@effect-app/vue-components 2.7.11 → 2.9.0

package/src/components/OmegaForm/useOmegaForm.ts

@@ -5,119 +5,17 @@ import * as api from "@opentelemetry/api"
 import { type DeepKeys, DeepValue, type FormAsyncValidateOrFn, type FormValidateOrFn, type StandardSchemaV1, StandardSchemaV1Issue, useForm, ValidationError, ValidationErrorMap } from "@tanstack/vue-form"
 import { Array, Data, Effect, Fiber, Option, Order, S } from "effect-app"
 import { runtimeFiberAsPromise } from "effect-app/utils"
-import { isObject } from "effect/Predicate"
 import { Component, computed, ComputedRef, ConcreteComponent, h, type InjectionKey, onBeforeUnmount, onMounted, onUnmounted, Ref, ref, watch } from "vue"
+import { deepMerge, extractSchemaDefaults } from "./defaultAST"
 import { MergedInputProps } from "./InputProps"
 import OmegaArray from "./OmegaArray.vue"
 import OmegaAutoGen from "./OmegaAutoGen.vue"
 import OmegaErrorsInternal from "./OmegaErrorsInternal.vue"
-import { BaseProps, DefaultTypeProps, FieldPath, type FormProps, generateMetaFromSchema, isNullableOrUndefined, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff"
+import { BaseProps, DefaultTypeProps, FieldPath, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import OmegaTaggedUnion from "./OmegaTaggedUnion.vue"
 import OmegaForm from "./OmegaWrapper.vue"
 
-/**
- * Recursively makes all properties in a schema optional, including nested objects.
- * Unlike S.partial which only makes top-level properties optional, this utility
- * traverses the schema tree and applies partial transformation at every level.
- *
- * Handles:
- * - TypeLiteral (structs): Makes all properties optional and recursively processes nested types
- * - Union types: Recursively applies partial to each union member
- * - Transformation types: Applies partial to both 'from' and 'to' sides
- */
-const partialRecursive = <A, I, R>(schema: S.Schema<A, I, R>): S.Schema<Partial<A>, Partial<I>, R> => {
-  const ast = schema.ast
-
-  // Handle Refinement types (e.g., NonEmptyArray, filters on ExtendedClass)
-  if (ast._tag === "Refinement") {
-    const refinementAst = ast as any
-    // For refinements, bypass the filter and recursively apply partial to the underlying type
-    const fromSchema = S.make(refinementAst.from)
-    return partialRecursive(fromSchema as any)
-  }
-
-  // Handle Union types - recursively apply partial to each member
-  if (ast._tag === "Union") {
-    const partialMembers = (ast as any).types.map((memberAst: any) => {
-      const memberSchema = S.make(memberAst)
-      const partialMember = partialRecursive(memberSchema as any)
-      return partialMember.ast
-    })
-
-    const newAst = {
-      ...ast,
-      types: partialMembers
-    }
-
-    return S.make(newAst as any)
-  }
-
-  // Handle Transformation types (e.g., withDefaultConstructor, ExtendedClass)
-  if (ast._tag === "Transformation") {
-    const transformAst = ast as any
-
-    // Special handling for ExtendedClass (Declaration in 'to' side)
-    if (transformAst.to._tag === "Declaration") {
-      // For ExtendedClass, extract the TypeLiteral from the 'from' side
-      // and make that partial, bypassing the Declaration entirely
-      const fromSchema = S.make(transformAst.from)
-      return partialRecursive(fromSchema as any)
-    }
-
-    // For other transformations, apply partial to both sides
-    const fromSchema = S.make(transformAst.from)
-    const toSchema = S.make(transformAst.to)
-    const partialFrom = partialRecursive(fromSchema as any)
-    const partialTo = partialRecursive(toSchema as any)
-
-    const newAst = {
-      ...ast,
-      from: partialFrom.ast,
-      to: partialTo.ast
-    }
-
-    return S.make(newAst as any)
-  }
-
-  // If this is a TypeLiteral (struct), recursively apply partial to nested fields
-  if (ast._tag === "TypeLiteral") {
-    const fields = ast.propertySignatures.map((prop: any) => {
-      const propType = prop.type
-      let newType = propType
-
-      // Recursively handle nested complex types (structs, unions, transformations, refinements)
-      if (
-        propType._tag === "TypeLiteral" || propType._tag === "Union" || propType
-            ._tag === "Transformation" || propType
-            ._tag === "Refinement"
-      ) {
-        const nestedSchema = S.make(propType)
-        const recursivePartial = partialRecursive(nestedSchema as any)
-        newType = recursivePartial.ast
-      }
-
-      // Create a new property signature with isOptional: true
-      return {
-        ...prop,
-        type: newType,
-        isOptional: true
-      }
-    })
-
-    const newAst = {
-      ...ast,
-      propertySignatures: fields
-    }
-
-    return S.make(newAst as any)
-  }
-
-  // For other schema types (primitives, refinements, etc.), return as-is
-  // These types don't need to be made partial, and S.partial doesn't support them anyway
-  return schema as any
-}
-
 type keysRule<T> =
   | {
     keys?: NestedKeyOf<T>[]
@@ -458,6 +356,7 @@ export interface OmegaFormReturn<
   // Pre-computed type aliases - computed ONCE for performance
   _paths: FieldPath<From>
   _keys: DeepKeys<From>
+  _schema: S.Schema<To, From, never>
 
   // this crazy thing here is copied from the OmegaFormInput.vue.d.ts, with `From` removed as Generic, instead closed over from the From generic above..
   Input: <Name extends OmegaFormReturn<From, To, TypeProps>["_paths"]>(
@@ -763,89 +662,6 @@ export const useOmegaForm = <
     window.history.replaceState({}, "", url.toString())
   }
 
-  function deepMerge(target: any, source: any) {
-    for (const key in source) {
-      if (Array.isArray(source[key])) {
-        // Arrays should be copied directly, not deep merged
-        target[key] = source[key]
-      } else if (source[key] && isObject(source[key])) {
-        if (!target[key]) {
-          target[key] = {}
-        }
-        deepMerge(target[key], source[key])
-      } else {
-        target[key] = source[key]
-      }
-    }
-    return target
-  }
-
-  // Helper function to recursively extract default values from schema AST
-  const extractDefaultsFromAST = (schemaObj: any): any => {
-    const result: Record<string, any> = {}
-
-    // Check if this schema has fields (struct)
-    if (schemaObj?.fields && typeof schemaObj.fields === "object") {
-      for (const [key, fieldSchema] of Object.entries(schemaObj.fields)) {
-        // Check if this field has a default value in its AST
-        if ((fieldSchema as any)?.ast?.defaultValue) {
-          try {
-            const defaultValue = (fieldSchema as any).ast.defaultValue()
-            result[key] = defaultValue
-          } catch {
-            // Silently ignore if defaultValue() throws
-          }
-        } else {
-          // TODO Should we put to null/undefined only leaves?
-          const ast = (fieldSchema as any)?.ast
-          const nullableOrUndefined = isNullableOrUndefined(ast)
-          switch (nullableOrUndefined) {
-            case "null":
-              result[key] = null
-              break
-            case "undefined":
-              result[key] = undefined
-              break
-          }
-        }
-
-        // Recursively check nested fields for structs and unions
-        const nestedDefaults = extractDefaultsFromAST(fieldSchema as any)
-        if (Object.keys(nestedDefaults).length > 0) {
-          // If we already have a default value for this key, merge with nested
-          if (result[key] && typeof result[key] === "object") {
-            Object.assign(result[key], nestedDefaults)
-          } else if (!result[key]) {
-            // Only set nested defaults if we don't have a default value
-            result[key] = nestedDefaults
-          }
-        }
-      }
-    } else {
-      if (schemaObj?.from?.fields && typeof schemaObj?.from?.fields === "object") {
-        return extractDefaultsFromAST(schemaObj.from)
-      }
-    }
-
-    return result
-  }
-
-  // Extract default values from schema constructors (e.g., withDefaultConstructor)
-  const extractSchemaDefaults = (defaultValues: Partial<From> = {}) => {
-    let result: Partial<From> = {}
-
-    try {
-      const astDefaults = extractDefaultsFromAST(schema)
-      result = S.encodeSync(partialRecursive(schema))(astDefaults)
-    } catch (astError) {
-      if (window.location.hostname === "localhost") {
-        console.warn("Could not extract defaults from AST:", astError)
-      }
-    }
-
-    return deepMerge(result, defaultValues)
-  }
-
   const defaultValues = computed(() => {
     // will contain what we get from querystring or local/session storage
     let defValuesPatch
@@ -892,6 +708,7 @@ export const useOmegaForm = <
 
     // we just return what we gathered from the query/storage
     return extractSchemaDefaults(
+      schema,
       omegaConfig?.persistency?.overrideDefaultValues
         ? deepMerge(tanstackFormOptions?.defaultValues || {}, defValuesPatch)
         : deepMerge(defValuesPatch, tanstackFormOptions?.defaultValues || {})
@@ -1107,6 +924,7 @@ export const useOmegaForm = <
     // Type-level properties for performance optimization (not used at runtime)
     _paths: undefined as any,
     _keys: undefined as any,
+    _schema: schema,
     errorContext,
     Form: fHoc(formWithExtras)(OmegaForm as any) as any,
     Input: fHoc(formWithExtras)(omegaConfig?.input ?? OmegaInput) as any,

package/dist/vue-components.es35.js

@@ -1,9 +0,0 @@
-const s = (t, e) => {
-  const o = t.__vccOpts || t;
-  for (const [r, c] of e)
-    o[r] = c;
-  return o;
-};
-export {
-  s as default
-};

package/dist/vue-components.es40.js

@@ -1,6 +0,0 @@
-(function(){"use strict";try{if(typeof document<"u"){var i=document.createElement("style");if(i.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),document.head.appendChild(i),window.customElements){const e=window.customElements.define;window.customElements.define=function(s,t){const n=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(n&&n.call(this),this.shadowRoot){const a=document.createElement("style");a.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),this.shadowRoot.appendChild(a)}},e.call(window.customElements,s,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
-import o from "./vue-components.es38.js";
-
-export {
-  o as default
-};