snyk-nodejs-lockfile-parser 1.58.10 → 1.58.12
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/dep-graph-builders/pnpm/build-dep-graph-pnpm.js +1 -1
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/index.d.ts +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/index.js +6 -0
- package/dist/dep-graph-builders/pnpm/lockfile-parser/index.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.d.ts +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js +11 -8
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js +7 -0
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.js +2 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/parse-project.d.ts +1 -1
- package/dist/dep-graph-builders/pnpm/parse-project.js.map +1 -1
- package/package.json +1 -1
|
@@ -17,7 +17,7 @@ const buildDepGraphPnpm = async (lockFileParser, pkgJson, options, importer) =>
|
|
|
17
17
|
lockFileParser.extractedPackages = lockFileParser.extractPackages();
|
|
18
18
|
const extractedPnpmPkgs = lockFileParser.extractedPackages;
|
|
19
19
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, options);
|
|
20
|
-
const extractedTopLevelDeps = lockFileParser.extractTopLevelDependencies(options,
|
|
20
|
+
const extractedTopLevelDeps = lockFileParser.extractTopLevelDependencies(options, importer) || {};
|
|
21
21
|
for (const name of Object.keys(topLevelDeps)) {
|
|
22
22
|
if (!extractedTopLevelDeps[name]) {
|
|
23
23
|
const errMessage = `Dependency ${name} was not found in ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-dep-graph-pnpm.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/build-dep-graph-pnpm.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAA0C;AAG1C,mCAA2C;AAC3C,2DAAsD;AAGtD,mFAAyE;AACzE,sEAGwC;AACxC,6BAAqC;AACrC,qCAAqC;AAErC,MAAM,KAAK,GAAG,WAAW,CAAC,sBAAsB,CAAC,CAAC;AAE3C,MAAM,iBAAiB,GAAG,KAAK,EACpC,cAAkC,EAClC,OAAwB,EACxB,OAAgC,EAChC,QAAiB,EACjB,EAAE;;IACF,MAAM,EACJ,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,uBAAuB,GACxB,GAAG,OAAO,CAAC;IAEZ,MAAM,eAAe,GAAG,IAAI,2BAAe,CACzC,EAAE,IAAI,EAAE,MAAM,EAAE,EAChB,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CACjD,CAAC;IAEF,cAAc,CAAC,iBAAiB,GAAG,cAAc,CAAC,eAAe,EAAE,CAAC;IAEpE,MAAM,iBAAiB,GACrB,cAAc,CAAC,iBAAiB,CAAC;IAEnC,MAAM,YAAY,GAAG,IAAA,sBAAe,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEvD,MAAM,qBAAqB,GACzB,cAAc,CAAC,2BAA2B,
|
|
1
|
+
{"version":3,"file":"build-dep-graph-pnpm.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/build-dep-graph-pnpm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { PnpmLockfileParser } from './lockfile-parser';
|
|
2
2
|
import { PnpmWorkspaceArgs } from '../../types';
|
|
3
3
|
import { NodeLockfileVersion } from '../../../utils';
|
|
4
|
-
export declare function getPnpmLockfileParser(pnpmLockContent: string, lockfileVersion?: NodeLockfileVersion, workspaceArgs?: PnpmWorkspaceArgs): PnpmLockfileParser;
|
|
4
|
+
export declare function getPnpmLockfileParser(pnpmLockContent: string | undefined, lockfileVersion?: NodeLockfileVersion, workspaceArgs?: PnpmWorkspaceArgs): PnpmLockfileParser;
|
|
@@ -8,6 +8,12 @@ const lockfile_v9_1 = require("./lockfile-v9");
|
|
|
8
8
|
const error_catalog_nodejs_public_1 = require("@snyk/error-catalog-nodejs-public");
|
|
9
9
|
const utils_1 = require("../../../utils");
|
|
10
10
|
function getPnpmLockfileParser(pnpmLockContent, lockfileVersion, workspaceArgs) {
|
|
11
|
+
// In case of no dependencies, pnpm@7 (lokfile version 5)
|
|
12
|
+
// does not create a lockfile at `pnpm install`
|
|
13
|
+
// so if there is no lockfile content, default to lockfile version 5
|
|
14
|
+
if (!pnpmLockContent) {
|
|
15
|
+
return new lockfile_v5_1.LockfileV5Parser(pnpmLockContent, workspaceArgs);
|
|
16
|
+
}
|
|
11
17
|
const rawPnpmLock = (0, js_yaml_1.load)(pnpmLockContent, {
|
|
12
18
|
json: true,
|
|
13
19
|
schema: js_yaml_1.FAILSAFE_SCHEMA,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/index.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAEhD,+CAAiD;AACjD,+CAAiD;AACjD,+CAAiD;AAEjD,mFAAyE;AACzE,0CAAqD;AAErD,SAAgB,qBAAqB,CACnC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/index.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAEhD,+CAAiD;AACjD,+CAAiD;AACjD,+CAAiD;AAEjD,mFAAyE;AACzE,0CAAqD;AAErD,SAAgB,qBAAqB,CACnC,eAAmC,EACnC,eAAqC,EACrC,aAAiC;IAEjC,yDAAyD;IACzD,+CAA+C;IAC/C,oEAAoE;IACpE,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,IAAI,8BAAgB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;KAC7D;IACD,MAAM,WAAW,GAAG,IAAA,cAAI,EAAC,eAAe,EAAE;QACxC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,yBAAe;KACxB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,WAAW,CAAC,eAAe,CAAC;IAE5C,IACE,eAAe,KAAK,2BAAmB,CAAC,UAAU;QAClD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EACvB;QACA,OAAO,IAAI,8BAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;KACzD;IAED,IACE,eAAe,KAAK,2BAAmB,CAAC,UAAU;QAClD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EACvB;QACA,OAAO,IAAI,8BAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;KACzD;IAED,IACE,eAAe,KAAK,2BAAmB,CAAC,UAAU;QAClD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EACvB;QACA,OAAO,IAAI,8BAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;KACzD;IAED,MAAM,IAAI,kDAAoB,CAAC,mCAAmC,CAChE,uCAAuC,eAAe,mBAAmB,CAC1E,CAAC;AACJ,CAAC;AAzCD,sDAyCC"}
|
|
@@ -15,7 +15,7 @@ export declare abstract class PnpmLockfileParser {
|
|
|
15
15
|
includeDevDeps: boolean;
|
|
16
16
|
includeOptionalDeps?: boolean;
|
|
17
17
|
includePeerDeps?: boolean;
|
|
18
|
-
},
|
|
18
|
+
}, importer?: string): PnpmDeps;
|
|
19
19
|
normalizedPkgToTopLevel(pkg: NormalisedPnpmPkg): PnpmDeps;
|
|
20
20
|
topLevelDepsToNormalizedPkgs(deps: PnpmDeps): Record<string, string>;
|
|
21
21
|
normalizeVersion(name: string, version: string, isDev: boolean, importerName?: string): string;
|
|
@@ -47,15 +47,17 @@ class PnpmLockfileParser {
|
|
|
47
47
|
});
|
|
48
48
|
return packages;
|
|
49
49
|
}
|
|
50
|
-
extractTopLevelDependencies(options,
|
|
50
|
+
extractTopLevelDependencies(options, importer) {
|
|
51
|
+
var _a, _b;
|
|
51
52
|
let root = this.rawPnpmLock;
|
|
52
53
|
if (importer) {
|
|
54
|
+
const { name, version } = (_a = this.workspaceArgs) === null || _a === void 0 ? void 0 : _a.projectsVersionMap[importer];
|
|
53
55
|
if (
|
|
54
56
|
// Return early because dependencies were already normalized for this importer
|
|
55
57
|
// as part of another's importer dependency and stored in extractedPackages
|
|
56
|
-
this.extractedPackages[`${
|
|
57
|
-
!(0, lodash_1.isEmpty)(this.extractedPackages[`${
|
|
58
|
-
return this.normalizedPkgToTopLevel(this.extractedPackages[`${
|
|
58
|
+
this.extractedPackages[`${name}@${version}`] &&
|
|
59
|
+
!(0, lodash_1.isEmpty)(this.extractedPackages[`${name}@${version}`].dependencies)) {
|
|
60
|
+
return this.normalizedPkgToTopLevel(this.extractedPackages[`${name}@${version}`]);
|
|
59
61
|
}
|
|
60
62
|
root = this.rawPnpmLock.importers[importer];
|
|
61
63
|
}
|
|
@@ -70,10 +72,11 @@ class PnpmLockfileParser {
|
|
|
70
72
|
? this.normalizeTopLevelDeps(root.peerDependencies || {}, false, importer)
|
|
71
73
|
: {};
|
|
72
74
|
if (importer) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
const { name, version } = (_b = this.workspaceArgs) === null || _b === void 0 ? void 0 : _b.projectsVersionMap[importer];
|
|
76
|
+
this.extractedPackages[`${name}@${version}`] = {
|
|
77
|
+
id: `${name}@${version}`,
|
|
78
|
+
name: version,
|
|
79
|
+
version: version,
|
|
77
80
|
dependencies: this.topLevelDepsToNormalizedPkgs(prodDeps),
|
|
78
81
|
devDependencies: this.topLevelDepsToNormalizedPkgs(devDeps),
|
|
79
82
|
optionalDependencies: this.topLevelDepsToNormalizedPkgs(optionalDeps),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-parser.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.ts"],"names":[],"mappings":";;;AAUA,mCAA+B;AAC/B,iCAAiC;AACjC,mCAAiC;AACjC,qCAAqC;AAErC,MAAM,KAAK,GAAG,WAAW,CAAC,sBAAsB,CAAC,CAAC;AAElD,MAAsB,kBAAkB;IAStC,YAAmB,WAAgB,EAAE,aAAiC;QACpE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;QACnD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACxD,CAAC;IAEM,mBAAmB;;QACxB,OAAO,MAAA,IAAI,CAAC,aAAa,0CAAE,WAAW,CAAC;IACzC,CAAC;IAEM,eAAe;QACpB,uDAAuD;QACvD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAClD,OAAO,IAAI,CAAC,iBAAiB,CAAC;SAC/B;QACD,MAAM,QAAQ,GAAuB,EAAE,CAAC;QACxC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CACnC,CAAC,CAAC,OAAO,EAAE,WAAW,CAAgB,EAAE,EAAE;YACxC,uIAAuI;YACvI,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YACtC,IAAI,UAAU,GAAkB,EAAE,CAAC;YACnC,IAAI,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE;gBACtB,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;aACzC;YAED,MAAM,GAAG,GAAsB;gBAC7B,EAAE,EAAE,OAAO;gBACX,IAAI,EAAE,IAAI,IAAI,UAAU,CAAC,IAAI;gBAC7B,OAAO,EAAE,OAAO,IAAI,UAAU,CAAC,OAAO,IAAI,OAAO;gBACjD,KAAK,EAAE,WAAW,CAAC,GAAG,IAAI,MAAM;gBAChC,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;gBAC5C,eAAe,EAAE,WAAW,CAAC,eAAe,IAAI,EAAE;gBAClD,oBAAoB,EAAE,WAAW,CAAC,oBAAoB,IAAI,EAAE;aAC7D,CAAC;YACF,QAAQ,CAAC,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,GAAG,CAAC;YAC7C,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChE,CAAC,CACF,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,2BAA2B,CAChC,OAIC,EACD,
|
|
1
|
+
{"version":3,"file":"lockfile-parser.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,13 @@ const dependency_path_1 = require("dependency-path");
|
|
|
5
5
|
const lockfile_parser_1 = require("./lockfile-parser");
|
|
6
6
|
class LockfileV5Parser extends lockfile_parser_1.PnpmLockfileParser {
|
|
7
7
|
constructor(rawPnpmLock, workspaceArgs) {
|
|
8
|
+
// In case of no dependencies, pnpm@7 (lokfile version 5)
|
|
9
|
+
// does not create a lockfile at `pnpm install`
|
|
10
|
+
if (!rawPnpmLock) {
|
|
11
|
+
rawPnpmLock = {
|
|
12
|
+
lockfileVersion: '5',
|
|
13
|
+
};
|
|
14
|
+
}
|
|
8
15
|
super(rawPnpmLock, workspaceArgs);
|
|
9
16
|
}
|
|
10
17
|
parseDepPath(depPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-v5.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lockfile-v5.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,8 @@ class LockfileV9Parser extends lockfile_v6_1.LockfileV6Parser {
|
|
|
11
11
|
super(rawPnpmLock, workspaceArgs);
|
|
12
12
|
this.settings = rawPnpmLock.settings;
|
|
13
13
|
this.packages = {};
|
|
14
|
-
|
|
14
|
+
this.snapshots = rawPnpmLock.snapshots || {};
|
|
15
|
+
Object.entries(this.snapshots).forEach(([depPath, versionData]) => {
|
|
15
16
|
const normalizedDepPath = this.excludeTransPeerDepsVersions(depPath);
|
|
16
17
|
this.packages[normalizedDepPath] = Object.assign(Object.assign({}, rawPnpmLock.packages[normalizedDepPath]), versionData);
|
|
17
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-v9.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.ts"],"names":[],"mappings":";;;AACA,+CAAiD;AAEjD,MAAM,sBAAsB,GAAsB;IAChD,WAAW,EAAE,IAAI;IACjB,kBAAkB,EAAE,EAAE;CACvB,CAAC;AACF,MAAa,gBAAiB,SAAQ,8BAAgB;IAIpD,YACE,WAAgB,EAChB,gBAAmC,sBAAsB;QAEzD,KAAK,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,MAAM,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"lockfile-v9.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.ts"],"names":[],"mappings":";;;AACA,+CAAiD;AAEjD,MAAM,sBAAsB,GAAsB;IAChD,WAAW,EAAE,IAAI;IACjB,kBAAkB,EAAE,EAAE;CACvB,CAAC;AACF,MAAa,gBAAiB,SAAQ,8BAAgB;IAIpD,YACE,WAAgB,EAChB,gBAAmC,sBAAsB;QAEzD,KAAK,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CACpC,CAAC,CAAC,OAAO,EAAE,WAAW,CAAgB,EAAE,EAAE;YACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;YACrE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,mCAC3B,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GACvC,WAAW,CACf,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;CACF;AAtBD,4CAsBC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { PnpmProjectParseOptions } from '../types';
|
|
2
2
|
import { DepGraph } from '@snyk/dep-graph';
|
|
3
3
|
import { NodeLockfileVersion } from '../../utils';
|
|
4
|
-
export declare const parsePnpmProject: (pkgJsonContent: string, pnpmLockContent: string, options: PnpmProjectParseOptions, lockfileVersion?: NodeLockfileVersion) => Promise<DepGraph>;
|
|
4
|
+
export declare const parsePnpmProject: (pkgJsonContent: string, pnpmLockContent: string | undefined, options: PnpmProjectParseOptions, lockfileVersion?: NodeLockfileVersion) => Promise<DepGraph>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-project.ts"],"names":[],"mappings":";;;AAAA,kCAAuC;AAEvC,iEAA2D;AAE3D,mDAAgE;AAGzD,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-project.ts"],"names":[],"mappings":";;;AAAA,kCAAuC;AAEvC,iEAA2D;AAE3D,mDAAgE;AAGzD,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAAsB,EACtB,eAAmC,EACnC,OAAgC,EAChC,eAAqC,EAClB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,GACxB,GAAG,OAAO,CAAC;IACZ,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,IAAA,6BAAqB,EAC1C,eAAe,EACf,eAAe,CAChB,CAAC;IAEF,mDAAmD;IACnD,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAClD,QAAQ,GAAG,GAAG,CAAC;QACf,cAAc,CAAC,aAAa,GAAG;YAC7B,kBAAkB,EAAE;gBAClB,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;aACtD;YACD,WAAW,EAAE,IAAI;SAClB,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAiB,EACtC,cAAc,EACd,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,eAAe;QACf,mBAAmB;QACnB,uBAAuB;KACxB,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA/CW,QAAA,gBAAgB,oBA+C3B"}
|
package/package.json
CHANGED