@osdk/cli 0.25.1 → 0.26.0-beta.10

package/build/esm/{handleGenerate-VS7LGEFI.js → handleGenerate-UQQTMEXV.js}

@@ -1,10 +1,11 @@
-import { createFetchHeaderMutator, createRetryingFetch, createFetchOrThrow, PalantirApiError } from './chunk-PXU2ECCD.js';
-import { YargsCheckError, ExitProcessError } from './chunk-SAOPV5FF.js';
-import { findUp } from './chunk-LR3YBME3.js';
-import { invokeLoginFlow } from './chunk-KHVWTBWA.js';
-import { __commonJS, init_esm_shims, __export, __toESM } from './chunk-DMUWBIYY.js';
-import * as fs8 from 'fs';
-import fs8__default, { realpathSync, statSync, Stats } from 'fs';
+import { createFetchHeaderMutator, createRetryingFetch, createFetchOrThrow, PalantirApiError } from './chunk-P5HXJTVE.js';
+import { YargsCheckError, ExitProcessError } from './chunk-2U36M44D.js';
+import { findUp } from './chunk-KJFA7LBI.js';
+import { invokeLoginFlow } from './chunk-M2BWWO6L.js';
+import { __commonJS, init_esm_shims, __export, __toESM } from './chunk-VHOQB2JW.js';
+import * as fs8 from 'node:fs';
+import * as path19 from 'node:path';
+import path19__default from 'node:path';
 import * as path9 from 'path';
 import path9__default, { dirname } from 'path';
 import { createRequire, builtinModules } from 'module';
@@ -14,9 +15,11 @@ import os from 'os';
 import tty from 'tty';
 import fs from 'fs/promises';
 import assert2 from 'assert';
+import fs6, { realpathSync, statSync, Stats } from 'fs';
 import v8 from 'v8';
 import { format, inspect } from 'util';
 import consola$1, { consola } from 'consola';
+import { fileURLToPath as fileURLToPath$1 } from 'node:url';
 
 // ../../node_modules/.pnpm/fast-deep-equal@3.1.3/node_modules/fast-deep-equal/index.js
 var require_fast_deep_equal = __commonJS({
@@ -54,10 +57,10 @@ var require_fast_deep_equal = __commonJS({
 // ../cli.cmd.typescript/build/esm/generate/handleGenerate.mjs
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/index.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/index.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
 init_esm_shims();
 
 // ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.3.0/node_modules/@osdk/shared.net.platformapi/build/esm/index.js
@@ -168,34 +171,34 @@ function parseUrl(baseUrl, endpointPath) {
   return new URL(`api${endpointPath}`, baseUrl);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/AttachmentPropertyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/AttachmentPropertyV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/LinkedObjectV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/LinkedObjectV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyV2.js
 var OntologyV2_exports = {};
 __export(OntologyV2_exports, {
   get: () => get,
@@ -216,16 +219,16 @@ function getFullMetadata($ctx, ...args) {
   return foundryPlatformFetch($ctx, _getFullMetadata, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.13.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.16.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
 init_esm_shims();
 
 // ../generator/build/esm/index.js
@@ -265,7 +268,7 @@ var AbstractImportable = class {
   }
   getImportPathRelTo = (filePath) => {
     if (this.importPath.startsWith(".")) {
-      const result = path9.relative(path9.dirname(filePath), this.importPath).split(path9.sep).join("/");
+      const result = path19.relative(path19.dirname(filePath), this.importPath).split(path19.sep).join("/");
       if (result.startsWith(".")) {
         return result;
       } else {
@@ -432,8 +435,8 @@ function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(interfaceType, v2,
     apiName: interfaceType.apiName,
     displayName: interfaceType.displayName,
     description: interfaceType.description,
-    implements: interfaceType.extendsInterfaces,
-    properties: Object.fromEntries(Object.entries(interfaceType.properties).map(([key2, value]) => {
+    implements: interfaceType.allExtendsInterfaces ?? interfaceType.extendsInterfaces,
+    properties: Object.fromEntries(Object.entries(interfaceType.allProperties ?? interfaceType.properties).map(([key2, value]) => {
       return [key2, wirePropertyV2ToSdkPropertyDefinition(value, true, log)];
     }).filter(([key2, value]) => value != null)),
     links: {},
@@ -727,6 +730,20 @@ function wireQueryDataTypeToQueryDataTypeDefinition(input) {
         threeDimensionalAggregation: get3DQueryAggregationProps(input),
         nullable: false
       };
+    case "entrySet":
+      const keyType = wireQueryDataTypeToQueryDataTypeDefinition(input.keyType);
+      if (!validMapKeyTypes.includes(keyType.type)) {
+        throw new Error("Map types with a key type of " + keyType.type + " are not supported" + validMapKeyTypes.toString());
+      }
+      if (keyType.multiplicity === true) {
+        throw new Error("Map types cannot have keys as arrays");
+      }
+      return {
+        type: "map",
+        nullable: false,
+        keyType,
+        valueType: wireQueryDataTypeToQueryDataTypeDefinition(input.valueType)
+      };
     case "null":
     case "unsupported":
       throw new Error(`Unable to process query because the server indicated an unsupported QueryDataType.type: ${input.type}. Please check that your query is using supported types.`);
@@ -771,6 +788,7 @@ function get3DQueryAggregationProps(input) {
 function guardInvalidKeyTypes(key2) {
   return key2.type === "string" || key2.type === "boolean";
 }
+var validMapKeyTypes = ["string", "object", "double", "float", "integer", "long", "date", "timestamp", "byte", "datetime", "decimal", "marking", "short", "objectType"];
 
 // ../generator-converters/build/esm/wireQueryTypeV2ToSdkQueryMetadata.js
 init_esm_shims();
@@ -17484,7 +17502,7 @@ function read2(jsonPath, { base, specifier }) {
   }
   let string;
   try {
-    string = fs8__default.readFileSync(path9__default.toNamespacedPath(jsonPath), "utf8");
+    string = fs6.readFileSync(path9__default.toNamespacedPath(jsonPath), "utf8");
   } catch (error) {
     const exception2 = (
       /** @type {ErrnoException} */
@@ -18393,7 +18411,7 @@ var import_n_readlines = __toESM2(require_readlines());
 function getInterpreter(file) {
   let fd;
   try {
-    fd = fs8__default.openSync(file, "r");
+    fd = fs6.openSync(file, "r");
   } catch {
     return;
   }
@@ -18410,7 +18428,7 @@ function getInterpreter(file) {
     }
   } finally {
     try {
-      fs8__default.closeSync(fd);
+      fs6.closeSync(fd);
     } catch {
     }
   }
@@ -21078,7 +21096,7 @@ function createParsersAndPrinters(modules) {
 }
 var options7 = { ...options_default, ...options_default2, ...options_default3, ...options_default4, ...options_default5, ...options_default6 };
 var languages = [...languages_evaluate_default, ...languages_evaluate_default2, ...languages_evaluate_default3, ...languages_evaluate_default4, ...languages_evaluate_default5, ...languages_evaluate_default6, ...languages_evaluate_default7, ...languages_evaluate_default8];
-var { parsers, printers } = createParsersAndPrinters([{ importPlugin: () => import('./acorn-LQZJTRX7.js'), parsers: ["acorn", "espree"] }, { importPlugin: () => import('./angular-VWUX447C.js'), parsers: ["__ng_action", "__ng_binding", "__ng_interpolation", "__ng_directive"] }, { importPlugin: () => import('./babel-7BWEVLBS.js'), parsers: ["babel", "babel-flow", "babel-ts", "__js_expression", "__ts_expression", "__vue_expression", "__vue_ts_expression", "__vue_event_binding", "__vue_ts_event_binding", "__babel_estree", "json", "json5", "jsonc", "json-stringify"] }, { importPlugin: () => import('./estree-PI6JMQNR.js'), printers: ["estree", "estree-json"] }, { importPlugin: () => import('./flow-AP4DEOL5.js'), parsers: ["flow"] }, { importPlugin: () => import('./glimmer-LM2ZFC5U.js'), parsers: ["glimmer"], printers: ["glimmer"] }, { importPlugin: () => import('./graphql-U5CPDQKQ.js'), parsers: ["graphql"], printers: ["graphql"] }, { importPlugin: () => import('./html-FNGHE355.js'), parsers: ["html", "angular", "vue", "lwc"], printers: ["html"] }, { importPlugin: () => import('./markdown-HUHOYR5Q.js'), parsers: ["markdown", "mdx", "remark"], printers: ["mdast"] }, { importPlugin: () => import('./meriyah-WP7UQXC7.js'), parsers: ["meriyah"] }, { importPlugin: () => import('./postcss-JMNG34CL.js'), parsers: ["css", "less", "scss"], printers: ["postcss"] }, { importPlugin: () => import('./typescript-A4QI3FB6.js'), parsers: ["typescript"] }, { importPlugin: () => import('./yaml-IT3UOTAK.js'), parsers: ["yaml"], printers: ["yaml"] }]);
+var { parsers, printers } = createParsersAndPrinters([{ importPlugin: () => import('./acorn-RXMSUCXL.js'), parsers: ["acorn", "espree"] }, { importPlugin: () => import('./angular-ZXAN5BMN.js'), parsers: ["__ng_action", "__ng_binding", "__ng_interpolation", "__ng_directive"] }, { importPlugin: () => import('./babel-TI7T67T2.js'), parsers: ["babel", "babel-flow", "babel-ts", "__js_expression", "__ts_expression", "__vue_expression", "__vue_ts_expression", "__vue_event_binding", "__vue_ts_event_binding", "__babel_estree", "json", "json5", "jsonc", "json-stringify"] }, { importPlugin: () => import('./estree-CSIG7D6Y.js'), printers: ["estree", "estree-json"] }, { importPlugin: () => import('./flow-NUNWZLRW.js'), parsers: ["flow"] }, { importPlugin: () => import('./glimmer-GYUSOBQY.js'), parsers: ["glimmer"], printers: ["glimmer"] }, { importPlugin: () => import('./graphql-OALHBC5M.js'), parsers: ["graphql"], printers: ["graphql"] }, { importPlugin: () => import('./html-4RLNYFM4.js'), parsers: ["html", "angular", "vue", "lwc"], printers: ["html"] }, { importPlugin: () => import('./markdown-MRACSGE5.js'), parsers: ["markdown", "mdx", "remark"], printers: ["mdast"] }, { importPlugin: () => import('./meriyah-LVMHXIGF.js'), parsers: ["meriyah"] }, { importPlugin: () => import('./postcss-A2ITI5N4.js'), parsers: ["css", "less", "scss"], printers: ["postcss"] }, { importPlugin: () => import('./typescript-BMNHHGAA.js'), parsers: ["typescript"] }, { importPlugin: () => import('./yaml-XQ236J4T.js'), parsers: ["yaml"], printers: ["yaml"] }]);
 function loadBuiltinPlugins() {
   return [builtin_plugins_proxy_exports];
 }
@@ -21325,7 +21343,7 @@ function formatTs(contents) {
 }
 
 // ../generator/build/esm/v2.0/generateMetadata.js
-var ExpectedOsdkVersion = "2.1.1";
+var ExpectedOsdkVersion = "2.2.0";
 async function generateOntologyMetadataFile({
   fs: fs9,
   outDir,
@@ -21408,12 +21426,12 @@ async function generatePerActionDataFiles({
   ontology: enhancedOntology,
   forInternalUse = false
 }) {
-  const outDir = path9__default.join(rootOutDir, "ontology", "actions");
+  const outDir = path19__default.join(rootOutDir, "ontology", "actions");
   await fs9.mkdir(outDir, {
     recursive: true
   });
   await Promise.all(Object.values(enhancedOntology.actionTypes).map(async (action) => {
-    const currentFilePath = path9__default.join("ontology", "actions", `${action.shortApiName}.ts`);
+    const currentFilePath = path19__default.join("ontology", "actions", `${action.shortApiName}.ts`);
     const uniqueApiNamesArray = extractReferencedObjectsFromAction(action.raw);
     const uniqueApiNames = new Set(uniqueApiNamesArray);
     stringUnionFrom([...uniqueApiNames]);
@@ -21499,7 +21517,7 @@ async function generatePerActionDataFiles({
       }
     }
     const imports = getObjectImports(referencedObjectDefs, undefined, currentFilePath, true);
-    await fs9.writeFile(path9__default.join(rootOutDir, currentFilePath), await formatTs(`
+    await fs9.writeFile(path19__default.join(rootOutDir, currentFilePath), await formatTs(`
           import type {
             ActionDefinition,
             ActionMetadata,
@@ -21587,8 +21605,8 @@ async function generatePerActionDataFiles({
     }()}
         `));
   }));
-  const indexFileRelPath = path9__default.join("ontology", "actions.ts");
-  await fs9.writeFile(path9__default.join(rootOutDir, indexFileRelPath), await formatTs(`
+  const indexFileRelPath = path19__default.join("ontology", "actions.ts");
+  await fs9.writeFile(path19__default.join(rootOutDir, indexFileRelPath), await formatTs(`
       ${Object.values(enhancedOntology.actionTypes).map((action) => {
     const exportConstLine = `export {${action.shortApiName} } from "${action.getImportPathRelTo(indexFileRelPath)}";`;
     return exportConstLine;
@@ -21995,13 +22013,13 @@ async function generatePerInterfaceDataFiles({
   importExt,
   forInternalUse
 }) {
-  const interfacesDir = path9__default.join(outDir, "ontology", "interfaces");
+  const interfacesDir = path19__default.join(outDir, "ontology", "interfaces");
   await fs9.mkdir(interfacesDir, {
     recursive: true
   });
   for (const obj of Object.values(ontology.interfaceTypes)) {
     if (obj instanceof ForeignType) continue;
-    await fs9.writeFile(path9__default.join(interfacesDir, `${obj.shortApiName}.ts`), await formatTs(`
+    await fs9.writeFile(path19__default.join(interfacesDir, `${obj.shortApiName}.ts`), await formatTs(`
         import type { PropertyDef as $PropertyDef } from "${forInternalUse ? "@osdk/api" : "@osdk/client"}";
         import { $osdkMetadata } from "../../OntologyMetadata${importExt}";
       ${__UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(obj, ontology, true, forInternalUse)}
@@ -22022,13 +22040,13 @@ async function generatePerObjectDataFiles(ctx) {
     ontology,
     importExt
   } = ctx;
-  await fs9.mkdir(path9__default.join(outDir, "ontology", "objects"), {
+  await fs9.mkdir(path19__default.join(outDir, "ontology", "objects"), {
     recursive: true
   });
   for (const obj of Object.values(ontology.objectTypes)) {
     if (obj instanceof ForeignType) continue;
-    const relPath = path9__default.join(".", "ontology", `objects`, `${obj.shortApiName}.ts`);
-    const outFilePath = path9__default.join(outDir, relPath);
+    const relPath = path19__default.join(".", "ontology", `objects`, `${obj.shortApiName}.ts`);
+    const outFilePath = path19__default.join(outDir, relPath);
     await fs9.writeFile(outFilePath, await formatTs(`
         import type { PropertyDef as $PropertyDef } from "${ctx.forInternalUse ? "@osdk/api" : "@osdk/client"}";
         import { $osdkMetadata } from "../../OntologyMetadata${importExt}";
@@ -22036,7 +22054,7 @@ async function generatePerObjectDataFiles(ctx) {
         ${wireObjectTypeV2ToSdkObjectConstV2(obj.raw, ctx, relPath)}
       `));
   }
-  await fs9.writeFile(path9__default.join(outDir, "ontology", "objects.ts"), await formatTs(`
+  await fs9.writeFile(path19__default.join(outDir, "ontology", "objects.ts"), await formatTs(`
     ${Object.values(ctx.ontology.objectTypes).filter((o) => o instanceof EnhancedObjectType).map((objType) => `export {${objType.shortApiName}} from "./objects/${objType.shortApiName}${importExt}";`).join("\n")}
     ${Object.keys(ontology.objectTypes).length === 0 ? "export {};" : ""}
     `));
@@ -22072,6 +22090,10 @@ function getObjectTypesFromQueryDataType(dataType, types) {
         getObjectTypesFromQueryDataType(type2, types);
       }
       return;
+    case "entrySet":
+      getObjectTypesFromQueryDataType(dataType.keyType, types);
+      getObjectTypesFromQueryDataType(dataType.valueType, types);
+      return;
     case "attachment":
     case "boolean":
     case "date":
@@ -22084,6 +22106,7 @@ function getObjectTypesFromQueryDataType(dataType, types) {
     case "threeDimensionalAggregation":
     case "timestamp":
     case "twoDimensionalAggregation":
+    case "entrySet":
     case "unsupported":
       return;
     default:
@@ -22111,8 +22134,8 @@ async function generatePerQueryDataFilesV2({
   importExt = "",
   forInternalUse = false
 }) {
-  const relOutDir = path9__default.join(".", "ontology", "queries");
-  const outDir = path9__default.join(rootOutDir, "ontology", "queries");
+  const relOutDir = path19__default.join(".", "ontology", "queries");
+  const outDir = path19__default.join(rootOutDir, "ontology", "queries");
   await fs9.mkdir(outDir, {
     recursive: true
   });
@@ -22125,15 +22148,15 @@ async function generatePerQueryDataFilesV2({
     `));
 }
 async function generateV2QueryFile(fs9, outDir, relOutDir, query, importExt, ontology, forInternalUse) {
-  const relFilePath = path9__default.join(relOutDir, `${query.shortApiName}.ts`);
+  const relFilePath = path19__default.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));
   objectTypes.length > 0 ? objectTypes.map((apiNameObj) => `"${apiNameObj}"`).join("|") : "never";
-  await fs9.writeFile(path9__default.join(outDir, `${query.shortApiName}.ts`), await formatTs(`
-        import type { QueryDefinition , QueryParam, QueryResult, VersionBound} from "${forInternalUse ? "@osdk/api" : "@osdk/client"}";
+  await fs9.writeFile(path19__default.join(outDir, `${query.shortApiName}.ts`), await formatTs(`
+        import type { ObjectSpecifier, QueryDefinition, QueryParam, QueryResult, VersionBound} from "${forInternalUse ? "@osdk/api" : "@osdk/client"}";
         import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
         import { $osdkMetadata} from "../../OntologyMetadata${importExt}";
         ${importObjects}
@@ -22237,7 +22260,7 @@ function queryParamJsDoc(param, {
 `;
   return ret;
 }
-function getQueryParamType(enhancedOntology, input, type2) {
+function getQueryParamType(enhancedOntology, input, type2, isMapKey = false) {
   let inner = `unknown /* ${input.type} */`;
   switch (input.type) {
     case "date":
@@ -22271,6 +22294,10 @@ function getQueryParamType(enhancedOntology, input, type2) {
         "${input.threeDimensionalAggregation.valueType.valueType}">`;
       break;
     case "object":
+      if (isMapKey) {
+        inner = `ObjectSpecifier<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
+        break;
+      }
       inner = `Query${type2}.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "objectSet":
@@ -22282,6 +22309,8 @@ function getQueryParamType(enhancedOntology, input, type2) {
     case "union":
       inner = input.union.map((u) => getQueryParamType(enhancedOntology, u, type2)).join(" | ");
       break;
+    case "map":
+      inner = `Record<${getQueryParamType(enhancedOntology, input.keyType, type2, true)}, ${getQueryParamType(enhancedOntology, input.valueType, type2)}>`;
   }
   if (input.multiplicity && type2 === "Param") {
     return `ReadonlyArray<${inner}>`;
@@ -22300,7 +22329,7 @@ async function generateRootIndexTsFile({
   ontologyApiNamespace,
   ontology
 }) {
-  await fs9.writeFile(path9__default.join(outDir, "index.ts"), await formatTs(`export {${helper(ontology.actionTypes)}} from "./ontology/actions${importExt}";
+  await fs9.writeFile(path19__default.join(outDir, "index.ts"), await formatTs(`export {${helper(ontology.actionTypes)}} from "./ontology/actions${importExt}";
         export * as $Actions from "./ontology/actions${importExt}";
         export {${helper(ontology.interfaceTypes)}} from "./ontology/interfaces${importExt}";
         export * as $Interfaces from "./ontology/interfaces${importExt}";
@@ -22354,24 +22383,24 @@ async function generateClientSdkPackage(packageName, packageVersion, sdkVersion,
     throw new Error("This generator version does not support generating v1 sdks");
   }
   for (const packageType of ["module", "commonjs"]) {
-    const outDir = path9.join(baseOutDir, "dist", packageType);
+    const outDir = path19.join(baseOutDir, "dist", packageType);
     await generateClientSdkVersionTwoPointZero(ontology, `typescript-sdk/${packageVersion} osdk-cli/${cliVersion}`, minimalFs, outDir, packageType, externalObjects, externalInterfaces);
     await fs8.promises.mkdir(outDir, {
       recursive: true
     });
-    await writeJson(minimalFs, path9.join(outDir, "package.json"), {
+    await writeJson(minimalFs, path19.join(outDir, "package.json"), {
       type: packageType
     });
-    await writeJson(minimalFs, path9.join(outDir, `tsconfig.json`), {
+    await writeJson(minimalFs, path19.join(outDir, `tsconfig.json`), {
       compilerOptions: getTsCompilerOptions(packageType)
     });
   }
-  await writeJson(minimalFs, path9.join(baseOutDir, "package.json"), getPackageJsonContents(packageName, packageVersion, dependencyVersions));
-  await minimalFs.mkdir(path9.join(baseOutDir, "ontology"), {
+  await writeJson(minimalFs, path19.join(baseOutDir, "package.json"), getPackageJsonContents(packageName, packageVersion, dependencyVersions));
+  await minimalFs.mkdir(path19.join(baseOutDir, "ontology"), {
     recursive: true
   });
-  await minimalFs.writeFile(path9.join(baseOutDir, "ontology", "objects.js"), `module.exports = require("../../dist/module/ontology/objects")`);
-  await minimalFs.writeFile(path9.join(baseOutDir, "ontology", "objects.d.ts"), `export * from "../dist/module/ontology/objects"`);
+  await minimalFs.writeFile(path19.join(baseOutDir, "ontology", "objects.js"), `module.exports = require("../../dist/module/ontology/objects")`);
+  await minimalFs.writeFile(path19.join(baseOutDir, "ontology", "objects.d.ts"), `export * from "../dist/module/ontology/objects"`);
 }
 function getTsCompilerOptions(packageType) {
   const commonTsconfig = {
@@ -22485,7 +22514,7 @@ function createSharedClientContext(baseUrl, tokenProvider, userAgent, fetchFn =
 
 // ../cli.cmd.typescript/build/esm/generate/handleGenerate.mjs
 var import_fast_deep_equal2 = __toESM(require_fast_deep_equal(), 1);
-var USER_AGENT = `osdk-cli.cmd.typescript/${"0.25.1"}`;
+var USER_AGENT = `osdk-cli.cmd.typescript/${"0.26.0-beta.10"}`;
 async function handleGenerate(args) {
   let success = false;
   if (args.ontologyPath) {
@@ -22559,7 +22588,7 @@ async function generateFromStack(args) {
       return {
         ...x,
         extendsInterfaces: [...x.extendsInterfaces].sort(),
-        properties: sortKeys2(x.properties)
+        properties: sortKeys2(x.allProperties ?? x.properties)
       };
     });
     ontology.queryTypes = sortKeys2(ontology.queryTypes, (x) => {
@@ -22621,7 +22650,7 @@ async function generateClientSdk(ontology, args) {
       }
       return true;
     }
-    await generateClientSdkPackage(args.packageName, args.version, args.beta ? "2.0" : "1.1", args.outDir, ontology, minimalFs, await getDependencyVersions(), "0.25.1", args.externalObjects, args.externalInterfaces);
+    await generateClientSdkPackage(args.packageName, args.version, args.beta ? "2.0" : "1.1", args.outDir, ontology, minimalFs, await getDependencyVersions(), "0.26.0-beta.10", args.externalObjects, args.externalInterfaces);
     return true;
   } catch (e) {
     consola.error("OSDK generation failed", e.message, e.stack);
@@ -22648,15 +22677,15 @@ async function getDependencyVersions() {
     typescriptVersion,
     tslibVersion,
     areTheTypesWrongVersion,
-    osdkApiVersion: `^${"2.1.1"}`,
-    osdkClientVersion: `^${"2.1.1"}`,
+    osdkApiVersion: `^${"2.2.0-beta.10"}`,
+    osdkClientVersion: `^${"2.2.0-beta.10"}`,
     osdkLegacyClientVersion
   };
 }
 var cachedOurPackageJsonPath;
 async function getOurPackageJsonPath() {
   if (cachedOurPackageJsonPath) return cachedOurPackageJsonPath;
-  const __dir = path9.dirname(fileURLToPath(import.meta.url));
+  const __dir = path19.dirname(fileURLToPath$1(import.meta.url));
   const ourPackageJsonPath = await findUp("package.json", {
     cwd: __dir
   });
@@ -22688,5 +22717,5 @@ function createNormalFs() {
 }
 
 export { getDependencyVersions, handleGenerate, updateVersionsIfTheyExist };
-//# sourceMappingURL=handleGenerate-VS7LGEFI.js.map
-//# sourceMappingURL=handleGenerate-VS7LGEFI.js.map
+//# sourceMappingURL=handleGenerate-UQQTMEXV.js.map
+//# sourceMappingURL=handleGenerate-UQQTMEXV.js.map