@reckona/mreact-router 0.0.206 → 0.0.207

package/dist/native-escape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"native-escape.d.ts","sourceRoot":"","sources":["../src/native-escape.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,EAAE,CAKpE"}
+{"version":3,"file":"native-escape.d.ts","sourceRoot":"","sources":["../src/native-escape.ts"],"names":[],"mappings":"AAUA;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,EAAE,CAKpE"}

package/dist/native-escape.js

@@ -1,6 +1,5 @@
 import { createRequire } from "node:module";
 import { nativeModulePackageCandidates } from "./native-route-matcher.js";
-import { escapeHtmlAttribute as escapeHtml } from "@reckona/mreact-shared/html-escape";
 let nativeModule;
 let nativeRequire;
 /**
@@ -11,6 +10,20 @@ export function escapeHtmlBatch(values) {
     const native = loadNativeEscapeModule();
     return native?.escapeHtmlBatch?.(strings) ?? strings.map(escapeHtml);
 }
+function escapeHtml(value) {
+    return value.replace(/[&<>"]/g, (character) => {
+        switch (character) {
+            case "&":
+                return "&amp;";
+            case "<":
+                return "&lt;";
+            case ">":
+                return "&gt;";
+            default:
+                return "&quot;";
+        }
+    });
+}
 function loadNativeEscapeModule() {
     if (nativeModule === undefined) {
         const require = nativePackageRequire();

package/dist/native-escape.js.map

@@ -1 +1 @@
-{"version":3,"file":"native-escape.js","sourceRoot":"","sources":["../src/native-escape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAE,mBAAmB,IAAI,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAMvF,IAAI,YAAoD,CAAC;AACzD,IAAI,aAAmE,CAAC;AAExE;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,MAA0B;IACxD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,sBAAsB,EAAE,CAAC;IAExC,OAAO,MAAM,EAAE,eAAe,EAAE,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,sBAAsB;IAC7B,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;QAEvC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,YAAY,GAAG,KAAK,CAAC;YACrB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,6BAA6B,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtF,IAAI,CAAC;gBACH,YAAY,GAAG,OAAO,CAAC,SAAS,CAAuB,CAAC;gBACxD,MAAM;YACR,CAAC;YAAC,MAAM,CAAC;gBACP,yEAAyE;YAC3E,CAAC;QACH,CAAC;QACD,YAAY,KAAK,KAAK,CAAC;IACzB,CAAC;IAED,OAAO,YAAY,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;AAC3D,CAAC;AAED,SAAS,oBAAoB;IAC3B,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,aAAa;gBACX,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3F,CAAC;QAAC,MAAM,CAAC;YACP,aAAa,GAAG,KAAK,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC;AAC7D,CAAC","sourcesContent":["import { createRequire } from \"node:module\";\nimport { nativeModulePackageCandidates } from \"./native-route-matcher.js\";\nimport { escapeHtmlAttribute as escapeHtml } from \"@reckona/mreact-shared/html-escape\";\n\ninterface NativeEscapeModule {\n  escapeHtmlBatch?: (values: string[]) => string[];\n}\n\nlet nativeModule: NativeEscapeModule | false | undefined;\nlet nativeRequire: ReturnType<typeof createRequire> | false | undefined;\n\n/**\n * Escapes a batch of values as HTML text using the native helper when available.\n */\nexport function escapeHtmlBatch(values: readonly unknown[]): string[] {\n  const strings = values.map((value) => String(value ?? \"\"));\n  const native = loadNativeEscapeModule();\n\n  return native?.escapeHtmlBatch?.(strings) ?? strings.map(escapeHtml);\n}\n\nfunction loadNativeEscapeModule(): NativeEscapeModule | undefined {\n  if (nativeModule === undefined) {\n    const require = nativePackageRequire();\n\n    if (require === undefined) {\n      nativeModule = false;\n      return undefined;\n    }\n\n    for (const candidate of nativeModulePackageCandidates(process.platform, process.arch)) {\n      try {\n        nativeModule = require(candidate) as NativeEscapeModule;\n        break;\n      } catch {\n        // Native package is optional. JS escaping remains the portable fallback.\n      }\n    }\n    nativeModule ??= false;\n  }\n\n  return nativeModule === false ? undefined : nativeModule;\n}\n\nfunction nativePackageRequire(): ReturnType<typeof createRequire> | undefined {\n  if (nativeRequire === undefined) {\n    try {\n      nativeRequire =\n        new URL(import.meta.url).protocol === \"file:\" ? createRequire(import.meta.url) : false;\n    } catch {\n      nativeRequire = false;\n    }\n  }\n\n  return nativeRequire === false ? undefined : nativeRequire;\n}\n"]}
+{"version":3,"file":"native-escape.js","sourceRoot":"","sources":["../src/native-escape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAM1E,IAAI,YAAoD,CAAC;AACzD,IAAI,aAAmE,CAAC;AAExE;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,MAA0B;IACxD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,sBAAsB,EAAE,CAAC;IAExC,OAAO,MAAM,EAAE,eAAe,EAAE,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;QAC5C,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,GAAG;gBACN,OAAO,OAAO,CAAC;YACjB,KAAK,GAAG;gBACN,OAAO,MAAM,CAAC;YAChB,KAAK,GAAG;gBACN,OAAO,MAAM,CAAC;YAChB;gBACE,OAAO,QAAQ,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB;IAC7B,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;QAEvC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,YAAY,GAAG,KAAK,CAAC;YACrB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,6BAA6B,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtF,IAAI,CAAC;gBACH,YAAY,GAAG,OAAO,CAAC,SAAS,CAAuB,CAAC;gBACxD,MAAM;YACR,CAAC;YAAC,MAAM,CAAC;gBACP,yEAAyE;YAC3E,CAAC;QACH,CAAC;QACD,YAAY,KAAK,KAAK,CAAC;IACzB,CAAC;IAED,OAAO,YAAY,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;AAC3D,CAAC;AAED,SAAS,oBAAoB;IAC3B,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,aAAa;gBACX,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3F,CAAC;QAAC,MAAM,CAAC;YACP,aAAa,GAAG,KAAK,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC;AAC7D,CAAC","sourcesContent":["import { createRequire } from \"node:module\";\nimport { nativeModulePackageCandidates } from \"./native-route-matcher.js\";\n\ninterface NativeEscapeModule {\n  escapeHtmlBatch?: (values: string[]) => string[];\n}\n\nlet nativeModule: NativeEscapeModule | false | undefined;\nlet nativeRequire: ReturnType<typeof createRequire> | false | undefined;\n\n/**\n * Escapes a batch of values as HTML text using the native helper when available.\n */\nexport function escapeHtmlBatch(values: readonly unknown[]): string[] {\n  const strings = values.map((value) => String(value ?? \"\"));\n  const native = loadNativeEscapeModule();\n\n  return native?.escapeHtmlBatch?.(strings) ?? strings.map(escapeHtml);\n}\n\nfunction escapeHtml(value: string): string {\n  return value.replace(/[&<>\"]/g, (character) => {\n    switch (character) {\n      case \"&\":\n        return \"&amp;\";\n      case \"<\":\n        return \"&lt;\";\n      case \">\":\n        return \"&gt;\";\n      default:\n        return \"&quot;\";\n    }\n  });\n}\n\nfunction loadNativeEscapeModule(): NativeEscapeModule | undefined {\n  if (nativeModule === undefined) {\n    const require = nativePackageRequire();\n\n    if (require === undefined) {\n      nativeModule = false;\n      return undefined;\n    }\n\n    for (const candidate of nativeModulePackageCandidates(process.platform, process.arch)) {\n      try {\n        nativeModule = require(candidate) as NativeEscapeModule;\n        break;\n      } catch {\n        // Native package is optional. JS escaping remains the portable fallback.\n      }\n    }\n    nativeModule ??= false;\n  }\n\n  return nativeModule === false ? undefined : nativeModule;\n}\n\nfunction nativePackageRequire(): ReturnType<typeof createRequire> | undefined {\n  if (nativeRequire === undefined) {\n    try {\n      nativeRequire =\n        new URL(import.meta.url).protocol === \"file:\" ? createRequire(import.meta.url) : false;\n    } catch {\n      nativeRequire = false;\n    }\n  }\n\n  return nativeRequire === false ? undefined : nativeRequire;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-router",
-  "version": "0.0.206",
+  "version": "0.0.207",
   "description": "File-system app router, SSR, actions, and deployment adapters for mreact.",
   "keywords": [
     "jsx",
@@ -111,20 +111,20 @@
   "dependencies": {
     "@typescript/typescript6": "^6.0.2",
     "esbuild": ">=0.28.1 <0.29",
-    "@reckona/mreact": "0.0.206",
-    "@reckona/mreact-compat": "0.0.206",
-    "@reckona/mreact-compiler": "0.0.206",
-    "@reckona/mreact-query": "0.0.206",
-    "@reckona/mreact-reactive-core": "0.0.206",
-    "@reckona/mreact-devtools": "0.0.206",
-    "@reckona/mreact-reactive-dom": "0.0.206",
-    "@reckona/mreact-shared": "0.0.206",
-    "@reckona/mreact-server": "0.0.206"
+    "@reckona/mreact": "0.0.207",
+    "@reckona/mreact-compat": "0.0.207",
+    "@reckona/mreact-compiler": "0.0.207",
+    "@reckona/mreact-devtools": "0.0.207",
+    "@reckona/mreact-query": "0.0.207",
+    "@reckona/mreact-reactive-core": "0.0.207",
+    "@reckona/mreact-server": "0.0.207",
+    "@reckona/mreact-reactive-dom": "0.0.207",
+    "@reckona/mreact-shared": "0.0.207"
   },
   "peerDependencies": {
     "vite": ">=8.1.4 <9"
   },
   "optionalDependencies": {
-    "@reckona/mreact-router-native": "0.0.206"
+    "@reckona/mreact-router-native": "0.0.207"
   }
 }

package/src/client.ts

@@ -3373,6 +3373,7 @@ function __mreactResolveRouteNode(value) {
     : `function __mreactSyncDomRefBindings() {}
 `;
   const boundaryOnlyHydrationBlock = routeRequiresFullHydration
+    || clientReferenceManifest.length === 0
     ? ""
     : `${routeCellHydrationIndent}if (!__mreactHasNonSerializableClientBoundaries(__mreactMarker) && __mreactHydrateClientBoundaries(document, __mreactClientReferences, __mreactClientReferenceComponents)) {
 ${routeCellHydrationIndent}  __mreactMarker.setAttribute(${JSON.stringify(routeHydrationContract.hydratedAttribute)}, "true");
@@ -3426,8 +3427,7 @@ ${restoreRequestUrl ? "  if (__mreactProps.request) __mreactProps.request.url =
   }
 ${routeCellHydrationStart}${routeCleanupHydrationStart}${boundaryOnlyHydrationBlock}${routeComponentGuard}${routeCellHydrationIndent}const __mreactNode = ${routeHydrationNodeExpression};
 ${routeCellHydrationIndent}__mreactResumeRoute(__mreactMarker, __mreactNode);
-${routeCellHydrationIndent}__mreactHydrateClientBoundaries(document, __mreactClientReferences, __mreactClientReferenceComponents);
-${routeCellHydrationIndent}__mreactMarker.setAttribute(__mreactRouteHydratedAttribute, "true");
+${clientReferenceManifest.length === 0 ? "" : `${routeCellHydrationIndent}__mreactHydrateClientBoundaries(document, __mreactClientReferences, __mreactClientReferenceComponents);\n`}${routeCellHydrationIndent}__mreactMarker.setAttribute(__mreactRouteHydratedAttribute, "true");
 ${routeCellHydrationIndent}__mreactMarkRouteHydrated();
 ${routeCellHydrationEnd}}
 ${routeCellDropFunction}
@@ -4893,9 +4893,7 @@ function __mreactHydrateClientBoundaries(marker, references, components) {
     }
 
     const propsElement = __mreactClientBoundaryPropsElement(placeholder, name);
-    const props = propsElement?.textContent === undefined || propsElement.textContent === ""
-      ? {}
-      : JSON.parse(propsElement.textContent);
+    let props = propsElement?.textContent ? JSON.parse(propsElement.textContent) : {};
     const fallbackChildren = __mreactClientBoundaryFallbackChildren(placeholder, propsElement);
 
     if (fallbackChildren !== undefined) {
@@ -4920,9 +4918,8 @@ function __mreactHydrateClientBoundaries(marker, references, components) {
       continue;
     }
 
-    const node = component(props);
-
-    placeholder.replaceWith(node);
+    props = component(props);
+    placeholder.replaceWith(...(props == null || typeof props === "boolean" ? [] : [props]));
     propsElement?.remove();
     hydrated = true;
   }

package/src/native-escape.ts

@@ -1,6 +1,5 @@
 import { createRequire } from "node:module";
 import { nativeModulePackageCandidates } from "./native-route-matcher.js";
-import { escapeHtmlAttribute as escapeHtml } from "@reckona/mreact-shared/html-escape";
 
 interface NativeEscapeModule {
   escapeHtmlBatch?: (values: string[]) => string[];
@@ -19,6 +18,21 @@ export function escapeHtmlBatch(values: readonly unknown[]): string[] {
   return native?.escapeHtmlBatch?.(strings) ?? strings.map(escapeHtml);
 }
 
+function escapeHtml(value: string): string {
+  return value.replace(/[&<>"]/g, (character) => {
+    switch (character) {
+      case "&":
+        return "&amp;";
+      case "<":
+        return "&lt;";
+      case ">":
+        return "&gt;";
+      default:
+        return "&quot;";
+    }
+  });
+}
+
 function loadNativeEscapeModule(): NativeEscapeModule | undefined {
   if (nativeModule === undefined) {
     const require = nativePackageRequire();