@osdk/cli 0.30.0-beta.1 → 0.30.0-beta.3

package/build/esm/{handleGenerate-62KRK76V.js → handleGenerate-I5KZ7RQ3.js}

@@ -54,16 +54,16 @@ var require_fast_deep_equal = __commonJS({
 // ../cli.cmd.typescript/build/esm/generate/handleGenerate.mjs
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/index.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/index.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Action.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.4.0/node_modules/@osdk/shared.net.platformapi/build/esm/index.js
+// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.5.0/node_modules/@osdk/shared.net.platformapi/build/esm/index.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.4.0/node_modules/@osdk/shared.net.platformapi/build/esm/foundryPlatformFetch.js
+// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.5.0/node_modules/@osdk/shared.net.platformapi/build/esm/foundryPlatformFetch.js
 init_esm_shims();
 
 // ../../node_modules/.pnpm/@osdk+shared.client@1.0.1/node_modules/@osdk/shared.client/index.js
@@ -74,40 +74,34 @@ var symbolClientContext = Symbol("ClientContext");
 init_esm_shims();
 var symbolClientContext2 = "__osdkClientContext";
 
-// ../../node_modules/.pnpm/@osdk+shared.net.errors@2.0.1/node_modules/@osdk/shared.net.errors/build/esm/index.js
+// ../../node_modules/.pnpm/@osdk+shared.net.errors@2.5.0-beta.2/node_modules/@osdk/shared.net.errors/build/esm/index.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+shared.net.errors@2.0.1/node_modules/@osdk/shared.net.errors/build/esm/PalantirApiError.js
+// ../../node_modules/.pnpm/@osdk+shared.net.errors@2.5.0-beta.2/node_modules/@osdk/shared.net.errors/build/esm/PalantirApiError.js
 init_esm_shims();
 var PalantirApiError2 = class extends Error {
-  message;
-  errorName;
-  errorCode;
-  statusCode;
-  errorInstanceId;
-  parameters;
-  constructor(message, errorName, errorCode, statusCode, errorInstanceId, parameters) {
+  constructor(message, errorName, errorCode, errorDescription, statusCode, errorInstanceId, parameters) {
     super(message);
     this.message = message;
     this.errorName = errorName;
     this.errorCode = errorCode;
+    this.errorDescription = errorDescription;
     this.statusCode = statusCode;
     this.errorInstanceId = errorInstanceId;
     this.parameters = parameters;
   }
 };
 
-// ../../node_modules/.pnpm/@osdk+shared.net.errors@2.0.1/node_modules/@osdk/shared.net.errors/build/esm/UnknownError.js
+// ../../node_modules/.pnpm/@osdk+shared.net.errors@2.5.0-beta.2/node_modules/@osdk/shared.net.errors/build/esm/UnknownError.js
 init_esm_shims();
 var UnknownError = class extends PalantirApiError2 {
-  originalError;
-  constructor(message, errorType, originalError) {
-    super(message, errorType);
+  constructor(message, errorName, originalError, statusCode) {
+    super(message, errorName, void 0, void 0, statusCode);
     this.originalError = originalError;
   }
 };
 
-// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.4.0/node_modules/@osdk/shared.net.platformapi/build/esm/foundryPlatformFetch.js
+// ../../node_modules/.pnpm/@osdk+shared.net.platformapi@1.5.0/node_modules/@osdk/shared.net.platformapi/build/esm/foundryPlatformFetch.js
 async function foundryPlatformFetch(client, [httpMethodNum, origPath, flags, contentType, responseContentType], ...args) {
   const path23 = origPath.replace(/\{([^}]+)\}/g, () => encodeURIComponent(args.shift()));
   const body = flags & 1 ? args.shift() : void 0;
@@ -151,7 +145,7 @@ async function apiFetch(clientCtx, method, endpointPath, data, queryArguments, h
   if (!response.ok) {
     try {
       const convertedError = await response.json();
-      return new PalantirApiError2(convertedError.message, convertedError.errorName, convertedError.errorCode, response.status, convertedError.errorInstanceId, convertedError.parameters);
+      return new PalantirApiError2(convertedError.message, convertedError.errorName, convertedError.errorCode, convertedError.errorDescription, response.status, convertedError.errorInstanceId, convertedError.parameters);
     } catch (e) {
       if (e instanceof Error) {
         return new UnknownError(e.message, "UNKNOWN");
@@ -172,40 +166,43 @@ function parseUrl(baseUrl, endpointPath) {
   return new URL(`api${endpointPath}`, baseUrl);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeFullMetadata.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ActionTypeV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/AttachmentPropertyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Attachment.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/CipherTextProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/AttachmentPropertyV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/LinkedObjectV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/CipherTextProperty.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/LinkedObjectV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/MediaReferenceProperty.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/ObjectTypeV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyInterface.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectSet.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyTransaction.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyObjectV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyTransaction.js
+init_esm_shims();
+
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyV2.js
 var OntologyV2_exports = {};
 __export(OntologyV2_exports, {
   get: () => get,
@@ -231,19 +228,19 @@ function loadMetadata($ctx, ...args) {
   return foundryPlatformFetch($ctx, _loadMetadata, ...args);
 }
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyValueType.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/OntologyValueType.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/Query.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/QueryType.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesPropertyV2.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.30.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
+// ../../node_modules/.pnpm/@osdk+foundry.ontologies@2.38.0/node_modules/@osdk/foundry.ontologies/build/esm/public/TimeSeriesValueBankProperty.js
 init_esm_shims();
 
 // ../generator/build/esm/index.js
@@ -343,6 +340,251 @@ init_esm_shims();
 
 // ../generator-converters/build/esm/wirePropertyV2ToSdkPropertyDefinition.js
 init_esm_shims();
+
+// ../generator-converters/build/esm/wirePropertyFormattingToSdkFormatting.js
+init_esm_shims();
+
+// ../generator-converters/build/esm/valueFormatting/convertBooleanValueFormattingRule.js
+init_esm_shims();
+function convertBooleanFormattingRule(wireFormatting) {
+  return {
+    type: "boolean",
+    valueIfTrue: wireFormatting.valueIfTrue,
+    valueIfFalse: wireFormatting.valueIfFalse
+  };
+}
+
+// ../generator-converters/build/esm/valueFormatting/convertDateAndTimestampValueFormattingRule.js
+init_esm_shims();
+
+// ../generator-converters/build/esm/valueFormatting/commonValueFormattingUtils.js
+init_esm_shims();
+function convertPropertyTypeReferenceOrStringConstant(value) {
+  switch (value.type) {
+    case "constant":
+      return {
+        type: "constant",
+        value: value.value
+      };
+    case "propertyType":
+      return {
+        type: "propertyType",
+        propertyApiName: value.propertyApiName
+      };
+    default:
+      throw new Error(`Unknown property reference type: ${value.type}`);
+  }
+}
+
+// ../generator-converters/build/esm/valueFormatting/convertDateAndTimestampValueFormattingRule.js
+function convertDateFormattingRule(wireFormatting) {
+  return {
+    type: "date",
+    format: convertDatetimeFormat(wireFormatting.format)
+  };
+}
+function convertTimestampFormattingRule(wireFormatting) {
+  return {
+    type: "timestamp",
+    format: convertDatetimeFormat(wireFormatting.format),
+    displayTimezone: convertDatetimeTimezone(wireFormatting.displayTimezone)
+  };
+}
+function convertDatetimeFormat(wireFormat) {
+  switch (wireFormat.type) {
+    case "stringFormat":
+      return {
+        type: "stringFormat",
+        pattern: wireFormat.pattern
+      };
+    case "localizedFormat":
+      return {
+        type: "localizedFormat",
+        format: wireFormat.format
+      };
+    default:
+      throw new Error(`Unknown datetime format type: ${wireFormat.type}`);
+  }
+}
+function convertDatetimeTimezone(wireTimezone) {
+  switch (wireTimezone.type) {
+    case "static":
+      return {
+        type: "static",
+        zoneId: convertPropertyTypeReferenceOrStringConstant(wireTimezone.zoneId)
+      };
+    case "user":
+      return {
+        type: "user"
+      };
+    default:
+      throw new Error(`Unknown timezone type: ${wireTimezone.type}`);
+  }
+}
+
+// ../generator-converters/build/esm/valueFormatting/convertKnownTypeValueFormattingRule.js
+init_esm_shims();
+function convertKnownTypeFormattingRule(wireFormatting) {
+  switch (wireFormatting.knownType) {
+    case "ARTIFACT_GID":
+      return {
+        type: "knownType",
+        knownType: "ARTIFACT_GID"
+      };
+    case "RESOURCE_RID":
+      return {
+        type: "knownType",
+        knownType: "RESOURCE_RID"
+      };
+    case "USER_OR_GROUP_ID":
+      return {
+        type: "knownType",
+        knownType: "USER_OR_GROUP_ID"
+      };
+    default:
+      wireFormatting.knownType;
+      return void 0;
+  }
+}
+
+// ../generator-converters/build/esm/valueFormatting/convertNumberValueFormattingRule.js
+init_esm_shims();
+function convertNumberFormattingRule(wireFormatting) {
+  const numberType = convertNumberFormattingType(wireFormatting.numberType);
+  if (!numberType) {
+    return void 0;
+  }
+  return {
+    type: "number",
+    numberType
+  };
+}
+function convertNumberFormatOptions(wireOptions) {
+  return {
+    useGrouping: wireOptions.useGrouping,
+    convertNegativeToParenthesis: wireOptions.convertNegativeToParenthesis,
+    minimumIntegerDigits: wireOptions.minimumIntegerDigits,
+    minimumFractionDigits: wireOptions.minimumFractionDigits,
+    maximumFractionDigits: wireOptions.maximumFractionDigits,
+    minimumSignificantDigits: wireOptions.minimumSignificantDigits,
+    maximumSignificantDigits: wireOptions.maximumSignificantDigits,
+    notation: wireOptions.notation,
+    roundingMode: wireOptions.roundingMode
+  };
+}
+function convertDurationFormatStyle(formatStyle) {
+  switch (formatStyle.type) {
+    case "humanReadable":
+      return {
+        type: "humanReadable",
+        showFullUnits: formatStyle.showFullUnits
+      };
+    case "timecode":
+      return {
+        type: "timecode"
+      };
+    default:
+      throw new Error(`Unknown duration format style: ${formatStyle.type}`);
+  }
+}
+function convertNumberFormattingType(wireNumberType) {
+  switch (wireNumberType.type) {
+    case "standard":
+      return {
+        type: "standard",
+        baseFormatOptions: convertNumberFormatOptions(wireNumberType.baseFormatOptions)
+      };
+    case "fixedValues":
+      return {
+        type: "fixedValues",
+        values: wireNumberType.values
+      };
+    case "currency": {
+      return {
+        type: "currency",
+        baseFormatOptions: convertNumberFormatOptions(wireNumberType.baseFormatOptions),
+        style: wireNumberType.style,
+        currencyCode: convertPropertyTypeReferenceOrStringConstant(wireNumberType.currencyCode)
+      };
+    }
+    case "standardUnit": {
+      return {
+        type: "standardUnit",
+        baseFormatOptions: convertNumberFormatOptions(wireNumberType.baseFormatOptions),
+        unit: convertPropertyTypeReferenceOrStringConstant(wireNumberType.unit)
+      };
+    }
+    case "customUnit": {
+      return {
+        type: "customUnit",
+        baseFormatOptions: convertNumberFormatOptions(wireNumberType.baseFormatOptions),
+        unit: convertPropertyTypeReferenceOrStringConstant(wireNumberType.unit)
+      };
+    }
+    case "affix": {
+      return {
+        type: "affix",
+        baseFormatOptions: convertNumberFormatOptions(wireNumberType.baseFormatOptions),
+        affix: {
+          prefix: wireNumberType.affix?.prefix != null ? convertPropertyTypeReferenceOrStringConstant(wireNumberType.affix.prefix) : void 0,
+          postfix: wireNumberType.affix?.postfix != null ? convertPropertyTypeReferenceOrStringConstant(wireNumberType.affix.postfix) : void 0
+        }
+      };
+    }
+    case "duration": {
+      return {
+        type: "duration",
+        formatStyle: convertDurationFormatStyle(wireNumberType.formatStyle),
+        precision: wireNumberType.precision,
+        baseValue: wireNumberType.baseValue
+      };
+    }
+    case "scale": {
+      return {
+        type: "scale",
+        scaleType: wireNumberType.scaleType,
+        baseFormatOptions: convertNumberFormatOptions(wireNumberType.baseFormatOptions)
+      };
+    }
+    case "ratio": {
+      return {
+        type: "ratio",
+        ratioType: wireNumberType.ratioType,
+        baseFormatOptions: convertNumberFormatOptions(wireNumberType.baseFormatOptions)
+      };
+    }
+    default:
+      throw new Error(`Unknown number format type: ${wireNumberType.type}`);
+  }
+}
+
+// ../generator-converters/build/esm/wirePropertyFormattingToSdkFormatting.js
+function wirePropertyFormattingToSdkFormatting(wireFormatting, log) {
+  try {
+    return convertPropertyFormattingInternal(wireFormatting);
+  } catch (error) {
+    log?.info(`Failed to convert property formatting rule: ${error}`);
+    return void 0;
+  }
+}
+function convertPropertyFormattingInternal(wireFormatting) {
+  switch (wireFormatting.type) {
+    case "date":
+      return convertDateFormattingRule(wireFormatting);
+    case "timestamp":
+      return convertTimestampFormattingRule(wireFormatting);
+    case "boolean":
+      return convertBooleanFormattingRule(wireFormatting);
+    case "knownType":
+      return convertKnownTypeFormattingRule(wireFormatting);
+    case "number":
+      return convertNumberFormattingRule(wireFormatting);
+    default:
+      throw new Error(`Unknown formatting type: ${wireFormatting.type}`);
+  }
+}
+
+// ../generator-converters/build/esm/wirePropertyV2ToSdkPropertyDefinition.js
 function wirePropertyV2ToSdkPropertyDefinition(input, isNullable = true, log) {
   const sdkPropDefinition = objectPropertyTypeToSdkPropertyDefinition(input.dataType, log);
   if (sdkPropDefinition == null) {
@@ -375,7 +617,8 @@ function wirePropertyV2ToSdkPropertyDefinition(input, isNullable = true, log) {
         description: input.description,
         type: sdkPropDefinition,
         nullable: input.nullable == null ? isNullable : input.nullable,
-        valueTypeApiName: input.valueTypeApiName
+        valueTypeApiName: input.valueTypeApiName,
+        valueFormatting: input.valueFormatting != null ? wirePropertyFormattingToSdkFormatting(input.valueFormatting, log) : void 0
       };
     case "array": {
       return {
@@ -384,7 +627,8 @@ function wirePropertyV2ToSdkPropertyDefinition(input, isNullable = true, log) {
         description: input.description,
         type: sdkPropDefinition,
         nullable: true,
-        valueTypeApiName: input.valueTypeApiName
+        valueTypeApiName: input.valueTypeApiName,
+        valueFormatting: input.valueFormatting != null ? wirePropertyFormattingToSdkFormatting(input.valueFormatting, log) : void 0
       };
     }
     case "cipherText": {
@@ -719,7 +963,9 @@ function wireQueryDataTypeToQueryDataTypeDefinition(input) {
       };
     case "array":
       return {
-        ...wireQueryDataTypeToQueryDataTypeDefinition(input.subType),
+        array: wireQueryDataTypeToQueryDataTypeDefinition(input.subType),
+        type: "array",
+        nullable: isNullableQueryDataType(input.subType),
         multiplicity: true
       };
     case "set":
@@ -773,7 +1019,7 @@ function wireQueryDataTypeToQueryDataTypeDefinition(input) {
       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) {
+      if (keyType.type === "array") {
         throw new Error("Map types cannot have keys as arrays");
       }
       return {
@@ -17458,7 +17704,7 @@ function formatTs(contents) {
 }
 
 // ../generator/build/esm/v2.0/generateMetadata.js
-var ExpectedOsdkVersion = "2.5.0";
+var ExpectedOsdkVersion = "2.6.0";
 async function generateOntologyMetadataFile({
   fs: fs6,
   outDir,
@@ -18531,10 +18777,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":
@@ -18544,10 +18793,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 [`
@@ -18557,43 +18806,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;
 }
 
 // ../generator/build/esm/v2.0/generateRootIndexTsFile.js
@@ -18791,7 +19035,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.30.0-beta.1"}`;
+var USER_AGENT = `osdk-cli.cmd.typescript/${"0.30.0-beta.3"}`;
 async function handleGenerate(args) {
   let success = false;
   if (args.ontologyPath) {
@@ -18931,7 +19175,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.30.0-beta.1", args.externalObjects, args.externalInterfaces);
+    await generateClientSdkPackage(args.packageName, args.version, args.beta ? "2.0" : "1.1", args.outDir, ontology, minimalFs, await getDependencyVersions(), "0.30.0-beta.3", args.externalObjects, args.externalInterfaces);
     return true;
   } catch (e) {
     consola.error("OSDK generation failed", e.message, e.stack);
@@ -18958,8 +19202,8 @@ async function getDependencyVersions() {
     typescriptVersion,
     tslibVersion,
     areTheTypesWrongVersion,
-    osdkApiVersion: `^${"2.6.0-beta.1"}`,
-    osdkClientVersion: `^${"2.6.0-beta.1"}`,
+    osdkApiVersion: `^${"2.6.0-beta.8"}`,
+    osdkClientVersion: `^${"2.6.0-beta.8"}`,
     osdkLegacyClientVersion
   };
 }
@@ -18998,5 +19242,5 @@ function createNormalFs() {
 }
 
 export { getDependencyVersions, handleGenerate, updateVersionsIfTheyExist };
-//# sourceMappingURL=handleGenerate-62KRK76V.js.map
-//# sourceMappingURL=handleGenerate-62KRK76V.js.map
+//# sourceMappingURL=handleGenerate-I5KZ7RQ3.js.map
+//# sourceMappingURL=handleGenerate-I5KZ7RQ3.js.map