@evanschleret/formforgeclient 1.2.2 → 1.2.4

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=4.0.0"
   },
-  "version": "1.2.2",
+  "version": "1.2.4",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/composables/useFormForgeClient.js

@@ -121,11 +121,10 @@ export function useFormForgeClient(config = {}) {
   const nuxtApp = useNuxtApp();
   const route = useRoute();
   const injectedClient = nuxtApp.$formforge;
+  const baseConfig = injectedClient?.config ?? useRuntimeConfig().public.formforge;
   if (injectedClient !== void 0 && !hasConfigOverrides(config)) {
     return injectedClient;
   }
-  const runtimeConfig = useRuntimeConfig();
-  const runtimePublicConfig = runtimeConfig.public.formforge;
   const routeParamsResolver = () => {
     const appRouteQuery = nuxtApp._route?.value?.query;
     const appRouteParams = nuxtApp._route?.value?.params;
@@ -144,14 +143,13 @@ export function useFormForgeClient(config = {}) {
       }
     );
     const resolvedPath = composableRoutePath || appRoutePath;
-    const resolvedBaseURL = config.baseURL ?? runtimePublicConfig?.baseURL;
-    const resolvedScopedRoutes = config.scopedRoutes ?? runtimePublicConfig?.scopedRoutes;
+    const resolvedBaseURL = config.baseURL ?? baseConfig?.baseURL;
+    const resolvedScopedRoutes = config.scopedRoutes ?? baseConfig?.scopedRoutes;
     const inferredFromBaseURL = inferParamsFromPath(resolvedBaseURL, resolvedPath);
     const withBaseURLValues = withInferredMissingValues(mergedRouteValues, inferredFromBaseURL);
     const inferredFromScopes = inferScopeSourcesFromPath(resolvedScopedRoutes, resolvedPath);
     return withInferredMissingValues(withBaseURLValues, inferredFromScopes);
   };
-  const baseConfig = runtimePublicConfig;
   const mergedConfig = {
     ...baseConfig,
     ...config

package/dist/runtime/renderers/default/FormForgeRenderer.vue

@@ -16,6 +16,7 @@ import UStepper from "@nuxt/ui/components/Stepper.vue";
 import USwitch from "@nuxt/ui/components/Switch.vue";
 import UTextarea from "@nuxt/ui/components/Textarea.vue";
 import { isFormForgeJsonObject } from "../../utils/object";
+import { sanitizePayloadWithSchema } from "../../utils/renderer-payload";
 import { useFormForgeForm } from "../../composables/useFormForgeForm";
 import { useFormForgeI18n } from "../../composables/useFormForgeI18n";
 import { useFormForgeSubmit } from "../../composables/useFormForgeSubmit";
@@ -137,43 +138,6 @@ function getResolvedZodSchema() {
   }
   return internalForm.zodSchema.value;
 }
-function resolveSchemaFieldNames(schema) {
-  const names = /* @__PURE__ */ new Set();
-  if (Array.isArray(schema.fields)) {
-    for (const field of schema.fields) {
-      if (typeof field.name === "string" && field.name !== "") {
-        names.add(field.name);
-      }
-    }
-  }
-  if (Array.isArray(schema.pages)) {
-    for (const page of schema.pages) {
-      if (!Array.isArray(page.fields)) {
-        continue;
-      }
-      for (const field of page.fields) {
-        if (typeof field.name === "string" && field.name !== "") {
-          names.add(field.name);
-        }
-      }
-    }
-  }
-  return names;
-}
-function sanitizePayloadWithSchema(value, schema) {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) {
-    return {};
-  }
-  const allowedFieldNames = resolveSchemaFieldNames(schema);
-  const sanitizedPayload = {};
-  for (const [key, entryValue] of Object.entries(value)) {
-    if (!allowedFieldNames.has(key)) {
-      continue;
-    }
-    sanitizedPayload[key] = entryValue;
-  }
-  return sanitizedPayload;
-}
 const formState = computed({
   get: () => {
     const value = usesExternalModel.value ? unwrapModelValueProp(props.modelValue) : internalForm.state.value;

package/dist/runtime/utils/renderer-payload.d.ts

@@ -0,0 +1,5 @@
+import type { FormForgeSubmissionPayload } from '../types/index.js';
+import type { FormForgeFormSchema } from '../types/schema.js';
+export declare function resolveSchemaFieldNames(schema: FormForgeFormSchema): Set<string>;
+export declare function sanitizePayloadWithSchema(value: FormForgeSubmissionPayload, schema: FormForgeFormSchema): FormForgeSubmissionPayload;
+//# sourceMappingURL=renderer-payload.d.ts.map

package/dist/runtime/utils/renderer-payload.js

@@ -0,0 +1,71 @@
+function collectSchemaFields(schema) {
+  const collected = [];
+  if (Array.isArray(schema.fields)) {
+    collected.push(...schema.fields);
+  }
+  if (Array.isArray(schema.pages)) {
+    for (const page of schema.pages) {
+      if (!Array.isArray(page.fields)) {
+        continue;
+      }
+      collected.push(...page.fields);
+    }
+  }
+  return collected;
+}
+function buildFieldAliases(schema) {
+  const aliasesByName = /* @__PURE__ */ new Map();
+  for (const field of collectSchemaFields(schema)) {
+    const name = typeof field.name === "string" ? field.name.trim() : "";
+    const fieldKey = typeof field.field_key === "string" ? field.field_key.trim() : "";
+    if (name === "") {
+      continue;
+    }
+    if (!aliasesByName.has(name)) {
+      aliasesByName.set(name, /* @__PURE__ */ new Set());
+    }
+    const aliases = aliasesByName.get(name);
+    aliases.add(name);
+    if (fieldKey !== "") {
+      aliases.add(fieldKey);
+    }
+  }
+  return Array.from(aliasesByName.entries()).map(([name, aliases]) => ({
+    name,
+    aliases: Array.from(aliases)
+  }));
+}
+export function resolveSchemaFieldNames(schema) {
+  const names = /* @__PURE__ */ new Set();
+  for (const field of buildFieldAliases(schema)) {
+    for (const alias of field.aliases) {
+      names.add(alias);
+    }
+  }
+  return names;
+}
+export function sanitizePayloadWithSchema(value, schema) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return {};
+  }
+  const sanitizedPayload = {};
+  const aliasesByName = buildFieldAliases(schema);
+  for (const field of aliasesByName) {
+    const nameValue = Object.prototype.hasOwnProperty.call(value, field.name) ? value[field.name] : void 0;
+    if (nameValue !== void 0) {
+      sanitizedPayload[field.name] = nameValue;
+      continue;
+    }
+    for (const alias of field.aliases) {
+      if (alias === field.name) {
+        continue;
+      }
+      if (!Object.prototype.hasOwnProperty.call(value, alias)) {
+        continue;
+      }
+      sanitizedPayload[field.name] = value[alias];
+      break;
+    }
+  }
+  return sanitizedPayload;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanschleret/formforgeclient",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Nuxt module and runtime client for FormForge",
   "license": "MIT",
   "type": "module",