Merge branch 'main' into jc/hackathon_ci

Author: jkaster

packages/hackathon/src/authToken/extensionProxyTransport.ts

@@ -133,6 +133,7 @@ export class ExtensionProxyTransport extends BaseTransport {
     // const responseBody =
     //   mode === ResponseMode.binary ? await res.body : await res.body.toString()
     return {
+      method,
       url: requestPath,
       body: res.body,
       contentType,

packages/run-it/src/components/ResponseExplorer/ResponseExplorer.spec.tsx

@@ -31,6 +31,7 @@ import userEvent from '@testing-library/user-event'
 import { ResponseExplorer, ResponseHeaders } from '.'
 
 const response: IRawResponse = {
+  method: 'GET',
   url: '/sample/url',
   ok: true,
   statusCode: 200,

packages/run-it/src/test-data/responses.ts

@@ -27,6 +27,7 @@
 import type { IRawResponse } from '@looker/sdk-rtl'
 
 export const testJsonResponse: IRawResponse = {
+  method: 'GET',
   url: 'https://some/json/data',
   headers: { 'content-type': 'application/json' },
   contentType: 'application/json',
@@ -37,6 +38,7 @@ export const testJsonResponse: IRawResponse = {
 }
 
 export const testOneRowComplexJson: IRawResponse = {
+  method: 'GET',
   url: 'https://some/json/data',
   headers: { 'content-type': 'application/json' },
   contentType: 'application/json',
@@ -98,6 +100,7 @@ export const testOneRowComplexJson: IRawResponse = {
 }
 
 export const testTextResponse: IRawResponse = {
+  method: 'GET',
   url: 'https://some/text/data',
   headers: { 'content-type': 'text/plain;charset=utf-8' },
   contentType: 'text/plain;charset=utf-8',
@@ -108,6 +111,7 @@ export const testTextResponse: IRawResponse = {
 }
 
 export const testHtmlResponse: IRawResponse = {
+  method: 'GET',
   url: `https://some/html`,
   headers: { 'content-type': 'text/html;charset=utf-8' },
   contentType: 'text/html;charset=utf-8',
@@ -123,6 +127,7 @@ export const testHtmlResponse: IRawResponse = {
 }
 
 export const testSqlResponse: IRawResponse = {
+  method: 'GET',
   url: `https://some/sql`,
   headers: { 'content-type': 'application/sql' },
   contentType: 'application/sql',
@@ -137,6 +142,7 @@ LIMIT 500`),
 }
 
 export const testImageResponse = (contentType = 'image/png'): IRawResponse => ({
+  method: 'GET',
   url: `http://${contentType}`,
   headers: { 'content-type': contentType },
   contentType,
@@ -147,6 +153,7 @@ export const testImageResponse = (contentType = 'image/png'): IRawResponse => ({
 })
 
 export const testUnknownResponse: IRawResponse = {
+  method: 'GET',
   url: 'http://bogus',
   headers: {},
   contentType: 'bogus',
@@ -157,6 +164,7 @@ export const testUnknownResponse: IRawResponse = {
 }
 
 export const testErrorResponse: IRawResponse = {
+  method: 'GET',
   url: 'http://error',
   headers: {},
   body: Buffer.from(
@@ -169,6 +177,7 @@ export const testErrorResponse: IRawResponse = {
 }
 
 export const testBogusJsonResponse: IRawResponse = {
+  method: 'GET',
   url: 'https://some/json/data',
   headers: {},
   contentType: 'application/json',

packages/sdk-codegen-scripts/src/legacyGenerator.ts

@@ -25,9 +25,8 @@
  */
 
 import { log } from '@looker/sdk-codegen-utils'
-import type { IGeneratorSpec } from '@looker/sdk-codegen'
+import type { IGeneratorSpec, IApiVersion } from '@looker/sdk-codegen'
 import { getSpecsFromVersions, legacyLanguages } from '@looker/sdk-codegen'
-import type { IApiVersion } from '@looker/sdk'
 import type { ISDKConfigProps } from './sdkConfig'
 import { run } from './nodeUtils'
 import { fetchLookerVersions, logConvertSpec } from './fetchSpec'

packages/sdk-codegen-scripts/src/prettify.ts

@@ -45,6 +45,5 @@ const prettierTs: prettier.Options = {
  */
 export const prettify = (code: string, options: prettier.Options = {}) => {
   const merged: prettier.Options = { ...prettierTs, ...{ options } }
-  const source = prettier.format(code, merged)
-  return source.trimRight()
+  return prettier.format(code, merged)
 }

packages/sdk-codegen-scripts/src/specConvert.ts

@@ -25,7 +25,7 @@
  */
 import * as path from 'path'
 import { log } from '@looker/sdk-codegen-utils'
-import type { IApiVersion } from '@looker/sdk'
+import type { IApiVersion } from '@looker/sdk-codegen'
 import { getSpecsFromVersions } from '@looker/sdk-codegen'
 import type { ISDKConfigProps } from './sdkConfig'
 import { SDKConfig } from './sdkConfig'

packages/sdk-codegen/src/specConverter.ts

@@ -25,7 +25,7 @@
  */
 
 import isEmpty from 'lodash/isEmpty'
-import type { APIMethods, Url } from '@looker/sdk-rtl'
+import type { APIMethods } from '@looker/sdk-rtl'
 import type { ArgValues, IApiModel, KeyedCollection } from './sdkModels'
 import { ApiModel } from './sdkModels'
 
@@ -35,7 +35,7 @@ const warn = (warning: string) => {
 
 const appJson = 'application/json'
 
-/** This declaration is duplicated DIRECTLY from @looker/sdk to detach dependency */
+/** This declaration is duplicated DIRECTLY from @looker/sdk API 4.0 models to detach dependency */
 export interface IApiVersion {
   /**
    * Current Looker release version number (read-only)
@@ -50,28 +50,30 @@ export interface IApiVersion {
    * API server base url (read-only)
    */
   api_server_url?: string
-  /** Web server url */
+  /**
+   * Web server base url (read-only)
+   */
   web_server_url?: string
 }
 
-/** This declaration is duplicated DIRECTLY from @looker/sdk to detach dependency */
+/** This declaration is duplicated DIRECTLY from @looker/sdk API 4.0 models to detach dependency */
 export interface IApiVersionElement {
   /**
    * Version number as it appears in '/api/xxx/' urls (read-only)
    */
-  version?: string
+  version?: string | null
   /**
    * Full version number including minor version (read-only)
    */
-  full_version?: string
+  full_version?: string | null
   /**
    * Status of this version (read-only)
    */
-  status?: string
+  status?: string | null
   /**
    * Url for swagger.json for this version (read-only)
    */
-  swagger_url?: Url
+  swagger_url?: string | null
 }
 
 /**

packages/sdk-codegen/src/typescript.gen.spec.ts

@@ -911,7 +911,7 @@ body: ICreateDashboardRenderTask`)
   /**
    * The local state of each project in the workspace (read-only)
    */
-  projects?: IProject[]
+  projects?: IProject[] | null
 }`)
     })
     it('with refs, arrays and nullable', () => {
@@ -921,12 +921,12 @@ body: ICreateDashboardRenderTask`)
   /**
    * Current Looker release version number (read-only)
    */
-  looker_release_version?: string
+  looker_release_version?: string | null
   current_version?: IApiVersionElement
   /**
    * Array of versions supported by this Looker instance (read-only)
    */
-  supported_versions?: IApiVersionElement[]
+  supported_versions?: IApiVersionElement[] | null
 }`)
     })
     it('required properties', () => {
@@ -941,27 +941,27 @@ body: ICreateDashboardRenderTask`)
   /**
    * Id of query to run
    */
-  query_id: number
+  query_id: number | null
   /**
    * Desired async query result format. Valid values are: "inline_json", "json", "json_detail", "json_fe", "csv", "html", "md", "txt", "xlsx", "gsxml".
    */
-  result_format: ${name}
+  result_format: ${name} | null
   /**
    * Source of query task
    */
-  source?: string
+  source?: string | null
   /**
    * Create the task but defer execution
    */
   deferred?: boolean
   /**
    * Id of look associated with query.
    */
-  look_id?: number
+  look_id?: number | null
   /**
    * Id of dashboard associated with query.
    */
-  dashboard_id?: string
+  dashboard_id?: string | null
 }`)
     })
 
@@ -1072,11 +1072,11 @@ export enum Align {
   /**
    * Id of query to run
    */
-  query_id: number
+  query_id: number | null
   /**
    * Desired async query result format. Valid values are: "inline_json", "json", "json_detail", "json_fe", "csv", "html", "md", "txt", "xlsx", "gsxml".
    */
-  result_format: ResultFormat
+  result_format: ResultFormat | null
   /**
    * An array of user attribute types that are allowed to be used in filters on this field. Valid values are: "advanced_filter_string", "advanced_filter_number", "advanced_filter_datetime", "string", "number", "datetime", "relative_url", "yesno", "zipcode". (read-only)
    */
@@ -1085,7 +1085,7 @@ export enum Align {
   /**
    * Roles assigned to group (read-only)
    */
-  roles?: IRole[]
+  roles?: IRole[] | null
 }`)
       })
 
@@ -1116,15 +1116,15 @@ export enum Align {
   /**
    * Id of query to run
    */
-  query_id: number
+  query_id: number | null
   /**
    * Desired async query result format. Valid values are: "inline_json", "json", "json_detail", "json_fe", "csv", "html", "md", "txt", "xlsx", "gsxml".
    */
-  result_format: SecondResponseWithEnumsResultFormat
+  result_format: SecondResponseWithEnumsResultFormat | null
   /**
    * Desired async query result format. Valid values are: "inline_json", "json", "json_detail", "json_fe", "csv", "html", "md", "txt", "xlsx", "gsxml".
    */
-  another_format?: AnotherFormat
+  another_format?: AnotherFormat | null
   /**
    * An array of user attribute types that are allowed to be used in filters on this field. Valid values are: "advanced_filter_string", "advanced_filter_number", "advanced_filter_datetime", "string", "number", "datetime", "relative_url", "yesno", "zipcode". (read-only)
    */
@@ -1133,7 +1133,7 @@ export enum Align {
   /**
    * Roles assigned to group (read-only)
    */
-  roles?: IRole[]
+  roles?: IRole[] | null
 }`)
       })
     })

packages/sdk-codegen/src/typescript.gen.ts

@@ -230,6 +230,7 @@ export class ${this.packageName}Stream extends APIMethods {
 
   declareProperty(indent: string, property: IProperty) {
     const optional = !property.required ? '?' : ''
+    const nullify = property.nullable ? ' | null' : ''
     if (property.name === strBody) {
       // TODO refactor this hack to track context when the body parameter is created for the request type
       property.type.refCount++
@@ -239,13 +240,17 @@ export class ${this.packageName}Stream extends APIMethods {
           property.description ||
             'body parameter for dynamically created request type'
         ) +
-        `${indent}${property.name}${optional}: ${this.typeName(property.type)}`
+        `${indent}${property.name}${optional}: ${this.typeName(
+          property.type
+        )}${nullify}`
       )
     }
     const mapped = this.typeMap(property.type)
     return (
       this.commentHeader(indent, this.describeProperty(property)) +
-      `${indent}${this.reserve(property.name)}${optional}: ${mapped.name}`
+      `${indent}${this.reserve(property.name)}${optional}: ${
+        mapped.name
+      }${nullify}`
     )
   }
 

packages/sdk-node/src/nodeTransport.spec.ts

@@ -40,6 +40,7 @@ describe('NodeTransport', () => {
     const response = await xp.rawRequest('GET', fullPath)
     expect(response).toBeDefined()
     expect(response.ok).toEqual(true)
+    expect(response.method).toEqual('GET')
     expect(response.statusCode).toEqual(200)
     expect(response.statusMessage).toEqual('OK')
     expect(response.contentType).toContain('text/html')
@@ -56,6 +57,7 @@ describe('NodeTransport', () => {
       const errorMessage = `GET ${badPath}`
       expect(response).toBeDefined()
       expect(response.ok).toEqual(false)
+      expect(response.method).toEqual('GET')
       expect(response.statusCode).toEqual(404)
       expect(response.body).toBeDefined()
       expect(response.statusMessage.indexOf('"type":"Buffer"')).toEqual(-1)
@@ -77,6 +79,7 @@ describe('NodeTransport', () => {
 
   describe('ok check', () => {
     const raw: IRawResponse = {
+      method: 'GET',
       contentType: 'application/json',
       headers: {},
       url: 'bogus',