@overkill-dev/run 0.0.83 → 0.0.84
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/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-module-boundary.d.ts","sourceRoot":"","sources":["../../../../source/run/file-module-boundary.ts"],"names":[],"mappings":"AAOA,YAEY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,eAAa,
|
|
1
|
+
{"version":3,"file":"file-module-boundary.d.ts","sourceRoot":"","sources":["../../../../source/run/file-module-boundary.ts"],"names":[],"mappings":"AAOA,YAEY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,eAAa,SAkES,sBAAsB,CAAC,MAAM,EAC/C,QAAQ,EAAE,kBAAkB,GAAG,IAAI,EACnC,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC,CAmDjB"}
|
|
@@ -4,7 +4,7 @@ import { realpath } from 'node:fs/promises';
|
|
|
4
4
|
// eslint-disable-next-line node/no-unsupported-features/node-builtins -- Synchronous hooks are supported on the pinned Node version.
|
|
5
5
|
import { registerHooks } from 'node:module';
|
|
6
6
|
import { isAbsolute, relative, sep } from 'node:path';
|
|
7
|
-
import { fileURLToPath } from 'node:url';
|
|
7
|
+
import { fileURLToPath, pathToFileURL } from 'node:url';
|
|
8
8
|
import { z } from 'zod/v4';
|
|
9
9
|
import { invalidRequest } from "./run-errors.js";
|
|
10
10
|
export const fileModuleBoundarySchema = z
|
|
@@ -18,6 +18,35 @@ function containsPath(root, path) {
|
|
|
18
18
|
const origin = relative(root, path);
|
|
19
19
|
return origin !== '..' && !origin.startsWith(`..${sep}`) && !isAbsolute(origin);
|
|
20
20
|
}
|
|
21
|
+
function isRelativeFileSpecifier(specifier) {
|
|
22
|
+
return specifier.startsWith('./') || specifier.startsWith('../');
|
|
23
|
+
}
|
|
24
|
+
function explicitFileURL(specifier, parentURL) {
|
|
25
|
+
if (specifier.startsWith('file:')) {
|
|
26
|
+
return specifier;
|
|
27
|
+
}
|
|
28
|
+
if (isAbsolute(specifier)) {
|
|
29
|
+
return pathToFileURL(specifier).href;
|
|
30
|
+
}
|
|
31
|
+
if (isRelativeFileSpecifier(specifier) && parentURL?.startsWith('file:') === true) {
|
|
32
|
+
const requested = new URL(specifier, parentURL);
|
|
33
|
+
return requested.href;
|
|
34
|
+
}
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
function validateRequestedModule(specifier, parentURL) {
|
|
38
|
+
const currentRoots = activeModuleRoots.getStore();
|
|
39
|
+
const url = explicitFileURL(specifier, parentURL);
|
|
40
|
+
if (currentRoots === undefined || url === null) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const path = fileURLToPath(url);
|
|
44
|
+
if (currentRoots.requested.every(function containsModule(root) {
|
|
45
|
+
return !containsPath(root, path);
|
|
46
|
+
})) {
|
|
47
|
+
invalidRequest(`Module import escapes its boundary: ${path}`);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
21
50
|
export function validateFileModuleBoundary(boundary) {
|
|
22
51
|
if (![boundary.projectRoot, ...boundary.sharedRoots].every(isAbsolute)) {
|
|
23
52
|
invalidRequest('Module boundary requires absolute roots.');
|
|
@@ -40,7 +69,10 @@ export async function withFileModuleBoundary(boundary, operation) {
|
|
|
40
69
|
}))
|
|
41
70
|
]);
|
|
42
71
|
validateFileModuleBoundary({ projectRoot, sharedRoots });
|
|
43
|
-
return await activeModuleRoots.run(
|
|
72
|
+
return await activeModuleRoots.run({
|
|
73
|
+
requested: [boundary.projectRoot, ...boundary.sharedRoots, projectRoot, ...sharedRoots],
|
|
74
|
+
resolved: [projectRoot, ...sharedRoots]
|
|
75
|
+
}, async function runBoundedOperation() {
|
|
44
76
|
function validateModule(url) {
|
|
45
77
|
const currentRoots = activeModuleRoots.getStore();
|
|
46
78
|
if (currentRoots === undefined || !url.startsWith('file:')) {
|
|
@@ -48,7 +80,7 @@ export async function withFileModuleBoundary(boundary, operation) {
|
|
|
48
80
|
}
|
|
49
81
|
// eslint-disable-next-line node/no-sync -- Native synchronous hooks must reject symlink escapes before evaluation.
|
|
50
82
|
const path = realpathSync(fileURLToPath(url));
|
|
51
|
-
if (currentRoots.every(function containsModule(root) {
|
|
83
|
+
if (currentRoots.resolved.every(function containsModule(root) {
|
|
52
84
|
return !containsPath(root, path);
|
|
53
85
|
})) {
|
|
54
86
|
invalidRequest(`Module import escapes its boundary: ${path}`);
|
|
@@ -56,6 +88,7 @@ export async function withFileModuleBoundary(boundary, operation) {
|
|
|
56
88
|
}
|
|
57
89
|
const hooks = registerHooks({
|
|
58
90
|
resolve(specifier, context, nextResolve) {
|
|
91
|
+
validateRequestedModule(specifier, context.parentURL);
|
|
59
92
|
const resolved = nextResolve(specifier, context);
|
|
60
93
|
validateModule(resolved.url);
|
|
61
94
|
return resolved;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-module-boundary.js","sourceRoot":"","sources":["../../../../source/run/file-module-boundary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,qIAAqI;AACrI,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"file-module-boundary.js","sourceRoot":"","sources":["../../../../source/run/file-module-boundary.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"component": {
|
|
17
17
|
"type": "library",
|
|
18
18
|
"name": "@overkill-dev/run",
|
|
19
|
-
"version": "0.0.
|
|
20
|
-
"bom-ref": "pkg:npm/@overkill-dev/run@0.0.
|
|
21
|
-
"purl": "pkg:npm/@overkill-dev/run@0.0.
|
|
19
|
+
"version": "0.0.84",
|
|
20
|
+
"bom-ref": "pkg:npm/@overkill-dev/run@0.0.84",
|
|
21
|
+
"purl": "pkg:npm/@overkill-dev/run@0.0.84"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -278,7 +278,7 @@
|
|
|
278
278
|
"ref": "pkg:npm/@jridgewell/trace-mapping@0.3.31"
|
|
279
279
|
},
|
|
280
280
|
{
|
|
281
|
-
"ref": "pkg:npm/@overkill-dev/run@0.0.
|
|
281
|
+
"ref": "pkg:npm/@overkill-dev/run@0.0.84",
|
|
282
282
|
"dependsOn": [
|
|
283
283
|
"pkg:npm/@enormora/clock@0.0.3",
|
|
284
284
|
"pkg:npm/@jridgewell/trace-mapping@0.3.31",
|