@pixldocs/canvas-renderer 0.5.1 → 0.5.3

package/dist/index.js

@@ -6,6 +6,7 @@ import { forwardRef, useRef, useState, useMemo, useEffect, useCallback, useImper
 import { flushSync } from "react-dom";
 import { create } from "zustand";
 import * as fabric from "fabric";
+import { createClient } from "@supabase/supabase-js";
 import { createRoot } from "react-dom/client";
 import { jsPDF, ShadingPattern } from "jspdf";
 import { svg2pdf } from "svg2pdf.js";
@@ -8764,6 +8765,50 @@ function applyThemeToConfig(config, themeOverrides) {
   }
   return cloned;
 }
+const SUPABASE_URL = void 0;
+const SUPABASE_PUBLISHABLE_KEY = void 0;
+createClient(SUPABASE_URL, SUPABASE_PUBLISHABLE_KEY, {
+  auth: {
+    storage: localStorage,
+    persistSession: true,
+    autoRefreshToken: true
+  }
+});
+function repeatablePageToSection(page) {
+  return {
+    id: page.id,
+    label: page.label,
+    description: page.description,
+    // Place pages after sections by default; explicit order preserved.
+    order: typeof page.order === "number" ? page.order + 1e4 : 1e4,
+    fields: page.fields,
+    repeatable: true,
+    minEntries: page.minEntries,
+    maxEntries: page.maxEntries,
+    templateKeyPrefix: page.templateKeyPrefix,
+    children: page.children
+  };
+}
+function getRenderableFormSections(schema) {
+  if (!schema) return [];
+  const base = schema.sections ?? [];
+  const pages = schema.repeatablePages ?? [];
+  if (!pages.length) return base;
+  return [...base, ...pages.map(repeatablePageToSection)];
+}
+function buildRepeatablePagesInputForApply(schema, sectionState) {
+  var _a;
+  if (!((_a = schema == null ? void 0 : schema.repeatablePages) == null ? void 0 : _a.length)) return [];
+  return schema.repeatablePages.map((p) => {
+    const entries = sectionState == null ? void 0 : sectionState[p.id];
+    const minEntries = p.minEntries != null ? Math.max(0, p.minEntries) : 1;
+    let entryCount;
+    if (Array.isArray(entries)) {
+      entryCount = minEntries === 0 ? entries.length : Math.max(1, entries.length);
+    }
+    return { pageId: p.id, templateKeyPrefix: p.templateKeyPrefix, entryCount };
+  });
+}
 function mapFormDefFieldType(t) {
   if (["text", "email", "tel", "textarea", "date", "url", "number", "toggle", "color", "image"].includes(t)) return t;
   if (t === "currency") return "number";
@@ -10312,9 +10357,27 @@ async function fetchDefaultForm(supabaseUrl, anonKey, formSchemaId) {
   const rows = await res.json();
   return rows.length ? rows[0] : null;
 }
-function deriveRepeatablePagesFromTemplate(config, inlineFormSchema) {
+function deriveRepeatablePagesFromTemplate(config, inlineFormSchema, formData) {
   if (!Array.isArray(config == null ? void 0 : config.pages) || config.pages.length === 0) return [];
   const schemaPages = inlineFormSchema == null ? void 0 : inlineFormSchema.repeatablePages;
+  const normalizeTemplateKeyPrefix = (prefix) => {
+    if (!prefix || typeof prefix !== "string") return void 0;
+    return prefix.replace(/^field_/, "");
+  };
+  const inferEntryCount = (prefix, minEntries) => {
+    const normalizedPrefix = normalizeTemplateKeyPrefix(prefix);
+    if (!normalizedPrefix) return minEntries === 0 ? 0 : void 0;
+    let maxIndex = 0;
+    const keyPrefix = `field_${normalizedPrefix}_`;
+    for (const key of Object.keys(formData ?? {})) {
+      if (!key.startsWith(keyPrefix)) continue;
+      const rest = key.slice(keyPrefix.length);
+      const match = /^(\d+)_/.exec(rest);
+      if (match) maxIndex = Math.max(maxIndex, parseInt(match[1], 10));
+    }
+    if (maxIndex > 0) return maxIndex;
+    return minEntries === 0 ? 0 : void 0;
+  };
   const collectIds = (nodes, out2) => {
     for (const n of nodes ?? []) {
       if (n == null ? void 0 : n.id) out2.add(n.id);
@@ -10327,9 +10390,11 @@ function deriveRepeatablePagesFromTemplate(config, inlineFormSchema) {
     const boundId = page == null ? void 0 : page.boundRepeatablePageId;
     if (!boundId) continue;
     let templateKeyPrefix;
+    let entryCount;
     if (Array.isArray(schemaPages)) {
-      const found = schemaPages.find((rp) => (rp == null ? void 0 : rp.id) === boundId);
-      if (found == null ? void 0 : found.templateKeyPrefix) templateKeyPrefix = found.templateKeyPrefix;
+      const found = schemaPages.find((rp) => (rp == null ? void 0 : rp.id) === boundId || (rp == null ? void 0 : rp.id) === page.id);
+      templateKeyPrefix = normalizeTemplateKeyPrefix(found == null ? void 0 : found.templateKeyPrefix);
+      entryCount = inferEntryCount(templateKeyPrefix ?? (found == null ? void 0 : found.templateKeyPrefix) ?? "", found == null ? void 0 : found.minEntries);
     }
     if (!templateKeyPrefix && Array.isArray(dynamicFields) && dynamicFields.length > 0) {
       const idsOnThisPage = /* @__PURE__ */ new Set();
@@ -10354,10 +10419,14 @@ function deriveRepeatablePagesFromTemplate(config, inlineFormSchema) {
           bestCount = count;
         }
       }
-      if (best) templateKeyPrefix = best;
+      if (best) templateKeyPrefix = normalizeTemplateKeyPrefix(best);
     }
     if (templateKeyPrefix) {
-      out.push({ pageId: boundId, templateKeyPrefix });
+      out.push({
+        pageId: boundId,
+        templateKeyPrefix,
+        entryCount: entryCount ?? inferEntryCount(templateKeyPrefix)
+      });
     }
   }
   return out;
@@ -10411,7 +10480,7 @@ async function resolveTemplateData(options) {
       });
     }
   }
-  const repeatablePagesInput = deriveRepeatablePagesFromTemplate(config, inlineFormSchema);
+  const repeatablePagesInput = deriveRepeatablePagesFromTemplate(config, inlineFormSchema, mergedFormData);
   const resolvedConfig = applyFormDataToConfig(
     config,
     mappings,
@@ -10430,7 +10499,7 @@ async function resolveTemplateData(options) {
   };
 }
 async function resolveFromForm(options) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const { templateId, formSchemaId, sectionState, themeId, supabaseUrl, supabaseAnonKey } = options;
   const [templateRow, formSchemaRow, defaultForm] = await Promise.all([
     fetchRow(supabaseUrl, supabaseAnonKey, "templates", templateId),
@@ -10439,6 +10508,7 @@ async function resolveFromForm(options) {
   ]);
   const templateConfig = templateRow.config;
   const templateFormSchema = templateRow.form_schema;
+  const formSchema = formSchemaRow.schema;
   if (templateFormSchema) {
     if (!Array.isArray(templateConfig.dynamicFields) && Array.isArray(templateFormSchema.dynamicFields)) {
       templateConfig.dynamicFields = templateFormSchema.dynamicFields;
@@ -10452,7 +10522,7 @@ async function resolveFromForm(options) {
   if ((repeatableFromSchema == null ? void 0 : repeatableFromSchema.length) && templateConfig.pages) {
     paintRepeatableSections(templateConfig, repeatableFromSchema);
   }
-  const schemaSections = (_a = formSchemaRow.schema) == null ? void 0 : _a.sections;
+  const schemaSections = getRenderableFormSections(formSchema);
   const repeatableNodeMap = /* @__PURE__ */ new Map();
   if (repeatableFromSchema) {
     for (const r of repeatableFromSchema) {
@@ -10463,12 +10533,12 @@ async function resolveFromForm(options) {
   let inferredSections;
   if (schemaSections == null ? void 0 : schemaSections.length) {
     inferredSections = formDefSectionsToInferred(schemaSections, repeatableNodeMap);
-  } else if ((_b = templateConfig.dynamicFields) == null ? void 0 : _b.length) {
+  } else if ((_a = templateConfig.dynamicFields) == null ? void 0 : _a.length) {
     const groups = templateConfig.fieldGroups || [];
     inferredSections = inferFormSchemaFromTemplate(
       templateConfig.dynamicFields,
       groups,
-      ((_c = templateConfig.pages) == null ? void 0 : _c.length) ? { pages: templateConfig.pages } : void 0
+      ((_b = templateConfig.pages) == null ? void 0 : _b.length) ? { pages: templateConfig.pages } : void 0
     );
   } else {
     inferredSections = [];
@@ -10553,9 +10623,10 @@ async function resolveFromForm(options) {
     repeatableList.length > 0 ? repeatableList : repeatableFromSchema ?? [],
     void 0,
     Object.keys(repeatableNestedEntryCounts).length > 0 ? repeatableNestedEntryCounts : void 0,
-    displayFormatMap.size > 0 ? displayFormatMap : void 0
+    displayFormatMap.size > 0 ? displayFormatMap : void 0,
+    buildRepeatablePagesInputForApply(formSchema, mergedSectionState)
   );
-  if ((_d = resolvedConfig.themeConfig) == null ? void 0 : _d.variables) {
+  if ((_c = resolvedConfig.themeConfig) == null ? void 0 : _c.variables) {
     const baseOverrides = {};
     for (const [key, def] of Object.entries(resolvedConfig.themeConfig.variables)) {
       baseOverrides[key] = def.value;