@yuuvis/client-cli 18.1.0 → 18.1.1

package/schematics/tasks/update-library-tsconfig.js

@@ -1,11 +1,25 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateLibraryTsConfig = updateLibraryTsConfig;
 const schematics_1 = require("@angular-devkit/schematics");
+const project_metadata_1 = require("../project-metadata");
+const utils_1 = require("../utils");
 function updateLibraryTsConfig(options) {
-    return (tree) => {
+    return (tree) => __awaiter(this, void 0, void 0, function* () {
         try {
-            const tsconfigBuffer = tree.read('./tsconfig.json');
+            const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
+            const librarySourceRoot = yield project.getLibrarySourceRoot(options.name);
+            const filePath = (0, utils_1.buildPath)(project.projectRoot, 'tsconfig.json');
+            const tsconfigBuffer = tree.read(filePath);
             if (!tsconfigBuffer) {
                 throw new schematics_1.SchematicsException('tsconfig.json not found');
             }
@@ -18,14 +32,14 @@ function updateLibraryTsConfig(options) {
             parsedTsconfig.compilerOptions = parsedTsconfig.compilerOptions || {};
             parsedTsconfig.compilerOptions.paths = parsedTsconfig.compilerOptions.paths || {};
             parsedTsconfig.compilerOptions.paths[options.name] = [
-                `./${options.libraryRoot}/src/public-api.ts`
+                `./${librarySourceRoot}/public-api.ts`
             ];
-            tree.overwrite('./tsconfig.json', `${comment}\n${JSON.stringify(parsedTsconfig, null, 2)}\n`);
+            tree.overwrite(filePath, `${comment}\n${JSON.stringify(parsedTsconfig, null, 2)}\n`);
             return tree;
         }
         catch (error) {
-            throw new schematics_1.SchematicsException(`Failed to parse tsconfig.json as JSON AST Object.`);
+            throw new schematics_1.SchematicsException(`Failed to parse tsconfig.json as JSON AST Object. ${error}`);
         }
-    };
+    });
 }
 //# sourceMappingURL=update-library-tsconfig.js.map

package/schematics/tasks/update-library-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-library-tsconfig.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-library-tsconfig.ts"],"names":[],"mappings":";;AAEA,sDA8BC;AAhCD,2DAA6E;AAE7E,SAAgB,qBAAqB,CAAC,OAAY;IAChD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACpD,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,gCAAmB,CAAC,yBAAyB,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,UAAU,GAAW,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACjD,MAAM,QAAQ,GAAW,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAEnD,MAAM,OAAO,GAAW,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;YACjE,MAAM,QAAQ,GAAW,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;YAEtE,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAE5C,cAAc,CAAC,eAAe,GAAG,cAAc,CAAC,eAAe,IAAI,EAAE,CAAC;YACtE,cAAc,CAAC,eAAe,CAAC,KAAK,GAAG,cAAc,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC;YAElF,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;gBACnD,KAAK,OAAO,CAAC,WAAW,oBAAoB;aAC7C,CAAC;YAEF,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,OAAO,KAAK,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAE9F,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,gCAAmB,CAAC,mDAAmD,CAAC,CAAC;QACrF,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"update-library-tsconfig.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-library-tsconfig.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA,sDAiCC;AArCD,2DAA6E;AAC7E,0DAAsD;AACtD,oCAAqC;AAErC,SAAgB,qBAAqB,CAAC,OAAY;IAChD,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC3E,MAAM,QAAQ,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YAEjE,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,gCAAmB,CAAC,yBAAyB,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,UAAU,GAAW,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACjD,MAAM,QAAQ,GAAW,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACnD,MAAM,OAAO,GAAW,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;YACjE,MAAM,QAAQ,GAAW,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;YAEtE,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAE5C,cAAc,CAAC,eAAe,GAAG,cAAc,CAAC,eAAe,IAAI,EAAE,CAAC;YACtE,cAAc,CAAC,eAAe,CAAC,KAAK,GAAG,cAAc,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC;YAElF,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;gBACnD,KAAK,iBAAiB,gBAAgB;aACvC,CAAC;YAEF,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,OAAO,KAAK,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAErF,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,gCAAmB,CAAC,qDAAqD,KAAK,EAAE,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC,CAAA,CAAC;AACJ,CAAC"}

package/schematics/tasks/update-package-json.d.ts

@@ -1,2 +1,2 @@
 import { Rule } from "@angular-devkit/schematics";
-export default function updatePackageJson(options: any): Rule;
+export default function updatePackageJson(packageJsonPath: string, extObj: any): Rule;

package/schematics/tasks/update-package-json.js

@@ -1,24 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = updatePackageJson;
-function updatePackageJson(options) {
-    return (tree, context) => {
-        const packageJsonPath = `${options.name}/package.json`;
+function updatePackageJson(packageJsonPath, extObj) {
+    return (tree) => {
         if (tree.exists(packageJsonPath)) {
             const packageJsonBuffer = tree.read(packageJsonPath);
             if (packageJsonBuffer) {
                 const packageJson = JSON.parse(packageJsonBuffer.toString());
                 packageJson.dependencies = packageJson.dependencies || {};
-                packageJson.dependencies['@yuuvis/client-shell'] = `${options.shellVersion}`;
-                packageJson.devDependencies['@colsen1991/ngx-translate-extract-marker'] = '^2.0.8';
-                packageJson.devDependencies['@vendure/ngx-translate-extract'] = '^9.4.0';
-                packageJson.scripts['prestart'] = 'npm run i18n:collect';
-                packageJson.scripts['start'] = 'ng serve --proxy-config proxy.config.js';
-                packageJson.scripts['i18n:collect'] = 'node ./scripts/i18n-collect.js';
-                packageJson.scripts['i18n:extract'] = 'node ./scripts/i18n-extract.js';
-                packageJson.dependencies = Object.fromEntries(Object.entries(packageJson.dependencies).sort());
-                packageJson.devDependencies = Object.fromEntries(Object.entries(packageJson.devDependencies).sort());
-                packageJson.scripts = Object.fromEntries(Object.entries(packageJson.scripts).sort());
+                if (extObj.dependencies) {
+                    packageJson.dependencies = packageJson.dependencies || {};
+                    packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), extObj.dependencies);
+                    packageJson.dependencies = Object.fromEntries(Object.entries(packageJson.dependencies).sort());
+                }
+                if (extObj.devDependencies) {
+                    packageJson.devDependencies = packageJson.devDependencies || {};
+                    packageJson.devDependencies = Object.assign(Object.assign({}, packageJson.devDependencies), extObj.devDependencies);
+                    packageJson.devDependencies = Object.fromEntries(Object.entries(packageJson.devDependencies).sort());
+                }
+                if (extObj.scripts) {
+                    packageJson.scripts = packageJson.scripts || {};
+                    packageJson.scripts = Object.assign(Object.assign({}, packageJson.scripts), extObj.scripts);
+                    packageJson.scripts = Object.fromEntries(Object.entries(packageJson.scripts).sort());
+                }
                 tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
             }
         }

package/schematics/tasks/update-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-package-json.ts"],"names":[],"mappings":";;AAEA,oCAwBC;AAxBD,SAAwB,iBAAiB,CAAC,OAAY;IACpD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,eAAe,GAAG,GAAG,OAAO,CAAC,IAAI,eAAe,CAAC;QACvD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACrD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC7D,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;gBAC1D,WAAW,CAAC,YAAY,CAAC,sBAAsB,CAAC,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC7E,WAAW,CAAC,eAAe,CAAC,0CAA0C,CAAC,GAAG,QAAQ,CAAC;gBACnF,WAAW,CAAC,eAAe,CAAC,gCAAgC,CAAC,GAAG,QAAQ,CAAC;gBACzE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,sBAAsB,CAAC;gBACzD,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,yCAAyC,CAAC;gBACzE,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,gCAAgC,CAAC;gBACvE,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,gCAAgC,CAAC;gBAEvE,WAAW,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC/F,WAAW,CAAC,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACrG,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACrF,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-package-json.ts"],"names":[],"mappings":";;AAEA,oCAwCC;AAxCD,SAAwB,iBAAiB,CAAC,eAAuB,EAAE,MAAW;IAC5E,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACrD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC7D,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;gBAE1D,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;oBACxB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;oBAC1D,WAAW,CAAC,YAAY,mCACnB,WAAW,CAAC,YAAY,GACxB,MAAM,CAAC,YAAY,CACvB,CAAC;oBACF,WAAW,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACjG,CAAC;gBAED,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;oBAC3B,WAAW,CAAC,eAAe,GAAG,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;oBAChE,WAAW,CAAC,eAAe,mCACtB,WAAW,CAAC,eAAe,GAC3B,MAAM,CAAC,eAAe,CAC1B,CAAC;oBACF,WAAW,CAAC,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvG,CAAC;gBAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnB,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC;oBAChD,WAAW,CAAC,OAAO,mCACd,WAAW,CAAC,OAAO,GACnB,MAAM,CAAC,OAAO,CAClB,CAAC;oBACF,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvF,CAAC;gBAED,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC"}

package/schematics/utils.d.ts

@@ -1,2 +1,17 @@
+export interface PackageSpecifier {
+    name: string;
+    version?: string;
+}
 export declare function getLibraryPathFromName(libraryName: string): string;
 export declare function extractNamesFromPackageName(name: string): [string, string, string];
+/**
+ * Splits an NPM package specifier into name and version.
+ *
+ * Examples:
+ * - "mylib"                         => { name: "mylib", version: undefined }
+ * - "mylib@1.2.3"                  => { name: "mylib", version: "1.2.3" }
+ * - "@scope/mylib@latest"         => { name: "@scope/mylib", version: "latest" }
+ * - "@scope/mylib"                => { name: "@scope/mylib", version: undefined }
+ */
+export declare function parsePackageSpecifier(specifier: string): PackageSpecifier;
+export declare function buildPath(...pathParts: string[]): string;

package/schematics/utils.js

@@ -1,7 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLibraryPathFromName = getLibraryPathFromName;
 exports.extractNamesFromPackageName = extractNamesFromPackageName;
+exports.parsePackageSpecifier = parsePackageSpecifier;
+exports.buildPath = buildPath;
+const path_1 = __importDefault(require("path"));
 const constants_1 = require("./constants");
 function getLibraryPathFromName(libraryName) {
     if (libraryName.startsWith("@")) {
@@ -15,4 +21,38 @@ function extractNamesFromPackageName(name) {
     const shortName = libraryName.includes("-") ? libraryName.split("-").pop() || "" : libraryName;
     return [namespace.slice(1), libraryName, shortName];
 }
+/**
+ * Splits an NPM package specifier into name and version.
+ *
+ * Examples:
+ * - "mylib"                         => { name: "mylib", version: undefined }
+ * - "mylib@1.2.3"                  => { name: "mylib", version: "1.2.3" }
+ * - "@scope/mylib@latest"         => { name: "@scope/mylib", version: "latest" }
+ * - "@scope/mylib"                => { name: "@scope/mylib", version: undefined }
+ */
+function parsePackageSpecifier(specifier) {
+    // Scoped packages start with "@", e.g. "@scope/pkg"
+    if (specifier.startsWith('@')) {
+        const secondAtIndex = specifier.indexOf('@', 1); // skip the "@" in "@scope"
+        if (secondAtIndex === -1) {
+            return { name: specifier };
+        }
+        return {
+            name: specifier.substring(0, secondAtIndex),
+            version: specifier.substring(secondAtIndex + 1),
+        };
+    }
+    // Unscoped package, version is after last "@"
+    const atIndex = specifier.lastIndexOf('@');
+    if (atIndex === -1) {
+        return { name: specifier };
+    }
+    return {
+        name: specifier.substring(0, atIndex),
+        version: specifier.substring(atIndex + 1),
+    };
+}
+function buildPath(...pathParts) {
+    return path_1.default.join(...pathParts);
+}
 //# sourceMappingURL=utils.js.map

package/schematics/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/schematics/utils.ts"],"names":[],"mappings":";;AAEA,wDAMC;AAED,kEAIC;AAdD,2CAA4C;AAE5C,SAAgB,sBAAsB,CAAC,WAAmB;IACxD,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAC;QACrE,OAAO,GAAG,yBAAa,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;IAChD,CAAC;IACD,OAAO,GAAG,yBAAa,IAAI,WAAW,EAAE,CAAC;AAC3C,CAAC;AAED,SAAgB,2BAA2B,CAAC,IAAY;IACtD,MAAM,CAAC,SAAS,GAAG,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACpG,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/F,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/schematics/utils.ts"],"names":[],"mappings":";;;;;AAQA,wDAMC;AAED,kEAIC;AAWD,sDAuBC;AAED,8BAGC;AA3DD,gDAAwB;AACxB,2CAA4C;AAO5C,SAAgB,sBAAsB,CAAC,WAAmB;IACxD,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAC;QACrE,OAAO,GAAG,yBAAa,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;IAChD,CAAC;IACD,OAAO,GAAG,yBAAa,IAAI,WAAW,EAAE,CAAC;AAC3C,CAAC;AAED,SAAgB,2BAA2B,CAAC,IAAY;IACtD,MAAM,CAAC,SAAS,GAAG,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACpG,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/F,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AACtD,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CAAC,SAAiB;IACrD,oDAAoD;IACpD,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,2BAA2B;QAC5E,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7B,CAAC;QACD,OAAO;YACL,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC;YAC3C,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC;SAChD,CAAC;IACJ,CAAC;IAED,8CAA8C;IAC9C,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC;QACrC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED,SAAgB,SAAS,CAAC,GAAG,SAAmB;IAC9C,OAAO,cAAI,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;AAEjC,CAAC"}