@pnpm/lockfile.fs 1000.0.0 → 1001.1.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/lib/gitMergeFile.d.ts +2 -2
- package/lib/index.d.ts +2 -1
- package/lib/index.js +4 -1
- package/lib/index.js.map +1 -1
- package/lib/lockfileFormatConverters.d.ts +3 -7
- package/lib/lockfileFormatConverters.js +30 -178
- package/lib/lockfileFormatConverters.js.map +1 -1
- package/lib/read.d.ts +5 -5
- package/lib/read.js.map +1 -1
- package/lib/sortLockfileKeys.d.ts +2 -2
- package/lib/sortLockfileKeys.js +1 -5
- package/lib/sortLockfileKeys.js.map +1 -1
- package/lib/write.d.ts +7 -6
- package/lib/write.js +8 -9
- package/lib/write.js.map +1 -1
- package/package.json +8 -9
package/lib/gitMergeFile.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export declare function autofixMergeConflicts(fileContent: string):
|
|
1
|
+
import { type LockfileObject } from '@pnpm/lockfile.types';
|
|
2
|
+
export declare function autofixMergeConflicts(fileContent: string): LockfileObject;
|
|
3
3
|
export declare function isDiff(fileContent: string): boolean;
|
package/lib/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export { isEmptyLockfile, writeLockfiles, writeCurrentLockfile, writeWantedLockfile, } from './write';
|
|
1
|
+
export { isEmptyLockfile, writeLockfiles, writeCurrentLockfile, writeWantedLockfile, writeLockfileFile, } from './write';
|
|
2
2
|
export { existsNonEmptyWantedLockfile } from './existsWantedLockfile';
|
|
3
3
|
export { getLockfileImporterId } from './getLockfileImporterId';
|
|
4
4
|
export * from '@pnpm/lockfile.types';
|
|
5
5
|
export * from './read';
|
|
6
6
|
export { cleanGitBranchLockfiles } from './gitBranchLockfile';
|
|
7
|
+
export { convertToLockfileFile } from './lockfileFormatConverters';
|
package/lib/index.js
CHANGED
|
@@ -14,12 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.cleanGitBranchLockfiles = exports.getLockfileImporterId = exports.existsNonEmptyWantedLockfile = exports.writeWantedLockfile = exports.writeCurrentLockfile = exports.writeLockfiles = exports.isEmptyLockfile = void 0;
|
|
17
|
+
exports.convertToLockfileFile = exports.cleanGitBranchLockfiles = exports.getLockfileImporterId = exports.existsNonEmptyWantedLockfile = exports.writeLockfileFile = exports.writeWantedLockfile = exports.writeCurrentLockfile = exports.writeLockfiles = exports.isEmptyLockfile = void 0;
|
|
18
18
|
var write_1 = require("./write");
|
|
19
19
|
Object.defineProperty(exports, "isEmptyLockfile", { enumerable: true, get: function () { return write_1.isEmptyLockfile; } });
|
|
20
20
|
Object.defineProperty(exports, "writeLockfiles", { enumerable: true, get: function () { return write_1.writeLockfiles; } });
|
|
21
21
|
Object.defineProperty(exports, "writeCurrentLockfile", { enumerable: true, get: function () { return write_1.writeCurrentLockfile; } });
|
|
22
22
|
Object.defineProperty(exports, "writeWantedLockfile", { enumerable: true, get: function () { return write_1.writeWantedLockfile; } });
|
|
23
|
+
Object.defineProperty(exports, "writeLockfileFile", { enumerable: true, get: function () { return write_1.writeLockfileFile; } });
|
|
23
24
|
var existsWantedLockfile_1 = require("./existsWantedLockfile");
|
|
24
25
|
Object.defineProperty(exports, "existsNonEmptyWantedLockfile", { enumerable: true, get: function () { return existsWantedLockfile_1.existsNonEmptyWantedLockfile; } });
|
|
25
26
|
var getLockfileImporterId_1 = require("./getLockfileImporterId");
|
|
@@ -28,4 +29,6 @@ __exportStar(require("@pnpm/lockfile.types"), exports);
|
|
|
28
29
|
__exportStar(require("./read"), exports);
|
|
29
30
|
var gitBranchLockfile_1 = require("./gitBranchLockfile");
|
|
30
31
|
Object.defineProperty(exports, "cleanGitBranchLockfiles", { enumerable: true, get: function () { return gitBranchLockfile_1.cleanGitBranchLockfiles; } });
|
|
32
|
+
var lockfileFormatConverters_1 = require("./lockfileFormatConverters");
|
|
33
|
+
Object.defineProperty(exports, "convertToLockfileFile", { enumerable: true, get: function () { return lockfileFormatConverters_1.convertToLockfileFile; } });
|
|
31
34
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAMgB;AALd,wGAAA,eAAe,OAAA;AACf,uGAAA,cAAc,OAAA;AACd,6GAAA,oBAAoB,OAAA;AACpB,4GAAA,mBAAmB,OAAA;AACnB,0GAAA,iBAAiB,OAAA;AAEnB,+DAAqE;AAA5D,oIAAA,4BAA4B,OAAA;AACrC,iEAA+D;AAAtD,8HAAA,qBAAqB,OAAA;AAC9B,uDAAoC;AACpC,yCAAsB;AACtB,yDAA6D;AAApD,4HAAA,uBAAuB,OAAA;AAChC,uEAAkE;AAAzD,iIAAA,qBAAqB,OAAA"}
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export
|
|
3
|
-
|
|
4
|
-
}
|
|
5
|
-
export declare function convertToLockfileFile(lockfile: Lockfile, opts: NormalizeLockfileOpts): LockfileFile;
|
|
6
|
-
export declare function convertToLockfileObject(lockfile: LockfileFile | LockfileFileV9): Lockfile;
|
|
7
|
-
export declare function convertLockfileV9ToLockfileObject(lockfile: LockfileFileV9): Lockfile;
|
|
1
|
+
import { type LockfileObject, type LockfileFile } from '@pnpm/lockfile.types';
|
|
2
|
+
export declare function convertToLockfileFile(lockfile: LockfileObject): LockfileFile;
|
|
3
|
+
export declare function convertToLockfileObject(lockfile: LockfileFile): LockfileObject;
|
|
@@ -5,18 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.convertToLockfileFile = convertToLockfileFile;
|
|
7
7
|
exports.convertToLockfileObject = convertToLockfileObject;
|
|
8
|
-
exports.convertLockfileV9ToLockfileObject = convertLockfileV9ToLockfileObject;
|
|
9
8
|
const dependency_path_1 = require("@pnpm/dependency-path");
|
|
10
|
-
const git_resolver_1 = require("@pnpm/git-resolver");
|
|
11
9
|
const types_1 = require("@pnpm/types");
|
|
12
|
-
const equals_1 = __importDefault(require("ramda/src/equals"));
|
|
13
10
|
const isEmpty_1 = __importDefault(require("ramda/src/isEmpty"));
|
|
14
11
|
const map_1 = __importDefault(require("ramda/src/map"));
|
|
15
12
|
const omit_1 = __importDefault(require("ramda/src/omit"));
|
|
16
13
|
const pickBy_1 = __importDefault(require("ramda/src/pickBy"));
|
|
17
14
|
const pick_1 = __importDefault(require("ramda/src/pick"));
|
|
18
15
|
const constants_1 = require("@pnpm/constants");
|
|
19
|
-
function convertToLockfileFile(lockfile
|
|
16
|
+
function convertToLockfileFile(lockfile) {
|
|
20
17
|
const packages = {};
|
|
21
18
|
const snapshots = {};
|
|
22
19
|
for (const [depPath, pkg] of Object.entries(lockfile.packages ?? {})) {
|
|
@@ -55,56 +52,38 @@ function convertToLockfileFile(lockfile, opts) {
|
|
|
55
52
|
if (newLockfile.settings?.peersSuffixMaxLength === 1000) {
|
|
56
53
|
newLockfile.settings = (0, omit_1.default)(['peersSuffixMaxLength'], newLockfile.settings);
|
|
57
54
|
}
|
|
58
|
-
|
|
55
|
+
if (newLockfile.settings?.injectWorkspacePackages === false) {
|
|
56
|
+
delete newLockfile.settings.injectWorkspacePackages;
|
|
57
|
+
}
|
|
58
|
+
return normalizeLockfile(newLockfile);
|
|
59
59
|
}
|
|
60
|
-
function normalizeLockfile(lockfile
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
delete lockfileToSave.importers;
|
|
68
|
-
for (const depType of types_1.DEPENDENCIES_FIELDS) {
|
|
69
|
-
if ((0, isEmpty_1.default)(lockfileToSave[depType])) {
|
|
70
|
-
delete lockfileToSave[depType];
|
|
60
|
+
function normalizeLockfile(lockfile) {
|
|
61
|
+
const lockfileToSave = {
|
|
62
|
+
...lockfile,
|
|
63
|
+
importers: (0, map_1.default)((importer) => {
|
|
64
|
+
const normalizedImporter = {};
|
|
65
|
+
if (importer.dependenciesMeta != null && !(0, isEmpty_1.default)(importer.dependenciesMeta)) {
|
|
66
|
+
normalizedImporter.dependenciesMeta = importer.dependenciesMeta;
|
|
71
67
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
if ((0, isEmpty_1.default)(lockfileToSave.snapshots) || (lockfileToSave.snapshots == null)) {
|
|
77
|
-
delete lockfileToSave.snapshots;
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
else {
|
|
81
|
-
lockfileToSave = {
|
|
82
|
-
...lockfile,
|
|
83
|
-
importers: (0, map_1.default)((importer) => {
|
|
84
|
-
const normalizedImporter = {};
|
|
85
|
-
if (importer.dependenciesMeta != null && !(0, isEmpty_1.default)(importer.dependenciesMeta)) {
|
|
86
|
-
normalizedImporter.dependenciesMeta = importer.dependenciesMeta;
|
|
68
|
+
for (const depType of types_1.DEPENDENCIES_FIELDS) {
|
|
69
|
+
if (!(0, isEmpty_1.default)(importer[depType] ?? {})) {
|
|
70
|
+
normalizedImporter[depType] = importer[depType];
|
|
87
71
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
delete lockfileToSave.packages;
|
|
101
|
-
}
|
|
102
|
-
if ((0, isEmpty_1.default)(lockfileToSave.snapshots) || (lockfileToSave.snapshots == null)) {
|
|
103
|
-
delete lockfileToSave.snapshots;
|
|
104
|
-
}
|
|
72
|
+
}
|
|
73
|
+
if (importer.publishDirectory) {
|
|
74
|
+
normalizedImporter.publishDirectory = importer.publishDirectory;
|
|
75
|
+
}
|
|
76
|
+
return normalizedImporter;
|
|
77
|
+
}, lockfile.importers ?? {}),
|
|
78
|
+
};
|
|
79
|
+
if ((0, isEmpty_1.default)(lockfileToSave.packages) || (lockfileToSave.packages == null)) {
|
|
80
|
+
delete lockfileToSave.packages;
|
|
81
|
+
}
|
|
82
|
+
if ((0, isEmpty_1.default)(lockfileToSave.snapshots) || (lockfileToSave.snapshots == null)) {
|
|
83
|
+
delete lockfileToSave.snapshots;
|
|
105
84
|
}
|
|
106
85
|
if (lockfileToSave.time) {
|
|
107
|
-
lockfileToSave.time =
|
|
86
|
+
lockfileToSave.time = pruneTimeInLockfile(lockfileToSave.time, lockfile.importers ?? {});
|
|
108
87
|
}
|
|
109
88
|
if ((lockfileToSave.catalogs != null) && (0, isEmpty_1.default)(lockfileToSave.catalogs)) {
|
|
110
89
|
delete lockfileToSave.catalogs;
|
|
@@ -126,7 +105,7 @@ function normalizeLockfile(lockfile, opts) {
|
|
|
126
105
|
}
|
|
127
106
|
return lockfileToSave;
|
|
128
107
|
}
|
|
129
|
-
function
|
|
108
|
+
function pruneTimeInLockfile(time, importers) {
|
|
130
109
|
const rootDepPaths = new Set();
|
|
131
110
|
for (const importer of Object.values(importers)) {
|
|
132
111
|
for (const depType of types_1.DEPENDENCIES_FIELDS) {
|
|
@@ -154,135 +133,8 @@ function refToRelative(reference, pkgName) {
|
|
|
154
133
|
}
|
|
155
134
|
return reference;
|
|
156
135
|
}
|
|
157
|
-
/**
|
|
158
|
-
* Reverts changes from the "forceSharedFormat" write option if necessary.
|
|
159
|
-
*/
|
|
160
|
-
function convertFromLockfileFileMutable(lockfileFile) {
|
|
161
|
-
if (typeof lockfileFile?.['importers'] === 'undefined') {
|
|
162
|
-
lockfileFile.importers = {
|
|
163
|
-
'.': {
|
|
164
|
-
dependenciesMeta: lockfileFile['dependenciesMeta'],
|
|
165
|
-
publishDirectory: lockfileFile['publishDirectory'],
|
|
166
|
-
},
|
|
167
|
-
};
|
|
168
|
-
for (const depType of types_1.DEPENDENCIES_FIELDS) {
|
|
169
|
-
if (lockfileFile[depType] != null) {
|
|
170
|
-
lockfileFile.importers['.'][depType] = lockfileFile[depType];
|
|
171
|
-
delete lockfileFile[depType];
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
return lockfileFile;
|
|
176
|
-
}
|
|
177
136
|
function convertToLockfileObject(lockfile) {
|
|
178
|
-
|
|
179
|
-
return convertLockfileV9ToLockfileObject(lockfile);
|
|
180
|
-
}
|
|
181
|
-
convertPkgIds(lockfile);
|
|
182
|
-
const { importers, ...rest } = convertFromLockfileFileMutable(lockfile);
|
|
183
|
-
const newLockfile = {
|
|
184
|
-
...rest,
|
|
185
|
-
importers: mapValues(importers ?? {}, revertProjectSnapshot),
|
|
186
|
-
};
|
|
187
|
-
return newLockfile;
|
|
188
|
-
}
|
|
189
|
-
function convertPkgIds(lockfile) {
|
|
190
|
-
const oldIdToNewId = {};
|
|
191
|
-
if (lockfile.packages == null || (0, isEmpty_1.default)(lockfile.packages))
|
|
192
|
-
return;
|
|
193
|
-
for (const [pkgId, pkg] of Object.entries(lockfile.packages ?? {})) {
|
|
194
|
-
if (pkg.name) {
|
|
195
|
-
const { id, peersSuffix } = (0, dependency_path_1.parseDepPath)(pkgId);
|
|
196
|
-
let newId = `${pkg.name}@`;
|
|
197
|
-
if ('tarball' in pkg.resolution) {
|
|
198
|
-
newId += pkg.resolution.tarball;
|
|
199
|
-
if (pkg.resolution.path) {
|
|
200
|
-
newId += `#path:${pkg.resolution.path}`;
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
else if ('repo' in pkg.resolution) {
|
|
204
|
-
newId += (0, git_resolver_1.createGitHostedPkgId)(pkg.resolution);
|
|
205
|
-
}
|
|
206
|
-
else if ('directory' in pkg.resolution) {
|
|
207
|
-
newId += id;
|
|
208
|
-
}
|
|
209
|
-
else {
|
|
210
|
-
continue;
|
|
211
|
-
}
|
|
212
|
-
oldIdToNewId[pkgId] = `${newId}${peersSuffix}`;
|
|
213
|
-
if (id !== pkgId) {
|
|
214
|
-
oldIdToNewId[id] = newId;
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
else {
|
|
218
|
-
const { id, peersSuffix } = (0, dependency_path_1.parseDepPath)(pkgId);
|
|
219
|
-
const newId = id.substring(1);
|
|
220
|
-
oldIdToNewId[pkgId] = `${newId}${peersSuffix}`;
|
|
221
|
-
if (id !== pkgId) {
|
|
222
|
-
oldIdToNewId[id] = newId;
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
}
|
|
226
|
-
const newLockfilePackages = {};
|
|
227
|
-
for (const [pkgId, pkg] of Object.entries(lockfile.packages ?? {})) {
|
|
228
|
-
if (oldIdToNewId[pkgId]) {
|
|
229
|
-
if (pkg.id) {
|
|
230
|
-
pkg.id = oldIdToNewId[pkg.id];
|
|
231
|
-
}
|
|
232
|
-
newLockfilePackages[oldIdToNewId[pkgId]] = pkg;
|
|
233
|
-
}
|
|
234
|
-
else {
|
|
235
|
-
newLockfilePackages[pkgId] = pkg;
|
|
236
|
-
}
|
|
237
|
-
for (const depType of ['dependencies', 'optionalDependencies']) {
|
|
238
|
-
for (const [alias, depPath] of Object.entries(pkg[depType] ?? {})) {
|
|
239
|
-
if (oldIdToNewId[depPath]) {
|
|
240
|
-
if (oldIdToNewId[depPath].startsWith(`${alias}@`)) {
|
|
241
|
-
pkg[depType][alias] = oldIdToNewId[depPath].substring(alias.length + 1);
|
|
242
|
-
}
|
|
243
|
-
else {
|
|
244
|
-
pkg[depType][alias] = oldIdToNewId[depPath];
|
|
245
|
-
}
|
|
246
|
-
}
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
lockfile.packages = newLockfilePackages;
|
|
251
|
-
if ((lockfile.dependencies != null || lockfile.devDependencies != null || lockfile.optionalDependencies != null) && !lockfile.importers?.['.']) {
|
|
252
|
-
lockfile.importers = lockfile.importers ?? {};
|
|
253
|
-
lockfile.importers['.'] = {
|
|
254
|
-
dependencies: lockfile.dependencies,
|
|
255
|
-
devDependencies: lockfile.devDependencies,
|
|
256
|
-
optionalDependencies: lockfile.optionalDependencies,
|
|
257
|
-
};
|
|
258
|
-
delete lockfile.dependencies;
|
|
259
|
-
delete lockfile.devDependencies;
|
|
260
|
-
delete lockfile.optionalDependencies;
|
|
261
|
-
}
|
|
262
|
-
for (const importer of Object.values(lockfile.importers ?? {})) {
|
|
263
|
-
for (const depType of ['dependencies', 'optionalDependencies', 'devDependencies']) {
|
|
264
|
-
for (const [alias, { version }] of Object.entries(importer[depType] ?? {})) {
|
|
265
|
-
if (oldIdToNewId[version]) {
|
|
266
|
-
if (oldIdToNewId[version].startsWith(`${alias}@`)) {
|
|
267
|
-
importer[depType][alias].version = oldIdToNewId[version].substring(alias.length + 1);
|
|
268
|
-
}
|
|
269
|
-
else {
|
|
270
|
-
importer[depType][alias].version = oldIdToNewId[version];
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
}
|
|
274
|
-
}
|
|
275
|
-
}
|
|
276
|
-
for (const depType of ['dependencies', 'optionalDependencies', 'devDependencies']) {
|
|
277
|
-
for (const [alias, { version }] of Object.entries(lockfile[depType] ?? {})) {
|
|
278
|
-
if (oldIdToNewId[version]) {
|
|
279
|
-
lockfile[depType][alias].version = oldIdToNewId[version];
|
|
280
|
-
}
|
|
281
|
-
}
|
|
282
|
-
}
|
|
283
|
-
}
|
|
284
|
-
function convertLockfileV9ToLockfileObject(lockfile) {
|
|
285
|
-
const { importers, ...rest } = convertFromLockfileFileMutable(lockfile);
|
|
137
|
+
const { importers, ...rest } = lockfile;
|
|
286
138
|
const packages = {};
|
|
287
139
|
for (const [depPath, pkg] of Object.entries(lockfile.snapshots ?? {})) {
|
|
288
140
|
const pkgId = (0, dependency_path_1.removeSuffix)(depPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfileFormatConverters.js","sourceRoot":"","sources":["../src/lockfileFormatConverters.ts"],"names":[],"mappings":";;;;;AA4BA,sDAwCC;AA4HD,0DAYC;AA0FD,8EAaC;AAnTD,2DAAkE;AAClE,qDAAyD;AAczD,uCAA+D;AAC/D,8DAAqC;AACrC,gEAAuC;AACvC,wDAAsC;AACtC,0DAAiC;AACjC,8DAAqC;AACrC,0DAAiC;AACjC,+CAAkD;AAMlD,SAAgB,qBAAqB,CAAE,QAAkB,EAAE,IAA2B;IACpF,MAAM,QAAQ,GAAgC,EAAE,CAAA;IAChD,MAAM,SAAS,GAAsC,EAAE,CAAA;IACvD,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QACrE,SAAS,CAAC,OAAO,CAAC,GAAG,IAAA,cAAI,EAAC;YACxB,cAAc;YACd,sBAAsB;YACtB,4BAA4B;YAC5B,UAAU;YACV,IAAI;SACL,EAAE,GAAG,CAAC,CAAA;QACP,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAA;QACnC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,cAAI,EAAC;gBACrB,qBAAqB;gBACrB,KAAK;gBACL,YAAY;gBACZ,SAAS;gBACT,QAAQ;gBACR,MAAM;gBACN,MAAM;gBACN,IAAI;gBACJ,kBAAkB;gBAClB,sBAAsB;gBACtB,YAAY;gBACZ,SAAS;aACV,EAAE,GAAG,CAAC,CAAA;QACT,CAAC;IACH,CAAC;IACD,MAAM,WAAW,GAAG;QAClB,GAAG,QAAQ;QACX,SAAS;QACT,QAAQ;QACR,eAAe,EAAE,4BAAgB;QACjC,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,8CAA8C,CAAC;KACzF,CAAA;IACD,IAAI,WAAW,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,EAAE,CAAC;QACxD,WAAW,CAAC,QAAQ,GAAG,IAAA,cAAI,EAAC,CAAC,sBAAsB,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;AAC7C,CAAC;AAED,SAAS,iBAAiB,CAAE,QAAkC,EAAE,IAA2B;IACzF,IAAI,cAA6B,CAAA;IACjC,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAA,gBAAM,EAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACpF,cAAc,GAAG;YACf,GAAG,QAAQ;YACX,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC;SAC7B,CAAA;QACD,OAAO,cAAc,CAAC,SAAS,CAAA;QAC/B,KAAK,MAAM,OAAO,IAAI,2BAAmB,EAAE,CAAC;YAC1C,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;gBACrC,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;YAChC,CAAC;QACH,CAAC;QACD,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,IAAI,CAAC,EAAE,CAAC;YAC1E,OAAO,cAAc,CAAC,QAAQ,CAAA;QAChC,CAAC;QACD,IAAI,IAAA,iBAAO,EAAE,cAAiC,CAAC,SAAS,CAAC,IAAI,CAAE,cAAiC,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,CAAC;YACpH,OAAQ,cAAiC,CAAC,SAAS,CAAA;QACrD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,cAAc,GAAG;YACf,GAAG,QAAQ;YACX,SAAS,EAAE,IAAA,aAAU,EAAC,CAAC,QAAQ,EAAE,EAAE;gBACjC,MAAM,kBAAkB,GAA6C,EAAE,CAAA;gBACvE,IAAI,QAAQ,CAAC,gBAAgB,IAAI,IAAI,IAAI,CAAC,IAAA,iBAAO,EAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBAC7E,kBAAkB,CAAC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAA;gBACjE,CAAC;gBACD,KAAK,MAAM,OAAO,IAAI,2BAAmB,EAAE,CAAC;oBAC1C,IAAI,CAAC,IAAA,iBAAO,EAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;wBACtC,kBAAkB,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;oBACjD,CAAC;gBACH,CAAC;gBACD,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC;oBAC9B,kBAAkB,CAAC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAA;gBACjE,CAAC;gBACD,OAAO,kBAAqD,CAAA;YAC9D,CAAC,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC;SAC7B,CAAA;QACD,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,IAAI,CAAC,EAAE,CAAC;YAC1E,OAAO,cAAc,CAAC,QAAQ,CAAA;QAChC,CAAC;QACD,IAAI,IAAA,iBAAO,EAAE,cAAiC,CAAC,SAAS,CAAC,IAAI,CAAE,cAAiC,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,CAAC;YACpH,OAAQ,cAAiC,CAAC,SAAS,CAAA;QACrD,CAAC;IACH,CAAC;IACD,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC;QACxB,cAAc,CAAC,IAAI,GAAG,qBAAqB,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IAC5F,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1E,OAAO,cAAc,CAAC,QAAQ,CAAA;IAChC,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5E,OAAO,cAAc,CAAC,SAAS,CAAA;IACjC,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,mBAAmB,IAAI,IAAI,CAAC,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAChG,OAAO,cAAc,CAAC,mBAAmB,CAAA;IAC3C,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,yBAAyB,EAAE,CAAC;QAC9C,OAAO,cAAc,CAAC,yBAAyB,CAAA;IACjD,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,2BAA2B,EAAE,MAAM,EAAE,CAAC;QACxD,OAAO,cAAc,CAAC,2BAA2B,CAAA;IACnD,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACrC,OAAO,cAAc,CAAC,gBAAgB,CAAA;IACxC,CAAC;IACD,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,SAAS,qBAAqB,CAAE,IAA4B,EAAE,SAA0D;IACtH,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAA;IACtC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAChD,KAAK,MAAM,OAAO,IAAI,2BAAmB,EAAE,CAAC;YAC1C,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;gBACrE,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,oBAAoB,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAA;gBACjG,MAAM,OAAO,GAAG,aAAa,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;gBAC5D,IAAI,CAAC,OAAO;oBAAE,SAAQ;gBACtB,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAA,gBAAM,EAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAA;AAChE,CAAC;AAED,SAAS,aAAa,CACpB,SAAiB,EACjB,OAAe;IAEf,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACtF,OAAO,IAAI,OAAO,IAAI,SAAS,EAAE,CAAA;IACnC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;GAEG;AACH,SAAS,8BAA8B,CAAE,YAA0B;IACjE,IAAI,OAAO,YAAY,EAAE,CAAC,WAAW,CAAC,KAAK,WAAW,EAAE,CAAC;QACvD,YAAY,CAAC,SAAS,GAAG;YACvB,GAAG,EAAE;gBACH,gBAAgB,EAAE,YAAY,CAAC,kBAAkB,CAAC;gBAClD,gBAAgB,EAAE,YAAY,CAAC,kBAAkB,CAAC;aACnD;SACF,CAAA;QACD,KAAK,MAAM,OAAO,IAAI,2BAAmB,EAAE,CAAC;YAC1C,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;gBAClC,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;gBAC5D,OAAO,YAAY,CAAC,OAAO,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,YAA8B,CAAA;AACvC,CAAC;AAED,SAAgB,uBAAuB,CAAE,QAAuC;IAC9E,IAAK,QAA2B,CAAC,SAAS,EAAE,CAAC;QAC3C,OAAO,iCAAiC,CAAC,QAA0B,CAAC,CAAA;IACtE,CAAC;IACD,aAAa,CAAC,QAAQ,CAAC,CAAA;IACvB,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAA;IAEvE,MAAM,WAAW,GAAG;QAClB,GAAG,IAAI;QACP,SAAS,EAAE,SAAS,CAAC,SAAS,IAAI,EAAE,EAAE,qBAAqB,CAAC;KAC7D,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,SAAS,aAAa,CAAE,QAAsB;IAC5C,MAAM,YAAY,GAA4B,EAAE,CAAA;IAChD,IAAI,QAAQ,CAAC,QAAQ,IAAI,IAAI,IAAI,IAAA,iBAAO,EAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAM;IACnE,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QACnE,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACb,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,IAAA,8BAAY,EAAC,KAAK,CAAC,CAAA;YAC/C,IAAI,KAAK,GAAG,GAAG,GAAG,CAAC,IAAI,GAAG,CAAA;YAC1B,IAAI,SAAS,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBAChC,KAAK,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAA;gBAC/B,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;oBACxB,KAAK,IAAI,SAAS,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;gBACzC,CAAC;YACH,CAAC;iBAAM,IAAI,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACpC,KAAK,IAAI,IAAA,mCAAoB,EAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAC/C,CAAC;iBAAM,IAAI,WAAW,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACzC,KAAK,IAAI,EAAE,CAAA;YACb,CAAC;iBAAM,CAAC;gBACN,SAAQ;YACV,CAAC;YACD,YAAY,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,GAAG,WAAW,EAAa,CAAA;YACzD,IAAI,EAAE,KAAK,KAAK,EAAE,CAAC;gBACjB,YAAY,CAAC,EAAE,CAAC,GAAG,KAAgB,CAAA;YACrC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,IAAA,8BAAY,EAAC,KAAK,CAAC,CAAA;YAC/C,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;YAC7B,YAAY,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,GAAG,WAAW,EAAa,CAAA;YACzD,IAAI,EAAE,KAAK,KAAK,EAAE,CAAC;gBACjB,YAAY,CAAC,EAAE,CAAC,GAAG,KAAgB,CAAA;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,mBAAmB,GAAqB,EAAE,CAAA;IAChD,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QACnE,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;gBACX,GAAG,CAAC,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YAC/B,CAAC;YACD,mBAAmB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAA;QAChD,CAAC;aAAM,CAAC;YACN,mBAAmB,CAAC,KAAgB,CAAC,GAAG,GAAG,CAAA;QAC7C,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,CAAC,cAAc,EAAE,sBAAsB,CAAU,EAAE,CAAC;YACxE,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;gBAClE,IAAI,YAAY,CAAC,OAAiB,CAAC,EAAE,CAAC;oBACpC,IAAI,YAAY,CAAC,OAAiB,CAAC,CAAC,UAAU,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC;wBAC5D,GAAG,CAAC,OAAO,CAAE,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC,OAAiB,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBACpF,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,OAAO,CAAE,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC,OAAiB,CAAC,CAAA;oBACxD,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,QAAQ,GAAG,mBAAmB,CAAA;IACvC,IAAI,CAAC,QAAQ,CAAC,YAAY,IAAI,IAAI,IAAI,QAAQ,CAAC,eAAe,IAAI,IAAI,IAAI,QAAQ,CAAC,oBAAoB,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/I,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAA;QAC7C,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG;YACxB,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;SACpD,CAAA;QACD,OAAO,QAAQ,CAAC,YAAY,CAAA;QAC5B,OAAO,QAAQ,CAAC,eAAe,CAAA;QAC/B,OAAO,QAAQ,CAAC,oBAAoB,CAAA;IACtC,CAAC;IACD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/D,KAAK,MAAM,OAAO,IAAI,CAAC,cAAc,EAAE,sBAAsB,EAAE,iBAAiB,CAAU,EAAE,CAAC;YAC3F,KAAK,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;gBAC3E,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC1B,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC;wBAClD,QAAQ,CAAC,OAAO,CAAE,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBACvF,CAAC;yBAAM,CAAC;wBACN,QAAQ,CAAC,OAAO,CAAE,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;oBAC3D,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,CAAC,cAAc,EAAE,sBAAsB,EAAE,iBAAiB,CAAU,EAAE,CAAC;QAC3F,KAAK,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3E,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1B,QAAQ,CAAC,OAAO,CAAE,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAgB,iCAAiC,CAAE,QAAwB;IACzE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAA;IAEvE,MAAM,QAAQ,GAAqB,EAAE,CAAA;IACrC,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QACtE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAA;QACnC,QAAQ,CAAC,OAAkB,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAC/E,CAAC;IACD,OAAO;QACL,GAAG,IAAA,cAAI,EAAC,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC;QAC5B,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,SAAS,IAAI,EAAE,EAAE,qBAAqB,CAAC;KAC7D,CAAA;AACH,CAAC;AAED,SAAS,8CAA8C,CACrD,eAAgC;IAEhC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,eAAe,CAAA;IAC/C,IAAI,UAAU,IAAI,IAAI;QAAE,OAAO,eAAkD,CAAA;IACjF,MAAM,YAAY,GAAG,CAAC,KAA4B,EAAE,EAAE,CACpD,KAAK,IAAI,IAAI;QACX,CAAC,CAAC,mDAAmD,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,CAAC;QAC5E,CAAC,CAAC,KAAK,CAAA;IACX,OAAO;QACL,GAAG,IAAI;QACP,YAAY,EAAE,YAAY,CAAC,eAAe,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9D,oBAAoB,EAAE,YAAY,CAAC,eAAe,CAAC,oBAAoB,IAAI,EAAE,CAAC;QAC9E,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC,eAAe,IAAI,EAAE,CAAC;KACrE,CAAA;AACH,CAAC;AAED,SAAS,mDAAmD,CAC1D,oBAA0C,EAC1C,EAAE,UAAU,EAAwC;IAEpD,OAAO,SAAS,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAC5D,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC;QAC9B,OAAO;KACR,CAAC,CAAC,CAAA;AACL,CAAC;AAED,SAAS,qBAAqB,CAAE,IAAqC;IACnE,MAAM,UAAU,GAAyB,EAAE,CAAA;IAE3C,SAAS,cAAc,CAAE,IAA0C;QACjE,MAAM,oBAAoB,GAAyB,EAAE,CAAA;QACrD,KAAK,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACrE,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;YACzC,IAAI,aAAa,IAAI,IAAI,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBACzD,MAAM,IAAI,KAAK,CAAC,wFAAwF,OAAO,EAAE,CAAC,CAAA;YACpH,CAAC;YAED,UAAU,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;YAC/B,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAA;QACzC,CAAC;QACD,OAAO,oBAAoB,CAAA;IAC7B,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI;QAC5C,CAAC,CAAC,IAAI,CAAC,YAAY;QACnB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACrC,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,IAAI;QAClD,CAAC,CAAC,IAAI,CAAC,eAAe;QACtB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IACxC,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,IAAI,IAAI;QAC5D,CAAC,CAAC,IAAI,CAAC,oBAAoB;QAC3B,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAE7C,OAAO;QACL,GAAG,IAAI;QACP,UAAU;QACV,YAAY;QACZ,eAAe;QACf,oBAAoB;KACrB,CAAA;AACH,CAAC;AAED,SAAS,SAAS,CAAQ,GAAsB,EAAE,MAAkC;IAClF,MAAM,MAAM,GAAsB,EAAE,CAAA;IACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAClC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
1
|
+
{"version":3,"file":"lockfileFormatConverters.js","sourceRoot":"","sources":["../src/lockfileFormatConverters.ts"],"names":[],"mappings":"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"}
|
package/lib/read.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type LockfileObject } from '@pnpm/lockfile.types';
|
|
2
2
|
import { type ProjectId } from '@pnpm/types';
|
|
3
3
|
export declare function readCurrentLockfile(virtualStoreDir: string, opts: {
|
|
4
4
|
wantedVersions?: string[];
|
|
5
5
|
ignoreIncompatible: boolean;
|
|
6
|
-
}): Promise<
|
|
6
|
+
}): Promise<LockfileObject | null>;
|
|
7
7
|
export declare function readWantedLockfileAndAutofixConflicts(pkgPath: string, opts: {
|
|
8
8
|
wantedVersions?: string[];
|
|
9
9
|
ignoreIncompatible: boolean;
|
|
10
10
|
useGitBranchLockfile?: boolean;
|
|
11
11
|
mergeGitBranchLockfiles?: boolean;
|
|
12
12
|
}): Promise<{
|
|
13
|
-
lockfile:
|
|
13
|
+
lockfile: LockfileObject | null;
|
|
14
14
|
hadConflicts: boolean;
|
|
15
15
|
}>;
|
|
16
16
|
export declare function readWantedLockfile(pkgPath: string, opts: {
|
|
@@ -18,10 +18,10 @@ export declare function readWantedLockfile(pkgPath: string, opts: {
|
|
|
18
18
|
ignoreIncompatible: boolean;
|
|
19
19
|
useGitBranchLockfile?: boolean;
|
|
20
20
|
mergeGitBranchLockfiles?: boolean;
|
|
21
|
-
}): Promise<
|
|
21
|
+
}): Promise<LockfileObject | null>;
|
|
22
22
|
export declare function createLockfileObject(importerIds: ProjectId[], opts: {
|
|
23
23
|
lockfileVersion: string;
|
|
24
24
|
autoInstallPeers: boolean;
|
|
25
25
|
excludeLinksFromLockfile: boolean;
|
|
26
26
|
peersSuffixMaxLength: number;
|
|
27
|
-
}):
|
|
27
|
+
}): LockfileObject;
|
package/lib/read.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../src/read.ts"],"names":[],"mappings":";;;;;AAsBA,kDASC;AAED,sFAgBC;AAED,gDAUC;AAyED,oDAyBC;AA/JD,2BAAmC;AACnC,gDAAuB;AACvB,gDAAuB;AACvB,+CAGwB;AACxB,uCAAuC;AACvC,2DAA4D;AAG5D,wEAA6C;AAC7C,sDAA0B;AAC1B,oDAA2B;AAC3B,0DAAgC;AAChC,qCAAsD;AACtD,iDAA8D;AAC9D,qCAAmD;AACnD,iDAAsD;AACtD,2DAA+D;AAC/D,yEAAoE;AAE7D,KAAK,UAAU,mBAAmB,CACvC,eAAuB,EACvB,IAGC;IAED,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;IAC5D,OAAO,CAAC,MAAM,KAAK,CAAC,YAAY,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAA;AACpE,CAAC;AAEM,KAAK,UAAU,qCAAqC,CACzD,OAAe,EACf,IAKC;IAKD,OAAO,mBAAmB,CAAC,OAAO,EAAE;QAClC,GAAG,IAAI;QACP,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAA;AACJ,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,OAAe,EACf,IAKC;IAED,OAAO,CAAC,MAAM,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAA;AAC5D,CAAC;AAED,KAAK,UAAU,KAAK,CAClB,YAAoB,EACpB,MAAc,EAAE,mBAAmB;AACnC,IAIC;IAKD,IAAI,kBAAkB,CAAA;IACtB,IAAI,CAAC;QACH,kBAAkB,GAAG,IAAA,mBAAQ,EAAC,MAAM,aAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IACxE,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,IAAI,CAAC,CAAC,cAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE,CAAC;YAC/E,MAAM,GAAG,CAAA;QACX,CAAC;QACD,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,KAAK;SACpB,CAAA;IACH,CAAC;IACD,IAAI,
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../src/read.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export declare function sortLockfileKeys(lockfile:
|
|
1
|
+
import { type LockfileFile } from '@pnpm/lockfile.types';
|
|
2
|
+
export declare function sortLockfileKeys(lockfile: LockfileFile): LockfileFile;
|
package/lib/sortLockfileKeys.js
CHANGED
|
@@ -36,10 +36,6 @@ const ROOT_KEYS = [
|
|
|
36
36
|
'packageExtensionsChecksum',
|
|
37
37
|
'pnpmfileChecksum',
|
|
38
38
|
'patchedDependencies',
|
|
39
|
-
'dependencies',
|
|
40
|
-
'optionalDependencies',
|
|
41
|
-
'devDependencies',
|
|
42
|
-
'dependenciesMeta',
|
|
43
39
|
'importers',
|
|
44
40
|
'packages',
|
|
45
41
|
];
|
|
@@ -93,7 +89,7 @@ function sortLockfileKeys(lockfile) {
|
|
|
93
89
|
});
|
|
94
90
|
}
|
|
95
91
|
}
|
|
96
|
-
for (const key of ['
|
|
92
|
+
for (const key of ['time', 'patchedDependencies']) {
|
|
97
93
|
if (!lockfile[key])
|
|
98
94
|
continue;
|
|
99
95
|
lockfile[key] = (0, sort_keys_1.default)(lockfile[key]); // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortLockfileKeys.js","sourceRoot":"","sources":["../src/sortLockfileKeys.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"sortLockfileKeys.js","sourceRoot":"","sources":["../src/sortLockfileKeys.ts"],"names":[],"mappings":"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"}
|
package/lib/write.d.ts
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
export declare function writeWantedLockfile(pkgPath: string, wantedLockfile:
|
|
1
|
+
import { type LockfileObject, type LockfileFile } from '@pnpm/lockfile.types';
|
|
2
|
+
export declare function writeWantedLockfile(pkgPath: string, wantedLockfile: LockfileObject, opts?: {
|
|
3
3
|
useGitBranchLockfile?: boolean;
|
|
4
4
|
mergeGitBranchLockfiles?: boolean;
|
|
5
5
|
}): Promise<void>;
|
|
6
|
-
export declare function writeCurrentLockfile(virtualStoreDir: string, currentLockfile:
|
|
7
|
-
export declare function
|
|
6
|
+
export declare function writeCurrentLockfile(virtualStoreDir: string, currentLockfile: LockfileObject): Promise<void>;
|
|
7
|
+
export declare function writeLockfileFile(lockfilePath: string, wantedLockfile: LockfileFile): Promise<void>;
|
|
8
|
+
export declare function isEmptyLockfile(lockfile: LockfileObject): boolean;
|
|
8
9
|
export declare function writeLockfiles(opts: {
|
|
9
|
-
wantedLockfile:
|
|
10
|
+
wantedLockfile: LockfileObject;
|
|
10
11
|
wantedLockfileDir: string;
|
|
11
|
-
currentLockfile:
|
|
12
|
+
currentLockfile: LockfileObject;
|
|
12
13
|
currentLockfileDir: string;
|
|
13
14
|
useGitBranchLockfile?: boolean;
|
|
14
15
|
mergeGitBranchLockfiles?: boolean;
|
package/lib/write.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.writeWantedLockfile = writeWantedLockfile;
|
|
7
7
|
exports.writeCurrentLockfile = writeCurrentLockfile;
|
|
8
|
+
exports.writeLockfileFile = writeLockfileFile;
|
|
8
9
|
exports.isEmptyLockfile = isEmptyLockfile;
|
|
9
10
|
exports.writeLockfiles = writeLockfiles;
|
|
10
11
|
const fs_1 = require("fs");
|
|
@@ -47,10 +48,11 @@ async function writeCurrentLockfile(virtualStoreDir, currentLockfile) {
|
|
|
47
48
|
}
|
|
48
49
|
async function writeLockfile(lockfileFilename, pkgPath, wantedLockfile) {
|
|
49
50
|
const lockfilePath = path_1.default.join(pkgPath, lockfileFilename);
|
|
50
|
-
const lockfileToStringify = (0, lockfileFormatConverters_1.convertToLockfileFile)(wantedLockfile
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
const lockfileToStringify = (0, lockfileFormatConverters_1.convertToLockfileFile)(wantedLockfile);
|
|
52
|
+
return writeLockfileFile(lockfilePath, lockfileToStringify);
|
|
53
|
+
}
|
|
54
|
+
function writeLockfileFile(lockfilePath, wantedLockfile) {
|
|
55
|
+
const yamlDoc = yamlStringify(wantedLockfile);
|
|
54
56
|
return writeFileAtomic(lockfilePath, yamlDoc);
|
|
55
57
|
}
|
|
56
58
|
function yamlStringify(lockfile) {
|
|
@@ -64,10 +66,7 @@ async function writeLockfiles(opts) {
|
|
|
64
66
|
const wantedLockfileName = await (0, lockfileName_1.getWantedLockfileName)(opts);
|
|
65
67
|
const wantedLockfilePath = path_1.default.join(opts.wantedLockfileDir, wantedLockfileName);
|
|
66
68
|
const currentLockfilePath = path_1.default.join(opts.currentLockfileDir, 'lock.yaml');
|
|
67
|
-
const
|
|
68
|
-
forceSharedFormat: true,
|
|
69
|
-
};
|
|
70
|
-
const wantedLockfileToStringify = (0, lockfileFormatConverters_1.convertToLockfileFile)(opts.wantedLockfile, normalizeOpts);
|
|
69
|
+
const wantedLockfileToStringify = (0, lockfileFormatConverters_1.convertToLockfileFile)(opts.wantedLockfile);
|
|
71
70
|
const yamlDoc = yamlStringify(wantedLockfileToStringify);
|
|
72
71
|
// in most cases the `pnpm-lock.yaml` and `node_modules/.pnpm-lock.yaml` are equal
|
|
73
72
|
// in those cases the YAML document can be stringified only once for both files
|
|
@@ -91,7 +90,7 @@ async function writeLockfiles(opts) {
|
|
|
91
90
|
message: `\`${constants_1.WANTED_LOCKFILE}\` differs from \`${path_1.default.relative(opts.wantedLockfileDir, currentLockfilePath)}\``,
|
|
92
91
|
prefix: opts.wantedLockfileDir,
|
|
93
92
|
});
|
|
94
|
-
const currentLockfileToStringify = (0, lockfileFormatConverters_1.convertToLockfileFile)(opts.currentLockfile
|
|
93
|
+
const currentLockfileToStringify = (0, lockfileFormatConverters_1.convertToLockfileFile)(opts.currentLockfile);
|
|
95
94
|
const currentYamlDoc = yamlStringify(currentLockfileToStringify);
|
|
96
95
|
await Promise.all([
|
|
97
96
|
writeFileAtomic(wantedLockfilePath, yamlDoc),
|
package/lib/write.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write.js","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":";;;;;AA6BA,kDAUC;AAED,oDAWC;
|
|
1
|
+
{"version":3,"file":"write.js","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/lockfile.fs",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1001.1.0",
|
|
4
4
|
"description": "Read/write pnpm-lock.yaml files",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"tempy": "^1.0.1",
|
|
36
36
|
"write-yaml-file": "^5.0.0",
|
|
37
37
|
"yaml-tag": "1.1.0",
|
|
38
|
-
"@pnpm/lockfile.fs": "
|
|
38
|
+
"@pnpm/lockfile.fs": "1001.1.0",
|
|
39
39
|
"@pnpm/logger": "1000.0.0"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
@@ -49,15 +49,14 @@
|
|
|
49
49
|
"sort-keys": "^4.2.0",
|
|
50
50
|
"strip-bom": "^4.0.0",
|
|
51
51
|
"write-file-atomic": "^5.0.1",
|
|
52
|
-
"@pnpm/
|
|
53
|
-
"@pnpm/
|
|
54
|
-
"@pnpm/git-resolver": "1000.0.0",
|
|
52
|
+
"@pnpm/error": "1000.0.1",
|
|
53
|
+
"@pnpm/constants": "1001.0.0",
|
|
55
54
|
"@pnpm/git-utils": "1000.0.0",
|
|
56
|
-
"@pnpm/lockfile.
|
|
57
|
-
"@pnpm/lockfile.
|
|
58
|
-
"@pnpm/
|
|
55
|
+
"@pnpm/lockfile.types": "1001.0.0",
|
|
56
|
+
"@pnpm/lockfile.merger": "1001.0.0",
|
|
57
|
+
"@pnpm/dependency-path": "1000.0.0",
|
|
59
58
|
"@pnpm/types": "1000.0.0",
|
|
60
|
-
"@pnpm/lockfile.utils": "
|
|
59
|
+
"@pnpm/lockfile.utils": "1001.0.0"
|
|
61
60
|
},
|
|
62
61
|
"funding": "https://opencollective.com/pnpm",
|
|
63
62
|
"exports": {
|