@jsonic/multisource 2.2.2 → 2.3.1
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/file.js +9 -2
- package/dist/resolver/file.js.map +1 -1
- package/package.json +1 -1
- package/src/resolver/file.ts +17 -4
package/dist/resolver/file.js
CHANGED
|
@@ -52,8 +52,15 @@ function makeFileResolver(pathfinder) {
|
|
|
52
52
|
ps.full = path_1.default.resolve(ps.full);
|
|
53
53
|
search.push(ps.full);
|
|
54
54
|
src = load(ps.full, fs);
|
|
55
|
-
if (null == src
|
|
56
|
-
|
|
55
|
+
if (null == src) {
|
|
56
|
+
const potentials = [];
|
|
57
|
+
// Special case: support npm linked references
|
|
58
|
+
if (null != ps.base && null != ps.path) {
|
|
59
|
+
potentials.push(path_1.default.resolve(ps.base, 'node_modules', ps.path), path_1.default.resolve(path_1.default.dirname(ps.base), 'node_modules', ps.path));
|
|
60
|
+
}
|
|
61
|
+
if (multisource_1.NONE === ps.kind) {
|
|
62
|
+
potentials.push(...(0, mem_1.buildPotentials)(ps, popts, (...s) => path_1.default.resolve(s.reduce((a, p) => path_1.default.join(a, p)))));
|
|
63
|
+
}
|
|
57
64
|
search.push(...potentials);
|
|
58
65
|
for (let path of potentials) {
|
|
59
66
|
if (null != (src = load(path, fs))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/resolver/file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/resolver/file.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/resolver/file.ts
CHANGED
|
@@ -46,10 +46,23 @@ function makeFileResolver(pathfinder?: PathFinder): Resolver {
|
|
|
46
46
|
search.push(ps.full)
|
|
47
47
|
src = load(ps.full, fs)
|
|
48
48
|
|
|
49
|
-
if (null == src
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
if (null == src) {
|
|
50
|
+
const potentials: string[] = []
|
|
51
|
+
|
|
52
|
+
// Special case: support npm linked references
|
|
53
|
+
if (null != ps.base && null != ps.path) {
|
|
54
|
+
potentials.push(
|
|
55
|
+
Path.resolve(ps.base, 'node_modules', ps.path),
|
|
56
|
+
Path.resolve(Path.dirname(ps.base), 'node_modules', ps.path)
|
|
57
|
+
)
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
if (NONE === ps.kind) {
|
|
61
|
+
potentials.push(...
|
|
62
|
+
buildPotentials(ps, popts, (...s) =>
|
|
63
|
+
Path.resolve(s.reduce((a, p) => Path.join(a, p)))))
|
|
64
|
+
}
|
|
65
|
+
|
|
53
66
|
search.push(...potentials)
|
|
54
67
|
|
|
55
68
|
for (let path of potentials) {
|