@tsonic/cli 0.0.27 → 0.0.29

package/dist/commands/init.test.js

@@ -5,8 +5,8 @@ import { describe, it } from "mocha";
 import { expect } from "chai";
 import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { getTypePackageInfo, initProject } from "./init.js";
+import { basename, join } from "node:path";
+import { getTypePackageInfo, initWorkspace } from "./init.js";
 describe("Init Command", () => {
     describe("getTypePackageInfo", () => {
         describe("default (no options)", () => {
@@ -16,7 +16,6 @@ describe("Init Command", () => {
                 expect(packageNames).to.include("tsonic");
                 expect(packageNames).to.include("@tsonic/core");
                 expect(packageNames).to.include("@tsonic/globals");
-                expect(packageNames).to.not.include("@tsonic/globals-pure");
                 expect(packageNames).to.not.include("@tsonic/nodejs");
                 expect(packageNames).to.not.include("@tsonic/js");
             });
@@ -47,29 +46,6 @@ describe("Init Command", () => {
                 expect(packageNames).to.include("@tsonic/js");
             });
         });
-        describe("pure flag", () => {
-            it("should use globals-pure when pure flag is true", () => {
-                const result = getTypePackageInfo({ pure: true });
-                const packageNames = result.packages.map((p) => p.name);
-                expect(packageNames).to.include("tsonic");
-                expect(packageNames).to.include("@tsonic/core");
-                expect(packageNames).to.include("@tsonic/globals-pure");
-                expect(packageNames).to.not.include("@tsonic/globals");
-                expect(result.typeRoots).to.deep.equal([
-                    "node_modules/@tsonic/globals-pure",
-                ]);
-            });
-            it("should use globals-pure with nodejs when both flags are true", () => {
-                const result = getTypePackageInfo({ nodejs: true, pure: true });
-                const packageNames = result.packages.map((p) => p.name);
-                expect(packageNames).to.include("tsonic");
-                expect(packageNames).to.include("@tsonic/core");
-                expect(packageNames).to.include("@tsonic/globals-pure");
-                expect(packageNames).to.include("@tsonic/dotnet");
-                expect(packageNames).to.include("@tsonic/nodejs");
-                expect(packageNames).to.not.include("@tsonic/globals");
-            });
-        });
         describe("package versions", () => {
             it("should use latest version for all packages", () => {
                 const result = getTypePackageInfo();
@@ -87,17 +63,17 @@ describe("Init Command", () => {
             });
         });
     });
-    describe("initProject", () => {
+    describe("initWorkspace", () => {
         it("should generate dotnet sample for default mode", () => {
             const dir = mkdtempSync(join(tmpdir(), "tsonic-init-default-"));
             try {
-                const result = initProject(dir, { skipTypes: true });
+                const result = initWorkspace(dir, { skipTypes: true });
                 expect(result.ok).to.equal(true);
-                const appTs = readFileSync(join(dir, "src", "App.ts"), "utf-8");
+                const workspaceName = basename(dir);
+                const appTs = readFileSync(join(dir, "packages", workspaceName, "src", "App.ts"), "utf-8");
                 expect(appTs).to.include('@tsonic/dotnet/System.js');
-                expect(appTs).to.include("Console.writeLine");
-                expect(appTs).to.include("File.readAllText");
-                expect(appTs).to.not.include("@tsonic/dotnet-pure/System.js");
+                expect(appTs).to.include("Console.WriteLine");
+                expect(appTs).to.include("File.ReadAllText");
             }
             finally {
                 rmSync(dir, { recursive: true, force: true });
@@ -106,14 +82,15 @@ describe("Init Command", () => {
         it("should generate js sample when --js is enabled", () => {
             const dir = mkdtempSync(join(tmpdir(), "tsonic-init-js-"));
             try {
-                const result = initProject(dir, { skipTypes: true, js: true });
+                const result = initWorkspace(dir, { skipTypes: true, js: true });
                 expect(result.ok).to.equal(true);
-                const appTs = readFileSync(join(dir, "src", "App.ts"), "utf-8");
+                const workspaceName = basename(dir);
+                const appTs = readFileSync(join(dir, "packages", workspaceName, "src", "App.ts"), "utf-8");
                 expect(appTs).to.include('@tsonic/js/index.js');
                 expect(appTs).to.include("JSON.parse");
                 expect(appTs).to.include("JSON.stringify");
-                const config = JSON.parse(readFileSync(join(dir, "tsonic.json"), "utf-8"));
-                expect(config.dotnet?.libraries).to.deep.equal(["lib/Tsonic.JSRuntime.dll"]);
+                const config = JSON.parse(readFileSync(join(dir, "tsonic.workspace.json"), "utf-8"));
+                expect(config.dotnet?.libraries).to.deep.equal(["libs/Tsonic.JSRuntime.dll"]);
             }
             finally {
                 rmSync(dir, { recursive: true, force: true });
@@ -122,36 +99,22 @@ describe("Init Command", () => {
         it("should generate nodejs sample when --nodejs is enabled", () => {
             const dir = mkdtempSync(join(tmpdir(), "tsonic-init-nodejs-"));
             try {
-                const result = initProject(dir, { skipTypes: true, nodejs: true });
+                const result = initWorkspace(dir, { skipTypes: true, nodejs: true });
                 expect(result.ok).to.equal(true);
-                const appTs = readFileSync(join(dir, "src", "App.ts"), "utf-8");
+                const workspaceName = basename(dir);
+                const appTs = readFileSync(join(dir, "packages", workspaceName, "src", "App.ts"), "utf-8");
                 expect(appTs).to.include('@tsonic/nodejs/index.js');
                 expect(appTs).to.include("console.log");
-                const config = JSON.parse(readFileSync(join(dir, "tsonic.json"), "utf-8"));
+                const config = JSON.parse(readFileSync(join(dir, "tsonic.workspace.json"), "utf-8"));
                 expect(config.dotnet?.libraries).to.deep.equal([
-                    "lib/Tsonic.JSRuntime.dll",
-                    "lib/nodejs.dll",
+                    "libs/Tsonic.JSRuntime.dll",
+                    "libs/nodejs.dll",
                 ]);
             }
             finally {
                 rmSync(dir, { recursive: true, force: true });
             }
         });
-        it("should generate dotnet-pure sample when --pure is enabled", () => {
-            const dir = mkdtempSync(join(tmpdir(), "tsonic-init-pure-"));
-            try {
-                const result = initProject(dir, { skipTypes: true, pure: true });
-                expect(result.ok).to.equal(true);
-                const appTs = readFileSync(join(dir, "src", "App.ts"), "utf-8");
-                expect(appTs).to.include('@tsonic/dotnet-pure/System.js');
-                expect(appTs).to.include("Console.WriteLine");
-                expect(appTs).to.include("File.ReadAllText");
-                expect(appTs).to.not.include("@tsonic/dotnet/System.js");
-            }
-            finally {
-                rmSync(dir, { recursive: true, force: true });
-            }
-        });
     });
 });
 //# sourceMappingURL=init.test.js.map

package/dist/commands/init.test.js.map

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

package/dist/commands/pack.js

@@ -45,7 +45,7 @@ export const packCommand = (config) => {
     if (!quiet) {
         console.log("Step 2/2: Creating NuGet package...");
     }
-    const nugetConfigResult = resolveNugetConfigFile(config.projectRoot);
+    const nugetConfigResult = resolveNugetConfigFile(config.workspaceRoot);
     if (!nugetConfigResult.ok)
         return nugetConfigResult;
     const packArgs = [

package/dist/commands/pack.js.map

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

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

@@ -1,5 +1,5 @@
 /**
- * tsonic remove nuget - remove a NuGet PackageReference from the project.
+ * tsonic remove nuget - remove a NuGet PackageReference from the workspace.
  *
  * Usage:
  *   tsonic remove nuget <PackageId>

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

@@ -1 +1 @@
-{"version":3,"file":"remove-nuget.d.ts","sourceRoot":"","sources":["../../src/commands/remove-nuget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAExD,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAW1E,eAAO,MAAM,kBAAkB,GAC7B,IAAI,MAAM,EACV,YAAY,MAAM,EAClB,UAAS,iBAAsB,KAC9B,MAAM,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAsCtC,CAAC"}
+{"version":3,"file":"remove-nuget.d.ts","sourceRoot":"","sources":["../../src/commands/remove-nuget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiD,MAAM,aAAa,CAAC;AAEzF,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAK1E,eAAO,MAAM,kBAAkB,GAC7B,IAAI,MAAM,EACV,YAAY,MAAM,EAClB,UAAS,iBAAsB,KAC9B,MAAM,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAsCtC,CAAC"}

package/dist/commands/remove-nuget.js

@@ -1,5 +1,5 @@
 /**
- * tsonic remove nuget - remove a NuGet PackageReference from the project.
+ * tsonic remove nuget - remove a NuGet PackageReference from the workspace.
  *
  * Usage:
  *   tsonic remove nuget <PackageId>
@@ -8,7 +8,7 @@
  * - Deterministic edit: removes exactly one PackageReference by id (case-insensitive)
  * - Always runs `tsonic restore` afterwards to keep local bindings consistent
  */
-import { loadConfig } from "../config.js";
+import { loadWorkspaceConfig } from "../config.js";
 import { writeTsonicJson } from "./add-common.js";
 import { restoreCommand } from "./restore.js";
 const normalizePkgId = (id) => id.trim().toLowerCase();
@@ -16,7 +16,7 @@ export const removeNugetCommand = (id, configPath, options = {}) => {
     if (!id.trim()) {
         return { ok: false, error: "NuGet package id must be non-empty" };
     }
-    const configResult = loadConfig(configPath);
+    const configResult = loadWorkspaceConfig(configPath);
     if (!configResult.ok)
         return configResult;
     const config = configResult.value;

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

@@ -1 +1 @@
-{"version":3,"file":"remove-nuget.js","sourceRoot":"","sources":["../../src/commands/remove-nuget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,eAAe,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQ9C,MAAM,cAAc,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAEvE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,EAAU,EACV,UAAkB,EAClB,UAA6B,EAAE,EACQ,EAAE;IACzC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC;IACpE,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAC5C,IAAI,CAAC,YAAY,CAAC,EAAE;QAAE,OAAO,YAAY,CAAC;IAC1C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC;IAElC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IACnC,MAAM,QAAQ,GAA6B;QACzC,GAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAA8B;KAClE,CAAC;IAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,cAAc,CAAC,EAAE,CAAC,CACnD,CAAC;IACF,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;QACZ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,sCAAsC,EAAE,EAAE,EAAE,CAAC;IAC1E,CAAC;IAED,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAExB,MAAM,UAAU,GAAiB;QAC/B,GAAG,MAAM;QACT,MAAM,EAAE;YACN,GAAG,MAAM;YACT,iBAAiB,EAAE,QAAQ;SAC5B;KACF,CAAC;IAEF,MAAM,WAAW,GAAG,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC5D,IAAI,CAAC,WAAW,CAAC,EAAE;QAAE,OAAO,WAAW,CAAC;IAExC,MAAM,aAAa,GAAG,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,aAAa,CAAC,EAAE;QAAE,OAAO,aAAa,CAAC;IAE5C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC;AAChD,CAAC,CAAC"}
+{"version":3,"file":"remove-nuget.js","sourceRoot":"","sources":["../../src/commands/remove-nuget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,cAAc,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAEvE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,EAAU,EACV,UAAkB,EAClB,UAA6B,EAAE,EACQ,EAAE;IACzC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC;IACpE,CAAC;IAED,MAAM,YAAY,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACrD,IAAI,CAAC,YAAY,CAAC,EAAE;QAAE,OAAO,YAAY,CAAC;IAC1C,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC;IAElC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IACnC,MAAM,QAAQ,GAA6B;QACzC,GAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAA8B;KAClE,CAAC;IAEF,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,cAAc,CAAC,EAAE,CAAC,CACnD,CAAC;IACF,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;QACZ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,sCAAsC,EAAE,EAAE,EAAE,CAAC;IAC1E,CAAC;IAED,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAExB,MAAM,UAAU,GAA0B;QACxC,GAAG,MAAM;QACT,MAAM,EAAE;YACN,GAAG,MAAM;YACT,iBAAiB,EAAE,QAAQ;SAC5B;KACF,CAAC;IAEF,MAAM,WAAW,GAAG,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC5D,IAAI,CAAC,WAAW,CAAC,EAAE;QAAE,OAAO,WAAW,CAAC;IAExC,MAAM,aAAa,GAAG,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,aAAa,CAAC,EAAE;QAAE,OAAO,aAAa,CAAC;IAE5C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC;AAChD,CAAC,CAAC"}

package/dist/commands/restore.d.ts

@@ -2,7 +2,7 @@
  * tsonic restore - restore .NET dependencies and (re)generate local bindings.
  *
  * This is the "clone a repo and get to green" command:
- * - Runs dotnet restore for NuGet PackageReferences from tsonic.json
+ * - Runs dotnet restore for NuGet PackageReferences from tsonic.workspace.json
  * - Generates bindings for all transitive NuGet package deps (no duplicates)
  * - Generates bindings for all local DLLs in dotnet.libraries (no duplicates)
  * - Generates bindings for FrameworkReferences when present

package/dist/commands/restore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restore.d.ts","sourceRoot":"","sources":["../../src/commands/restore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAIxD,OAAO,EAcL,KAAK,iBAAiB,EAIvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC;AAgL/C,eAAO,MAAM,cAAc,GACzB,YAAY,MAAM,EAClB,UAAS,cAAmB,KAC3B,MAAM,CAAC,IAAI,EAAE,MAAM,CA2frB,CAAC"}
+{"version":3,"file":"restore.d.ts","sourceRoot":"","sources":["../../src/commands/restore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,OAAO,KAAK,EAIV,MAAM,EAEP,MAAM,aAAa,CAAC;AAIrB,OAAO,EAaL,KAAK,iBAAiB,EAIvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC;AA0K/C,eAAO,MAAM,cAAc,GACzB,YAAY,MAAM,EAClB,UAAS,cAAmB,KAC3B,MAAM,CAAC,IAAI,EAAE,MAAM,CAyhBrB,CAAC"}

package/dist/commands/restore.js

@@ -2,7 +2,7 @@
  * tsonic restore - restore .NET dependencies and (re)generate local bindings.
  *
  * This is the "clone a repo and get to green" command:
- * - Runs dotnet restore for NuGet PackageReferences from tsonic.json
+ * - Runs dotnet restore for NuGet PackageReferences from tsonic.workspace.json
  * - Generates bindings for all transitive NuGet package deps (no duplicates)
  * - Generates bindings for all local DLLs in dotnet.libraries (no duplicates)
  * - Generates bindings for FrameworkReferences when present
@@ -15,9 +15,9 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
 import { isBuiltInRuntimeDllPath } from "../dotnet/runtime-dlls.js";
-import { loadConfig } from "../config.js";
+import { loadWorkspaceConfig } from "../config.js";
 import { resolveNugetConfigFile } from "../dotnet/nuget-config.js";
-import { bindingsStoreDir, defaultBindingsPackageNameForDll, defaultBindingsPackageNameForFramework, defaultBindingsPackageNameForNuget, detectTsbindgenNaming, ensureGeneratedBindingsPackageJson, installGeneratedBindingsPackage, listDotnetRuntimes, resolveFromProjectRoot, resolvePackageRoot, resolveTsbindgenDllPath, tsbindgenGenerate, tsbindgenResolveClosure, defaultExec, writeTsonicJson, } from "./add-common.js";
+import { bindingsStoreDir, defaultBindingsPackageNameForDll, defaultBindingsPackageNameForFramework, defaultBindingsPackageNameForNuget, ensureGeneratedBindingsPackageJson, installGeneratedBindingsPackage, listDotnetRuntimes, resolveFromProjectRoot, resolvePackageRoot, resolveTsbindgenDllPath, tsbindgenGenerate, tsbindgenResolveClosure, defaultExec, writeTsonicJson, } from "./add-common.js";
 const normalizePkgId = (id) => id.trim().toLowerCase();
 const pickPackageFolder = (assets) => {
     const folders = assets.packageFolders ? Object.keys(assets.packageFolders) : [];
@@ -130,35 +130,31 @@ const pathIsWithin = (path, dir) => {
     const normalizedBase = normalizedDir.replace(/\\/g, "/");
     return normalizedPath.startsWith(normalizedBase);
 };
+const normalizeLibraryKey = (pathLike) => pathLike.replace(/\\/g, "/").replace(/^\.\//, "").toLowerCase();
 export const restoreCommand = (configPath, options = {}) => {
-    const configResult = loadConfig(configPath);
+    const configResult = loadWorkspaceConfig(configPath);
     if (!configResult.ok)
         return configResult;
-    const projectRoot = dirname(configPath);
-    const nugetConfigResult = resolveNugetConfigFile(projectRoot);
+    const workspaceRoot = dirname(configPath);
+    const nugetConfigResult = resolveNugetConfigFile(workspaceRoot);
     if (!nugetConfigResult.ok)
         return nugetConfigResult;
     const nugetConfigFile = nugetConfigResult.value;
     const rawConfig = configResult.value;
     let config = rawConfig;
-    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;
-    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 dotnet = config.dotnet ?? {};
-    const naming = detectTsbindgenNaming(config);
     // 1) FrameworkReferences bindings
     for (const entry of (dotnet.frameworkReferences ??
         [])) {
@@ -177,7 +173,7 @@ export const restoreCommand = (configPath, options = {}) => {
             };
         }
         const packageName = defaultBindingsPackageNameForFramework(frameworkRef);
-        const outDir = bindingsStoreDir(projectRoot, "framework", packageName);
+        const outDir = bindingsStoreDir(workspaceRoot, "framework", packageName);
         const pkgJsonResult = ensureGeneratedBindingsPackageJson(outDir, packageName, {
             kind: "framework",
             source: { frameworkReference: frameworkRef },
@@ -189,22 +185,18 @@ export const restoreCommand = (configPath, options = {}) => {
             runtime.dir,
             "-o",
             outDir,
-            "--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, packageName, outDir);
+        const installResult = installGeneratedBindingsPackage(workspaceRoot, packageName, outDir);
         if (!installResult.ok)
             return installResult;
     }
@@ -212,8 +204,8 @@ export const restoreCommand = (configPath, options = {}) => {
     const packageReferencesAll = (dotnet.packageReferences ??
         []);
     if (packageReferencesAll.length > 0) {
-        const targetFramework = config.dotnetVersion ?? "net10.0";
-        const restoreDir = join(projectRoot, ".tsonic", "nuget");
+        const targetFramework = config.dotnetVersion;
+        const restoreDir = join(workspaceRoot, ".tsonic", "nuget");
         const restoreProject = writeRestoreProject(restoreDir, targetFramework, packageReferencesAll.map((p) => ({ id: p.id, version: p.version })));
         if (!restoreProject.ok)
             return restoreProject;
@@ -358,7 +350,7 @@ export const restoreCommand = (configPath, options = {}) => {
                 if (!typesPkg) {
                     return { ok: false, error: `Internal error: missing types package for ${packageId}` };
                 }
-                const root = resolvePackageRoot(projectRoot, typesPkg);
+                const root = resolvePackageRoot(workspaceRoot, typesPkg);
                 if (!root.ok)
                     return root;
                 typesLibDirByPkgId.set(norm, root.value);
@@ -389,7 +381,7 @@ export const restoreCommand = (configPath, options = {}) => {
                     continue; // bindings supplied externally; do not auto-generate.
                 }
                 const packageName = defaultBindingsPackageNameForNuget(node.packageId);
-                const outDir = bindingsStoreDir(projectRoot, "nuget", packageName);
+                const outDir = bindingsStoreDir(workspaceRoot, "nuget", packageName);
                 bindingsDirByLibKey.set(libKey, outDir);
                 const pkgJsonResult = ensureGeneratedBindingsPackageJson(outDir, packageName, {
                     kind: "nuget",
@@ -401,12 +393,8 @@ export const restoreCommand = (configPath, options = {}) => {
                     ...seedDlls.flatMap((p) => ["-a", p]),
                     "-o",
                     outDir,
-                    "--naming",
-                    naming,
                     "--lib",
                     dotnetLib,
-                    "--lib",
-                    coreLib,
                 ];
                 const libDirs = new Set();
                 for (const depKey of transitiveDeps.get(libKey) ?? []) {
@@ -434,42 +422,68 @@ export const restoreCommand = (configPath, options = {}) => {
                 for (const d of compileDirs)
                     generateArgs.push("--ref-dir", d);
                 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, packageName, outDir);
+                const installResult = installGeneratedBindingsPackage(workspaceRoot, packageName, outDir);
                 if (!installResult.ok)
                     return installResult;
             }
         }
     }
     // 3) Local DLL bindings (dotnet.libraries)
-    const dllLibraries = (dotnet.libraries ?? []).filter((p) => {
+    const typesPackageByLibraryPathKey = new Map();
+    const libraryPaths = [];
+    for (const entry of (dotnet.libraries ?? [])) {
+        if (typeof entry === "string") {
+            libraryPaths.push(entry);
+            continue;
+        }
+        libraryPaths.push(entry.path);
+        if (entry.types === undefined)
+            continue;
+        const key = normalizeLibraryKey(entry.path);
+        if (!key.endsWith(".dll")) {
+            return {
+                ok: false,
+                error: `tsonic.workspace.json: dotnet.libraries entry has 'types' but is not a DLL: ${entry.path}`,
+            };
+        }
+        const existing = typesPackageByLibraryPathKey.get(key);
+        if (existing && existing !== entry.types) {
+            return {
+                ok: false,
+                error: `tsonic.workspace.json: conflicting 'types' mapping for '${entry.path}'.\n` +
+                    `Existing: ${existing}\n` +
+                    `New: ${entry.types}`,
+            };
+        }
+        typesPackageByLibraryPathKey.set(key, entry.types);
+    }
+    const dllLibraries = libraryPaths.filter((p) => {
         const normalized = p.replace(/\\/g, "/").toLowerCase();
         if (!normalized.endsWith(".dll"))
             return false;
         if (isBuiltInRuntimeDllPath(p))
             return false;
-        // Only DLLs copied into ./lib are eligible for bindings generation.
-        // Other DLL paths (e.g. workspace project outputs) are treated as build-time
-        // references only.
-        return normalized.startsWith("lib/") || normalized.startsWith("./lib/");
+        // Only DLLs copied into ./libs are eligible for bindings generation.
+        return normalized.startsWith("libs/") || normalized.startsWith("./libs/");
     });
     if (dllLibraries.length > 0) {
-        const dllAbs = dllLibraries.map((p) => resolveFromProjectRoot(projectRoot, p));
+        const dllAbs = dllLibraries.map((p) => resolveFromProjectRoot(workspaceRoot, p));
         for (const p of dllAbs) {
             if (!existsSync(p)) {
                 return {
                     ok: false,
-                    error: `Missing DLL from tsonic.json dotnet.libraries: ${p}`,
+                    error: `Missing DLL from tsonic.workspace.json dotnet.libraries: ${p}`,
                 };
             }
         }
-        const userDeps = (options.deps ?? []).map((d) => resolveFromProjectRoot(projectRoot, d));
-        const refDirs = [...runtimes.map((r) => r.dir), join(projectRoot, "lib"), ...userDeps];
-        const closureResult = tsbindgenResolveClosure(projectRoot, tsbindgenDll, dllAbs, refDirs);
+        const userDeps = (options.deps ?? []).map((d) => resolveFromProjectRoot(workspaceRoot, d));
+        const refDirs = [...runtimes.map((r) => r.dir), join(workspaceRoot, "libs"), ...userDeps];
+        const closureResult = tsbindgenResolveClosure(workspaceRoot, tsbindgenDll, dllAbs, refDirs);
         if (!closureResult.ok)
             return closureResult;
         const closure = closureResult.value;
@@ -521,9 +535,9 @@ export const restoreCommand = (configPath, options = {}) => {
             }
             ids.add(id);
             byId.set(id, asm);
-            const destPath = resolveFromProjectRoot(projectRoot, join("lib", basename(asm.path)));
+            const destPath = resolveFromProjectRoot(workspaceRoot, join("libs", basename(asm.path)));
             if (!existsSync(destPath)) {
-                return { ok: false, error: `Missing DLL dependency in lib/: ${destPath}` };
+                return { ok: false, error: `Missing DLL dependency in libs/: ${destPath}` };
             }
             destPathById.set(id, destPath);
         }
@@ -573,18 +587,31 @@ export const restoreCommand = (configPath, options = {}) => {
             }
             transitiveDeps.set(id, set);
         }
-        const bindingsDirById = new Map();
+        const libDirById = 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 typesPkg = typesPackageByLibraryPathKey.get(normalizeLibraryKey(`libs/${basename(destPath)}`));
+            if (typesPkg) {
+                const typesRoot = resolvePackageRoot(workspaceRoot, typesPkg);
+                if (!typesRoot.ok) {
+                    return {
+                        ok: false,
+                        error: `Bindings package not found for '${basename(destPath)}': ${typesPkg}\n` +
+                            `Install it in the workspace and retry (e.g. npm install -D ${typesPkg}).`,
+                    };
+                }
+                libDirById.set(id, typesRoot.value);
+                continue; // bindings supplied externally; do not auto-generate.
+            }
             const packageName = defaultBindingsPackageNameForDll(destPath);
-            const outDir = bindingsStoreDir(projectRoot, "dll", packageName);
-            bindingsDirById.set(id, outDir);
+            const outDir = bindingsStoreDir(workspaceRoot, "dll", packageName);
+            libDirById.set(id, outDir);
             const pkgJsonResult = ensureGeneratedBindingsPackageJson(outDir, packageName, {
                 kind: "dll",
-                source: { assemblyName: asm.name, version: asm.version, path: `lib/${basename(destPath)}` },
+                source: { assemblyName: asm.name, version: asm.version, path: `libs/${basename(destPath)}` },
             });
             if (!pkgJsonResult.ok)
                 return pkgJsonResult;
@@ -593,15 +620,11 @@ export const restoreCommand = (configPath, options = {}) => {
                 destPath,
                 "-o",
                 outDir,
-                "--naming",
-                naming,
                 "--lib",
                 dotnetLib,
-                "--lib",
-                coreLib,
             ];
             const libs = Array.from(transitiveDeps.get(id) ?? [])
-                .map((depId) => bindingsDirById.get(depId))
+                .map((depId) => libDirById.get(depId))
                 .filter((p) => typeof p === "string")
                 .sort((a, b) => a.localeCompare(b));
             for (const lib of libs)
@@ -610,11 +633,11 @@ export const restoreCommand = (configPath, options = {}) => {
                 generateArgs.push("--ref-dir", rt.dir);
             for (const dep of userDeps)
                 generateArgs.push("--ref-dir", dep);
-            generateArgs.push("--ref-dir", join(projectRoot, "lib"));
-            const genResult = tsbindgenGenerate(projectRoot, tsbindgenDll, generateArgs, options);
+            generateArgs.push("--ref-dir", join(workspaceRoot, "libs"));
+            const genResult = tsbindgenGenerate(workspaceRoot, tsbindgenDll, generateArgs, options);
             if (!genResult.ok)
                 return genResult;
-            const installResult = installGeneratedBindingsPackage(projectRoot, packageName, outDir);
+            const installResult = installGeneratedBindingsPackage(workspaceRoot, packageName, outDir);
             if (!installResult.ok)
                 return installResult;
         }