miqro 6.0.9 → 6.0.10

package/editor/components/file-browser.tsx

@@ -44,27 +44,33 @@ export function FileBrowser(props: FileBrowserProps) {
             ev.preventDefault();
             props.togglePanel("left");
           }}>{"<<"}</button>
-        <button
-          class="file-editor-button btn"
-          style={`width: 30%;${props.disableLog ? "display: none;" : ""}`}
-          onclick={ev => {
-            ev.preventDefault();
-            props.togglePanel("bottom");
-          }}>log</button>
-        <button
-          class="file-editor-button btn active"
-          style={`width: 30%;${props.disableReload ? "display: none;" : ""}`}
-          onclick={ev => {
-            ev.preventDefault();
-            props.scanFiles();
-          }}>scan</button>
-        <button
-          class="file-editor-button btn warning"
-          style={`width: 30%;${props.disableReload ? "display: none;" : ""}`}
-          onclick={ev => {
-            ev.preventDefault();
-            props.reloadServer();
-          }}>reload</button>
+        {props.disableLog ? <></> :
+          <button
+            id="log-btn"
+            class="file-editor-button btn"
+            style={`width: 30%;${props.disableLog ? "display: none;" : ""}`}
+            onclick={ev => {
+              ev.preventDefault();
+              props.togglePanel("bottom");
+            }}>log</button>}
+        {props.disableReload ? <></> :
+          <button
+            id="scan-btn"
+            class="file-editor-button btn active"
+            style={`width: 30%;${props.disableReload ? "display: none;" : ""}`}
+            onclick={ev => {
+              ev.preventDefault();
+              props.scanFiles();
+            }}>scan</button>}
+        {props.disableReload ? <></> :
+          <button
+            id="reload-btn"
+            class="file-editor-button btn warning"
+            style={`width: 30%;${props.disableReload ? "display: none;" : ""}`}
+            onclick={ev => {
+              ev.preventDefault();
+              props.reloadServer();
+            }}>reload</button>}
       </div>
       <div class="row">
         <input
@@ -79,28 +85,34 @@ export function FileBrowser(props: FileBrowserProps) {
           placeholder={"..filter.."} />
       </div>
       <div class="row">
+        {props.disablePreview ? <></> :
+          <button
+            id="preview-btn"
+            class="file-editor-button btn"
+            style={`width: 30%;${props.disablePreview ? "display: none;" : ""}`}
+            onclick={ev => {
+              ev.preventDefault();
+              props.togglePanel("right");
+            }}>preview</button>}
         <button
-          class="file-editor-button btn"
-          style={`width: 30%;${props.disablePreview ? "display: none;" : ""}`}
-          onclick={ev => {
-            ev.preventDefault();
-            props.togglePanel("right");
-          }}>preview</button>
-        <button
+          id="new-btn"
           class="file-editor-button btn info"
           style="width: 20%;"
           onclick={ev => {
             ev.preventDefault();
             props.showNewFile();
           }}>new</button>
+        {props.disableReload ? <></> :
+          <button
+            id="scan-btn"
+            class="file-editor-button btn active"
+            style={`width: 30%;${!props.disableReload ? "display: none;" : ""}`}
+            onclick={ev => {
+              ev.preventDefault();
+              props.scanFiles();
+            }}>scan</button>}
         <button
-          class="file-editor-button btn active"
-          style={`width: 30%;${!props.disableReload ? "display: none;" : ""}`}
-          onclick={ev => {
-            ev.preventDefault();
-            props.scanFiles();
-          }}>scan</button>
-        <button
+          id="saveall-btn"
           class="file-editor-button btn success"
           style="width: 25%;"
           onclick={ev => {
@@ -109,6 +121,7 @@ export function FileBrowser(props: FileBrowserProps) {
 
           }}>save</button>
         <button
+          id="closeall-btn"
           class="file-editor-button btn danger"
           style="width: 25%;"
           onclick={ev => {

package/editor/components/file-editor-toolbar.tsx

@@ -43,6 +43,7 @@ export function FileEditorToolbar(props: FileEditorToolbar) {
           props.togglePanel("left");
         }}>{">>"}</button>
       <button
+        id="save-btn"
         disabled={!props.changed}
         class={`btn success`}
         onclick={ev => {
@@ -50,6 +51,7 @@ export function FileEditorToolbar(props: FileEditorToolbar) {
           props.saveFile();
         }}>save</button>
       {props.disableReload ? <></> : <button
+        id="savereload-btn"
         disabled={!props.changed}
         class={`btn info`}
         style="margin-left: var(--file-browser-separation);"
@@ -58,6 +60,7 @@ export function FileEditorToolbar(props: FileEditorToolbar) {
           props.saveFile(true);
         }}>save/reload</button>}
       <button
+        id="revert-btn"
         disabled={!props.changed}
         style="margin-left: var(--file-browser-separation);"
         class={`btn warning`}
@@ -66,6 +69,7 @@ export function FileEditorToolbar(props: FileEditorToolbar) {
           props.revertFile();
         }}>revert</button>
       <button
+        id="close-btn"
         class={`btn danger`}
         style="margin-left: var(--file-browser-separation);"
         onclick={ev => {

package/editor/http/admin/editor/api/server/reload.api.ts

@@ -30,11 +30,12 @@ export default {
   },
   handler: async (req: AdminRequest, res) => {
     const errors = await req?.editor?.reload();
+    const parsedErrors = parseInflateErrors(errors);
     return res.json({
       message: "OK",
       reloadString: req.uuid,
       migrations: req?.editor?.getMigrations().map(m => m.name),
-      errors: parseInflateErrors(errors)
+      errors: parsedErrors ? parsedErrors : []
     });
   },
 } as APIRoute;

package/editor/http/admin/editor/index.api.tsx

@@ -22,11 +22,11 @@ export default {
 
         <script type="module" src="/admin/editor/editor.js" />
         <editor-component
-          disableLog="true"
-          disablePreview="true"
-          disableReload="true"
+          disablelog="true"
+          disablepreview="true"
+          disablereload="true"
           class="main-container"
-          reloadString={`${req?.uuid}`}
+          reloadstring={`${req?.uuid}`}
           migrations={`${HTMLEncode(JSON.stringify(migrations))}`}
           services={`${HTMLEncode(JSON.stringify(services))}`}
           errors={`${HTMLEncode(JSON.stringify(errors))}`}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "6.0.9",
+  "version": "6.0.10",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",
@@ -8,13 +8,15 @@
   "author": "claukers",
   "license": "ISC",
   "scripts": {
-    "test": "node --enable-source-maps --test test/cases/*.test.js",
-    "coverage": "node --enable-source-maps --experimental-test-coverage --test test/cases/*.test.js",
+    "pretest": "npm run build",
+    "test": "BROWSER=none node --enable-source-maps --test test/cases/*.test.js",
+    "coverage": "BROWSER=none node --enable-source-maps --experimental-test-coverage --test test/cases/*.test.js",
     "prepare": "npm run build",
     "release:package": "sh sea/release-tar.sh",
     "prerelease:package": "npm run compile",
     "build": "tsc",
-    "postbuild": "npm run postbuild:lib && npm run postbuild:postject && npm run postbuild:sh && npm run postbuild:jsxdom && npm run postbuild:editor && npm run postbuild:types",
+    "postbuild": "npm run postbuild:lib && npm run postbuild:postject && npm run postbuild:sh && npm run postbuild:jsxdom && npm run postbuild:editor && npm run postbuild:types && npm run postbuild:versiontag",
+    "postbuild:versiontag": "node sea/version.tag.js",
     "postbuild:types": "sh sea/copy-types.sh && node sea/generate-global-types-asset-json.js",
     "postbuild:editor": "esbuild --log-level=silent --external:node:process --external:node:path --platform=neutral --bundle --loader:.js=jsx --jsx-factory=jsx.createElement --jsx-fragment=jsx.Fragment sea/editor-assets/editor.bundle.in.mjs --outfile=build/editor.bundle.js",
     "postbuild:jsxdom": "cp node_modules/@miqro/jsx-dom/build/jsx-dom.esm.bundle.js build/jsx.dom.js",
@@ -35,7 +37,8 @@
     "@types/cookie": "^0.6.0",
     "@types/node": "^22.10.2",
     "postject": "1.0.0-alpha.6",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "highlight.js": "11.11.1"
   },
   "dependencies": {
     "@miqro/core": "^5.0.13",
@@ -48,8 +51,7 @@
     "@miqro/test": "^0.2.9",
     "@miqro/test-http": "^0.1.2",
     "@types/showdown": "2.0.6",
-    "esbuild": "0.25.3",
-    "highlight.js": "11.11.1",
+    "esbuild": "0.25.4",
     "showdown": "2.1.0"
   }
 }

package/sea/compile.sh

@@ -14,6 +14,9 @@ TSC_BIN="sh sea/tsc.sh"
 sh sea/copy-types.sh
 $NODE_BIN sea/generate-global-types-asset-json.js
 
+#version.tag
+$NODE_BIN sea/version.tag.js
+
 rm -Rf bin;
 mkdir -p bin/;
 rm -Rf build;
@@ -23,12 +26,12 @@ mkdir -p build/;
 echo $TSC_BIN
 $TSC_BIN
 
-CURRENT_GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
-CURRENT_GIT_SHORT_HASH=`git rev-parse --short HEAD`
-CURRENT_DATE=`date +"%y-%m-%d"`
-VERSION_TAG="${CURRENT_DATE}_${CURRENT_GIT_SHORT_HASH}_${CURRENT_GIT_BRANCH}"
+#CURRENT_GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+#CURRENT_GIT_SHORT_HASH=`git rev-parse --short HEAD`
+#CURRENT_DATE=`date +"%y-%m-%d"`
+#VERSION_TAG="${CURRENT_DATE}_${CURRENT_GIT_SHORT_HASH}_${CURRENT_GIT_BRANCH}"
 
-echo $VERSION_TAG > sea/version.tag
+#echo $VERSION_TAG > sea/version.tag
 
 # jsx.js
 cp node_modules/@miqro/jsx-dom/build/jsx-dom.esm.bundle.js build/jsx.dom.js

package/sea/install-esbuild.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 TARGET="${PWD}/sea/deps/esbuild"
-VERSION="0.25.3"
+VERSION="0.25.4"
 
 if [ -d "$TARGET" ]; then
   echo "$TARGET already exists exist."

package/sea/install-nodejs.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 TARGET="${PWD}/sea/deps/nodejs"
-VERSION="23.11.0"
+VERSION="24.0.0"
 
 if [ -d "$TARGET" ]; then
   echo "$TARGET already exists exist."

package/sea/node.version.tag

@@ -1 +1 @@
-23.11.0
+24.0.0

package/sea/version.tag.js

@@ -0,0 +1,11 @@
+import { readFileSync, writeFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from 'node:url';
+
+export const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url))) : null;
+
+const version = JSON.parse(readFileSync(resolve(__package_dirname, "../package.json")).toString()).version;
+
+console.log("writing [%s] with [%s]", resolve(__package_dirname, "version.tag"), version);
+
+writeFileSync(resolve(__package_dirname, "version.tag"), version);

package/src/common/arguments.ts

@@ -1,5 +1,5 @@
 import { checkEnvVariable } from "@miqro/core";
-import { existsSync, statSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import { resolve } from "node:path";
 import { cwd, env, platform, arch } from "node:process";
 
@@ -10,7 +10,7 @@ import { BIN_NAME, help, usage } from "./help.js";
 import { TEST_SOCKET } from "./paths.js";
 import { isSea } from "node:sea";
 import cluster from "node:cluster";
-import { getVersion } from "./assets.js";
+import { __package_dirname, getVersion } from "./assets.js";
 
 export function getPORT() {
   return checkEnvVariable("PORT", "8080");
@@ -84,8 +84,12 @@ export function parseArguments(): Arguments {
           console.log("version [%s]", VERSION);
           console.log("Node.js version [%s]", NODE_VERSION);
           console.log("esbuild version [%s]", ESBUILD_VERSION);
+          console.log("platform [%s-%s]", platform, arch);
+        } else {
+          const packageJSON = JSON.parse(readFileSync(resolve(__package_dirname, "package.json")).toString());
+          const VERSION = packageJSON.version;
+          console.log("version [%s]", VERSION);
         }
-        console.log("platform [%s-%s]", platform, arch);
         process.exit(EXIT_CODES.NORMAL_EXIT);
       case "-h":
       case "--help":
@@ -319,22 +323,22 @@ export function parseArguments(): Arguments {
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.test && (flags.editor)) {
+  if (flags.test && (flags.hotreload || flags.editor || flags.compile || flags.inflate)) {
     console.error("bad arguments. cannot use --editor with --test");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.migrateUp && (flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
+  if (flags.migrateUp && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateDown || flags.inflate)) {
     console.error("bad arguments. cannot use with --migrate-up");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.migrateDown && (flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
+  if (flags.migrateDown && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate)) {
     console.error("bad arguments. cannot use with --migrate-down");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }
 
-  if (flags.generateDoc && (flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
+  if (flags.generateDoc && (flags.hotreload || flags.editor || flags.compile || flags.test || flags.migrateUp || flags.inflate || flags.migrateDown)) {
     console.error("bad arguments. cannot use with --generate-doc");
     process.exit(EXIT_CODES.BAD_ARGUMENTS);
   }

package/src/common/assets.ts

@@ -10,7 +10,7 @@ import { initESBuild } from "./esbuild.js";
 import { initJSXJS } from "./jsx.js";
 //const require = createRequire(import.meta.url);
 
-const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "..", "..") : null;
+export const __package_dirname = import.meta.url ? resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", "..", "..") : null;
 
 const ASSETS_ROUTER = {
   "lib.cjs": "build/lib.cjs",

package/src/common/jsx.ts

@@ -126,16 +126,6 @@ export async function inflateJSX(inFile: string, options: InflateOptions): Promi
   }
 }
 
-export async function importAPIRoute(inFile: string, logger?: Logger) {
-  const mod = (await importJSXFile(inFile, logger)).default;
-  const module = typeof mod === "function" ? { handler: mod } : parser.parse(mod, APIRouteSchema, basename(inFile));
-  if (module !== undefined) {
-    return module as APIRoute;
-  } else {
-    throw new Error(`error with module [${inFile}] undefined`);
-  }
-}
-
 export const APIOptionsSchema: Schema<APIOptions> = {
   type: "object?",
   properties: {
@@ -155,7 +145,8 @@ export const APIOptionsSchema: Schema<APIOptions> = {
       properties: SessionHandlerOptionsSchema.properties
     },
     ...RouteOptionsSchema.properties
-  }
+  },
+  //mode:"add_extra"
 };
 
 export interface HTMLModule {
@@ -170,7 +161,8 @@ export const HTMLModuleSchema: Schema<HTMLModule> = {
       type: "function|object"
     },
     apiOptions: APIOptionsSchema
-  }
+  },
+  //mode:"add_extra"
 }
 
 export type JSONModuleValue = string | object;
@@ -187,7 +179,8 @@ export const JSONModuleSchema: Schema<JSONModule> = {
       type: "function|object|string"
     },
     apiOptions: APIOptionsSchema
-  }
+  },
+  //mode:"add_extra"
 }
 
 export const MigrationSchema: Schema<Migration> = {
@@ -195,7 +188,8 @@ export const MigrationSchema: Schema<Migration> = {
   properties: {
     up: "function",
     down: "function"
-  }
+  },
+  mode: "add_extra"
 }
 
 export const CORSOptionsSchema: Schema<CORSOptions> = {
@@ -205,7 +199,8 @@ export const CORSOptionsSchema: Schema<CORSOptions> = {
     validate: "function?",
     methods: "string?",
     preflightContinue: "boolean?"
-  }
+  },
+  //mode:"add_extra"
 }
 
 export const WSConfigSchema: Schema<WSConfig> = {
@@ -218,7 +213,8 @@ export const WSConfigSchema: Schema<WSConfig> = {
     onConnection: "function?",
     onMessage: "function?",
     onDisconnect: "function?"
-  }
+  },
+  //mode:"add_extra"
 };
 
 export const DBConfigSchema: Schema<DBConfig> = {
@@ -229,7 +225,8 @@ export const DBConfigSchema: Schema<DBConfig> = {
     storage: "string?",
     dialect: "string?",
     name: "string"
-  }
+  },
+  //mode:"add_extra"
 }
 
 export const ServerConfigSchema: Schema<ServerConfig> = {
@@ -240,7 +237,8 @@ export const ServerConfigSchema: Schema<ServerConfig> = {
     stop: "function?",
     start: "function?",
     load: "function?"
-  }
+  },
+  //mode:"add_extra"
 };
 
 export const LogConfigSchema: Schema<LogConfig> = {
@@ -253,17 +251,27 @@ export const LogConfigSchema: Schema<LogConfig> = {
     replaceConsoleTransport: "boolean?",
     replaceFileTransport: "boolean?",
     write: "function"
-  }
+  },
+  //mode:"add_extra"
 };
 
 export const AuthConfigSchema: Schema<AuthConfig> = {
   type: "object",
   properties: {
     ...SessionHandlerOptionsSchema.properties
-  }
+  },
+  //mode:"add_extra"
 }
 
-
+export async function importAPIRoute(inFile: string, logger?: Logger) {
+  const mod = (await importJSXFile(inFile, logger)).default;
+  const module = typeof mod === "function" ? { handler: mod } : parser.parse(mod, APIRouteSchema, basename(inFile));
+  if (module !== undefined) {
+    return module as APIRoute;
+  } else {
+    throw new Error(`error with module [${inFile}] undefined`);
+  }
+}
 
 export async function importMigrationModule(inFile: string, logger?: Logger) {
   const module = parser.parse((await importJSXFile(inFile, logger)).default, MigrationSchema, basename(inFile));
@@ -275,7 +283,9 @@ export async function importMigrationModule(inFile: string, logger?: Logger) {
 }
 
 export async function importHTMLModule(inFile: string, logger?: Logger) {
-  const module = parser.parse((await importJSXFile(inFile, logger)), HTMLModuleSchema, basename(inFile));
+  const module = (await importJSXFile(inFile, logger));
+  parser.parse(module.default, HTMLModuleSchema.properties.default, `${basename(inFile)}.default`);
+  parser.parse(module.apiOptions, APIOptionsSchema, `${basename(inFile)}.apiOptions`);
   if (module !== undefined) {
     return module;
   } else {
@@ -284,7 +294,9 @@ export async function importHTMLModule(inFile: string, logger?: Logger) {
 }
 
 export async function importJSONModule(inFile: string, logger?: Logger) {
-  const module = parser.parse((await importJSXFile(inFile, logger)), JSONModuleSchema, basename(inFile));
+  const module = (await importJSXFile(inFile, logger));
+  parser.parse(module.default, JSONModuleSchema.properties.default, `${basename(inFile)}.default`);
+  parser.parse(module.apiOptions, APIOptionsSchema, `${basename(inFile)}.apiOptions`);
   if (module !== undefined) {
     return module;
   } else {

package/src/common/watch.ts

@@ -77,4 +77,9 @@ export async function watchAndServer(app: Miqro) {
 
   watchLogger?.info("watching for changes on [%s]", app.options.services.join(","));
   reWatch();
+  return {
+    stopWatch: () => {
+      stopWatch();
+    }
+  };
 }