@tsonic/cli 0.0.18 → 0.0.20

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 (61) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/cli/dispatcher.d.ts.map +1 -1
  3. package/dist/cli/dispatcher.js +89 -4
  4. package/dist/cli/dispatcher.js.map +1 -1
  5. package/dist/cli/help.d.ts.map +1 -1
  6. package/dist/cli/help.js +6 -0
  7. package/dist/cli/help.js.map +1 -1
  8. package/dist/cli/parser.d.ts.map +1 -1
  9. package/dist/cli/parser.js +14 -0
  10. package/dist/cli/parser.js.map +1 -1
  11. package/dist/cli/parser.test.js +20 -0
  12. package/dist/cli/parser.test.js.map +1 -1
  13. package/dist/commands/add-common.d.ts +14 -4
  14. package/dist/commands/add-common.d.ts.map +1 -1
  15. package/dist/commands/add-common.js +107 -19
  16. package/dist/commands/add-common.js.map +1 -1
  17. package/dist/commands/add-deps.test.d.ts +10 -0
  18. package/dist/commands/add-deps.test.d.ts.map +1 -0
  19. package/dist/commands/add-deps.test.js +220 -0
  20. package/dist/commands/add-deps.test.js.map +1 -0
  21. package/dist/commands/add-framework.d.ts +1 -1
  22. package/dist/commands/add-framework.d.ts.map +1 -1
  23. package/dist/commands/add-framework.js +53 -35
  24. package/dist/commands/add-framework.js.map +1 -1
  25. package/dist/commands/add-nuget.d.ts +6 -3
  26. package/dist/commands/add-nuget.d.ts.map +1 -1
  27. package/dist/commands/add-nuget.js +49 -211
  28. package/dist/commands/add-nuget.js.map +1 -1
  29. package/dist/commands/add-package.d.ts +1 -1
  30. package/dist/commands/add-package.d.ts.map +1 -1
  31. package/dist/commands/add-package.js +162 -58
  32. package/dist/commands/add-package.js.map +1 -1
  33. package/dist/commands/generate.d.ts.map +1 -1
  34. package/dist/commands/generate.js +5 -1
  35. package/dist/commands/generate.js.map +1 -1
  36. package/dist/commands/remove-nuget.d.ts +16 -0
  37. package/dist/commands/remove-nuget.d.ts.map +1 -0
  38. package/dist/commands/remove-nuget.js +47 -0
  39. package/dist/commands/remove-nuget.js.map +1 -0
  40. package/dist/commands/restore.d.ts +19 -0
  41. package/dist/commands/restore.d.ts.map +1 -0
  42. package/dist/commands/restore.js +619 -0
  43. package/dist/commands/restore.js.map +1 -0
  44. package/dist/commands/restore.test.d.ts +5 -0
  45. package/dist/commands/restore.test.d.ts.map +1 -0
  46. package/dist/commands/restore.test.js +59 -0
  47. package/dist/commands/restore.test.js.map +1 -0
  48. package/dist/commands/update-nuget.d.ts +18 -0
  49. package/dist/commands/update-nuget.d.ts.map +1 -0
  50. package/dist/commands/update-nuget.js +76 -0
  51. package/dist/commands/update-nuget.js.map +1 -0
  52. package/dist/config.d.ts.map +1 -1
  53. package/dist/config.js +24 -6
  54. package/dist/config.js.map +1 -1
  55. package/dist/dotnet/runtime-dlls.d.ts +3 -0
  56. package/dist/dotnet/runtime-dlls.d.ts.map +1 -0
  57. package/dist/dotnet/runtime-dlls.js +5 -0
  58. package/dist/dotnet/runtime-dlls.js.map +1 -0
  59. package/dist/types.d.ts +7 -1
  60. package/dist/types.d.ts.map +1 -1
  61. package/package.json +5 -4
@@ -0,0 +1 @@
1
+ {"version":3,"file":"add-deps.test.js","sourceRoot":"","sources":["../../src/commands/add-deps.test.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,7 @@
10
10
  import type { Result } from "../types.js";
11
11
  import { type AddCommandOptions } from "./add-common.js";
12
12
  export type AddFrameworkOptions = AddCommandOptions;
13
- export declare const addFrameworkCommand: (frameworkReference: string, typesPackage: string | undefined, projectRoot: string, options?: AddFrameworkOptions) => Result<{
13
+ export declare const addFrameworkCommand: (frameworkReference: string, typesPackage: string | undefined, configPath: string, options?: AddFrameworkOptions) => Result<{
14
14
  frameworkReference: string;
15
15
  bindings: string;
16
16
  }, string>;
@@ -1 +1 @@
1
- {"version":3,"file":"add-framework.d.ts","sourceRoot":"","sources":["../../src/commands/add-framework.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AACxD,OAAO,EAUL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAWpD,eAAO,MAAM,mBAAmB,GAC9B,oBAAoB,MAAM,EAC1B,cAAc,MAAM,GAAG,SAAS,EAChC,aAAa,MAAM,EACnB,UAAS,mBAAwB,KAChC,MAAM,CAAC;IAAE,kBAAkB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAoHjE,CAAC"}
1
+ {"version":3,"file":"add-framework.d.ts","sourceRoot":"","sources":["../../src/commands/add-framework.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAGxD,OAAO,EAYL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAcpD,eAAO,MAAM,mBAAmB,GAC9B,oBAAoB,MAAM,EAC1B,cAAc,MAAM,GAAG,SAAS,EAChC,YAAY,MAAM,EAClB,UAAS,mBAAwB,KAChC,MAAM,CAAC;IAAE,kBAAkB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAsIjE,CAAC"}
@@ -7,32 +7,57 @@
7
7
  * If typesPackage is omitted, bindings are auto-generated via tsbindgen from the
8
8
  * installed shared framework assemblies.
9
9
  */
10
- import { existsSync, mkdirSync } from "node:fs";
11
- import { join } from "node:path";
12
- import { defaultBindingsPackageNameForFramework, detectTsbindgenNaming, ensurePackageJson, listDotnetRuntimes, npmInstallDevDependency, readTsonicJson, resolveFromProjectRoot, resolveTsbindgenDllPath, tsbindgenGenerate, writeTsonicJson, } from "./add-common.js";
13
- const addUnique = (arr, value) => {
14
- if (!arr.includes(value))
15
- arr.push(value);
16
- };
10
+ import { loadConfig } from "../config.js";
11
+ import { dirname } from "node:path";
12
+ import { bindingsStoreDir, defaultBindingsPackageNameForFramework, detectTsbindgenNaming, ensureGeneratedBindingsPackageJson, installGeneratedBindingsPackage, listDotnetRuntimes, npmInstallDevDependency, resolveFromProjectRoot, resolvePackageRoot, resolveTsbindgenDllPath, tsbindgenGenerate, writeTsonicJson, } from "./add-common.js";
13
+ const normalizeFrameworkRefId = (value) => typeof value === "string" ? value : value.id;
17
14
  const isValidTypesPackageName = (name) => {
18
15
  if (!name.startsWith("@") && !name.includes("/"))
19
16
  return true;
20
17
  return /^@[a-z0-9-]+\/[a-z0-9-]+$/i.test(name);
21
18
  };
22
- export const addFrameworkCommand = (frameworkReference, typesPackage, projectRoot, options = {}) => {
19
+ export const addFrameworkCommand = (frameworkReference, typesPackage, configPath, options = {}) => {
20
+ const projectRoot = dirname(configPath);
23
21
  if (!frameworkReference.trim()) {
24
22
  return { ok: false, error: "Framework reference must be non-empty" };
25
23
  }
26
24
  if (typesPackage !== undefined && !isValidTypesPackageName(typesPackage)) {
27
25
  return { ok: false, error: `Invalid types package name: ${typesPackage}` };
28
26
  }
29
- const tsonicConfigResult = readTsonicJson(projectRoot);
27
+ const tsonicConfigResult = loadConfig(configPath);
30
28
  if (!tsonicConfigResult.ok)
31
29
  return tsonicConfigResult;
32
- const { path: configPath, config } = tsonicConfigResult.value;
30
+ const config = tsonicConfigResult.value;
33
31
  const dotnet = config.dotnet ?? {};
34
- const frameworkRefs = [...(dotnet.frameworkReferences ?? [])];
35
- addUnique(frameworkRefs, frameworkReference);
32
+ const frameworkRefs = [
33
+ ...(dotnet.frameworkReferences ?? []),
34
+ ];
35
+ const idx = frameworkRefs.findIndex((r) => normalizeFrameworkRefId(r).toLowerCase() ===
36
+ frameworkReference.toLowerCase());
37
+ if (idx >= 0) {
38
+ const existing = frameworkRefs[idx];
39
+ if (typesPackage) {
40
+ if (typeof existing === "string") {
41
+ frameworkRefs[idx] = { id: existing, types: typesPackage };
42
+ }
43
+ else if (existing.types && existing.types !== typesPackage) {
44
+ return {
45
+ ok: false,
46
+ error: `Framework reference already present with a different types package:\n` +
47
+ `- ${frameworkReference}\n` +
48
+ `- existing: ${existing.types}\n` +
49
+ `- requested: ${typesPackage}\n` +
50
+ `Refusing to change automatically (airplane-grade). Update tsonic.json manually if intended.`,
51
+ };
52
+ }
53
+ else {
54
+ frameworkRefs[idx] = { ...existing, types: typesPackage };
55
+ }
56
+ }
57
+ }
58
+ else {
59
+ frameworkRefs.push(typesPackage ? { id: frameworkReference, types: typesPackage } : frameworkReference);
60
+ }
36
61
  const nextConfig = {
37
62
  ...config,
38
63
  dotnet: {
@@ -69,25 +94,21 @@ export const addFrameworkCommand = (frameworkReference, typesPackage, projectRoo
69
94
  `Installed runtimes:\n${available}`,
70
95
  };
71
96
  }
72
- const dotnetLib = join(projectRoot, "node_modules/@tsonic/dotnet");
73
- const coreLib = join(projectRoot, "node_modules/@tsonic/core");
74
- if (!existsSync(join(dotnetLib, "package.json"))) {
75
- return {
76
- ok: false,
77
- error: "Missing @tsonic/dotnet in node_modules. Run 'tsonic project init' (recommended) or install it manually.",
78
- };
79
- }
80
- if (!existsSync(join(coreLib, "package.json"))) {
81
- return {
82
- ok: false,
83
- error: "Missing @tsonic/core in node_modules. Run 'tsonic project init' (recommended) or install it manually.",
84
- };
85
- }
97
+ const dotnetRoot = resolvePackageRoot(projectRoot, "@tsonic/dotnet");
98
+ if (!dotnetRoot.ok)
99
+ return dotnetRoot;
100
+ const coreRoot = resolvePackageRoot(projectRoot, "@tsonic/core");
101
+ if (!coreRoot.ok)
102
+ return coreRoot;
103
+ const dotnetLib = dotnetRoot.value;
104
+ const coreLib = coreRoot.value;
86
105
  const naming = detectTsbindgenNaming(nextConfig);
87
106
  const generatedPackage = defaultBindingsPackageNameForFramework(frameworkReference);
88
- const bindingsDir = join(projectRoot, "bindings", generatedPackage);
89
- mkdirSync(bindingsDir, { recursive: true });
90
- const packageJsonResult = ensurePackageJson(bindingsDir, generatedPackage);
107
+ const bindingsDir = bindingsStoreDir(projectRoot, "framework", generatedPackage);
108
+ const packageJsonResult = ensureGeneratedBindingsPackageJson(bindingsDir, generatedPackage, {
109
+ kind: "framework",
110
+ source: { frameworkReference },
111
+ });
91
112
  if (!packageJsonResult.ok)
92
113
  return packageJsonResult;
93
114
  const generateArgs = [
@@ -111,12 +132,9 @@ export const addFrameworkCommand = (frameworkReference, typesPackage, projectRoo
111
132
  const genResult = tsbindgenGenerate(projectRoot, tsbindgenDll, generateArgs, options);
112
133
  if (!genResult.ok)
113
134
  return genResult;
114
- const ensurePkg = ensurePackageJson(bindingsDir, generatedPackage);
115
- if (!ensurePkg.ok)
116
- return ensurePkg;
117
- const installLocal = npmInstallDevDependency(projectRoot, `file:bindings/${generatedPackage}`, options);
118
- if (!installLocal.ok)
119
- return installLocal;
135
+ const installResult = installGeneratedBindingsPackage(projectRoot, generatedPackage, bindingsDir);
136
+ if (!installResult.ok)
137
+ return installResult;
120
138
  return {
121
139
  ok: true,
122
140
  value: { frameworkReference, bindings: generatedPackage },
@@ -1 +1 @@
1
- {"version":3,"file":"add-framework.js","sourceRoot":"","sources":["../../src/commands/add-framework.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-framework.js","sourceRoot":"","sources":["../../src/commands/add-framework.ts"],"names":[],"mappings":"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"}
@@ -4,13 +4,16 @@
4
4
  * Usage:
5
5
  * tsonic add nuget <PackageId> <Version> [typesPackage]
6
6
  *
7
- * If typesPackage is omitted, bindings are auto-generated via tsbindgen from the
8
- * restored compile-time assemblies (including transitive dependencies).
7
+ * Airplane-grade rules:
8
+ * - Versions are pinned (no automatic upgrades/downgrades)
9
+ * - If a types package is provided, we do NOT auto-generate bindings
10
+ * - If types are omitted, we auto-generate bindings for the full transitive closure
11
+ * via `tsonic restore` (single source of truth)
9
12
  */
10
13
  import type { Result } from "../types.js";
11
14
  import { type AddCommandOptions } from "./add-common.js";
12
15
  export type AddNugetOptions = AddCommandOptions;
13
- export declare const addNugetCommand: (packageId: string, version: string, typesPackage: string | undefined, projectRoot: string, options?: AddNugetOptions) => Result<{
16
+ export declare const addNugetCommand: (id: string, ver: string, typesPackage: string | undefined, configPath: string, options?: AddNugetOptions) => Result<{
14
17
  packageId: string;
15
18
  version: string;
16
19
  bindings: string;
@@ -1 +1 @@
1
- {"version":3,"file":"add-nuget.d.ts","sourceRoot":"","sources":["../../src/commands/add-nuget.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AACxD,OAAO,EAUL,KAAK,iBAAiB,EAIvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAoHhD,eAAO,MAAM,eAAe,GAC1B,WAAW,MAAM,EACjB,SAAS,MAAM,EACf,cAAc,MAAM,GAAG,SAAS,EAChC,aAAa,MAAM,EACnB,UAAS,eAAoB,KAC5B,MAAM,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAoLzE,CAAC"}
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"}
@@ -4,123 +4,67 @@
4
4
  * Usage:
5
5
  * tsonic add nuget <PackageId> <Version> [typesPackage]
6
6
  *
7
- * If typesPackage is omitted, bindings are auto-generated via tsbindgen from the
8
- * restored compile-time assemblies (including transitive dependencies).
7
+ * Airplane-grade rules:
8
+ * - Versions are pinned (no automatic upgrades/downgrades)
9
+ * - If a types package is provided, we do NOT auto-generate bindings
10
+ * - If types are omitted, we auto-generate bindings for the full transitive closure
11
+ * via `tsonic restore` (single source of truth)
9
12
  */
10
- import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
11
- import { dirname, join } from "node:path";
12
- import { defaultBindingsPackageNameForNuget, detectTsbindgenNaming, ensurePackageJson, listDotnetRuntimes, npmInstallDevDependency, readTsonicJson, resolveFromProjectRoot, resolveTsbindgenDllPath, tsbindgenGenerate, defaultExec, writeTsonicJson, } from "./add-common.js";
13
+ import { loadConfig } from "../config.js";
14
+ import { dirname } from "node:path";
15
+ import { defaultBindingsPackageNameForNuget, npmInstallDevDependency, writeTsonicJson, } from "./add-common.js";
16
+ import { restoreCommand } from "./restore.js";
17
+ const normalizePkgId = (id) => id.trim().toLowerCase();
13
18
  const isValidTypesPackageName = (name) => {
14
19
  if (!name.startsWith("@") && !name.includes("/"))
15
20
  return true;
16
21
  return /^@[a-z0-9-]+\/[a-z0-9-]+$/i.test(name);
17
22
  };
18
- const normalizePkgId = (id) => id.trim().toLowerCase();
19
- const writeRestoreProject = (restoreDir, targetFramework, packageReferences) => {
20
- try {
21
- mkdirSync(restoreDir, { recursive: true });
22
- const csprojPath = join(restoreDir, "tsonic.nuget.restore.csproj");
23
- const itemGroup = packageReferences
24
- .map((p) => ` <PackageReference Include="${p.id}" Version="${p.version}" />`)
25
- .join("\n");
26
- const csproj = `<Project Sdk="Microsoft.NET.Sdk">
27
- <PropertyGroup>
28
- <TargetFramework>${targetFramework}</TargetFramework>
29
- <ImplicitUsings>false</ImplicitUsings>
30
- <Nullable>enable</Nullable>
31
- </PropertyGroup>
32
- <ItemGroup>
33
- ${itemGroup}
34
- </ItemGroup>
35
- </Project>
36
- `;
37
- writeFileSync(csprojPath, csproj, "utf-8");
38
- return { ok: true, value: csprojPath };
39
- }
40
- catch (error) {
41
- return {
42
- ok: false,
43
- error: `Failed to write restore project: ${error instanceof Error ? error.message : String(error)}`,
44
- };
45
- }
46
- };
47
- const dotnetRestore = (restoreProjectPath, options, exec = defaultExec) => {
48
- const restoreDir = dirname(restoreProjectPath);
49
- const result = exec("dotnet", ["restore", restoreProjectPath], restoreDir, options.verbose ? "inherit" : "pipe");
50
- if (result.status !== 0) {
51
- const msg = result.stderr || result.stdout || "Unknown error";
52
- return { ok: false, error: `dotnet restore failed:\n${msg}` };
53
- }
54
- const assetsPath = join(restoreDir, "obj", "project.assets.json");
55
- if (!existsSync(assetsPath)) {
56
- return { ok: false, error: `Restore succeeded but assets file missing: ${assetsPath}` };
23
+ export const addNugetCommand = (id, ver, typesPackage, configPath, options = {}) => {
24
+ const projectRoot = dirname(configPath);
25
+ if (!id.trim()) {
26
+ return { ok: false, error: "NuGet package id must be non-empty" };
57
27
  }
58
- return { ok: true, value: assetsPath };
59
- };
60
- const pickPackageFolder = (assets) => {
61
- const folders = assets.packageFolders ? Object.keys(assets.packageFolders) : [];
62
- if (folders.length === 0)
63
- return undefined;
64
- // Use the first package folder entry (dotnet restore writes an ordered map).
65
- return folders[0];
66
- };
67
- const findTargetKey = (assets, tfm) => {
68
- const targets = assets.targets ? Object.keys(assets.targets) : [];
69
- if (targets.includes(tfm))
70
- return tfm;
71
- return targets.find((k) => k.startsWith(`${tfm}/`));
72
- };
73
- const collectCompileDlls = (assets, targetKey, packageFolder) => {
74
- const targets = assets.targets?.[targetKey];
75
- const libraries = assets.libraries ?? {};
76
- const byLibrary = new Map();
77
- if (!targets || typeof targets !== "object")
78
- return byLibrary;
79
- for (const [libKey, libValue] of Object.entries(targets)) {
80
- if (!libKey || !libValue || typeof libValue !== "object")
81
- continue;
82
- const libInfo = libraries[libKey];
83
- if (!libInfo || libInfo.type !== "package" || !libInfo.path)
84
- continue;
85
- const compile = libValue.compile;
86
- if (!compile || typeof compile !== "object")
87
- continue;
88
- const dlls = Object.keys(compile)
89
- .filter((p) => p.toLowerCase().endsWith(".dll"))
90
- .map((p) => join(packageFolder, libInfo.path, p));
91
- if (dlls.length > 0)
92
- byLibrary.set(libKey, dlls);
28
+ if (!ver.trim()) {
29
+ return { ok: false, error: "NuGet version must be non-empty" };
93
30
  }
94
- return byLibrary;
95
- };
96
- export const addNugetCommand = (packageId, version, typesPackage, projectRoot, options = {}) => {
97
- const id = packageId.trim();
98
- const ver = version.trim();
99
- if (!id)
100
- return { ok: false, error: "PackageId must be non-empty" };
101
- if (!ver)
102
- return { ok: false, error: "Version must be non-empty" };
103
31
  if (typesPackage !== undefined && !isValidTypesPackageName(typesPackage)) {
104
32
  return { ok: false, error: `Invalid types package name: ${typesPackage}` };
105
33
  }
106
- const tsonicConfigResult = readTsonicJson(projectRoot);
34
+ const tsonicConfigResult = loadConfig(configPath);
107
35
  if (!tsonicConfigResult.ok)
108
36
  return tsonicConfigResult;
109
- const { path: configPath, config } = tsonicConfigResult.value;
37
+ const config = tsonicConfigResult.value;
110
38
  const dotnet = config.dotnet ?? {};
111
- const existing = [...(dotnet.packageReferences ?? [])];
112
- const existingIdx = existing.findIndex((p) => normalizePkgId(p.id) === normalizePkgId(id));
113
- if (existingIdx >= 0) {
114
- if (existing[existingIdx]?.version !== ver) {
39
+ const existing = [
40
+ ...(dotnet.packageReferences ?? []),
41
+ ];
42
+ const idx = existing.findIndex((p) => normalizePkgId(p.id) === normalizePkgId(id));
43
+ if (idx >= 0) {
44
+ const current = existing[idx];
45
+ if (current?.version !== ver) {
115
46
  return {
116
47
  ok: false,
117
- error: `NuGet package already present with a different version: ${existing[existingIdx]?.id} ${existing[existingIdx]?.version}\n` +
48
+ error: `NuGet package already present with a different version: ${current?.id} ${current?.version}\n` +
118
49
  `Refusing to change versions automatically (airplane-grade). Update tsonic.json manually if intended.`,
119
50
  };
120
51
  }
52
+ if (typesPackage) {
53
+ if (current?.types && current.types !== typesPackage) {
54
+ return {
55
+ ok: false,
56
+ error: `NuGet package already present with a different types package:\n` +
57
+ `- ${current.id} ${current.version}\n` +
58
+ `- existing: ${current.types}\n` +
59
+ `- requested: ${typesPackage}\n` +
60
+ `Refusing to change automatically (airplane-grade). Update tsonic.json manually if intended.`,
61
+ };
62
+ }
63
+ existing[idx] = { ...current, types: typesPackage };
64
+ }
121
65
  }
122
66
  else {
123
- existing.push({ id, version: ver });
67
+ existing.push(typesPackage ? { id, version: ver, types: typesPackage } : { id, version: ver });
124
68
  }
125
69
  const nextConfig = {
126
70
  ...config,
@@ -132,125 +76,19 @@ export const addNugetCommand = (packageId, version, typesPackage, projectRoot, o
132
76
  const writeResult = writeTsonicJson(configPath, nextConfig);
133
77
  if (!writeResult.ok)
134
78
  return writeResult;
79
+ const bindings = typesPackage ??
80
+ existing.find((p) => normalizePkgId(p.id) === normalizePkgId(id))?.types ??
81
+ defaultBindingsPackageNameForNuget(id);
135
82
  if (typesPackage) {
136
83
  const installResult = npmInstallDevDependency(projectRoot, typesPackage, options);
137
84
  if (!installResult.ok)
138
85
  return installResult;
139
- return {
140
- ok: true,
141
- value: { packageId: id, version: ver, bindings: typesPackage },
142
- };
86
+ return { ok: true, value: { packageId: id, version: ver, bindings } };
143
87
  }
144
- const tsbindgenDllResult = resolveTsbindgenDllPath(projectRoot);
145
- if (!tsbindgenDllResult.ok)
146
- return tsbindgenDllResult;
147
- const tsbindgenDll = tsbindgenDllResult.value;
148
- const dotnetLib = join(projectRoot, "node_modules/@tsonic/dotnet");
149
- const coreLib = join(projectRoot, "node_modules/@tsonic/core");
150
- if (!existsSync(join(dotnetLib, "package.json"))) {
151
- return {
152
- ok: false,
153
- error: "Missing @tsonic/dotnet in node_modules. Run 'tsonic project init' (recommended) or install it manually.",
154
- };
155
- }
156
- if (!existsSync(join(coreLib, "package.json"))) {
157
- return {
158
- ok: false,
159
- error: "Missing @tsonic/core in node_modules. Run 'tsonic project init' (recommended) or install it manually.",
160
- };
161
- }
162
- const targetFramework = nextConfig.dotnetVersion ?? "net10.0";
163
- const restoreDir = join(projectRoot, ".tsonic", "nuget");
164
- const restoreProject = writeRestoreProject(restoreDir, targetFramework, existing);
165
- if (!restoreProject.ok)
166
- return restoreProject;
167
- const assetsPathResult = dotnetRestore(restoreProject.value, options);
168
- if (!assetsPathResult.ok)
169
- return assetsPathResult;
170
- let assets;
171
- try {
172
- assets = JSON.parse(readFileSync(assetsPathResult.value, "utf-8"));
173
- }
174
- catch (error) {
175
- return {
176
- ok: false,
177
- error: `Failed to parse project.assets.json: ${error instanceof Error ? error.message : String(error)}`,
178
- };
179
- }
180
- const packageFolder = pickPackageFolder(assets);
181
- if (!packageFolder) {
182
- return { ok: false, error: "project.assets.json missing packageFolders (unexpected)" };
183
- }
184
- const targetKey = findTargetKey(assets, targetFramework);
185
- if (!targetKey) {
186
- const available = assets.targets ? Object.keys(assets.targets).join("\n") : "(none)";
187
- return {
188
- ok: false,
189
- error: `No restore target found for ${targetFramework}. Available targets:\n${available}`,
190
- };
191
- }
192
- const dllsByLibrary = collectCompileDlls(assets, targetKey, packageFolder);
193
- const rootLibKey = Array.from(dllsByLibrary.keys()).find((k) => k.toLowerCase().startsWith(`${normalizePkgId(id)}/`));
194
- if (!rootLibKey) {
195
- return {
196
- ok: false,
197
- error: `No compile-time assemblies found for ${id} ${ver}.\n` +
198
- `This may be a meta-package or incompatible target framework (${targetFramework}).`,
199
- };
200
- }
201
- const seedDlls = dllsByLibrary.get(rootLibKey) ?? [];
202
- if (seedDlls.length === 0) {
203
- return {
204
- ok: false,
205
- error: `No .dll compile assets found for ${id} ${ver} under ${targetFramework}.`,
206
- };
207
- }
208
- const compileDirs = new Set();
209
- for (const dlls of dllsByLibrary.values()) {
210
- for (const dll of dlls)
211
- compileDirs.add(dirname(dll));
212
- }
213
- const runtimesResult = listDotnetRuntimes(projectRoot);
214
- if (!runtimesResult.ok)
215
- return runtimesResult;
216
- const runtimes = runtimesResult.value;
217
- const naming = detectTsbindgenNaming(nextConfig);
218
- const generatedPackage = defaultBindingsPackageNameForNuget(id);
219
- const bindingsDir = join(projectRoot, "bindings", generatedPackage);
220
- mkdirSync(bindingsDir, { recursive: true });
221
- const packageJsonResult = ensurePackageJson(bindingsDir, generatedPackage);
222
- if (!packageJsonResult.ok)
223
- return packageJsonResult;
224
- const generateArgs = [
225
- ...seedDlls.flatMap((p) => ["-a", p]),
226
- "-o",
227
- bindingsDir,
228
- "--naming",
229
- naming,
230
- "--lib",
231
- dotnetLib,
232
- "--lib",
233
- coreLib,
234
- ];
235
- for (const rt of runtimes)
236
- generateArgs.push("--ref-dir", rt.dir);
237
- for (const d of compileDirs)
238
- generateArgs.push("--ref-dir", d);
239
- for (const dep of options.deps ?? []) {
240
- generateArgs.push("--ref-dir", resolveFromProjectRoot(projectRoot, dep));
241
- }
242
- const genResult = tsbindgenGenerate(projectRoot, tsbindgenDll, generateArgs, options);
243
- if (!genResult.ok)
244
- return genResult;
245
- const ensurePkg = ensurePackageJson(bindingsDir, generatedPackage);
246
- if (!ensurePkg.ok)
247
- return ensurePkg;
248
- const installLocal = npmInstallDevDependency(projectRoot, `file:bindings/${generatedPackage}`, options);
249
- if (!installLocal.ok)
250
- return installLocal;
251
- return {
252
- ok: true,
253
- value: { packageId: id, version: ver, bindings: generatedPackage },
254
- };
88
+ // Auto-generate bindings for all auto-gen dependencies (including transitive deps).
89
+ const restoreResult = restoreCommand(configPath, options);
90
+ if (!restoreResult.ok)
91
+ return restoreResult;
92
+ return { ok: true, value: { packageId: id, version: ver, bindings } };
255
93
  };
256
94
  //# sourceMappingURL=add-nuget.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"add-nuget.js","sourceRoot":"","sources":["../../src/commands/add-nuget.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-nuget.js","sourceRoot":"","sources":["../../src/commands/add-nuget.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,7 @@
12
12
  import type { Result } from "../types.js";
13
13
  import { type AddCommandOptions } from "./add-common.js";
14
14
  export type AddPackageOptions = AddCommandOptions;
15
- export declare const addPackageCommand: (dllPath: string, typesPackage: string | undefined, projectRoot: string, options?: AddPackageOptions) => Result<{
15
+ export declare const addPackageCommand: (dllPath: string, typesPackage: string | undefined, configPath: string, options?: AddPackageOptions) => Result<{
16
16
  dllsCopied: number;
17
17
  bindings: string;
18
18
  }, string>;
@@ -1 +1 @@
1
- {"version":3,"file":"add-package.d.ts","sourceRoot":"","sources":["../../src/commands/add-package.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAUH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AACxD,OAAO,EAWL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAyBlD,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,cAAc,MAAM,GAAG,SAAS,EAChC,aAAa,MAAM,EACnB,UAAS,iBAAsB,KAC9B,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CA0MzD,CAAC"}
1
+ {"version":3,"file":"add-package.d.ts","sourceRoot":"","sources":["../../src/commands/add-package.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAUH,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAGxD,OAAO,EAaL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAqClD,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,cAAc,MAAM,GAAG,SAAS,EAChC,YAAY,MAAM,EAClB,UAAS,iBAAsB,KAC9B,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAiTzD,CAAC"}