@rxap/plugin-library 16.1.0-dev.9 → 16.2.0-dev.0

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.2.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0...@rxap/plugin-library@16.2.0-dev.0) (2024-05-27)
+
+### Features
+
+- **plugin-library:** enhance update-package-group executor functionality ([38f76c6](https://gitlab.com/rxap/packages/commit/38f76c6e3c628711a7617484925d024a445b840d))
+
+# [16.1.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.12...@rxap/plugin-library@16.1.0) (2024-04-17)
+
+**Note:** Version bump only for package @rxap/plugin-library
+
+# [16.1.0-dev.12](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.11...@rxap/plugin-library@16.1.0-dev.12) (2024-04-10)
+
+### Features
+
+- add format files ([672c753](https://gitlab.com/rxap/packages/commit/672c7533b8b0248d19c9dc2ad4a203c482cfd9ae))
+
+# [16.1.0-dev.11](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.10...@rxap/plugin-library@16.1.0-dev.11) (2024-04-09)
+
+### Features
+
+- serialize the generator options ([e781286](https://gitlab.com/rxap/packages/commit/e78128606eaac8a0dd7168f568e9aa7a3fa710e8))
+
+# [16.1.0-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.9...@rxap/plugin-library@16.1.0-dev.10) (2024-04-07)
+
+### Bug Fixes
+
+- only set license if not defined ([bdfd74b](https://gitlab.com/rxap/packages/commit/bdfd74b6f00a794687782d6bc6d1d0e46cdf75d3))
+
+### Features
+
+- add index-export option ([801b4a4](https://gitlab.com/rxap/packages/commit/801b4a42034defa9bfe00683c71a04e859063ad0))
+
 # [16.1.0-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.8...@rxap/plugin-library@16.1.0-dev.9) (2024-03-31)
 
 **Note:** Version bump only for package @rxap/plugin-library

package/README.md

@@ -19,7 +19,7 @@ yarn add @rxap/plugin-library
 ```
 **Install peer dependencies:**
 ```bash
-yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.2-dev.0 @rxap/node-utilities@^1.2.0-dev.1 @rxap/plugin-utilities@^16.1.1-dev.4 @rxap/ts-morph@^1.1.0-dev.22 @rxap/utilities@^16.1.0-dev.8 @rxap/workspace-utilities@^16.1.0-dev.5 nx@^16.5.0 ts-morph@^18.0.0 tslib@2.6.2 
+yarn add @nx/devkit@^16.10.0 @rxap/generator-ts-morph@^1.0.2 @rxap/node-utilities@^1.2.0 @rxap/plugin-utilities@^16.4.0-dev.0 @rxap/ts-morph@^1.2.0-dev.0 @rxap/utilities@^16.2.0-dev.1 @rxap/workspace-utilities@^16.3.0-dev.1 nx@^16.10.0 ts-morph@^18.0.0 tslib@2.6.2 
 ```
 **Execute the init generator:**
 ```bash

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.1.0-dev.9",
+  "version": "16.2.0-dev.0",
   "name": "@rxap/plugin-library",
   "license": "GPL-3.0-or-later",
   "dependencies": {
@@ -13,17 +13,17 @@
     "yaml": "2.3.1"
   },
   "peerDependencies": {
-    "@nx/devkit": "^16.5.0",
-    "@rxap/generator-ts-morph": "^1.0.2-dev.0",
-    "@rxap/node-utilities": "^1.2.0-dev.1",
-    "@rxap/plugin-utilities": "^16.1.1-dev.4",
-    "@rxap/ts-morph": "^1.1.0-dev.22",
-    "@rxap/utilities": "^16.1.0-dev.8",
-    "@rxap/workspace-utilities": "^16.1.0-dev.5",
-    "nx": "^16.5.0",
+    "@nx/devkit": "^16.10.0",
+    "@rxap/generator-ts-morph": "^1.0.2",
+    "@rxap/node-utilities": "^1.2.0",
+    "@rxap/plugin-utilities": "^16.4.0-dev.0",
+    "@rxap/ts-morph": "^1.2.0-dev.0",
+    "@rxap/utilities": "^16.2.0-dev.1",
+    "@rxap/workspace-utilities": "^16.3.0-dev.1",
+    "nx": "^16.10.0",
     "ts-morph": "^18.0.0",
     "tslib": "2.6.2",
-    "@rxap/workspace-ts-morph": "16.0.2-dev.2"
+    "@rxap/workspace-ts-morph": "16.1.1-dev.0"
   },
   "author": {
     "name": "Merzough Münker",
@@ -46,44 +46,36 @@
   "nx-migrations": {
     "packageGroup": [
       {
-        "package": "@rxap/generator-ts-morph",
-        "version": "1.0.2-dev.0"
+        "package": "@nx/devkit",
+        "version": "16.10.0"
       },
       {
-        "package": "@rxap/generator-utilities",
-        "version": "1.1.1-dev.1"
+        "package": "@rxap/generator-ts-morph",
+        "version": "1.0.2"
       },
       {
         "package": "@rxap/node-utilities",
-        "version": "1.2.0-dev.1"
-      },
-      {
-        "package": "@rxap/plugin-angular",
-        "version": "16.1.1-dev.1"
-      },
-      {
-        "package": "@rxap/plugin-nestjs",
-        "version": "16.2.0-dev.0"
+        "version": "1.2.0"
       },
       {
         "package": "@rxap/plugin-utilities",
-        "version": "16.1.1-dev.4"
-      },
-      {
-        "package": "@rxap/schematics-utilities",
-        "version": "16.0.0-dev.4"
+        "version": "16.4.0-dev.0"
       },
       {
         "package": "@rxap/ts-morph",
-        "version": "1.1.0-dev.22"
+        "version": "1.2.0-dev.0"
       },
       {
         "package": "@rxap/utilities",
-        "version": "16.1.0-dev.8"
+        "version": "16.2.0-dev.1"
+      },
+      {
+        "package": "@rxap/workspace-ts-morph",
+        "version": "16.1.0"
       },
       {
         "package": "@rxap/workspace-utilities",
-        "version": "16.1.0-dev.5"
+        "version": "16.3.0-dev.1"
       }
     ]
   },
@@ -98,7 +90,6 @@
   },
   "schematics": "./generators.json",
   "type": "commonjs",
-  "gitHead": "88bb83e5ae16a958b2618d657587390058b48a3f",
-  "main": "./src/index.js",
-  "types": "./src/index.d.ts"
+  "gitHead": "ca2e1999cd330fd3c1a07a2b2471a36567dab3e9",
+  "main": "./src/index.js"
 }

package/src/executors/update-package-group/executor.d.ts

@@ -1,5 +1,5 @@
-import { UpdatePackageGroupExecutorSchema } from './schema';
 import { ExecutorContext } from '@nx/devkit';
+import { UpdatePackageGroupExecutorSchema } from './schema';
 export default function runExecutor(options: UpdatePackageGroupExecutorSchema, context: ExecutorContext): Promise<{
     success: boolean;
 }>;

package/src/executors/update-package-group/executor.js

@@ -1,22 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const package_json_1 = require("nx/src/utils/package-json");
 const plugin_utilities_1 = require("@rxap/plugin-utilities");
-function getPackageGroup(context) {
-    const directPackageDependencies = (0, plugin_utilities_1.getDirectPackageDependenciesForProject)(context);
-    return Object.entries(directPackageDependencies)
-        .filter(([packageName]) => packageName.startsWith('@rxap/'))
+const package_json_1 = require("nx/src/utils/package-json");
+function normalizePackageVersion(version) {
+    return version.replace(/[\^~>=<]/g, '');
+}
+function convertToPackageGroup(input, packageGroupRegex) {
+    return Object.entries(input)
+        .filter(([packageName]) => packageGroupRegex.some(regex => regex.test(packageName)))
         .map(([packageName, version]) => ({
         package: packageName,
-        version: version,
+        version: normalizePackageVersion(version),
     }));
 }
+function getPackageGroupFromDependencies(context, packageGroupRegex) {
+    const directPackageDependencies = (0, plugin_utilities_1.GetAllPackageDependenciesForProject)(context);
+    return convertToPackageGroup(directPackageDependencies, packageGroupRegex);
+}
+function getPackageGroupFromPeerDependencies(context, packageGroupRegex) {
+    var _a;
+    const peerDependencies = (_a = (0, plugin_utilities_1.readPackageJsonForProject)(context).peerDependencies) !== null && _a !== void 0 ? _a : {};
+    return convertToPackageGroup(peerDependencies, packageGroupRegex);
+}
+function getPackageGroup(context, packageGroupRegex) {
+    return mergePackageGroup(getPackageGroupFromPeerDependencies(context, packageGroupRegex), getPackageGroupFromDependencies(context, packageGroupRegex));
+}
 function mergePackageGroup(original, updated) {
     const normalized = (0, package_json_1.normalizePackageGroup)(original);
     return [...updated, ...normalized].filter((item, index, array) => {
         return array.findIndex(({ package: packageName }) => packageName === item.package) === index;
-    }).filter(({ package: packageName }) => packageName.startsWith('@rxap/'));
+    });
 }
 function runExecutor(options, context) {
     var _a, _b;
@@ -33,8 +47,17 @@ function runExecutor(options, context) {
             console.error('INTERNAL: The nx-migrations property in the package.json is not an object');
             return { success: false };
         }
+        const packageGroupRegex = options.packageGroupRegex.map(regex => new RegExp(regex));
+        console.log(`Update package group for project ${context.projectName} with the following package group regex:`, packageGroupRegex.map(regex => regex.toString()));
+        (0, plugin_utilities_1.LoadProjectToPackageMapping)(context);
+        let packageGroup = getPackageGroup(context, packageGroupRegex);
         (_b = nxMigrations.packageGroup) !== null && _b !== void 0 ? _b : (nxMigrations.packageGroup = []);
-        nxMigrations.packageGroup = mergePackageGroup(nxMigrations.packageGroup, getPackageGroup(context));
+        if (options.merge) {
+            console.log('Merge the package group');
+            packageGroup = mergePackageGroup(nxMigrations.packageGroup, packageGroup);
+        }
+        console.log('set the package group', JSON.stringify(packageGroup, undefined, 2));
+        nxMigrations.packageGroup = packageGroup;
         (0, plugin_utilities_1.writePackageJsonFormProject)(context, packageJson);
         return {
             success: true,

package/src/executors/update-package-group/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":";;;AAEA,4DAImC;AACnC,6DAIgC;AAEhC,SAAS,eAAe,CAAC,OAAwB;IAC/C,MAAM,yBAAyB,GAAG,IAAA,yDAAsC,EAAC,OAAO,CAAC,CAAC;IAClF,OAAO,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC;SAClC,MAAM,CAAC,CAAC,CAAE,WAAW,CAAE,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;SAC7D,GAAG,CAAC,CAAC,CAAE,WAAW,EAAE,OAAO,CAAE,EAAE,EAAE,CAAC,CAAC;QAClC,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC,CAAC;AACnB,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAsB,EAAE,OAA0B;IAC3E,MAAM,UAAU,GAAG,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC;IACnD,OAAO,CAAE,GAAG,OAAO,EAAE,GAAG,UAAU,CAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACjE,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC;IAC/F,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,SAA8B,WAAW,CACvC,OAAyC,EACzC,OAAwB;;;QAIxB,MAAM,WAAW,GAAG,IAAA,4CAAyB,EAAC,OAAO,CAAC,CAAC;QAEvD,6CAA6C;QAC7C,MAAA,WAAW,CAAC,eAAe,qCAA3B,WAAW,CAAC,eAAe,IAAM,EAAE,EAAC;QAEpC,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;QAEtD,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;YAC9F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC3B;QAED,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;YACpC,OAAO,CAAC,KAAK,CAAC,2EAA2E,CAAC,CAAC;YAC3F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC3B;QAED,MAAA,YAAY,CAAC,YAAY,oCAAzB,YAAY,CAAC,YAAY,GAAK,EAAE,EAAC;QACjC,YAAY,CAAC,YAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;QAEnG,IAAA,8CAA2B,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAElD,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA/BD,8BA+BC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/update-package-group/executor.ts"],"names":[],"mappings":"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"}

package/src/executors/update-package-group/schema.d.ts

@@ -1 +1,4 @@
-export interface UpdatePackageGroupExecutorSchema {} // eslint-disable-line
+export interface UpdatePackageGroupExecutorSchema {
+  packageGroupRegex: string[];
+  merge?: boolean;
+}

package/src/executors/update-package-group/schema.json

@@ -4,6 +4,24 @@
   "title": "UpdatePackageGroup executor",
   "description": "",
   "type": "object",
-  "properties": {},
+  "properties": {
+    "packageGroupRegex": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": [
+        "@rxap\/",
+        "@angular\/",
+        "@nx\/"
+      ],
+      "description": "List of regexes to match package name that should be added to the package group"
+    },
+    "merge": {
+      "type": "boolean",
+      "default": false,
+      "description": "If true, the package group will be merged with the existing package group. If false, the package group will be replaced."
+    }
+  },
   "required": []
 }

package/src/generators/init/generator.js

@@ -24,15 +24,19 @@ function initGenerator(tree, options) {
         }
         console.log('library init generator:', options);
         (0, init_workspace_1.initWorkspace)(tree, options);
-        for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
-            if (skipProject(tree, options, project, projectName)) {
-                continue;
-            }
-            if (!options.skipProjects) {
+        if (!options.skipProjects) {
+            for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
+                if (skipProject(tree, options, project, projectName)) {
+                    continue;
+                }
+                (0, workspace_utilities_1.GenerateSerializedSchematicFile)(tree, (0, workspace_utilities_1.GetProjectRoot)(tree, projectName), '@rxap/plugin-library', 'init', (0, utilities_1.DeleteProperties)(options, ['project', 'projects', 'overwrite', 'skipProjects']));
                 yield (0, init_project_1.initProject)(tree, projectName, project, options);
                 (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
             }
         }
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
 }
 exports.initGenerator = initGenerator;

package/src/generators/init/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,+CAAmD;AACnD,mEAAkE;AAClE,iDAA6C;AAC7C,qDAAiD;AAEjD,kBAAgB;AAGhB,SAAS,WAAW,CAClB,IAAU,EACV,OAA4B,EAC5B,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;;QAC1E,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,SAAS,EAAC;QAC9B,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,EAAE,EAAC;QACxB,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,4BAAgB,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;SACvD;QACD,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBACzB,MAAM,IAAA,0BAAW,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEvD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACxD;SAEF;;CAEF;AAxBD,sCAwBC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AACpB,+CAGyB;AACzB,mEAImC;AACnC,iDAA6C;AAC7C,qDAAiD;AAEjD,kBAAgB;AAGhB,SAAS,WAAW,CAClB,IAAU,EACV,OAA4B,EAC5B,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;;QAC1E,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,SAAS,EAAC;QAC9B,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,EAAE,EAAC;QACxB,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,4BAAgB,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAE,OAAO,CAAC,OAAO,CAAE,CAAC,CAAC;SACzD;QACD,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,IAAA,qDAA+B,EAC7B,IAAI,EACJ,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,EACjC,sBAAsB,EACtB,MAAM,EACN,IAAA,4BAAgB,EAAC,OAAO,EAAE,CAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAE,CAAC,CAClF,CAAC;gBAEF,MAAM,IAAA,0BAAW,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEvD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACxD;SAEF;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CAEF;AArCD,sCAqCC;AAED,kBAAe,aAAa,CAAC"}

package/src/generators/init/init-project.js

@@ -12,7 +12,7 @@ function initProject(tree, projectName, project, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         console.log(`init library project: ${projectName}`);
         (0, update_project_tags_1.updateProjectTags)(project);
-        (0, update_project_targets_1.updateProjectTargets)(project);
+        (0, update_project_targets_1.updateProjectTargets)(project, options);
         if ((0, workspace_utilities_1.IsBuildable)(project)) {
             (0, init_project_1.initProject)(tree, projectName, project, options);
         }

package/src/generators/init/init-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init/init-project.ts"],"names":[],"mappings":";;;;AAIA,mEAImC;AACnC,iEAAqF;AACrF,8DAA+E;AAC/E,mEAAyF;AAEzF,+DAA0D;AAC1D,qEAAgE;AAEhE,SAAsB,WAAW,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAA4B;;QAC5H,OAAO,CAAC,GAAG,CAAC,yBAA0B,WAAY,EAAE,CAAC,CAAC;QAEtD,IAAA,uCAAiB,EAAC,OAAO,CAAC,CAAC;QAE3B,IAAA,6CAAoB,EAAC,OAAO,CAAC,CAAC;QAE9B,IAAI,IAAA,iCAAW,EAAC,OAAO,CAAC,EAAE;YACxB,IAAA,0BAAoB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAC3D;QAED,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YAChC,IAAA,0BAAsB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAC7D;QAED,IAAI,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;YAC5B,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAC9D;IAEH,CAAC;CAAA;AAnBD,kCAmBC"}
+{"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init/init-project.ts"],"names":[],"mappings":";;;;AAIA,mEAImC;AACnC,iEAAqF;AACrF,8DAA+E;AAC/E,mEAAyF;AAEzF,+DAA0D;AAC1D,qEAAgE;AAEhE,SAAsB,WAAW,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAA4B;;QAC5H,OAAO,CAAC,GAAG,CAAC,yBAA0B,WAAY,EAAE,CAAC,CAAC;QAEtD,IAAA,uCAAiB,EAAC,OAAO,CAAC,CAAC;QAE3B,IAAA,6CAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvC,IAAI,IAAA,iCAAW,EAAC,OAAO,CAAC,EAAE;YACxB,IAAA,0BAAoB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAC3D;QAED,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YAChC,IAAA,0BAAsB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAC7D;QAED,IAAI,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;YAC5B,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SAC9D;IAEH,CAAC;CAAA;AAnBD,kCAmBC"}

package/src/generators/init/schema.d.ts

@@ -3,4 +3,6 @@ export interface InitGeneratorSchema {
   projects?: string[];
   overwrite?: boolean;
   skipProjects?: boolean;
+  indexExport?: boolean;
+  skipFormat?: boolean;
 }

package/src/generators/init/schema.json

@@ -13,6 +13,10 @@
         "type": "string"
       }
     },
+    "skipFormat": {
+      "type": "boolean",
+      "default": false
+    },
     "overwrite": {
       "type": "boolean",
       "default": false,
@@ -22,6 +26,11 @@
       "type": "boolean",
       "default": false,
       "description": "Whether to skip executing project specific initialization"
+    },
+    "indexExport": {
+      "type": "boolean",
+      "default": true,
+      "description": "Whether to add the index-export target to the library"
     }
   },
   "required": []

package/src/generators/init/update-project-targets.d.ts

@@ -1,2 +1,3 @@
 import { ProjectConfiguration } from '@nx/devkit';
-export declare function updateProjectTargets(project: ProjectConfiguration): void;
+import { InitGeneratorSchema } from './schema';
+export declare function updateProjectTargets(project: ProjectConfiguration, options: InitGeneratorSchema): void;

package/src/generators/init/update-project-targets.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectTargets = void 0;
 const workspace_utilities_1 = require("@rxap/workspace-utilities");
-function updateProjectTargets(project) {
-    if (!(0, workspace_utilities_1.IsPluginProject)(project) && !(0, workspace_utilities_1.IsGeneratorProject)(project) && !(0, workspace_utilities_1.IsSchematicProject)(project)) {
+function updateProjectTargets(project, options) {
+    if (options.indexExport && !(0, workspace_utilities_1.IsPluginProject)(project) && !(0, workspace_utilities_1.IsGeneratorProject)(project) && !(0, workspace_utilities_1.IsSchematicProject)(project)) {
         (0, workspace_utilities_1.CoerceTarget)(project, 'index-export', {});
     }
     else {

package/src/generators/init/update-project-targets.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init/update-project-targets.ts"],"names":[],"mappings":";;;AACA,mEAKmC;AAEnC,SAAgB,oBAAoB,CAAC,OAA6B;IAEhE,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,wCAAkB,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,wCAAkB,EAAC,OAAO,CAAC,EAAE;QAC7F,IAAA,kCAAY,EAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;KAC3C;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,qEAAqE,CAAC,MAAM,CAAC,CAAC;KAC3F;AAEH,CAAC;AARD,oDAQC"}
+{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init/update-project-targets.ts"],"names":[],"mappings":";;;AACA,mEAKmC;AAGnC,SAAgB,oBAAoB,CAAC,OAA6B,EAAE,OAA4B;IAE9F,IAAI,OAAO,CAAC,WAAW,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,wCAAkB,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,wCAAkB,EAAC,OAAO,CAAC,EAAE;QACpH,IAAA,kCAAY,EAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;KAC3C;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,qEAAqE,CAAC,MAAM,CAAC,CAAC;KAC3F;AAEH,CAAC;AARD,oDAQC"}

package/src/generators/init-buildable/generator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initBuildableGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const utilities_1 = require("@rxap/utilities");
 const workspace_utilities_1 = require("@rxap/workspace-utilities");
 const init_project_1 = require("./init-project");
 const init_workspace_1 = require("./init-workspace");
@@ -13,7 +14,13 @@ function skipProject(tree, options, project, projectName) {
     return false;
 }
 function initBuildableGenerator(tree, options) {
+    var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (_a = options.project) !== null && _a !== void 0 ? _a : (options.project = undefined);
+        (_b = options.projects) !== null && _b !== void 0 ? _b : (options.projects = []);
+        if (options.project) {
+            (0, utilities_1.CoerceArrayItems)(options.projects, [options.project]);
+        }
         console.log('buildable library init generator:', options);
         (0, init_workspace_1.initWorkspace)(tree, options);
         if (!options.skipProjects) {
@@ -25,6 +32,9 @@ function initBuildableGenerator(tree, options) {
                 (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
             }
         }
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
 }
 exports.initBuildableGenerator = initBuildableGenerator;

package/src/generators/init-buildable/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-buildable/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,mEAAoE;AACpE,iDAA6C;AAC7C,qDAAiD;AAGjD,SAAS,WAAW,CAClB,IAAU,EACV,OAAqC,EACrC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,6CAAuB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAChE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAAqC;;QAErC,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;QAE1D,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,IAAA,0BAAW,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEjD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAExD;SACF;IACH,CAAC;CAAA;AArBD,wDAqBC;AAED,kBAAe,sBAAsB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-buildable/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AACpB,+CAAmD;AACnD,mEAAoE;AACpE,iDAA6C;AAC7C,qDAAiD;AAGjD,SAAS,WAAW,CAClB,IAAU,EACV,OAAqC,EACrC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,6CAAuB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAChE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAAqC;;;QAErC,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,SAAS,EAAC;QAC9B,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,EAAE,EAAC;QACxB,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,4BAAgB,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;SACvD;QACD,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;QAE1D,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,IAAA,0BAAW,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEjD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAExD;SACF;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CAEF;AA/BD,wDA+BC;AAED,kBAAe,sBAAsB,CAAC"}

package/src/generators/init-buildable/schema.d.ts

@@ -1,5 +1,7 @@
 export interface InitBuildableGeneratorSchema {
+  project?: string;
   projects?: string[];
   overwrite?: boolean;
   skipProjects?: boolean;
+  skipFormat?: boolean;
 }

package/src/generators/init-buildable/schema.json

@@ -4,13 +4,19 @@
   "title": "",
   "type": "object",
   "properties": {
+    "project": {
+      "type": "string"
+    },
     "projects": {
-      "alias": "project",
       "type": "array",
       "items": {
         "type": "string"
       }
     },
+    "skipFormat": {
+      "type": "boolean",
+      "default": false
+    },
     "overwrite": {
       "type": "boolean",
       "default": false,

package/src/generators/init-plugin/generator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initPluginGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const utilities_1 = require("@rxap/utilities");
 const workspace_utilities_1 = require("@rxap/workspace-utilities");
 const init_project_1 = require("./init-project");
 const init_workspace_1 = require("./init-workspace");
@@ -16,7 +17,13 @@ function skipProject(tree, options, project, projectName) {
     return false;
 }
 function initPluginGenerator(tree, options) {
+    var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (_a = options.project) !== null && _a !== void 0 ? _a : (options.project = undefined);
+        (_b = options.projects) !== null && _b !== void 0 ? _b : (options.projects = []);
+        if (options.project) {
+            (0, utilities_1.CoerceArrayItems)(options.projects, [options.project]);
+        }
         console.log('plugin library init generator:', options);
         (0, init_workspace_1.initWorkspace)(tree, options);
         if (!options.skipProjects) {
@@ -28,6 +35,9 @@ function initPluginGenerator(tree, options) {
                 (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
             }
         }
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
 }
 exports.initPluginGenerator = initPluginGenerator;

package/src/generators/init-plugin/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,mEAGmC;AACnC,iDAA6C;AAC7C,qDAAiD;AAGjD,SAAS,WAAW,CAClB,IAAU,EACV,OAAkC,EAClC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,MAAM,IAAA,0BAAW,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEvD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAExD;SAEF;IAEH,CAAC;CAAA;AAxBD,kDAwBC;AAED,kBAAe,mBAAmB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AACpB,+CAAmD;AACnD,mEAGmC;AACnC,iDAA6C;AAC7C,qDAAiD;AAGjD,SAAS,WAAW,CAClB,IAAU,EACV,OAAkC,EAClC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;;QAElC,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,SAAS,EAAC;QAC9B,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,EAAE,EAAC;QACxB,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,4BAAgB,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;SACvD;QACD,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,MAAM,IAAA,0BAAW,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEvD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAExD;SAEF;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CAEF;AAjCD,kDAiCC;AAED,kBAAe,mBAAmB,CAAC"}

package/src/generators/init-plugin/schema.d.ts

@@ -1,5 +1,7 @@
 export interface InitPluginGeneratorSchema {
+  project?: string;
   projects?: string[];
   overwrite?: boolean;
   skipProjects?: boolean;
+  skipFormat?: boolean;
 }

package/src/generators/init-plugin/schema.json

@@ -4,13 +4,19 @@
   "title": "",
   "type": "object",
   "properties": {
+    "project": {
+      "type": "string"
+    },
     "projects": {
-      "alias": "project",
       "type": "array",
       "items": {
         "type": "string"
       }
     },
+    "skipFormat": {
+      "type": "boolean",
+      "default": false
+    },
     "overwrite": {
       "type": "boolean",
       "default": false,

package/src/generators/init-publishable/generator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initPublishableGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const utilities_1 = require("@rxap/utilities");
 const workspace_utilities_1 = require("@rxap/workspace-utilities");
 const init_project_1 = require("./init-project");
 const init_workspace_1 = require("./init-workspace");
@@ -13,7 +14,13 @@ function skipProject(tree, options, project, projectName) {
     return false;
 }
 function initPublishableGenerator(tree, options) {
+    var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (_a = options.project) !== null && _a !== void 0 ? _a : (options.project = undefined);
+        (_b = options.projects) !== null && _b !== void 0 ? _b : (options.projects = []);
+        if (options.project) {
+            (0, utilities_1.CoerceArrayItems)(options.projects, [options.project]);
+        }
         console.log('publishable library init generator:', options);
         (0, init_workspace_1.initWorkspace)(tree, options);
         if (!options.skipProjects) {
@@ -25,6 +32,9 @@ function initPublishableGenerator(tree, options) {
                 (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
             }
         }
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
 }
 exports.initPublishableGenerator = initPublishableGenerator;

package/src/generators/init-publishable/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,mEAAsE;AAEtE,iDAA6C;AAC7C,qDAAiD;AAGjD,SAAS,WAAW,CAClB,IAAU,EACV,OAA4B,EAC5B,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,+CAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAClE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,wBAAwB,CAC5C,IAAU,EACV,OAAuC;;QAEvC,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,IAAA,0BAAW,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEjD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAExD;SAEF;IAEH,CAAC;CAAA;AAxBD,4DAwBC;AAED,kBAAe,wBAAwB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AACpB,+CAAmD;AACnD,mEAAsE;AAEtE,iDAA6C;AAC7C,qDAAiD;AAGjD,SAAS,WAAW,CAClB,IAAU,EACV,OAA4B,EAC5B,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,+CAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAClE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,wBAAwB,CAC5C,IAAU,EACV,OAAuC;;;QAEvC,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,SAAS,EAAC;QAC9B,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,EAAE,EAAC;QACxB,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,4BAAgB,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;SACvD;QACD,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE7B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,IAAA,0BAAW,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEjD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAExD;SAEF;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CAEF;AAjCD,4DAiCC;AAED,kBAAe,wBAAwB,CAAC"}

package/src/generators/init-publishable/schema.d.ts

@@ -1,5 +1,7 @@
 export interface InitPublishableGeneratorSchema {
+  project?: string;
   projects?: string[];
   overwrite?: boolean;
   skipProjects?: boolean;
+  skipFormat?: boolean;
 }

package/src/generators/init-publishable/schema.json

@@ -4,13 +4,19 @@
   "title": "",
   "type": "object",
   "properties": {
+    "project": {
+      "type": "string"
+    },
     "projects": {
-      "alias": "project",
       "type": "array",
       "items": {
         "type": "string"
       }
     },
+    "skipFormat": {
+      "type": "boolean",
+      "default": false
+    },
     "overwrite": {
       "type": "boolean",
       "default": false,

package/src/generators/init-publishable/update-project-package-json.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const workspace_utilities_1 = require("@rxap/workspace-utilities");
 const path_1 = require("path");
 function updateProjectPackageJson(tree, project, projectName, rootPackageJson) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const packageJson = (0, devkit_1.readJson)(tree, (0, path_1.join)(project.root, 'package.json'));
     const scope = (0, workspace_utilities_1.GetWorkspaceScope)(tree);
     (_a = packageJson.scripts) !== null && _a !== void 0 ? _a : (packageJson.scripts = {});
@@ -34,7 +34,7 @@ function updateProjectPackageJson(tree, project, projectName, rootPackageJson) {
         packageJson.homepage = (0, path_1.join)(rootPackageJson.homepage, project.root);
     }
     packageJson.bugs = rootPackageJson.bugs;
-    packageJson.license = rootPackageJson.license;
+    (_f = packageJson.license) !== null && _f !== void 0 ? _f : (packageJson.license = rootPackageJson.license);
     packageJson.contributors = rootPackageJson.contributors;
     packageJson.funding = rootPackageJson.funding;
     packageJson.repository = rootPackageJson.repository;
@@ -46,12 +46,16 @@ function updateProjectPackageJson(tree, project, projectName, rootPackageJson) {
 }
 exports.updateProjectPackageJson = updateProjectPackageJson;
 function updatePathsAliasInBaseTsConfig(tree, project, currentPackageJsonName, newPackageJsonName) {
-    const tsConfig = (0, devkit_1.readJson)(tree, (0, path_1.join)('/', 'tsconfig.base.json'));
-    if (tsConfig.compilerOptions.paths[currentPackageJsonName]) {
-        const aliasList = tsConfig.compilerOptions.paths[currentPackageJsonName];
-        delete tsConfig.compilerOptions.paths[currentPackageJsonName];
-        tsConfig.compilerOptions.paths[newPackageJsonName] = aliasList;
-    }
-    (0, devkit_1.writeJson)(tree, (0, path_1.join)('/', 'tsconfig.base.json'), tsConfig);
+    (0, workspace_utilities_1.UpdateTsConfigJson)(tree, tsConfig => {
+        var _a, _b;
+        var _c;
+        (_a = tsConfig.compilerOptions) !== null && _a !== void 0 ? _a : (tsConfig.compilerOptions = {});
+        (_b = (_c = tsConfig.compilerOptions).paths) !== null && _b !== void 0 ? _b : (_c.paths = {});
+        if (tsConfig.compilerOptions.paths[currentPackageJsonName]) {
+            const aliasList = tsConfig.compilerOptions.paths[currentPackageJsonName];
+            delete tsConfig.compilerOptions.paths[currentPackageJsonName];
+            tsConfig.compilerOptions.paths[newPackageJsonName] = aliasList;
+        }
+    }, { infix: 'base' });
 }
 //# sourceMappingURL=update-project-package-json.js.map

package/src/generators/init-publishable/update-project-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/update-project-package-json.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-project-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/update-project-package-json.ts"],"names":[],"mappings":"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"}