@osdk/foundry-sdk-generator 2.1.0-beta.9 → 2.2.0-beta.1

package/build/esm/index.js

@@ -4,7 +4,7 @@ import path2__default, { join, dirname, isAbsolute, normalize } from 'path';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { exit } from 'process';
-import { createClientContext } from '@osdk/shared.net';
+import { createSharedClientContext } from '@osdk/shared.client.impl';
 import { generateClientSdkVersionTwoPointZero } from '@osdk/generator';
 import { mkdir, writeFile, readdir, readFile } from 'fs/promises';
 import commonjs from '@rollup/plugin-commonjs';
@@ -15,7 +15,7 @@ import { Project, Node } from 'ts-morph';
 import * as fs from 'fs';
 import { ModuleKind, ScriptTarget, createCompilerHost, createSourceFile, createProgram } from 'typescript';
 
-// ../../node_modules/.pnpm/tsup@8.2.3_@microsoft+api-extractor@7.47.0_@types+node@22.7.9__jiti@1.21.6_postcss@8.4.47_typescript@5.5.4_yaml@2.4.5/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.2.3_@microsoft+api-extractor@7.49.1_@types+node@18.19.74__@swc+core@1.7.39_jiti@2.4.2__cusz3dqci6tomwziqqbdrtlnre/node_modules/tsup/assets/esm_shims.js
 var getFilename = () => fileURLToPath(import.meta.url);
 var getDirname = () => path2__default.dirname(getFilename());
 var __dirname = /* @__PURE__ */ getDirname();
@@ -192,7 +192,7 @@ var OntologyMetadataResolver = class {
     this.#authToken = authToken;
   }
   getClientContext() {
-    return createClientContext(this.stackName.match(/^https?:\/\//) ? this.stackName : `https://${this.stackName}`, () => this.#authToken, `foundry-typescript-osdk-generator/${process.env.npm_package_version}`);
+    return createSharedClientContext(this.stackName.match(/^https?:\/\//) ? this.stackName : `https://${this.stackName}`, () => Promise.resolve(this.#authToken), `foundry-typescript-osdk-generator/${process.env.npm_package_version}`);
   }
   filterMetadataByApiName(ontologyFullMetadata, expectedEntities, pkgInfo) {
     const filteredObjectTypes = Object.fromEntries(Object.entries(ontologyFullMetadata.objectTypes).filter(([, {
@@ -258,14 +258,11 @@ var OntologyMetadataResolver = class {
   }
   async getWireOntologyDefinition(ontologyRid, entities, extPackageInfo = /* @__PURE__ */ new Map()) {
     let ontology;
-    const {
-      Ontologies
-    } = await import('@osdk/internal.foundry.ontologies');
     const {
       OntologiesV2
-    } = await import('@osdk/internal.foundry.ontologiesv2');
+    } = await import('@osdk/foundry.ontologies');
     try {
-      ontology = await Ontologies.get(this.getClientContext(), ontologyRid);
+      ontology = await OntologiesV2.get(this.getClientContext(), ontologyRid);
     } catch (e) {
       return Result.err([`Unable to load the specified Ontology with network error: ${JSON.stringify(e)}`]);
     }
@@ -321,7 +318,8 @@ ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
       objectTypes,
       linkTypes,
       actionTypes,
-      queryTypes
+      queryTypes,
+      interfaceTypes
     }, ontologyFullMetadata, extPackageInfo);
     if (validData.isErr()) {
       return Result.err(validData.error);
@@ -336,6 +334,7 @@ ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
     const errors = [];
     const loadedObjectTypes = Object.fromEntries(Object.values(filteredFullMetadata.objectTypes).map((object) => [object.objectType.apiName, object]));
     const loadedLinkTypes = Object.fromEntries(Object.values(filteredFullMetadata.objectTypes).map((object) => [object.objectType.apiName, Object.fromEntries(object.linkTypes.map((link) => [link.apiName, link]))]));
+    const loadedInterfaceTypes = Object.fromEntries(Object.values(filteredFullMetadata.interfaceTypes).map((interfaceType) => [interfaceType.apiName, interfaceType]));
     const missingObjectTypes = [];
     for (const object of expectedEntities.objectTypes) {
       if (!loadedObjectTypes[object]) {
@@ -360,6 +359,16 @@ ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
     if (missingObjectTypes.length > 0) {
       errors.push(`Unable to find the following Object Types: ${missingObjectTypes.join(", ")}`);
     }
+    const missingInterfaceTypes = [];
+    for (const expectedInterface of expectedEntities.interfaceTypes) {
+      if (!loadedInterfaceTypes[expectedInterface]) {
+        missingInterfaceTypes.push(expectedInterface);
+        continue;
+      }
+    }
+    if (missingInterfaceTypes.length > 0) {
+      errors.push(`Unable to find the following Interface Types: ${missingInterfaceTypes.join(", ")}`);
+    }
     const loadedQueryTypes = Object.fromEntries(Object.entries(filteredFullMetadata.queryTypes).map(([queryApiName, query]) => [queryApiName, query]));
     const missingQueryTypes = [];
     for (const queryApiName of expectedEntities.queryTypes) {
@@ -386,7 +395,7 @@ ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
       }
     }
     for (const action of Object.values(loadedActionTypes)) {
-      const result = this.validateActionParameters(action, expectedEntities.objectTypes);
+      const result = this.validateActionParameters(action, expectedEntities.objectTypes, expectedEntities.interfaceTypes);
       if (result.isErr()) {
         for (const errorString of result.error) {
           errors.push(errorString);
@@ -407,9 +416,9 @@ ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
     const results = Result.coalesce(parameterValidation);
     return results;
   }
-  validateActionParameters(actionType, loadedObjectApiNames) {
+  validateActionParameters(actionType, loadedObjectApiNames, loadedInterfaceApiNames) {
     const camelizedApiName = this.camelize(actionType.apiName);
-    const parameterValidation = Object.entries(actionType.parameters).map(([_paramName, paramData]) => this.isSupportedActionTypeParameter(camelizedApiName, paramData.dataType, loadedObjectApiNames));
+    const parameterValidation = Object.entries(actionType.parameters).map(([_paramName, paramData]) => this.isSupportedActionTypeParameter(camelizedApiName, paramData.dataType, loadedObjectApiNames, loadedInterfaceApiNames));
     return Result.coalesce(parameterValidation);
   }
   visitSupportedQueryTypes(queryApiName, propertyName, baseType, loadedObjectApiNames) {
@@ -454,10 +463,10 @@ ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
         return Result.err([`Unable to load query ${queryApiName} because it takes an unsupported parameter type: ${JSON.stringify(baseType)} in parameter ${propertyName}`]);
     }
   }
-  isSupportedActionTypeParameter(actionApiName, actonTypeParameter, loadedObjectApiNames) {
+  isSupportedActionTypeParameter(actionApiName, actonTypeParameter, loadedObjectApiNames, loadedInterfaceApiNames) {
     switch (actonTypeParameter.type) {
       case "array":
-        return this.isSupportedActionTypeParameter(actionApiName, actonTypeParameter.subType, loadedObjectApiNames);
+        return this.isSupportedActionTypeParameter(actionApiName, actonTypeParameter.subType, loadedObjectApiNames, loadedInterfaceApiNames);
       case "object":
         if (loadedObjectApiNames.has(actonTypeParameter.objectTypeApiName)) {
           return Result.ok({});
@@ -468,6 +477,11 @@ ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
           return Result.ok({});
         }
         return Result.err([`Unable to load action ${actionApiName} because it takes an ObjectSet of unloaded object type as a parameter: ${actonTypeParameter.objectTypeApiName} make sure to specify it as an argument with --ontologyObjects ${actonTypeParameter.objectTypeApiName})`]);
+      case "interfaceObject":
+        if (loadedInterfaceApiNames.has(actonTypeParameter.interfaceTypeApiName)) {
+          return Result.ok({});
+        }
+        return Result.err([`Unable to load action ${actionApiName} because it takes an unloaded interface type as a parameter: ${actonTypeParameter.interfaceTypeApiName} make sure to specify it as an argument with --ontologyInterfaces ${actonTypeParameter.interfaceTypeApiName}`]);
       case "string":
       case "boolean":
       case "attachment":
@@ -476,6 +490,8 @@ ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
       case "integer":
       case "long":
       case "timestamp":
+      case "struct":
+      case "mediaReference":
         return Result.ok({});
       default:
         return Result.err([`Unable to load action ${actionApiName} because it takes an unsupported parameter: ${JSON.stringify(actonTypeParameter)} specify only the actions you want to load with the --actions argument.`]);
@@ -533,7 +549,7 @@ async function getDependencyVersionFromFindUpPackageJson(name, opts) {
     findUp
   } = await import('find-up');
   const packageJsonPath = await findUp("package.json", opts);
-  !(packageJsonPath !== void 0) ? process.env.NODE_ENV !== "production" ? process.env.NODE_ENV !== "production" ? invariant(false, "Could not find package.json") : invariant()  : process.env.NODE_ENV !== "production" ? invariant() : invariant()  : void 0;
+  !(packageJsonPath !== undefined) ? process.env.NODE_ENV !== "production" ? process.env.NODE_ENV !== "production" ? invariant(false, "Could not find package.json") : invariant()  : process.env.NODE_ENV !== "production" ? invariant() : invariant()  : undefined;
   const packageJson = await readFile(packageJsonPath, {
     encoding: "utf-8"
   });
@@ -542,7 +558,7 @@ async function getDependencyVersionFromFindUpPackageJson(name, opts) {
   }
   const parsedPackageJson = JSON.parse(packageJson);
   const version = parsedPackageJson.dependencies?.[name] ?? parsedPackageJson.devDependencies?.[name] ?? parsedPackageJson.peerDependencies?.[name];
-  !(version !== void 0) ? process.env.NODE_ENV !== "production" ? process.env.NODE_ENV !== "production" ? invariant(false, `Could not find a dependency for ${name} in ${packageJsonPath}`) : invariant()  : process.env.NODE_ENV !== "production" ? invariant() : invariant()  : void 0;
+  !(version !== undefined) ? process.env.NODE_ENV !== "production" ? process.env.NODE_ENV !== "production" ? invariant(false, `Could not find a dependency for ${name} in ${packageJsonPath}`) : invariant()  : process.env.NODE_ENV !== "production" ? invariant() : invariant()  : undefined;
   return version;
 }
 
@@ -559,9 +575,9 @@ async function resolveDependenciesFromFindUp(deps, cwd) {
 }
 
 // src/utils/UserAgent.ts
-var USER_AGENT = `typescript-sdk-generator/${"2.1.0-beta.9"}`;
+var USER_AGENT = `typescript-sdk-generator/${"2.2.0-beta.1"}`;
 async function createRollupBuild(absolutePackagePath, packageName) {
-  const inputPath = `${absolutePackagePath}/${packageName}/index.js`;
+  const inputPath = `${absolutePackagePath}/${packageName}/esm/index.js`;
   const {
     findUp
   } = await import('find-up');
@@ -569,7 +585,7 @@ async function createRollupBuild(absolutePackagePath, packageName) {
     cwd: __dirname,
     type: "directory"
   });
-  return rollup({
+  return await rollup({
     input: inputPath,
     plugins: [nodeResolve({
       browser: true,
@@ -584,7 +600,7 @@ async function createRollupBuild(absolutePackagePath, packageName) {
   });
 }
 async function writeRollupBuild(rollupBuild, absolutePackagePath, packageName, format) {
-  const outputPath = `${absolutePackagePath}/${packageName}/dist/bundle/index.${format}.js`;
+  const outputPath = `${absolutePackagePath}/${packageName}/dist/bundle/index.${"mjs"}`;
   await Promise.all([rollupBuild.write({
     file: outputPath,
     format,
@@ -771,11 +787,12 @@ function outputModule(project) {
   });
   return modules.join("\n");
 }
-function compileInMemory(files, opts) {
+function compileInMemory(files, type) {
   const inMemoryOutputFileSystem = {};
   const compilerOptions = {
-    module: opts?.esm ? ModuleKind.NodeNext : ModuleKind.CommonJS,
-    target: ScriptTarget.ES2019,
+    module: type === "cjs" ? ModuleKind.CommonJS : ModuleKind.ES2022,
+    target: ScriptTarget.ES2020,
+    resolvePackageJsonExports: true,
     declaration: true,
     skipLibCheck: true
   };
@@ -786,7 +803,7 @@ function compileInMemory(files, opts) {
   const originalSourceFile = compilerHost.getSourceFile;
   compilerHost.getSourceFile = (fileName, languageVersion) => {
     const sourceText = files[fileName];
-    return sourceText !== void 0 ? createSourceFile(fileName, sourceText, languageVersion) : originalSourceFile(fileName, languageVersion);
+    return sourceText !== undefined ? createSourceFile(fileName, sourceText, languageVersion) : originalSourceFile(fileName, languageVersion);
   };
   const program = createProgram(Object.keys(files), compilerOptions, compilerHost);
   const emitOutput = program.emit();
@@ -801,23 +818,32 @@ async function generatePackageJson(options) {
   const packageJson = {
     name: options.packageName,
     version: options.packageVersion,
-    main: "./index.js",
-    types: "./index.d.ts",
+    main: "./cjs/index.js",
+    types: "./cjs/index.d.ts",
     exports: {
       ".": {
-        types: "./index.d.ts",
         script: {
-          types: "./dist/bundle/index.d.ts",
-          default: "./dist/bundle/index.esm.js"
+          types: "./dist/bundle/index.d.mts",
+          default: "./dist/bundle/index.mjs"
         },
-        default: "./index.js"
+        require: {
+          types: "./cjs/index.d.ts",
+          default: "./cjs/index.js"
+        },
+        import: {
+          types: "./esm/index.d.ts",
+          default: "./esm/index.js"
+        },
+        types: "./cjs/index.d.ts",
+        default: "./cjs/index.js"
       }
     },
     dependencies: packageDeps,
     peerDependencies: packagePeerDeps,
-    type: "module"
+    type: "commonjs"
   };
-  await writeFile(join(options.packagePath, "package.json"), JSON.stringify(packageJson, void 0, 4));
+  await writeFile(join(options.packagePath, "package.json"), JSON.stringify(packageJson, undefined, 4));
+  return packageJson;
 }
 function constructDependencies(dependencies) {
   return dependencies?.reduce((acc, value) => {
@@ -828,12 +854,13 @@ function constructDependencies(dependencies) {
 
 // src/generate/betaClient/generatePackage.ts
 var betaPeerDependencies = {
-  "@osdk/client": void 0
+  "@osdk/client": undefined
 };
 async function generatePackage(ontologyInfo, options) {
   const {
     consola
   } = await import('consola');
+  let success = true;
   const packagePath = join(options.outputDir, options.packageName);
   const resolvedPeerDependencies = await resolveDependenciesFromFindUp(betaPeerDependencies, dirname(fileURLToPath(import.meta.url)));
   await mkdir(packagePath, {
@@ -841,8 +868,8 @@ async function generatePackage(ontologyInfo, options) {
   });
   const inMemoryFileSystem = {};
   const hostFs = {
-    writeFile: async (path3, contents) => {
-      inMemoryFileSystem[normalize(path3)] = contents;
+    writeFile: async (path3, contents2) => {
+      inMemoryFileSystem[normalize(path3)] = contents2;
     },
     mkdir: async (path3, _options) => {
       await mkdir(normalize(path3), {
@@ -852,10 +879,47 @@ async function generatePackage(ontologyInfo, options) {
     readdir: (path3) => readdir(path3)
   };
   await generateClientSdkVersionTwoPointZero(ontologyInfo.filteredFullMetadata, `typescript-sdk/${options.packageVersion} ${USER_AGENT}`, hostFs, packagePath, "module", ontologyInfo.externalObjects, ontologyInfo.externalInterfaces);
-  const compilerOutput = compileInMemory(inMemoryFileSystem, {
-    esm: options.beta
+  const contents = await generatePackageJson({
+    packageName: options.packageName,
+    packagePath,
+    packageVersion: options.packageVersion,
+    dependencies: [],
+    peerDependencies: resolvedPeerDependencies,
+    beta: options.beta
   });
-  compilerOutput.diagnostics.forEach((d) => consola.error(`Error compiling file`, d.file?.fileName, d.messageText));
+  const compilerOutput = {};
+  for (const type of ["esm", "cjs"]) {
+    await hostFs.writeFile(join(packagePath, "package.json"), JSON.stringify({
+      ...contents,
+      type: type === "cjs" ? "commonjs" : "module"
+    }));
+    compilerOutput[type] = compileInMemory(inMemoryFileSystem, type);
+    compilerOutput[type].diagnostics.forEach((d) => {
+      consola.error(`Error compiling file`, d.file?.fileName, d.messageText);
+      success = false;
+    });
+    await mkdir(join(packagePath, "dist", "bundle"), {
+      recursive: true
+    });
+    await mkdir(join(packagePath, "esm"), {
+      recursive: true
+    });
+    await mkdir(join(packagePath, "cjs"), {
+      recursive: true
+    });
+    for (const [path3, contents2] of Object.entries(compilerOutput[type].files)) {
+      const newPath = path3.replace(packagePath, join(packagePath, type));
+      await mkdir(dirname(newPath), {
+        recursive: true
+      });
+      await writeFile(newPath, contents2, {
+        flag: "w"
+      });
+    }
+    void await writeFile(join(packagePath, type, "package.json"), JSON.stringify({
+      type: type === "esm" ? "module" : "commonjs"
+    }));
+  }
   await mkdir(join(packagePath, "dist", "bundle"), {
     recursive: true
   });
@@ -869,40 +933,35 @@ async function generatePackage(ontologyInfo, options) {
   let bundleDts = "";
   if (nodeModulesPath) {
     try {
-      bundleDts = await bundleDependencies([], options.packageName, compilerOutput.files, void 0);
+      bundleDts = await bundleDependencies([], options.packageName, compilerOutput["esm"].files, void 0);
     } catch (e) {
       consola.error("Failed bundling DTS", e);
+      success = false;
     }
   } else {
     consola.error("Could not find node_modules directory, skipping DTS bundling");
+    success = false;
   }
-  await Promise.all([...Object.entries(compilerOutput.files).map(async ([path3, contents]) => {
-    await writeFile(path3, contents, {
-      flag: "w"
-    });
-  }), await writeFile(join(packagePath, "dist", "bundle", "index.d.ts"), bundleDts, {
+  await writeFile(join(packagePath, "dist", "bundle", "index.d.mts"), bundleDts, {
     flag: "w"
-  }), generatePackageJson({
-    packageName: options.packageName,
-    packagePath,
-    packageVersion: options.packageVersion,
-    dependencies: [],
-    peerDependencies: resolvedPeerDependencies,
-    beta: options.beta
-  })]);
+  });
   const absolutePackagePath = isAbsolute(options.outputDir) ? options.outputDir : join(process.cwd(), options.outputDir);
   try {
     await generateBundles(absolutePackagePath, options.packageName);
   } catch (e) {
     consola.error(e);
+    success = false;
+  }
+  if (!success) {
+    throw new Error("Failed to generate package");
   }
 }
 
 // src/generate/commandUtils.ts
 function transformArrayArg(arg) {
   if (arg && arg.length > 0) {
-    if (arg[0] === void 0) {
-      return void 0;
+    if (arg[0] === undefined) {
+      return undefined;
     }
   }
   return arg;
@@ -943,42 +1002,42 @@ var GeneratePackageCommand = class {
       string: true,
       demandOption: false,
       description: `The API names of the object types to generate. Example Usage: --objectTypes Aircraft Airport`,
-      default: void 0,
+      default: undefined,
       defaultDescription: `By default, no arguments will not load any object type.`
     }).options("actionTypes", {
       array: true,
       string: true,
       demandOption: false,
       description: `The API names of the action types to generate. Example Usage: --actionTypes schedule-airplane-maintenance`,
-      default: void 0,
+      default: undefined,
       defaultDescription: `By default, no arguments will not load any action type.`
     }).options("linkTypes", {
       array: true,
       string: true,
       demandOption: false,
       description: `The link types to generate in the format of ObjectTypeApiName.LinkTypeApiName. Example Usage: --linkTypes Aircraft.scheduledFlight`,
-      default: void 0,
+      default: undefined,
       defaultDescription: `By default, no arguments will not load any link type.`
     }).options("queryTypes", {
       array: true,
       string: true,
       demandOption: false,
       description: `The API Names of the query types to generate. Example Usage: --queryTypes calculateMetric`,
-      default: void 0,
+      default: undefined,
       defaultDescription: `By default, no arguments will not load any query type.`
     }).options("interfaceTypes", {
       array: true,
       string: true,
       demandOption: false,
       description: `The API Names of the interface types to generate. Example Usage: --interfaceTypes Geolocatable`,
-      default: void 0,
+      default: undefined,
       defaultDescription: `By default, no arguments will not load any interface type.`
     }).options("experimentalFeatures", {
       array: true,
       string: true,
       demandOption: false,
       description: `Experimental features that can be modified or removed at any time. Example Usage: --experimentalFeatures realtimeUpdates`,
-      default: void 0,
+      default: undefined,
       defaultDescription: `By default, no arguments will not enable any experimental features.`
     }).options("beta", {
       boolean: true,
@@ -1038,7 +1097,7 @@ var GeneratePackageCommand = class {
 async function cli(args = process.argv) {
   const base = yargs(hideBin(args)).command(new GeneratePackageCommand()).demandCommand().recommendCommands().strict().showHelpOnFail(true).help().version(process.env.npm_package_version);
   try {
-    return base.parseAsync();
+    return await base.parseAsync();
   } catch (e) {
     console.log(e);
   }