@tsonic/cli 0.0.63 → 0.0.64

package/dist/commands/add-npm.js

@@ -5,31 +5,29 @@
  * Usage:
  *   tsonic add npm <packageSpec>
  *
- * The npm package must include `tsonic.bindings.json` at its package root.
- * That manifest is the ONLY mechanism used to discover .NET deps (airplane-grade).
+ * Supported manifest contracts (airplane-grade):
+ * - `tsonic/package-manifest.json` (Aikya)
+ * - `tsonic.bindings.json` (legacy/external)
  */
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { loadWorkspaceConfig } from "../config.js";
 import { npmInstallDevDependency, resolvePackageRoot, writeTsonicJson, } from "./add-common.js";
-const normalizeId = (id) => id.trim().toLowerCase();
+import { discoverWorkspaceBindingsManifests, mergeManifestIntoWorkspaceConfig, resolveInstalledPackageBindingsManifest, } from "../aikya/bindings.js";
 const parseNpmPackageName = (rawSpec) => {
     const spec = rawSpec.trim();
     if (!spec)
         return null;
-    // Reject path-ish specs; these are handled separately.
     if (spec.startsWith("file:") ||
         spec.startsWith(".") ||
         spec.startsWith("/") ||
         spec.includes("\\")) {
         return null;
     }
-    // Scoped: @scope/pkg[@ver]
     if (spec.startsWith("@")) {
         const match = spec.match(/^(@[^/]+\/[^@/]+)(?:@.+)?$/);
         return match?.[1] ?? null;
     }
-    // Unscoped: pkg[@ver]
     const match = spec.match(/^([^@/]+)(?:@.+)?$/);
     return match?.[1] ?? null;
 };
@@ -80,130 +78,28 @@ const resolvePackageNameFromSpec = (workspaceRoot, packageSpec) => {
             `Use a standard npm spec (e.g., @scope/pkg@1.2.3) or a local directory (file:./path).`,
     };
 };
-const readBindingsManifest = (pkgRoot) => {
-    const manifestPath = join(pkgRoot, "tsonic.bindings.json");
-    if (!existsSync(manifestPath)) {
-        return {
-            ok: false,
-            error: `Missing tsonic.bindings.json in npm package: ${pkgRoot}\n` +
-                `This package does not declare its .NET dependency graph for Tsonic.`,
-        };
-    }
+const writeNormalizedBindingsManifest = (workspaceRoot, packageName, manifest) => {
+    const outDir = join(workspaceRoot, ".tsonic", "manifests", "npm", packageName);
+    const outPath = join(outDir, "tsonic.bindings.normalized.json");
     try {
-        const parsed = JSON.parse(readFileSync(manifestPath, "utf-8"));
-        if (parsed === null || typeof parsed !== "object") {
-            return {
-                ok: false,
-                error: `Invalid tsonic.bindings.json (must be an object): ${manifestPath}`,
-            };
-        }
-        return { ok: true, value: parsed };
+        mkdirSync(outDir, { recursive: true });
+        writeFileSync(outPath, JSON.stringify(manifest, null, 2) + "\n", "utf-8");
+        return { ok: true, value: undefined };
     }
     catch (error) {
         return {
             ok: false,
-            error: `Failed to parse tsonic.bindings.json: ${error instanceof Error ? error.message : String(error)}`,
+            error: `Failed to write normalized bindings manifest: ${error instanceof Error ? error.message : String(error)}`,
         };
     }
 };
-const mergeFrameworkReferences = (existing, incoming) => {
-    const out = [...existing];
-    const byId = new Map();
-    for (const ref of out) {
-        const id = typeof ref === "string" ? ref : ref.id;
-        byId.set(normalizeId(id), ref);
-    }
-    for (const ref of incoming) {
-        const id = typeof ref === "string" ? ref : ref.id;
-        const key = normalizeId(id);
-        const current = byId.get(key);
-        if (!current) {
-            out.push(ref);
-            byId.set(key, ref);
-            continue;
-        }
-        const currentTypes = typeof current === "string" ? undefined : current.types;
-        const nextTypes = typeof ref === "string" ? undefined : ref.types;
-        if (nextTypes !== undefined &&
-            currentTypes !== undefined &&
-            currentTypes !== nextTypes) {
-            return {
-                ok: false,
-                error: `Conflicting framework types mapping for '${id}'.\n` +
-                    `Existing: ${String(currentTypes)}\n` +
-                    `Manifest: ${String(nextTypes)}\n` +
-                    `Refusing to change automatically (airplane-grade). Update tsonic.workspace.json manually if intended.`,
-            };
-        }
-        // If existing is string and incoming has types, upgrade entry to object.
-        if (typeof current === "string" && typeof ref !== "string") {
-            const idx = out.findIndex((x) => (typeof x === "string" ? x : x.id).toLowerCase() ===
-                current.toLowerCase());
-            if (idx >= 0)
-                out[idx] = { id: current, types: ref.types };
-            byId.set(key, out[idx]);
-        }
-    }
-    return { ok: true, value: out };
-};
-const mergePackageReferences = (existing, incoming) => {
-    const out = [...existing];
-    const byId = new Map();
-    for (const p of out)
-        byId.set(normalizeId(p.id), p);
-    for (const p of incoming) {
-        const key = normalizeId(p.id);
-        const current = byId.get(key);
-        if (!current) {
-            out.push(p);
-            byId.set(key, p);
-            continue;
-        }
-        if (current.version !== p.version) {
-            return {
-                ok: false,
-                error: `NuGet package already present with a different version: ${current.id} ${current.version}\n` +
-                    `Manifest requested: ${p.id} ${p.version}\n` +
-                    `Refusing to change versions automatically (airplane-grade). Update tsonic.workspace.json manually if intended.`,
-            };
-        }
-        if (p.types !== undefined &&
-            current.types !== undefined &&
-            current.types !== p.types) {
-            return {
-                ok: false,
-                error: `NuGet package already present with a different types mapping:\n` +
-                    `- ${current.id} ${current.version}\n` +
-                    `- existing: ${String(current.types)}\n` +
-                    `- manifest: ${String(p.types)}\n` +
-                    `Refusing to change automatically (airplane-grade). Update tsonic.workspace.json manually if intended.`,
-            };
-        }
-        if (current.types === undefined && p.types !== undefined) {
-            const idx = out.findIndex((x) => normalizeId(x.id) === key);
-            if (idx >= 0)
-                out[idx] = { ...current, types: p.types };
-            byId.set(key, out[idx]);
-        }
-    }
-    return { ok: true, value: out };
-};
-const mergeMsbuildProperties = (existing, incoming) => {
-    const out = { ...existing };
-    for (const [k, v] of Object.entries(incoming)) {
-        const current = out[k];
-        if (current !== undefined && current !== v) {
-            return {
-                ok: false,
-                error: `Conflicting msbuildProperties for key '${k}'.\n` +
-                    `Existing: ${current}\n` +
-                    `Manifest: ${v}\n` +
-                    `Refusing to change automatically (airplane-grade). Update tsonic.workspace.json manually if intended.`,
-            };
-        }
-        out[k] = v;
+const writeNormalizedBindingsManifests = (workspaceRoot, manifests) => {
+    for (const manifest of manifests) {
+        const writeResult = writeNormalizedBindingsManifest(workspaceRoot, manifest.packageName, manifest);
+        if (!writeResult.ok)
+            return writeResult;
     }
-    return { ok: true, value: out };
+    return { ok: true, value: undefined };
 };
 const installTypesPackages = (workspaceRoot, manifest, selfPackageName, options) => {
     const typesToInstall = new Set();
@@ -217,7 +113,6 @@ const installTypesPackages = (workspaceRoot, manifest, selfPackageName, options)
         if (typeof p.types === "string")
             typesToInstall.add(p.types);
     }
-    // If the manifest points back at itself, avoid re-installing redundantly.
     typesToInstall.delete(selfPackageName);
     for (const pkg of typesToInstall) {
         const r = npmInstallDevDependency(workspaceRoot, pkg, options);
@@ -226,78 +121,75 @@ const installTypesPackages = (workspaceRoot, manifest, selfPackageName, options)
     }
     return { ok: true, value: undefined };
 };
+const installTypesPackagesForManifests = (workspaceRoot, manifests, options) => {
+    for (const manifest of manifests) {
+        const dotnetTypesResult = installTypesPackages(workspaceRoot, manifest.dotnet, manifest.packageName, options);
+        if (!dotnetTypesResult.ok)
+            return dotnetTypesResult;
+        const testTypesResult = installTypesPackages(workspaceRoot, manifest.testDotnet, manifest.packageName, options);
+        if (!testTypesResult.ok)
+            return testTypesResult;
+    }
+    return { ok: true, value: undefined };
+};
 export const addNpmCommand = (packageSpec, configPath, options = {}) => {
     const workspaceRoot = dirname(configPath);
     const nameResult = resolvePackageNameFromSpec(workspaceRoot, packageSpec);
     if (!nameResult.ok)
         return nameResult;
-    const packageName = nameResult.value;
+    const requestedPackageName = nameResult.value;
     const installResult = npmInstallDevDependency(workspaceRoot, packageSpec, options);
     if (!installResult.ok)
         return installResult;
-    const pkgRootResult = resolvePackageRoot(workspaceRoot, packageName);
+    const pkgRootResult = resolvePackageRoot(workspaceRoot, requestedPackageName);
     if (!pkgRootResult.ok)
         return pkgRootResult;
     const pkgRoot = pkgRootResult.value;
-    const manifestResult = readBindingsManifest(pkgRoot);
+    const manifestResult = resolveInstalledPackageBindingsManifest(pkgRoot);
     if (!manifestResult.ok)
         return manifestResult;
     const manifest = manifestResult.value;
+    if (!manifest) {
+        return {
+            ok: false,
+            error: `Missing manifest in npm package: ${pkgRoot}\n` +
+                `Expected one of:\n` +
+                `- tsonic/package-manifest.json\n` +
+                `- tsonic.bindings.json`,
+        };
+    }
+    const discovered = discoverWorkspaceBindingsManifests(workspaceRoot);
+    if (!discovered.ok)
+        return discovered;
+    const resolvedManifests = discovered.value;
+    const requestedResolved = resolvedManifests.some((m) => m.packageName === manifest.packageName &&
+        m.packageVersion === manifest.packageVersion);
+    if (!requestedResolved) {
+        return {
+            ok: false,
+            error: `Installed npm package '${manifest.packageName}@${manifest.packageVersion}' ` +
+                `was not found during workspace manifest discovery.`,
+        };
+    }
+    const writeAllResult = writeNormalizedBindingsManifests(workspaceRoot, resolvedManifests);
+    if (!writeAllResult.ok)
+        return writeAllResult;
     const configResult = loadWorkspaceConfig(configPath);
     if (!configResult.ok)
         return configResult;
-    const config = configResult.value;
-    const dotnet = config.dotnet ?? {};
-    const testDotnet = config.testDotnet ?? {};
-    const mergedFramework = mergeFrameworkReferences((dotnet.frameworkReferences ?? []), (manifest.dotnet?.frameworkReferences ?? []));
-    if (!mergedFramework.ok)
-        return mergedFramework;
-    const mergedPackages = mergePackageReferences((dotnet.packageReferences ?? []), (manifest.dotnet?.packageReferences ?? []));
-    if (!mergedPackages.ok)
-        return mergedPackages;
-    const mergedMsbuild = mergeMsbuildProperties((dotnet.msbuildProperties ?? {}), (manifest.dotnet?.msbuildProperties ?? {}));
-    if (!mergedMsbuild.ok)
-        return mergedMsbuild;
-    const mergedTestFramework = mergeFrameworkReferences((testDotnet.frameworkReferences ?? []), (manifest.testDotnet?.frameworkReferences ??
-        []));
-    if (!mergedTestFramework.ok)
-        return mergedTestFramework;
-    const mergedTestPackages = mergePackageReferences((testDotnet.packageReferences ?? []), (manifest.testDotnet?.packageReferences ?? []));
-    if (!mergedTestPackages.ok)
-        return mergedTestPackages;
-    const mergedTestMsbuild = mergeMsbuildProperties((testDotnet.msbuildProperties ?? {}), (manifest.testDotnet?.msbuildProperties ?? {}));
-    if (!mergedTestMsbuild.ok)
-        return mergedTestMsbuild;
-    const nextConfig = {
-        ...config,
-        dotnet: {
-            ...dotnet,
-            frameworkReferences: mergedFramework.value,
-            packageReferences: mergedPackages.value,
-            msbuildProperties: Object.keys(mergedMsbuild.value).length > 0
-                ? mergedMsbuild.value
-                : undefined,
-        },
-        testDotnet: manifest.testDotnet
-            ? {
-                ...testDotnet,
-                frameworkReferences: mergedTestFramework.value,
-                packageReferences: mergedTestPackages.value,
-                msbuildProperties: Object.keys(mergedTestMsbuild.value).length > 0
-                    ? mergedTestMsbuild.value
-                    : undefined,
-            }
-            : config.testDotnet,
-    };
-    const writeResult = writeTsonicJson(configPath, nextConfig);
+    let mergedConfig = configResult.value;
+    for (const item of resolvedManifests) {
+        const merged = mergeManifestIntoWorkspaceConfig(mergedConfig, item);
+        if (!merged.ok)
+            return merged;
+        mergedConfig = merged.value;
+    }
+    const writeResult = writeTsonicJson(configPath, mergedConfig);
     if (!writeResult.ok)
         return writeResult;
-    const dotnetTypesResult = installTypesPackages(workspaceRoot, manifest.dotnet, packageName, options);
-    if (!dotnetTypesResult.ok)
-        return dotnetTypesResult;
-    const testTypesResult = installTypesPackages(workspaceRoot, manifest.testDotnet, packageName, options);
-    if (!testTypesResult.ok)
-        return testTypesResult;
-    return { ok: true, value: { packageName } };
+    const typesResult = installTypesPackagesForManifests(workspaceRoot, resolvedManifests, options);
+    if (!typesResult.ok)
+        return typesResult;
+    return { ok: true, value: { packageName: manifest.packageName } };
 };
 //# sourceMappingURL=add-npm.js.map

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

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

package/dist/commands/add-npm.test.js

@@ -39,10 +39,18 @@ const writeLocalNpmPackage = (workspaceRoot, relDir, pkg) => {
         private: true,
         version: "1.0.0",
         type: "module",
+        ...(pkg.dependencies ? { dependencies: pkg.dependencies } : {}),
     }, null, 2) + "\n", "utf-8");
     if (pkg.manifest !== undefined) {
         writeFileSync(join(pkgRoot, "tsonic.bindings.json"), JSON.stringify(pkg.manifest, null, 2) + "\n", "utf-8");
     }
+    if (pkg.aikyaManifest !== undefined) {
+        mkdirSync(join(pkgRoot, "tsonic"), { recursive: true });
+        writeFileSync(join(pkgRoot, "tsonic", "package-manifest.json"), JSON.stringify(pkg.aikyaManifest, null, 2) + "\n", "utf-8");
+    }
+    if (pkg.bindingsRoot) {
+        mkdirSync(join(pkgRoot, pkg.bindingsRoot), { recursive: true });
+    }
     return pkgRoot;
 };
 describe("add npm", function () {
@@ -90,6 +98,32 @@ describe("add npm", function () {
             expect(cfg.testDotnet.packageReferences).to.deep.equal([
                 { id: "Acme.Test", version: "2.0.0", types: false },
             ]);
+            const normalizedManifestPath = join(dir, ".tsonic", "manifests", "npm", pkgName, "tsonic.bindings.normalized.json");
+            expect(existsSync(normalizedManifestPath)).to.equal(true);
+            const normalizedManifest = JSON.parse(readFileSync(normalizedManifestPath, "utf-8"));
+            expect(normalizedManifest["bindingVersion"]).to.equal(1);
+            expect(normalizedManifest["packageName"]).to.equal(pkgName);
+            expect(normalizedManifest["packageVersion"]).to.equal("1.0.0");
+            expect(normalizedManifest["surfaceMode"]).to.equal("clr");
+            const runtimePackages = normalizedManifest["runtimePackages"];
+            expect(runtimePackages).to.deep.equal([pkgName]);
+            const nugetDependencies = normalizedManifest["nugetDependencies"];
+            expect(nugetDependencies).to.deep.equal([
+                {
+                    source: "dotnet.framework",
+                    id: "Microsoft.AspNetCore.App",
+                },
+                {
+                    source: "dotnet.package",
+                    id: "Acme.A",
+                    version: "1.0.0",
+                },
+                {
+                    source: "testDotnet.package",
+                    id: "Acme.Test",
+                    version: "2.0.0",
+                },
+            ]);
         }
         finally {
             rmSync(dir, { recursive: true, force: true });
@@ -124,7 +158,7 @@ describe("add npm", function () {
             rmSync(dir, { recursive: true, force: true });
         }
     });
-    it("errors when the npm package lacks tsonic.bindings.json", () => {
+    it("errors when the npm package lacks both supported manifest contracts", () => {
         const dir = mkdtempSync(join(tmpdir(), "tsonic-add-npm-missing-"));
         try {
             const configPath = writeWorkspaceConfig(dir);
@@ -133,7 +167,247 @@ describe("add npm", function () {
                 quiet: true,
             });
             expect(result.ok).to.equal(false);
-            expect(result.ok ? "" : result.error).to.match(/Missing tsonic\.bindings\.json/);
+            expect(result.ok ? "" : result.error).to.match(/Missing manifest/);
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+    it("errors on unsupported manifest bindingVersion", () => {
+        const dir = mkdtempSync(join(tmpdir(), "tsonic-add-npm-bindver-"));
+        try {
+            const configPath = writeWorkspaceConfig(dir);
+            const pkgName = "acme-bindings";
+            writeLocalNpmPackage(dir, "local/acme-bindings", {
+                name: pkgName,
+                manifest: {
+                    bindingVersion: 2,
+                    dotnet: {
+                        packageReferences: [
+                            { id: "Acme.A", version: "1.0.0", types: pkgName },
+                        ],
+                    },
+                },
+            });
+            const result = addNpmCommand("./local/acme-bindings", configPath, {
+                quiet: true,
+            });
+            expect(result.ok).to.equal(false);
+            expect(result.ok ? "" : result.error).to.match(/bindingVersion/i);
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+    it("errors on packageName mismatch between manifest and installed package", () => {
+        const dir = mkdtempSync(join(tmpdir(), "tsonic-add-npm-name-mismatch-"));
+        try {
+            const configPath = writeWorkspaceConfig(dir);
+            writeLocalNpmPackage(dir, "local/acme-bindings", {
+                name: "acme-bindings",
+                manifest: {
+                    bindingVersion: 1,
+                    packageName: "different-name",
+                    dotnet: {
+                        packageReferences: [{ id: "Acme.A", version: "1.0.0" }],
+                    },
+                },
+            });
+            const result = addNpmCommand("./local/acme-bindings", configPath, {
+                quiet: true,
+            });
+            expect(result.ok).to.equal(false);
+            expect(result.ok ? "" : result.error).to.match(/packageName mismatch/i);
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+    it("writes deterministic normalized manifest bytes across repeated installs", () => {
+        const dir = mkdtempSync(join(tmpdir(), "tsonic-add-npm-deterministic-"));
+        try {
+            const configPath = writeWorkspaceConfig(dir);
+            const pkgName = "acme-bindings";
+            writeLocalNpmPackage(dir, "local/acme-bindings", {
+                name: pkgName,
+                manifest: {
+                    bindingVersion: 1,
+                    surfaceMode: "nodejs",
+                    runtimePackages: ["@tsonic/nodejs", "@tsonic/js"],
+                    dotnet: {
+                        packageReferences: [
+                            { id: "Zeta", version: "1.0.0" },
+                            { id: "Acme.A", version: "1.0.0" },
+                        ],
+                    },
+                    testDotnet: {
+                        frameworkReferences: ["Microsoft.AspNetCore.App"],
+                    },
+                },
+            });
+            const first = addNpmCommand("./local/acme-bindings", configPath, {
+                quiet: true,
+            });
+            expect(first.ok).to.equal(true);
+            const normalizedManifestPath = join(dir, ".tsonic", "manifests", "npm", pkgName, "tsonic.bindings.normalized.json");
+            const firstBytes = readFileSync(normalizedManifestPath, "utf-8");
+            const second = addNpmCommand("./local/acme-bindings", configPath, {
+                quiet: true,
+            });
+            expect(second.ok).to.equal(true);
+            const secondBytes = readFileSync(normalizedManifestPath, "utf-8");
+            expect(secondBytes).to.equal(firstBytes);
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+    it("supports Aikya package-manifest and injects runtime NuGet references", () => {
+        const dir = mkdtempSync(join(tmpdir(), "tsonic-add-npm-aikya-"));
+        try {
+            const configPath = writeWorkspaceConfig(dir);
+            const pkgName = "@acme/node";
+            writeLocalNpmPackage(dir, "local/acme-node", {
+                name: pkgName,
+                bindingsRoot: "tsonic/bindings",
+                aikyaManifest: {
+                    schemaVersion: 1,
+                    kind: "tsonic-library",
+                    npmPackage: pkgName,
+                    npmVersion: "1.0.0",
+                    runtime: {
+                        nugetPackages: [{ id: "Acme.Node.Runtime", version: "1.0.0" }],
+                        frameworkReferences: ["Microsoft.AspNetCore.App"],
+                        runtimePackages: ["@tsonic/dotnet"],
+                    },
+                    typing: {
+                        bindingsRoot: "tsonic/bindings",
+                    },
+                    producer: {
+                        tool: "tsonic",
+                        version: "0.0.70",
+                        mode: "aikya-firstparty",
+                    },
+                },
+            });
+            const result = addNpmCommand("./local/acme-node", configPath, {
+                quiet: true,
+            });
+            expect(result.ok).to.equal(true);
+            expect(result.ok ? result.value.packageName : "").to.equal(pkgName);
+            const cfg = readWorkspaceConfig(dir);
+            expect(cfg.dotnet.frameworkReferences).to.deep.equal([
+                "Microsoft.AspNetCore.App",
+            ]);
+            expect(cfg.dotnet.packageReferences).to.deep.equal([
+                { id: "Acme.Node.Runtime", version: "1.0.0" },
+            ]);
+            const normalizedManifestPath = join(dir, ".tsonic", "manifests", "npm", pkgName, "tsonic.bindings.normalized.json");
+            const normalizedManifest = JSON.parse(readFileSync(normalizedManifestPath, "utf-8"));
+            expect(normalizedManifest["sourceManifest"]).to.equal("aikya");
+            expect(normalizedManifest["packageName"]).to.equal(pkgName);
+            expect(normalizedManifest["bindingsRoot"]).to.equal("tsonic/bindings");
+            expect(normalizedManifest["runtimePackages"]).to.deep.equal([
+                "@acme/node",
+                "@tsonic/dotnet",
+            ]);
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+    it("resolves transitive Aikya manifests and injects all runtime NuGet references", () => {
+        const dir = mkdtempSync(join(tmpdir(), "tsonic-add-npm-aikya-transitive-"));
+        try {
+            const configPath = writeWorkspaceConfig(dir);
+            writeLocalNpmPackage(dir, "local/acme-child", {
+                name: "acme-child",
+                bindingsRoot: "tsonic/bindings",
+                aikyaManifest: {
+                    schemaVersion: 1,
+                    kind: "tsonic-library",
+                    npmPackage: "acme-child",
+                    npmVersion: "1.0.0",
+                    runtime: {
+                        nugetPackages: [{ id: "Acme.Child.Runtime", version: "1.0.0" }],
+                    },
+                    typing: {
+                        bindingsRoot: "tsonic/bindings",
+                    },
+                    producer: {
+                        tool: "tsonic",
+                        version: "0.0.70",
+                        mode: "aikya-firstparty",
+                    },
+                },
+            });
+            writeLocalNpmPackage(dir, "local/acme-parent", {
+                name: "acme-parent",
+                dependencies: {
+                    "acme-child": "file:../acme-child",
+                },
+                bindingsRoot: "tsonic/bindings",
+                aikyaManifest: {
+                    schemaVersion: 1,
+                    kind: "tsonic-library",
+                    npmPackage: "acme-parent",
+                    npmVersion: "1.0.0",
+                    runtime: {
+                        nugetPackages: [{ id: "Acme.Parent.Runtime", version: "1.0.0" }],
+                    },
+                    typing: {
+                        bindingsRoot: "tsonic/bindings",
+                    },
+                    producer: {
+                        tool: "tsonic",
+                        version: "0.0.70",
+                        mode: "aikya-firstparty",
+                    },
+                },
+            });
+            const result = addNpmCommand("./local/acme-parent", configPath, {
+                quiet: true,
+            });
+            expect(result.ok).to.equal(true);
+            expect(result.ok ? result.value.packageName : "").to.equal("acme-parent");
+            const cfg = readWorkspaceConfig(dir);
+            expect(cfg.dotnet.packageReferences).to.deep.equal([
+                { id: "Acme.Child.Runtime", version: "1.0.0" },
+                { id: "Acme.Parent.Runtime", version: "1.0.0" },
+            ]);
+            const childManifest = join(dir, ".tsonic", "manifests", "npm", "acme-child", "tsonic.bindings.normalized.json");
+            const parentManifest = join(dir, ".tsonic", "manifests", "npm", "acme-parent", "tsonic.bindings.normalized.json");
+            expect(existsSync(childManifest)).to.equal(true);
+            expect(existsSync(parentManifest)).to.equal(true);
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+    it("emits TSN8A04 when Aikya manifest bindingsRoot is missing", () => {
+        const dir = mkdtempSync(join(tmpdir(), "tsonic-add-npm-aikya-root-"));
+        try {
+            const configPath = writeWorkspaceConfig(dir);
+            writeLocalNpmPackage(dir, "local/acme-node", {
+                name: "@acme/node",
+                aikyaManifest: {
+                    schemaVersion: 1,
+                    kind: "tsonic-library",
+                    npmPackage: "@acme/node",
+                    npmVersion: "1.0.0",
+                    runtime: {
+                        nugetPackages: [{ id: "Acme.Node.Runtime", version: "1.0.0" }],
+                    },
+                    typing: {
+                        bindingsRoot: "tsonic/bindings",
+                    },
+                },
+            });
+            const result = addNpmCommand("./local/acme-node", configPath, {
+                quiet: true,
+            });
+            expect(result.ok).to.equal(false);
+            expect(result.ok ? "" : result.error).to.match(/^TSN8A04:/);
         }
         finally {
             rmSync(dir, { recursive: true, force: true });