@osdk/foundry-sdk-generator 2.1.0-beta.15 → 2.1.0-beta.17

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @osdk/foundry-sdk-generator
 
+## 2.1.0-beta.17
+
+### Minor Changes
+
+- 1b60b3d: Packages use more specific versions instead of indirection through shared.net
+
+### Patch Changes
+
+- Updated dependencies [1b60b3d]
+  - @osdk/shared.client.impl@1.1.0-beta.3
+  - @osdk/client@2.1.0-beta.17
+  - @osdk/api@2.1.0-beta.17
+  - @osdk/generator@2.1.0-beta.17
+
+## 2.1.0-beta.16
+
+### Minor Changes
+
+- 3a85529: Generated SDKS produce valid ESM packages
+
+### Patch Changes
+
+- Updated dependencies [e5fe7c0]
+  - @osdk/client@2.1.0-beta.16
+  - @osdk/api@2.1.0-beta.16
+  - @osdk/generator@2.1.0-beta.16
+
 ## 2.1.0-beta.15
 
 ### Patch Changes

package/build/browser/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';
@@ -13,9 +13,9 @@ import { rollup } from 'rollup';
 import nodePolyfill from 'rollup-plugin-polyfill-node';
 import { Project, Node } from 'ts-morph';
 import * as fs from 'fs';
-import { ModuleKind, ScriptTarget, createCompilerHost, createSourceFile, createProgram } from 'typescript';
+import { ModuleKind, ScriptTarget, ModuleResolutionKind, 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.47.0_@types+node@22.10.1__jiti@1.21.6_postcss@8.4.47_typescript@5.5.4_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();
@@ -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(([, {
@@ -559,7 +559,7 @@ async function resolveDependenciesFromFindUp(deps, cwd) {
 }
 
 // src/utils/UserAgent.ts
-var USER_AGENT = `typescript-sdk-generator/${"2.1.0-beta.15"}`;
+var USER_AGENT = `typescript-sdk-generator/${"2.1.0-beta.17"}`;
 async function createRollupBuild(absolutePackagePath, packageName) {
   const inputPath = `${absolutePackagePath}/${packageName}/index.js`;
   const {
@@ -771,11 +771,12 @@ function outputModule(project) {
   });
   return modules.join("\n");
 }
-function compileInMemory(files, opts) {
+function compileInMemory(files) {
   const inMemoryOutputFileSystem = {};
   const compilerOptions = {
-    module: ModuleKind.NodeNext ,
-    target: ScriptTarget.ES2019,
+    module: ModuleKind.NodeNext,
+    target: ScriptTarget.ES2020,
+    moduleResolution: ModuleResolutionKind.NodeNext,
     declaration: true,
     skipLibCheck: true
   };
@@ -818,6 +819,7 @@ async function generatePackageJson(options) {
     type: "module"
   };
   await writeFile(join(options.packagePath, "package.json"), JSON.stringify(packageJson, void 0, 4));
+  return packageJson;
 }
 function constructDependencies(dependencies) {
   return dependencies?.reduce((acc, value) => {
@@ -841,8 +843,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,6 +854,15 @@ 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 contents = await generatePackageJson({
+    packageName: options.packageName,
+    packagePath,
+    packageVersion: options.packageVersion,
+    dependencies: [],
+    peerDependencies: resolvedPeerDependencies,
+    beta: options.beta
+  });
+  await hostFs.writeFile(join(packagePath, "package.json"), JSON.stringify(contents));
   const compilerOutput = compileInMemory(inMemoryFileSystem);
   compilerOutput.diagnostics.forEach((d) => consola.error(`Error compiling file`, d.file?.fileName, d.messageText));
   await mkdir(join(packagePath, "dist", "bundle"), {
@@ -874,19 +885,12 @@ async function generatePackage(ontologyInfo, options) {
   } else {
     consola.error("Could not find node_modules directory, skipping DTS bundling");
   }
-  await Promise.all([...Object.entries(compilerOutput.files).map(async ([path3, contents]) => {
-    await writeFile(path3, contents, {
+  await Promise.all([...Object.entries(compilerOutput.files).map(async ([path3, contents2]) => {
+    await writeFile(path3, contents2, {
       flag: "w"
     });
   }), await writeFile(join(packagePath, "dist", "bundle", "index.d.ts"), 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 {