miqro 6.2.12 → 6.2.13

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

@@ -10,6 +10,7 @@ interface MiqroJSON {
     https?: boolean;
     serverOptions?: ServerOptions;
     httpsRedirect?: number;
+    inflateParallel?: number;
 }
 export declare function importMiqroJSON(inFile: string): MiqroJSON;
 export declare function getPORT(): string;
@@ -40,6 +41,7 @@ export interface Arguments {
     https: boolean;
     serverOptions: ServerOptions;
     httpsRedirect?: number;
+    inflateParallel?: number;
 }
 /**
  * parse process.argv arguments

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

@@ -24,7 +24,8 @@ const MiqroJSONSchema = {
         editor: "boolean?",
         https: "boolean?",
         serverOptions: "any?",
-        httpsRedirect: "number?"
+        httpsRedirect: "number?",
+        inflateParallel: "number?"
     }
 };
 export function importMiqroJSON(inFile) {
@@ -47,6 +48,7 @@ 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 = {
+        inflateParallel: null,
         httpsRedirect: null,
         https: null,
         serverOptions: {},
@@ -392,6 +394,28 @@ export function parseArguments() {
                 services.push(args[i + 1]);
                 i++;
                 continue;
+            case "--inflate-parallel":
+                if (args[i + 1] === undefined) {
+                    console.error("bad arguments. service directory not provided.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                if (typeof args[i + 1] !== "string") {
+                    console.error("bad arguments. --inflate-parallel must be a number.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                else {
+                    const cParallel = parseInt(String(args[i + 1]), 10);
+                    if (isNaN(cParallel)) {
+                        console.error("bad arguments. --inflate-parallel must be a number.");
+                        console.error(usage);
+                        process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                    }
+                    flags.inflateParallel = cParallel;
+                }
+                i++;
+                continue;
             case "--inflate-dir":
                 if (flags.inflateDir !== null && flags.compile === null) {
                     console.error("bad arguments. --inflate-dir already set.");
@@ -491,6 +515,11 @@ export function parseArguments() {
                 flags.editor = miqroRC.editor;
             }
         }
+        if (flags.inflateParallel === null) {
+            if (miqroRC.inflateParallel !== undefined) {
+                flags.inflateParallel = miqroRC.inflateParallel;
+            }
+        }
     }
     flags.editor = flags.editor ? flags.editor : false;
     if (services.length === 0 && (!flags.installTSConfig && !flags.installTypes && !flags.installMiqroJSON)) {
@@ -569,6 +598,7 @@ export function parseArguments() {
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
     return {
+        inflateParallel: flags.inflateParallel ? flags.inflateParallel : undefined,
         name: flags.name ? flags.name : undefined,
         browser: flags.browser !== null ? flags.browser : undefined,
         logFile: flags.logFile !== null ? flags.logFile : undefined,

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

@@ -6,3 +6,9 @@ export declare function describeFilePath(filePath: string): {
     subName: string;
     filePath: string;
 };
+export declare function mkdirASync(path: string, options?: Partial<{
+    recursive: true;
+}>): Promise<void>;
+export declare function writeFileASync(path: string, body?: any): Promise<void>;
+export declare function rmdirASync(path: string): Promise<void>;
+export declare function unlinkASync(path: string): Promise<void>;

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

@@ -1,3 +1,4 @@
+import { mkdir, rmdir, unlink, writeFile } from "node:fs";
 import { basename, extname } from "node:path";
 export function describeFilePath(filePath) {
     const ext = extname(filePath);
@@ -14,3 +15,71 @@ export function describeFilePath(filePath) {
         filePath
     };
 }
+export async function mkdirASync(path, options) {
+    return new Promise((resolve, reject) => {
+        try {
+            mkdir(path, options, (err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve();
+                }
+            });
+        }
+        catch (e) {
+            reject(e);
+        }
+    });
+}
+export async function writeFileASync(path, body) {
+    return new Promise((resolve, reject) => {
+        try {
+            writeFile(path, body, (err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve();
+                }
+            });
+        }
+        catch (e) {
+            reject(e);
+        }
+    });
+}
+export async function rmdirASync(path) {
+    return new Promise((resolve, reject) => {
+        try {
+            rmdir(path, (err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve();
+                }
+            });
+        }
+        catch (e) {
+            reject(e);
+        }
+    });
+}
+export async function unlinkASync(path) {
+    return new Promise((resolve, reject) => {
+        try {
+            unlink(path, (err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve();
+                }
+            });
+        }
+        catch (e) {
+            reject(e);
+        }
+    });
+}

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\n\toutputs the version number\n-h, --help\n\toutputs this page.\n--watch\n\tuse to enable the hot-reload functionality.\n--test\n\trun the tests for a service.\n--migrate-up\n\tmigrations up.\n--migrate-down\n\tmigrations down.\n--inflate\n\tinflates the application.\n--inflate-dir\n\tto set the output directory of the --inflate command. default value is inflated/.\n--editor\n\truns the application with a built-in editor.\n--generate-doc\n\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\n\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\n\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\n\toutputs all the server routes in the documentation output.\n--compile\n\tinflates the application and tries to create a NODE SEA binary.\n--inflate-sea\n\tinflates the application with sea compilation scripts.\n--install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.\n--install-types\n\tcreates and updates the .types/ folder use together with --install-tsconfig.\n--install-miqrojson\n\tcreates a default miqro.json file.\n--disable-miqrojson\n\tdisables the load of miqro.json file.\n--log-file\n\toverrides the default log file from LOG_FILE.\n--browser\n\toverrides the default browser from BROWSER.\n--config\n\toverrides the default miqro.json path.\n--port\n\toverrides the default port from PORT.\n--name\n\toverrides the default name of the server.\n--https\n\tserves the server in https instead of http\n--https-key\n\tpoint to a server.key file for https.\n--https-cert\n\tpoint to a server.cert file for https.\n--https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.\n\n==environment variables==\n\nPORT\n\toverride the default 8080 port.\nBROWSER\n\toverride the default browser. change to none to disable.\".\nLOG_FILE\n\toverride the default ./server.log file\nDB\n\tenable the server.db features\nDB_STORAGE\n\toverride the default local db location ./db.sqlite3\nDB_DIALECT\n\toverride the default node:sqlite\nDB_CONNECTION\n\toverride the default connection url\nCLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";
+export declare const help = "\n==flags==\n\n-v, --version\n\toutputs the version number\n-h, --help\n\toutputs this page.\n--watch\n\tuse to enable the hot-reload functionality.\n--test\n\trun the tests for a service.\n--migrate-up\n\tmigrations up.\n--migrate-down\n\tmigrations down.\n--inflate\n\tinflates the application.\n--inflate-dir\n\tto set the output directory of the --inflate command. default value is inflated/.\n--editor\n\truns the application with a built-in editor.\n--generate-doc\n\tgenerates a documentation for the api endpoints of the service.\n--generate-doc-out\n\tthe output file for the generated documentation. default value is API.md.\n--generate-doc-type\n\tthe format of the generated documentation. it can be JSON or MD. default value is MD.\n--generate-doc-all\n\toutputs all the server routes in the documentation output.\n--compile\n\tinflates the application and tries to create a NODE SEA binary.\n--inflate-sea\n\tinflates the application with sea compilation scripts.\n--install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.\n--install-types\n\tcreates and updates the .types/ folder use together with --install-tsconfig.\n--install-miqrojson\n\tcreates a default miqro.json file.\n--disable-miqrojson\n\tdisables the load of miqro.json file.\n--log-file\n\toverrides the default log file from LOG_FILE.\n--browser\n\toverrides the default browser from BROWSER.\n--config\n\toverrides the default miqro.json path.\n--port\n\toverrides the default port from PORT.\n--name\n\toverrides the default name of the server.\n--https\n\tserves the server in https instead of http\n--https-key\n\tpoint to a server.key file for https.\n--https-cert\n\tpoint to a server.cert file for https.\n--https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.\n--inflate-parallel\n\tsets the max parallel esbuild instances. defaults to 1.\n\n==environment variables==\n\nPORT\n\toverride the default 8080 port.\nBROWSER\n\toverride the default browser. change to none to disable.\".\nLOG_FILE\n\toverride the default ./server.log file\nDB\n\tenable the server.db features\nDB_STORAGE\n\toverride the default local db location ./db.sqlite3\nDB_DIALECT\n\toverride the default node:sqlite\nDB_CONNECTION\n\toverride the default connection url\nCLEAR_JSX_CACHE\n\tset to 1 or 0 to enable or disable the clearing of the esbuild cache defaults to 1.\nJSX_TMP\n\tset custom location of esbuild builds defaults to /tmp/jsx_tmp.\n";

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

@@ -41,6 +41,7 @@ export const help = `
 --https-key\n\tpoint to a server.key file for https.
 --https-cert\n\tpoint to a server.cert file for https.
 --https-redirect\n\tserves an aditional http server that redirects to https. it needs a port number.
+--inflate-parallel\n\tsets the max parallel esbuild instances. defaults to 1.
 
 ==environment variables==
 

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

@@ -1,7 +1,6 @@
 import { createNodeRuntime } from "@miqro/jsx-node";
 import { basename, dirname, extname, relative, resolve } from "node:path";
 import { randomUUID } from "node:crypto";
-import { mkdirSync, rmdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { Parser } from "@miqro/parser";
 import { APIRouteSchema, SessionHandlerOptionsSchema } from "@miqro/core";
 import { cwd } from "node:process";
@@ -12,6 +11,7 @@ import { CLEAR_JSX_CACHE } from "./constants.js";
 import { getAsset, initAsset, validateAsset } from "./assets.js";
 import { calculateChecksumFromBuffer } from "./checksum.js";
 import { HandlerWithOptionsSchema, RouteOptionsSchema } from "@miqro/core/build/types.js";
+import { mkdirASync, rmdirASync, unlinkASync, writeFileASync } from "./fs.js";
 let jsxJSBuffer = null; // Buffer.from(getAsset("jsx.dom.js"));
 let jsxJSBufferChecksumPromise = null; // calculateChecksumFromBuffer(jsxJSBuffer);
 export async function initJSXJS(logger) {
@@ -40,11 +40,11 @@ export async function inflateJSX(inFile, options) {
     const logger = options.logger; //getLogger(`${SERVER_IDENTIFIER}_JSX`);
     try {
         if (!options.embemedJSX) {
-            mkdirSync(tmpBuildDir, {
+            await mkdirASync(tmpBuildDir, {
                 recursive: true
             });
-            writeFileSync(inFileTmp, browserJSXGlobals(inFile, false, options.useExport));
-            //writeFileSync(inFileTmp, browserJSXGlobals(relative(tmpBuildDir, inFile), false));
+            await writeFileASync(inFileTmp, browserJSXGlobals(inFile, false, options.useExport));
+            //await writeFileASync(inFileTmp, browserJSXGlobals(relative(tmpBuildDir, inFile), false));
             logger?.trace("inflating [%s] from [%s]. to change the import folder set JSX_TMP", relative(cwd(), inFile), dirname(relative(JSX_TMP_DIR, inFileTmp)));
             const { outputFiles: [{ contents }] } = await esBuild({
                 ...DEFAULT_ESOPTION,
@@ -54,18 +54,18 @@ export async function inflateJSX(inFile, options) {
             });
             if (CLEAR_JSX_CACHE) {
                 logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-                unlinkSync(inFileTmp);
-                rmdirSync(tmpBuildDir);
+                await unlinkASync(inFileTmp);
+                await rmdirASync(tmpBuildDir);
             }
             return contents;
         }
         else {
-            mkdirSync(tmpBuildDir, {
+            await mkdirASync(tmpBuildDir, {
                 recursive: true
             });
-            //writeFileSync(jsxJSPath, Buffer.from(getAsset("jsx-dom-bundle")));
-            writeFileSync(inFileTmp, browserJSXGlobals(inFile, jsxJSPath));
-            //writeFileSync(inFileTmp, browserJSXGlobals(relative(tmpBuildDir, inFile), relative(tmpBuildDir, jsxJSPath)));
+            //await writeFileASync(jsxJSPath, Buffer.from(getAsset("jsx-dom-bundle")));
+            await writeFileASync(inFileTmp, browserJSXGlobals(inFile, jsxJSPath));
+            //await writeFileASync(inFileTmp, browserJSXGlobals(relative(tmpBuildDir, inFile), relative(tmpBuildDir, jsxJSPath)));
             logger?.trace("inflating [%s] from [%s] with jsx.js embedded. to change the import folder set JSX_TMP", relative(cwd(), inFile), dirname(relative(JSX_TMP_DIR, inFileTmp)));
             const { outputFiles: [{ contents }] } = await esBuild({
                 ...DEFAULT_ESOPTION,
@@ -75,9 +75,9 @@ export async function inflateJSX(inFile, options) {
             });
             if (CLEAR_JSX_CACHE) {
                 logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-                unlinkSync(inFileTmp);
-                //unlinkSync(jsxJSPath);
-                rmdirSync(tmpBuildDir);
+                await unlinkASync(inFileTmp);
+                //await unlinkASync(jsxJSPath);
+                await rmdirASync(tmpBuildDir);
             }
             return contents;
         }
@@ -88,9 +88,9 @@ export async function inflateJSX(inFile, options) {
         if (options.embemedJSX) {
             if (CLEAR_JSX_CACHE) {
                 logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-                unlinkSync(inFileTmp);
-                //unlinkSync(jsxJSPath);
-                rmdirSync(tmpBuildDir);
+                await unlinkASync(inFileTmp);
+                //await unlinkASync(jsxJSPath);
+                await rmdirASync(tmpBuildDir);
             }
             else {
                 //console.error("errors on: " + tmpBuildDir);
@@ -427,11 +427,11 @@ export async function importJSXFile(inFile, logger) {
     //const inFileTmp = resolve(tmpBuildDir, basename(inFile) + ".mjs");
     const inFileTmp = resolve(tmpBuildDir, basename(inFile) + ".cjs");
     //const logger = getLogger(`${SERVER_IDENTIFIER}_JSX`);
-    mkdirSync(tmpBuildDir, {
+    await mkdirASync(tmpBuildDir, {
         recursive: true
     });
     try {
-        writeFileSync(inFileTmp, inflatedCode);
+        await writeFileASync(inFileTmp, inflatedCode);
         assertGlobalTampered();
         logger?.trace("importing [%s] from [%s]. to change the import folder set JSX_TMP", relative(cwd(), inFile), dirname(relative(JSX_TMP_DIR, inFileTmp)));
         logger?.debug("importing [%s]", relative(cwd(), inFile));
@@ -439,8 +439,8 @@ export async function importJSXFile(inFile, logger) {
         assertGlobalTampered();
         if (CLEAR_JSX_CACHE) {
             logger?.trace("clearing cache at [%s]. to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-            unlinkSync(inFileTmp);
-            rmdirSync(tmpBuildDir);
+            await unlinkASync(inFileTmp);
+            await rmdirASync(tmpBuildDir);
         }
         return module.default;
     }
@@ -449,8 +449,8 @@ export async function importJSXFile(inFile, logger) {
         logger?.error("error with2: " + inFile);
         if (CLEAR_JSX_CACHE) {
             logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-            unlinkSync(inFileTmp);
-            rmdirSync(tmpBuildDir);
+            await unlinkASync(inFileTmp);
+            await rmdirASync(tmpBuildDir);
         }
         else {
             //console.error("errors on: " + tmpBuildDir);

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

@@ -1,7 +1,7 @@
-import { chmodSync, constants, mkdirSync, writeFileSync } from "node:fs";
+import { chmodSync, constants, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve } from "node:path";
 import { cwd, platform } from "node:process";
-import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getMiddlewareConfigPath, getMigrationsPath, getServerConfigPath, getWSConfigPath } from "../common/paths.js";
+import { getAuthConfigPath, getCORSConfigPath, getDBConfigPath, getErrorConfigPath, getMiddlewareConfigPath, getMigrationsPath, getMiqroJSONPath, getServerConfigPath, getWSConfigPath } from "../common/paths.js";
 import { getAsset } from "../common/assets.js";
 import { migration } from "@miqro/query";
 import { esBuild } from "../common/esbuild.js";
@@ -104,6 +104,10 @@ main().catch(e=>console.error(e));
         platform: "node",
         outfile: join(inflateDir, "sea", "app.bundle.cjs")
     });
+    const miqroRCPath = getMiqroJSONPath();
+    if (miqroRCPath) {
+        writeFile(logger, join(inflateDir, "miqro.json"), readFileSync(miqroRCPath));
+    }
 }
 export async function inflateServiceForSea(logger, inflateDir, service, servicePath /*, serviceMigrations: string[]*/, serviceRouteFileMap, serviceStaticFileMap) {
     const migrationsFolderPath = getMigrationsPath(servicePath);

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

@@ -11,5 +11,6 @@ export interface InflateAppOptions {
     hotreload?: boolean;
     port: string;
     serverInterface: ServerInterface;
+    inflateParallel?: number;
 }
-export declare function inflateApp({ serverInterface, logger, hotreload, services, inflateDir, inflateSea, port }: InflateAppOptions): Promise<[Router, InflateError[] | null, RouteFileMap, WSConfig[], LogConfigMap]>;
+export declare function inflateApp({ inflateParallel, serverInterface, logger, hotreload, services, inflateDir, inflateSea, port }: InflateAppOptions): Promise<[Router, InflateError[] | null, RouteFileMap, WSConfig[], LogConfigMap]>;

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

@@ -8,7 +8,7 @@ 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*/, port }) {
+export async function inflateApp({ inflateParallel, serverInterface, logger, hotreload, services /*, dbManager*/, inflateDir, inflateSea /*, editor, inflateTests*/, port }) {
     logger.trace("inflateApp");
     const errors = [];
     //const migrations: string[] = [];
@@ -43,7 +43,7 @@ export async function inflateApp({ serverInterface, logger, hotreload, services
         }*/
         //await setupDB(logger, service, dbConfigList, inflateDir);
         await setupLogConfig(logger, servicePath, service, logConfigMap, inflateSea ? inflateDir : false, errors);
-        router.use(await setupHTTPRouter(serverInterface, logger, hotreload ? hotreload : false, servicePath, service, serviceRouteFileMap, serviceStaticFileMap, inflateDir, inflateSea, errors));
+        router.use(await setupHTTPRouter(serverInterface, logger, hotreload ? hotreload : false, servicePath, service, serviceRouteFileMap, serviceStaticFileMap, inflateDir, inflateSea, errors, inflateParallel));
         routeFileMap = {
             ...routeFileMap,
             ...serviceRouteFileMap

package/build/esm/src/inflate/setup-http.d.ts

@@ -25,7 +25,7 @@ export interface StaticFileMap {
         body: Buffer;
     };
 }
-export declare function setupHTTPRouter(server: ServerInterface, logger: Logger, hotreload: boolean, servicePath: string, service: string, routeFileMap: RouteFileMap, staticFileMap: StaticFileMap | null, inflateDir: string | undefined | false, inflateSea: boolean, errors: InflateError[]): Promise<Router>;
+export declare function setupHTTPRouter(server: ServerInterface, logger: Logger, hotreload: boolean, servicePath: string, service: string, routeFileMap: RouteFileMap, staticFileMap: StaticFileMap | null, inflateDir: string | undefined | false, inflateSea: boolean, errors: InflateError[], inflateParallel?: number): Promise<Router>;
 interface ScannedFile {
     filePath: string;
     ext: string;