@btst/stack 2.1.0 → 2.3.0

package/dist/packages/stack/src/plugins/cms/api/query-key-defs.cjs

@@ -0,0 +1,29 @@
+'use strict';
+
+function contentListDiscriminator(params) {
+  return {
+    typeSlug: params.typeSlug,
+    limit: params.limit ?? 20,
+    offset: params.offset ?? 0
+  };
+}
+const CMS_QUERY_KEYS = {
+  /**
+   * Key for the cmsTypes.list() query.
+   * Full key: ["cmsTypes", "list", "list"]
+   */
+  typesList: () => ["cmsTypes", "list", "list"],
+  /**
+   * Key for the cmsContent.list({ typeSlug, limit, offset }) query.
+   * Full key: ["cmsContent", "list", { typeSlug, limit, offset }]
+   */
+  contentList: (params) => ["cmsContent", "list", contentListDiscriminator(params)],
+  /**
+   * Key for the cmsContent.detail(typeSlug, id) query.
+   * Full key: ["cmsContent", "detail", typeSlug, id]
+   */
+  contentDetail: (typeSlug, id) => ["cmsContent", "detail", typeSlug, id]
+};
+
+exports.CMS_QUERY_KEYS = CMS_QUERY_KEYS;
+exports.contentListDiscriminator = contentListDiscriminator;

package/dist/packages/stack/src/plugins/cms/api/query-key-defs.mjs

@@ -0,0 +1,26 @@
+function contentListDiscriminator(params) {
+  return {
+    typeSlug: params.typeSlug,
+    limit: params.limit ?? 20,
+    offset: params.offset ?? 0
+  };
+}
+const CMS_QUERY_KEYS = {
+  /**
+   * Key for the cmsTypes.list() query.
+   * Full key: ["cmsTypes", "list", "list"]
+   */
+  typesList: () => ["cmsTypes", "list", "list"],
+  /**
+   * Key for the cmsContent.list({ typeSlug, limit, offset }) query.
+   * Full key: ["cmsContent", "list", { typeSlug, limit, offset }]
+   */
+  contentList: (params) => ["cmsContent", "list", contentListDiscriminator(params)],
+  /**
+   * Key for the cmsContent.detail(typeSlug, id) query.
+   * Full key: ["cmsContent", "detail", typeSlug, id]
+   */
+  contentDetail: (typeSlug, id) => ["cmsContent", "detail", typeSlug, id]
+};
+
+export { CMS_QUERY_KEYS, contentListDiscriminator };

package/dist/packages/stack/src/plugins/cms/client/components/pages/content-editor-page.internal.cjs

@@ -136,7 +136,7 @@ function ContentEditorPage({ typeSlug, id }) {
       contentForm.ContentForm,
       {
         contentType,
-        initialData: isEditing ? item?.parsedData : Object.keys(prefillParams).length > 0 ? convertPrefillToFormData(
+        initialData: isEditing ? item?.parsedData ?? void 0 : Object.keys(prefillParams).length > 0 ? convertPrefillToFormData(
           prefillParams,
           JSON.parse(contentType.jsonSchema)
         ) : void 0,

package/dist/packages/stack/src/plugins/cms/client/components/pages/content-editor-page.internal.mjs

@@ -134,7 +134,7 @@ function ContentEditorPage({ typeSlug, id }) {
       ContentForm,
       {
         contentType,
-        initialData: isEditing ? item?.parsedData : Object.keys(prefillParams).length > 0 ? convertPrefillToFormData(
+        initialData: isEditing ? item?.parsedData ?? void 0 : Object.keys(prefillParams).length > 0 ? convertPrefillToFormData(
           prefillParams,
           JSON.parse(contentType.jsonSchema)
         ) : void 0,

package/dist/packages/stack/src/plugins/cms/client/hooks/cms-hooks.cjs

@@ -305,10 +305,12 @@ function useCreateContent(typeSlug) {
     },
     onSuccess: async () => {
       await queryClient.invalidateQueries({
-        queryKey: queries.cmsContent.list._def
+        queryKey: queries.cmsContent.list._def,
+        refetchType: "all"
       });
       await queryClient.invalidateQueries({
-        queryKey: queries.cmsTypes.list._def
+        queryKey: queries.cmsTypes.list._def,
+        refetchType: "all"
       });
       if (refresh) {
         await refresh();
@@ -346,7 +348,8 @@ function useUpdateContent(typeSlug) {
         );
       }
       await queryClient.invalidateQueries({
-        queryKey: queries.cmsContent.list._def
+        queryKey: queries.cmsContent.list._def,
+        refetchType: "all"
       });
       if (refresh) {
         await refresh();

package/dist/packages/stack/src/plugins/cms/client/hooks/cms-hooks.mjs

@@ -303,10 +303,12 @@ function useCreateContent(typeSlug) {
     },
     onSuccess: async () => {
       await queryClient.invalidateQueries({
-        queryKey: queries.cmsContent.list._def
+        queryKey: queries.cmsContent.list._def,
+        refetchType: "all"
       });
       await queryClient.invalidateQueries({
-        queryKey: queries.cmsTypes.list._def
+        queryKey: queries.cmsTypes.list._def,
+        refetchType: "all"
       });
       if (refresh) {
         await refresh();
@@ -344,7 +346,8 @@ function useUpdateContent(typeSlug) {
         );
       }
       await queryClient.invalidateQueries({
-        queryKey: queries.cmsContent.list._def
+        queryKey: queries.cmsContent.list._def,
+        refetchType: "all"
       });
       if (refresh) {
         await refresh();

package/dist/packages/stack/src/plugins/cms/client/plugin.cjs

@@ -56,6 +56,11 @@ function createDashboardLoader(config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -123,6 +128,11 @@ function createContentListLoader(typeSlug, config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -180,6 +190,11 @@ function createContentEditorLoader(typeSlug, id, config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }

package/dist/packages/stack/src/plugins/cms/client/plugin.mjs

@@ -1,6 +1,6 @@
 import { jsx } from 'react/jsx-runtime';
 import { lazy } from 'react';
-import { defineClientPlugin, createApiClient } from '@btst/stack/plugins/client';
+import { defineClientPlugin, createApiClient, isConnectionError } from '@btst/stack/plugins/client';
 import { createRoute } from '@btst/yar';
 import { createCMSQueryKeys } from '../../../../../../plugins/cms/query-keys.mjs';
 
@@ -54,6 +54,11 @@ function createDashboardLoader(config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (isConnectionError(error)) {
+          console.warn(
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -121,6 +126,11 @@ function createContentListLoader(typeSlug, config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (isConnectionError(error)) {
+          console.warn(
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -178,6 +188,11 @@ function createContentEditorLoader(typeSlug, id, config) {
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (isConnectionError(error)) {
+          console.warn(
+            "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
+          );
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }

package/dist/packages/stack/src/plugins/form-builder/api/getters.cjs

@@ -0,0 +1,120 @@
+'use strict';
+
+function serializeForm(form) {
+  return {
+    id: form.id,
+    name: form.name,
+    slug: form.slug,
+    description: form.description,
+    schema: form.schema,
+    successMessage: form.successMessage,
+    redirectUrl: form.redirectUrl,
+    status: form.status,
+    createdBy: form.createdBy,
+    createdAt: form.createdAt.toISOString(),
+    updatedAt: form.updatedAt.toISOString()
+  };
+}
+function serializeFormSubmission(submission) {
+  return {
+    ...submission,
+    submittedAt: submission.submittedAt.toISOString()
+  };
+}
+function serializeFormSubmissionWithData(submission) {
+  let parsedData = null;
+  try {
+    parsedData = JSON.parse(submission.data);
+  } catch {
+  }
+  return {
+    ...serializeFormSubmission(submission),
+    parsedData,
+    form: submission.form ? serializeForm(submission.form) : void 0
+  };
+}
+async function getAllForms(adapter, params) {
+  const whereConditions = [];
+  if (params?.status) {
+    whereConditions.push({
+      field: "status",
+      value: params.status,
+      operator: "eq"
+    });
+  }
+  const total = await adapter.count({
+    model: "form",
+    where: whereConditions.length > 0 ? whereConditions : void 0
+  });
+  const forms = await adapter.findMany({
+    model: "form",
+    where: whereConditions.length > 0 ? whereConditions : void 0,
+    limit: params?.limit,
+    offset: params?.offset,
+    sortBy: { field: "createdAt", direction: "desc" }
+  });
+  return {
+    items: forms.map(serializeForm),
+    total,
+    limit: params?.limit,
+    offset: params?.offset
+  };
+}
+async function getFormById(adapter, id) {
+  const form = await adapter.findOne({
+    model: "form",
+    where: [{ field: "id", value: id, operator: "eq" }]
+  });
+  if (!form) return null;
+  return serializeForm(form);
+}
+async function getFormBySlug(adapter, slug) {
+  const form = await adapter.findOne({
+    model: "form",
+    where: [{ field: "slug", value: slug, operator: "eq" }]
+  });
+  if (!form) {
+    return null;
+  }
+  return serializeForm(form);
+}
+async function getFormSubmissions(adapter, formId, params) {
+  const form = await adapter.findOne({
+    model: "form",
+    where: [{ field: "id", value: formId, operator: "eq" }]
+  });
+  if (!form) {
+    return {
+      items: [],
+      total: 0,
+      limit: params?.limit,
+      offset: params?.offset
+    };
+  }
+  const total = await adapter.count({
+    model: "formSubmission",
+    where: [{ field: "formId", value: formId, operator: "eq" }]
+  });
+  const submissions = await adapter.findMany({
+    model: "formSubmission",
+    where: [{ field: "formId", value: formId, operator: "eq" }],
+    limit: params?.limit,
+    offset: params?.offset,
+    sortBy: { field: "submittedAt", direction: "desc" },
+    join: { form: true }
+  });
+  return {
+    items: submissions.map(serializeFormSubmissionWithData),
+    total,
+    limit: params?.limit,
+    offset: params?.offset
+  };
+}
+
+exports.getAllForms = getAllForms;
+exports.getFormById = getFormById;
+exports.getFormBySlug = getFormBySlug;
+exports.getFormSubmissions = getFormSubmissions;
+exports.serializeForm = serializeForm;
+exports.serializeFormSubmission = serializeFormSubmission;
+exports.serializeFormSubmissionWithData = serializeFormSubmissionWithData;

package/dist/packages/stack/src/plugins/form-builder/api/getters.mjs

@@ -0,0 +1,112 @@
+function serializeForm(form) {
+  return {
+    id: form.id,
+    name: form.name,
+    slug: form.slug,
+    description: form.description,
+    schema: form.schema,
+    successMessage: form.successMessage,
+    redirectUrl: form.redirectUrl,
+    status: form.status,
+    createdBy: form.createdBy,
+    createdAt: form.createdAt.toISOString(),
+    updatedAt: form.updatedAt.toISOString()
+  };
+}
+function serializeFormSubmission(submission) {
+  return {
+    ...submission,
+    submittedAt: submission.submittedAt.toISOString()
+  };
+}
+function serializeFormSubmissionWithData(submission) {
+  let parsedData = null;
+  try {
+    parsedData = JSON.parse(submission.data);
+  } catch {
+  }
+  return {
+    ...serializeFormSubmission(submission),
+    parsedData,
+    form: submission.form ? serializeForm(submission.form) : void 0
+  };
+}
+async function getAllForms(adapter, params) {
+  const whereConditions = [];
+  if (params?.status) {
+    whereConditions.push({
+      field: "status",
+      value: params.status,
+      operator: "eq"
+    });
+  }
+  const total = await adapter.count({
+    model: "form",
+    where: whereConditions.length > 0 ? whereConditions : void 0
+  });
+  const forms = await adapter.findMany({
+    model: "form",
+    where: whereConditions.length > 0 ? whereConditions : void 0,
+    limit: params?.limit,
+    offset: params?.offset,
+    sortBy: { field: "createdAt", direction: "desc" }
+  });
+  return {
+    items: forms.map(serializeForm),
+    total,
+    limit: params?.limit,
+    offset: params?.offset
+  };
+}
+async function getFormById(adapter, id) {
+  const form = await adapter.findOne({
+    model: "form",
+    where: [{ field: "id", value: id, operator: "eq" }]
+  });
+  if (!form) return null;
+  return serializeForm(form);
+}
+async function getFormBySlug(adapter, slug) {
+  const form = await adapter.findOne({
+    model: "form",
+    where: [{ field: "slug", value: slug, operator: "eq" }]
+  });
+  if (!form) {
+    return null;
+  }
+  return serializeForm(form);
+}
+async function getFormSubmissions(adapter, formId, params) {
+  const form = await adapter.findOne({
+    model: "form",
+    where: [{ field: "id", value: formId, operator: "eq" }]
+  });
+  if (!form) {
+    return {
+      items: [],
+      total: 0,
+      limit: params?.limit,
+      offset: params?.offset
+    };
+  }
+  const total = await adapter.count({
+    model: "formSubmission",
+    where: [{ field: "formId", value: formId, operator: "eq" }]
+  });
+  const submissions = await adapter.findMany({
+    model: "formSubmission",
+    where: [{ field: "formId", value: formId, operator: "eq" }],
+    limit: params?.limit,
+    offset: params?.offset,
+    sortBy: { field: "submittedAt", direction: "desc" },
+    join: { form: true }
+  });
+  return {
+    items: submissions.map(serializeFormSubmissionWithData),
+    total,
+    limit: params?.limit,
+    offset: params?.offset
+  };
+}
+
+export { getAllForms, getFormById, getFormBySlug, getFormSubmissions, serializeForm, serializeFormSubmission, serializeFormSubmissionWithData };

package/dist/packages/stack/src/plugins/form-builder/api/plugin.cjs

@@ -6,38 +6,77 @@ const schemaConverter = require('../../../../../ui/src/lib/schema-converter.cjs'
 const db = require('../db.cjs');
 const schemas = require('../schemas.cjs');
 const utils = require('../utils.cjs');
+const getters = require('./getters.cjs');
+const queryKeyDefs = require('./query-key-defs.cjs');
 
-function serializeForm(form) {
-  return {
-    id: form.id,
-    name: form.name,
-    slug: form.slug,
-    description: form.description,
-    schema: form.schema,
-    successMessage: form.successMessage,
-    redirectUrl: form.redirectUrl,
-    status: form.status,
-    createdBy: form.createdBy,
-    createdAt: form.createdAt.toISOString(),
-    updatedAt: form.updatedAt.toISOString()
-  };
-}
-function serializeFormSubmission(submission) {
-  return {
-    ...submission,
-    submittedAt: submission.submittedAt.toISOString()
-  };
-}
-function serializeFormSubmissionWithData(submission) {
-  return {
-    ...serializeFormSubmission(submission),
-    parsedData: JSON.parse(submission.data),
-    form: submission.form ? serializeForm(submission.form) : void 0
+function createFormBuilderPrefetchForRoute(adapter) {
+  return async function prefetchForRoute(key, qc, params) {
+    switch (key) {
+      case "formList": {
+        const result = await getters.getAllForms(adapter, { limit: 20, offset: 0 });
+        qc.setQueryData(queryKeyDefs.FORM_QUERY_KEYS.formsList({ limit: 20, offset: 0 }), {
+          pages: [
+            {
+              items: result.items,
+              total: result.total,
+              limit: result.limit ?? 20,
+              offset: result.offset ?? 0
+            }
+          ],
+          pageParams: [0]
+        });
+        break;
+      }
+      case "editForm": {
+        const id = params?.id ?? "";
+        if (id) {
+          const form = await getters.getFormById(adapter, id);
+          qc.setQueryData(queryKeyDefs.FORM_QUERY_KEYS.formById(id), form);
+        }
+        break;
+      }
+      case "submissions": {
+        const id = params?.id ?? "";
+        if (id) {
+          const [form, submissionsResult] = await Promise.all([
+            getters.getFormById(adapter, id),
+            getters.getFormSubmissions(adapter, id, { limit: 20, offset: 0 })
+          ]);
+          qc.setQueryData(queryKeyDefs.FORM_QUERY_KEYS.formById(id), form);
+          qc.setQueryData(
+            queryKeyDefs.FORM_QUERY_KEYS.submissionsList({
+              formId: id,
+              limit: 20,
+              offset: 0
+            }),
+            {
+              pages: [
+                {
+                  items: submissionsResult.items,
+                  total: submissionsResult.total,
+                  limit: submissionsResult.limit ?? 20,
+                  offset: submissionsResult.offset ?? 0
+                }
+              ],
+              pageParams: [0]
+            }
+          );
+        }
+        break;
+      }
+    }
   };
 }
 const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
   name: "form-builder",
   dbPlugin: db.formBuilderSchema,
+  api: (adapter) => ({
+    getAllForms: (params) => getters.getAllForms(adapter, params),
+    getFormById: (id) => getters.getFormById(adapter, id),
+    getFormBySlug: (slug) => getters.getFormBySlug(adapter, slug),
+    getFormSubmissions: (formId, params) => getters.getFormSubmissions(adapter, formId, params),
+    prefetchForRoute: createFormBuilderPrefetchForRoute(adapter)
+  }),
   routes: (adapter) => {
     const createContext = (headers) => ({
       headers,
@@ -64,32 +103,7 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
             throw ctx.error(403, { message: "Access denied" });
           }
         }
-        const whereConditions = [];
-        if (status) {
-          whereConditions.push({
-            field: "status",
-            value: status,
-            operator: "eq"
-          });
-        }
-        const allForms = await adapter.findMany({
-          model: "form",
-          where: whereConditions.length > 0 ? whereConditions : void 0
-        });
-        const total = allForms.length;
-        const forms = await adapter.findMany({
-          model: "form",
-          where: whereConditions.length > 0 ? whereConditions : void 0,
-          limit,
-          offset,
-          sortBy: { field: "createdAt", direction: "desc" }
-        });
-        return {
-          items: forms.map(serializeForm),
-          total,
-          limit,
-          offset
-        };
+        return getters.getAllForms(adapter, { status, limit, offset });
       }
     );
     const getFormBySlug = api.createEndpoint(
@@ -107,14 +121,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
             throw ctx.error(403, { message: "Access denied" });
           }
         }
-        const form = await adapter.findOne({
-          model: "form",
-          where: [{ field: "slug", value: slug, operator: "eq" }]
-        });
+        const form = await getters.getFormBySlug(adapter, slug);
         if (!form) {
           throw ctx.error(404, { message: "Form not found" });
         }
-        return serializeForm(form);
+        return form;
       }
     );
     const getFormById = api.createEndpoint(
@@ -139,7 +150,7 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
         if (!form) {
           throw ctx.error(404, { message: "Form not found" });
         }
-        return serializeForm(form);
+        return getters.serializeForm(form);
       }
     );
     const createForm = api.createEndpoint(
@@ -207,7 +218,7 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
             updatedAt: /* @__PURE__ */ new Date()
           }
         });
-        const serialized = serializeForm(form);
+        const serialized = getters.serializeForm(form);
         if (config.hooks?.onAfterFormCreated) {
           await config.hooks.onAfterFormCreated(serialized, context);
         }
@@ -308,7 +319,7 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
         if (!updated) {
           throw ctx.error(500, { message: "Failed to fetch updated form" });
         }
-        const serialized = serializeForm(updated);
+        const serialized = getters.serializeForm(updated);
         if (config.hooks?.onAfterFormUpdated) {
           await config.hooks.onAfterFormUpdated(serialized, context);
         }
@@ -437,11 +448,11 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
             userAgent: baseContext.userAgent
           }
         });
-        const serialized = serializeFormSubmission(submission);
+        const serialized = getters.serializeFormSubmission(submission);
         if (config.hooks?.onAfterSubmission) {
           await config.hooks.onAfterSubmission(
             serialized,
-            serializeForm(form),
+            getters.serializeForm(form),
             submissionContext
           );
         }
@@ -481,29 +492,7 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
             throw ctx.error(403, { message: "Access denied" });
           }
         }
-        const allSubmissions = await adapter.findMany({
-          model: "formSubmission",
-          where: [
-            { field: "formId", value: formId, operator: "eq" }
-          ]
-        });
-        const total = allSubmissions.length;
-        const submissions = await adapter.findMany({
-          model: "formSubmission",
-          where: [
-            { field: "formId", value: formId, operator: "eq" }
-          ],
-          limit,
-          offset,
-          sortBy: { field: "submittedAt", direction: "desc" },
-          join: { form: true }
-        });
-        return {
-          items: submissions.map(serializeFormSubmissionWithData),
-          total,
-          limit,
-          offset
-        };
+        return getters.getFormSubmissions(adapter, formId, { limit, offset });
       }
     );
     const getSubmission = api.createEndpoint(
@@ -532,7 +521,7 @@ const formBuilderBackendPlugin = (config = {}) => api.defineBackendPlugin({
         if (!submission || submission.formId !== formId) {
           throw ctx.error(404, { message: "Submission not found" });
         }
-        return serializeFormSubmissionWithData(submission);
+        return getters.serializeFormSubmissionWithData(submission);
       }
     );
     const deleteSubmission = api.createEndpoint(