@jsonic/multisource 1.7.1 → 1.8.0
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/resolver/pkg.js +14 -4
- package/dist/resolver/pkg.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/resolver/pkg.ts +17 -4
package/dist/resolver/pkg.js
CHANGED
|
@@ -39,9 +39,18 @@ function makePkgResolver(options) {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
catch (me) {
|
|
42
|
-
search.push(
|
|
43
|
-
|
|
42
|
+
search.push(ps.path);
|
|
43
|
+
// search.push(...(requireOptions?.paths || (useRequire.resolve.paths(ps.path)
|
|
44
|
+
// .map((p: string) => Path.join(p, (ps.path as string))))))
|
|
44
45
|
let potentials = [];
|
|
46
|
+
let localpath = path_1.default.join(process.cwd(), 'NIL');
|
|
47
|
+
let localpaths = [];
|
|
48
|
+
let localparts;
|
|
49
|
+
do {
|
|
50
|
+
localparts = path_1.default.parse(localpath);
|
|
51
|
+
localpath = localparts.dir;
|
|
52
|
+
localpaths.push(path_1.default.join(localpath, 'node_modules', ps.path));
|
|
53
|
+
} while (localparts.root !== localparts.dir);
|
|
45
54
|
if (null != ps.path && 'string' === typeof ps.path) {
|
|
46
55
|
const pspath = ps.path;
|
|
47
56
|
// Add the main paths of the current require
|
|
@@ -64,8 +73,9 @@ function makePkgResolver(options) {
|
|
|
64
73
|
}
|
|
65
74
|
}
|
|
66
75
|
catch (me) {
|
|
67
|
-
search.push(
|
|
68
|
-
|
|
76
|
+
search.push(path);
|
|
77
|
+
// search.push(...(requireOptions?.paths || (useRequire.resolve.paths(path)
|
|
78
|
+
// .map((p: string) => Path.join(p, (path as string))))))
|
|
69
79
|
}
|
|
70
80
|
}
|
|
71
81
|
}
|
package/dist/resolver/pkg.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pkg.js","sourceRoot":"","sources":["../../src/resolver/pkg.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"pkg.js","sourceRoot":"","sources":["../../src/resolver/pkg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/multisource.ts","../src/processor/js.ts","../src/processor/jsonic.ts","../src/resolver/file.ts","../src/resolver/mem.ts","../src/resolver/pkg.ts"],"version":"5.
|
|
1
|
+
{"root":["../src/multisource.ts","../src/processor/js.ts","../src/processor/jsonic.ts","../src/resolver/file.ts","../src/resolver/mem.ts","../src/resolver/pkg.ts"],"version":"5.7.2"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jsonic/multisource",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.8.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/multisource.js",
|
|
6
6
|
"type": "commonjs",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@hapi/code": "^9.0.3",
|
|
51
51
|
"@jsonic/doc": "^0.0.9",
|
|
52
|
-
"@types/node": "^22.9.
|
|
52
|
+
"@types/node": "^22.9.3",
|
|
53
53
|
"jsonic-multisource-pkg-test": "^0.0.1",
|
|
54
|
-
"typescript": "^5.
|
|
54
|
+
"typescript": "^5.7.2"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
57
|
"@jsonic/path": ">=1.0.0",
|
package/src/resolver/pkg.ts
CHANGED
|
@@ -58,11 +58,23 @@ function makePkgResolver(options: any): Resolver {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
catch (me: any) {
|
|
61
|
-
search.push(
|
|
62
|
-
|
|
61
|
+
search.push(ps.path)
|
|
62
|
+
// search.push(...(requireOptions?.paths || (useRequire.resolve.paths(ps.path)
|
|
63
|
+
// .map((p: string) => Path.join(p, (ps.path as string))))))
|
|
63
64
|
|
|
64
65
|
let potentials = []
|
|
65
66
|
|
|
67
|
+
let localpath = Path.join(process.cwd(), 'NIL')
|
|
68
|
+
let localpaths = []
|
|
69
|
+
let localparts
|
|
70
|
+
do {
|
|
71
|
+
localparts = Path.parse(localpath)
|
|
72
|
+
localpath = localparts.dir
|
|
73
|
+
localpaths.push(Path.join(localpath, 'node_modules', ps.path))
|
|
74
|
+
}
|
|
75
|
+
while (localparts.root !== localparts.dir)
|
|
76
|
+
|
|
77
|
+
|
|
66
78
|
if (null != ps.path && 'string' === typeof ps.path) {
|
|
67
79
|
const pspath = ps.path
|
|
68
80
|
|
|
@@ -94,8 +106,9 @@ function makePkgResolver(options: any): Resolver {
|
|
|
94
106
|
}
|
|
95
107
|
}
|
|
96
108
|
catch (me: any) {
|
|
97
|
-
search.push(
|
|
98
|
-
|
|
109
|
+
search.push(path)
|
|
110
|
+
// search.push(...(requireOptions?.paths || (useRequire.resolve.paths(path)
|
|
111
|
+
// .map((p: string) => Path.join(p, (path as string))))))
|
|
99
112
|
}
|
|
100
113
|
}
|
|
101
114
|
}
|