@tsonic/cli 0.0.64 → 0.0.65

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/aikya/bindings.d.ts +1 -1
  3. package/dist/aikya/bindings.d.ts.map +1 -1
  4. package/dist/aikya/bindings.js +2 -2
  5. package/dist/aikya/bindings.js.map +1 -1
  6. package/dist/cli/help.js +3 -3
  7. package/dist/cli/parser.test.js +4 -4
  8. package/dist/cli/parser.test.js.map +1 -1
  9. package/dist/commands/build-library-bindings-aliases.test.js +3 -2
  10. package/dist/commands/build-library-bindings-aliases.test.js.map +1 -1
  11. package/dist/commands/build.d.ts.map +1 -1
  12. package/dist/commands/build.js +29 -2
  13. package/dist/commands/build.js.map +1 -1
  14. package/dist/commands/generate.d.ts.map +1 -1
  15. package/dist/commands/generate.js +3 -1
  16. package/dist/commands/generate.js.map +1 -1
  17. package/dist/commands/init.d.ts +1 -0
  18. package/dist/commands/init.d.ts.map +1 -1
  19. package/dist/commands/init.js +42 -13
  20. package/dist/commands/init.js.map +1 -1
  21. package/dist/commands/init.test.js +112 -38
  22. package/dist/commands/init.test.js.map +1 -1
  23. package/dist/commands/library-bindings-augment.d.ts.map +1 -1
  24. package/dist/commands/library-bindings-augment.js +3 -1
  25. package/dist/commands/library-bindings-augment.js.map +1 -1
  26. package/dist/commands/library-bindings-firstparty-regressions.test.js +1 -4
  27. package/dist/commands/library-bindings-firstparty-regressions.test.js.map +1 -1
  28. package/dist/commands/library-bindings-firstparty.d.ts.map +1 -1
  29. package/dist/commands/library-bindings-firstparty.js +3 -1
  30. package/dist/commands/library-bindings-firstparty.js.map +1 -1
  31. package/dist/config.d.ts.map +1 -1
  32. package/dist/config.js +7 -4
  33. package/dist/config.js.map +1 -1
  34. package/dist/config.test.js +72 -33
  35. package/dist/config.test.js.map +1 -1
  36. package/dist/surface/profiles.d.ts +6 -1
  37. package/dist/surface/profiles.d.ts.map +1 -1
  38. package/dist/surface/profiles.js +181 -24
  39. package/dist/surface/profiles.js.map +1 -1
  40. package/dist/surface/profiles.test.js +148 -22
  41. package/dist/surface/profiles.test.js.map +1 -1
  42. package/dist/types.d.ts +4 -4
  43. package/dist/types.d.ts.map +1 -1
  44. package/package.json +4 -4
  45. package/runtime/nodejs.dll +0 -0
@@ -13,21 +13,28 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
13
13
  import { basename, join } from "node:path";
14
14
  import { spawnSync } from "node:child_process";
15
15
  import { addNpmCommand } from "./add-npm.js";
16
- import { isSurfaceMode, resolveSurfaceCapabilities, } from "../surface/profiles.js";
16
+ import { resolveSurfaceCapabilities } from "../surface/profiles.js";
17
17
  // Unified CLI package version - installed as devDependency for npm scripts.
18
18
  const CLI_PACKAGE = { name: "tsonic", version: "latest" };
19
19
  export const getTypePackageInfo = (options = {}) => {
20
20
  const surface = options.surface ?? "clr";
21
- const surfaceCapabilities = resolveSurfaceCapabilities(surface);
22
- const packages = [
23
- CLI_PACKAGE,
24
- { name: "@tsonic/globals", version: "latest" },
25
- ];
21
+ const surfaceCapabilities = resolveSurfaceCapabilities(surface, {
22
+ workspaceRoot: options.workspaceRoot,
23
+ });
24
+ const packages = [CLI_PACKAGE];
26
25
  for (const pkgName of surfaceCapabilities.requiredNpmPackages) {
27
26
  packages.push({ name: pkgName, version: "latest" });
28
27
  }
28
+ const uniquePackages = [];
29
+ const seen = new Set();
30
+ for (const pkg of packages) {
31
+ if (seen.has(pkg.name))
32
+ continue;
33
+ seen.add(pkg.name);
34
+ uniquePackages.push(pkg);
35
+ }
29
36
  return {
30
- packages,
37
+ packages: uniquePackages,
31
38
  typeRoots: surfaceCapabilities.requiredTypeRoots,
32
39
  };
33
40
  };
@@ -110,10 +117,6 @@ const npmInstallDev = (workspaceRoot, spec) => {
110
117
  };
111
118
  export const initWorkspace = (workspaceRoot, options = {}) => {
112
119
  const surface = options.surface ?? "clr";
113
- if (!isSurfaceMode(surface)) {
114
- return { ok: false, error: `Invalid surface: ${surface}` };
115
- }
116
- const surfaceCapabilities = resolveSurfaceCapabilities(surface);
117
120
  const workspaceConfigPath = join(workspaceRoot, "tsonic.workspace.json");
118
121
  if (existsSync(workspaceConfigPath)) {
119
122
  return {
@@ -133,13 +136,13 @@ export const initWorkspace = (workspaceRoot, options = {}) => {
133
136
  // Root package.json (npm workspaces)
134
137
  createOrUpdateRootPackageJson(workspaceRoot);
135
138
  // Workspace config (deps live here)
136
- const typeInfo = getTypePackageInfo({ surface });
139
+ const typeInfo = getTypePackageInfo({ surface, workspaceRoot });
137
140
  let workspaceConfig = {
138
141
  $schema: "https://tsonic.org/schema/workspace/v1.json",
139
142
  dotnetVersion: "net10.0",
140
143
  surface,
141
144
  dotnet: {
142
- typeRoots: surfaceCapabilities.requiredTypeRoots,
145
+ typeRoots: typeInfo.typeRoots,
143
146
  libraries: [],
144
147
  frameworkReferences: [],
145
148
  packageReferences: [],
@@ -147,14 +150,40 @@ export const initWorkspace = (workspaceRoot, options = {}) => {
147
150
  };
148
151
  // Install type declarations at workspace root
149
152
  const shouldInstallTypes = options.skipTypes !== true;
153
+ const installedPackageNames = new Set();
150
154
  if (shouldInstallTypes) {
151
155
  for (const pkg of typeInfo.packages) {
152
156
  const version = options.typesVersion ?? pkg.version;
153
157
  const r = npmInstallDev(workspaceRoot, `${pkg.name}@${version}`);
154
158
  if (!r.ok)
155
159
  return r;
160
+ installedPackageNames.add(pkg.name);
156
161
  }
157
162
  }
163
+ let surfaceCapabilities = resolveSurfaceCapabilities(surface, {
164
+ workspaceRoot,
165
+ });
166
+ if (shouldInstallTypes) {
167
+ for (const pkgName of surfaceCapabilities.requiredNpmPackages) {
168
+ if (installedPackageNames.has(pkgName))
169
+ continue;
170
+ const version = options.typesVersion ?? "latest";
171
+ const r = npmInstallDev(workspaceRoot, `${pkgName}@${version}`);
172
+ if (!r.ok)
173
+ return r;
174
+ installedPackageNames.add(pkgName);
175
+ }
176
+ surfaceCapabilities = resolveSurfaceCapabilities(surface, {
177
+ workspaceRoot,
178
+ });
179
+ }
180
+ workspaceConfig = {
181
+ ...workspaceConfig,
182
+ dotnet: {
183
+ ...(workspaceConfig.dotnet ?? {}),
184
+ typeRoots: surfaceCapabilities.requiredTypeRoots,
185
+ },
186
+ };
158
187
  writeWorkspaceConfig(workspaceRoot, workspaceConfig);
159
188
  // Surface-specific package manifests may inject required .NET package refs.
160
189
  // Reuse the authoritative add-npm workflow instead of duplicating merge logic.
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
@@ -3,46 +3,87 @@
3
3
  */
4
4
  import { describe, it } from "mocha";
5
5
  import { expect } from "chai";
6
- import { mkdtempSync, readFileSync, rmSync } from "node:fs";
6
+ import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync, } from "node:fs";
7
7
  import { tmpdir } from "node:os";
8
8
  import { basename, join } from "node:path";
9
9
  import { getTypePackageInfo, initWorkspace } from "./init.js";
10
10
  describe("Init Command", () => {
11
11
  describe("getTypePackageInfo", () => {
12
12
  describe("default (no options)", () => {
13
- it("should return cli and globals packages", () => {
13
+ it("should return cli and clr surface packages", () => {
14
14
  const result = getTypePackageInfo();
15
15
  const packageNames = result.packages.map((p) => p.name);
16
16
  expect(packageNames).to.include("tsonic");
17
- expect(packageNames).to.include("@tsonic/globals");
17
+ expect(packageNames).to.include("@tsonic/dotnet");
18
18
  expect(packageNames).to.not.include("@tsonic/core");
19
19
  });
20
- it("should set typeRoots to globals", () => {
20
+ it("should include clr surface type roots", () => {
21
21
  const result = getTypePackageInfo();
22
- expect(result.typeRoots).to.deep.equal([
23
- "node_modules/@tsonic/globals",
24
- ]);
22
+ expect(result.typeRoots).to.deep.equal(["node_modules/@tsonic/dotnet"]);
25
23
  });
26
24
  });
27
- it("should include js package (without nodejs) for js surface", () => {
28
- const result = getTypePackageInfo({ surface: "js" });
25
+ it("should include @tsonic/js package (without nodejs) for js surface", () => {
26
+ const result = getTypePackageInfo({ surface: "@tsonic/js" });
29
27
  const packageNames = result.packages.map((p) => p.name);
30
28
  expect(packageNames).to.include("@tsonic/js");
31
29
  expect(packageNames).to.not.include("@tsonic/nodejs");
32
- expect(result.typeRoots).to.deep.equal([
33
- "node_modules/@tsonic/globals",
34
- "node_modules/@tsonic/js",
35
- ]);
30
+ expect(result.typeRoots).to.deep.equal(["node_modules/@tsonic/js"]);
36
31
  });
37
- it("should include js and nodejs packages for nodejs surface", () => {
38
- const result = getTypePackageInfo({ surface: "nodejs" });
32
+ it("should include @tsonic/nodejs package for nodejs surface bootstrap", () => {
33
+ const result = getTypePackageInfo({ surface: "@tsonic/nodejs" });
39
34
  const packageNames = result.packages.map((p) => p.name);
40
- expect(packageNames).to.include("@tsonic/js");
41
35
  expect(packageNames).to.include("@tsonic/nodejs");
36
+ expect(packageNames).to.not.include("@tsonic/js");
37
+ expect(result.typeRoots).to.deep.equal(["node_modules/@tsonic/nodejs"]);
38
+ });
39
+ it("should include inherited surface package requirements from installed manifests", () => {
40
+ const workspaceRoot = mkdtempSync(join(tmpdir(), "tsonic-init-surface-"));
41
+ try {
42
+ writeFileSync(join(workspaceRoot, "package.json"), JSON.stringify({ name: "app", version: "1.0.0", private: true, type: "module" }, null, 2));
43
+ const jsRoot = join(workspaceRoot, "node_modules", "@tsonic", "js");
44
+ mkdirSync(jsRoot, { recursive: true });
45
+ writeFileSync(join(jsRoot, "package.json"), JSON.stringify({
46
+ name: "@tsonic/js",
47
+ version: "1.0.0",
48
+ type: "module",
49
+ }));
50
+ writeFileSync(join(jsRoot, "tsonic.surface.json"), JSON.stringify({
51
+ schemaVersion: 1,
52
+ id: "@tsonic/js",
53
+ extends: [],
54
+ requiredTypeRoots: ["types"],
55
+ requiredNpmPackages: ["@tsonic/js"],
56
+ }, null, 2));
57
+ const nodejsRoot = join(workspaceRoot, "node_modules", "@tsonic", "nodejs");
58
+ mkdirSync(nodejsRoot, { recursive: true });
59
+ writeFileSync(join(nodejsRoot, "package.json"), JSON.stringify({ name: "@tsonic/nodejs", version: "1.0.0", type: "module" }, null, 2));
60
+ writeFileSync(join(nodejsRoot, "tsonic.surface.json"), JSON.stringify({
61
+ schemaVersion: 1,
62
+ id: "@tsonic/nodejs",
63
+ extends: ["@tsonic/js"],
64
+ requiredTypeRoots: ["types"],
65
+ requiredNpmPackages: ["@tsonic/nodejs", "@tsonic/js"],
66
+ }, null, 2));
67
+ const result = getTypePackageInfo({
68
+ surface: "@tsonic/nodejs",
69
+ workspaceRoot,
70
+ });
71
+ const packageNames = result.packages.map((p) => p.name);
72
+ expect(packageNames).to.include("@tsonic/nodejs");
73
+ expect(packageNames).to.include("@tsonic/js");
74
+ expect(result.typeRoots).to.include(join(jsRoot, "types"));
75
+ expect(result.typeRoots).to.include(join(nodejsRoot, "types"));
76
+ }
77
+ finally {
78
+ rmSync(workspaceRoot, { recursive: true, force: true });
79
+ }
80
+ });
81
+ it("should support custom surface package names via fallback profile", () => {
82
+ const result = getTypePackageInfo({ surface: "@acme/surface-web" });
83
+ const packageNames = result.packages.map((p) => p.name);
84
+ expect(packageNames).to.include("@acme/surface-web");
42
85
  expect(result.typeRoots).to.deep.equal([
43
- "node_modules/@tsonic/globals",
44
- "node_modules/@tsonic/js",
45
- "node_modules/@tsonic/nodejs",
86
+ "node_modules/@acme/surface-web",
46
87
  ]);
47
88
  });
48
89
  describe("package versions", () => {
@@ -55,14 +96,20 @@ describe("Init Command", () => {
55
96
  });
56
97
  });
57
98
  describe("initWorkspace", () => {
58
- it("should fail for invalid surface mode", () => {
59
- const dir = mkdtempSync(join(tmpdir(), "tsonic-init-invalid-"));
99
+ it("should allow custom surface names", () => {
100
+ const dir = mkdtempSync(join(tmpdir(), "tsonic-init-custom-surface-"));
60
101
  try {
61
102
  const result = initWorkspace(dir, {
62
103
  skipTypes: true,
63
- surface: "invalid",
104
+ surface: "@acme/surface-web",
64
105
  });
65
- expect(result.ok).to.equal(false);
106
+ expect(result.ok).to.equal(true);
107
+ const workspaceRaw = readFileSync(join(dir, "tsonic.workspace.json"), "utf-8");
108
+ const workspace = JSON.parse(workspaceRaw);
109
+ expect(workspace.surface).to.equal("@acme/surface-web");
110
+ expect(workspace.dotnet?.typeRoots).to.deep.equal([
111
+ "node_modules/@acme/surface-web",
112
+ ]);
66
113
  }
67
114
  finally {
68
115
  rmSync(dir, { recursive: true, force: true });
@@ -82,18 +129,19 @@ describe("Init Command", () => {
82
129
  rmSync(dir, { recursive: true, force: true });
83
130
  }
84
131
  });
85
- it("should write js surface config when requested", () => {
132
+ it("should write @tsonic/js surface config when requested", () => {
86
133
  const dir = mkdtempSync(join(tmpdir(), "tsonic-init-js-"));
87
134
  try {
88
- const result = initWorkspace(dir, { skipTypes: true, surface: "js" });
135
+ const result = initWorkspace(dir, {
136
+ skipTypes: true,
137
+ surface: "@tsonic/js",
138
+ });
89
139
  expect(result.ok).to.equal(true);
90
140
  const workspaceRaw = readFileSync(join(dir, "tsonic.workspace.json"), "utf-8");
91
141
  const workspace = JSON.parse(workspaceRaw);
92
- expect(workspace.surface).to.equal("js");
93
- expect(workspace.dotnet?.typeRoots).to.deep.equal([
94
- "node_modules/@tsonic/globals",
95
- "node_modules/@tsonic/js",
96
- ]);
142
+ expect(workspace.surface).to.equal("@tsonic/js");
143
+ expect((workspace.dotnet?.typeRoots ?? []).some((root) => root === "node_modules/@tsonic/js" ||
144
+ /[/\\]js[/\\]versions[/\\]\d+$/.test(root))).to.equal(true);
97
145
  const workspaceName = basename(dir);
98
146
  const appTs = readFileSync(join(dir, "packages", workspaceName, "src", "App.ts"), "utf-8");
99
147
  expect(appTs).to.include("console.log");
@@ -103,22 +151,48 @@ describe("Init Command", () => {
103
151
  rmSync(dir, { recursive: true, force: true });
104
152
  }
105
153
  });
106
- it("should write nodejs surface config when requested", () => {
154
+ it("should write @tsonic/nodejs surface config when requested", () => {
107
155
  const dir = mkdtempSync(join(tmpdir(), "tsonic-init-nodejs-"));
108
156
  try {
157
+ writeFileSync(join(dir, "package.json"), JSON.stringify({ name: "app", version: "1.0.0", private: true, type: "module" }, null, 2));
158
+ const jsRoot = join(dir, "node_modules", "@tsonic", "js");
159
+ mkdirSync(jsRoot, { recursive: true });
160
+ writeFileSync(join(jsRoot, "package.json"), JSON.stringify({
161
+ name: "@tsonic/js",
162
+ version: "1.0.0",
163
+ type: "module",
164
+ }));
165
+ writeFileSync(join(jsRoot, "tsonic.surface.json"), JSON.stringify({
166
+ schemaVersion: 1,
167
+ id: "@tsonic/js",
168
+ extends: [],
169
+ requiredTypeRoots: ["types"],
170
+ requiredNpmPackages: ["@tsonic/js"],
171
+ }, null, 2));
172
+ const nodejsRoot = join(dir, "node_modules", "@tsonic", "nodejs");
173
+ mkdirSync(nodejsRoot, { recursive: true });
174
+ writeFileSync(join(nodejsRoot, "package.json"), JSON.stringify({ name: "@tsonic/nodejs", version: "1.0.0", type: "module" }, null, 2));
175
+ writeFileSync(join(nodejsRoot, "tsonic.surface.json"), JSON.stringify({
176
+ schemaVersion: 1,
177
+ id: "@tsonic/nodejs",
178
+ extends: ["@tsonic/js"],
179
+ requiredTypeRoots: ["types"],
180
+ requiredNpmPackages: ["@tsonic/nodejs", "@tsonic/js"],
181
+ }, null, 2));
109
182
  const result = initWorkspace(dir, {
110
183
  skipTypes: true,
111
- surface: "nodejs",
184
+ surface: "@tsonic/nodejs",
112
185
  });
113
186
  expect(result.ok).to.equal(true);
114
187
  const workspaceRaw = readFileSync(join(dir, "tsonic.workspace.json"), "utf-8");
115
188
  const workspace = JSON.parse(workspaceRaw);
116
- expect(workspace.surface).to.equal("nodejs");
117
- expect(workspace.dotnet?.typeRoots).to.deep.equal([
118
- "node_modules/@tsonic/globals",
119
- "node_modules/@tsonic/js",
120
- "node_modules/@tsonic/nodejs",
121
- ]);
189
+ expect(workspace.surface).to.equal("@tsonic/nodejs");
190
+ expect((workspace.dotnet?.typeRoots ?? []).some((root) => root === join(jsRoot, "types") ||
191
+ root === "node_modules/@tsonic/js" ||
192
+ /[/\\]js[/\\]versions[/\\]\d+$/.test(root))).to.equal(true);
193
+ expect((workspace.dotnet?.typeRoots ?? []).some((root) => root === join(nodejsRoot, "types") ||
194
+ root === "node_modules/@tsonic/nodejs" ||
195
+ /[/\\]nodejs[/\\]versions[/\\]\d+$/.test(root))).to.equal(true);
122
196
  const workspaceName = basename(dir);
123
197
  const appTs = readFileSync(join(dir, "packages", workspaceName, "src", "App.ts"), "utf-8");
124
198
  expect(appTs).to.include("console.log");
@@ -1 +1 @@
1
- {"version":3,"file":"init.test.js","sourceRoot":"","sources":["../../src/commands/init.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.test.js","sourceRoot":"","sources":["../../src/commands/init.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"library-bindings-augment.d.ts","sourceRoot":"","sources":["../../src/commands/library-bindings-augment.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAmc1D,eAAO,MAAM,sCAAsC,GACjD,sBAAsB,MAAM,EAC5B,WAAW,SAAS,MAAM,EAAE,KAC3B,MAAM,CAAC,IAAI,EAAE,MAAM,CAgDrB,CAAC;AAwiCF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GACpC,QAAQ,cAAc,EACtB,gBAAgB,MAAM,KACrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAwDrB,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAAI,SAAS,MAAM,KAAG,MAepE,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,QAAQ,cAAc,EACtB,gBAAgB,MAAM,KACrB,MAAM,CAAC,IAAI,EAAE,MAAM,CA2lBrB,CAAC"}
1
+ {"version":3,"file":"library-bindings-augment.d.ts","sourceRoot":"","sources":["../../src/commands/library-bindings-augment.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAmc1D,eAAO,MAAM,sCAAsC,GACjD,sBAAsB,MAAM,EAC5B,WAAW,SAAS,MAAM,EAAE,KAC3B,MAAM,CAAC,IAAI,EAAE,MAAM,CAgDrB,CAAC;AAwiCF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GACpC,QAAQ,cAAc,EACtB,gBAAgB,MAAM,KACrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAwDrB,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAAI,SAAS,MAAM,KAAG,MAepE,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,QAAQ,cAAc,EACtB,gBAAgB,MAAM,KACrB,MAAM,CAAC,IAAI,EAAE,MAAM,CA6lBrB,CAAC"}
@@ -1236,7 +1236,9 @@ export const augmentLibraryBindingsFromSource = (config, bindingsOutDir) => {
1236
1236
  }
1237
1237
  const absoluteEntryPoint = resolve(config.projectRoot, entryPoint);
1238
1238
  const absoluteSourceRoot = resolve(config.projectRoot, config.sourceRoot);
1239
- const surfaceCapabilities = resolveSurfaceCapabilities(config.surface);
1239
+ const surfaceCapabilities = resolveSurfaceCapabilities(config.surface, {
1240
+ workspaceRoot: config.workspaceRoot,
1241
+ });
1240
1242
  const typeLibraries = config.libraries.filter((lib) => !lib.endsWith(".dll"));
1241
1243
  const allTypeRoots = [...config.typeRoots, ...typeLibraries].map((p) => resolve(config.workspaceRoot, p));
1242
1244
  const compilerOptions = {