@tsonic/cli 0.0.26 → 0.0.28

package/dist/commands/add-framework.js

@@ -1,5 +1,5 @@
 /**
- * tsonic add framework - add a FrameworkReference to the project, plus bindings.
+ * tsonic add framework - add a FrameworkReference to the workspace, plus bindings.
  *
  * Usage:
  *   tsonic add framework Microsoft.AspNetCore.App [typesPackage]
@@ -7,9 +7,9 @@
  * If typesPackage is omitted, bindings are auto-generated via tsbindgen from the
  * installed shared framework assemblies.
  */
-import { loadConfig } from "../config.js";
+import { loadWorkspaceConfig } from "../config.js";
 import { dirname } from "node:path";
-import { bindingsStoreDir, defaultBindingsPackageNameForFramework, detectTsbindgenNaming, ensureGeneratedBindingsPackageJson, installGeneratedBindingsPackage, listDotnetRuntimes, npmInstallDevDependency, resolveFromProjectRoot, resolvePackageRoot, resolveTsbindgenDllPath, tsbindgenGenerate, writeTsonicJson, } from "./add-common.js";
+import { bindingsStoreDir, defaultBindingsPackageNameForFramework, ensureGeneratedBindingsPackageJson, installGeneratedBindingsPackage, listDotnetRuntimes, npmInstallDevDependency, resolveFromProjectRoot, resolvePackageRoot, resolveTsbindgenDllPath, tsbindgenGenerate, writeTsonicJson, } from "./add-common.js";
 const normalizeFrameworkRefId = (value) => typeof value === "string" ? value : value.id;
 const isValidTypesPackageName = (name) => {
     if (!name.startsWith("@") && !name.includes("/"))
@@ -17,14 +17,14 @@ const isValidTypesPackageName = (name) => {
     return /^@[a-z0-9-]+\/[a-z0-9-]+$/i.test(name);
 };
 export const addFrameworkCommand = (frameworkReference, typesPackage, configPath, options = {}) => {
-    const projectRoot = dirname(configPath);
+    const workspaceRoot = dirname(configPath);
     if (!frameworkReference.trim()) {
         return { ok: false, error: "Framework reference must be non-empty" };
     }
     if (typesPackage !== undefined && !isValidTypesPackageName(typesPackage)) {
         return { ok: false, error: `Invalid types package name: ${typesPackage}` };
     }
-    const tsonicConfigResult = loadConfig(configPath);
+    const tsonicConfigResult = loadWorkspaceConfig(configPath);
     if (!tsonicConfigResult.ok)
         return tsonicConfigResult;
     const config = tsonicConfigResult.value;
@@ -47,7 +47,7 @@ export const addFrameworkCommand = (frameworkReference, typesPackage, configPath
                         `- ${frameworkReference}\n` +
                         `- existing: ${existing.types}\n` +
                         `- requested: ${typesPackage}\n` +
-                        `Refusing to change automatically (airplane-grade). Update tsonic.json manually if intended.`,
+                        `Refusing to change automatically (airplane-grade). Update tsonic.workspace.json manually if intended.`,
                 };
             }
             else {
@@ -69,7 +69,7 @@ export const addFrameworkCommand = (frameworkReference, typesPackage, configPath
     if (!writeResult.ok)
         return writeResult;
     if (typesPackage) {
-        const installResult = npmInstallDevDependency(projectRoot, typesPackage, options);
+        const installResult = npmInstallDevDependency(workspaceRoot, typesPackage, options);
         if (!installResult.ok)
             return installResult;
         return {
@@ -77,11 +77,11 @@ export const addFrameworkCommand = (frameworkReference, typesPackage, configPath
             value: { frameworkReference, bindings: typesPackage },
         };
     }
-    const tsbindgenDllResult = resolveTsbindgenDllPath(projectRoot);
+    const tsbindgenDllResult = resolveTsbindgenDllPath(workspaceRoot);
     if (!tsbindgenDllResult.ok)
         return tsbindgenDllResult;
     const tsbindgenDll = tsbindgenDllResult.value;
-    const runtimesResult = listDotnetRuntimes(projectRoot);
+    const runtimesResult = listDotnetRuntimes(workspaceRoot);
     if (!runtimesResult.ok)
         return runtimesResult;
     const runtimes = runtimesResult.value;
@@ -94,17 +94,12 @@ export const addFrameworkCommand = (frameworkReference, typesPackage, configPath
                 `Installed runtimes:\n${available}`,
         };
     }
-    const dotnetRoot = resolvePackageRoot(projectRoot, "@tsonic/dotnet");
+    const dotnetRoot = resolvePackageRoot(workspaceRoot, "@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 naming = detectTsbindgenNaming(nextConfig);
     const generatedPackage = defaultBindingsPackageNameForFramework(frameworkReference);
-    const bindingsDir = bindingsStoreDir(projectRoot, "framework", generatedPackage);
+    const bindingsDir = bindingsStoreDir(workspaceRoot, "framework", generatedPackage);
     const packageJsonResult = ensureGeneratedBindingsPackageJson(bindingsDir, generatedPackage, {
         kind: "framework",
         source: { frameworkReference },
@@ -116,23 +111,19 @@ export const addFrameworkCommand = (frameworkReference, typesPackage, configPath
         runtime.dir,
         "-o",
         bindingsDir,
-        "--naming",
-        naming,
         "--lib",
         dotnetLib,
-        "--lib",
-        coreLib,
     ];
     for (const rt of runtimes) {
         generateArgs.push("--ref-dir", rt.dir);
     }
     for (const dep of options.deps ?? []) {
-        generateArgs.push("--ref-dir", resolveFromProjectRoot(projectRoot, dep));
+        generateArgs.push("--ref-dir", resolveFromProjectRoot(workspaceRoot, dep));
     }
-    const genResult = tsbindgenGenerate(projectRoot, tsbindgenDll, generateArgs, options);
+    const genResult = tsbindgenGenerate(workspaceRoot, tsbindgenDll, generateArgs, options);
     if (!genResult.ok)
         return genResult;
-    const installResult = installGeneratedBindingsPackage(projectRoot, generatedPackage, bindingsDir);
+    const installResult = installGeneratedBindingsPackage(workspaceRoot, generatedPackage, bindingsDir);
     if (!installResult.ok)
         return installResult;
     return {

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

@@ -1 +1 @@
-{"version":3,"file":"add-framework.js","sourceRoot":"","sources":["../../src/commands/add-framework.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EACL,gBAAgB,EAChB,sCAAsC,EACtC,qBAAqB,EACrB,kCAAkC,EAClC,+BAA+B,EAC/B,kBAAkB,EAClB,uBAAuB,EACvB,sBAAsB,EACtB,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,EAEjB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AAQzB,MAAM,uBAAuB,GAAG,CAAC,KAA+B,EAAU,EAAE,CAC1E,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;AAE/C,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAW,EAAE;IACxD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9D,OAAO,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,kBAA0B,EAC1B,YAAgC,EAChC,UAAkB,EAClB,UAA+B,EAAE,EACiC,EAAE;IACpE,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACxC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC;QAC/B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,uCAAuC,EAAE,CAAC;IACvE,CAAC;IACD,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,EAAE,CAAC;QACzE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,+BAA+B,YAAY,EAAE,EAAE,CAAC;IAC7E,CAAC;IAED,MAAM,kBAAkB,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAClD,IAAI,CAAC,kBAAkB,CAAC,EAAE;QAAE,OAAO,kBAAkB,CAAC;IACtD,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC;IAExC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IACnC,MAAM,aAAa,GAA+B;QAChD,GAAI,CAAC,MAAM,CAAC,mBAAmB,IAAI,EAAE,CAAgC;KACtE,CAAC;IAEF,MAAM,GAAG,GAAG,aAAa,CAAC,SAAS,CACjC,CAAC,CAAC,EAAE,EAAE,CACJ,uBAAuB,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QACxC,kBAAkB,CAAC,WAAW,EAAE,CACnC,CAAC;IAEF,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAA6B,CAAC;QAChE,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACjC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;YAC7D,CAAC;iBAAM,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;gBAC7D,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EACH,uEAAuE;wBACvE,KAAK,kBAAkB,IAAI;wBAC3B,eAAe,QAAQ,CAAC,KAAK,IAAI;wBACjC,gBAAgB,YAAY,IAAI;wBAChC,6FAA6F;iBAChG,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,IAAI,CAChB,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,kBAAkB,CACpF,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAiB;QAC/B,GAAG,MAAM;QACT,MAAM,EAAE;YACN,GAAG,MAAM;YACT,mBAAmB,EAAE,aAAa;SACnC;KACF,CAAC;IAEF,MAAM,WAAW,GAAG,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC5D,IAAI,CAAC,WAAW,CAAC,EAAE;QAAE,OAAO,WAAW,CAAC;IAExC,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,aAAa,GAAG,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAClF,IAAI,CAAC,aAAa,CAAC,EAAE;YAAE,OAAO,aAAa,CAAC;QAC5C,OAAO;YACL,EAAE,EAAE,IAAI;YACR,KAAK,EAAE,EAAE,kBAAkB,EAAE,QAAQ,EAAE,YAAY,EAAE;SACtD,CAAC;IACJ,CAAC;IAED,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAChE,IAAI,CAAC,kBAAkB,CAAC,EAAE;QAAE,OAAO,kBAAkB,CAAC;IACtD,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC;IAE9C,MAAM,cAAc,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACvD,IAAI,CAAC,cAAc,CAAC,EAAE;QAAE,OAAO,cAAc,CAAC;IAC9C,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC;IAEtC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC;IACpE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3E,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EACH,gCAAgC,kBAAkB,IAAI;gBACtD,wBAAwB,SAAS,EAAE;SACtC,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACrE,IAAI,CAAC,UAAU,CAAC,EAAE;QAAE,OAAO,UAAU,CAAC;IACtC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACjE,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,OAAO,QAAQ,CAAC;IAClC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC;IACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC;IAE/B,MAAM,MAAM,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACjD,MAAM,gBAAgB,GAAG,sCAAsC,CAAC,kBAAkB,CAAC,CAAC;IACpF,MAAM,WAAW,GAAG,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAEjF,MAAM,iBAAiB,GAAG,kCAAkC,CAAC,WAAW,EAAE,gBAAgB,EAAE;QAC1F,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,EAAE,kBAAkB,EAAE;KAC/B,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB,CAAC,EAAE;QAAE,OAAO,iBAAiB,CAAC;IAEpD,MAAM,YAAY,GAAa;QAC7B,IAAI;QACJ,OAAO,CAAC,GAAG;QACX,IAAI;QACJ,WAAW;QACX,UAAU;QACV,MAAM;QACN,OAAO;QACP,SAAS;QACT,OAAO;QACP,OAAO;KACR,CAAC;IACF,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QAC1B,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QACrC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,SAAS,GAAG,iBAAiB,CAAC,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IACtF,IAAI,CAAC,SAAS,CAAC,EAAE;QAAE,OAAO,SAAS,CAAC;IAEpC,MAAM,aAAa,GAAG,+BAA+B,CAAC,WAAW,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;IAClG,IAAI,CAAC,aAAa,CAAC,EAAE;QAAE,OAAO,aAAa,CAAC;IAE5C,OAAO;QACL,EAAE,EAAE,IAAI;QACR,KAAK,EAAE,EAAE,kBAAkB,EAAE,QAAQ,EAAE,gBAAgB,EAAE;KAC1D,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"add-framework.js","sourceRoot":"","sources":["../../src/commands/add-framework.ts"],"names":[],"mappings":"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"}

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

@@ -1,8 +1,8 @@
 /**
- * tsonic add js - add JSRuntime interop to an existing project.
+ * tsonic add js - add JSRuntime interop to a workspace.
  *
  * - Installs @tsonic/js (type declarations)
- * - Copies runtime DLLs into ./lib for deterministic builds
+ * - Copies runtime DLLs into ./libs for deterministic builds
  */
 import type { Result } from "../types.js";
 import { type Exec, type AddCommandOptions } from "./add-common.js";

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

@@ -1 +1 @@
-{"version":3,"file":"add-js.d.ts","sourceRoot":"","sources":["../../src/commands/add-js.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAGxD,OAAO,EAIL,KAAK,IAAI,EACT,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AA0CzB,eAAO,MAAM,YAAY,GACvB,YAAY,MAAM,EAClB,UAAS,iBAAsB,EAC/B,OAAM,IAAkB,KACvB,MAAM,CAAC,IAAI,EAAE,MAAM,CAmBrB,CAAC"}
+{"version":3,"file":"add-js.d.ts","sourceRoot":"","sources":["../../src/commands/add-js.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAIL,KAAK,IAAI,EACT,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAiCzB,eAAO,MAAM,YAAY,GACvB,YAAY,MAAM,EAClB,UAAS,iBAAsB,EAC/B,OAAM,IAAkB,KACvB,MAAM,CAAC,IAAI,EAAE,MAAM,CA+BrB,CAAC"}

package/dist/commands/add-js.js

@@ -1,14 +1,14 @@
 /**
- * tsonic add js - add JSRuntime interop to an existing project.
+ * tsonic add js - add JSRuntime interop to a workspace.
  *
  * - Installs @tsonic/js (type declarations)
- * - Copies runtime DLLs into ./lib for deterministic builds
+ * - Copies runtime DLLs into ./libs for deterministic builds
  */
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { loadConfig } from "../config.js";
-import { copyRuntimeDllsToProjectLib } from "../dotnet/runtime-assets.js";
-import { defaultExec, detectTsbindgenNaming, npmInstallDevDependency, } from "./add-common.js";
+import { loadWorkspaceConfig } from "../config.js";
+import { copyRuntimeDllsToWorkspaceLibs } from "../dotnet/runtime-assets.js";
+import { defaultExec, npmInstallDevDependency, writeTsonicJson, } from "./add-common.js";
 const hasPackage = (projectRoot, name) => {
     const pkgJsonPath = join(projectRoot, "package.json");
     if (!existsSync(pkgJsonPath))
@@ -27,31 +27,33 @@ const ensureDevDependency = (projectRoot, packageName, options, exec) => {
         return { ok: true, value: undefined };
     return npmInstallDevDependency(projectRoot, `${packageName}@latest`, options, exec);
 };
-const ensureDotnetForPeerDeps = (projectRoot, config, options, exec) => {
-    // @tsonic/js currently imports from @tsonic/dotnet. In CLR-naming projects
-    // (globals-pure), ensure dotnet is present to satisfy module resolution.
-    const naming = detectTsbindgenNaming(config);
-    if (naming !== "clr")
-        return { ok: true, value: undefined };
-    return ensureDevDependency(projectRoot, "@tsonic/dotnet", options, exec);
+const addUnique = (arr, value) => {
+    if (!arr.includes(value))
+        arr.push(value);
 };
 export const addJsCommand = (configPath, options = {}, exec = defaultExec) => {
-    const projectRoot = dirname(configPath);
-    const configResult = loadConfig(configPath);
+    const workspaceRoot = dirname(configPath);
+    const configResult = loadWorkspaceConfig(configPath);
     if (!configResult.ok)
         return configResult;
     const config = configResult.value;
-    const peerResult = ensureDotnetForPeerDeps(projectRoot, config, options, exec);
-    if (!peerResult.ok)
-        return peerResult;
-    const installResult = ensureDevDependency(projectRoot, "@tsonic/js", options, exec);
+    const installResult = ensureDevDependency(workspaceRoot, "@tsonic/js", options, exec);
     if (!installResult.ok)
         return installResult;
-    const copyResult = copyRuntimeDllsToProjectLib(projectRoot, {
+    const copyResult = copyRuntimeDllsToWorkspaceLibs(workspaceRoot, {
         includeJsRuntime: true,
     });
     if (!copyResult.ok)
         return copyResult;
+    const dotnet = config.dotnet ?? {};
+    const libraries = [...(dotnet.libraries ?? [])];
+    addUnique(libraries, "libs/Tsonic.JSRuntime.dll");
+    const writeResult = writeTsonicJson(configPath, {
+        ...config,
+        dotnet: { ...dotnet, libraries },
+    });
+    if (!writeResult.ok)
+        return writeResult;
     return { ok: true, value: undefined };
 };
 //# sourceMappingURL=add-js.js.map

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

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

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

@@ -3,7 +3,7 @@
  */
 import { describe, it } from "mocha";
 import { expect } from "chai";
-import { mkdtempSync, rmSync, writeFileSync, existsSync } from "node:fs";
+import { mkdtempSync, rmSync, writeFileSync, existsSync, readFileSync, } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { addJsCommand } from "./add-js.js";
@@ -12,19 +12,25 @@ describe("add js", () => {
         const dir = mkdtempSync(join(tmpdir(), "tsonic-add-js-"));
         try {
             writeFileSync(join(dir, "package.json"), JSON.stringify({ name: "test", version: "0.0.0", type: "module", devDependencies: {} }, null, 2) + "\n", "utf-8");
-            writeFileSync(join(dir, "tsonic.json"), JSON.stringify({ rootNamespace: "Test", dotnet: { typeRoots: [] } }, null, 2) + "\n", "utf-8");
+            writeFileSync(join(dir, "tsonic.workspace.json"), JSON.stringify({
+                $schema: "https://tsonic.org/schema/workspace/v1.json",
+                dotnetVersion: "net10.0",
+                dotnet: { libraries: [], frameworkReferences: [], packageReferences: [] },
+            }, null, 2) + "\n", "utf-8");
             const calls = [];
-            const exec = (cmd, args) => {
+            const exec = (cmd, args, cwd) => {
                 calls.push({ cmd, args });
+                expect(cwd).to.equal(dir);
                 return { status: 0, stdout: "", stderr: "" };
             };
-            const result = addJsCommand(join(dir, "tsonic.json"), {}, exec);
+            const result = addJsCommand(join(dir, "tsonic.workspace.json"), {}, exec);
             expect(result.ok).to.equal(true);
             expect(calls.length).to.equal(1);
             expect(calls[0]?.cmd).to.equal("npm");
             expect(calls[0]?.args.join(" ")).to.include("@tsonic/js@latest");
-            expect(existsSync(join(dir, "lib", "Tsonic.Runtime.dll"))).to.equal(true);
-            expect(existsSync(join(dir, "lib", "Tsonic.JSRuntime.dll"))).to.equal(true);
+            expect(existsSync(join(dir, "libs", "Tsonic.JSRuntime.dll"))).to.equal(true);
+            const updated = JSON.parse(readFileSync(join(dir, "tsonic.workspace.json"), "utf-8"));
+            expect(updated.dotnet?.libraries).to.deep.equal(["libs/Tsonic.JSRuntime.dll"]);
         }
         finally {
             rmSync(dir, { recursive: true, force: true });
@@ -39,17 +45,23 @@ describe("add js", () => {
                 type: "module",
                 devDependencies: { "@tsonic/js": "^0.1.2" },
             }, null, 2) + "\n", "utf-8");
-            writeFileSync(join(dir, "tsonic.json"), JSON.stringify({ rootNamespace: "Test", dotnet: { typeRoots: [] } }, null, 2) + "\n", "utf-8");
+            writeFileSync(join(dir, "tsonic.workspace.json"), JSON.stringify({
+                $schema: "https://tsonic.org/schema/workspace/v1.json",
+                dotnetVersion: "net10.0",
+                dotnet: { libraries: [], frameworkReferences: [], packageReferences: [] },
+            }, null, 2) + "\n", "utf-8");
             const calls = [];
-            const exec = (cmd, args) => {
+            const exec = (cmd, args, cwd) => {
                 calls.push({ cmd, args });
+                expect(cwd).to.equal(dir);
                 return { status: 0, stdout: "", stderr: "" };
             };
-            const result = addJsCommand(join(dir, "tsonic.json"), {}, exec);
+            const result = addJsCommand(join(dir, "tsonic.workspace.json"), {}, exec);
             expect(result.ok).to.equal(true);
             expect(calls.length).to.equal(0);
-            expect(existsSync(join(dir, "lib", "Tsonic.Runtime.dll"))).to.equal(true);
-            expect(existsSync(join(dir, "lib", "Tsonic.JSRuntime.dll"))).to.equal(true);
+            expect(existsSync(join(dir, "libs", "Tsonic.JSRuntime.dll"))).to.equal(true);
+            const updated = JSON.parse(readFileSync(join(dir, "tsonic.workspace.json"), "utf-8"));
+            expect(updated.dotnet?.libraries).to.deep.equal(["libs/Tsonic.JSRuntime.dll"]);
         }
         finally {
             rmSync(dir, { recursive: true, force: true });

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

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

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

@@ -1,8 +1,8 @@
 /**
- * tsonic add nodejs - add Node.js interop to an existing project.
+ * tsonic add nodejs - add Node.js interop to a workspace.
  *
  * - Installs @tsonic/nodejs (type declarations)
- * - Copies runtime DLLs into ./lib for deterministic builds
+ * - Copies runtime DLLs into ./libs for deterministic builds
  */
 import type { Result } from "../types.js";
 import { type Exec, type AddCommandOptions } from "./add-common.js";

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

@@ -1 +1 @@
-{"version":3,"file":"add-nodejs.d.ts","sourceRoot":"","sources":["../../src/commands/add-nodejs.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAGxD,OAAO,EAIL,KAAK,IAAI,EACT,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AA0CzB,eAAO,MAAM,gBAAgB,GAC3B,YAAY,MAAM,EAClB,UAAS,iBAAsB,EAC/B,OAAM,IAAkB,KACvB,MAAM,CAAC,IAAI,EAAE,MAAM,CAyBrB,CAAC"}
+{"version":3,"file":"add-nodejs.d.ts","sourceRoot":"","sources":["../../src/commands/add-nodejs.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAIL,KAAK,IAAI,EACT,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAiCzB,eAAO,MAAM,gBAAgB,GAC3B,YAAY,MAAM,EAClB,UAAS,iBAAsB,EAC/B,OAAM,IAAkB,KACvB,MAAM,CAAC,IAAI,EAAE,MAAM,CAiCrB,CAAC"}

package/dist/commands/add-nodejs.js

@@ -1,14 +1,14 @@
 /**
- * tsonic add nodejs - add Node.js interop to an existing project.
+ * tsonic add nodejs - add Node.js interop to a workspace.
  *
  * - Installs @tsonic/nodejs (type declarations)
- * - Copies runtime DLLs into ./lib for deterministic builds
+ * - Copies runtime DLLs into ./libs for deterministic builds
  */
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { loadConfig } from "../config.js";
-import { copyRuntimeDllsToProjectLib } from "../dotnet/runtime-assets.js";
-import { defaultExec, detectTsbindgenNaming, npmInstallDevDependency, } from "./add-common.js";
+import { loadWorkspaceConfig } from "../config.js";
+import { copyRuntimeDllsToWorkspaceLibs } from "../dotnet/runtime-assets.js";
+import { defaultExec, npmInstallDevDependency, writeTsonicJson, } from "./add-common.js";
 const hasPackage = (projectRoot, name) => {
     const pkgJsonPath = join(projectRoot, "package.json");
     if (!existsSync(pkgJsonPath))
@@ -27,32 +27,35 @@ const ensureDevDependency = (projectRoot, packageName, options, exec) => {
         return { ok: true, value: undefined };
     return npmInstallDevDependency(projectRoot, `${packageName}@latest`, options, exec);
 };
-const ensureDotnetForPeerDeps = (projectRoot, config, options, exec) => {
-    // @tsonic/nodejs currently imports from @tsonic/dotnet. In CLR-naming projects
-    // (globals-pure), ensure dotnet is present to satisfy module resolution.
-    const naming = detectTsbindgenNaming(config);
-    if (naming !== "clr")
-        return { ok: true, value: undefined };
-    return ensureDevDependency(projectRoot, "@tsonic/dotnet", options, exec);
+const addUnique = (arr, value) => {
+    if (!arr.includes(value))
+        arr.push(value);
 };
 export const addNodejsCommand = (configPath, options = {}, exec = defaultExec) => {
-    const projectRoot = dirname(configPath);
-    const configResult = loadConfig(configPath);
+    const workspaceRoot = dirname(configPath);
+    const configResult = loadWorkspaceConfig(configPath);
     if (!configResult.ok)
         return configResult;
     const config = configResult.value;
-    const peerResult = ensureDotnetForPeerDeps(projectRoot, config, options, exec);
-    if (!peerResult.ok)
-        return peerResult;
-    const installResult = ensureDevDependency(projectRoot, "@tsonic/nodejs", options, exec);
+    const installResult = ensureDevDependency(workspaceRoot, "@tsonic/nodejs", options, exec);
     if (!installResult.ok)
         return installResult;
-    const copyResult = copyRuntimeDllsToProjectLib(projectRoot, {
+    const copyResult = copyRuntimeDllsToWorkspaceLibs(workspaceRoot, {
         includeJsRuntime: true,
         includeNodejs: true,
     });
     if (!copyResult.ok)
         return copyResult;
+    const dotnet = config.dotnet ?? {};
+    const libraries = [...(dotnet.libraries ?? [])];
+    addUnique(libraries, "libs/Tsonic.JSRuntime.dll");
+    addUnique(libraries, "libs/nodejs.dll");
+    const writeResult = writeTsonicJson(configPath, {
+        ...config,
+        dotnet: { ...dotnet, libraries },
+    });
+    if (!writeResult.ok)
+        return writeResult;
     return { ok: true, value: undefined };
 };
 //# sourceMappingURL=add-nodejs.js.map

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

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

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

@@ -3,7 +3,7 @@
  */
 import { describe, it } from "mocha";
 import { expect } from "chai";
-import { mkdtempSync, rmSync, writeFileSync, existsSync } from "node:fs";
+import { mkdtempSync, rmSync, writeFileSync, existsSync, readFileSync, } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { addNodejsCommand } from "./add-nodejs.js";
@@ -12,20 +12,29 @@ describe("add nodejs", () => {
         const dir = mkdtempSync(join(tmpdir(), "tsonic-add-nodejs-"));
         try {
             writeFileSync(join(dir, "package.json"), JSON.stringify({ name: "test", version: "0.0.0", type: "module", devDependencies: {} }, null, 2) + "\n", "utf-8");
-            writeFileSync(join(dir, "tsonic.json"), JSON.stringify({ rootNamespace: "Test", dotnet: { typeRoots: [] } }, null, 2) + "\n", "utf-8");
+            writeFileSync(join(dir, "tsonic.workspace.json"), JSON.stringify({
+                $schema: "https://tsonic.org/schema/workspace/v1.json",
+                dotnetVersion: "net10.0",
+                dotnet: { libraries: [], frameworkReferences: [], packageReferences: [] },
+            }, null, 2) + "\n", "utf-8");
             const calls = [];
-            const exec = (cmd, args) => {
+            const exec = (cmd, args, cwd) => {
                 calls.push({ cmd, args });
+                expect(cwd).to.equal(dir);
                 return { status: 0, stdout: "", stderr: "" };
             };
-            const result = addNodejsCommand(join(dir, "tsonic.json"), {}, exec);
+            const result = addNodejsCommand(join(dir, "tsonic.workspace.json"), {}, exec);
             expect(result.ok).to.equal(true);
             expect(calls.length).to.equal(1);
             expect(calls[0]?.cmd).to.equal("npm");
             expect(calls[0]?.args.join(" ")).to.include("@tsonic/nodejs@latest");
-            expect(existsSync(join(dir, "lib", "Tsonic.Runtime.dll"))).to.equal(true);
-            expect(existsSync(join(dir, "lib", "Tsonic.JSRuntime.dll"))).to.equal(true);
-            expect(existsSync(join(dir, "lib", "nodejs.dll"))).to.equal(true);
+            expect(existsSync(join(dir, "libs", "Tsonic.JSRuntime.dll"))).to.equal(true);
+            expect(existsSync(join(dir, "libs", "nodejs.dll"))).to.equal(true);
+            const updated = JSON.parse(readFileSync(join(dir, "tsonic.workspace.json"), "utf-8"));
+            expect(updated.dotnet?.libraries).to.deep.equal([
+                "libs/Tsonic.JSRuntime.dll",
+                "libs/nodejs.dll",
+            ]);
         }
         finally {
             rmSync(dir, { recursive: true, force: true });
@@ -40,18 +49,27 @@ describe("add nodejs", () => {
                 type: "module",
                 devDependencies: { "@tsonic/nodejs": "^0.4.5" },
             }, null, 2) + "\n", "utf-8");
-            writeFileSync(join(dir, "tsonic.json"), JSON.stringify({ rootNamespace: "Test", dotnet: { typeRoots: [] } }, null, 2) + "\n", "utf-8");
+            writeFileSync(join(dir, "tsonic.workspace.json"), JSON.stringify({
+                $schema: "https://tsonic.org/schema/workspace/v1.json",
+                dotnetVersion: "net10.0",
+                dotnet: { libraries: [], frameworkReferences: [], packageReferences: [] },
+            }, null, 2) + "\n", "utf-8");
             const calls = [];
-            const exec = (cmd, args) => {
+            const exec = (cmd, args, cwd) => {
                 calls.push({ cmd, args });
+                expect(cwd).to.equal(dir);
                 return { status: 0, stdout: "", stderr: "" };
             };
-            const result = addNodejsCommand(join(dir, "tsonic.json"), {}, exec);
+            const result = addNodejsCommand(join(dir, "tsonic.workspace.json"), {}, exec);
             expect(result.ok).to.equal(true);
             expect(calls.length).to.equal(0);
-            expect(existsSync(join(dir, "lib", "Tsonic.Runtime.dll"))).to.equal(true);
-            expect(existsSync(join(dir, "lib", "Tsonic.JSRuntime.dll"))).to.equal(true);
-            expect(existsSync(join(dir, "lib", "nodejs.dll"))).to.equal(true);
+            expect(existsSync(join(dir, "libs", "Tsonic.JSRuntime.dll"))).to.equal(true);
+            expect(existsSync(join(dir, "libs", "nodejs.dll"))).to.equal(true);
+            const updated = JSON.parse(readFileSync(join(dir, "tsonic.workspace.json"), "utf-8"));
+            expect(updated.dotnet?.libraries).to.deep.equal([
+                "libs/Tsonic.JSRuntime.dll",
+                "libs/nodejs.dll",
+            ]);
         }
         finally {
             rmSync(dir, { recursive: true, force: true });

package/dist/commands/add-nodejs.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-nodejs.test.js","sourceRoot":"","sources":["../../src/commands/add-nodejs.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-nodejs.test.js","sourceRoot":"","sources":["../../src/commands/add-nodejs.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EACL,WAAW,EACX,MAAM,EACN,aAAa,EACb,UAAU,EACV,YAAY,GACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC;YACH,aAAa,CACX,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EACzB,IAAI,CAAC,SAAS,CACZ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,EAAE,EACvE,IAAI,EACJ,CAAC,CACF,GAAG,IAAI,EACR,OAAO,CACR,CAAC;YACF,aAAa,CACX,IAAI,CAAC,GAAG,EAAE,uBAAuB,CAAC,EAClC,IAAI,CAAC,SAAS,CACZ;gBACE,OAAO,EAAE,6CAA6C;gBACtD,aAAa,EAAE,SAAS;gBACxB,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE;aAC1E,EACD,IAAI,EACJ,CAAC,CACF,GAAG,IAAI,EACR,OAAO,CACR,CAAC;YAEF,MAAM,KAAK,GAAoD,EAAE,CAAC;YAClE,MAAM,IAAI,GAAS,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;gBACpC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1B,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1B,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YAC/C,CAAC,CAAC;YAEF,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,uBAAuB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC9E,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEjC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;YAErE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC7E,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEnE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,uBAAuB,CAAC,EAAE,OAAO,CAAC,CAG1D,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC9C,2BAA2B;gBAC3B,iBAAiB;aAClB,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC;YACH,aAAa,CACX,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EACzB,IAAI,CAAC,SAAS,CACZ;gBACE,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,QAAQ;gBACd,eAAe,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE;aAChD,EACD,IAAI,EACJ,CAAC,CACF,GAAG,IAAI,EACR,OAAO,CACR,CAAC;YACF,aAAa,CACX,IAAI,CAAC,GAAG,EAAE,uBAAuB,CAAC,EAClC,IAAI,CAAC,SAAS,CACZ;gBACE,OAAO,EAAE,6CAA6C;gBACtD,aAAa,EAAE,SAAS;gBACxB,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE;aAC1E,EACD,IAAI,EACJ,CAAC,CACF,GAAG,IAAI,EACR,OAAO,CACR,CAAC;YAEF,MAAM,KAAK,GAAoD,EAAE,CAAC;YAClE,MAAM,IAAI,GAAS,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;gBACpC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1B,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1B,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YAC/C,CAAC,CAAC;YAEF,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,uBAAuB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC9E,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEjC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC7E,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEnE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CACxB,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,uBAAuB,CAAC,EAAE,OAAO,CAAC,CAG1D,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC9C,2BAA2B;gBAC3B,iBAAiB;aAClB,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -1,5 +1,5 @@
 /**
- * tsonic add nuget - add a NuGet PackageReference to the project, plus bindings.
+ * tsonic add nuget - add a NuGet PackageReference to the workspace, plus bindings.
  *
  * Usage:
  *   tsonic add nuget <PackageId> <Version> [typesPackage]

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

@@ -1 +1 @@
-{"version":3,"file":"add-nuget.d.ts","sourceRoot":"","sources":["../../src/commands/add-nuget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAGxD,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAehD,eAAO,MAAM,eAAe,GAC1B,IAAI,MAAM,EACV,KAAK,MAAM,EACX,cAAc,MAAM,GAAG,SAAS,EAChC,YAAY,MAAM,EAClB,UAAS,eAAoB,KAC5B,MAAM,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAoFzE,CAAC"}
+{"version":3,"file":"add-nuget.d.ts","sourceRoot":"","sources":["../../src/commands/add-nuget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiD,MAAM,aAAa,CAAC;AAGzF,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAShD,eAAO,MAAM,eAAe,GAC1B,IAAI,MAAM,EACV,KAAK,MAAM,EACX,cAAc,MAAM,GAAG,SAAS,EAChC,YAAY,MAAM,EAClB,UAAS,eAAoB,KAC5B,MAAM,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAwFzE,CAAC"}

package/dist/commands/add-nuget.js

@@ -1,5 +1,5 @@
 /**
- * tsonic add nuget - add a NuGet PackageReference to the project, plus bindings.
+ * tsonic add nuget - add a NuGet PackageReference to the workspace, plus bindings.
  *
  * Usage:
  *   tsonic add nuget <PackageId> <Version> [typesPackage]
@@ -10,7 +10,7 @@
  * - If types are omitted, we auto-generate bindings for the full transitive closure
  *   via `tsonic restore` (single source of truth)
  */
-import { loadConfig } from "../config.js";
+import { loadWorkspaceConfig } from "../config.js";
 import { dirname } from "node:path";
 import { defaultBindingsPackageNameForNuget, npmInstallDevDependency, writeTsonicJson, } from "./add-common.js";
 import { restoreCommand } from "./restore.js";
@@ -21,7 +21,7 @@ const isValidTypesPackageName = (name) => {
     return /^@[a-z0-9-]+\/[a-z0-9-]+$/i.test(name);
 };
 export const addNugetCommand = (id, ver, typesPackage, configPath, options = {}) => {
-    const projectRoot = dirname(configPath);
+    const workspaceRoot = dirname(configPath);
     if (!id.trim()) {
         return { ok: false, error: "NuGet package id must be non-empty" };
     }
@@ -31,7 +31,7 @@ export const addNugetCommand = (id, ver, typesPackage, configPath, options = {})
     if (typesPackage !== undefined && !isValidTypesPackageName(typesPackage)) {
         return { ok: false, error: `Invalid types package name: ${typesPackage}` };
     }
-    const tsonicConfigResult = loadConfig(configPath);
+    const tsonicConfigResult = loadWorkspaceConfig(configPath);
     if (!tsonicConfigResult.ok)
         return tsonicConfigResult;
     const config = tsonicConfigResult.value;
@@ -46,7 +46,7 @@ export const addNugetCommand = (id, ver, typesPackage, configPath, options = {})
             return {
                 ok: false,
                 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.`,
+                    `Refusing to change versions automatically (airplane-grade). Update tsonic.workspace.json manually if intended.`,
             };
         }
         if (typesPackage) {
@@ -57,7 +57,7 @@ export const addNugetCommand = (id, ver, typesPackage, configPath, options = {})
                         `- ${current.id} ${current.version}\n` +
                         `- existing: ${current.types}\n` +
                         `- requested: ${typesPackage}\n` +
-                        `Refusing to change automatically (airplane-grade). Update tsonic.json manually if intended.`,
+                        `Refusing to change automatically (airplane-grade). Update tsonic.workspace.json manually if intended.`,
                 };
             }
             existing[idx] = { ...current, types: typesPackage };
@@ -80,7 +80,7 @@ export const addNugetCommand = (id, ver, typesPackage, configPath, options = {})
         existing.find((p) => normalizePkgId(p.id) === normalizePkgId(id))?.types ??
         defaultBindingsPackageNameForNuget(id);
     if (typesPackage) {
-        const installResult = npmInstallDevDependency(projectRoot, typesPackage, options);
+        const installResult = npmInstallDevDependency(workspaceRoot, typesPackage, options);
         if (!installResult.ok)
             return installResult;
         return { ok: true, value: { packageId: id, version: ver, bindings } };