@openrewrite/rewrite 8.72.7 → 8.72.8
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/javascript/format/prettier-config-loader.d.ts.map +1 -1
- package/dist/javascript/format/prettier-config-loader.js +1 -6
- package/dist/javascript/format/prettier-config-loader.js.map +1 -1
- package/dist/javascript/package-manager.d.ts.map +1 -1
- package/dist/javascript/package-manager.js +2 -13
- package/dist/javascript/package-manager.js.map +1 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +19 -14
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/project-parser.d.ts.map +1 -1
- package/dist/javascript/project-parser.js +3 -8
- package/dist/javascript/project-parser.js.map +1 -1
- package/dist/path-utils.d.ts.map +1 -1
- package/dist/path-utils.js +5 -16
- package/dist/path-utils.js.map +1 -1
- package/dist/rpc/request/install-recipes.d.ts.map +1 -1
- package/dist/rpc/request/install-recipes.js +2 -1
- package/dist/rpc/request/install-recipes.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +8 -5
- package/src/javascript/format/prettier-config-loader.ts +2 -1
- package/src/javascript/package-manager.ts +2 -0
- package/src/javascript/parser.ts +19 -14
- package/src/javascript/project-parser.ts +5 -2
- package/src/path-utils.ts +9 -4
- package/src/rpc/request/install-recipes.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-parser.d.ts","sourceRoot":"","sources":["../../src/javascript/project-parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"project-parser.d.ts","sourceRoot":"","sources":["../../src/javascript/project-parser.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAC,oBAAoB,EAAC,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,MAAM,EAAsB,MAAM,YAAY,CAAC;AAgBvD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC;;OAEG;IACH,GAAG,CAAC,EAAE,gBAAgB,CAAC;IAEvB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAEtB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAE3G;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC;IAE/C;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,kFAAkF;IAClF,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,wCAAwC;IACxC,SAAS,EAAE;QACP,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,IAAI,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;IACF,gFAAgF;IAChF,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,gEAAgE;IAChE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,sDAAsD;IACtD,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,kEAAkE;IAClE,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,UAQ9B,CAAC;AA4BF;;;;;;;;;;GAUG;AACH,qBAAa,aAAa;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAW;IACtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAmB;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAqC;IACjE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAoC;gBAEpD,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB;IAWnE;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAO3D;;;;OAIG;IACG,qBAAqB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBvE;;;OAGG;IACI,KAAK,IAAI,cAAc,CAAC,UAAU,CAAC;IAwL1C;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,eAAe,CAAC;IA+D/C;;OAEG;YACW,oBAAoB;IAoDlC;;OAEG;YACW,qBAAqB;IAsCnC;;OAEG;IACH,OAAO,CAAC,cAAc;IAuCtB;;OAEG;YACW,oBAAoB;IASlC;;OAEG;IACH,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACH,OAAO,CAAC,UAAU;IAalB;;OAEG;IACH,OAAO,CAAC,eAAe;IAgBvB;;OAEG;IACH,OAAO,CAAC,GAAG;CAKd"}
|
|
@@ -75,6 +75,7 @@ exports.ProjectParser = exports.DEFAULT_EXCLUSIONS = void 0;
|
|
|
75
75
|
const path = __importStar(require("path"));
|
|
76
76
|
const fs = __importStar(require("fs"));
|
|
77
77
|
const fsp = __importStar(require("fs/promises"));
|
|
78
|
+
const os = __importStar(require("os"));
|
|
78
79
|
const child_process_1 = require("child_process");
|
|
79
80
|
const picomatch_1 = __importDefault(require("picomatch"));
|
|
80
81
|
const mutative_1 = require("mutative");
|
|
@@ -535,10 +536,7 @@ class ProjectParser {
|
|
|
535
536
|
async discoverFilesWithGit() {
|
|
536
537
|
const files = [];
|
|
537
538
|
// Get tracked files
|
|
538
|
-
const tracked = (0, child_process_1.spawnSync)("git", ["ls-files"], {
|
|
539
|
-
cwd: this.projectPath,
|
|
540
|
-
encoding: "utf8"
|
|
541
|
-
});
|
|
539
|
+
const tracked = (0, child_process_1.spawnSync)("git", ["ls-files"], Object.assign({ cwd: this.projectPath, encoding: "utf8" }, (os.platform() === 'win32' ? { shell: true } : {})));
|
|
542
540
|
if (tracked.status !== 0 || tracked.error) {
|
|
543
541
|
// Fall back to walk if git fails
|
|
544
542
|
return this.discoverFilesWithWalk();
|
|
@@ -556,10 +554,7 @@ class ProjectParser {
|
|
|
556
554
|
}
|
|
557
555
|
}
|
|
558
556
|
// Get untracked but not ignored files
|
|
559
|
-
const untracked = (0, child_process_1.spawnSync)("git", ["ls-files", "--others", "--exclude-standard"], {
|
|
560
|
-
cwd: this.projectPath,
|
|
561
|
-
encoding: "utf8"
|
|
562
|
-
});
|
|
557
|
+
const untracked = (0, child_process_1.spawnSync)("git", ["ls-files", "--others", "--exclude-standard"], Object.assign({ cwd: this.projectPath, encoding: "utf8" }, (os.platform() === 'win32' ? { shell: true } : {})));
|
|
563
558
|
if (untracked.stdout) {
|
|
564
559
|
for (const line of untracked.stdout.split("\n")) {
|
|
565
560
|
const trimmed = line.trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-parser.js","sourceRoot":"","sources":["../../src/javascript/project-parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project-parser.js","sourceRoot":"","sources":["../../src/javascript/project-parser.ts"],"names":[],"mappings":"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"}
|
package/dist/path-utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-utils.d.ts","sourceRoot":"","sources":["../src/path-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"path-utils.d.ts","sourceRoot":"","sources":["../src/path-utils.ts"],"names":[],"mappings":"AAqBA;;GAEG;AACH,eAAO,MAAM,sBAAsB,aAYjC,CAAC;AAEH;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAUpE;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAOhD;AAED,MAAM,WAAW,eAAe;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAE1B;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,eAAoB,GAC9B,OAAO,CAAC,MAAM,EAAE,CAAC,CA8DnB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA8CxD"}
|
package/dist/path-utils.js
CHANGED
|
@@ -55,6 +55,7 @@ exports.getGitTrackedFiles = getGitTrackedFiles;
|
|
|
55
55
|
*/
|
|
56
56
|
const fs = __importStar(require("fs"));
|
|
57
57
|
const fsp = __importStar(require("fs/promises"));
|
|
58
|
+
const os = __importStar(require("os"));
|
|
58
59
|
const path = __importStar(require("path"));
|
|
59
60
|
const child_process_1 = require("child_process");
|
|
60
61
|
/**
|
|
@@ -79,10 +80,7 @@ exports.DEFAULT_DIR_EXCLUSIONS = new Set([
|
|
|
79
80
|
* Falls back to false if not in a git repository.
|
|
80
81
|
*/
|
|
81
82
|
function isGitIgnored(filePath, cwd) {
|
|
82
|
-
const result = (0, child_process_1.spawnSync)("git", ["check-ignore", "-q", filePath], {
|
|
83
|
-
cwd: cwd || path.dirname(filePath),
|
|
84
|
-
encoding: "utf8"
|
|
85
|
-
});
|
|
83
|
+
const result = (0, child_process_1.spawnSync)("git", ["check-ignore", "-q", filePath], Object.assign({ cwd: cwd || path.dirname(filePath), encoding: "utf8" }, (os.platform() === 'win32' ? { shell: true } : {})));
|
|
86
84
|
// Exit code 0 means the file IS ignored
|
|
87
85
|
// Exit code 1 means the file is NOT ignored
|
|
88
86
|
// Other exit codes indicate git errors (not a repo, etc.)
|
|
@@ -92,10 +90,7 @@ function isGitIgnored(filePath, cwd) {
|
|
|
92
90
|
* Checks if we're in a git repository.
|
|
93
91
|
*/
|
|
94
92
|
function isInGitRepo(dir) {
|
|
95
|
-
const result = (0, child_process_1.spawnSync)("git", ["rev-parse", "--git-dir"], {
|
|
96
|
-
cwd: dir,
|
|
97
|
-
encoding: "utf8"
|
|
98
|
-
});
|
|
93
|
+
const result = (0, child_process_1.spawnSync)("git", ["rev-parse", "--git-dir"], Object.assign({ cwd: dir, encoding: "utf8" }, (os.platform() === 'win32' ? { shell: true } : {})));
|
|
99
94
|
return result.status === 0;
|
|
100
95
|
}
|
|
101
96
|
/**
|
|
@@ -158,10 +153,7 @@ async function walkDirs(rootDir, options = {}) {
|
|
|
158
153
|
function getGitTrackedFiles(dir) {
|
|
159
154
|
const files = [];
|
|
160
155
|
// Get tracked files
|
|
161
|
-
const tracked = (0, child_process_1.spawnSync)("git", ["ls-files"], {
|
|
162
|
-
cwd: dir,
|
|
163
|
-
encoding: "utf8"
|
|
164
|
-
});
|
|
156
|
+
const tracked = (0, child_process_1.spawnSync)("git", ["ls-files"], Object.assign({ cwd: dir, encoding: "utf8" }, (os.platform() === 'win32' ? { shell: true } : {})));
|
|
165
157
|
if (tracked.status !== 0 || tracked.error) {
|
|
166
158
|
return [];
|
|
167
159
|
}
|
|
@@ -177,10 +169,7 @@ function getGitTrackedFiles(dir) {
|
|
|
177
169
|
}
|
|
178
170
|
}
|
|
179
171
|
// Get untracked but not ignored files
|
|
180
|
-
const untracked = (0, child_process_1.spawnSync)("git", ["ls-files", "--others", "--exclude-standard"], {
|
|
181
|
-
cwd: dir,
|
|
182
|
-
encoding: "utf8"
|
|
183
|
-
});
|
|
172
|
+
const untracked = (0, child_process_1.spawnSync)("git", ["ls-files", "--others", "--exclude-standard"], Object.assign({ cwd: dir, encoding: "utf8" }, (os.platform() === 'win32' ? { shell: true } : {})));
|
|
184
173
|
if (untracked.stdout) {
|
|
185
174
|
for (const line of untracked.stdout.split("\n")) {
|
|
186
175
|
const trimmed = line.trim();
|
package/dist/path-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-utils.js","sourceRoot":"","sources":["../src/path-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"path-utils.js","sourceRoot":"","sources":["../src/path-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-recipes.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"install-recipes.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAM3C,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAGpD,MAAM,WAAW,sBAAsB;IACnC,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB;AAqCD,qBAAa,cAAc;IAMX,OAAO,CAAC,QAAQ,CAAC,OAAO;IALpC;;;;OAIG;gBAC0B,OAAO,EAAE,MAAM,GAAG;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAGxF,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,EACrF,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CAsFhE"}
|
|
@@ -52,6 +52,7 @@ exports.InstallRecipes = void 0;
|
|
|
52
52
|
const rpc = __importStar(require("vscode-jsonrpc/node"));
|
|
53
53
|
const path = __importStar(require("path"));
|
|
54
54
|
const fs = __importStar(require("fs"));
|
|
55
|
+
const os = __importStar(require("os"));
|
|
55
56
|
const child_process_1 = require("child_process");
|
|
56
57
|
const metrics_1 = require("./metrics");
|
|
57
58
|
const shell_utils_1 = require("../../shell-utils");
|
|
@@ -59,7 +60,7 @@ const shell_utils_1 = require("../../shell-utils");
|
|
|
59
60
|
* Helper function to spawn npm/npx commands with logging and promise handling
|
|
60
61
|
*/
|
|
61
62
|
async function spawnNpmCommand(command, args, cwd, logger, logPrefix) {
|
|
62
|
-
const child = (0, child_process_1.spawn)((0, shell_utils_1.getPlatformCommand)(command), args, { cwd });
|
|
63
|
+
const child = (0, child_process_1.spawn)((0, shell_utils_1.getPlatformCommand)(command), args, Object.assign({ cwd }, (os.platform() === 'win32' ? { shell: true } : {})));
|
|
63
64
|
if (logger) {
|
|
64
65
|
const prefix = logPrefix ? `${logPrefix}: ` : '';
|
|
65
66
|
child.stdout.on("data", (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-recipes.js","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,2CAA6B;AAC7B,uCAAyB;AACzB,iDAAoC;AACpC,uCAAsC;AAEtC,mDAAqD;AAOrD;;GAEG;AACH,KAAK,UAAU,eAAe,CAC1B,OAAe,EACf,IAAc,EACd,GAAW,EACX,MAAmB,EACnB,SAAkB;IAElB,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,IAAA,gCAAkB,EAAC,OAAO,CAAC,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"install-recipes.js","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"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"}
|
package/dist/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.72.
|
|
1
|
+
8.72.8
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openrewrite/rewrite",
|
|
3
|
-
"version": "8.72.
|
|
3
|
+
"version": "8.72.8",
|
|
4
4
|
"license": "Moderne Source Available License",
|
|
5
5
|
"description": "OpenRewrite JavaScript.",
|
|
6
6
|
"homepage": "https://github.com/openrewrite/rewrite",
|
|
@@ -45,13 +45,15 @@
|
|
|
45
45
|
}
|
|
46
46
|
},
|
|
47
47
|
"scripts": {
|
|
48
|
-
"
|
|
49
|
-
"
|
|
48
|
+
"prebuild": "bun -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && bun -e \"require('fs').rmSync('tsconfig.build.tsbuildinfo',{force:true})\"",
|
|
49
|
+
"build": "tsc --build tsconfig.build.json",
|
|
50
|
+
"postbuild": "bun -e \"require('fs').chmodSync('dist/rpc/server.js', '+x')\" && npm link",
|
|
50
51
|
"typecheck": "tsc --noEmit -p tsconfig.test.json",
|
|
51
52
|
"dev": "tsc --watch -p tsconfig.json",
|
|
52
|
-
"test": "npm run typecheck && npm run build &&
|
|
53
|
+
"test": "npm run typecheck && npm run build && bun run testhelper",
|
|
54
|
+
"testhelper": "NODE_OPTIONS='--max-old-space-size=4096 --experimental-vm-modules' jest",
|
|
53
55
|
"build:fixtures": "tsc --build fixtures/tsconfig.json",
|
|
54
|
-
"ci:test": "
|
|
56
|
+
"ci:test": "bun run testhelper",
|
|
55
57
|
"start": "npm run build && node ./dist/rpc/server.js"
|
|
56
58
|
},
|
|
57
59
|
"dependencies": {
|
|
@@ -76,6 +78,7 @@
|
|
|
76
78
|
"@types/tmp": "^0.2.6",
|
|
77
79
|
"@types/semver": "^7.7.1",
|
|
78
80
|
"benchmark": "^2.1.4",
|
|
81
|
+
"bun": "^1.3.5",
|
|
79
82
|
"jest": "^29.7.0",
|
|
80
83
|
"jest-junit": "^16.0.0",
|
|
81
84
|
"prettier": "^3.7.4",
|
|
@@ -102,7 +102,8 @@ async function installPrettierToCache(version: string): Promise<void> {
|
|
|
102
102
|
cwd: cacheDir,
|
|
103
103
|
encoding: 'utf-8',
|
|
104
104
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
105
|
-
timeout: 120000 // 2 minutes
|
|
105
|
+
timeout: 120000, // 2 minutes
|
|
106
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
106
107
|
});
|
|
107
108
|
|
|
108
109
|
if (result.error) {
|
|
@@ -238,6 +238,7 @@ function runInstall(pm: PackageManager, options: InstallOptions): PackageManager
|
|
|
238
238
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
239
239
|
timeout: options.timeout ?? 120000,
|
|
240
240
|
env: options.env ? {...process.env, ...options.env} : process.env,
|
|
241
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
241
242
|
});
|
|
242
243
|
|
|
243
244
|
if (result.error) {
|
|
@@ -291,6 +292,7 @@ export function runList(pm: PackageManager, cwd: string, timeout: number = 30000
|
|
|
291
292
|
encoding: 'utf-8',
|
|
292
293
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
293
294
|
timeout,
|
|
295
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
294
296
|
});
|
|
295
297
|
|
|
296
298
|
if (result.error || result.status !== 0) {
|
package/src/javascript/parser.ts
CHANGED
|
@@ -194,9 +194,10 @@ export class JavaScriptParser extends Parser {
|
|
|
194
194
|
if (this.relativeTo && !path.isAbsolute(sourcePath)) {
|
|
195
195
|
sourcePath = path.join(this.relativeTo, sourcePath);
|
|
196
196
|
}
|
|
197
|
-
|
|
197
|
+
const normalizedSourcePath = path.normalize(sourcePath);
|
|
198
|
+
inputFiles.set(normalizedSourcePath, input);
|
|
198
199
|
// Remove from cache if previously cached
|
|
199
|
-
this.sourceFileCache && this.sourceFileCache.delete(
|
|
200
|
+
this.sourceFileCache && this.sourceFileCache.delete(normalizedSourcePath);
|
|
200
201
|
}
|
|
201
202
|
|
|
202
203
|
// Create a new CompilerHost within parseInputs
|
|
@@ -210,8 +211,9 @@ export class JavaScriptParser extends Parser {
|
|
|
210
211
|
|
|
211
212
|
// Override getSourceFile
|
|
212
213
|
host.getSourceFile = (fileName, languageVersion, onError) => {
|
|
214
|
+
const normalizedFileName = path.normalize(fileName);
|
|
213
215
|
// Check if the SourceFile is in the cache
|
|
214
|
-
let sourceFile = this.sourceFileCache && this.sourceFileCache.get(
|
|
216
|
+
let sourceFile = this.sourceFileCache && this.sourceFileCache.get(normalizedFileName);
|
|
215
217
|
if (sourceFile) {
|
|
216
218
|
return sourceFile;
|
|
217
219
|
}
|
|
@@ -220,17 +222,17 @@ export class JavaScriptParser extends Parser {
|
|
|
220
222
|
let sourceText: string | undefined;
|
|
221
223
|
|
|
222
224
|
// For input files
|
|
223
|
-
const input = inputFiles.get(
|
|
225
|
+
const input = inputFiles.get(normalizedFileName);
|
|
224
226
|
if (input) {
|
|
225
227
|
sourceText = parserInputRead(input);
|
|
226
228
|
} else {
|
|
227
229
|
// For dependency files
|
|
228
|
-
sourceText = ts.sys.readFile(
|
|
230
|
+
sourceText = ts.sys.readFile(normalizedFileName);
|
|
229
231
|
}
|
|
230
232
|
|
|
231
233
|
if (sourceText !== undefined) {
|
|
232
234
|
// Determine script kind based on file extension
|
|
233
|
-
const scriptKind = getScriptKindFromFileName(
|
|
235
|
+
const scriptKind = getScriptKindFromFileName(normalizedFileName);
|
|
234
236
|
|
|
235
237
|
// Build CreateSourceFileOptions with jsDocParsingMode
|
|
236
238
|
const sourceFileOptions: ts.CreateSourceFileOptions = typeof languageVersion === 'number'
|
|
@@ -243,27 +245,29 @@ export class JavaScriptParser extends Parser {
|
|
|
243
245
|
jsDocParsingMode: ts.JSDocParsingMode.ParseNone // We override this as otherwise invalid JSDoc causes parse errors
|
|
244
246
|
};
|
|
245
247
|
|
|
246
|
-
sourceFile = ts.createSourceFile(
|
|
248
|
+
sourceFile = ts.createSourceFile(normalizedFileName, sourceText, sourceFileOptions, true, scriptKind);
|
|
247
249
|
// Cache the SourceFile if it's a dependency
|
|
248
250
|
if (!input && this.sourceFileCache) {
|
|
249
|
-
this.sourceFileCache.set(
|
|
251
|
+
this.sourceFileCache.set(normalizedFileName, sourceFile);
|
|
250
252
|
}
|
|
251
253
|
return sourceFile;
|
|
252
254
|
}
|
|
253
255
|
|
|
254
|
-
if (onError) onError(`File not found: ${
|
|
256
|
+
if (onError) onError(`File not found: ${normalizedFileName}`);
|
|
255
257
|
return undefined;
|
|
256
258
|
};
|
|
257
259
|
|
|
258
260
|
// Override fileExists
|
|
259
261
|
host.fileExists = (fileName) => {
|
|
260
|
-
|
|
262
|
+
const normalizedFileName = path.normalize(fileName);
|
|
263
|
+
return inputFiles.has(normalizedFileName) || ts.sys.fileExists(normalizedFileName);
|
|
261
264
|
};
|
|
262
265
|
|
|
263
266
|
// Override readFile
|
|
264
267
|
host.readFile = (fileName) => {
|
|
265
|
-
const
|
|
266
|
-
|
|
268
|
+
const normalizedFileName = path.normalize(fileName);
|
|
269
|
+
const input = inputFiles.get(normalizedFileName);
|
|
270
|
+
return input ? parserInputRead(input) : ts.sys.readFile(normalizedFileName);
|
|
267
271
|
};
|
|
268
272
|
|
|
269
273
|
// Custom module resolution to handle in-memory imports
|
|
@@ -271,7 +275,8 @@ export class JavaScriptParser extends Parser {
|
|
|
271
275
|
// but our source files only exist in memory (in the inputFiles map)
|
|
272
276
|
host.resolveModuleNameLiterals = (moduleLiterals, containingFile) => {
|
|
273
277
|
const resolvedModules: ts.ResolvedModuleWithFailedLookupLocations[] = [];
|
|
274
|
-
const
|
|
278
|
+
const normalizedFileName = path.normalize(containingFile);
|
|
279
|
+
const containingDir = path.dirname(normalizedFileName);
|
|
275
280
|
|
|
276
281
|
for (const moduleLiteral of moduleLiterals) {
|
|
277
282
|
const moduleName = moduleLiteral.text;
|
|
@@ -311,7 +316,7 @@ export class JavaScriptParser extends Parser {
|
|
|
311
316
|
// Fall back to TypeScript's default resolution for node_modules and absolute paths
|
|
312
317
|
const result = ts.resolveModuleName(
|
|
313
318
|
moduleName,
|
|
314
|
-
|
|
319
|
+
normalizedFileName,
|
|
315
320
|
this.compilerOptions,
|
|
316
321
|
host
|
|
317
322
|
);
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
import * as path from "path";
|
|
17
17
|
import * as fs from "fs";
|
|
18
18
|
import * as fsp from "fs/promises";
|
|
19
|
+
import * as os from "os";
|
|
19
20
|
import {spawnSync} from "child_process";
|
|
20
21
|
import picomatch from "picomatch";
|
|
21
22
|
import {create as produce} from "mutative";
|
|
@@ -474,7 +475,8 @@ export class ProjectParser {
|
|
|
474
475
|
// Get tracked files
|
|
475
476
|
const tracked = spawnSync("git", ["ls-files"], {
|
|
476
477
|
cwd: this.projectPath,
|
|
477
|
-
encoding: "utf8"
|
|
478
|
+
encoding: "utf8",
|
|
479
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
478
480
|
});
|
|
479
481
|
|
|
480
482
|
if (tracked.status !== 0 || tracked.error) {
|
|
@@ -498,7 +500,8 @@ export class ProjectParser {
|
|
|
498
500
|
// Get untracked but not ignored files
|
|
499
501
|
const untracked = spawnSync("git", ["ls-files", "--others", "--exclude-standard"], {
|
|
500
502
|
cwd: this.projectPath,
|
|
501
|
-
encoding: "utf8"
|
|
503
|
+
encoding: "utf8",
|
|
504
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
502
505
|
});
|
|
503
506
|
|
|
504
507
|
if (untracked.stdout) {
|
package/src/path-utils.ts
CHANGED
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import * as fs from "fs";
|
|
17
17
|
import * as fsp from "fs/promises";
|
|
18
|
+
import * as os from "os";
|
|
18
19
|
import * as path from "path";
|
|
19
20
|
import {spawnSync} from "child_process";
|
|
20
21
|
|
|
@@ -43,7 +44,8 @@ export const DEFAULT_DIR_EXCLUSIONS = new Set([
|
|
|
43
44
|
export function isGitIgnored(filePath: string, cwd?: string): boolean {
|
|
44
45
|
const result = spawnSync("git", ["check-ignore", "-q", filePath], {
|
|
45
46
|
cwd: cwd || path.dirname(filePath),
|
|
46
|
-
encoding: "utf8"
|
|
47
|
+
encoding: "utf8",
|
|
48
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
47
49
|
});
|
|
48
50
|
// Exit code 0 means the file IS ignored
|
|
49
51
|
// Exit code 1 means the file is NOT ignored
|
|
@@ -57,7 +59,8 @@ export function isGitIgnored(filePath: string, cwd?: string): boolean {
|
|
|
57
59
|
export function isInGitRepo(dir: string): boolean {
|
|
58
60
|
const result = spawnSync("git", ["rev-parse", "--git-dir"], {
|
|
59
61
|
cwd: dir,
|
|
60
|
-
encoding: "utf8"
|
|
62
|
+
encoding: "utf8",
|
|
63
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
61
64
|
});
|
|
62
65
|
return result.status === 0;
|
|
63
66
|
}
|
|
@@ -167,7 +170,8 @@ export function getGitTrackedFiles(dir: string): string[] {
|
|
|
167
170
|
// Get tracked files
|
|
168
171
|
const tracked = spawnSync("git", ["ls-files"], {
|
|
169
172
|
cwd: dir,
|
|
170
|
-
encoding: "utf8"
|
|
173
|
+
encoding: "utf8",
|
|
174
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
171
175
|
});
|
|
172
176
|
|
|
173
177
|
if (tracked.status !== 0 || tracked.error) {
|
|
@@ -189,7 +193,8 @@ export function getGitTrackedFiles(dir: string): string[] {
|
|
|
189
193
|
// Get untracked but not ignored files
|
|
190
194
|
const untracked = spawnSync("git", ["ls-files", "--others", "--exclude-standard"], {
|
|
191
195
|
cwd: dir,
|
|
192
|
-
encoding: "utf8"
|
|
196
|
+
encoding: "utf8",
|
|
197
|
+
...(os.platform() === 'win32' ? { shell: true } : {})
|
|
193
198
|
});
|
|
194
199
|
|
|
195
200
|
if (untracked.stdout) {
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
import * as rpc from "vscode-jsonrpc/node";
|
|
17
17
|
import * as path from "path";
|
|
18
18
|
import * as fs from "fs";
|
|
19
|
+
import * as os from "os";
|
|
19
20
|
import {spawn} from "child_process";
|
|
20
21
|
import {withMetrics} from "./metrics";
|
|
21
22
|
import {RecipeMarketplace} from "../../marketplace";
|
|
@@ -36,7 +37,7 @@ async function spawnNpmCommand(
|
|
|
36
37
|
logger?: rpc.Logger,
|
|
37
38
|
logPrefix?: string
|
|
38
39
|
): Promise<void> {
|
|
39
|
-
const child = spawn(getPlatformCommand(command), args, {cwd});
|
|
40
|
+
const child = spawn(getPlatformCommand(command), args, {cwd, ...(os.platform() === 'win32' ? { shell: true } : {})});
|
|
40
41
|
|
|
41
42
|
if (logger) {
|
|
42
43
|
const prefix = logPrefix ? `${logPrefix}: ` : '';
|