@nathapp/na-cli 1.0.0-rc.41 → 1.0.0-rc.42

package/Makefile

@@ -49,7 +49,8 @@ name:
 
 
 test:
-	@echo "Skipped"
+	@npm ci --cache .npm --prefer-offline
+	@npm test
 
 build:
 	@npm run build

package/README.md

@@ -12,10 +12,11 @@ Command line for create a project with your own templates, and other template jo
 4. k8s-deployments 1.0.0
 5. nestjs-api 1.0.0
    - with nestjs ^9.0.0
-   - with @nathapp/common ^0.1.10
-   - with @nathapp/nestjs-common ^1.0.1-rc.0
+   - with @nathapp/common ^0.1.11
+   - with @nathapp/nestjs-common ^1.0.1-rc.16
 6. nestjs-library 1.0.0
    - with nestjs ^9.0.0
+
 ## Inspired by https://github.com/pongsatt/mycli
 
 chatbot: 0

package/dist/templates/nestjs-api/.dockerignore

@@ -1,2 +1,6 @@
 dist
 node_modules
+
+.tomg-config
+generated
+.pem

package/dist/templates/nestjs-api/.env

@@ -2,10 +2,22 @@ SERVER_PORT=8080
 
 GLOBAL_PREFIX=/
 
-JWT_ACCESS_SECERT=thisisasecret
-JWT_ACCESS_EXPIRE=24h
-JWT_REFRESH_SECRET=thisisarefreshsecret
-JWT_REFRESH_EXPIRE=1y
+JWT_ACCESS_SECRET=thisisasecret
+JWT_ACCESS_PRIVATEKEY="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAv7LDW5t44Z8GNoaTz1iF3YF7byIyE0as7Y/F58aFVWFhRC/G\nmGovJPgm3s6/gOCzxUWtP4URLjWDmGIs2MJebt9GWbXF4Ou5O47DCta75up+ZrqP\nCoLVOEL1tNUUx/GW+Q/Dd4quiy1SWz7At/BDF1y5DUv34C/S3VMR5mxkli1kwqPK\nzw/ozrc2+JzmoQ0n355utcUVXsU/4ufZ9eQuSF2tUUOBZs2nlauYOixz/qrqg+j+\n3HoJBvmzMTIahXYFEGCjormc2E0kwdz5/0ZfYUbAogYH7GZIzXEOZvQedOD8s9JL\n90i/yEE4L14F3XJsfLo+Krgxz49LBU6KEaGzGwIDAQABAoIBACO2+HKuypyudgfe\nltdAlOAp6YdRBadVuY4hBSwjbl/z3p1HkWaAEfx/Ry6nskIemx+b1aVJ82N6kOPp\nFpXj0JgzfPXlydIX2NDhzjDMxQFGmvoks9Wvfm4W+5QPRunhdtE8QJya993yOa/K\nRzl9x+IoYkm555qbDlwxx9n4Q90+kLP6GXxcg9D+8aR7Eflqu7npI12K1gOka643\nj6hYmpaioPQJeQavK0ih5cYHTVdAwT2EpUXo58+n7ICDG3KbuW57zM07wtJ1fIDX\nqn0wWzDzecSV0t7UDvHrQ4YK4LmkzXsubgkfXW0CHhLp/oma2eHu5evFbCvuipy2\nne4E2fECgYEA+RkL2bAv4CA3fLdDmCzMPZv0UDATSFaqh/B0+IvdUeHZ/R7EZ72h\nm2nQJ7/oqmhfGmkxg9KyQF6cTHpsJCy3tftkI313Z4C/tOvXkracDYUXACSaNbdm\njvlbZIgVrlYUVe51f2H2i4gpyhlKzymWOnTrda+T3B04vd6QD6rt7KUCgYEAxQKO\n5Ukvc3Px2vmWOa/ov5AsgOyirCVyv/Ff2HwCsKN1kMaNa0JDyD6I0rpQzMMpix5+\nOcdwXBTvPYbaLL1Q0kkVQYSk4AvF++0/lAzZ8o+v4jPhKR7BSuqj3pg+3g6qSOzy\n72WdNeC+7dV/PoKvjDYrSj/HXu92Es6TUNUYVL8CgYAM9BB5sX/L1+EKyzzonOvC\nCGocAWP/TwJvL0Hl6uAHcgcz8nWkL2hH/KimaIRg2CyZ4v6ALGS4lDLshzE4cFrd\nS8VZUxzydO+DKQB80KIs0c7wYvbh9DeRF8Z449q8xh0oms3hYebAOsRxjf8l5rO5\nNntIE2lM+PgKZ5h2OB1HQQKBgQCqSrjL9sPebyVq230AJk7wbyYY1vMSDFixE2p+\nzUrh9pkj6IzLXv8KMwu/4y7+n9/kEhqXxQ4ZejsGGu+x5n7bFjMabBa8V1Dun7fq\nOGWYJp2o0KFbEuuP31yAh2coONL2sGKZjmMi9D71hCs2FG67qwMmbhTeuex8+zUZ\nlOkwLwKBgA1Qf5JHX4GYnd6vbkdME2ltQBnNo83wjME/t8BWk75Sm7vUSXuEJu63\nSbxc9oF8hE44CVSTwoxQTnXzl28QXb0spZsLzbL6heXr4TQQEE+XxmvGN7byxfYv\ntfixUdU5UUIHRID3XZiApiukE/5lMYf3FmXtgeHq0J9ArgHbF1gd\n-----END RSA PRIVATE KEY-----\n"
+JWT_ACCESS_PUBLICKEY="-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7LDW5t44Z8GNoaTz1iF\n3YF7byIyE0as7Y/F58aFVWFhRC/GmGovJPgm3s6/gOCzxUWtP4URLjWDmGIs2MJe\nbt9GWbXF4Ou5O47DCta75up+ZrqPCoLVOEL1tNUUx/GW+Q/Dd4quiy1SWz7At/BD\nF1y5DUv34C/S3VMR5mxkli1kwqPKzw/ozrc2+JzmoQ0n355utcUVXsU/4ufZ9eQu\nSF2tUUOBZs2nlauYOixz/qrqg+j+3HoJBvmzMTIahXYFEGCjormc2E0kwdz5/0Zf\nYUbAogYH7GZIzXEOZvQedOD8s9JL90i/yEE4L14F3XJsfLo+Krgxz49LBU6KEaGz\nGwIDAQAB\n-----END PUBLIC KEY-----\n"
+JWT_ACCESS_PASSPHRASE=
+## for RSA use RS384, SECRET use HS384
+JWT_ACCESS_ALGORITHM=RS256
+JWT_ACCESS_EXPIRE=1h
+
+## only use on auth-api
+# JWT_REFRESH_SECRET=thisisarefreshsecret
+# JWT_REFRESH_PRIVATEKEY="-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAufuMWcfztXd9V3JbpwzzPstzYgFY6wS+pGq0ZGxMUz8bJAFK\nPAby44knaHgVdDREyldSpcOJqSsAEsfNT7kcAeGhkhdwAvDLRpN3MTHuIKRw9DBQ\nXsL1b10A74ao4n77nSIfglmUe1Daobuf8CQZVU6tkONn4B+ibP/A/cIUEwaJVyff\n8xOCq91nTNfP7l6yOBzsQE+omh5ZP3l/uQcBF42+S0URbzFoxNYnA1DPjJbuk2rU\np5o8L4JYMR7eGZriFm7A4xBftyINV4W0ptvT/S0vOT0CjXrtdz9Adpj/dpkSSiCu\ncCzKZOdm+DEuNT/WBG/GNCWfNiHZxC/qGPOJKwIDAQABAoIBAC8PRpFFNhaZ2J5y\n8lwPu9EM2/JVkvFM7wxdb63ldV6vHif7J5SO0ZDfmJgnoo4X17w3YlNNahzjI46c\n/geJOFwFgsObqJ0l3tnJ4KQTFUUvNuGjBAMmY8I9D0qMkVlWdkZpZv2tuxOE/v1j\no3G5QKvET8jUsekVOB1KjcPoAvpZA3E8T0Zy3gWw9dJmxcKq0Gq5DuXG7l2+XiuD\nR3rDF4rTzK1J1RL+syKW9T2DO8jcPF8qeHQibJKlPVT9r7B2/v2Tltee5oxyRnow\nSWOlDiN6wos0feo3gKGTKBKv0coYVryPzQ3SFBUhSCaZGQJhQRmjVmu1B4AGpSwX\nrolfmtkCgYEA58IqfvqCD9TdYb1FP5h0p5HJ/YdL7YouxCnfvaQ5BBZSmsqIhEQT\n3I/nl5dQv3nZvVkLNPt2kxfZtihjsCm0NoPPZSonAYexRSs8bpelzXDfBTzROb+E\nOE+5F0d7lYBtjpIz6DWB4pbpa8j1Js7jCit4zQtpY/ebGIzu1TGTUQcCgYEAzW+i\nhXAlEfIL/kjAZS5WzCaCdHnJBQszXqdS2pR2wwHjuUqiu/42E2tY/Szag6MIck5p\n8Rx+yuZC+jWjeO4de1Jc2Nr8ci/cLogojX1hr6hXZTB5yMspvxBm58cdOKfSnNJE\ntlWantQRoPg6Eww7+/PRuMDRjCLIcDA/c3Um0b0CgYBgOetBG6wi/KQKr/ZvqFJP\nPSYcATASabxvMF+4stYFj2su4Ab8u/NvMcTb2TTqu6IfjzgrAHnEKzP3ASAbBcXQ\nmLvk6jKV3QxKhuApnwd1nHbNCupoSs+QPfHA66oxcciLWML6mDTcqwIyAZdgTKhS\nEaivohxZKHaaI/IKTPI4wwKBgFqE/vqG8H6YxXoU+lla8rnfmgnSg6WqSsdBOPvB\nARdp5LqHTW9CUvd5jGt58Qqhsp4TOREZejDTBt4S9mXZnbnyD6Ep1KRHvF/wdNXr\nUjjBF0kp8+9qvYlHo+Aq1xBYui+JYudojsm/LclcttIfyOp6g4VByNNTnDf6umqY\nSzONAoGAMdtuB9KdZ0d4dqg8xpjM4J40Te5USS95k2iKE4eEgA2oGXPpXiyVVZxP\nKXiWGCvxKPNBiUzGeJ5RIrKh7ZauU1606ag9pkjrAJKFlQSAaDPQAHhFDbUYK6aX\nGM6qsqVdgonL8KWe7YR2AlR9N3l5SnqLvcL92Linuj9aUdhGvyM=\n-----END RSA PRIVATE KEY-----\n"
+# JWT_REFRESH_PUBLICKEY="-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAufuMWcfztXd9V3Jbpwzz\nPstzYgFY6wS+pGq0ZGxMUz8bJAFKPAby44knaHgVdDREyldSpcOJqSsAEsfNT7kc\nAeGhkhdwAvDLRpN3MTHuIKRw9DBQXsL1b10A74ao4n77nSIfglmUe1Daobuf8CQZ\nVU6tkONn4B+ibP/A/cIUEwaJVyff8xOCq91nTNfP7l6yOBzsQE+omh5ZP3l/uQcB\nF42+S0URbzFoxNYnA1DPjJbuk2rUp5o8L4JYMR7eGZriFm7A4xBftyINV4W0ptvT\n/S0vOT0CjXrtdz9Adpj/dpkSSiCucCzKZOdm+DEuNT/WBG/GNCWfNiHZxC/qGPOJ\nKwIDAQAB\n-----END PUBLIC KEY-----\n"
+# JWT_REFRESH_PASSPHRASE=
+# ## for RSA use RS384, SECRET use HS384
+# JWT_REFRESH_ALGORITHM=RS256
+# JWT_REFRESH_EXPIRE=1d
 
 #MONGO_URL=mongodb://root:password@127.0.0.1:27017/mongo?authSource=admin
 

package/dist/templates/nestjs-api/.gitignore-rename

@@ -32,4 +32,8 @@ lerna-debug.log*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
-!.vscode/extensions.json
+!.vscode/extensions.json
+
+.tomg-config
+generated
+*.pem

package/dist/templates/nestjs-api/Dockerfile

@@ -6,7 +6,7 @@ ADD ./tsconfig.json /app/
 ADD ./tsconfig.build.json /app/
 ADD ./src /app/src
 RUN npm install glob rimraf
-RUN npm install --only=development
+RUN npm install
 COPY . .
 RUN npm run build
 
@@ -14,6 +14,6 @@ RUN npm run build
 FROM node:16.14.2-alpine3.15
 WORKDIR /app/
 COPY package*.json ./
+RUN npm ci --omit=dev
 COPY --from=builder /app/dist /app/dist
-RUN npm install --only=production
 CMD ["npm", "run", "start:prod"]

package/dist/templates/nestjs-api/Makefile

@@ -82,3 +82,14 @@ spec-file:
 		echo ""; \
 		cat $$file; \
 	done;
+
+
+gen-keypair:
+	@openssl genrsa -out private.pem 2048
+	@openssl rsa -in private.pem -pubout -out public.pem
+
+view-privatekey:
+	@awk '{printf "%s\\n", $$0}' private.pem
+
+view-publickey:
+	@awk '{printf "%s\\n", $$0}' public.pem

package/dist/templates/nestjs-api/README.md

@@ -1,5 +1,9 @@
 # <%= projectName %>
 
+## Issue
+
+1. if u having Cannot find module 'typescript' error. https://github.com/toonvanstrijp/nestjs-i18n/issues/551
+
 ### Getting Started
 
 The <%= projectName %> API endpoints.

package/dist/templates/nestjs-api/nest-cli.json

@@ -3,6 +3,9 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "deleteOutDir": true
+    "deleteOutDir": true,
+    "assets": [
+      "i18n/**/*"
+    ]
   }
-}
+}

package/dist/templates/nestjs-api/package.json

@@ -20,15 +20,20 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@nathapp/common": "^0.1.10",
-    "@nathapp/nestjs-common": "^1.0.1-rc.0",
+    "@nathapp/common": "^0.1.11",
+    "@nathapp/nestjs-app": "^1.0.0-rc.2",
+    "@nathapp/nestjs-auth": "^1.0.0-rc.23",
+    "@nathapp/nestjs-common": "^1.0.1-rc.16",
+    "@nathapp/nestjs-microservices": "^1.0.0-rc.10",
     "@nestjs/common": "^9.0.0",
     "@nestjs/config": "^2.3.1",
     "@nestjs/core": "^9.0.0",
+    "@nestjs/passport": "^9.0.3",
     "@nestjs/platform-express": "^9.0.0",
     "@nestjs/swagger": "^6.2.1",
-    "class-transformer": "^0.5.1",    
-    "class-validator": "^0.14.0",    
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0",
+    "mysql2": "^2.3.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.2.0"
   },
@@ -53,6 +58,7 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.0.0",
     "tsconfig-paths": "4.1.1",
+    "typeorm-model-generator": "^0.4.6-no-engines",
     "typescript": "^4.7.4"
   },
   "jest": {
@@ -72,4 +78,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}

package/dist/templates/nestjs-api/src/app.controller.ts

@@ -1,11 +1,11 @@
 import { JsonResponse } from '@nathapp/common';
-import { Public } from '@nathapp/nestjs-common';
+import { Public } from '@nathapp/nestjs-auth';
 import { Controller, Get } from '@nestjs/common';
 import { AppService } from './app.service';
 
 @Controller()
 export class AppController {
-  constructor(private readonly appService: AppService) {}
+  constructor(private readonly appService: AppService) { }
 
   @Get('/')
   @Public()

package/dist/templates/nestjs-api/src/app.module.ts

@@ -1,10 +1,32 @@
+import {
+  DefaultJwtModuleOptionsFactory,
+  JwtModule,
+  JwtRefreshGuard,
+  JwtRefreshStrategy,
+  JwtStrategy,
+} from '@nathapp/nestjs-auth';
+import { I18nCoreModule } from '@nathapp/nestjs-common';
 import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
 
 @Module({
-  imports: [],
+  imports: [
+    ConfigModule.forRoot(),
+    JwtModule.forRootAsync({
+      imports: [ConfigModule],
+      useClass: DefaultJwtModuleOptionsFactory,
+    }),
+    I18nCoreModule.forRoot(),
+  ],
   controllers: [AppController],
-  providers: [AppService],
+  providers: [
+    AppService,
+    JwtModule,
+    JwtStrategy,
+    //JwtRefreshStrategy,
+    //JwtRefreshGuard,
+  ],
 })
-export class AppModule {}
+export class AppModule { }

package/dist/templates/nestjs-api/src/app.service.ts

@@ -1,12 +1,27 @@
 import { JsonResponse } from '@nathapp/common';
 import { Injectable } from '@nestjs/common';
-import { name, version } from '../package.json';
 
 @Injectable()
 export class AppService {
   displayVersion(): any {
     return JsonResponse.Ok({
-      version: `${name} ${version}`,
+      version: `${process.env.npm_package_name} ${process.env.npm_package_version}`,
     });
   }
+
+  appVersion(): string {
+    return process.env.npm_package_version || '1.0.0-rc.0';
+  }
+
+  appName(): string {
+    return process.env.npm_package_name || 'noname-app';
+  }
+
+  getAppInfo(): any {
+    return {
+      name: this.appName(),
+      version: this.appVersion(),
+      description: '',
+    };
+  }
 }

package/dist/templates/nestjs-api/src/i18n/en_US/exception.json

@@ -0,0 +1,11 @@
+{
+  "-1": "Unknown error occurred, Please try again later",
+  "-2": "Request Parameter Error: {param}",
+  "404": "Resource not found",
+  "501": "Internal Server Error",
+  "20000": "User does not exist",
+  "40000": "Unauthorized",
+  "40001": "Forbidden",
+  "40002": "Forbidden",
+  "40003": "Forbidden"
+}

package/dist/templates/nestjs-api/src/i18n/zh_CN/exception.json

@@ -0,0 +1,11 @@
+{
+  "-1": "发生未知错误，请稍后重试",
+  "-2": "请求参数错误: {param}",
+  "404": "找不到资源",
+  "501": "内部服务器错误",
+  "20000": "用户不存在",
+  "40000": "未授权操作",
+  "40001": "禁止访问",
+  "40002": "禁止访问",
+  "40003": "禁止访问"
+}

package/dist/templates/nestjs-api/src/i18n/zh_TW/exception.json

@@ -0,0 +1,11 @@
+{
+  "-1": "發生未知錯誤，請稍後重試",
+  "-2": "請求參數錯誤: {param}",
+  "404": "找不到資源",
+  "501": "內部服務器錯誤",
+  "20000": "用戶不存在",
+  "40000": "未授權操作",
+  "40001": "禁止訪問",
+  "40002": "禁止訪問",
+  "40003": "禁止訪問"
+}

package/dist/templates/nestjs-api/src/main.ts

@@ -1,31 +1,22 @@
-import { RequestMethod, ValidationPipe } from '@nestjs/common';
-import { HttpAdapterHost, NestFactory, Reflector } from '@nestjs/core';
-import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
+import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
-import { name, version, description } from '../package.json';
+import { AppFactory } from '@nathapp/nestjs-app';
+import { AppService } from './app.service';
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
-  const reflector = app.get(Reflector);
-  const httpAdapterHost = app.get(HttpAdapterHost);
-  app.setGlobalPrefix(process.env.GLOBAL_PREFIX || '/', {
-    exclude: [
-      { path: '/', method: RequestMethod.GET },
-      { path: '/liveness', method: RequestMethod.GET },
-      { path: '/readiness', method: RequestMethod.GET },
-    ],
+  const nestjsApp = await NestFactory.create(AppModule, {
+    logger: ['log', 'error', 'warn'],
   });
-  app.useGlobalPipes(new ValidationPipe({ forbidUnknownValues: false }));
 
-  const config = new DocumentBuilder()
-    .setTitle(name)
-    .setDescription(description)
-    .setVersion(version)
-    .addBearerAuth()
-    .build();
-  const document = SwaggerModule.createDocument(app, config);
-  SwaggerModule.setup('swagger-ui.html', app, document);
+  const app = AppFactory.useApp(nestjsApp);
+  const appService = app.get(AppService);
+  app
+    .useAppGlobalPipes()
+    .useAppGlobalPrefix()
+    .useAppGlobalFilters()
+    .useAppGlobalGuards()
+    .useSwaggerUI(appService.getAppInfo());
 
-  await app.listen(parseInt(process.env.SERVER_PORT) || 8080);
+  await app.start();
 }
 bootstrap();

package/dist/templates/nestjs-api/tsconfig.build.json

@@ -1,4 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
+  "exclude": ["generated", "node_modules", "test", "dist", "**/*spec.ts"]
 }

package/dist/templates/nestjs-api/tsconfig.json

@@ -16,7 +16,6 @@
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-    "resolveJsonModule": true
+    "noFallthroughCasesInSwitch": false
   }
 }

package/dist/templates/nestjs-library/.gitlab-ci.yml

@@ -9,7 +9,10 @@ stages:
 
 run-test:
   stage: test
-  image: node:10.13.0-jessie
+  image:
+    name: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:16.20.1-alpine-ci-1
+  script:
+    - make test
   script:
     - make test
   rules:
@@ -64,7 +67,7 @@ run-prepare:
 run-build:
   stage: build
   image: 
-    name: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:16.3.0-alpine-ci-1
+    name: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:16.20.1-alpine-ci-1
   before_script:
     - npm ci --cache .npm --prefer-offline
     - npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}

package/dist/templates/nestjs-library/package.json

@@ -5,24 +5,33 @@
   "scripts": {
     "build": "rimraf dist && tsc -p tsconfig.json",
     "precommit": "lint-staged",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "test": "jest --config ./test/jest-test.json",
+    "test:cov": "jest --config ./test/jest-test.json --coverage",
+    "test:watch": "jest --config ./test/jest-test.json --watch",
     "lint": "eslint -c .eslintrc.js"
   },
   "author": "",
   "license": "ISC",
+  "engines": {
+    "node": ">=16"
+  },
   "devDependencies": {
+    "@golevelup/ts-jest": "^0.3.7",
     "@nestjs/platform-express": "^9.0.0",
     "@nestjs/platform-fastify": "^9.0.0",
+    "@nestjs/testing": "^9.4.3",
+    "@types/jest": "^29.5.2",
     "@types/node": "^17.0.22",
+    "@types/supertest": "^2.0.12",
     "@typescript-eslint/eslint-plugin": "^4",
     "@typescript-eslint/parser": "^4",
     "eslint": "*",
     "eslint-config-prettier": "^6",
     "eslint-plugin-prettier": "^3",
+    "jest": "^29.5.0",
     "prettier": "^2",
+    "supertest": "^6.3.3",
+    "ts-jest": "^29.1.0",
     "typescript": "^4"
   },
   "types": "./index.d.ts",
@@ -32,8 +41,8 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "@nestjs/common": "*",
-    "@nestjs/core": "*",
+    "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0",
+    "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0",
     "class-transformer": "*",
     "class-validator": "*",
     "rxjs": "*"

package/dist/templates/nestjs-library/test/app/controller/hello.controller.ts

@@ -0,0 +1,7 @@
+import { Controller } from "@nestjs/common";
+
+
+@Controller('hello')
+export class HelloController {
+
+}

package/dist/templates/nestjs-library/test/jest-test.json

@@ -0,0 +1,23 @@
+{
+  "moduleFileExtensions": [
+    "js",
+    "json",
+    "ts",
+    "d.ts"
+  ],
+  "rootDir": "../",
+  "testEnvironment": "node",
+  "testRegex": ".spec.ts$",
+  "transform": {
+    "^.+\\.(t|j)s$": [
+      "ts-jest",
+      {
+        "diagnostics": true
+      }
+    ]
+  },
+  "collectCoverageFrom": [
+    "src/**/*.ts",
+    "!**/node_modules/**"
+  ]
+}

package/dist/templates/nestjs-library/tsconfig.build.json

@@ -1,4 +1,7 @@
 {
   "extends": "./tsconfig.json",
+  "include": [
+    "src/**/*"
+  ],  
   "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
 }

package/dist/templates/ts-library/.gitlab-ci.yml

@@ -9,7 +9,8 @@ stages:
 
 run-test:
   stage: test
-  image: node:10.13.0-jessie
+  image:
+    name: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:16.20.1-alpine-ci-1
   script:
     - make test
   rules:
@@ -64,7 +65,7 @@ run-prepare:
 run-build:
   stage: build
   image: 
-    name: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:16.3.0-alpine-ci-1
+    name: registry-intl.cn-hongkong.aliyuncs.com/gkci/node:16.20.1-alpine-ci-1
   before_script:
     - npm ci --cache .npm --prefer-offline
     - npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}

package/dist/templates/ts-library/Makefile

@@ -47,9 +47,9 @@ version:
 name:
 	@echo $(SERVICE_NAME)
 
-## can add npm run test on here to run test before build
 test:
-	@echo "Skipped"
+	@npm ci --cache .npm --prefer-offline
+	@npm test
 
 build:
 	@npm run build

package/dist/templates/ts-library/package.json

@@ -5,25 +5,24 @@
   "scripts": {
     "build": "rimraf dist && tsc -p tsconfig.json",
     "precommit": "lint-staged",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "test": "jest --config ./test/jest-test.json",
+    "test:cov": "jest --config ./test/jest-test.json --coverage",
+    "test:watch": "jest --config ./test/jest-test.json --watch",
     "lint": "eslint -c .eslintrc.js"
   },
   "author": "<%= author %>",
   "license": "ISC",
   "devDependencies": {
-    "@types/jest": "^28.1.6",
+    "@types/jest": "^29.5.2",
     "@types/node": "^18.11.18",
     "@typescript-eslint/eslint-plugin": "^4.3.5",
     "@typescript-eslint/parser": "^4.3.5",
     "eslint": "*",
     "eslint-config-prettier": "^6",
     "eslint-plugin-prettier": "^3",
-    "jest": "^28.1.3",
+    "jest": "^29.5.0",
     "prettier": "^2",
-    "ts-jest": "^28.0.7",
+    "ts-jest": "^29.1.0",
     "typescript": "^4.3.5"
   },
   "types": "./index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/na-cli",
-  "version": "1.0.0-rc.41",
+  "version": "1.0.0-rc.42",
   "main": "dist/index.js",
   "scripts": {
     "start": "npm run build && node dist/index.js",