@osdk/generator 2.2.0-beta.2 → 2.2.0-beta.21

package/build/cjs/index.cjs

@@ -1,13 +1,10 @@
 'use strict';
 
-var chunkXOCES5YA_cjs = require('./chunk-XOCES5YA.cjs');
 var fs = require('fs');
 var path8 = require('path');
 var generatorConverters = require('@osdk/generator-converters');
 var prettier = require('prettier');
-require('process');
-require('tty');
-require('util');
+var consola = require('consola');
 var fastDeepEqual = require('fast-deep-equal');
 var invariant = require('tiny-invariant');
 
@@ -33,9 +30,11 @@ function _interopNamespace(e) {
 
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 var path8__namespace = /*#__PURE__*/_interopNamespace(path8);
+var consola__default = /*#__PURE__*/_interopDefault(consola);
 var fastDeepEqual__default = /*#__PURE__*/_interopDefault(fastDeepEqual);
 var invariant__default = /*#__PURE__*/_interopDefault(invariant);
 
+// src/generateClientSdkPackage.ts
 var AbstractImportable = class {
   /**
    * Either a path relative to the ourDir (e.g. "./ontology/objects/foo.js") or a normal
@@ -72,7 +71,7 @@ var EnhancedBase = class extends AbstractImportable {
 };
 function extractNamespace(fqApiName) {
   const last = fqApiName.lastIndexOf(".");
-  if (last === -1) return [undefined, fqApiName];
+  if (last === -1) return [void 0, fqApiName];
   return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];
 }
 
@@ -104,7 +103,7 @@ var EnhancedAction = class extends EnhancedBase {
 
 // src/util/deleteUndefineds.ts
 function deleteUndefineds(obj) {
-  return Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== undefined));
+  return Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== void 0));
 }
 
 // src/GenerateContext/EnhancedInterfaceType.ts
@@ -210,7 +209,7 @@ var EnhancedOntologyDefinition = class {
     return (fullApiName, localOnly) => {
       const ret = this[type][fullApiName];
       if (!ret) {
-        extractNamespace(fullApiName);
+        const [apiNamespace, shortApiName] = extractNamespace(fullApiName);
         throw new Error(`Unable to find ${type}: No entry for '${fullApiName}`);
       }
       return ret;
@@ -393,7 +392,7 @@ async function generatePerActionDataFiles({
           ${entries.map(([key, value]) => {
         return `"${key}": {
                 ${stringify(value, {
-          description: (value2, d) => value2 ? d(value2) : undefined,
+          description: (value2, d) => value2 ? d(value2) : void 0,
           // trick to remove undefineds
           type: (type) => {
             if (typeof type === "string") {
@@ -410,7 +409,7 @@ async function generatePerActionDataFiles({
             } else if (type.type === "struct") {
               return `ActionMetadata.DataType.Struct<${JSON.stringify(type.struct)}>`;
             }
-            return undefined;
+            return void 0;
           }
         })}
             }`;
@@ -457,9 +456,9 @@ async function generatePerActionDataFiles({
             // Represents a fqn of the action
             export interface Signatures {
               ${getDescriptionIfPresent(action.description)}
-              applyAction<P extends ${action.paramsIdentifier}, OP extends ApplyActionOptions>(args: P, options?: OP): Promise<ActionReturnTypeForOptions<OP>>;
+              applyAction<OP extends ApplyActionOptions>(args: ${action.paramsIdentifier}, options?: OP): Promise<ActionReturnTypeForOptions<OP>>;
            
-              batchApplyAction<P extends ReadonlyArray<${action.paramsIdentifier}>, OP extends ApplyBatchActionOptions>(args: P, options?: OP): Promise<ActionReturnTypeForOptions<OP>>;
+              batchApplyAction<OP extends ApplyBatchActionOptions>(args: ReadonlyArray<${action.paramsIdentifier}>, options?: OP): Promise<ActionReturnTypeForOptions<OP>>;
             }
   
           }
@@ -476,12 +475,12 @@ async function generatePerActionDataFiles({
               signatures: ${action.shortApiName}.Signatures;
             },
             ${stringify(fullActionDef, {
-        "description": () => undefined,
-        "displayName": () => undefined,
-        "modifiedEntities": () => undefined,
-        "parameters": () => undefined,
-        "rid": () => undefined,
-        "status": () => undefined
+        "description": () => void 0,
+        "displayName": () => void 0,
+        "modifiedEntities": () => void 0,
+        "parameters": () => void 0,
+        "rid": () => void 0,
+        "status": () => void 0
       })}
             osdkMetadata: typeof $osdkMetadata;
             }
@@ -491,12 +490,12 @@ async function generatePerActionDataFiles({
       return `  export const ${action.shortApiName}: ${action.shortApiName} = 
         {
           ${stringify(fullActionDef, {
-        "description": () => undefined,
-        "displayName": () => undefined,
-        "modifiedEntities": () => undefined,
-        "parameters": () => undefined,
-        "rid": () => undefined,
-        "status": () => undefined
+        "description": () => void 0,
+        "displayName": () => void 0,
+        "modifiedEntities": () => void 0,
+        "parameters": () => void 0,
+        "rid": () => void 0,
+        "status": () => void 0
       })},
           osdkMetadata: $osdkMetadata
         }
@@ -533,7 +532,7 @@ async function generatePerActionDataFiles({
         }
       }
     }
-    const imports = getObjectImports(referencedObjectDefs, undefined, currentFilePath, true);
+    const imports = getObjectImports(referencedObjectDefs, void 0, currentFilePath, true);
     await fs2.writeFile(path8__namespace.default.join(rootOutDir, currentFilePath), await formatTs(`
           import type {
             ActionDefinition,
@@ -598,7 +597,7 @@ function extractReferencedObjectsFromActionParameter(actionParameter) {
     case "integer":
     case "long":
     case "timestamp":
-      return undefined;
+      return void 0;
   }
 }
 
@@ -642,7 +641,7 @@ function wireObjectTypeV2ToSdkObjectConstV2(wireObject, {
     throw new Error("Should not be generating types for an external type");
   }
   const uniqueLinkTargetTypes = new Set(wireObject.linkTypes.map((a) => ontology.requireObjectType(a.objectTypeApiName, false)));
-  const definition = deleteUndefineds(generatorConverters.wireObjectTypeFullMetadataToSdkObjectMetadata(object.raw, true, chunkXOCES5YA_cjs.consola));
+  const definition = deleteUndefineds(generatorConverters.wireObjectTypeFullMetadataToSdkObjectMetadata(object.raw, true, consola__default.default));
   const objectDefIdentifier = object.getDefinitionIdentifier(true);
   const objectSetIdentifier = `${object.shortApiName}.ObjectSet`;
   const propertyKeysIdentifier = `${object.shortApiName}.PropertyKeys`;
@@ -763,9 +762,9 @@ function createProps(type, identifier, strict) {
   return `export interface ${identifier} {
 ${stringify(definition.properties, {
     "*": (propertyDefinition, _, apiName) => {
-      return [`readonly "${maybeStripNamespace(type, apiName)}"${// after we convert everything over we can do this:
-      // !strict || propertyDefinition.nullable ? "?" : ""
-      ""}`, (typeof propertyDefinition.type === "object" ? remapStructType(propertyDefinition.type) : `$PropType[${JSON.stringify(propertyDefinition.type)}]`) + `${propertyDefinition.multiplicity ? "[]" : ""}${propertyDefinition.nullable || !strict && !(definition.type === "object" && definition.primaryKeyApiName === apiName) ? `| undefined` : ""}`];
+      return [`${propertyJsdoc(propertyDefinition, {
+        apiName
+      })}readonly "${maybeStripNamespace(type, apiName)}"`, (typeof propertyDefinition.type === "object" ? remapStructType(propertyDefinition.type) : `$PropType[${JSON.stringify(propertyDefinition.type)}]`) + `${propertyDefinition.multiplicity ? "[]" : ""}${propertyDefinition.nullable || !strict && !(definition.type === "object" && definition.primaryKeyApiName === apiName) ? `| undefined` : ""}`];
     }
   })}
     }`;
@@ -839,7 +838,7 @@ function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ontology,
   const parents = definition.implements?.map((p) => {
     const parent = ontology.requireInterfaceType(p, true);
     if (parent instanceof EnhancedInterfaceType) {
-      const it = deleteUndefineds(generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(parent.raw, v2, chunkXOCES5YA_cjs.consola));
+      const it = deleteUndefineds(generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(parent.raw, v2, consola__default.default));
       return it;
     }
   }) ?? [];
@@ -852,9 +851,9 @@ function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ontology,
     }
     for (const apiName of Object.keys(parent.properties)) {
       if (definition.properties[apiName] != null) {
-        !fastDeepEqual__default.default(definition.properties[apiName], parent.properties[apiName]) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Interface ${definition.apiName} redefines property '${apiName}' from parent '${parent.apiName}' but the properties do not match`) : invariant__default.default(false) : undefined;
+        !fastDeepEqual__default.default(definition.properties[apiName], parent.properties[apiName]) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Interface ${definition.apiName} redefines property '${apiName}' from parent '${parent.apiName}' but the properties do not match`) : invariant__default.default(false) : void 0;
       } else if (mergedProperties[apiName] != null) {
-        !fastDeepEqual__default.default(mergedProperties[apiName], parent.properties[apiName]) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Some interface defines a conflicting property '${apiName}' that does not match property from parent '${parent.apiName}'`) : invariant__default.default(false) : undefined;
+        !fastDeepEqual__default.default(mergedProperties[apiName], parent.properties[apiName]) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Some interface defines a conflicting property '${apiName}' that does not match property from parent '${parent.apiName}'`) : invariant__default.default(false) : void 0;
       }
       mergedProperties[apiName] = parent.properties[apiName];
     }
@@ -1006,6 +1005,10 @@ function getObjectTypesFromQueryDataType(dataType, types) {
         getObjectTypesFromQueryDataType(type, types);
       }
       return;
+    case "entrySet":
+      getObjectTypesFromQueryDataType(dataType.keyType, types);
+      getObjectTypesFromQueryDataType(dataType.valueType, types);
+      return;
     case "attachment":
     case "boolean":
     case "date":
@@ -1018,6 +1021,7 @@ function getObjectTypesFromQueryDataType(dataType, types) {
     case "threeDimensionalAggregation":
     case "timestamp":
     case "twoDimensionalAggregation":
+    case "entrySet":
     case "unsupported":
       return;
     default:
@@ -1068,7 +1072,7 @@ async function generateV2QueryFile(fs2, outDir, relOutDir, query, importExt, ont
   const outputBase = deleteUndefineds(generatorConverters.wireQueryDataTypeToQueryDataTypeDefinition(query.output));
   objectTypes.length > 0 ? objectTypes.map((apiNameObj) => `"${apiNameObj}"`).join("|") : "never";
   await fs2.writeFile(path8__namespace.default.join(outDir, `${query.shortApiName}.ts`), await formatTs(`
-        import type { QueryDefinition , QueryParam, QueryResult, VersionBound} from "${forInternalUse ? "@osdk/api" : "@osdk/client"}";
+        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}
@@ -1120,9 +1124,9 @@ async function generateV2QueryFile(fs2, outDir, relOutDir, query, importExt, ont
             signature: ${query.shortApiName}.Signature;
         }, 
         ${stringify(baseProps, {
-    "description": () => undefined,
-    "displayName": () => undefined,
-    "rid": () => undefined
+    "description": () => void 0,
+    "displayName": () => void 0,
+    "rid": () => void 0
   })}, 
           osdkMetadata: typeof $osdkMetadata;
               }
@@ -1130,9 +1134,9 @@ async function generateV2QueryFile(fs2, outDir, relOutDir, query, importExt, ont
 
         export const ${query.shortApiName}: ${query.definitionIdentifier} = {
             ${stringify(baseProps, {
-    "description": () => undefined,
-    "displayName": () => undefined,
-    "rid": () => undefined
+    "description": () => void 0,
+    "displayName": () => void 0,
+    "rid": () => void 0
   })},
     osdkMetadata: $osdkMetadata
         };
@@ -1172,7 +1176,7 @@ function queryParamJsDoc(param, {
 `;
   return ret;
 }
-function getQueryParamType(enhancedOntology, input, type) {
+function getQueryParamType(enhancedOntology, input, type, isMapKey = false) {
   let inner = `unknown /* ${input.type} */`;
   switch (input.type) {
     case "date":
@@ -1206,6 +1210,10 @@ function getQueryParamType(enhancedOntology, input, type) {
         "${input.threeDimensionalAggregation.valueType.valueType}">`;
       break;
     case "object":
+      if (isMapKey) {
+        inner = `ObjectSpecifier<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
+        break;
+      }
       inner = `Query${type}.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
       break;
     case "objectSet":
@@ -1217,6 +1225,8 @@ function getQueryParamType(enhancedOntology, input, type) {
     case "union":
       inner = 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}>`;
@@ -1382,7 +1392,7 @@ function getPackageJsonContents(name, version, dependencyVersions) {
   };
 }
 async function writeJson(minimalFs, filePath, body) {
-  return void await minimalFs.writeFile(filePath, JSON.stringify(body, undefined, 2) + "\n");
+  return void await minimalFs.writeFile(filePath, JSON.stringify(body, void 0, 2) + "\n");
 }
 
 exports.__UNSTABLE_generateClientSdkPackage = generateClientSdkPackage;