@osdk/generator 2.5.0-rc.15 → 2.5.1

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @osdk/generator
 
+## 2.5.1
+
+### Patch Changes
+
+- 099b4d8: Fix nested array query param type handling
+- Updated dependencies [099b4d8]
+  - @osdk/generator-converters@2.5.1
+  - @osdk/api@2.5.1
+
+## 2.5.0
+
+### Patch Changes
+
+- 322c5bc: Simulated release
+- 4b4a458: Allow exporting rid for object types
+- 7cdab1d: Update platform sdk dependencies
+- a00d2ed: Update Platform SDK dependencies
+- d29cdfb: Fixes query generation with disallowed javascript identifiers.
+- a6f49e9: experimentalDoNotUseMetadata -> internalDoNotUseMetadata
+- 7bdac45: Update Platform SDK dependency
+- a96d89e: Update Platform SDK dependencies
+- 78be29f: mark deprecated properties with JSDoc for interface types
+- 7bdac45: Support value type enum generation for strings and booleans
+- cbcf2ad: Add branching support
+- 4248b80: Temporarily remove NullValue type from codegen
+- Updated dependencies [322c5bc]
+- Updated dependencies [322c5bc]
+- Updated dependencies [7160276]
+- Updated dependencies [7cdab1d]
+- Updated dependencies [a00d2ed]
+- Updated dependencies [7bdac45]
+- Updated dependencies [37eb75b]
+- Updated dependencies [7b97128]
+- Updated dependencies [76905f5]
+- Updated dependencies [a96d89e]
+- Updated dependencies [7bdac45]
+- Updated dependencies [20962bc]
+- Updated dependencies [cbcf2ad]
+- Updated dependencies [052a96b]
+- Updated dependencies [ca1fabe]
+- Updated dependencies [e48be06]
+  - @osdk/api@2.5.0
+  - @osdk/generator-converters@2.5.0
+
 ## 2.5.0-rc.15
 
 ### Patch Changes

package/build/browser/v2.0/generateMetadata.js

@@ -18,7 +18,7 @@ import path from "path";
 import { formatTs } from "../util/test/formatTs.js";
 
 // BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.
-const ExpectedOsdkVersion = "2.5.0";
+const ExpectedOsdkVersion = "2.5.1";
 // END: THIS IS GENERATED CODE. DO NOT EDIT.
 
 export async function generateOntologyMetadataFile({

package/build/browser/v2.0/generateMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateMetadata.js","names":["path","formatTs","ExpectedOsdkVersion","generateOntologyMetadataFile","fs","outDir","ontology","ontologyApiNamespace","userAgent","writeFile","join","rid","raw","branch"],"sources":["generateMetadata.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport path from \"path\";\nimport type { GenerateContext } from \"../GenerateContext/GenerateContext.js\";\nimport { formatTs } from \"../util/test/formatTs.js\";\n\n// BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.\nconst ExpectedOsdkVersion = \"2.5.0\";\n// END: THIS IS GENERATED CODE. DO NOT EDIT.\n\nexport async function generateOntologyMetadataFile(\n  { fs, outDir, ontology, ontologyApiNamespace }: GenerateContext,\n  userAgent: string,\n): Promise<void> {\n  await fs.writeFile(\n    path.join(outDir, \"OntologyMetadata.ts\"),\n    await formatTs(\n      `\n      export type $ExpectedClientVersion = \"${ExpectedOsdkVersion}\";\n      export const $osdkMetadata = { extraUserAgent: \"${userAgent}\" };\n      ${\n        ontologyApiNamespace == null\n          ? `\n        export const $ontologyRid = \"${ontology.ontology.rid}\";\n        `\n          : \"\"\n      }\n       ${\n        ontology.raw.branch != null\n          ? `\n        export const $branch = \"${ontology.raw.branch.rid}\";\n        `\n          : \"\"\n      }\n      `,\n    ),\n  );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,OAAOA,IAAI,MAAM,MAAM;AAEvB,SAASC,QAAQ,QAAQ,0BAA0B;;AAEnD;AACA,MAAMC,mBAAmB,GAAG,OAAO;AACnC;;AAEA,OAAO,eAAeC,4BAA4BA,CAChD;EAAEC,EAAE;EAAEC,MAAM;EAAEC,QAAQ;EAAEC;AAAsC,CAAC,EAC/DC,SAAiB,EACF;EACf,MAAMJ,EAAE,CAACK,SAAS,CAChBT,IAAI,CAACU,IAAI,CAACL,MAAM,EAAE,qBAAqB,CAAC,EACxC,MAAMJ,QAAQ,CACZ;AACN,8CAA8CC,mBAAmB;AACjE,wDAAwDM,SAAS;AACjE,QACQD,oBAAoB,IAAI,IAAI,GACxB;AACZ,uCAAuCD,QAAQ,CAACA,QAAQ,CAACK,GAAG;AAC5D,SAAS,GACG,EAAE;AACd,SAEQL,QAAQ,CAACM,GAAG,CAACC,MAAM,IAAI,IAAI,GACvB;AACZ,kCAAkCP,QAAQ,CAACM,GAAG,CAACC,MAAM,CAACF,GAAG;AACzD,SAAS,GACG,EAAE;AACd,OAEI,CACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"generateMetadata.js","names":["path","formatTs","ExpectedOsdkVersion","generateOntologyMetadataFile","fs","outDir","ontology","ontologyApiNamespace","userAgent","writeFile","join","rid","raw","branch"],"sources":["generateMetadata.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport path from \"path\";\nimport type { GenerateContext } from \"../GenerateContext/GenerateContext.js\";\nimport { formatTs } from \"../util/test/formatTs.js\";\n\n// BEGIN: THIS IS GENERATED CODE. DO NOT EDIT.\nconst ExpectedOsdkVersion = \"2.5.1\";\n// END: THIS IS GENERATED CODE. DO NOT EDIT.\n\nexport async function generateOntologyMetadataFile(\n  { fs, outDir, ontology, ontologyApiNamespace }: GenerateContext,\n  userAgent: string,\n): Promise<void> {\n  await fs.writeFile(\n    path.join(outDir, \"OntologyMetadata.ts\"),\n    await formatTs(\n      `\n      export type $ExpectedClientVersion = \"${ExpectedOsdkVersion}\";\n      export const $osdkMetadata = { extraUserAgent: \"${userAgent}\" };\n      ${\n        ontologyApiNamespace == null\n          ? `\n        export const $ontologyRid = \"${ontology.ontology.rid}\";\n        `\n          : \"\"\n      }\n       ${\n        ontology.raw.branch != null\n          ? `\n        export const $branch = \"${ontology.raw.branch.rid}\";\n        `\n          : \"\"\n      }\n      `,\n    ),\n  );\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,OAAOA,IAAI,MAAM,MAAM;AAEvB,SAASC,QAAQ,QAAQ,0BAA0B;;AAEnD;AACA,MAAMC,mBAAmB,GAAG,OAAO;AACnC;;AAEA,OAAO,eAAeC,4BAA4BA,CAChD;EAAEC,EAAE;EAAEC,MAAM;EAAEC,QAAQ;EAAEC;AAAsC,CAAC,EAC/DC,SAAiB,EACF;EACf,MAAMJ,EAAE,CAACK,SAAS,CAChBT,IAAI,CAACU,IAAI,CAACL,MAAM,EAAE,qBAAqB,CAAC,EACxC,MAAMJ,QAAQ,CACZ;AACN,8CAA8CC,mBAAmB;AACjE,wDAAwDM,SAAS;AACjE,QACQD,oBAAoB,IAAI,IAAI,GACxB;AACZ,uCAAuCD,QAAQ,CAACA,QAAQ,CAACK,GAAG;AAC5D,SAAS,GACG,EAAE;AACd,SAEQL,QAAQ,CAACM,GAAG,CAACC,MAAM,IAAI,IAAI,GACvB;AACZ,kCAAkCP,QAAQ,CAACM,GAAG,CAACC,MAAM,CAACF,GAAG;AACzD,SAAS,GACG,EAAE;AACd,OAEI,CACF,CAAC;AACH","ignoreList":[]}

package/build/browser/v2.0/generatePerQueryDataFiles.js

@@ -157,10 +157,13 @@ export function queryParamJsDoc(param, {
   return ret;
 }
 export function getQueryParamType(enhancedOntology, input, type, isMapKey = false) {
-  let inner = `unknown /* ${input.type} */`;
+  let paramType = `unknown /* ${input.type} */`;
   switch (input.type) {
+    case "array":
+      paramType = `${type === "Param" ? "Readonly" : ""}Array<${getQueryParamType(enhancedOntology, input.array, type)}>`;
+      break;
     case "date":
-      inner = `Query${type}.PrimitiveType<${JSON.stringify("datetime")}>`;
+      paramType = `Query${type}.PrimitiveType<${JSON.stringify("datetime")}>`;
       break;
     case "attachment":
     case "boolean":
@@ -170,10 +173,10 @@ export function getQueryParamType(enhancedOntology, input, type, isMapKey = fals
     case "long":
     case "string":
     case "timestamp":
-      inner = `Query${type}.PrimitiveType<${JSON.stringify(input.type)}>`;
+      paramType = `Query${type}.PrimitiveType<${JSON.stringify(input.type)}>`;
       break;
     case "struct":
-      inner = `{
+      paramType = `{
             ${stringify(input.struct, {
         "*": (p, formatter, apiName) => {
           return [`
@@ -183,42 +186,37 @@ export function getQueryParamType(enhancedOntology, input, type, isMapKey = fals
             }`;
       break;
     case "twoDimensionalAggregation":
-      inner = `Query${type}.TwoDimensionalAggregationType<${input.twoDimensionalAggregation.keyType === "range" ? `Query${type}.RangeKey<"${input.twoDimensionalAggregation.keySubtype}">` : `"${input.twoDimensionalAggregation.keyType}"`}, "${input.twoDimensionalAggregation.valueType}">`;
+      paramType = `Query${type}.TwoDimensionalAggregationType<${input.twoDimensionalAggregation.keyType === "range" ? `Query${type}.RangeKey<"${input.twoDimensionalAggregation.keySubtype}">` : `"${input.twoDimensionalAggregation.keyType}"`}, "${input.twoDimensionalAggregation.valueType}">`;
       break;
     case "threeDimensionalAggregation":
-      inner = `Query${type}.ThreeDimensionalAggregationType<${input.threeDimensionalAggregation.keyType === "range" ? `Query${type}.RangeKey<"${input.threeDimensionalAggregation.keySubtype}">` : `"${input.threeDimensionalAggregation.keyType}"`},${input.threeDimensionalAggregation.valueType.keyType === "range" ? `Query${type}.RangeKey<"${input.threeDimensionalAggregation.valueType.keySubtype}">` : `"${input.threeDimensionalAggregation.valueType.keyType}"`}, 
+      paramType = `Query${type}.ThreeDimensionalAggregationType<${input.threeDimensionalAggregation.keyType === "range" ? `Query${type}.RangeKey<"${input.threeDimensionalAggregation.keySubtype}">` : `"${input.threeDimensionalAggregation.keyType}"`},${input.threeDimensionalAggregation.valueType.keyType === "range" ? `Query${type}.RangeKey<"${input.threeDimensionalAggregation.valueType.keySubtype}">` : `"${input.threeDimensionalAggregation.valueType.keyType}"`}, 
         "${input.threeDimensionalAggregation.valueType.valueType}">`;
       break;
     case "object":
       if (isMapKey) {
-        inner = `ObjectSpecifier<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
+        paramType = `ObjectSpecifier<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
         break;
       }
-      inner = `Query${type}.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
+      paramType = `Query${type}.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "interface":
-      inner = `Query${type}.InterfaceType<${enhancedOntology.requireInterfaceType(input.interface).getImportedDefinitionIdentifier(true)}>`;
+      paramType = `Query${type}.InterfaceType<${enhancedOntology.requireInterfaceType(input.interface).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "objectSet":
-      inner = `Query${type}.ObjectSetType<${enhancedOntology.requireObjectType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
+      paramType = `Query${type}.ObjectSetType<${enhancedOntology.requireObjectType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "interfaceObjectSet":
-      inner = `Query${type}.ObjectSetType<${enhancedOntology.requireInterfaceType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
+      paramType = `Query${type}.ObjectSetType<${enhancedOntology.requireInterfaceType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "set":
-      inner = `${type === "Param" ? "Readonly" : ""}Set<${getQueryParamType(enhancedOntology, input.set, type)}>`;
+      paramType = `${type === "Param" ? "Readonly" : ""}Set<${getQueryParamType(enhancedOntology, input.set, type)}>`;
       break;
     case "union":
-      inner = input.union.map(u => getQueryParamType(enhancedOntology, u, type)).join(" | ");
+      paramType = input.union.map(u => getQueryParamType(enhancedOntology, u, type)).join(" | ");
       break;
     case "map":
-      inner = `Partial<Record<${getQueryParamType(enhancedOntology, input.keyType, type, true)}, ${getQueryParamType(enhancedOntology, input.valueType, type)}>>`;
-  }
-  if (input.multiplicity && type === "Param") {
-    return `ReadonlyArray<${inner}>`;
-  } else if (input.multiplicity) {
-    return `Array<${inner}>`;
+      paramType = `Partial<Record<${getQueryParamType(enhancedOntology, input.keyType, type, true)}, ${getQueryParamType(enhancedOntology, input.valueType, type)}>>`;
   }
-  return inner;
+  return paramType;
 }
 //# sourceMappingURL=generatePerQueryDataFiles.js.map

package/build/browser/v2.0/generatePerQueryDataFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatePerQueryDataFiles.js","names":["wireQueryDataTypeToQueryDataTypeDefinition","wireQueryParameterV2ToQueryParameterDefinition","paramToDef","wireQueryTypeV2ToSdkQueryDefinitionNoParams","path","getInterfaceTypeApiNamesFromQuery","getObjectImports","getObjectTypeApiNamesFromQuery","deleteUndefineds","stringify","formatTs","getDescriptionIfPresent","generatePerQueryDataFilesV2","fs","outDir","rootOutDir","ontology","fixedVersionQueryTypes","importExt","forInternalUse","relOutDir","join","mkdir","recursive","Promise","all","Object","values","queryTypes","map","query","generateV2QueryFile","writeFile","shortApiName","getImportPathRelTo","keys","length","relFilePath","objectTypes","interfaceTypes","interfaceAndObjectTypes","Set","o","requireObjectType","requireInterfaceType","importObjects","baseProps","raw","outputBase","output","isUsingFixedVersion","includes","fullApiName","description","parameters","paramsIdentifier","*","parameter","formatter","apiName","q","queryParamJsDoc","nullable","getQueryParamType","type","dataType","parameterDefsForType","getLineFor__OsdkTargetType","undefined","displayName","rid","definitionIdentifier","valueFormatter","qdt","objectTypeApiName","getImportedDefinitionIdentifier","param","ret","enhancedOntology","input","isMapKey","inner","JSON","struct","p","twoDimensionalAggregation","keyType","keySubtype","valueType","threeDimensionalAggregation","object","interface","objectSet","set","union","u","multiplicity"],"sources":["generatePerQueryDataFiles.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { QueryParameterDefinition } from \"@osdk/api\";\nimport type { QueryDataType } from \"@osdk/foundry.ontologies\";\nimport {\n  wireQueryDataTypeToQueryDataTypeDefinition,\n  wireQueryParameterV2ToQueryParameterDefinition as paramToDef,\n  wireQueryTypeV2ToSdkQueryDefinitionNoParams,\n} from \"@osdk/generator-converters\";\nimport path from \"node:path\";\nimport type { EnhancedOntologyDefinition } from \"../GenerateContext/EnhancedOntologyDefinition.js\";\nimport type { EnhancedQuery } from \"../GenerateContext/EnhancedQuery.js\";\nimport type { GenerateContext } from \"../GenerateContext/GenerateContext.js\";\nimport type { MinimalFs } from \"../MinimalFs.js\";\nimport { getInterfaceTypeApiNamesFromQuery } from \"../shared/getInterfaceTypeApiNamesFromQuery.js\";\nimport { getObjectImports } from \"../shared/getObjectImports.js\";\nimport { getObjectTypeApiNamesFromQuery } from \"../shared/getObjectTypeApiNamesFromQuery.js\";\nimport { deleteUndefineds } from \"../util/deleteUndefineds.js\";\nimport { stringify } from \"../util/stringify.js\";\nimport { formatTs } from \"../util/test/formatTs.js\";\nimport { getDescriptionIfPresent } from \"./getDescriptionIfPresent.js\";\n\nexport async function generatePerQueryDataFilesV2(\n  {\n    fs,\n    outDir: rootOutDir,\n    ontology,\n    fixedVersionQueryTypes,\n    importExt = \"\",\n    forInternalUse = false,\n  }: Pick<\n    GenerateContext,\n    | \"fs\"\n    | \"outDir\"\n    | \"importExt\"\n    | \"ontology\"\n    | \"forInternalUse\"\n    | \"fixedVersionQueryTypes\"\n  >,\n  v2: boolean,\n): Promise<void> {\n  const relOutDir = path.join(\".\", \"ontology\", \"queries\");\n  const outDir = path.join(rootOutDir, \"ontology\", \"queries\");\n  await fs.mkdir(outDir, { recursive: true });\n  await Promise.all(\n    Object.values(ontology.queryTypes).map(async query => {\n      await generateV2QueryFile(\n        fs,\n        outDir,\n        relOutDir,\n        query,\n        importExt,\n        ontology,\n        forInternalUse,\n        fixedVersionQueryTypes,\n      );\n    }),\n  );\n\n  const indexFilePath = `${outDir}.ts`;\n  await fs.writeFile(\n    indexFilePath,\n    await formatTs(`\n    ${\n      Object.values(ontology.queryTypes).map(query =>\n        `export {${query.shortApiName}} from \"${\n          query.getImportPathRelTo(relOutDir)\n        }\";`\n      )\n        .join(\"\\n\")\n    }\n      ${Object.keys(ontology.queryTypes).length === 0 ? \"export {};\" : \"\"}\n    `),\n  );\n}\n\nasync function generateV2QueryFile(\n  fs: MinimalFs,\n  outDir: string,\n  relOutDir: string,\n  query: EnhancedQuery,\n  importExt: string,\n  ontology: EnhancedOntologyDefinition,\n  forInternalUse: boolean,\n  fixedVersionQueryTypes: string[],\n) {\n  const relFilePath = path.join(relOutDir, `${query.shortApiName}.ts`);\n  const objectTypes = getObjectTypeApiNamesFromQuery(query);\n  const interfaceTypes = getInterfaceTypeApiNamesFromQuery(query);\n  const interfaceAndObjectTypes = new Set(\n    [\n      ...objectTypes.map(o => ontology.requireObjectType(o)),\n      ...interfaceTypes.map(o => ontology.requireInterfaceType(o)),\n    ],\n  );\n\n  const importObjects = getObjectImports(\n    interfaceAndObjectTypes,\n    \"\",\n    relFilePath,\n    true,\n  );\n\n  const baseProps = deleteUndefineds(\n    wireQueryTypeV2ToSdkQueryDefinitionNoParams(query.raw),\n  );\n\n  const outputBase = deleteUndefineds(\n    wireQueryDataTypeToQueryDataTypeDefinition(query.output),\n  );\n\n  const isUsingFixedVersion = fixedVersionQueryTypes.includes(\n    query.fullApiName,\n  );\n\n  await fs.writeFile(\n    path.join(outDir, `${query.shortApiName}.ts`),\n    await formatTs(`\n        import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound} from \"${\n      forInternalUse ? \"@osdk/api\" : \"@osdk/client\"\n    }\";\n        import type { $ExpectedClientVersion } from \"../../OntologyMetadata${importExt}\";\n        import { $osdkMetadata} from \"../../OntologyMetadata${importExt}\";\n        ${importObjects}\n\n        export namespace ${query.shortApiName} {\n          export interface Signature {\n            ${getDescriptionIfPresent(query.description)}\n            (${\n      Object.keys(query.parameters).length > 0\n        ? `query: ${query.paramsIdentifier}`\n        : \"\"\n    }): Promise<${query.shortApiName}.ReturnType>\n          }\n\n        ${\n      Object.keys(query.parameters).length > 0\n        ? `\n            export interface Parameters {\n            ${\n          stringify(query.parameters, {\n            \"*\": (parameter, formatter, apiName) => {\n              const q = paramToDef(parameter);\n              return [\n                `\n                ${\n                  queryParamJsDoc(paramToDef(parameter), { apiName })\n                }readonly \"${apiName}\"${q.nullable ? \"?\" : \"\"}`,\n                getQueryParamType(ontology, q, \"Param\"),\n              ];\n            },\n          })\n        }\n            }`\n        : \"\"\n    }\n\n            ${\n      query.output.type === \"struct\"\n        ? `\n            export interface ReturnType \n            ${\n          getQueryParamType(\n            ontology,\n            paramToDef({ dataType: query.output }),\n            \"Result\",\n          )\n        }\n        `\n        : `\n        export type ReturnType = ${\n          getQueryParamType(\n            ontology,\n            paramToDef({ dataType: query.output }),\n            \"Result\",\n          )\n        }\n          `\n    }\n      }\n    \n            \n        export interface ${query.shortApiName} extends QueryDefinition<\n          ${query.shortApiName}.Signature\n        >, VersionBound<$ExpectedClientVersion>{\n         __DefinitionMetadata?: {\n             ${stringify(baseProps)}\n             isFixedVersion: ${isUsingFixedVersion};\n            parameters: {\n            ${parameterDefsForType(ontology, query)}\n            };\n            output: {\n            ${stringify(outputBase)},\n            ${getLineFor__OsdkTargetType(ontology, query.output)}\n            };\n            signature: ${query.shortApiName}.Signature;\n        }, \n        ${\n      stringify(baseProps, {\n        \"description\": () => undefined,\n        \"displayName\": () => undefined,\n        \"rid\": () => undefined,\n      })\n    }, \n          osdkMetadata: typeof $osdkMetadata;\n              }\n\n\n        export const ${query.shortApiName}: ${query.definitionIdentifier} = {\n            ${\n      stringify(baseProps, {\n        \"description\": () => undefined,\n        \"displayName\": () => undefined,\n        \"rid\": () => undefined,\n      })\n    },\n    isFixedVersion: ${isUsingFixedVersion},\n    osdkMetadata: $osdkMetadata\n        };\n        `),\n  );\n}\n\nfunction parameterDefsForType(\n  ontology: EnhancedOntologyDefinition,\n  query: EnhancedQuery,\n) {\n  return stringify(query.parameters, {\n    \"*\": (parameter, valueFormatter, apiName) => [\n      `${queryParamJsDoc(paramToDef(parameter), { apiName })} \"${apiName}\"`,\n      ` {\n          ${stringify(deleteUndefineds(paramToDef(parameter)))},\n          ${getLineFor__OsdkTargetType(ontology, parameter.dataType)}\n        }`,\n    ],\n  });\n}\n\nfunction getLineFor__OsdkTargetType(\n  ontology: EnhancedOntologyDefinition,\n  qdt: QueryDataType,\n) {\n  if (qdt.type === \"object\" || qdt.type === \"objectSet\") {\n    return `__OsdkTargetType?: ${\n      ontology.requireObjectType(\n        qdt.objectTypeApiName!,\n      ).getImportedDefinitionIdentifier(true)\n    }`;\n  }\n  return \"\";\n}\n\nexport function queryParamJsDoc(\n  param: QueryParameterDefinition<any>,\n  { apiName }: { apiName: string },\n): string {\n  let ret = `/**\\n`;\n\n  if (param.description) {\n    if (param.description) {\n      ret += ` *   description: ${param.description}\\n`;\n    }\n  } else {\n    ret += ` * (no ontology metadata)\\n`;\n  }\n\n  ret += ` */\\n`;\n  return ret;\n}\n\nexport function getQueryParamType(\n  enhancedOntology: EnhancedOntologyDefinition,\n  input: QueryParameterDefinition,\n  type: \"Param\" | \"Result\",\n  isMapKey = false,\n): string {\n  let inner = `unknown /* ${input.type} */`;\n\n  switch (input.type) {\n    case \"date\":\n      inner = `Query${type}.PrimitiveType<${JSON.stringify(\"datetime\")}>`;\n      break;\n\n    case \"attachment\":\n    case \"boolean\":\n    case \"double\":\n    case \"float\":\n    case \"integer\":\n    case \"long\":\n    case \"string\":\n    case \"timestamp\":\n      inner = `Query${type}.PrimitiveType<${JSON.stringify(input.type)}>`;\n      break;\n    case \"struct\":\n      inner = `{\n            ${\n        stringify(input.struct, {\n          \"*\": (p, formatter, apiName) => {\n            return [\n              `\n                ${type === \"Param\" ? \"readonly \" : \"\"}\"${apiName}\"${\n                p.nullable ? \"?\" : \"\"\n              }`,\n              getQueryParamType(enhancedOntology, p, type),\n            ];\n          },\n        })\n      }\n            }`;\n      break;\n    case \"twoDimensionalAggregation\":\n      inner = `Query${type}.TwoDimensionalAggregationType<${\n        input.twoDimensionalAggregation.keyType === \"range\"\n          ? `Query${type}.RangeKey<\"${input.twoDimensionalAggregation.keySubtype}\">`\n          : `\"${input.twoDimensionalAggregation.keyType}\"`\n      }, \"${input.twoDimensionalAggregation.valueType}\">`;\n      break;\n\n    case \"threeDimensionalAggregation\":\n      inner = `Query${type}.ThreeDimensionalAggregationType<${\n        input.threeDimensionalAggregation.keyType === \"range\"\n          ? `Query${type}.RangeKey<\"${input.threeDimensionalAggregation.keySubtype}\">`\n          : `\"${input.threeDimensionalAggregation.keyType}\"`\n      },${\n        input.threeDimensionalAggregation.valueType.keyType === \"range\"\n          ? `Query${type}.RangeKey<\"${input.threeDimensionalAggregation.valueType.keySubtype}\">`\n          : `\"${input.threeDimensionalAggregation.valueType.keyType}\"`\n      }, \n        \"${input.threeDimensionalAggregation.valueType.valueType}\">`;\n      break;\n    case \"object\":\n      if (isMapKey) {\n        inner = `ObjectSpecifier<${\n          enhancedOntology.requireObjectType(input.object)\n            .getImportedDefinitionIdentifier(true)\n        }>`;\n        break;\n      }\n      inner = `Query${type}.ObjectType<${\n        enhancedOntology.requireObjectType(input.object)\n          .getImportedDefinitionIdentifier(true)\n      }>`;\n      break;\n    case \"interface\":\n      inner = `Query${type}.InterfaceType<${\n        enhancedOntology.requireInterfaceType(input.interface)\n          .getImportedDefinitionIdentifier(true)\n      }>`;\n      break;\n\n    case \"objectSet\":\n      inner = `Query${type}.ObjectSetType<${\n        enhancedOntology.requireObjectType(input.objectSet)\n          .getImportedDefinitionIdentifier(true)\n      }>`;\n      break;\n\n    case \"interfaceObjectSet\":\n      inner = `Query${type}.ObjectSetType<${\n        enhancedOntology.requireInterfaceType(input.objectSet)\n          .getImportedDefinitionIdentifier(true)\n      }>`;\n      break;\n\n    case \"set\":\n      inner = `${type === \"Param\" ? \"Readonly\" : \"\"}Set<${\n        getQueryParamType(enhancedOntology, input.set, type)\n      }>`;\n      break;\n\n    case \"union\":\n      inner = input.union.map((u) =>\n        getQueryParamType(enhancedOntology, u, type)\n      ).join(\" | \");\n      break;\n\n    case \"map\":\n      inner = `Partial<Record<${\n        getQueryParamType(enhancedOntology, input.keyType, type, true)\n      }, ${getQueryParamType(enhancedOntology, input.valueType, type)}>>`;\n  }\n\n  if (input.multiplicity && type === \"Param\") {\n    return `ReadonlyArray<${inner}>`;\n  } else if (input.multiplicity) {\n    return `Array<${inner}>`;\n  }\n  return inner;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"generatePerQueryDataFiles.js","names":["wireQueryDataTypeToQueryDataTypeDefinition","wireQueryParameterV2ToQueryParameterDefinition","paramToDef","wireQueryTypeV2ToSdkQueryDefinitionNoParams","path","getInterfaceTypeApiNamesFromQuery","getObjectImports","getObjectTypeApiNamesFromQuery","deleteUndefineds","stringify","formatTs","getDescriptionIfPresent","generatePerQueryDataFilesV2","fs","outDir","rootOutDir","ontology","fixedVersionQueryTypes","importExt","forInternalUse","relOutDir","join","mkdir","recursive","Promise","all","Object","values","queryTypes","map","query","generateV2QueryFile","writeFile","shortApiName","getImportPathRelTo","keys","length","relFilePath","objectTypes","interfaceTypes","interfaceAndObjectTypes","Set","o","requireObjectType","requireInterfaceType","importObjects","baseProps","raw","outputBase","output","isUsingFixedVersion","includes","fullApiName","description","parameters","paramsIdentifier","*","parameter","formatter","apiName","q","queryParamJsDoc","nullable","getQueryParamType","type","dataType","parameterDefsForType","getLineFor__OsdkTargetType","undefined","displayName","rid","definitionIdentifier","valueFormatter","qdt","objectTypeApiName","getImportedDefinitionIdentifier","param","ret","enhancedOntology","input","isMapKey","paramType","array","JSON","struct","p","twoDimensionalAggregation","keyType","keySubtype","valueType","threeDimensionalAggregation","object","interface","objectSet","set","union","u"],"sources":["generatePerQueryDataFiles.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type { QueryParameterDefinition } from \"@osdk/api\";\nimport type { QueryDataType } from \"@osdk/foundry.ontologies\";\nimport {\n  wireQueryDataTypeToQueryDataTypeDefinition,\n  wireQueryParameterV2ToQueryParameterDefinition as paramToDef,\n  wireQueryTypeV2ToSdkQueryDefinitionNoParams,\n} from \"@osdk/generator-converters\";\nimport path from \"node:path\";\nimport type { EnhancedOntologyDefinition } from \"../GenerateContext/EnhancedOntologyDefinition.js\";\nimport type { EnhancedQuery } from \"../GenerateContext/EnhancedQuery.js\";\nimport type { GenerateContext } from \"../GenerateContext/GenerateContext.js\";\nimport type { MinimalFs } from \"../MinimalFs.js\";\nimport { getInterfaceTypeApiNamesFromQuery } from \"../shared/getInterfaceTypeApiNamesFromQuery.js\";\nimport { getObjectImports } from \"../shared/getObjectImports.js\";\nimport { getObjectTypeApiNamesFromQuery } from \"../shared/getObjectTypeApiNamesFromQuery.js\";\nimport { deleteUndefineds } from \"../util/deleteUndefineds.js\";\nimport { stringify } from \"../util/stringify.js\";\nimport { formatTs } from \"../util/test/formatTs.js\";\nimport { getDescriptionIfPresent } from \"./getDescriptionIfPresent.js\";\n\nexport async function generatePerQueryDataFilesV2(\n  {\n    fs,\n    outDir: rootOutDir,\n    ontology,\n    fixedVersionQueryTypes,\n    importExt = \"\",\n    forInternalUse = false,\n  }: Pick<\n    GenerateContext,\n    | \"fs\"\n    | \"outDir\"\n    | \"importExt\"\n    | \"ontology\"\n    | \"forInternalUse\"\n    | \"fixedVersionQueryTypes\"\n  >,\n  v2: boolean,\n): Promise<void> {\n  const relOutDir = path.join(\".\", \"ontology\", \"queries\");\n  const outDir = path.join(rootOutDir, \"ontology\", \"queries\");\n  await fs.mkdir(outDir, { recursive: true });\n  await Promise.all(\n    Object.values(ontology.queryTypes).map(async query => {\n      await generateV2QueryFile(\n        fs,\n        outDir,\n        relOutDir,\n        query,\n        importExt,\n        ontology,\n        forInternalUse,\n        fixedVersionQueryTypes,\n      );\n    }),\n  );\n\n  const indexFilePath = `${outDir}.ts`;\n  await fs.writeFile(\n    indexFilePath,\n    await formatTs(`\n    ${\n      Object.values(ontology.queryTypes).map(query =>\n        `export {${query.shortApiName}} from \"${\n          query.getImportPathRelTo(relOutDir)\n        }\";`\n      )\n        .join(\"\\n\")\n    }\n      ${Object.keys(ontology.queryTypes).length === 0 ? \"export {};\" : \"\"}\n    `),\n  );\n}\n\nasync function generateV2QueryFile(\n  fs: MinimalFs,\n  outDir: string,\n  relOutDir: string,\n  query: EnhancedQuery,\n  importExt: string,\n  ontology: EnhancedOntologyDefinition,\n  forInternalUse: boolean,\n  fixedVersionQueryTypes: string[],\n) {\n  const relFilePath = path.join(relOutDir, `${query.shortApiName}.ts`);\n  const objectTypes = getObjectTypeApiNamesFromQuery(query);\n  const interfaceTypes = getInterfaceTypeApiNamesFromQuery(query);\n  const interfaceAndObjectTypes = new Set(\n    [\n      ...objectTypes.map(o => ontology.requireObjectType(o)),\n      ...interfaceTypes.map(o => ontology.requireInterfaceType(o)),\n    ],\n  );\n\n  const importObjects = getObjectImports(\n    interfaceAndObjectTypes,\n    \"\",\n    relFilePath,\n    true,\n  );\n\n  const baseProps = deleteUndefineds(\n    wireQueryTypeV2ToSdkQueryDefinitionNoParams(query.raw),\n  );\n\n  const outputBase = deleteUndefineds(\n    wireQueryDataTypeToQueryDataTypeDefinition(query.output),\n  );\n\n  const isUsingFixedVersion = fixedVersionQueryTypes.includes(\n    query.fullApiName,\n  );\n\n  await fs.writeFile(\n    path.join(outDir, `${query.shortApiName}.ts`),\n    await formatTs(`\n        import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound} from \"${\n      forInternalUse ? \"@osdk/api\" : \"@osdk/client\"\n    }\";\n        import type { $ExpectedClientVersion } from \"../../OntologyMetadata${importExt}\";\n        import { $osdkMetadata} from \"../../OntologyMetadata${importExt}\";\n        ${importObjects}\n\n        export namespace ${query.shortApiName} {\n          export interface Signature {\n            ${getDescriptionIfPresent(query.description)}\n            (${\n      Object.keys(query.parameters).length > 0\n        ? `query: ${query.paramsIdentifier}`\n        : \"\"\n    }): Promise<${query.shortApiName}.ReturnType>\n          }\n\n        ${\n      Object.keys(query.parameters).length > 0\n        ? `\n            export interface Parameters {\n            ${\n          stringify(query.parameters, {\n            \"*\": (parameter, formatter, apiName) => {\n              const q = paramToDef(parameter);\n              return [\n                `\n                ${\n                  queryParamJsDoc(paramToDef(parameter), { apiName })\n                }readonly \"${apiName}\"${q.nullable ? \"?\" : \"\"}`,\n                getQueryParamType(ontology, q, \"Param\"),\n              ];\n            },\n          })\n        }\n            }`\n        : \"\"\n    }\n\n            ${\n      query.output.type === \"struct\"\n        ? `\n            export interface ReturnType \n            ${\n          getQueryParamType(\n            ontology,\n            paramToDef({ dataType: query.output }),\n            \"Result\",\n          )\n        }\n        `\n        : `\n        export type ReturnType = ${\n          getQueryParamType(\n            ontology,\n            paramToDef({ dataType: query.output }),\n            \"Result\",\n          )\n        }\n          `\n    }\n      }\n    \n            \n        export interface ${query.shortApiName} extends QueryDefinition<\n          ${query.shortApiName}.Signature\n        >, VersionBound<$ExpectedClientVersion>{\n         __DefinitionMetadata?: {\n             ${stringify(baseProps)}\n             isFixedVersion: ${isUsingFixedVersion};\n            parameters: {\n            ${parameterDefsForType(ontology, query)}\n            };\n            output: {\n            ${stringify(outputBase)},\n            ${getLineFor__OsdkTargetType(ontology, query.output)}\n            };\n            signature: ${query.shortApiName}.Signature;\n        }, \n        ${\n      stringify(baseProps, {\n        \"description\": () => undefined,\n        \"displayName\": () => undefined,\n        \"rid\": () => undefined,\n      })\n    }, \n          osdkMetadata: typeof $osdkMetadata;\n              }\n\n\n        export const ${query.shortApiName}: ${query.definitionIdentifier} = {\n            ${\n      stringify(baseProps, {\n        \"description\": () => undefined,\n        \"displayName\": () => undefined,\n        \"rid\": () => undefined,\n      })\n    },\n    isFixedVersion: ${isUsingFixedVersion},\n    osdkMetadata: $osdkMetadata\n        };\n        `),\n  );\n}\n\nfunction parameterDefsForType(\n  ontology: EnhancedOntologyDefinition,\n  query: EnhancedQuery,\n) {\n  return stringify(query.parameters, {\n    \"*\": (parameter, valueFormatter, apiName) => [\n      `${queryParamJsDoc(paramToDef(parameter), { apiName })} \"${apiName}\"`,\n      ` {\n          ${stringify(deleteUndefineds(paramToDef(parameter)))},\n          ${getLineFor__OsdkTargetType(ontology, parameter.dataType)}\n        }`,\n    ],\n  });\n}\n\nfunction getLineFor__OsdkTargetType(\n  ontology: EnhancedOntologyDefinition,\n  qdt: QueryDataType,\n) {\n  if (qdt.type === \"object\" || qdt.type === \"objectSet\") {\n    return `__OsdkTargetType?: ${\n      ontology.requireObjectType(\n        qdt.objectTypeApiName!,\n      ).getImportedDefinitionIdentifier(true)\n    }`;\n  }\n  return \"\";\n}\n\nexport function queryParamJsDoc(\n  param: QueryParameterDefinition<any>,\n  { apiName }: { apiName: string },\n): string {\n  let ret = `/**\\n`;\n\n  if (param.description) {\n    if (param.description) {\n      ret += ` *   description: ${param.description}\\n`;\n    }\n  } else {\n    ret += ` * (no ontology metadata)\\n`;\n  }\n\n  ret += ` */\\n`;\n  return ret;\n}\n\nexport function getQueryParamType(\n  enhancedOntology: EnhancedOntologyDefinition,\n  input: QueryParameterDefinition,\n  type: \"Param\" | \"Result\",\n  isMapKey = false,\n): string {\n  let paramType = `unknown /* ${input.type} */`;\n\n  switch (input.type) {\n    case \"array\":\n      paramType = `${type === \"Param\" ? \"Readonly\" : \"\"}Array<${\n        getQueryParamType(enhancedOntology, input.array, type)\n      }>`;\n      break;\n    case \"date\":\n      paramType = `Query${type}.PrimitiveType<${JSON.stringify(\"datetime\")}>`;\n      break;\n\n    case \"attachment\":\n    case \"boolean\":\n    case \"double\":\n    case \"float\":\n    case \"integer\":\n    case \"long\":\n    case \"string\":\n    case \"timestamp\":\n      paramType = `Query${type}.PrimitiveType<${JSON.stringify(input.type)}>`;\n      break;\n    case \"struct\":\n      paramType = `{\n            ${\n        stringify(input.struct, {\n          \"*\": (p, formatter, apiName) => {\n            return [\n              `\n                ${type === \"Param\" ? \"readonly \" : \"\"}\"${apiName}\"${\n                p.nullable ? \"?\" : \"\"\n              }`,\n              getQueryParamType(enhancedOntology, p, type),\n            ];\n          },\n        })\n      }\n            }`;\n      break;\n    case \"twoDimensionalAggregation\":\n      paramType = `Query${type}.TwoDimensionalAggregationType<${\n        input.twoDimensionalAggregation.keyType === \"range\"\n          ? `Query${type}.RangeKey<\"${input.twoDimensionalAggregation.keySubtype}\">`\n          : `\"${input.twoDimensionalAggregation.keyType}\"`\n      }, \"${input.twoDimensionalAggregation.valueType}\">`;\n      break;\n\n    case \"threeDimensionalAggregation\":\n      paramType = `Query${type}.ThreeDimensionalAggregationType<${\n        input.threeDimensionalAggregation.keyType === \"range\"\n          ? `Query${type}.RangeKey<\"${input.threeDimensionalAggregation.keySubtype}\">`\n          : `\"${input.threeDimensionalAggregation.keyType}\"`\n      },${\n        input.threeDimensionalAggregation.valueType.keyType === \"range\"\n          ? `Query${type}.RangeKey<\"${input.threeDimensionalAggregation.valueType.keySubtype}\">`\n          : `\"${input.threeDimensionalAggregation.valueType.keyType}\"`\n      }, \n        \"${input.threeDimensionalAggregation.valueType.valueType}\">`;\n      break;\n    case \"object\":\n      if (isMapKey) {\n        paramType = `ObjectSpecifier<${\n          enhancedOntology.requireObjectType(input.object)\n            .getImportedDefinitionIdentifier(true)\n        }>`;\n        break;\n      }\n      paramType = `Query${type}.ObjectType<${\n        enhancedOntology.requireObjectType(input.object)\n          .getImportedDefinitionIdentifier(true)\n      }>`;\n      break;\n    case \"interface\":\n      paramType = `Query${type}.InterfaceType<${\n        enhancedOntology.requireInterfaceType(input.interface)\n          .getImportedDefinitionIdentifier(true)\n      }>`;\n      break;\n\n    case \"objectSet\":\n      paramType = `Query${type}.ObjectSetType<${\n        enhancedOntology.requireObjectType(input.objectSet)\n          .getImportedDefinitionIdentifier(true)\n      }>`;\n      break;\n\n    case \"interfaceObjectSet\":\n      paramType = `Query${type}.ObjectSetType<${\n        enhancedOntology.requireInterfaceType(input.objectSet)\n          .getImportedDefinitionIdentifier(true)\n      }>`;\n      break;\n\n    case \"set\":\n      paramType = `${type === \"Param\" ? \"Readonly\" : \"\"}Set<${\n        getQueryParamType(enhancedOntology, input.set, type)\n      }>`;\n      break;\n\n    case \"union\":\n      paramType = input.union.map((u) =>\n        getQueryParamType(enhancedOntology, u, type)\n      ).join(\" | \");\n      break;\n\n    case \"map\":\n      paramType = `Partial<Record<${\n        getQueryParamType(enhancedOntology, input.keyType, type, true)\n      }, ${getQueryParamType(enhancedOntology, input.valueType, type)}>>`;\n  }\n\n  return paramType;\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/v2.0/generatePerQueryDataFiles.test.js

@@ -233,6 +233,25 @@ describe("generatePerQueryDataFiles", () => {
                     type: "string"
                   }
                 },
+                listField: {
+                  dataType: {
+                    type: "array",
+                    "subType": {
+                      "type": "float"
+                    }
+                  }
+                },
+                nestedListField: {
+                  dataType: {
+                    type: "array",
+                    "subType": {
+                      "type": "array",
+                      "subType": {
+                        "type": "float"
+                      }
+                    }
+                  }
+                },
                 paramStruct: {
                   dataType: {
                     type: "struct",
@@ -332,6 +351,16 @@ describe("generatePerQueryDataFiles", () => {
              */
             readonly foo: QueryParam.PrimitiveType<'string'>;
 
+            /**
+             * (no ontology metadata)
+             */
+            readonly listField: ReadonlyArray<QueryParam.PrimitiveType<'float'>>;
+
+            /**
+             * (no ontology metadata)
+             */
+            readonly nestedListField: ReadonlyArray<ReadonlyArray<QueryParam.PrimitiveType<'float'>>>;
+
             /**
              * (no ontology metadata)
              */
@@ -378,6 +407,35 @@ describe("generatePerQueryDataFiles", () => {
                 nullable: false;
                 type: 'string';
               };
+              /**
+               * (no ontology metadata)
+               */
+              listField: {
+                array: {
+                  type: 'float';
+                  nullable: false;
+                };
+                multiplicity: true;
+                nullable: false;
+                type: 'array';
+              };
+              /**
+               * (no ontology metadata)
+               */
+              nestedListField: {
+                array: {
+                  array: {
+                    type: 'float';
+                    nullable: false;
+                  };
+                  type: 'array';
+                  nullable: false;
+                  multiplicity: true;
+                };
+                multiplicity: true;
+                nullable: false;
+                type: 'array';
+              };
               /**
                * (no ontology metadata)
                */

package/build/browser/v2.0/generatePerQueryDataFiles.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatePerQueryDataFiles.test.js","names":["ts","describe","expect","it","enhanceOntology","createMockMinimalFiles","TodoWireOntology","generatePerQueryDataFilesV2","helper","fs","minimalFiles","ontology","sanitized","importExt","externalObjects","Map","externalInterfaces","externalSpts","outDir","forInternalUse","fixedVersionQueryTypes","getFiles","toMatchInlineSnapshot","writeFile","rootFileNames","Object","keys","console","log","files","forEach","fileName","version","servicesHost","getScriptFileNames","getScriptVersion","toString","getScriptSnapshot","undefined","ScriptSnapshot","fromString","getCurrentDirectory","getCompilationSettings","getDefaultLibFileName","options","getDefaultLibFilePath","fileExists","path","readFile","readDirectory","extensions","exclude","include","depth","sys","directoryExists","getDirectories","langServices","createLanguageService","q","getDocCommentTemplateAtPosition","createDocumentRegistry","actionTypes","interfaceTypes","objectTypes","apiName","description","displayName","rid","queryTypes","doThing","parameters","foo","dataType","type","paramStruct","fields","name","fieldType","output","sharedPropertyTypes","valueTypes"],"sources":["generatePerQueryDataFiles.test.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport * as ts from \"typescript\";\nimport { describe, expect, it } from \"vitest\";\nimport { enhanceOntology } from \"../GenerateContext/enhanceOntology.js\";\nimport { createMockMinimalFiles } from \"../util/test/createMockMinimalFiles.js\";\nimport { TodoWireOntology } from \"../util/test/TodoWireOntology.js\";\nimport { generatePerQueryDataFilesV2 } from \"./generatePerQueryDataFiles.js\";\n\ndescribe(\"generatePerQueryDataFiles\", () => {\n  it(\"is stable v2\", async () => {\n    const helper = createMockMinimalFiles();\n    const BASE_PATH = \"/foo\";\n\n    await generatePerQueryDataFilesV2(\n      {\n        fs: helper.minimalFiles,\n        ontology: enhanceOntology({\n          sanitized: TodoWireOntology,\n          importExt: \".js\",\n          externalObjects: new Map(),\n          externalInterfaces: new Map(),\n          externalSpts: new Map(),\n        }),\n        outDir: BASE_PATH,\n        importExt: \".js\",\n        forInternalUse: true,\n        fixedVersionQueryTypes: [],\n      },\n      true,\n    );\n\n    expect(helper.getFiles()).toMatchInlineSnapshot(`\n      {\n        \"/foo/ontology/queries.ts\": \"export { getCount } from './queries/getCount.js';\n      export { returnsTodo } from './queries/returnsTodo.js';\n      \",\n        \"/foo/ontology/queries/getCount.ts\": \"import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';\n      import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';\n      import { $osdkMetadata } from '../../OntologyMetadata.js';\n\n      export namespace getCount {\n        export interface Signature {\n          (query: getCount.Parameters): Promise<getCount.ReturnType>;\n        }\n\n        export interface Parameters {\n          /**\n           * (no ontology metadata)\n           */\n          readonly completed: QueryParam.PrimitiveType<'boolean'>;\n        }\n\n        export type ReturnType = QueryResult.PrimitiveType<'integer'>;\n      }\n\n      export interface getCount extends QueryDefinition<getCount.Signature>, VersionBound<$ExpectedClientVersion> {\n        __DefinitionMetadata?: {\n          apiName: 'getCount';\n          rid: 'rid.query.1';\n          type: 'query';\n          version: '1.1.0';\n          isFixedVersion: false;\n          parameters: {\n            /**\n             * (no ontology metadata)\n             */\n            completed: {\n              nullable: false;\n              type: 'boolean';\n            };\n          };\n          output: {\n            nullable: false;\n            type: 'integer';\n          };\n          signature: getCount.Signature;\n        };\n        apiName: 'getCount';\n        type: 'query';\n        version: '1.1.0';\n        osdkMetadata: typeof $osdkMetadata;\n      }\n\n      export const getCount: getCount = {\n        apiName: 'getCount',\n        type: 'query',\n        version: '1.1.0',\n        isFixedVersion: false,\n        osdkMetadata: $osdkMetadata,\n      };\n      \",\n        \"/foo/ontology/queries/returnsTodo.ts\": \"import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';\n      import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';\n      import { $osdkMetadata } from '../../OntologyMetadata.js';\n      import type { Todo } from '../objects/Todo.js';\n\n      export namespace returnsTodo {\n        export interface Signature {\n          (query: returnsTodo.Parameters): Promise<returnsTodo.ReturnType>;\n        }\n\n        export interface Parameters {\n          /**\n           *   description: Random desc so we test jsdoc\n           */\n          readonly someTodo: QueryParam.ObjectType<Todo>;\n        }\n\n        export type ReturnType = QueryResult.ObjectType<Todo>;\n      }\n\n      export interface returnsTodo extends QueryDefinition<returnsTodo.Signature>, VersionBound<$ExpectedClientVersion> {\n        __DefinitionMetadata?: {\n          apiName: 'returnsTodo';\n          rid: 'rid.query.2';\n          type: 'query';\n          version: '3.2.0';\n          isFixedVersion: false;\n          parameters: {\n            /**\n             *   description: Random desc so we test jsdoc\n             */\n            someTodo: {\n              description: 'Random desc so we test jsdoc';\n              nullable: false;\n              object: 'Todo';\n              type: 'object';\n              __OsdkTargetType?: Todo;\n            };\n          };\n          output: {\n            nullable: false;\n            object: 'Todo';\n            type: 'object';\n            __OsdkTargetType?: Todo;\n          };\n          signature: returnsTodo.Signature;\n        };\n        apiName: 'returnsTodo';\n        type: 'query';\n        version: '3.2.0';\n        osdkMetadata: typeof $osdkMetadata;\n      }\n\n      export const returnsTodo: returnsTodo = {\n        apiName: 'returnsTodo',\n        type: 'query',\n        version: '3.2.0',\n        isFixedVersion: false,\n        osdkMetadata: $osdkMetadata,\n      };\n      \",\n      }\n    `);\n\n    await helper.minimalFiles.writeFile(\n      \"/bar/test.ts\",\n      `\n      import {returnsTodo} from \"/foo/ontology/queries/returnsTodo.ts\";\n\n      returnsTodo({someTodo:/*marker*/})\n    `,\n    );\n\n    const rootFileNames = Object.keys(helper.getFiles());\n    console.log(rootFileNames);\n\n    const files: ts.MapLike<{ version: number }> = {};\n\n    // initialize the list of files\n    rootFileNames.forEach(fileName => {\n      files[fileName] = { version: 0 };\n    });\n\n    const servicesHost: ts.LanguageServiceHost = {\n      getScriptFileNames: () => Object.keys(helper.getFiles()),\n      getScriptVersion: fileName =>\n        files[fileName] && files[fileName].version.toString(),\n      getScriptSnapshot: fileName => {\n        if (!helper.getFiles()[fileName]) {\n          return undefined;\n        }\n\n        return ts.ScriptSnapshot.fromString(\n          helper.getFiles()[fileName],\n        );\n      },\n      getCurrentDirectory: () => \"/bar\",\n      getCompilationSettings: () => ({}),\n      getDefaultLibFileName: options => ts.getDefaultLibFilePath(options),\n      fileExists: (path: string) => {\n        console.log(path);\n        return helper.getFiles()[path] !== undefined;\n      },\n      readFile: (path: string) => {\n        console.log(\"readFile: \", path);\n        return helper.getFiles()[path];\n      },\n      readDirectory: (path, extensions, exclude, include, depth) => {\n        console.log(\"readDirectory\", path);\n        return ts.sys.readDirectory(path, extensions, exclude, include, depth);\n      },\n      directoryExists: ts.sys.directoryExists,\n      getDirectories: ts.sys.getDirectories,\n    };\n\n    const langServices = ts.createLanguageService(servicesHost);\n\n    const q = langServices.getDocCommentTemplateAtPosition(\"/bar/test.ts\", 1);\n    console.log(q);\n    ts.createDocumentRegistry();\n  });\n\n  it(\"generates structs for queries\", async () => {\n    const helper = createMockMinimalFiles();\n    const BASE_PATH = \"/foo\";\n\n    await generatePerQueryDataFilesV2(\n      {\n        fs: helper.minimalFiles,\n        ontology: enhanceOntology({\n          sanitized: {\n            actionTypes: {},\n            interfaceTypes: {},\n            objectTypes: {},\n            ontology: {\n              apiName: \"foo\",\n              description: \"foo\",\n              displayName: \"foo\",\n              rid: \"ri.foo\",\n            },\n            queryTypes: {\n              doThing: {\n                rid: \"rid.query.1\",\n                version: \"0\",\n                apiName: \"doThing\",\n                parameters: {\n                  foo: {\n                    dataType: { type: \"string\" },\n                  },\n                  paramStruct: {\n                    dataType: {\n                      type: \"struct\",\n                      fields: [\n                        {\n                          name: \"aDate\",\n                          fieldType: { type: \"date\" },\n                        },\n                        {\n                          name: \"nestedStruct\",\n                          fieldType: {\n                            type: \"struct\",\n                            fields: [\n                              {\n                                name: \"nestedString\",\n                                fieldType: { type: \"string\" },\n                              },\n                              {\n                                name: \"nestedInteger\",\n                                fieldType: { type: \"integer\" },\n                              },\n                            ],\n                          },\n                        },\n                      ],\n                    },\n                  },\n                },\n                output: {\n                  type: \"struct\",\n                  fields: [\n                    {\n                      name: \"aString\",\n                      fieldType: { type: \"string\" },\n                    },\n                    {\n                      name: \"anInteger\",\n                      fieldType: { type: \"integer\" },\n                    },\n                    {\n                      name: \"aLong\",\n                      fieldType: { type: \"long\" },\n                    },\n                    {\n                      name: \"aDate\",\n                      fieldType: { type: \"date\" },\n                    },\n                    {\n                      name: \"nestedStruct\",\n                      fieldType: {\n                        type: \"struct\",\n                        fields: [\n                          {\n                            name: \"nestedString\",\n                            fieldType: { type: \"string\" },\n                          },\n                          {\n                            name: \"nestedInteger\",\n                            fieldType: { type: \"integer\" },\n                          },\n                        ],\n                      },\n                    },\n                  ],\n                },\n              },\n            },\n            sharedPropertyTypes: {},\n            valueTypes: {},\n          },\n          importExt: \".js\",\n          externalObjects: new Map(),\n          externalInterfaces: new Map(),\n          externalSpts: new Map(),\n        }),\n        outDir: BASE_PATH,\n        importExt: \".js\",\n        forInternalUse: true,\n        fixedVersionQueryTypes: [],\n      },\n      true,\n    );\n    expect(helper.getFiles()[\"/foo/ontology/queries/doThing.ts\"])\n      .toMatchInlineSnapshot(`\n        \"import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';\n        import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';\n        import { $osdkMetadata } from '../../OntologyMetadata.js';\n\n        export namespace doThing {\n          export interface Signature {\n            (query: doThing.Parameters): Promise<doThing.ReturnType>;\n          }\n\n          export interface Parameters {\n            /**\n             * (no ontology metadata)\n             */\n            readonly foo: QueryParam.PrimitiveType<'string'>;\n\n            /**\n             * (no ontology metadata)\n             */\n            readonly paramStruct: {\n              readonly aDate: QueryParam.PrimitiveType<'datetime'>;\n\n              readonly nestedStruct: {\n                readonly nestedInteger: QueryParam.PrimitiveType<'integer'>;\n\n                readonly nestedString: QueryParam.PrimitiveType<'string'>;\n              };\n            };\n          }\n\n          export interface ReturnType {\n            aDate: QueryResult.PrimitiveType<'datetime'>;\n\n            aLong: QueryResult.PrimitiveType<'long'>;\n\n            anInteger: QueryResult.PrimitiveType<'integer'>;\n\n            aString: QueryResult.PrimitiveType<'string'>;\n\n            nestedStruct: {\n              nestedInteger: QueryResult.PrimitiveType<'integer'>;\n\n              nestedString: QueryResult.PrimitiveType<'string'>;\n            };\n          }\n        }\n\n        export interface doThing extends QueryDefinition<doThing.Signature>, VersionBound<$ExpectedClientVersion> {\n          __DefinitionMetadata?: {\n            apiName: 'doThing';\n            rid: 'rid.query.1';\n            type: 'query';\n            version: '0';\n            isFixedVersion: false;\n            parameters: {\n              /**\n               * (no ontology metadata)\n               */\n              foo: {\n                nullable: false;\n                type: 'string';\n              };\n              /**\n               * (no ontology metadata)\n               */\n              paramStruct: {\n                nullable: false;\n                struct: {\n                  aDate: {\n                    type: 'date';\n                    nullable: false;\n                  };\n                  nestedStruct: {\n                    type: 'struct';\n                    struct: {\n                      nestedString: {\n                        type: 'string';\n                        nullable: false;\n                      };\n                      nestedInteger: {\n                        type: 'integer';\n                        nullable: false;\n                      };\n                    };\n                    nullable: false;\n                  };\n                };\n                type: 'struct';\n              };\n            };\n            output: {\n              nullable: false;\n              struct: {\n                aString: {\n                  type: 'string';\n                  nullable: false;\n                };\n                anInteger: {\n                  type: 'integer';\n                  nullable: false;\n                };\n                aLong: {\n                  type: 'long';\n                  nullable: false;\n                };\n                aDate: {\n                  type: 'date';\n                  nullable: false;\n                };\n                nestedStruct: {\n                  type: 'struct';\n                  struct: {\n                    nestedString: {\n                      type: 'string';\n                      nullable: false;\n                    };\n                    nestedInteger: {\n                      type: 'integer';\n                      nullable: false;\n                    };\n                  };\n                  nullable: false;\n                };\n              };\n              type: 'struct';\n            };\n            signature: doThing.Signature;\n          };\n          apiName: 'doThing';\n          type: 'query';\n          version: '0';\n          osdkMetadata: typeof $osdkMetadata;\n        }\n\n        export const doThing: doThing = {\n          apiName: 'doThing',\n          type: 'query',\n          version: '0',\n          isFixedVersion: false,\n          osdkMetadata: $osdkMetadata,\n        };\n        \"\n      `);\n  });\n});\n"],"mappings":"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BAAEJ,IAAI,EAAE;sBAAU;oBAC/B,CAAC;kBAEL;gBACF,CAAC;cAEL;YACF;UACF,CAAC;UACDM,mBAAmB,EAAE,CAAC,CAAC;UACvBC,UAAU,EAAE,CAAC;QACf,CAAC;QACDpE,SAAS,EAAE,KAAK;QAChBC,eAAe,EAAE,IAAIC,GAAG,CAAC,CAAC;QAC1BC,kBAAkB,EAAE,IAAID,GAAG,CAAC,CAAC;QAC7BE,YAAY,EAAE,IAAIF,GAAG,CAAC;MACxB,CAAC,CAAC;MACFG,MAAM,EApGQ,MAoGG;MACjBL,SAAS,EAAE,KAAK;MAChBM,cAAc,EAAE,IAAI;MACpBC,sBAAsB,EAAE;IAC1B,CAAC,EACD,IACF,CAAC;IACDlB,MAAM,CAACM,MAAM,CAACa,QAAQ,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAC1DC,qBAAqB,CAAC;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,CAAC;EACN,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"generatePerQueryDataFiles.test.js","names":["ts","describe","expect","it","enhanceOntology","createMockMinimalFiles","TodoWireOntology","generatePerQueryDataFilesV2","helper","fs","minimalFiles","ontology","sanitized","importExt","externalObjects","Map","externalInterfaces","externalSpts","outDir","forInternalUse","fixedVersionQueryTypes","getFiles","toMatchInlineSnapshot","writeFile","rootFileNames","Object","keys","console","log","files","forEach","fileName","version","servicesHost","getScriptFileNames","getScriptVersion","toString","getScriptSnapshot","undefined","ScriptSnapshot","fromString","getCurrentDirectory","getCompilationSettings","getDefaultLibFileName","options","getDefaultLibFilePath","fileExists","path","readFile","readDirectory","extensions","exclude","include","depth","sys","directoryExists","getDirectories","langServices","createLanguageService","q","getDocCommentTemplateAtPosition","createDocumentRegistry","actionTypes","interfaceTypes","objectTypes","apiName","description","displayName","rid","queryTypes","doThing","parameters","foo","dataType","type","listField","nestedListField","paramStruct","fields","name","fieldType","output","sharedPropertyTypes","valueTypes"],"sources":["generatePerQueryDataFiles.test.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport * as ts from \"typescript\";\nimport { describe, expect, it } from \"vitest\";\nimport { enhanceOntology } from \"../GenerateContext/enhanceOntology.js\";\nimport { createMockMinimalFiles } from \"../util/test/createMockMinimalFiles.js\";\nimport { TodoWireOntology } from \"../util/test/TodoWireOntology.js\";\nimport { generatePerQueryDataFilesV2 } from \"./generatePerQueryDataFiles.js\";\n\ndescribe(\"generatePerQueryDataFiles\", () => {\n  it(\"is stable v2\", async () => {\n    const helper = createMockMinimalFiles();\n    const BASE_PATH = \"/foo\";\n\n    await generatePerQueryDataFilesV2(\n      {\n        fs: helper.minimalFiles,\n        ontology: enhanceOntology({\n          sanitized: TodoWireOntology,\n          importExt: \".js\",\n          externalObjects: new Map(),\n          externalInterfaces: new Map(),\n          externalSpts: new Map(),\n        }),\n        outDir: BASE_PATH,\n        importExt: \".js\",\n        forInternalUse: true,\n        fixedVersionQueryTypes: [],\n      },\n      true,\n    );\n\n    expect(helper.getFiles()).toMatchInlineSnapshot(`\n      {\n        \"/foo/ontology/queries.ts\": \"export { getCount } from './queries/getCount.js';\n      export { returnsTodo } from './queries/returnsTodo.js';\n      \",\n        \"/foo/ontology/queries/getCount.ts\": \"import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';\n      import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';\n      import { $osdkMetadata } from '../../OntologyMetadata.js';\n\n      export namespace getCount {\n        export interface Signature {\n          (query: getCount.Parameters): Promise<getCount.ReturnType>;\n        }\n\n        export interface Parameters {\n          /**\n           * (no ontology metadata)\n           */\n          readonly completed: QueryParam.PrimitiveType<'boolean'>;\n        }\n\n        export type ReturnType = QueryResult.PrimitiveType<'integer'>;\n      }\n\n      export interface getCount extends QueryDefinition<getCount.Signature>, VersionBound<$ExpectedClientVersion> {\n        __DefinitionMetadata?: {\n          apiName: 'getCount';\n          rid: 'rid.query.1';\n          type: 'query';\n          version: '1.1.0';\n          isFixedVersion: false;\n          parameters: {\n            /**\n             * (no ontology metadata)\n             */\n            completed: {\n              nullable: false;\n              type: 'boolean';\n            };\n          };\n          output: {\n            nullable: false;\n            type: 'integer';\n          };\n          signature: getCount.Signature;\n        };\n        apiName: 'getCount';\n        type: 'query';\n        version: '1.1.0';\n        osdkMetadata: typeof $osdkMetadata;\n      }\n\n      export const getCount: getCount = {\n        apiName: 'getCount',\n        type: 'query',\n        version: '1.1.0',\n        isFixedVersion: false,\n        osdkMetadata: $osdkMetadata,\n      };\n      \",\n        \"/foo/ontology/queries/returnsTodo.ts\": \"import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';\n      import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';\n      import { $osdkMetadata } from '../../OntologyMetadata.js';\n      import type { Todo } from '../objects/Todo.js';\n\n      export namespace returnsTodo {\n        export interface Signature {\n          (query: returnsTodo.Parameters): Promise<returnsTodo.ReturnType>;\n        }\n\n        export interface Parameters {\n          /**\n           *   description: Random desc so we test jsdoc\n           */\n          readonly someTodo: QueryParam.ObjectType<Todo>;\n        }\n\n        export type ReturnType = QueryResult.ObjectType<Todo>;\n      }\n\n      export interface returnsTodo extends QueryDefinition<returnsTodo.Signature>, VersionBound<$ExpectedClientVersion> {\n        __DefinitionMetadata?: {\n          apiName: 'returnsTodo';\n          rid: 'rid.query.2';\n          type: 'query';\n          version: '3.2.0';\n          isFixedVersion: false;\n          parameters: {\n            /**\n             *   description: Random desc so we test jsdoc\n             */\n            someTodo: {\n              description: 'Random desc so we test jsdoc';\n              nullable: false;\n              object: 'Todo';\n              type: 'object';\n              __OsdkTargetType?: Todo;\n            };\n          };\n          output: {\n            nullable: false;\n            object: 'Todo';\n            type: 'object';\n            __OsdkTargetType?: Todo;\n          };\n          signature: returnsTodo.Signature;\n        };\n        apiName: 'returnsTodo';\n        type: 'query';\n        version: '3.2.0';\n        osdkMetadata: typeof $osdkMetadata;\n      }\n\n      export const returnsTodo: returnsTodo = {\n        apiName: 'returnsTodo',\n        type: 'query',\n        version: '3.2.0',\n        isFixedVersion: false,\n        osdkMetadata: $osdkMetadata,\n      };\n      \",\n      }\n    `);\n\n    await helper.minimalFiles.writeFile(\n      \"/bar/test.ts\",\n      `\n      import {returnsTodo} from \"/foo/ontology/queries/returnsTodo.ts\";\n\n      returnsTodo({someTodo:/*marker*/})\n    `,\n    );\n\n    const rootFileNames = Object.keys(helper.getFiles());\n    console.log(rootFileNames);\n\n    const files: ts.MapLike<{ version: number }> = {};\n\n    // initialize the list of files\n    rootFileNames.forEach(fileName => {\n      files[fileName] = { version: 0 };\n    });\n\n    const servicesHost: ts.LanguageServiceHost = {\n      getScriptFileNames: () => Object.keys(helper.getFiles()),\n      getScriptVersion: fileName =>\n        files[fileName] && files[fileName].version.toString(),\n      getScriptSnapshot: fileName => {\n        if (!helper.getFiles()[fileName]) {\n          return undefined;\n        }\n\n        return ts.ScriptSnapshot.fromString(\n          helper.getFiles()[fileName],\n        );\n      },\n      getCurrentDirectory: () => \"/bar\",\n      getCompilationSettings: () => ({}),\n      getDefaultLibFileName: options => ts.getDefaultLibFilePath(options),\n      fileExists: (path: string) => {\n        console.log(path);\n        return helper.getFiles()[path] !== undefined;\n      },\n      readFile: (path: string) => {\n        console.log(\"readFile: \", path);\n        return helper.getFiles()[path];\n      },\n      readDirectory: (path, extensions, exclude, include, depth) => {\n        console.log(\"readDirectory\", path);\n        return ts.sys.readDirectory(path, extensions, exclude, include, depth);\n      },\n      directoryExists: ts.sys.directoryExists,\n      getDirectories: ts.sys.getDirectories,\n    };\n\n    const langServices = ts.createLanguageService(servicesHost);\n\n    const q = langServices.getDocCommentTemplateAtPosition(\"/bar/test.ts\", 1);\n    console.log(q);\n    ts.createDocumentRegistry();\n  });\n\n  it(\"generates structs for queries\", async () => {\n    const helper = createMockMinimalFiles();\n    const BASE_PATH = \"/foo\";\n\n    await generatePerQueryDataFilesV2(\n      {\n        fs: helper.minimalFiles,\n        ontology: enhanceOntology({\n          sanitized: {\n            actionTypes: {},\n            interfaceTypes: {},\n            objectTypes: {},\n            ontology: {\n              apiName: \"foo\",\n              description: \"foo\",\n              displayName: \"foo\",\n              rid: \"ri.foo\",\n            },\n            queryTypes: {\n              doThing: {\n                rid: \"rid.query.1\",\n                version: \"0\",\n                apiName: \"doThing\",\n                parameters: {\n                  foo: {\n                    dataType: { type: \"string\" },\n                  },\n                  listField: {\n                    dataType: { type: \"array\", \"subType\": { \"type\": \"float\" } },\n                  },\n                  nestedListField: {\n                    dataType: {\n                      type: \"array\",\n                      \"subType\": {\n                        \"type\": \"array\",\n                        \"subType\": { \"type\": \"float\" },\n                      },\n                    },\n                  },\n                  paramStruct: {\n                    dataType: {\n                      type: \"struct\",\n                      fields: [\n                        {\n                          name: \"aDate\",\n                          fieldType: { type: \"date\" },\n                        },\n                        {\n                          name: \"nestedStruct\",\n                          fieldType: {\n                            type: \"struct\",\n                            fields: [\n                              {\n                                name: \"nestedString\",\n                                fieldType: { type: \"string\" },\n                              },\n                              {\n                                name: \"nestedInteger\",\n                                fieldType: { type: \"integer\" },\n                              },\n                            ],\n                          },\n                        },\n                      ],\n                    },\n                  },\n                },\n                output: {\n                  type: \"struct\",\n                  fields: [\n                    {\n                      name: \"aString\",\n                      fieldType: { type: \"string\" },\n                    },\n                    {\n                      name: \"anInteger\",\n                      fieldType: { type: \"integer\" },\n                    },\n                    {\n                      name: \"aLong\",\n                      fieldType: { type: \"long\" },\n                    },\n                    {\n                      name: \"aDate\",\n                      fieldType: { type: \"date\" },\n                    },\n                    {\n                      name: \"nestedStruct\",\n                      fieldType: {\n                        type: \"struct\",\n                        fields: [\n                          {\n                            name: \"nestedString\",\n                            fieldType: { type: \"string\" },\n                          },\n                          {\n                            name: \"nestedInteger\",\n                            fieldType: { type: \"integer\" },\n                          },\n                        ],\n                      },\n                    },\n                  ],\n                },\n              },\n            },\n            sharedPropertyTypes: {},\n            valueTypes: {},\n          },\n          importExt: \".js\",\n          externalObjects: new Map(),\n          externalInterfaces: new Map(),\n          externalSpts: new Map(),\n        }),\n        outDir: BASE_PATH,\n        importExt: \".js\",\n        forInternalUse: true,\n        fixedVersionQueryTypes: [],\n      },\n      true,\n    );\n    expect(helper.getFiles()[\"/foo/ontology/queries/doThing.ts\"])\n      .toMatchInlineSnapshot(`\n        \"import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';\n        import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';\n        import { $osdkMetadata } from '../../OntologyMetadata.js';\n\n        export namespace doThing {\n          export interface Signature {\n            (query: doThing.Parameters): Promise<doThing.ReturnType>;\n          }\n\n          export interface Parameters {\n            /**\n             * (no ontology metadata)\n             */\n            readonly foo: QueryParam.PrimitiveType<'string'>;\n\n            /**\n             * (no ontology metadata)\n             */\n            readonly listField: ReadonlyArray<QueryParam.PrimitiveType<'float'>>;\n\n            /**\n             * (no ontology metadata)\n             */\n            readonly nestedListField: ReadonlyArray<ReadonlyArray<QueryParam.PrimitiveType<'float'>>>;\n\n            /**\n             * (no ontology metadata)\n             */\n            readonly paramStruct: {\n              readonly aDate: QueryParam.PrimitiveType<'datetime'>;\n\n              readonly nestedStruct: {\n                readonly nestedInteger: QueryParam.PrimitiveType<'integer'>;\n\n                readonly nestedString: QueryParam.PrimitiveType<'string'>;\n              };\n            };\n          }\n\n          export interface ReturnType {\n            aDate: QueryResult.PrimitiveType<'datetime'>;\n\n            aLong: QueryResult.PrimitiveType<'long'>;\n\n            anInteger: QueryResult.PrimitiveType<'integer'>;\n\n            aString: QueryResult.PrimitiveType<'string'>;\n\n            nestedStruct: {\n              nestedInteger: QueryResult.PrimitiveType<'integer'>;\n\n              nestedString: QueryResult.PrimitiveType<'string'>;\n            };\n          }\n        }\n\n        export interface doThing extends QueryDefinition<doThing.Signature>, VersionBound<$ExpectedClientVersion> {\n          __DefinitionMetadata?: {\n            apiName: 'doThing';\n            rid: 'rid.query.1';\n            type: 'query';\n            version: '0';\n            isFixedVersion: false;\n            parameters: {\n              /**\n               * (no ontology metadata)\n               */\n              foo: {\n                nullable: false;\n                type: 'string';\n              };\n              /**\n               * (no ontology metadata)\n               */\n              listField: {\n                array: {\n                  type: 'float';\n                  nullable: false;\n                };\n                multiplicity: true;\n                nullable: false;\n                type: 'array';\n              };\n              /**\n               * (no ontology metadata)\n               */\n              nestedListField: {\n                array: {\n                  array: {\n                    type: 'float';\n                    nullable: false;\n                  };\n                  type: 'array';\n                  nullable: false;\n                  multiplicity: true;\n                };\n                multiplicity: true;\n                nullable: false;\n                type: 'array';\n              };\n              /**\n               * (no ontology metadata)\n               */\n              paramStruct: {\n                nullable: false;\n                struct: {\n                  aDate: {\n                    type: 'date';\n                    nullable: false;\n                  };\n                  nestedStruct: {\n                    type: 'struct';\n                    struct: {\n                      nestedString: {\n                        type: 'string';\n                        nullable: false;\n                      };\n                      nestedInteger: {\n                        type: 'integer';\n                        nullable: false;\n                      };\n                    };\n                    nullable: false;\n                  };\n                };\n                type: 'struct';\n              };\n            };\n            output: {\n              nullable: false;\n              struct: {\n                aString: {\n                  type: 'string';\n                  nullable: false;\n                };\n                anInteger: {\n                  type: 'integer';\n                  nullable: false;\n                };\n                aLong: {\n                  type: 'long';\n                  nullable: false;\n                };\n                aDate: {\n                  type: 'date';\n                  nullable: false;\n                };\n                nestedStruct: {\n                  type: 'struct';\n                  struct: {\n                    nestedString: {\n                      type: 'string';\n                      nullable: false;\n                    };\n                    nestedInteger: {\n                      type: 'integer';\n                      nullable: false;\n                    };\n                  };\n                  nullable: false;\n                };\n              };\n              type: 'struct';\n            };\n            signature: doThing.Signature;\n          };\n          apiName: 'doThing';\n          type: 'query';\n          version: '0';\n          osdkMetadata: typeof $osdkMetadata;\n        }\n\n        export const doThing: doThing = {\n          apiName: 'doThing',\n          type: 'query',\n          version: '0',\n          isFixedVersion: false,\n          osdkMetadata: $osdkMetadata,\n        };\n        \"\n      `);\n  });\n});\n"],"mappings":"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OAAO;kBACbC,SAAS,EAAE;oBAAEN,IAAI,EAAE;kBAAO;gBAC5B,CAAC,EACD;kBACEK,IAAI,EAAE,cAAc;kBACpBC,SAAS,EAAE;oBACTN,IAAI,EAAE,QAAQ;oBACdI,MAAM,EAAE,CACN;sBACEC,IAAI,EAAE,cAAc;sBACpBC,SAAS,EAAE;wBAAEN,IAAI,EAAE;sBAAS;oBAC9B,CAAC,EACD;sBACEK,IAAI,EAAE,eAAe;sBACrBC,SAAS,EAAE;wBAAEN,IAAI,EAAE;sBAAU;oBAC/B,CAAC;kBAEL;gBACF,CAAC;cAEL;YACF;UACF,CAAC;UACDQ,mBAAmB,EAAE,CAAC,CAAC;UACvBC,UAAU,EAAE,CAAC;QACf,CAAC;QACDtE,SAAS,EAAE,KAAK;QAChBC,eAAe,EAAE,IAAIC,GAAG,CAAC,CAAC;QAC1BC,kBAAkB,EAAE,IAAID,GAAG,CAAC,CAAC;QAC7BE,YAAY,EAAE,IAAIF,GAAG,CAAC;MACxB,CAAC,CAAC;MACFG,MAAM,EAhHQ,MAgHG;MACjBL,SAAS,EAAE,KAAK;MAChBM,cAAc,EAAE,IAAI;MACpBC,sBAAsB,EAAE;IAC1B,CAAC,EACD,IACF,CAAC;IACDlB,MAAM,CAACM,MAAM,CAACa,QAAQ,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAC1DC,qBAAqB,CAAC;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,CAAC;EACN,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}

package/build/cjs/index.cjs

@@ -287,7 +287,7 @@ function formatTs(contents) {
 }
 
 // src/v2.0/generateMetadata.ts
-var ExpectedOsdkVersion = "2.5.0";
+var ExpectedOsdkVersion = "2.5.1";
 async function generateOntologyMetadataFile({
   fs: fs2,
   outDir,
@@ -1319,10 +1319,13 @@ function queryParamJsDoc(param, {
   return ret;
 }
 function getQueryParamType(enhancedOntology, input, type, isMapKey = false) {
-  let inner = `unknown /* ${input.type} */`;
+  let paramType = `unknown /* ${input.type} */`;
   switch (input.type) {
+    case "array":
+      paramType = `${type === "Param" ? "Readonly" : ""}Array<${getQueryParamType(enhancedOntology, input.array, type)}>`;
+      break;
     case "date":
-      inner = `Query${type}.PrimitiveType<${JSON.stringify("datetime")}>`;
+      paramType = `Query${type}.PrimitiveType<${JSON.stringify("datetime")}>`;
       break;
     case "attachment":
     case "boolean":
@@ -1332,10 +1335,10 @@ function getQueryParamType(enhancedOntology, input, type, isMapKey = false) {
     case "long":
     case "string":
     case "timestamp":
-      inner = `Query${type}.PrimitiveType<${JSON.stringify(input.type)}>`;
+      paramType = `Query${type}.PrimitiveType<${JSON.stringify(input.type)}>`;
       break;
     case "struct":
-      inner = `{
+      paramType = `{
             ${stringify(input.struct, {
         "*": (p, formatter, apiName) => {
           return [`
@@ -1345,43 +1348,38 @@ function getQueryParamType(enhancedOntology, input, type, isMapKey = false) {
             }`;
       break;
     case "twoDimensionalAggregation":
-      inner = `Query${type}.TwoDimensionalAggregationType<${input.twoDimensionalAggregation.keyType === "range" ? `Query${type}.RangeKey<"${input.twoDimensionalAggregation.keySubtype}">` : `"${input.twoDimensionalAggregation.keyType}"`}, "${input.twoDimensionalAggregation.valueType}">`;
+      paramType = `Query${type}.TwoDimensionalAggregationType<${input.twoDimensionalAggregation.keyType === "range" ? `Query${type}.RangeKey<"${input.twoDimensionalAggregation.keySubtype}">` : `"${input.twoDimensionalAggregation.keyType}"`}, "${input.twoDimensionalAggregation.valueType}">`;
       break;
     case "threeDimensionalAggregation":
-      inner = `Query${type}.ThreeDimensionalAggregationType<${input.threeDimensionalAggregation.keyType === "range" ? `Query${type}.RangeKey<"${input.threeDimensionalAggregation.keySubtype}">` : `"${input.threeDimensionalAggregation.keyType}"`},${input.threeDimensionalAggregation.valueType.keyType === "range" ? `Query${type}.RangeKey<"${input.threeDimensionalAggregation.valueType.keySubtype}">` : `"${input.threeDimensionalAggregation.valueType.keyType}"`}, 
+      paramType = `Query${type}.ThreeDimensionalAggregationType<${input.threeDimensionalAggregation.keyType === "range" ? `Query${type}.RangeKey<"${input.threeDimensionalAggregation.keySubtype}">` : `"${input.threeDimensionalAggregation.keyType}"`},${input.threeDimensionalAggregation.valueType.keyType === "range" ? `Query${type}.RangeKey<"${input.threeDimensionalAggregation.valueType.keySubtype}">` : `"${input.threeDimensionalAggregation.valueType.keyType}"`}, 
         "${input.threeDimensionalAggregation.valueType.valueType}">`;
       break;
     case "object":
       if (isMapKey) {
-        inner = `ObjectSpecifier<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
+        paramType = `ObjectSpecifier<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
         break;
       }
-      inner = `Query${type}.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
+      paramType = `Query${type}.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "interface":
-      inner = `Query${type}.InterfaceType<${enhancedOntology.requireInterfaceType(input.interface).getImportedDefinitionIdentifier(true)}>`;
+      paramType = `Query${type}.InterfaceType<${enhancedOntology.requireInterfaceType(input.interface).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "objectSet":
-      inner = `Query${type}.ObjectSetType<${enhancedOntology.requireObjectType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
+      paramType = `Query${type}.ObjectSetType<${enhancedOntology.requireObjectType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "interfaceObjectSet":
-      inner = `Query${type}.ObjectSetType<${enhancedOntology.requireInterfaceType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
+      paramType = `Query${type}.ObjectSetType<${enhancedOntology.requireInterfaceType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "set":
-      inner = `${type === "Param" ? "Readonly" : ""}Set<${getQueryParamType(enhancedOntology, input.set, type)}>`;
+      paramType = `${type === "Param" ? "Readonly" : ""}Set<${getQueryParamType(enhancedOntology, input.set, type)}>`;
       break;
     case "union":
-      inner = input.union.map((u) => getQueryParamType(enhancedOntology, u, type)).join(" | ");
+      paramType = input.union.map((u) => getQueryParamType(enhancedOntology, u, type)).join(" | ");
       break;
     case "map":
-      inner = `Partial<Record<${getQueryParamType(enhancedOntology, input.keyType, type, true)}, ${getQueryParamType(enhancedOntology, input.valueType, type)}>>`;
-  }
-  if (input.multiplicity && type === "Param") {
-    return `ReadonlyArray<${inner}>`;
-  } else if (input.multiplicity) {
-    return `Array<${inner}>`;
+      paramType = `Partial<Record<${getQueryParamType(enhancedOntology, input.keyType, type, true)}, ${getQueryParamType(enhancedOntology, input.valueType, type)}>>`;
   }
-  return inner;
+  return paramType;
 }
 async function generateRootIndexTsFile({
   fs: fs2,