@osdk/generator 2.0.0-beta.7 → 2.0.0-beta.9

package/build/cjs/index.cjs

@@ -692,12 +692,8 @@ async function generatePerActionDataFiles({
     const uniqueApiNames = new Set(uniqueApiNamesArray);
     const uniqueApiNamesString = stringUnionFrom([...uniqueApiNames]);
     const fullActionDef = deleteUndefineds(wireActionTypeV2ToSdkActionDefinition(action.raw));
-    const {
-      parameters,
-      ...actionDefSansParameters
-    } = fullActionDef;
     function createParamsDef() {
-      const entries = Object.entries(parameters);
+      const entries = Object.entries(fullActionDef.parameters ?? {});
       entries.sort((a, b) => a[0].localeCompare(b[0]));
       if (entries.length === 0) {
         return `// Represents the definition of the parameters for the action
@@ -737,6 +733,10 @@ async function generatePerActionDataFiles({
     }
     function createV2Types() {
       `${action.shortApiName}$Params`;
+      let jsDocBlock = ["/**"];
+      if (action.description != null) {
+        jsDocBlock.push(`* ${action.description}`);
+      }
       return `
         
           export namespace ${action.shortApiName}{
@@ -744,26 +744,17 @@ async function generatePerActionDataFiles({
 
             ${getDescriptionIfPresent(action.description)}
             export interface Params {
-              ${stringify(parameters, {
+              ${stringify(fullActionDef.parameters, {
         "*": (ogValue, _, ogKey) => {
           const key = `${getDescriptionIfPresent(ogValue.description)}
                   readonly "${ogKey}"${ogValue.nullable ? "?" : ""}`;
           const value = ogValue.multiplicity ? `ReadonlyArray<${getActionParamType(ogValue.type)}>` : `${getActionParamType(ogValue.type)}`;
+          jsDocBlock.push(`* @param {${getActionParamType(ogValue.type)}} ${ogValue.nullable ? `[${ogKey}]` : `${ogKey}`} ${ogValue.description ?? ""} `);
           return [key, value];
         }
       })}
             }
 
-
-              // Represents the definition of the action
-              export interface Definition extends ActionDefinition<"${action.shortApiName}", ${uniqueApiNamesString}, ${action.shortApiName}.Signatures>, VersionBound<$ExpectedClientVersion> {
-              ${Object.entries(actionDefSansParameters).sort((a, b) => a[0].localeCompare(b[0])).map(([key, value]) => {
-        return `${key}: ${JSON.stringify(value)};`;
-      }).join("\n")}
-              parameters: ${action.definitionParamsIdentifier};
-              osdkMetadata: typeof $osdkMetadata;
-            }
-
             // Represents a fqn of the action
             export interface Signatures {
               ${getDescriptionIfPresent(action.description)}
@@ -774,14 +765,36 @@ async function generatePerActionDataFiles({
   
           }
 
-          /** @deprecated Use \`${action.definitionIdentifier}\` **/
-          export type ${action.shortApiName} = ${action.shortApiName}.Signatures;
+          
+          ${jsDocBlock.join("\n")}
+          */
+          export interface ${action.shortApiName} extends MinimalActionDefinition<"${action.shortApiName}", ${uniqueApiNamesString}, ${action.shortApiName}.Signatures> {
+            __DefinitionMetadata?: {
+              ${stringify(fullActionDef, {
+        "parameters": () => action.definitionParamsIdentifier
+      })}
+              
+              signatures: ${action.shortApiName}.Signatures;
+            },
+            ${stringify(fullActionDef, {
+        "description": () => void 0,
+        "displayName": () => void 0,
+        "modifiedEntities": () => void 0,
+        "parameters": () => void 0
+      })}
+            osdkMetadata: typeof $osdkMetadata;
+            }
           `;
     }
     function createV2Object() {
-      return `  export const ${action.shortApiName}: ${action.definitionIdentifier} = 
+      return `  export const ${action.shortApiName}: ${action.shortApiName} = 
         {
-          ${stringify(fullActionDef)},
+          ${stringify(fullActionDef, {
+        "description": () => void 0,
+        "displayName": () => void 0,
+        "modifiedEntities": () => void 0,
+        "parameters": () => void 0
+      })},
           osdkMetadata: $osdkMetadata
         }
         `;
@@ -807,9 +820,8 @@ async function generatePerActionDataFiles({
     }
     const imports = getObjectImports(referencedObjectDefs, void 0, currentFilePath, true);
     await fs2.writeFile(path5__namespace.default.join(rootOutDir, currentFilePath), await formatTs(`
-          import type { ActionDefinition, ObjectActionDataType, ObjectSetActionDataType, VersionBound} from "@osdk/api";
+          import type { MinimalActionDefinition, ObjectActionDataType, ObjectSetActionDataType } from "@osdk/api";
           import type { ActionParam, ActionReturnTypeForOptions, ApplyActionOptions, ApplyBatchActionOptions,  } from '@osdk/client.api';
-          import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
           import { $osdkMetadata} from "../../OntologyMetadata${importExt}";
           ${imports}