@yuuvis/client-cli 18.1.0 → 18.1.2

package/schematics/tasks/update-app-routes.d.ts

@@ -1,3 +1,3 @@
 import { Rule } from "@angular-devkit/schematics";
 import { AppManifest } from "../app-manifest";
-export declare function updateAppRoutes(options: any, appManifest: AppManifest): Rule;
+export declare function updateAppRoutes(appName: string, appManifest: AppManifest): Rule;

package/schematics/tasks/update-app-routes.js

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,9 +17,12 @@ const typescript_1 = __importDefault(require("typescript"));
 const schematics_1 = require("@angular-devkit/schematics");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
-function updateAppRoutes(options, appManifest) {
-    return (tree) => {
-        const filePath = `./src/app/app.routes.ts`;
+const project_metadata_1 = require("../project-metadata");
+const utils_1 = require("../utils");
+function updateAppRoutes(appName, appManifest) {
+    return (tree, context) => __awaiter(this, void 0, void 0, function* () {
+        const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
+        const filePath = (0, utils_1.buildPath)(project.sourceRoot, 'app', 'app.routes.ts');
         if (!appManifest.ui) {
             throw new schematics_1.SchematicsException(`App manifest has no ui defined.`);
         }
@@ -20,11 +32,11 @@ function updateAppRoutes(options, appManifest) {
       title: '${appManifest.title}',
       path: '${appManifest.ui.path}',
       icon: '${appManifest.ui.icon}',
-      loadChildren: () => import('${options.name}').then((m) => m.${schematics_1.strings.classify(options.componentName)}Routes)
+      loadChildren: () => import('${appName}').then((m) => m.${appManifest.ui.routes})
     }
     `;
         if (!tree.exists(filePath)) {
-            throw new schematics_1.SchematicsException(`Cannot find ${filePath} to register the app ${options.name}.`);
+            throw new schematics_1.SchematicsException(`Cannot find ${filePath} to register the app ${appName}.`);
         }
         const fileBuffer = tree.read(filePath);
         if (!fileBuffer) {
@@ -44,11 +56,30 @@ function updateAppRoutes(options, appManifest) {
         if (!appsArrayNode || !typescript_1.default.isArrayLiteralExpression(appsArrayNode)) {
             throw new schematics_1.SchematicsException(`'apps' is not an array in ${filePath}`);
         }
+        if (hasAppWithProperty(appsArrayNode, 'id', appManifest.id)) {
+            throw new schematics_1.SchematicsException(`App with id '${appManifest.id}' is already registered in ${filePath}`);
+        }
+        const routeAlreadyRegistered = hasAppWithProperty(appsArrayNode, 'path', appManifest.ui.path);
         const insertPosition = appsArrayNode.elements.end;
         const change = new change_1.InsertChange(filePath, insertPosition, `${appsArrayNode.elements.length > 0 ? "," : ""} ${appConfig}`);
         (0, change_1.applyToUpdateRecorder)(recorder, [change]);
         tree.commitUpdate(recorder);
+        if (routeAlreadyRegistered) {
+            context.logger.warn(`Duplicate app path '${appManifest.ui.path}' in ${filePath}. Only one app per path is accessible via the router. Please use unique paths.`);
+        }
         return tree;
-    };
+    });
+}
+function hasAppWithProperty(arrayNode, propertyName, propertyValue) {
+    return arrayNode.elements.some((element) => {
+        if (!typescript_1.default.isObjectLiteralExpression(element)) {
+            return false;
+        }
+        return element.properties.some((property) => typescript_1.default.isPropertyAssignment(property) &&
+            typescript_1.default.isIdentifier(property.name) &&
+            property.name.text === propertyName &&
+            typescript_1.default.isStringLiteral(property.initializer) &&
+            property.initializer.text === propertyValue);
+    });
 }
 //# sourceMappingURL=update-app-routes.js.map

package/schematics/tasks/update-app-routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-app-routes.ts"],"names":[],"mappings":";;;;;AAMA,0CAsDC;AA5DD,4DAA4B;AAC5B,2DAAsF;AACtF,qEAAkE;AAClE,+DAAyF;AAGzF,SAAgB,eAAe,CAAC,OAAY,EAAE,WAAwB;IACpE,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,QAAQ,GAAG,yBAAyB,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,gCAAmB,CAAC,iCAAiC,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,SAAS,GAAG;;aAET,WAAW,CAAC,EAAE;gBACX,WAAW,CAAC,KAAK;eAClB,WAAW,CAAC,EAAE,CAAC,IAAI;eACnB,WAAW,CAAC,EAAE,CAAC,IAAI;oCACE,OAAO,CAAC,IAAI,oBAAoB,oBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;;KAEtG,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,gCAAmB,CAAC,eAAe,QAAQ,wBAAwB,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;QAChG,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,gCAAmB,CAAC,kBAAkB,QAAQ,GAAG,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,oBAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,oBAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAExF,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE5C,yBAAyB;QACzB,MAAM,kBAAkB,GAAG,IAAA,qBAAS,EAAC,UAAU,EAAE,oBAAE,CAAC,UAAU,CAAC,iBAAiB,CAA2B,CAAC;QAC5G,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,IAAsB,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;QAE3I,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,gCAAmB,CAAC,qCAAqC,QAAQ,EAAE,CAAC,CAAC;QACjF,CAAC;QAED,2BAA2B;QAC3B,MAAM,aAAa,GAAG,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QAC/E,IAAI,CAAC,aAAa,IAAI,CAAC,oBAAE,CAAC,wBAAwB,CAAC,aAAa,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,gCAAmB,CAAC,6BAA6B,QAAQ,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC;QAElD,MAAM,MAAM,GAAG,IAAI,qBAAY,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,SAAS,EAAE,CAAC,CAAC;QAE1H,IAAA,8BAAqB,EAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-app-routes.ts"],"names":[],"mappings":"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"}

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

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+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.updateLibraryComponent = updateLibraryComponent;
 const core_1 = require("@angular-devkit/core");
@@ -30,10 +39,14 @@ const change_1 = require("@schematics/angular/utility/change");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const ts = __importStar(require("typescript"));
 const schematics_util_1 = require("../schematics-util");
+const project_metadata_1 = require("../project-metadata");
+const utils_1 = require("../utils");
 function updateLibraryComponent(options) {
-    return (tree) => {
+    return (tree) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const filePath = `${options.libraryRoot}/src/lib/${core_1.strings.dasherize(options.componentName)}.component.ts`;
+        const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
+        const librarySourceRoot = yield project.getLibrarySourceRoot(options.name);
+        const filePath = (0, utils_1.buildPath)(librarySourceRoot, 'lib', `${core_1.strings.dasherize(options.componentName)}.component.ts`);
         if (!tree.exists(filePath)) {
             console.warn(`Cannot find the file ${filePath} to append content.`);
             return tree;
@@ -80,6 +93,6 @@ function updateLibraryComponent(options) {
         (0, schematics_util_1.addInlineTemplate)(recorder, componentDecorator, newTemplate);
         tree.commitUpdate(recorder);
         return tree;
-    };
+    });
 }
 //# sourceMappingURL=update-library-component.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"update-library-component.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-library-component.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-library-component.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-library-component.ts"],"names":[],"mappings":"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"}

package/schematics/tasks/update-library-public-api.js

@@ -1,11 +1,24 @@
 "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.updateLibraryPublicApi = updateLibraryPublicApi;
 const schematics_1 = require("@angular-devkit/schematics");
+const project_metadata_1 = require("../project-metadata");
+const utils_1 = require("../utils");
 function updateLibraryPublicApi(options) {
-    return (tree) => {
+    return (tree) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const filePath = `${options.libraryRoot}/src/public-api.ts`;
+        const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
+        const librarySourceRoot = yield project.getLibrarySourceRoot(options.name);
+        const filePath = (0, utils_1.buildPath)(librarySourceRoot, 'public-api.ts');
         const exportStatement = `export * from './lib/lib.routes';`;
         if (!tree.exists(filePath)) {
             throw new schematics_1.SchematicsException(`Cannot find the file ${filePath} to append content.`);
@@ -20,6 +33,6 @@ function updateLibraryPublicApi(options) {
         recorder.insertRight(content.length, `\n${exportStatement}\n`);
         tree.commitUpdate(recorder);
         return tree;
-    };
+    });
 }
 //# sourceMappingURL=update-library-public-api.js.map

package/schematics/tasks/update-library-public-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-library-public-api.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-library-public-api.ts"],"names":[],"mappings":";;AAEA,wDAuBC;AAzBD,2DAA+F;AAE/F,SAAgB,sBAAsB,CAAC,OAAY;IACjD,OAAO,CAAC,IAAU,EAAE,EAAE;;QACpB,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,WAAW,oBAAoB,CAAC;QAC5D,MAAM,eAAe,GAAG,mCAAmC,CAAC;QAE5D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,gCAAmB,CAAC,wBAAwB,QAAQ,qBAAqB,CAAC,CAAC;QACvF,CAAC;QAED,IAAI,OAAO,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAE1B,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,gCAAmB,CAAC,mCAAmC,QAAQ,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,eAAe,IAAI,CAAC,CAAC;QAE/D,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"update-library-public-api.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-library-public-api.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA,wDAyBC;AA7BD,2DAA+F;AAC/F,0DAAsD;AACtD,oCAAqC;AAErC,SAAgB,sBAAsB,CAAC,OAAY;IACjD,OAAO,CAAO,IAAU,EAAE,EAAE;;QAC1B,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,IAAA,iBAAS,EAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;QAC/D,MAAM,eAAe,GAAG,mCAAmC,CAAC;QAE5D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,gCAAmB,CAAC,wBAAwB,QAAQ,qBAAqB,CAAC,CAAC;QACvF,CAAC;QAED,IAAI,OAAO,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAE1B,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,gCAAmB,CAAC,mCAAmC,QAAQ,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,eAAe,IAAI,CAAC,CAAC;QAE/D,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAA,CAAC;AACJ,CAAC"}

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,13 @@
+export interface ParsedPackageName {
+    namespace: string | null;
+    libraryName: string;
+    libraryFullName: string;
+    shortName: string;
+    lastPart: string;
+    version: string | null;
+    major: string | null;
+    minor: string | null;
+}
 export declare function getLibraryPathFromName(libraryName: string): string;
-export declare function extractNamesFromPackageName(name: string): [string, string, string];
+export declare function parsePackageName(input: string): ParsedPackageName;
+export declare function buildPath(...pathParts: string[]): string;

package/schematics/utils.js

@@ -1,18 +1,74 @@
 "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.parsePackageName = parsePackageName;
+exports.buildPath = buildPath;
+const path_1 = __importDefault(require("path"));
 const constants_1 = require("./constants");
+const schematics_1 = require("@angular-devkit/schematics");
 function getLibraryPathFromName(libraryName) {
-    if (libraryName.startsWith("@")) {
-        const [namespace, lib, _] = extractNamesFromPackageName(libraryName);
-        return `${constants_1.APP_BASE_PATH}/${namespace}/${lib}`;
+    const parsedPackageName = parsePackageName(libraryName);
+    const namespace = parsedPackageName.namespace ? `${parsedPackageName.namespace}/` : '';
+    return `${constants_1.APP_BASE_PATH}/${namespace}${parsedPackageName.libraryName}`;
+}
+function parsePackageName(input) {
+    input = input.trim();
+    let namespace = null;
+    let libraryName;
+    let libraryFullName;
+    let shortName;
+    let lastPart;
+    let version = null;
+    let major = null;
+    let minor = null;
+    // split to full name and version
+    libraryFullName = input;
+    if (input.startsWith('@')) {
+        const secondAt = input.indexOf('@', 1);
+        if (secondAt !== -1) {
+            libraryFullName = input.substring(0, secondAt);
+            version = input.substring(secondAt + 1);
+        }
+    }
+    else {
+        const lastAt = input.lastIndexOf('@');
+        if (lastAt !== -1) {
+            libraryFullName = input.substring(0, lastAt);
+            version = input.substring(lastAt + 1);
+        }
+    }
+    // extract namespcase and library name
+    if (libraryFullName.startsWith('@')) {
+        const [ns, lib] = libraryFullName.split('/', 2);
+        if (!lib || (libraryFullName.match(/\//g) || []).length !== 1)
+            throw new schematics_1.SchematicsException(`Invalid scoped package name: "${input}"`);
+        namespace = ns.slice(1);
+        libraryName = lib;
+    }
+    else {
+        libraryName = libraryFullName;
+    }
+    if (!libraryName) {
+        throw new schematics_1.SchematicsException(`Invalid package name: "${input}"`);
+    }
+    // get last part of the library name
+    const parts = libraryName.split('-');
+    shortName = parts.length > 1 && parts[0] === 'app' ? parts.slice(1).join('-') : parts.slice(-1)[0];
+    lastPart = parts[parts.length - 1];
+    // extract major and minor version
+    if (version) {
+        const match = /^(\d+)(?:\.(\d+))?/.exec(version);
+        if (match) {
+            major = match[1];
+            minor = match[2] ? `${match[1]}.${match[2]}` : `${match[1]}`;
+        }
     }
-    return `${constants_1.APP_BASE_PATH}/${libraryName}`;
+    return { namespace, libraryName, libraryFullName, shortName, lastPart, version, major, minor };
 }
-function extractNamesFromPackageName(name) {
-    const [namespace = "", libraryName = name] = name.startsWith("@") ? name.split("/", 2) : ["", name];
-    const shortName = libraryName.includes("-") ? libraryName.split("-").pop() || "" : libraryName;
-    return [namespace.slice(1), libraryName, shortName];
+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":"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"}