miqro 6.0.14 → 6.1.1

package/build/esm/src/cluster.js

@@ -18,4 +18,3 @@ else {
     console.log(CMD);
     execSync(CMD, { stdio: 'inherit' });
 }
-//# sourceMappingURL=cluster.js.map

package/build/esm/src/common/arguments.d.ts

@@ -1,11 +1,22 @@
+interface MiqroJSON {
+    services?: string[];
+    port?: string | number;
+    inflateDir?: string;
+    name?: string;
+}
+export declare function importMiqroJSON(inFile: string): MiqroJSON;
 export declare function getPORT(): string;
 export interface Arguments {
+    name: string;
     installTypes: boolean;
     installTSConfig: boolean;
     test: boolean;
+    port: string;
     inflate: boolean;
     generateDoc: boolean;
     generateDocOut: string;
+    miqroJSONPath: string | false;
+    disableMiqroJSON: boolean;
     generateDocAll: boolean;
     generateDocType: "JSON" | "MD";
     migrateUp: boolean;
@@ -21,3 +32,4 @@ export interface Arguments {
  * parse process.argv arguments
  */
 export declare function parseArguments(): Arguments;
+export {};

package/build/esm/src/common/arguments.js

@@ -1,15 +1,36 @@
 import { checkEnvVariable } from "@miqro/core";
 import { existsSync, readFileSync, statSync } from "node:fs";
-import { resolve } from "node:path";
+import { basename, dirname, join, relative, resolve } from "node:path";
 import { cwd, env, platform, arch } from "node:process";
 import { EXIT_CODES } from "./constants.js";
 import { tmpdir } from "node:os";
 import { randomUUID } from "node:crypto";
 import { BIN_NAME, help, usage } from "./help.js";
-import { TEST_SOCKET } from "./paths.js";
+import { getMiqroJSONPath, TEST_SOCKET } from "./paths.js";
 import { isSea } from "node:sea";
 import cluster from "node:cluster";
 import { __package_dirname, getVersion } from "./assets.js";
+import { Parser } from "@miqro/parser";
+const parser = new Parser();
+const MiqroJSONSchema = {
+    type: "object",
+    properties: {
+        name: "string?",
+        services: "string[]?",
+        port: "number?|string?",
+        inflateDir: "string?"
+    }
+};
+export function importMiqroJSON(inFile) {
+    const mod = JSON.parse(readFileSync(inFile).toString());
+    const module = parser.parse(mod, MiqroJSONSchema, basename(inFile));
+    if (module !== undefined) {
+        return module;
+    }
+    else {
+        throw new Error(`error loading [${inFile}] undefined`);
+    }
+}
 export function getPORT() {
     return checkEnvVariable("PORT", "8080");
 }
@@ -20,8 +41,12 @@ export function parseArguments() {
     //env["LOG_FILE"] = env["LOG_FILE"] ? env["LOG_FILE"] : "./server.log";
     const args = cluster.isPrimary ? process.argv.slice(2, process.argv.length) : process.argv.slice(3, process.argv.length);
     const flags = {
+        name: null,
         hotreload: null,
+        miqroJSONPath: null,
+        disableMiqroJSON: null,
         installTypes: null,
+        port: null,
         installTSConfig: null,
         migrateUp: null,
         migrateDown: null,
@@ -60,6 +85,29 @@ export function parseArguments() {
                 console.log(usage);
                 console.log(help);
                 process.exit(EXIT_CODES.NORMAL_EXIT);
+            case "--disable-miqrojson":
+                if (flags.disableMiqroJSON !== null || flags.miqroJSONPath !== null) {
+                    console.error("bad arguments.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                flags.disableMiqroJSON = true;
+                continue;
+            case "--config":
+                if (flags.miqroJSONPath !== null || flags.disableMiqroJSON !== null) {
+                    console.error("bad arguments.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                const cPath = String(args[i + 1]).toUpperCase();
+                if (typeof cPath !== "string") {
+                    console.error("bad arguments. --config must be a string.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                flags.miqroJSONPath = cPath;
+                i++;
+                continue;
             case "--install-tsconfig":
                 if (flags.inflate !== null || flags.installTSConfig !== null) {
                     console.error("bad arguments.");
@@ -76,6 +124,36 @@ export function parseArguments() {
                 }
                 flags.hotreload = true;
                 continue;
+            case "--port":
+                if (flags.port !== null) {
+                    console.error("bad arguments.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                const cPort = String(args[i + 1]).toUpperCase();
+                if (typeof cPort !== "string") {
+                    console.error("bad arguments. --port must be a string.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                flags.port = cPort;
+                i++;
+                continue;
+            case "--name":
+                if (flags.name !== null) {
+                    console.error("bad arguments.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                const cName = String(args[i + 1]).toUpperCase();
+                if (typeof cName !== "string") {
+                    console.error("bad arguments. --port must be a string.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                flags.name = cName;
+                i++;
+                continue;
             case "--generate-doc":
                 if (flags.generateDoc !== null) {
                     console.error("bad arguments.");
@@ -164,7 +242,6 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                env["HOT_RELOAD"] = env["HOT_RELOAD"] ? env["HOT_RELOAD"] : "0";
                 flags.migrateUp = true;
                 continue;
             case "--migrate-down":
@@ -173,7 +250,6 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                env["HOT_RELOAD"] = env["HOT_RELOAD"] ? env["HOT_RELOAD"] : "0";
                 flags.migrateDown = true;
                 continue;
             case "--inflate":
@@ -182,7 +258,6 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                env["HOT_RELOAD"] = env["HOT_RELOAD"] ? env["HOT_RELOAD"] : "0";
                 flags.inflate = true;
                 continue;
             case "--test":
@@ -191,7 +266,6 @@ export function parseArguments() {
                     console.error(usage);
                     process.exit(EXIT_CODES.BAD_ARGUMENTS);
                 }
-                env["HOT_RELOAD"] = env["HOT_RELOAD"] ? env["HOT_RELOAD"] : "0";
                 env["BROWSER"] = env["BROWSER"] ? env["BROWSER"] : "none";
                 env["PORT"] = TEST_SOCKET;
                 flags.test = true;
@@ -233,13 +307,37 @@ export function parseArguments() {
             continue;*/
         }
     }
-    if (process.env["CLUSTER_NODE_NUMBER"]) {
-        env["HOT_RELOAD"] = env["HOT_RELOAD"] ? env["HOT_RELOAD"] : "0";
-    }
     flags.inflate = flags.inflate ? flags.inflate : false;
     flags.editor = flags.editor ? flags.editor : false;
     flags.test = flags.test ? flags.test : false;
     flags.inflateDir = flags.inflateDir ? flags.inflateDir : undefined;
+    const miqroJSONPath = !flags.disableMiqroJSON ? flags.miqroJSONPath ? resolve(flags.miqroJSONPath) : getMiqroJSONPath() : false;
+    const miqroRC = miqroJSONPath ? importMiqroJSON(miqroJSONPath) : {};
+    // try to load .miqrorc
+    if (!flags.disableMiqroJSON && miqroJSONPath) {
+        if (services.length === 0) {
+            if (miqroRC.services) {
+                for (const service of miqroRC.services) {
+                    services.push(join(relative(cwd(), dirname(miqroJSONPath)), service));
+                }
+            }
+        }
+        if (!flags.port) {
+            if (miqroRC.port) {
+                flags.port = String(miqroRC.port);
+            }
+        }
+        if (!flags.inflateDir && flags.inflate) {
+            if (miqroRC.inflateDir) {
+                flags.inflateDir = miqroRC.inflateDir;
+            }
+        }
+        if (!flags.name) {
+            if (miqroRC.name) {
+                flags.name = miqroRC.name;
+            }
+        }
+    }
     if (services.length === 0 && (!flags.installTSConfig && !flags.installTypes)) {
         flags.inflateDir = flags.inflateDir ? flags.inflateDir : undefined;
         console.error(`bad arguments. missing --service argument`);
@@ -304,11 +402,15 @@ export function parseArguments() {
     }
     const generateDocType = flags.generateDocType ? flags.generateDocType : "MD";
     return {
+        name: flags.name ? flags.name : undefined,
         generateDocAll: flags.generateDocAll ? true : false,
         hotreload: flags.hotreload ? true : false,
+        disableMiqroJSON: flags.disableMiqroJSON !== null ? flags.disableMiqroJSON : false,
+        miqroJSONPath: miqroJSONPath ? miqroJSONPath : false,
         installTypes: flags.installTypes ? true : false,
         installTSConfig: flags.installTSConfig ? true : false,
         inflate: flags.inflate,
+        port: flags.port ? flags.port : getPORT(),
         migrateUp: flags.migrateUp ? true : false,
         migrateDown: flags.migrateDown ? true : false,
         test: flags.test ? true : false,
@@ -322,4 +424,3 @@ export function parseArguments() {
         editor: flags.editor ? true : false
     };
 }
-//# sourceMappingURL=arguments.js.map

package/build/esm/src/common/assets.js

@@ -24,8 +24,8 @@ const ASSETS_ROUTER = {
     "jsx.dom.js": "build/jsx.dom.js",
     "types.json": "sea/types.json",
     "editor-assets/editor.bundle.js": "build/editor.bundle.js",
-    "editor-assets/style.css": "editor/http/admin/editor/style.css",
-    "editor-assets/font.ttf": "editor/http/admin/editor/font.ttf"
+    "editor-assets/style.css": "build/style.css",
+    "editor-assets/font.ttf": "build/font.ttf"
 };
 export function getAsset(key) {
     if (isSea()) {
@@ -121,4 +121,3 @@ export async function initAsset(logger, path, buffer, executable, checksum, logI
         }
     }
 }
-//# sourceMappingURL=assets.js.map

package/build/esm/src/common/checksum.js

@@ -54,4 +54,3 @@ export async function calculateChecksumFromBuffer(buffer) {
         }
     });
 }
-//# sourceMappingURL=checksum.js.map

package/build/esm/src/common/constants.js

@@ -11,4 +11,3 @@ export const EDITOR_CONFIG_KEY = "$$editor$$";
 export const HOT_RELOAD_PATH = "/hot-reload";
 //export const SERVER_IDENTIFIER = cluster.isPrimary ? "SERVER" : process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}` : "WORKER";
 //export const DB_IDENTIFIER = cluster.isPrimary ? "DATABASE" : process.env["CLUSTER_NODE_NUMBER"] ? `WORKER_${process.env["CLUSTER_NODE_NUMBER"]}_DATABASE` : "WORKER_DATABASE";
-//# sourceMappingURL=constants.js.map

package/build/esm/src/common/content-type.js

@@ -79,4 +79,3 @@ export const CONTENT_TYPE_MAP = {
     ".3g2": "video/3gpp2; audio/3gpp2",
     ".7z": "application/x-7z-compressed"
 };
-//# sourceMappingURL=content-type.js.map

package/build/esm/src/common/esbuild.js

@@ -76,4 +76,3 @@ export async function esBuild(options, logger) {
         }
     });
 }
-//# sourceMappingURL=esbuild.js.map

package/build/esm/src/common/exit.js

@@ -81,4 +81,3 @@ export function setupExitHandlers(app) {
         process.exit(EXIT_CODES.ABNORMAL_UNCONTROLLED);
     });
 }
-//# sourceMappingURL=exit.js.map

package/build/esm/src/common/fs.js

@@ -14,4 +14,3 @@ export function describeFilePath(filePath) {
         filePath
     };
 }
-//# sourceMappingURL=fs.js.map

package/build/esm/src/common/help.d.ts

@@ -1,3 +1,3 @@
 export declare const BIN_NAME = "miqro";
 export declare const usage = "usage: miqro [...FLAGS] --service app/\n\n==examples==\n\nmiqro --watch --service front/\nPORT=8181 miqro --service api/ --service front/\nmiqro --test --service front/\nmiqro --inflate --service front/\nmiqro --generate-doc --generate-doc-out API.md --service front/\nCLUSTER_COUNT=10 miqro-cluster --service api/";
-export declare const help = "\n==flags==\n\n-v, --version\t\toutputs the version number\n-h, --help\t\toutputs this page.\n--watch\t\t\tuse to enable the hot-reload functionality.\n--test\t\t\trun the tests for a service.\n--migrate-up\t\tmigrations up.\n--migrate-down\t\tmigrations down.\n--inflate\t\tinflates the application.\n--inflate-dir\t\tto set the output directory of the --inflate command. default value is inflated/.\n--editor\t\truns the application with a built-in editor.\n--generate-doc\t\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\toutputs all the server routes in the documentation output.\n--compile\t\tinflates the application and tries to create a NODE SEA binary.\n--inflate-sea\t\tinflates the application with sea compilation scripts.\n--install-tsconfig\tcreates a tsconfig.json configured to use with --install-types.\n--install-types\t\tcreates and updates the .types/ folder use together with --install-tsconfig.\n\n==environment variables==\n\nPORT\t\t\toverride the default 8080 port.\nLOG_FILE\t\toverride the default ./server.log file\nDB\t\t\tenable the server.db features\nDB_STORAGE\t\toverride the default local db location ./db.sqlite3\nDB_DIALECT\t\toverride the default node:sqlite\nDB_CONNECTION\t\toverride the default connection url\nCLEAR_JSX_CACHE\t\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\t\t\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";
+export declare const help = "\n==flags==\n\n-v, --version\t\toutputs the version number\n-h, --help\t\toutputs this page.\n--watch\t\t\tuse to enable the hot-reload functionality.\n--test\t\t\trun the tests for a service.\n--migrate-up\t\tmigrations up.\n--migrate-down\t\tmigrations down.\n--inflate\t\tinflates the application.\n--inflate-dir\t\tto set the output directory of the --inflate command. default value is inflated/.\n--editor\t\truns the application with a built-in editor.\n--generate-doc\t\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\toutputs all the server routes in the documentation output.\n--compile\t\tinflates the application and tries to create a NODE SEA binary.\n--inflate-sea\t\tinflates the application with sea compilation scripts.\n--install-tsconfig\tcreates a tsconfig.json configured to use with --install-types.\n--install-types\t\tcreates and updates the .types/ folder use together with --install-tsconfig.\n--disable-miqrojson\tdisables the load of miqro.json file.\n--config\toverrides the default miqro.json path with a new one.\n--port\toverrides the default port loading from environment variables.\n--name\toverrides the default name of the server.\n\n==environment variables==\n\nPORT\t\t\toverride the default 8080 port.\nLOG_FILE\t\toverride the default ./server.log file\nDB\t\t\tenable the server.db features\nDB_STORAGE\t\toverride the default local db location ./db.sqlite3\nDB_DIALECT\t\toverride the default node:sqlite\nDB_CONNECTION\t\toverride the default connection url\nCLEAR_JSX_CACHE\t\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\t\t\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";

package/build/esm/src/common/help.js

@@ -30,6 +30,10 @@ export const help = `
 --inflate-sea\t\tinflates the application with sea compilation scripts.
 --install-tsconfig\tcreates a tsconfig.json configured to use with --install-types.
 --install-types\t\tcreates and updates the .types/ folder use together with --install-tsconfig.
+--disable-miqrojson\tdisables the load of miqro.json file.
+--config\toverrides the default miqro.json path with a new one.
+--port\toverrides the default port loading from environment variables.
+--name\toverrides the default name of the server.
 
 ==environment variables==
 
@@ -42,4 +46,3 @@ DB_CONNECTION\t\toverride the default connection url
 CLEAR_JSX_CACHE\t\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.
 JSX_TMP\t\t\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.
 `;
-//# sourceMappingURL=help.js.map

package/build/esm/src/common/jsx.d.ts

@@ -1,7 +1,7 @@
 import { Runtime } from "@miqro/jsx";
 import { Request, Response, CORSOptions, Logger, APIRoute } from "@miqro/core";
 import { Schema } from "@miqro/parser";
-import { APIOptions, ServerConfig, WSConfig, AuthConfig, DBConfig, LogConfig } from "../types.js";
+import { APIOptions, ServerConfig, WSConfig, AuthConfig, DBConfig, LogConfig, MiddlewareConfig, ErrorConfig, DocConfig } from "../types.js";
 import { Migration } from "@miqro/query";
 export declare function initJSXJS(logger: Logger): Promise<void>;
 export declare function validateJSXJS(logger: Logger): Promise<boolean>;
@@ -38,11 +38,18 @@ export declare const DBConfigSchema: Schema<DBConfig>;
 export declare const ServerConfigSchema: Schema<ServerConfig>;
 export declare const LogConfigSchema: Schema<LogConfig>;
 export declare const AuthConfigSchema: Schema<AuthConfig>;
+export declare const MiddlewareConfigSchema: Schema<MiddlewareConfig>;
+export declare const ErrorConfigSchema: Schema<ErrorConfig>;
+export declare const DocConfigSchema: Schema<DocConfig>;
 export declare function importAPIRoute(inFile: string, logger?: Logger): Promise<APIRoute>;
 export declare function importMigrationModule(inFile: string, logger?: Logger): Promise<Migration>;
 export declare function importHTMLModule(inFile: string, logger?: Logger): Promise<any>;
 export declare function importJSONModule(inFile: string, logger?: Logger): Promise<any>;
 export declare function importAuthModule(inFile: string, logger?: Logger): Promise<AuthConfig>;
+export declare function importMiddlewareConfigModule(inFile: string, logger?: Logger): Promise<MiddlewareConfig>;
+export declare function importErrorConfigModule(inFile: string, logger?: Logger): Promise<ErrorConfig>;
+export declare function importDocConfigModule(inFile: string, logger?: Logger): Promise<DocConfig>;
+export declare function importConfigConfigModule(inFile: string, logger?: Logger): Promise<MiddlewareConfig>;
 export declare function importCORSModule(inFile: string, logger?: Logger): Promise<CORSOptions>;
 export declare function importWSConfigModule(inFile: string, logger?: Logger): Promise<WSConfig>;
 export declare function importDBConfigModule(inFile: string, logger?: Logger): Promise<DBConfig>;

package/build/esm/src/common/jsx.js

@@ -11,7 +11,7 @@ import { getJSXJSPath, JSX_TMP_DIR } from "./paths.js";
 import { CLEAR_JSX_CACHE } from "./constants.js";
 import { getAsset, initAsset, validateAsset } from "./assets.js";
 import { calculateChecksumFromBuffer } from "./checksum.js";
-import { RouteOptionsSchema } from "@miqro/core/build/types.js";
+import { HandlerWithOptionsSchema, RouteOptionsSchema } from "@miqro/core/build/types.js";
 let jsxJSBuffer = null; // Buffer.from(getAsset("jsx.dom.js"));
 let jsxJSBufferChecksumPromise = null; // calculateChecksumFromBuffer(jsxJSBuffer);
 export async function initJSXJS(logger) {
@@ -214,6 +214,53 @@ export const AuthConfigSchema = {
     },
     //mode:"add_extra"
 };
+export const MiddlewareConfigSchema = {
+    type: "object",
+    properties: {
+        middleware: {
+            type: "Array",
+            arrayType: "function|object",
+            required: false,
+            properties: {
+                ...HandlerWithOptionsSchema.properties
+            }
+        },
+        post: {
+            type: "Array",
+            arrayType: "function|object",
+            required: false,
+            properties: {
+                ...HandlerWithOptionsSchema.properties
+            }
+        }
+    },
+};
+export const ErrorConfigSchema = {
+    type: "object",
+    properties: {
+        catch: {
+            type: "Array",
+            required: false,
+            arrayType: "function"
+        }
+    },
+};
+export const DocConfigSchema = {
+    type: "object",
+    properties: {
+        publish: {
+            type: "dict?",
+            dictType: "object",
+            properties: {
+                type: {
+                    type: "enum?",
+                    enumValues: ["HTML", "MD", "JSON"]
+                },
+                all: "boolean?"
+            }
+        }
+    }
+};
 export async function importAPIRoute(inFile, logger) {
     const mod = (await importJSXFile(inFile, logger)).default;
     const module = typeof mod === "function" ? { handler: mod } : parser.parse(mod, APIRouteSchema, basename(inFile));
@@ -264,6 +311,42 @@ export async function importAuthModule(inFile, logger) {
         throw new Error(`error with module [${inFile}] undefined`);
     }
 }
+export async function importMiddlewareConfigModule(inFile, logger) {
+    const module = parser.parse((await importJSXFile(inFile, logger)).default, MiddlewareConfigSchema, basename(inFile));
+    if (module !== undefined) {
+        return module;
+    }
+    else {
+        throw new Error(`error with module [${inFile}] undefined`);
+    }
+}
+export async function importErrorConfigModule(inFile, logger) {
+    const module = parser.parse((await importJSXFile(inFile, logger)).default, ErrorConfigSchema, basename(inFile));
+    if (module !== undefined) {
+        return module;
+    }
+    else {
+        throw new Error(`error with module [${inFile}] undefined`);
+    }
+}
+export async function importDocConfigModule(inFile, logger) {
+    const module = parser.parse((await importJSXFile(inFile, logger)).default, DocConfigSchema, basename(inFile));
+    if (module !== undefined) {
+        return module;
+    }
+    else {
+        throw new Error(`error with module [${inFile}] undefined`);
+    }
+}
+export async function importConfigConfigModule(inFile, logger) {
+    const module = parser.parse((await importJSXFile(inFile, logger)).default, MiddlewareConfigSchema, basename(inFile));
+    if (module !== undefined) {
+        return module;
+    }
+    else {
+        throw new Error(`error with module [${inFile}] undefined`);
+    }
+}
 export async function importCORSModule(inFile, logger) {
     const module = parser.parse((await importJSXFile(inFile, logger)).default, CORSOptionsSchema, basename(inFile));
     if (module !== undefined) {
@@ -376,4 +459,3 @@ export function jsx2HTML(out, runtime) {
     //console.log("jsx2HTML [%s]", HTML);
     return HTML;
 }
-//# sourceMappingURL=jsx.js.map

package/build/esm/src/common/paths.d.ts

@@ -7,6 +7,10 @@ export declare function getServerConfigPath(servicePath: string): string | false
 export declare function getWSConfigPath(servicePath: string): string | false;
 export declare function getDBConfigPath(servicePath: string): string | false;
 export declare function getStaticFilesPath(servicePath: string): string | false;
+export declare function getMiddlewareConfigPath(servicePath: string): string | false;
+export declare function getErrorConfigPath(servicePath: string): string | false;
+export declare function getDocConfigPath(servicePath: string): string | false;
+export declare function getMiqroJSONPath(): string | false;
 export declare function getAuthConfigPath(servicePath: string): string | false;
 export declare function getHTTPRouterPath(servicePath: string): string | false;
 export declare function getMigrationsPath(servicePath: string): string | false;

package/build/esm/src/common/paths.js

@@ -71,13 +71,53 @@ export function getStaticFilesPath(servicePath) {
     }
     return false;
 }
+export function getMiddlewareConfigPath(servicePath) {
+    const middlewarePath = resolve(servicePath, "middleware.ts");
+    const middlewarePathJS = resolve(servicePath, "middleware.js");
+    if (existsSync(middlewarePath) && !statSync(middlewarePath).isDirectory()) {
+        return middlewarePath;
+    }
+    else if (existsSync(middlewarePathJS) && !statSync(middlewarePathJS).isDirectory()) {
+        return middlewarePathJS;
+    }
+    return false;
+}
+export function getErrorConfigPath(servicePath) {
+    const errorPath = resolve(servicePath, "catch.ts");
+    const errorPathJS = resolve(servicePath, "catch.js");
+    if (existsSync(errorPath) && !statSync(errorPath).isDirectory()) {
+        return errorPath;
+    }
+    else if (existsSync(errorPathJS) && !statSync(errorPathJS).isDirectory()) {
+        return errorPathJS;
+    }
+    return false;
+}
+export function getDocConfigPath(servicePath) {
+    const docPath = resolve(servicePath, "doc.ts");
+    const docPathJS = resolve(servicePath, "doc.js");
+    if (existsSync(docPath) && !statSync(docPath).isDirectory()) {
+        return docPath;
+    }
+    else if (existsSync(docPathJS) && !statSync(docPathJS).isDirectory()) {
+        return docPathJS;
+    }
+    return false;
+}
+export function getMiqroJSONPath() {
+    const miqroRCPath = resolve(cwd(), "miqro.json");
+    if (existsSync(miqroRCPath) && !statSync(miqroRCPath).isDirectory()) {
+        return miqroRCPath;
+    }
+    return false;
+}
 export function getAuthConfigPath(servicePath) {
     const authPath = resolve(servicePath, "auth.ts");
     const authPathJS = resolve(servicePath, "auth.js");
     if (existsSync(authPath) && !statSync(authPath).isDirectory()) {
         return authPath;
     }
-    else if (existsSync(authPath) && !statSync(authPath).isDirectory()) {
+    else if (existsSync(authPathJS) && !statSync(authPathJS).isDirectory()) {
         return authPathJS;
     }
     return false;
@@ -107,4 +147,3 @@ export function getESBuildBinaryPath() {
 export function getJSXJSPath() {
     return resolve(JSX_TMP_DIR, String(process.pid), "jsx.js");
 }
-//# sourceMappingURL=paths.js.map

package/build/esm/src/common/watch.js

@@ -76,4 +76,3 @@ export async function watchAndServer(app) {
         }
     };
 }
-//# sourceMappingURL=watch.js.map

package/build/esm/src/inflate/inflate-sea.js

@@ -1,7 +1,7 @@
 import { chmodSync, constants, mkdirSync, writeFileSync } from "node:fs";
 import { dirname, extname, join, relative, resolve } from "node:path";
 import { cwd, platform } from "node:process";
-import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getMigrationsPath, getServerConfigPath, getServicePath, getWSConfigPath } from "../common/paths.js";
+import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getMiddlewareConfigPath, getMigrationsPath, getServerConfigPath, getWSConfigPath } from "../common/paths.js";
 import { getAsset } from "../common/assets.js";
 import { migration } from "@miqro/query";
 //export const libCJSBuffer = Buffer.from(getAsset("lib.cjs"));
@@ -83,20 +83,9 @@ async function main() {
   ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.preload).map(config=>config.preload(serverInterface)));\n` : ""}
   app.use(ServerRequestHandler(serverInterface));
   app.use(LoggerHandler());
-  ${services.map(service => {
-        const servicePath = getServicePath(service);
-        return `${getCORSConfigPath(servicePath) ? `app.use(server.middleware.cors((await import("../${service}/cors.js")).default));` : ""}`;
-    })}
-  ${services.map(service => {
-        const servicePath = getServicePath(service);
-        return `${getAuthConfigPath(servicePath) ? `app.use(server.middleware.session((await import("../${service}/auth.js")).default));` : ""}`;
-    })}
-  ${services.map(service => `
-  app.use(await (await import("./${join(service, "api-router.js")}")).setupRouter());
-  app.use(await (await import("./${join(service, "static-router.js")}")).setupRouter())`).join("\n")}
+  ${services.map(service => `app.use(await (await import("./${join(service, "router.js")}")).setupRouter());`).join("\n")}
   ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.load).map(config=>config.load(serverInterface)));\n` : ""}
   
-
   await app.listen(PORT);
   ${SERVERCONFIGLIST ? `\n  await Promise.all([${SERVERCONFIGLIST}].filter(config=>config.start).map(config=>config.start(serverInterface)));` : ""}
 }
@@ -106,10 +95,25 @@ main().catch(e=>console.error(e));
 export async function inflateServiceForSea(logger, inflateDir, service, servicePath /*, serviceMigrations: string[]*/, serviceRouteFileMap, serviceStaticFileMap) {
     const migrationsFolderPath = getMigrationsPath(servicePath);
     const serviceMigrations = migrationsFolderPath ? migration.getSortedMigrations(migrationsFolderPath) : [];
-    writeFile(logger, join(inflateDir, "sea", service, "api-router.js"), `import { appendAPIModule, Router } from "./../lib.cjs";\n
+    writeFile(logger, join(inflateDir, "sea", service, "router.js"), `import { appendAPIModule, Router } from "./../lib.cjs";\n
 export async function setupRouter() {
   const router = new Router();
-
+${getErrorConfigPath(servicePath) ? `
+  const errorConfig = (await import("../../${service}/catch.js")).default;
+  if(errorConfig && errorConfig.catch) {
+    for(const m of errorConfig.catch) {
+      router.catch(m);
+    }
+  }` : ""}
+${getCORSConfigPath(servicePath) ? `  router.use(server.middleware.cors((await import("../../${service}/cors.js")).default));` : ""}
+${getAuthConfigPath(servicePath) ? `  router.use(server.middleware.session((await import("../../${service}/auth.js")).default));` : ""}
+${getMiddlewareConfigPath(servicePath) ? `
+  const middlewareConfig = (await import("../../${service}/middleware.js")).default;
+  if(middlewareConfig && middlewareConfig.middleware) {
+    for(const m of middlewareConfig.middleware) {
+      router.use(m);
+    }
+  }` : ""}
 ${Object.keys(serviceRouteFileMap)
         .map(filePath => serviceRouteFileMap[filePath])
         .filter(data => data.previewMethod === "api")
@@ -124,7 +128,15 @@ ${Object.keys(serviceRouteFileMap)
         }
     }).filter(l => l)[0])
         .join("\n")}
+  router.use(await (await import("./static-router.js")).setupRouter())
 
+${getMiddlewareConfigPath(servicePath) ? `
+  if(middlewareConfig && middlewareConfig.post) {
+    for(const m of middlewareConfig.post) {
+      router.use(m);
+    }
+  }` : ""}
+      
   return router;
 }`);
     writeFile(logger, join(inflateDir, "sea", service, "migration-up.js"), `import { migration } from "./../lib.cjs";\n
@@ -173,4 +185,3 @@ function writeFile(logger, path, buffer) {
     });
     writeFileSync(path, buffer);
 }
-//# sourceMappingURL=inflate-sea.js.map

package/build/esm/src/inflate/inflate.js

@@ -7,6 +7,7 @@ import { getServicePath } from "../common/paths.js";
 import { inflateWSConfig } from "./setup-ws.js";
 import { inflateAppForSea, inflateServiceForSea } from "./inflate-sea.js";
 import { setupLogConfig } from "./setup-log.js";
+import { setupDoc } from "./setup.doc.js";
 export async function inflateApp({ serverInterface, logger, hotreload, services /*, dbManager*/, inflateDir, inflateSea /*, editor, inflateTests*/ }) {
     logger.trace("inflateApp");
     const errors = [];
@@ -47,6 +48,7 @@ export async function inflateApp({ serverInterface, logger, hotreload, services
             ...routeFileMap,
             ...serviceRouteFileMap
         };
+        await setupDoc(logger, servicePath, service, router, routeFileMap, inflateDir, errors);
         await inflateWSConfig(logger, servicePath, service, wsConfigList, inflateSea ? inflateDir : undefined, errors);
         //await setupServerConfig(logger, servicePath, service, serverConfigMap, inflateSea ? inflateDir : undefined, errors);
         if (inflateDir && inflateSea) {
@@ -62,4 +64,3 @@ export async function inflateApp({ serverInterface, logger, hotreload, services
     router.use(assertGlobalTampered);
     return errors.length === 0 ? [router, null, routeFileMap /*, migrations*/, wsConfigList /*, serverConfigMap*/, logConfigMap] : [router, errors, routeFileMap /*, migrations*/, wsConfigList /*, serverConfigMap*/, logConfigMap];
 }
-//# sourceMappingURL=inflate.js.map

package/build/esm/src/inflate/md.d.ts

@@ -1,2 +1,3 @@
 import { Logger } from "@miqro/core";
 export declare function inflateMD2HTML(inFile: string, logger?: Logger): string;
+export declare function inflateMDString2HTML(text: string, logger?: Logger): string;