@tsonic/cli 0.0.19 → 0.0.21

package/dist/commands/add-nuget.js

@@ -4,123 +4,67 @@
  * Usage:
  *   tsonic add nuget <PackageId> <Version> [typesPackage]
  *
- * If typesPackage is omitted, bindings are auto-generated via tsbindgen from the
- * restored compile-time assemblies (including transitive dependencies).
+ * Airplane-grade rules:
+ * - Versions are pinned (no automatic upgrades/downgrades)
+ * - If a types package is provided, we do NOT auto-generate bindings
+ * - If types are omitted, we auto-generate bindings for the full transitive closure
+ *   via `tsonic restore` (single source of truth)
  */
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { defaultBindingsPackageNameForNuget, detectTsbindgenNaming, ensurePackageJson, listDotnetRuntimes, npmInstallDevDependency, readTsonicJson, resolveFromProjectRoot, resolveTsbindgenDllPath, tsbindgenGenerate, defaultExec, writeTsonicJson, } from "./add-common.js";
+import { loadConfig } from "../config.js";
+import { dirname } from "node:path";
+import { defaultBindingsPackageNameForNuget, npmInstallDevDependency, writeTsonicJson, } from "./add-common.js";
+import { restoreCommand } from "./restore.js";
+const normalizePkgId = (id) => id.trim().toLowerCase();
 const isValidTypesPackageName = (name) => {
     if (!name.startsWith("@") && !name.includes("/"))
         return true;
     return /^@[a-z0-9-]+\/[a-z0-9-]+$/i.test(name);
 };
-const normalizePkgId = (id) => id.trim().toLowerCase();
-const writeRestoreProject = (restoreDir, targetFramework, packageReferences) => {
-    try {
-        mkdirSync(restoreDir, { recursive: true });
-        const csprojPath = join(restoreDir, "tsonic.nuget.restore.csproj");
-        const itemGroup = packageReferences
-            .map((p) => `    <PackageReference Include="${p.id}" Version="${p.version}" />`)
-            .join("\n");
-        const csproj = `<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>${targetFramework}</TargetFramework>
-    <ImplicitUsings>false</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-${itemGroup}
-  </ItemGroup>
-</Project>
-`;
-        writeFileSync(csprojPath, csproj, "utf-8");
-        return { ok: true, value: csprojPath };
-    }
-    catch (error) {
-        return {
-            ok: false,
-            error: `Failed to write restore project: ${error instanceof Error ? error.message : String(error)}`,
-        };
-    }
-};
-const dotnetRestore = (restoreProjectPath, options, exec = defaultExec) => {
-    const restoreDir = dirname(restoreProjectPath);
-    const result = exec("dotnet", ["restore", restoreProjectPath], restoreDir, options.verbose ? "inherit" : "pipe");
-    if (result.status !== 0) {
-        const msg = result.stderr || result.stdout || "Unknown error";
-        return { ok: false, error: `dotnet restore failed:\n${msg}` };
-    }
-    const assetsPath = join(restoreDir, "obj", "project.assets.json");
-    if (!existsSync(assetsPath)) {
-        return { ok: false, error: `Restore succeeded but assets file missing: ${assetsPath}` };
+export const addNugetCommand = (id, ver, typesPackage, configPath, options = {}) => {
+    const projectRoot = dirname(configPath);
+    if (!id.trim()) {
+        return { ok: false, error: "NuGet package id must be non-empty" };
     }
-    return { ok: true, value: assetsPath };
-};
-const pickPackageFolder = (assets) => {
-    const folders = assets.packageFolders ? Object.keys(assets.packageFolders) : [];
-    if (folders.length === 0)
-        return undefined;
-    // Use the first package folder entry (dotnet restore writes an ordered map).
-    return folders[0];
-};
-const findTargetKey = (assets, tfm) => {
-    const targets = assets.targets ? Object.keys(assets.targets) : [];
-    if (targets.includes(tfm))
-        return tfm;
-    return targets.find((k) => k.startsWith(`${tfm}/`));
-};
-const collectCompileDlls = (assets, targetKey, packageFolder) => {
-    const targets = assets.targets?.[targetKey];
-    const libraries = assets.libraries ?? {};
-    const byLibrary = new Map();
-    if (!targets || typeof targets !== "object")
-        return byLibrary;
-    for (const [libKey, libValue] of Object.entries(targets)) {
-        if (!libKey || !libValue || typeof libValue !== "object")
-            continue;
-        const libInfo = libraries[libKey];
-        if (!libInfo || libInfo.type !== "package" || !libInfo.path)
-            continue;
-        const compile = libValue.compile;
-        if (!compile || typeof compile !== "object")
-            continue;
-        const dlls = Object.keys(compile)
-            .filter((p) => p.toLowerCase().endsWith(".dll"))
-            .map((p) => join(packageFolder, libInfo.path, p));
-        if (dlls.length > 0)
-            byLibrary.set(libKey, dlls);
+    if (!ver.trim()) {
+        return { ok: false, error: "NuGet version must be non-empty" };
     }
-    return byLibrary;
-};
-export const addNugetCommand = (packageId, version, typesPackage, projectRoot, options = {}) => {
-    const id = packageId.trim();
-    const ver = version.trim();
-    if (!id)
-        return { ok: false, error: "PackageId must be non-empty" };
-    if (!ver)
-        return { ok: false, error: "Version must be non-empty" };
     if (typesPackage !== undefined && !isValidTypesPackageName(typesPackage)) {
         return { ok: false, error: `Invalid types package name: ${typesPackage}` };
     }
-    const tsonicConfigResult = readTsonicJson(projectRoot);
+    const tsonicConfigResult = loadConfig(configPath);
     if (!tsonicConfigResult.ok)
         return tsonicConfigResult;
-    const { path: configPath, config } = tsonicConfigResult.value;
+    const config = tsonicConfigResult.value;
     const dotnet = config.dotnet ?? {};
-    const existing = [...(dotnet.packageReferences ?? [])];
-    const existingIdx = existing.findIndex((p) => normalizePkgId(p.id) === normalizePkgId(id));
-    if (existingIdx >= 0) {
-        if (existing[existingIdx]?.version !== ver) {
+    const existing = [
+        ...(dotnet.packageReferences ?? []),
+    ];
+    const idx = existing.findIndex((p) => normalizePkgId(p.id) === normalizePkgId(id));
+    if (idx >= 0) {
+        const current = existing[idx];
+        if (current?.version !== ver) {
             return {
                 ok: false,
-                error: `NuGet package already present with a different version: ${existing[existingIdx]?.id} ${existing[existingIdx]?.version}\n` +
+                error: `NuGet package already present with a different version: ${current?.id} ${current?.version}\n` +
                     `Refusing to change versions automatically (airplane-grade). Update tsonic.json manually if intended.`,
             };
         }
+        if (typesPackage) {
+            if (current?.types && current.types !== typesPackage) {
+                return {
+                    ok: false,
+                    error: `NuGet package already present with a different types package:\n` +
+                        `- ${current.id} ${current.version}\n` +
+                        `- existing: ${current.types}\n` +
+                        `- requested: ${typesPackage}\n` +
+                        `Refusing to change automatically (airplane-grade). Update tsonic.json manually if intended.`,
+                };
+            }
+            existing[idx] = { ...current, types: typesPackage };
+        }
     }
     else {
-        existing.push({ id, version: ver });
+        existing.push(typesPackage ? { id, version: ver, types: typesPackage } : { id, version: ver });
     }
     const nextConfig = {
         ...config,
@@ -132,125 +76,19 @@ export const addNugetCommand = (packageId, version, typesPackage, projectRoot, o
     const writeResult = writeTsonicJson(configPath, nextConfig);
     if (!writeResult.ok)
         return writeResult;
+    const bindings = typesPackage ??
+        existing.find((p) => normalizePkgId(p.id) === normalizePkgId(id))?.types ??
+        defaultBindingsPackageNameForNuget(id);
     if (typesPackage) {
         const installResult = npmInstallDevDependency(projectRoot, typesPackage, options);
         if (!installResult.ok)
             return installResult;
-        return {
-            ok: true,
-            value: { packageId: id, version: ver, bindings: typesPackage },
-        };
+        return { ok: true, value: { packageId: id, version: ver, bindings } };
     }
-    const tsbindgenDllResult = resolveTsbindgenDllPath(projectRoot);
-    if (!tsbindgenDllResult.ok)
-        return tsbindgenDllResult;
-    const tsbindgenDll = tsbindgenDllResult.value;
-    const dotnetLib = join(projectRoot, "node_modules/@tsonic/dotnet");
-    const coreLib = join(projectRoot, "node_modules/@tsonic/core");
-    if (!existsSync(join(dotnetLib, "package.json"))) {
-        return {
-            ok: false,
-            error: "Missing @tsonic/dotnet in node_modules. Run 'tsonic project init' (recommended) or install it manually.",
-        };
-    }
-    if (!existsSync(join(coreLib, "package.json"))) {
-        return {
-            ok: false,
-            error: "Missing @tsonic/core in node_modules. Run 'tsonic project init' (recommended) or install it manually.",
-        };
-    }
-    const targetFramework = nextConfig.dotnetVersion ?? "net10.0";
-    const restoreDir = join(projectRoot, ".tsonic", "nuget");
-    const restoreProject = writeRestoreProject(restoreDir, targetFramework, existing);
-    if (!restoreProject.ok)
-        return restoreProject;
-    const assetsPathResult = dotnetRestore(restoreProject.value, options);
-    if (!assetsPathResult.ok)
-        return assetsPathResult;
-    let assets;
-    try {
-        assets = JSON.parse(readFileSync(assetsPathResult.value, "utf-8"));
-    }
-    catch (error) {
-        return {
-            ok: false,
-            error: `Failed to parse project.assets.json: ${error instanceof Error ? error.message : String(error)}`,
-        };
-    }
-    const packageFolder = pickPackageFolder(assets);
-    if (!packageFolder) {
-        return { ok: false, error: "project.assets.json missing packageFolders (unexpected)" };
-    }
-    const targetKey = findTargetKey(assets, targetFramework);
-    if (!targetKey) {
-        const available = assets.targets ? Object.keys(assets.targets).join("\n") : "(none)";
-        return {
-            ok: false,
-            error: `No restore target found for ${targetFramework}. Available targets:\n${available}`,
-        };
-    }
-    const dllsByLibrary = collectCompileDlls(assets, targetKey, packageFolder);
-    const rootLibKey = Array.from(dllsByLibrary.keys()).find((k) => k.toLowerCase().startsWith(`${normalizePkgId(id)}/`));
-    if (!rootLibKey) {
-        return {
-            ok: false,
-            error: `No compile-time assemblies found for ${id} ${ver}.\n` +
-                `This may be a meta-package or incompatible target framework (${targetFramework}).`,
-        };
-    }
-    const seedDlls = dllsByLibrary.get(rootLibKey) ?? [];
-    if (seedDlls.length === 0) {
-        return {
-            ok: false,
-            error: `No .dll compile assets found for ${id} ${ver} under ${targetFramework}.`,
-        };
-    }
-    const compileDirs = new Set();
-    for (const dlls of dllsByLibrary.values()) {
-        for (const dll of dlls)
-            compileDirs.add(dirname(dll));
-    }
-    const runtimesResult = listDotnetRuntimes(projectRoot);
-    if (!runtimesResult.ok)
-        return runtimesResult;
-    const runtimes = runtimesResult.value;
-    const naming = detectTsbindgenNaming(nextConfig);
-    const generatedPackage = defaultBindingsPackageNameForNuget(id);
-    const bindingsDir = join(projectRoot, "bindings", generatedPackage);
-    mkdirSync(bindingsDir, { recursive: true });
-    const packageJsonResult = ensurePackageJson(bindingsDir, generatedPackage);
-    if (!packageJsonResult.ok)
-        return packageJsonResult;
-    const generateArgs = [
-        ...seedDlls.flatMap((p) => ["-a", p]),
-        "-o",
-        bindingsDir,
-        "--naming",
-        naming,
-        "--lib",
-        dotnetLib,
-        "--lib",
-        coreLib,
-    ];
-    for (const rt of runtimes)
-        generateArgs.push("--ref-dir", rt.dir);
-    for (const d of compileDirs)
-        generateArgs.push("--ref-dir", d);
-    for (const dep of options.deps ?? []) {
-        generateArgs.push("--ref-dir", resolveFromProjectRoot(projectRoot, dep));
-    }
-    const genResult = tsbindgenGenerate(projectRoot, tsbindgenDll, generateArgs, options);
-    if (!genResult.ok)
-        return genResult;
-    const ensurePkg = ensurePackageJson(bindingsDir, generatedPackage);
-    if (!ensurePkg.ok)
-        return ensurePkg;
-    const installLocal = npmInstallDevDependency(projectRoot, `file:bindings/${generatedPackage}`, options);
-    if (!installLocal.ok)
-        return installLocal;
-    return {
-        ok: true,
-        value: { packageId: id, version: ver, bindings: generatedPackage },
-    };
+    // Auto-generate bindings for all auto-gen dependencies (including transitive deps).
+    const restoreResult = restoreCommand(configPath, options);
+    if (!restoreResult.ok)
+        return restoreResult;
+    return { ok: true, value: { packageId: id, version: ver, bindings } };
 };
 //# sourceMappingURL=add-nuget.js.map

package/dist/commands/add-nuget.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-nuget.js","sourceRoot":"","sources":["../../src/commands/add-nuget.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-nuget.js","sourceRoot":"","sources":["../../src/commands/add-nuget.ts"],"names":[],"mappings":"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"}

package/dist/commands/add-package.d.ts

@@ -12,7 +12,7 @@
 import type { Result } from "../types.js";
 import { type AddCommandOptions } from "./add-common.js";
 export type AddPackageOptions = AddCommandOptions;
-export declare const addPackageCommand: (dllPath: string, typesPackage: string | undefined, projectRoot: string, options?: AddPackageOptions) => Result<{
+export declare const addPackageCommand: (dllPath: string, typesPackage: string | undefined, configPath: string, options?: AddPackageOptions) => Result<{
     dllsCopied: number;
     bindings: string;
 }, string>;

package/dist/commands/add-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-package.d.ts","sourceRoot":"","sources":["../../src/commands/add-package.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAUH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AACxD,OAAO,EAWL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAyBlD,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,cAAc,MAAM,GAAG,SAAS,EAChC,aAAa,MAAM,EACnB,UAAS,iBAAsB,KAC9B,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CA0MzD,CAAC"}
+{"version":3,"file":"add-package.d.ts","sourceRoot":"","sources":["../../src/commands/add-package.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAUH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAGxD,OAAO,EAaL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAqClD,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,cAAc,MAAM,GAAG,SAAS,EAChC,YAAY,MAAM,EAClB,UAAS,iBAAsB,KAC9B,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAiTzD,CAAC"}

package/dist/commands/add-package.js

@@ -10,9 +10,11 @@
  * - Any unresolved dependency is a hard failure with actionable diagnostics
  */
 import { copyFileSync, existsSync, mkdirSync, readFileSync, } from "node:fs";
-import { basename, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import { createHash } from "node:crypto";
-import { defaultBindingsPackageNameForDll, detectTsbindgenNaming, ensurePackageJson, listDotnetRuntimes, npmInstallDevDependency, readTsonicJson, resolveFromProjectRoot, resolveTsbindgenDllPath, tsbindgenGenerate, tsbindgenResolveClosure, writeTsonicJson, } from "./add-common.js";
+import { loadConfig } from "../config.js";
+import { isBuiltInRuntimeDllPath } from "../dotnet/runtime-dlls.js";
+import { bindingsStoreDir, defaultBindingsPackageNameForDll, detectTsbindgenNaming, ensureGeneratedBindingsPackageJson, installGeneratedBindingsPackage, listDotnetRuntimes, npmInstallDevDependency, resolveFromProjectRoot, resolvePackageRoot, resolveTsbindgenDllPath, tsbindgenGenerate, tsbindgenResolveClosure, writeTsonicJson, } from "./add-common.js";
 const sha256File = (path) => {
     const data = readFileSync(path);
     // crypto.update's types are stricter than Buffer's ArrayBufferLike surface.
@@ -23,6 +25,7 @@ const addUnique = (arr, value) => {
     if (!arr.includes(value))
         arr.push(value);
 };
+const hasFrameworkReference = (arr, value) => arr.some((r) => (typeof r === "string" ? r : r.id).toLowerCase() === value.toLowerCase());
 const isValidTypesPackageName = (name) => {
     if (!name.startsWith("@") && !name.includes("/"))
         return true;
@@ -34,7 +37,8 @@ const pathIsWithin = (path, dir) => {
     const normalizedBase = normalizedDir.replace(/\\/g, "/");
     return normalizedPath.startsWith(normalizedBase);
 };
-export const addPackageCommand = (dllPath, typesPackage, projectRoot, options = {}) => {
+export const addPackageCommand = (dllPath, typesPackage, configPath, options = {}) => {
+    const projectRoot = dirname(configPath);
     const dllAbs = resolveFromProjectRoot(projectRoot, dllPath);
     if (!existsSync(dllAbs)) {
         return { ok: false, error: `DLL not found: ${dllAbs}` };
@@ -45,13 +49,20 @@ export const addPackageCommand = (dllPath, typesPackage, projectRoot, options =
             error: `Invalid DLL path: ${dllAbs} (must end with .dll)`,
         };
     }
+    if (isBuiltInRuntimeDllPath(dllAbs)) {
+        return {
+            ok: false,
+            error: `Refusing to add built-in runtime DLL: ${basename(dllAbs)}\n` +
+                `Tsonic includes its runtime automatically. Remove it from dotnet.libraries and try again.`,
+        };
+    }
     if (typesPackage !== undefined && !isValidTypesPackageName(typesPackage)) {
         return { ok: false, error: `Invalid types package name: ${typesPackage}` };
     }
-    const tsonicConfigResult = readTsonicJson(projectRoot);
+    const tsonicConfigResult = loadConfig(configPath);
     if (!tsonicConfigResult.ok)
         return tsonicConfigResult;
-    const { path: configPath, config } = tsonicConfigResult.value;
+    const config = tsonicConfigResult.value;
     const tsbindgenDllResult = resolveTsbindgenDllPath(projectRoot);
     if (!tsbindgenDllResult.ok)
         return tsbindgenDllResult;
@@ -119,9 +130,13 @@ export const addPackageCommand = (dllPath, typesPackage, projectRoot, options =
     for (const rel of copiedRelPaths) {
         addUnique(libraries, rel);
     }
-    const frameworkRefs = [...(dotnet.frameworkReferences ?? [])];
+    const frameworkRefs = [
+        ...(dotnet.frameworkReferences ?? []),
+    ];
     for (const fr of requiredFrameworkRefs) {
-        addUnique(frameworkRefs, fr);
+        if (!hasFrameworkReference(frameworkRefs, fr)) {
+            frameworkRefs.push(fr);
+        }
     }
     const nextConfig = {
         ...config,
@@ -145,64 +160,153 @@ export const addPackageCommand = (dllPath, typesPackage, projectRoot, options =
         };
     }
     const naming = detectTsbindgenNaming(nextConfig);
-    const generatedPackage = defaultBindingsPackageNameForDll(dllAbs);
-    const bindingsDir = join(projectRoot, "bindings", generatedPackage);
-    const packageJsonResult = ensurePackageJson(bindingsDir, generatedPackage);
-    if (!packageJsonResult.ok)
-        return packageJsonResult;
-    const dotnetLib = join(projectRoot, "node_modules/@tsonic/dotnet");
-    const coreLib = join(projectRoot, "node_modules/@tsonic/core");
-    if (!existsSync(join(dotnetLib, "package.json"))) {
-        return {
-            ok: false,
-            error: "Missing @tsonic/dotnet in node_modules. Run 'tsonic project init' (recommended) or install it manually.",
-        };
+    const dotnetRoot = resolvePackageRoot(projectRoot, "@tsonic/dotnet");
+    if (!dotnetRoot.ok)
+        return dotnetRoot;
+    const coreRoot = resolvePackageRoot(projectRoot, "@tsonic/core");
+    if (!coreRoot.ok)
+        return coreRoot;
+    const dotnetLib = dotnetRoot.value;
+    const coreLib = coreRoot.value;
+    const nonFramework = closure.resolvedAssemblies.filter((asm) => {
+        const runtimeDir = runtimeDirs.find((rt) => pathIsWithin(asm.path, rt.dir));
+        return !runtimeDir;
+    });
+    const identityKey = (asm) => `${asm.name}|${asm.publicKeyToken}|${asm.culture}`;
+    const byId = new Map();
+    const destPathById = new Map();
+    const directDeps = new Map();
+    for (const asm of nonFramework) {
+        const id = identityKey(asm);
+        if (byId.has(id)) {
+            return {
+                ok: false,
+                error: `Ambiguous assembly identity in closure: ${asm.name} (${asm.publicKeyToken}, ${asm.culture}).\n` +
+                    `This indicates multiple assemblies with the same identity were resolved, which is not supported.`,
+            };
+        }
+        byId.set(id, asm);
+        const destPath = join(libDir, basename(asm.path));
+        if (!existsSync(destPath)) {
+            return {
+                ok: false,
+                error: `Internal error: expected copied DLL to exist: ${destPath}`,
+            };
+        }
+        destPathById.set(id, destPath);
     }
-    if (!existsSync(join(coreLib, "package.json"))) {
-        return {
-            ok: false,
-            error: "Missing @tsonic/core in node_modules. Run 'tsonic project init' (recommended) or install it manually.",
-        };
+    const ids = new Set(byId.keys());
+    for (const asm of nonFramework) {
+        const id = identityKey(asm);
+        const refs = asm.references ?? [];
+        const deps = [];
+        for (const r of refs) {
+            const depId = `${r.name}|${r.publicKeyToken}|${r.culture}`;
+            if (ids.has(depId))
+                deps.push(depId);
+        }
+        // De-dup while preserving order.
+        directDeps.set(id, Array.from(new Set(deps)));
     }
-    const rootDllName = basename(dllAbs);
-    const rootDllInLib = join(libDir, rootDllName);
-    if (!existsSync(rootDllInLib)) {
-        return {
-            ok: false,
-            error: `Internal error: expected ${rootDllInLib} to exist after copy.`,
-        };
+    // Topological order (deps first).
+    const order = [];
+    const state = new Map();
+    const visit = (id) => {
+        const s = state.get(id);
+        if (s === "done")
+            return { ok: true, value: undefined };
+        if (s === "visiting") {
+            return { ok: false, error: `Cycle detected in DLL dependency graph at: ${id}` };
+        }
+        state.set(id, "visiting");
+        for (const dep of directDeps.get(id) ?? []) {
+            const r = visit(dep);
+            if (!r.ok)
+                return r;
+        }
+        state.set(id, "done");
+        order.push(id);
+        return { ok: true, value: undefined };
+    };
+    for (const id of ids) {
+        const r = visit(id);
+        if (!r.ok)
+            return r;
     }
-    const generateArgs = [
-        "-a",
-        rootDllInLib,
-        "-o",
-        bindingsDir,
-        "--naming",
-        naming,
-        "--lib",
-        dotnetLib,
-        "--lib",
-        coreLib,
-    ];
-    for (const dir of runtimeDirs) {
-        generateArgs.push("--ref-dir", dir.dir);
+    // Compute transitive deps for --lib.
+    const transitiveDeps = new Map();
+    for (const id of order) {
+        const set = new Set();
+        for (const dep of directDeps.get(id) ?? []) {
+            set.add(dep);
+            const depTrans = transitiveDeps.get(dep);
+            if (depTrans)
+                for (const t of depTrans)
+                    set.add(t);
+        }
+        transitiveDeps.set(id, set);
     }
-    for (const dep of userDeps) {
-        generateArgs.push("--ref-dir", dep);
+    const bindingsDirById = new Map();
+    const packageNameById = new Map();
+    for (const id of order) {
+        const asm = byId.get(id);
+        const destPath = destPathById.get(id);
+        if (!asm || !destPath) {
+            return { ok: false, error: `Internal error: missing assembly info for ${id}` };
+        }
+        const packageName = defaultBindingsPackageNameForDll(destPath);
+        const bindingsDir = bindingsStoreDir(projectRoot, "dll", packageName);
+        bindingsDirById.set(id, bindingsDir);
+        packageNameById.set(id, packageName);
+        const pkgJsonResult = ensureGeneratedBindingsPackageJson(bindingsDir, packageName, {
+            kind: "dll",
+            source: {
+                assemblyName: asm.name,
+                version: asm.version,
+                path: `lib/${basename(destPath)}`,
+            },
+        });
+        if (!pkgJsonResult.ok)
+            return pkgJsonResult;
+        const generateArgs = [
+            "-a",
+            destPath,
+            "-o",
+            bindingsDir,
+            "--naming",
+            naming,
+            "--lib",
+            dotnetLib,
+            "--lib",
+            coreLib,
+        ];
+        const libs = Array.from(transitiveDeps.get(id) ?? [])
+            .map((depId) => bindingsDirById.get(depId))
+            .filter((p) => typeof p === "string");
+        libs.sort((a, b) => a.localeCompare(b));
+        for (const lib of libs)
+            generateArgs.push("--lib", lib);
+        for (const dir of runtimeDirs)
+            generateArgs.push("--ref-dir", dir.dir);
+        for (const dep of userDeps)
+            generateArgs.push("--ref-dir", dep);
+        generateArgs.push("--ref-dir", libDir);
+        const genResult = tsbindgenGenerate(projectRoot, tsbindgenDll, generateArgs, options);
+        if (!genResult.ok)
+            return genResult;
+        const installResult = installGeneratedBindingsPackage(projectRoot, packageName, bindingsDir);
+        if (!installResult.ok)
+            return installResult;
     }
-    generateArgs.push("--ref-dir", libDir);
-    const genResult = tsbindgenGenerate(projectRoot, tsbindgenDll, generateArgs, options);
-    if (!genResult.ok)
-        return genResult;
-    const ensurePkg = ensurePackageJson(bindingsDir, generatedPackage);
-    if (!ensurePkg.ok)
-        return ensurePkg;
-    const installLocal = npmInstallDevDependency(projectRoot, `file:bindings/${generatedPackage}`, options);
-    if (!installLocal.ok)
-        return installLocal;
+    const rootId = Array.from(order).find((id) => {
+        const dest = destPathById.get(id);
+        return dest ? basename(dest).toLowerCase() === basename(dllAbs).toLowerCase() : false;
+    });
+    const rootPackage = (rootId ? packageNameById.get(rootId) : undefined) ??
+        defaultBindingsPackageNameForDll(dllAbs);
     return {
         ok: true,
-        value: { dllsCopied: copiedCount, bindings: generatedPackage },
+        value: { dllsCopied: copiedCount, bindings: rootPackage },
     };
 };
 //# sourceMappingURL=add-package.js.map