miqro 6.0.9 → 6.0.11

package/editor/common/log-socket.tsx

@@ -7,7 +7,7 @@ export interface LogSocket {
   setMaxLogSize: (val: number | "unlimited") => void;
 }
 
-export function useLogSocket(): LogSocket {
+export function useLogSocket(options: { disableLog?: boolean; }): LogSocket {
 
   const [_, setmaxLogSize, getMaxlogsize] = jsx.useState<number | "unlimited">(1000000);
 
@@ -20,6 +20,9 @@ export function useLogSocket(): LogSocket {
 
     function setupSocket() {
       try {
+        if (options.disableLog) {
+          return;
+        }
         console.log("setting up log socket");
         const socket = new WebSocket("/admin/socket");
         socket.addEventListener("error", (err) => {

package/editor/common/templates.ts

@@ -34,7 +34,7 @@ export default async (req: ServerRequest | null, res: ServerResponse | null) =>
     sufix: ".api.ts",
     displayName: ".api.ts file",
     language: "typescript",
-    template: () => `import { ServerRequest, ServerResponse, APIRoute } from "miqro"
+    template: () => `import { ServerRequest, ServerResponse, APIRoute } from "miqro";
 
 export default {
   path: "/health",
@@ -85,7 +85,7 @@ export default {
     sufix: ".ts",
     displayName: "migration file",
     language: "typescript",
-    template: () => `import { Migration } from "@miqro/query";
+    template: () => `import { Migration } from "miqro";
 
 export default {
     up: async (db, logger) => {
@@ -260,14 +260,14 @@ export default {
     template: () => `{
   "compilerOptions": {
     "target": "es2022",
-    "module": "es2022",
+    "noEmit": true,
+    "module": "NodeNext",
+    "moduleResolution": "nodenext",
     "lib": ["es2021", "dom"],
     "jsx": "react",
     "jsxFactory": "JSX.createElement",
     "jsxFragmentFactory": "JSX.Fragment",
     "typeRoots": [
-      "./node_modules/",
-      "./node_modules/@types",
       "./.types"
     ]
   }

package/editor/components/editor.tsx

@@ -28,7 +28,10 @@ function InflateError2Map(errors: {
 }
 
 export function Editor(props: { disablelog?: boolean; disablepreview?: boolean; disablereload?: boolean; migrations: string; services: string; reloadstring: string; files: string; initialcurrent: string; classname?: string; errors: string }) {
-  const logSocket = useLogSocket();
+  //console.dir(props);
+  const logSocket = useLogSocket({
+    disableLog: (props as any).disablelog === "true" || props.disablelog === true ? true : false
+  });
 
   const [services, setservices] = jsx.useState<string[]>(JSON.parse(props.services));
   const [collapsed, setCollapsed] = jsx.useState<{

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.11",
   "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