piral-cli 0.15.0-beta.4708 → 0.15.0-beta.4725

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.
Files changed (14) hide show
  1. package/lib/apps/new-pilet.d.ts +4 -0
  2. package/lib/apps/new-pilet.js +3 -2
  3. package/lib/apps/new-pilet.js.map +1 -1
  4. package/lib/apps/new-piral.d.ts +1 -1
  5. package/lib/apps/new-piral.js +3 -3
  6. package/lib/apps/new-piral.js.map +1 -1
  7. package/lib/commands.js +9 -5
  8. package/lib/commands.js.map +1 -1
  9. package/package.json +2 -2
  10. package/src/apps/new-pilet.test.ts +18 -1
  11. package/src/apps/new-pilet.ts +8 -1
  12. package/src/apps/new-piral.test.ts +1 -1
  13. package/src/apps/new-piral.ts +4 -4
  14. package/src/commands.ts +9 -5
package/lib/apps/new-pilet.d.ts CHANGED
@@ -49,6 +49,10 @@ export interface NewPiletOptions {
49
49
  * Places additional variables that should used when scaffolding.
50
50
  */
51
51
  variables?: Record<string, string>;
52
+ /**
53
+ * Sets Pilet's name
54
+ */
55
+ name?: string;
52
56
  }
53
57
  export declare const newPiletDefaults: NewPiletOptions;
54
58
  export declare function newPilet(baseDir?: string, options?: NewPiletOptions): Promise<void>;
package/lib/apps/new-pilet.js CHANGED
@@ -25,10 +25,11 @@ exports.newPiletDefaults = {
25
25
  npmClient: undefined,
26
26
  bundlerName: 'none',
27
27
  variables: {},
28
+ name: undefined,
28
29
  };
29
30
  function newPilet(baseDir = process.cwd(), options = {}) {
30
31
  return __awaiter(this, void 0, void 0, function* () {
31
- const { target = exports.newPiletDefaults.target, registry = exports.newPiletDefaults.registry, source = exports.newPiletDefaults.source, forceOverwrite = exports.newPiletDefaults.forceOverwrite, language = exports.newPiletDefaults.language, install = exports.newPiletDefaults.install, template = exports.newPiletDefaults.template, logLevel = exports.newPiletDefaults.logLevel, bundlerName = exports.newPiletDefaults.bundlerName, variables = exports.newPiletDefaults.variables, npmClient: defaultNpmClient = exports.newPiletDefaults.npmClient, } = options;
32
+ const { target = exports.newPiletDefaults.target, registry = exports.newPiletDefaults.registry, source = exports.newPiletDefaults.source, forceOverwrite = exports.newPiletDefaults.forceOverwrite, language = exports.newPiletDefaults.language, install = exports.newPiletDefaults.install, template = exports.newPiletDefaults.template, logLevel = exports.newPiletDefaults.logLevel, bundlerName = exports.newPiletDefaults.bundlerName, variables = exports.newPiletDefaults.variables, npmClient: defaultNpmClient = exports.newPiletDefaults.npmClient, name = exports.newPiletDefaults.name, } = options;
32
33
  const fullBase = (0, path_1.resolve)(process.cwd(), baseDir);
33
34
  const root = (0, path_1.resolve)(fullBase, target);
34
35
  (0, common_1.setLogLevel)(logLevel);
@@ -37,7 +38,7 @@ function newPilet(baseDir = process.cwd(), options = {}) {
37
38
  const success = yield (0, common_1.createDirectory)(root);
38
39
  if (success) {
39
40
  const npmClient = yield (0, common_1.determineNpmClient)(root, defaultNpmClient);
40
- const projectName = (0, path_1.basename)(root);
41
+ const projectName = name || (0, path_1.basename)(root);
41
42
  (0, common_1.progress)(`Scaffolding new pilet in %s ...`, root);
42
43
  yield (0, common_1.createFileIfNotExists)(root, 'package.json', JSON.stringify({
43
44
  name: projectName,
package/lib/apps/new-pilet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAyC;AACzC,oCAAoE;AACpE,sCA6BmB;AAoEN,QAAA,gBAAgB,GAAoB;IAC/C,MAAM,EAAE,GAAG;IACX,QAAQ,EAAE,eAAM,CAAC,QAAQ;IACzB,MAAM,EAAE,OAAO;IACf,cAAc,EAAE,uBAAc,CAAC,EAAE;IACjC,QAAQ,EAAE,eAAM,CAAC,QAAQ;IACzB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE,iBAAS,CAAC,IAAI;IACxB,SAAS,EAAE,SAAS;IACpB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,EAAE;IACb,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF,SAAsB,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAA2B,EAAE;;QACnF,MAAM,EACJ,MAAM,GAAG,wBAAgB,CAAC,MAAM,EAChC,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,MAAM,GAAG,wBAAgB,CAAC,MAAM,EAChC,cAAc,GAAG,wBAAgB,CAAC,cAAc,EAChD,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,OAAO,GAAG,wBAAgB,CAAC,OAAO,EAClC,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,WAAW,GAAG,wBAAgB,CAAC,WAAW,EAC1C,SAAS,GAAG,wBAAgB,CAAC,SAAS,EACtC,SAAS,EAAE,gBAAgB,GAAG,wBAAgB,CAAC,SAAS,EACxD,IAAI,GAAG,wBAAgB,CAAC,IAAI,GAC7B,GAAG,OAAO,CAAC;QACZ,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACvC,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;QACtB,IAAA,iBAAQ,EAAC,iCAAiC,CAAC,CAAC;QAC5C,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,2BAAkB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjG,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAe,EAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,OAAO,EAAE;YACX,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAkB,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,IAAI,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;YAE3C,IAAA,iBAAQ,EAAC,iCAAiC,EAAE,IAAI,CAAC,CAAC;YAElD,MAAM,IAAA,8BAAqB,EACzB,IAAI,EACJ,cAAc,EACd,IAAI,CAAC,SAAS,CACZ;gBACE,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,EAAE;gBACf,QAAQ,EAAE,CAAC,OAAO,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,eAAe,EAAE,EAAE;gBACnB,gBAAgB,EAAE,EAAE;gBACpB,OAAO,EAAE,EAAE;gBACX,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,CAAC,MAAM,CAAC;aAChB,EACD,SAAS,EACT,CAAC,CACF,CACF,CAAC;YAEF,MAAM,IAAA,uBAAc,EAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;YAEnD,IAAI,QAAQ,KAAK,wBAAgB,CAAC,QAAQ,EAAE;gBAC1C,IAAA,iBAAQ,EAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC;gBAEvD,MAAM,IAAA,8BAAqB,EACzB,IAAI,EACJ,QAAQ,EACR,YAAY,QAAQ;iBACX,EACT,cAAc,CACf,CAAC;aACH;YAED,MAAM,IAAA,8BAAqB,EACzB,IAAI,EACJ,YAAY,EACZ,IAAI,CAAC,SAAS,CAAC;gBACb,aAAa,EAAE,IAAI;aACpB,CAAC,CACH,CAAC;YAEF,MAAM,OAAO,GAAG,IAAA,wBAAe,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;YAE9D,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;gBAEtE,IAAA,iBAAQ,EAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;gBACtD,MAAM,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;aACpF;iBAAM;gBACL,IAAA,iBAAQ,EAAC,4CAA4C,EAAE,UAAU,CAAC,CAAC;aACpE;YAED,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;YACjE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAC5F,MAAM,SAAS,GAAG,MAAM,IAAA,yBAAgB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAE5D,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,SAAS,CAAC,CAAC;YAEnD,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,sBAAa,EAAC,SAAS,CAAC,CAAC;YAErG,IAAI,WAAW,EAAE;gBACf,IAAA,iBAAQ,EAAC,gCAAgC,CAAC,CAAC;gBAC3C,IAAA,YAAG,EAAC,mBAAmB,EAAE,QAAQ,WAAW,EAAE,CAAC,CAAC;gBAChD,MAAM,IAAA,kBAAS,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;aACpC;YAED,IAAA,iBAAQ,EAAC,+BAA+B,CAAC,CAAC;YAE1C,MAAM,IAAI,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;YAC1E,MAAM,cAAc,GAAG,QAAQ,IAAI,mBAAmB,IAAI,SAAS,CAAC;YACpE,MAAM,IAAA,iCAAwB,EAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAE/E,IAAI,UAAU,EAAE;gBACd,qFAAqF;gBACrF,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,uBAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;aAC9E;iBAAM;gBACL,oEAAoE;gBACpE,sEAAsE;gBACtE,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBACpD,MAAM,IAAA,6BAAoB,EAAC,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;aACvE;YAED,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU,EAAE;gBAChF,QAAQ;gBACR,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;YAEH,IAAI,OAAO,EAAE;gBACX,IAAA,iBAAQ,EAAC,6BAA6B,CAAC,CAAC;gBACxC,MAAM,IAAA,+BAAsB,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aAC/C;YAED,IAAI,YAAY,EAAE;gBAChB,IAAA,iBAAQ,EAAC,iCAAiC,CAAC,CAAC;gBAC5C,IAAA,YAAG,EAAC,mBAAmB,EAAE,QAAQ,YAAY,EAAE,CAAC,CAAC;gBACjD,MAAM,IAAA,kBAAS,EAAC,YAAY,EAAE,IAAI,CAAC,CAAC;aACrC;YAED,IAAA,gBAAO,EAAC,gCAAgC,CAAC,CAAC;SAC3C;aAAM;YACL,IAAA,aAAI,EAAC,4BAA4B,CAAC,CAAC;SACpC;IACH,CAAC;CAAA;AApID,4BAoIC"}
package/lib/apps/new-piral.d.ts CHANGED
@@ -56,7 +56,7 @@ export interface NewPiralOptions {
56
56
  /**
57
57
  * Sets new app name
58
58
  */
59
- appName?: string;
59
+ name?: string;
60
60
  }
61
61
  export declare const newPiralDefaults: NewPiralOptions;
62
62
  export declare function newPiral(baseDir?: string, options?: NewPiralOptions): Promise<void>;
package/lib/apps/new-piral.js CHANGED
@@ -28,11 +28,11 @@ exports.newPiralDefaults = {
28
28
  npmClient: undefined,
29
29
  bundlerName: 'none',
30
30
  variables: {},
31
- appName: undefined,
31
+ name: undefined,
32
32
  };
33
33
  function newPiral(baseDir = process.cwd(), options = {}) {
34
34
  return __awaiter(this, void 0, void 0, function* () {
35
- const { app = exports.newPiralDefaults.app, registry = exports.newPiralDefaults.registry, framework = exports.newPiralDefaults.framework, target = exports.newPiralDefaults.target, version = exports.newPiralDefaults.version, forceOverwrite = exports.newPiralDefaults.forceOverwrite, language = exports.newPiralDefaults.language, install = exports.newPiralDefaults.install, template = exports.newPiralDefaults.template, logLevel = exports.newPiralDefaults.logLevel, bundlerName = exports.newPiralDefaults.bundlerName, variables = exports.newPiralDefaults.variables, appName = exports.newPiralDefaults.appName, npmClient: defaultNpmClient = exports.newPiralDefaults.npmClient, } = options;
35
+ const { app = exports.newPiralDefaults.app, registry = exports.newPiralDefaults.registry, framework = exports.newPiralDefaults.framework, target = exports.newPiralDefaults.target, version = exports.newPiralDefaults.version, forceOverwrite = exports.newPiralDefaults.forceOverwrite, language = exports.newPiralDefaults.language, install = exports.newPiralDefaults.install, template = exports.newPiralDefaults.template, logLevel = exports.newPiralDefaults.logLevel, bundlerName = exports.newPiralDefaults.bundlerName, variables = exports.newPiralDefaults.variables, name = exports.newPiralDefaults.name, npmClient: defaultNpmClient = exports.newPiralDefaults.npmClient, } = options;
36
36
  const fullBase = (0, path_1.resolve)(process.cwd(), baseDir);
37
37
  const root = (0, path_1.resolve)(fullBase, target);
38
38
  if (!helpers_1.frameworkKeys.includes(framework)) {
@@ -44,7 +44,7 @@ function newPiral(baseDir = process.cwd(), options = {}) {
44
44
  if (success) {
45
45
  const npmClient = yield (0, common_1.determineNpmClient)(root, defaultNpmClient);
46
46
  const packageRef = (0, common_1.combinePackageRef)(framework, version, 'registry');
47
- const projectName = appName || (0, path_1.basename)(root);
47
+ const projectName = name || (0, path_1.basename)(root);
48
48
  (0, common_1.progress)(`Creating a new Piral instance in %s ...`, root);
49
49
  yield (0, common_1.createFileIfNotExists)(root, 'package.json', JSON.stringify({
50
50
  name: projectName,
package/lib/apps/new-piral.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":"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"}
package/lib/commands.js CHANGED
@@ -277,9 +277,9 @@ const allCommands = [
277
277
  .string('base')
278
278
  .default('base', process.cwd())
279
279
  .describe('base', 'Sets the base directory. By default the current directory is used.')
280
- .string('app-name')
281
- .describe('app-name', 'Sets the name for the new Piral app.')
282
- .default('app-name', apps.newPiralDefaults.appName);
280
+ .string('name')
281
+ .describe('name', 'Sets the name for the new Piral app.')
282
+ .default('name', apps.newPiralDefaults.name);
283
283
  },
284
284
  run(args) {
285
285
  return apps.newPiral(args.base, {
@@ -296,7 +296,7 @@ const allCommands = [
296
296
  npmClient: args['npm-client'],
297
297
  bundlerName: args.bundler,
298
298
  variables: args.vars,
299
- appName: args['app-name'],
299
+ name: args['name'],
300
300
  });
301
301
  },
302
302
  },
@@ -668,7 +668,10 @@ const allCommands = [
668
668
  .default('vars', apps.newPiletDefaults.variables)
669
669
  .string('base')
670
670
  .default('base', process.cwd())
671
- .describe('base', 'Sets the base directory. By default the current directory is used.');
671
+ .describe('base', 'Sets the base directory. By default the current directory is used.')
672
+ .string('name')
673
+ .describe('name', 'Sets the name for the new Pilet.')
674
+ .default('name', apps.newPiletDefaults.name);
672
675
  },
673
676
  run(args) {
674
677
  return apps.newPilet(args.base, {
@@ -683,6 +686,7 @@ const allCommands = [
683
686
  npmClient: args['npm-client'],
684
687
  bundlerName: args.bundler,
685
688
  variables: args.vars,
689
+ name: args['name'],
686
690
  });
687
691
  },
688
692
  },
package/lib/commands.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAkDtB,oBAAI;AAjDb,uCAemB;AAcnB,SAAS,iBAAiB,CAAC,QAAiC,EAAE,OAAyB,EAAE,MAAc;IACrG,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACjC,QAAQ,CAAC,IAAI,iCACR,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EACtC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IACxF,CAAC;KACJ;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAc;IACxC,MAAM,QAAQ,GAA4B,EAAE,CAAC;IAE7C,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;QACjC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;KAC9C;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAID,MAAM,WAAW,GAA4B;IAC3C;QACE,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,CAAC,aAAa,EAAE,cAAc,EAAE,cAAc,CAAC;QACtD,WAAW,EAAE,oDAAoD;QACjE,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,uFAAuF;QACvF,KAAK,CAAC,IAAS;YACb,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,uFAAuF;gBACjG,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK;aACvC,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,gDAAgD,CAAC;iBACpE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;iBACjD,MAAM,CAAC,MAAM,CAAC;iBACd,QAAQ,CAAC,MAAM,EAAE,gDAAgD,CAAC;iBAClE,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;iBAC7C,MAAM,CAAC,YAAY,CAAC;iBACpB,QAAQ,CAAC,YAAY,EAAE,2CAA2C,CAAC;iBACnE,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;iBACxD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;iBACtD,OAAO,CAAC,MAAM,CAAC;iBACf,QAAQ,CAAC,MAAM,EAAE,mDAAmD,CAAC;iBACrE,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;iBAC7C,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,KAAK,EAAE,uCAAuC,CAAC;iBACxD,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;iBAC3C,OAAO,CAAC,kBAAkB,CAAC;iBAC3B,QAAQ,CAAC,kBAAkB,EAAE,0DAA0D,CAAC;iBACxF,OAAO,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;iBACpE,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC;iBACrC,QAAQ,CAAC,SAAS,EAAE,0BAA0B,CAAC;iBAC/C,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC,CAAC,CAAC,CAAC;iBACxC,MAAM,CAAC,MAAM,CAAC;iBACd,QAAQ,CAAC,MAAM,EAAE,2DAA2D,CAAC;iBAC7E,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC1C,KAAK,EAAE,IAAI,CAAC,MAAgB;gBAC5B,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,IAAI,EAAE,IAAI,CAAC,IAAc;gBACzB,GAAG,EAAE,IAAI,CAAC,GAAc;gBACxB,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAY;gBACpD,SAAS,EAAE,IAAI,CAAC,YAAY,CAAW;gBACvC,WAAW,EAAE,IAAI,CAAC,OAAiB;gBACnC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,IAAI,EAAE,IAAI,CAAC,IAAe;gBAC1B,KAAK,EAAE,IAAI,CAAC,KAAe;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAc;gBACzB,CAAC,EAAE,IAAI;aACR,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,CAAC,cAAc,EAAE,cAAc,EAAE,eAAe,CAAC;QACxD,WAAW,EAAE,kDAAkD;QAC/D,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,uFAAuF;QACvF,KAAK,CAAC,IAAS;YACb,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,uFAAuF;gBACjG,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK;aACvC,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,gDAAgD,CAAC;iBACpE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;iBACjD,MAAM,CAAC,YAAY,CAAC;iBACpB,QAAQ,CAAC,YAAY,EAAE,oEAAoE,CAAC;iBAC5F,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;iBACxD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;iBACtD,OAAO,CAAC,OAAO,CAAC;iBAChB,QAAQ,CAAC,OAAO,EAAE,gEAAgE,CAAC;iBACnF,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;iBAC/C,OAAO,CAAC,QAAQ,CAAC;iBACjB,QAAQ,CAAC,QAAQ,EAAE,6DAA6D,CAAC;iBACjF,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;iBACjD,OAAO,CAAC,aAAa,CAAC;iBACtB,QAAQ,CAAC,aAAa,EAAE,gDAAgD,CAAC;iBACzE,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC;iBAC1D,OAAO,CAAC,QAAQ,CAAC;iBACjB,QAAQ,CACP,QAAQ,EACR,mGAAmG,CACpG;iBACA,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;iBACjD,OAAO,CAAC,cAAc,CAAC;iBACvB,QAAQ,CAAC,cAAc,EAAE,4CAA4C,CAAC;iBACtE,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC;iBAC5D,OAAO,CAAC,kBAAkB,CAAC;iBAC3B,QAAQ,CAAC,kBAAkB,EAAE,0DAA0D,CAAC;iBACxF,OAAO,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;iBACpE,OAAO,CAAC,MAAM,EAAE,4BAAkB,CAAC;iBACnC,QAAQ,CAAC,MAAM,EAAE,sEAAsE,CAAC;iBACxF,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;iBAC7C,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC;iBACrC,QAAQ,CAAC,SAAS,EAAE,0BAA0B,CAAC;iBAC/C,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC,CAAC,CAAC,CAAC;iBACxC,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC1C,KAAK,EAAE,IAAI,CAAC,MAAgB;gBAC5B,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,SAAS,EAAE,IAAI,CAAC,YAAY,CAAW;gBACvC,WAAW,EAAE,IAAI,CAAC,OAAiB;gBACnC,MAAM,EAAE,IAAI,CAAC,MAAiB;gBAC9B,KAAK,EAAE,IAAI,CAAC,KAAgB;gBAC5B,MAAM,EAAE,IAAI,CAAC,MAAiB;gBAC9B,WAAW,EAAE,IAAI,CAAC,cAAc,CAAY;gBAC5C,UAAU,EAAE,IAAI,CAAC,aAAa,CAAY;gBAC1C,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAY;gBACpD,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,IAAI,EAAE,IAAI,CAAC,IAAsB;gBACjC,KAAK,EAAE,IAAI,CAAC,KAAe;gBAC3B,CAAC,EAAE,IAAI;aACR,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,eAAe;QACrB,KAAK,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC;QACnC,WAAW,EAAE,2CAA2C;QACxD,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,KAAK,CAAC,IAAI;YACR,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,uDAAuD;gBACjE,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM;aAC1C,CAAC;iBACD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;iBACxD,OAAO,CAAC,MAAM,EAAE,4BAAkB,CAAC;iBACnC,QAAQ,CAAC,MAAM,EAAE,uEAAuE,CAAC;iBACzF,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;iBAC/C,OAAO,CAAC,UAAU,EAAE,mCAAyB,CAAC;iBAC9C,QAAQ,CAAC,UAAU,EAAE,sDAAsD,CAAC;iBAC5E,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;iBACvD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;iBACzB,QAAQ,CAAC,MAAM,EAAE,qDAAqD,CAAC;iBACvE,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;iBAC/C,OAAO,CAAC,aAAa,CAAC;iBACtB,QAAQ,CAAC,aAAa,EAAE,iEAAiE,CAAC;iBAC1F,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC;iBAC7D,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC5C,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,IAAI,EAAE,IAAI,CAAC,IAAsB;gBACjC,QAAQ,EAAE,IAAI,CAAC,QAAkB;gBACjC,IAAI,EAAE,IAAI,CAAC,IAA8B;gBACzC,WAAW,EAAE,IAAI,CAAC,WAAsB;aACzC,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,mBAAmB;QACzB,KAAK,EAAE,CAAC,eAAe,EAAE,oBAAoB,EAAE,gBAAgB,CAAC;QAChE,WAAW,EAAE,4EAA4E;QACzF,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,KAAK,CAAC,IAAI;YACR,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,uFAAuF;gBACjG,OAAO,EAAE,IAAI,CAAC,wBAAwB,CAAC,KAAK;aAC7C,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,yDAAyD,CAAC;iBAC7E,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC;iBACvD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC;iBAC5D,OAAO,CAAC,iBAAiB,EAAE,4BAAkB,CAAC;iBAC9C,QAAQ,CAAC,iBAAiB,EAAE,2DAA2D,CAAC;iBACxF,OAAO,CAAC,iBAAiB,EAAE,IAAA,6BAAmB,EAAC,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;iBAC7F,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAc,EAAE;gBAChD,KAAK,EAAE,IAAI,CAAC,MAAgB;gBAC5B,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,cAAc,EAAE,IAAA,+BAAqB,EAAC,IAAI,CAAC,iBAAiB,CAAW,CAAC;gBACxE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;aACzC,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,CAAC,cAAc,EAAE,gBAAgB,EAAE,aAAa,CAAC;QACxD,WAAW,EAAE,sFAAsF;QACnG,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,uFAAuF;QACvF,KAAK,CAAC,IAAS;YACb,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,2DAA2D;gBACrE,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;aACtC,CAAC;iBACD,MAAM,CAAC,KAAK,CAAC;iBACb,QAAQ,CAAC,KAAK,EAAE,8CAA8C,CAAC;iBAC/D,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;iBACzC,OAAO,CAAC,WAAW,EAAE,uBAAa,CAAC;iBACnC,QAAQ,CAAC,WAAW,EAAE,0CAA0C,CAAC;iBACjE,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;iBACrD,OAAO,CAAC,SAAS,CAAC;iBAClB,QAAQ,CAAC,SAAS,EAAE,4DAA4D,CAAC;iBACjF,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;iBACjD,KAAK,CAAC,SAAS,EAAE,iBAAiB,CAAC;iBACnC,MAAM,CAAC,UAAU,CAAC;iBAClB,QAAQ,CAAC,UAAU,EAAE,kEAAkE,CAAC;iBACxF,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;iBACnD,KAAK,CAAC,UAAU,EAAE,kBAAkB,CAAC;iBACrC,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;iBACpD,MAAM,CAAC,KAAK,CAAC;iBACb,QAAQ,CACP,KAAK,EACL,kGAAkG,CACnG;iBACA,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;iBAC7C,KAAK,CAAC,KAAK,EAAE,eAAe,CAAC;iBAC7B,OAAO,CAAC,iBAAiB,EAAE,4BAAkB,CAAC;iBAC9C,QAAQ,CAAC,iBAAiB,EAAE,gEAAgE,CAAC;iBAC7F,OAAO,CAAC,iBAAiB,EAAE,IAAA,6BAAmB,EAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;iBACrF,OAAO,CAAC,UAAU,EAAE,4BAAkB,CAAC;iBACvC,QAAQ,CAAC,UAAU,EAAE,iEAAiE,CAAC;iBACvF,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;iBACnD,MAAM,CAAC,UAAU,CAAC;iBAClB,QAAQ,CAAC,UAAU,EAAE,oEAAoE,CAAC;iBAC1F,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;iBACnD,OAAO,CAAC,YAAY,EAAE,wBAAc,CAAC;iBACrC,QAAQ,CAAC,YAAY,EAAE,kDAAkD,CAAC;iBAC1E,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;iBACtD,OAAO,CAAC,SAAS,EAAE,qBAAW,CAAC;iBAC/B,QAAQ,CAAC,SAAS,EAAE,sCAAsC,CAAC;iBAC3D,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC;iBACrD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;iBACzB,QAAQ,CAAC,MAAM,EAAE,wDAAwD,CAAC;iBAC1E,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;iBAChD,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC;iBACtF,MAAM,CAAC,UAAU,CAAC;iBAClB,QAAQ,CAAC,UAAU,EAAE,sCAAsC,CAAC;iBAC5D,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAc,EAAE;gBACxC,GAAG,EAAE,IAAI,CAAC,GAAa;gBACvB,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,GAAa;gBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAkB;gBACjC,cAAc,EAAE,IAAA,+BAAqB,EAAC,IAAI,CAAC,iBAAiB,CAAW,CAAC;gBACxE,QAAQ,EAAE,IAAI,CAAC,QAA0B;gBACzC,OAAO,EAAE,IAAI,CAAC,OAAkB;gBAChC,QAAQ,EAAE,IAAI,CAAC,QAAkB;gBACjC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAkB;gBAC9C,WAAW,EAAE,IAAI,CAAC,OAAiB;gBACnC,SAAS,EAAE,IAAI,CAAC,IAA8B;gBAC9C,OAAO,EAAE,IAAI,CAAC,UAAU,CAAW;aACpC,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,eAAe;QACrB,KAAK,EAAE,CAAC,OAAO,CAAC;QAChB,WAAW,EAAE,+EAA+E;QAC5F,SAAS,EAAE,CAAC,kBAAkB,CAAC;QAC/B,KAAK,CAAC,IAAI;YACR,OAAO,IAAI;iBACR,UAAU,CAAC,gBAAgB,EAAE;gBAC5B,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,6EAA6E;gBACvF,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO;aAC3C,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,0EAA0E,CAAC;iBAC9F,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;iBACnD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;iBACxD,OAAO,CAAC,SAAS,CAAC;iBAClB,QAAQ,CAAC,SAAS,EAAE,sDAAsD,CAAC;iBAC3E,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;iBACrD,KAAK,CAAC,SAAS,EAAE,iBAAiB,CAAC;iBACnC,OAAO,CAAC,YAAY,EAAE,wBAAc,CAAC;iBACrC,QAAQ,CAAC,YAAY,EAAE,gDAAgD,CAAC;iBACxE,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC;iBAC1D,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC5C,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAW;gBACzC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,OAAO,EAAE,IAAI,CAAC,OAAkB;gBAChC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAkB;aAC/C,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,gBAAgB;QACtB,KAAK,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;QACtC,WAAW,EAAE,iEAAiE;QAC9E,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,KAAK,CAAC,IAAI;YACR,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,uFAAuF;gBACjG,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,KAAK;aAC1C,CAAC;iBACD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;iBACzD,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC7C,KAAK,EAAE,IAAI,CAAC,KAAe;gBAC3B,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;aACzC,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC;QACxC,WAAW,EAAE,kEAAkE;QAC/E,SAAS,EAAE,CAAC,YAAY,CAAC;QACzB,uFAAuF;QACvF,KAAK,CAAC,IAAS;YACb,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,wDAAwD;gBAClE,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK;aACvC,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,gDAAgD,CAAC;iBACpE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;iBACjD,MAAM,CAAC,YAAY,CAAC;iBACpB,QAAQ,CAAC,YAAY,EAAE,gDAAgD,CAAC;iBACxE,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;iBACxD,MAAM,CAAC,MAAM,CAAC;iBACd,QAAQ,CAAC,MAAM,EAAE,gDAAgD,CAAC;iBAClE,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;iBAC7C,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;iBACtD,MAAM,CAAC,aAAa,CAAC;iBACrB,QAAQ,CAAC,aAAa,EAAE,mDAAmD,CAAC;iBAC5E,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC;iBAC3D,OAAO,CAAC,MAAM,CAAC;iBACf,QAAQ,CAAC,MAAM,EAAE,0CAA0C,CAAC;iBAC5D,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;iBAC7C,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,KAAK,EAAE,uCAAuC,CAAC;iBACxD,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;iBAC3C,OAAO,CAAC,kBAAkB,CAAC;iBAC3B,QAAQ,CAAC,kBAAkB,EAAE,0DAA0D,CAAC;iBACxF,OAAO,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;iBACpE,OAAO,CAAC,QAAQ,EAAE,oBAAU,CAAC;iBAC7B,QAAQ,CAAC,QAAQ,EAAE,sDAAsD,CAAC;iBAC1E,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC;iBACxD,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC;iBACrC,QAAQ,CAAC,SAAS,EAAE,0BAA0B,CAAC;iBAC/C,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC,CAAC,CAAC,CAAC;iBACxC,MAAM,CAAC,KAAK,CAAC;iBACb,QAAQ,CAAC,KAAK,EAAE,sCAAsC,CAAC;iBACvD,MAAM,CAAC,SAAS,CAAC;iBACjB,QAAQ,CAAC,SAAS,EAAE,uDAAuD,CAAC;iBAC5E,MAAM,CAAC,MAAM,CAAC;iBACd,QAAQ,CAAC,MAAM,EAAE,2DAA2D,CAAC;iBAC7E,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC1C,KAAK,EAAE,IAAI,CAAC,MAAgB;gBAC5B,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,SAAS,EAAE,IAAI,CAAC,YAAY,CAAW;gBACvC,IAAI,EAAE,IAAI,CAAC,IAAc;gBACzB,GAAG,EAAE,IAAI,CAAC,GAAc;gBACxB,WAAW,EAAE,IAAI,CAAC,OAAiB;gBACnC,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAY;gBACpD,cAAc,EAAE,IAAI,CAAC,SAAS,CAAW;gBACzC,GAAG,EAAE,IAAI,CAAC,GAAa;gBACvB,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,IAAI,EAAE,IAAI,CAAC,IAAe;gBAC1B,aAAa,EAAE,IAAI,CAAC,MAA4B;gBAChD,WAAW,EAAE,IAAI,CAAC,WAAqB;gBACvC,IAAI,EAAE,IAAI,CAAC,IAAc;gBACzB,KAAK,EAAE,IAAI,CAAC,KAAe;gBAC3B,CAAC,EAAE,IAAI;aACR,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC;QAC1C,WAAW,EAAE,yCAAyC;QACtD,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,uFAAuF;QACvF,KAAK,CAAC,IAAS;YACb,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,oEAAoE;gBAC9E,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK;aACvC,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,mCAAmC,CAAC;iBACvD,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;iBACjD,MAAM,CAAC,YAAY,CAAC;iBACpB,QAAQ,CAAC,YAAY,EAAE,gDAAgD,CAAC;iBACxE,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;iBACxD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;iBACtD,MAAM,CAAC,aAAa,CAAC;iBACrB,QAAQ,CAAC,aAAa,EAAE,mDAAmD,CAAC;iBAC5E,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC;iBAC3D,OAAO,CAAC,aAAa,CAAC;iBACtB,QAAQ,CAAC,aAAa,EAAE,sCAAsC,CAAC;iBAC/D,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC;iBAC1D,OAAO,CAAC,OAAO,CAAC;iBAChB,QAAQ,CAAC,OAAO,EAAE,gEAAgE,CAAC;iBACnF,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;iBAC/C,OAAO,CAAC,QAAQ,CAAC;iBACjB,QAAQ,CAAC,QAAQ,EAAE,6DAA6D,CAAC;iBACjF,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;iBACjD,OAAO,CAAC,aAAa,CAAC;iBACtB,QAAQ,CAAC,aAAa,EAAE,2CAA2C,CAAC;iBACpE,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC;iBAC3D,OAAO,CAAC,cAAc,CAAC;iBACvB,QAAQ,CAAC,cAAc,EAAE,4CAA4C,CAAC;iBACtE,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC;iBAC5D,OAAO,CAAC,kBAAkB,CAAC;iBAC3B,QAAQ,CAAC,kBAAkB,EAAE,0DAA0D,CAAC;iBACxF,OAAO,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;iBACpE,OAAO,CAAC,QAAQ,EAAE,oBAAU,CAAC;iBAC7B,QAAQ,CAAC,QAAQ,EAAE,sDAAsD,CAAC;iBAC1E,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC;iBACxD,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC;iBACrC,QAAQ,CAAC,SAAS,EAAE,0BAA0B,CAAC;iBAC/C,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC,CAAC,CAAC,CAAC;iBACxC,OAAO,CAAC,MAAM,EAAE,4BAAkB,CAAC;iBACnC,QAAQ,CAAC,MAAM,EAAE,uCAAuC,CAAC;iBACzD,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;iBAC7C,MAAM,CAAC,KAAK,CAAC;iBACb,QAAQ,CAAC,KAAK,EAAE,sCAAsC,CAAC;iBACvD,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC1C,KAAK,EAAE,IAAI,CAAC,MAAgB;gBAC5B,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,SAAS,EAAE,IAAI,CAAC,YAAY,CAAW;gBACvC,MAAM,EAAE,IAAI,CAAC,MAAiB;gBAC9B,WAAW,EAAE,IAAI,CAAC,cAAc,CAAY;gBAC5C,WAAW,EAAE,IAAI,CAAC,OAAiB;gBACnC,WAAW,EAAE,IAAI,CAAC,WAAsB;gBACxC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAY;gBAC1C,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAY;gBACpD,IAAI,EAAE,IAAI,CAAC,IAAsB;gBACjC,KAAK,EAAE,IAAI,CAAC,KAAgB;gBAC5B,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,aAAa,EAAE,IAAI,CAAC,MAA4B;gBAChD,WAAW,EAAE,IAAI,CAAC,WAAqB;gBACvC,GAAG,EAAE,IAAI,CAAC,GAAa;gBACvB,KAAK,EAAE,IAAI,CAAC,KAAe;gBAC3B,CAAC,EAAE,IAAI;aACR,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC;QAC3C,WAAW,EAAE,gDAAgD;QAC7D,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,KAAK,CAAC,IAAI;YACR,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,6DAA6D;gBACvE,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM;aACvC,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,+CAA+C,CAAC;iBACnE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;iBAChD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;iBACrD,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAc,EAAE;gBACzC,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;aACzC,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,eAAe;QACrB,KAAK,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC;QAChC,WAAW,EAAE,4CAA4C;QACzD,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,uFAAuF;QACvF,KAAK,CAAC,IAAS;YACb,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,mGAAmG;aAC9G,CAAC;iBACD,MAAM,CAAC,KAAK,CAAC;iBACb,QAAQ,CAAC,KAAK,EAAE,sDAAsD,CAAC;iBACvE,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC;iBAC7C,MAAM,CAAC,SAAS,CAAC;iBACjB,QAAQ,CAAC,SAAS,EAAE,oDAAoD,CAAC;iBACzE,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;iBACpD,MAAM,CAAC,SAAS,CAAC;iBACjB,QAAQ,CAAC,SAAS,EAAE,qDAAqD,CAAC;iBAC1E,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;iBAClD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;iBACxD,OAAO,CAAC,OAAO,CAAC;iBAChB,QAAQ,CAAC,OAAO,EAAE,wEAAwE,CAAC;iBAC3F,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;iBACjD,OAAO,CAAC,QAAQ,EAAE,oBAAU,CAAC;iBAC7B,QAAQ,CAAC,QAAQ,EAAE,oEAAoE,CAAC;iBACxF,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC;iBAC1D,OAAO,CAAC,MAAM,EAAE,yBAAe,CAAC;iBAChC,QAAQ,CAAC,MAAM,EAAE,qCAAqC,CAAC;iBACvD,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;iBAC/C,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC;iBAC1B,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC;iBACrC,QAAQ,CAAC,SAAS,EAAE,0BAA0B,CAAC;iBAC/C,OAAO,CAAC,SAAS,EAAE,2BAAiB,CAAC,CAAC,CAAC,CAAC;iBACxC,OAAO,CAAC,MAAM,EAAE,kBAAQ,CAAC;iBACzB,QAAQ,CAAC,MAAM,EAAE,oDAAoD,CAAC;iBACtE,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;iBAC/C,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;iBAC3B,QAAQ,CAAC,QAAQ,EAAE,oEAAoE,CAAC;iBACxF,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;iBACnD,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC5B,QAAQ,CAAC,SAAS,EAAE,qEAAqE,CAAC;iBAC1F,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;iBACrD,OAAO,CAAC,aAAa,CAAC;iBACtB,QAAQ,CAAC,aAAa,EAAE,iEAAiE,CAAC;iBAC1F,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC;iBAC7D,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC5C,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,MAAM,EAAE,IAAI,CAAC,SAAS,CAAW;gBACjC,GAAG,EAAE,IAAI,CAAC,GAAa;gBACvB,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAW;gBAC/B,WAAW,EAAE,IAAI,CAAC,OAAiB;gBACnC,KAAK,EAAE,IAAI,CAAC,KAAgB;gBAC5B,IAAI,EAAE,IAAI,CAAC,IAA0B;gBACrC,aAAa,EAAE,IAAI,CAAC,MAA4B;gBAChD,MAAM,EAAE,IAAI,CAAC,MAAgC;gBAC7C,OAAO,EAAE,IAAI,CAAC,OAAiC;gBAC/C,IAAI,EAAE,IAAI,CAAC,IAA0B;gBACrC,WAAW,EAAE,IAAI,CAAC,WAAsB;gBACxC,CAAC,EAAE,IAAI;aACR,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,CAAC,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC;QACtE,WAAW,EAAE,uDAAuD;QACpE,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,uFAAuF;QACvF,KAAK,CAAC,IAAS;YACb,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,8HAA8H;gBAChI,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;aACtC,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,+EAA+E,CAAC;iBACnG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;iBAC/C,MAAM,CAAC,UAAU,CAAC;iBAClB,QAAQ,CAAC,UAAU,EAAE,yEAAyE,CAAC;iBAC/F,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;iBACnD,KAAK,CAAC,UAAU,EAAE,kBAAkB,CAAC;iBACrC,OAAO,CAAC,SAAS,CAAC;iBAClB,QAAQ,CAAC,SAAS,EAAE,4DAA4D,CAAC;iBACjF,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;iBACjD,KAAK,CAAC,SAAS,EAAE,iBAAiB,CAAC;iBACnC,OAAO,CAAC,iBAAiB,EAAE,4BAAkB,CAAC;iBAC9C,QAAQ,CAAC,iBAAiB,EAAE,+DAA+D,CAAC;iBAC5F,OAAO,CAAC,iBAAiB,EAAE,IAAA,6BAAmB,EAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;iBACrF,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;iBACpD,OAAO,CAAC,UAAU,EAAE,4BAAkB,CAAC;iBACvC,QAAQ,CAAC,UAAU,EAAE,wDAAwD,CAAC;iBAC9E,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;iBACnD,MAAM,CAAC,UAAU,CAAC;iBAClB,QAAQ,CAAC,UAAU,EAAE,oEAAoE,CAAC;iBAC1F,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;iBACnD,OAAO,CAAC,YAAY,EAAE,wBAAc,CAAC;iBACrC,QAAQ,CAAC,YAAY,EAAE,kDAAkD,CAAC;iBAC1E,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;iBACtD,OAAO,CAAC,SAAS,EAAE,qBAAW,CAAC;iBAC/B,QAAQ,CAAC,SAAS,EAAE,sCAAsC,CAAC;iBAC3D,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC;iBACrD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;iBACzB,QAAQ,CAAC,MAAM,EAAE,wDAAwD,CAAC;iBAC1E,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;iBAChD,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAc,EAAE;gBACxC,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,QAAQ,EAAE,IAAI,CAAC,QAAkB;gBACjC,cAAc,EAAE,IAAA,+BAAqB,EAAC,IAAI,CAAC,iBAAiB,CAAW,CAAC;gBACxE,QAAQ,EAAE,IAAI,CAAC,QAA0B;gBACzC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,OAAO,EAAE,IAAI,CAAC,OAAkB;gBAChC,QAAQ,EAAE,IAAI,CAAC,QAAkB;gBACjC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAkB;gBAC9C,WAAW,EAAE,IAAI,CAAC,OAAiB;gBACnC,SAAS,EAAE,IAAI,CAAC,IAA8B;aAC/C,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,eAAe;QACrB,KAAK,EAAE,CAAC,SAAS,CAAC;QAClB,WAAW,EAAE,8EAA8E;QAC3F,SAAS,EAAE,CAAC,kBAAkB,CAAC;QAC/B,KAAK,CAAC,IAAI;YACR,OAAO,IAAI;iBACR,UAAU,CAAC,gBAAgB,EAAE;gBAC5B,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,0FAA0F;gBACpG,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO;aAC3C,CAAC;iBACD,MAAM,CAAC,QAAQ,CAAC;iBAChB,QAAQ,CAAC,QAAQ,EAAE,0EAA0E,CAAC;iBAC9F,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;iBACnD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;iBACxD,OAAO,CAAC,SAAS,CAAC;iBAClB,QAAQ,CAAC,SAAS,EAAE,sDAAsD,CAAC;iBAC3E,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;iBACrD,KAAK,CAAC,SAAS,EAAE,iBAAiB,CAAC;iBACnC,OAAO,CAAC,iBAAiB,EAAE,4BAAkB,CAAC;iBAC9C,QAAQ,CAAC,iBAAiB,EAAE,qEAAqE,CAAC;iBAClG,OAAO,CAAC,iBAAiB,EAAE,IAAA,6BAAmB,EAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;iBACzF,OAAO,CAAC,YAAY,EAAE,wBAAc,CAAC;iBACrC,QAAQ,CAAC,YAAY,EAAE,gDAAgD,CAAC;iBACxE,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC;iBAC1D,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;iBACzB,QAAQ,CAAC,MAAM,EAAE,wDAAwD,CAAC;iBAC1E,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC;iBACpD,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC5C,MAAM,EAAE,IAAI,CAAC,MAAgB;gBAC7B,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAW;gBACzC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,cAAc,EAAE,IAAA,+BAAqB,EAAC,IAAI,CAAC,iBAAiB,CAAW,CAAC;gBACxE,OAAO,EAAE,IAAI,CAAC,OAAkB;gBAChC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAkB;gBAC9C,SAAS,EAAE,IAAI,CAAC,IAA8B;aAC/C,CAAC,CAAC;QACL,CAAC;KACF;IACD;QACE,IAAI,EAAE,gBAAgB;QACtB,KAAK,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,CAAC;QACpE,WAAW,EAAE,gGAAgG;QAC7G,SAAS,EAAE,CAAC,UAAU,CAAC;QACvB,KAAK,CAAC,IAAI;YACR,OAAO,IAAI;iBACR,UAAU,CAAC,QAAQ,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,wDAAwD;gBAClE,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,KAAK;aAC1C,CAAC;iBACD,MAAM,CAAC,WAAW,CAAC;iBACnB,QAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC;iBACzD,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;iBACzD,MAAM,CAAC,KAAK,CAAC;iBACb,QAAQ,CAAC,KAAK,EAAE,sCAAsC,CAAC;iBACvD,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;iBAC9B,QAAQ,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;QAC5F,CAAC;QACD,GAAG,CAAC,IAAI;YACN,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAc,EAAE;gBAC7C,KAAK,EAAE,IAAI,CAAC,KAAe;gBAC3B,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAc;gBACxC,GAAG,EAAE,IAAI,CAAC,GAAa;aACxB,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC;AAEF,MAAM,QAAQ;IAAd;QACS,QAAG,GAAG,WAAW,CAAC;IAS3B,CAAC;IAPC,IAAW,KAAK;QACd,OAAO,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,IAAW,KAAK;QACd,OAAO,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;CACF;AAEY,QAAA,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC"}
1
+ {"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "0.15.0-beta.4708",
3
+ "version": "0.15.0-beta.4725",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -80,5 +80,5 @@
80
80
  "typescript": "^4.7.3",
81
81
  "yargs": "^15.4.1"
82
82
  },
83
- "gitHead": "c0d9ed70f3a5ff7cf9bdebae379f30af361914c3"
83
+ "gitHead": "75f9470ac248fe45f806bd16b2adabde86b48e8f"
84
84
  }
package/src/apps/new-pilet.test.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { mkdtempSync, existsSync } from 'fs';
1
+ import { mkdtempSync, existsSync, readFileSync } from 'fs';
2
2
  import { tmpdir } from 'os';
3
3
  import { join, resolve } from 'path';
4
4
  import { newPilet } from './new-pilet';
@@ -82,4 +82,21 @@ describe('New Pilet Command', () => {
82
82
  expect(existsSync(resolve(dir, 'src/index.jsx'))).toBeTruthy();
83
83
  expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
84
84
  });
85
+
86
+ it('should set pilet name if passed as argument', async () => {
87
+ const dir = createTempDir();
88
+ await newPilet(dir, {
89
+ install: false,
90
+ source: 'piral@latest',
91
+ name: 'testpiralname',
92
+ });
93
+ expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();
94
+ expect(existsSync(resolve(dir, 'package.json'))).toBeTruthy();
95
+ expect(existsSync(resolve(dir, 'tsconfig.json'))).toBeTruthy();
96
+ expect(existsSync(resolve(dir, 'src/index.tsx'))).toBeTruthy();
97
+ expect(existsSync(resolve(dir, '.npmrc'))).toBeFalsy();
98
+
99
+ const packageContent = await JSON.parse(readFileSync(`${dir}/package.json`, 'utf8'));
100
+ expect(packageContent.name).toBe('testpiralname');
101
+ });
85
102
  });
package/src/apps/new-pilet.ts CHANGED
@@ -90,6 +90,11 @@ export interface NewPiletOptions {
90
90
  * Places additional variables that should used when scaffolding.
91
91
  */
92
92
  variables?: Record<string, string>;
93
+
94
+ /**
95
+ * Sets Pilet's name
96
+ */
97
+ name?: string;
93
98
  }
94
99
 
95
100
  export const newPiletDefaults: NewPiletOptions = {
@@ -104,6 +109,7 @@ export const newPiletDefaults: NewPiletOptions = {
104
109
  npmClient: undefined,
105
110
  bundlerName: 'none',
106
111
  variables: {},
112
+ name: undefined,
107
113
  };
108
114
 
109
115
  export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions = {}) {
@@ -119,6 +125,7 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
119
125
  bundlerName = newPiletDefaults.bundlerName,
120
126
  variables = newPiletDefaults.variables,
121
127
  npmClient: defaultNpmClient = newPiletDefaults.npmClient,
128
+ name = newPiletDefaults.name,
122
129
  } = options;
123
130
  const fullBase = resolve(process.cwd(), baseDir);
124
131
  const root = resolve(fullBase, target);
@@ -129,7 +136,7 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
129
136
 
130
137
  if (success) {
131
138
  const npmClient = await determineNpmClient(root, defaultNpmClient);
132
- const projectName = basename(root);
139
+ const projectName = name || basename(root);
133
140
 
134
141
  progress(`Scaffolding new pilet in %s ...`, root);
135
142
 
package/src/apps/new-piral.test.ts CHANGED
@@ -51,7 +51,7 @@ describe('New Piral Command', () => {
51
51
  it('scaffolding with custom app name works', async () => {
52
52
  const dir = createTempDir();
53
53
  await newPiral(dir, {
54
- appName: 'test-name',
54
+ name: 'test-name',
55
55
  install: false,
56
56
  });
57
57
 
package/src/apps/new-piral.ts CHANGED
@@ -90,7 +90,7 @@ export interface NewPiralOptions {
90
90
  /**
91
91
  * Sets new app name
92
92
  */
93
- appName?: string;
93
+ name?: string;
94
94
  }
95
95
 
96
96
  export const newPiralDefaults: NewPiralOptions = {
@@ -107,7 +107,7 @@ export const newPiralDefaults: NewPiralOptions = {
107
107
  npmClient: undefined,
108
108
  bundlerName: 'none',
109
109
  variables: {},
110
- appName: undefined,
110
+ name: undefined,
111
111
  };
112
112
 
113
113
  export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions = {}) {
@@ -124,7 +124,7 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
124
124
  logLevel = newPiralDefaults.logLevel,
125
125
  bundlerName = newPiralDefaults.bundlerName,
126
126
  variables = newPiralDefaults.variables,
127
- appName = newPiralDefaults.appName,
127
+ name = newPiralDefaults.name,
128
128
  npmClient: defaultNpmClient = newPiralDefaults.npmClient,
129
129
  } = options;
130
130
  const fullBase = resolve(process.cwd(), baseDir);
@@ -142,7 +142,7 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
142
142
  if (success) {
143
143
  const npmClient = await determineNpmClient(root, defaultNpmClient);
144
144
  const packageRef = combinePackageRef(framework, version, 'registry');
145
- const projectName = appName || basename(root);
145
+ const projectName = name || basename(root);
146
146
 
147
147
  progress(`Creating a new Piral instance in %s ...`, root);
148
148
 
package/src/commands.ts CHANGED
@@ -317,9 +317,9 @@ const allCommands: Array<ToolCommand<any>> = [
317
317
  .string('base')
318
318
  .default('base', process.cwd())
319
319
  .describe('base', 'Sets the base directory. By default the current directory is used.')
320
- .string('app-name')
321
- .describe('app-name', 'Sets the name for the new Piral app.')
322
- .default('app-name', apps.newPiralDefaults.appName);
320
+ .string('name')
321
+ .describe('name', 'Sets the name for the new Piral app.')
322
+ .default('name', apps.newPiralDefaults.name);
323
323
  },
324
324
  run(args) {
325
325
  return apps.newPiral(args.base as string, {
@@ -336,7 +336,7 @@ const allCommands: Array<ToolCommand<any>> = [
336
336
  npmClient: args['npm-client'] as NpmClientType,
337
337
  bundlerName: args.bundler as string,
338
338
  variables: args.vars as Record<string, string>,
339
- appName: args['app-name'] as string,
339
+ name: args['name'] as string,
340
340
  });
341
341
  },
342
342
  },
@@ -709,7 +709,10 @@ const allCommands: Array<ToolCommand<any>> = [
709
709
  .default('vars', apps.newPiletDefaults.variables)
710
710
  .string('base')
711
711
  .default('base', process.cwd())
712
- .describe('base', 'Sets the base directory. By default the current directory is used.');
712
+ .describe('base', 'Sets the base directory. By default the current directory is used.')
713
+ .string('name')
714
+ .describe('name', 'Sets the name for the new Pilet.')
715
+ .default('name', apps.newPiletDefaults.name);
713
716
  },
714
717
  run(args) {
715
718
  return apps.newPilet(args.base as string, {
@@ -724,6 +727,7 @@ const allCommands: Array<ToolCommand<any>> = [
724
727
  npmClient: args['npm-client'] as NpmClientType,
725
728
  bundlerName: args.bundler as string,
726
729
  variables: args.vars as Record<string, string>,
730
+ name: args['name'] as string,
727
731
  });
728
732
  },
729
733
  },