miqro 7.2.2 → 7.2.3

package/build/lib.cjs

@@ -640,12 +640,6 @@ var init_lib = __esm({
         }
       }
       parse(arg, options, name = "") {
-        if (typeof options === "string") {
-          options = {
-            type: options,
-            required: true
-          };
-        }
         const baseOption = typeof options === "string" ? {
           type: options,
           required: true
@@ -706,7 +700,7 @@ function ReadBuffer(options) {
     limit = parseInt(limitS, 10);
     timeout = parseInt(timeoutS, 10);
   }
-  return async function ReadBuffer2(req, res) {
+  return async function ReadBuffer3(req, res) {
     return new Promise((resolve24, reject) => {
       try {
         const readTimeout = setTimeout(() => {
@@ -780,7 +774,7 @@ function URLEncodedParser(options) {
   const readBuffer = ReadBuffer({
     limit
   });
-  return async function URLEncodedParser2(req, res) {
+  return async function URLEncodedParser3(req, res) {
     try {
       const isType = req.body === void 0 && req.headers["content-type"] ? req.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
       if (isType && !req.buffer) {
@@ -828,7 +822,7 @@ function JSONParser(options) {
   const readBuffer = ReadBuffer({
     limit
   });
-  return async function JSONParser2(req, res) {
+  return async function JSONParser3(req, res) {
     try {
       const isType = req.body === void 0 && req.headers["content-type"] ? req.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
       if (isType && !req.buffer) {
@@ -872,7 +866,7 @@ function TextParser(options) {
   const readBuffer = ReadBuffer({
     limit
   });
-  return async function TextParser2(req, res) {
+  return async function TextParser3(req, res) {
     try {
       const isType = req.body === void 0 && req.headers["content-type"] ? req.headers["content-type"].toLocaleLowerCase().indexOf(type.toLocaleLowerCase()) !== -1 : false;
       if (isType && !req.buffer) {
@@ -1103,7 +1097,7 @@ var init_body_parser = __esm({
         origins = origins[0];
       }
       const validate = options && options.validate ? options && options.validate : isOriginAllowed;
-      return async function CORS2(req, res) {
+      return async function CORS3(req, res) {
         if (!origins || origins === "*") {
           res.setHeader("Access-Control-Allow-Origin", "*");
           res.addVaryHeader("Origin");
@@ -1206,7 +1200,7 @@ function SessionHandler(config) {
   const tokenLocation = config.options.tokenLocation;
   const tokenLocationName = config.options.tokenLocationName;
   const setCookieOptions = config.options.setCookieOptions;
-  return async function SessionHandler2(req, res) {
+  return async function SessionHandler3(req, res) {
     try {
       const tlN = typeof tokenLocationName === "string" ? tokenLocationName : tokenLocationName ? await tokenLocationName(req) : "";
       let token = null;
@@ -1352,6 +1346,9 @@ var init_session = __esm({
 function isMinimalRouter(obj) {
   return typeof obj === "object" && typeof obj.run === "function" && typeof obj.getJSONDoc === "function";
 }
+function defineRoute(route) {
+  return route;
+}
 function pathPartTokenize(token) {
   const isWild = token.value[0] === ":";
   const optional = token.value[token.value.length - 1] === "?";
@@ -6797,7 +6794,7 @@ var init_read_api = __esm({
     import_node_path21 = require("node:path");
     init_scan_api();
     init_constants_server();
-    read_api_default = {
+    read_api_default = defineRoute({
       method: "POST",
       path: "/read",
       description: "admin editor file read endpoint",
@@ -6822,7 +6819,7 @@ var init_read_api = __esm({
           path
         });
       }
-    };
+    });
   }
 });
 
@@ -6899,7 +6896,7 @@ var init_rename_api = __esm({
     import_node_fs21 = require("node:fs");
     init_read_api();
     import_node_path23 = require("node:path");
-    rename_api_default = {
+    rename_api_default = defineRoute({
       middleware: [JSONParser()],
       method: "POST",
       description: "admin editor file rename endpoint",
@@ -6923,7 +6920,7 @@ var init_rename_api = __esm({
           message: "OK"
         });
       }
-    };
+    });
   }
 });
 
@@ -6941,7 +6938,7 @@ var init_delete_api = __esm({
     init_lib3();
     import_node_fs22 = require("node:fs");
     init_read_api();
-    delete_api_default = {
+    delete_api_default = defineRoute({
       description: "admin editor file deletion endpoint",
       method: "POST",
       path: "/delete",
@@ -6964,7 +6961,7 @@ var init_delete_api = __esm({
           message: "OK"
         });
       }
-    };
+    });
   }
 });
 
@@ -7145,6 +7142,7 @@ __export(lib_exports3, {
   appendAPIModule: () => appendAPIModule,
   createLogProviderOptions: () => createLogProviderOptions,
   createServerInterface: () => createServerInterface,
+  defineRoute: () => defineRoute2,
   jsx: () => lib_exports,
   jsx2HTML: () => jsx2HTML,
   jwt: () => jwt,
@@ -8881,22 +8879,25 @@ function HTMLEncode(str) {
 function AttributeEncode(str) {
   return str.replaceAll('"', """);
 }
+var containerMap = /* @__PURE__ */ new WeakMap();
+var originalChildNodesMap = /* @__PURE__ */ new WeakMap();
 function runtimeDefine(runtime, tagName, component, options) {
-  let container = null;
-  let originalChildNodes = [];
   runtime.customElementMap[tagName] = class extends SSRHTMLElement {
     constructor() {
       super(tagName, runtime);
-      container = runtime.createContainer(this, {
+      const container = runtime.createContainer(this, {
         shadowInit: options?.shadowInit,
         runtimeOptions: options?.runtimeOptions
       });
+      containerMap.set(this, container);
     }
     connectedCallback() {
+      const container = containerMap.get(this);
       if (!container) {
         throw new Error("cannot find container!");
       }
       this.reCalculateOriginalChildren();
+      const originalChildNodes = originalChildNodesMap.get(this);
       const props = {};
       const self = this;
       for (const name of self.getAttributeNames()) {
@@ -8906,12 +8907,18 @@ function runtimeDefine(runtime, tagName, component, options) {
       container.render(createElement(component, props, originalChildNodes));
     }
     disconnectedCallback() {
+      const container = containerMap.get(this);
       if (!container) {
         throw new Error("cannot find container!");
       }
       container.disconnect();
     }
     attributeChangedCallback() {
+      const container = containerMap.get(this);
+      const originalChildNodes = originalChildNodesMap.get(this);
+      if (!container || !originalChildNodesMap.has(this)) {
+        return;
+      }
       if (!container) {
         throw new Error("cannot find container!");
       }
@@ -8924,13 +8931,22 @@ function runtimeDefine(runtime, tagName, component, options) {
       container.render(createElement(component, props, originalChildNodes));
     }
     reCalculateOriginalChildren() {
-      originalChildNodes = [];
+      if (originalChildNodesMap.has(this)) {
+        return;
+      }
+      const originalChildNodes = [];
+      if (!originalChildNodes) {
+        return;
+      }
       const self = this;
       for (let i = 0; i < self.childNodes.length; i++) {
         const node = self.childNodes[i];
-        node.remove();
         originalChildNodes.push(node);
       }
+      for (const o of originalChildNodes) {
+        o.remove();
+      }
+      originalChildNodesMap.set(this, originalChildNodes);
     }
     getProps() {
       const props = {};
@@ -11589,6 +11605,11 @@ var down = {
   folder: downMigrationFolder
 };
 
+// src/types.ts
+function defineRoute2(route) {
+  return defineRoute(route);
+}
+
 // src/services/utils/cluster-ws.ts
 init_lib3();
 var ClusterWebSocketServer2MessageType = "$$$$ClusterWebSocketServer2Message$$$$$";
@@ -17852,6 +17873,7 @@ var JSX2 = {
   appendAPIModule,
   createLogProviderOptions,
   createServerInterface,
+  defineRoute,
   jsx,
   jsx2HTML,
   jwt,

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

@@ -1,8 +1,8 @@
-import { APIRoute, JSONParser } from "@miqro/core";
+import { defineRoute, JSONParser } from "@miqro/core";
 import { unlinkSync } from "node:fs";
 import { getPath } from "./read.api.js";
 
-export default {
+export default defineRoute({
   description: "admin editor file deletion endpoint",
   method: "POST",
   path: "/delete",
@@ -25,7 +25,7 @@ export default {
       message: "OK"
     });
   }
-} as APIRoute;
+});
 
 function deleteFile(path: string) {
   unlinkSync(getPath(path));

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

@@ -1,11 +1,11 @@
-import { APIRoute, JSONParser } from "@miqro/core";
+import { APIRoute, defineRoute, JSONParser } from "@miqro/core";
 import { readFileSync, realpathSync } from "node:fs";
 import { SUPPORTED_LANGUAGES } from "../../../../../common/constants.js";
 import { relative, resolve } from "node:path";
 import { getLanguage } from "./scan.api.js";
 import { BASE_PATH } from "../../../../../common/constants.server.js";
 
-export default {
+export default defineRoute({
   method: "POST",
   path: "/read",
   description: "admin editor file read endpoint",
@@ -30,7 +30,7 @@ export default {
       path
     });
   }
-} as APIRoute;
+});
 
 export function readFile(path: string) {
   const filePath = getPath(path);

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

@@ -1,9 +1,9 @@
-import { APIRoute, JSONParser } from "@miqro/core";
+import { APIRoute, defineRoute, JSONParser } from "@miqro/core";
 import { existsSync, mkdirSync, renameSync } from "node:fs";
 import { getPath } from "./read.api.js";
 import { dirname } from "node:path";
 
-export default {
+export default defineRoute({
   middleware: [JSONParser()],
   method: "POST",
   description: "admin editor file rename endpoint",
@@ -27,7 +27,7 @@ export default {
       message: "OK"
     });
   }
-} as APIRoute;
+});
 
 export async function rename(path: string, newName: string) {
   if (existsSync(path) && !existsSync(newName)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "7.2.2",
+  "version": "7.2.3",
   "description": "",
   "type": "module",
   "main": "build/esm/src/lib.js",
@@ -11,7 +11,7 @@
     "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",
-    "prepare2": "npm run build",
+    "prepare": "npm run build",
     "release:package": "sh sea/release-tar.sh",
     "prerelease:package": "npm run compile",
     "prebuild": "rm -Rf build/;",
@@ -41,15 +41,15 @@
   },
   "dependencies": {
     "postject": "1.0.0-alpha.6",
-    "@miqro/core": "^5.0.17",
-    "@miqro/jsx": "^1.0.1",
-    "@miqro/jsx-dom": "^1.0.4",
-    "@miqro/jsx-node": "^1.0.6",
-    "@miqro/parser": "^2.0.5",
-    "@miqro/query": "^0.0.7",
-    "@miqro/runner": "^2.0.2",
-    "@miqro/test": "^0.2.9",
-    "@miqro/test-http": "^0.1.3",
+    "@miqro/core": "^5.0.18",
+    "@miqro/jsx": "^1.0.2",
+    "@miqro/jsx-dom": "^1.0.6",
+    "@miqro/jsx-node": "^1.0.7",
+    "@miqro/parser": "^2.0.6",
+    "@miqro/query": "^0.0.8",
+    "@miqro/runner": "^2.0.3",
+    "@miqro/test": "^0.2.10",
+    "@miqro/test-http": "^0.1.4",
     "esbuild": "0.28.0",
     "jose": "6.2.1",
     "showdown": "2.1.0"

package/src/common/jsx.ts

@@ -3,7 +3,7 @@ import { createNodeRuntime } from "@miqro/jsx-node";
 import { basename, dirname, extname, relative, resolve } from "node:path";
 import { randomUUID } from "node:crypto";
 import { Request, Response, CORSOptions, Logger, APIRoute } from "@miqro/core";
-import { Parser, Schema } from "@miqro/parser";
+import { InferSchema, Parser, Schema } from "@miqro/parser";
 import { APIRouteSchema, SessionHandlerOptionsSchema } from "@miqro/core";
 import { cwd } from "node:process";
 
@@ -391,7 +391,7 @@ export async function importMiddlewareConfigModule(inFile: string, options: Impo
   const isCJS = extname(inFile) === ".cjs";
   const mod = isCJS ? (await importJSXFile(inFile, options, logger)).default.default : (await importJSXFile(inFile, options, logger)).default;
 
-  const module = parser.parse(mod, MiddlewareConfigSchema, basename(inFile));
+  const module = parser.parse(mod, MiddlewareConfigSchema, basename(inFile)) as MiddlewareConfig;
   if (module !== undefined) {
     return module;
   } else {
@@ -403,7 +403,7 @@ export async function importErrorConfigModule(inFile: string, options: ImportJSX
   const isCJS = extname(inFile) === ".cjs";
   const mod = isCJS ? (await importJSXFile(inFile, options, logger)).default.default : (await importJSXFile(inFile, options, logger)).default;
 
-  const module = parser.parse(mod, ErrorConfigSchema, basename(inFile));
+  const module = parser.parse(mod, ErrorConfigSchema, basename(inFile)) as ErrorConfig;
   if (module !== undefined) {
     return module;
   } else {

package/src/inflate/setup-http.ts

@@ -1,4 +1,4 @@
-import { Router, newURL, Response, Request, RouterHandlerOptions, Logger, APIRoute, normalizePath, HandlerWithOptions, Handler } from "@miqro/core";
+import { Router, newURL, Response, Request, RouterHandlerOptions, Logger, APIRoute, normalizePath } from "@miqro/core";
 import { existsSync, mkdir, readFile, readFileSync, readdirSync, statSync } from "node:fs";
 import { dirname, join, relative, resolve as pathResolve } from "node:path";
 
@@ -15,7 +15,7 @@ import { setupAUTH } from "./setup-auth.js";
 import { getRoutes } from "../services/utils/get-route.js";
 import { describeFilePath, mkdirASync, writeFileASync } from "../common/fs.js";
 import { inflateMD2HTML } from "./md.js";
-import { MiddlewareConfig, ServerInterface, ServerRequest } from "../types.js";
+import { MiddlewareConfig, ServerInterface, ServerRequest, ServerResponse } from "../types.js";
 import { setupMiddleware } from "./setup-middleware.js";
 import { setupError } from "./setup-error.js";
 
@@ -319,7 +319,7 @@ async function createRouterFromDirectory(importOptions: ImportJSXFileOptions, in
                   }
 
                   // router.use(assertGlobalTampered);
-                  router.use(async function (req: Request, res: Response) {
+                  router.use(async function (req: ServerRequest, res: ServerResponse) {
 
                     const JSON = await getJSON(req, res, newURL(req.path), module.apiOptions?.basePath, module.default);
 
@@ -393,7 +393,7 @@ async function createRouterFromDirectory(importOptions: ImportJSXFileOptions, in
                   }
 
                   // router.use(assertGlobalTampered);
-                  router.use(async function (req: Request, res: Response) {
+                  router.use(async function (req: ServerRequest, res: ServerResponse) {
                     const toRender = typeof module.default === "function" ? module.default(req, res) : module.default;
                     const HTML = await getHTML(hotreload, req, res, newURL(req.path), module.apiOptions?.basePath, await toRender);
 

package/src/services/editor.tsx

@@ -89,7 +89,7 @@ function getHandlerOptions(router: APIRoute): RouterHandlerOptions {
   };
 }
 
-function getHandler(/*auth: Handler, */router: APIRoute): HandlerWithOptions {
+function getHandler(/*auth: Handler, */router: APIRoute<any, any, any>): HandlerWithOptions<any, any, any> {
   /*const ret = new Router();
   ret.use(auth);
   ret.use(router.handler, undefined, undefined, getHandlerOptions(router));

package/src/types.ts

@@ -1,16 +1,8 @@
 import { Database } from "@miqro/query";
-import { WebSocketServerOptions, SessionHandlerOptions, Logger, WebSocketServer, ReadBuffer, URLEncodedParser, JSONParser, TextParser, CORS, SessionHandler, RouteOptions, Handler, Request, Response, LogLevel, LoggerTransportWriteArgs, CORSOptions, HandlerWithOptions, ErrorHandler } from "@miqro/core";
+import { WebSocketServerOptions, SessionHandlerOptions, Logger, WebSocketServer, ReadBuffer, URLEncodedParser, JSONParser, TextParser, CORS, SessionHandler, RouteOptions, Handler, Request, Response, LogLevel, LoggerTransportWriteArgs, CORSOptions, HandlerWithOptions, ErrorHandler, SchemaProperties, APIRoute as BaseAPIRoute, TypedRequest, defineRoute as baseDefineRoute } from "@miqro/core";
 import { request } from "@miqro/request";
 import { Parser, ParserInterface } from "@miqro/parser";
 import { RuntimeHTMLElement, Runtime, RuntimeContainer, RuntimeURL, RuntimeOptions, RuntimeShadowRootInit } from "@miqro/jsx";
-import {
-  RuntimeElementDefinitionOptions,
-  Component,
-  createElement,
-  Fragment,
-  enableDebugLog
-} from "@miqro/jsx";
-import * as jsxLib from "@miqro/jsx";
 import { EncryptOptions, JWTDecryptOptions, JWTDecryptResult, JWTPayload, JWTVerifyOptions, JWTVerifyResult, ProtectedHeaderParameters, SignOptions } from "jose";
 import { KeyObject } from "node:crypto";
 
@@ -33,36 +25,20 @@ export interface JWTSignOptions {
   options?: SignOptions;
 }
 
-/*declare global {
-  // jsx only for the default value of tsconfig.json
-  //var React: {};
-  var JSX: {
-    createElement: typeof createElement;
-    Fragment: typeof Fragment;
-    enableDebugLog: typeof enableDebugLog;
-  }
+export type APIRoute<
+  TBody extends SchemaProperties | string | boolean | undefined = undefined,
+  TParams extends SchemaProperties | string | boolean | undefined = undefined,
+  TQuery extends SchemaProperties | string | boolean | undefined = undefined>
+  = BaseAPIRoute<ServerRequest, TBody, TParams, TQuery>;
+
+export function defineRoute<
+  const TBody extends SchemaProperties | string | boolean | undefined = undefined,
+  const TParams extends SchemaProperties | string | boolean | undefined = undefined,
+  const TQuery extends SchemaProperties | string | boolean | undefined = undefined
+>(route: APIRoute<TBody, TParams, TQuery>) {
+  return baseDefineRoute<ServerRequest, TBody, TParams, TQuery>(route) as APIRoute;
 }
 
-declare global {
-  // only available browser side
-  var jsx: {
-    define: (tagName: string, component: Component, options?: RuntimeElementDefinitionOptions) => void;
-    useRuntime: typeof jsxLib.useRuntime;
-    usePathname: typeof jsxLib.usePathname;
-    Link: typeof jsxLib.Link;
-    Router: typeof jsxLib.Router;
-    createContext: typeof jsxLib.createContext;
-    useContext: typeof jsxLib.useContext;
-    useState: typeof jsxLib.useState;
-    useEffect: typeof jsxLib.useEffect;
-    useQuery: typeof jsxLib.useQuery;
-    useRef: typeof jsxLib.useRef;
-    useElement: typeof jsxLib.useElement;
-    useRefresh: typeof jsxLib.useRefresh;
-  }
-}*/
-
-export { APIRoute } from "@miqro/core";
 export { Migration } from "@miqro/query";
 
 export interface JWTInterface {
@@ -129,7 +105,7 @@ export interface ServerGlobal {
   newParser(): Parser;
   newClusterCache: (name: string, logger?: Logger) => CacheInterface;
   newLocalCache: (name: string, logger?: Logger) => CacheInterface;
-  
+
   getWorkerCount: () => number;
   getWorkerNumber: () => number;
   isPrimaryWorker: () => boolean;
@@ -199,7 +175,7 @@ export interface ServerInterface extends ServerGlobal {
 }
 
 export interface ServerRequest extends Request {
-  server?: ServerInterface;
+  server: ServerInterface;
 }
 
 export interface ServerResponse extends Response {
@@ -297,11 +273,15 @@ export interface DBConfig {
   name: string;
 }
 
-export interface APIOptions extends Partial<RouteOptions> {
+export interface APIOptions<
+  TBody extends SchemaProperties | string | boolean | undefined = SchemaProperties | string | boolean | undefined,
+  TParams extends SchemaProperties | string | boolean | undefined = SchemaProperties | string | boolean | undefined,
+  TQuery extends SchemaProperties | string | boolean | undefined = SchemaProperties | string | boolean | undefined
+> extends Partial<RouteOptions<TBody, TParams, TQuery>> {
   basePath?: string;
   path?: string | string[];
   method?: string | string[];
   parser?: ParserInterface;
   middleware?: Handler | Handler[];
   session?: SessionHandlerOptions | Handler;
-}
+}