angular-three-plugin 4.0.0-next.45 → 4.0.0-next.47
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/generators.json +10 -0
- package/package.json +3 -1
- package/src/generators/aux/aux.d.ts +3 -0
- package/src/generators/aux/aux.js +54 -0
- package/src/generators/aux/aux.js.map +1 -0
- package/src/generators/aux/compat.d.ts +2 -0
- package/src/generators/aux/compat.js +7 -0
- package/src/generators/aux/compat.js.map +1 -0
- package/src/generators/aux/schema.json +7 -0
- package/src/generators/gltf/{utils/generate-ngt.d.ts → generate-ngt.d.ts} +1 -1
- package/src/generators/gltf/generate-ngt.js.map +1 -0
- package/src/generators/gltf/gltf.d.ts +1 -1
- package/src/generators/gltf/gltf.js +9 -6
- package/src/generators/gltf/gltf.js.map +1 -1
- package/src/generators/gltf/schema.json +3 -4
- package/src/versions.d.ts +1 -28
- package/src/versions.js.map +1 -1
- package/src/generators/gltf/utils/generate-ngt.js.map +0 -1
- /package/src/generators/gltf/{utils/generate-ngt.js → generate-ngt.js} +0 -0
package/generators.json
CHANGED
|
@@ -9,6 +9,11 @@
|
|
|
9
9
|
"factory": "./src/generators/gltf/gltf",
|
|
10
10
|
"schema": "./src/generators/gltf/schema.json",
|
|
11
11
|
"description": "gltf generator"
|
|
12
|
+
},
|
|
13
|
+
"aux": {
|
|
14
|
+
"factory": "./src/generators/aux/aux",
|
|
15
|
+
"schema": "./src/generators/aux/schema.json",
|
|
16
|
+
"description": "aux generator"
|
|
12
17
|
}
|
|
13
18
|
},
|
|
14
19
|
"schematics": {
|
|
@@ -21,6 +26,11 @@
|
|
|
21
26
|
"factory": "./src/generators/gltf/compat",
|
|
22
27
|
"schema": "./src/generators/gltf/schema.json",
|
|
23
28
|
"description": "gltf generator"
|
|
29
|
+
},
|
|
30
|
+
"aux": {
|
|
31
|
+
"factory": "./src/generators/aux/compat",
|
|
32
|
+
"schema": "./src/generators/aux/schema.json",
|
|
33
|
+
"description": "aux generator"
|
|
24
34
|
}
|
|
25
35
|
}
|
|
26
36
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "angular-three-plugin",
|
|
3
|
-
"version": "4.0.0-next.
|
|
3
|
+
"version": "4.0.0-next.47",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
"nx-migrations": {
|
|
32
32
|
"migrations": "./migrations.json",
|
|
33
33
|
"packageGroup": [
|
|
34
|
+
"angular-three-plugin",
|
|
34
35
|
"angular-three-soba",
|
|
35
36
|
"angular-three-postprocessing",
|
|
36
37
|
"angular-three-cannon",
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
"ng-update": {
|
|
41
42
|
"migrations": "./migrations.json",
|
|
42
43
|
"packageGroup": [
|
|
44
|
+
"angular-three-plugin",
|
|
43
45
|
"angular-three-soba",
|
|
44
46
|
"angular-three-postprocessing",
|
|
45
47
|
"angular-three-cannon",
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.auxGenerator = auxGenerator;
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const enquirer_1 = require("enquirer");
|
|
6
|
+
const utils_1 = require("../../utils");
|
|
7
|
+
const versions_1 = require("../../versions");
|
|
8
|
+
async function auxGenerator(tree) {
|
|
9
|
+
devkit_1.logger.info('[NGT] Initialize auxiliary packages');
|
|
10
|
+
const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
11
|
+
if (!packageJson) {
|
|
12
|
+
devkit_1.logger.warn(`[NGT] PackageJson not found in: ${tree.root}`);
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
const ngtVersion = packageJson['dependencies']?.['angular-three'] || packageJson['devDependencies']?.['angular-three'];
|
|
16
|
+
if (!ngtVersion) {
|
|
17
|
+
devkit_1.logger.warn(`[NGT] angular-three is not installed.`);
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
const { packages } = await (0, enquirer_1.prompt)({
|
|
21
|
+
type: 'multiselect',
|
|
22
|
+
name: 'packages',
|
|
23
|
+
message: 'Which packages to add?',
|
|
24
|
+
choices: ['angular-three-soba', 'angular-three-rapier', 'angular-three-postprocessing', 'angular-three-cannon'],
|
|
25
|
+
});
|
|
26
|
+
const packagesToAdd = {};
|
|
27
|
+
for (const pkg of packages) {
|
|
28
|
+
const exist = packageJson['dependencies']?.[pkg] || packageJson['devDependencies']?.[pkg];
|
|
29
|
+
if (exist) {
|
|
30
|
+
devkit_1.logger.warn(`[NGT] ${pkg} is already installed. Skipping`);
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
packagesToAdd[pkg] = ngtVersion;
|
|
34
|
+
if (versions_1.PEER_DEPENDENCIES[pkg]) {
|
|
35
|
+
for (const depName in versions_1.PEER_DEPENDENCIES[pkg]) {
|
|
36
|
+
packagesToAdd[depName] = versions_1.PEER_DEPENDENCIES[pkg][depName];
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
if (pkg === 'angular-three-soba') {
|
|
40
|
+
(0, utils_1.addMetadataJson)(tree, 'angular-three-soba/metadata.json');
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if (Object.keys(packagesToAdd).length === 0) {
|
|
44
|
+
console.warn(`[NGT] No packages to add`);
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, packagesToAdd, {});
|
|
48
|
+
await (0, devkit_1.formatFiles)(tree);
|
|
49
|
+
return () => {
|
|
50
|
+
(0, devkit_1.installPackagesTask)(tree);
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
exports.default = auxGenerator;
|
|
54
|
+
//# sourceMappingURL=aux.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aux.js","sourceRoot":"","sources":["../../../../../../libs/plugin/src/generators/aux/aux.ts"],"names":[],"mappings":";;AAKA,oCA0DC;AA/DD,uCAAoH;AACpH,uCAAkC;AAClC,uCAA8C;AAC9C,6CAAmD;AAE5C,KAAK,UAAU,YAAY,CAAC,IAAU;IAC5C,eAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;IAEnD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,CAAC,WAAW,EAAE,CAAC;QAClB,eAAM,CAAC,IAAI,CAAC,mCAAmC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5D,OAAO;IACR,CAAC;IAED,MAAM,UAAU,GACf,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;IAErG,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,eAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO;IACR,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iBAAM,EAAyB;QACzD,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,wBAAwB;QACjC,OAAO,EAAE,CAAC,oBAAoB,EAAE,sBAAsB,EAAE,8BAA8B,EAAE,sBAAsB,CAAC;KAC/G,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,EAAE,CAAC;IAEzB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAC1F,IAAI,KAAK,EAAE,CAAC;YACX,eAAM,CAAC,IAAI,CAAC,SAAS,GAAG,iCAAiC,CAAC,CAAC;YAC3D,SAAS;QACV,CAAC;QAED,aAAa,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;QAEhC,IAAI,4BAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,KAAK,MAAM,OAAO,IAAI,4BAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9C,aAAa,CAAC,OAAO,CAAC,GAAG,4BAAiB,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1D,CAAC;QACF,CAAC;QAED,IAAI,GAAG,KAAK,oBAAoB,EAAE,CAAC;YAClC,IAAA,uBAAe,EAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;QAC3D,CAAC;IACF,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACzC,OAAO;IACR,CAAC;IAED,IAAA,qCAA4B,EAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IAEtD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,GAAG,EAAE;QACX,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,CAAC;AACH,CAAC;AAED,kBAAe,YAAY,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const aux_1 = tslib_1.__importDefault(require("./aux"));
|
|
6
|
+
exports.default = (0, devkit_1.convertNxGenerator)(aux_1.default);
|
|
7
|
+
//# sourceMappingURL=compat.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../libs/plugin/src/generators/aux/compat.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAChD,wDAAiC;AAEjC,kBAAe,IAAA,2BAAkB,EAAC,aAAY,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate-ngt.js","sourceRoot":"","sources":["../../../../../../libs/plugin/src/generators/gltf/generate-ngt.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.gltfGenerator = gltfGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
|
-
const generate_ngt_1 = require("./
|
|
6
|
+
const generate_ngt_1 = require("./generate-ngt");
|
|
7
7
|
// @ts-expect-error - type only import
|
|
8
8
|
function normalizeOptions(tree, options, gltfJsx) {
|
|
9
9
|
const { Log } = gltfJsx;
|
|
@@ -32,7 +32,11 @@ function normalizeOptions(tree, options, gltfJsx) {
|
|
|
32
32
|
};
|
|
33
33
|
const modelPathFromRoot = (0, node_path_1.join)(tree.root, options.modelPath);
|
|
34
34
|
const outputDir = (0, node_path_1.dirname)(options.output);
|
|
35
|
-
const injectGLTFOptions = options.transform
|
|
35
|
+
const injectGLTFOptions = options.transform && options.draco != null
|
|
36
|
+
? `{ useDraco: ${options.draco} }`
|
|
37
|
+
: options.transform
|
|
38
|
+
? '{ useDraco: true }'
|
|
39
|
+
: '';
|
|
36
40
|
const selector = `${options.selectorPrefix}-${fileName}`;
|
|
37
41
|
const gltfAnimationTypeName = className + 'AnimationClips';
|
|
38
42
|
const gltfAnimationApiTypeName = className + 'AnimationApi';
|
|
@@ -87,9 +91,8 @@ async function gltfGenerator(tree, options) {
|
|
|
87
91
|
if (!gltfPath.startsWith('http') && !gltfPath.startsWith('.')) {
|
|
88
92
|
gltfPath = `./${gltfPath}`;
|
|
89
93
|
}
|
|
90
|
-
(0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, 'files'), outputDir, {
|
|
94
|
+
(0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, 'files'), outputDir, Object.assign(generateOptions, {
|
|
91
95
|
tmpl: '',
|
|
92
|
-
...generateOptions,
|
|
93
96
|
scene,
|
|
94
97
|
fileName,
|
|
95
98
|
className,
|
|
@@ -105,7 +108,8 @@ async function gltfGenerator(tree, options) {
|
|
|
105
108
|
gltfOptions: injectGLTFOptions,
|
|
106
109
|
header: options.header,
|
|
107
110
|
size,
|
|
108
|
-
});
|
|
111
|
+
}));
|
|
112
|
+
await (0, devkit_1.formatFiles)(tree);
|
|
109
113
|
if (options.console) {
|
|
110
114
|
const outputPath = (0, node_path_1.join)(outputDir, `${fileName}.ts`);
|
|
111
115
|
const outputContent = tree.read(outputPath, 'utf8');
|
|
@@ -122,7 +126,6 @@ async function gltfGenerator(tree, options) {
|
|
|
122
126
|
log.debug('Disposing of DracoLoader');
|
|
123
127
|
dracoLoader?.dispose();
|
|
124
128
|
}
|
|
125
|
-
await (0, devkit_1.formatFiles)(tree);
|
|
126
129
|
}
|
|
127
130
|
exports.default = gltfGenerator;
|
|
128
131
|
//# sourceMappingURL=gltf.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gltf.js","sourceRoot":"","sources":["../../../../../../libs/plugin/src/generators/gltf/gltf.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"gltf.js","sourceRoot":"","sources":["../../../../../../libs/plugin/src/generators/gltf/gltf.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,11 +34,10 @@
|
|
|
34
34
|
"x-prompt": "Enter the prefix to use for the generated component selector (default: app)"
|
|
35
35
|
},
|
|
36
36
|
"draco": {
|
|
37
|
-
"type": "
|
|
38
|
-
"enum": ["true", "false", ""],
|
|
37
|
+
"type": "boolean",
|
|
39
38
|
"description": "Use DracoLoader",
|
|
40
|
-
"alias": "
|
|
41
|
-
"default":
|
|
39
|
+
"alias": "D",
|
|
40
|
+
"default": null
|
|
42
41
|
},
|
|
43
42
|
"bones": {
|
|
44
43
|
"type": "boolean",
|
package/src/versions.d.ts
CHANGED
|
@@ -2,31 +2,4 @@ export declare const ANGULAR_THREE_VERSION = "next";
|
|
|
2
2
|
export declare const THREE_VERSION = "^0.173.0";
|
|
3
3
|
export declare const THREE_TYPE_VERSION = "^0.173.0";
|
|
4
4
|
export declare const NGXTENSION_VERSION = "^4.0.0";
|
|
5
|
-
export declare const PEER_DEPENDENCIES:
|
|
6
|
-
'angular-three-soba': {
|
|
7
|
-
'three-stdlib': string;
|
|
8
|
-
'@pmndrs/vanilla': string;
|
|
9
|
-
'@monogrid/gainmap-js': string;
|
|
10
|
-
'camera-controls': string;
|
|
11
|
-
'hls.js': string;
|
|
12
|
-
maath: string;
|
|
13
|
-
meshline: string;
|
|
14
|
-
'stats-gl': string;
|
|
15
|
-
'three-custom-shader-material': string;
|
|
16
|
-
'three-mesh-bvh': string;
|
|
17
|
-
'troika-three-text': string;
|
|
18
|
-
};
|
|
19
|
-
'angular-three-rapier': {
|
|
20
|
-
'@dimforge/rapier3d-compat': string;
|
|
21
|
-
};
|
|
22
|
-
'angular-three-postprocessing': {
|
|
23
|
-
maath: string;
|
|
24
|
-
n8ao: string;
|
|
25
|
-
postprocessing: string;
|
|
26
|
-
};
|
|
27
|
-
'angular-three-cannon': {
|
|
28
|
-
'@pmndrs/cannon-worker-api': string;
|
|
29
|
-
'cannon-es': string;
|
|
30
|
-
'cannon-es-debugger': string;
|
|
31
|
-
};
|
|
32
|
-
};
|
|
5
|
+
export declare const PEER_DEPENDENCIES: Record<string, Record<string, string>>;
|
package/src/versions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../libs/plugin/src/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAC/B,QAAA,aAAa,GAAG,UAAU,CAAC;AAC3B,QAAA,kBAAkB,GAAG,UAAU,CAAC;AAChC,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE9B,QAAA,iBAAiB,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../libs/plugin/src/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAC/B,QAAA,aAAa,GAAG,UAAU,CAAC;AAC3B,QAAA,kBAAkB,GAAG,UAAU,CAAC;AAChC,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE9B,QAAA,iBAAiB,GAA2C;IACxE,oBAAoB,EAAE;QACrB,cAAc,EAAE,QAAQ;QACxB,iBAAiB,EAAE,SAAS;QAC5B,sBAAsB,EAAE,QAAQ;QAChC,iBAAiB,EAAE,QAAQ;QAC3B,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,SAAS;QAChB,QAAQ,EAAE,QAAQ;QAClB,UAAU,EAAE,QAAQ;QACpB,8BAA8B,EAAE,QAAQ;QACxC,gBAAgB,EAAE,QAAQ;QAC1B,mBAAmB,EAAE,SAAS;KAC9B;IACD,sBAAsB,EAAE;QACvB,2BAA2B,EAAE,SAAS;KACtC;IACD,8BAA8B,EAAE;QAC/B,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,QAAQ;QACd,cAAc,EAAE,QAAQ;KACxB;IACD,sBAAsB,EAAE;QACvB,2BAA2B,EAAE,QAAQ;QACrC,WAAW,EAAE,SAAS;QACtB,oBAAoB,EAAE,QAAQ;KAC9B;CACD,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-ngt.js","sourceRoot":"","sources":["../../../../../../../libs/plugin/src/generators/gltf/utils/generate-ngt.ts"],"names":[],"mappings":";;;AAGA,MAAa,WAAW;IAMd;IAEA;IACA;IART,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7B,IAAI,GAAG,KAAK,CAAC;IAEb;IACC,sCAAsC;IAC9B,YAAuD;IAC/D,sCAAsC;IAC9B,UAA+C,EAC/C,OAA4B;QAH5B,iBAAY,GAAZ,YAAY,CAA2C;QAEvD,eAAU,GAAV,UAAU,CAAqC;QAC/C,YAAO,GAAP,OAAO,CAAqB;IAClC,CAAC;IAEJ,QAAQ;QACP,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3F,CAAC;IAED,kBAAkB;QACjB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,IAAI;YAAE,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,WAAW;YAAE,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC9D,IAAI,YAAY;YAAE,cAAc,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAEhE,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY;aACnC,SAAS,EAAE;aACX,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;aAC/D,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY;aAClC,QAAQ,EAAE;aACV,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;aAC/D,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY;aACtC,YAAY,EAAE;aACd,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;aAC/D,IAAI,CAAC,KAAK,CAAC,CAAC;QAEd,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;QAE3D,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAC/G,MAAM,MAAM,GAAG,UAAU;YACxB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;iBACtB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;iBACjF,IAAI,CAAC,IAAI,CAAC;YACb,CAAC,CAAC,EAAE,CAAC;QAEN,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAE5E,OAAO;YACN,UAAU;YACV,MAAM;YACN,YAAY;YACZ,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW;YACX,YAAY;YACZ,WAAW;YACX,UAAU;YACV,cAAc;YACd,cAAc;SACd,CAAC;IACH,CAAC;IAED,IAAY,WAAW;QACtB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CACtC,CAAC,CAAC,EAAE,EAAE;QACL,uCAAuC;QACvC,CAAC,KAAK,OAAO;YACb,sEAAsE;YACtE,CAAC,KAAK,mBAAmB;YACzB,wEAAwE;YACxE,CAAC,KAAK,oBAAoB;YAC1B,2BAA2B;YAC3B,CAAC,KAAK,MAAM;YACZ,+BAA+B;YAC/B,CAAC,KAAK,UAAU,CACjB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,GAAa;QAC1B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QAEhG,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,WAAW;QACX,IAAI,GAAG,CAAC,QAAQ;YAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEnF,oCAAoC;QACpC,IAAI,SAAS,CAAC,GAAG,CAAC;YAAE,OAAO,QAAQ,CAAC;QAEpC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE/B,oBAAoB;QACpB,IAAI,CAAC,KAAK,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YACjB,OAAO,yBAAyB,IAAI,QAAQ,CAAC;QAC9C,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YACjB,OAAO,IAAI,OAAO,IAAI,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,cAAc,IAAI;2BAC7C,IAAI,aAAa,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC;IAC5E,OAAO,GAAG,CAAC;QACb,CAAC;QAED,iEAAiE;QACjE,EAAE;QACF,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,GAAG,IAAI,WAAW,CAAC;YAC/B,MAAM,GAAG,GACR,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,WAAW,CAAC;YAClG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YACjB,MAAM,GAAG,+BAA+B,GAAG,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;QAC5G,CAAC;aAAM,CAAC;YACP,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;gBACjB,MAAM,GAAG,0BAA0B,IAAI,KAAK,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACP,MAAM,GAAG,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;YACnD,CAAC;QACF,CAAC;QAED,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IACC,GAAG,CAAC,IAAI,CAAC,MAAM;YACf,uBAAuB,IAAI,GAAG;YAC9B,CAAC,CAAC,GAAG,CAAC,qBAAqB;YAC3B,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,EAChC,CAAC;YACF,aAAa,GAAG,IAAI,CAAC;YACrB,MAAM,IAAI,SAAS,GAAG,CAAC,IAAI,IAAI,CAAC;QACjC,CAAC;QAED,MAAM,IAAI,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAEvD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,2CAA2C;YAC3C,MAAM,IAAI;QACL,QAAQ;UACN,OAAO,GAAG,CAAC;QACnB,CAAC;aAAM,CAAC;YACP,2BAA2B;YAC3B,MAAM,IAAI,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,mBAAmB,CAAC,GAAa,EAAE,QAAQ,GAAG,KAAK;QAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEzD,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAE1B,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YAE9B,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBACpB,IAAI,QAAQ;oBAAE,SAAS;gBACvB,gBAAgB,IAAI,SAAS,KAAK,IAAI,CAAC;gBACvC,SAAS;YACV,CAAC;YAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACpB,iCAAiC;gBACjC,gBAAgB,IAAI,GAAG,GAAG,GAAG,CAAC;gBAC9B,SAAS;YACV,CAAC;YAED,gBAAgB,IAAI,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC;QAC5C,CAAC;QAED,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAEO,OAAO,CAAC,GAAa;QAC5B,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEhE,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACzB,IAAI,GAAG,OAAO,CAAC;YACf,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;QAED,IAAI,IAAI,KAAK,mBAAmB;YAAE,IAAI,GAAG,mBAAmB,CAAC;QAC7D,IAAI,IAAI,KAAK,oBAAoB;YAAE,IAAI,GAAG,oBAAoB,CAAC;QAE/D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACb,CAAC;IAED;;;;OAIG;IACK,sBAAsB,CAAC,IAAY;QAC1C,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACzB,OAAO,cAAc,CAAC;QACvB,CAAC;QAED,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,IAAI,KAAK,mBAAmB,EAAE,CAAC;YAClC,OAAO,yBAAyB,CAAC;QAClC,CAAC;QAED,IAAI,IAAI,KAAK,oBAAoB,EAAE,CAAC;YACnC,OAAO,0BAA0B,CAAC;QACnC,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAChE,OAAO,OAAO,SAAS,EAAE,CAAC;IAC3B,CAAC;CACD;AA9ND,kCA8NC"}
|
|
File without changes
|