tspace-mysql 1.4.7 → 1.4.9

package/dist/lib/tspace/Schema.js

@@ -55,9 +55,9 @@ class Schema extends Builder_1.Builder {
                     ];
                 }
                 const sql = [
-                    `CREATE TABLE IF NOT EXISTS`,
+                    `${this.$constants('CREATE_TABLE_NOT_EXISTS')}`,
                     `${table} (${columns === null || columns === void 0 ? void 0 : columns.join(',')})`,
-                    `ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8`
+                    `${this.$constants('ENGINE')}`
                 ].join(' ');
                 yield this.query(sql);
                 console.log(`Migrats : '${table}' created successfully`);
@@ -78,9 +78,9 @@ class Schema extends Builder_1.Builder {
                 ];
             }
             const sql = [
-                `CREATE TABLE IF NOT EXISTS`,
+                `${this.$constants('CREATE_TABLE_NOT_EXISTS')}`,
                 `${table} (${columns === null || columns === void 0 ? void 0 : columns.join(', ')})`,
-                `ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8`
+                `${this.$constants('ENGINE')}`
             ].join(' ');
             return sql;
         };
@@ -175,7 +175,6 @@ class Schema extends Builder_1.Builder {
         return __awaiter(this, void 0, void 0, function* () {
             const checkTables = yield new Builder_1.Builder().query('SHOW TABLES');
             const existsTables = checkTables.map((c) => Object.values(c)[0]);
-            // console.log(checkTables)
             for (const model of models) {
                 if (model == null)
                     continue;
@@ -256,10 +255,8 @@ class Schema extends Builder_1.Builder {
                     yield new Builder_1.Builder().debug(log).query(sql);
                 }
                 catch (e) {
-                    if (typeof foreign.on === "string") {
-                        console.log(e);
+                    if (typeof foreign.on === "string")
                         continue;
-                    }
                     if (String(e.message).includes("Duplicate foreign key constraint"))
                         continue;
                     const schemaModelOn = yield foreign.on.getSchemaModel();

package/dist/lib/tspace/index.d.ts

@@ -2,14 +2,18 @@ import DB from './DB';
 import Model from './Model';
 import Schema from './Schema';
 import Blueprint from './Blueprint';
+import Pool from '../connection';
 export { DB };
 export { Model };
 export { Schema };
 export { Blueprint };
+export { Pool };
+export * from './Decorator';
 declare const _default: {
     DB: typeof DB;
     Model: typeof Model;
     Schema: typeof Schema;
     Blueprint: typeof Blueprint;
+    Pool: import("../Interface").Connection;
 };
 export default _default;

package/dist/lib/tspace/index.js

@@ -1,9 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Blueprint = exports.Schema = exports.Model = exports.DB = void 0;
+exports.Pool = exports.Blueprint = exports.Schema = exports.Model = exports.DB = void 0;
 const DB_1 = __importDefault(require("./DB"));
 exports.DB = DB_1.default;
 const Model_1 = __importDefault(require("./Model"));
@@ -12,9 +26,13 @@ const Schema_1 = __importDefault(require("./Schema"));
 exports.Schema = Schema_1.default;
 const Blueprint_1 = __importDefault(require("./Blueprint"));
 exports.Blueprint = Blueprint_1.default;
+const connection_1 = __importDefault(require("../connection"));
+exports.Pool = connection_1.default;
+__exportStar(require("./Decorator"), exports);
 exports.default = {
     DB: DB_1.default,
     Model: Model_1.default,
     Schema: Schema_1.default,
-    Blueprint: Blueprint_1.default
+    Blueprint: Blueprint_1.default,
+    Pool: connection_1.default
 };

package/dist/lib/utils/index.d.ts

@@ -7,6 +7,7 @@ declare const utils: {
     timestamp: (dateString?: string) => string;
     date: () => string;
     escape: (str: any) => any;
+    escapeXSS: (str: any) => any;
     isSubQuery: (subQuery: string) => boolean;
     generateUUID: () => string;
     covertBooleanToNumber: (data: any) => any;

package/dist/lib/utils/index.js

@@ -49,6 +49,13 @@ const escape = (str) => {
         return str;
     return str.replace(/[\0\b\t\n\r\x1a\'\\]/g, '');
 };
+const escapeXSS = (str) => {
+    if (typeof str !== 'string')
+        return str;
+    return str
+        .replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '')
+        .replace(/on\w+="[^"]+"/g, '');
+};
 const isSubQuery = (subQuery) => {
     const checkIsSubQuery = (/\bSELECT\s+(?!\*)/i.test(subQuery));
     if (!checkIsSubQuery)
@@ -149,6 +156,7 @@ const randomString = (length = 100) => {
 };
 const faker = (value) => {
     var _a, _b;
+    value = value.toLocaleLowerCase();
     if (!value.search('timestamp'))
         return timestamp();
     if (!value.search('datetime'))
@@ -196,6 +204,7 @@ const utils = {
     timestamp,
     date,
     escape,
+    escapeXSS,
     isSubQuery,
     generateUUID,
     covertBooleanToNumber,

package/dist/tests/01-Pool.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/01-Pool.test.js

@@ -0,0 +1,45 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const mocha_1 = require("mocha");
+const lib_1 = require("../lib");
+(0, mocha_1.describe)('Testing Pool', function () {
+    /* ##################################################### */
+    (0, mocha_1.it)('Pool: It is can doing ?', function () {
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, chai_1.expect)(lib_1.Pool).to.have.an('object');
+            (0, chai_1.expect)(lib_1.Pool).to.have.property('query');
+            (0, chai_1.expect)(lib_1.Pool).to.have.property('connection');
+            (0, chai_1.expect)(lib_1.Pool.connection).to.be.a('function');
+            (0, chai_1.expect)(lib_1.Pool.query).to.be.a('function');
+            const query = yield lib_1.Pool.query('SELECT 1 as ping');
+            (0, chai_1.expect)(query).to.be.an('array');
+            (0, chai_1.expect)(query.length).to.be.equal(1);
+            (0, chai_1.expect)(query[0].ping).to.be.equal(1);
+            const connect = yield lib_1.Pool.connection();
+            (0, chai_1.expect)(connect).to.be.an('object');
+            (0, chai_1.expect)(connect).to.have.property('query');
+            (0, chai_1.expect)(connect).to.have.property('startTransaction');
+            (0, chai_1.expect)(connect).to.have.property('commit');
+            (0, chai_1.expect)(connect).to.have.property('rollback');
+            (0, chai_1.expect)(connect.startTransaction).to.be.a('function');
+            (0, chai_1.expect)(connect.commit).to.be.a('function');
+            (0, chai_1.expect)(connect.rollback).to.be.a('function');
+            (0, chai_1.expect)(connect.query).to.be.an('function');
+            const connectQuery = yield connect.query('SELECT 1 as ping');
+            (0, chai_1.expect)(connectQuery).to.be.an('array');
+            (0, chai_1.expect)(connectQuery.length).to.be.equal(1);
+            (0, chai_1.expect)(connectQuery[0].ping).to.be.equal(1);
+        });
+    });
+    /* ###################################################### */
+});

package/dist/tests/02-DB.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/02-DB.test.js

@@ -0,0 +1,109 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = __importStar(require("chai"));
+const mocha_1 = require("mocha");
+const chai_json_schema_1 = __importDefault(require("chai-json-schema"));
+const lib_1 = require("../lib");
+chai_1.default.use(chai_json_schema_1.default);
+(0, mocha_1.describe)('Testing DB', function () {
+    /* ##################################################### */
+    (0, mocha_1.it)(`DB: await new DB('users').get()
+    It should return an array and must have all user schema attributes`, function () {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield new lib_1.DB('users').get();
+            (0, chai_1.expect)(results).to.be.an('array');
+            const usersSchema = {
+                type: 'array',
+                items: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'integer' },
+                        uuid: { anyOf: [{ type: 'string' }, { type: 'null' }] },
+                        email: { type: 'string' },
+                        name: { anyOf: [{ type: 'string' }, { type: 'null' }] },
+                        username: { type: 'string' },
+                        password: { type: 'string' },
+                        createdAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                        updatedAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                        deletedAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                    }
+                }
+            };
+            (0, chai_1.expect)(results).to.be.jsonSchema(usersSchema);
+        });
+    });
+    (0, mocha_1.it)(`DB: await new DB('users').first()
+    It should returns an object and must have all user schema attributes`, function () {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield new lib_1.DB('users').first();
+            (0, chai_1.expect)(results).to.be.an('object');
+            const userSchema = {
+                type: 'object',
+                properties: {
+                    id: { type: 'integer' },
+                    uuid: { anyOf: [{ type: 'string' }, { type: 'null' }] },
+                    email: { type: 'string' },
+                    name: { anyOf: [{ type: 'string' }, { type: 'null' }] },
+                    username: { type: 'string' },
+                    password: { type: 'string' },
+                    createdAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                    updatedAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                    deletedAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                }
+            };
+            (0, chai_1.expect)(results).to.be.jsonSchema(userSchema);
+        });
+    });
+    (0, mocha_1.it)(`DB: await new DB('users').select('id').first()
+    It should returns an object and must only have an 'id'`, function () {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield new lib_1.DB('users').select('id').first();
+            (0, chai_1.expect)(results).to.be.an('object');
+            (0, chai_1.expect)(results).to.have.property('id');
+        });
+    });
+    (0, mocha_1.it)(`DB: await new DB('users').except('id').first()
+    It should returns an object and must only have an 'id'`, function () {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield new lib_1.DB('users').except('id').first();
+            (0, chai_1.expect)(results).to.be.an('object');
+            (0, chai_1.expect)(results).to.not.have.property('id');
+        });
+    });
+    /* ###################################################### */
+});

package/dist/tests/03-Model.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/03-Model.test.js

@@ -0,0 +1,73 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = __importStar(require("chai"));
+const mocha_1 = require("mocha");
+const chai_json_schema_1 = __importDefault(require("chai-json-schema"));
+const lib_1 = require("../lib");
+chai_1.default.use(chai_json_schema_1.default);
+class User extends lib_1.Model {
+}
+(0, mocha_1.describe)('Testing Model', function () {
+    /* ##################################################### */
+    (0, mocha_1.it)('Try to select * from users with User Model ?', function () {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield new User().get();
+            (0, chai_1.expect)(results).to.be.an('array');
+            const usersSchema = {
+                type: 'array',
+                items: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'integer' },
+                        uuid: { anyOf: [{ type: 'string' }, { type: 'null' }] },
+                        email: { type: 'string' },
+                        name: { anyOf: [{ type: 'string' }, { type: 'null' }] },
+                        username: { type: 'string' },
+                        password: { type: 'string' },
+                        createdAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                        updatedAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                        deletedAt: { anyOf: [{ type: 'string' }, { type: 'date' }, { type: 'null' }] },
+                    },
+                    required: ['uuid'],
+                }
+            };
+            (0, chai_1.expect)(results).to.be.jsonSchema(usersSchema);
+        });
+    });
+    /* ###################################################### */
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "mysql query builder object relational mapping",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -47,10 +47,21 @@
   "homepage": "https://github.com/thanathip41",
   "scripts": {
     "build": "tsc",
-    "prepare": "npm run build"
+    "prepare": "npm run build",
+    "test:build": "mocha './dist/tests/**/*.test.js' --reporter spec --no-timeouts --recursive   --exit",
+    "test": "ts-mocha './src/tests/**/*.test.ts' --reporter spec --no-timeouts --recursive   --exit"
   },
   "devDependencies": {
+    "@types/chai": "^4.3.11",
+    "@types/chai-json-schema": "^1.4.9",
+    "@types/mocha": "^10.0.6",
     "@types/mysql": "^2.15.19",
-    "@types/pluralize": "^0.0.29"
+    "@types/pluralize": "^0.0.29",
+    "chai": "4.3.10",
+    "chai-json-schema": "^1.5.1",
+    "mocha": "^10.2.0",
+    "mochawesome": "^7.1.3",
+    "ts-mocha": "^10.0.0",
+    "typescript": "^5.3.3"
   }
 }