@osdk/foundry-sdk-generator 1.3.1 → 1.4.0-beta.0

package/CHANGELOG.md

@@ -1,10 +1,25 @@
 # @osdk/foundry-sdk-generator
 
-## 1.3.1
+## 1.4.0-beta.0
+
+### Minor Changes
+
+- ff718df: Fixes an issue where ambiguous ontology api names can conflict. Used rid instead.
+- 9eb7c6e: Restore cjs exports
 
 ### Patch Changes
 
-- 74e035c: Restore cjs exports
+- Updated dependencies [ac4f4fd]
+- Updated dependencies [f86f8d0]
+- Updated dependencies [a2c7b37]
+- Updated dependencies [7494995]
+- Updated dependencies [1770490]
+- Updated dependencies [5a41e5e]
+- Updated dependencies [795777a]
+  - @osdk/generator@1.14.0-beta.0
+  - @osdk/client@0.22.0-beta.0
+  - @osdk/client.api@0.22.0-beta.0
+  - @osdk/legacy-client@2.5.0
 
 ## 1.3.0
 

package/build/browser/index.js

@@ -1,3 +1,6 @@
+import { fileURLToPath } from 'url';
+import * as path2 from 'path';
+import path2__default, { join, isAbsolute, normalize } from 'path';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { exit } from 'process';
@@ -5,8 +8,6 @@ import { namespaces } from '@osdk/gateway';
 import { UserTokenAuth } from '@osdk/legacy-client';
 import { generateClientSdkVersionOneDotOne, generateClientSdkVersionTwoPointZero } from '@osdk/generator';
 import { mkdir, writeFile, readFile, readdir } from 'fs/promises';
-import * as path from 'path';
-import { join, isAbsolute, normalize } from 'path';
 import commonjs from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import { rollup } from 'rollup';
@@ -15,7 +16,10 @@ import { Project, Node, SyntaxKind } from 'ts-morph';
 import * as fs from 'fs';
 import { ModuleKind, ScriptTarget, createCompilerHost, createSourceFile, createProgram } from 'typescript';
 
-// src/cli/foundrySdkGeneratorCli.ts
+// ../../node_modules/.pnpm/tsup@8.2.3_@microsoft+api-extractor@7.47.0_@types+node@20.14.10__jiti@1.21.6_postcss@8.4.39_typescript@5.5.3_yaml@2.4.5/node_modules/tsup/assets/esm_shims.js
+var getFilename = () => fileURLToPath(import.meta.url);
+var getDirname = () => path2__default.dirname(getFilename());
+var __dirname = /* @__PURE__ */ getDirname();
 
 // src/net/Constants.ts
 var API_BASE_URL = (host) => {
@@ -365,7 +369,7 @@ var OntologyMetadataResolver = class {
     } catch (e) {
       return Result.err([`Unable to load the specified Ontology with network error: ${JSON.stringify(e)}`]);
     }
-    const ontologyFullMetadata = await namespaces.getOntologyFullMetadata(this.getRequestFunction(), ontology.apiName);
+    const ontologyFullMetadata = await namespaces.getOntologyFullMetadata(this.getRequestFunction(), ontology.rid);
     if (ontologyFullMetadata.errorName != null) {
       return Result.err([`Unable to load the specified Ontology metadata.
 ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
@@ -557,7 +561,7 @@ function isValidSemver(semverString) {
 }
 
 // src/utils/UserAgent.ts
-var USER_AGENT = `typescript-sdk-generator/${"1.3.1"}`;
+var USER_AGENT = `typescript-sdk-generator/${"1.4.0-beta.0"}`;
 async function createRollupBuild(absolutePackagePath, packageName) {
   const inputPath = `${absolutePackagePath}/${packageName}/index.js`;
   const {
@@ -670,7 +674,7 @@ async function copyFiles(project, dirs, generatedPackageName, generatedFiles) {
     const relativeBuildDir = buildDirsToTry.find((buildDir) => {
       return ["d.ts", "d.cts", "d.mts"].some((ext) => {
         try {
-          fs.statSync(path.join(dir, buildDir, `index.${ext}`));
+          fs.statSync(path2.join(dir, buildDir, `index.${ext}`));
           return true;
         } catch (e) {
           return false;
@@ -680,9 +684,9 @@ async function copyFiles(project, dirs, generatedPackageName, generatedFiles) {
     if (!relativeBuildDir) {
       throw new Error("Couldn't find the right build dir");
     }
-    for (const file of getTypeFiles(path.join(dir, relativeBuildDir))) {
-      const absoluteBuildDir = path.join(dir, relativeBuildDir);
-      const tsPath = removeDts(path.relative(absoluteBuildDir, file));
+    for (const file of getTypeFiles(path2.join(dir, relativeBuildDir))) {
+      const absoluteBuildDir = path2.join(dir, relativeBuildDir);
+      const tsPath = removeDts(path2.relative(absoluteBuildDir, file));
       const newModulePath = `internal/${packageName}/${tsPath}`;
       const fileContents = fs.readFileSync(file).toString();
       const sourceFile = project.createSourceFile(`${newModulePath}.ts`, fileContents, {
@@ -710,13 +714,13 @@ async function copyFiles(project, dirs, generatedPackageName, generatedFiles) {
   return importSet;
 }
 function getPackageName(dir) {
-  const pkg = fs.readFileSync(path.join(dir, "package.json"));
+  const pkg = fs.readFileSync(path2.join(dir, "package.json"));
   const parsed = JSON.parse(pkg.toString());
   return parsed.name;
 }
 function* getTypeFiles(dir) {
   for (const item of fs.readdirSync(dir)) {
-    const target = path.join(dir, item);
+    const target = path2.join(dir, item);
     if (target.endsWith(".d.ts") && !target.endsWith(".test.d.ts") || target.endsWith(".d.cts") && !target.endsWith(".test.d.cts")) {
       yield target;
     } else {
@@ -736,7 +740,7 @@ function transformModuleSpecifier(value, filePath) {
       moduleSpecifier = `internal/${value}`;
     }
   } else if (value.startsWith(".")) {
-    moduleSpecifier = path.join(filePath, "..", value);
+    moduleSpecifier = path2.join(filePath, "..", value);
   } else if (KNOWN_EXTERNAL.has(value)) {
     moduleSpecifier = `internal/${value}`;
   } else {
@@ -1153,15 +1157,15 @@ async function generatePackage(ontology, options) {
   });
   const inMemoryFileSystem = {};
   const hostFs = {
-    writeFile: async (path2, contents) => {
-      inMemoryFileSystem[normalize(path2)] = contents;
+    writeFile: async (path3, contents) => {
+      inMemoryFileSystem[normalize(path3)] = contents;
     },
-    mkdir: async (path2, _options) => {
-      await mkdir(normalize(path2), {
+    mkdir: async (path3, _options) => {
+      await mkdir(normalize(path3), {
         recursive: true
       });
     },
-    readdir: (path2) => readdir(path2)
+    readdir: (path3) => readdir(path3)
   };
   if (!options.beta) {
     await generateClientSdkVersionOneDotOne(ontology, `typescript-sdk/${options.packageVersion} ${USER_AGENT}`, hostFs, packagePath);
@@ -1192,8 +1196,8 @@ async function generatePackage(ontology, options) {
   } else {
     consola.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, {
+  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, {
@@ -1319,6 +1323,11 @@ var GeneratePackageCommand = class {
       demandOption: false,
       hidden: true,
       default: false
+    }).options("sdkPackages", {
+      array: true,
+      string: true,
+      // experimental for now
+      hidden: true
     }).strict();
   }
   handler = async (args) => {
@@ -1369,6 +1378,6 @@ async function cli(args = process.argv) {
   }
 }
 
-export { cli };
+export { GeneratePackageCommand as __testSeamOnly_NotSemverStable__GeneratePackageCommand, cli };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map