@pnpm/catalogs.resolver 0.1.0 → 0.1.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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.matchCatalogResolveResult =
|
|
3
|
+
exports.matchCatalogResolveResult = matchCatalogResolveResult;
|
|
4
4
|
function matchCatalogResolveResult(result, matcher) {
|
|
5
5
|
switch (result.type) {
|
|
6
6
|
case 'found': return matcher.found(result);
|
|
@@ -8,5 +8,4 @@ function matchCatalogResolveResult(result, matcher) {
|
|
|
8
8
|
case 'unused': return matcher.unused(result);
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
exports.matchCatalogResolveResult = matchCatalogResolveResult;
|
|
12
11
|
//# sourceMappingURL=matchCatalogResolveResult.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchCatalogResolveResult.js","sourceRoot":"","sources":["../src/matchCatalogResolveResult.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"matchCatalogResolveResult.js","sourceRoot":"","sources":["../src/matchCatalogResolveResult.ts"],"names":[],"mappings":";;AAQA,8DASC;AATD,SAAgB,yBAAyB,CACvC,MAA+B,EAC/B,OAAgC;IAEhC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,OAAO,CAAC,CAAC,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAC1C,KAAK,kBAAkB,CAAC,CAAC,OAAO,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAChE,KAAK,QAAQ,CAAC,CAAC,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveFromCatalog =
|
|
3
|
+
exports.resolveFromCatalog = resolveFromCatalog;
|
|
4
4
|
const error_1 = require("@pnpm/error");
|
|
5
5
|
const catalogs_protocol_parser_1 = require("@pnpm/catalogs.protocol-parser");
|
|
6
6
|
function resolveFromCatalog(catalogs, wantedDependency) {
|
|
@@ -23,6 +23,32 @@ function resolveFromCatalog(catalogs, wantedDependency) {
|
|
|
23
23
|
error: new error_1.PnpmError('CATALOG_ENTRY_INVALID_RECURSIVE_DEFINITION', `Found invalid catalog entry using the catalog protocol recursively. The entry for '${wantedDependency.alias}' in catalog '${catalogName}' is invalid.`),
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
|
+
// Ban catalog entries that use the workspace protocol for a few reasons:
|
|
27
|
+
//
|
|
28
|
+
// 1. It's kind of silly. It'd be better to encourage users to use the
|
|
29
|
+
// workspace protocol directly.
|
|
30
|
+
// 2. Catalogs cache the resolved version of a dependency specifier in
|
|
31
|
+
// pnpm-lock.yaml for more consistent resolution across importers. The
|
|
32
|
+
// link: resolutions can't be shared between importers.
|
|
33
|
+
const protocolOfLookup = catalogLookup.split(':')[0];
|
|
34
|
+
if (protocolOfLookup === 'workspace') {
|
|
35
|
+
return {
|
|
36
|
+
type: 'misconfiguration',
|
|
37
|
+
catalogName,
|
|
38
|
+
error: new error_1.PnpmError('CATALOG_ENTRY_INVALID_WORKSPACE_SPEC', `The workspace protocol cannot be used as a catalog value. The entry for '${wantedDependency.alias}' in catalog '${catalogName}' is invalid.`),
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
// A future version of pnpm will try to support this. These protocols aren't
|
|
42
|
+
// supported today since these are often relative file paths that users expect
|
|
43
|
+
// to be relative to the repo root rather than the location of the pnpm
|
|
44
|
+
// workspace package.
|
|
45
|
+
if (['link', 'file'].includes(protocolOfLookup)) {
|
|
46
|
+
return {
|
|
47
|
+
type: 'misconfiguration',
|
|
48
|
+
catalogName,
|
|
49
|
+
error: new error_1.PnpmError('CATALOG_ENTRY_INVALID_SPEC', `The entry for '${wantedDependency.alias}' in catalog '${catalogName}' declares a dependency using the '${protocolOfLookup}' protocol. This is not yet supported, but may be in a future version of pnpm.`),
|
|
50
|
+
};
|
|
51
|
+
}
|
|
26
52
|
return {
|
|
27
53
|
type: 'found',
|
|
28
54
|
resolution: {
|
|
@@ -31,5 +57,4 @@ function resolveFromCatalog(catalogs, wantedDependency) {
|
|
|
31
57
|
},
|
|
32
58
|
};
|
|
33
59
|
}
|
|
34
|
-
exports.resolveFromCatalog = resolveFromCatalog;
|
|
35
60
|
//# sourceMappingURL=resolveFromCatalog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveFromCatalog.js","sourceRoot":"","sources":["../src/resolveFromCatalog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolveFromCatalog.js","sourceRoot":"","sources":["../src/resolveFromCatalog.ts"],"names":[],"mappings":";;AA2DA,gDAmEC;AA9HD,uCAAuC;AACvC,6EAAqE;AA0DrE,SAAgB,kBAAkB,CAAE,QAAkB,EAAE,gBAAkC;IACxF,MAAM,WAAW,GAAG,IAAA,+CAAoB,EAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAE/D,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;IACrE,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QAC1B,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,WAAW;YACX,KAAK,EAAE,IAAI,iBAAS,CAClB,kCAAkC,EAClC,qBAAqB,gBAAgB,CAAC,KAAK,4BAA4B,WAAW,IAAI,CAAC;SAC1F,CAAA;IACH,CAAC;IAED,IAAI,IAAA,+CAAoB,EAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;QAChD,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,WAAW;YACX,KAAK,EAAE,IAAI,iBAAS,CAClB,4CAA4C,EAC5C,sFAAsF,gBAAgB,CAAC,KAAK,iBAAiB,WAAW,eAAe,CAAC;SAC3J,CAAA;IACH,CAAC;IAED,yEAAyE;IACzE,EAAE;IACF,wEAAwE;IACxE,oCAAoC;IACpC,wEAAwE;IACxE,2EAA2E;IAC3E,4DAA4D;IAC5D,MAAM,gBAAgB,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IACpD,IAAI,gBAAgB,KAAK,WAAW,EAAE,CAAC;QACrC,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,WAAW;YACX,KAAK,EAAE,IAAI,iBAAS,CAClB,sCAAsC,EACtC,4EAA4E,gBAAgB,CAAC,KAAK,iBAAiB,WAAW,eAAe,CAAC;SACjJ,CAAA;IACH,CAAC;IAED,4EAA4E;IAC5E,8EAA8E;IAC9E,uEAAuE;IACvE,qBAAqB;IACrB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAChD,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,WAAW;YACX,KAAK,EAAE,IAAI,iBAAS,CAClB,4BAA4B,EAC5B,kBAAkB,gBAAgB,CAAC,KAAK,iBAAiB,WAAW,sCAAsC,gBAAgB,gFAAgF,CAAC;SAC9M,CAAA;IACH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,OAAO;QACb,UAAU,EAAE;YACV,WAAW;YACX,SAAS,EAAE,aAAa;SACzB;KACF,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/catalogs.resolver",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.1",
|
|
4
4
|
"description": "Dereferences catalog protocol specifiers into usable specifiers.",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@pnpm/catalogs.protocol-parser": "^0.1.0",
|
|
31
|
-
"@pnpm/error": "^6.0.
|
|
31
|
+
"@pnpm/error": "^6.0.2"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@pnpm/catalogs.resolver": "0.1.
|
|
34
|
+
"@pnpm/catalogs.resolver": "0.1.1",
|
|
35
35
|
"@pnpm/catalogs.types": "0.1.0"
|
|
36
36
|
},
|
|
37
37
|
"scripts": {
|