@osdk/foundry-sdk-generator 1.4.0-beta.4 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @osdk/foundry-sdk-generator
 
+## 2.0.0-beta.6
+
+### Minor Changes
+
+- 0a374d6: Remove legacy client
+
+### Patch Changes
+
+- Updated dependencies [3affe49]
+- Updated dependencies [76a7adb]
+- Updated dependencies [a2c7b37]
+- Updated dependencies [0ce2858]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [0a374d6]
+- Updated dependencies [96ea876]
+- Updated dependencies [5d6d5ab]
+- Updated dependencies [6f93c8b]
+- Updated dependencies [a9923f3]
+  - @osdk/api@2.0.0-beta.6
+  - @osdk/client@2.0.0-beta.6
+  - @osdk/client.api@2.0.0-beta.6
+  - @osdk/generator@2.0.0-beta.6
+  - @osdk/gateway@2.5.0-beta.0
+
+## 1.4.0-beta.5
+
+### Patch Changes
+
+- Updated dependencies [dc25fb4]
+  - @osdk/client.api@0.22.0-beta.5
+  - @osdk/generator@1.14.0-beta.4
+  - @osdk/client@0.22.0-beta.5
+  - @osdk/api@1.10.0-beta.1
+  - @osdk/legacy-client@2.6.0-beta.1
+
 ## 1.4.0-beta.4
 
 ### Patch Changes

package/build/browser/index.js

@@ -6,13 +6,13 @@ import { hideBin } from 'yargs/helpers';
 import { exit } from 'process';
 import { namespaces } from '@osdk/gateway';
 import { UserTokenAuth } from '@osdk/legacy-client';
-import { generateClientSdkVersionOneDotOne, generateClientSdkVersionTwoPointZero } from '@osdk/generator';
+import { generateClientSdkVersionTwoPointZero } from '@osdk/generator';
 import { mkdir, writeFile, readFile, readdir } from 'fs/promises';
 import commonjs from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import { rollup } from 'rollup';
 import nodePolyfill from 'rollup-plugin-polyfill-node';
-import { Project, Node, SyntaxKind } from 'ts-morph';
+import { Project, Node } from 'ts-morph';
 import * as fs from 'fs';
 import { ModuleKind, ScriptTarget, createCompilerHost, createSourceFile, createProgram } from 'typescript';
 
@@ -561,7 +561,7 @@ function isValidSemver(semverString) {
 }
 
 // src/utils/UserAgent.ts
-var USER_AGENT = `typescript-sdk-generator/${"1.4.0-beta.4"}`;
+var USER_AGENT = `typescript-sdk-generator/${"2.0.0-beta.6"}`;
 async function createRollupBuild(absolutePackagePath, packageName) {
   const inputPath = `${absolutePackagePath}/${packageName}/index.js`;
   const {
@@ -604,23 +604,6 @@ async function generateEsmBuild(absolutePackagePath, packageName) {
 async function generateBundles(absolutePackagePath, packageName) {
   await Promise.all([generateEsmBuild(absolutePackagePath, packageName)]);
 }
-
-// src/generate/betaClient/getModuleSourceFile.ts
-function getModuleSourceFile(project, node) {
-  let exportSourceFile;
-  try {
-    exportSourceFile = project.getSourceFile(`/${node.getLiteralText()}.ts`);
-    if (!exportSourceFile) {
-      exportSourceFile = project.getSourceFile(`/${node.getLiteralText()}/index.ts`);
-      if (!exportSourceFile) {
-        return void 0;
-      }
-    }
-  } catch (e) {
-    return void 0;
-  }
-  return exportSourceFile;
-}
 function withoutTrailingIndex(filePath) {
   return filePath.endsWith("/index") ? filePath.slice(0, -6) : filePath;
 }
@@ -751,277 +734,6 @@ function transformModuleSpecifier(value, filePath) {
 function withoutExtension(value) {
   return value.replace(".js", "");
 }
-var ProjectMinifier = class {
-  nodesToKeep = {};
-  visitedImports = {};
-  dependentExport = {};
-  stack = [];
-  constructor(project, startingImportSet, startingFilePath) {
-    this.project = project;
-    this.startingImportSet = startingImportSet;
-    this.startingFilePath = startingFilePath;
-    this.stack.push({
-      sourceFile: this.project.getSourceFile(this.startingFilePath),
-      imports: this.startingImportSet
-    });
-  }
-  shouldContinueVisiting() {
-    return this.stack.length > 0;
-  }
-  getNextVisit() {
-    if (this.stack.length === 0) {
-      throw new Error("Done processing");
-    }
-    return this.stack.pop();
-  }
-  pushNextVisit(sourceFile, imports) {
-    this.stack.push({
-      sourceFile,
-      imports
-    });
-  }
-  shouldSkipTraversal(traversalStep) {
-    const filePath = traversalStep.sourceFile.getFilePath();
-    if (!this.visitedImports[filePath]) {
-      this.visitedImports[filePath] = /* @__PURE__ */ new Set();
-    }
-    let shouldSkipCheck = true;
-    for (const importToCheck of traversalStep.imports) {
-      if (!this.visitedImports[filePath].has(importToCheck)) {
-        shouldSkipCheck = false;
-        this.visitedImports[filePath].add(importToCheck);
-      }
-    }
-    return shouldSkipCheck;
-  }
-  getNodesToKeepForModule(moduleName) {
-    if (!this.nodesToKeep[moduleName]) {
-      this.nodesToKeep[moduleName] = /* @__PURE__ */ new Set();
-    }
-    return this.nodesToKeep[moduleName];
-  }
-  minifyProject() {
-    while (this.shouldContinueVisiting()) {
-      const visitImports = this.getNextVisit();
-      if (this.shouldSkipTraversal(visitImports)) {
-        continue;
-      }
-      const identifiersToResolve = /* @__PURE__ */ new Set();
-      const sourceFile = visitImports.sourceFile;
-      const moduleName = getModuleFromFileName(sourceFile);
-      const nodeSet = this.getNodesToKeepForModule(moduleName);
-      for (const [key, declarations] of sourceFile.getExportedDeclarations()) {
-        if (!visitImports.imports.has(key)) {
-          continue;
-        }
-        this.visitDependentExports(moduleName);
-        this.visitDeclaration(declarations, nodeSet, identifiersToResolve);
-      }
-      for (const declaration of sourceFile.getExportDeclarations()) {
-        const moduleSpecifier = declaration.getModuleSpecifier();
-        if (!moduleSpecifier) {
-          continue;
-        }
-        const literalText = moduleSpecifier.getLiteralText();
-        const exportSourceFile = getModuleSourceFile(this.project, moduleSpecifier);
-        if (!exportSourceFile) {
-          continue;
-        }
-        if (declaration.isNamespaceExport()) {
-          const namespaceExport = declaration.getNamespaceExport();
-          if (namespaceExport) {
-            if (visitImports.imports.has(namespaceExport.getName())) {
-              this.getNodesToKeepForModule(moduleName).add(namespaceExport);
-              const nodesToKeepForModule = this.getNodesToKeepForModule(getModuleFromFileName(exportSourceFile));
-              nodesToKeepForModule.add(exportSourceFile);
-              const importsFromNamespace = new Set(exportSourceFile.getExportedDeclarations().keys());
-              this.pushNextVisit(exportSourceFile, importsFromNamespace);
-            }
-          }
-        }
-        const namedExports = declaration.getNamedExports();
-        if (namedExports.length === 0) {
-          this.pushNextVisit(exportSourceFile, visitImports.imports);
-          if (!this.dependentExport[literalText]) {
-            this.dependentExport[literalText] = /* @__PURE__ */ new Set();
-          }
-          this.dependentExport[literalText].add(declaration);
-          continue;
-        }
-        this.visitNamedExports(namedExports, visitImports, nodeSet, exportSourceFile);
-      }
-      for (const declaration of sourceFile.getImportDeclarations()) {
-        const namedImports = declaration.getNamedImports();
-        const moduleSpecifier = declaration.getModuleSpecifier();
-        if (!moduleSpecifier) {
-          continue;
-        }
-        const importSourceFile = getModuleSourceFile(this.project, moduleSpecifier);
-        if (!importSourceFile) {
-          continue;
-        }
-        if (namedImports.length === 0) {
-          const aliasedSymbol = declaration.getImportClause()?.getNamespaceImport()?.getSymbol();
-          if (aliasedSymbol && identifiersToResolve.has(aliasedSymbol)) {
-            this.getNodesToKeepForModule(moduleName).add(declaration);
-            const importsFromNamespace = new Set(importSourceFile.getExportedDeclarations().keys());
-            importSourceFile.getExportDeclarations().forEach((decl) => {
-              this.getNodesToKeepForModule(moduleSpecifier.getLiteralText()).add(decl);
-            });
-            this.getNodesToKeepForModule(moduleSpecifier.getLiteralText()).add(sourceFile);
-            this.pushNextVisit(importSourceFile, importsFromNamespace);
-          }
-          continue;
-        }
-        this.visitNamedImports(namedImports, identifiersToResolve, moduleName, declaration, importSourceFile);
-      }
-    }
-    this.deleteUnused();
-  }
-  visitNamedImports(namedImports, identifiersToResolve, moduleName, declaration, importSourceFile) {
-    const importsToVisit = /* @__PURE__ */ new Set();
-    for (const namedImport of namedImports) {
-      const symbol = namedImport.getSymbol();
-      if (!symbol) {
-        continue;
-      }
-      if (identifiersToResolve.has(symbol)) {
-        importsToVisit.add(symbol.getName());
-        importsToVisit.add(namedImport.getName());
-        this.getNodesToKeepForModule(moduleName).add(namedImport);
-        this.getNodesToKeepForModule(moduleName).add(declaration);
-      }
-    }
-    this.pushNextVisit(importSourceFile, importsToVisit);
-  }
-  // For each named export if it is something that we need, we keep the export
-  // And visit the module it is exported from
-  // export { A } from ".."
-  visitNamedExports(namedExports, visitImports, nodeSet, exportSourceFile) {
-    const exportsToVisit = /* @__PURE__ */ new Set();
-    for (const namedExport of namedExports) {
-      const symbol = namedExport.getSymbol();
-      if (!symbol) {
-        continue;
-      }
-      if (!visitImports.imports.has(symbol.getName())) {
-        continue;
-      }
-      exportsToVisit.add(symbol.getName());
-      nodeSet.add(namedExport);
-      for (const ancestor of namedExport.getAncestors()) {
-        nodeSet.add(ancestor);
-      }
-    }
-    this.pushNextVisit(exportSourceFile, exportsToVisit);
-  }
-  // Traverse the declaration and it's dependent symbols
-  visitDeclaration(declarations, nodeSet, identifiers) {
-    const declarationStack = declarations;
-    while (declarationStack.length > 0) {
-      const currentDeclaration = declarationStack.pop();
-      if (nodeSet.has(currentDeclaration)) {
-        continue;
-      }
-      nodeSet.add(currentDeclaration);
-      for (const ancestor of currentDeclaration.getAncestors()) {
-        nodeSet.add(ancestor);
-      }
-      for (const child of currentDeclaration.getDescendantsOfKind(SyntaxKind.Identifier)) {
-        const symbol = child.getSymbol();
-        if (!symbol || identifiers.has(symbol)) {
-          continue;
-        }
-        identifiers.add(symbol);
-        for (const symbolDeclaration of symbol.getDeclarations()) {
-          if (Node.isImportDeclaration(symbolDeclaration)) {
-            const importSourceFile = getModuleSourceFile(this.project, symbolDeclaration.getModuleSpecifier());
-            if (!importSourceFile) {
-              continue;
-            }
-            this.pushNextVisit(importSourceFile, new Set(symbol.getName()));
-          } else {
-            declarationStack.push(symbolDeclaration);
-          }
-        }
-      }
-    }
-  }
-  deleteUnused() {
-    const deletedModules = /* @__PURE__ */ new Set();
-    this.project.getSourceFiles().forEach((sourceFile) => {
-      if (sourceFile.getFilePath().startsWith("/internal")) {
-        const moduleName = getModuleFromFileName(sourceFile);
-        const nodesToKeepForModule = this.nodesToKeep[moduleName];
-        if (!nodesToKeepForModule || nodesToKeepForModule.size === 0) {
-          deletedModules.add(moduleName);
-          sourceFile.deleteImmediatelySync();
-          return;
-        }
-        sourceFile.getImportDeclarations().forEach((importDeclaration) => {
-          importDeclaration.getNamedImports().forEach((namedImport) => {
-            if (nodesToKeepForModule && !nodesToKeepForModule.has(namedImport)) {
-              namedImport.remove();
-            }
-          });
-        });
-        for (const exportDeclaration of sourceFile.getExportDeclarations()) {
-          const targetModuleSpecifier = exportDeclaration.getModuleSpecifier();
-          if (!targetModuleSpecifier) {
-            continue;
-          }
-          const targetModuleLiteralText = targetModuleSpecifier.getLiteralText();
-          if (deletedModules.has(targetModuleLiteralText)) {
-            continue;
-          }
-          const nodesToKeepForTargetModule = this.nodesToKeep[targetModuleLiteralText];
-          if (!nodesToKeepForTargetModule || nodesToKeepForTargetModule.size === 0) {
-            exportDeclaration.remove();
-            continue;
-          }
-          for (const namedExport of exportDeclaration.getNamedExports()) {
-            if (!nodesToKeepForTargetModule.has(namedExport)) {
-              namedExport.remove();
-            }
-          }
-        }
-        sourceFile.forEachChild((node) => {
-          if (!nodesToKeepForModule.has(node)) {
-            node.replaceWithText("");
-          }
-        });
-        const lines = sourceFile.getText().split("\n");
-        if (lines.length === 0) {
-          deletedModules.add(moduleName);
-          sourceFile.deleteImmediatelySync();
-          return;
-        }
-      }
-    });
-  }
-  // Visit all files up which have done
-  // `export * from "moduleName"`
-  visitDependentExports(moduleName) {
-    if (!this.dependentExport[moduleName]) {
-      return;
-    }
-    const dependentExportStack = [moduleName];
-    while (dependentExportStack.length > 0) {
-      const nextModuleName = dependentExportStack.pop();
-      if (!this.dependentExport[nextModuleName]) {
-        continue;
-      }
-      for (const node of this.dependentExport[nextModuleName]) {
-        const reexportModuleName = getModuleFromFileName(node.getSourceFile());
-        this.getNodesToKeepForModule(reexportModuleName).add(node);
-        dependentExportStack.push(reexportModuleName);
-      }
-    }
-  }
-};
-function getModuleFromFileName(sourceFile) {
-  return sourceFile.getFilePath().replace("/", "").replace(".ts", "").replace("/index", "");
-}
 
 // src/generate/betaClient/bundleDependencies.ts
 async function bundleDependencies(dirs, generatedPackageName, generatedFiles, entry) {
@@ -1033,11 +745,7 @@ async function bundleDependencies(dirs, generatedPackageName, generatedFiles, en
       outFile: "dist/bundle/index.d.ts"
     }
   });
-  const importSet = await copyFiles(project, dirs, generatedPackageName, generatedFiles);
-  if (entry) {
-    const projectMinifier = new ProjectMinifier(project, importSet, entry);
-    projectMinifier.minifyProject();
-  }
+  await copyFiles(project, dirs, generatedPackageName, generatedFiles);
   return outputModule(project);
 }
 function outputModule(project) {
@@ -1134,9 +842,6 @@ async function generatePackageJson(options) {
 }
 
 // src/generate/betaClient/generatePackage.ts
-var dependencies = {
-  "@osdk/legacy-client": typeof __OSDK_LEGACY_CLIENT_VERSION__ !== "undefined" ? __OSDK_LEGACY_CLIENT_VERSION__ : void 0
-};
 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
@@ -1146,7 +851,7 @@ async function generatePackage(ontology, options) {
     consola
   } = await import('consola');
   const packagePath = join(options.outputDir, options.packageName);
-  const resolvedDependencies = await Promise.all(Object.keys(options.beta ? betaDependencies : dependencies).map(async (dependency) => {
+  const resolvedDependencies = await Promise.all(Object.keys(betaDependencies).map(async (dependency) => {
     return {
       dependencyName: dependency,
       dependencyVersion: await getDependencyVersion(dependency)
@@ -1168,7 +873,7 @@ async function generatePackage(ontology, options) {
     readdir: (path3) => readdir(path3)
   };
   if (!options.beta) {
-    await generateClientSdkVersionOneDotOne(ontology, `typescript-sdk/${options.packageVersion} ${USER_AGENT}`, hostFs, packagePath);
+    throw new Error("Only beta is supported in this version");
   } else {
     await generateClientSdkVersionTwoPointZero(ontology, `typescript-sdk/${options.packageVersion} ${USER_AGENT}`, hostFs, packagePath, "module");
   }
@@ -1189,7 +894,7 @@ async function generatePackage(ontology, options) {
   let bundleDts = "";
   if (nodeModulesPath) {
     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`);
+      bundleDts = await bundleDependencies([], options.packageName, compilerOutput.files, void 0);
     } catch (e) {
       consola.error("Failed bundling DTS", e);
     }
@@ -1217,9 +922,6 @@ async function generatePackage(ontology, options) {
   }
 }
 async function getDependencyVersion(dependency) {
-  if (dependencies[dependency] !== void 0) {
-    return dependencies[dependency];
-  }
   const {
     findUp
   } = await import('find-up');