@osdk/foundry-sdk-generator 2.0.0-beta.8 → 2.0.2-beta.1

package/CHANGELOG.md

@@ -1,5 +1,272 @@
 # @osdk/foundry-sdk-generator
 
+## 2.0.2-beta.1
+
+### Patch Changes
+
+- Updated dependencies [135bddc]
+  - @osdk/client@2.0.2-beta.1
+  - @osdk/generator@2.0.2-beta.1
+  - @osdk/api@2.0.2-beta.1
+
+## 2.0.2-rc.0
+
+### Patch Changes
+
+- 85e03ec: Prepare foundry-sdk-generator for GA
+  - @osdk/client@2.0.2-rc.0
+  - @osdk/generator@2.0.2-rc.0
+  - @osdk/api@2.0.2-rc.0
+
+## 2.0.1
+
+### Patch Changes
+
+- @osdk/client@2.0.1
+- @osdk/internal.foundry.core@0.2.1
+- @osdk/internal.foundry.ontologies@0.2.1
+- @osdk/internal.foundry.ontologiesv2@0.2.1
+- @osdk/shared.net@2.0.1
+- @osdk/generator@2.0.1
+- @osdk/api@2.0.1
+
+## 2.0.0
+
+### Major Changes
+
+- 1252d94: ESM Only
+
+### Minor Changes
+
+- ff718df: Fixes an issue where ambiguous ontology api names can conflict. Used rid instead.
+- 9eb7c6e: Properly handles \_\_dirname
+- 45b8178: Generation now works with or without https prefix on stack name
+- 9eb7c6e: Upgrades version of rollup used internally
+- e6ade8b: Adds fetchMetadata method to client
+- a6486f6: Add peer dependency on client for code generation.
+- 0a374d6: Remove legacy client
+- 9eb7c6e: Restore cjs exports
+- 1f633f7: Removed dependency on @osdk/client.api
+- d4d6605: Audited and cleaned up deps
+
+### Patch Changes
+
+- Updated dependencies [39525b8]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [ac4f4fd]
+- Updated dependencies [f86f8d0]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [3affe49]
+- Updated dependencies [b946e00]
+- Updated dependencies [a2c7b37]
+- Updated dependencies [0ea1a17]
+- Updated dependencies [7494995]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [9b0617d]
+- Updated dependencies [0b20066]
+- Updated dependencies [76a7adb]
+- Updated dependencies [33759fb]
+- Updated dependencies [1770490]
+- Updated dependencies [94105a5]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [51fe88c]
+- Updated dependencies [68a8dc7]
+- Updated dependencies [a2c7b37]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [1252d94]
+- Updated dependencies [e6ade8b]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [f009bb2]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [5a41e5e]
+- Updated dependencies [a2c7b37]
+- Updated dependencies [795777a]
+- Updated dependencies [fe9547e]
+- Updated dependencies [95f9247]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [d2f75f9]
+- Updated dependencies [bbfebfd]
+- Updated dependencies [b7cd0a1]
+- Updated dependencies [7494995]
+- Updated dependencies [512ee35]
+- Updated dependencies [0ae2b07]
+- Updated dependencies [e86c505]
+- Updated dependencies [6eeca39]
+- Updated dependencies [01724ae]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [0ce2858]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [5c89065]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [7c2db00]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [fc28eae]
+- Updated dependencies [56df85a]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [0a374d6]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [885c8e4]
+- Updated dependencies [96ea876]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [6f93c8b]
+- Updated dependencies [a9923f3]
+- Updated dependencies [1f633f7]
+- Updated dependencies [d4d6605]
+- Updated dependencies [96ea876]
+- Updated dependencies [64818dc]
+- Updated dependencies [081114f]
+  - @osdk/client@2.0.0
+  - @osdk/internal.foundry.ontologiesv2@0.2.0
+  - @osdk/internal.foundry.ontologies@0.2.0
+  - @osdk/internal.foundry.core@0.2.0
+  - @osdk/generator@2.0.0
+  - @osdk/api@2.0.0
+  - @osdk/shared.net@2.0.0
+
+## 2.0.0-beta.16
+
+### Patch Changes
+
+- Updated dependencies [dc25fb4]
+- Updated dependencies [dc25fb4]
+  - @osdk/generator@2.0.0-beta.16
+  - @osdk/client@2.0.0-beta.16
+  - @osdk/api@2.0.0-beta.16
+  - @osdk/internal.foundry.core@0.2.0-beta.10
+  - @osdk/internal.foundry.ontologies@0.2.0-beta.10
+  - @osdk/internal.foundry.ontologiesv2@0.2.0-beta.10
+  - @osdk/shared.net@2.0.0-beta.6
+
+## 2.0.0-beta.15
+
+### Minor Changes
+
+- a6486f6: Add peer dependency on client for code generation.
+
+### Patch Changes
+
+- Updated dependencies [dc25fb4]
+  - @osdk/generator@2.0.0-beta.15
+  - @osdk/client@2.0.0-beta.15
+  - @osdk/api@2.0.0-beta.15
+
+## 2.0.0-beta.14
+
+### Minor Changes
+
+- 9eb7c6e: Properly handles \_\_dirname
+- 9eb7c6e: Upgrades version of rollup used internally
+- 1f633f7: Removed dependency on @osdk/client.api
+- d4d6605: Audited and cleaned up deps
+
+### Patch Changes
+
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [a2c7b37]
+- Updated dependencies [fe9547e]
+- Updated dependencies [1f633f7]
+- Updated dependencies [d4d6605]
+  - @osdk/internal.foundry.ontologiesv2@0.2.0-beta.9
+  - @osdk/internal.foundry.ontologies@0.2.0-beta.9
+  - @osdk/internal.foundry.core@0.2.0-beta.9
+  - @osdk/client@2.0.0-beta.14
+  - @osdk/api@2.0.0-beta.14
+  - @osdk/generator@2.0.0-beta.14
+  - @osdk/shared.net@2.0.0-beta.5
+
+## 2.0.0-beta.13
+
+### Patch Changes
+
+- Updated dependencies [1488144]
+- Updated dependencies [d2f75f9]
+- Updated dependencies [bbfebfd]
+- Updated dependencies [b7cd0a1]
+- Updated dependencies [f6e2880]
+- Updated dependencies [c28792e]
+- Updated dependencies [26ee3bd]
+- Updated dependencies [6ab5d2e]
+- Updated dependencies [885c8e4]
+  - @osdk/generator@2.0.0-beta.13
+  - @osdk/client@2.0.0-beta.13
+  - @osdk/api@2.0.0-beta.13
+  - @osdk/client.api@2.0.0-beta.13
+  - @osdk/internal.foundry.core@0.2.0-beta.8
+  - @osdk/internal.foundry.ontologies@0.2.0-beta.8
+  - @osdk/internal.foundry.ontologiesv2@0.2.0-beta.8
+  - @osdk/shared.net@2.0.0-beta.4
+
+## 2.0.0-beta.12
+
+### Patch Changes
+
+- Updated dependencies [dc25fb4]
+  - @osdk/client.api@2.0.0-beta.12
+  - @osdk/client@2.0.0-beta.12
+  - @osdk/generator@2.0.0-beta.12
+  - @osdk/api@2.0.0-beta.12
+
+## 2.0.0-beta.11
+
+### Patch Changes
+
+- Updated dependencies [f009bb2]
+- Updated dependencies [6eeca39]
+  - @osdk/client@2.0.0-beta.11
+  - @osdk/client.api@2.0.0-beta.11
+  - @osdk/generator@2.0.0-beta.11
+  - @osdk/api@2.0.0-beta.11
+
+## 2.0.0-beta.10
+
+### Major Changes
+
+- 1252d94: ESM Only
+
+### Minor Changes
+
+- e6ade8b: Adds fetchMetadata method to client
+
+### Patch Changes
+
+- Updated dependencies [dc25fb4]
+- Updated dependencies [0b20066]
+- Updated dependencies [94105a5]
+- Updated dependencies [dc25fb4]
+- Updated dependencies [1252d94]
+- Updated dependencies [e6ade8b]
+- Updated dependencies [95f9247]
+- Updated dependencies [0ae2b07]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [56df85a]
+  - @osdk/client.api@2.0.0-beta.10
+  - @osdk/generator@2.0.0-beta.10
+  - @osdk/client@2.0.0-beta.10
+  - @osdk/api@2.0.0-beta.10
+  - @osdk/internal.foundry.core@0.2.0-beta.7
+  - @osdk/internal.foundry.ontologiesv2@0.2.0-beta.7
+  - @osdk/shared.net@2.0.0-beta.3
+  - @osdk/internal.foundry.ontologies@0.2.0-beta.7
+
+## 2.0.0-beta.9
+
+### Patch Changes
+
+- Updated dependencies [b946e00]
+- Updated dependencies [01724ae]
+  - @osdk/generator@2.0.0-beta.9
+  - @osdk/client@2.0.0-beta.9
+  - @osdk/api@2.0.0-beta.9
+  - @osdk/shared.net@2.0.0-beta.2
+  - @osdk/client.api@2.0.0-beta.9
+  - @osdk/internal.foundry.core@0.2.0-beta.6
+  - @osdk/internal.foundry.ontologies@0.2.0-beta.6
+  - @osdk/internal.foundry.ontologiesv2@0.2.0-beta.6
+
 ## 2.0.0-beta.8
 
 ### Minor Changes

package/bin/{foundry-sdk-generator.cjs → foundry-sdk-generator.mjs}

@@ -14,6 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { cli } from "../build/esm/index.js";
 
-const cli = require("../build/cjs/index.cjs");
-cli.cli();
+cli();

package/build/browser/index.js

@@ -1,12 +1,12 @@
 import { fileURLToPath } from 'url';
 import * as path2 from 'path';
-import path2__default, { join, isAbsolute, normalize } from 'path';
+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 { generateClientSdkVersionTwoPointZero } from '@osdk/generator';
-import { mkdir, writeFile, readFile, readdir } from 'fs/promises';
+import { mkdir, writeFile, readdir, readFile } from 'fs/promises';
 import commonjs from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import { rollup } from 'rollup';
@@ -137,11 +137,11 @@ var OntologyMetadataResolver = class {
       OntologiesV2
     } = await import('@osdk/internal.foundry.ontologiesv2');
     try {
-      ontology = await Ontologies.getOntology(this.getClientContext(), ontologyRid);
+      ontology = await Ontologies.get(this.getClientContext(), ontologyRid);
     } catch (e) {
       return Result.err([`Unable to load the specified Ontology with network error: ${JSON.stringify(e)}`]);
     }
-    const ontologyFullMetadata = await OntologiesV2.getOntologyFullMetadata(this.getClientContext(), ontology.rid);
+    const ontologyFullMetadata = await OntologiesV2.getFullMetadata(this.getClientContext(), ontology.rid);
     if (ontologyFullMetadata.errorName != null) {
       return Result.err([`Unable to load the specified Ontology metadata.
 ${JSON.stringify(ontologyFullMetadata, null, 2)}`]);
@@ -333,7 +333,7 @@ function isValidSemver(semverString) {
 }
 
 // src/utils/UserAgent.ts
-var USER_AGENT = `typescript-sdk-generator/${"2.0.0-beta.8"}`;
+var USER_AGENT = `typescript-sdk-generator/${"2.0.2-beta.1"}`;
 async function createRollupBuild(absolutePackagePath, packageName) {
   const inputPath = `${absolutePackagePath}/${packageName}/index.js`;
   const {
@@ -570,10 +570,8 @@ function compileInMemory(files, opts) {
   };
 }
 async function generatePackageJson(options) {
-  const packageDeps = options.dependencies?.reduce((acc, value) => {
-    acc[value.dependencyName] = value.dependencyVersion;
-    return acc;
-  }, {});
+  const packageDeps = constructDependencies(options.dependencies);
+  const packagePeerDeps = constructDependencies(options.peerDependencies);
   const packageJson = options.beta ? {
     name: options.packageName,
     version: options.packageVersion,
@@ -588,7 +586,8 @@ async function generatePackageJson(options) {
         default: "./index.js"
       }
     },
-    dependencies: packageDeps
+    dependencies: packageDeps,
+    peerDependencies: packagePeerDeps
   } : {
     name: options.packageName,
     version: options.packageVersion,
@@ -608,27 +607,32 @@ async function generatePackageJson(options) {
         default: "./ontology/objects/index.js"
       }
     },
-    dependencies: packageDeps
+    dependencies: packageDeps,
+    peerDependencies: packagePeerDeps
   };
   await writeFile(join(options.packagePath, "package.json"), JSON.stringify(packageJson, void 0, 4));
 }
+function constructDependencies(dependencies) {
+  return dependencies?.reduce((acc, value) => {
+    acc[value.dependencyName] = value.dependencyVersion;
+    return acc;
+  }, {});
+}
 
 // src/generate/betaClient/generatePackage.ts
 var betaDependencies = {
-  "@osdk/client.api": typeof __OSDK_CLIENT_API_VERSION__ !== "undefined" ? __OSDK_CLIENT_API_VERSION__ : void 0,
   "@osdk/api": typeof __OSDK_API_VERSION__ !== "undefined" ? __OSDK_API_VERSION__ : void 0
 };
+var betaPeerDependencies = {
+  "@osdk/client": typeof __OSDK_CLIENT_VERSION__ !== "undefined" ? __OSDK_CLIENT_VERSION__ : void 0
+};
 async function generatePackage(ontology, options) {
   const {
     consola
   } = await import('consola');
   const packagePath = join(options.outputDir, options.packageName);
-  const resolvedDependencies = await Promise.all(Object.keys(betaDependencies).map(async (dependency) => {
-    return {
-      dependencyName: dependency,
-      dependencyVersion: await getDependencyVersion(dependency)
-    };
-  }));
+  const resolvedDependencies = await resolveDependencies(betaDependencies);
+  const resolvedPeerDependencies = await resolveDependencies(betaPeerDependencies);
   await mkdir(packagePath, {
     recursive: true
   });
@@ -660,7 +664,7 @@ async function generatePackage(ontology, options) {
     findUp
   } = await import('find-up');
   const nodeModulesPath = await findUp("node_modules", {
-    cwd: __dirname,
+    cwd: dirname(fileURLToPath(import.meta.url)),
     type: "directory"
   });
   let bundleDts = "";
@@ -684,6 +688,7 @@ async function generatePackage(ontology, options) {
     packagePath,
     packageVersion: options.packageVersion,
     dependencies: resolvedDependencies,
+    peerDependencies: resolvedPeerDependencies,
     beta: options.beta
   })]);
   const absolutePackagePath = isAbsolute(options.outputDir) ? options.outputDir : join(process.cwd(), options.outputDir);
@@ -698,7 +703,7 @@ async function getDependencyVersion(dependency) {
     findUp
   } = await import('find-up');
   const result = await findUp("package.json", {
-    cwd: __dirname
+    cwd: dirname(fileURLToPath(import.meta.url))
   });
   const packageJson = await readFile(result, {
     encoding: "utf-8"
@@ -709,6 +714,14 @@ async function getDependencyVersion(dependency) {
   const parsedPackageJson = JSON.parse(packageJson);
   return parsedPackageJson.dependencies[dependency];
 }
+async function resolveDependencies(deps) {
+  return await Promise.all(Object.keys(deps).map(async (dependency) => {
+    return {
+      dependencyName: dependency,
+      dependencyVersion: await getDependencyVersion(dependency)
+    };
+  }));
+}
 
 // src/generate/commandUtils.ts
 function transformArrayArg(arg) {