@nathapp/na-cli 1.0.1-rc.0 → 1.0.1-rc.6

package/.gitlab-ci.yml

@@ -77,20 +77,18 @@ run-build:
     - npm config set ${NPM_REGISTRY}:_authToken ${NPM_RELEASE_TOKEN}
   script:
     - make build
-    - make release
+    - REGISTRY=https:${NPM_REGISTRY} make release-with-registry
   rules:
     # NOT triggerred by bot and NOT commit message contains `run-without-release` keyword and NOT merge request and NOT tag was created
     - if: '$CI_COMMIT_MESSAGE =~ /release-by-bot/ || $CI_COMMIT_MESSAGE =~ /run-without-release/ || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_TAG != null'
       when: never
     # Commit message contains `run-prerelease` keyword and commit branch is not default branch (master)
-    - if: '$CI_COMMIT_MESSAGE =~ /run-prerelease/ && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_MESSAGE =~ /run-prerelease/ && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'      
+      variables:                              
+        NPM_REGISTRY: //npm.nathapp.io/  # Override NPM_REGISTRY defined at the job level.  
+        NPM_RELEASE_TOKEN: $NPM_PRIVATE_TOKEN     
     # Commit into default branch (master)
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'  
-    # Override VARIABLES if not default branch (master)   
-    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
-      variables:                              # Override NPM_REGISTRY defined
-        NPM_REGISTRY: "//npm.nathapp.io/"  # at the job level.  
-        NPM_RELEASE_TOKEN: $NPM_PRIVATE_TOKEN     
 
 run-build-commit:
   stage: build-commit

package/Makefile

@@ -58,17 +58,5 @@ build:
 release:
 	@npm publish --access public
 
-# build-prerelease: version-prerelease
-# 	@npm run build
-
-# build: version-patch
-# 	@npm run build
-
-# release: 
-# 	@npm publish --access public
-
-# publish-prerelease: build-prerelease 
-# 	@make --no-print-directory release
-
-# publish: build 
-# 	@make --no-print-directory release
+release-with-registry:
+	@npm publish --access public --registry=${REGISTRY}

package/README.md

@@ -12,10 +12,12 @@ 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 ^10.0.0
-   - with @nathapp/common ^0.1.11
-   - with @nathapp/nestjs-common ^1.0.1-rc.21
-   - with @nathapp/nestjs-app ^1.0.0-rc.7  
-   - with @nathapp/nestjs-auth ^1.0.0-rc.24     
+   - with @nathapp/common ^0.1.13
+   - with @nathapp/nestjs-app ^1.0.0-rc.10 
+   - with @nathapp/nestjs-auth ^1.0.0-rc.28     
+   - with @nathapp/nestjs-common ^1.0.1-rc.28
+   - with @nathapp/nestjs-data ^1.0.0-rc.13
+   - with @nathapp/nestjs-microservices ^1.0.0-rc.14
 6. nestjs-library 1.0.0
    - with nestjs ^10.0.0
 

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

@@ -1,8 +1,8 @@
 {
   "name": "<%= projectName %>",
   "version": "1.0.0-rc.0",
-  "description": "",
-  "author": "",
+  "description": "<%= projectName %>",
+  "author": "<%= author %>",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -11,7 +11,7 @@
     "start": "nest start",
     "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
-    "start:prod": "node dist/main",
+    "start:prod": "ENV_NAME=production node dist/main",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -21,11 +21,12 @@
   },
   "dependencies": {
     <%if (isFastify) { -%>"@fastify/static": "^6.11.2",<% }-%>       
-    "@nathapp/common": "^0.1.11",
-    "@nathapp/nestjs-app": "^1.0.0-rc.7",
-    "@nathapp/nestjs-auth": "^1.0.0-rc.24",
-    "@nathapp/nestjs-common": "^1.0.1-rc.21",
-    "@nathapp/nestjs-microservices": "^1.0.0-rc.12",
+    "@nathapp/common": "^0.1.13",
+    "@nathapp/nestjs-app": "^1.0.0-rc.10",
+    "@nathapp/nestjs-auth": "^1.0.0-rc.28",
+    "@nathapp/nestjs-common": "^1.0.1-rc.28",
+    "@nathapp/nestjs-data": "^1.0.0-rc.13",
+    "@nathapp/nestjs-microservices": "^1.0.0-rc.14",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.0.0",
     "@nestjs/core": "^10.0.0",
@@ -39,6 +40,7 @@
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
+    "@golevelup/ts-jest": "^0.4.0",    
     "@nestjs/cli": "^10.0.0",
     "@nestjs/schematics": "^10.0.0",
     "@nestjs/testing": "^10.0.0",
@@ -77,6 +79,9 @@
       "**/*.(t|j)s"
     ],
     "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "moduleNameMapper": {
+      "^@/(.*)$": "<rootDir>/../src/$1"
+    }
   }
 }

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

@@ -1,9 +1,10 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { AppController } from './app.controller';
-import { AppService } from './app.service';
+import { AppService } from '@/app.service';
 
 describe('AppController', () => {
   let appController: AppController;
+  let appService: AppService;
 
   beforeEach(async () => {
     const app: TestingModule = await Test.createTestingModule({
@@ -12,11 +13,12 @@ describe('AppController', () => {
     }).compile();
 
     appController = app.get<AppController>(AppController);
+    appService = app.get(AppService);
   });
 
-  // describe('root', () => {
-  //   it('should return "Hello World!"', () => {
-  //     expect(appController.getHello()).toBe('Hello World!');
-  //   });
-  // });
+  describe('root', () => {
+    it('should return "App Version"', () => {
+      expect(appController.get()).toEqual(appService.displayVersion());
+    });
+  });
 });

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

@@ -5,8 +5,13 @@ import {
   JwtRefreshStrategy,
   JwtStrategy,
 } from '@nathapp/nestjs-auth';
-import { I18nCoreModule } from '@nathapp/nestjs-common';
-import { Module } from '@nestjs/common';
+import { I18nCoreModule, LoggerMiddleware } from '@nathapp/nestjs-common';
+import {
+  MiddlewareConsumer,
+  Module,
+  NestModule,
+  RequestMethod,
+} from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
@@ -29,4 +34,16 @@ import { AppService } from './app.service';
     //JwtRefreshGuard,
   ],
 })
-export class AppModule { }
+export class AppModule implements NestModule {
+  configure(consumer: MiddlewareConsumer) {
+    consumer
+      .apply(LoggerMiddleware)
+      .exclude(
+        { path: '/', method: RequestMethod.GET },
+        { path: '/favicon.ico', method: RequestMethod.GET },
+        { path: '/liveness', method: RequestMethod.GET },
+        { path: '/readiness', method: RequestMethod.GET },
+      )
+      .forRoutes({ path: '*', method: RequestMethod.ALL });
+  }
+}

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

@@ -1,7 +1,7 @@
 {
   "-1": "Unknown error occurred, Please try again later",
   "-2": "Request Parameter Error: {param}",
-  "-3": "Invalid Request",  
+  "-3": "Bad Request",  
   "404": "Resource not found",
   "501": "Internal Server Error",
   "20000": "User does not exist",

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

@@ -19,7 +19,7 @@ async function bootstrap() {
     .useAppGlobalPrefix()
     .useAppGlobalFilters()
     .useAppGlobalGuards()
-    .useSwaggerUI(appService.getAppInfo());
+    .useSwaggerUIOnDevOnly(appService.getAppInfo());
 
   await app.start();
 }

package/dist/templates/nestjs-api/test/app.e2e-spec.ts

@@ -2,23 +2,46 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
 import * as request from 'supertest';
 import { AppModule } from './../src/app.module';
+import { AppService } from './../src/app.service';
+<%if (isFastify) { -%>
+import {
+  FastifyAdapter,
+  NestFastifyApplication,
+} from '@nestjs/platform-fastify';
+<% }-%>  
 
 describe('AppController (e2e)', () => {
   let app: INestApplication;
-
+  let appService: AppService;
+  
   beforeEach(async () => {
     const moduleFixture: TestingModule = await Test.createTestingModule({
       imports: [AppModule],
     }).compile();
 
+    <%if (isFastify) { -%>
+    app = moduleFixture.createNestApplication<NestFastifyApplication>(
+      new FastifyAdapter(),
+    );
+    <% } else{ %>  
     app = moduleFixture.createNestApplication();
-    await app.init();
+    <% }-%>     
+    appService = app.get(AppService);    
+    await app.init();    
+    <%if (isFastify) { -%>
+    await app.getHttpAdapter().getInstance().ready();
+    <% }-%>     
   });
 
+  afterEach(async () => {
+    await app.close();
+  });  
+
   it('/ (GET)', () => {
+    const response = appService.displayVersion();
     return request(app.getHttpServer())
       .get('/')
       .expect(200)
-      .expect('Hello World!');
+      .expect({ ret: response.ret, data: response.data });
   });
 });

package/dist/templates/nestjs-api/test/jest-e2e.json

@@ -5,5 +5,8 @@
   "testRegex": ".e2e-spec.ts$",
   "transform": {
     "^.+\\.(t|j)s$": "ts-jest"
-  }
+  },
+  "moduleNameMapper": {
+    "^@/(.*)$": "<rootDir>/../src/$1"
+  }   
 }

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

@@ -16,6 +16,9 @@
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false
+    "noFallthroughCasesInSwitch": false,
+    "paths": {
+      "@/*": ["src/*"],
+    }    
   }
 }

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

@@ -10,7 +10,7 @@
     "test:watch": "jest --config ./test/jest-test.json --watch",
     "lint": "eslint -c .eslintrc.js"
   },
-  "author": "",
+  "author": "<%= author %>",
   "license": "ISC",
   "engines": {
     "node": ">=16"

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

@@ -1,7 +1,7 @@
 {
   "name": "<%= projectName %>",
   "version": "1.0.0-rc.0",
-  "description": "na-cli generated ts-library 1.0.0",
+  "description": "<%= projectName %>",
   "scripts": {
     "build": "rimraf dist && tsc -p tsconfig.json",
     "precommit": "lint-staged",

package/dist/utils/help.js

@@ -0,0 +1,8 @@
+// function showHelp() {
+//   console.log(usage);
+//   console.log('\nOptions:\r')
+//   console.log('\t--version\t      ' + 'Show version number.' + '\t\t' + '[boolean]\r')
+//   console.log('    -l, --languages\t' + '      ' + 'List all languages.' + '\t\t' + '[boolean]\r')
+//   console.log('\t--help\t\t      ' + 'Show help.' + '\t\t\t' + '[boolean]\n')
+// }
+//# sourceMappingURL=help.js.map

package/dist/utils/help.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/utils/help.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,wBAAwB;AACxB,gCAAgC;AAChC,yFAAyF;AACzF,qGAAqG;AACrG,gFAAgF;AAChF,IAAI"}

package/package.json

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