namirasoft-node 1.2.2 → 1.2.4

package/dist/BaseApplication.js

@@ -121,13 +121,13 @@ class BaseApplication {
             let result = yield builder.run();
             if (!fs_1.default.existsSync(this.swagger_dir))
                 fs_1.default.mkdirSync(this.swagger_dir, { recursive: true });
-            for (let i = 0; i < result.controllers.length; i++) {
-                const lines = result.controllers[i];
-                fs_1.default.writeFileSync(this.swagger_dir + "/controller_" + i + ".swg", lines.join("\n"));
+            for (let name of Object.keys(result.controllers)) {
+                const lines = result.controllers[name];
+                fs_1.default.writeFileSync(this.swagger_dir + "/controller_" + name + ".swg", lines.join("\n"));
             }
             for (let name of Object.keys(result.classes)) {
                 const lines = result.classes[name];
-                fs_1.default.writeFileSync(this.swagger_dir + "/" + name + ".swg", lines.join("\n"));
+                fs_1.default.writeFileSync(this.swagger_dir + "/model_" + name + ".swg", lines.join("\n"));
             }
         });
     }

package/dist/BaseApplication.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseApplication.js","sourceRoot":"","sources":["../src/BaseApplication.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseApplication.js","sourceRoot":"","sources":["../src/BaseApplication.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -3,10 +3,6 @@ export * from "./BaseApplication";
 export * from "./BaseApplicationLink";
 export * from "./BaseController";
 export * from "./BaseDatabase";
-export * from "./BaseMySqlDatabase";
-export * from "./BaseSequelizeDatabase";
-export * from "./BaseSequelizeModel";
-export * from "./BaseSequelizeTable";
 export * from "./BaseTable";
 export * from "./EmailService";
 export * from "./EnvService";

package/dist/index.js

@@ -19,10 +19,6 @@ __exportStar(require("./BaseApplication"), exports);
 __exportStar(require("./BaseApplicationLink"), exports);
 __exportStar(require("./BaseController"), exports);
 __exportStar(require("./BaseDatabase"), exports);
-__exportStar(require("./BaseMySqlDatabase"), exports);
-__exportStar(require("./BaseSequelizeDatabase"), exports);
-__exportStar(require("./BaseSequelizeModel"), exports);
-__exportStar(require("./BaseSequelizeTable"), exports);
 __exportStar(require("./BaseTable"), exports);
 __exportStar(require("./EmailService"), exports);
 __exportStar(require("./EnvService"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,oDAAkC;AAClC,wDAAsC;AACtC,mDAAiC;AACjC,iDAA+B;AAC/B,sDAAoC;AACpC,0DAAwC;AACxC,uDAAqC;AACrC,uDAAqC;AACrC,8CAA4B;AAC5B,iDAA+B;AAC/B,+CAA6B;AAC7B,gDAA8B;AAC9B,yCAAuB;AACvB,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,oDAAkC;AAClC,wDAAsC;AACtC,mDAAiC;AACjC,iDAA+B;AAC/B,8CAA4B;AAC5B,iDAA+B;AAC/B,+CAA6B;AAC7B,gDAA8B;AAC9B,yCAAuB;AACvB,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C"}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "namirasoft-node",
     "description": "Namira Software Corporation Node NPM Package",
-    "version": "1.2.2",
+    "version": "1.2.4",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "scripts": {},
@@ -11,7 +11,7 @@
         "@supercharge/request-ip": "^1.2.0",
         "@types/cors": "^2.8.17",
         "@types/express": "^4.17.21",
-        "@types/node": "^20.10.0",
+        "@types/node": "^20.10.2",
         "@types/nodemailer": "^6.4.14",
         "@types/nodemailer-smtp-transport": "^2.7.8",
         "@types/swagger-jsdoc": "^6.0.4",
@@ -21,11 +21,10 @@
         "joi": "^17.11.0",
         "namirasoft-core": "^1.2.0",
         "namirasoft-log": "^1.2.0",
-        "namirasoft-schema": "^1.2.0",
+        "namirasoft-schema": "^1.2.2",
         "nodemailer": "^6.9.7",
         "nodemailer-smtp-transport": "^2.7.4",
         "request-ip": "^3.3.0",
-        "sequelize": "^6.35.1",
         "swagger-jsdoc": "^6.2.8",
         "swagger-ui-express": "^5.0.0"
     }

package/src/BaseApplication.ts

@@ -132,15 +132,15 @@ export abstract class BaseApplication<D extends BaseDatabase>
         let result = await builder.run();
         if (!fs.existsSync(this.swagger_dir))
             fs.mkdirSync(this.swagger_dir, { recursive: true });
-        for (let i = 0; i < result.controllers.length; i++)
+        for (let name of Object.keys(result.controllers))
         {
-            const lines = result.controllers[i];
-            fs.writeFileSync(this.swagger_dir + "/controller_" + i + ".swg", lines.join("\n"));
+            const lines = result.controllers[name];
+            fs.writeFileSync(this.swagger_dir + "/controller_" + name + ".swg", lines.join("\n"));
         }
         for (let name of Object.keys(result.classes))
         {
             const lines = result.classes[name];
-            fs.writeFileSync(this.swagger_dir + "/" + name + ".swg", lines.join("\n"));
+            fs.writeFileSync(this.swagger_dir + "/model_" + name + ".swg", lines.join("\n"));
         }
     }
     protected async startSwagger(): Promise<void>

package/src/index.ts

@@ -3,10 +3,6 @@ export * from "./BaseApplication";
 export * from "./BaseApplicationLink";
 export * from "./BaseController";
 export * from "./BaseDatabase";
-export * from "./BaseMySqlDatabase";
-export * from "./BaseSequelizeDatabase";
-export * from "./BaseSequelizeModel";
-export * from "./BaseSequelizeTable";
 export * from "./BaseTable";
 export * from "./EmailService";
 export * from "./EnvService";

package/dist/BaseMySqlDatabase.d.ts

@@ -1,4 +0,0 @@
-import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
-export declare abstract class BaseMySqlDatabase extends BaseSequelizeDatabase {
-    constructor(host: string, port: number, name: string, user: string, pass: string, logging?: boolean);
-}

package/dist/BaseMySqlDatabase.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseMySqlDatabase = void 0;
-const BaseSequelizeDatabase_1 = require("./BaseSequelizeDatabase");
-class BaseMySqlDatabase extends BaseSequelizeDatabase_1.BaseSequelizeDatabase {
-    constructor(host, port, name, user, pass, logging = false) {
-        super('mysql', host, port, name, user, pass, logging);
-    }
-}
-exports.BaseMySqlDatabase = BaseMySqlDatabase;
-//# sourceMappingURL=BaseMySqlDatabase.js.map

package/dist/BaseMySqlDatabase.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseMySqlDatabase.js","sourceRoot":"","sources":["../src/BaseMySqlDatabase.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAChE,MAAsB,iBAAkB,SAAQ,6CAAqB;IAEjE,YAAY,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,UAAmB,KAAK;QAEtG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;CACJ;AAND,8CAMC"}

package/dist/BaseSequelizeDatabase.d.ts

@@ -1,12 +0,0 @@
-import { Sequelize, Dialect } from "sequelize";
-import { FindOptions, Transaction, Attributes } from 'sequelize';
-import { BaseDatabase } from "./BaseDatabase";
-import { BaseSequelizeModel } from "./BaseSequelizeModel";
-import { Where } from "sequelize/types/utils";
-export declare abstract class BaseSequelizeDatabase extends BaseDatabase {
-    sequelize: Sequelize;
-    constructor(dialect: Dialect, host: string, port: number, name: string, user: string, pass: string, logging?: boolean);
-    startTransaction<T>(handler: (trx: Transaction) => Promise<T>, trx: Transaction | null): Promise<T>;
-    getGoogleSearchConditions(columns: string[], search: string, conditions: Where[]): Where[];
-    paginate<T extends BaseSequelizeModel>(options: FindOptions<Attributes<T>>, page_number: number, page_size: number, page_size_default?: number): void;
-}

package/dist/BaseSequelizeDatabase.js

@@ -1,76 +0,0 @@
-"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 });
-exports.BaseSequelizeDatabase = void 0;
-const sequelize_1 = require("sequelize");
-const BaseDatabase_1 = require("./BaseDatabase");
-class BaseSequelizeDatabase extends BaseDatabase_1.BaseDatabase {
-    constructor(dialect, host, port, name, user, pass, logging = false) {
-        super();
-        this.sequelize = new sequelize_1.Sequelize(name, user, pass, {
-            dialect,
-            host,
-            port,
-            logging
-        });
-    }
-    startTransaction(handler, trx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (trx)
-                return yield handler(trx);
-            trx = yield this.sequelize.transaction();
-            try {
-                let result = yield handler(trx);
-                yield trx.commit();
-                return result;
-            }
-            catch (error) {
-                yield trx.rollback();
-                throw error;
-            }
-        });
-    }
-    getGoogleSearchConditions(columns, search, conditions) {
-        if (!conditions)
-            conditions = [];
-        if (search)
-            if (search.split) {
-                let toks = search.split(' ');
-                if (toks.length > 0) {
-                    for (let i = 0; i < toks.length; i++) {
-                        let rOpr = { [sequelize_1.Op.like]: '%' + toks[i].trim() + '%' };
-                        let lOpr;
-                        let cs = columns.map(column => sequelize_1.Sequelize.col(column));
-                        lOpr = sequelize_1.Sequelize.fn("concat", ...cs);
-                        let condition = sequelize_1.Sequelize.where(lOpr, rOpr);
-                        conditions.push(condition);
-                    }
-                }
-            }
-        return conditions;
-    }
-    paginate(options, page_number, page_size, page_size_default) {
-        // page_number
-        if (isNaN(page_number))
-            page_number = 1;
-        // page_size
-        if (isNaN(page_size))
-            if (page_size_default)
-                page_size = page_size_default;
-        if (isNaN(page_size))
-            page_size = 20;
-        //
-        options.offset = (page_number - 1) * page_size;
-        options.limit = page_size;
-    }
-}
-exports.BaseSequelizeDatabase = BaseSequelizeDatabase;
-//# sourceMappingURL=BaseSequelizeDatabase.js.map

package/dist/BaseSequelizeDatabase.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseSequelizeDatabase.js","sourceRoot":"","sources":["../src/BaseSequelizeDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAmD;AAEnD,iDAA8C;AAI9C,MAAsB,qBAAsB,SAAQ,2BAAY;IAG5D,YAAY,OAAgB,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,UAAmB,KAAK;QAExH,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAC1B,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ;YACI,OAAO;YACP,IAAI;YACJ,IAAI;YACJ,OAAO;SACV,CAAC,CAAC;IACX,CAAC;IACK,gBAAgB,CAAI,OAAyC,EAAE,GAAuB;;YAExF,IAAI,GAAG;gBACH,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YACzC,IACA;gBACI,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;gBAChC,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;gBACnB,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,KAAK,EACZ;gBACI,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,KAAK,CAAC;aACf;QACL,CAAC;KAAA;IACD,yBAAyB,CAAC,OAAiB,EAAE,MAAc,EAAE,UAAmB;QAE5E,IAAI,CAAC,UAAU;YACX,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,MAAM;YACN,IAAI,MAAM,CAAC,KAAK,EAChB;gBACI,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EACnB;oBACI,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EACpC;wBACI,IAAI,IAAI,GAAG,EAAE,CAAC,cAAE,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,GAAG,EAAE,CAAC;wBACrD,IAAI,IAAI,CAAC;wBACT,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,qBAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;wBACtD,IAAI,GAAG,qBAAS,CAAC,EAAE,CACf,QAAQ,EACR,GAAG,EAAE,CACR,CAAC;wBACF,IAAI,SAAS,GAAG,qBAAS,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBAC5C,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;qBAC9B;iBACJ;aACJ;QACL,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,QAAQ,CAA+B,OAAmC,EACtE,WAAmB,EAAE,SAAiB,EAAE,iBAA0B;QAElE,cAAc;QACd,IAAI,KAAK,CAAC,WAAW,CAAC;YAClB,WAAW,GAAG,CAAC,CAAC;QACpB,YAAY;QACZ,IAAI,KAAK,CAAC,SAAS,CAAC;YAChB,IAAI,iBAAiB;gBACjB,SAAS,GAAG,iBAAiB,CAAC;QACtC,IAAI,KAAK,CAAC,SAAS,CAAC;YAChB,SAAS,GAAG,EAAE,CAAC;QACnB,EAAE;QACF,OAAO,CAAC,MAAM,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;QAC/C,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAC9B,CAAC;CACJ;AA7ED,sDA6EC"}

package/dist/BaseSequelizeModel.d.ts

@@ -1,3 +0,0 @@
-import { Model } from 'sequelize';
-export declare abstract class BaseSequelizeModel extends Model {
-}

package/dist/BaseSequelizeModel.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseSequelizeModel = void 0;
-const sequelize_1 = require("sequelize");
-class BaseSequelizeModel extends sequelize_1.Model {
-}
-exports.BaseSequelizeModel = BaseSequelizeModel;
-//# sourceMappingURL=BaseSequelizeModel.js.map

package/dist/BaseSequelizeModel.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseSequelizeModel.js","sourceRoot":"","sources":["../src/BaseSequelizeModel.ts"],"names":[],"mappings":";;;AAAA,yCAAkC;AAElC,MAAsB,kBAAmB,SAAQ,iBAAK;CAErD;AAFD,gDAEC"}

package/dist/BaseSequelizeTable.d.ts

@@ -1,60 +0,0 @@
-import { ModelOptions, ModelAttributes, ModelAttributeColumnOptions } from "sequelize";
-import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
-import { BaseTable } from "./BaseTable";
-import { ModelCtor, FindOptions, Transaction, Attributes } from 'sequelize';
-import { BaseSequelizeModel } from "./BaseSequelizeModel";
-import { ArraySchema, BaseVariableSchema, ObjectSchema } from "namirasoft-schema";
-export declare class BaseSequelizeTable<D extends BaseSequelizeDatabase, M extends BaseSequelizeModel> extends BaseTable<D> {
-    model: ModelCtor<M>;
-    attributes: ModelAttributes<M, Attributes<M>>;
-    constructor(database: D);
-    find(options: FindOptions<Attributes<M>>, trx: Transaction | null): Promise<M>;
-    define(modelName: string, attributes: ModelAttributes<M, Attributes<M>>, options?: ModelOptions<M>): void;
-    protected getExamples(): {
-        [name: string]: string;
-    };
-    protected forEachColumn(handler: (name: string, column: ModelAttributeColumnOptions) => void): void;
-    getSchema(require: boolean, name?: string, excludeColumns?: string[], joins?: BaseVariableSchema[]): ObjectSchema;
-    getArraySchema(require: boolean, name?: string, excludeColumns?: string[], joins?: BaseVariableSchema[]): ArraySchema;
-    private getVariableSchema;
-    private getTypeSchema;
-    protected isFloat(type: any): type is {
-        options: {
-            length: number;
-            decimals: number;
-        };
-    };
-    protected isDouble(type: any): type is {
-        options: {
-            length: number;
-            decimals: number;
-        };
-    };
-    protected isDecimal(type: any): type is {
-        options: {
-            precision: number;
-            scale: number;
-        };
-    };
-    protected isReal(type: any): type is {
-        options: {
-            length: number;
-            decimals: number;
-        };
-    };
-    protected isChar(type: any): type is {
-        options: {
-            length: number;
-        };
-    };
-    protected isString(type: any): type is {
-        options: {
-            length: number;
-        };
-    };
-    protected isEnum(type: any): type is {
-        options: {
-            values: string[];
-        };
-    };
-}

package/dist/BaseSequelizeTable.js

@@ -1,159 +0,0 @@
-"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 });
-exports.BaseSequelizeTable = void 0;
-const sequelize_1 = require("sequelize");
-const BaseTable_1 = require("./BaseTable");
-const namirasoft_core_1 = require("namirasoft-core");
-const namirasoft_schema_1 = require("namirasoft-schema");
-const EnumSchema_1 = require("namirasoft-schema/dist/schema/type/EnumSchema");
-class BaseSequelizeTable extends BaseTable_1.BaseTable {
-    constructor(database) {
-        super(database);
-    }
-    find(options, trx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            options.transaction = trx;
-            let value = yield this.model.findOne(options);
-            if (value != null)
-                return value;
-            throw namirasoft_core_1.ErrorOperation.getHTTP(404, "Could not found " + this.model.name);
-        });
-    }
-    define(modelName, attributes, options) {
-        this.attributes = attributes;
-        if (!options)
-            options = {};
-        if (options.name == undefined)
-            options.name = {
-                plural: modelName,
-                singular: modelName
-            };
-        if (options.paranoid == undefined)
-            options.paranoid = true;
-        if (options.freezeTableName == undefined)
-            options.freezeTableName = true;
-        if (options.tableName == undefined)
-            options.tableName = modelName;
-        if (options.underscored == undefined)
-            options.underscored = true;
-        if (options.timestamps == undefined)
-            options.timestamps = true;
-        if (options.paranoid == undefined)
-            options.paranoid = true;
-        if (options.createdAt == undefined)
-            options.createdAt = true;
-        if (options.updatedAt == undefined)
-            options.updatedAt = true;
-        this.model = this.database.sequelize.define(modelName, attributes, options);
-    }
-    getExamples() {
-        return {};
-    }
-    forEachColumn(handler) {
-        let keys = Object.keys(this.attributes);
-        let secures = this.getSecureColumns();
-        for (let i = 0; i < keys.length; i++)
-            if (!secures.includes(keys[i])) {
-                const column = this.attributes[keys[i]];
-                handler(keys[i], column);
-            }
-    }
-    getSchema(require, name, excludeColumns, joins) {
-        if (!excludeColumns)
-            excludeColumns = [];
-        let readOnlyColumns = this.getReadOnlyColumns();
-        let ans = new namirasoft_schema_1.ObjectSchema(name !== null && name !== void 0 ? name : this.model.name, require, null);
-        this.forEachColumn((name, column) => {
-            if (excludeColumns)
-                if (!excludeColumns.includes(name))
-                    ans.addField(this.getVariableSchema(name, column, readOnlyColumns.includes(name)));
-        });
-        if (joins)
-            ans.addField(...joins);
-        return ans;
-    }
-    getArraySchema(require, name, excludeColumns, joins) {
-        let ans = this.getSchema(require, name, excludeColumns, joins);
-        return new namirasoft_schema_1.ArraySchema(require, [ans]);
-    }
-    getVariableSchema(name, element, read_only) {
-        let schema = this.getTypeSchema(element);
-        schema.read_only = read_only;
-        let es = this.getExamples();
-        schema.example = es[name];
-        return new namirasoft_schema_1.BaseVariableSchema(name, schema);
-    }
-    getTypeSchema(element) {
-        var _a;
-        let required = !((_a = element.allowNull) !== null && _a !== void 0 ? _a : true);
-        if (element.type instanceof sequelize_1.DataTypes.BOOLEAN)
-            return new namirasoft_schema_1.BoolSchema(required);
-        else if (element.type instanceof sequelize_1.DataTypes.TINYINT)
-            return new namirasoft_schema_1.TinyIntSchema(required);
-        else if (element.type instanceof sequelize_1.DataTypes.SMALLINT)
-            return new namirasoft_schema_1.SmallIntSchema(required);
-        else if (element.type instanceof sequelize_1.DataTypes.MEDIUMINT)
-            return new namirasoft_schema_1.MediumIntSchema(required);
-        else if (element.type instanceof sequelize_1.DataTypes.INTEGER)
-            return new namirasoft_schema_1.IntegerSchema(required);
-        else if (element.type instanceof sequelize_1.DataTypes.BIGINT)
-            return new namirasoft_schema_1.BigIntSchema(required);
-        else if (this.isFloat(element.type))
-            return new namirasoft_schema_1.FloatSchema(required, element.type.options.decimals);
-        else if (this.isDouble(element.type))
-            return new namirasoft_schema_1.DoubleSchema(required, element.type.options.decimals);
-        else if (this.isDecimal(element.type))
-            return new namirasoft_schema_1.DecimalSchema(required, element.type.options.scale);
-        else if (this.isReal(element.type))
-            return new namirasoft_schema_1.RealSchema(required, element.type.options.decimals);
-        else if (this.isChar(element.type))
-            return new namirasoft_schema_1.StringSchema(required, element.type.options.length, element.type.options.length);
-        else if (this.isString(element.type))
-            return new namirasoft_schema_1.StringSchema(required, null, element.type.options.length);
-        else if (element.type instanceof sequelize_1.DataTypes.TEXT)
-            return new namirasoft_schema_1.StringSchema(required, null, null);
-        else if (element.type instanceof sequelize_1.DataTypes.DATE)
-            return new namirasoft_schema_1.DateTimeSchema(required);
-        else if (element.type instanceof sequelize_1.DataTypes.DATEONLY)
-            return new namirasoft_schema_1.DateSchema(required);
-        else if (element.type instanceof sequelize_1.DataTypes.TIME)
-            return new namirasoft_schema_1.TimeSchema(required);
-        else if (this.isEnum(element.type))
-            return new EnumSchema_1.EnumSchema(required, ...element.type.options.values);
-        else if (element.type instanceof sequelize_1.DataTypes.JSON)
-            return new namirasoft_schema_1.AnySchema(required);
-        throw new Error("Unsupported datatype for schema: " + element.type);
-    }
-    isFloat(type) {
-        return type instanceof sequelize_1.DataTypes.FLOAT;
-    }
-    isDouble(type) {
-        return type instanceof sequelize_1.DataTypes.DOUBLE;
-    }
-    isDecimal(type) {
-        return type instanceof sequelize_1.DataTypes.DECIMAL;
-    }
-    isReal(type) {
-        return type instanceof sequelize_1.DataTypes.REAL;
-    }
-    isChar(type) {
-        return type instanceof sequelize_1.DataTypes.CHAR;
-    }
-    isString(type) {
-        return type instanceof sequelize_1.DataTypes.STRING;
-    }
-    isEnum(type) {
-        return type instanceof sequelize_1.DataTypes.STRING;
-    }
-}
-exports.BaseSequelizeTable = BaseSequelizeTable;
-//# sourceMappingURL=BaseSequelizeTable.js.map

package/dist/BaseSequelizeTable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseSequelizeTable.js","sourceRoot":"","sources":["../src/BaseSequelizeTable.ts"],"names":[],"mappings":"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"}

package/src/BaseMySqlDatabase.ts

@@ -1,8 +0,0 @@
-import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
-export abstract class BaseMySqlDatabase extends BaseSequelizeDatabase
-{
-    constructor(host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
-    {
-        super('mysql', host, port, name, user, pass, logging);
-    }
-}

package/src/BaseSequelizeDatabase.ts

@@ -1,84 +0,0 @@
-import { Sequelize, Dialect, Op } from "sequelize";
-import { FindOptions, Transaction, Attributes } from 'sequelize';
-import { BaseDatabase } from "./BaseDatabase";
-import { BaseSequelizeModel } from "./BaseSequelizeModel";
-import { Where } from "sequelize/types/utils";
-
-export abstract class BaseSequelizeDatabase extends BaseDatabase
-{
-    public sequelize: Sequelize;
-    constructor(dialect: Dialect, host: string, port: number, name: string, user: string, pass: string, logging: boolean = false)
-    {
-        super();
-        this.sequelize = new Sequelize(
-            name,
-            user,
-            pass,
-            {
-                dialect,
-                host,
-                port,
-                logging
-            });
-    }
-    async startTransaction<T>(handler: (trx: Transaction) => Promise<T>, trx: Transaction | null): Promise<T>
-    {
-        if (trx)
-            return await handler(trx);
-        trx = await this.sequelize.transaction();
-        try
-        {
-            let result = await handler(trx);
-            await trx.commit();
-            return result;
-        }
-        catch (error)
-        {
-            await trx.rollback();
-            throw error;
-        }
-    }
-    getGoogleSearchConditions(columns: string[], search: string, conditions: Where[])
-    {
-        if (!conditions)
-            conditions = [];
-        if (search)
-            if (search.split)
-            {
-                let toks = search.split(' ');
-                if (toks.length > 0)
-                {
-                    for (let i = 0; i < toks.length; i++)
-                    {
-                        let rOpr = { [Op.like]: '%' + toks[i].trim() + '%' };
-                        let lOpr;
-                        let cs = columns.map(column => Sequelize.col(column));
-                        lOpr = Sequelize.fn(
-                            "concat",
-                            ...cs
-                        );
-                        let condition = Sequelize.where(lOpr, rOpr);
-                        conditions.push(condition);
-                    }
-                }
-            }
-        return conditions;
-    }
-
-    paginate<T extends BaseSequelizeModel>(options: FindOptions<Attributes<T>>,
-        page_number: number, page_size: number, page_size_default?: number)
-    {
-        // page_number
-        if (isNaN(page_number))
-            page_number = 1;
-        // page_size
-        if (isNaN(page_size))
-            if (page_size_default)
-                page_size = page_size_default;
-        if (isNaN(page_size))
-            page_size = 20;
-        //
-        options.offset = (page_number - 1) * page_size;
-        options.limit = page_size;
-    }
-}

package/src/BaseSequelizeModel.ts

@@ -1,5 +0,0 @@
-import { Model } from 'sequelize';
-
-export abstract class BaseSequelizeModel extends Model
-{
-}

package/src/BaseSequelizeTable.ts

@@ -1,169 +0,0 @@
-import { ModelOptions, ModelAttributes, ModelAttributeColumnOptions, DataTypes } from "sequelize";
-import { BaseSequelizeDatabase } from "./BaseSequelizeDatabase";
-import { BaseTable } from "./BaseTable";
-import { ModelCtor, FindOptions, Transaction, Attributes } from 'sequelize';
-import { BaseSequelizeModel } from "./BaseSequelizeModel";
-import { ErrorOperation } from "namirasoft-core";
-import { AnySchema, ArraySchema, BaseTypeSchema, BaseVariableSchema, BigIntSchema, BoolSchema, DateSchema, DateTimeSchema, DecimalSchema, DoubleSchema, FloatSchema, IntegerSchema, MediumIntSchema, ObjectSchema, RealSchema, SmallIntSchema, StringSchema, TimeSchema, TinyIntSchema } from "namirasoft-schema";
-import { EnumSchema } from "namirasoft-schema/dist/schema/type/EnumSchema";
-
-export class BaseSequelizeTable<D extends BaseSequelizeDatabase, M extends BaseSequelizeModel> extends BaseTable<D>
-{
-    model!: ModelCtor<M>;
-    attributes!: ModelAttributes<M, Attributes<M>>;
-    constructor(database: D)
-    {
-        super(database);
-    }
-    async find(options: FindOptions<Attributes<M>>, trx: Transaction | null): Promise<M>
-    {
-        options.transaction = trx;
-        let value = await this.model.findOne<M>(options);
-        if (value != null)
-            return value;
-        throw ErrorOperation.getHTTP(404, "Could not found " + this.model.name);
-    }
-    define(modelName: string, attributes: ModelAttributes<M, Attributes<M>>, options?: ModelOptions<M>
-    ): void
-    {
-        this.attributes = attributes;
-        if (!options)
-            options = {};
-        if (options.name == undefined)
-            options.name = {
-                plural: modelName,
-                singular: modelName
-            };
-        if (options.paranoid == undefined)
-            options.paranoid = true;
-        if (options.freezeTableName == undefined)
-            options.freezeTableName = true;
-        if (options.tableName == undefined)
-            options.tableName = modelName;
-        if (options.underscored == undefined)
-            options.underscored = true;
-        if (options.timestamps == undefined)
-            options.timestamps = true;
-        if (options.paranoid == undefined)
-            options.paranoid = true;
-        if (options.createdAt == undefined)
-            options.createdAt = true;
-        if (options.updatedAt == undefined)
-            options.updatedAt = true;
-
-        this.model = this.database.sequelize.define(modelName, attributes, options);
-    }
-    protected getExamples(): { [name: string]: string }
-    {
-        return {};
-    }
-    protected forEachColumn(handler: (name: string, column: ModelAttributeColumnOptions) => void)
-    {
-        let keys = Object.keys(this.attributes);
-        let secures = this.getSecureColumns();
-        for (let i = 0; i < keys.length; i++)
-            if (!secures.includes(keys[i]))
-            {
-                const column = this.attributes[keys[i]] as ModelAttributeColumnOptions;
-                handler(keys[i], column);
-            }
-    }
-    getSchema(require: boolean, name?: string, excludeColumns?: string[], joins?: BaseVariableSchema[]): ObjectSchema
-    {
-        if (!excludeColumns)
-            excludeColumns = [];
-        let readOnlyColumns = this.getReadOnlyColumns();
-        let ans = new ObjectSchema(name ?? this.model.name, require, null);
-        this.forEachColumn((name, column) =>
-        {
-            if (excludeColumns)
-                if (!excludeColumns.includes(name))
-                    ans.addField(this.getVariableSchema(name, column, readOnlyColumns.includes(name)));
-        });
-        if (joins)
-            ans.addField(...joins);
-        return ans;
-    }
-    getArraySchema(require: boolean, name?: string, excludeColumns?: string[], joins?: BaseVariableSchema[]): ArraySchema
-    {
-        let ans = this.getSchema(require, name, excludeColumns, joins);
-        return new ArraySchema(require, [ans]);
-    }
-    private getVariableSchema(name: string, element: ModelAttributeColumnOptions, read_only: boolean): BaseVariableSchema
-    {
-        let schema = this.getTypeSchema(element);
-        schema.read_only = read_only;
-        let es = this.getExamples();
-        schema.example = es[name];
-        return new BaseVariableSchema(name, schema);
-    }
-    private getTypeSchema(element: ModelAttributeColumnOptions): BaseTypeSchema
-    {
-        let required = !(element.allowNull ?? true);
-        if (element.type instanceof DataTypes.BOOLEAN)
-            return new BoolSchema(required);
-        else if (element.type instanceof DataTypes.TINYINT)
-            return new TinyIntSchema(required);
-        else if (element.type instanceof DataTypes.SMALLINT)
-            return new SmallIntSchema(required);
-        else if (element.type instanceof DataTypes.MEDIUMINT)
-            return new MediumIntSchema(required);
-        else if (element.type instanceof DataTypes.INTEGER)
-            return new IntegerSchema(required);
-        else if (element.type instanceof DataTypes.BIGINT)
-            return new BigIntSchema(required);
-        else if (this.isFloat(element.type))
-            return new FloatSchema(required, element.type.options.decimals);
-        else if (this.isDouble(element.type))
-            return new DoubleSchema(required, element.type.options.decimals);
-        else if (this.isDecimal(element.type))
-            return new DecimalSchema(required, element.type.options.scale);
-        else if (this.isReal(element.type))
-            return new RealSchema(required, element.type.options.decimals);
-        else if (this.isChar(element.type))
-            return new StringSchema(required, element.type.options.length, element.type.options.length);
-        else if (this.isString(element.type))
-            return new StringSchema(required, null, element.type.options.length);
-        else if (element.type instanceof DataTypes.TEXT)
-            return new StringSchema(required, null, null);
-        else if (element.type instanceof DataTypes.DATE)
-            return new DateTimeSchema(required);
-        else if (element.type instanceof DataTypes.DATEONLY)
-            return new DateSchema(required);
-        else if (element.type instanceof DataTypes.TIME)
-            return new TimeSchema(required);
-        else if (this.isEnum(element.type))
-            return new EnumSchema(required, ...element.type.options.values);
-        else if (element.type instanceof DataTypes.JSON)
-            return new AnySchema(required);
-        throw new Error("Unsupported datatype for schema: " + element.type);
-    }
-    protected isFloat(type: any): type is { options: { length: number, decimals: number } }
-    {
-        return type instanceof DataTypes.FLOAT;
-    }
-    protected isDouble(type: any): type is { options: { length: number, decimals: number } }
-    {
-        return type instanceof DataTypes.DOUBLE;
-    }
-    protected isDecimal(type: any): type is { options: { precision: number, scale: number } }
-    {
-        return type instanceof DataTypes.DECIMAL;
-    }
-    protected isReal(type: any): type is { options: { length: number, decimals: number } }
-    {
-        return type instanceof DataTypes.REAL;
-    }
-    protected isChar(type: any): type is { options: { length: number } }
-    {
-        return type instanceof DataTypes.CHAR;
-    }
-    protected isString(type: any): type is { options: { length: number } }
-    {
-        return type instanceof DataTypes.STRING;
-    }
-    protected isEnum(type: any): type is { options: { values: string[] } }
-    {
-        return type instanceof DataTypes.STRING;
-    }
-}