@osdk/foundry-sdk-generator 1.3.2 → 1.3.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @osdk/foundry-sdk-generator
 
+## 1.3.3
+
+### Patch Changes
+
+- ef2018e: Fixed an edge case where generation caused compile errors
+- bf5d49e: --beta now loads from the beta package
+- Updated dependencies [ef2018e]
+  - @osdk/generator@1.13.2
+  - @osdk/legacy-client@2.5.1
+
 ## 1.3.2
 
 ### Patch Changes

package/build/browser/index.js

@@ -1,3 +1,4 @@
+import consola from 'consola';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { exit } from 'process';
@@ -557,7 +558,7 @@ function isValidSemver(semverString) {
 }
 
 // src/utils/UserAgent.ts
-var USER_AGENT = `typescript-sdk-generator/${"1.3.2"}`;
+var USER_AGENT = `typescript-sdk-generator/${"1.3.3"}`;
 async function createRollupBuild(absolutePackagePath, packageName) {
   const inputPath = `${absolutePackagePath}/${packageName}/index.js`;
   const {
@@ -1139,7 +1140,7 @@ var betaDependencies = {
 };
 async function generatePackage(ontology, options) {
   const {
-    consola
+    consola: consola2
   } = await import('consola');
   const packagePath = join(options.outputDir, options.packageName);
   const resolvedDependencies = await Promise.all(Object.keys(options.beta ? betaDependencies : dependencies).map(async (dependency) => {
@@ -1171,7 +1172,7 @@ async function generatePackage(ontology, options) {
   const compilerOutput = compileInMemory(inMemoryFileSystem, {
     esm: options.beta
   });
-  compilerOutput.diagnostics.forEach((d) => consola.error(`Error compiling file`, d.file?.fileName, d.messageText));
+  compilerOutput.diagnostics.forEach((d) => consola2.error(`Error compiling file`, d.file?.fileName, d.messageText));
   await mkdir(join(packagePath, "dist", "bundle"), {
     recursive: true
   });
@@ -1187,10 +1188,10 @@ async function generatePackage(ontology, options) {
     try {
       bundleDts = await bundleDependencies(options.beta ? [] : [join(nodeModulesPath, "@osdk", "legacy-client"), join(nodeModulesPath, "@osdk", "api"), join(nodeModulesPath, "@osdk", "gateway")], options.packageName, compilerOutput.files, options.beta ? void 0 : `internal/@osdk/legacy-client/index.ts`);
     } catch (e) {
-      consola.error("Failed bundling DTS", e);
+      consola2.error("Failed bundling DTS", e);
     }
   } else {
-    consola.error("Could not find node_modules directory, skipping DTS bundling");
+    consola2.error("Could not find node_modules directory, skipping DTS bundling");
   }
   await Promise.all([...Object.entries(compilerOutput.files).map(async ([path2, contents]) => {
     await writeFile(path2, contents, {
@@ -1209,7 +1210,7 @@ async function generatePackage(ontology, options) {
   try {
     await generateBundles(absolutePackagePath, options.packageName);
   } catch (e) {
-    consola.error(e);
+    consola2.error(e);
   }
 }
 async function getDependencyVersion(dependency) {
@@ -1314,22 +1315,17 @@ var GeneratePackageCommand = class {
       description: `Experimental features that can be modified or removed at any time. Example Usage: --experimentalFeatures realtimeUpdates`,
       default: void 0,
       defaultDescription: `By default, no arguments will not enable any experimental features.`
-    }).options("beta", {
-      boolean: true,
-      demandOption: false,
-      hidden: true,
-      default: false
     }).strict();
   }
   handler = async (args) => {
     const {
-      consola
+      consola: consola2
     } = await import('consola');
-    consola.start(`Generating OSDK: ${args.packageName} at version: ${args.packageVersion}`);
+    consola2.start(`Generating OSDK: ${args.packageName} at version: ${args.packageVersion}`);
     const ontologyRid = args.ontology;
     const ontologyMetadataResolver = new OntologyMetadataResolver(args.authToken, args.foundryHostname);
     if (!isValidSemver(args.packageVersion)) {
-      consola.error(new Error(`Invalid argument provided for packageVersion: ${args.packageVersion}, expected valid semver`));
+      consola2.error(new Error(`Invalid argument provided for packageVersion: ${args.packageVersion}, expected valid semver`));
       exit(1);
     }
     const timeStart = Date.now();
@@ -1342,9 +1338,9 @@ var GeneratePackageCommand = class {
     });
     if (wireOntologyDefinition.isErr()) {
       wireOntologyDefinition.error.forEach((err) => {
-        consola.error(err);
+        consola2.error(err);
       });
-      consola.error("Failed generating package");
+      consola2.error("Failed generating package");
       exit(1);
     }
     await generatePackage(wireOntologyDefinition.value, {
@@ -1354,18 +1350,30 @@ var GeneratePackageCommand = class {
       beta: !!args.beta
     });
     const elapsedTime = Date.now() - timeStart;
-    consola.success(`Finished generating package in ${(elapsedTime / 1e3).toFixed(2)}s`);
+    consola2.success(`Finished generating package in ${(elapsedTime / 1e3).toFixed(2)}s`);
     return;
   };
 };
 
 // src/cli/foundrySdkGeneratorCli.ts
 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);
+  function createBase() {
+    return yargs(hideBin(args)).command(new GeneratePackageCommand()).demandCommand().recommendCommands().strict().showHelpOnFail(true).help().version(process.env.npm_package_version);
+  }
   try {
-    return base.parseAsync();
+    return createBase().parseAsync(hideBin(args), {}, async (err, argv, output) => {
+      if (argv.beta) {
+        consola.warn("Beta flag is set, this feature may not be stable");
+        const {
+          cli: cli2
+        } = await import('@osdk/main-foundry-sdk-generator');
+        await cli2(args);
+      } else {
+        await createBase().parseAsync(hideBin(args));
+      }
+    });
   } catch (e) {
-    console.log(e);
+    consola.error(e);
   }
 }