@o3r/schematics 14.0.0-next.0 → 14.0.0-next.10
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/package.json +47 -47
- package/src/modules/index.d.ts +3 -3
- package/src/modules/index.js +3 -3
- package/src/modules/{modules.constants.d.ts → modules-constants.d.ts} +1 -1
- package/src/modules/{modules.constants.d.ts.map → modules-constants.d.ts.map} +1 -1
- package/src/modules/{modules.constants.js → modules-constants.js} +1 -1
- package/src/modules/{modules.constants.js.map → modules-constants.js.map} +1 -1
- package/src/modules/{modules.display.rule.d.ts → modules-display-rule.d.ts} +3 -3
- package/src/modules/{modules.display.rule.d.ts.map → modules-display-rule.d.ts.map} +1 -1
- package/src/modules/{modules.display.rule.js → modules-display-rule.js} +3 -3
- package/src/modules/{modules.display.rule.js.map → modules-display-rule.js.map} +1 -1
- package/src/modules/{modules.helpers.d.ts → modules-helpers.d.ts} +3 -3
- package/src/modules/{modules.helpers.d.ts.map → modules-helpers.d.ts.map} +1 -1
- package/src/modules/{modules.helpers.js → modules-helpers.js} +6 -5
- package/src/modules/modules-helpers.js.map +1 -0
- package/src/rule-factories/add-imports/index.js +2 -1
- package/src/rule-factories/add-imports/index.js.map +1 -1
- package/src/rule-factories/check-packages-peers/index.js +2 -1
- package/src/rule-factories/check-packages-peers/index.js.map +1 -1
- package/src/rule-factories/dev-tools/devtools-registration.d.ts.map +1 -1
- package/src/rule-factories/dev-tools/devtools-registration.js +6 -4
- package/src/rule-factories/dev-tools/devtools-registration.js.map +1 -1
- package/src/rule-factories/editor-config/{editor-config.helpers.d.ts → editor-config-helpers.d.ts} +1 -1
- package/src/rule-factories/editor-config/{editor-config.helpers.d.ts.map → editor-config-helpers.d.ts.map} +1 -1
- package/src/rule-factories/editor-config/{editor-config.helpers.js → editor-config-helpers.js} +3 -3
- package/src/rule-factories/editor-config/{editor-config.helpers.js.map → editor-config-helpers.js.map} +1 -1
- package/src/rule-factories/editor-config/editor-config.js +1 -1
- package/src/rule-factories/ng-add/dependencies.js +4 -3
- package/src/rule-factories/ng-add/dependencies.js.map +1 -1
- package/src/rule-factories/ng-add/index.d.ts +1 -1
- package/src/rule-factories/ng-add/index.js +1 -1
- package/src/rule-factories/ng-add/{ng-add.helpers.d.ts → ng-add-helpers.d.ts} +1 -1
- package/src/rule-factories/ng-add/{ng-add.helpers.d.ts.map → ng-add-helpers.d.ts.map} +1 -1
- package/src/rule-factories/ng-add/{ng-add.helpers.js → ng-add-helpers.js} +4 -3
- package/src/rule-factories/ng-add/ng-add-helpers.js.map +1 -0
- package/src/rule-factories/update-imports/update-ts-imports.js +2 -1
- package/src/rule-factories/update-imports/update-ts-imports.js.map +1 -1
- package/src/tasks/package-manager/interfaces.d.ts +1 -1
- package/src/utility/ast.js +2 -1
- package/src/utility/ast.js.map +1 -1
- package/src/utility/collection.js +2 -2
- package/src/utility/collection.js.map +1 -1
- package/src/utility/component.js +3 -2
- package/src/utility/component.js.map +1 -1
- package/src/utility/dependencies.js +4 -3
- package/src/utility/dependencies.js.map +1 -1
- package/src/utility/environment.d.ts +1 -1
- package/src/utility/environment.js +4 -3
- package/src/utility/environment.js.map +1 -1
- package/src/utility/file-info.js +2 -1
- package/src/utility/file-info.js.map +1 -1
- package/src/utility/index.d.ts +2 -1
- package/src/utility/index.d.ts.map +1 -1
- package/src/utility/index.js +2 -1
- package/src/utility/index.js.map +1 -1
- package/src/utility/loaders.d.ts +16 -3
- package/src/utility/loaders.d.ts.map +1 -1
- package/src/utility/loaders.js +44 -5
- package/src/utility/loaders.js.map +1 -1
- package/src/utility/matching-peers.js +2 -1
- package/src/utility/matching-peers.js.map +1 -1
- package/src/utility/modules.d.ts +2 -2
- package/src/utility/modules.d.ts.map +1 -1
- package/src/utility/modules.js +10 -7
- package/src/utility/modules.js.map +1 -1
- package/src/utility/monorepo.js +2 -1
- package/src/utility/monorepo.js.map +1 -1
- package/src/utility/ng-update.d.ts +8 -0
- package/src/utility/ng-update.d.ts.map +1 -0
- package/src/utility/ng-update.js +74 -0
- package/src/utility/ng-update.js.map +1 -0
- package/src/utility/package-version.js +2 -1
- package/src/utility/package-version.js.map +1 -1
- package/src/utility/routes.js +2 -1
- package/src/utility/routes.js.map +1 -1
- package/src/utility/sub-entry.js +2 -1
- package/src/utility/sub-entry.js.map +1 -1
- package/src/utility/{template-property.helper.d.ts → template-property-helper.d.ts} +21 -8
- package/src/utility/template-property-helper.d.ts.map +1 -0
- package/src/utility/{template-property.helper.js → template-property-helper.js} +36 -10
- package/src/utility/template-property-helper.js.map +1 -0
- package/src/utility/update-imports.js +2 -1
- package/src/utility/update-imports.js.map +1 -1
- package/src/utility/update-pipes.d.ts.map +1 -1
- package/src/utility/update-pipes.js +8 -3
- package/src/utility/update-pipes.js.map +1 -1
- package/src/utility/wrapper.js +4 -3
- package/src/utility/wrapper.js.map +1 -1
- package/src/modules/modules.helpers.js.map +0 -1
- package/src/rule-factories/ng-add/ng-add.helpers.js.map +0 -1
- package/src/utility/template-property.helper.d.ts.map +0 -1
- package/src/utility/template-property.helper.js.map +0 -1
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ngAddPackages = ngAddPackages;
|
|
4
4
|
exports.ngAddDependenciesRule = ngAddDependenciesRule;
|
|
5
|
+
const tslib_1 = require("tslib");
|
|
5
6
|
const node_fs_1 = require("node:fs");
|
|
6
|
-
const path = require("node:path");
|
|
7
|
+
const path = tslib_1.__importStar(require("node:path"));
|
|
7
8
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
8
9
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
9
10
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
@@ -21,7 +22,7 @@ const getNgAddSchema = (packageName, context) => {
|
|
|
21
22
|
};
|
|
22
23
|
const sortDependencies = (packageJson, depType) => {
|
|
23
24
|
packageJson[depType] = packageJson[depType]
|
|
24
|
-
? Object.fromEntries(Object.entries(packageJson[depType] || {}).
|
|
25
|
+
? Object.fromEntries(Object.entries(packageJson[depType] || {}).toSorted(([key1, _val1], [key2, _val2]) => key1.localeCompare(key2)))
|
|
25
26
|
: undefined;
|
|
26
27
|
};
|
|
27
28
|
/**
|
|
@@ -181,4 +182,4 @@ function ngAddDependenciesRule(options, packageJsonPath, deps) {
|
|
|
181
182
|
]);
|
|
182
183
|
};
|
|
183
184
|
}
|
|
184
|
-
//# sourceMappingURL=ng-add
|
|
185
|
+
//# sourceMappingURL=ng-add-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ng-add-helpers.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add-helpers.ts"],"names":[],"mappings":";;AA6DA,sCA8GC;AA2BD,sDAkDC;;AAxPD,qCAIiB;AACjB,wDAAkC;AAClC,2DAQoC;AACpC,4DAE0C;AAC1C,2EAEkD;AAOlD,+CAM6B;AAC7B,iDAGwB;AAExB,MAAM,cAAc,GAAG,CAAC,WAAmB,EAAE,OAAyB,EAAE,EAAE;IACxE,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAChE,OAAO,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,WAAW,EAAE,CAAC,CAAC;QAC1D,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,WAAwB,EAAE,OAAgE,EAAE,EAAE;IACtH,WAAW,CAAC,OAAO,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC;QACzC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QACrI,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,QAAkB,EAAE,OAA8F,EAAE,eAAe,GAAG,eAAe;IACjL,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,iBAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAClD,wHAAwH;IACxH,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,gBAAgB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC;IACnI,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAA+B,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CACpG,CAAC,WAAW,EAAE,OAAO,OAAO,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpG,IAAI,OAAO,EAAE,gBAAgB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACvF,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,mBAAmB,GAAG,CAAC,WAAmB,EAAE,EAAE;QAClD,IAAI,YAAgC,CAAC;QACrC,KAAK,MAAM,gBAAgB,IAAI,IAAI,GAAG,CAAC,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC;gBACH,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC1H,IAAI,OAA2B,CAAC;gBAChC,IAAI,OAAO,EAAE,cAAc,KAAK,iCAAkB,CAAC,GAAG,EAAE,CAAC;oBACvD,OAAO,GAAG,qBAAqB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;gBAC/D,CAAC;qBAAM,IAAI,OAAO,EAAE,cAAc,KAAK,iCAAkB,CAAC,IAAI,EAAE,CAAC;oBAC/D,OAAO,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;gBAChE,CAAC;qBAAM,CAAC;oBACN,OAAO,GAAG,qBAAqB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC5D,CAAC;gBACD,IAAI,YAAY,IAAI,OAAO,KAAK,YAAY,EAAE,CAAC;oBAC7C,+GAA+G;oBAC/G,OAAO;gBACT,CAAC;gBACD,YAAY,GAAG,OAAO,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO;YACT,CAAC;QACH,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,MAA2B,EAAE,EAAE;QACjD,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,UAAU,IAAI,EAAE,CAAC;QACtE,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAsB,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,KAAK,CAAgB,EAAE,EAAE;YAC3G,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC1B,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC;IAC1F,MAAM,cAAc,GAAG,IAAA,yBAAiB,GAAE,CAAC;IAC3C,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACnJ,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,iBAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAA,kBAAK,EAAC;QACX,8BAA8B;QAC9B,CAAC,IAAI,EAAE,EAAE;YACP,KAAK,MAAM,QAAQ,IAAI,IAAI,GAAG,CAAC,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC;gBACpE,MAAM,WAAW,GAAgB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAgB,CAAC;gBACxE,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBAC/B,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC;oBAClD,IAAI,OAAO,EAAE,cAAc,KAAK,iCAAkB,CAAC,GAAG,EAAE,CAAC;wBACvD,WAAW,CAAC,eAAe,GAAG,EAAE,GAAG,WAAW,CAAC,eAAe,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC;oBAC3F,CAAC;yBAAM,IAAI,OAAO,EAAE,cAAc,KAAK,iCAAkB,CAAC,IAAI,EAAE,CAAC;wBAC/D,WAAW,CAAC,gBAAgB,GAAG,EAAE,GAAG,WAAW,CAAC,gBAAgB,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC;oBAC7F,CAAC;yBAAM,CAAC;wBACN,WAAW,CAAC,YAAY,GAAG,EAAE,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC;oBACrF,CAAC;gBACH,CAAC,CAAC,CAAC;gBACF,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAW,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBACrF,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACzC,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QACD,cAAc;QACd,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;YACtB,IAAI,OAAO,EAAE,qBAAqB,EAAE,CAAC;gBACnC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;wHACiD,CAAC,CAAC;gBAClH,OAAO,iBAAI,CAAC;YACd,CAAC;YAED,IAAI,GAAG,CAAC,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAChE,IAAA,mBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjF,IAAA,uBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7E,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,CAAC;gBACzC,cAAc,EAAE,cAAc;gBAC9B,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE,KAAK;aACN,CAAC,CAAC,CAAC;YAEX,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC1C,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAA0B,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,MAAa,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAC7J,CAAC;YAEF,MAAM,aAAa,GAAG,iBAAiB;iBACpC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;iBAC9F,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,EAAE;gBAC3C,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,mCAAmC,WAAW,2BAA2B,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,iBAAiB,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACrK,CAAC;gBACD,OAAO,CAAC,CAAC,eAAe,CAAC;YAC3B,CAAC,CAAC;iBACD,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,IAAA,8BAAiB,EAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC;YACrH,OAAO,IAAA,kBAAK,EAAC,aAAa,CAAC,CAAC;QAC9B,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAqBD;;;;;GAKG;AACH,SAAgB,qBAAqB,CACnC,OAAqB,EACrB,eAAuB,EACvB,IAAqE;IAErE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,EACJ,qBAAqB,GAAG,EAAE,EAC1B,wBAAwB,GAAG,EAAE,EAC7B,oBAAoB,GAAG,EAAE,EAC1B,GAAG,MAAM,CAAC,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,IAAA,sBAAc,EAAC,eAAe,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,0BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,IAAI,IAAI,GAAG,CAAC;QACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAgB,CAAC;QAC3G,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxG,MAAM,oBAAoB,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACpE,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE;wBACxE,KAAK,EAAE,IAAA,sCAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAA,sCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAC1G,MAAM,wBAAwB,GAAG,IAAA,mCAA2B,EAC1D;YACE,wBAAwB;YACxB,qBAAqB;YACrB,kBAAkB,EAAE,eAAe;YACnC,WAAW,EAAE,gBAAgB,EAAE,WAAW;YAC1C,kBAAkB;SACnB,EACD,OAAO,CAAC,MAAM,CACf,CAAC;QACF,MAAM,YAAY,GAAG;YACnB,GAAG,oBAAoB;YACvB,GAAG,wBAAwB;SAC5B,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,gCAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateImports = updateImports;
|
|
4
|
-
const
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const ts = tslib_1.__importStar(require("typescript"));
|
|
5
6
|
const index_1 = require("../../utility/index");
|
|
6
7
|
const escapeRegExp = (str) => str.replace(/[$()*+./?[\\\]^{|}-]/g, '\\$&');
|
|
7
8
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ts-imports.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":";;AAmBA,sCA0BC
|
|
1
|
+
{"version":3,"file":"update-ts-imports.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":";;AAmBA,sCA0BC;;AA1CD,uDAAiC;AACjC,+CAK6B;AAE7B,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AAEnF;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,aAA6B,EAAE,EAAE,kBAA0C,EAAE,EAAE,QAAQ,GAAG,KAAK;IAC3H,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,qCAA6B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,2CAAmC,EAAC,IAAI,CAAC,CAAC;QAE/G,6BAA6B;QAC7B,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7G,gEAAgE;QAChE,MAAM,oBAAoB,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxH,IAAI,qBAAqB,GAAG,CAAC,CAAC;QAE9B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,IAAI,EACJ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EACnB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;YACF,qBAAqB,IAAI,IAAA,2BAAmB,EAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,oBAAoB,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;QACnJ,CAAC,CAAC,CAAC;QAEH,IAAI,qBAAqB,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,qBAAqB,yEAAyE,CAAC,CAAC;QACzK,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Tree } from '@angular-devkit/schematics';
|
|
2
2
|
/**
|
|
3
|
-
* Duplication of the interface not exposed by the
|
|
3
|
+
* Duplication of the interface not exposed by the `@angular-devkit/schematics`
|
|
4
4
|
*/
|
|
5
5
|
export interface NodePackageInstallTaskOptions {
|
|
6
6
|
/** Tree */
|
package/src/utility/ast.js
CHANGED
|
@@ -5,8 +5,9 @@ exports.findFirstNodeOfKind = findFirstNodeOfKind;
|
|
|
5
5
|
exports.findLastNodeOfKind = findLastNodeOfKind;
|
|
6
6
|
exports.parseImportsFromFile = parseImportsFromFile;
|
|
7
7
|
exports.getExportedSymbolsFromFile = getExportedSymbolsFromFile;
|
|
8
|
+
const tslib_1 = require("tslib");
|
|
8
9
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
9
|
-
const ts = require("typescript");
|
|
10
|
+
const ts = tslib_1.__importStar(require("typescript"));
|
|
10
11
|
/**
|
|
11
12
|
* Find the first node with the specific syntax kind
|
|
12
13
|
* @param sourceFile Typescript file
|
package/src/utility/ast.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":";;;AAWA,kDASC;AAQD,gDAcC;AAMD,oDAcC;AAOD,gEAaC;AAlFD,qEAE+C;AAC/C,iCAAiC;AAEjC;;;;;GAKG;AACH,SAAgB,mBAAmB,CAA8B,UAAyB,EAAE,UAAyB,EAAE,IAAc;IACnI,MAAM,WAAW,GAAG,IAAI,IAAI,UAAU,CAAC;IACvC,IAAI,GAAG,GAAa,IAAI,CAAC;IACzB,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,GAAG,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,CAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QACxF,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAA8B,UAAyB,EAAE,UAAyB,EAAE,IAAc;IAClI,MAAM,WAAW,GAAG,IAAI,IAAI,UAAU,CAAC;IACvC,IAAI,GAAG,GAAa,IAAI,CAAC;IACzB,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC1B,GAAG,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAM,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,kBAAkB,CAAI,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;YAC/D,IAAI,KAAK,EAAE,CAAC;gBACV,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC1D,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,UAAyB;IAC5D,6FAA6F;IAC7F,OAAO,IAAA,qBAAS,EAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5E,MAAM,GAAG,GAAG,OAA+B,CAAC;QAC5C,MAAM,UAAU,GAAG,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEtE,6DAA6D;QAC7D,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,WAAW,IAAI,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC;YAC3D,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC1D,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CAAC,OAAmB,EAAE,UAAkB;IAChF,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACxD,OAAO,IAAI,CAAC,QAAQ,KAAK,UAAU,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,WAAW,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAE3D,OAAO,WAAW,CAAC,kBAAkB,CAAC,MAAO,CAAC,CAAC;AACjD,CAAC;AAeD;;;GAGG;AACI,MAAM,kBAAkB,GAAG,CAAC,IAAa,EAA4B,EAAE,CAC5E,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;OACjB,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC;OACpC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAHpC,QAAA,kBAAkB,sBAGkB;AAEjD;;;;GAIG;AACI,MAAM,qCAAqC,GAAG,CAAC,SAA2B,EAAE,OAAe,EAAE,EAAE;IACpG,MAAM,wBAAwB,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAEnE,IAAI,EAAE,CAAC,yBAAyB,CAAC,wBAAwB,CAAC,EAAE,CAAC;QAC3D,OAAO,wBAAwB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAiC,EAAE,CACtF,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC;eAC1B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;eAC1B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,OAAO,CAChD,EAAE,WAAW,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AAVW,QAAA,qCAAqC,yCAUhD;AAEF;;;GAGG;AACI,MAAM,6CAA6C,GAAG,CAAC,GAAW,EAAE,EAAE;IAC3E,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,UAAU,EACV,sBAAsB,GAAG,KAAK,EAC9B,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,OAAO,CAAC,GAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAyB,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAC1F,CAAC,CAAC;AARW,QAAA,6CAA6C,iDAQxD;AAEF;;;GAGG;AACI,MAAM,+BAA+B,GAAG,CAAC,GAAW,EAAE,EAAE;IAC7D,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,UAAU,EACV;QACI,GAAG;MACL,EACF,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,OAAO,CAAC,GAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAyB,CAAC,OAAO,CAAC,CAAC;AACxE,CAAC,CAAC;AAXW,QAAA,+BAA+B,mCAW1C;AAEF;;;GAGG;AACI,MAAM,iCAAiC,GAAG,CAAC,GAAW,EAAE,EAAE;IAC/D,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,UAAU,EACV;QACI,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;MAC1B,EACF,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,OAAO,CAAC,GAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAA4B,CAAC,IAAK,CAAC,UAAU,CAAC,CAAC;AACpF,CAAC,CAAC;AAVW,QAAA,iCAAiC,qCAU5C;AAEF;;;GAGG;AACI,MAAM,uCAAuC,GAAG,CAAC,GAAW,EAAE,EAAE;IACrE,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,UAAU,EACV,iBAAiB,GAAG,MAAM,EAC1B,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,OAAO,CAAC,GAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAA4B,CAAC,UAAU,CAAC,CAAC;AAC9E,CAAC,CAAC;AARW,QAAA,uCAAuC,2CAQlD;AAEF;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAAC,aAA8B,EAAE,aAA8B,EAAE,EAAE;IACjG,QAAQ,aAAa,CAAC,IAAI,EAAE,CAAC;QAC3B,KAAK,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC;YACvC,OAAO,CAAC,CAAC,CAAC;QACZ,CAAC;QACD,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;YAC/B,QAAQ,aAAa,CAAC,IAAI,EAAE,CAAC;gBAC3B,KAAK,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC;oBACvC,OAAO,CAAC,CAAC;gBACX,CAAC;gBACD,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC;oBACrC,OAAO,CAAC,CAAC,CAAC;gBACZ,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,OAAO,CAAC,CAAC,CAAC;gBACZ,CAAC;YACH,CAAC;QACH,CAAC;QACD,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACrC,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B;AAEF;;;;;GAKG;AACI,MAAM,qCAAqC,GAAG,CACnD,cAAsB,EACtB,kBAA0D,GAAG,EAAE,CAAC,IAAI,EACpE,qBAAkC,IAAI,GAAG,EAAE,EACX,EAAE;IAClC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC3B,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QACxB,MAAM,KAAK,GAAG,CAAC,IAAa,EAAW,EAAE;YACvC,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzD,MAAM,iBAAiB,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;gBACnI,MAAM,qBAAqB,GAAG,IAAA,qDAA6C,EAAC,cAAc,CAAC,CAAC;gBAE5F,MAAM,oBAAoB,GAAG,iBAAiB;oBAC5C,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;wBAChD,GAAG,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,EAAE,CAClD,kBAAkB,CAAC,IAAI,KAAK,CAAC;+BAC1B,CACD,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC;mCACtC,CAAC,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAC5E,CACF;wBACD,GAAG,qBAAqB;qBACzB,CAAC;oBACF,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;gBAE9F,MAAM,eAAe,GAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;qBAC3E,MAAM,CAAC,CAAC,CAAoB,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;qBAC7E,MAAM,CAAC,oBAAoB,CAAC,CAAC;gBAEhC,MAAM,YAAY,GAAI,EAAwB;qBAC3C,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;qBACpC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEvC,OAAO,OAAO,CAAC,sBAAsB,CACnC,IAAI,EACJ,YAAY,EACZ,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,cAAc,EACnB,eAAe,EACf,IAAI,CAAC,OAAO,CACb,CAAC;YACJ,CAAC;YACD,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAC7C,CAAC,CAAC;QACF,OAAO,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,qCAAqC,yCA8ChD;AAEF;;;;GAIG;AACI,MAAM,4BAA4B,GAAG,CAC1C,aAAgC,EAChC,QAAgC,EAChC,EAAE;IACF,aAAa,CAAC,MAAM,CAAC,CAAC,YAAY,EAAoE,EAAE,CACtG,EAAE,CAAC,qBAAqB,CAAC,YAAY,CAAC;WACnC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CACtC,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;QACzB,MAAM,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QACD,EAAE,CAAC,0BAA0B,CAC3B,YAAY,EACZ,EAAE,CAAC,UAAU,CAAC,sBAAsB,EACpC,KAAK,OAAO,EAAE,EACd,IAAI,CACL,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAnBW,QAAA,4BAA4B,gCAmBvC;AAEF;;;GAGG;AACI,MAAM,iBAAiB,GAAmC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IACxB,MAAM,KAAK,GAAG,CAAC,IAAa,EAAW,EAAE;QACvC,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;YAC9C,OAAO,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC;IACF,OAAO,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AACvC,CAAC,CAAC;AATW,QAAA,iBAAiB,qBAS5B;AAEF;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAAC,UAAkB,EAAE,EAAE,CAAC,CAAC,YAA6B,EAAwC,EAAE,CAC9H,EAAE,CAAC,mBAAmB,CAAC,YAAY,CAAC;OACjC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC;OAClC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC;AAHhD,QAAA,gBAAgB,oBAGgC;AAE7D;;;;;;GAMG;AACI,MAAM,sBAAsB,GAAG,CAAC,IAAyB,EAAE,OAAuB,EAAE,UAAkB,EAAE,eAA+B,EAAE,EAAE;IAChJ,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC,CAAC;IACvE,OAAO,cAAc;QACnB,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAC/B,cAAc,EACd,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,EAC/B,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,IAAI,EACnB,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,cAAc,EAC7B,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,IAAI,EACnB,cAAc,CAAC,IAAI;YACjB,CAAC,CAAC,OAAO,CAAC,WAAW,CACnB,cAAc,CAAC,IAAI,EACnB,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CACvD;YACD,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,CAC/C;QACD,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAC/B,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAClD,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,EACpC,SAAS,EACT,SAAS,EACT,EAAE,EACF,SAAS,EACT,OAAO,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,CAC3C,CAAC;AACN,CAAC,CAAC;AA7BW,QAAA,sBAAsB,0BA6BjC;AAEF;;;GAGG;AACI,MAAM,sBAAsB,GAAG,CAAC,IAAa,EAAoH,EAAE,CACxK,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC;OAC1B,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC;OACpC,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;OACzD,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC;OACtD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,SAAS;OAC1E,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,wBAAwB,CAAC;OACtF,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,IAAA,8BAAsB,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;AAPhE,QAAA,sBAAsB,0BAO0C;AAE7E;;;;GAIG;AACI,MAAM,qEAAqE,GAAG,CACnF,OAAmC,EACnC,IAAa,EACmB,EAAE,CAClC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAiB,EAAE,EAAE;IAC7B,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IACxB,MAAM,KAAK,GAAG,CAAC,IAAa,EAAW,EAAE;QACvC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,8BAAsB,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YAC/F,OAAO,OAAO,CAAC,WAAW,CACxB,IAAI,EACJ,IAAI,CAAC,UAAU;iBACZ,MAAM,CAAiB,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;gBACzC,IAAI,IAAA,8BAAsB,EAAC,SAAS,CAAC,EAAE,CAAC;oBACtC,MAAM,aAAa,GAAI,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAgC,CAAC,UAAU,CAAC;oBACnG,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAA8E,EAAE,CAC1H,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,SAAS,CACnC,CAAC;oBAEF,OAAO,GAAG,CAAC,MAAM,CACf,OAAO,CAAC,yBAAyB,CAC/B,SAAS,EACT,OAAO,CAAC,oBAAoB,CAC1B,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,UAAU,CAAC,UAAU,EAC/B,SAAS,CAAC,UAAU,CAAC,aAAa,EAClC;wBACE,OAAO,CAAC,6BAA6B,CAAC;4BACpC,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,SAAS,CAAC;4BACrE,OAAO,CAAC,wBAAwB,CAAC,SAAS,EAAE,OAAO,CAAC,4BAA4B,CAC9E,CACE,WAAW;gCACT,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;gCACvC,CAAC,CAAC,EAAE,CACP,CAAC,MAAM,CACN,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAChH,EACD,IAAI,CACL,CAAC;yBACH,EAAE,IAAI,CAAC;qBACT,CACF,CACF,CACF,CAAC;gBACJ,CAAC;gBACD,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC,EAAE,EAAE,CAAC;iBACL,MAAM,CACL,IAAI,CAAC,CAAC,CAAC,IAAA,yCAAiC,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CACpD,CACJ,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC;IACF,OAAO,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AACvC,CAAC,CAAC;AAtDS,QAAA,qEAAqE,yEAsD9E"}
|
|
1
|
+
{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ function getDefaultOptionsForSchematic(workspace, collection, schematicName, opt
|
|
|
40
40
|
}
|
|
41
41
|
return Object.entries(schematics)
|
|
42
42
|
.filter(([key, _]) => new RegExp(key.replace(/\*/g, '.*')).test(`${collection}:${schematicName}`))
|
|
43
|
-
.
|
|
43
|
+
.toSorted(([a], [b]) => (a.match(/\*/g)?.length || 0) - (b.match(/\*/g)?.length || 0))
|
|
44
44
|
.map(([_, value]) => value)
|
|
45
45
|
.reduce((config, value) => ({ ...config, ...value }), acc);
|
|
46
46
|
}, {});
|
|
@@ -55,7 +55,7 @@ function getSchematicOptions(config, context) {
|
|
|
55
55
|
const schematicName = `${context.schematic.description.collection.name}:${context.schematic.description.name}`;
|
|
56
56
|
const options = config.schematics && Object.entries(config.schematics)
|
|
57
57
|
.filter(([name]) => new RegExp(name.replace(/\*/g, '.*')).test(schematicName))
|
|
58
|
-
.
|
|
58
|
+
.toSorted(([a], [b]) => ((a.match(/\*/g)?.length || 0) - (b.match(/\*/g)?.length || 0)))
|
|
59
59
|
.reduce((acc, [, opts]) => ({ ...acc, ...opts }), {});
|
|
60
60
|
return options && Object.keys(options).length > 0 ? options : config.schematics?.['*:*'];
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":";;AAcA,oEAOC;AAWD,sEAyBC;AAQD,kDASC;AAlED;;;;;GAKG;AACH,SAAgB,4BAA4B,CAAC,SAA0B,EAAE,UAAkB;IACzF,SAAS,CAAC,GAAG,KAAK,EAAE,CAAC;IACrB,SAAS,CAAC,GAAG,CAAC,oBAAoB,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC/D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7D,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,6BAA6B,CAC3C,SAAiC,EACjC,UAAkB,EAClB,aAAqB,EACrB,OAA8C;IAE9C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,EAAO,CAAC;IACjB,CAAC;IACD,MAAM,uBAAuB,GAAG;QAC9B,SAAS,CAAC,UAAU;QACpB,GAAG,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE;KACrF,CAAC;IAEF,OAAO,uBAAuB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QACxD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,CAAyB,UAAU,CAAC;aACtD,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,aAAa,EAAE,CAAC,CAAC;aACjG,
|
|
1
|
+
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":"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"}
|
package/src/utility/component.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addImportsIntoComponentDecoratorTransformerFactory = exports.getO3rComponentInfoOrThrowIfNotFound = exports.NoOtterComponent = exports.askConfirmationToConvertComponent = exports.isO3rClassComponent = exports.isNgClassComponent = exports.isO3rClassDecorator = exports.isNgClassDecorator = void 0;
|
|
4
|
-
const
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const ts = tslib_1.__importStar(require("typescript"));
|
|
5
6
|
const ast_1 = require("./ast");
|
|
6
7
|
const error_1 = require("./error");
|
|
7
8
|
/**
|
|
@@ -31,7 +32,7 @@ exports.isNgClassComponent = isNgClassComponent;
|
|
|
31
32
|
const isO3rClassComponent = (classDeclaration) => (0, exports.isNgClassComponent)(classDeclaration)
|
|
32
33
|
&& (ts.getDecorators(classDeclaration) || []).some((decorator) => (0, exports.isO3rClassDecorator)(decorator));
|
|
33
34
|
exports.isO3rClassComponent = isO3rClassComponent;
|
|
34
|
-
const askConfirmationToConvertComponent = async () => (await Promise.resolve().then(() => require('@angular/cli/src/utilities/prompt'))).askConfirmation('Component found is not an Otter component. Would you like to convert it?', true);
|
|
35
|
+
const askConfirmationToConvertComponent = async () => (await Promise.resolve().then(() => tslib_1.__importStar(require('@angular/cli/src/utilities/prompt')))).askConfirmation('Component found is not an Otter component. Would you like to convert it?', true);
|
|
35
36
|
exports.askConfirmationToConvertComponent = askConfirmationToConvertComponent;
|
|
36
37
|
class NoOtterComponent extends Error {
|
|
37
38
|
constructor(componentPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/utility/component.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/utility/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ exports.getVersionToInstallFromPackageJson = getVersionToInstallFromPackageJson;
|
|
|
8
8
|
exports.isDependencyAlreadyInstalled = isDependencyAlreadyInstalled;
|
|
9
9
|
exports.getNodeDependencyList = getNodeDependencyList;
|
|
10
10
|
exports.getExternalDependenciesInfo = getExternalDependenciesInfo;
|
|
11
|
-
const
|
|
11
|
+
const tslib_1 = require("tslib");
|
|
12
|
+
const fs = tslib_1.__importStar(require("node:fs"));
|
|
12
13
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
13
14
|
const semver_1 = require("semver");
|
|
14
15
|
const error_1 = require("./error");
|
|
@@ -79,7 +80,7 @@ function getDependencyMaximumVersionRange(packageName, packageJsonContent, isTil
|
|
|
79
80
|
.filter((packageVersion) => {
|
|
80
81
|
return (0, semver_1.valid)(packageVersion) !== null || (0, semver_1.validRange)(packageVersion) !== null;
|
|
81
82
|
})
|
|
82
|
-
.
|
|
83
|
+
.toSorted((rangeA, rangeB) => isRangeGreater(rangeB, rangeA) ? 1 : (isRangeGreater(rangeA, rangeB) ? -1 : 0));
|
|
83
84
|
return rangeSortedByHighestMinimum[0];
|
|
84
85
|
}
|
|
85
86
|
/**
|
|
@@ -143,7 +144,7 @@ function getExternalDependenciesInfo({ dependenciesToInstall, devDependenciesToI
|
|
|
143
144
|
const peerDependenciesInfo = dependenciesToInstall.reduce((acc, name) => {
|
|
144
145
|
const rootVersion = [
|
|
145
146
|
name,
|
|
146
|
-
...name.startsWith('@angular/') ? ['@angular/core'] : [],
|
|
147
|
+
...name.startsWith('@angular/') && !['@angular/cdk', '@angular/material'].includes(name) ? ['@angular/core'] : [],
|
|
147
148
|
...name.startsWith('@angular-devkit/') && name !== '@angular-devkit/architect' ? ['@angular-devkit/core'] : [],
|
|
148
149
|
...name.startsWith('@ngrx/') ? ['@ngrx/store'] : []
|
|
149
150
|
]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../src/utility/dependencies.ts"],"names":[],"mappings":";;;AAuCA,kFAeC;AAcD,wCAYC;AASD,4EAcC;AASD,gFAMC;AAUD,oEAMC;AAQD,sDAOC;AAgBD,kEAuFC
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../src/utility/dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getEnvironmentInfoStringify = exports.getEnvironmentInfo = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const fs = tslib_1.__importStar(require("node:fs"));
|
|
6
|
+
const os = tslib_1.__importStar(require("node:os"));
|
|
7
|
+
const semver = tslib_1.__importStar(require("semver"));
|
|
7
8
|
const package_manager_runner_1 = require("./package-manager-runner");
|
|
8
9
|
/**
|
|
9
10
|
* Get all environment information
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/utility/environment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/utility/environment.ts"],"names":[],"mappings":";;;;AAAA,oDAA8B;AAC9B,oDAA8B;AAC9B,uDAAiC;AACjC,qEAEkC;AAElC;;;GAGG;AACI,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG;QACb,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE;QACvB,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;QACvB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;KACtB,CAAC;IACF,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE,WAAW,IAAI,GAAG,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;KACzF,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,8CAAqB,GAAE,CAAC;IACnD,IAAI,wBAA4C,CAAC;IACjD,IAAI,CAAC;QACH,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,MAAM,SAAS,GAAG;QAChB,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,OAAiB,CAAC,CAAC,CAAC,SAAS;KAC9I,CAAC;IACF,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAC9F,CAAC,CAAC;AAnBW,QAAA,kBAAkB,sBAmB7B;AAEF;;;GAGG;AACI,MAAM,2BAA2B,GAAG,GAAG,EAAE;IAC9C,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAA,0BAAkB,GAAE,CAAC;IAClH,OAAO;6BACoB,MAAM,CAAC,YAAY;yBACvB,MAAM,CAAC,QAAQ;wBAChB,MAAM,CAAC,OAAO;kBACpB,QAAQ,CAAC,OAAO,IAAI,WAAW;0BACvB,kBAAkB,CAAC,IAAI;6BACpB,kBAAkB,CAAC,OAAO,IAAI,WAAW;mBACnD,SAAS,CAAC,OAAO,IAAI,WAAW;CAClD,CAAC;AACF,CAAC,CAAC;AAXW,QAAA,2BAA2B,+BAWtC"}
|
package/src/utility/file-info.js
CHANGED
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getModuleIndex = getModuleIndex;
|
|
4
4
|
exports.getFileInfo = getFileInfo;
|
|
5
|
+
const tslib_1 = require("tslib");
|
|
5
6
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
6
|
-
const ts = require("typescript");
|
|
7
|
+
const ts = tslib_1.__importStar(require("typescript"));
|
|
7
8
|
const modules_1 = require("./modules");
|
|
8
9
|
/**
|
|
9
10
|
* Get the module index of the decorator in a file (supports both standalone and module)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-info.js","sourceRoot":"","sources":["../../../src/utility/file-info.ts"],"names":[],"mappings":";;AAwCA,wCA8BC;AAQD,kCAmCC
|
|
1
|
+
{"version":3,"file":"file-info.js","sourceRoot":"","sources":["../../../src/utility/file-info.ts"],"names":[],"mappings":"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"}
|
package/src/utility/index.d.ts
CHANGED
|
@@ -14,12 +14,13 @@ export * from './matching-peers';
|
|
|
14
14
|
export * from './migration/migration';
|
|
15
15
|
export * from './modules';
|
|
16
16
|
export * from './monorepo';
|
|
17
|
+
export * from './ng-update';
|
|
17
18
|
export * from './package-manager-runner';
|
|
18
19
|
export * from './package-version';
|
|
19
20
|
export * from './question';
|
|
20
21
|
export * from './routes';
|
|
21
22
|
export * from './sub-entry';
|
|
22
|
-
export * from './template-property
|
|
23
|
+
export * from './template-property-helper';
|
|
23
24
|
export * from './update-imports';
|
|
24
25
|
export * from './update-pipes';
|
|
25
26
|
export * from './wrapper';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC"}
|
package/src/utility/index.js
CHANGED
|
@@ -17,12 +17,13 @@ tslib_1.__exportStar(require("./matching-peers"), exports);
|
|
|
17
17
|
tslib_1.__exportStar(require("./migration/migration"), exports);
|
|
18
18
|
tslib_1.__exportStar(require("./modules"), exports);
|
|
19
19
|
tslib_1.__exportStar(require("./monorepo"), exports);
|
|
20
|
+
tslib_1.__exportStar(require("./ng-update"), exports);
|
|
20
21
|
tslib_1.__exportStar(require("./package-manager-runner"), exports);
|
|
21
22
|
tslib_1.__exportStar(require("./package-version"), exports);
|
|
22
23
|
tslib_1.__exportStar(require("./question"), exports);
|
|
23
24
|
tslib_1.__exportStar(require("./routes"), exports);
|
|
24
25
|
tslib_1.__exportStar(require("./sub-entry"), exports);
|
|
25
|
-
tslib_1.__exportStar(require("./template-property
|
|
26
|
+
tslib_1.__exportStar(require("./template-property-helper"), exports);
|
|
26
27
|
tslib_1.__exportStar(require("./update-imports"), exports);
|
|
27
28
|
tslib_1.__exportStar(require("./update-pipes"), exports);
|
|
28
29
|
tslib_1.__exportStar(require("./wrapper"), exports);
|
package/src/utility/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,oDAA0B;AAC1B,uDAA6B;AAC7B,sDAA4B;AAC5B,yDAA+B;AAC/B,wDAA8B;AAC9B,kDAAwB;AACxB,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B;AAC5B,oDAA0B;AAC1B,iDAAuB;AACvB,2DAAiC;AACjC,gEAAsC;AACtC,oDAA0B;AAC1B,qDAA2B;AAC3B,mEAAyC;AACzC,4DAAkC;AAClC,qDAA2B;AAC3B,mDAAyB;AACzB,sDAA4B;AAC5B,qEAA2C;AAC3C,2DAAiC;AACjC,yDAA+B;AAC/B,oDAA0B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,oDAA0B;AAC1B,uDAA6B;AAC7B,sDAA4B;AAC5B,yDAA+B;AAC/B,wDAA8B;AAC9B,kDAAwB;AACxB,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B;AAC5B,oDAA0B;AAC1B,iDAAuB;AACvB,2DAAiC;AACjC,gEAAsC;AACtC,oDAA0B;AAC1B,qDAA2B;AAC3B,sDAA4B;AAC5B,mEAAyC;AACzC,4DAAkC;AAClC,qDAA2B;AAC3B,mDAAyB;AACzB,sDAA4B;AAC5B,qEAA2C;AAC3C,2DAAiC;AACjC,yDAA+B;AAC/B,oDAA0B"}
|
package/src/utility/loaders.d.ts
CHANGED
|
@@ -29,7 +29,7 @@ export declare function writeAngularJson(tree: Tree, workspace: WorkspaceSchema,
|
|
|
29
29
|
* Load the target's package.json file
|
|
30
30
|
* @param tree File tree
|
|
31
31
|
* @param workspaceProject Angular workspace project
|
|
32
|
-
* @throws
|
|
32
|
+
* @throws {SchematicsException} JSON invalid or non exist
|
|
33
33
|
*/
|
|
34
34
|
export declare function readPackageJson(tree: Tree, workspaceProject: WorkspaceProject): PackageJson;
|
|
35
35
|
/**
|
|
@@ -55,9 +55,10 @@ export declare function getAllFilesInTree(tree: Tree, basePath?: string, exclude
|
|
|
55
55
|
/**
|
|
56
56
|
* Get the path of all the files in the Tree
|
|
57
57
|
* @param tree Schematics file tree
|
|
58
|
-
* @param patterns Array of globs to be
|
|
58
|
+
* @param patterns Array of globs to be searched in the tree
|
|
59
|
+
* @param excludes Array of globs to be ignored
|
|
59
60
|
*/
|
|
60
|
-
export declare function globInTree(tree: Tree, patterns: string[]): string[];
|
|
61
|
+
export declare function globInTree(tree: Tree, patterns: string[], excludes?: string[]): string[];
|
|
61
62
|
/**
|
|
62
63
|
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
63
64
|
* @param tree
|
|
@@ -65,6 +66,12 @@ export declare function globInTree(tree: Tree, patterns: string[]): string[];
|
|
|
65
66
|
* @param extension
|
|
66
67
|
*/
|
|
67
68
|
export declare function getFilesInFolderFromWorkspaceProjectsInTree(tree: Tree, folderInProject: string, extension: string): string[];
|
|
69
|
+
/**
|
|
70
|
+
* Get all component files from the specified folder for all the projects described in the workspace
|
|
71
|
+
* @param tree
|
|
72
|
+
* @param folderInProject
|
|
73
|
+
*/
|
|
74
|
+
export declare function getComponentFilesInFolderFromWorkspaceProjectsInTree(tree: Tree, folderInProject: string): string[];
|
|
68
75
|
/**
|
|
69
76
|
* Get all files with specific extension from the tree
|
|
70
77
|
* @param tree
|
|
@@ -88,4 +95,10 @@ export declare function getFilesFromWorkspaceProjects(tree: Tree, extension: str
|
|
|
88
95
|
* @param tree
|
|
89
96
|
*/
|
|
90
97
|
export declare function getSourceFilesFromWorkspaceProjects(tree: Tree): string[];
|
|
98
|
+
/**
|
|
99
|
+
* Get all dependencies from all the package.json files in the tree
|
|
100
|
+
* @param tree
|
|
101
|
+
* @param dependencyTypes
|
|
102
|
+
*/
|
|
103
|
+
export declare function getAllDependencies(tree: Tree, dependencyTypes?: string[]): Set<string>;
|
|
91
104
|
//# sourceMappingURL=loaders.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,QAAQ,EACR,SAAS,EACV,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,QAAQ,EACR,SAAS,EACV,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EACL,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAIlD,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAiB7B;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,EAAE,iBAAiB,GAAE,MAAM,EAAsC,eAInK;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,SAAkB,GAAG,eAAe,GAAG,IAAI,CAKzJ;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,SAAkB,gEAGzG;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,GAOlD,WAAW,CACtC;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,kBAAkB,EAAE,CAE/F;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,SAAc,UAGpG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,SAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,EAAE,SAAS,UAAO,GAAG,MAAM,EAAE,CAQjH;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE,CAG5F;AAED;;;;;GAKG;AACH,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAOjH;AAED;;;;GAIG;AACH,wBAAgB,oDAAoD,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,YAWvG;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAK1E;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAEhF;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAE1E;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,YAE7D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,WAAsC,eAUnG"}
|
package/src/utility/loaders.js
CHANGED
|
@@ -9,14 +9,19 @@ exports.getTemplateFolder = getTemplateFolder;
|
|
|
9
9
|
exports.getAllFilesInTree = getAllFilesInTree;
|
|
10
10
|
exports.globInTree = globInTree;
|
|
11
11
|
exports.getFilesInFolderFromWorkspaceProjectsInTree = getFilesInFolderFromWorkspaceProjectsInTree;
|
|
12
|
+
exports.getComponentFilesInFolderFromWorkspaceProjectsInTree = getComponentFilesInFolderFromWorkspaceProjectsInTree;
|
|
12
13
|
exports.getFilesWithExtensionFromTree = getFilesWithExtensionFromTree;
|
|
13
14
|
exports.getFilesFromRootOfWorkspaceProjects = getFilesFromRootOfWorkspaceProjects;
|
|
14
15
|
exports.getFilesFromWorkspaceProjects = getFilesFromWorkspaceProjects;
|
|
15
16
|
exports.getSourceFilesFromWorkspaceProjects = getSourceFilesFromWorkspaceProjects;
|
|
16
|
-
|
|
17
|
+
exports.getAllDependencies = getAllDependencies;
|
|
18
|
+
const tslib_1 = require("tslib");
|
|
19
|
+
const path = tslib_1.__importStar(require("node:path"));
|
|
17
20
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
21
|
+
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
18
22
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
19
23
|
const minimatch_1 = require("minimatch");
|
|
24
|
+
const ts = tslib_1.__importStar(require("typescript"));
|
|
20
25
|
function findFilesInTreeRec(memory, directory, fileMatchesCriteria, ignoreDirectories) {
|
|
21
26
|
if (ignoreDirectories.some((i) => directory.path.split(path.posix.sep).includes(i))) {
|
|
22
27
|
return memory;
|
|
@@ -66,7 +71,7 @@ function writeAngularJson(tree, workspace, angularJsonFile = '/angular.json') {
|
|
|
66
71
|
* Load the target's package.json file
|
|
67
72
|
* @param tree File tree
|
|
68
73
|
* @param workspaceProject Angular workspace project
|
|
69
|
-
* @throws
|
|
74
|
+
* @throws {SchematicsException} JSON invalid or non exist
|
|
70
75
|
*/
|
|
71
76
|
function readPackageJson(tree, workspaceProject) {
|
|
72
77
|
const packageJsonPath = `${workspaceProject.root}/package.json`;
|
|
@@ -112,10 +117,11 @@ function getAllFilesInTree(tree, basePath = '/', excludes = [], recursive = true
|
|
|
112
117
|
/**
|
|
113
118
|
* Get the path of all the files in the Tree
|
|
114
119
|
* @param tree Schematics file tree
|
|
115
|
-
* @param patterns Array of globs to be
|
|
120
|
+
* @param patterns Array of globs to be searched in the tree
|
|
121
|
+
* @param excludes Array of globs to be ignored
|
|
116
122
|
*/
|
|
117
|
-
function globInTree(tree, patterns) {
|
|
118
|
-
const files = getAllFilesInTree(tree);
|
|
123
|
+
function globInTree(tree, patterns, excludes = []) {
|
|
124
|
+
const files = getAllFilesInTree(tree, '/', excludes);
|
|
119
125
|
return files.filter((basePath) => patterns.some((p) => (0, minimatch_1.minimatch)(basePath, p, { dot: true })));
|
|
120
126
|
}
|
|
121
127
|
/**
|
|
@@ -132,6 +138,23 @@ function getFilesInFolderFromWorkspaceProjectsInTree(tree, folderInProject, exte
|
|
|
132
138
|
.flatMap((project) => getAllFilesInTree(tree, path.posix.join(project.root, folderInProject), excludes))
|
|
133
139
|
.filter((filePath) => extensionMatcher.test(filePath));
|
|
134
140
|
}
|
|
141
|
+
/**
|
|
142
|
+
* Get all component files from the specified folder for all the projects described in the workspace
|
|
143
|
+
* @param tree
|
|
144
|
+
* @param folderInProject
|
|
145
|
+
*/
|
|
146
|
+
function getComponentFilesInFolderFromWorkspaceProjectsInTree(tree, folderInProject) {
|
|
147
|
+
const workspace = getWorkspaceConfig(tree);
|
|
148
|
+
const excludes = ['**/node_modules/**', '**/.cache/**'];
|
|
149
|
+
return Object.values(workspace?.projects || {})
|
|
150
|
+
.flatMap((project) => getAllFilesInTree(tree, path.posix.join(project.root, folderInProject), excludes))
|
|
151
|
+
.filter((filePath) => /^(?!.*\.spec\.ts$).*\.ts$/.test(filePath))
|
|
152
|
+
.filter((filePath) => {
|
|
153
|
+
const fileContent = tree.readText(filePath);
|
|
154
|
+
const sourceFile = ts.createSourceFile(filePath, fileContent, ts.ScriptTarget.ES2015, true);
|
|
155
|
+
return (0, ast_utils_1.isImported)(sourceFile, 'Component', '@angular/core') && fileContent.includes('@Component');
|
|
156
|
+
});
|
|
157
|
+
}
|
|
135
158
|
/**
|
|
136
159
|
* Get all files with specific extension from the tree
|
|
137
160
|
* @param tree
|
|
@@ -166,4 +189,20 @@ function getFilesFromWorkspaceProjects(tree, extension) {
|
|
|
166
189
|
function getSourceFilesFromWorkspaceProjects(tree) {
|
|
167
190
|
return getFilesFromWorkspaceProjects(tree, 'ts');
|
|
168
191
|
}
|
|
192
|
+
/**
|
|
193
|
+
* Get all dependencies from all the package.json files in the tree
|
|
194
|
+
* @param tree
|
|
195
|
+
* @param dependencyTypes
|
|
196
|
+
*/
|
|
197
|
+
function getAllDependencies(tree, dependencyTypes = ['dependencies', 'devDependencies']) {
|
|
198
|
+
const packageJsonPaths = globInTree(tree, ['**/package.json'], ['**/node_modules']);
|
|
199
|
+
const allDependencies = new Set();
|
|
200
|
+
for (const packageJsonPath of packageJsonPaths) {
|
|
201
|
+
const packageJson = tree.readJson(packageJsonPath);
|
|
202
|
+
for (const depType of dependencyTypes) {
|
|
203
|
+
Object.keys(packageJson[depType] || {}).forEach((dep) => allDependencies.add(dep));
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
return allDependencies;
|
|
207
|
+
}
|
|
169
208
|
//# sourceMappingURL=loaders.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getPeerDepWithPattern = getPeerDepWithPattern;
|
|
4
4
|
exports.getO3rPeerDeps = getO3rPeerDeps;
|
|
5
5
|
exports.getO3rGeneratorDeps = getO3rGeneratorDeps;
|
|
6
|
-
const
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const fs = tslib_1.__importStar(require("node:fs"));
|
|
7
8
|
/**
|
|
8
9
|
* Retrieve the peer dependencies with the given pattern from the given package json file
|
|
9
10
|
* @param packageJsonPath
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matching-peers.js","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":";;AAWA,sDAgBC;AAeD,wCASC;AAOD,kDAYC
|
|
1
|
+
{"version":3,"file":"matching-peers.js","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":";;AAWA,sDAgBC;AAeD,wCASC;AAOD,kDAYC;;AAtED,oDAA8B;AAK9B;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,eAAuB,EAAE,UAA6B,uBAAuB,EAAE,YAAY,GAAG,EAAE,CAAC,YAAY;IACjJ,MAAM,kBAAkB,GAAqE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7J,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC;IAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAClD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,IAAI,EAAE,CAAC;SACnF,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,wBAAwB,GAAG,MAAM,CAAC,WAAW,CACjD,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,IAAI,EAAE,CAAC;SACtD,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SAC1I,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,kBAAkB,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CACxG,CAAC;IACF,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAE/D,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;AACrF,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,WAAW;IACX,iBAAiB;IACjB,gBAAgB;CACjB,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,eAAuB,EAAE,YAAY,GAAG,IAAI,EAAE,cAAc,GAAG,mBAAmB,EAAE,kBAAkB,GAAG,EAAE;IACxI,MAAM,QAAQ,GAAG,qBAAqB,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IACxE,OAAO;QACL,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,cAAc,EAAE,kBAAkB,GAAG,QAAQ,CAAC,cAAc;QAC5D,WAAW,EAAE,YAAY;YACvB,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAChF,CAAC,CAAC,QAAQ,CAAC,gBAAgB;KAC9B,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,eAAuB,EAAE,cAAc,GAAG,mBAAmB;IAC/F,MAAM,kBAAkB,GAAgB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC3G,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC;IAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAClD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,qBAAqB,IAAI,EAAE,CAAC;SACpF,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,IAAI,EAAE,CAAC;SAC5E,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5F,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC;AAC3D,CAAC"}
|