@evanschleret/formforgeclient 1.2.4 → 2.0.0

package/dist/runtime/utils/schema.js

@@ -1,5 +1,7 @@
 import { getFormForgeStringArray, isFormForgeJsonObject, pickFormForgeDataEnvelope } from "./object.js";
 import { normalizeFormForgeCategory } from "./category.js";
+import { createDefaultAddressFields, resolveDefaultFieldLabel } from "./defaults.js";
+import { isTemporalFieldType, isTemporalMode, temporalModeFromFieldType } from "./temporal.js";
 const FIELD_TYPES = [
   "text",
   "textarea",
@@ -9,14 +11,14 @@ const FIELD_TYPES = [
   "select_menu",
   "radio",
   "checkbox",
+  "consent",
   "checkbox_group",
   "switch",
+  "temporal",
   "date",
   "time",
-  "datetime",
-  "date_range",
-  "datetime_range",
-  "file"
+  "file",
+  "address"
 ];
 const CONDITION_TARGET_TYPES = ["page", "field"];
 const CONDITION_ACTIONS = ["show", "hide", "skip", "require", "disable"];
@@ -62,6 +64,18 @@ function toString(value, fallback) {
   }
   return fallback;
 }
+function toNumber(value, fallback) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value;
+  }
+  if (typeof value === "string") {
+    const parsed = Number.parseInt(value, 10);
+    if (!Number.isNaN(parsed)) {
+      return parsed;
+    }
+  }
+  return fallback;
+}
 function toNullableString(value) {
   if (typeof value === "string" || value === null) {
     return value;
@@ -74,6 +88,10 @@ function toNumberOrStringOrNull(value) {
   }
   return void 0;
 }
+function toPositiveNumber(value) {
+  const numericValue = toNumber(value, 0);
+  return numericValue > 0 ? numericValue : void 0;
+}
 function normalizeOption(option) {
   if (typeof option === "string" || typeof option === "number" || typeof option === "boolean" || option === null) {
     return option;
@@ -102,9 +120,31 @@ function normalizeOptions(value) {
   }
   return options;
 }
-function normalizeField(field, index, fallbackPageKey) {
+function normalizeAddressFields(value, locale) {
+  if (!Array.isArray(value)) {
+    return void 0;
+  }
+  const defaults = createDefaultAddressFields(locale);
+  const normalized = [];
+  for (const [index, addressField] of value.entries()) {
+    if (!isFormForgeJsonObject(addressField)) {
+      continue;
+    }
+    const hasLabel = Object.prototype.hasOwnProperty.call(addressField, "label") && (typeof addressField.label === "string" || addressField.label === null);
+    const key = typeof addressField.key === "string" && addressField.key.trim() !== "" ? addressField.key : defaults[index]?.key ?? defaults[0].key;
+    const label = hasLabel ? typeof addressField.label === "string" ? addressField.label.trim() : "" : defaults[index]?.label ?? key;
+    normalized.push({
+      key,
+      label,
+      visible: addressField.visible !== false,
+      required: addressField.required === true
+    });
+  }
+  return normalized.length > 0 ? normalized : void 0;
+}
+function normalizeField(field, index, fallbackPageKey, locale) {
   const rawType = toString(field.type, "text");
-  const fieldType = isFieldType(rawType) ? rawType : "text";
+  const fieldType = isTemporalFieldType(rawType) ? "temporal" : isFieldType(rawType) ? rawType : "text";
   const name = toString(field.name, `field_${index}`);
   const fieldKey = toString(field.field_key, `${name}_${index}`);
   const pageKey = toString(field.page_key, fallbackPageKey);
@@ -131,8 +171,16 @@ function normalizeField(field, index, fallbackPageKey) {
     multiple: toBoolean(field.multiple, false),
     disabled: toBoolean(field.disabled, false),
     readonly: toBoolean(field.readonly, false),
-    options: normalizeOptions(field.options)
+    options: normalizeOptions(field.options),
+    address_fields: normalizeAddressFields(field.address_fields, locale),
+    display: field.display === "list" || field.display === "menu" ? field.display : void 0,
+    temporal_mode: fieldType === "temporal" ? isTemporalMode(field.temporal_mode) ? field.temporal_mode : temporalModeFromFieldType(rawType) : void 0,
+    hour_cycle: fieldType === "temporal" && (isTemporalMode(field.temporal_mode) ? field.temporal_mode : temporalModeFromFieldType(rawType)) === "time" ? field.hour_cycle === 12 ? 12 : 24 : void 0,
+    consent_label: typeof field.consent_label === "string" ? field.consent_label : void 0
   };
+  if (normalizedField.type === "temporal" && (typeof normalizedField.label !== "string" || normalizedField.label.trim() === "")) {
+    normalizedField.label = resolveDefaultFieldLabel("temporal", locale, normalizedField.temporal_mode);
+  }
   if (fieldType === "file") {
     const accept = getFormForgeStringArray(field.accept);
     const maxSize = typeof field.max_size === "number" || field.max_size === null ? field.max_size : void 0;
@@ -150,7 +198,7 @@ function normalizeField(field, index, fallbackPageKey) {
   }
   return normalizedField;
 }
-function normalizeFieldsList(value, fallbackPageKey, indexOffset = 0) {
+function normalizeFieldsList(value, fallbackPageKey, indexOffset = 0, locale) {
   if (!Array.isArray(value)) {
     return [];
   }
@@ -159,11 +207,11 @@ function normalizeFieldsList(value, fallbackPageKey, indexOffset = 0) {
     if (!isFormForgeJsonObject(item)) {
       continue;
     }
-    fields.push(normalizeField(item, indexOffset + index, fallbackPageKey));
+    fields.push(normalizeField(item, indexOffset + index, fallbackPageKey, locale));
   }
   return fields;
 }
-function normalizePageFieldsFromSections(value, pageKey, indexOffset) {
+function normalizePageFieldsFromSections(value, pageKey, indexOffset, locale) {
   if (!Array.isArray(value)) {
     return [];
   }
@@ -172,12 +220,12 @@ function normalizePageFieldsFromSections(value, pageKey, indexOffset) {
     if (!isFormForgeJsonObject(sectionValue)) {
       continue;
     }
-    const sectionFields = normalizeFieldsList(sectionValue.fields, pageKey, indexOffset + fields.length);
+    const sectionFields = normalizeFieldsList(sectionValue.fields, pageKey, indexOffset + fields.length, locale);
     fields.push(...sectionFields);
   }
   return fields;
 }
-function normalizePages(value) {
+function normalizePages(value, locale) {
   if (!Array.isArray(value)) {
     return {
       pages: [],
@@ -193,7 +241,7 @@ function normalizePages(value) {
     const pageKey = toString(pageValue.page_key, `page_${pageIndex + 1}`);
     const pageMetaValue = pageValue.meta;
     const pageMeta = isFormForgeJsonObject(pageMetaValue) ? pageMetaValue : {};
-    const pageFields = Array.isArray(pageValue.fields) ? normalizeFieldsList(pageValue.fields, pageKey, fields.length) : normalizePageFieldsFromSections(pageValue.sections, pageKey, fields.length);
+    const pageFields = Array.isArray(pageValue.fields) ? normalizeFieldsList(pageValue.fields, pageKey, fields.length, locale) : normalizePageFieldsFromSections(pageValue.sections, pageKey, fields.length, locale);
     fields.push(...pageFields);
     pages.push({
       page_key: pageKey,
@@ -281,10 +329,10 @@ function normalizeDraftSettings(value) {
     enabled: toBoolean(value.enabled, false)
   };
 }
-export function normalizeFormForgeSchema(payload) {
+export function normalizeFormForgeSchema(payload, locale) {
   const data = pickFormForgeDataEnvelope(payload);
-  const rootFields = normalizeFieldsList(data.fields, "page_1");
-  const normalizedPages = normalizePages(data.pages);
+  const rootFields = normalizeFieldsList(data.fields, "page_1", 0, locale);
+  const normalizedPages = normalizePages(data.pages, locale);
   const fields = normalizedPages.fields.length > 0 ? normalizedPages.fields : rootFields;
   const pages = normalizedPages.pages.length > 0 ? normalizedPages.pages : buildPagesFromFlatFields(fields);
   const apiValue = data.api;
@@ -295,10 +343,16 @@ export function normalizeFormForgeSchema(payload) {
   return {
     key: toString(data.key, ""),
     version: toString(data.version, ""),
+    schema_version: toNumber(data.schema_version, 1),
     title: toString(data.title, ""),
+    publish_at: toNullableString(data.publish_at),
+    pause_at: toNullableString(data.pause_at),
+    response_limit: toPositiveNumber(data.response_limit),
+    submission_code_required: typeof data.submission_code_required === "boolean" ? data.submission_code_required : void 0,
     category: typeof data.category === "string" || data.category === null ? data.category : void 0,
     category_item: categoryItem ?? void 0,
     is_published: toBoolean(data.is_published, false),
+    public_url: toNullableString(data.public_url),
     fields,
     pages,
     conditions: normalizeConditions(data.conditions),

package/dist/runtime/utils/temporal.d.ts

@@ -0,0 +1,10 @@
+import type { FormForgeFieldSchema, FormForgeTemporalMode } from '../types/index.js';
+declare const LEGACY_TEMPORAL_TYPES: Record<'date' | 'time', FormForgeTemporalMode>;
+export declare function isTemporalMode(value: unknown): value is FormForgeTemporalMode;
+export declare function isLegacyTemporalFieldType(value: string): value is keyof typeof LEGACY_TEMPORAL_TYPES;
+export declare function isTemporalFieldType(value: string): boolean;
+export declare function temporalModeFromFieldType(value: string): FormForgeTemporalMode;
+export declare function resolveTemporalMode(field: Pick<FormForgeFieldSchema, 'type' | 'temporal_mode'>): FormForgeTemporalMode;
+export declare function isTemporalDateMode(mode: FormForgeTemporalMode): boolean;
+export {};
+//# sourceMappingURL=temporal.d.ts.map

package/dist/runtime/utils/temporal.js

@@ -0,0 +1,28 @@
+const LEGACY_TEMPORAL_TYPES = {
+  date: "date",
+  time: "time"
+};
+export function isTemporalMode(value) {
+  return value === "date" || value === "time";
+}
+export function isLegacyTemporalFieldType(value) {
+  return value === "date" || value === "time";
+}
+export function isTemporalFieldType(value) {
+  return value === "temporal" || isLegacyTemporalFieldType(value);
+}
+export function temporalModeFromFieldType(value) {
+  if (isLegacyTemporalFieldType(value)) {
+    return LEGACY_TEMPORAL_TYPES[value];
+  }
+  return "date";
+}
+export function resolveTemporalMode(field) {
+  if (field.type === "temporal" && isTemporalMode(field.temporal_mode)) {
+    return field.temporal_mode;
+  }
+  return temporalModeFromFieldType(field.type);
+}
+export function isTemporalDateMode(mode) {
+  return mode === "date";
+}

package/dist/runtime/utils/validation.d.ts

@@ -0,0 +1,5 @@
+import type { FormForgeFieldValidationConfig, FormForgeFieldValidationOperator } from '../types/index.js';
+export type FormForgeValidationMode = 'text' | 'address' | 'temporal';
+export declare function normalizeFormForgeValidationOperator(operator: FormForgeFieldValidationOperator, mode: FormForgeValidationMode): FormForgeFieldValidationOperator;
+export declare function normalizeFormForgeValidationConfig(config: FormForgeFieldValidationConfig, mode: FormForgeValidationMode): FormForgeFieldValidationConfig;
+//# sourceMappingURL=validation.d.ts.map

package/dist/runtime/utils/validation.js

@@ -0,0 +1,36 @@
+const TEXT_TO_TEMPORAL_OPERATOR_MAP = {
+  min: "after",
+  max: "before"
+};
+const TEMPORAL_TO_TEXT_OPERATOR_MAP = {
+  after: "min",
+  before: "max",
+  between: "min",
+  not_between: "max"
+};
+export function normalizeFormForgeValidationOperator(operator, mode) {
+  if (mode === "temporal") {
+    return TEXT_TO_TEMPORAL_OPERATOR_MAP[operator] ?? operator;
+  }
+  return TEMPORAL_TO_TEXT_OPERATOR_MAP[operator] ?? operator;
+}
+export function normalizeFormForgeValidationConfig(config, mode) {
+  let mutated = false;
+  const nextRules = config.rules.map((rule) => {
+    const operator = normalizeFormForgeValidationOperator(rule.operator, mode);
+    if (operator !== rule.operator) {
+      mutated = true;
+    }
+    return operator === rule.operator ? rule : {
+      ...rule,
+      operator
+    };
+  });
+  if (!mutated) {
+    return config;
+  }
+  return {
+    ...config,
+    rules: nextRules
+  };
+}

package/dist/runtime/validation/zod.d.ts

@@ -1,6 +1,9 @@
 import { z } from 'zod';
 import type { FormForgeFormSchema, FormForgeSubmissionPayload } from '../types/index.js';
-export declare function createFormForgeZodSchema(form: FormForgeFormSchema): z.ZodTypeAny;
+export interface FormForgeZodValidationOptions {
+    locale?: string;
+}
+export declare function createFormForgeZodSchema(form: FormForgeFormSchema, options?: FormForgeZodValidationOptions): z.ZodTypeAny;
 export declare function mapFormForgeZodIssues(error: z.ZodError): Record<string, string[]>;
-export declare function validateFormForgePayload(schema: z.ZodTypeAny, payload: FormForgeSubmissionPayload): Record<string, string[]>;
+export declare function validateFormForgePayload(schema: z.ZodTypeAny, payload: FormForgeSubmissionPayload, options?: FormForgeZodValidationOptions): Record<string, string[]>;
 //# sourceMappingURL=zod.d.ts.map