@symbo.ls/brender 3.8.2 → 3.8.7

package/dist/cjs/render.js

@@ -49,6 +49,17 @@ var import_prefetch = require("./prefetch.js");
 var import_linkedom = require("linkedom");
 var import_create_instance = __toESM(require("@emotion/css/create-instance"), 1);
 const import_meta = {};
+let _funcqlPlugin = null;
+const getFuncqlPlugin = async () => {
+  if (_funcqlPlugin) return _funcqlPlugin;
+  try {
+    const mod = await import("@domql/funcql");
+    _funcqlPlugin = mod.funcqlPlugin;
+    return _funcqlPlugin;
+  } catch {
+    return null;
+  }
+};
 const ssrResolve = (map, key) => {
   if (!map || !key) return void 0;
   if (map[key] !== void 0) return map[key];
@@ -122,8 +133,17 @@ const safeJsonReplacer = () => {
     return value;
   };
 };
-const _brenderRequire = (0, import_module.createRequire)(import_meta.url);
+let _brenderRequire = null;
+try {
+  if (import_meta.url) {
+    _brenderRequire = (0, import_module.createRequire)(import_meta.url);
+  }
+} catch {
+}
 const detectWorkspace = () => {
+  if (!import_meta.url || !_brenderRequire) {
+    return { isMonorepo: false, monorepoRoot: null, resolvePackage: (pkg) => pkg };
+  }
   const brenderDir = (0, import_fs.realpathSync)(new URL(".", import_meta.url).pathname);
   const monorepoRoot = (0, import_path.resolve)(brenderDir, "../..");
   const isMonorepo = (0, import_fs.existsSync)((0, import_path.resolve)(monorepoRoot, "packages", "smbls", "src", "createDomql.js"));
@@ -220,6 +240,15 @@ let _cachedCreateDomql = null;
 const bundleCreateDomql = async () => {
   if (_cachedCreateDomql) return _cachedCreateDomql;
   const ws = detectWorkspace();
+  if (!_brenderRequire) {
+    try {
+      const mod2 = await import("./dist/createDomql.bundled.mjs");
+      _cachedCreateDomql = mod2;
+      return mod2;
+    } catch (err) {
+      throw new Error(`brender: pre-bundled createDomql not available in bundled runtime: ${err.message}`);
+    }
+  }
   let entry;
   if (ws.isMonorepo) {
     entry = (0, import_path.resolve)(ws.monorepoRoot, "packages", "smbls", "src", "createDomql.js");
@@ -381,6 +410,14 @@ const bundleCreateDomql = async () => {
         );
         return { contents, loader: "js" };
       });
+      build.onLoad({ filter: /fetch\/adapters\/supabase\.js$/ }, () => {
+        return {
+          contents: `export const setup = async () => null;
+export const supabaseAdapter = () => ({name:'supabase'});
+`,
+          loader: "js"
+        };
+      });
       build.onLoad({ filter: /.*/, namespace: "brender-stub" }, () => {
         return { contents: "export const SyncComponent = {}; export const Inspect = {}; export const Notifications = {}; export default {}", loader: "js" };
       });
@@ -455,9 +492,13 @@ const bundleCreateDomql = async () => {
     ]
   });
   const mod = await import(`file://${outFile}`);
-  try {
-    (0, import_fs.unlinkSync)(outFile);
-  } catch {
+  if (!process.env.BRENDER_DEBUG) {
+    try {
+      (0, import_fs.unlinkSync)(outFile);
+    } catch {
+    }
+  } else {
+    console.log("[brender] Bundle saved:", outFile);
   }
   _cachedCreateDomql = mod;
   return mod;
@@ -525,6 +566,22 @@ const UIKIT_STUBS = {
   },
   Text: { tag: "span" }
 };
+const buildPathRegistry = (element, path = "") => {
+  if (!element || !element.__ref) return {};
+  const registry = {};
+  const brKey = element.__ref.__brKey;
+  if (brKey) registry[path === "" ? "__root" : path] = brKey;
+  if (element.__ref.__children) {
+    for (const childKey of element.__ref.__children) {
+      const child = element[childKey];
+      if (child && child.__ref) {
+        const childPath = path === "" ? childKey : `${path}.${childKey}`;
+        Object.assign(registry, buildPathRegistry(child, childPath));
+      }
+    }
+  }
+  return registry;
+};
 const render = async (data, options = {}) => {
   const { route = "/", pathname, state: stateOverrides, context: contextOverrides, prefetch = false } = options;
   const locationPath = pathname || route;
@@ -651,12 +708,20 @@ const render = async (data, options = {}) => {
     // Caller overrides
     ...contextOverrides || {}
   };
+  const funcql = await getFuncqlPlugin();
+  if (funcql) {
+    ctx.plugins = ctx.plugins || [];
+    if (!ctx.plugins.some((p) => p.name === "funcql")) {
+      ctx.plugins.push(funcql);
+    }
+  }
   (0, import_keys.resetKeys)();
   const element = await createDomqlElement(app, ctx);
   const flushDelay = prefetch ? 2e3 : 50;
   await new Promise((r) => setTimeout(r, flushDelay));
   (0, import_keys.assignKeys)(body);
   const registry = (0, import_keys.mapKeysToElements)(element);
+  const brRegistry = buildPathRegistry(element);
   const metadata = (0, import_metadata.extractMetadata)(data, route, element, element?.state);
   const emotionCSS = [];
   const emotionInstance = ctx.emotion || element && element.context && element.context.emotion;
@@ -707,7 +772,7 @@ const render = async (data, options = {}) => {
   else delete globalThis.document;
   if (_prevLoc !== void 0) globalThis.location = _prevLoc;
   else delete globalThis.location;
-  return { html, metadata, registry, element, emotionCSS, document, window, ssrTranslations, prefetchedPages };
+  return { html, metadata, registry, brRegistry, element, emotionCSS, document, window, ssrTranslations, prefetchedPages };
 };
 const renderElement = async (elementDef, options = {}) => {
   const { context = {} } = options;
@@ -753,6 +818,11 @@ const generateGlobalCSS = async (ds, config) => {
     const { existsSync: existsSync2, writeFileSync: writeFileSync2, unlinkSync: unlinkSync2 } = await import("fs");
     const { tmpdir: tmpdir2 } = await import("os");
     const { randomBytes: randomBytes2 } = await import("crypto");
+    try {
+      tmpdir2();
+    } catch {
+      return {};
+    }
     const esbuild = await import("esbuild");
     const dsJson = JSON.stringify(ds || {}, safeJsonReplacer());
     const cfgJson = JSON.stringify(config || {}, safeJsonReplacer());
@@ -970,6 +1040,7 @@ const renderRoute = async (data, options = {}) => {
     fontLinks: generateFontLinks(ds),
     metadata: result.metadata || (0, import_metadata.extractMetadata)(data, route),
     brKeyCount: result.registry ? Object.keys(result.registry).length : 0,
+    brRegistry: result.brRegistry || {},
     ssrTranslations: result.ssrTranslations,
     prefetchedState,
     activeLang
@@ -1019,7 +1090,10 @@ const renderPage = async (data, route = "/", options = {}) => {
 `;
         }
       }
-      isrBody = `${translationSeed}<script>window.__BRENDER__ = true<\/script>
+      const brRegistryJson = result.brRegistry && Object.keys(result.brRegistry).length ? JSON.stringify(result.brRegistry) : null;
+      const brRegistryScript = brRegistryJson ? `<script>window.__BR_REGISTRY__=${brRegistryJson}<\/script>
+` : "";
+      isrBody = `${translationSeed}${brRegistryScript}<script>window.__BRENDER__=true<\/script>
 <script type="module" src="${prefix}${isr.clientScript}"><\/script>`;
     } else {
       isrBody = `<script type="module">

package/dist/esm/render.js

@@ -8,6 +8,17 @@ import { resetKeys, assignKeys, mapKeysToElements } from "./keys.js";
 import { extractMetadata, generateHeadHtml } from "./metadata.js";
 import { hydrate } from "./hydrate.js";
 import { prefetchPageData, injectPrefetchedState, fetchSSRTranslations } from "./prefetch.js";
+let _funcqlPlugin = null;
+const getFuncqlPlugin = async () => {
+  if (_funcqlPlugin) return _funcqlPlugin;
+  try {
+    const mod = await import("@domql/funcql");
+    _funcqlPlugin = mod.funcqlPlugin;
+    return _funcqlPlugin;
+  } catch {
+    return null;
+  }
+};
 import { parseHTML } from "linkedom";
 import createEmotionInstance from "@emotion/css/create-instance";
 const ssrResolve = (map, key) => {
@@ -83,8 +94,17 @@ const safeJsonReplacer = () => {
     return value;
   };
 };
-const _brenderRequire = createRequire(import.meta.url);
+let _brenderRequire = null;
+try {
+  if (import.meta.url) {
+    _brenderRequire = createRequire(import.meta.url);
+  }
+} catch {
+}
 const detectWorkspace = () => {
+  if (!import.meta.url || !_brenderRequire) {
+    return { isMonorepo: false, monorepoRoot: null, resolvePackage: (pkg) => pkg };
+  }
   const brenderDir = realpathSync(new URL(".", import.meta.url).pathname);
   const monorepoRoot = resolve(brenderDir, "../..");
   const isMonorepo = existsSync(resolve(monorepoRoot, "packages", "smbls", "src", "createDomql.js"));
@@ -181,6 +201,15 @@ let _cachedCreateDomql = null;
 const bundleCreateDomql = async () => {
   if (_cachedCreateDomql) return _cachedCreateDomql;
   const ws = detectWorkspace();
+  if (!_brenderRequire) {
+    try {
+      const mod2 = await import("./dist/createDomql.bundled.mjs");
+      _cachedCreateDomql = mod2;
+      return mod2;
+    } catch (err) {
+      throw new Error(`brender: pre-bundled createDomql not available in bundled runtime: ${err.message}`);
+    }
+  }
   let entry;
   if (ws.isMonorepo) {
     entry = resolve(ws.monorepoRoot, "packages", "smbls", "src", "createDomql.js");
@@ -342,6 +371,14 @@ const bundleCreateDomql = async () => {
         );
         return { contents, loader: "js" };
       });
+      build.onLoad({ filter: /fetch\/adapters\/supabase\.js$/ }, () => {
+        return {
+          contents: `export const setup = async () => null;
+export const supabaseAdapter = () => ({name:'supabase'});
+`,
+          loader: "js"
+        };
+      });
       build.onLoad({ filter: /.*/, namespace: "brender-stub" }, () => {
         return { contents: "export const SyncComponent = {}; export const Inspect = {}; export const Notifications = {}; export default {}", loader: "js" };
       });
@@ -416,9 +453,13 @@ const bundleCreateDomql = async () => {
     ]
   });
   const mod = await import(`file://${outFile}`);
-  try {
-    unlinkSync(outFile);
-  } catch {
+  if (!process.env.BRENDER_DEBUG) {
+    try {
+      unlinkSync(outFile);
+    } catch {
+    }
+  } else {
+    console.log("[brender] Bundle saved:", outFile);
   }
   _cachedCreateDomql = mod;
   return mod;
@@ -486,6 +527,22 @@ const UIKIT_STUBS = {
   },
   Text: { tag: "span" }
 };
+const buildPathRegistry = (element, path = "") => {
+  if (!element || !element.__ref) return {};
+  const registry = {};
+  const brKey = element.__ref.__brKey;
+  if (brKey) registry[path === "" ? "__root" : path] = brKey;
+  if (element.__ref.__children) {
+    for (const childKey of element.__ref.__children) {
+      const child = element[childKey];
+      if (child && child.__ref) {
+        const childPath = path === "" ? childKey : `${path}.${childKey}`;
+        Object.assign(registry, buildPathRegistry(child, childPath));
+      }
+    }
+  }
+  return registry;
+};
 const render = async (data, options = {}) => {
   const { route = "/", pathname, state: stateOverrides, context: contextOverrides, prefetch = false } = options;
   const locationPath = pathname || route;
@@ -612,12 +669,20 @@ const render = async (data, options = {}) => {
     // Caller overrides
     ...contextOverrides || {}
   };
+  const funcql = await getFuncqlPlugin();
+  if (funcql) {
+    ctx.plugins = ctx.plugins || [];
+    if (!ctx.plugins.some((p) => p.name === "funcql")) {
+      ctx.plugins.push(funcql);
+    }
+  }
   resetKeys();
   const element = await createDomqlElement(app, ctx);
   const flushDelay = prefetch ? 2e3 : 50;
   await new Promise((r) => setTimeout(r, flushDelay));
   assignKeys(body);
   const registry = mapKeysToElements(element);
+  const brRegistry = buildPathRegistry(element);
   const metadata = extractMetadata(data, route, element, element?.state);
   const emotionCSS = [];
   const emotionInstance = ctx.emotion || element && element.context && element.context.emotion;
@@ -668,7 +733,7 @@ const render = async (data, options = {}) => {
   else delete globalThis.document;
   if (_prevLoc !== void 0) globalThis.location = _prevLoc;
   else delete globalThis.location;
-  return { html, metadata, registry, element, emotionCSS, document, window, ssrTranslations, prefetchedPages };
+  return { html, metadata, registry, brRegistry, element, emotionCSS, document, window, ssrTranslations, prefetchedPages };
 };
 const renderElement = async (elementDef, options = {}) => {
   const { context = {} } = options;
@@ -714,6 +779,11 @@ const generateGlobalCSS = async (ds, config) => {
     const { existsSync: existsSync2, writeFileSync: writeFileSync2, unlinkSync: unlinkSync2 } = await import("fs");
     const { tmpdir: tmpdir2 } = await import("os");
     const { randomBytes: randomBytes2 } = await import("crypto");
+    try {
+      tmpdir2();
+    } catch {
+      return {};
+    }
     const esbuild = await import("esbuild");
     const dsJson = JSON.stringify(ds || {}, safeJsonReplacer());
     const cfgJson = JSON.stringify(config || {}, safeJsonReplacer());
@@ -931,6 +1001,7 @@ const renderRoute = async (data, options = {}) => {
     fontLinks: generateFontLinks(ds),
     metadata: result.metadata || extractMetadata(data, route),
     brKeyCount: result.registry ? Object.keys(result.registry).length : 0,
+    brRegistry: result.brRegistry || {},
     ssrTranslations: result.ssrTranslations,
     prefetchedState,
     activeLang
@@ -980,7 +1051,10 @@ const renderPage = async (data, route = "/", options = {}) => {
 `;
         }
       }
-      isrBody = `${translationSeed}<script>window.__BRENDER__ = true<\/script>
+      const brRegistryJson = result.brRegistry && Object.keys(result.brRegistry).length ? JSON.stringify(result.brRegistry) : null;
+      const brRegistryScript = brRegistryJson ? `<script>window.__BR_REGISTRY__=${brRegistryJson}<\/script>
+` : "";
+      isrBody = `${translationSeed}${brRegistryScript}<script>window.__BRENDER__=true<\/script>
 <script type="module" src="${prefix}${isr.clientScript}"><\/script>`;
     } else {
       isrBody = `<script type="module">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/brender",
-  "version": "3.8.2",
+  "version": "3.8.7",
   "license": "CC-BY-NC-4.0",
   "type": "module",
   "module": "./dist/esm/index.js",
@@ -36,7 +36,7 @@
     "dev:rita": "node examples/serve-rita.js"
   },
   "dependencies": {
-    "@symbo.ls/helmet": "^3.8.1",
+    "@symbo.ls/helmet": "^3.8.7",
     "linkedom": "^0.16.8"
   },
   "devDependencies": {

package/render.js

@@ -8,6 +8,20 @@ import { resetKeys, assignKeys, mapKeysToElements } from './keys.js'
 import { extractMetadata, generateHeadHtml } from './metadata.js'
 import { hydrate } from './hydrate.js'
 import { prefetchPageData, injectPrefetchedState, fetchSSRTranslations } from './prefetch.js'
+
+// funcql plugin — enables evaluation of funcql schemas as property values
+// during SSR. Async-imported to avoid polluting non-funcql codepaths.
+let _funcqlPlugin = null
+const getFuncqlPlugin = async () => {
+  if (_funcqlPlugin) return _funcqlPlugin
+  try {
+    const mod = await import('@domql/funcql')
+    _funcqlPlugin = mod.funcqlPlugin
+    return _funcqlPlugin
+  } catch {
+    return null
+  }
+}
 import { parseHTML } from 'linkedom'
 import createEmotionInstance from '@emotion/css/create-instance'
 
@@ -104,9 +118,23 @@ const safeJsonReplacer = () => {
 // ── Workspace detection ──────────────────────────────────────────────────────
 // Detect whether brender is running inside the monorepo or as an installed
 // npm package, and resolve paths accordingly.
-const _brenderRequire = createRequire(import.meta.url)
+// Guard createRequire for bundled environments (e.g. Cloudflare Workers)
+// where import.meta.url may be undefined after bundling.
+let _brenderRequire = null
+try {
+  if (import.meta.url) {
+    _brenderRequire = createRequire(import.meta.url)
+  }
+} catch {
+  // Bundled runtime — filesystem-based resolution not available
+}
 
 const detectWorkspace = () => {
+  // In bundled environments (CF Workers), import.meta.url may be undefined.
+  // Return a minimal workspace config that skips filesystem-based resolution.
+  if (!import.meta.url || !_brenderRequire) {
+    return { isMonorepo: false, monorepoRoot: null, resolvePackage: (pkg) => pkg }
+  }
   const brenderDir = realpathSync(new URL('.', import.meta.url).pathname)
   const monorepoRoot = resolve(brenderDir, '../..')
 
@@ -232,6 +260,18 @@ const bundleCreateDomql = async () => {
 
   const ws = detectWorkspace()
 
+  // In bundled environments (CF Workers), use the pre-bundled createDomql.
+  // Generated by: node scripts/prebundle-createDomql.js (or during npm prepublish)
+  if (!_brenderRequire) {
+    try {
+      const mod = await import('./dist/createDomql.bundled.mjs')
+      _cachedCreateDomql = mod
+      return mod
+    } catch (err) {
+      throw new Error(`brender: pre-bundled createDomql not available in bundled runtime: ${err.message}`)
+    }
+  }
+
   // Resolve entry point
   let entry
   if (ws.isMonorepo) {
@@ -412,6 +452,15 @@ const bundleCreateDomql = async () => {
         )
         return { contents, loader: 'js' }
       })
+      // Stub the Supabase adapter during brender — the prefetch system handles
+      // data fetching separately via its own Supabase client. The DOMQL fetch
+      // plugin's on.create handler shouldn't fire during SSR.
+      build.onLoad({ filter: /fetch\/adapters\/supabase\.js$/ }, () => {
+        return {
+          contents: `export const setup = async () => null;\nexport const supabaseAdapter = () => ({name:'supabase'});\n`,
+          loader: 'js'
+        }
+      })
       // No-op: globals.js keeps window = globalThis
       // We set globalThis.document/location before import to make it SSR-safe
       // Stub loader for brender-stub namespace (used for @symbo.ls/sync etc.)
@@ -470,7 +519,12 @@ const bundleCreateDomql = async () => {
   })
 
   const mod = await import(`file://${outFile}`)
-  try { unlinkSync(outFile) } catch {} // cleanup: ignore if temp file already removed
+  // Keep temp file in debug mode for inspection
+  if (!process.env.BRENDER_DEBUG) {
+    try { unlinkSync(outFile) } catch {}
+  } else {
+    console.log('[brender] Bundle saved:', outFile)
+  }
 
   _cachedCreateDomql = mod
   return mod
@@ -758,6 +812,15 @@ export const render = async (data, options = {}) => {
     ...(contextOverrides || {})
   }
 
+  // Add funcql plugin if available (enables funcql schema evaluation in exec())
+  const funcql = await getFuncqlPlugin()
+  if (funcql) {
+    ctx.plugins = ctx.plugins || []
+    if (!ctx.plugins.some(p => p.name === 'funcql')) {
+      ctx.plugins.push(funcql)
+    }
+  }
+
   resetKeys()
 
   const element = await createDomqlElement(app, ctx)
@@ -937,6 +1000,10 @@ const generateGlobalCSS = async (ds, config) => {
     const { existsSync, writeFileSync, unlinkSync } = await import('fs')
     const { tmpdir } = await import('os')
     const { randomBytes } = await import('crypto')
+
+    // Guard: skip if filesystem APIs aren't available (e.g. CF Workers)
+    try { tmpdir() } catch { return {} }
+
     const esbuild = await import('esbuild')
 
     // Write a temporary script that imports scratch, runs set(), and