miqro 6.3.0 → 7.0.2

package/editor/common/log-socket.tsx

@@ -1,3 +1,5 @@
+import * as jsx from "@miqro/jsx";
+
 interface LogLine { out: string; identifier: string; level: "error" | "warn" | "debug" | "trace" | "info" }
 
 export interface LogSocket {

package/editor/common/templates.ts

@@ -110,7 +110,7 @@ export default {
     sufix: ".test.tsx",
     displayName: "a test file",
     language: "typescript",
-    template: () => `import { } from "miqro";
+    template: () => `import JSX from "@miqro/jsx";
 import { strictEqual } from "node:assert";
 
 describe("test group", () => {
@@ -138,7 +138,8 @@ describe("test group", () => {
     sufix: ".html.tsx",
     displayName: ".html.tsx file",
     language: "typescript",
-    template: () => `import { ServerRequest, ServerResponse, APIOptions } from "miqro";
+    template: () => `import JSX from "@miqro/jsx";
+import { ServerRequest, ServerResponse, APIOptions } from "miqro";
 
 /*export const apiOptions: APIOptions = {
   path: ["/", "/index.html"],
@@ -284,10 +285,7 @@ export default {
     "lib": ["es2021", "dom"],
     "jsx": "react",
     "jsxFactory": "JSX.createElement",
-    "jsxFragmentFactory": "JSX.Fragment",
-    "typeRoots": [
-      "./.types"
-    ]
+    "jsxFragmentFactory": "JSX.Fragment"
   }
 }
 `},
@@ -311,13 +309,14 @@ export default {
     sufix: ".min.tsx",
     displayName: "min.tsx file",
     language: "typescript",
-    template: () => `import { } from "miqro";
+    template: () => `import JSX from "@miqro/jsx";
+import { define } from "@miqro/jsx-dom";
 
 export function MyComponent() {
   return <p>HelloWorld</p>
 }
 window.addEventListener("load", (event) => {
-  jsx.define("my-tag", MyComponent, {
+  define("my-tag", MyComponent, {
     shadowInit: false,
     observedAttributes: []
   });
@@ -328,19 +327,20 @@ window.addEventListener("load", (event) => {
     sufix: ".tsx",
     displayName: ".tsx file",
     language: "typescript",
-    template: () => `import { } from "miqro";
+    template: () => `import JSX from "@miqro/jsx";
+import { define } from "@miqro/jsx-dom";
 
 export function MyComponent() {
   return <p>HelloWorld</p>
 }
 window.addEventListener("load", (event) => {
-  jsx.define("my-tag", MyComponent, {
+  define("my-tag", MyComponent, {
     shadowInit: false,
     observedAttributes: []
   });
 });  
 `},
-  SSRTSX: {
+  /*SSRTSX: {
     prefix: "http",
     sufix: ".tsx",
     displayName: "an ssr component example using webcomponents",
@@ -423,7 +423,7 @@ export function SSRComponent(props, children) {
     );
 }
 `
-  },
+  },*/
   JS: {
     prefix: "http",
     sufix: ".js",

package/editor/components/api-preview.tsx

@@ -1,4 +1,6 @@
 import { HighlightTextArea } from "./highlight-text-area.js";
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
 
 const DEFAULT_HEADERS = `{"content-type": "application/json"}`;
 const DEFAULT_BODY = `{}`;

package/editor/components/editor.tsx

@@ -1,3 +1,5 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
 import { FileEditor } from "./file-editor.js";
 import { NewFile } from "./new-file.js";
 import { useScroll } from "./scroll-query.js";

package/editor/components/file-browser.tsx

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 interface FileBrowserFile {
   filePath: string;
   fileName: string;

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

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 import { SUPPORTED_LANGUAGES } from "../common/constants.js";
 
 interface FileEditorToolbar {

package/editor/components/file-editor.tsx

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 import { APIPReview } from "./api-preview.js";
 import { FileEditorToolbar } from "./file-editor-toolbar.js";
 import { HighlightTextArea } from "./highlight-text-area.js";

package/editor/components/filter-query.tsx

@@ -1,3 +1,7 @@
+
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 let queryTimeout2: any = null;
 
 export function useFilterQuery(): [string, (newFilter: string, inmediate?: boolean) => void] {

package/editor/components/highlight-text-area.tsx

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 //import hljs from "../lib/highlight/core.min.js"
 import hljs from 'highlight.js/lib/core';
 import javascript from 'highlight.js/lib/languages/javascript';

package/editor/components/log-viewer.tsx

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 import { LogSocket } from "../common/log-socket.js";
 
 function getUniqueIdentifiers(lines: {

package/editor/components/new-file.tsx

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 import { BASEEDITOR_PATH } from "../common/constants.js";
 import { TEMPLATES } from "../common/templates.js";
 import { HighlightTextArea } from "./highlight-text-area.js";

package/editor/components/scroll-query.tsx

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 let scrollTimeout2: any = null;
 
 export function useScroll(): [{ scrollTop: string; scrollLeft: string }, (newScroll: { scrollTop: number; scrollLeft: number; }, inmediate?: boolean) => void] {

package/editor/components/start-page.tsx

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 interface StartPageProps {
   togglePanel: (panel: string) => void;
   isPanelVisible: (panel: string) => boolean;

package/editor/http/admin/editor/api/fs/delete.api.tsx

@@ -1,4 +1,4 @@
-import { APIRoute } from "@miqro/core";
+import { APIRoute, JSONParser } from "@miqro/core";
 import { unlinkSync } from "node:fs";
 import { getPath } from "./read.api.js";
 
@@ -6,7 +6,7 @@ export default {
   description: "admin editor file deletion endpoint",
   method: "POST",
   path: "/delete",
-  middleware: [server.middleware.json()],
+  middleware: [JSONParser()],
   request: {
     body: {
       path: "string"

package/editor/http/admin/editor/api/fs/read.api.tsx

@@ -1,4 +1,4 @@
-import { APIRoute } from "@miqro/core";
+import { APIRoute, JSONParser } from "@miqro/core";
 import { readFileSync } from "node:fs";
 import { SUPPORTED_LANGUAGES } from "../../../../../common/constants.js";
 import { relative, resolve } from "node:path";
@@ -9,7 +9,7 @@ export default {
   method: "POST",
   path: "/read",
   description: "admin editor file read endpoint",
-  middleware: [server.middleware.json()],
+  middleware: [JSONParser()],
   request: {
     body: {
       path: "string"

package/editor/http/admin/editor/api/fs/rename.api.tsx

@@ -1,10 +1,10 @@
-import { APIRoute } from "@miqro/core";
+import { APIRoute, JSONParser } from "@miqro/core";
 import { existsSync, mkdirSync, renameSync } from "node:fs";
 import { getPath } from "./read.api.js";
 import { dirname } from "node:path";
 
 export default {
-  middleware: [server.middleware.json()],
+  middleware: [JSONParser()],
   method: "POST",
   description: "admin editor file rename endpoint",
   path: "/rename",

package/editor/http/admin/editor/api/fs/scan.api.tsx

@@ -1,4 +1,4 @@
-import { APIRoute } from "@miqro/core";
+import { APIRoute, JSONParser } from "@miqro/core";
 import { existsSync, readdirSync, statSync } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve, sep } from "node:path";
 import { BASE_PATH } from "../../../../../common/constants.server.js";
@@ -24,7 +24,7 @@ export default {
   method: "GET",
   path: "/scan",
   description: "admin editor file scan endpoint",
-  middleware: [server.middleware.json()],
+  middleware: [JSONParser()],
   request: {
     body: false
   },

package/editor/http/admin/editor/api/fs/write.api.tsx

@@ -1,10 +1,10 @@
-import { APIRoute } from "@miqro/core";
+import { APIRoute, JSONParser } from "@miqro/core";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { getPath } from "./read.api.js";
 import { dirname } from "node:path";
 
 export default {
-  middleware: [server.middleware.json()],
+  middleware: [JSONParser()],
   method: "POST",
   path: "/write",
   description: "admin editor file write endpoint",

package/editor/http/admin/editor/api/server/restart.api.tsx

@@ -1,4 +1,4 @@
-import { APIRoute } from "@miqro/core";
+import { APIRoute, JSONParser } from "@miqro/core";
 import { relative } from "node:path";
 import { BASE_PATH } from "../../../../../common/constants.server.js";
 import { AdminRequest } from "../../../../../common/admin-interface.js";
@@ -7,7 +7,7 @@ export default {
   method: "POST",
   path: "/restart",
   description: "admin editor server restart endpoint",
-  middleware: [server.middleware.json()],
+  middleware: [JSONParser()],
   request: {
     body: false
   },

package/editor/http/admin/editor/editor.tsx

@@ -1,8 +1,10 @@
+import { define } from "@miqro/jsx-dom";
+
 //import "../../../../.types/browser.globals";
 import { Editor } from "../../../components/editor.js";
 
 window.addEventListener("load", async (event) => {
-  jsx.define("editor-component", Editor, {
+  define("editor-component", Editor, {
     shadowInit: false
   });
 });

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

@@ -1,3 +1,6 @@
+import * as jsx from "@miqro/jsx";
+import JSX from "@miqro/jsx";
+
 import { APIRoute, Response } from "@miqro/core";
 import { scanDir } from "./api/fs/scan.api.js";
 import { HTMLEncode } from "../../../common/html-encode.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "6.3.0",
+  "version": "7.0.2",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",
@@ -16,15 +16,13 @@
     "prerelease:package": "npm run compile",
     "prebuild": "rm -Rf build/;",
     "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:editor-assets && npm run postbuild:types && npm run postbuild:versiontag",
+    "postbuild": "npm run postbuild:lib && npm run postbuild:sh && npm run postbuild:assets && npm run postbuild:editor && npm run postbuild:editor-assets && 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-assets": "cp sea/editor-assets/font.ttf build/font.ttf && cp sea/editor-assets/style.css build/style.css",
-    "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",
+    "postbuild:editor": "esbuild --external:node:process --external:node:path --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:assets": "node sea/assets.js",
     "postbuild:sh": "node sea/base64.js sea/basic-compile.sh > sea/basic-compile.base64.sh",
-    "postbuild:postject": "esbuild node_modules/postject/dist/cli.js --log-level=silent --bundle --platform=node --outfile=build/postject.cjs && node sea/base64.js build/postject.cjs > build/postject.base64.cjs",
-    "postbuild:lib": "esbuild src/lib.ts --log-level=silent --bundle --platform=node --outfile=build/lib.cjs --external:sqlite3 --external:pg --external:esbuild --external:node:assert --external:node:util --external:node:path",
+    "postbuild:lib": "esbuild src/lib.ts --bundle --platform=node --outfile=build/lib.cjs --external:sqlite3 --external:pg --external:esbuild --external:node:assert --external:node:util --external:node:path",
     "compile": "npm run build && sh sea/compile.sh",
     "start:editor": "node --enable-source-maps --disable-warning=ExperimentalWarning build/esm/src/main.js --service editor/",
     "compile:editor": "node --enable-source-maps --disable-warning=ExperimentalWarning build/esm/src/main.js --compile --service editor/",
@@ -39,10 +37,10 @@
     "@types/node": "^22.10.2",
     "@types/showdown": "2.0.6",
     "highlight.js": "11.11.1",
-    "postject": "1.0.0-alpha.6",
     "typescript": "^5.7.2"
   },
   "dependencies": {
+    "postject": "1.0.0-alpha.6",
     "@miqro/core": "^5.0.15",
     "@miqro/jsx": "^1.0.1",
     "@miqro/jsx-dom": "^1.0.4",

package/sea/basic-compile.base64.sh

@@ -1 +1 @@
-IyEvdXNyL2Jpbi9lbnYgc2gKCnJtIC1SZiBiaW47Cm1rZGlyIC1wIGJpbi87CgpzaCAuL2luc3RhbGwtbm9kZWpzLnNoCgpOT0RFX0JJTj0ic2ggc2VhL25vZGUuc2giClNJR05fUkVNT1ZFX0JJTj0ic2ggc2VhL3NpZ24tcmVtb3ZlLnNoIgpTSUdOX0FERF9CSU49InNoIHNlYS9zaWduLWFkZC5zaCIKUE9TVEpFQ1RfQklOPSIke05PREVfQklOfSBzZWEvcG9zdGplY3QuY2pzIgpFU0JVSUxEX0JJTj0ic2VhL2VzYnVpbGQiCgojJEVTQlVJTERfQklOIHNlYS9hcHAuY2pzIC0tYnVuZGxlIC0tcGxhdGZvcm09bm9kZSAtLWV4dGVybmFsOnNxbGl0ZTMgLS1leHRlcm5hbDpwZyAtLWV4dGVybmFsOmVzYnVpbGQgLS1vdXRmaWxlPXNlYS9hcHAuYnVuZGxlLmNqcwoKJE5PREVfQklOIC0tZXhwZXJpbWVudGFsLXNlYS1jb25maWcgc2VhL2NvbmZpZy5qc29uCgpUQVJHRVRfQklOX05BTUU9ImFwcCIKClRBUkdFVF9MSU5VWF9YNjQ9ImJpbi9saW51eC14NjQvJHtUQVJHRVRfQklOX05BTUV9IgpUQVJHRVRfTElOVVhfQVJNNjQ9ImJpbi9saW51eC1hcm02NC8ke1RBUkdFVF9CSU5fTkFNRX0iCgpUQVJHRVRfREFSV0lOX0FSTTY0PSJiaW4vZGFyd2luLWFybTY0LyR7VEFSR0VUX0JJTl9OQU1FfSIKVEFSR0VUX0RBUldJTl9YNjQ9ImJpbi9kYXJ3aW4teDY0LyR7VEFSR0VUX0JJTl9OQU1FfSIKCiNUQVJHRVRfV0lOX1g2ND0iYmluL3dpbi14NjQvJHtUQVJHRVRfQklOX05BTUV9LmV4ZSIKI1RBUkdFVF9XSU5fQVJNNjQ9ImJpbi93aW4tYXJtNjQvJHtUQVJHRVRfQklOX05BTUV9LmV4ZSIKCm1rZGlyIC1wIGJpbi9saW51eC14NjQKbWtkaXIgLXAgYmluL2xpbnV4LWFybTY0Cgpta2RpciAtcCBiaW4vZGFyd2luLXg2NApta2RpciAtcCBiaW4vZGFyd2luLWFybTY0CgojbWtkaXIgLXAgYmluL3dpbi14NjQKI21rZGlyIC1wIGJpbi93aW4tYXJtNjQKCmNwIHNlYS9kZXBzL25vZGVqcy9kYXJ3aW4vYXJtNjQvbm9kZSAiJHtUQVJHRVRfREFSV0lOX0FSTTY0fSIKY3Agc2VhL2RlcHMvbm9kZWpzL2Rhcndpbi94NjQvbm9kZSAiJHtUQVJHRVRfREFSV0lOX1g2NH0iCgpjcCBzZWEvZGVwcy9ub2RlanMvbGludXgveDY0L25vZGUgIiR7VEFSR0VUX0xJTlVYX1g2NH0iCmNwIHNlYS9kZXBzL25vZGVqcy9saW51eC9hcm02NC9ub2RlICIke1RBUkdFVF9MSU5VWF9BUk02NH0iCgojY3Agc2VhL2RlcHMvbm9kZWpzL3dpbi94NjQvbm9kZS5leGUgIiR7VEFSR0VUX1dJTl9YNjR9IgojY3Agc2VhL2RlcHMvbm9kZWpzL3dpbi94NjQvbm9kZS5leGUgIiR7VEFSR0VUX1dJTl9BUk02NH0iCgokU0lHTl9SRU1PVkVfQklOICIke1RBUkdFVF9EQVJXSU5fQVJNNjR9IgokU0lHTl9SRU1PVkVfQklOICIke1RBUkdFVF9EQVJXSU5fWDY0fSIKCmNobW9kICt3ICIke1RBUkdFVF9MSU5VWF9BUk02NH0iCmNobW9kICt3ICIke1RBUkdFVF9MSU5VWF9YNjR9IgoKY2htb2QgK3cgIiR7VEFSR0VUX0RBUldJTl9BUk02NH0iCmNobW9kICt3ICIke1RBUkdFVF9EQVJXSU5fWDY0fSIKCiNjaG1vZCArdyAiJHtUQVJHRVRfV0lOX1g2NH0iCiNjaG1vZCArdyAiJHtUQVJHRVRfV0lOX0FSTTY0fSIKCkJMT0I9InNlYS9hcHAuYnVuZGxlLmJsb2IiCgpjcCBzZWEvcnVuLnNoIGJpbi9hcHAuc2gKY2htb2QgK3ggYmluL2FwcC5zaAoKJFBPU1RKRUNUX0JJTiAiJHtUQVJHRVRfREFSV0lOX0FSTTY0fSIgTk9ERV9TRUFfQkxPQiAke0JMT0J9IC0tc2VudGluZWwtZnVzZSBOT0RFX1NFQV9GVVNFX2ZjZTY4MGFiMmNjNDY3YjZlMDcyYjhiNWRmMTk5NmIyIC0tbWFjaG8tc2VnbWVudC1uYW1lIE5PREVfU0VBCiRTSUdOX0FERF9CSU4gIiR7VEFSR0VUX0RBUldJTl9BUk02NH0iCiRQT1NUSkVDVF9CSU4gIiR7VEFSR0VUX0RBUldJTl9YNjR9IiBOT0RFX1NFQV9CTE9CICR7QkxPQn0gLS1zZW50aW5lbC1mdXNlIE5PREVfU0VBX0ZVU0VfZmNlNjgwYWIyY2M0NjdiNmUwNzJiOGI1ZGYxOTk2YjIgLS1tYWNoby1zZWdtZW50LW5hbWUgTk9ERV9TRUEKJFNJR05fQUREX0JJTiAiJHtUQVJHRVRfREFSV0lOX1g2NH0iCgokUE9TVEpFQ1RfQklOICIke1RBUkdFVF9MSU5VWF9BUk02NH0iIE5PREVfU0VBX0JMT0IgJHtCTE9CfSAtLXNlbnRpbmVsLWZ1c2UgTk9ERV9TRUFfRlVTRV9mY2U2ODBhYjJjYzQ2N2I2ZTA3MmI4YjVkZjE5OTZiMgokUE9TVEpFQ1RfQklOICIke1RBUkdFVF9MSU5VWF9YNjR9IiBOT0RFX1NFQV9CTE9CICR7QkxPQn0gLS1zZW50aW5lbC1mdXNlIE5PREVfU0VBX0ZVU0VfZmNlNjgwYWIyY2M0NjdiNmUwNzJiOGI1ZGYxOTk2YjIKCiMkUE9TVEpFQ1RfQklOICIke1RBUkdFVF9XSU5fWDY0fSIgTk9ERV9TRUFfQkxPQiAke0JMT0J9IC0tc2VudGluZWwtZnVzZSBOT0RFX1NFQV9GVVNFX2ZjZTY4MGFiMmNjNDY3YjZlMDcyYjhiNWRmMTk5NmIyCiMkUE9TVEpFQ1RfQklOICIke1RBUkdFVF9XSU5fQVJNNjR9IiBOT0RFX1NFQV9CTE9CICR7QkxPQn0gLS1zZW50aW5lbC1mdXNlIE5PREVfU0VBX0ZVU0VfZmNlNjgwYWIyY2M0NjdiNmUwNzJiOGI1ZGYxOTk2YjIK
+IyEvdXNyL2Jpbi9lbnYgc2gKCnJtIC1SZiBiaW47Cm1rZGlyIC1wIGJpbi87CgpzaCAuL2luc3RhbGwtbm9kZWpzLnNoCgpOT0RFX0JJTj0ic2ggc2VhL25vZGUuc2giClNJR05fUkVNT1ZFX0JJTj0ic2ggc2VhL3NpZ24tcmVtb3ZlLnNoIgpTSUdOX0FERF9CSU49InNoIHNlYS9zaWduLWFkZC5zaCIKUE9TVEpFQ1RfQklOPSIke05PREVfQklOfSAuLi9ub2RlX21vZHVsZXMvcG9zdGplY3QvZGlzdC9jbGkuanMiCkVTQlVJTERfQklOPSJzZWEvZXNidWlsZCIKCiMkRVNCVUlMRF9CSU4gc2VhL2FwcC5janMgLS1idW5kbGUgLS1wbGF0Zm9ybT1ub2RlIC0tZXh0ZXJuYWw6c3FsaXRlMyAtLWV4dGVybmFsOnBnIC0tZXh0ZXJuYWw6ZXNidWlsZCAtLW91dGZpbGU9c2VhL2FwcC5idW5kbGUuY2pzCgokTk9ERV9CSU4gLS1leHBlcmltZW50YWwtc2VhLWNvbmZpZyBzZWEvY29uZmlnLmpzb24KClRBUkdFVF9CSU5fTkFNRT0iYXBwIgoKVEFSR0VUX0xJTlVYX1g2ND0iYmluL2xpbnV4LXg2NC8ke1RBUkdFVF9CSU5fTkFNRX0iClRBUkdFVF9MSU5VWF9BUk02ND0iYmluL2xpbnV4LWFybTY0LyR7VEFSR0VUX0JJTl9OQU1FfSIKClRBUkdFVF9EQVJXSU5fQVJNNjQ9ImJpbi9kYXJ3aW4tYXJtNjQvJHtUQVJHRVRfQklOX05BTUV9IgpUQVJHRVRfREFSV0lOX1g2ND0iYmluL2Rhcndpbi14NjQvJHtUQVJHRVRfQklOX05BTUV9IgoKI1RBUkdFVF9XSU5fWDY0PSJiaW4vd2luLXg2NC8ke1RBUkdFVF9CSU5fTkFNRX0uZXhlIgojVEFSR0VUX1dJTl9BUk02ND0iYmluL3dpbi1hcm02NC8ke1RBUkdFVF9CSU5fTkFNRX0uZXhlIgoKbWtkaXIgLXAgYmluL2xpbnV4LXg2NApta2RpciAtcCBiaW4vbGludXgtYXJtNjQKCm1rZGlyIC1wIGJpbi9kYXJ3aW4teDY0Cm1rZGlyIC1wIGJpbi9kYXJ3aW4tYXJtNjQKCiNta2RpciAtcCBiaW4vd2luLXg2NAojbWtkaXIgLXAgYmluL3dpbi1hcm02NAoKY3Agc2VhL2RlcHMvbm9kZWpzL2Rhcndpbi9hcm02NC9ub2RlICIke1RBUkdFVF9EQVJXSU5fQVJNNjR9IgpjcCBzZWEvZGVwcy9ub2RlanMvZGFyd2luL3g2NC9ub2RlICIke1RBUkdFVF9EQVJXSU5fWDY0fSIKCmNwIHNlYS9kZXBzL25vZGVqcy9saW51eC94NjQvbm9kZSAiJHtUQVJHRVRfTElOVVhfWDY0fSIKY3Agc2VhL2RlcHMvbm9kZWpzL2xpbnV4L2FybTY0L25vZGUgIiR7VEFSR0VUX0xJTlVYX0FSTTY0fSIKCiNjcCBzZWEvZGVwcy9ub2RlanMvd2luL3g2NC9ub2RlLmV4ZSAiJHtUQVJHRVRfV0lOX1g2NH0iCiNjcCBzZWEvZGVwcy9ub2RlanMvd2luL3g2NC9ub2RlLmV4ZSAiJHtUQVJHRVRfV0lOX0FSTTY0fSIKCiRTSUdOX1JFTU9WRV9CSU4gIiR7VEFSR0VUX0RBUldJTl9BUk02NH0iCiRTSUdOX1JFTU9WRV9CSU4gIiR7VEFSR0VUX0RBUldJTl9YNjR9IgoKY2htb2QgK3cgIiR7VEFSR0VUX0xJTlVYX0FSTTY0fSIKY2htb2QgK3cgIiR7VEFSR0VUX0xJTlVYX1g2NH0iCgpjaG1vZCArdyAiJHtUQVJHRVRfREFSV0lOX0FSTTY0fSIKY2htb2QgK3cgIiR7VEFSR0VUX0RBUldJTl9YNjR9IgoKI2NobW9kICt3ICIke1RBUkdFVF9XSU5fWDY0fSIKI2NobW9kICt3ICIke1RBUkdFVF9XSU5fQVJNNjR9IgoKQkxPQj0ic2VhL2FwcC5idW5kbGUuYmxvYiIKCmNwIHNlYS9ydW4uc2ggYmluL2FwcC5zaApjaG1vZCAreCBiaW4vYXBwLnNoCgokUE9TVEpFQ1RfQklOICIke1RBUkdFVF9EQVJXSU5fQVJNNjR9IiBOT0RFX1NFQV9CTE9CICR7QkxPQn0gLS1zZW50aW5lbC1mdXNlIE5PREVfU0VBX0ZVU0VfZmNlNjgwYWIyY2M0NjdiNmUwNzJiOGI1ZGYxOTk2YjIgLS1tYWNoby1zZWdtZW50LW5hbWUgTk9ERV9TRUEKJFNJR05fQUREX0JJTiAiJHtUQVJHRVRfREFSV0lOX0FSTTY0fSIKJFBPU1RKRUNUX0JJTiAiJHtUQVJHRVRfREFSV0lOX1g2NH0iIE5PREVfU0VBX0JMT0IgJHtCTE9CfSAtLXNlbnRpbmVsLWZ1c2UgTk9ERV9TRUFfRlVTRV9mY2U2ODBhYjJjYzQ2N2I2ZTA3MmI4YjVkZjE5OTZiMiAtLW1hY2hvLXNlZ21lbnQtbmFtZSBOT0RFX1NFQQokU0lHTl9BRERfQklOICIke1RBUkdFVF9EQVJXSU5fWDY0fSIKCiRQT1NUSkVDVF9CSU4gIiR7VEFSR0VUX0xJTlVYX0FSTTY0fSIgTk9ERV9TRUFfQkxPQiAke0JMT0J9IC0tc2VudGluZWwtZnVzZSBOT0RFX1NFQV9GVVNFX2ZjZTY4MGFiMmNjNDY3YjZlMDcyYjhiNWRmMTk5NmIyCiRQT1NUSkVDVF9CSU4gIiR7VEFSR0VUX0xJTlVYX1g2NH0iIE5PREVfU0VBX0JMT0IgJHtCTE9CfSAtLXNlbnRpbmVsLWZ1c2UgTk9ERV9TRUFfRlVTRV9mY2U2ODBhYjJjYzQ2N2I2ZTA3MmI4YjVkZjE5OTZiMgoKIyRQT1NUSkVDVF9CSU4gIiR7VEFSR0VUX1dJTl9YNjR9IiBOT0RFX1NFQV9CTE9CICR7QkxPQn0gLS1zZW50aW5lbC1mdXNlIE5PREVfU0VBX0ZVU0VfZmNlNjgwYWIyY2M0NjdiNmUwNzJiOGI1ZGYxOTk2YjIKIyRQT1NUSkVDVF9CSU4gIiR7VEFSR0VUX1dJTl9BUk02NH0iIE5PREVfU0VBX0JMT0IgJHtCTE9CfSAtLXNlbnRpbmVsLWZ1c2UgTk9ERV9TRUFfRlVTRV9mY2U2ODBhYjJjYzQ2N2I2ZTA3MmI4YjVkZjE5OTZiMgo=

package/sea/basic-compile.sh

@@ -8,7 +8,7 @@ sh ./install-nodejs.sh
 NODE_BIN="sh sea/node.sh"
 SIGN_REMOVE_BIN="sh sea/sign-remove.sh"
 SIGN_ADD_BIN="sh sea/sign-add.sh"
-POSTJECT_BIN="${NODE_BIN} sea/postject.cjs"
+POSTJECT_BIN="${NODE_BIN} ../node_modules/postject/dist/cli.js"
 ESBUILD_BIN="sea/esbuild"
 
 #$ESBUILD_BIN sea/app.cjs --bundle --platform=node --external:sqlite3 --external:pg --external:esbuild --outfile=sea/app.bundle.cjs

package/sea/install-nodejs.sh

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

package/sea/node.version.tag

@@ -1 +1 @@
-24.2.0
+24.3.0

package/src/bin/types.ts

@@ -1,15 +1,20 @@
 import { MinimalLogger } from "@miqro/core";
 import { Arguments } from "../common/arguments.js";
-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: Arguments, logger: MinimalLogger) {
-  if (args.installTypes) {
+  /*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/src/cluster.ts

@@ -16,7 +16,7 @@ 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 {
   const CMD = `CLUSTER_COUNT=${CLUSTER_COUNT} CLUSTER_AUTO_BROADCAST=true ${process.argv[0]} ${mainPath()} ${resolve(__package_dirname, "main.js")} ${process.argv.slice(2).join(" ")}`;

package/src/common/arguments.ts

@@ -65,9 +65,10 @@ export interface Arguments {
   name?: string;
   browser?: string | boolean;
   logFile?: string | boolean;
-  installTypes: boolean;
+  // installTypes: boolean;
   installMiqroJSON: boolean;
   installTSConfig: boolean;
+  install: boolean;
   test: boolean;
   port: string;
   inflate: boolean;
@@ -108,9 +109,10 @@ export function parseArguments(): Arguments {
     logFile: string | boolean | null;
     browser: string | boolean | null;
     name: string | null;
-    installTypes: boolean | null;
+    // installTypes: boolean | null;
     installMiqroJSON: boolean | null;
     installTSConfig: boolean | null;
+    install: boolean | null;
     inflate: boolean | null;
     port: string | null;
     generateDoc: boolean | null;
@@ -140,8 +142,9 @@ export function parseArguments(): Arguments {
     watch: null,
     miqroJSONPath: null,
     installMiqroJSON: null,
+    install: null,
     disableMiqroJSON: null,
-    installTypes: null,
+    // installTypes: null,
     port: null,
     installTSConfig: null,
     migrateUp: null,
@@ -213,6 +216,14 @@ export function parseArguments(): Arguments {
         }
         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.");
@@ -407,14 +418,14 @@ export function parseArguments(): Arguments {
         flags.inflateSEA = true;
         flags.inflate = true;
         continue;
-      case "--install-types":
+      /*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;
+        continue;*/
       case "--editor":
         if (flags.editor !== null) {
           console.error("bad arguments.");
@@ -618,7 +629,7 @@ export function parseArguments(): Arguments {
 
   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);
@@ -650,13 +661,18 @@ export function parseArguments(): Arguments {
     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);
   }
 
@@ -665,7 +681,7 @@ export function parseArguments(): Arguments {
     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);
   }
@@ -722,9 +738,10 @@ export function parseArguments(): Arguments {
     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/src/common/assets.ts

@@ -1,13 +1,14 @@
 //import { createRequire } from 'node:module';
 import { Logger, MinimalLogger } from "@miqro/core";
-import { chmodSync, constants, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { chmodSync, constants, existsSync, lstatSync, mkdirSync, readFileSync, statSync, unlinkSync, writeFileSync } 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 { esBuild, initESBuild } from "./esbuild.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;
@@ -17,7 +18,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",
@@ -25,8 +26,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"
@@ -72,14 +74,27 @@ export async function initAssets(logger: 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: MinimalLogger) {
+/*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: MinimalLogger, include: string[]) {
+  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: MinimalLogger | undefined, path: string, internalChecksum: string): Promise<boolean> {
@@ -108,8 +123,13 @@ export async function initAsset(logger: MinimalLogger, path: string, buffer: Buf
   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);
       }
@@ -120,7 +140,7 @@ export async function initAsset(logger: MinimalLogger, path: string, buffer: Buf
     } 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);
     }