@bagelink/blox 1.15.553 → 1.15.554

package/dist/ssg/createSSREntry.d.ts

@@ -57,8 +57,17 @@ export interface BloxSSREntry {
 }
 interface PublishedPage {
     slug?: string;
+    data_bindings?: Record<string, {
+        adapter?: string;
+        collection?: string;
+        bind_by?: string;
+    }>;
 }
 export declare function matchPublishedPage(pages: PublishedPage[], slug: string, allowTemplates?: boolean): PublishedPage | null;
+export declare function resolvePublishedPage(pages: PublishedPage[], slug: string, locale: string, resolver?: CreateBloxSSREntryOptions['collectionResolver']): Promise<{
+    page: PublishedPage;
+    contexts: Record<string, Record<string, unknown> | null>;
+} | null>;
 /**
  * Factory that produces the `{ render }` export for `main.server.ts`.
  *

package/dist/ssg/createSSREntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSSREntry.d.ts","sourceRoot":"","sources":["../../src/ssg/createSSREntry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,KAAK,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAO9D,OAAO,EAAuC,KAAK,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAInF,MAAM,WAAW,yBAAyB;IACzC,oCAAoC;IACpC,aAAa,EAAE,SAAS,CAAA;IACxB;;;;OAIG;IACH,YAAY,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,QAAQ,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9D;;;OAGG;IACH,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IACpD,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAA;IACnB,kCAAkC;IAClC,KAAK,EAAE,MAAM,CAAA;IACb,oGAAoG;IACpG,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,2EAA2E;IAC3E,YAAY,CAAC,EAAE,uBAAuB,CAAA;IACtC;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,8EAA8E;IAC9E,kBAAkB,CAAC,EAAE,CACpB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB,KACrB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5C,oCAAoC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2CAA2C;IAC3C,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC3B;;;OAGG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,EAAE,MAAM,GAAG,CAAC,OAAO,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAA;IAC5E;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAC5C,kDAAkD;IAClD,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAA;CAC1B;AAED,MAAM,WAAW,YAAY;IAC5B,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,YAAY,CAAC,CAAA;IAClE,0EAA0E;IAC1E,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CACnD;AAED,UAAU,aAAa;IACtB,IAAI,CAAC,EAAE,MAAM,CAAA;CACb;AAED,wBAAgB,kBAAkB,CACjC,KAAK,EAAE,aAAa,EAAE,EACtB,IAAI,EAAE,MAAM,EACZ,cAAc,UAAQ,GACpB,aAAa,GAAG,IAAI,CAUtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,YAAY,CA0NnF"}
+{"version":3,"file":"createSSREntry.d.ts","sourceRoot":"","sources":["../../src/ssg/createSSREntry.ts"],"names":[],"mappings":"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"}

package/dist/ssg/index.cjs

@@ -138,6 +138,38 @@ function matchPublishedPage(pages, slug, allowTemplates = false) {
   }
   return null;
 }
+function templateParams(template, slug) {
+  const names = [];
+  const pattern = template.replace(/:([a-z_]+)/g, (_match, name) => {
+    names.push(name);
+    return "([^/]+)";
+  });
+  const match = slug.match(new RegExp(`^${pattern}$`));
+  if (!match) return null;
+  return Object.fromEntries(names.map((name, index) => [name, match[index + 1]]));
+}
+async function resolvePublishedPage(pages, slug, locale, resolver) {
+  var _a;
+  const page = matchPublishedPage(pages, slug, true);
+  if (!page) return null;
+  const params = ((_a = page.slug) == null ? void 0 : _a.includes(":")) ? templateParams(page.slug, slug) : {};
+  const contexts = {};
+  if (params && resolver) {
+    for (const [name, binding] of Object.entries(page.data_bindings ?? {})) {
+      if (binding.adapter !== "datastore" || !binding.collection || !binding.bind_by) continue;
+      const value = params[binding.bind_by];
+      if (!value) continue;
+      const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+      const items = await resolver(binding.collection, {
+        locale,
+        q: `${binding.bind_by} eq "${escaped}"`,
+        limit: 1
+      });
+      contexts[name] = items[0] ?? null;
+    }
+  }
+  return { page, contexts };
+}
 function createBloxSSREntry(options) {
   var _a;
   const {
@@ -199,12 +231,13 @@ function createBloxSSREntry(options) {
         publishedBundleCache.set(cacheKey, pending);
       }
       const bundle = await pending;
-      const page = matchPublishedPage(
+      const resolved = await resolvePublishedPage(
         bundle.pages,
         slug,
-        options.resolvePublishedPaths
+        pageLocale,
+        options.resolvePublishedPaths ? options.collectionResolver : void 0
       );
-      return page ? { page, contexts: {}, warnings: [] } : null;
+      return resolved ? { ...resolved, warnings: [] } : null;
     }
     const url = `${apiBase}/blox/websites/${websiteId}/resolve-path?path=${encodeURIComponent(slug)}&locale=${pageLocale}`;
     return llmArtifacts.bloxBuildJson(url, {}, options.buildRequest);

package/dist/ssg/index.mjs

@@ -116,6 +116,38 @@ function matchPublishedPage(pages, slug, allowTemplates = false) {
   }
   return null;
 }
+function templateParams(template, slug) {
+  const names = [];
+  const pattern = template.replace(/:([a-z_]+)/g, (_match, name) => {
+    names.push(name);
+    return "([^/]+)";
+  });
+  const match = slug.match(new RegExp(`^${pattern}$`));
+  if (!match) return null;
+  return Object.fromEntries(names.map((name, index) => [name, match[index + 1]]));
+}
+async function resolvePublishedPage(pages, slug, locale, resolver) {
+  var _a;
+  const page = matchPublishedPage(pages, slug, true);
+  if (!page) return null;
+  const params = ((_a = page.slug) == null ? void 0 : _a.includes(":")) ? templateParams(page.slug, slug) : {};
+  const contexts = {};
+  if (params && resolver) {
+    for (const [name, binding] of Object.entries(page.data_bindings ?? {})) {
+      if (binding.adapter !== "datastore" || !binding.collection || !binding.bind_by) continue;
+      const value = params[binding.bind_by];
+      if (!value) continue;
+      const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+      const items = await resolver(binding.collection, {
+        locale,
+        q: `${binding.bind_by} eq "${escaped}"`,
+        limit: 1
+      });
+      contexts[name] = items[0] ?? null;
+    }
+  }
+  return { page, contexts };
+}
 function createBloxSSREntry(options) {
   var _a;
   const {
@@ -177,12 +209,13 @@ function createBloxSSREntry(options) {
         publishedBundleCache.set(cacheKey, pending);
       }
       const bundle = await pending;
-      const page = matchPublishedPage(
+      const resolved = await resolvePublishedPage(
         bundle.pages,
         slug,
-        options.resolvePublishedPaths
+        pageLocale,
+        options.resolvePublishedPaths ? options.collectionResolver : void 0
       );
-      return page ? { page, contexts: {}, warnings: [] } : null;
+      return resolved ? { ...resolved, warnings: [] } : null;
     }
     const url = `${apiBase}/blox/websites/${websiteId}/resolve-path?path=${encodeURIComponent(slug)}&locale=${pageLocale}`;
     return bloxBuildJson(url, {}, options.buildRequest);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/blox",
   "type": "module",
-  "version": "1.15.553",
+  "version": "1.15.554",
   "description": "Blox page builder library for drag-and-drop page building and static data management",
   "author": {
     "name": "Bagel Studio",