piral-cli 0.15.0-alpha.4036 → 0.15.0-alpha.4041

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 (17) hide show
  1. package/lib/apps/new-pilet.js +4 -3
  2. package/lib/apps/new-pilet.js.map +1 -1
  3. package/lib/common/importmap.js +20 -1
  4. package/lib/common/importmap.js.map +1 -1
  5. package/lib/common/package.d.ts +7 -0
  6. package/lib/common/package.js +28 -10
  7. package/lib/common/package.js.map +1 -1
  8. package/lib/rules/pilet-has-externals-as-peers.js +1 -1
  9. package/lib/rules/pilet-has-externals-as-peers.js.map +1 -1
  10. package/lib/types/common.d.ts +3 -1
  11. package/package.json +2 -2
  12. package/src/apps/new-pilet.ts +4 -3
  13. package/src/common/importmap.ts +25 -1
  14. package/src/common/package.test.ts +2 -2
  15. package/src/common/package.ts +29 -12
  16. package/src/rules/pilet-has-externals-as-peers.ts +2 -2
  17. package/src/types/common.ts +3 -1
package/lib/apps/new-pilet.js CHANGED
@@ -20,7 +20,7 @@ exports.newPiletDefaults = {
20
20
  forceOverwrite: common_1.ForceOverwrite.no,
21
21
  language: common_1.config.language,
22
22
  install: true,
23
- template: 'default',
23
+ template: undefined,
24
24
  logLevel: types_1.LogLevels.info,
25
25
  npmClient: common_1.config.npmClient,
26
26
  bundlerName: 'none',
@@ -68,7 +68,7 @@ always-auth=true`, forceOverwrite);
68
68
  const packageVersion = (0, common_1.getPackageVersion)(hadVersion, sourceName, sourceVersion, type, root);
69
69
  const piralInfo = yield (0, common_1.readPiralPackage)(root, packageName);
70
70
  const isEmulator = (0, common_1.checkAppShellPackage)(piralInfo);
71
- const { preScaffold, postScaffold, files } = (0, common_1.getPiletsInfo)(piralInfo);
71
+ const { preScaffold, postScaffold, files, template: preSelectedTemplate } = (0, common_1.getPiletsInfo)(piralInfo);
72
72
  if (preScaffold) {
73
73
  (0, common_1.progress)(`Running preScaffold script ...`);
74
74
  (0, common_1.log)('generalDebug_0003', `Run: ${preScaffold}`);
@@ -76,7 +76,8 @@ always-auth=true`, forceOverwrite);
76
76
  }
77
77
  (0, common_1.progress)(`Taking care of templating ...`);
78
78
  const data = (0, common_1.getPiletScaffoldData)(language, root, packageName, variables);
79
- yield (0, common_1.scaffoldPiletSourceFiles)(template, registry, data, forceOverwrite);
79
+ const chosenTemplate = template || preSelectedTemplate || 'default';
80
+ yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
80
81
  if (isEmulator) {
81
82
  // in the emulator case we get the files (and files_once) from the contained tarballs
82
83
  yield (0, common_1.copyPiralFiles)(root, packageName, piralInfo, common_1.ForceOverwrite.yes, data);
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":"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"}
package/lib/common/importmap.js CHANGED
@@ -50,6 +50,7 @@ function resolveImportmap(dir, importmap) {
50
50
  return __awaiter(this, void 0, void 0, function* () {
51
51
  const dependencies = [];
52
52
  const sharedImports = importmap === null || importmap === void 0 ? void 0 : importmap.imports;
53
+ const inheritedImports = importmap === null || importmap === void 0 ? void 0 : importmap.inherit;
53
54
  if (typeof sharedImports === 'object' && sharedImports) {
54
55
  for (const depName of Object.keys(sharedImports)) {
55
56
  const url = sharedImports[depName];
@@ -91,7 +92,9 @@ function resolveImportmap(dir, importmap) {
91
92
  const exists = yield (0, io_1.checkExists)(entry);
92
93
  if (exists) {
93
94
  const isDirectory = yield (0, io_1.checkIsDirectory)(entry);
94
- const packageJson = isDirectory ? (0, path_1.resolve)(entry, 'package.json') : yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
95
+ const packageJson = isDirectory
96
+ ? (0, path_1.resolve)(entry, 'package.json')
97
+ : yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
95
98
  const packageJsonExists = yield (0, io_1.checkExists)(packageJson);
96
99
  if (packageJsonExists) {
97
100
  const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
@@ -125,6 +128,22 @@ function resolveImportmap(dir, importmap) {
125
128
  }
126
129
  }
127
130
  }
131
+ if (Array.isArray(inheritedImports)) {
132
+ for (const inheritedImport of inheritedImports) {
133
+ const packageJson = tryResolve(dir, `${inheritedImport}/package.json`);
134
+ if (packageJson) {
135
+ const packageDir = (0, path_1.dirname)(packageJson);
136
+ const packageDetails = require(packageJson);
137
+ const otherDependencies = yield readImportmap(packageDir, packageDetails);
138
+ for (const dependency of otherDependencies) {
139
+ const entry = dependencies.find((dep) => dep.name === dependency.name);
140
+ if (!entry) {
141
+ dependencies.push(dependency);
142
+ }
143
+ }
144
+ }
145
+ }
146
+ }
128
147
  return dependencies;
129
148
  });
130
149
  }
package/lib/common/importmap.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
package/lib/common/package.d.ts CHANGED
@@ -9,6 +9,10 @@ export declare function getPiralPackage(app: string, language: SourceLanguage, v
9
9
  start: string;
10
10
  build: string;
11
11
  };
12
+ importmap: {
13
+ imports: {};
14
+ inherit: string[];
15
+ };
12
16
  pilets: PiletsInfo;
13
17
  dependencies: {
14
18
  [x: string]: string;
@@ -28,6 +32,7 @@ export declare function getPiletsInfo(piralInfo: any): PiletsInfo;
28
32
  export declare function retrievePiralRoot(baseDir: string, entry: string): Promise<string>;
29
33
  export declare function findDependencyVersion(pckg: Record<string, any>, rootPath: string, packageName: string): Promise<string>;
30
34
  export declare function findPackageVersion(rootPath: string, packageName: string): Promise<string>;
35
+ export declare function retrieveExternals(root: string, packageInfo: any): Promise<string[]>;
31
36
  export declare function retrievePiletsInfo(entryFile: string): Promise<{
32
37
  externals: string[];
33
38
  name: any;
@@ -41,6 +46,7 @@ export declare function retrievePiletsInfo(entryFile: string): Promise<{
41
46
  ignored: any[];
42
47
  root: string;
43
48
  files: (string | TemplateFileLocation)[];
49
+ template: string;
44
50
  devDependencies: Record<string, string | true>;
45
51
  validators: Record<string, any>;
46
52
  packageOverrides: Record<string, any>;
@@ -66,6 +72,7 @@ export declare function retrievePiletData(target: string, app?: string): Promise
66
72
  ignored: any[];
67
73
  importmap: import("../types").SharedDependency[];
68
74
  appFile: string;
75
+ appRoot: string;
69
76
  piletPackage: any;
70
77
  appPackage: any;
71
78
  emulator: boolean;
package/lib/common/package.js CHANGED
@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
20
20
  return t;
21
21
  };
22
22
  Object.defineProperty(exports, "__esModule", { value: true });
23
- exports.retrievePiletData = exports.checkAppShellPackage = exports.patchPiletPackage = exports.isValidDependency = exports.retrievePiletsInfo = exports.findPackageVersion = exports.findDependencyVersion = exports.retrievePiralRoot = exports.getPiletsInfo = exports.copyPiralFiles = exports.copyScaffoldingFiles = exports.getFileStats = exports.getPiralPackage = exports.readPiralPackage = exports.findPackageRoot = exports.getPiralPath = void 0;
23
+ exports.retrievePiletData = exports.checkAppShellPackage = exports.patchPiletPackage = exports.isValidDependency = exports.retrievePiletsInfo = exports.retrieveExternals = exports.findPackageVersion = exports.findDependencyVersion = exports.retrievePiralRoot = exports.getPiletsInfo = exports.copyPiralFiles = exports.copyScaffoldingFiles = exports.getFileStats = exports.getPiralPackage = exports.readPiralPackage = exports.findPackageRoot = exports.getPiralPath = void 0;
24
24
  const path_1 = require("path");
25
25
  const log_1 = require("./log");
26
26
  const info_1 = require("./info");
@@ -145,8 +145,10 @@ function findPackage(pck, baseDir) {
145
145
  if (path) {
146
146
  (0, log_1.log)('generalDebug_0003', `Following the app package in "${path}" ...`);
147
147
  const appPackage = require(path);
148
+ const root = (0, path_1.dirname)(path);
148
149
  const relPath = appPackage && appPackage.app;
149
- appPackage.app = relPath && (0, path_1.resolve)((0, path_1.dirname)(path), relPath);
150
+ appPackage.app = relPath && (0, path_1.resolve)(root, relPath);
151
+ appPackage.root = root;
150
152
  return appPackage;
151
153
  }
152
154
  }
@@ -172,6 +174,10 @@ function getPiralPackage(app, language, version, framework, bundler) {
172
174
  start: 'piral debug',
173
175
  build: 'piral build',
174
176
  },
177
+ importmap: {
178
+ imports: {},
179
+ inherit: ['piral-base', framework !== 'piral-base' && 'piral-core'].filter(Boolean),
180
+ },
175
181
  pilets: getPiletsInfo({}),
176
182
  dependencies,
177
183
  devDependencies,
@@ -291,11 +297,11 @@ function copyPiralFiles(root, name, piralInfo, forceOverwrite, variables, origin
291
297
  }
292
298
  exports.copyPiralFiles = copyPiralFiles;
293
299
  function getPiletsInfo(piralInfo) {
294
- const { files = [], externals = [], scripts = {}, validators = {}, devDependencies = {}, preScaffold = '', postScaffold = '', preUpgrade = '', postUpgrade = '', packageOverrides = {}, } = piralInfo.pilets || {};
300
+ const { files = [], scripts = {}, template = 'default', validators = {}, devDependencies = {}, preScaffold = '', postScaffold = '', preUpgrade = '', postUpgrade = '', packageOverrides = {}, } = piralInfo.pilets || {};
295
301
  return {
296
302
  files,
297
- externals,
298
303
  scripts,
304
+ template,
299
305
  validators,
300
306
  devDependencies,
301
307
  preScaffold,
@@ -371,6 +377,19 @@ function findPackageVersion(rootPath, packageName) {
371
377
  });
372
378
  }
373
379
  exports.findPackageVersion = findPackageVersion;
380
+ function retrieveExternals(root, packageInfo) {
381
+ var _a;
382
+ return __awaiter(this, void 0, void 0, function* () {
383
+ const sharedDependencies = yield (0, importmap_1.readImportmap)(root, packageInfo);
384
+ if (sharedDependencies.length === 0) {
385
+ const allDeps = Object.assign(Object.assign({}, packageInfo.devDependencies), packageInfo.dependencies);
386
+ const deps = (_a = packageInfo.pilets) === null || _a === void 0 ? void 0 : _a.externals;
387
+ return (0, npm_1.makeExternals)(allDeps, deps);
388
+ }
389
+ return sharedDependencies.map((m) => m.name);
390
+ });
391
+ }
392
+ exports.retrieveExternals = retrieveExternals;
374
393
  function retrievePiletsInfo(entryFile) {
375
394
  return __awaiter(this, void 0, void 0, function* () {
376
395
  const exists = yield (0, io_2.checkExists)(entryFile);
@@ -382,12 +401,9 @@ function retrievePiletsInfo(entryFile) {
382
401
  (0, log_1.fail)('packageJsonMissing_0074');
383
402
  }
384
403
  const packageInfo = require(packageJson);
385
- const allDeps = Object.assign(Object.assign({}, packageInfo.devDependencies), packageInfo.dependencies);
386
404
  const info = getPiletsInfo(packageInfo);
387
405
  const root = (0, path_1.dirname)(packageJson);
388
- const sharedDependencies = yield (0, importmap_1.readImportmap)(root, packageInfo);
389
- const deps = sharedDependencies.length > 0 ? sharedDependencies.map((m) => m.name) : info.externals;
390
- const externals = (0, npm_1.makeExternals)(allDeps, deps);
406
+ const externals = yield retrieveExternals(root, packageInfo);
391
407
  return Object.assign(Object.assign({}, info), { externals, name: packageInfo.name, version: packageInfo.version, dependencies: {
392
408
  std: packageInfo.dependencies || {},
393
409
  dev: packageInfo.devDependencies || {},
@@ -481,8 +497,9 @@ function retrievePiletData(target, app) {
481
497
  const root = (0, path_1.dirname)(packageJson);
482
498
  const piletPackage = require(packageJson);
483
499
  const appPackage = findPackage(app || (piletPackage.piral && piletPackage.piral.name) || Object.keys(piletPackage.devDependencies), target);
484
- const appFile = appPackage && appPackage.app;
485
- if (!appFile) {
500
+ const appFile = appPackage === null || appPackage === void 0 ? void 0 : appPackage.app;
501
+ const appRoot = appPackage === null || appPackage === void 0 ? void 0 : appPackage.root;
502
+ if (!appFile || !appRoot) {
486
503
  (0, log_1.fail)('appInstanceInvalid_0011');
487
504
  }
488
505
  const emulator = checkAppShellPackage(appPackage);
@@ -495,6 +512,7 @@ function retrievePiletData(target, app) {
495
512
  ignored: checkArrayOrUndefined(piletPackage, 'preservedDependencies'),
496
513
  importmap,
497
514
  appFile,
515
+ appRoot,
498
516
  piletPackage,
499
517
  appPackage,
500
518
  emulator,
package/lib/common/package.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA2E;AAC3E,+BAAkC;AAClC,iCAAoC;AACpC,uCAA0C;AAC1C,yCAAiE;AACjE,mCAAyD;AACzD,mDAA6D;AAC7D,mCAAoC;AACpC,yCAA2C;AAC3C,2CAA4C;AAC5C,+BAAkH;AAClH,2CAA+F;AAC/F,6BAA6D;AAC7D,6BAAiF;AAGjF,SAAS,aAAa,CAAC,eAAuC,EAAE,OAAe,EAAE,OAAe;IAC9F,IAAI,OAAO,IAAI,OAAO,KAAK,MAAM,EAAE;QACjC,IAAI,wBAAY,CAAC,QAAQ,CAAC,OAAc,CAAC,EAAE;YACzC,eAAe,CAAC,aAAa,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;SACnD;aAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE;YACtC,uCAAuC;YACvC,IAAA,SAAG,EAAC,qBAAqB,EAAE,8BAA8B,OAAO,4CAA4C,CAAC,CAAC;SAC/G;aAAM;YACL,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACpC,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrE,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACnE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;SACjC;KACF;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAY,EACZ,eAA8C,EAC9C,eAAuC;IAEvC,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9G,IAAI,CAAC,QAAQ,EAAE;QACb,IAAA,SAAG,EAAC,2BAA2B,EAAE,IAAI,CAAC,CAAC;KACxC;IAED,OAAO,QAAQ,IAAI,QAAQ,CAAC;AAC9B,CAAC;AAQD,MAAM,0BAA0B,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAE3E,SAAe,gBAAgB,CAC7B,MAAc,EACd,MAAc,EACd,IAAmC;;QAEnC,MAAM,EACJ,IAAI,EACJ,EAAE,EACF,IAAI,GAAG,IAAI,EACX,QAAQ,GAAG,KAAK,GACjB,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3E,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;QAEvD,IAAI,WAAW,EAAE;YACf,IAAA,SAAG,EAAC,mBAAmB,EAAE,0BAA0B,UAAU,IAAI,CAAC,CAAC;YACnE,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC;YACpC,MAAM,KAAK,GAAG,MAAM,IAAA,eAAU,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACpD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAA,cAAO,EAAC,UAAU,EAAE,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBAC3D,QAAQ;aACT,CAAC,CAAC,CAAC;SACL;aAAM,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,wBAAwB,UAAU,IAAI,CAAC,CAAC;YACjE,MAAM,KAAK,GAAG,MAAM,IAAA,eAAU,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAEtB,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;oBAClE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBAClC,MAAM;iBACP;aACF;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAEpC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAA,cAAO,EAAC,OAAO,EAAE,IAAA,eAAQ,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACrD,QAAQ;aACT,CAAC,CAAC,CAAC;SACL;QAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,8BAA8B,UAAU,IAAI,CAAC,CAAC;QAEvE,OAAO;YACL;gBACE,UAAU;gBACV,UAAU;gBACV,QAAQ;aACT;SACF,CAAC;IACJ,CAAC;CAAA;AAED,SAAgB,YAAY,CAAC,IAAY,EAAE,IAAY;IACrD,IAAI;QACF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,eAAe,EAAE;YACnD,KAAK,EAAE,CAAC,IAAI,CAAC;SACd,CAAC,CAAC;QACH,OAAO,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;KACtB;IAAC,OAAO,EAAE,EAAE;QACX,IAAA,SAAG,EAAC,mBAAmB,EAAE,wCAAwC,IAAI,SAAS,IAAI,MAAM,EAAE,GAAG,CAAC,CAAC;QAC/F,IAAA,UAAI,EAAC,4BAA4B,CAAC,CAAC;KACpC;AACH,CAAC;AAVD,oCAUC;AAED,SAAgB,eAAe,CAAC,GAAW,EAAE,OAAe;IAC1D,IAAI;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,eAAe,EAAE;YAC5C,KAAK,EAAE,CAAC,OAAO,CAAC;SACjB,CAAC,CAAC;KACJ;IAAC,OAAO,EAAE,EAAE;QACX,IAAA,SAAG,EAAC,mBAAmB,EAAE,uCAAuC,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC;QACpF,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AATD,0CASC;AAED,SAAS,WAAW,CAAC,GAA2B,EAAE,OAAe;IAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtB,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE;YACtB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE1C,IAAI,MAAM,EAAE;gBACV,OAAO,MAAM,CAAC;aACf;SACF;KACF;SAAM;QACL,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE3C,IAAI,IAAI,EAAE;YACR,IAAA,SAAG,EAAC,mBAAmB,EAAE,iCAAiC,IAAI,OAAO,CAAC,CAAC;YACvE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,OAAO,GAAG,UAAU,IAAI,UAAU,CAAC,GAAG,CAAC;YAC7C,UAAU,CAAC,GAAG,GAAG,OAAO,IAAI,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;YAC5D,OAAO,UAAU,CAAC;SACnB;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,gBAAgB,CAAC,IAAY,EAAE,IAAY;IACzD,IAAA,SAAG,EAAC,mBAAmB,EAAE,iCAAiC,IAAI,OAAO,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtC,OAAO,IAAA,aAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AACxC,CAAC;AAJD,4CAIC;AAED,SAAgB,eAAe,CAC7B,GAAW,EACX,QAAwB,EACxB,OAAe,EACf,SAAoB,EACpB,OAAgB;IAEhB,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,mDAAmD;IACnD,MAAM,OAAO,GAAG,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5D,MAAM,eAAe,mCAChB,IAAA,6BAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,KACxC,WAAW,EAAE,GAAG,OAAO,EAAE,GAC1B,CAAC;IACF,MAAM,YAAY,qBACb,IAAA,0BAAe,EAAC,QAAQ,EAAE,QAAQ,CAAC,CACvC,CAAC;IAEF,aAAa,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAEjD,OAAO;QACL,GAAG;QACH,OAAO,EAAE;YACP,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE,aAAa;SACrB;QACD,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC;QACzB,YAAY;QACZ,eAAe;KAChB,CAAC;AACJ,CAAC;AA/BD,0CA+BC;AAED,SAAe,iBAAiB,CAC9B,IAAY,EACZ,IAAY,EACZ,OAAe,EACf,OAAoC;;QAEpC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,GAAG,OAAO,MAAM,CAAC;QAC7B,IAAA,SAAG,EAAC,mBAAmB,EAAE,gBAAgB,GAAG,gBAAgB,MAAM,OAAO,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,IAAA,cAAO,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAEvD,IAAI,MAAM,EAAE;YACV,MAAM,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;SAClC;QAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,MAAM,IAAI,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,MAAM,IAAA,eAAU,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE7C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;YAAC,OAAA,CAAC;gBAC1B,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAA,cAAO,EAAC,IAAI,EAAE,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,QAAQ,EAAE,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,cAAO,EAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,0CAAE,QAAQ,KAAI,KAAK;aACnF,CAAC,CAAA;SAAA,CAAC,CAAC;IACN,CAAC;CAAA;AAED,SAAsB,YAAY,CAAC,IAAY,EAAE,IAAY,EAAE,UAAuC,EAAE;;QACtG,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,oBAAQ,EAAE,OAAO,CAAC,CAAC;QAErE,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;YACvB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;YACxC,MAAM,UAAU,GAAG,MAAM,IAAA,YAAO,EAAC,UAAU,CAAC,CAAC;YAC7C,IAAA,SAAG,EAAC,mBAAmB,EAAE,uBAAuB,UAAU,MAAM,UAAU,EAAE,CAAC,CAAC;YAC9E,MAAM,UAAU,GAAG,MAAM,IAAA,YAAO,EAAC,UAAU,CAAC,CAAC;YAC7C,IAAA,SAAG,EAAC,mBAAmB,EAAE,uBAAuB,UAAU,MAAM,UAAU,EAAE,CAAC,CAAC;YAC9E,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,UAAU,KAAK,UAAU;aACnC,CAAC;QACJ,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AAjBD,oCAiBC;AAED,SAAe,SAAS,CACtB,QAA+B,EAC/B,cAA8B,EAC9B,aAA8B,EAC9B,SAAkC;;QAElC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;YACrD,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,UAAU,CAAC,CAAC;YAE7C,IAAI,MAAM,EAAE;gBACV,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACjF,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,sBAAc,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC;gBAC9D,MAAM,OAAO,GAAG,MAAM,IAAA,SAAI,EAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;gBAE1D,IAAI,OAAO,IAAI,QAAQ,IAAI,SAAS,EAAE;oBACpC,MAAM,IAAA,wBAAa,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;iBAC5C;aACF;iBAAM;gBACL,IAAA,UAAI,EAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;aACzC;SACF;IACH,CAAC;CAAA;AAED,SAAsB,oBAAoB,CACxC,MAAc,EACd,MAAc,EACd,KAA2C,EAC3C,SAAe,EACf,SAAkC;;QAElC,IAAA,SAAG,EAAC,mBAAmB,EAAE,mCAAmC,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAA0B,EAAE,CAAC;QAE3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC9D,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;SAC5B;QAED,IAAI,SAAS,EAAE;YACb,MAAM,0CAA0C,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;SAC/E;QAED,MAAM,SAAS,CAAC,QAAQ,EAAE,sBAAc,CAAC,GAAG,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;CAAA;AApBD,oDAoBC;AAED,SAAe,0CAA0C,CAAC,IAAY,EAAE,SAAc,EAAE,KAA4B;;QAClH,MAAM,aAAa,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEpD,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;YAChC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAEtB,IAAI,IAAI,CAAC,UAAU,KAAK,aAAa,EAAE;gBACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAQ,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACrF,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEnB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;oBACrB,SAAS,CAAC,MAAM,GAAG,EAAE,CAAC;iBACvB;gBAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE;oBACtC,SAAS,CAAC,MAAM,CAAC,gBAAgB,GAAG,EAAE,CAAC;iBACxC;gBAED,SAAS,CAAC,MAAM,CAAC,gBAAgB,mCAC5B,SAAS,CAAC,MAAM,CAAC,gBAAgB,GACjC,QAAQ,CACZ,CAAC;aACH;SACF;IACH,CAAC;CAAA;AAED,SAAS,sBAAsB,CAAC,IAAmC;IACjE,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC;AAClC,CAAC;AAED,SAAsB,cAAc,CAClC,IAAY,EACZ,IAAY,EACZ,SAAc,EACd,cAA8B,EAC9B,SAAiC,EACjC,aAA+B;;QAE/B,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,CAAC,CAAC;QACxD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,oBAAQ,EAAE,OAAO,CAAC,CAAC;QAErE,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,wBAAY,EAAE,OAAO,CAAC,CAAC;YAChF,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;YAC5B,aAAa,GAAG,EAAE,CAAC;SACpB;QAED,MAAM,0CAA0C,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACzE,MAAM,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC;CAAA;AArBD,wCAqBC;AAED,SAAgB,aAAa,CAAC,SAAc;IAC1C,MAAM,EACJ,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,EAAE,EACd,OAAO,GAAG,EAAE,EACZ,UAAU,GAAG,EAAE,EACf,eAAe,GAAG,EAAE,EACpB,WAAW,GAAG,EAAE,EAChB,YAAY,GAAG,EAAE,EACjB,UAAU,GAAG,EAAE,EACf,WAAW,GAAG,EAAE,EAChB,gBAAgB,GAAG,EAAE,GACtB,GAAG,SAAS,CAAC,MAAM,IAAI,EAAE,CAAC;IAE3B,OAAO;QACL,KAAK;QACL,SAAS;QACT,OAAO;QACP,UAAU;QACV,eAAe;QACf,WAAW;QACX,YAAY;QACZ,UAAU;QACV,WAAW;QACX,gBAAgB;KACjB,CAAC;AACJ,CAAC;AA1BD,sCA0BC;AAED,SAAsB,iBAAiB,CAAC,OAAe,EAAE,KAAa;;QACpE,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACrC,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,OAAO,OAAO,CAAC,CAAC;QAExE,IAAI,CAAC,sCAA0B,CAAC,QAAQ,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE;YACxE,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,KAAK,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YACnG,IAAA,SAAG,EAAC,mBAAmB,EAAE,mCAAmC,WAAW,IAAI,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,WAAW,CAAC,CAAC;YAE9C,IAAI,CAAC,MAAM,EAAE;gBACX,IAAA,UAAI,EAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;aACzC;YAED,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;YAErC,IAAI,CAAC,GAAG,EAAE;gBACR,IAAA,UAAI,EAAC,wBAAwB,CAAC,CAAC;aAChC;YAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,GAAG,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC;SACxC;QAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,OAAO,IAAI,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAzBD,8CAyBC;AAED,SAAS,qBAAqB,CAAC,GAAwB,EAAE,GAAW;IAClE,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IAEvB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,KAAK,KAAK,SAAS,EAAE;QAC9B,IAAA,SAAG,EAAC,oBAAoB,EAAE,GAAG,EAAE,OAAO,KAAK,CAAC,CAAC;KAC9C;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,qBAAqB,CACnC,IAAyB,EACzB,QAAgB,EAChB,WAAmB;;IAEnB,MAAM,EAAE,eAAe,GAAG,EAAE,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;IACzD,MAAM,cAAc,GAAG,MAAA,YAAY,CAAC,WAAW,CAAC,mCAAI,eAAe,CAAC,WAAW,CAAC,CAAC;IAEjF,IAAI,cAAc,EAAE;QAClB,IAAI,IAAA,kBAAY,EAAC,cAAc,CAAC,EAAE;YAChC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,gBAAU,EAAC,cAAc,CAAC,CAAC,CAAC;SACpD;aAAM,IAAI,IAAA,oBAAc,EAAC,QAAQ,EAAE,cAAc,CAAC,EAAE;YACnD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,kBAAY,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;SAChE;KACF;IAED,OAAO,kBAAkB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AACnD,CAAC;AAjBD,sDAiBC;AAED,SAAsB,kBAAkB,CAAC,QAAgB,EAAE,WAAmB;;QAC5E,IAAI;YACF,IAAA,SAAG,EAAC,mBAAmB,EAAE,2BAA2B,WAAW,SAAS,QAAQ,IAAI,CAAC,CAAC;YACtF,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;gBAC9C,KAAK,EAAE,CAAC,QAAQ,CAAC;aAClB,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YAC/D,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;SACrC;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,SAAG,EAAC,8BAA8B,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;YAC3D,OAAO,QAAQ,CAAC;SACjB;IACH,CAAC;CAAA;AAZD,gDAYC;AAED,SAAsB,kBAAkB,CAAC,SAAiB;;QACxD,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,SAAS,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,EAAE;YACX,IAAA,UAAI,EAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;SAChD;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAE9D,IAAI,CAAC,WAAW,EAAE;YAChB,IAAA,UAAI,EAAC,yBAAyB,CAAC,CAAC;SACjC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACzC,MAAM,OAAO,mCACR,WAAW,CAAC,eAAe,GAC3B,WAAW,CAAC,YAAY,CAC5B,CAAC;QACF,MAAM,IAAI,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;QAClC,MAAM,kBAAkB,GAAG,MAAM,IAAA,yBAAa,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QACpG,MAAM,SAAS,GAAG,IAAA,mBAAa,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE/C,uCACK,IAAI,KACP,SAAS,EACT,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,OAAO,EAAE,WAAW,CAAC,OAAO,EAC5B,YAAY,EAAE;gBACZ,GAAG,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;gBACnC,GAAG,EAAE,WAAW,CAAC,eAAe,IAAI,EAAE;gBACtC,IAAI,EAAE,WAAW,CAAC,gBAAgB,IAAI,EAAE;aACzC,EACD,OAAO,EAAE,WAAW,CAAC,OAAO,EAC5B,OAAO,EAAE,qBAAqB,CAAC,WAAW,EAAE,uBAAuB,CAAC,EACpE,IAAI,IACJ;IACJ,CAAC;CAAA;AAtCD,gDAsCC;AAED,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,mCAAmC;IACnC,sFAAsF;IACtF,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC7F,CAAC;AAJD,8CAIC;AAED,SAAsB,iBAAiB,CACrC,IAAY,EACZ,IAAY,EACZ,OAAe,EACf,SAAc,EACd,YAAqB,EACrB,OAAuD;;QAEvD,IAAA,SAAG,EAAC,mBAAmB,EAAE,iCAAiC,IAAI,OAAO,CAAC,CAAC;QACvE,MAAM,KAA2C,aAAa,CAAC,SAAS,CAAC,EAAnE,EAAE,SAAS,EAAE,gBAAgB,OAAsC,EAAjC,IAAI,cAAtC,iCAAwC,CAA2B,CAAC;QAC1E,MAAM,KAAK,GAAG;YACZ,OAAO,EAAE,yCAAyC;YAClD,IAAI;SACL,CAAC;QACF,MAAM,iBAAiB,mCAClB,SAAS,CAAC,eAAe,GACzB,SAAS,CAAC,YAAY,CAC1B,CAAC;QACF,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,6BAAkB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,MAAM,OAAO,GAAG,OAAO;YACrB,CAAC,iBACG,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,IACrB,IAAI,CAAC,OAAO,EAEnB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACjB,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,IAAA,wBAAkB,EAAC,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAC/F,MAAM,gBAAgB,mCACjB,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;YAErC,IAAI,CAAC,KAAK,EAAE;gBACV,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACxB;YAED,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,KACN,CAAC,IAAI,CAAC,EAAE,GAAG,GACZ,CAAC;QACF,MAAM,eAAe,+DAChB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,GACH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACzD,IAAI,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;YACjF,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,GACH,YAAY,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAC9D,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAExC,IAAI,OAAO,IAAI,OAAO,EAAE;gBACtB,4EAA4E;gBAC5E,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,IAAI,QAAQ,CAAC;aAClC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,KACN,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,GAC1C,CAAC;QAEF,IAAI,OAAO,EAAE;YACX,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAChC,MAAM,OAAO,GAAG,IAAI,iBAAU,EAAE,CAAC;YACjC,eAAe,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;YACvC,aAAa,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAClD;QAED,MAAM,cAAc,GAAG,IAAA,iBAAS,EAAC,gBAAgB,EAAE;YACjD,KAAK;YACL,eAAe;YACf,gBAAgB;YAChB,WAAW;YACX,YAAY,EAAE;gBACZ,CAAC,IAAI,CAAC,EAAE,SAAS;aAClB;YACD,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,IAAA,uBAAkB,EAAC,IAAI,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC/D,IAAA,SAAG,EAAC,mBAAmB,EAAE,uCAAuC,CAAC,CAAC;IACpE,CAAC;CAAA;AApFD,8CAoFC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAAC,UAAe;IAClD,MAAM,EAAE,QAAQ,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAU,EAAE,EAAE,GAAG,UAAU,CAAC;IAE5E,IAAI,QAAQ,CAAC,SAAS,EAAE;QACtB,IAAA,0CAA0B,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;KACb;IAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,mDAAmD,CAAC,CAAC;IAC9E,OAAO,KAAK,CAAC;AACf,CAAC;AAVD,oDAUC;AAED,SAAsB,iBAAiB,CAAC,MAAc,EAAE,GAAY;;QAClE,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3D,IAAI,CAAC,WAAW,EAAE;YAChB,IAAA,UAAI,EAAC,yBAAyB,CAAC,CAAC;SACjC;QAED,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;QAClC,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,WAAW,CAC5B,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EACnG,MAAM,CACP,CAAC;QACF,MAAM,OAAO,GAAW,UAAU,IAAI,UAAU,CAAC,GAAG,CAAC;QAErD,IAAI,CAAC,OAAO,EAAE;YACZ,IAAA,UAAI,EAAC,yBAAyB,CAAC,CAAC;SACjC;QAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,MAAM,IAAA,yBAAa,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAE1D,OAAO;YACL,YAAY,EAAE,YAAY,CAAC,YAAY,IAAI,EAAE;YAC7C,eAAe,EAAE,YAAY,CAAC,eAAe,IAAI,EAAE;YACnD,gBAAgB,EAAE,YAAY,CAAC,gBAAgB,IAAI,EAAE;YACrD,WAAW,EAAE,YAAY,CAAC,WAAW,IAAI,EAAE;YAC3C,OAAO,EAAE,qBAAqB,CAAC,YAAY,EAAE,uBAAuB,CAAC;YACrE,SAAS;YACT,OAAO;YACP,YAAY;YACZ,UAAU;YACV,QAAQ;YACR,IAAI;SACL,CAAC;IACJ,CAAC;CAAA;AAnCD,8CAmCC"}
1
+ {"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA2E;AAC3E,+BAAkC;AAClC,iCAAoC;AACpC,uCAA0C;AAC1C,yCAAiE;AACjE,mCAAyD;AACzD,mDAA6D;AAC7D,mCAAoC;AACpC,yCAA2C;AAC3C,2CAA4C;AAC5C,+BAAkH;AAClH,2CAA+F;AAC/F,6BAA6D;AAC7D,6BAAiF;AAGjF,SAAS,aAAa,CAAC,eAAuC,EAAE,OAAe,EAAE,OAAe;IAC9F,IAAI,OAAO,IAAI,OAAO,KAAK,MAAM,EAAE;QACjC,IAAI,wBAAY,CAAC,QAAQ,CAAC,OAAc,CAAC,EAAE;YACzC,eAAe,CAAC,aAAa,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;SACnD;aAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE;YACtC,uCAAuC;YACvC,IAAA,SAAG,EAAC,qBAAqB,EAAE,8BAA8B,OAAO,4CAA4C,CAAC,CAAC;SAC/G;aAAM;YACL,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACpC,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrE,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACnE,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;SACjC;KACF;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAY,EACZ,eAA8C,EAC9C,eAAuC;IAEvC,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9G,IAAI,CAAC,QAAQ,EAAE;QACb,IAAA,SAAG,EAAC,2BAA2B,EAAE,IAAI,CAAC,CAAC;KACxC;IAED,OAAO,QAAQ,IAAI,QAAQ,CAAC;AAC9B,CAAC;AAQD,MAAM,0BAA0B,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAE3E,SAAe,gBAAgB,CAC7B,MAAc,EACd,MAAc,EACd,IAAmC;;QAEnC,MAAM,EACJ,IAAI,EACJ,EAAE,EACF,IAAI,GAAG,IAAI,EACX,QAAQ,GAAG,KAAK,GACjB,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3E,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;QAEvD,IAAI,WAAW,EAAE;YACf,IAAA,SAAG,EAAC,mBAAmB,EAAE,0BAA0B,UAAU,IAAI,CAAC,CAAC;YACnE,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC;YACpC,MAAM,KAAK,GAAG,MAAM,IAAA,eAAU,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACpD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAA,cAAO,EAAC,UAAU,EAAE,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBAC3D,QAAQ;aACT,CAAC,CAAC,CAAC;SACL;aAAM,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,wBAAwB,UAAU,IAAI,CAAC,CAAC;YACjE,MAAM,KAAK,GAAG,MAAM,IAAA,eAAU,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAEtB,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;oBAClE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBAClC,MAAM;iBACP;aACF;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAEpC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAA,cAAO,EAAC,OAAO,EAAE,IAAA,eAAQ,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACrD,QAAQ;aACT,CAAC,CAAC,CAAC;SACL;QAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,8BAA8B,UAAU,IAAI,CAAC,CAAC;QAEvE,OAAO;YACL;gBACE,UAAU;gBACV,UAAU;gBACV,QAAQ;aACT;SACF,CAAC;IACJ,CAAC;CAAA;AAED,SAAgB,YAAY,CAAC,IAAY,EAAE,IAAY;IACrD,IAAI;QACF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,eAAe,EAAE;YACnD,KAAK,EAAE,CAAC,IAAI,CAAC;SACd,CAAC,CAAC;QACH,OAAO,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;KACtB;IAAC,OAAO,EAAE,EAAE;QACX,IAAA,SAAG,EAAC,mBAAmB,EAAE,wCAAwC,IAAI,SAAS,IAAI,MAAM,EAAE,GAAG,CAAC,CAAC;QAC/F,IAAA,UAAI,EAAC,4BAA4B,CAAC,CAAC;KACpC;AACH,CAAC;AAVD,oCAUC;AAED,SAAgB,eAAe,CAAC,GAAW,EAAE,OAAe;IAC1D,IAAI;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,eAAe,EAAE;YAC5C,KAAK,EAAE,CAAC,OAAO,CAAC;SACjB,CAAC,CAAC;KACJ;IAAC,OAAO,EAAE,EAAE;QACX,IAAA,SAAG,EAAC,mBAAmB,EAAE,uCAAuC,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC;QACpF,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AATD,0CASC;AAED,SAAS,WAAW,CAAC,GAA2B,EAAE,OAAe;IAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtB,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE;YACtB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE1C,IAAI,MAAM,EAAE;gBACV,OAAO,MAAM,CAAC;aACf;SACF;KACF;SAAM;QACL,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE3C,IAAI,IAAI,EAAE;YACR,IAAA,SAAG,EAAC,mBAAmB,EAAE,iCAAiC,IAAI,OAAO,CAAC,CAAC;YACvE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,OAAO,GAAG,UAAU,IAAI,UAAU,CAAC,GAAG,CAAC;YAC7C,UAAU,CAAC,GAAG,GAAG,OAAO,IAAI,IAAA,cAAO,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnD,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;YACvB,OAAO,UAAU,CAAC;SACnB;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,gBAAgB,CAAC,IAAY,EAAE,IAAY;IACzD,IAAA,SAAG,EAAC,mBAAmB,EAAE,iCAAiC,IAAI,OAAO,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtC,OAAO,IAAA,aAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AACxC,CAAC;AAJD,4CAIC;AAED,SAAgB,eAAe,CAC7B,GAAW,EACX,QAAwB,EACxB,OAAe,EACf,SAAoB,EACpB,OAAgB;IAEhB,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,mDAAmD;IACnD,MAAM,OAAO,GAAG,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5D,MAAM,eAAe,mCAChB,IAAA,6BAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,KACxC,WAAW,EAAE,GAAG,OAAO,EAAE,GAC1B,CAAC;IACF,MAAM,YAAY,qBACb,IAAA,0BAAe,EAAC,QAAQ,EAAE,QAAQ,CAAC,CACvC,CAAC;IAEF,aAAa,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAEjD,OAAO;QACL,GAAG;QACH,OAAO,EAAE;YACP,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE,aAAa;SACrB;QACD,SAAS,EAAE;YACT,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,CAAC,YAAY,EAAE,SAAS,KAAK,YAAY,IAAI,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;SACpF;QACD,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC;QACzB,YAAY;QACZ,eAAe;KAChB,CAAC;AACJ,CAAC;AAnCD,0CAmCC;AAED,SAAe,iBAAiB,CAC9B,IAAY,EACZ,IAAY,EACZ,OAAe,EACf,OAAoC;;QAEpC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,GAAG,OAAO,MAAM,CAAC;QAC7B,IAAA,SAAG,EAAC,mBAAmB,EAAE,gBAAgB,GAAG,gBAAgB,MAAM,OAAO,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,IAAA,cAAO,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAEvD,IAAI,MAAM,EAAE;YACV,MAAM,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;SAClC;QAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,MAAM,IAAI,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,MAAM,IAAA,eAAU,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE7C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;YAAC,OAAA,CAAC;gBAC1B,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAA,cAAO,EAAC,IAAI,EAAE,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,QAAQ,EAAE,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,cAAO,EAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,0CAAE,QAAQ,KAAI,KAAK;aACnF,CAAC,CAAA;SAAA,CAAC,CAAC;IACN,CAAC;CAAA;AAED,SAAsB,YAAY,CAAC,IAAY,EAAE,IAAY,EAAE,UAAuC,EAAE;;QACtG,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,oBAAQ,EAAE,OAAO,CAAC,CAAC;QAErE,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;YACvB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;YACxC,MAAM,UAAU,GAAG,MAAM,IAAA,YAAO,EAAC,UAAU,CAAC,CAAC;YAC7C,IAAA,SAAG,EAAC,mBAAmB,EAAE,uBAAuB,UAAU,MAAM,UAAU,EAAE,CAAC,CAAC;YAC9E,MAAM,UAAU,GAAG,MAAM,IAAA,YAAO,EAAC,UAAU,CAAC,CAAC;YAC7C,IAAA,SAAG,EAAC,mBAAmB,EAAE,uBAAuB,UAAU,MAAM,UAAU,EAAE,CAAC,CAAC;YAC9E,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,UAAU,KAAK,UAAU;aACnC,CAAC;QACJ,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AAjBD,oCAiBC;AAED,SAAe,SAAS,CACtB,QAA+B,EAC/B,cAA8B,EAC9B,aAA8B,EAC9B,SAAkC;;QAElC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;YACrD,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,UAAU,CAAC,CAAC;YAE7C,IAAI,MAAM,EAAE;gBACV,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACjF,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,sBAAc,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC;gBAC9D,MAAM,OAAO,GAAG,MAAM,IAAA,SAAI,EAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;gBAE1D,IAAI,OAAO,IAAI,QAAQ,IAAI,SAAS,EAAE;oBACpC,MAAM,IAAA,wBAAa,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;iBAC5C;aACF;iBAAM;gBACL,IAAA,UAAI,EAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;aACzC;SACF;IACH,CAAC;CAAA;AAED,SAAsB,oBAAoB,CACxC,MAAc,EACd,MAAc,EACd,KAA2C,EAC3C,SAAe,EACf,SAAkC;;QAElC,IAAA,SAAG,EAAC,mBAAmB,EAAE,mCAAmC,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAA0B,EAAE,CAAC;QAE3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC9D,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;SAC5B;QAED,IAAI,SAAS,EAAE;YACb,MAAM,0CAA0C,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;SAC/E;QAED,MAAM,SAAS,CAAC,QAAQ,EAAE,sBAAc,CAAC,GAAG,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;CAAA;AApBD,oDAoBC;AAED,SAAe,0CAA0C,CAAC,IAAY,EAAE,SAAc,EAAE,KAA4B;;QAClH,MAAM,aAAa,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEpD,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;YAChC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAEtB,IAAI,IAAI,CAAC,UAAU,KAAK,aAAa,EAAE;gBACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAQ,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACrF,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEnB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;oBACrB,SAAS,CAAC,MAAM,GAAG,EAAE,CAAC;iBACvB;gBAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE;oBACtC,SAAS,CAAC,MAAM,CAAC,gBAAgB,GAAG,EAAE,CAAC;iBACxC;gBAED,SAAS,CAAC,MAAM,CAAC,gBAAgB,mCAC5B,SAAS,CAAC,MAAM,CAAC,gBAAgB,GACjC,QAAQ,CACZ,CAAC;aACH;SACF;IACH,CAAC;CAAA;AAED,SAAS,sBAAsB,CAAC,IAAmC;IACjE,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC;AAClC,CAAC;AAED,SAAsB,cAAc,CAClC,IAAY,EACZ,IAAY,EACZ,SAAc,EACd,cAA8B,EAC9B,SAAiC,EACjC,aAA+B;;QAE/B,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,CAAC,CAAC;QACxD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,oBAAQ,EAAE,OAAO,CAAC,CAAC;QAErE,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,wBAAY,EAAE,OAAO,CAAC,CAAC;YAChF,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;YAC5B,aAAa,GAAG,EAAE,CAAC;SACpB;QAED,MAAM,0CAA0C,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACzE,MAAM,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC;CAAA;AArBD,wCAqBC;AAED,SAAgB,aAAa,CAAC,SAAc;IAC1C,MAAM,EACJ,KAAK,GAAG,EAAE,EACV,OAAO,GAAG,EAAE,EACZ,QAAQ,GAAG,SAAS,EACpB,UAAU,GAAG,EAAE,EACf,eAAe,GAAG,EAAE,EACpB,WAAW,GAAG,EAAE,EAChB,YAAY,GAAG,EAAE,EACjB,UAAU,GAAG,EAAE,EACf,WAAW,GAAG,EAAE,EAChB,gBAAgB,GAAG,EAAE,GACtB,GAAG,SAAS,CAAC,MAAM,IAAI,EAAE,CAAC;IAE3B,OAAO;QACL,KAAK;QACL,OAAO;QACP,QAAQ;QACR,UAAU;QACV,eAAe;QACf,WAAW;QACX,YAAY;QACZ,UAAU;QACV,WAAW;QACX,gBAAgB;KACjB,CAAC;AACJ,CAAC;AA1BD,sCA0BC;AAED,SAAsB,iBAAiB,CAAC,OAAe,EAAE,KAAa;;QACpE,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACrC,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,OAAO,OAAO,CAAC,CAAC;QAExE,IAAI,CAAC,sCAA0B,CAAC,QAAQ,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE;YACxE,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,KAAK,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YACnG,IAAA,SAAG,EAAC,mBAAmB,EAAE,mCAAmC,WAAW,IAAI,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,WAAW,CAAC,CAAC;YAE9C,IAAI,CAAC,MAAM,EAAE;gBACX,IAAA,UAAI,EAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;aACzC;YAED,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;YAErC,IAAI,CAAC,GAAG,EAAE;gBACR,IAAA,UAAI,EAAC,wBAAwB,CAAC,CAAC;aAChC;YAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,GAAG,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC;SACxC;QAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,OAAO,IAAI,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAzBD,8CAyBC;AAED,SAAS,qBAAqB,CAAC,GAAwB,EAAE,GAAW;IAClE,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IAEvB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,KAAK,KAAK,SAAS,EAAE;QAC9B,IAAA,SAAG,EAAC,oBAAoB,EAAE,GAAG,EAAE,OAAO,KAAK,CAAC,CAAC;KAC9C;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,qBAAqB,CACnC,IAAyB,EACzB,QAAgB,EAChB,WAAmB;;IAEnB,MAAM,EAAE,eAAe,GAAG,EAAE,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;IACzD,MAAM,cAAc,GAAG,MAAA,YAAY,CAAC,WAAW,CAAC,mCAAI,eAAe,CAAC,WAAW,CAAC,CAAC;IAEjF,IAAI,cAAc,EAAE;QAClB,IAAI,IAAA,kBAAY,EAAC,cAAc,CAAC,EAAE;YAChC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,gBAAU,EAAC,cAAc,CAAC,CAAC,CAAC;SACpD;aAAM,IAAI,IAAA,oBAAc,EAAC,QAAQ,EAAE,cAAc,CAAC,EAAE;YACnD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,kBAAY,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;SAChE;KACF;IAED,OAAO,kBAAkB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AACnD,CAAC;AAjBD,sDAiBC;AAED,SAAsB,kBAAkB,CAAC,QAAgB,EAAE,WAAmB;;QAC5E,IAAI;YACF,IAAA,SAAG,EAAC,mBAAmB,EAAE,2BAA2B,WAAW,SAAS,QAAQ,IAAI,CAAC,CAAC;YACtF,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;gBAC9C,KAAK,EAAE,CAAC,QAAQ,CAAC;aAClB,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YAC/D,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;SACrC;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,SAAG,EAAC,8BAA8B,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;YAC3D,OAAO,QAAQ,CAAC;SACjB;IACH,CAAC;CAAA;AAZD,gDAYC;AAED,SAAsB,iBAAiB,CAAC,IAAY,EAAE,WAAgB;;;QACpE,MAAM,kBAAkB,GAAG,MAAM,IAAA,yBAAa,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAElE,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;YACnC,MAAM,OAAO,mCACR,WAAW,CAAC,eAAe,GAC3B,WAAW,CAAC,YAAY,CAC5B,CAAC;YACF,MAAM,IAAI,GAAG,MAAA,WAAW,CAAC,MAAM,0CAAE,SAAS,CAAC;YAC3C,OAAO,IAAA,mBAAa,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SACrC;QAED,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;;CAC9C;AAbD,8CAaC;AAED,SAAsB,kBAAkB,CAAC,SAAiB;;QACxD,MAAM,MAAM,GAAG,MAAM,IAAA,gBAAW,EAAC,SAAS,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,EAAE;YACX,IAAA,UAAI,EAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;SAChD;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAE9D,IAAI,CAAC,WAAW,EAAE;YAChB,IAAA,UAAI,EAAC,yBAAyB,CAAC,CAAC;SACjC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE7D,uCACK,IAAI,KACP,SAAS,EACT,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,OAAO,EAAE,WAAW,CAAC,OAAO,EAC5B,YAAY,EAAE;gBACZ,GAAG,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;gBACnC,GAAG,EAAE,WAAW,CAAC,eAAe,IAAI,EAAE;gBACtC,IAAI,EAAE,WAAW,CAAC,gBAAgB,IAAI,EAAE;aACzC,EACD,OAAO,EAAE,WAAW,CAAC,OAAO,EAC5B,OAAO,EAAE,qBAAqB,CAAC,WAAW,EAAE,uBAAuB,CAAC,EACpE,IAAI,IACJ;IACJ,CAAC;CAAA;AAhCD,gDAgCC;AAED,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,mCAAmC;IACnC,sFAAsF;IACtF,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC7F,CAAC;AAJD,8CAIC;AAED,SAAsB,iBAAiB,CACrC,IAAY,EACZ,IAAY,EACZ,OAAe,EACf,SAAc,EACd,YAAqB,EACrB,OAAuD;;QAEvD,IAAA,SAAG,EAAC,mBAAmB,EAAE,iCAAiC,IAAI,OAAO,CAAC,CAAC;QACvE,MAAM,KAA2C,aAAa,CAAC,SAAS,CAAC,EAAnE,EAAE,SAAS,EAAE,gBAAgB,OAAsC,EAAjC,IAAI,cAAtC,iCAAwC,CAA2B,CAAC;QAC1E,MAAM,KAAK,GAAG;YACZ,OAAO,EAAE,yCAAyC;YAClD,IAAI;SACL,CAAC;QACF,MAAM,iBAAiB,mCAClB,SAAS,CAAC,eAAe,GACzB,SAAS,CAAC,YAAY,CAC1B,CAAC;QACF,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,6BAAkB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,MAAM,OAAO,GAAG,OAAO;YACrB,CAAC,iBACG,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,IACrB,IAAI,CAAC,OAAO,EAEnB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACjB,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,IAAA,wBAAkB,EAAC,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAC/F,MAAM,gBAAgB,mCACjB,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;YAErC,IAAI,CAAC,KAAK,EAAE;gBACV,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACxB;YAED,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,KACN,CAAC,IAAI,CAAC,EAAE,GAAG,GACZ,CAAC;QACF,MAAM,eAAe,+DAChB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,GACH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACzD,IAAI,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;YACjF,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,GACH,YAAY,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAC9D,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAExC,IAAI,OAAO,IAAI,OAAO,EAAE;gBACtB,4EAA4E;gBAC5E,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,IAAI,QAAQ,CAAC;aAClC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAE,CAAC,KACN,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,GAC1C,CAAC;QAEF,IAAI,OAAO,EAAE;YACX,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAChC,MAAM,OAAO,GAAG,IAAI,iBAAU,EAAE,CAAC;YACjC,eAAe,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;YACvC,aAAa,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAClD;QAED,MAAM,cAAc,GAAG,IAAA,iBAAS,EAAC,gBAAgB,EAAE;YACjD,KAAK;YACL,eAAe;YACf,gBAAgB;YAChB,WAAW;YACX,YAAY,EAAE;gBACZ,CAAC,IAAI,CAAC,EAAE,SAAS;aAClB;YACD,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,IAAA,uBAAkB,EAAC,IAAI,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC/D,IAAA,SAAG,EAAC,mBAAmB,EAAE,uCAAuC,CAAC,CAAC;IACpE,CAAC;CAAA;AApFD,8CAoFC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAAC,UAAe;IAClD,MAAM,EAAE,QAAQ,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAU,EAAE,EAAE,GAAG,UAAU,CAAC;IAE5E,IAAI,QAAQ,CAAC,SAAS,EAAE;QACtB,IAAA,0CAA0B,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;KACb;IAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,mDAAmD,CAAC,CAAC;IAC9E,OAAO,KAAK,CAAC;AACf,CAAC;AAVD,oDAUC;AAED,SAAsB,iBAAiB,CAAC,MAAc,EAAE,GAAY;;QAClE,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3D,IAAI,CAAC,WAAW,EAAE;YAChB,IAAA,UAAI,EAAC,yBAAyB,CAAC,CAAC;SACjC;QAED,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;QAClC,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,WAAW,CAC5B,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EACnG,MAAM,CACP,CAAC;QACF,MAAM,OAAO,GAAW,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC;QACxC,MAAM,OAAO,GAAW,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC;QAEzC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE;YACxB,IAAA,UAAI,EAAC,yBAAyB,CAAC,CAAC;SACjC;QAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,MAAM,IAAA,yBAAa,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAE1D,OAAO;YACL,YAAY,EAAE,YAAY,CAAC,YAAY,IAAI,EAAE;YAC7C,eAAe,EAAE,YAAY,CAAC,eAAe,IAAI,EAAE;YACnD,gBAAgB,EAAE,YAAY,CAAC,gBAAgB,IAAI,EAAE;YACrD,WAAW,EAAE,YAAY,CAAC,WAAW,IAAI,EAAE;YAC3C,OAAO,EAAE,qBAAqB,CAAC,YAAY,EAAE,uBAAuB,CAAC;YACrE,SAAS;YACT,OAAO;YACP,OAAO;YACP,YAAY;YACZ,UAAU;YACV,QAAQ;YACR,IAAI;SACL,CAAC;IACJ,CAAC;CAAA;AArCD,8CAqCC"}
package/lib/rules/pilet-has-externals-as-peers.js CHANGED
@@ -26,7 +26,7 @@ Received: Missing "${missingNames.join('", "')}".
26
26
  function default_1(context, options = 'ignore') {
27
27
  return __awaiter(this, void 0, void 0, function* () {
28
28
  if (options !== 'ignore') {
29
- const { externals } = (0, common_1.getPiletsInfo)(context.data.appPackage);
29
+ const externals = yield (0, common_1.retrieveExternals)(context.data.appRoot, context.data.appPackage);
30
30
  const markedPeerDependencies = Object.keys(context.peerDependencies);
31
31
  const markedPeerModules = context.peerModules;
32
32
  const missingExternals = externals
package/lib/rules/pilet-has-externals-as-peers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pilet-has-externals-as-peers.js","sourceRoot":"","sources":["../../src/rules/pilet-has-externals-as-peers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pilet-has-externals-as-peers.js","sourceRoot":"","sources":["../../src/rules/pilet-has-externals-as-peers.ts"],"names":[],"mappings":"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"}
package/lib/types/common.d.ts CHANGED
@@ -50,7 +50,8 @@ export interface TemplateFileLocation {
50
50
  }
51
51
  export interface PiletsInfo {
52
52
  files: Array<string | TemplateFileLocation>;
53
- externals: Array<string>;
53
+ template: string;
54
+ externals?: Array<string>;
54
55
  devDependencies: Record<string, string | true>;
55
56
  scripts: Record<string, string>;
56
57
  validators: Record<string, any>;
@@ -94,6 +95,7 @@ export interface PiletRuleContext extends RuleContext {
94
95
  importmap: Array<SharedDependency>;
95
96
  }
96
97
  export interface PiralData {
98
+ appRoot: string;
97
99
  appFile: string;
98
100
  appPackage: any;
99
101
  piletPackage: any;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "0.15.0-alpha.4036",
3
+ "version": "0.15.0-alpha.4041",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -78,5 +78,5 @@
78
78
  "typescript": "^4.0.2",
79
79
  "yargs": "^15.4.1"
80
80
  },
81
- "gitHead": "5bd5efc3af82380f20e25d821a0de8a88c16a670"
81
+ "gitHead": "3d305d88c72e3e05a44acbf240a38f6ad7b03959"
82
82
  }
package/src/apps/new-pilet.ts CHANGED
@@ -101,7 +101,7 @@ export const newPiletDefaults: NewPiletOptions = {
101
101
  forceOverwrite: ForceOverwrite.no,
102
102
  language: config.language,
103
103
  install: true,
104
- template: 'default',
104
+ template: undefined,
105
105
  logLevel: LogLevels.info,
106
106
  npmClient: config.npmClient,
107
107
  bundlerName: 'none',
@@ -184,7 +184,7 @@ always-auth=true`,
184
184
 
185
185
  const isEmulator = checkAppShellPackage(piralInfo);
186
186
 
187
- const { preScaffold, postScaffold, files } = getPiletsInfo(piralInfo);
187
+ const { preScaffold, postScaffold, files, template: preSelectedTemplate } = getPiletsInfo(piralInfo);
188
188
 
189
189
  if (preScaffold) {
190
190
  progress(`Running preScaffold script ...`);
@@ -195,7 +195,8 @@ always-auth=true`,
195
195
  progress(`Taking care of templating ...`);
196
196
 
197
197
  const data = getPiletScaffoldData(language, root, packageName, variables);
198
- await scaffoldPiletSourceFiles(template, registry, data, forceOverwrite);
198
+ const chosenTemplate = template || preSelectedTemplate || 'default';
199
+ await scaffoldPiletSourceFiles(chosenTemplate, registry, data, forceOverwrite);
199
200
 
200
201
  if (isEmulator) {
201
202
  // in the emulator case we get the files (and files_once) from the contained tarballs
package/src/common/importmap.ts CHANGED
@@ -7,6 +7,7 @@ import { SharedDependency } from '../types';
7
7
 
8
8
  interface Importmap {
9
9
  imports: Record<string, string>;
10
+ inherit: Array<string>;
10
11
  }
11
12
 
12
13
  function tryResolve(baseDir: string, name: string) {
@@ -53,6 +54,7 @@ function getLocalDependencyVersion(
53
54
  async function resolveImportmap(dir: string, importmap: Importmap) {
54
55
  const dependencies: Array<SharedDependency> = [];
55
56
  const sharedImports = importmap?.imports;
57
+ const inheritedImports = importmap?.inherit;
56
58
 
57
59
  if (typeof sharedImports === 'object' && sharedImports) {
58
60
  for (const depName of Object.keys(sharedImports)) {
@@ -96,7 +98,9 @@ async function resolveImportmap(dir: string, importmap: Importmap) {
96
98
 
97
99
  if (exists) {
98
100
  const isDirectory = await checkIsDirectory(entry);
99
- const packageJson = isDirectory ? resolve(entry, 'package.json') : await findFile(dirname(entry), 'package.json');
101
+ const packageJson = isDirectory
102
+ ? resolve(entry, 'package.json')
103
+ : await findFile(dirname(entry), 'package.json');
100
104
  const packageJsonExists = await checkExists(packageJson);
101
105
 
102
106
  if (packageJsonExists) {
@@ -131,6 +135,26 @@ async function resolveImportmap(dir: string, importmap: Importmap) {
131
135
  }
132
136
  }
133
137
 
138
+ if (Array.isArray(inheritedImports)) {
139
+ for (const inheritedImport of inheritedImports) {
140
+ const packageJson = tryResolve(dir, `${inheritedImport}/package.json`);
141
+
142
+ if (packageJson) {
143
+ const packageDir = dirname(packageJson);
144
+ const packageDetails = require(packageJson);
145
+ const otherDependencies = await readImportmap(packageDir, packageDetails);
146
+
147
+ for (const dependency of otherDependencies) {
148
+ const entry = dependencies.find((dep) => dep.name === dependency.name);
149
+
150
+ if (!entry) {
151
+ dependencies.push(dependency);
152
+ }
153
+ }
154
+ }
155
+ }
156
+ }
157
+
134
158
  return dependencies;
135
159
  }
136
160
 
package/src/common/package.test.ts CHANGED
@@ -29,7 +29,7 @@ describe('CLI package module', () => {
29
29
  it('getPiletsInfo returns pilets information about provided piralInfo', () => {
30
30
  const emptyPiletsInfo = {
31
31
  files: [],
32
- externals: [],
32
+ template: 'default',
33
33
  scripts: {},
34
34
  validators: {},
35
35
  devDependencies: {},
@@ -45,7 +45,7 @@ describe('CLI package module', () => {
45
45
  const piralInfo = {
46
46
  pilets: {
47
47
  files: ['foo.tgz', 'foo2.tgz'],
48
- externals: [],
48
+ template: 'default',
49
49
  scripts: {},
50
50
  validators: {},
51
51
  devDependencies: {},
package/src/common/package.ts CHANGED
@@ -150,8 +150,10 @@ function findPackage(pck: string | Array<string>, baseDir: string) {
150
150
  if (path) {
151
151
  log('generalDebug_0003', `Following the app package in "${path}" ...`);
152
152
  const appPackage = require(path);
153
+ const root = dirname(path);
153
154
  const relPath = appPackage && appPackage.app;
154
- appPackage.app = relPath && resolve(dirname(path), relPath);
155
+ appPackage.app = relPath && resolve(root, relPath);
156
+ appPackage.root = root;
155
157
  return appPackage;
156
158
  }
157
159
  }
@@ -192,6 +194,10 @@ export function getPiralPackage(
192
194
  start: 'piral debug',
193
195
  build: 'piral build',
194
196
  },
197
+ importmap: {
198
+ imports: {},
199
+ inherit: ['piral-base', framework !== 'piral-base' && 'piral-core'].filter(Boolean),
200
+ },
195
201
  pilets: getPiletsInfo({}),
196
202
  dependencies,
197
203
  devDependencies,
@@ -345,8 +351,8 @@ export async function copyPiralFiles(
345
351
  export function getPiletsInfo(piralInfo: any): PiletsInfo {
346
352
  const {
347
353
  files = [],
348
- externals = [],
349
354
  scripts = {},
355
+ template = 'default',
350
356
  validators = {},
351
357
  devDependencies = {},
352
358
  preScaffold = '',
@@ -358,8 +364,8 @@ export function getPiletsInfo(piralInfo: any): PiletsInfo {
358
364
 
359
365
  return {
360
366
  files,
361
- externals,
362
367
  scripts,
368
+ template,
363
369
  validators,
364
370
  devDependencies,
365
371
  preScaffold,
@@ -442,6 +448,21 @@ export async function findPackageVersion(rootPath: string, packageName: string):
442
448
  }
443
449
  }
444
450
 
451
+ export async function retrieveExternals(root: string, packageInfo: any) {
452
+ const sharedDependencies = await readImportmap(root, packageInfo);
453
+
454
+ if (sharedDependencies.length === 0) {
455
+ const allDeps = {
456
+ ...packageInfo.devDependencies,
457
+ ...packageInfo.dependencies,
458
+ };
459
+ const deps = packageInfo.pilets?.externals;
460
+ return makeExternals(allDeps, deps);
461
+ }
462
+
463
+ return sharedDependencies.map((m) => m.name);
464
+ }
465
+
445
466
  export async function retrievePiletsInfo(entryFile: string) {
446
467
  const exists = await checkExists(entryFile);
447
468
 
@@ -456,15 +477,9 @@ export async function retrievePiletsInfo(entryFile: string) {
456
477
  }
457
478
 
458
479
  const packageInfo = require(packageJson);
459
- const allDeps = {
460
- ...packageInfo.devDependencies,
461
- ...packageInfo.dependencies,
462
- };
463
480
  const info = getPiletsInfo(packageInfo);
464
481
  const root = dirname(packageJson);
465
- const sharedDependencies = await readImportmap(root, packageInfo);
466
- const deps = sharedDependencies.length > 0 ? sharedDependencies.map((m) => m.name) : info.externals;
467
- const externals = makeExternals(allDeps, deps);
482
+ const externals = await retrieveExternals(root, packageInfo);
468
483
 
469
484
  return {
470
485
  ...info,
@@ -602,9 +617,10 @@ export async function retrievePiletData(target: string, app?: string) {
602
617
  app || (piletPackage.piral && piletPackage.piral.name) || Object.keys(piletPackage.devDependencies),
603
618
  target,
604
619
  );
605
- const appFile: string = appPackage && appPackage.app;
620
+ const appFile: string = appPackage?.app;
621
+ const appRoot: string = appPackage?.root;
606
622
 
607
- if (!appFile) {
623
+ if (!appFile || !appRoot) {
608
624
  fail('appInstanceInvalid_0011');
609
625
  }
610
626
 
@@ -619,6 +635,7 @@ export async function retrievePiletData(target: string, app?: string) {
619
635
  ignored: checkArrayOrUndefined(piletPackage, 'preservedDependencies'),
620
636
  importmap,
621
637
  appFile,
638
+ appRoot,
622
639
  piletPackage,
623
640
  appPackage,
624
641
  emulator,
package/src/rules/pilet-has-externals-as-peers.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { PiletRuleContext } from '../types';
2
- import { getPiletsInfo, getSourceFiles, isValidDependency } from '../common';
2
+ import { retrieveExternals, getSourceFiles, isValidDependency } from '../common';
3
3
 
4
4
  export type Options = 'ignore' | 'active' | 'only-used';
5
5
 
@@ -21,7 +21,7 @@ Received: Missing "${missingNames.join('", "')}".
21
21
  */
22
22
  export default async function (context: PiletRuleContext, options: Options = 'ignore') {
23
23
  if (options !== 'ignore') {
24
- const { externals } = getPiletsInfo(context.data.appPackage);
24
+ const externals = await retrieveExternals(context.data.appRoot, context.data.appPackage);
25
25
  const markedPeerDependencies = Object.keys(context.peerDependencies);
26
26
  const markedPeerModules = context.peerModules;
27
27
  const missingExternals = externals
package/src/types/common.ts CHANGED
@@ -55,7 +55,8 @@ export interface TemplateFileLocation {
55
55
 
56
56
  export interface PiletsInfo {
57
57
  files: Array<string | TemplateFileLocation>;
58
- externals: Array<string>;
58
+ template: string;
59
+ externals?: Array<string>;
59
60
  devDependencies: Record<string, string | true>;
60
61
  scripts: Record<string, string>;
61
62
  validators: Record<string, any>;
@@ -106,6 +107,7 @@ export interface PiletRuleContext extends RuleContext {
106
107
  }
107
108
 
108
109
  export interface PiralData {
110
+ appRoot: string;
109
111
  appFile: string;
110
112
  appPackage: any;
111
113
  piletPackage: any;