Schematics package migration

.gitignore

@@ -70,6 +70,8 @@ testing/
 **/testing*/
 packages/cli
 samples/todo
-
-
-.nx/cache
+
+
+.nx/cache
+
+dist/

package.json

@@ -21,33 +21,36 @@
     "@swc/helpers": "~0.5.2",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",
-    "prettier": "^2.7.1",
+    "passport-jwt": "^4.0.1",
+    "prettier": "^2.8.8",
     "triple-beam": "^1.4.1",
-    "tslib": "^2.3.0",
-    "typescript": "^4.8.3"
+    "tslib": "^2.6.2",
+    "type-fest": "^4.10.2",
+    "typescript": "^5.3.3"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@nestjs/common": "^9.1.2",
-    "@nestjs/core": "^9.1.2",
-    "@nestjs/testing": "^9.1.2",
+    "@nestjs/common": "^10.3.3",
+    "@nestjs/core": "^10.3.3",
+    "@nestjs/testing": "^10.3.3",
     "@nx/jest": "17.2.8",
     "@nx/js": "17.2.8",
+    "@nx/nest": "^17.2.8",
     "@swc-node/register": "~1.6.7",
     "@swc/cli": "~0.1.62",
     "@swc/core": "~1.3.85",
     "@types/jest": "^29.4.0",
-    "@types/js-yaml": "^4.0.5",
-    "@types/lodash": "^4.14.185",
-    "@types/node": "18.16.9",
+    "@types/js-yaml": "^4.0.9",
+    "@types/lodash": "^4.14.202",
+    "@types/node": "20.11.19",
     "@types/nodemailer": "^6.4.6",
     "@types/pluralize": "^0.0.33",
-    "@types/prettier": "^2.7.1",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "@types/prettier": "^2.7.3",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.38.0",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.0",
+    "class-validator": "^0.14.1",
     "commitizen": "^4.2.4",
     "cz-conventional-changelog": "3.3.0",
     "eslint": "^8.24.0",
@@ -59,11 +62,11 @@
     "jest": "^29.4.1",
     "jest-environment-jsdom": "^29.4.1",
     "lerna": "^5.5.2",
-    "nx": "17.2.6",
+    "nx": "~17.2.8",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.5.7",
-    "ts-jest": "^29.1.0",
-    "ts-node": "10.9.1",
+    "ts-jest": "^29.1.2",
+    "ts-node": "10.9.2",
     "typeorm": "^0.3.10",
     "zx": "^7.0.8"
   },

packages/schematics/.eslintignore

@@ -1,4 +1,6 @@
 src/lib/**/files/**/*
 **/src/lib/**/files/**/*
+src/generators/**/files/**/*
+**/src/generators/**/files/**/*
 *.d.ts
 **/*.d.ts

packages/schematics/.eslintrc.json

@@ -0,0 +1,32 @@
+{
+  "extends": ["../../.eslintrc.js"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": "error"
+      }
+    },
+    {
+      "files": ["./package.json", "./generators.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/nx-plugin-checks": "error"
+      }
+    }
+  ]
+}

packages/schematics/.gitignore

@@ -6,6 +6,7 @@ src/**/*.js
 !src/**/.eslintrc.js
 src/**/*.js.map
 src/**/*.d.ts
+!src/generators/**/schema.d.ts
 
 # IDEs
 .idea/

packages/schematics/generators.json

@@ -0,0 +1,47 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "name": "@devon4ts_node/schematics",
+  "version": "6.0.0",
+  "generators": {
+    "typeorm": {
+      "description": "Initialice typeorm into your current project in a correct way.",
+      "factory": "./src/generators/init-typeorm/generator",
+      "schema": "./src/generators/init-typeorm/schema.json"
+    },
+    "entity": {
+      "description": "Add a TypeOrm entity to your project",
+      "factory": "./src/generators/entity/generator",
+      "schema": "./src/generators/entity/schema.json"
+    },
+    "convict": {
+      "description": "Initialize convict to manage the configuration  into the project.",
+      "factory": "./src/generators/convict/generator",
+      "schema": "./src/generators/convict/schema.json"
+    },
+    "mailer": {
+      "description": "Add @devon4ts_node/mailer module to project.",
+      "factory": "./src/generators/mailer/generator",
+      "schema": "./src/generators/mailer/schema.json"
+    },
+    "swagger": {
+      "description": "Add swagger module to project.",
+      "factory": "./src/generators/swagger/generator",
+      "schema": "./src/generators/swagger/schema.json"
+    },
+    "auth-jwt": {
+      "description": "Add the auth JWT module to the project.",
+      "factory": "./src/generators/auth-jwt/generator",
+      "schema": "./src/generators/auth-jwt/schema.json"
+    },
+    "security": {
+      "description": "Add cors and helmet to your project.",
+      "factory": "./src/generators/security/generator",
+      "schema": "./src/generators/security/schema.json"
+    },
+    "application": {
+      "description": "Generates a basic NestJS application using Devonfw Architecture",
+      "factory": "./src/generators/application/generator",
+      "schema": "./src/generators/application/schema.json"
+    }
+  }
+}

packages/schematics/jest.config.ts

@@ -0,0 +1,10 @@
+/* eslint-disable */
+export default {
+  displayName: 'schematics',
+  preset: '../../jest.preset.js',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../coverage/packages/schematics',
+};

packages/schematics/package.json

@@ -24,32 +24,14 @@
   "license": "Apache-2.0",
   "schematics": "./src/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "^14.0.2",
-    "@angular-devkit/schematics": "^14.0.2",
-    "@nestjs/schematics": "^9.0.0",
-    "@schematics/angular": "^14.0.2",
-    "js-yaml": "^4.1.0",
+    "@nx/devkit": "17.2.8",
+    "@nx/nest": "17.2.8",
+    "@nestjs/schematics": "^10.1.1",
     "lodash": "^4.17.21",
     "pluralize": "^8.0.0",
-    "prettier": "^2.7.1",
-    "ts-morph": "^15.1.0",
-    "typescript": "^4.7.4"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "roots": [
-      "src"
-    ],
-    "testRegex": "_spec.ts$",
-    "transform": {
-      "^.+\\.ts$": "ts-jest"
-    },
-    "coverageDirectory": "./coverage",
-    "testEnvironment": "node"
+    "prettier": "^3.2.5",
+    "ts-morph": "^21.0.1",
+    "typescript": "^5.3.3"
   },
   "gitHead": "1f351bcc0fbad70f9c25fa73a398a538ca0c8e55"
-}
+}

packages/schematics/project.json

@@ -0,0 +1,52 @@
+{
+  "name": "schematics",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "packages/schematics/src",
+  "projectType": "library",
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/packages/schematics",
+        "main": "packages/schematics/src/index.ts",
+        "tsConfig": "packages/schematics/tsconfig.lib.json",
+        "assets": [
+          "packages/schematics/*.md",
+          {
+            "input": "./packages/schematics/src",
+            "glob": "**/!(*.ts)",
+            "output": "./src"
+          },
+          {
+            "input": "./packages/schematics/src",
+            "glob": "**/*.d.ts",
+            "output": "./src"
+          },
+          {
+            "input": "./packages/schematics",
+            "glob": "generators.json",
+            "output": "."
+          },
+          {
+            "input": "./packages/schematics",
+            "glob": "executors.json",
+            "output": "."
+          }
+        ]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "packages/schematics/jest.config.ts"
+      }
+    }
+  },
+  "tags": []
+}

packages/schematics/src/collection.json

@@ -1,96 +1,44 @@
 {
-  "$schema": "../node_modules/@angular-devkit/schematics/collection-schema.json",
-  "extends": "@nestjs/schematics",
-  "schematics": {
-    "application": {
-      "description": "Create a devon4ts_node application.",
-      "factory": "./lib/devon4ts_node-application/devon4ts_node-application.factory#devon4ts_nodeApplication",
-      "schema": "./lib/devon4ts_node-application/schema.json"
-    },
+  "generators": {
     "typeorm": {
       "description": "Initialice typeorm into your current project in a correct way.",
-      "factory": "./lib/init-typeorm/init-typeorm.factory#initTypeorm",
-      "schema": "./lib/init-typeorm/schema.json"
+      "factory": "./generators/init-typeorm/generator",
+      "schema": "./generators/init-typeorm/schema.json"
     },
     "entity": {
       "description": "Add a TypeOrm entity to your project",
-      "factory": "./lib/entity/entity.factory#main",
-      "schema": "./lib/entity/schema.json"
+      "factory": "./generators/entity/generator",
+      "schema": "./generators/entity/schema.json"
     },
     "convict": {
-      "description": "Initialize convict to manage the configuration  into the project.",
-      "factory": "./lib/convict/convict.factory#initConvict",
-      "schema": "./lib/convict/schema.json"
+      "description": "Initialize convict to manage the configuration into the project.",
+      "factory": "./generators/convict/generator",
+      "schema": "./generators/convict/schema.json"
     },
     "mailer": {
       "description": "Add @devon4ts_node/mailer module to project.",
-      "factory": "./lib/mailer/mailer.factory#mailer",
-      "schema": "./lib/mailer/schema.json"
+      "factory": "./generators/mailer/generator",
+      "schema": "./generators/mailer/schema.json"
     },
     "swagger": {
       "description": "Add swagger module to project.",
-      "factory": "./lib/swagger/swagger.factory#swagger",
-      "schema": "./lib/swagger/schema.json"
+      "factory": "./generators/swagger/generator",
+      "schema": "./generators/swagger/schema.json"
     },
     "auth-jwt": {
       "description": "Add the auth JWT module to the project.",
-      "factory": "./lib/auth-jwt/auth.factory#authJWT",
-      "schema": "./lib/auth-jwt/schema.json"
+      "factory": "./generators/auth-jwt/generator",
+      "schema": "./generators/auth-jwt/schema.json"
     },
     "security": {
       "description": "Add cors and helmet to your project.",
-      "factory": "./lib/security/security.factory#security",
-      "schema": "./lib/security/schema.json"
-    },
-    "repository": {
-      "factory": "./lib/repository/repository.factory#main",
-      "description": "Create a TypeORM custom repository.",
-      "schema": "./lib/repository/schema.json"
-    },
-    "controller": {
-      "factory": "./lib/controller/controller.factory#main",
-      "description": "Create a Nest controller.",
-      "schema": "./lib/controller/schema.json"
-    },
-    "module": {
-      "factory": "./lib/module/module.factory#main",
-      "description": "Create a Nest module.",
-      "schema": "./lib/module/schema.json"
-    },
-    "service": {
-      "factory": "./lib/service/service.factory#main",
-      "description": "Create a Nest service.",
-      "schema": "./lib/service/schema.json"
+      "factory": "./generators/security/generator",
+      "schema": "./generators/security/schema.json"
     },
-    "filter": {
-      "factory": "./lib/filter/filter.factory#main",
-      "description": "Create a Nest filter.",
-      "schema": "./lib/filter/schema.json"
-    },
-    "guard": {
-      "factory": "./lib/guard/guard.factory#main",
-      "description": "Create a Nest guard.",
-      "schema": "./lib/guard/schema.json"
-    },
-    "interceptor": {
-      "factory": "./lib/interceptor/interceptor.factory#main",
-      "description": "Create a Nest interceptor.",
-      "schema": "./lib/interceptor/schema.json"
-    },
-    "middleware": {
-      "factory": "./lib/middleware/middleware.factory#main",
-      "description": "Create a Nest middleware.",
-      "schema": "./lib/middleware/schema.json"
-    },
-    "pipe": {
-      "factory": "./lib/pipe/pipe.factory#main",
-      "description": "Create a Nest pipe.",
-      "schema": "./lib/pipe/schema.json"
-    },
-    "resource": {
-      "factory": "./lib/resource/resource.factory#main",
-      "description": "Create a Nest resource.",
-      "schema": "./lib/resource/schema.json"
+    "application": {
+      "factory": "./src/generators/application/generator",
+      "schema": "./src/generators/application/schema.json",
+      "description": "Generates a basic NestJS application using Devonfw Architecture"
     }
   }
-}
+}