@rxap/preset-angular 19.0.1-dev.1 → 19.0.1-dev.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [19.0.1-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/preset-angular@19.0.1-dev.1...@rxap/preset-angular@19.0.1-dev.2) (2024-06-21)
+
+### Bug Fixes
+
+- run the install task after preset generators ([6eb50fa](https://gitlab.com/rxap/packages/commit/6eb50fabc21d7b0bc403b5bc6bed7331bcedeb7c))
+
 ## [19.0.1-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/preset-angular@19.0.1-dev.0...@rxap/preset-angular@19.0.1-dev.1) (2024-06-20)
 
 **Note:** Version bump only for package @rxap/preset-angular

package/GUIDES.md

@@ -4,7 +4,7 @@ To create a new workspace, run the following command:
 
 ```bash
 WORKSPACE_NAME=my-workspace
-yarn create nx-workspace@19.1.1 --preset @rxap/preset-angular@development --pm yarn --name $WORKSPACE_NAME
+yarn create nx-workspace --preset @rxap/preset-angular --pm yarn --name $WORKSPACE_NAME
 ```
 
 Navigate to the newly created workspace and run the yarn install command:

package/generators.json

@@ -5,6 +5,11 @@
       "schema": "./src/generators/preset/schema.json",
       "description": "preset generator",
       "x-use-standalone-layout": true
+    },
+    "init": {
+      "factory": "./src/generators/init/generator",
+      "schema": "./src/generators/init/schema.json",
+      "description": "Initialize the package in the workspace"
     }
   }
 }

package/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "19.0.1-dev.1",
+  "version": "19.0.1-dev.2",
   "name": "@rxap/preset-angular",
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "@nx/devkit": "19.3.0",
-    "@rxap/plugin-angular": "^19.2.0-dev.0",
-    "@rxap/plugin-workspace": "^19.1.1-dev.1",
+    "@rxap/plugin-angular": "^19.2.0-dev.1",
+    "@rxap/plugin-workspace": "^19.1.1-dev.2",
     "tslib": "2.6.2"
   },
   "author": {
@@ -39,5 +39,5 @@
   },
   "type": "commonjs",
   "typings": "./src/index.d.ts",
-  "gitHead": "3fa5a96cac9ec03017cb91b15f918a0e66db9066"
+  "gitHead": "bbecc3ca89ac11dedf7969bed08705f22dfaa186"
 }

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

@@ -0,0 +1,4 @@
+import { Tree } from '@nx/devkit';
+import { InitGeneratorSchema } from './schema';
+export declare function initGenerator(tree: Tree, options: InitGeneratorSchema): Promise<void>;
+export default initGenerator;

package/src/generators/init/generator.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+function initGenerator(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e;
+        const packageJsonFilePath = (0, path_1.relative)(tree.root, (0, path_1.join)(__dirname, '..', '..', '..', 'package.json'));
+        if (!tree.exists(packageJsonFilePath)) {
+            console.error('package.json not found in: ' + packageJsonFilePath);
+            return;
+        }
+        const { peerDependencies, name: packageName } = JSON.parse(tree.read(packageJsonFilePath, 'utf-8'));
+        console.log(`Coerce peer dependencies for package: ${packageName}`);
+        if (!peerDependencies || !Object.keys(peerDependencies).length) {
+            console.log('No peer dependencies found');
+            return;
+        }
+        console.log(`Peer dependencies: ${Object.keys(peerDependencies).join(', ')}`);
+        const rootPackageJson = JSON.parse(tree.read('package.json', 'utf-8'));
+        let isDevDependency = !!((_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[packageName]);
+        if (isDevDependency &&
+            [/^@rxap\/ngx/, /^@rxap\/nest/].some((rx) => rx.test(packageName))) {
+            (_b = rootPackageJson.dependencies) !== null && _b !== void 0 ? _b : (rootPackageJson.dependencies = {});
+            rootPackageJson.dependencies[packageName] =
+                rootPackageJson.devDependencies[packageName];
+            delete rootPackageJson.devDependencies[packageName];
+            isDevDependency = false;
+            tree.write('package.json', JSON.stringify(rootPackageJson, null, 2));
+        }
+        if (!isDevDependency && [
+            /^@rxap\/plugin/,
+            /^@rxap\/workspace/,
+            /@rxap\/schematic/,
+        ]) {
+            (_c = rootPackageJson.devDependencies) !== null && _c !== void 0 ? _c : (rootPackageJson.devDependencies = {});
+            rootPackageJson.devDependencies[packageName] =
+                rootPackageJson.dependencies[packageName];
+            delete rootPackageJson.dependencies[packageName];
+            isDevDependency = true;
+            tree.write('package.json', JSON.stringify(rootPackageJson, null, 2));
+        }
+        const missingPeerDependencies = Object.entries(peerDependencies)
+            .filter(([dep]) => {
+            var _a, _b;
+            return !((_a = rootPackageJson.dependencies) === null || _a === void 0 ? void 0 : _a[dep]) &&
+                !((_b = rootPackageJson.devDependencies) === null || _b === void 0 ? void 0 : _b[dep]);
+        })
+            .reduce((acc, [dep, version]) => (Object.assign(Object.assign({}, acc), { [dep]: version })), {});
+        if (!Object.keys(missingPeerDependencies).length) {
+            console.log('No missing peer dependencies');
+            return;
+        }
+        if (isDevDependency) {
+            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, missingPeerDependencies);
+        }
+        else {
+            (0, devkit_1.addDependenciesToPackageJson)(tree, missingPeerDependencies, {});
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+        (0, devkit_1.installPackagesTask)(tree);
+        for (const peer of Object.keys(missingPeerDependencies)) {
+            console.log(`Peer dependency ${peer} added to package.json`);
+            const peerPackageJsonFilePath = (0, path_1.join)('node_modules', ...peer.split('/'), 'package.json');
+            if (!tree.exists(peerPackageJsonFilePath)) {
+                console.log(`Peer dependency ${peer} has no package.json`);
+                continue;
+            }
+            const { generators, schematics } = JSON.parse(tree.read(peerPackageJsonFilePath, 'utf-8'));
+            if (!generators && !schematics) {
+                console.log(`Peer dependency ${peer} has no generators or schematics`);
+                continue;
+            }
+            const configFile = generators || schematics;
+            if (!tree.exists((0, path_1.join)('node_modules', ...peer.split('/'), configFile))) {
+                console.log(`Peer dependency ${peer} has no generators or schematics file`);
+                continue;
+            }
+            const config = JSON.parse(tree.read((0, path_1.join)('node_modules', ...peer.split('/'), configFile), 'utf-8'));
+            if (!((_d = config.generators) === null || _d === void 0 ? void 0 : _d.init)) {
+                console.log(`Peer dependency ${peer} has no init generator`);
+                continue;
+            }
+            const initGeneratorFilePath = config.generators.init.factory;
+            const fullInitGeneratorFilePath = (0, path_1.join)('node_modules', ...peer.split('/'), initGeneratorFilePath) + '.js';
+            if (!tree.exists(fullInitGeneratorFilePath)) {
+                console.log(`Peer dependency ${peer} has no init generator file: ` +
+                    fullInitGeneratorFilePath);
+                continue;
+            }
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            const initGenerator = (_e = require((0, path_1.join)('node_modules', ...peer.split('/'), initGeneratorFilePath))) === null || _e === void 0 ? void 0 : _e.default;
+            if (typeof initGenerator !== 'function') {
+                console.log(`Peer dependency ${peer} has no init generator function`);
+                continue;
+            }
+            console.log(`Run init generator for peer dependency ${peer}`);
+            yield initGenerator(tree, options);
+        }
+    });
+}
+exports.initGenerator = initGenerator;
+exports.default = initGenerator;
+//# sourceMappingURL=generator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/preset/angular/src/generators/init/generator.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,2 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface InitGeneratorSchema {}

package/src/generators/init/schema.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "Init",
+  "title": "",
+  "type": "object",
+  "properties": {},
+  "required": []
+}

package/src/generators/preset/generator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.presetGenerator = void 0;
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
 const plugin_angular_1 = require("@rxap/plugin-angular");
 const plugin_workspace_1 = require("@rxap/plugin-workspace");
 function presetGenerator(tree, options) {
@@ -18,6 +19,7 @@ function presetGenerator(tree, options) {
             prefix,
             overwrite: true,
         });
+        (0, devkit_1.installPackagesTask)(tree, true);
     });
 }
 exports.presetGenerator = presetGenerator;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/preset/angular/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;AACA,yDAA4D;AAC5D,6DAAgE;AAGhE,SAAsB,eAAe,CACnC,IAAU,EACV,OAA8B;;QAE9B,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,aAAa,EACb,MAAM,GACP,GAAG,OAAO,CAAC;QACZ,MAAM,IAAA,yCAAsB,EAAC,IAAI,EAAE;YACjC,QAAQ;YACR,UAAU;YACV,OAAO;YACP,aAAa;YACb,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE;YAC/B,MAAM;YACN,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;CAAA;AAtBD,0CAsBC;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/preset/angular/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,yDAA4D;AAC5D,6DAAgE;AAGhE,SAAsB,eAAe,CACnC,IAAU,EACV,OAA8B;;QAE9B,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,OAAO,EACP,aAAa,EACb,MAAM,GACP,GAAG,OAAO,CAAC;QACZ,MAAM,IAAA,yCAAsB,EAAC,IAAI,EAAE;YACjC,QAAQ;YACR,UAAU;YACV,OAAO;YACP,aAAa;YACb,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE;YAC/B,MAAM;YACN,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,IAAA,4BAAmB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;CAAA;AAxBD,0CAwBC;AAED,kBAAe,eAAe,CAAC"}

package/src/generators/preset/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "Preset",
   "title": "",
   "type": "object",