@osdk/foundry-sdk-generator 1.3.12 → 1.3.14

package/build/esm/index.js

@@ -12,8 +12,9 @@ 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, SyntaxKind, Node } from 'ts-morph';
 import * as fs from 'fs';
+import { colorize } from 'consola/utils';
 import { ModuleKind, ScriptTarget, createCompilerHost, createSourceFile, createProgram } from 'typescript';
 
 // src/cli/foundrySdkGeneratorCli.ts
@@ -558,7 +559,7 @@ function isValidSemver(semverString) {
 }
 
 // src/utils/UserAgent.ts
-var USER_AGENT = `typescript-sdk-generator/${"1.3.12"}`;
+var USER_AGENT = `typescript-sdk-generator/${"1.3.14"}`;
 async function createRollupBuild(absolutePackagePath, packageName) {
   const inputPath = `${absolutePackagePath}/${packageName}/index.js`;
   const {
@@ -601,166 +602,25 @@ 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;
-}
-
-// src/generate/betaClient/copyFiles.ts
-var KNOWN_EXTERNAL = /* @__PURE__ */ new Set(["geojson"]);
-function removeDts(file) {
-  return file.replace(/\.d\.c?ts$/, "");
-}
-async function copyFiles(project, dirs, generatedPackageName, generatedFiles) {
-  const importSet = /* @__PURE__ */ new Set();
-  for (const [fileName, file] of Object.entries(generatedFiles)) {
-    if (!fileName.endsWith(".d.ts") && !fileName.endsWith(".d.cts")) {
-      continue;
-    }
-    const indexOfPackageName = fileName.indexOf(generatedPackageName);
-    const tsPath = removeDts(fileName.slice(indexOfPackageName + generatedPackageName.length));
-    const newModulePath = `${generatedPackageName}${tsPath}`;
-    const sourceFile = project.createSourceFile(newModulePath, file);
-    for (const importDeclaration of sourceFile.getImportDeclarations()) {
-      const moduleSpecifier = importDeclaration.getModuleSpecifier();
-      const newModuleSpecifier = transformModuleSpecifier(moduleSpecifier.getLiteralValue(), newModulePath);
-      moduleSpecifier.setLiteralValue(newModuleSpecifier);
-      if (newModuleSpecifier.startsWith("internal")) {
-        for (const importName of importDeclaration.getNamedImports().map((imp) => imp.getName())) {
-          importSet.add(importName);
-        }
-      }
-    }
-    for (const exportedDecl of sourceFile.getStatements()) {
-      if (Node.isModifierable(exportedDecl)) {
-        exportedDecl.toggleModifier("declare", false);
-      }
-    }
-    for (const exportDeclaration of sourceFile.getExportDeclarations()) {
-      const moduleSpecifier = exportDeclaration.getModuleSpecifier();
-      if (moduleSpecifier) {
-        const newModuleSpecifier = transformModuleSpecifier(moduleSpecifier.getLiteralValue(), newModulePath);
-        moduleSpecifier.setLiteralValue(newModuleSpecifier);
-        if (newModuleSpecifier.startsWith("internal")) {
-          for (const exportName of exportDeclaration.getNamedExports().map((exp) => exp.getName())) {
-            importSet.add(exportName);
-          }
-        }
-      }
-    }
-  }
-  for (const dir of dirs) {
-    const buildDirsToTry = ["build/cjs", "build/esm"];
-    const packageName = getPackageName(dir);
-    const relativeBuildDir = buildDirsToTry.find((buildDir) => {
-      return ["d.ts", "d.cts", "d.mts"].some((ext) => {
-        try {
-          fs.statSync(path.join(dir, buildDir, `index.${ext}`));
-          return true;
-        } catch (e) {
-          return false;
-        }
-      });
-    });
-    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));
-      const newModulePath = `internal/${packageName}/${tsPath}`;
-      const fileContents = fs.readFileSync(file).toString();
-      const sourceFile = project.createSourceFile(`${newModulePath}.ts`, fileContents, {
-        overwrite: true
-      });
-      for (const importDeclaration of sourceFile.getImportDeclarations()) {
-        const moduleSpecifier = importDeclaration.getModuleSpecifier();
-        const newModuleSpecifier = transformModuleSpecifier(moduleSpecifier.getLiteralValue(), newModulePath);
-        moduleSpecifier.setLiteralValue(newModuleSpecifier);
-      }
-      for (const exportedDecl of sourceFile.getStatements()) {
-        if (Node.isModifierable(exportedDecl)) {
-          exportedDecl.toggleModifier("declare", false);
-        }
-      }
-      for (const exportDeclaration of sourceFile.getExportDeclarations()) {
-        const moduleSpecifier = exportDeclaration.getModuleSpecifier();
-        if (moduleSpecifier) {
-          const newModuleSpecifier = transformModuleSpecifier(moduleSpecifier.getLiteralValue(), newModulePath);
-          moduleSpecifier.setLiteralValue(withoutTrailingIndex(newModuleSpecifier));
-        }
-      }
-    }
-  }
-  return importSet;
-}
-function getPackageName(dir) {
-  const pkg = fs.readFileSync(path.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);
-    if (target.endsWith(".d.ts") && !target.endsWith(".test.d.ts") || target.endsWith(".d.cts") && !target.endsWith(".test.d.cts")) {
-      yield target;
-    } else {
-      const stat = fs.lstatSync(target);
-      if (stat.isDirectory() && item !== "test") {
-        yield* getTypeFiles(target);
-      }
-    }
-  }
-}
-function transformModuleSpecifier(value, filePath) {
-  let moduleSpecifier;
-  if (value.startsWith("@osdk")) {
-    if (value.startsWith("@osdk/gateway/types")) {
-      moduleSpecifier = `internal/${value.replace("@osdk/gateway/types", "@osdk/gateway/public/types")}`;
-    } else {
-      moduleSpecifier = `internal/${value}`;
-    }
-  } else if (value.startsWith(".")) {
-    moduleSpecifier = path.join(filePath, "..", value);
-  } else if (KNOWN_EXTERNAL.has(value)) {
-    moduleSpecifier = `internal/${value}`;
-  } else {
-    throw new Error("Failed generated DTS for package, no handling for: " + value);
-  }
-  return withoutTrailingIndex(withoutExtension(moduleSpecifier));
-}
-function withoutExtension(value) {
-  return value.replace(".js", "");
-}
+var DEBUG = false;
 var ProjectMinifier = class {
   nodesToKeep = {};
   visitedImports = {};
   dependentExport = {};
   stack = [];
-  constructor(project, startingImportSet, startingFilePath) {
+  constructor(project, startingImportSet) {
     this.project = project;
-    this.startingImportSet = startingImportSet;
-    this.startingFilePath = startingFilePath;
-    this.stack.push({
-      sourceFile: this.project.getSourceFile(this.startingFilePath),
-      imports: this.startingImportSet
-    });
+    const filesToImports = {};
+    for (const importSet of startingImportSet) {
+      const [file, importString] = importSet.split(":");
+      if (!filesToImports[file]) {
+        filesToImports[file] = /* @__PURE__ */ new Set();
+      }
+      filesToImports[file].add(importString);
+    }
+    for (const [file, imports] of Object.entries(filesToImports)) {
+      this.pushNextVisit(getModuleSourceFile(project, file), imports, "constructor");
+    }
   }
   shouldContinueVisiting() {
     return this.stack.length > 0;
@@ -771,7 +631,8 @@ var ProjectMinifier = class {
     }
     return this.stack.pop();
   }
-  pushNextVisit(sourceFile, imports) {
+  pushNextVisit(sourceFile, imports, source) {
+    if (imports.size === 0) return;
     this.stack.push({
       sourceFile,
       imports
@@ -787,6 +648,8 @@ var ProjectMinifier = class {
       if (!this.visitedImports[filePath].has(importToCheck)) {
         shouldSkipCheck = false;
         this.visitedImports[filePath].add(importToCheck);
+      } else {
+        traversalStep.imports.delete(importToCheck);
       }
     }
     return shouldSkipCheck;
@@ -806,15 +669,23 @@ var ProjectMinifier = class {
       const identifiersToResolve = /* @__PURE__ */ new Set();
       const sourceFile = visitImports.sourceFile;
       const moduleName = getModuleFromFileName(sourceFile);
-      const nodeSet = this.getNodesToKeepForModule(moduleName);
+      const nodesToKeepForThisModule = this.getNodesToKeepForModule(moduleName);
       for (const [key, declarations] of sourceFile.getExportedDeclarations()) {
+        if (declarations.length === 0 && DEBUG) {
+          console.log(`Possible issue for sdk with slate: can't find declaration for ${key} from ${logNode(sourceFile)}`);
+        }
         if (!visitImports.imports.has(key)) {
           continue;
         }
         this.visitDependentExports(moduleName);
-        this.visitDeclaration(declarations, nodeSet, identifiersToResolve);
+        this.visitDeclaration(declarations, nodesToKeepForThisModule, identifiersToResolve);
       }
       for (const declaration of sourceFile.getExportDeclarations()) {
+        let deleteFromSet2 = function(set, toDelete) {
+          for (const d of toDelete) {
+            set.delete(d);
+          }
+        };
         const moduleSpecifier = declaration.getModuleSpecifier();
         if (!moduleSpecifier) {
           continue;
@@ -832,20 +703,28 @@ var ProjectMinifier = class {
               const nodesToKeepForModule = this.getNodesToKeepForModule(getModuleFromFileName(exportSourceFile));
               nodesToKeepForModule.add(exportSourceFile);
               const importsFromNamespace = new Set(exportSourceFile.getExportedDeclarations().keys());
-              this.pushNextVisit(exportSourceFile, importsFromNamespace);
+              this.pushNextVisit(exportSourceFile, importsFromNamespace, "minifyProjectA");
             }
           }
         }
         const namedExports = declaration.getNamedExports();
         if (namedExports.length === 0) {
-          this.pushNextVisit(exportSourceFile, visitImports.imports);
+          const depExportNames = new Set(exportSourceFile.getExportSymbols().map((s) => s.getName()).filter((s) => visitImports.imports.has(s)));
+          deleteFromSet2(visitImports.imports, depExportNames);
+          this.pushNextVisit(exportSourceFile, depExportNames, "minifyProjectB");
           if (!this.dependentExport[literalText]) {
             this.dependentExport[literalText] = /* @__PURE__ */ new Set();
           }
           this.dependentExport[literalText].add(declaration);
           continue;
         }
-        this.visitNamedExports(namedExports, visitImports, nodeSet, exportSourceFile);
+        this.visitNamedExports(namedExports, visitImports, nodesToKeepForThisModule, exportSourceFile);
+        for (const n of namedExports) {
+          if (visitImports.imports.has(n.getName())) {
+            nodesToKeepForThisModule.add(n);
+            visitImports.imports.delete(n.getName());
+          }
+        }
       }
       for (const declaration of sourceFile.getImportDeclarations()) {
         const namedImports = declaration.getNamedImports();
@@ -866,12 +745,21 @@ var ProjectMinifier = class {
               this.getNodesToKeepForModule(moduleSpecifier.getLiteralText()).add(decl);
             });
             this.getNodesToKeepForModule(moduleSpecifier.getLiteralText()).add(sourceFile);
-            this.pushNextVisit(importSourceFile, importsFromNamespace);
+            this.pushNextVisit(importSourceFile, importsFromNamespace, "minifyProjectC");
           }
           continue;
         }
         this.visitNamedImports(namedImports, identifiersToResolve, moduleName, declaration, importSourceFile);
       }
+      sourceFile.getDescendantsOfKind(SyntaxKind.ImportType).forEach((node) => {
+        const moduleSpecifier = node.getArgument().getText().slice(1, -1);
+        const importSourceFile = getModuleSourceFile(this.project, moduleSpecifier);
+        const qualifier = node.getQualifier();
+        const qualifierSymbol = qualifier?.getSymbol();
+        if (qualifier && qualifierSymbol && importSourceFile && identifiersToResolve.has(qualifierSymbol)) {
+          this.pushNextVisit(importSourceFile, /* @__PURE__ */ new Set([qualifier.getText()]), "dynamic imports");
+        }
+      });
     }
     this.deleteUnused();
   }
@@ -889,7 +777,7 @@ var ProjectMinifier = class {
         this.getNodesToKeepForModule(moduleName).add(declaration);
       }
     }
-    this.pushNextVisit(importSourceFile, importsToVisit);
+    this.pushNextVisit(importSourceFile, importsToVisit, "visitNamedImports");
   }
   // For each named export if it is something that we need, we keep the export
   // And visit the module it is exported from
@@ -910,33 +798,33 @@ var ProjectMinifier = class {
         nodeSet.add(ancestor);
       }
     }
-    this.pushNextVisit(exportSourceFile, exportsToVisit);
+    this.pushNextVisit(exportSourceFile, exportsToVisit, "visitNamedExports");
   }
   // Traverse the declaration and it's dependent symbols
-  visitDeclaration(declarations, nodeSet, identifiers) {
-    const declarationStack = declarations;
+  visitDeclaration(declarations, nodesToKeep, identifiersToResolve) {
+    const declarationStack = [...declarations];
     while (declarationStack.length > 0) {
       const currentDeclaration = declarationStack.pop();
-      if (nodeSet.has(currentDeclaration)) {
+      if (nodesToKeep.has(currentDeclaration)) {
         continue;
       }
-      nodeSet.add(currentDeclaration);
+      nodesToKeep.add(currentDeclaration);
       for (const ancestor of currentDeclaration.getAncestors()) {
-        nodeSet.add(ancestor);
+        nodesToKeep.add(ancestor);
       }
       for (const child of currentDeclaration.getDescendantsOfKind(SyntaxKind.Identifier)) {
         const symbol = child.getSymbol();
-        if (!symbol || identifiers.has(symbol)) {
+        if (!symbol || identifiersToResolve.has(symbol)) {
           continue;
         }
-        identifiers.add(symbol);
+        identifiersToResolve.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()));
+            this.pushNextVisit(importSourceFile, new Set(symbol.getName()), "visitDeclaration");
           } else {
             declarationStack.push(symbolDeclaration);
           }
@@ -976,7 +864,17 @@ var ProjectMinifier = class {
             exportDeclaration.remove();
             continue;
           }
-          for (const namedExport of exportDeclaration.getNamedExports()) {
+          perNamedExport: for (const namedExport of exportDeclaration.getNamedExports()) {
+            for (const n of nodesToKeepForTargetModule) {
+              if (Node.isExportable(n) && n.getSourceFile().getFilePath().startsWith("/internal")) {
+                if (n.getSymbol()?.getName() === namedExport.getName()) {
+                  continue perNamedExport;
+                }
+              }
+            }
+            if (nodesToKeepForModule.has(namedExport)) {
+              continue perNamedExport;
+            }
             if (!nodesToKeepForTargetModule.has(namedExport)) {
               namedExport.remove();
             }
@@ -1019,6 +917,184 @@ var ProjectMinifier = class {
 function getModuleFromFileName(sourceFile) {
   return sourceFile.getFilePath().replace("/", "").replace(".ts", "").replace("/index", "");
 }
+function logFilename(node) {
+  if (typeof node === "string") {
+    return colorize("yellow", node);
+  }
+  return colorize("yellow", `${node.getSourceFile().getFilePath()}:${node.getStartLineNumber()}`);
+}
+function logNode(node, {
+  ancestors,
+  text
+} = {
+  ancestors: false,
+  text: true
+}) {
+  if (Node.isSourceFile(node)) {
+    return `${colorize("blue", "SourceFile[")}${logFilename(node)}${colorize("blue", "]")}`;
+  }
+  return `${colorize("blue", "Node[")}${logFilename(node)}: ${colorize("gray", node.getKindName())}${ancestors ? `:${node.getAncestors().map((n) => n.getKindName()).join(":")}` : ""}${text ? `:${logJustNodeText(node)}` : ""}${colorize("blue", "]")}`;
+}
+function logJustNodeText(node, {
+  maxLength
+} = {
+  maxLength: 50
+}) {
+  const a = node.getText().replace(/\n/g, "\\n");
+  if (a.length <= maxLength) return `\`${a}\``;
+  return `\`${a.slice(0, maxLength)}\`...`;
+}
+
+// src/generate/betaClient/getModuleSourceFile.ts
+var splitExtension = /^(.*)(\.[cm]?js)$/;
+function getModuleSourceFile(project, node) {
+  let exportSourceFile;
+  const literalText = typeof node === "string" ? node : node.getLiteralText();
+  const withoutExtension2 = literalText.match(splitExtension)?.[1] ?? literalText;
+  try {
+    exportSourceFile = project.getSourceFile(`/${withoutExtension2}.ts`);
+    if (!exportSourceFile) {
+      exportSourceFile = project.getSourceFile(`/${withoutExtension2}/index.ts`);
+      if (DEBUG && !exportSourceFile) ;
+    }
+  } catch (e) {
+    console.log(e);
+    return void 0;
+  }
+  return exportSourceFile;
+}
+function withoutTrailingIndex(filePath) {
+  return filePath.endsWith("/index") ? filePath.slice(0, -6) : filePath;
+}
+
+// src/generate/betaClient/copyFiles.ts
+var KNOWN_EXTERNAL = /* @__PURE__ */ new Set(["geojson"]);
+function removeDts(file) {
+  return file.replace(/\.d\.c?ts$/, "");
+}
+async function copyFiles(project, dirs, generatedPackageName, generatedFiles) {
+  const importSet = /* @__PURE__ */ new Set();
+  for (const [fileName, file] of Object.entries(generatedFiles)) {
+    if (!fileName.endsWith(".d.ts") && !fileName.endsWith(".d.cts")) {
+      continue;
+    }
+    const indexOfPackageName = fileName.indexOf(generatedPackageName);
+    const tsPath = removeDts(fileName.slice(indexOfPackageName + generatedPackageName.length));
+    const newModulePath = `${generatedPackageName}${tsPath}`;
+    const sourceFile = project.createSourceFile(newModulePath, file);
+    remapImportsExports(sourceFile, newModulePath, importSet);
+  }
+  for (const dir of dirs) {
+    const buildDirsToTry = [path.join(dir, "build", "cjs"), path.join(dir, "build", "esm"), dir];
+    const packageName = getPackageName(dir);
+    const absoluteBuildDir = buildDirsToTry.find((buildDir) => {
+      return ["d.ts", "d.cts", "d.mts"].some((ext) => {
+        try {
+          fs.statSync(path.join(buildDir, `index.${ext}`));
+          return true;
+        } catch (e) {
+          return false;
+        }
+      });
+    });
+    if (!absoluteBuildDir) {
+      throw new Error("Couldn't find the right build dir");
+    }
+    for (const file of getTypeFiles(absoluteBuildDir)) {
+      const tsPath = removeDts(path.relative(absoluteBuildDir, file));
+      const newModulePath = `internal/${packageName}/${tsPath}`;
+      const fileContents = fs.readFileSync(file).toString();
+      const sourceFile = project.createSourceFile(`${newModulePath}.ts`, fileContents, {
+        overwrite: true
+      });
+      remapImportsExports(sourceFile, newModulePath, void 0);
+    }
+  }
+  return importSet;
+}
+function remapImportsExports(sourceFile, newModulePath, importSet) {
+  for (const importDeclaration of sourceFile.getImportDeclarations()) {
+    const moduleSpecifier = importDeclaration.getModuleSpecifier();
+    const newModuleSpecifier = transformModuleSpecifier(moduleSpecifier.getLiteralValue(), newModulePath);
+    moduleSpecifier.setLiteralValue(newModuleSpecifier);
+    if (importSet && newModuleSpecifier.startsWith("internal")) {
+      for (const importName of importDeclaration.getNamedImports().map((imp) => imp.getName())) {
+        importSet.add(`${newModuleSpecifier}:${importName}`);
+      }
+    }
+  }
+  for (const exportedDecl of sourceFile.getStatements()) {
+    if (Node.isModifierable(exportedDecl)) {
+      exportedDecl.toggleModifier("declare", false);
+    }
+  }
+  for (const exportDeclaration of sourceFile.getExportDeclarations()) {
+    const moduleSpecifier = exportDeclaration.getModuleSpecifier();
+    if (moduleSpecifier) {
+      const newModuleSpecifier = transformModuleSpecifier(moduleSpecifier.getLiteralValue(), newModulePath);
+      moduleSpecifier.setLiteralValue(newModuleSpecifier);
+      if (importSet && newModuleSpecifier.startsWith("internal")) {
+        for (const exportName of exportDeclaration.getNamedExports().map((exp) => exp.getName())) {
+          importSet.add(`${newModuleSpecifier}:${exportName}`);
+        }
+      }
+    }
+  }
+  sourceFile.getDescendantsOfKind(SyntaxKind.ImportType).forEach((node) => {
+    let moduleSpecifier = node.getArgument().getText();
+    if (moduleSpecifier.startsWith('"') && moduleSpecifier.endsWith('"')) {
+      moduleSpecifier = moduleSpecifier.slice(1, -1);
+    }
+    const newModuleSpecifier = transformModuleSpecifier(moduleSpecifier, newModulePath);
+    node.setArgument(newModuleSpecifier);
+    const importName = node.getQualifier()?.getText();
+    if (importSet && newModuleSpecifier.startsWith("internal") && importName) {
+      importSet.add(`${newModuleSpecifier}:${importName}`);
+    }
+  });
+}
+function getPackageName(dir) {
+  const pkg = fs.readFileSync(path.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);
+    if (target.endsWith(".d.ts") && !target.endsWith(".test.d.ts") || target.endsWith(".d.cts") && !target.endsWith(".test.d.cts")) {
+      yield target;
+    } else {
+      const stat = fs.lstatSync(target);
+      if (stat.isDirectory() && item !== "test") {
+        yield* getTypeFiles(target);
+      }
+    }
+  }
+}
+function transformModuleSpecifier(value, filePath) {
+  let moduleSpecifier;
+  if (value.startsWith("@osdk")) {
+    if (value.startsWith("@osdk/gateway/types")) {
+      moduleSpecifier = `internal/${value.replace("@osdk/gateway/types", "@osdk/gateway/public/types")}`;
+    } else {
+      const maybe = value.match(splitExtension);
+      value = maybe ? maybe[1] : value;
+      moduleSpecifier = `internal/${value}`;
+    }
+  } else if (value.startsWith(".")) {
+    const maybe = value.match(splitExtension);
+    value = maybe ? maybe[1] : value;
+    moduleSpecifier = path.join(filePath, "..", value);
+  } else if (KNOWN_EXTERNAL.has(value)) {
+    moduleSpecifier = `internal/${value}`;
+  } else {
+    throw new Error("Failed generated DTS for package, no handling for: " + value);
+  }
+  return withoutTrailingIndex(withoutExtension(moduleSpecifier));
+}
+function withoutExtension(value) {
+  return value.replace(".js", "");
+}
 
 // src/generate/betaClient/bundleDependencies.ts
 async function bundleDependencies(dirs, generatedPackageName, generatedFiles, entry) {
@@ -1027,12 +1103,15 @@ async function bundleDependencies(dirs, generatedPackageName, generatedFiles, en
     compilerOptions: {
       declaration: true,
       emitDeclarationOnly: true,
-      outFile: "dist/bundle/index.d.ts"
+      outFile: "dist/bundle/index.d.ts",
+      paths: {
+        "internal/*": ["/internal/*"]
+      }
     }
   });
   const importSet = await copyFiles(project, dirs, generatedPackageName, generatedFiles);
   if (entry) {
-    const projectMinifier = new ProjectMinifier(project, importSet, entry);
+    const projectMinifier = new ProjectMinifier(project, importSet);
     projectMinifier.minifyProject();
   }
   return outputModule(project);
@@ -1132,7 +1211,8 @@ 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
+  "@osdk/legacy-client": typeof __OSDK_LEGACY_CLIENT_VERSION__ !== "undefined" ? __OSDK_LEGACY_CLIENT_VERSION__ : void 0,
+  "@osdk/api": typeof __OSDK_API_VERSION__ !== "undefined" ? __OSDK_API_VERSION__ : void 0
 };
 var betaDependencies = {
   "@osdk/client.api": typeof __OSDK_CLIENT_API_VERSION__ !== "undefined" ? __OSDK_CLIENT_API_VERSION__ : void 0,
@@ -1186,7 +1266,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.beta ? [] : [join(nodeModulesPath, "@osdk", "legacy-client"), join(nodeModulesPath, "@osdk", "api"), join(nodeModulesPath, "@osdk", "gateway"), join(nodeModulesPath, "@osdk", "shared.net"), join(nodeModulesPath, "@osdk", "shared.client")], options.packageName, compilerOutput.files, options.beta ? void 0 : `internal/@osdk/legacy-client/index.ts`);
     } catch (e) {
       consola2.error("Failed bundling DTS", e);
     }