@btst/plugin-form-builder 1.0.0-beta.0 → 1.2.0-beta.1

package/dist/ui/src/lib/schema-converter.cjs

@@ -1,7 +1,20 @@
 'use strict';
 
 const z = require('zod');
+const formVisibility = require('./form-visibility.cjs');
 
+const displaySchemas = /* @__PURE__ */ new WeakMap();
+function getFormDisplaySchema(schema) {
+  const cached = displaySchemas.get(schema);
+  if (cached) return cached;
+  const metadata = schema.meta();
+  if (schema instanceof z.z.ZodPipe && metadata?.properties) {
+    const display = z.z.fromJSONSchema(metadata);
+    displaySchemas.set(schema, display);
+    return display;
+  }
+  return void 0;
+}
 function zodToFormSchema(schema, metadata) {
   const jsonSchema = z.z.toJSONSchema(schema, {
     unrepresentable: "any",
@@ -106,8 +119,94 @@ function attachStepsMetadata(schema, jsonSchema) {
     stepGroupMap
   });
 }
+function hasVisibilityRules(schema) {
+  return Boolean(schema.steps?.some((step) => step.showIf) || Object.values(schema.properties ?? {}).some((prop) => prop.showIf || prop.properties && hasVisibilityRules(prop) || prop.items && hasVisibilityRules(prop.items)));
+}
+function resolveVisibleSchema(schema, values) {
+  const data = { ...values };
+  for (const [key, prop] of Object.entries(schema.properties ?? {})) {
+    if (data[key] === void 0 && prop.default !== void 0) Object.defineProperty(data, key, { value: prop.default, enumerable: true, writable: true, configurable: true });
+  }
+  const comparisonValues = { ...data };
+  const visibility = /* @__PURE__ */ new Map();
+  const resolving = [];
+  const isVisible = (key) => {
+    if (visibility.has(key)) return visibility.get(key);
+    const cycleStart = resolving.indexOf(key);
+    if (cycleStart !== -1) {
+      for (const field of resolving.slice(cycleStart)) visibility.set(field, false);
+      return false;
+    }
+    const prop = schema.properties?.[key];
+    if (!prop) return true;
+    resolving.push(key);
+    const matches = (condition) => {
+      if (!condition) return true;
+      const sourceVisible = isVisible(condition.field);
+      return formVisibility.matchesShowIf(condition, { [condition.field]: sourceVisible && Object.hasOwn(comparisonValues, condition.field) ? comparisonValues[condition.field] : void 0 });
+    };
+    const step = schema.steps?.[prop.stepGroup ?? schema.stepGroupMap?.[key] ?? 0];
+    const result = matches(step?.showIf) && matches(prop.showIf);
+    resolving.pop();
+    if (!visibility.has(key)) visibility.set(key, result);
+    return visibility.get(key);
+  };
+  const properties = /* @__PURE__ */ Object.create(null);
+  for (const [key, prop] of Object.entries(schema.properties ?? {})) {
+    if (!isVisible(key)) {
+      Reflect.deleteProperty(data, key);
+      continue;
+    }
+    const { showIf: _showIf, ...visibleProp } = prop;
+    if (prop.properties && data[key] && typeof data[key] === "object" && !Array.isArray(data[key])) {
+      const nested = resolveVisibleSchema(prop, data[key]);
+      Object.assign(visibleProp, nested.schema);
+      data[key] = nested.data;
+    }
+    properties[key] = visibleProp;
+  }
+  return { schema: { ...schema, properties, required: schema.required?.filter((key) => key in properties), steps: schema.steps?.map(({ showIf: _showIf, ...step }) => step) }, data };
+}
 function formSchemaToZod(jsonSchema) {
+  if (jsonSchema.default !== void 0 && hasVisibilityRules(jsonSchema)) {
+    const { default: defaultValue, ...contentSchema } = jsonSchema;
+    return formSchemaToZod(contentSchema).prefault(defaultValue).meta({ ...jsonSchema });
+  }
+  if (jsonSchema.steps?.some((step) => step.showIf) || Object.values(jsonSchema.properties ?? {}).some((prop) => prop.showIf)) {
+    const display = z.z.fromJSONSchema(jsonSchema);
+    const shape = Object.fromEntries(Object.entries(display.shape).map(([key]) => [key, z.z.unknown().optional()]));
+    const conditional = z.z.object(shape).passthrough().transform((data, ctx) => {
+      const { schema: visibleSchema, data: visibleData } = resolveVisibleSchema(jsonSchema, data);
+      const result = formSchemaToZod(visibleSchema).safeParse(visibleData);
+      if (!result.success) {
+        for (const issue of result.error.issues) ctx.addIssue({ ...issue });
+        return z.z.NEVER;
+      }
+      return result.data;
+    }).meta({ ...jsonSchema });
+    displaySchemas.set(conditional, display);
+    return conditional;
+  }
   let schema = z.z.fromJSONSchema(jsonSchema);
+  if (schema instanceof z.z.ZodObject) {
+    const nestedShape = {};
+    for (const [key, prop] of Object.entries(jsonSchema.properties ?? {})) {
+      if (!hasVisibilityRules({ properties: { [key]: prop } })) continue;
+      let nested;
+      if (prop.type === "object" && prop.properties) nested = formSchemaToZod(prop);
+      if (prop.type === "array" && prop.items?.properties) {
+        let array = z.z.array(formSchemaToZod(prop.items));
+        if (typeof prop.minItems === "number") array = array.min(prop.minItems);
+        if (typeof prop.maxItems === "number") array = array.max(prop.maxItems);
+        nested = array;
+      }
+      if (nested) {
+        if (!jsonSchema.required?.includes(key)) nested = nested.optional();
+        nestedShape[key] = prop.default !== void 0 ? nested.prefault(prop.default) : nested;
+      }
+    }
+    if (Object.keys(nestedShape).length) schema = schema.extend(nestedShape);
+  }
   if (schema && typeof schema.passthrough === "function") {
     schema = schema.passthrough();
   }
@@ -127,7 +226,9 @@ function getStepGroupMap(jsonSchema) {
 }
 
 exports.formSchemaToZod = formSchemaToZod;
+exports.getFormDisplaySchema = getFormDisplaySchema;
 exports.getStepGroupMap = getStepGroupMap;
 exports.getSteps = getSteps;
 exports.hasSteps = hasSteps;
+exports.resolveVisibleSchema = resolveVisibleSchema;
 exports.zodToFormSchema = zodToFormSchema;

package/dist/ui/src/lib/schema-converter.mjs

@@ -1,5 +1,18 @@
 import { z } from 'zod';
+import { matchesShowIf } from './form-visibility.mjs';
 
+const displaySchemas = /* @__PURE__ */ new WeakMap();
+function getFormDisplaySchema(schema) {
+  const cached = displaySchemas.get(schema);
+  if (cached) return cached;
+  const metadata = schema.meta();
+  if (schema instanceof z.ZodPipe && metadata?.properties) {
+    const display = z.fromJSONSchema(metadata);
+    displaySchemas.set(schema, display);
+    return display;
+  }
+  return void 0;
+}
 function zodToFormSchema(schema, metadata) {
   const jsonSchema = z.toJSONSchema(schema, {
     unrepresentable: "any",
@@ -104,8 +117,94 @@ function attachStepsMetadata(schema, jsonSchema) {
     stepGroupMap
   });
 }
+function hasVisibilityRules(schema) {
+  return Boolean(schema.steps?.some((step) => step.showIf) || Object.values(schema.properties ?? {}).some((prop) => prop.showIf || prop.properties && hasVisibilityRules(prop) || prop.items && hasVisibilityRules(prop.items)));
+}
+function resolveVisibleSchema(schema, values) {
+  const data = { ...values };
+  for (const [key, prop] of Object.entries(schema.properties ?? {})) {
+    if (data[key] === void 0 && prop.default !== void 0) Object.defineProperty(data, key, { value: prop.default, enumerable: true, writable: true, configurable: true });
+  }
+  const comparisonValues = { ...data };
+  const visibility = /* @__PURE__ */ new Map();
+  const resolving = [];
+  const isVisible = (key) => {
+    if (visibility.has(key)) return visibility.get(key);
+    const cycleStart = resolving.indexOf(key);
+    if (cycleStart !== -1) {
+      for (const field of resolving.slice(cycleStart)) visibility.set(field, false);
+      return false;
+    }
+    const prop = schema.properties?.[key];
+    if (!prop) return true;
+    resolving.push(key);
+    const matches = (condition) => {
+      if (!condition) return true;
+      const sourceVisible = isVisible(condition.field);
+      return matchesShowIf(condition, { [condition.field]: sourceVisible && Object.hasOwn(comparisonValues, condition.field) ? comparisonValues[condition.field] : void 0 });
+    };
+    const step = schema.steps?.[prop.stepGroup ?? schema.stepGroupMap?.[key] ?? 0];
+    const result = matches(step?.showIf) && matches(prop.showIf);
+    resolving.pop();
+    if (!visibility.has(key)) visibility.set(key, result);
+    return visibility.get(key);
+  };
+  const properties = /* @__PURE__ */ Object.create(null);
+  for (const [key, prop] of Object.entries(schema.properties ?? {})) {
+    if (!isVisible(key)) {
+      Reflect.deleteProperty(data, key);
+      continue;
+    }
+    const { showIf: _showIf, ...visibleProp } = prop;
+    if (prop.properties && data[key] && typeof data[key] === "object" && !Array.isArray(data[key])) {
+      const nested = resolveVisibleSchema(prop, data[key]);
+      Object.assign(visibleProp, nested.schema);
+      data[key] = nested.data;
+    }
+    properties[key] = visibleProp;
+  }
+  return { schema: { ...schema, properties, required: schema.required?.filter((key) => key in properties), steps: schema.steps?.map(({ showIf: _showIf, ...step }) => step) }, data };
+}
 function formSchemaToZod(jsonSchema) {
+  if (jsonSchema.default !== void 0 && hasVisibilityRules(jsonSchema)) {
+    const { default: defaultValue, ...contentSchema } = jsonSchema;
+    return formSchemaToZod(contentSchema).prefault(defaultValue).meta({ ...jsonSchema });
+  }
+  if (jsonSchema.steps?.some((step) => step.showIf) || Object.values(jsonSchema.properties ?? {}).some((prop) => prop.showIf)) {
+    const display = z.fromJSONSchema(jsonSchema);
+    const shape = Object.fromEntries(Object.entries(display.shape).map(([key]) => [key, z.unknown().optional()]));
+    const conditional = z.object(shape).passthrough().transform((data, ctx) => {
+      const { schema: visibleSchema, data: visibleData } = resolveVisibleSchema(jsonSchema, data);
+      const result = formSchemaToZod(visibleSchema).safeParse(visibleData);
+      if (!result.success) {
+        for (const issue of result.error.issues) ctx.addIssue({ ...issue });
+        return z.NEVER;
+      }
+      return result.data;
+    }).meta({ ...jsonSchema });
+    displaySchemas.set(conditional, display);
+    return conditional;
+  }
   let schema = z.fromJSONSchema(jsonSchema);
+  if (schema instanceof z.ZodObject) {
+    const nestedShape = {};
+    for (const [key, prop] of Object.entries(jsonSchema.properties ?? {})) {
+      if (!hasVisibilityRules({ properties: { [key]: prop } })) continue;
+      let nested;
+      if (prop.type === "object" && prop.properties) nested = formSchemaToZod(prop);
+      if (prop.type === "array" && prop.items?.properties) {
+        let array = z.array(formSchemaToZod(prop.items));
+        if (typeof prop.minItems === "number") array = array.min(prop.minItems);
+        if (typeof prop.maxItems === "number") array = array.max(prop.maxItems);
+        nested = array;
+      }
+      if (nested) {
+        if (!jsonSchema.required?.includes(key)) nested = nested.optional();
+        nestedShape[key] = prop.default !== void 0 ? nested.prefault(prop.default) : nested;
+      }
+    }
+    if (Object.keys(nestedShape).length) schema = schema.extend(nestedShape);
+  }
   if (schema && typeof schema.passthrough === "function") {
     schema = schema.passthrough();
   }
@@ -124,4 +223,4 @@ function getStepGroupMap(jsonSchema) {
   return jsonSchema.stepGroupMap ?? extractStepGroupMap(jsonSchema);
 }
 
-export { formSchemaToZod, getStepGroupMap, getSteps, hasSteps, zodToFormSchema };
+export { formSchemaToZod, getFormDisplaySchema, getStepGroupMap, getSteps, hasSteps, resolveVisibleSchema, zodToFormSchema };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/plugin-form-builder",
-  "version": "1.0.0-beta.0",
+  "version": "1.2.0-beta.1",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -147,7 +147,7 @@
     "better-call": "1.4.4"
   },
   "peerDependencies": {
-    "@btst/stack": ">=6.0.0-beta.0 <7.0.0",
+    "@btst/stack": ">=6.2.0-beta.1 <6.2.0",
     "@btst/yar": ">=1.3.2",
     "@tanstack/react-query": "^5.0.0",
     "react": ">=19.2.6",
@@ -166,10 +166,10 @@
     "@btst/adapter-memory": "3.0.1",
     "jsdom": "^28.1.0",
     "@types/slug": "^5.0.9",
-    "@btst/stack": "6.0.0-beta.0",
+    "@btst/stack": "6.2.0-beta.1",
     "@workspace/ui": "0.0.0"
   },
-  "gitHead": "ac7a6206d81e36262baf4392255575b4dc9bf6b5",
+  "gitHead": "657bc1fff550f456c13c9de9caaa87c7978c0f33",
   "scripts": {
     "build": "unbuild --clean",
     "typecheck": "tsc --project tsconfig.json && tsc --project tsconfig.typecheck.json",