@tsonic/cli 0.0.64 → 0.0.66
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.
- package/dist/.tsbuildinfo +1 -1
- package/dist/aikya/bindings.d.ts +2 -2
- package/dist/aikya/bindings.d.ts.map +1 -1
- package/dist/aikya/bindings.js +23 -5
- package/dist/aikya/bindings.js.map +1 -1
- package/dist/aikya/bindings.test.js +86 -0
- package/dist/aikya/bindings.test.js.map +1 -1
- package/dist/cli/dispatcher.d.ts.map +1 -1
- package/dist/cli/dispatcher.js +8 -0
- package/dist/cli/dispatcher.js.map +1 -1
- package/dist/cli/help.js +3 -3
- package/dist/cli/parser.test.js +4 -4
- package/dist/cli/parser.test.js.map +1 -1
- package/dist/commands/add-common.d.ts.map +1 -1
- package/dist/commands/add-common.js +54 -1
- package/dist/commands/add-common.js.map +1 -1
- package/dist/commands/add-common.test.js +18 -0
- package/dist/commands/add-common.test.js.map +1 -1
- package/dist/commands/build-library-bindings-aliases.test.js +3 -2
- package/dist/commands/build-library-bindings-aliases.test.js.map +1 -1
- package/dist/commands/build.d.ts.map +1 -1
- package/dist/commands/build.js +29 -2
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/build.test.js +44 -0
- package/dist/commands/build.test.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +12 -2
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/init.d.ts +1 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +42 -13
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/init.test.js +111 -34
- package/dist/commands/init.test.js.map +1 -1
- package/dist/commands/library-bindings-augment.d.ts.map +1 -1
- package/dist/commands/library-bindings-augment.js +3 -1
- package/dist/commands/library-bindings-augment.js.map +1 -1
- package/dist/commands/library-bindings-firstparty-regressions.test.js +1 -4
- package/dist/commands/library-bindings-firstparty-regressions.test.js.map +1 -1
- package/dist/commands/library-bindings-firstparty.d.ts.map +1 -1
- package/dist/commands/library-bindings-firstparty.js +3 -1
- package/dist/commands/library-bindings-firstparty.js.map +1 -1
- package/dist/commands/restore.d.ts.map +1 -1
- package/dist/commands/restore.js +5 -1
- package/dist/commands/restore.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +7 -4
- package/dist/config.js.map +1 -1
- package/dist/config.test.js +70 -31
- package/dist/config.test.js.map +1 -1
- package/dist/surface/profiles.d.ts +6 -1
- package/dist/surface/profiles.d.ts.map +1 -1
- package/dist/surface/profiles.js +180 -23
- package/dist/surface/profiles.js.map +1 -1
- package/dist/surface/profiles.test.js +149 -20
- package/dist/surface/profiles.test.js.map +1 -1
- package/dist/types.d.ts +4 -4
- package/dist/types.d.ts.map +1 -1
- package/package.json +5 -5
- package/runtime/Tsonic.JSRuntime.dll +0 -0
- package/runtime/nodejs.dll +0 -0
|
@@ -22,6 +22,50 @@ const run = (cwd, command, args) => {
|
|
|
22
22
|
};
|
|
23
23
|
describe("build command (library bindings ref dirs)", function () {
|
|
24
24
|
this.timeout(10 * 60 * 1000);
|
|
25
|
+
it("prefers local DLL references over duplicate NuGet package references in generated csproj", () => {
|
|
26
|
+
const dir = mkdtempSync(join(tmpdir(), "tsonic-local-dll-wins-"));
|
|
27
|
+
try {
|
|
28
|
+
mkdirSync(join(dir, "node_modules"), { recursive: true });
|
|
29
|
+
writeFileSync(join(dir, "package.json"), JSON.stringify({ name: "test-workspace", private: true, type: "module" }, null, 2) + "\n", "utf-8");
|
|
30
|
+
linkDir(join(repoRoot, "node_modules/@tsonic/globals"), join(dir, "node_modules/@tsonic/globals"));
|
|
31
|
+
linkDir(join(repoRoot, "node_modules/@tsonic/core"), join(dir, "node_modules/@tsonic/core"));
|
|
32
|
+
linkDir(join(repoRoot, "node_modules/@tsonic/dotnet"), join(dir, "node_modules/@tsonic/dotnet"));
|
|
33
|
+
const runtimeDll = join(repoRoot, "packages/cli/runtime/Tsonic.Runtime.dll");
|
|
34
|
+
expect(existsSync(runtimeDll)).to.equal(true);
|
|
35
|
+
const workspaceConfig = {
|
|
36
|
+
$schema: "https://tsonic.org/schema/workspace/v1.json",
|
|
37
|
+
dotnetVersion: "net10.0",
|
|
38
|
+
dotnet: {
|
|
39
|
+
libraries: [runtimeDll],
|
|
40
|
+
frameworkReferences: [],
|
|
41
|
+
packageReferences: [{ id: "Tsonic.Runtime", version: "0.0.1" }],
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
const projectRoot = join(dir, "packages", "app");
|
|
45
|
+
mkdirSync(join(projectRoot, "src"), { recursive: true });
|
|
46
|
+
writeFileSync(join(projectRoot, "package.json"), JSON.stringify({ name: "@acme/app", version: "1.0.0", private: true, type: "module" }, null, 2) + "\n", "utf-8");
|
|
47
|
+
writeFileSync(join(projectRoot, "src", "index.ts"), "export function main(): void {}\n", "utf-8");
|
|
48
|
+
const projectConfig = {
|
|
49
|
+
$schema: "https://tsonic.org/schema/v1.json",
|
|
50
|
+
rootNamespace: "App",
|
|
51
|
+
entryPoint: "src/index.ts",
|
|
52
|
+
sourceRoot: "src",
|
|
53
|
+
outputDirectory: "generated",
|
|
54
|
+
outputName: "App",
|
|
55
|
+
};
|
|
56
|
+
const config = resolveConfig(workspaceConfig, projectConfig, {}, dir, projectRoot);
|
|
57
|
+
const gen = generateCommand(config);
|
|
58
|
+
expect(gen.ok).to.equal(true);
|
|
59
|
+
if (!gen.ok)
|
|
60
|
+
return;
|
|
61
|
+
const csprojText = readFileSync(join(projectRoot, "generated", "tsonic.csproj"), "utf-8");
|
|
62
|
+
expect(csprojText).to.include('<Reference Include="Tsonic.Runtime">');
|
|
63
|
+
expect(csprojText).to.not.include('<PackageReference Include="Tsonic.Runtime" Version="0.0.1" />');
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
rmSync(dir, { recursive: true, force: true });
|
|
67
|
+
}
|
|
68
|
+
});
|
|
25
69
|
it("generates bindings for libraries that reference other DLLs and Tsonic.Runtime without requiring copy-local", () => {
|
|
26
70
|
const dir = mkdtempSync(join(tmpdir(), "tsonic-build-lib-"));
|
|
27
71
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.test.js","sourceRoot":"","sources":["../../src/commands/build.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.test.js","sourceRoot":"","sources":["../../src/commands/build.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAAA;;GAEG;AA6BH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAAA;;GAEG;AA6BH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAuK1D;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,cAAc,KACrB,MAAM,CAAC;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAkV9D,CAAC"}
|
|
@@ -15,6 +15,13 @@ const findProjectCsproj = (projectRoot) => {
|
|
|
15
15
|
const csprojFile = files.find((f) => f.endsWith(".csproj"));
|
|
16
16
|
return csprojFile ? join(projectRoot, csprojFile) : null;
|
|
17
17
|
};
|
|
18
|
+
const dedupePackageReferencesAgainstAssemblyReferences = (packageReferences, assemblyReferences) => {
|
|
19
|
+
if (packageReferences.length === 0 || assemblyReferences.length === 0) {
|
|
20
|
+
return packageReferences;
|
|
21
|
+
}
|
|
22
|
+
const localAssemblyIds = new Set(assemblyReferences.map((reference) => reference.name.toLowerCase()));
|
|
23
|
+
return packageReferences.filter((reference) => !localAssemblyIds.has(reference.id.toLowerCase()));
|
|
24
|
+
};
|
|
18
25
|
/**
|
|
19
26
|
* Find a specific DLL, checking project's lib/ first, then CLI package runtime
|
|
20
27
|
* Returns the absolute path to the DLL or null if not found
|
|
@@ -136,7 +143,9 @@ const extractEntryInfo = (entryModule) => {
|
|
|
136
143
|
*/
|
|
137
144
|
export const generateCommand = (config) => {
|
|
138
145
|
const { entryPoint, outputDirectory, rootNamespace, workspaceRoot, projectRoot, sourceRoot, typeRoots, frameworkReferences, packageReferences, } = config;
|
|
139
|
-
const surfaceCapabilities = resolveSurfaceCapabilities(config.surface
|
|
146
|
+
const surfaceCapabilities = resolveSurfaceCapabilities(config.surface, {
|
|
147
|
+
workspaceRoot,
|
|
148
|
+
});
|
|
140
149
|
// For libraries, entry point is optional
|
|
141
150
|
if (!entryPoint && config.outputConfig.type !== "library") {
|
|
142
151
|
return {
|
|
@@ -317,6 +326,7 @@ export const generateCommand = (config) => {
|
|
|
317
326
|
...findRuntimeDlls(outputDir),
|
|
318
327
|
...collectProjectLibraries(workspaceRoot, outputDir, config.libraries),
|
|
319
328
|
];
|
|
329
|
+
const effectivePackageReferences = dedupePackageReferencesAgainstAssemblyReferences(packageReferences, assemblyReferences);
|
|
320
330
|
// Build output configuration
|
|
321
331
|
const outputConfig = outputType === "library"
|
|
322
332
|
? {
|
|
@@ -355,7 +365,7 @@ export const generateCommand = (config) => {
|
|
|
355
365
|
runtimePath,
|
|
356
366
|
assemblyReferences,
|
|
357
367
|
frameworkReferences,
|
|
358
|
-
packageReferences,
|
|
368
|
+
packageReferences: effectivePackageReferences,
|
|
359
369
|
msbuildProperties: config.msbuildProperties,
|
|
360
370
|
outputConfig,
|
|
361
371
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/init.d.ts
CHANGED
|
@@ -24,6 +24,7 @@ type TypePackageInfo = {
|
|
|
24
24
|
};
|
|
25
25
|
export declare const getTypePackageInfo: (options?: {
|
|
26
26
|
readonly surface?: SurfaceMode;
|
|
27
|
+
readonly workspaceRoot?: string;
|
|
27
28
|
}) => TypePackageInfo;
|
|
28
29
|
export declare const initWorkspace: (workspaceRoot: string, options?: InitOptions) => Result<void, string>;
|
|
29
30
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,KAAK,EACV,MAAM,EACN,WAAW,EAGZ,MAAM,aAAa,CAAC;AAErB,KAAK,WAAW,GAAG;IACjB,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;CAChC,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,QAAQ,CAAC,QAAQ,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAChE,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC,CAAC;AAKF,eAAO,MAAM,kBAAkB,GAC7B,UAAS;IACP,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;CAC5B,KACL,eAuBF,CAAC;AAkHF,eAAO,MAAM,aAAa,GACxB,eAAe,MAAM,EACrB,UAAS,WAAgB,KACxB,MAAM,CAAC,IAAI,EAAE,MAAM,CA2JrB,CAAC"}
|
package/dist/commands/init.js
CHANGED
|
@@ -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 {
|
|
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
|
-
|
|
23
|
-
|
|
24
|
-
|
|
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:
|
|
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":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,46 +3,90 @@
|
|
|
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
|
|
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
17
|
expect(packageNames).to.include("@tsonic/globals");
|
|
18
|
+
expect(packageNames).to.include("@tsonic/dotnet");
|
|
18
19
|
expect(packageNames).to.not.include("@tsonic/core");
|
|
19
20
|
});
|
|
20
|
-
it("should
|
|
21
|
+
it("should include clr surface type roots", () => {
|
|
21
22
|
const result = getTypePackageInfo();
|
|
22
23
|
expect(result.typeRoots).to.deep.equal([
|
|
23
24
|
"node_modules/@tsonic/globals",
|
|
24
25
|
]);
|
|
25
26
|
});
|
|
26
27
|
});
|
|
27
|
-
it("should include js package (without nodejs) for js surface", () => {
|
|
28
|
-
const result = getTypePackageInfo({ surface: "js" });
|
|
28
|
+
it("should include @tsonic/js package (without nodejs) for js surface", () => {
|
|
29
|
+
const result = getTypePackageInfo({ surface: "@tsonic/js" });
|
|
29
30
|
const packageNames = result.packages.map((p) => p.name);
|
|
30
31
|
expect(packageNames).to.include("@tsonic/js");
|
|
31
32
|
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
|
-
]);
|
|
33
|
+
expect(result.typeRoots).to.deep.equal(["node_modules/@tsonic/js"]);
|
|
36
34
|
});
|
|
37
|
-
it("should include
|
|
38
|
-
const result = getTypePackageInfo({ surface: "nodejs" });
|
|
35
|
+
it("should include @tsonic/nodejs package for nodejs surface bootstrap", () => {
|
|
36
|
+
const result = getTypePackageInfo({ surface: "@tsonic/nodejs" });
|
|
39
37
|
const packageNames = result.packages.map((p) => p.name);
|
|
40
|
-
expect(packageNames).to.include("@tsonic/js");
|
|
41
38
|
expect(packageNames).to.include("@tsonic/nodejs");
|
|
39
|
+
expect(packageNames).to.not.include("@tsonic/js");
|
|
40
|
+
expect(result.typeRoots).to.deep.equal(["node_modules/@tsonic/nodejs"]);
|
|
41
|
+
});
|
|
42
|
+
it("should include inherited surface package requirements from installed manifests", () => {
|
|
43
|
+
const workspaceRoot = mkdtempSync(join(tmpdir(), "tsonic-init-surface-"));
|
|
44
|
+
try {
|
|
45
|
+
writeFileSync(join(workspaceRoot, "package.json"), JSON.stringify({ name: "app", version: "1.0.0", private: true, type: "module" }, null, 2));
|
|
46
|
+
const jsRoot = join(workspaceRoot, "node_modules", "@tsonic", "js");
|
|
47
|
+
mkdirSync(jsRoot, { recursive: true });
|
|
48
|
+
writeFileSync(join(jsRoot, "package.json"), JSON.stringify({
|
|
49
|
+
name: "@tsonic/js",
|
|
50
|
+
version: "1.0.0",
|
|
51
|
+
type: "module",
|
|
52
|
+
}));
|
|
53
|
+
writeFileSync(join(jsRoot, "tsonic.surface.json"), JSON.stringify({
|
|
54
|
+
schemaVersion: 1,
|
|
55
|
+
id: "@tsonic/js",
|
|
56
|
+
extends: [],
|
|
57
|
+
requiredTypeRoots: ["types"],
|
|
58
|
+
requiredNpmPackages: ["@tsonic/js"],
|
|
59
|
+
}, null, 2));
|
|
60
|
+
const nodejsRoot = join(workspaceRoot, "node_modules", "@tsonic", "nodejs");
|
|
61
|
+
mkdirSync(nodejsRoot, { recursive: true });
|
|
62
|
+
writeFileSync(join(nodejsRoot, "package.json"), JSON.stringify({ name: "@tsonic/nodejs", version: "1.0.0", type: "module" }, null, 2));
|
|
63
|
+
writeFileSync(join(nodejsRoot, "tsonic.surface.json"), JSON.stringify({
|
|
64
|
+
schemaVersion: 1,
|
|
65
|
+
id: "@tsonic/nodejs",
|
|
66
|
+
extends: ["@tsonic/js"],
|
|
67
|
+
requiredTypeRoots: ["types"],
|
|
68
|
+
requiredNpmPackages: ["@tsonic/nodejs", "@tsonic/js"],
|
|
69
|
+
}, null, 2));
|
|
70
|
+
const result = getTypePackageInfo({
|
|
71
|
+
surface: "@tsonic/nodejs",
|
|
72
|
+
workspaceRoot,
|
|
73
|
+
});
|
|
74
|
+
const packageNames = result.packages.map((p) => p.name);
|
|
75
|
+
expect(packageNames).to.include("@tsonic/nodejs");
|
|
76
|
+
expect(packageNames).to.include("@tsonic/js");
|
|
77
|
+
expect(result.typeRoots).to.include(join(jsRoot, "types"));
|
|
78
|
+
expect(result.typeRoots).to.include(join(nodejsRoot, "types"));
|
|
79
|
+
}
|
|
80
|
+
finally {
|
|
81
|
+
rmSync(workspaceRoot, { recursive: true, force: true });
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
it("should support custom surface package names via fallback profile", () => {
|
|
85
|
+
const result = getTypePackageInfo({ surface: "@acme/surface-web" });
|
|
86
|
+
const packageNames = result.packages.map((p) => p.name);
|
|
87
|
+
expect(packageNames).to.include("@acme/surface-web");
|
|
42
88
|
expect(result.typeRoots).to.deep.equal([
|
|
43
|
-
"node_modules/@
|
|
44
|
-
"node_modules/@tsonic/js",
|
|
45
|
-
"node_modules/@tsonic/nodejs",
|
|
89
|
+
"node_modules/@acme/surface-web",
|
|
46
90
|
]);
|
|
47
91
|
});
|
|
48
92
|
describe("package versions", () => {
|
|
@@ -55,14 +99,20 @@ describe("Init Command", () => {
|
|
|
55
99
|
});
|
|
56
100
|
});
|
|
57
101
|
describe("initWorkspace", () => {
|
|
58
|
-
it("should
|
|
59
|
-
const dir = mkdtempSync(join(tmpdir(), "tsonic-init-
|
|
102
|
+
it("should allow custom surface names", () => {
|
|
103
|
+
const dir = mkdtempSync(join(tmpdir(), "tsonic-init-custom-surface-"));
|
|
60
104
|
try {
|
|
61
105
|
const result = initWorkspace(dir, {
|
|
62
106
|
skipTypes: true,
|
|
63
|
-
surface: "
|
|
107
|
+
surface: "@acme/surface-web",
|
|
64
108
|
});
|
|
65
|
-
expect(result.ok).to.equal(
|
|
109
|
+
expect(result.ok).to.equal(true);
|
|
110
|
+
const workspaceRaw = readFileSync(join(dir, "tsonic.workspace.json"), "utf-8");
|
|
111
|
+
const workspace = JSON.parse(workspaceRaw);
|
|
112
|
+
expect(workspace.surface).to.equal("@acme/surface-web");
|
|
113
|
+
expect(workspace.dotnet?.typeRoots).to.deep.equal([
|
|
114
|
+
"node_modules/@acme/surface-web",
|
|
115
|
+
]);
|
|
66
116
|
}
|
|
67
117
|
finally {
|
|
68
118
|
rmSync(dir, { recursive: true, force: true });
|
|
@@ -82,18 +132,19 @@ describe("Init Command", () => {
|
|
|
82
132
|
rmSync(dir, { recursive: true, force: true });
|
|
83
133
|
}
|
|
84
134
|
});
|
|
85
|
-
it("should write js surface config when requested", () => {
|
|
135
|
+
it("should write @tsonic/js surface config when requested", () => {
|
|
86
136
|
const dir = mkdtempSync(join(tmpdir(), "tsonic-init-js-"));
|
|
87
137
|
try {
|
|
88
|
-
const result = initWorkspace(dir, {
|
|
138
|
+
const result = initWorkspace(dir, {
|
|
139
|
+
skipTypes: true,
|
|
140
|
+
surface: "@tsonic/js",
|
|
141
|
+
});
|
|
89
142
|
expect(result.ok).to.equal(true);
|
|
90
143
|
const workspaceRaw = readFileSync(join(dir, "tsonic.workspace.json"), "utf-8");
|
|
91
144
|
const workspace = JSON.parse(workspaceRaw);
|
|
92
|
-
expect(workspace.surface).to.equal("js");
|
|
93
|
-
expect(workspace.dotnet?.typeRoots).
|
|
94
|
-
|
|
95
|
-
"node_modules/@tsonic/js",
|
|
96
|
-
]);
|
|
145
|
+
expect(workspace.surface).to.equal("@tsonic/js");
|
|
146
|
+
expect((workspace.dotnet?.typeRoots ?? []).some((root) => root === "node_modules/@tsonic/js" ||
|
|
147
|
+
/[/\\]js[/\\]versions[/\\]\d+$/.test(root))).to.equal(true);
|
|
97
148
|
const workspaceName = basename(dir);
|
|
98
149
|
const appTs = readFileSync(join(dir, "packages", workspaceName, "src", "App.ts"), "utf-8");
|
|
99
150
|
expect(appTs).to.include("console.log");
|
|
@@ -103,22 +154,48 @@ describe("Init Command", () => {
|
|
|
103
154
|
rmSync(dir, { recursive: true, force: true });
|
|
104
155
|
}
|
|
105
156
|
});
|
|
106
|
-
it("should write nodejs surface config when requested", () => {
|
|
157
|
+
it("should write @tsonic/nodejs surface config when requested", () => {
|
|
107
158
|
const dir = mkdtempSync(join(tmpdir(), "tsonic-init-nodejs-"));
|
|
108
159
|
try {
|
|
160
|
+
writeFileSync(join(dir, "package.json"), JSON.stringify({ name: "app", version: "1.0.0", private: true, type: "module" }, null, 2));
|
|
161
|
+
const jsRoot = join(dir, "node_modules", "@tsonic", "js");
|
|
162
|
+
mkdirSync(jsRoot, { recursive: true });
|
|
163
|
+
writeFileSync(join(jsRoot, "package.json"), JSON.stringify({
|
|
164
|
+
name: "@tsonic/js",
|
|
165
|
+
version: "1.0.0",
|
|
166
|
+
type: "module",
|
|
167
|
+
}));
|
|
168
|
+
writeFileSync(join(jsRoot, "tsonic.surface.json"), JSON.stringify({
|
|
169
|
+
schemaVersion: 1,
|
|
170
|
+
id: "@tsonic/js",
|
|
171
|
+
extends: [],
|
|
172
|
+
requiredTypeRoots: ["types"],
|
|
173
|
+
requiredNpmPackages: ["@tsonic/js"],
|
|
174
|
+
}, null, 2));
|
|
175
|
+
const nodejsRoot = join(dir, "node_modules", "@tsonic", "nodejs");
|
|
176
|
+
mkdirSync(nodejsRoot, { recursive: true });
|
|
177
|
+
writeFileSync(join(nodejsRoot, "package.json"), JSON.stringify({ name: "@tsonic/nodejs", version: "1.0.0", type: "module" }, null, 2));
|
|
178
|
+
writeFileSync(join(nodejsRoot, "tsonic.surface.json"), JSON.stringify({
|
|
179
|
+
schemaVersion: 1,
|
|
180
|
+
id: "@tsonic/nodejs",
|
|
181
|
+
extends: ["@tsonic/js"],
|
|
182
|
+
requiredTypeRoots: ["types"],
|
|
183
|
+
requiredNpmPackages: ["@tsonic/nodejs", "@tsonic/js"],
|
|
184
|
+
}, null, 2));
|
|
109
185
|
const result = initWorkspace(dir, {
|
|
110
186
|
skipTypes: true,
|
|
111
|
-
surface: "nodejs",
|
|
187
|
+
surface: "@tsonic/nodejs",
|
|
112
188
|
});
|
|
113
189
|
expect(result.ok).to.equal(true);
|
|
114
190
|
const workspaceRaw = readFileSync(join(dir, "tsonic.workspace.json"), "utf-8");
|
|
115
191
|
const workspace = JSON.parse(workspaceRaw);
|
|
116
|
-
expect(workspace.surface).to.equal("nodejs");
|
|
117
|
-
expect(workspace.dotnet?.typeRoots).
|
|
118
|
-
"node_modules/@tsonic/
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
192
|
+
expect(workspace.surface).to.equal("@tsonic/nodejs");
|
|
193
|
+
expect((workspace.dotnet?.typeRoots ?? []).some((root) => root === join(jsRoot, "types") ||
|
|
194
|
+
root === "node_modules/@tsonic/js" ||
|
|
195
|
+
/[/\\]js[/\\]versions[/\\]\d+$/.test(root))).to.equal(true);
|
|
196
|
+
expect((workspace.dotnet?.typeRoots ?? []).some((root) => root === join(nodejsRoot, "types") ||
|
|
197
|
+
root === "node_modules/@tsonic/nodejs" ||
|
|
198
|
+
/[/\\]nodejs[/\\]versions[/\\]\d+$/.test(root))).to.equal(true);
|
|
122
199
|
const workspaceName = basename(dir);
|
|
123
200
|
const appTs = readFileSync(join(dir, "packages", workspaceName, "src", "App.ts"), "utf-8");
|
|
124
201
|
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,
|
|
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 = {
|