@typespec/compiler 0.65.0-dev.22 → 0.65.0-dev.23
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/manifest.js +2 -2
- package/dist/src/core/engine.d.ts +6 -0
- package/dist/src/core/engine.d.ts.map +1 -0
- package/dist/src/core/engine.js +7 -0
- package/dist/src/core/engine.js.map +1 -0
- package/dist/src/core/install.d.ts.map +1 -1
- package/dist/src/core/install.js +20 -0
- package/dist/src/core/install.js.map +1 -1
- package/package.json +3 -1
package/dist/manifest.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../src/core/engine.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC;AAE5C;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,cAAc,CAElD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../src/core/engine.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,iBAAiB;IAC/B,OAAQ,UAAkB,CAAC,eAAe,IAAI,MAAM,CAAC;AACvD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAWjD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAQf"}
|
package/dist/src/core/install.js
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
|
+
import Arborist from "@npmcli/arborist";
|
|
1
2
|
import { spawn } from "child_process";
|
|
3
|
+
import { getTypeSpecEngine } from "./engine.js";
|
|
2
4
|
export async function installTypeSpecDependencies(host, directory) {
|
|
5
|
+
// Only use the builtin npm when running in standalone tsp mode.
|
|
6
|
+
// TBD how we'll change this as we move to a more integrated setup and resolve the user package manager.
|
|
7
|
+
if (getTypeSpecEngine() === "tsp") {
|
|
8
|
+
await installWithBuiltinNpm(host, directory);
|
|
9
|
+
}
|
|
10
|
+
else {
|
|
11
|
+
await installWithNpmExe(host, directory);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
async function installWithBuiltinNpm(host, directory) {
|
|
15
|
+
const arb = new Arborist({
|
|
16
|
+
path: directory,
|
|
17
|
+
});
|
|
18
|
+
await arb.loadActual();
|
|
19
|
+
await arb.buildIdealTree({});
|
|
20
|
+
await arb.reify();
|
|
21
|
+
}
|
|
22
|
+
async function installWithNpmExe(host, directory) {
|
|
3
23
|
const child = spawn("npm", ["install"], {
|
|
4
24
|
shell: process.platform === "win32",
|
|
5
25
|
stdio: "inherit",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAUhD,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,IAAqB,EACrB,SAAiB;IAEjB,gEAAgE;IAChE,wGAAwG;IACxG,IAAI,iBAAiB,EAAE,KAAK,KAAK,EAAE,CAAC;QAClC,MAAM,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,MAAM,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,IAAqB,EAAE,SAAiB;IAC3E,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC;QACvB,IAAI,EAAE,SAAS;KAChB,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;IACvB,MAAM,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAC7B,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;AACpB,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAqB,EAAE,SAAiB;IACvE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE;QACtC,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;QACnC,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;KACjB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE;QACtB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAiB,EAAE,EAAE;YACtC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6EAA6E,CAC9E,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC5B,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/compiler",
|
|
3
|
-
"version": "0.65.0-dev.
|
|
3
|
+
"version": "0.65.0-dev.23",
|
|
4
4
|
"description": "TypeSpec Compiler Preview",
|
|
5
5
|
"author": "Microsoft Corporation",
|
|
6
6
|
"license": "MIT",
|
|
@@ -71,6 +71,7 @@
|
|
|
71
71
|
],
|
|
72
72
|
"dependencies": {
|
|
73
73
|
"@babel/code-frame": "~7.26.2",
|
|
74
|
+
"@npmcli/arborist": "^9.0.0",
|
|
74
75
|
"ajv": "~8.17.1",
|
|
75
76
|
"change-case": "~5.4.4",
|
|
76
77
|
"globby": "~14.0.2",
|
|
@@ -89,6 +90,7 @@
|
|
|
89
90
|
"@types/babel__code-frame": "~7.0.6",
|
|
90
91
|
"@types/mustache": "~4.2.5",
|
|
91
92
|
"@types/node": "~22.10.10",
|
|
93
|
+
"@types/npmcli__arborist": "^6.3.0",
|
|
92
94
|
"@types/prompts": "~2.4.9",
|
|
93
95
|
"@types/semver": "^7.5.8",
|
|
94
96
|
"@types/yargs": "~17.0.33",
|