typespeed 2.1.2 → 2.2.1

package/dist/core.decorator.js

@@ -11,18 +11,18 @@ let globalConfig = {};
 const resourceObjects = new Map();
 const beanMapper = new Map();
 const objectMapper = new Map();
-const coreDir = __dirname;
-const mainPath = path.dirname(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 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 () {
@@ -147,6 +147,23 @@ 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

@@ -37,7 +37,7 @@ class ExpressServer extends server_factory_class_1.default {
             this.app.use(middleware);
         });
         this.setDefaultMiddleware();
-        this.app.listen(port, () => {
+        return this.app.listen(port, () => {
             (0, core_decorator_1.log)("server start at port: " + port);
         });
     }

package/dist/scaffold/templates/package.json.tpl

@@ -8,8 +8,9 @@
         "build": "tsc -p ."
     },
     "dependencies": {
-        "@types/node": "^18.0.6",
-        "tracer": "^1.1.6",
         "typespeed": "latest"
+    },
+    "devDependencies": {
+        "@types/node": "^18.0.6"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespeed",
-  "version": "2.1.2",
+  "version": "2.2.1",
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",
@@ -52,7 +52,6 @@
     "tracer": "^1.1.6",
     "typescript": "^4.7.4",
     "walk-sync": "^3.0.0",
-    "amqplib": "0.10.3",
-    "swagger-ui-express": "4.6.3"
+    "amqplib": "0.10.3"
   }
 }

package/src/core.decorator.ts

@@ -9,20 +9,20 @@ 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>();
-const coreDir = __dirname;
-const mainPath = path.dirname(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<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'] });
 
@@ -145,6 +145,23 @@ 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) => {

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

@@ -52,7 +52,7 @@ export default class ExpressServer extends ServerFactory {
         this.middlewareList.push(middleware);
     }
 
-    public start(port: number) {
+    public start(port: number): any {
         this.app.use(this.authentication.afterCompletion);
         this.middlewareList.forEach(middleware => {
             this.app.use(middleware);
@@ -60,7 +60,7 @@ export default class ExpressServer extends ServerFactory {
 
         this.setDefaultMiddleware();
  
-        this.app.listen(port, () => {
+        return this.app.listen(port, () => {
             log("server start at port: " + port);
         });
     }

package/src/scaffold/templates/package.json.tpl

@@ -8,8 +8,9 @@
         "build": "tsc -p ."
     },
     "dependencies": {
-        "@types/node": "^18.0.6",
-        "tracer": "^1.1.6",
         "typespeed": "latest"
+    },
+    "devDependencies": {
+        "@types/node": "^18.0.6"
     }
 }