miqro 6.3.0 → 7.0.1

package/build/esm/src/bin/types.js

@@ -1,12 +1,17 @@
-import { initTypes } from "../common/assets.js";
+// import { initTypes } from "../common/assets.js";
 import { existsSync, writeFileSync } from "node:fs";
 import { TEMPLATES } from "../../editor/common/templates.js";
 import { EXIT_CODES } from "../common/constants.js";
+import { installAsset } from "../common/assets.js";
 export async function installTypings(args, logger) {
-    if (args.installTypes) {
-        logger.debug("writing types");
-        // install typing for typescript only if argument --install-types is set
-        await initTypes(logger);
+    /*if (args.installTypes) {
+      logger.debug("writing types");
+      // install typing for typescript only if argument --install-types is set
+      await initTypes(logger);
+    }*/
+    if (args.install) {
+        logger.debug("writing node_modules");
+        await installAsset(logger, ["node_modules/"]);
     }
     if (args.installTSConfig && !existsSync("tsconfig.json")) {
         logger.info("writing tsconfig.json");

package/build/esm/src/cluster.js

@@ -10,7 +10,7 @@ const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import
 //const usage = "CLUSTER_COUNT=os.cpus().length [CLUSTER_AUTO_BROADCAST=true|false] [CLUSTER_DISABLE_RESTART=true|false]";
 const CLUSTER_COUNT = checkEnvVariable("CLUSTER_COUNT", String(cpus().length));
 const args = parseArguments();
-if (args.inflate || args.test || args.compile || args.installTSConfig || args.installTypes || args.migrateDown || args.migrateUp) {
+if (args.inflate || args.test || args.compile || args.installTSConfig /* || args.installTypes */ || args.migrateDown || args.migrateUp) {
     await import("./main.js");
 }
 else {

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

@@ -18,9 +18,9 @@ export interface Arguments {
     name?: string;
     browser?: string | boolean;
     logFile?: string | boolean;
-    installTypes: boolean;
     installMiqroJSON: boolean;
     installTSConfig: boolean;
+    install: boolean;
     test: boolean;
     port: string;
     inflate: boolean;

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

@@ -59,8 +59,9 @@ export function parseArguments() {
         watch: null,
         miqroJSONPath: null,
         installMiqroJSON: null,
+        install: null,
         disableMiqroJSON: null,
-        installTypes: null,
+        // installTypes: null,
         port: null,
         installTSConfig: null,
         migrateUp: null,
@@ -133,6 +134,14 @@ export function parseArguments() {
                 }
                 flags.installTSConfig = true;
                 continue;
+            case "--install":
+                if (flags.inflate !== null || flags.installTSConfig !== null) {
+                    console.error("bad arguments.");
+                    console.error(usage);
+                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
+                }
+                flags.install = true;
+                continue;
             case "--watch":
                 if (flags.watch !== null) {
                     console.error("bad arguments.");
@@ -328,14 +337,14 @@ export function parseArguments() {
                 flags.inflateSEA = true;
                 flags.inflate = true;
                 continue;
-            case "--install-types":
-                if (flags.inflate !== null || flags.installTypes !== null) {
-                    console.error("bad arguments.");
-                    console.error(usage);
-                    process.exit(EXIT_CODES.BAD_ARGUMENTS);
-                }
-                flags.installTypes = true;
-                continue;
+            /*case "--install-types":
+              if (flags.inflate !== null || flags.installTypes !== null) {
+                console.error("bad arguments.");
+                console.error(usage);
+                process.exit(EXIT_CODES.BAD_ARGUMENTS);
+              }
+              flags.installTypes = true;
+              continue;*/
             case "--editor":
                 if (flags.editor !== null) {
                     console.error("bad arguments.");
@@ -531,7 +540,7 @@ export function parseArguments() {
         }
     }
     flags.editor = flags.editor ? flags.editor : false;
-    if (services.length === 0 && (!flags.installTSConfig && !flags.installTypes && !flags.installMiqroJSON)) {
+    if (services.length === 0 && (!flags.installTSConfig /* && !flags.installTypes*/ && !flags.installMiqroJSON)) {
         flags.inflateDir = flags.inflateDir ? flags.inflateDir : undefined;
         console.error(`bad arguments. missing --service argument`);
         console.error(usage);
@@ -557,19 +566,23 @@ export function parseArguments() {
         console.error("for ts");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
+    if (flags.install && flags.inflate) {
+        console.error("bad arguments. cannot use --install with --inflate");
+        process.exit(EXIT_CODES.BAD_ARGUMENTS);
+    }
     if (flags.inflate && flags.editor) {
         console.error("bad arguments. cannot use --inflate with --editor");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.inflate && (flags.installTypes || flags.installTSConfig || flags.installMiqroJSON)) {
-        console.error("bad arguments. cannot use --inflate with --install-types, --install-tsconfig or --install-miqrojson");
+    if (flags.inflate && ( /*flags.installTypes || */flags.installTSConfig || flags.installMiqroJSON || flags.install)) {
+        console.error("bad arguments. cannot use --inflate with --install, --install-tsconfig or --install-miqrojson");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
     if (flags.inflateSEA && !flags.inflate) {
         console.error("bad arguments. cannot use --inflate-sea without --inflate");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
-    if (flags.editor && (flags.installTypes || flags.installTSConfig || flags.installMiqroJSON)) {
+    if (flags.editor && ( /*flags.installTypes || */flags.installTSConfig || flags.installMiqroJSON)) {
         console.error("bad arguments. cannot use --editor with--install-types, --install-tsconfig or --install-miqrojson");
         process.exit(EXIT_CODES.BAD_ARGUMENTS);
     }
@@ -616,9 +629,10 @@ export function parseArguments() {
         watch: flags.watch ? true : false,
         disableMiqroJSON: flags.disableMiqroJSON !== null ? flags.disableMiqroJSON : false,
         miqroJSONPath: miqroJSONPath ? miqroJSONPath : false,
-        installTypes: flags.installTypes ? true : false,
+        // installTypes: flags.installTypes ? true : false,
         installMiqroJSON: flags.installMiqroJSON ? true : false,
         installTSConfig: flags.installTSConfig ? true : false,
+        install: flags.install,
         inflate: flags.inflate,
         port: flags.port ? flags.port : getPORT(),
         migrateUp: flags.migrateUp ? true : false,

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

@@ -7,6 +7,6 @@ export declare function getVersion(): {
     ESBUILD_VERSION: string;
 };
 export declare function initAssets(logger: Logger): Promise<void>;
-export declare function initTypes(logger: MinimalLogger): Promise<void>;
+export declare function installAsset(logger: MinimalLogger, include: string[]): Promise<void>;
 export declare function validateAsset(logger: MinimalLogger | undefined, path: string, internalChecksum: string): Promise<boolean>;
 export declare function initAsset(logger: MinimalLogger, path: string, buffer: Buffer, executable?: boolean, checksum?: Promise<string>, logInstallasInfo?: boolean): Promise<void>;

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

@@ -1,11 +1,12 @@
-import { chmodSync, constants, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { chmodSync, constants, existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
 import { getAsset as seaGetAsset, isSea } from "node:sea";
-import { dirname, resolve } from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { calculateChecksum, calculateChecksumFromBuffer } from "./checksum.js";
 import { arch, cwd, platform } from "node:process";
 import { fileURLToPath } from 'node:url';
 import { initESBuild } from "./esbuild.js";
-import { initJSXJS } from "./jsx.js";
+import { mkdirASync, unlinkASync, writeFileASync } from "./fs.js";
+// import { initJSXJS } from "./jsx.js";
 //const require = createRequire(import.meta.url);
 export const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "..", "..") : null;
 const ASSETS_ROUTER = {
@@ -13,7 +14,7 @@ const ASSETS_ROUTER = {
     "version.tag": "sea/version.tag",
     "node.version.tag": "sea/node.version.tag",
     "esbuild.version.tag": "sea/esbuild.version.tag",
-    "postject.base64.cjs": "build/postject.base64.cjs",
+    // "postject.base64.cjs": "build/postject.base64.cjs",
     "sea.basic.config.json": "sea/basic-config.json",
     "node.sh": "sea/node.sh",
     "install-nodejs.sh": "sea/install-nodejs.sh",
@@ -21,8 +22,9 @@ const ASSETS_ROUTER = {
     "sign-remove.sh": "sea/sign-remove.sh",
     "sign-add.sh": "sea/sign-add.sh",
     "app.sh": "sea/app.sh",
-    "jsx.dom.js": "build/jsx.dom.js",
-    "types.json": "sea/types.json",
+    // "jsx.dom.js": "build/jsx.dom.js",
+    // "types.json": "sea/types.json",
+    "assets.base64.json": "sea/assets.base64.json",
     "editor-assets/editor.bundle.js": "build/editor.bundle.js",
     "editor-assets/style.css": "build/style.css",
     "editor-assets/font.ttf": "build/font.ttf"
@@ -68,11 +70,25 @@ export async function initAssets(logger) {
         logger.debug("esbuild version [%s]", ESBUILD_VERSION);
     }
     logger.debug("platform [%s-%s]", platform, arch);
-    await Promise.all([initJSXJS(logger), initESBuild(logger)]);
+    // await Promise.all([initJSXJS(logger), initESBuild(logger)]);
+    await Promise.all([initESBuild(logger)]);
 }
-export async function initTypes(logger) {
-    const typesJSON = JSON.parse(Buffer.from(getAsset("types.json")).toString("utf-8"));
-    await Promise.all(Object.keys(typesJSON).map(typeFile => initAsset(logger, resolve(cwd(), "." + typeFile), Buffer.from(typesJSON[typeFile], "base64"))));
+/*export async function initTypes(logger: MinimalLogger) {
+  const typesJSON = JSON.parse(Buffer.from(getAsset("types.json")).toString("utf-8"));
+  await Promise.all(Object.keys(typesJSON).map(typeFile =>
+    initAsset(logger, resolve(cwd(), "." + typeFile), Buffer.from(typesJSON[typeFile], "base64"))
+  ));
+}*/
+export async function installAsset(logger, include) {
+    const assetsJSON = JSON.parse(Buffer.from(getAsset("assets.base64.json")).toString("utf-8"));
+    await Promise.all(assetsJSON.map(asset => {
+        for (const i of include) {
+            if (asset.path.indexOf(i) === 0) {
+                return initAsset(logger, join(cwd(), asset.path), Buffer.from(asset.content, "base64"));
+            }
+        }
+        return Promise.resolve();
+    }));
 }
 export async function validateAsset(logger, path, internalChecksum) {
     mkdirSync(dirname(path), {
@@ -101,8 +117,13 @@ export async function initAsset(logger, path, buffer, executable, checksum, logI
     if (existsSync(path)) {
         if (!valid) {
             logger.info("updating [%s]", path);
-            unlinkSync(path);
-            writeFileSync(path, buffer);
+            await unlinkASync(path);
+            if (!statSync(dirname(path)).isDirectory()) {
+                await mkdirASync(dirname(path), {
+                    recursive: true
+                });
+            }
+            await writeFileASync(path, buffer);
             if (executable) {
                 chmodSync(path, constants.S_IXUSR | constants.S_IRUSR | constants.S_IWUSR);
             }
@@ -115,7 +136,7 @@ export async function initAsset(logger, path, buffer, executable, checksum, logI
         else {
             logger.info("installing [%s]", path);
         }
-        writeFileSync(path, buffer);
+        await writeFileASync(path, buffer);
         if (executable) {
             chmodSync(path, constants.S_IXUSR | constants.S_IRUSR | constants.S_IWUSR);
         }

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

@@ -1,14 +1,17 @@
 import { Logger } from "@miqro/core";
 export declare function validateESBuild(logger?: Logger): Promise<boolean>;
 export declare function initESBuild(logger: Logger): Promise<void>;
+export declare const NODEJS_EXTERNAL: string[];
 export declare function esBuild(options: {
-    platform?: string;
+    platform?: string | false;
     entryPoints: [string];
+    mainFields?: string;
     bundle?: boolean;
     jsxFactory?: string;
     jsxFragment?: string;
     minify?: boolean;
     outfile?: string;
+    external?: string[];
 }, logger?: Logger): Promise<{
     outputFiles: {
         path: string;

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

@@ -13,39 +13,44 @@ export async function initESBuild(logger) {
     esbuildBinaryChecksumPromise = esbuildBinaryChecksumPromise ? esbuildBinaryChecksumPromise : calculateChecksumFromBuffer(esbuildBinaryBuffer);
     return initAsset(logger, getESBuildBinaryPath(), esbuildBinaryBuffer, true, esbuildBinaryChecksumPromise, false);
 }
-const NODEJS_EXTERNAL = [
-    "node:cluster",
-    "node:assert",
-    "node:util",
-    "node:path",
-    "node:fs",
-    "node:crypto",
-    "node:http",
-    "node:https",
-    "node:os",
-    "node:dns",
-    "node:string_decoder",
-    "node:stream",
-    "node:http2",
-    "node:net",
-    "node:worker_threads",
-    "node:process",
-    "child_process",
-    "node:child_process",
-    "core",
-    "globals",
-    "jsx.globals",
-    "server.globals",
-    "browser.globals",
+/*const NODEJS_EXTERNAL = [
+  "node:cluster",
+  "node:assert",
+  "node:util",
+  "node:path",
+  "node:fs",
+  "node:crypto",
+  "node:http",
+  "node:https",
+  "node:os",
+  "node:dns",
+  "node:string_decoder",
+  "node:stream",
+  "node:http2",
+  "node:net",
+  "node:worker_threads",
+  "node:process",
+  "child_process",
+  "node:child_process",
+  "core",
+  "globals",
+  "jsx.globals",
+  "server.globals",
+  "browser.globals",
+  "sqlite3",
+  "pg"
+];*/
+export const NODEJS_EXTERNAL = [
     "sqlite3",
-    "pg"
+    "pg",
+    "node:*"
 ];
 export async function esBuild(options, logger) {
     return new Promise(async (resolve, reject) => {
         try {
             //const logger = getLogger(`${SERVER_IDENTIFIER}_ESBUILD`);
             const valid = await validateESBuild(logger);
-            const esBuildCMD = `${getESBuildBinaryPath()} "${options.entryPoints[0]}" ${NODEJS_EXTERNAL.map(e => `--external:${e}`).join(" ")} --loader:.js=jsx --jsx-factory=${options.jsxFactory} --jsx-fragment=${options.jsxFragment} ${options.bundle ? " --bundle" : ""}${options.minify ? " --minify" : ""}${options.outfile ? ` --outfile="${options.outfile}"` : ""}${options.platform ? ` --platform=${options.platform}` : ""}`;
+            const esBuildCMD = `${getESBuildBinaryPath()} "${options.entryPoints[0]}" ${(options.external ? options.external : NODEJS_EXTERNAL).map(e => `--external:${e}`).join(" ")} --loader:.js=jsx --jsx-factory=${options.jsxFactory} --jsx-fragment=${options.jsxFragment} ${options.bundle ? " --bundle" : ""}${options.minify ? " --minify" : ""}${options.outfile ? ` --outfile="${options.outfile}"` : ""}${options.platform ? ` --platform=${options.platform}` : ""}${options.mainFields ? ` --main-fields=${options.mainFields}` : ""}`;
             logger?.trace(esBuildCMD);
             if (!valid) {
                 const err = new Error(`esbuild installation at [${getESBuildBinaryPath()}] tampered`);

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

@@ -1,6 +1,6 @@
 import { existsSync, rmdirSync, unlinkSync } from "node:fs";
 //import { notifiyServerStop, notifiyServerUnLoad } from "../services/server.js";
-import { getESBuildBinaryPath, getJSXJSPath, JSX_TMP_DIR } from "./paths.js";
+import { getESBuildBinaryPath /*, getJSXJSPath*/, JSX_TMP_DIR } from "./paths.js";
 import { CLEAR_JSX_CACHE } from "./constants.js";
 import { resolve } from "node:path";
 import { EXIT_CODES } from "./constants.js";
@@ -10,10 +10,10 @@ function cleanJSX(app) {
         unlinkSync(getESBuildBinaryPath());
     }
     if (CLEAR_JSX_CACHE) {
-        app.logger?.trace("trying to clean up jsx.js installation at [%s]", getJSXJSPath());
+        /*app.logger?.trace("trying to clean up jsx.js installation at [%s]", getJSXJSPath());
         if (existsSync(getJSXJSPath())) {
-            unlinkSync(getJSXJSPath());
-        }
+          unlinkSync(getJSXJSPath());
+        }*/
         const buildParendDir = resolve(JSX_TMP_DIR, String(process.pid));
         app.logger?.trace("trying to clean up jsx build/import folders at [%s]", buildParendDir);
         const buildDir = resolve(buildParendDir, "build");

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 auto reload the server when files change.\n--hot-reload\n\tenables the hot-reload functionality use with --watch.\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";
+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 auto reload the server when files change.\n--hot-reload\n\tenables the hot-reload functionality use with --watch.\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-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

@@ -30,7 +30,6 @@ export const help = `
 --compile\n\tinflates the application and tries to create a NODE SEA binary.
 --inflate-sea\n\tinflates the application with sea compilation scripts.
 --install-tsconfig\n\tcreates a tsconfig.json configured to use with --install-types.
---install-types\n\tcreates and updates the .types/ folder use together with --install-tsconfig.
 --install-miqrojson\n\tcreates a default miqro.json file.
 --disable-miqrojson\n\tdisables the load of miqro.json file.
 --log-file\n\toverrides the default log file from LOG_FILE.

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

@@ -3,8 +3,6 @@ import { Request, Response, CORSOptions, Logger, APIRoute } from "@miqro/core";
 import { Schema } from "@miqro/parser";
 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>;
 export interface Dict<T> {
     [key: string]: T | Dict<T>;
 }
@@ -13,10 +11,11 @@ export interface InflateError {
     error: Error;
 }
 export interface InflateOptions {
-    embemedJSX: boolean;
     minify: boolean;
     useExport: boolean;
     platform?: string;
+    mainFields?: string;
+    external?: string[];
     logger?: Logger | Console;
 }
 export declare function inflateJSX(inFile: string, options: InflateOptions): Promise<string>;

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

@@ -5,99 +5,93 @@ import { Parser } from "@miqro/parser";
 import { APIRouteSchema, SessionHandlerOptionsSchema } from "@miqro/core";
 import { cwd } from "node:process";
 import { esBuild } from "./esbuild.js";
-import { assertGlobalTampered, browserJSXGlobals } from "../services/globals.js";
-import { getJSXJSPath, JSX_TMP_DIR } from "./paths.js";
+import { 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 { 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) {
-    jsxJSBuffer = jsxJSBuffer ? jsxJSBuffer : Buffer.from(getAsset("jsx.dom.js"));
-    jsxJSBufferChecksumPromise = jsxJSBufferChecksumPromise ? jsxJSBufferChecksumPromise : calculateChecksumFromBuffer(jsxJSBuffer);
-    return initAsset(logger, getJSXJSPath(), jsxJSBuffer, true, jsxJSBufferChecksumPromise, false);
-}
-export async function validateJSXJS(logger) {
-    const checksum = await jsxJSBufferChecksumPromise;
-    if (!checksum) {
-        throw new Error("error calculating checksum");
-    }
-    return validateAsset(logger, getJSXJSPath(), checksum);
-}
 const parser = new Parser();
 const DEFAULT_ESOPTION = {
     platform: "neutral",
+    mainFields: "module,main",
+    // platform: "node",
     bundle: true,
     jsxFactory: "JSX.createElement",
     jsxFragment: "JSX.Fragment"
 };
+function JSXTemplate(inFile /*, jsxPath: string | false = false*/, useExport = true) {
+    // const PRE = ``;
+    // return `${jsxPath ? PRE : ""}\n${useExport ? `export * from "${inFile}";import * as lib from "${inFile}";export default lib.default;` : `import * as lib from "${inFile}"`}`;
+    return `${useExport ? `export * from "${inFile}";import * as lib from "${inFile}";export default lib.default;` : `import * as lib from "${inFile}"`}`;
+}
 export async function inflateJSX(inFile, options) {
     const tmpBuildDir = resolve(JSX_TMP_DIR, String(process.pid), "build", Date.now() + "-" + randomUUID());
     const inFileTmp = resolve(tmpBuildDir, basename(inFile) + ".mjs");
-    const jsxJSPath = getJSXJSPath(); //resolve(tmpBuildDir, "jsx.js");
+    //const jsxJSPath = getJSXJSPath();//resolve(tmpBuildDir, "jsx.js");
     const logger = options.logger; //getLogger(`${SERVER_IDENTIFIER}_JSX`);
     try {
-        if (!options.embemedJSX) {
-            await mkdirASync(tmpBuildDir, {
-                recursive: true
-            });
-            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,
-                entryPoints: [inFileTmp],
-                minify: options.minify,
-                platform: options.platform ? options.platform : DEFAULT_ESOPTION.platform
-            });
-            if (CLEAR_JSX_CACHE) {
-                logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-                await unlinkASync(inFileTmp);
-                await rmdirASync(tmpBuildDir);
-            }
-            return contents;
-        }
-        else {
-            await mkdirASync(tmpBuildDir, {
-                recursive: true
-            });
-            //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,
-                entryPoints: [inFileTmp],
-                minify: options.minify,
-                platform: options.platform ? options.platform : DEFAULT_ESOPTION.platform
-            });
-            if (CLEAR_JSX_CACHE) {
-                logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-                await unlinkASync(inFileTmp);
-                //await unlinkASync(jsxJSPath);
-                await rmdirASync(tmpBuildDir);
-            }
-            return contents;
+        // if (!options.embemedJSX) {
+        await mkdirASync(tmpBuildDir, {
+            recursive: true
+        });
+        await writeFileASync(inFileTmp, JSXTemplate(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,
+            entryPoints: [inFileTmp],
+            minify: options.minify,
+            platform: options.platform !== undefined ? options.platform : DEFAULT_ESOPTION.platform,
+            mainFields: options.mainFields !== undefined ? options.mainFields : DEFAULT_ESOPTION.mainFields,
+            external: options.external ? options.external : undefined,
+        });
+        if (CLEAR_JSX_CACHE) {
+            logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
+            await unlinkASync(inFileTmp);
+            await rmdirASync(tmpBuildDir);
         }
+        return contents;
+        /*} else {
+          await mkdirASync(tmpBuildDir, {
+            recursive: true
+          });
+          //await writeFileASync(jsxJSPath, Buffer.from(getAsset("jsx-dom-bundle")));
+          await writeFileASync(inFileTmp, browserJSXGlobals(inFile, false));
+          //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,
+            entryPoints: [inFileTmp],
+            minify: options.minify,
+            platform: options.platform !== undefined ? options.platform : DEFAULT_ESOPTION.platform,
+            mainFields: options.mainFields !== undefined ? options.mainFields : DEFAULT_ESOPTION.mainFields,
+            external: options.external ? options.external : undefined
+          });
+          if (CLEAR_JSX_CACHE) {
+            logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
+            await unlinkASync(inFileTmp);
+            //await unlinkASync(jsxJSPath);
+            await rmdirASync(tmpBuildDir);
+          }
+          return contents;
+        }*/
     }
     catch (e) {
         logger?.error("error with: " + inFile);
         logger?.error(e);
-        if (options.embemedJSX) {
-            if (CLEAR_JSX_CACHE) {
-                logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
-                await unlinkASync(inFileTmp);
-                //await unlinkASync(jsxJSPath);
-                await rmdirASync(tmpBuildDir);
-            }
-            else {
-                //console.error("errors on: " + tmpBuildDir);
-                logger?.error("error with: %s", inFileTmp);
-                logger?.trace("NOT clearing cache. to change this behaivor set CLEAR_JSX_CACHE to 1", tmpBuildDir);
-            }
-        }
+        /*if (options.embemedJSX) {
+          if (CLEAR_JSX_CACHE) {
+            logger?.trace("clearing cache at [%s] to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
+            await unlinkASync(inFileTmp);
+            //await unlinkASync(jsxJSPath);
+            await rmdirASync(tmpBuildDir);
+          } else {
+            //console.error("errors on: " + tmpBuildDir);
+            logger?.error("error with: %s", inFileTmp);
+            logger?.trace("NOT clearing cache. to change this behaivor set CLEAR_JSX_CACHE to 1", tmpBuildDir);
+          }
+        }*/
         throw e;
     }
 }
@@ -417,14 +411,14 @@ export async function importServerConfigModule(inFile, logger) {
 }
 export async function importJSXFile(inFile, logger) {
     const inflatedCode = await inflateJSX(inFile, {
-        embemedJSX: false,
+        // embemedJSX: false,
         minify: false,
         useExport: true,
         platform: "node",
         logger
     });
     const tmpBuildDir = resolve(JSX_TMP_DIR, String(process.pid), "import", Date.now() + "-" + randomUUID());
-    //const inFileTmp = resolve(tmpBuildDir, basename(inFile) + ".mjs");
+    // const inFileTmp = resolve(tmpBuildDir, basename(inFile) + ".mjs");
     const inFileTmp = resolve(tmpBuildDir, basename(inFile) + ".cjs");
     //const logger = getLogger(`${SERVER_IDENTIFIER}_JSX`);
     await mkdirASync(tmpBuildDir, {
@@ -432,11 +426,12 @@ export async function importJSXFile(inFile, logger) {
     });
     try {
         await writeFileASync(inFileTmp, inflatedCode);
-        assertGlobalTampered();
+        // 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));
         const module = await import(resolve(inFileTmp));
-        assertGlobalTampered();
+        // console.dir(module);
+        // assertGlobalTampered();
         if (CLEAR_JSX_CACHE) {
             logger?.trace("clearing cache at [%s]. to change this behaivor set CLEAR_JSX_CACHE to 0", tmpBuildDir);
             await unlinkASync(inFileTmp);

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

@@ -15,4 +15,3 @@ export declare function getAuthConfigPath(servicePath: string): string | false;
 export declare function getHTTPRouterPath(servicePath: string): string | false;
 export declare function getMigrationsPath(servicePath: string): string | false;
 export declare function getESBuildBinaryPath(): string;
-export declare function getJSXJSPath(): string;

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

@@ -82,6 +82,6 @@ export function getESBuildBinaryPath() {
         return resolve(JSX_TMP_DIR, String(process.pid), "esbuild");
     }
 }
-export function getJSXJSPath() {
-    return resolve(JSX_TMP_DIR, String(process.pid), "jsx.js");
-}
+/*export function getJSXJSPath() {
+  return resolve(JSX_TMP_DIR, String(process.pid), "jsx.js");
+}*/

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

@@ -1,4 +1,3 @@
-import "../services/globals.js";
 import { Miqro } from "../services/app.js";
 export declare function watchAndServer(app: Miqro): Promise<{
     stopWatch: () => void;

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

@@ -1,4 +1,4 @@
-import "../services/globals.js";
+//import "../services/globals.js";
 import { existsSync, readdirSync, statSync, watch } from "node:fs";
 import { resolve } from "node:path";
 export async function watchAndServer(app) {