nest-knexjs 0.0.8 → 0.0.11

package/.github/workflows/codeql-analysis.yml

@@ -15,17 +15,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: javascript
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

package/.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install commitlint --edit $1

package/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo_text.svg" width="320" alt="Nest Logo" /></a>
+  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="200" alt="Nest Logo" /></a>
 </p>
 
 [circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
@@ -51,7 +51,7 @@ or
 - [Usage](#usage)
   - [KnexModule](#knexmodule)
   - [ExampleOfUse](#example-of-use)
-  - [MultiConnectionsDatabae](#multi-connections-database)
+  - [MultiConnectionsDatabase](#multi-connections-database)
   - [CreateMigrations](#create-migrations)
   - [RunMigrations](#run-migrations)
   - [CreateSeeds](#create-seeds) 
@@ -134,7 +134,7 @@ export class UsersController {
   constructor(private readonly usersService: UsersService) {}
 
   @Get()
-  async getHello() {
+  async getAllUsers() {
     return await this.usersService.findAll();
   }
 }
@@ -224,7 +224,6 @@ export class PostService {
   }
 
   async findAll() {
-    console.log(this.knexConnection);
     const posts = await this.knexConnection.table('posts');
     return { posts };
   }

package/dist/common/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/common/knex.utils.d.ts

@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
  * @returns {string} The Entity injection token
  */
 export declare function getModelToken(model: Function, connection?: KnexModuleOptions | string): string;
-export declare function getConnectionToken(connection?: KnexModuleOptions | any): string | Function;
+export declare function getConnectionToken(connection?: KnexModuleOptions | string): string | Function;
 /**
  * This function returns a Connection prefix based on the connection name
  * @param {KnexModuleOptions | string} [connection='default'] This optional parameter is either

package/dist/common/knex.utils.js

@@ -22,6 +22,9 @@ function getModelToken(model, connection = knex_constants_1.DEFAULT_CONNECTION_N
 }
 exports.getModelToken = getModelToken;
 function getConnectionToken(connection = knex_constants_1.DEFAULT_CONNECTION_NAME) {
+    if (typeof connection === 'string') {
+        return connection;
+    }
     return `${connection.name || knex_constants_1.DEFAULT_CONNECTION_NAME}`;
 }
 exports.getConnectionToken = getConnectionToken;

package/dist/exceptions/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/interfaces/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nest-knexjs",
-  "version": "0.0.8",
+  "version": "0.0.11",
   "description": "Knexjs module for Nest framework (node.js) 😻",
   "author": "Tony133",
   "license": "MIT",
@@ -15,55 +15,48 @@
     "test:e2e": "jest --config ./tests/jest-e2e.json --runInBand",
     "test:e2e:dev": "jest --config ./tests/jest-e2e.json --runInBand --watch",
     "prerelease": "npm run build",
-    "release": "release-it"
+    "release": "release-it",
+    "prepare": "husky install"
   },
   "devDependencies": {
-    "@commitlint/cli": "16.1.0",
-    "@commitlint/config-angular": "16.0.0",
-    "@nestjs/common": "8.2.6",
-    "@nestjs/core": "8.2.6",
-    "@nestjs/platform-express": "8.2.6",
-    "@nestjs/testing": "8.2.6",
+    "@commitlint/cli": "17.0.3",
+    "@commitlint/config-angular": "17.0.3",
+    "@nestjs/common": "8.4.7",
+    "@nestjs/core": "8.4.7",
+    "@nestjs/platform-express": "8.4.7",
+    "@nestjs/testing": "8.4.7",
     "@types/express": "4.17.13",
-    "@types/node": "16.11.21",
-    "@types/jest": "27.4.0",
-    "@types/supertest": "2.0.11",
-    "@typescript-eslint/eslint-plugin": "5.10.1",
-    "@typescript-eslint/parser": "5.10.1",
-    "eslint": "8.8.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-import": "2.25.4",
-    "knex": "1.0.1",
+    "@types/node": "16.11.43",
+    "@types/jest": "28.1.4",
+    "@types/supertest": "2.0.12",
+    "@typescript-eslint/eslint-plugin": "5.30.5",
+    "@typescript-eslint/parser": "5.30.5",
+    "eslint": "8.19.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-import": "2.26.0",
+    "knex": "2.1.0",
     "mysql": "2.18.1",
-    "husky": "7.0.4",
-    "prettier": "2.5.1",
-    "jest": "27.4.7",
+    "husky": "8.0.1",
+    "prettier": "2.7.1",
+    "jest": "28.1.2",
     "reflect-metadata": "0.1.13",
-    "release-it": "14.12.4",
-    "supertest": "6.2.2",
-    "ts-node": "10.4.0",
-    "rxjs": "7.5.2",
-    "ts-jest": "27.1.3",
-    "tsconfig-paths": "3.12.0",
-    "typescript": "4.5.5"
+    "release-it": "15.1.1",
+    "supertest": "6.2.4",
+    "ts-node": "10.8.2",
+    "rxjs": "7.5.5",
+    "ts-jest": "28.0.5",
+    "tsconfig-paths": "4.0.0",
+    "typescript": "4.7.4"
   },
   "peerDependencies": {
     "@nestjs/common": "^7.0.0 || ^8.0.0",
     "@nestjs/core": "^7.0.0 || ^8.0.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^6.6.3 || ^7.2.0",
-    "knex": "^0.21.17 || ^0.95.0 || ^1.0.0"
+    "knex": "^0.21.17 || ^0.95.0 || ^1.0.0 || ^2.0.0"
   },
   "lint-staged": {
-    "*.ts": [
-      "prettier --write"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -c .commitlintrc.json -E HUSKY_GIT_PARAMS",
-      "pre-commit": "lint-staged"
-    }
+    "**/*.{ts,json}": []
   },
   "repository": {
     "type": "git",

package/tests/app-knex/app/app.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { KnexModule } from '../../lib';
+import { KnexModule } from '../../../lib';
 import { UsersModule } from './users/users.module';
 
 @Module({
@@ -11,6 +11,7 @@ import { UsersModule } from './users/users.module';
         useNullAsDefault: true,
         connection: {
           host: '127.0.0.1',
+          port: 3308,
           user: 'root',
           password: 'root',
           database: 'test',

package/tests/app-multi-database/app/app.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { KnexModule } from '../../lib';
+import { KnexModule } from '../../../lib';
 import { PostModule } from './post/post.module';
 import { UsersModule } from './users/users.module';
 

package/tests/app-multi-database/app/users/users.controller.ts

@@ -3,9 +3,9 @@ import {
   Get,
   Post,
   Body,
-  Put,
   Param,
   Delete,
+  Patch,
 } from '@nestjs/common';
 import { UsersService } from './users.service';
 import { CreateUserDto } from './dto/create-user.dto';
@@ -30,7 +30,7 @@ export class UsersController {
     return this.usersService.findOne(+id);
   }
 
-  @Put(':id')
+  @Patch(':id')
   update(@Param('id') id: string, @Body() updateUserDto: UpdateUserDto) {
     return this.usersService.update(+id, updateUserDto);
   }

package/tests/jest-e2e.json

@@ -1,4 +1,3 @@
-
 {
     "moduleFileExtensions": ["js", "json", "ts"],
     "rootDir": "..",
@@ -7,4 +6,4 @@
     "transform": {
       "^.+\\.(t|j)s$": "ts-jest"
     }
-  }
+}

package/tsconfig.build.json

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

package/dist/entities-metadata.storage.d.ts

@@ -1,8 +0,0 @@
-import { KnexModuleOptions } from './interfaces';
-declare type ConnectionToken = KnexModuleOptions | string;
-export declare class EntitiesMetadataStorage {
-    private static readonly storage;
-    static addEntitiesByConnection(connection: ConnectionToken, entities: Function[]): void;
-    static getEntitiesByConnection(connection: ConnectionToken): Function[];
-}
-export {};

package/dist/entities-metadata.storage.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntitiesMetadataStorage = void 0;
-class EntitiesMetadataStorage {
-    static addEntitiesByConnection(connection, entities) {
-        const connectionToken = typeof connection === 'string' ? connection : connection.name;
-        if (!connectionToken) {
-            return;
-        }
-        let collection = this.storage.get(connectionToken);
-        if (!collection) {
-            collection = [];
-            this.storage.set(connectionToken, collection);
-        }
-        entities.forEach(entity => {
-            if (collection.includes(entity)) {
-                return;
-            }
-            collection.push(entity);
-        });
-    }
-    static getEntitiesByConnection(connection) {
-        const connectionToken = typeof connection === 'string' ? connection : connection.name;
-        if (!connectionToken) {
-            return [];
-        }
-        return this.storage.get(connectionToken) || [];
-    }
-}
-exports.EntitiesMetadataStorage = EntitiesMetadataStorage;
-EntitiesMetadataStorage.storage = new Map();