@rxap/plugin-nestjs 16.1.0-dev.0 → 16.1.0-dev.2

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.1.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.1.0-dev.1...@rxap/plugin-nestjs@16.1.0-dev.2) (2023-08-03)
+
+### Features
+
+- add project json generator executor ([c92ea78](https://gitlab.com/rxap/packages/commit/c92ea7800271b611894c33d243e7de0dc9031f32))
+
+# [16.1.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.1.0-dev.0...@rxap/plugin-nestjs@16.1.0-dev.1) (2023-08-01)
+
+### Bug Fixes
+
+- generate readme with peer dependencies to install ([e7039bb](https://gitlab.com/rxap/packages/commit/e7039bb5e86ffeadfe7cc92d5fc71d32f8efb4fb))
+- skip plugin or schematic projects ([c87532b](https://gitlab.com/rxap/packages/commit/c87532b33e3e88515e4c1735901711c4fe04ce3c))
+
 # 16.1.0-dev.0 (2023-08-01)
 
 ### Bug Fixes

package/README.md

@@ -9,6 +9,7 @@
 
 - [Installation](#installation)
 - [Generators](#generators)
+- [Executors](#executors)
 
 # Installation
 
@@ -18,7 +19,7 @@ yarn add @rxap/plugin-nestjs
 ```
 **Install peer dependencies:**
 ```bash
-yarn add 
+yarn add @nx/devkit@^16.5.0 @rxap/generator-utilities@^1.1.0-dev.0 @rxap/plugin-utilities@^16.1.0-dev.1 @rxap/workspace-utilities@^0.1.0-dev.0 nx@^16.5.0 
 ```
 **Execute the init generator:**
 ```bash
@@ -46,3 +47,19 @@ yarn nx g @rxap/plugin-nestjs:init-library
 ```bash
 yarn nx g @rxap/plugin-nestjs:init-application
 ```
+# Executors
+
+## package-json
+> package-json executor
+
+**project.json**
+```json
+{
+  "targets": {
+    "package-json": {
+      "executor": "@rxap/plugin-nestjs:package-json"
+    }
+  }
+}
+```
+

package/executors.json

@@ -0,0 +1,9 @@
+{
+  "executors": {
+    "package-json": {
+      "implementation": "./src/executors/package-json/executor",
+      "schema": "./src/executors/package-json/schema.json",
+      "description": "package-json executor"
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxap/plugin-nestjs",
-  "version": "16.1.0-dev.0",
+  "version": "16.1.0-dev.2",
   "type": "commonjs",
   "generators": "./generators.json",
   "publishConfig": {
@@ -31,22 +31,37 @@
     "email": "mmuenker@digitaix.com"
   },
   "dependencies": {
+    "ignore": "^5.2.4",
+    "semver": "^7.3.5",
     "tslib": "2.6.1"
   },
   "peerDependencies": {
     "@nx/devkit": "^16.5.0",
-    "@rxap/generator-utilities": "^1.0.1-dev.2",
-    "nx": "^16.5.0"
+    "@rxap/generator-utilities": "^1.1.0-dev.0",
+    "@rxap/plugin-utilities": "^16.1.0-dev.1",
+    "@rxap/workspace-utilities": "^0.1.0-dev.0",
+    "nx": "^16.5.0",
+    "@rxap/node-utilities": "1.0.1-dev.2",
+    "@rxap/utilities": "16.0.0-dev.4"
   },
   "nx-migrations": {
     "packageGroup": [
       {
         "package": "@rxap/generator-utilities",
-        "version": "1.0.1-dev.2"
+        "version": "1.1.0-dev.0"
+      },
+      {
+        "package": "@rxap/plugin-utilities",
+        "version": "16.1.0-dev.1"
+      },
+      {
+        "package": "@rxap/workspace-utilities",
+        "version": "0.1.0-dev.0"
       }
     ]
   },
-  "gitHead": "ed3a0788894aa734ec2a8e9e957cf73cabe033d6",
+  "executors": "./executors.json",
+  "gitHead": "5601620d3b3fc43f63d114b0953635992f783070",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

package/src/executors/package-json/executor.d.ts

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

package/src/executors/package-json/executor.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const plugin_utilities_1 = require("@rxap/plugin-utilities");
+const fs_1 = require("fs");
+const path_1 = require("path");
+function runExecutor(options, context) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        console.log('Executor ran for PackageJson', options);
+        (0, plugin_utilities_1.LoadProjectToPackageMapping)(context);
+        const dependencies = (0, plugin_utilities_1.GetAllPackageDependenciesForProject)(context);
+        const packageJson = { dependencies, name: context.projectName, private: true };
+        console.log('dependencies', dependencies);
+        (0, fs_1.writeFileSync)((0, path_1.join)((0, plugin_utilities_1.GetProjectRoot)(context), 'package.json'), JSON.stringify(packageJson, null, 2));
+        return {
+            success: true,
+        };
+    });
+}
+exports.default = runExecutor;
+//# sourceMappingURL=executor.js.map

package/src/executors/package-json/executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/executors/package-json/executor.ts"],"names":[],"mappings":";;;AACA,6DAIgC;AAChC,2BAAmC;AACnC,+BAA4B;AAG5B,SAA8B,WAAW,CACvC,OAAkC,EAClC,OAAwB;;QAExB,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;QAErD,IAAA,8CAA2B,EAAC,OAAO,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,IAAA,sDAAmC,EAAC,OAAO,CAAC,CAAC;QAElE,MAAM,WAAW,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAE/E,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAE1C,IAAA,kBAAa,EAAC,IAAA,WAAI,EAAC,IAAA,iCAAc,EAAC,OAAO,CAAC,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEnG,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA;AAnBD,8BAmBC"}

package/src/executors/package-json/schema.d.ts

@@ -0,0 +1 @@
+export interface PackageJsonExecutorSchema {} // eslint-disable-line

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

@@ -0,0 +1,9 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "version": 2,
+  "title": "PackageJson executor",
+  "description": "",
+  "type": "object",
+  "properties": {},
+  "required": []
+}

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

@@ -1,7 +1,4 @@
 import { Tree } from '@nx/devkit';
 import { InitApplicationGeneratorSchema } from './schema';
-export declare const legacyNestJsInit: (host: Tree, generatorOptions: {
-    [k: string]: any;
-}) => Promise<any>;
 export declare function initApplicationGenerator(tree: Tree, options: InitApplicationGeneratorSchema): Promise<void>;
 export default initApplicationGenerator;

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

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initApplicationGenerator = exports.legacyNestJsInit = void 0;
+exports.initApplicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const generator_utilities_1 = require("@rxap/generator-utilities");
+const workspace_utilities_1 = require("@rxap/workspace-utilities");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const path_1 = require("path");
 const skip_non_nest_project_1 = require("../../lib/skip-non-nest-project");
 function skipProject(tree, options, project, projectName) {
     if ((0, skip_non_nest_project_1.SkipNonNestProject)(tree, options, project, projectName)) {
@@ -15,18 +17,40 @@ function skipProject(tree, options, project, projectName) {
     }
     return false;
 }
-exports.legacyNestJsInit = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@rxap/schematic-nestjs', 'init');
+function setGeneralTargetDefaults(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    (0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'build', 'generate-package-json');
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
+function updateProjectTargets(project) {
+    var _a;
+    (_a = project.targets) !== null && _a !== void 0 ? _a : (project.targets = {});
+    project.targets['generate-package-json'] = {
+        executor: '@rxap/plugin-nestjs:package-json',
+        configurations: {
+            production: {},
+        },
+    };
+}
+function updateGitIgnore(tree, project) {
+    (0, generator_utilities_1.CoerceIgnorePattern)(tree, (0, path_1.join)(project.root, '.gitignore'), ['package.json']);
+}
 function initApplicationGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         console.log('nestjs application init generator:', options);
+        setGeneralTargetDefaults(tree);
         for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
             if (skipProject(tree, options, project, projectName)) {
                 continue;
             }
             console.log(`init project: ${projectName}`);
-            yield (0, exports.legacyNestJsInit)(tree, Object.assign(Object.assign({}, options), { project: projectName }));
+            updateProjectTargets(project);
+            updateGitIgnore(tree, project);
             // apply changes to the project configuration
             (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+            if (options.legacy) {
+                yield (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@rxap/schematic-nestjs', 'init')(tree, Object.assign(Object.assign({}, options), { project: projectName }));
+            }
         }
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,mEAAsE;AACtE,gEAA0E;AAC1E,2EAAqE;AAGrE,SAAS,WAAW,CAClB,IAAU,EACV,OAAuC,EACvC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,0CAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC3D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAA,+CAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAClE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAEY,QAAA,gBAAgB,GAAG,IAAA,0CAA0B,EACxD,wBAAwB,EACxB,MAAM,CACP,CAAC;AAEF,SAAsB,wBAAwB,CAC5C,IAAU,EACV,OAAuC;;QAEvC,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;QAE3D,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,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;YAE9C,MAAM,IAAA,wBAAgB,EAAC,IAAI,kCACtB,OAAO,KACV,OAAO,EAAE,WAAW,IACpB,CAAC;YAEH,6CAA6C;YAC7C,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;SACxD;IACH,CAAC;CAAA;AAtBD,4DAsBC;AAED,kBAAe,wBAAwB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,mEAGmC;AACnC,mEAA2E;AAC3E,gEAA0E;AAC1E,+BAA4B;AAC5B,2EAAqE;AAGrE,SAAS,WAAW,CAClB,IAAU,EACV,OAAuC,EACvC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,0CAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC3D,OAAO,IAAI,CAAC;KACb;IAED,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,SAAS,wBAAwB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,CAAC;IAEzE,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,oBAAoB,CAAC,OAA6B;;IAEzD,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;IAEvB,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,GAAG;QACzC,QAAQ,EAAE,kCAAkC;QAC5C,cAAc,EAAE;YACd,UAAU,EAAE,EAAE;SACf;KACF,CAAC;AAEJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,OAA6B;IAChE,IAAA,yCAAmB,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,CAAE,cAAc,CAAE,CAAC,CAAC;AAClF,CAAC;AAED,SAAsB,wBAAwB,CAC5C,IAAU,EACV,OAAuC;;QAEvC,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;QAE3D,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,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,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;YAE9C,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC9B,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE/B,6CAA6C;YAC7C,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAEvD,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClB,MAAM,IAAA,0CAA0B,EAC9B,wBAAwB,EACxB,MAAM,CACP,CAAC,IAAI,kCACD,OAAO,KACV,OAAO,EAAE,WAAW,IACpB,CAAC;aACJ;SAEF;IACH,CAAC;CAAA;AAjCD,4DAiCC;AAED,kBAAe,wBAAwB,CAAC"}

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

@@ -20,4 +20,5 @@ export interface InitApplicationGeneratorSchema {
   overwrite?: boolean;
   openApi?: boolean;
   jwt?: boolean;
+  legacy?: boolean;
 }

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

@@ -17,6 +17,12 @@
       "description": "Whether this service will be deployed on google resources",
       "x-prompt": "Is this service deployed on google resources?"
     },
+    "legacy": {
+      "type": "boolean",
+      "default": false,
+      "description": "Whether the legacy schematic should be executed",
+      "x-prompt": "Should the legacy schematic be executed?"
+    },
     "sentry": {
       "type": "boolean",
       "default": false,