@osdk/generator 2.0.0-beta.13 → 2.0.0-beta.14

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2023 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as path from "node:path";
+import { describe, expect, it } from "vitest";
+import { enhanceOntology } from "../GenerateContext/enhanceOntology.js";
+import { createMockMinimalFiles } from "../util/test/createMockMinimalFiles.js";
+import { TodoWireOntology } from "../util/test/TodoWireOntology.js";
+import { generatePerActionDataFiles } from "./generatePerActionDataFiles.js";
+describe(generatePerActionDataFiles, () => {
+  it("guards against empty actions", async () => {
+    const helper = createMockMinimalFiles();
+    const BASE_PATH = "/foo";
+    const sanitizedOntology = {
+      ...TodoWireOntology,
+      actionTypes: {}
+    };
+    await generatePerActionDataFiles({
+      sanitizedOntology,
+      fs: helper.minimalFiles,
+      outDir: BASE_PATH,
+      ontology: enhanceOntology(sanitizedOntology, undefined, new Map(), "")
+    });
+    expect(helper.getFiles()[`${BASE_PATH}/ontology/actions.ts`]).toEqual("export {};\n");
+  });
+  it("imports object types correctly with array params in actions", async () => {
+    const helper = createMockMinimalFiles();
+    const BASE_PATH = "/foo/ontology/actions";
+    const sanitizedOntology = TodoWireOntology;
+    await generatePerActionDataFiles({
+      sanitizedOntology,
+      fs: helper.minimalFiles,
+      outDir: path.join(BASE_PATH, "..", ".."),
+      ontology: enhanceOntology(sanitizedOntology, undefined, new Map(), "")
+    });
+    expect(helper.getFiles()[`${BASE_PATH}/deleteTodos.ts`]).toContain("import type { Todo } from '../objects/Todo';\n");
+  });
+});
+//# sourceMappingURL=generatePerActionDataFiles.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generatePerActionDataFiles.test.js","names":["path","describe","expect","it","enhanceOntology","createMockMinimalFiles","TodoWireOntology","generatePerActionDataFiles","helper","BASE_PATH","sanitizedOntology","actionTypes","fs","minimalFiles","outDir","ontology","undefined","Map","getFiles","toEqual","join","toContain"],"sources":["generatePerActionDataFiles.test.js"],"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 */\nimport * as path from \"node:path\";\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 { generatePerActionDataFiles } from \"./generatePerActionDataFiles.js\";\ndescribe(generatePerActionDataFiles, () => {\n    it(\"guards against empty actions\", async () => {\n        const helper = createMockMinimalFiles();\n        const BASE_PATH = \"/foo\";\n        const sanitizedOntology = { ...TodoWireOntology, actionTypes: {} };\n        await generatePerActionDataFiles({\n            sanitizedOntology,\n            fs: helper.minimalFiles,\n            outDir: BASE_PATH,\n            ontology: enhanceOntology(sanitizedOntology, undefined, new Map(), \"\"),\n        });\n        expect(helper.getFiles()[`${BASE_PATH}/ontology/actions.ts`]).toEqual(\"export {};\\n\");\n    });\n    it(\"imports object types correctly with array params in actions\", async () => {\n        const helper = createMockMinimalFiles();\n        const BASE_PATH = \"/foo/ontology/actions\";\n        const sanitizedOntology = TodoWireOntology;\n        await generatePerActionDataFiles({\n            sanitizedOntology,\n            fs: helper.minimalFiles,\n            outDir: path.join(BASE_PATH, \"..\", \"..\"),\n            ontology: enhanceOntology(sanitizedOntology, undefined, new Map(), \"\"),\n        });\n        expect(helper.getFiles()[`${BASE_PATH}/deleteTodos.ts`]).toContain(\"import type { Todo } from '../objects/Todo';\\n\");\n    });\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,KAAKA,IAAI,MAAM,WAAW;AACjC,SAASC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,QAAQ;AAC7C,SAASC,eAAe,QAAQ,uCAAuC;AACvE,SAASC,sBAAsB,QAAQ,wCAAwC;AAC/E,SAASC,gBAAgB,QAAQ,kCAAkC;AACnE,SAASC,0BAA0B,QAAQ,iCAAiC;AAC5EN,QAAQ,CAACM,0BAA0B,EAAE,MAAM;EACvCJ,EAAE,CAAC,8BAA8B,EAAE,YAAY;IAC3C,MAAMK,MAAM,GAAGH,sBAAsB,CAAC,CAAC;IACvC,MAAMI,SAAS,GAAG,MAAM;IACxB,MAAMC,iBAAiB,GAAG;MAAE,GAAGJ,gBAAgB;MAAEK,WAAW,EAAE,CAAC;IAAE,CAAC;IAClE,MAAMJ,0BAA0B,CAAC;MAC7BG,iBAAiB;MACjBE,EAAE,EAAEJ,MAAM,CAACK,YAAY;MACvBC,MAAM,EAAEL,SAAS;MACjBM,QAAQ,EAAEX,eAAe,CAACM,iBAAiB,EAAEM,SAAS,EAAE,IAAIC,GAAG,CAAC,CAAC,EAAE,EAAE;IACzE,CAAC,CAAC;IACFf,MAAM,CAACM,MAAM,CAACU,QAAQ,CAAC,CAAC,CAAC,GAAGT,SAAS,sBAAsB,CAAC,CAAC,CAACU,OAAO,CAAC,cAAc,CAAC;EACzF,CAAC,CAAC;EACFhB,EAAE,CAAC,6DAA6D,EAAE,YAAY;IAC1E,MAAMK,MAAM,GAAGH,sBAAsB,CAAC,CAAC;IACvC,MAAMI,SAAS,GAAG,uBAAuB;IACzC,MAAMC,iBAAiB,GAAGJ,gBAAgB;IAC1C,MAAMC,0BAA0B,CAAC;MAC7BG,iBAAiB;MACjBE,EAAE,EAAEJ,MAAM,CAACK,YAAY;MACvBC,MAAM,EAAEd,IAAI,CAACoB,IAAI,CAACX,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;MACxCM,QAAQ,EAAEX,eAAe,CAACM,iBAAiB,EAAEM,SAAS,EAAE,IAAIC,GAAG,CAAC,CAAC,EAAE,EAAE;IACzE,CAAC,CAAC;IACFf,MAAM,CAACM,MAAM,CAACU,QAAQ,CAAC,CAAC,CAAC,GAAGT,SAAS,iBAAiB,CAAC,CAAC,CAACY,SAAS,CAAC,gDAAgD,CAAC;EACxH,CAAC,CAAC;AACN,CAAC,CAAC","ignoreList":[]}

package/build/browser/v2.0/generatePerQueryDataFiles.d.ts

@@ -0,0 +1,9 @@
+import type { QueryParameterDefinition } from "@osdk/api";
+import type { EnhancedOntologyDefinition } from "../GenerateContext/EnhancedOntologyDefinition.js";
+import type { GenerateContext } from "../GenerateContext/GenerateContext.js";
+export declare function generatePerQueryDataFilesV2({ fs, outDir: rootOutDir, ontology, importExt, }: Pick<GenerateContext, "fs" | "outDir" | "importExt" | "ontology">, v2: boolean): Promise<void>;
+export declare function queryParamJsDoc(param: QueryParameterDefinition<any>, { apiName }: {
+    apiName: string;
+}): string;
+export declare function getQueryParamType(enhancedOntology: EnhancedOntologyDefinition, input: QueryParameterDefinition<any, any>, type: "Param" | "Result"): string;
+//# sourceMappingURL=generatePerQueryDataFiles.d.ts.map

package/build/browser/v2.0/generatePerQueryDataFiles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generatePerQueryDataFiles.d.ts","sourceRoot":"","sources":["../../../src/v2.0/generatePerQueryDataFiles.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAQ1D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAS7E,wBAAsB,2BAA2B,CAC/C,EACE,EAAE,EACF,MAAM,EAAE,UAAU,EAClB,QAAQ,EACR,SAAc,GACf,EAAE,IAAI,CACL,eAAe,EACb,IAAI,GACJ,QAAQ,GACR,WAAW,GACX,UAAU,CACb,EACD,EAAE,EAAE,OAAO,iBA+BZ;AAoKD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,wBAAwB,CAAC,GAAG,CAAC,EACpC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,UAcjC;AAED,wBAAgB,iBAAiB,CAC/B,gBAAgB,EAAE,0BAA0B,EAC5C,KAAK,EAAE,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,EACzC,IAAI,EAAE,OAAO,GAAG,QAAQ,GACvB,MAAM,CAyDR"}

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

@@ -0,0 +1,194 @@
+/*
+ * Copyright 2023 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { wireQueryDataTypeToQueryDataTypeDefinition, wireQueryParameterV2ToQueryParameterDefinition as paramToDef, wireQueryTypeV2ToSdkQueryDefinitionNoParams } from "@osdk/generator-converters";
+import path from "node:path";
+import { getObjectImports } from "../shared/getObjectImports.js";
+import { getObjectTypeApiNamesFromQuery } from "../shared/getObjectTypeApiNamesFromQuery.js";
+import { deleteUndefineds } from "../util/deleteUndefineds.js";
+import { stringify } from "../util/stringify.js";
+import { formatTs } from "../util/test/formatTs.js";
+import { getDescriptionIfPresent } from "./getDescriptionIfPresent.js";
+export async function generatePerQueryDataFilesV2({
+  fs,
+  outDir: rootOutDir,
+  ontology,
+  importExt = ""
+}) {
+  const relOutDir = path.join(".", "ontology", "queries");
+  const outDir = path.join(rootOutDir, "ontology", "queries");
+  await fs.mkdir(outDir, {
+    recursive: true
+  });
+  await Promise.all(Object.values(ontology.queryTypes).map(async query => {
+    await generateV2QueryFile(fs, outDir, relOutDir, query, importExt, ontology);
+  }));
+  await fs.writeFile(`${outDir}.ts`, await formatTs(`
+    ${Object.values(ontology.queryTypes).map(query => `export * from "${query.getImportPathRelTo(relOutDir)}";`).join("\n")}
+      ${Object.keys(ontology.queryTypes).length === 0 ? "export {};" : ""}
+    `));
+}
+async function generateV2QueryFile(fs, outDir, relOutDir, query, importExt, ontology) {
+  const relFilePath = path.join(relOutDir, `${query.shortApiName}.ts`);
+  const objectTypes = getObjectTypeApiNamesFromQuery(query);
+  const objectTypeObjects = new Set(objectTypes.map(o => ontology.requireObjectType(o)));
+  const importObjects = getObjectImports(objectTypeObjects, "", relFilePath, true);
+  const baseProps = deleteUndefineds(wireQueryTypeV2ToSdkQueryDefinitionNoParams(query.raw));
+  const outputBase = deleteUndefineds(wireQueryDataTypeToQueryDataTypeDefinition(query.output));
+  const referencedObjectTypes = objectTypes.length > 0 ? objectTypes.map(apiNameObj => `"${apiNameObj}"`).join("|") : "never";
+  await fs.writeFile(path.join(outDir, `${query.shortApiName}.ts`), await formatTs(`
+        import type { QueryDefinition , VersionBound} from "@osdk/api";
+        import type { QueryParam, QueryResult } from "@osdk/api";
+        import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
+        import { $osdkMetadata} from "../../OntologyMetadata${importExt}";
+        ${importObjects}
+
+        export namespace ${query.shortApiName} {
+          export interface Signature {
+            ${getDescriptionIfPresent(query.description)}
+            (${Object.keys(query.parameters).length > 0 ? `query: ${query.paramsIdentifier}` : ""}): Promise<${getQueryParamType(ontology, paramToDef({
+    dataType: query.output
+  }), "Result")}>
+          }
+
+        ${Object.keys(query.parameters).length > 0 ? `
+            export interface Parameters {
+            ${stringify(query.parameters, {
+    "*": (parameter, formatter, apiName) => {
+      const q = paramToDef(parameter);
+      return [`
+                ${queryParamJsDoc(paramToDef(parameter), {
+        apiName
+      })}readonly "${apiName}"${q.nullable ? "?" : ""}`, `${getQueryParamType(ontology, q, "Param")}`];
+    }
+  })}
+            }
+    
+            ` : ""}
+
+        
+
+        }
+
+        export interface ${query.shortApiName} extends QueryDefinition<
+          "${query.fullApiName}", 
+          ${referencedObjectTypes},
+          ${query.shortApiName}.Signature
+        >, VersionBound<$ExpectedClientVersion>{
+         __DefinitionMetadata?: {
+             ${stringify(baseProps)}
+            parameters: {
+            ${parameterDefsForType(ontology, query)}
+            };
+            output: {
+            ${stringify(outputBase)},
+            ${getLineFor__OsdkTargetType(ontology, query.output)}
+            };
+            signature: ${query.shortApiName}.Signature;
+        }, 
+        ${stringify(baseProps, {
+    "description": () => undefined,
+    "displayName": () => undefined,
+    "rid": () => undefined
+  })}, 
+          osdkMetadata: typeof $osdkMetadata;
+              }
+
+
+        export const ${query.shortApiName}: ${query.definitionIdentifier} = {
+            ${stringify(baseProps, {
+    "description": () => undefined,
+    "displayName": () => undefined,
+    "rid": () => undefined
+  })},
+    osdkMetadata: $osdkMetadata
+        };
+        `));
+}
+function parametersForConst(query) {
+  return stringify(query.parameters, {
+    "*": (parameter, formatter) => formatter(deleteUndefineds(paramToDef(parameter)))
+  });
+}
+function parameterDefsForType(ontology, query) {
+  return stringify(query.parameters, {
+    "*": (parameter, valueFormatter, apiName) => [`${queryParamJsDoc(paramToDef(parameter), {
+      apiName
+    })} ${apiName}`, ` {
+          ${stringify(deleteUndefineds(paramToDef(parameter)))},
+          ${getLineFor__OsdkTargetType(ontology, parameter.dataType)}
+        }`]
+  });
+}
+function getLineFor__OsdkTargetType(ontology, qdt) {
+  if (qdt.type === "object" || qdt.type === "objectSet") {
+    return `__OsdkTargetType?: ${ontology.requireObjectType(qdt.objectTypeApiName).getImportedDefinitionIdentifier(true)}`;
+  }
+  return "";
+}
+export function queryParamJsDoc(param, {
+  apiName
+}) {
+  let ret = `/**\n`;
+  if (param.description) {
+    if (param.description) {
+      ret += ` *   description: ${param.description}\n`;
+    }
+  } else {
+    ret += ` * (no ontology metadata)\n`;
+  }
+  ret += ` */\n`;
+  return ret;
+}
+export function getQueryParamType(enhancedOntology, input, type) {
+  let inner = `unknown /* ${input.type} */`;
+  switch (input.type) {
+    case "date":
+      inner = `Query${type}.PrimitiveType<${JSON.stringify("datetime")}>`;
+      break;
+    case "attachment":
+    case "boolean":
+    case "double":
+    case "float":
+    case "integer":
+    case "long":
+    case "string":
+    case "struct":
+    case "threeDimensionalAggregation":
+    case "timestamp":
+    case "twoDimensionalAggregation":
+      inner = `Query${type}.PrimitiveType<${JSON.stringify(input.type)}>`;
+      break;
+    case "object":
+      inner = `Query${type}.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
+      break;
+    case "objectSet":
+      inner = `Query${type}.ObjectSetType<${enhancedOntology.requireObjectType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
+      break;
+    case "set":
+      inner = `${type === "Param" ? "Readonly" : ""}Set<${getQueryParamType(enhancedOntology, input.set, type)}>`;
+      break;
+    case "union":
+      inner = input.union.map(u => getQueryParamType(enhancedOntology, u, type)).join(" | ");
+      break;
+  }
+  if (input.multiplicity && type === "Param") {
+    return `ReadonlyArray<${inner}>`;
+  } else if (input.multiplicity) {
+    return `Array<${inner}>`;
+  }
+  return inner;
+}
+//# sourceMappingURL=generatePerQueryDataFiles.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generatePerQueryDataFiles.js","names":["wireQueryDataTypeToQueryDataTypeDefinition","wireQueryParameterV2ToQueryParameterDefinition","paramToDef","wireQueryTypeV2ToSdkQueryDefinitionNoParams","path","getObjectImports","getObjectTypeApiNamesFromQuery","deleteUndefineds","stringify","formatTs","getDescriptionIfPresent","generatePerQueryDataFilesV2","fs","outDir","rootOutDir","ontology","importExt","relOutDir","join","mkdir","recursive","Promise","all","Object","values","queryTypes","map","query","generateV2QueryFile","writeFile","getImportPathRelTo","keys","length","relFilePath","shortApiName","objectTypes","objectTypeObjects","Set","o","requireObjectType","importObjects","baseProps","raw","outputBase","output","referencedObjectTypes","apiNameObj","description","parameters","paramsIdentifier","getQueryParamType","dataType","*","parameter","formatter","apiName","q","queryParamJsDoc","nullable","fullApiName","parameterDefsForType","getLineFor__OsdkTargetType","undefined","displayName","rid","definitionIdentifier","parametersForConst","valueFormatter","qdt","type","objectTypeApiName","getImportedDefinitionIdentifier","param","ret","enhancedOntology","input","inner","JSON","object","objectSet","set","union","u","multiplicity"],"sources":["generatePerQueryDataFiles.js"],"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 */\nimport { wireQueryDataTypeToQueryDataTypeDefinition, wireQueryParameterV2ToQueryParameterDefinition as paramToDef, wireQueryTypeV2ToSdkQueryDefinitionNoParams, } from \"@osdk/generator-converters\";\nimport path from \"node:path\";\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\";\nexport async function generatePerQueryDataFilesV2({ fs, outDir: rootOutDir, ontology, importExt = \"\", }, v2) {\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(Object.values(ontology.queryTypes).map(async (query) => {\n        await generateV2QueryFile(fs, outDir, relOutDir, query, importExt, ontology);\n    }));\n    const indexFilePath = `${outDir}.ts`;\n    await fs.writeFile(indexFilePath, await formatTs(`\n    ${Object.values(ontology.queryTypes).map(query => `export * from \"${query.getImportPathRelTo(relOutDir)}\";`)\n        .join(\"\\n\")}\n      ${Object.keys(ontology.queryTypes).length === 0 ? \"export {};\" : \"\"}\n    `));\n}\nasync function generateV2QueryFile(fs, outDir, relOutDir, query, importExt, ontology) {\n    const relFilePath = path.join(relOutDir, `${query.shortApiName}.ts`);\n    const objectTypes = getObjectTypeApiNamesFromQuery(query);\n    const objectTypeObjects = new Set(objectTypes.map(o => ontology.requireObjectType(o)));\n    const importObjects = getObjectImports(objectTypeObjects, \"\", relFilePath, true);\n    const baseProps = deleteUndefineds(wireQueryTypeV2ToSdkQueryDefinitionNoParams(query.raw));\n    const outputBase = deleteUndefineds(wireQueryDataTypeToQueryDataTypeDefinition(query.output));\n    const referencedObjectTypes = objectTypes.length > 0\n        ? objectTypes.map(apiNameObj => `\"${apiNameObj}\"`).join(\"|\")\n        : \"never\";\n    await fs.writeFile(path.join(outDir, `${query.shortApiName}.ts`), await formatTs(`\n        import type { QueryDefinition , VersionBound} from \"@osdk/api\";\n        import type { QueryParam, QueryResult } from \"@osdk/api\";\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            (${Object.keys(query.parameters).length > 0\n        ? `query: ${query.paramsIdentifier}`\n        : \"\"}): Promise<${getQueryParamType(ontology, paramToDef({ dataType: query.output }), \"Result\")}>\n          }\n\n        ${Object.keys(query.parameters).length > 0\n        ? `\n            export interface Parameters {\n            ${stringify(query.parameters, {\n            \"*\": (parameter, formatter, apiName) => {\n                const q = paramToDef(parameter);\n                return [\n                    `\n                ${queryParamJsDoc(paramToDef(parameter), { apiName })}readonly \"${apiName}\"${q.nullable ? \"?\" : \"\"}`,\n                    `${getQueryParamType(ontology, q, \"Param\")}`,\n                ];\n            },\n        })}\n            }\n    \n            `\n        : \"\"}\n\n        \n\n        }\n\n        export interface ${query.shortApiName} extends QueryDefinition<\n          \"${query.fullApiName}\", \n          ${referencedObjectTypes},\n          ${query.shortApiName}.Signature\n        >, VersionBound<$ExpectedClientVersion>{\n         __DefinitionMetadata?: {\n             ${stringify(baseProps)}\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        ${stringify(baseProps, {\n        \"description\": () => undefined,\n        \"displayName\": () => undefined,\n        \"rid\": () => undefined,\n    })}, \n          osdkMetadata: typeof $osdkMetadata;\n              }\n\n\n        export const ${query.shortApiName}: ${query.definitionIdentifier} = {\n            ${stringify(baseProps, {\n        \"description\": () => undefined,\n        \"displayName\": () => undefined,\n        \"rid\": () => undefined,\n    })},\n    osdkMetadata: $osdkMetadata\n        };\n        `));\n}\nfunction parametersForConst(query) {\n    return stringify(query.parameters, {\n        \"*\": (parameter, formatter) => formatter(deleteUndefineds(paramToDef(parameter))),\n    });\n}\nfunction parameterDefsForType(ontology, query) {\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}\nfunction getLineFor__OsdkTargetType(ontology, qdt) {\n    if (qdt.type === \"object\" || qdt.type === \"objectSet\") {\n        return `__OsdkTargetType?: ${ontology.requireObjectType(qdt.objectTypeApiName).getImportedDefinitionIdentifier(true)}`;\n    }\n    return \"\";\n}\nexport function queryParamJsDoc(param, { apiName }) {\n    let ret = `/**\\n`;\n    if (param.description) {\n        if (param.description) {\n            ret += ` *   description: ${param.description}\\n`;\n        }\n    }\n    else {\n        ret += ` * (no ontology metadata)\\n`;\n    }\n    ret += ` */\\n`;\n    return ret;\n}\nexport function getQueryParamType(enhancedOntology, input, type) {\n    let inner = `unknown /* ${input.type} */`;\n    switch (input.type) {\n        case \"date\":\n            inner = `Query${type}.PrimitiveType<${JSON.stringify(\"datetime\")}>`;\n            break;\n        case \"attachment\":\n        case \"boolean\":\n        case \"double\":\n        case \"float\":\n        case \"integer\":\n        case \"long\":\n        case \"string\":\n        case \"struct\":\n        case \"threeDimensionalAggregation\":\n        case \"timestamp\":\n        case \"twoDimensionalAggregation\":\n            inner = `Query${type}.PrimitiveType<${JSON.stringify(input.type)}>`;\n            break;\n        case \"object\":\n            inner = `Query${type}.ObjectType<${enhancedOntology.requireObjectType(input.object)\n                .getImportedDefinitionIdentifier(true)}>`;\n            break;\n        case \"objectSet\":\n            inner = `Query${type}.ObjectSetType<${enhancedOntology.requireObjectType(input.objectSet)\n                .getImportedDefinitionIdentifier(true)}>`;\n            break;\n        case \"set\":\n            inner = `${type === \"Param\" ? \"Readonly\" : \"\"}Set<${getQueryParamType(enhancedOntology, input.set, type)}>`;\n            break;\n        case \"union\":\n            inner = input.union.map((u) => getQueryParamType(enhancedOntology, u, type)).join(\" | \");\n            break;\n    }\n    if (input.multiplicity && type === \"Param\") {\n        return `ReadonlyArray<${inner}>`;\n    }\n    else if (input.multiplicity) {\n        return `Array<${inner}>`;\n    }\n    return inner;\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/v2.0/generatePerQueryDataFiles.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=generatePerQueryDataFiles.test.d.ts.map

package/build/browser/v2.0/generatePerQueryDataFiles.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generatePerQueryDataFiles.test.d.ts","sourceRoot":"","sources":["../../../src/v2.0/generatePerQueryDataFiles.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,199 @@
+/*
+ * Copyright 2023 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as ts from "typescript";
+import { describe, expect, it } from "vitest";
+import { enhanceOntology } from "../GenerateContext/enhanceOntology.js";
+import { createMockMinimalFiles } from "../util/test/createMockMinimalFiles.js";
+import { TodoWireOntology } from "../util/test/TodoWireOntology.js";
+import { generatePerQueryDataFilesV2 } from "./generatePerQueryDataFiles.js";
+describe("generatePerQueryDataFiles", () => {
+  it("is stable v2", async () => {
+    const helper = createMockMinimalFiles();
+    await generatePerQueryDataFilesV2({
+      fs: helper.minimalFiles,
+      ontology: enhanceOntology(TodoWireOntology, undefined, new Map(), ".js"),
+      outDir: "/foo",
+      importExt: ".js"
+    }, true);
+    expect(helper.getFiles()).toMatchInlineSnapshot(`
+      {
+        "/foo/ontology/queries.ts": "export * from './queries/getCount.js';
+      export * from './queries/returnsTodo.js';
+      ",
+        "/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, VersionBound } from '@osdk/api';
+      import type { QueryParam, QueryResult } from '@osdk/api';
+      import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
+      import { $osdkMetadata } from '../../OntologyMetadata.js';
+
+      export namespace getCount {
+        export interface Signature {
+          (query: getCount.Parameters): Promise<QueryResult.PrimitiveType<'integer'>>;
+        }
+
+        export interface Parameters {
+          /**
+           * (no ontology metadata)
+           */
+          readonly completed: QueryParam.PrimitiveType<'boolean'>;
+        }
+      }
+
+      export interface getCount
+        extends QueryDefinition<'getCount', never, getCount.Signature>,
+          VersionBound<$ExpectedClientVersion> {
+        __DefinitionMetadata?: {
+          apiName: 'getCount';
+          rid: 'rid.query.1';
+          type: 'query';
+          version: '0';
+          parameters: {
+            /**
+             * (no ontology metadata)
+             */
+            completed: {
+              nullable: false;
+              type: 'boolean';
+            };
+          };
+          output: {
+            nullable: false;
+            type: 'integer';
+          };
+          signature: getCount.Signature;
+        };
+        apiName: 'getCount';
+        type: 'query';
+        version: '0';
+        osdkMetadata: typeof $osdkMetadata;
+      }
+
+      export const getCount: getCount = {
+        apiName: 'getCount',
+        type: 'query',
+        version: '0',
+        osdkMetadata: $osdkMetadata,
+      };
+      ",
+        "/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, VersionBound } from '@osdk/api';
+      import type { QueryParam, QueryResult } from '@osdk/api';
+      import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
+      import { $osdkMetadata } from '../../OntologyMetadata.js';
+      import type { Todo } from '../objects/Todo.js';
+
+      export namespace returnsTodo {
+        export interface Signature {
+          (query: returnsTodo.Parameters): Promise<QueryResult.ObjectType<Todo>>;
+        }
+
+        export interface Parameters {
+          /**
+           *   description: Random desc so we test jsdoc
+           */
+          readonly someTodo: QueryParam.ObjectType<Todo>;
+        }
+      }
+
+      export interface returnsTodo
+        extends QueryDefinition<'returnsTodo', 'Todo', returnsTodo.Signature>,
+          VersionBound<$ExpectedClientVersion> {
+        __DefinitionMetadata?: {
+          apiName: 'returnsTodo';
+          rid: 'rid.query.2';
+          type: 'query';
+          version: '0';
+          parameters: {
+            /**
+             *   description: Random desc so we test jsdoc
+             */
+            someTodo: {
+              description: 'Random desc so we test jsdoc';
+              nullable: false;
+              object: 'Todo';
+              type: 'object';
+              __OsdkTargetType?: Todo;
+            };
+          };
+          output: {
+            nullable: false;
+            object: 'Todo';
+            type: 'object';
+            __OsdkTargetType?: Todo;
+          };
+          signature: returnsTodo.Signature;
+        };
+        apiName: 'returnsTodo';
+        type: 'query';
+        version: '0';
+        osdkMetadata: typeof $osdkMetadata;
+      }
+
+      export const returnsTodo: returnsTodo = {
+        apiName: 'returnsTodo',
+        type: 'query',
+        version: '0',
+        osdkMetadata: $osdkMetadata,
+      };
+      ",
+      }
+    `);
+    await helper.minimalFiles.writeFile("/bar/test.ts", `
+      import {returnsTodo} from "/foo/ontology/queries/returnsTodo.ts";
+
+      returnsTodo({someTodo:/*marker*/})
+    `);
+    const rootFileNames = Object.keys(helper.getFiles());
+    console.log(rootFileNames);
+    const files = {};
+    // initialize the list of files
+    rootFileNames.forEach(fileName => {
+      files[fileName] = {
+        version: 0
+      };
+    });
+    const servicesHost = {
+      getScriptFileNames: () => Object.keys(helper.getFiles()),
+      getScriptVersion: fileName => files[fileName] && files[fileName].version.toString(),
+      getScriptSnapshot: fileName => {
+        if (!helper.getFiles()[fileName]) {
+          return undefined;
+        }
+        return ts.ScriptSnapshot.fromString(helper.getFiles()[fileName]);
+      },
+      getCurrentDirectory: () => "/bar",
+      getCompilationSettings: () => ({}),
+      getDefaultLibFileName: options => ts.getDefaultLibFilePath(options),
+      fileExists: path => {
+        console.log(path);
+        return helper.getFiles()[path] !== undefined;
+      },
+      readFile: path => {
+        console.log("readFile: ", path);
+        return helper.getFiles()[path];
+      },
+      readDirectory: (path, extensions, exclude, include, depth) => {
+        console.log("readDirectory", path);
+        return ts.sys.readDirectory(path, extensions, exclude, include, depth);
+      },
+      directoryExists: ts.sys.directoryExists,
+      getDirectories: ts.sys.getDirectories
+    };
+    const langServices = ts.createLanguageService(servicesHost);
+    const q = langServices.getDocCommentTemplateAtPosition("/bar/test.ts", 1);
+    console.log(q);
+    ts.createDocumentRegistry();
+  });
+});
+//# sourceMappingURL=generatePerQueryDataFiles.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generatePerQueryDataFiles.test.js","names":["ts","describe","expect","it","enhanceOntology","createMockMinimalFiles","TodoWireOntology","generatePerQueryDataFilesV2","helper","fs","minimalFiles","ontology","undefined","Map","outDir","importExt","getFiles","toMatchInlineSnapshot","writeFile","rootFileNames","Object","keys","console","log","files","forEach","fileName","version","servicesHost","getScriptFileNames","getScriptVersion","toString","getScriptSnapshot","ScriptSnapshot","fromString","getCurrentDirectory","getCompilationSettings","getDefaultLibFileName","options","getDefaultLibFilePath","fileExists","path","readFile","readDirectory","extensions","exclude","include","depth","sys","directoryExists","getDirectories","langServices","createLanguageService","q","getDocCommentTemplateAtPosition","createDocumentRegistry"],"sources":["generatePerQueryDataFiles.test.js"],"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 */\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\";\ndescribe(\"generatePerQueryDataFiles\", () => {\n    it(\"is stable v2\", async () => {\n        const helper = createMockMinimalFiles();\n        const BASE_PATH = \"/foo\";\n        await generatePerQueryDataFilesV2({\n            fs: helper.minimalFiles,\n            ontology: enhanceOntology(TodoWireOntology, undefined, new Map(), \".js\"),\n            outDir: BASE_PATH,\n            importExt: \".js\",\n        }, true);\n        expect(helper.getFiles()).toMatchInlineSnapshot(`\n      {\n        \"/foo/ontology/queries.ts\": \"export * from './queries/getCount.js';\n      export * from './queries/returnsTodo.js';\n      \",\n        \"/foo/ontology/queries/getCount.ts\": \"import type { QueryDefinition, VersionBound } from '@osdk/api';\n      import type { QueryParam, QueryResult } 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<QueryResult.PrimitiveType<'integer'>>;\n        }\n\n        export interface Parameters {\n          /**\n           * (no ontology metadata)\n           */\n          readonly completed: QueryParam.PrimitiveType<'boolean'>;\n        }\n      }\n\n      export interface getCount\n        extends QueryDefinition<'getCount', never, getCount.Signature>,\n          VersionBound<$ExpectedClientVersion> {\n        __DefinitionMetadata?: {\n          apiName: 'getCount';\n          rid: 'rid.query.1';\n          type: 'query';\n          version: '0';\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: '0';\n        osdkMetadata: typeof $osdkMetadata;\n      }\n\n      export const getCount: getCount = {\n        apiName: 'getCount',\n        type: 'query',\n        version: '0',\n        osdkMetadata: $osdkMetadata,\n      };\n      \",\n        \"/foo/ontology/queries/returnsTodo.ts\": \"import type { QueryDefinition, VersionBound } from '@osdk/api';\n      import type { QueryParam, QueryResult } 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<QueryResult.ObjectType<Todo>>;\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\n      export interface returnsTodo\n        extends QueryDefinition<'returnsTodo', 'Todo', returnsTodo.Signature>,\n          VersionBound<$ExpectedClientVersion> {\n        __DefinitionMetadata?: {\n          apiName: 'returnsTodo';\n          rid: 'rid.query.2';\n          type: 'query';\n          version: '0';\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: '0';\n        osdkMetadata: typeof $osdkMetadata;\n      }\n\n      export const returnsTodo: returnsTodo = {\n        apiName: 'returnsTodo',\n        type: 'query',\n        version: '0',\n        osdkMetadata: $osdkMetadata,\n      };\n      \",\n      }\n    `);\n        await helper.minimalFiles.writeFile(\"/bar/test.ts\", `\n      import {returnsTodo} from \"/foo/ontology/queries/returnsTodo.ts\";\n\n      returnsTodo({someTodo:/*marker*/})\n    `);\n        const rootFileNames = Object.keys(helper.getFiles());\n        console.log(rootFileNames);\n        const files = {};\n        // initialize the list of files\n        rootFileNames.forEach(fileName => {\n            files[fileName] = { version: 0 };\n        });\n        const servicesHost = {\n            getScriptFileNames: () => Object.keys(helper.getFiles()),\n            getScriptVersion: fileName => files[fileName] && files[fileName].version.toString(),\n            getScriptSnapshot: fileName => {\n                if (!helper.getFiles()[fileName]) {\n                    return undefined;\n                }\n                return ts.ScriptSnapshot.fromString(helper.getFiles()[fileName]);\n            },\n            getCurrentDirectory: () => \"/bar\",\n            getCompilationSettings: () => ({}),\n            getDefaultLibFileName: options => ts.getDefaultLibFilePath(options),\n            fileExists: (path) => {\n                console.log(path);\n                return helper.getFiles()[path] !== undefined;\n            },\n            readFile: (path) => {\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        const langServices = ts.createLanguageService(servicesHost);\n        const q = langServices.getDocCommentTemplateAtPosition(\"/bar/test.ts\", 1);\n        console.log(q);\n        ts.createDocumentRegistry();\n    });\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,KAAKA,EAAE,MAAM,YAAY;AAChC,SAASC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,QAAQ;AAC7C,SAASC,eAAe,QAAQ,uCAAuC;AACvE,SAASC,sBAAsB,QAAQ,wCAAwC;AAC/E,SAASC,gBAAgB,QAAQ,kCAAkC;AACnE,SAASC,2BAA2B,QAAQ,gCAAgC;AAC5EN,QAAQ,CAAC,2BAA2B,EAAE,MAAM;EACxCE,EAAE,CAAC,cAAc,EAAE,YAAY;IAC3B,MAAMK,MAAM,GAAGH,sBAAsB,CAAC,CAAC;IAEvC,MAAME,2BAA2B,CAAC;MAC9BE,EAAE,EAAED,MAAM,CAACE,YAAY;MACvBC,QAAQ,EAAEP,eAAe,CAACE,gBAAgB,EAAEM,SAAS,EAAE,IAAIC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC;MACxEC,MAAM,EAJQ,MAIG;MACjBC,SAAS,EAAE;IACf,CAAC,EAAE,IAAI,CAAC;IACRb,MAAM,CAACM,MAAM,CAACQ,QAAQ,CAAC,CAAC,CAAC,CAACC,qBAAqB,CAAC;AACxD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK,CAAC;IACE,MAAMT,MAAM,CAACE,YAAY,CAACQ,SAAS,CAAC,cAAc,EAAE;AAC5D;AACA;AACA;AACA,KAAK,CAAC;IACE,MAAMC,aAAa,GAAGC,MAAM,CAACC,IAAI,CAACb,MAAM,CAACQ,QAAQ,CAAC,CAAC,CAAC;IACpDM,OAAO,CAACC,GAAG,CAACJ,aAAa,CAAC;IAC1B,MAAMK,KAAK,GAAG,CAAC,CAAC;IAChB;IACAL,aAAa,CAACM,OAAO,CAACC,QAAQ,IAAI;MAC9BF,KAAK,CAACE,QAAQ,CAAC,GAAG;QAAEC,OAAO,EAAE;MAAE,CAAC;IACpC,CAAC,CAAC;IACF,MAAMC,YAAY,GAAG;MACjBC,kBAAkB,EAAEA,CAAA,KAAMT,MAAM,CAACC,IAAI,CAACb,MAAM,CAACQ,QAAQ,CAAC,CAAC,CAAC;MACxDc,gBAAgB,EAAEJ,QAAQ,IAAIF,KAAK,CAACE,QAAQ,CAAC,IAAIF,KAAK,CAACE,QAAQ,CAAC,CAACC,OAAO,CAACI,QAAQ,CAAC,CAAC;MACnFC,iBAAiB,EAAEN,QAAQ,IAAI;QAC3B,IAAI,CAAClB,MAAM,CAACQ,QAAQ,CAAC,CAAC,CAACU,QAAQ,CAAC,EAAE;UAC9B,OAAOd,SAAS;QACpB;QACA,OAAOZ,EAAE,CAACiC,cAAc,CAACC,UAAU,CAAC1B,MAAM,CAACQ,QAAQ,CAAC,CAAC,CAACU,QAAQ,CAAC,CAAC;MACpE,CAAC;MACDS,mBAAmB,EAAEA,CAAA,KAAM,MAAM;MACjCC,sBAAsB,EAAEA,CAAA,MAAO,CAAC,CAAC,CAAC;MAClCC,qBAAqB,EAAEC,OAAO,IAAItC,EAAE,CAACuC,qBAAqB,CAACD,OAAO,CAAC;MACnEE,UAAU,EAAGC,IAAI,IAAK;QAClBnB,OAAO,CAACC,GAAG,CAACkB,IAAI,CAAC;QACjB,OAAOjC,MAAM,CAACQ,QAAQ,CAAC,CAAC,CAACyB,IAAI,CAAC,KAAK7B,SAAS;MAChD,CAAC;MACD8B,QAAQ,EAAGD,IAAI,IAAK;QAChBnB,OAAO,CAACC,GAAG,CAAC,YAAY,EAAEkB,IAAI,CAAC;QAC/B,OAAOjC,MAAM,CAACQ,QAAQ,CAAC,CAAC,CAACyB,IAAI,CAAC;MAClC,CAAC;MACDE,aAAa,EAAEA,CAACF,IAAI,EAAEG,UAAU,EAAEC,OAAO,EAAEC,OAAO,EAAEC,KAAK,KAAK;QAC1DzB,OAAO,CAACC,GAAG,CAAC,eAAe,EAAEkB,IAAI,CAAC;QAClC,OAAOzC,EAAE,CAACgD,GAAG,CAACL,aAAa,CAACF,IAAI,EAAEG,UAAU,EAAEC,OAAO,EAAEC,OAAO,EAAEC,KAAK,CAAC;MAC1E,CAAC;MACDE,eAAe,EAAEjD,EAAE,CAACgD,GAAG,CAACC,eAAe;MACvCC,cAAc,EAAElD,EAAE,CAACgD,GAAG,CAACE;IAC3B,CAAC;IACD,MAAMC,YAAY,GAAGnD,EAAE,CAACoD,qBAAqB,CAACxB,YAAY,CAAC;IAC3D,MAAMyB,CAAC,GAAGF,YAAY,CAACG,+BAA+B,CAAC,cAAc,EAAE,CAAC,CAAC;IACzEhC,OAAO,CAACC,GAAG,CAAC8B,CAAC,CAAC;IACdrD,EAAE,CAACuD,sBAAsB,CAAC,CAAC;EAC/B,CAAC,CAAC;AACN,CAAC,CAAC","ignoreList":[]}

package/build/browser/v2.0/getDescriptionIfPresent.d.ts

@@ -0,0 +1,2 @@
+export declare function getDescriptionIfPresent(description?: string, includeNewline?: boolean): string;
+//# sourceMappingURL=getDescriptionIfPresent.d.ts.map

package/build/browser/v2.0/getDescriptionIfPresent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDescriptionIfPresent.d.ts","sourceRoot":"","sources":["../../../src/v2.0/getDescriptionIfPresent.ts"],"names":[],"mappings":"AAgBA,wBAAgB,uBAAuB,CACrC,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,OAAO,UAQzB"}

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export function getDescriptionIfPresent(description, includeNewline) {
+  if (description) {
+    return `/**
+ * ${description}
+ */${includeNewline ? "\n" : ""}`;
+  }
+  return "";
+}
+//# sourceMappingURL=getDescriptionIfPresent.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getDescriptionIfPresent.js","names":["getDescriptionIfPresent","description","includeNewline"],"sources":["getDescriptionIfPresent.js"],"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 */\nexport function getDescriptionIfPresent(description, includeNewline) {\n    if (description) {\n        return `/**\n * ${description}\n */${includeNewline ? \"\\n\" : \"\"}`;\n    }\n    return \"\";\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,uBAAuBA,CAACC,WAAW,EAAEC,cAAc,EAAE;EACjE,IAAID,WAAW,EAAE;IACb,OAAO;AACf,KAAKA,WAAW;AAChB,KAAKC,cAAc,GAAG,IAAI,GAAG,EAAE,EAAE;EAC7B;EACA,OAAO,EAAE;AACb","ignoreList":[]}

package/build/browser/v2.0/wireObjectTypeV2ToSdkObjectConstV2.d.ts

@@ -0,0 +1,13 @@
+import type { EnhancedInterfaceType } from "../GenerateContext/EnhancedInterfaceType.js";
+import { EnhancedObjectType } from "../GenerateContext/EnhancedObjectType.js";
+import type { EnhancedOntologyDefinition } from "../GenerateContext/EnhancedOntologyDefinition.js";
+export declare function getObjectDefIdentifier(name: string, v2: boolean): string;
+export interface Identifiers extends Record<"osdkObjectIdentifier" | "propertyKeysIdentifier" | "osdkObjectPropsIdentifier" | "objectDefIdentifier" | "osdkObjectLinksIdentifier" | "osdkObjectStrictPropsIdentifier" | "objectSetIdentifier", string> {
+}
+export declare function createOsdkObject(object: EnhancedObjectType | EnhancedInterfaceType, identifier: string, { osdkObjectPropsIdentifier, objectDefIdentifier, osdkObjectStrictPropsIdentifier, osdkObjectLinksIdentifier, }: Identifiers): string;
+export declare function createObjectSet(object: EnhancedObjectType | EnhancedInterfaceType, { objectDefIdentifier, objectSetIdentifier, propertyKeysIdentifier, osdkObjectIdentifier, }: Identifiers): string;
+export declare function createProps(type: EnhancedInterfaceType | EnhancedObjectType, identifier: string, strict: boolean): string;
+export declare function createDefinition(object: EnhancedObjectType | EnhancedInterfaceType, ontology: EnhancedOntologyDefinition, identifier: string, { objectDefIdentifier, objectSetIdentifier, osdkObjectPropsIdentifier, osdkObjectStrictPropsIdentifier, osdkObjectLinksIdentifier, }: Identifiers): string;
+export declare function createLinks(ontology: EnhancedOntologyDefinition, object: EnhancedObjectType | EnhancedInterfaceType, identifier: string): string;
+export declare function createPropertyKeys(type: EnhancedObjectType | EnhancedInterfaceType): string;
+//# sourceMappingURL=wireObjectTypeV2ToSdkObjectConstV2.d.ts.map

package/build/browser/v2.0/wireObjectTypeV2ToSdkObjectConstV2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wireObjectTypeV2ToSdkObjectConstV2.d.ts","sourceRoot":"","sources":["../../../src/v2.0/wireObjectTypeV2ToSdkObjectConstV2.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAOnG,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,UAE/D;AAqGD,MAAM,WAAW,WAAY,SAC3B,MAAM,CACF,sBAAsB,GACtB,wBAAwB,GACxB,2BAA2B,GAC3B,qBAAqB,GACrB,2BAA2B,GAC3B,iCAAiC,GACjC,qBAAqB,EACvB,MAAM,CACP;CACD;AAEF,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,kBAAkB,GAAG,qBAAqB,EAClD,UAAU,EAAE,MAAM,EAClB,EACE,yBAAyB,EACzB,mBAAmB,EACnB,+BAA+B,EAC/B,yBAAyB,GAC1B,EAAE,WAAW,UAgBf;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,kBAAkB,GAAG,qBAAqB,EAClD,EACE,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,oBAAoB,GACrB,EAAE,WAAW,UAYf;AAeD,wBAAgB,WAAW,CACzB,IAAI,EAAE,qBAAqB,GAAG,kBAAkB,EAChD,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,OAAO,UAoBhB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,kBAAkB,GAAG,qBAAqB,EAClD,QAAQ,EAAE,0BAA0B,EACpC,UAAU,EAAE,MAAM,EAClB,EACE,mBAAmB,EACnB,mBAAmB,EACnB,yBAAyB,EACzB,+BAA+B,EAC/B,yBAAyB,GAC1B,EAAE,WAAW,UAmDf;AAED,wBAAgB,WAAW,CACzB,QAAQ,EAAE,0BAA0B,EACpC,MAAM,EAAE,kBAAkB,GAAG,qBAAqB,EAClD,UAAU,EAAE,MAAM,UAiCnB;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,kBAAkB,GAAG,qBAAqB,UAOjD"}