typespeed 2.2.1 → 2.3.1

package/app/nodemon.json

@@ -0,0 +1,5 @@
+{
+    "watch": ["src", "../dist", "../src", "../test"],
+    "ext": "ts,json",
+    "exec": "npm start" 
+}

package/{test → app}/package.json

@@ -4,8 +4,7 @@
     "description": "",
     "scripts": {
       "watch": "nodemon",
-      "test": "ts-node src/main.ts",
-      "start": "ts-node --transpile-only src/main.ts",
+      "start": "ts-node src/main.ts",
       "build": "tsc -p ."
     },
     "author": "",

package/{test → app}/src/config-development.json

@@ -9,7 +9,7 @@
     },
     "view": {
         "engine": "mustache",
-        "path": "/test/views",
+        "path": "/app/src/views",
         "suffix": "html"
     }
 }

package/{test → app}/src/config.json

@@ -1,11 +1,10 @@
 {
     "view": {
-        "engine": "pug",
-        "path": "./views",
+        "engine": "mustache",
+        "path": "./src/views",
         "suffix": "html"
     },
-    "static": "/static",
-    "favicon": "/static/favicon.ico",
+
     "compression": {
         "level": 9
     },

package/{test → app}/src/custom-log.class.ts

@@ -17,7 +17,7 @@ export default class CustomLog extends LogFactory {
     }
 
     public log(message?: any, ...optionalParams: any[]) : void{
-        this.logger.log(message, ...optionalParams);
+        //this.logger.log(message, ...optionalParams);
     }
 
     public error(message?: any, ...optionalParams: any[]) : void {

package/{test → app}/src/main.ts

@@ -1,5 +1,6 @@
-import { app, log, autoware, ServerFactory } from "../../";
+import { app, log, autoware, ServerFactory } from "../../src/typespeed";
 //import * as basicAuth from "express-basic-auth"
+let appServer = null;
 
 @app
 class Main {
@@ -11,7 +12,13 @@ class Main {
         // this.server.setMiddleware(basicAuth({
         //     users: { 'admin': 'supersecret' }
         // }));
-        this.server.start(8081);
+        appServer = this.server.start(8081);
         log('start application');
     }
-}
+}
+
+export default () => {
+    if (appServer != null) {
+        appServer.close();
+    }
+};

package/dist/core.decorator.js

@@ -1,54 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.schedule = exports.getComponent = exports.getBean = exports.autoware = exports.config = exports.error = exports.value = exports.app = exports.log = exports.resource = exports.bean = exports.component = void 0;
+exports.schedule = exports.getComponent = exports.getBean = exports.autoware = exports.error = exports.log = exports.resource = exports.bean = exports.component = void 0;
 require("reflect-metadata");
-const fs = require("fs");
-const path = require("path");
-const walkSync = require("walk-sync");
 const cron = require("cron");
 const log_factory_class_1 = require("./factory/log-factory.class");
-let globalConfig = {};
 const resourceObjects = new Map();
 const beanMapper = new Map();
 const objectMapper = new Map();
-function app(constructor) {
-    const coreDir = __dirname;
-    const mainPath = path.dirname(getRootPath() || process.argv[1]);
-    const configFile = mainPath + "/config.json";
-    if (fs.existsSync(configFile)) {
-        globalConfig = JSON.parse(fs.readFileSync(configFile, "utf-8"));
-        const nodeEnv = process.env.NODE_ENV || "development";
-        const envConfigFile = mainPath + "/config-" + nodeEnv + ".json";
-        if (fs.existsSync(envConfigFile)) {
-            globalConfig = Object.assign(globalConfig, JSON.parse(fs.readFileSync(envConfigFile, "utf-8")));
-        }
-    }
-    const coreFiles = walkSync(coreDir, { globs: ['**/*.ts'], ignore: ['**/*.d.ts', 'scaffold/**'] });
-    const mainFiles = walkSync(mainPath, { globs: ['**/*.ts'] });
-    (async function () {
-        try {
-            for (let p of coreFiles) {
-                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
-                await Promise.resolve().then(() => require(coreDir + "/" + moduleName));
-            }
-            for (let p of mainFiles) {
-                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
-                await Promise.resolve().then(() => require(mainPath + "/" + moduleName));
-            }
-        }
-        catch (err) {
-            console.error(err);
-        }
-        //log("main start")
-        const main = new constructor();
-        main["main"]();
-    }());
-}
-exports.app = app;
-function config(node) {
-    return globalConfig[node] || null;
-}
-exports.config = config;
 function component(constructorFunction) {
     objectMapper.set(constructorFunction.name, new constructorFunction());
 }
@@ -71,30 +29,6 @@ function getBean(mappingClass) {
     return bean["factory"];
 }
 exports.getBean = getBean;
-function value(configPath) {
-    return function (target, propertyKey) {
-        if (globalConfig === undefined) {
-            Object.defineProperty(target, propertyKey, {
-                get: () => {
-                    return undefined;
-                }
-            });
-        }
-        else {
-            let pathNodes = configPath.split(".");
-            let nodeValue = globalConfig;
-            for (let i = 0; i < pathNodes.length; i++) {
-                nodeValue = nodeValue[pathNodes[i]];
-            }
-            Object.defineProperty(target, propertyKey, {
-                get: () => {
-                    return nodeValue;
-                }
-            });
-        }
-    };
-}
-exports.value = value;
 function autoware(target, propertyKey) {
     const type = Reflect.getMetadata("design:type", target, propertyKey);
     Object.defineProperty(target, propertyKey, {
@@ -147,23 +81,6 @@ function error(message, ...optionalParams) {
     }
 }
 exports.error = error;
-function getRootPath() {
-    const lines = new Error().stack.split("\n");
-    let rootPath = "";
-    let lastLine = "";
-    for (let line of lines) {
-        if (line.includes("at ") &&
-            line.includes("node:internal/modules/cjs/loader") &&
-            line.includes("Module._compile") &&
-            lastLine.includes("at ") &&
-            lastLine.includes("Object.<anonymous>")) {
-            rootPath = lastLine.split("(")[1].split(":")[0];
-            break;
-        }
-        lastLine = line;
-    }
-    return rootPath;
-}
 function schedule(cronTime) {
     return (target, propertyKey) => {
         new cron.CronJob(cronTime, target[propertyKey]).start();

package/dist/default/express-server.class.js

@@ -19,6 +19,7 @@ const expressSession = require("express-session");
 const connectRedis = require("connect-redis");
 const server_factory_class_1 = require("../factory/server-factory.class");
 const route_decorator_1 = require("../route.decorator");
+const typespeed_1 = require("../typespeed");
 const core_decorator_1 = require("../core.decorator");
 const redis_class_1 = require("./redis.class");
 const authentication_factory_class_1 = require("../factory/authentication-factory.class");
@@ -110,31 +111,31 @@ class ExpressServer extends server_factory_class_1.default {
     }
 }
 __decorate([
-    (0, core_decorator_1.value)("view"),
+    (0, typespeed_1.value)("view"),
     __metadata("design:type", String)
 ], ExpressServer.prototype, "view", void 0);
 __decorate([
-    (0, core_decorator_1.value)("static"),
+    (0, typespeed_1.value)("static"),
     __metadata("design:type", String)
 ], ExpressServer.prototype, "static", void 0);
 __decorate([
-    (0, core_decorator_1.value)("favicon"),
+    (0, typespeed_1.value)("favicon"),
     __metadata("design:type", String)
 ], ExpressServer.prototype, "favicon", void 0);
 __decorate([
-    (0, core_decorator_1.value)("compression"),
+    (0, typespeed_1.value)("compression"),
     __metadata("design:type", Object)
 ], ExpressServer.prototype, "compression", void 0);
 __decorate([
-    (0, core_decorator_1.value)("cookie"),
+    (0, typespeed_1.value)("cookie"),
     __metadata("design:type", Object)
 ], ExpressServer.prototype, "cookieConfig", void 0);
 __decorate([
-    (0, core_decorator_1.value)("session"),
+    (0, typespeed_1.value)("session"),
     __metadata("design:type", Object)
 ], ExpressServer.prototype, "session", void 0);
 __decorate([
-    (0, core_decorator_1.value)("redis"),
+    (0, typespeed_1.value)("redis"),
     __metadata("design:type", Object)
 ], ExpressServer.prototype, "redisConfig", void 0);
 __decorate([

package/dist/default/node-cache.class.js

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cache_factory_class_1 = require("../factory/cache-factory.class");
 const cache = require("node-cache");
+const typespeed_1 = require("../typespeed");
 const core_decorator_1 = require("../core.decorator");
 class NodeCache extends cache_factory_class_1.default {
     constructor() {
@@ -38,7 +39,7 @@ class NodeCache extends cache_factory_class_1.default {
     }
 }
 __decorate([
-    (0, core_decorator_1.value)("cache"),
+    (0, typespeed_1.value)("cache"),
     __metadata("design:type", Object)
 ], NodeCache.prototype, "config", void 0);
 __decorate([

package/dist/default/rabbitmq.class.js

@@ -11,11 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rabbitListener = exports.RabbitMQ = void 0;
 const core_decorator_1 = require("../core.decorator");
+const typespeed_1 = require("../typespeed");
 const amqplib_1 = require("amqplib");
 let rabbitConnection = null;
 class RabbitMQ {
     getRabbitMQ() {
-        if (!(0, core_decorator_1.config)("rabbitmq")) {
+        if (!(0, typespeed_1.config)("rabbitmq")) {
             return null;
         }
         return new RabbitMQ();
@@ -48,7 +49,7 @@ __decorate([
 exports.RabbitMQ = RabbitMQ;
 async function getChannel() {
     if (rabbitConnection === null) {
-        rabbitConnection = await (0, amqplib_1.connect)((0, core_decorator_1.config)("rabbitmq"));
+        rabbitConnection = await (0, amqplib_1.connect)((0, typespeed_1.config)("rabbitmq"));
         process.once('SIGINT', async () => {
             await rabbitConnection.close();
         });

package/dist/default/read-write-db.class.js

@@ -12,10 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const mysql2_1 = require("mysql2");
 const data_source_factory_class_1 = require("../factory/data-source-factory.class");
 const core_decorator_1 = require("../core.decorator");
+const typespeed_1 = require("../typespeed");
 class ReadWriteDb extends data_source_factory_class_1.default {
+    getDataSource() {
+        if (!(0, typespeed_1.config)("mysql")) {
+            return null;
+        }
+        return new ReadWriteDb();
+    }
     constructor() {
         super();
-        const dbConfig = (0, core_decorator_1.config)("mysql");
+        const dbConfig = (0, typespeed_1.config)("mysql");
         if (dbConfig["master"] && dbConfig["slave"]) {
             this.writeSession = this.getConnectionByConfig(dbConfig["master"]);
             if (Array.isArray(dbConfig["slave"])) {
@@ -30,12 +37,6 @@ class ReadWriteDb extends data_source_factory_class_1.default {
             this.readSession = [this.writeSession];
         }
     }
-    getDataSource() {
-        if (!(0, core_decorator_1.config)("mysql")) {
-            return null;
-        }
-        return new ReadWriteDb();
-    }
     getConnectionByConfig(config) {
         if (config["PoolOptions"] !== undefined) {
             // we need pool

package/dist/default/redis.class.js

@@ -11,12 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_decorator_1 = require("../core.decorator");
 const ioredis_1 = require("ioredis");
+const typespeed_1 = require("../typespeed");
 class Redis extends ioredis_1.default {
     getRedis() {
-        if (!(0, core_decorator_1.config)("redis")) {
+        if (!(0, typespeed_1.config)("redis")) {
             return null;
         }
-        return new Redis((0, core_decorator_1.config)("redis"));
+        return new Redis((0, typespeed_1.config)("redis"));
     }
     constructor(config) {
         super(config);

package/dist/typespeed.js

@@ -14,7 +14,91 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReadWriteDb = exports.Redis = exports.NodeCache = exports.LogDefault = exports.ExpressServer = exports.AuthenticationFactory = exports.ServerFactory = exports.DataSourceFactory = exports.CacheFactory = exports.LogFactory = void 0;
+exports.ReadWriteDb = exports.Redis = exports.NodeCache = exports.LogDefault = exports.ExpressServer = exports.AuthenticationFactory = exports.ServerFactory = exports.DataSourceFactory = exports.CacheFactory = exports.LogFactory = exports.config = exports.value = exports.app = void 0;
+require("reflect-metadata");
+const fs = require("fs");
+const path = require("path");
+const walkSync = require("walk-sync");
+let globalConfig = {};
+const coreDir = __dirname;
+const mainPath = path.dirname(getRootPath(new Error().stack.split("\n")) || process.argv[1]);
+const configFile = mainPath + "/config.json";
+if (fs.existsSync(configFile)) {
+    globalConfig = JSON.parse(fs.readFileSync(configFile, "utf-8"));
+    const nodeEnv = process.env.NODE_ENV || "development";
+    const envConfigFile = mainPath + "/config-" + nodeEnv + ".json";
+    if (fs.existsSync(envConfigFile)) {
+        globalConfig = Object.assign(globalConfig, JSON.parse(fs.readFileSync(envConfigFile, "utf-8")));
+    }
+}
+function app(constructor) {
+    const coreFiles = walkSync(coreDir, { globs: ['**/*.ts'], ignore: ['**/*.d.ts', 'scaffold/**'] });
+    const mainFiles = walkSync(mainPath, { globs: ['**/*.ts'] });
+    (async function () {
+        var _a, _b;
+        try {
+            for (let p of coreFiles) {
+                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
+                await (_a = coreDir + "/" + moduleName, Promise.resolve().then(() => require(_a)));
+            }
+            for (let p of mainFiles) {
+                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
+                await (_b = mainPath + "/" + moduleName, Promise.resolve().then(() => require(_b)));
+            }
+        }
+        catch (err) {
+            console.error(err);
+        }
+        //log("main start")
+        const main = new constructor();
+        main["main"]();
+    }());
+}
+exports.app = app;
+function config(node) {
+    return globalConfig[node] || null;
+}
+exports.config = config;
+function value(configPath) {
+    return function (target, propertyKey) {
+        if (globalConfig === undefined) {
+            Object.defineProperty(target, propertyKey, {
+                get: () => {
+                    return undefined;
+                }
+            });
+        }
+        else {
+            let pathNodes = configPath.split(".");
+            let nodeValue = globalConfig;
+            for (let i = 0; i < pathNodes.length; i++) {
+                nodeValue = nodeValue[pathNodes[i]];
+            }
+            Object.defineProperty(target, propertyKey, {
+                get: () => {
+                    return nodeValue;
+                }
+            });
+        }
+    };
+}
+exports.value = value;
+function getRootPath(lines) {
+    const macths = ["at Function.Module._load", "at Module.require", "at require", "at Object.<anonymous>"];
+    let matchIndex = 0;
+    for (let line of lines) {
+        if (line.includes(macths[matchIndex])) {
+            if (matchIndex === macths.length - 1) {
+                return line.split("(")[1].split(":")[0];
+            }
+            matchIndex++;
+        }
+        else {
+            matchIndex = 0;
+        }
+    }
+    return undefined;
+}
 __exportStar(require("./core.decorator"), exports);
 __exportStar(require("./route.decorator"), exports);
 __exportStar(require("./database.decorator"), exports);

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "typespeed",
-  "version": "2.2.1",
+  "version": "2.3.1",
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",
   "scripts": {
+    "test": "mocha --require ts-node/register test/**/*.ts --exit",
+    "test-with-coverage": "nyc --reporter=text npm test",
+    "start": "ts-node --transpile-only app/src/main.ts",
     "build": "tsc -p .",
     "postbuild": "cp src/typespeed.d.ts dist/typespeed.d.ts && cp -r src/default/pages dist/default/pages && cp -r src/scaffold/templates dist/scaffold/templates",
     "prebuild": "rm -rf dist",
@@ -30,7 +33,6 @@
     "middleware"
   ],
   "dependencies": {
-    "@types/node": "^18.0.6",
     "commander": "^9.4.0",
     "compression": "^1.7.4",
     "connect-redis": "^6.1.3",
@@ -50,8 +52,18 @@
     "reflect-metadata": "^0.1.13",
     "serve-favicon": "^2.5.0",
     "tracer": "^1.1.6",
-    "typescript": "^4.7.4",
     "walk-sync": "^3.0.0",
     "amqplib": "0.10.3"
+  },
+  "devDependencies": {
+    "@types/node": "^18.0.6",
+    "@types/express": "^4.17.13",
+    "@types/mocha": "^10.0.1",
+    "chai": "4.3.7",
+    "chai-http": "^4.4.0",
+    "mocha": "10.2.0",
+    "nyc": "^15.1.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5"
   }
 }

package/src/core.decorator.ts

@@ -1,55 +1,11 @@
 import "reflect-metadata";
-import * as fs from "fs";
-import * as path from "path";
-import * as walkSync from "walk-sync";
 import * as cron from "cron";
 import LogFactory from "./factory/log-factory.class";
 
-let globalConfig = {};
 const resourceObjects = new Map<string, object>();
 const beanMapper: Map<string, any> = new Map<string, any>();
 const objectMapper: Map<string, any> = new Map<string, any>();
 
-function app<T extends { new(...args: any[]): {} }>(constructor: T) {
-    const coreDir = __dirname;
-    const mainPath = path.dirname(getRootPath() || process.argv[1]);
-    const configFile = mainPath + "/config.json";
-    if (fs.existsSync(configFile)) {
-        globalConfig = JSON.parse(fs.readFileSync(configFile, "utf-8"));
-        const nodeEnv = process.env.NODE_ENV || "development";
-        const envConfigFile = mainPath + "/config-" + nodeEnv + ".json";
-        if (fs.existsSync(envConfigFile)) {
-            globalConfig = Object.assign(globalConfig, JSON.parse(fs.readFileSync(envConfigFile, "utf-8")));
-        }
-    }
-
-    const coreFiles = walkSync(coreDir, { globs: ['**/*.ts'], ignore: ['**/*.d.ts', 'scaffold/**'] });
-    const mainFiles = walkSync(mainPath, { globs: ['**/*.ts'] });
-
-    (async function () {
-        try {
-            for (let p of coreFiles) {
-                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
-                await import(coreDir + "/" + moduleName);
-            }
-
-            for (let p of mainFiles) {
-                let moduleName = p.replace(".d.ts", "").replace(".ts", "");
-                await import(mainPath + "/" + moduleName);
-            }
-        } catch (err) {
-            console.error(err);
-        }
-        //log("main start")
-        const main = new constructor();
-        main["main"]();
-    }());
-}
-
-function config(node: string) {
-    return globalConfig[node] || null;
-}
-
 function component(constructorFunction) {
     objectMapper.set(constructorFunction.name, new constructorFunction());
 }
@@ -72,28 +28,6 @@ function getBean(mappingClass: Function): any {
     return bean["factory"];
 }
 
-function value(configPath: string): any {
-    return function (target: any, propertyKey: string) {
-        if (globalConfig === undefined) {
-            Object.defineProperty(target, propertyKey, {
-                get: () => {
-                    return undefined;
-                }
-            });
-        } else {
-            let pathNodes = configPath.split(".");
-            let nodeValue = globalConfig;
-            for (let i = 0; i < pathNodes.length; i++) {
-                nodeValue = nodeValue[pathNodes[i]];
-            }
-            Object.defineProperty(target, propertyKey, {
-                get: () => {
-                    return nodeValue;
-                }
-            });
-        }
-    };
-}
 
 function autoware(target: any, propertyKey: string): void {
     const type = Reflect.getMetadata("design:type", target, propertyKey);
@@ -145,28 +79,10 @@ function error(message?: any, ...optionalParams: any[]) {
     }
 }
 
-function getRootPath() {
-    const lines = new Error().stack.split("\n");
-    let rootPath = "";
-    let lastLine = "";
-    for (let line of lines) {
-        if (line.includes("at ") &&
-            line.includes("node:internal/modules/cjs/loader") &&
-            line.includes("Module._compile") &&
-            lastLine.includes("at ") &&
-            lastLine.includes("Object.<anonymous>")) {
-            rootPath = lastLine.split("(")[1].split(":")[0];
-            break;
-        }
-        lastLine = line;
-    }
-    return rootPath;
-}
-
 function schedule(cronTime: string | Date) {
     return (target: any, propertyKey: string) => {
         new cron.CronJob(cronTime, target[propertyKey]).start();
     }
 }
 
-export { component, bean, resource, log, app, value, error, config, autoware, getBean, getComponent, schedule };
+export { component, bean, resource, log, error, autoware, getBean, getComponent, schedule };

package/src/default/express-server.class.ts

@@ -8,7 +8,8 @@ import * as expressSession from "express-session";
 import * as connectRedis from "connect-redis";
 import ServerFactory from "../factory/server-factory.class";
 import { setRouter } from "../route.decorator";
-import { bean, log, value, error, autoware } from "../core.decorator";
+import { value } from "../typespeed";
+import { bean, log, error, autoware } from "../core.decorator";
 import Redis from "./redis.class";
 import AuthenticationFactory from "../factory/authentication-factory.class";
 

package/src/default/node-cache.class.ts

@@ -1,6 +1,7 @@
 import CacheFactory from "../factory/cache-factory.class";
 import * as cache from "node-cache";
-import { value, bean } from "../core.decorator";
+import { value } from "../typespeed";
+import { bean } from "../core.decorator";
 
 export default class NodeCache extends CacheFactory {
     private NodeCache: any;

package/src/default/rabbitmq.class.ts

@@ -1,4 +1,5 @@
-import { bean, config } from "../core.decorator";
+import { bean  } from "../core.decorator";
+import { config } from "../typespeed";
 import { connect } from "amqplib";
 let rabbitConnection = null;
 

package/src/default/read-write-db.class.ts

@@ -1,7 +1,7 @@
 import { createConnection, createPool } from "mysql2";
 import DataSourceFactory from "../factory/data-source-factory.class";
-import { bean, config } from "../core.decorator";
-
+import { bean } from "../core.decorator";
+import { config } from "../typespeed";
 export default class ReadWriteDb extends DataSourceFactory {
     private readonly readSession;
     private readonly writeSession;

package/src/default/redis.class.ts

@@ -1,6 +1,6 @@
-import { bean, config } from "../core.decorator";
+import { bean } from "../core.decorator";
 import IoRedis from "ioredis";
-
+import { config } from "../typespeed";
 export default class Redis extends IoRedis {
 
     @bean