cnpmcore 2.5.2 → 2.6.0

package/History.md

@@ -1,4 +1,13 @@
 
+2.6.0 / 2022-11-23
+==================
+
+**features**
+  * [[`be8387d`](http://github.com/cnpm/cnpmcore/commit/be8387dfa48b9487156542000a93081fa823694a)] - feat: Support canvas sync from different binary (#357) (Ke Wu <<gemwuu@163.com>>)
+
+**fixes**
+  * [[`d6c4cf5`](http://github.com/cnpm/cnpmcore/commit/d6c4cf5029ca6450064fc05696a8624b6c36f0b2)] - fix: duplicate binary task (#354) (elrrrrrrr <<elrrrrrrr@gmail.com>>)
+
 2.5.2 / 2022-11-11
 ==================
 

package/dist/app/core/entity/Task.js

@@ -132,6 +132,7 @@ class Task extends Entity_1.Entity {
             targetName,
             authorId: `pid_${exports.PID}`,
             authorIp: exports.HOST_NAME,
+            bizId: `SyncBinary:${targetName}`,
             data: {
                 // task execute worker
                 taskWorker: '',
@@ -154,4 +155,4 @@ class Task extends Entity_1.Entity {
     }
 }
 exports.Task = Task;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFzay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL2VudGl0eS9UYXNrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDRDQUFvQjtBQUNwQixnREFBd0I7QUFDeEIscUNBQThDO0FBQzlDLG1EQUEwRDtBQUMxRCxpREFBNkQ7QUFDN0QsK0RBQXVDO0FBRzFCLFFBQUEsU0FBUyxHQUFHLFlBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUMxQixRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0FBbUUvQixNQUFhLElBQTRDLFNBQVEsZUFBTTtJQWVyRSxZQUFZLElBQWlCOztRQUMzQixLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDWixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDMUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUN4QixJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUM7UUFDbEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQzlCLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUM5QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7UUFDdEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFBLElBQUksQ0FBQyxPQUFPLG1DQUFJLEVBQUUsQ0FBQztRQUNsQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsTUFBQSxJQUFJLENBQUMsZ0JBQWdCLG1DQUFJLEVBQUUsQ0FBQztRQUNwRCxJQUFJLENBQUMsUUFBUSxHQUFHLE1BQUEsSUFBSSxDQUFDLFFBQVEsbUNBQUksQ0FBQyxDQUFDO1FBQ25DLElBQUksQ0FBQyxLQUFLLEdB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFzay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL2VudGl0eS9UYXNrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDRDQUFvQjtBQUNwQixnREFBd0I7QUFDeEIscUNBQThDO0FBQzlDLG1EQUEwRDtBQUMxRCxpREFBNkQ7QUFDN0QsK0RBQXVDO0FBRzFCLFFBQUEsU0FBUyxHQUFHLFlBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUMxQixRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0FBbUUvQixNQUFhLElBQTRDLFNBQVEsZUFBTTtJQWVyRSxZQUFZLElBQWlCOztRQUMzQixLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDWixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDMUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUN4QixJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUM7UUFDbEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQzlCLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUM5QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7UUFDdEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFBLElBQUksQ0FBQyxPQUFPLG1DQUFJLEVBQUUsQ0FBQztRQUNsQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsTUFBQSxJQUFJLENBQUMsZ0JBQWdCLG1DQUFJLEVBQUUsQ0FBQztRQUNwRCxJQUFJLENBQUMsUUFBUSxHQUFHLE1BQUEsSUFBSSxDQUFDLFFBQVEsbUNBQUksQ0FBQyxDQUFDO1FBQ25DLElBQUksQ0FBQyxLQUFLLEdB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

package/dist/app/core/service/BinarySyncerService.d.ts

@@ -5,13 +5,14 @@ import { AbstractService } from '../../common/AbstractService';
 export declare class BinarySyncerService extends AbstractService {
     private readonly binaryRepository;
     private readonly taskService;
+    private readonly taskRepository;
     private readonly httpclient;
     private readonly nfsAdapter;
     findBinary(binaryName: string, parent: string, name: string): Promise<Binary | null>;
     listDirBinaries(binary: Binary): Promise<Binary[]>;
     listRootBinaries(binaryName: string): Promise<Binary[]>;
     downloadBinary(binary: Binary): Promise<string | import("stream").Readable | undefined>;
-    createTask(binaryName: string, lastData?: any): Promise<Task<import("../entity/Task").TaskBaseData>>;
+    createTask(binaryName: string, lastData?: any): Promise<Task<import("../entity/Task").TaskBaseData> | undefined>;
     findTask(taskId: string): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
     findTaskLog(task: Task): Promise<string | import("stream").Readable | undefined>;
     findExecuteTask(): Promise<Task<import("../entity/Task").TaskBaseData> | null>;

package/dist/app/core/service/BinarySyncerService.js

@@ -78,13 +78,42 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
         return await this.binaryRepository.listBinaries(binary.category, `${binary.parent}${binary.name}`);
     }
     async listRootBinaries(binaryName) {
-        return await this.binaryRepository.listBinaries(binaryName, '/');
+        // 通常 binaryName 和 category 是一样的，但是有些特殊的 binaryName 会有多个 category，比如 canvas
+        // 所以查询 canvas 的时候，需要将 binaryName 和 category 的数据都查出来
+        const { category, mergeCategory, } = binaries_1.default[binaryName];
+        const reqs = [
+            this.binaryRepository.listBinaries(binaryName, '/'),
+        ];
+        if (mergeCategory && mergeCategory !== category) {
+            reqs.push(this.binaryRepository.listBinaries(mergeCategory, '/'));
+        }
+        const [rootBinary, categoryBinary,] = await Promise.all(reqs);
+        const versions = rootBinary.map(b => b.name);
+        categoryBinary === null || categoryBinary === void 0 ? void 0 : categoryBinary.forEach(b => {
+            const version = b.name;
+            // 只将没有的版本添加进去
+            if (!versions.includes(version)) {
+                rootBinary.push(b);
+            }
+        });
+        return rootBinary;
     }
     async downloadBinary(binary) {
         return await this.nfsAdapter.getDownloadUrlOrStream(binary.storePath);
     }
+    // SyncBinary 由定时任务每台单机定时触发，手动去重
+    // 添加 bizId 在 db 防止重复，记录 id 错误
     async createTask(binaryName, lastData) {
-        return await this.taskService.createTask(Task_2.Task.createSyncBinary(binaryName, lastData), false);
+        const existsTask = await this.taskRepository.findTaskByTargetName(binaryName, Task_1.TaskType.SyncBinary);
+        if (existsTask) {
+            return existsTask;
+        }
+        try {
+            return await this.taskService.createTask(Task_2.Task.createSyncBinary(binaryName, lastData), false);
+        }
+        catch (e) {
+            this.logger.error('[BinarySyncerService.createTask] binaryName: %s, error: %s', binaryName, e);
+        }
     }
     async findTask(taskId) {
         return await this.taskService.findTask(taskId);
@@ -266,6 +295,9 @@ __decorate([
 __decorate([
     (0, tegg_1.Inject)()
 ], BinarySyncerService.prototype, "taskService", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], BinarySyncerService.prototype, "taskRepository", void 0);
 __decorate([
     (0, tegg_1.Inject)()
 ], BinarySyncerService.prototype, "httpclient", void 0);
@@ -278,4 +310,4 @@ BinarySyncerService = __decorate([
     })
 ], BinarySyncerService);
 exports.BinarySyncerService = BinarySyncerService;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAiC;AACjC,sCAIqB;AAIrB,2DAA6B;AAC7B,qEAAiE;AAEjE,iDAA6D;AAC7D,oDAA2D;AAE3D,yCAAsC;AACtC,6CAA0C;AAG1C,qEAAkE;AAClE,kEAA+D;AAC/D,uEAAoE;AACpE,uEAAoE;AACpE,2EAAwE;AACxE,6EAA0E;AAC1E,iFAA8E;AAC9E,iFAA8E;AAC9E,2EAAwE;AACxE,+EAA4E;AAC5E,mFAAgF;AAChF,+EAA4E;AAC5E,mFAAgF;AAEhF,MAAM,aAAa,GAAG;IACpB,CAAC,sBAAW,CAAC,UAAU,CAAC,EAAE,uBAAU;IACpC,CAAC,sBAAW,CAAC,UAAU,CAAC,EAAE,uBAAU;IACpC,CAAC,sBAAW,CAAC,YAAY,CAAC,EAAE,2BAAY;IACxC,CAAC,sBAAW,CAAC,aAAa,CAAC,EAAE,6BAAa;IAC1C,CAAC,sBAAW,CAAC,eAAe,CAAC,EAAE,iCAAe;IAC9C,CAAC,sBAAW,CAAC,eAAe,CAAC,EAAE,iCAAe;IAC9C,CAAC,sBAAW,CAAC,YAAY,CAAC,EAAE,2BAAY;IACxC,CAAC,sBAAW,CAAC,cAAc,CAAC,EAAE,+BAAc;IAC5C,CAAC,sBAAW,CAAC,gBAAgB,CAAC,EAAE,mCAAgB;IAChD,CAAC,sBAAW,CAAC,cAAc,CAAC,EAAE,+BAAc;IAC5C,CAAC,sBAAW,CAAC,gBAAgB,CAAC,EAAE,mCAAgB;CACjD,CAAC;AAEF,SAAS,MAAM;IACb,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAKD,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,iCAAe;IAU/C,KAAK,CAAC,UAAU,CAAC,UAAkB,EAAE,MAAc,EAAE,IAAY;QACtE,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,MAAc;QACzC,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACrG,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QAC9C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAc;QACxC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,UAAkB,EAAE,QAAc;QACxD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,WAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;IAC/F,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,MAAc;QAClC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,IAAU;QACjC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,eAAQ,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,IAAU;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,aAAa,UAAU,UAAU,IAAI,CAAC,MAAM,MAAM,CAAC;QAClG,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,mCAAmC,UAAU,cAAc,CAAC,CAAC;QACnF,IAAI,CAAC,cAAc,EAAE;YACnB,IAAI,CAAC,KAAK,GAAG,mBAAmB,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,eAAe,UAAU,WAAW,IAAI,CAAC,KAAK,UAAU,MAAM,EAAE,CAAC,CAAC;YACxF,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,YAAY,UAAU,SAAS,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,EACvF,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACzE,OAAO;SACR;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,IAAI,GAAG,EAAE,CAAC;QACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6EAA6E,EAC5F,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACxC,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,aAAa,MAAM,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,iBAAiB,UAAU,cAAc,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+EAA+E,EAC9F,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;SACzC;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,eAAe,UAAU,WAAW,IAAI,CAAC,KAAK,UAAU,MAAM,EAAE,CAAC,CAAC;YACxF,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,YAAY,UAAU,SAAS,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,EACvF,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1E;IACH,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,cAA8B,EAAE,IAAU,EAAE,GAAW,EAAE,WAAW,GAAG,EAAE;QAC7F,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,IAAI,GAAa,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAChE,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,sBAAsB,MAAM,CAAC,KAAK,CAAC,MAAM,OAAO,QAAQ,CAAC,MAAM,mBAAmB,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YACnJ,KAAK,MAAM,CAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;gBAC3D,IAAI,IAAI,CAAC,KAAK,EAAE;oBACd,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC;oBACzH,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC5D,IAAI,GAAG,EAAE,CAAC;oBACV,MAAM,CAAE,QAAQ,EAAE,WAAW,CAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,GAAG,WAAW,GAAG,KAAK,GAAG,CAAC,CAAC;oBAC5H,IAAI,QAAQ,EAAE;wBACZ,gBAAgB,GAAG,IAAI,CAAC;qBACzB;yBAAM;wBACL,2DAA2D;wBAC3D,8BAA8B;wBAC9B,IAAI,WAAW,EAAE;4BACf,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;yBACjC;qBACF;iBACF;qBAAM;oBACL,kBAAkB;oBAClB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,iBAAiB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC;oBACtH,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC5D,IAAI,GAAG,EAAE,CAAC;oBACV,IAAI,SAAS,GAAG,EAAE,CAAC;oBACnB,IAAI;wBACF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAChC,MAAM,IAAA,6BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAU,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;wBAC/G,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,0BAA0B,OAAO,CAAC,gBAAgB,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,OAAO,OAAO,EAAE,CAAC,CAAC;wBACrL,SAAS,GAAG,OAAO,CAAC;wBACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;wBACxD,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,oCAAoC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;wBACjH,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;wBAC5D,IAAI,GAAG,EAAE,CAAC;qBACX;oBAAC,OAAO,GAAQ,EAAE;wBACjB,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAuB,EAAE;4BACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;4BAC1D,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,UAAU,WAAW,GAAG,KAAK,cAAc,IAAI,CAAC,SAAS,qBAAqB,CAAC,CAAC;yBAC/G;6BAAM;4BACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;4BAChE,gBAAgB,GAAG,IAAI,CAAC;4BACxB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,QAAQ,WAAW,GAAG,KAAK,cAAc,IAAI,CAAC,SAAS,WAAW,GAAG,EAAE,CAAC,CAAC;yBACxG;wBACD,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;wBAC5D,IAAI,GAAG,EAAE,CAAC;qBACX;4BAAS;wBACR,IAAI,SAAS,EAAE;4BACb,MAAM,IAAA,aAAE,EAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;yBACtC;qBACF;iBACF;aACF;YACD,IAAI,gBAAgB,EAAE;gBACpB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,qBAAqB,CAAC,CAAC;aACtD;iBAAM;gBACL,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,yBAAyB,CAAC,CAAC;aAC1D;YACD,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC7D;QACD,OAAO,CAAE,gBAAgB,EAAE,QAAQ,CAAE,CAAC;IACxC,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,UAAkB,EAAE,GAAW,EAAE,UAAwB;QAC1E,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC9E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;YAC9B,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAChC;QACD,MAAM,SAAS,GAAuC,EAAE,CAAC;QACzD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,UAAU,EAAE;gBACf,SAAS,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,eAAM,CAAC,MAAM,CAAC;wBAClB,QAAQ,EAAE,UAAU;wBACpB,MAAM,EAAE,GAAG;wBACX,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,IAAI,EAAE,CAAC;wBACP,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,SAAS,EAAE,IAAI,CAAC,GAAG;wBACnB,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;qBACpD,CAAC;oBACF,MAAM,EAAE,UAAU;iBACnB,CAAC,CAAC;aACJ;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE;gBACxC,SAAS,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,qBAAqB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBACrG,CAAC,CAAC;gBACH,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;gBAChC,UAAU,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC;gBAChE,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;aAC7B;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,OAAgB;QAC3D,IAAI,OAAO,EAAE;YACX,MAAM,IAAI,GAAG,MAAM,kBAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACxB,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kFAAkF,EACjG,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;SAC1D;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,oBAAoB,CAAC,UAAkB;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QACpC,IAAI,MAAM,CAAC,oBAAoB,EAAE;YAC/B,MAAM,YAAY,GAAG,kBAAQ,CAAC,UAAU,CAAC,CAAC;YAC1C,MAAM,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,IAAI,GAAG,MAAM,CAAC,cAAc,WAAW,CAAC;YACtG,OAAO,IAAI,qBAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,uBAAuB,CAAC,CAAC;SAC3F;QACD,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,kBAAQ,CAAC,EAAE;YAClD,IAAI,YAAY,CAAC,QAAQ,KAAK,UAAU,EAAE;gBACxC,OAAO,IAAI,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;aAC3F;SACF;IACH,CAAC;CACF,CAAA;AA/MC;IADC,IAAA,aAAM,GAAE;6DAC2C;AAEpD;IADC,IAAA,aAAM,GAAE;wDACiC;AAE1C;IADC,IAAA,aAAM,GAAE;uDACyC;AAElD;IADC,IAAA,aAAM,GAAE;uDAC+B;AAR7B,mBAAmB;IAH/B,IAAA,mBAAY,EAAC;QACZ,WAAW,EAAE,kBAAW,CAAC,MAAM;KAChC,CAAC;GACW,mBAAmB,CAiN/B;AAjNY,kDAAmB"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":"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"}

package/dist/app/port/controller/BinarySyncController.d.ts

@@ -6,6 +6,7 @@ export declare class BinarySyncController extends AbstractController {
     showBinaryHTML(ctx: EggContext): Promise<string>;
     listBinaries(): Promise<{
         name: string;
+        mergeCategory: string;
         description: string;
         distUrl: string;
         repoUrl: string;

package/dist/app/port/controller/BinarySyncController.js

@@ -27,6 +27,7 @@ let BinarySyncController = class BinarySyncController extends AbstractController
         return Object.values(binaries_1.default).map(binaryConfig => {
             return {
                 name: `${binaryConfig.category}/`,
+                mergeCategory: `${binaryConfig.mergeCategory}/`,
                 description: binaryConfig.description,
                 distUrl: binaryConfig.distUrl,
                 repoUrl: /^https?:\/\//.test(binaryConfig.repo) ? binaryConfig.repo : `https://github.com/${binaryConfig.repo}`,
@@ -36,6 +37,7 @@ let BinarySyncController = class BinarySyncController extends AbstractController
         });
     }
     async showBinary(ctx, binaryName, subpath) {
+        var _a;
         subpath = subpath || '/';
         if (subpath === '/') {
             const items = await this.binarySyncerService.listRootBinaries(binaryName);
@@ -45,7 +47,17 @@ let BinarySyncController = class BinarySyncController extends AbstractController
         const parsed = path_1.default.parse(subpath);
         const parent = parsed.dir === '/' ? '/' : `${parsed.dir}/`;
         const name = subpath.endsWith('/') ? `${parsed.base}/` : parsed.base;
-        const binary = await this.binarySyncerService.findBinary(binaryName, parent, name);
+        // 首先查询 binary === category 的情况
+        let binary = await this.binarySyncerService.findBinary(binaryName, parent, name);
+        if (!binary) {
+            // 查询不到再去查询 mergeCategory 的情况
+            const mergeCategory = (_a = binaries_1.default === null || binaries_1.default === void 0 ? void 0 : binaries_1.default[binaryName]) === null || _a === void 0 ? void 0 : _a.mergeCategory;
+            if (mergeCategory) {
+                // canvas/v2.6.1/canvas-v2.6.1-node-v57-linux-glibc-x64.tar.gz
+                // -> node-canvas-prebuilt/v2.6.1/node-canvas-prebuilt-v2.6.1-node-v57-linux-glibc-x64.tar.gz
+                binary = await this.binarySyncerService.findBinary(mergeCategory, parent, name.replace(new RegExp(`^${binaryName}-`), `${mergeCategory}-`));
+            }
+        }
         if (!binary) {
             throw new egg_errors_1.NotFoundError(`Binary "${binaryName}${subpath}" not found`);
         }
@@ -120,4 +132,4 @@ BinarySyncController = __decorate([
     (0, tegg_1.HTTPController)()
 ], BinarySyncController);
 exports.BinarySyncController = BinarySyncController;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmluYXJ5U3luY0NvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL0JpbmFyeVN5bmNDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVFxQjtBQUNyQixnREFBd0I7QUFDeEIsMkNBQTJDO0FBQzNDLDZEQUEwRDtBQUcxRCx3RUFBZ0Q7QUFHaEQsSUFBYSxvQkFBb0IsR0FBakMsTUFBYSxvQkFBcUIsU0FBUSx1Q0FBa0I7SUFRMUQsS0FBSyxDQUFDLGNBQWMsQ0FBWSxHQUFlO1FBQzdDLEdBQUcsQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDO1FBQ2xCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUM7SUFDNUIsQ0FBQztJQU1ELEtBQUssQ0FBQyxZQUFZO1FBQ2hCLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxrQkFBUSxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFO1lBQ2hELE9BQU87Z0JBQ0wsSUFBSSxFQUFFLEdBQUcsWUFBWSxDQUFDLFFBQVEsR0FBRztnQkFDakMsV0FBVyxFQUFFLFlBQVksQ0FBQyxXQUFXO2dCQUNyQyxPQUFPLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQzdCLE9BQU8sRUFBRSxjQUFjLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsc0JBQXNCLFlBQVksQ0FBQyxJQUFJLEVBQUU7Z0JBQy9HLElBQUksRUFBRSxLQUFLO2dCQUNYLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsYUFBYSxZQUFZLENBQUMsUUFBUSxHQUFHO2FBQzNFLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFNRCxLQUFLLENBQUMsVUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmluYXJ5U3luY0NvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL0JpbmFyeVN5bmNDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVFxQjtBQUNyQixnREFBd0I7QUFDeEIsMkNBQTJDO0FBQzNDLDZEQUEwRDtBQUcxRCx3RUFBZ0Q7QUFHaEQsSUFBYSxvQkFBb0IsR0FBakMsTUFBYSxvQkFBcUIsU0FBUSx1Q0FBa0I7SUFRMUQsS0FBSyxDQUFDLGNBQWMsQ0FBWSxHQUFlO1FBQzdDLEdBQUcsQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDO1FBQ2xCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUM7SUFDNUIsQ0FBQztJQU1ELEtBQUssQ0FBQyxZQUFZO1FBQ2hCLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxrQkFBUSxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFO1lBQ2hELE9BQU87Z0JBQ0wsSUFBSSxFQUFFLEdBQUcsWUFBWSxDQUFDLFFBQVEsR0FBRztnQkFDakMsYUFBYSxFQUFFLEdBQUcsWUFBWSxDQUFDLGFBQWEsR0FBRztnQkFDL0MsV0FBVyxFQUFFLFlBQVksQ0FBQyxXQUFXO2dCQUNyQyxPQUFPLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQzdCLE9BQU8sRUFBRSxjQUFjLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsc0JBQXNCLFlBQVksQ0FBQyxJQUFJLEVBQUU7Z0JBQy9HLElBQUksRUFBRSxLQUFLO2dCQUNYLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsYUFBYSxZQUFZLENBQUMsUUFBUSxHQUFHO2FBQzNFLENBQUM7UUFDSixD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

package/dist/config/binaries.d.ts

@@ -17,6 +17,7 @@ export declare type BinaryTaskConfig = {
     syncer: SyncerClass;
     repo: string;
     distUrl: string;
+    mergeCategory?: string;
     ignoreDirs?: string[];
     ignoreFiles?: string[];
     options?: {

package/dist/config/binaries.js

@@ -611,13 +611,6 @@ const binaries = {
         repo: 'eugeneware/ffmpeg-static',
         distUrl: 'https://github.com/eugeneware/ffmpeg-static/releases',
     },
-    canvas: {
-        category: 'canvas',
-        description: 'Node canvas is a Cairo backed Canvas implementation for NodeJS.',
-        syncer: SyncerClass.GithubBinary,
-        repo: 'Automattic/node-canvas',
-        distUrl: 'https://github.com/Automattic/node-canvas/releases',
-    },
     nodejieba: {
         category: 'nodejieba',
         description: '"结巴"中文分词的Node.js版本',
@@ -836,6 +829,43 @@ const binaries = {
         repo: 'dragonflyoss/image-service',
         distUrl: 'https://github.com/dragonflyoss/image-service/releases',
     },
+    canvas: {
+        category: 'canavs',
+        // canvas@<=2.6.1 二进制需要从 node-canvas-prebuilt 下载
+        mergeCategory: 'node-canvas-prebuilt',
+        description: 'Node canvas is a Cairo backed Canvas implementation for NodeJS.',
+        syncer: SyncerClass.GithubBinary,
+        repo: 'Automattic/node-canvas',
+        distUrl: 'https://github.com/Automattic/node-canvas/releases',
+    },
+    'canvas-prebuilt': {
+        category: 'canvas-prebuilt',
+        distUrl: 'https://github.com/node-gfx/node-canvas-prebuilt/releases',
+        repo: 'chearon/node-canvas-prebuilt',
+        description: 'Prebuilt versions of node-canvas as a drop-in replacement',
+        syncer: SyncerClass.GithubBinary,
+        options: {
+            nodeArchs: {
+                linux: ['x64'],
+                darwin: ['x64'],
+                win32: ['x64'],
+            },
+        },
+    },
+    'node-canvas-prebuilt': {
+        category: 'node-canvas-prebuilt',
+        distUrl: 'https://github.com/node-gfx/node-canvas-prebuilt/releases',
+        repo: 'node-gfx/node-canvas-prebuilt',
+        description: 'Repo used to build binaries for node-canvas on CI',
+        syncer: SyncerClass.GithubBinary,
+        options: {
+            nodeArchs: {
+                linux: ['x64'],
+                darwin: ['x64'],
+                win32: ['x64'],
+            },
+        },
+    },
 };
 exports.default = binaries;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"binaries.js","sourceRoot":"","sources":["../../config/binaries.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"binaries.js","sourceRoot":"","sources":["../../config/binaries.ts"],"names":[],"mappings":";;;AAAA,IAAY,WAYX;AAZD,WAAY,WAAW;IACrB,wCAAyB,CAAA;IACzB,wCAAyB,CAAA;IACzB,8CAA+B,CAAA;IAC/B,4CAA6B,CAAA;IAC7B,4CAA6B,CAAA;IAC7B,gDAAiC,CAAA;IACjC,kDAAmC,CAAA;IACnC,kDAAmC,CAAA;IACnC,oDAAqC,CAAA;IACrC,gDAAiC,CAAA;IACjC,oDAAqC,CAAA;AACvC,CAAC,EAZW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAYtB;AA8BD,MAAM,QAAQ,GAEV;IACF,aAAa;IACb,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,sKAAsK;QACnL,MAAM,EAAE,WAAW,CAAC,UAAU;QAC9B,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,qBAAqB;KAC/B;IACD,aAAa;IACb,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,2EAA2E;QACxF,MAAM,EAAE,WAAW,CAAC,UAAU;QAC9B,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,yBAAyB;KACnC;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,2BAA2B;QACxC,MAAM,EAAE,WAAW,CAAC,UAAU;QAC9B,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,gCAAgC;KAC1C;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,uBAAuB;QACpC,MAAM,EAAE,WAAW,CAAC,UAAU;QAC9B,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,qCAAqC;KAC/C;IACD,wBAAwB,EAAE;QACxB,QAAQ,EAAE,wBAAwB;QAClC,WAAW,EAAE,yEAAyE;QACtF,MAAM,EAAE,WAAW,CAAC,UAAU;QAC9B,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,uDAAuD;KACjE;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,mJAAmJ;QAChK,MAAM,EAAE,WAAW,CAAC,UAAU;QAC9B,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,4CAA4C;KACtD;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,WAAW,EAAE,yDAAyD;QACtE,MAAM,EAAE,WAAW,CAAC,UAAU;QAC9B,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,mCAAmC;QAC5C,WAAW,EAAE;YACX,wBAAwB;SACzB;KACF;IACD,gBAAgB;IAChB,OAAO,EAAE;QACP,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,sEAAsE;QACnF,MAAM,EAAE,WAAW,CAAC,aAAa;QACjC,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,yBAAyB;KACnC;IACD,kBAAkB;IAClB,wBAAwB,EAAE;QACxB,QAAQ,EAAE,wBAAwB;QAClC,WAAW,EAAE,6BAA6B;QAC1C,MAAM,EAAE,WAAW,CAAC,eAAe;QACnC,IAAI,EAAE,4BAA4B;QAClC,OAAO,EAAE,kDAAkD;KAC5D;IACD,kBAAkB;IAClB,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,4BAA4B;QACtC,WAAW,EAAE,+CAA+C;QAC5D,MAAM,EAAE,WAAW,CAAC,eAAe;QACnC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,gFAAgF;KAC1F;IACD,mBAAmB;IACnB,YAAY,EAAE;QACZ,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,2CAA2C;QACxD,MAAM,EAAE,WAAW,CAAC,gBAAgB;QACpC,IAAI,EAAE,oEAAoE;QAC1E,OAAO,EAAE,2CAA2C;KACrD;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,uBAAuB;QACpC,MAAM,EAAE,WAAW,CAAC,gBAAgB;QACpC,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,2CAA2C;KACrD;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,+BAA+B;QAC5C,MAAM,EAAE,WAAW,CAAC,gBAAgB;QACpC,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,gDAAgD;QACzD,OAAO,EAAE;YACP,oBAAoB,EAAE,IAAI;SAC3B;KACF;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,6EAA6E;QAC1F,MAAM,EAAE,WAAW,CAAC,gBAAgB;QACpC,IAAI,EAAE,yBAAyB;QAC/B,OAAO,EAAE,sCAAsC;KAChD;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,8BAA8B;QAC3C,MAAM,EAAE,WAAW,CAAC,gBAAgB;QACpC,IAAI,EAAE,iBAAiB;QACvB,OAAO,EAAE,6CAA6C;QACtD,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,KAAK,EAAE,CAAE,KAAK,CAAE;gBAChB,MAAM,EAAE,CAAE,KAAK,CAAE;gBACjB,kFAAkF;gBAClF,KAAK,EAAE,CAAE,KAAK,EAAE,MAAM,CAAE;aACzB;SACF;QACD,wBAAwB;QACxB,OAAO,EAAE,IAAI;KACd;IACD,eAAe;IACf,YAAY,EAAE;QACZ,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,wFAAwF;QACrG,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,gDAAgD;QACtD,OAAO,EAAE,8CAA8C;KACxD;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,0CAA0C;QACvD,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,2BAA2B;QACjC,OAAO,EAAE,kDAAkD;KAC5D;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,gBAAgB;QAC1B,WAAW,EAAE,iDAAiD;QAC9D,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,+BAA+B;QACrC,OAAO,EAAE,0CAA0C;QACnD,UAAU,EAAE;YACV,WAAW;SACZ;KACF;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,4CAA4C;QACzD,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,uDAAuD;KACjE;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,qCAAqC;QAClD,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,6CAA6C;KACvD;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,8EAA8E;QAC3F,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,iBAAiB;QACvB,OAAO,EAAE,4CAA4C;KACtD;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,8EAA8E;QAC3F,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,iBAAiB;QACvB,OAAO,EAAE,2CAA2C;KACrD;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,WAAW,EAAE,0IAA0I;QACvJ,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,mDAAmD;QAC5D,UAAU,EAAE;YACV,wEAAwE;YACxE,8CAA8C;YAC9C,iCAAiC;YACjC,mBAAmB;YACnB,kBAAkB;YAClB,iBAAiB;YACjB,aAAa;YACb,UAAU;YACV,MAAM;YACN,aAAa;YACb,sBAAsB;YACtB,iCAAiC;YACjC,8BAA8B;YAC9B,oBAAoB;SACrB;KACF;IACD,iBAAiB;IACjB,cAAc,EAAE;QACd,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,+EAA+E;QAC5F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,oEAAoE;YACpE,aAAa,EAAE,CAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAE;YAC9D,SAAS,EAAE;gBACT,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACvB,OAAO,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACzB,KAAK,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACvB,GAAG,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;aACtB;YACD,QAAQ,EAAE;gBACR,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,OAAO,EAAE,CAAE,UAAU,CAAE;gBACvB,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,GAAG,EAAE,CAAE,cAAc,EAAE,gBAAgB,CAAE;aAC1C;SACF;KACF;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,+EAA+E;QAC5F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,oEAAoE;YACpE,aAAa,EAAE,CAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAE;YACrD,SAAS,EAAE;gBACT,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACvB,OAAO,EAAE,CAAE,KAAK,CAAE;gBAClB,GAAG,EAAE,EAAE;aACR;YACD,QAAQ,EAAE;gBACR,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,OAAO,EAAE,CAAE,UAAU,CAAE;gBACvB,GAAG,EAAE,CAAE,cAAc,CAAE;aACxB;SACF;KACF;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,8EAA8E;QAC3F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,mDAAmD;YACnD,cAAc,EAAE,SAAS;YACzB,mEAAmE;YACnE,mEAAmE;YACnE,aAAa,EAAE,CAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAE;YACjD,SAAS,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAE;gBACT,GAAG,EAAE,EAAE;aACR;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAE,OAAO,CAAE;gBAChB,KAAK,EAAE,CAAE,OAAO,CAAE;gBAClB,KAAK,EAAE,CAAE,OAAO,CAAE;gBAClB,GAAG,EAAE,CAAE,WAAW,CAAE;aACrB;SACF;KACF;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,+EAA+E;QAC5F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,oDAAoD;YACpD,cAAc,EAAE,UAAU;YAC1B,oEAAoE;YACpE,oEAAoE;YACpE,aAAa,EAAE,CAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAE;YACrD,SAAS,EAAE;gBACT,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACvB,OAAO,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACzB,GAAG,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;aACtB;YACD,QAAQ,EAAE;gBACR,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,OAAO,EAAE,CAAE,UAAU,CAAE;gBACvB,GAAG,EAAE,CAAE,cAAc,CAAE;aACxB;SACF;KACF;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,8EAA8E;QAC3F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,mEAAmE;YACnE,mEAAmE;YACnE,aAAa,EAAE,CAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAE;YAC9D,SAAS,EAAE;gBACT,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACvB,OAAO,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACzB,KAAK,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACvB,GAAG,EAAE,EAAE;aACR;YACD,QAAQ,EAAE;gBACR,KAAK,EAAE,CAAE,SAAS,CAAE;gBACpB,KAAK,EAAE,CAAE,SAAS,CAAE;gBACpB,OAAO,EAAE,CAAE,SAAS,CAAE;gBACtB,KAAK,EAAE,CAAE,SAAS,CAAE;gBACpB,GAAG,EAAE,CAAE,aAAa,CAAE;aACvB;SACF;KACF;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,eAAe;QACzB,WAAW,EAAE,gFAAgF;QAC7F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,qEAAqE;YACrE,qEAAqE;YACrE,aAAa,EAAE,CAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAE;YAC1C,SAAS,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAE;aACV;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAE,WAAW,CAAE;gBACpB,KAAK,EAAE,CAAE,WAAW,CAAE;gBACtB,KAAK,EAAE,CAAE,eAAe,CAAE;aAC3B;SACF;KACF;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,eAAe;QACzB,WAAW,EAAE,gFAAgF;QAC7F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,qEAAqE;YACrE,qEAAqE;YACrE,aAAa,EAAE,CAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAE;YAC1C,SAAS,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAE;aACV;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAE,WAAW,CAAE;gBACpB,KAAK,EAAE,CAAE,WAAW,CAAE;gBACtB,KAAK,EAAE,CAAE,eAAe,CAAE;aAC3B;SACF;KACF;IACD,qBAAqB,EAAE;QACrB,QAAQ,EAAE,qBAAqB;QAC/B,WAAW,EAAE,sFAAsF;QACnG,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,8BAA8B;QACpC,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,2EAA2E;YAC3E,2EAA2E;YAC3E,aAAa,EAAE,CAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAE;YACxC,SAAS,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,EAAE;gBACT,GAAG,EAAE,EAAE;aACR;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAE,iBAAiB,CAAE;gBAC1B,KAAK,EAAE,CAAE,iBAAiB,CAAE;gBAC5B,GAAG,EAAE,CAAE,qBAAqB,CAAE;aAC/B;SACF;KACF;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,+EAA+E;QAC5F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,oEAAoE;YACpE,oEAAoE;YACpE,aAAa,EAAE,CAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAE;YACxC,SAAS,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,EAAE;gBACT,GAAG,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;aACtB;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAE,UAAU,CAAE;gBACnB,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,GAAG,EAAE,CAAE,cAAc,CAAE;aACxB;SACF;KACF;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,6EAA6E;QAC1F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,kEAAkE;YAClE,kEAAkE;YAClE,aAAa,EAAE,CAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAE;YACrD,SAAS,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACvB,OAAO,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACzB,KAAK,EAAE,EAAG;aACX;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAE,UAAU,CAAE;gBACnB,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,OAAO,EAAE,CAAE,QAAQ,CAAE;gBACrB,KAAK,EAAE,CAAE,cAAc,CAAE;aAC1B;SACF;KACF;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,+EAA+E;QAC5F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,oEAAoE;YACpE,aAAa,EAAE,CAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAE;YAC1C,SAAS,EAAE;gBACT,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAG;gBACV,GAAG,EAAE,EAAG;aACT;YACD,QAAQ,EAAE;gBACR,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,KAAK,EAAE,CAAE,UAAU,CAAE;gBACrB,GAAG,EAAE,CAAE,cAAc,CAAE;aACxB;SACF;KACF;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,8EAA8E;QAC3F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,mDAAmD;YACnD,cAAc,EAAE,SAAS;YACzB,mEAAmE;YACnE,aAAa,EAAE,CAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAE;YAC1C,SAAS,EAAE;gBACT,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAG;gBACV,GAAG,EAAE,EAAG;aACT;YACD,QAAQ,EAAE;gBACR,KAAK,EAAE,CAAE,SAAS,CAAE;gBACpB,KAAK,EAAE,CAAE,SAAS,CAAE;gBACpB,GAAG,EAAE,CAAE,aAAa,CAAE;aACvB;SACF;KACF;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,6EAA6E;QAC1F,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,kEAAkE;YAClE,aAAa,EAAE,CAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAE;YAC1C,SAAS,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAG;aACX;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAE,QAAQ,CAAE;gBACjB,KAAK,EAAE,CAAE,QAAQ,CAAE;gBACnB,KAAK,EAAE,CAAE,YAAY,CAAE;aACxB;SACF;KACF;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,4EAA4E;QACzF,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,iEAAiE;YACjE,aAAa,EAAE,CAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAE;YACxC,SAAS,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;gBACvB,GAAG,EAAE,CAAE,KAAK,EAAE,KAAK,CAAE;aACtB;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,CAAE,OAAO,CAAE;gBAChB,KAAK,EAAE,CAAE,OAAO,CAAE;gBAClB,GAAG,EAAE,CAAE,WAAW,CAAE;aACrB;SACF;KACF;IACD,eAAe;IACf,GAAG,EAAE;QACH,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,qCAAqC;QAC9C,OAAO,EAAE;YACP,OAAO,EAAE,CAAC;SACX;KACF;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,2GAA2G;QACxH,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,kDAAkD;KAC5D;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,gCAAgC;QAC7C,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,4CAA4C;KACtD;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,eAAe;QACzB,WAAW,EAAE,kGAAkG;QAC/G,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,yBAAyB;QAC/B,OAAO,EAAE,qDAAqD;KAC/D;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,kEAAkE;QAC/E,MAAM,EAAE,WAAW,CAAC,cAAc;QAClC,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,+CAA+C;QACxD,OAAO,EAAE;YACP,6BAA6B;YAC7B,OAAO,EAAE,CAAC;SACX;KACF;IACD,kBAAkB,EAAE;QAClB,QAAQ,EAAE,kBAAkB;QAC5B,WAAW,EAAE,kEAAkE;QAC/E,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,gDAAgD;QACzD,OAAO,EAAE;YACP,OAAO,EAAE,CAAC;SACX;KACF;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,2BAA2B;QACrC,WAAW,EAAE,kHAAkH;QAC/H,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,6CAA6C;QACnD,OAAO,EAAE,yEAAyE;KACnF;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,eAAe;QACzB,WAAW,EAAE,0DAA0D;QACvE,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,sDAAsD;KAChE;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,oBAAoB;QACjC,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,+CAA+C;KACzD;IACD,iBAAiB,EAAE;QACjB,QAAQ,EAAE,iBAAiB;QAC3B,WAAW,EAAE,oDAAoD;QACjE,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,iDAAiD;KAC3D;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,0BAA0B;QACvC,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,uCAAuC;KACjD;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,+CAA+C;QAC5D,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,mCAAmC;QACzC,OAAO,EAAE,+DAA+D;KACzE;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,uBAAuB;QACpC,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,iDAAiD;KAC3D;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,0EAA0E;QACvF,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,iBAAiB;QACvB,OAAO,EAAE,6CAA6C;KACvD;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,6CAA6C;QAC1D,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,iDAAiD;KAC3D;IACD,EAAE,EAAE;QACF,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,iCAAiC;QAC9C,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,iDAAiD;KAC3D;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,sFAAsF;QACnG,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,2CAA2C;KACrD;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,gDAAgD;QAC7D,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,+CAA+C;KACzD;IACD,GAAG,EAAE;QACH,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,qDAAqD;QAClE,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,uCAAuC;KACjD;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,gBAAgB;QAC1B,WAAW,EAAE,wCAAwC;QACrD,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,2BAA2B;QACjC,OAAO,EAAE,uDAAuD;KACjE;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,sDAAsD;QACnE,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,iDAAiD;KAC3D;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,yEAAyE;QACtF,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,kDAAkD;KAC5D;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,eAAe;QACzB,WAAW,EAAE,2HAA2H;QACxI,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,kDAAkD;KAC5D;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,OAAO;QACjB,WAAW,EAAE,2KAA2K;QACxL,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,0CAA0C;KACpD;IACD,GAAG,EAAE;QACH,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,2IAA2I;QACxJ,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,iBAAiB;QACvB,OAAO,EAAE,6CAA6C;KACvD;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,sFAAsF;QACnG,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,kDAAkD;KAC5D;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,WAAW,EAAE,+CAA+C;QAC5D,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,kDAAkD;KAC5D;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,WAAW,EAAE,6CAA6C;QAC1D,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,+CAA+C;KACzD;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,kDAAkD;QAC/D,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,gDAAgD;KAC1D;IACD,iBAAiB,EAAE;QACjB,QAAQ,EAAE,iBAAiB;QAC3B,WAAW,EAAE,uIAAuI;QACpJ,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,2BAA2B;QACjC,OAAO,EAAE,uDAAuD;KACjE;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,yDAAyD;QACtE,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,0CAA0C;KACpD;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,6BAA6B;QAC1C,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,iDAAiD;KAC3D;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,4BAA4B;QACzC,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,mDAAmD;KAC7D;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,8FAA8F;QAC3G,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,2CAA2C;KACrD;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,yDAAyD;QACtE,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,mDAAmD;KAC7D;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,gBAAgB;QAC1B,WAAW,EAAE,8DAA8D;QAC3E,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,yBAAyB;QAC/B,OAAO,EAAE,qDAAqD;KAC/D;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,WAAW,EAAE,6BAA6B;QAC1C,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,8CAA8C;KACxD;IACD,mBAAmB;IACnB,UAAU,EAAE;QACV,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,2DAA2D;QACxE,MAAM,EAAE,WAAW,CAAC,gBAAgB;QACpC,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,kDAAkD;KAC5D;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,OAAO;QACjB,WAAW,EAAE,0FAA0F;QACvG,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,4BAA4B;QAClC,OAAO,EAAE,wDAAwD;KAClE;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,gDAAgD;QAChD,aAAa,EAAE,sBAAsB;QACrC,WAAW,EAAE,iEAAiE;QAC9E,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,oDAAoD;KAC9D;IACD,iBAAiB,EAAE;QACjB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,2DAA2D;QACpE,IAAI,EAAE,8BAA8B;QACpC,WAAW,EAAE,2DAA2D;QACxE,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,KAAK,EAAE,CAAE,KAAK,CAAE;gBAChB,MAAM,EAAE,CAAE,KAAK,CAAE;gBACjB,KAAK,EAAE,CAAE,KAAK,CAAE;aACjB;SACF;KACF;IACD,sBAAsB,EAAE;QACtB,QAAQ,EAAE,sBAAsB;QAChC,OAAO,EAAE,2DAA2D;QACpE,IAAI,EAAE,+BAA+B;QACrC,WAAW,EAAE,mDAAmD;QAChE,MAAM,EAAE,WAAW,CAAC,YAAY;QAChC,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,KAAK,EAAE,CAAE,KAAK,CAAE;gBAChB,MAAM,EAAE,CAAE,KAAK,CAAE;gBACjB,KAAK,EAAE,CAAE,KAAK,CAAE;aACjB;SACF;KACF;CACF,CAAC;AAEF,kBAAe,QAAQ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "description": "npm core",
   "files": [
     "dist/**/*"