@osdk/generator 1.13.4 → 1.13.6

package/build/cjs/index.cjs

@@ -4,6 +4,7 @@ var fs = require('fs');
 var path16 = require('path');
 var prettier = require('prettier');
 var organizeImports = require('prettier-plugin-organize-imports');
+var consola2 = require('consola');
 var generatorConverters = require('@osdk/generator-converters');
 var fastDeepEqual = require('fast-deep-equal');
 var invariant = require('tiny-invariant');
@@ -31,6 +32,7 @@ function _interopNamespace(e) {
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 var path16__namespace = /*#__PURE__*/_interopNamespace(path16);
 var organizeImports__default = /*#__PURE__*/_interopDefault(organizeImports);
+var consola2__default = /*#__PURE__*/_interopDefault(consola2);
 var fastDeepEqual__default = /*#__PURE__*/_interopDefault(fastDeepEqual);
 var invariant__default = /*#__PURE__*/_interopDefault(invariant);
 
@@ -97,6 +99,9 @@ ${Array.from(uniqueLinkTargets).map((linkTarget) => `import type { ${linkTarget}
   readonly $primaryKey: ${wirePropertyTypeV2ToTypeScriptType(objectTypeWithLinks.objectType.properties[objectTypeWithLinks.objectType.primaryKey].dataType)};
 ${Object.entries(objectTypeWithLinks.objectType.properties).sort((a, b) => a[0].localeCompare(b[0])).flatMap(([propertyName, propertyDefinition]) => {
     const propertyType = wirePropertyTypeV2ToTypeScriptType(propertyDefinition.dataType);
+    if (propertyType == null) {
+      return [];
+    }
     const entries = [`${getDescriptionIfPresent(propertyDefinition.description, true)}readonly ${propertyName}: ${propertyType} | undefined`];
     if (isReservedKeyword(propertyName)) {
       entries.push(`/** @deprecated please migrate to '${propertyName}' instead */
@@ -118,7 +123,11 @@ function wirePropertyTypeV2ToTypeScriptType(property) {
     case "boolean":
       return "boolean";
     case "array":
-      return wirePropertyTypeV2ToTypeScriptType(property.subType) + "[]";
+      const subType = wirePropertyTypeV2ToTypeScriptType(property.subType);
+      if (subType == null) {
+        return void 0;
+      }
+      return subType + "[]";
     case "integer":
       return "number";
     case "attachment":
@@ -148,7 +157,8 @@ function wirePropertyTypeV2ToTypeScriptType(property) {
     case "marking":
       return "string";
     default:
-      throw new Error(`Unknown property type ${property}`);
+      consola2.consola.info(`Unknown property type ${JSON.stringify(property)}`);
+      return void 0;
   }
 }
 function getDescriptionIfPresent(description, includeNewline) {
@@ -284,7 +294,7 @@ function getObjectDefIdentifier(name, v2) {
 }
 function wireObjectTypeV2ToSdkObjectConst(object, importExt, v2 = false) {
   const uniqueLinkTargetTypes = new Set(object.linkTypes.map((a) => a.objectTypeApiName));
-  const definition = deleteUndefineds(generatorConverters.wireObjectTypeFullMetadataToSdkObjectTypeDefinition(object, v2));
+  const definition = deleteUndefineds(generatorConverters.wireObjectTypeFullMetadataToSdkObjectTypeDefinition(object, v2, consola2__default.default));
   const objectDefIdentifier = getObjectDefIdentifier(object.objectType.apiName, v2);
   function getV1Types() {
     return `
@@ -705,7 +715,7 @@ async function generateOAuthClientDistDir(outDir, fs2, importExt = "") {
 }
 async function generateAggregationsAggregations(fs2, aggregationsDir) {
   await fs2.writeFile(path16__namespace.join(aggregationsDir, "Aggregations.ts"), await formatTs(`
-      import { LocalDate, Timestamp } from "@osdk/legacy-client";
+      import { LocalDate, Timestamp, OntologyObject } from "@osdk/legacy-client";
       ` + reexportTypes(["Double", "Rangeable", "MetricValue", "Date", "BucketKey", "BucketValue", "TimeUnit", "BucketGroup", "Metrics", "AggregatableProperties", "AggregationClause"]) + reexportTypes(["Range"], "<T extends Rangeable>", "<T>") + reexportTypes(["BaseGroupBy"], "<_T extends BucketValue = BucketValue>") + reexportTypes(["Duration"], "<_T extends Timestamp | LocalDate = Timestamp | LocalDate>") + reexportTypes(["AggregatableProperty", "MultipleAggregationsOperations"], "<_T extends MetricValue = MetricValue>") + reexportTypes(["AggregationGroup"], "<TMetrics extends Metrics | MetricValue, TBucketGroup extends BucketGroup>") + reexportTypes(["Bucketing"], "<_T extends string , _X extends BucketValue>") + reexportTypes(["AggregationResult"], "<TBucketGroup extends BucketGroup, TMetrics extends Metrics | MetricValue>") + reexportTypes(["BaseBucketing"], "<TBucketKey extends BucketKey, TBucketValue extends BucketValue, Kind extends string>") + reexportTypes(["ExactValueBucketing", "InternalBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends BucketValue>`) + reexportTypes(["RangeBucketing", "FixedWidthBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends Range<Rangeable>>`) + reexportTypes(["DurationBucketing"], `<TBucketKey extends BucketKey, TBucketValue extends Date>`) + reexportTypes(["InternalBucketingVisitor"], "<TBucketKey extends BucketKey, T extends BucketValue, R>") + reexportTypes(["AggregationBuilderResult"], "<T, TMultipleAggregationProperties>") + reexportTypes(["AggregatablePropertiesForResult", "AggregatablePropertyNamesForResult"], "<TAggregatableProperties, TResult extends MetricValue>") + reexportConsts(["assertBucketingInternal", "visitInternalBucketing"], true) + reexportTypes(["AggregatableObjectSetStep"], "<TAggregatableProperties, TMultipleAggregationProperties, TBucketableProperties, TBucketGroup extends BucketGroup = {}>") + reexportTypes(["GroupedTerminalAggregationOperations"], "<TAggregatableProperties, TMultipleAggregationProperties, TBucketGroup extends BucketGroup = {}>")));
 }
 async function generateGroupBy(fs2, aggregationsDir, importExt = "") {
@@ -728,12 +738,11 @@ async function generateMetrics(fs2, aggregationsDir, importExt = "") {
   await fs2.writeFile(path16__namespace.join(metricsDir, "metrics.ts"), await formatTs(`export {MetricValueType} from "@osdk/legacy-client";`));
   await fs2.writeFile(path16__namespace.join(metricsDir, "ApproximateDistinctCountAggregatableProperty.ts"), await formatTs(reexportConsts(["ApproximateDistinctCountAggregatableProperty"]) + reexportTypes(["ApproximateDistinctCountAggregatableProperty"])));
   await fs2.writeFile(path16__namespace.join(metricsDir, "MultipleAggregatableProperty.ts"), await formatTs(`
-        import { Double, MetricValue, MultipleAggregationsOperations } from "../Aggregations${importExt}";
-        import { MetricValueType } from "./index${importExt}";
+       import { Double, MetricValue } from "@osdk/legacy-client";
       ` + reexportConsts(["MultipleAggregatableProperty"]) + reexportTypes(["MultipleAggregatableProperty"], "<TResult extends MetricValue = Double>")));
   for (const typeName of ["DefaultAggregatableProperty", "LocalDatePropertyMetric", "NumericPropertyMetric", "TimestampPropertyMetric"]) {
     await fs2.writeFile(path16__namespace.join(metricsDir, `${typeName}.ts`), await formatTs(`
-          import { MultipleAggregatableProperty } from "./MultipleAggregatableProperty${importExt}";
+          import { MultipleAggregatableProperty } from "@osdk/legacy-client";
         ` + reexportConsts([typeName], true)));
   }
   await fs2.writeFile(path16__namespace.join(metricsDir, "index.ts"), await formatTs(`
@@ -1784,7 +1793,7 @@ function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ontology,
       
     };`;
 }
-var ExpectedOsdkVersion = "0.21.2";
+var ExpectedOsdkVersion = "0.21.3";
 async function generateOntologyMetadataFile(ontology, userAgent, fs2, outDir) {
   fs2.writeFile(path16__namespace.default.join(outDir, "OntologyMetadata.ts"), await formatTs(`
       import { OntologyMetadata as OM } from "@osdk/api";