miqro 4.0.1 → 5.0.2

package/build/utils/templates.js

@@ -1,4 +1,157 @@
 // noinspection SpellCheckingInspection
+export const testTemplates = {
+    js: (category) => `import { it } from "node:test";
+import { TestHelper } from "@miqro/test-http";
+import { Server, APIRouter } from "@miqro/core";
+import { resolve } from "path";
+import { strictEqual } from "assert";
+
+it("happy path health", async () => {
+  const response = await TestHelper(new Server().use(await APIRouter({
+    dirname: resolve("./build/api")
+  })), {
+    url: "/health"
+  });
+  strictEqual(response.status, 200);
+});
+`
+};
+export const apiRouteTemplate = {
+    ts: (noMethod = false) => noMethod ? `import { APIRoute } from "@miqro/core";
+
+export default {
+  method: "GET",
+  handler: async (req, res) => {
+    return {
+      text: \`Hello\`
+    }
+  }
+} as APIRoute;
+` : `import { APIRoute } from "@miqro/core";
+
+export default {
+  handler: async (req, res) => {
+    return {
+      text: \`Hello\`
+    }
+  }
+} as APIRoute;
+`,
+    js: (noMethod = false) => noMethod ? `module.exports = {
+  method: "GET
+  handler: async (req, res) => {
+    return {
+      text: \`Hello\`
+    }
+  }
+};
+` : `module.exports = {
+  handler: async (req, res) => {
+    return {
+      text: \`Hello\`
+    }
+  }
+};
+`
+};
+export const mainTemplates = {
+    ts: () => `import { APIRouter, Server, checkEnvVariables, getLogger } from "@miqro/core";
+import { resolve } from "path";
+
+/*
+To be start as a main file
+node file.js
+*/
+
+const [PORT] = checkEnvVariables(["PORT"], ["8080"]);
+
+const logger = getLogger("server");
+
+async function main() {
+  const server = new Server();
+  server.use(await APIRouter({
+    dirname: resolve("./build/api")
+  }), "/api");
+  await server.listen(PORT);
+  server.logPaths(logger);
+  logger.info("listening on " + PORT);
+}
+
+main().catch(e => logger.error(e));
+`,
+    js: () => `const { APIRouter, App, checkEnvVariables, getLogger } = require("@miqro/core");
+const { resolve } = require("path");
+
+/*
+To be start as a main file
+node file.js
+*/
+
+const [PORT] = checkEnvVariables(["PORT"], ["8080"]);
+
+const logger = getLogger("server");
+
+async function main() {
+  const server = new App();
+  server.use(await APIRouter({
+    dirname: resolve(__dirname, "api")
+  }), "/api");
+  await server.listen(PORT);
+  server.logPaths(logger);
+  logger.info("listening on " + PORT);
+}
+
+main().catch(e => logger.error(e));
+`
+};
+export const gitignoreTemplate = {
+    ts: () => `node_modules/
+dist/
+`,
+    js: () => `node_modules/`
+};
+export const packageTemplate = {
+    ts: (name) => `{
+  "name": "${name}",
+  "type": "module",
+  "version": "1.0.0",
+  "description": "",
+  "private": true,
+  "scripts": {
+    "prebuild": "rm -Rf build/;",
+    "build": "tsc",
+    "prestart": "npm run build",
+    "start": "node --enable-source-maps build/main.js",
+    "cluster": "NODE_OPTIONS=--enable-source-maps miqro cluster build/main.js",
+    "pretest": "npm run build",
+    "test": "node --enable-source-maps --test test/**/*.test.js",
+    "coverage": "node --enable-source-maps --experimental-test-coverage --test test/**/*.test.js"
+  },
+  "devDependencies": {
+  },
+  "dependencies": {
+  },
+  "author": ""
+}`,
+    js: (name) => `{
+  "name": "${name}",
+  "type": "module",
+  "version": "1.0.0",
+  "description": "",
+  "private": true,
+  "scripts": {
+    "start": "node src/main.js",
+    "cluster": "miqro cluster src/main.js",
+    "test": "node --test test/**/*.test.js",
+    "coverage": "node --experimental-test-coverage --test test/**/*.test.js"
+  },
+  "devDependencies": {
+  },
+  "dependencies": {
+  },
+  "author": ""
+}`
+};
 export const logEnvFile = `####################
 ## logging
 LOG_LEVEL=info

package/build/utils/watch.d.ts

@@ -0,0 +1 @@
+export declare function setupWatch(directory: string, cmd: string, timeout?: number): void;

package/build/utils/watch.js

@@ -0,0 +1,35 @@
+import { execSync } from "child_process";
+import { watch, watchFile } from "fs";
+export function setupWatch(directory, cmd, timeout = 1000) {
+    watchFile(directory, () => {
+        queueRunCMD(cmd, timeout);
+    });
+    watch(directory, {
+        recursive: true
+    }, () => {
+        queueRunCMD(cmd, timeout);
+    });
+}
+let cmdTimeout = null;
+let running = false;
+function queueRunCMD(cmd, timeout) {
+    if (running) {
+        return;
+    }
+    if (cmdTimeout) {
+        clearTimeout(cmdTimeout);
+    }
+    cmdTimeout = setTimeout(() => {
+        running = true;
+        try {
+            execSync(cmd, {
+                cwd: process.cwd(),
+                env: process.env
+            });
+        }
+        catch (e) {
+            console.error(e);
+        }
+        running = false;
+    }, timeout);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "4.0.1",
+  "version": "5.0.2",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -13,20 +13,20 @@
     "prebuild": "rm -Rf build;",
     "build": "tsc",
     "pretest": "npm run build",
-    "test": "node --enable-source-maps --test test/",
-    "coverage": "node --enable-source-maps --experimental-test-coverage --test test/"
+    "test": "node --enable-source-maps --test test/**.test.js",
+    "coverage": "node --enable-source-maps --experimental-test-coverage --test test/**.test.js"
   },
   "author": "claukers",
   "license": "ISC",
   "dependencies": {
-    "@miqro/core": "^4.0.1",
-    "@miqro/parser": "^2.0.1",
+    "@miqro/core": "^5.0.9",
+    "@miqro/parser": "^2.0.2",
     "@miqro/runner": "^2.0.1"
   },
   "devDependencies": {
-    "@types/cookie": "0.4.1",
+    "@types/cookie": "0.6.0",
     "@types/node": "^20.4.5",
-    "typescript": "5.0.4"
+    "typescript": "5.3.3"
   },
   "engines": {
     "node": ">=18.0.0",

package/build/cmds/config-bash.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro config:bash";
-export declare const main: () => void;

package/build/cmds/config-bash.js

@@ -1,14 +0,0 @@
-import { loadConfig } from "@miqro/core";
-export const usage = "usage: [NODE_ENV=development] npx miqro config:bash";
-export const main = () => {
-    const logger = console;
-    if (process.argv.length !== 3) {
-        throw new Error(`invalid number of args. ${usage}`);
-    }
-    const configOut = loadConfig();
-    const config = configOut.combined;
-    const keys = Object.keys(config);
-    for (const key of keys) {
-        logger.info(`export ${key}=${config[key]}`);
-    }
-};

package/build/cmds/config-env.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro config:env";
-export declare const main: () => void;

package/build/cmds/config-env.js

@@ -1,14 +0,0 @@
-import { loadConfig } from "@miqro/core";
-export const usage = "usage: [NODE_ENV=development] npx miqro config:env";
-export const main = () => {
-    const logger = console;
-    if (process.argv.length !== 3) {
-        throw new Error(`invalid number of args. ${usage}`);
-    }
-    const configOut = loadConfig();
-    const config = configOut.combined;
-    const keys = Object.keys(config);
-    for (const key of keys) {
-        logger.info(`${key}=${config[key]}`);
-    }
-};

package/build/cmds/config-init.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro config:init";
-export declare const main: () => void;

package/build/cmds/config-init.js

@@ -1,31 +0,0 @@
-import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { resolve } from "path";
-import { ConfigPathResolver, loadConfig } from "@miqro/core";
-import { templates } from "../utils/templates.js";
-export const usage = "usage: [NODE_ENV=development] npx miqro config:init";
-export const main = () => {
-    const logger = console;
-    if (process.argv.length !== 3) {
-        throw new Error(`invalid number of args. ${usage}`);
-    }
-    loadConfig();
-    const configPath = ConfigPathResolver.getConfigDirname();
-    const initEnvFile = (path, template) => {
-        if (!existsSync(path)) {
-            logger.warn(`creating ${path} env file`);
-            writeFileSync(path, template);
-        }
-        else {
-            logger.warn(`${path} already exists!. init will not create it.`);
-        }
-    };
-    if (!existsSync(configPath)) {
-        logger.warn(`[${configPath}] doesnt exists!`);
-        mkdirSync(configPath, {
-            recursive: true
-        });
-    }
-    initEnvFile(resolve(configPath, `log.env`), templates.logEnvFile);
-    initEnvFile(resolve(configPath, `auth.env`), templates.authEnvFile);
-    initEnvFile(resolve(configPath, `features.env`), templates.featuresEnvFile);
-};

package/build/cmds/config.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro config";
-export declare const main: () => void;

package/build/cmds/config.js

@@ -1,11 +0,0 @@
-import { loadConfig } from "@miqro/core";
-export const usage = "usage: [NODE_ENV=development] npx miqro config";
-export const main = () => {
-    const logger = console;
-    if (process.argv.length !== 3) {
-        throw new Error(`invalid number of args. ${usage}`);
-    }
-    const configOut = loadConfig();
-    const config = configOut.combined;
-    logger.info(JSON.stringify(config, undefined, 2));
-};

package/build/cmds/doc-json.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro doc <api_folder> <subPath> [apiName]";
-export declare const main: () => Promise<void>;

package/build/cmds/doc-json.js

@@ -1,13 +0,0 @@
-import { loadConfig } from "@miqro/core";
-import { getDOCJSON } from "../utils/doc/json.js";
-export const usage = `usage: [NODE_ENV=development] npx miqro doc <api_folder> <subPath> [apiName]`;
-export const main = async () => {
-    if (process.argv.length < 5 || process.argv.length > 6) {
-        throw new Error(usage);
-    }
-    const dirname = process.argv[3];
-    const subPath = process.argv[4];
-    const apiName = process.argv[5];
-    loadConfig();
-    console.log(JSON.stringify(await getDOCJSON({ dirname, subPath, apiName }), undefined, 2));
-};

package/build/cmds/doc-md.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro doc <api_folder> <subPath> [apiName]";
-export declare const main: () => Promise<void>;

package/build/cmds/doc-md.js

@@ -1,13 +0,0 @@
-import { loadConfig } from "@miqro/core";
-import { getMDDoc } from "../utils/doc/md.js";
-export const usage = `usage: [NODE_ENV=development] npx miqro doc <api_folder> <subPath> [apiName]`;
-export const main = async () => {
-    if (process.argv.length < 5 || process.argv.length > 6) {
-        throw new Error(usage);
-    }
-    const dirname = process.argv[3];
-    const subPath = process.argv[4];
-    const apiName = process.argv[5];
-    loadConfig();
-    console.log(await getMDDoc({ dirname, subPath, apiName }));
-};

package/build/cmds/handler-apiroute-new.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro new:api:route <identifier ex: SRC_API_V1_HEALTH>";
-export declare const main: () => void;

package/build/cmds/handler-apiroute-new.js

@@ -1,66 +0,0 @@
-import { ConfigPathResolver, loadConfig } from "@miqro/core";
-import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { resolve } from "path";
-const templates = {
-    ts: (noMethod = false) => noMethod ? `import { APIRoute } from "@miqro/core";
-
-export default {
-  method: "GET",
-  handler: async (ctx) => {
-    return {
-      text: \`Hello\`
-    }
-  }
-} as APIRoute;
-` : `import { APIRoute } from "@miqro/core";
-
-export default {
-  handler: async (ctx) => {
-    return {
-      text: \`Hello\`
-    }
-  }
-} as APIRoute;
-`,
-    js: (noMethod = false) => noMethod ? `module.exports = {
-  method: "GET
-  handler: async (ctx) => {
-    return {
-      text: \`Hello\`
-    }
-  }
-};
-` : `module.exports = {
-  handler: async (ctx) => {
-    return {
-      text: \`Hello\`
-    }
-  }
-};
-`
-};
-export const usage = `usage: [NODE_ENV=development] npx miqro new:api:route <identifier ex: SRC_API_V1_HEALTH>`;
-export const main = () => {
-    if (process.argv.length !== 4 || process.argv[3].length < 1) {
-        throw new Error(usage);
-    }
-    const identifier = process.argv[3].toLocaleLowerCase();
-    const split = identifier.split("_").map(s => s.trim()).filter(s => s);
-    const dots = split.filter(s => s.indexOf(".") !== -1);
-    if (dots.length > 0) {
-        throw new Error(`identifier cannot contain dots\n${usage}`);
-    }
-    loadConfig();
-    const path = resolve(ConfigPathResolver.getBaseDirname(), ...split.splice(0, split.length - 1));
-    const ext = existsSync(resolve(ConfigPathResolver.getBaseDirname(), "tsconfig.json")) ? "ts" : "js";
-    const noMethod = ["post", "get", "put", "delete", "patch", "options"].indexOf(split[0].toLocaleLowerCase()) === -1;
-    const filePath = resolve(path, `${split[0]}.${ext}`);
-    if (existsSync(filePath)) {
-        throw new Error(`file ${filePath} already exists! doing nothing`);
-    }
-    console.log(`creating ${filePath}`);
-    mkdirSync(path, {
-        recursive: true
-    });
-    writeFileSync(filePath, templates[ext](noMethod));
-};

package/build/cmds/handler-main-new.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro new:api:main <identifier ex: NEW_APP>";
-export declare const main: () => void;

package/build/cmds/handler-main-new.js

@@ -1,78 +0,0 @@
-import { ConfigPathResolver, loadConfig } from "@miqro/core";
-import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { resolve } from "path";
-const mainTemplates = {
-    ts: () => `import { APIRouter, Server, checkEnvVariables, getLogger } from "@miqro/core";
-import { resolve } from "path";
-
-/*
-To be start as a main file
-node file.js
-*/
-
-const [PORT] = checkEnvVariables(["PORT"], ["8080"]);
-
-const logger = getLogger("server");
-
-async function main() {
-  const server = new Server();
-  server.use(await APIRouter({
-    dirname: resolve("./build/api")
-  }), "/api");
-  await server.listen(PORT);
-  server.logPaths(logger);
-  logger.info("listening on " + PORT);
-}
-
-main().catch(e => logger.error(e));
-`,
-    js: () => `const { APIRouter, App, checkEnvVariables, getLogger } = require("@miqro/core");
-const { resolve } = require("path");
-
-/*
-To be start as a main file
-node file.js
-*/
-
-const [PORT] = checkEnvVariables(["PORT"], ["8080"]);
-
-const logger = getLogger("server");
-
-async function main() {
-  const server = new App();
-  server.use(await APIRouter({
-    dirname: resolve(__dirname, "api")
-  }), "/api");
-  await server.listen(PORT);
-  server.logPaths(logger);
-  logger.info("listening on " + PORT);
-}
-
-main().catch(e => logger.error(e));
-`
-};
-export const usage = `usage: [NODE_ENV=development] npx miqro new:api:main <identifier ex: NEW_APP>`;
-export const main = () => {
-    if (process.argv.length !== 4 || process.argv[3].length < 1) {
-        throw new Error(usage);
-    }
-    const identifier = process.argv[3].toLocaleLowerCase();
-    const split = identifier.split("_");
-    const dots = split.filter(s => s.indexOf(".") !== -1);
-    if (dots.length > 0) {
-        throw new Error(`identifier cannot contain dots\narguments: <identifier ex: SRC_MAIN>`);
-    }
-    loadConfig();
-    const path = resolve(ConfigPathResolver.getBaseDirname(), ...split.splice(0, split.length - 1));
-    const ext = existsSync(resolve(ConfigPathResolver.getBaseDirname(), "tsconfig.json")) ? "ts" : "js";
-    const filePath = resolve(path, `${split[0]}.${ext}`);
-    if (existsSync(filePath)) {
-        throw new Error(`file ${filePath} already exists! doing nothing`);
-    }
-    console.log(`creating ${filePath}`);
-    mkdirSync(path, {
-        recursive: true
-    });
-    writeFileSync(filePath, mainTemplates[ext]());
-    console.log(`file ${filePath} created`);
-};

package/build/cmds/help.d.ts

@@ -1 +0,0 @@
-export declare function main(): void;

package/build/cmds/help.js

@@ -1,5 +0,0 @@
-import { CMD_MAP, usage } from "../cmd-map.js";
-import { getUsage } from "../utils/index.js";
-export function main() {
-    console.log(getUsage(CMD_MAP, usage));
-}

package/build/cmds/new-test.d.ts

@@ -1,2 +0,0 @@
-export declare const usage = "usage: [NODE_ENV=development] npx miqro new:test <identifier ex: TEST_SOMEFILE>";
-export declare const main: () => void;

package/build/cmds/new-test.js

@@ -1,44 +0,0 @@
-import { ConfigPathResolver, loadConfig } from "@miqro/core";
-import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { resolve } from "path";
-export const usage = `usage: [NODE_ENV=development] npx miqro new:test <identifier ex: TEST_SOMEFILE>`;
-const testTemplates = {
-    js: (category) => `import { it } from "node:test";
-import { TestHelper } from "@miqro/test-http";
-import { Server, APIRouter } from "@miqro/core";
-import { resolve } from "path";
-import { strictEqual } from "assert";
-
-it("happy path health", async () => {
-  const response = await TestHelper(new Server().use(await APIRouter({
-    dirname: resolve("./build/api")
-  })), {
-    url: "/health"
-  });
-  strictEqual(response.status, 200);
-});
-`
-};
-export const main = () => {
-    if (process.argv.length !== 4 || process.argv[3].length < 1) {
-        throw new Error(usage);
-    }
-    const identifier = process.argv[3].toLocaleLowerCase();
-    const split = identifier.split("_");
-    const dots = split.filter(s => s.indexOf(".") !== -1);
-    if (dots.length > 0) {
-        throw new Error(`identifier cannot contain dots\narguments: <identifier ex: TEST_SOMETEST>`);
-    }
-    loadConfig();
-    const path = resolve(ConfigPathResolver.getBaseDirname(), ...split.splice(0, split.length - 1));
-    const filePath = resolve(path, `${split[0]}.test.js`);
-    if (existsSync(filePath)) {
-        throw new Error(`file ${filePath} already exists! doing nothing`);
-    }
-    console.log(`creating ${filePath}`);
-    mkdirSync(path, {
-        recursive: true
-    });
-    writeFileSync(filePath, testTemplates.js(split[0]));
-    console.log(`file ${filePath} created`);
-};

package/build/cmds/new.d.ts

@@ -1,2 +0,0 @@
-export declare const usageTS = "usage: npx miqro new:api <identifier ex: NEW_APP>";
-export declare const mainTS: () => void;