@coolon/angular-ui-powerups 3.7.0-alpha.1 → 3.7.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/package.json +2 -2
- package/schematics/place-routes/index.d.ts +1 -1
- package/schematics/place-routes/index.js +9 -14
- package/schematics/place-routes/index.js.map +1 -1
- package/schematics/place-routes/place-builder.d.ts +3 -5
- package/schematics/place-routes/place-builder.js +4 -23
- package/schematics/place-routes/place-builder.js.map +1 -1
- package/schematics/place-routes/place-class-scanner.d.ts +3 -2
- package/schematics/place-routes/place-class-scanner.js.map +1 -1
- package/schematics/place-routes/place-def.d.ts +3 -2
- package/schematics/place-routes/place-def.js.map +1 -1
- package/schematics/utils/build-context.js +1 -1
- package/schematics/utils/build-context.js.map +1 -1
- package/schematics/utils/schematic-tree-file-system.d.ts +3 -2
- package/schematics/utils/schematic-tree-file-system.js +11 -2
- package/schematics/utils/schematic-tree-file-system.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [3.7.0-alpha.2](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.7.0-alpha.1...v3.7.0-alpha.2) (2020-12-16)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* place routes failing to find source files on second run ([e690438](https://bitbucket.org/coolon/angular-ui-powerups/commit/e6904384131a43c34c3d564e388e40abd2223f8b))
|
|
11
|
+
|
|
5
12
|
## [3.7.0-alpha.1](https://bitbucket.org/coolon/angular-ui-powerups/compare/v3.7.0-alpha.0...v3.7.0-alpha.1) (2020-12-15)
|
|
6
13
|
|
|
7
14
|
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@coolon/angular-ui-powerups",
|
|
3
|
-
"version": "3.7.0-alpha.
|
|
3
|
+
"version": "3.7.0-alpha.2",
|
|
4
4
|
"schematics": "./schematics/collection.json",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@coolon/typescript-utilities": "^2.2.0",
|
|
7
7
|
"@typescript-plus/fast-memoize-decorator": "^0.1.0",
|
|
8
8
|
"json5": "^2.1.0",
|
|
9
|
-
"ts-morph": "^
|
|
9
|
+
"ts-morph": "^9.1.0",
|
|
10
10
|
"tslib": "^2.0.0",
|
|
11
11
|
"typescript-string-enums": "^1.0.0"
|
|
12
12
|
},
|
|
@@ -2,26 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateRoutes = void 0;
|
|
4
4
|
const pectin_1 = require("@coolon/pectin");
|
|
5
|
+
const workspace_1 = require("../utils/workspace");
|
|
5
6
|
const place_builder_1 = require("./place-builder");
|
|
6
|
-
function generateRoutes(
|
|
7
|
-
return (tree,
|
|
7
|
+
function generateRoutes(_options) {
|
|
8
|
+
return (tree, _context) => {
|
|
8
9
|
pectin_1.Logger.logTo({
|
|
9
10
|
on(log) {
|
|
10
|
-
|
|
11
|
+
_context.logger.info(log.message);
|
|
11
12
|
}
|
|
12
13
|
});
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
const workspace = workspace_1.Workspace.load(tree, _context);
|
|
15
|
+
const buildContext = workspace.getApplicationOrDefault(_options.project);
|
|
16
|
+
if (!_options.project) {
|
|
17
|
+
_options.project = workspace.defaultProject;
|
|
16
18
|
}
|
|
17
|
-
|
|
18
|
-
const workspaceContent = workspaceConfig.toString();
|
|
19
|
-
// parse workspace string into JSON object
|
|
20
|
-
const workspace = JSON.parse(workspaceContent);
|
|
21
|
-
if (!options.project) {
|
|
22
|
-
options.project = workspace.defaultProject;
|
|
23
|
-
}
|
|
24
|
-
const placeBuilder = new place_builder_1.PlaceBuilder(options, workspace, context);
|
|
19
|
+
const placeBuilder = new place_builder_1.PlaceBuilder(_options, buildContext, _context);
|
|
25
20
|
try {
|
|
26
21
|
return placeBuilder.process(tree);
|
|
27
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/index.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AACxC,mDAA+C;AAG/C,SAAgB,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/index.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AACxC,kDAA+C;AAC/C,mDAA+C;AAG/C,SAAgB,cAAc,CAAC,QAAgB;IAE7C,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAEhD,eAAM,CAAC,KAAK,CAAC;YACX,EAAE,CAAC,GAAiB;gBAClB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAExE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;YACrB,QAAQ,CAAC,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC;SAC7C;QAED,MAAM,YAAY,GAAG,IAAI,4BAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QAExE,IAAI;YACF,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACnC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC,CAAC;AAEJ,CAAC;AA1BD,wCA0BC"}
|
|
@@ -1,18 +1,16 @@
|
|
|
1
|
-
import { experimental } from '@angular-devkit/core';
|
|
2
1
|
import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
3
|
-
import {
|
|
2
|
+
import { BuildContext } from '../utils/build-context';
|
|
4
3
|
import { Schema } from './schema';
|
|
5
4
|
export declare class PlaceBuilder {
|
|
6
5
|
readonly options: Schema;
|
|
6
|
+
readonly buildContext: BuildContext.App;
|
|
7
7
|
readonly context: SchematicContext;
|
|
8
8
|
private projectName;
|
|
9
9
|
private projectType;
|
|
10
10
|
private sourceRoot;
|
|
11
|
-
private workspaceProject;
|
|
12
11
|
private typescriptProject;
|
|
13
12
|
private tsConfigPath;
|
|
14
|
-
constructor(options: Schema,
|
|
15
|
-
loadTypeScriptProject(): Project;
|
|
13
|
+
constructor(options: Schema, buildContext: BuildContext.App, context: SchematicContext);
|
|
16
14
|
process(tree: Tree): Rule;
|
|
17
15
|
private renderTemplates;
|
|
18
16
|
private extractPlaceDefinitions;
|
|
@@ -4,7 +4,6 @@ exports.PlaceBuilder = void 0;
|
|
|
4
4
|
const core_1 = require("@angular-devkit/core");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
const path = require("path");
|
|
7
|
-
const ts_morph_1 = require("ts-morph");
|
|
8
7
|
const place_def_1 = require("./place-def");
|
|
9
8
|
// interface Config {
|
|
10
9
|
// authGuard: ClassImport;
|
|
@@ -14,32 +13,14 @@ const place_def_1 = require("./place-def");
|
|
|
14
13
|
// }
|
|
15
14
|
const noopRule = (tree, context) => tree;
|
|
16
15
|
class PlaceBuilder {
|
|
17
|
-
constructor(options,
|
|
16
|
+
constructor(options, buildContext, context) {
|
|
18
17
|
this.options = options;
|
|
18
|
+
this.buildContext = buildContext;
|
|
19
19
|
this.context = context;
|
|
20
20
|
this.projectName = options.project;
|
|
21
|
-
this.
|
|
22
|
-
this.projectType = this.workspaceProject.projectType === 'application' ? 'app' : 'lib';
|
|
23
|
-
this.sourceRoot = `${this.workspaceProject.sourceRoot}/${this.projectType}`;
|
|
24
|
-
this.tsConfigPath = this.workspaceProject.architect.build.options.tsConfig;
|
|
25
|
-
this.typescriptProject = this.loadTypeScriptProject();
|
|
21
|
+
this.sourceRoot = buildContext.sourceCodeRoot;
|
|
26
22
|
this.context.logger.info(`sourceRoot=${this.sourceRoot}`);
|
|
27
23
|
this.context.logger.info(`projectName=${this.projectName}`);
|
|
28
|
-
this.context.logger.info(`projectType=${this.projectType}`);
|
|
29
|
-
}
|
|
30
|
-
loadTypeScriptProject() {
|
|
31
|
-
// TODO: this barfs if you're not running it from teh project root directory
|
|
32
|
-
this.context.logger.info(`loading tsConfig from -> ${this.tsConfigPath}`);
|
|
33
|
-
try {
|
|
34
|
-
return new ts_morph_1.Project({
|
|
35
|
-
tsConfigFilePath: this.tsConfigPath
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
catch (error) {
|
|
39
|
-
this.context.logger.error(error.toString());
|
|
40
|
-
this.context.logger.fatal(`Failed to load typescript project from: ${this.tsConfigPath} You probably need to specify the --project option?`);
|
|
41
|
-
throw error;
|
|
42
|
-
}
|
|
43
24
|
}
|
|
44
25
|
process(tree) {
|
|
45
26
|
const placeRoots = [];
|
|
@@ -95,7 +76,7 @@ class PlaceBuilder {
|
|
|
95
76
|
if (!content) {
|
|
96
77
|
return;
|
|
97
78
|
}
|
|
98
|
-
const sourceFile = this.
|
|
79
|
+
const sourceFile = this.buildContext.getSourceFile(`./${filePath}`);
|
|
99
80
|
if (!sourceFile) {
|
|
100
81
|
throw new Error(`${filePath} is not included by ${this.tsConfigPath}. You might need to add an '"include": ["**/*.ts", "**/*.d.ts"]'`);
|
|
101
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"place-builder.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-builder.ts"],"names":[],"mappings":";;;AAAA,+CAA6D;AAC7D,2DAYoC;AACpC,6BAA6B;
|
|
1
|
+
{"version":3,"file":"place-builder.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { SchematicContext } from '@angular-devkit/schematics';
|
|
2
|
-
import { ClassDeclaration, Decorator, ObjectLiteralExpression, PropertyDeclaration
|
|
2
|
+
import { ClassDeclaration, Decorator, ObjectLiteralExpression, PropertyDeclaration } from 'ts-morph';
|
|
3
|
+
import { DecoratedSourceFile } from '../utils/decorators/decorated-source-file';
|
|
3
4
|
import { PlaceDef } from './place-def';
|
|
4
5
|
export declare class PlaceClassScanner {
|
|
5
6
|
private readonly sourceFile;
|
|
6
7
|
private readonly classDecl;
|
|
7
8
|
readonly context: SchematicContext;
|
|
8
9
|
private placeAnnotation;
|
|
9
|
-
constructor(sourceFile:
|
|
10
|
+
constructor(sourceFile: DecoratedSourceFile, classDecl: ClassDeclaration, context: SchematicContext);
|
|
10
11
|
isPlace(): boolean;
|
|
11
12
|
onMatch(callback: (scan: PlaceClassScanner) => void): void;
|
|
12
13
|
createDefinition(moduleImportPath: string): PlaceDef;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"place-class-scanner.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-class-scanner.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"place-class-scanner.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-class-scanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { SchematicContext } from '@angular-devkit/schematics';
|
|
2
|
-
import { ClassDeclaration
|
|
2
|
+
import { ClassDeclaration } from 'ts-morph';
|
|
3
|
+
import { DecoratedSourceFile } from '../utils/decorators/decorated-source-file';
|
|
3
4
|
import { PlaceClassScanner } from './place-class-scanner';
|
|
4
5
|
export declare class PlaceDef {
|
|
5
6
|
readonly sourceFilePath: string;
|
|
@@ -41,7 +42,7 @@ export declare namespace PlaceDef {
|
|
|
41
42
|
modelName: string;
|
|
42
43
|
typeName: string;
|
|
43
44
|
}
|
|
44
|
-
function scan(sourceFile:
|
|
45
|
+
function scan(sourceFile: DecoratedSourceFile, classDecl: ClassDeclaration, context: SchematicContext): PlaceClassScanner;
|
|
45
46
|
function stripEnclosingQuotes(value: string): string;
|
|
46
47
|
class ChildRef {
|
|
47
48
|
readonly filePath: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":";;;;;;;;;AACA,2CAAsC;AACtC,0EAA2E;
|
|
1
|
+
{"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ class BuildContext {
|
|
|
33
33
|
try {
|
|
34
34
|
return new ts_morph_1.Project({
|
|
35
35
|
tsConfigFilePath: this.tsConfigPath,
|
|
36
|
-
fileSystem: new schematic_tree_file_system_1.SchematicTreeFileSystem(this.tree)
|
|
36
|
+
fileSystem: new schematic_tree_file_system_1.SchematicTreeFileSystem(this.tree, this.context)
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-context.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/build-context.ts"],"names":[],"mappings":";;;AAEA,uCAAiE;AACjE,8EAAyE;AACzE,6EAAuE;AAEvE,MAAsB,YAAY;IAGhC,YAAqB,IAAU,EAAW,WAAmB,EAAqB,QAA+B,EAAW,OAAyB;QAAhI,SAAI,GAAJ,IAAI,CAAM;QAAW,gBAAW,GAAX,WAAW,CAAQ;QAAqB,aAAQ,GAAR,QAAQ,CAAuB;QAAW,YAAO,GAAP,OAAO,CAAkB;QACnJ,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAGD,IAAI,cAAc;QAChB,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IACrF,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC;IACnD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC;IAC7C,CAAC;IAEO,qBAAqB;QAC3B,4EAA4E;QAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAClE,IAAI;YACF,OAAO,IAAI,kBAAO,CAAC;gBACjB,gBAAgB,EAAE,IAAI,CAAC,YAAY;gBACnC,UAAU,EAAE,IAAI,oDAAuB,CAAC,IAAI,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"build-context.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/build-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { Tree } from '@angular-devkit/schematics';
|
|
1
|
+
import { SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
2
2
|
import { FileSystemHost } from 'ts-morph';
|
|
3
3
|
export declare class SchematicTreeFileSystem implements FileSystemHost {
|
|
4
4
|
private readonly tree;
|
|
5
|
-
|
|
5
|
+
private readonly context;
|
|
6
|
+
constructor(tree: Tree, context: SchematicContext);
|
|
6
7
|
copy(srcPath: string, destPath: string): Promise<void>;
|
|
7
8
|
copySync(srcPath: string, destPath: string): void;
|
|
8
9
|
delete(path: string): Promise<void>;
|
|
@@ -12,8 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.SchematicTreeFileSystem = void 0;
|
|
13
13
|
const typescript_utilities_1 = require("@coolon/typescript-utilities");
|
|
14
14
|
class SchematicTreeFileSystem {
|
|
15
|
-
constructor(tree) {
|
|
15
|
+
constructor(tree, context) {
|
|
16
16
|
this.tree = tree;
|
|
17
|
+
this.context = context;
|
|
17
18
|
}
|
|
18
19
|
copy(srcPath, destPath) {
|
|
19
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -45,7 +46,14 @@ class SchematicTreeFileSystem {
|
|
|
45
46
|
});
|
|
46
47
|
}
|
|
47
48
|
fileExistsSync(filePath) {
|
|
48
|
-
|
|
49
|
+
const exists = this.tree.exists(filePath);
|
|
50
|
+
// NOTE: If we turn the logging on this will show ts-morph trying to read
|
|
51
|
+
// the tsconfig.app.json parent config from a double nested directory i.e
|
|
52
|
+
// apps/test-bed/dummy-app/apps/test-bed/dummy-app/tsconfig.json
|
|
53
|
+
// This is happening from within the typescript compiler so I'm not sure if
|
|
54
|
+
// it's intended behaviour or not.
|
|
55
|
+
// this.context.logger.info(`fileExists->${filePath}? ${exists}`)
|
|
56
|
+
return exists;
|
|
49
57
|
}
|
|
50
58
|
getCurrentDirectory() {
|
|
51
59
|
return '';
|
|
@@ -83,6 +91,7 @@ class SchematicTreeFileSystem {
|
|
|
83
91
|
});
|
|
84
92
|
}
|
|
85
93
|
readFileSync(filePath, encoding) {
|
|
94
|
+
// this.context.logger.info(`readFile->${filePath}`)
|
|
86
95
|
return this.tree.get(filePath).content.toString(encoding || 'UTF-8');
|
|
87
96
|
}
|
|
88
97
|
realpathSync(path) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schematic-tree-file-system.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/schematic-tree-file-system.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,uEAAoD;AAGpD,MAAa,uBAAuB;IAElC,YAA6B,IAAU;
|
|
1
|
+
{"version":3,"file":"schematic-tree-file-system.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/schematic-tree-file-system.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,uEAAoD;AAGpD,MAAa,uBAAuB;IAElC,YAA6B,IAAU,EAAmB,OAAyB;QAAtD,SAAI,GAAJ,IAAI,CAAM;QAAmB,YAAO,GAAP,OAAO,CAAkB;IACnF,CAAC;IAEK,IAAI,CAAC,OAAe,EAAE,QAAgB;;YAC1C,OAAO,2BAAI,CAAC,cAAc,EAAE,CAAC;QAC/B,CAAC;KAAA;IAED,QAAQ,CAAC,OAAe,EAAE,QAAgB;QACxC,OAAO,2BAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAEK,MAAM,CAAC,IAAY;;YACvB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;KAAA;IAED,UAAU,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAEK,eAAe,CAAC,OAAe;;YACnC,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;KAAA;IAED,mBAAmB,CAAC,OAAe;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAEK,UAAU,CAAC,QAAgB;;YAC/B,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;KAAA;IAED,cAAc,CAAC,QAAgB;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1C,yEAAyE;QACzE,yEAAyE;QACzE,gEAAgE;QAChE,2EAA2E;QAC3E,kCAAkC;QAClC,iEAAiE;QACjE,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,mBAAmB;QACjB,OAAO,EAAE,CAAC;IACZ,CAAC;IAEK,IAAI,CAAC,QAA+B;;YACxC,OAAO,2BAAI,CAAC,cAAc,EAAE,CAAC;QAC/B,CAAC;KAAA;IAED,QAAQ,CAAC,QAA+B;QACtC,OAAO,2BAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAED,eAAe;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,OAAO,2BAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAED,SAAS,CAAC,OAAe;QACvB,OAAO,2BAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,QAAgB;QACpC,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,QAAQ,CAAC,OAAe,EAAE,QAAgB;QACxC,OAAO,2BAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAED,WAAW,CAAC,OAAe;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtC,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,IAAI,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAEK,QAAQ,CAAC,QAAgB,EAAE,QAAiB;;YAChD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;KAAA;IAED,YAAY,CAAC,QAAgB,EAAE,QAAiB;QAC9C,oDAAoD;QACpD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAEK,SAAS,CAAC,QAAgB,EAAE,QAAgB;;YAChD,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;KAAA;IAED,aAAa,CAAC,QAAgB,EAAE,QAAgB;QAC9C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;CAMF;AA1GD,0DA0GC"}
|