@logixjs/form 0.0.2 → 1.0.1

package/dist/Form.cjs

@@ -42,7 +42,7 @@ module.exports = __toCommonJS(Form_exports);
 
 // src/internal/form/impl.ts
 var Logix4 = __toESM(require("@logixjs/core"), 1);
-var import_effect4 = require("effect");
+var import_effect3 = require("effect");
 
 // src/internal/form/traits.ts
 var isPlainObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
@@ -1006,8 +1006,14 @@ var makeFormController = (params) => {
         });
         const state = yield* runtime.getState;
         const { errors: _errors, ui: _ui, $form: _meta, ...values } = state;
-        const decoded = import_effect.Schema.decodeUnknownEither(params.valuesSchema)(values);
-        const schemaTree = decoded._tag === "Right" ? {} : toSchemaErrorTree(decoded.left);
+        const schemaTree = (() => {
+          try {
+            import_effect.Schema.decodeUnknownSync(params.valuesSchema)(values);
+            return {};
+          } catch (error) {
+            return toSchemaErrorTree(error);
+          }
+        })();
         yield* runtime.dispatch({
           _tag: "setValue",
           payload: { path: "errors.$schema", value: schemaTree }
@@ -1049,8 +1055,14 @@ var makeFormController = (params) => {
           $form: _metaAfterRules,
           ...valuesAfterRules
         } = stateAfterRules;
-        const decoded = import_effect.Schema.decodeUnknownEither(params.valuesSchema)(valuesAfterRules);
-        const schemaTree = decoded._tag === "Right" ? {} : toSchemaErrorTree(decoded.left);
+        const schemaTree = (() => {
+          try {
+            import_effect.Schema.decodeUnknownSync(params.valuesSchema)(valuesAfterRules);
+            return {};
+          } catch (error) {
+            return toSchemaErrorTree(error);
+          }
+        })();
         yield* runtime.dispatch({
           _tag: "setValue",
           payload: { path: "errors.$schema", value: schemaTree }
@@ -1166,7 +1178,7 @@ var install = (module2, config) => module2.logic(($) => {
     const prev = pending.get(path);
     if (!prev) return;
     pending.delete(path);
-    yield* import_effect2.Fiber.interruptFork(prev);
+    yield* import_effect2.Fiber.interrupt(prev);
   });
   const scheduleDebouncedValidate = (path) => import_effect2.Effect.gen(function* () {
     const ms = debounceMs ?? 0;
@@ -1177,9 +1189,9 @@ var install = (module2, config) => module2.logic(($) => {
     yield* cancelPending(path);
     const fiber = yield* import_effect2.Effect.forkScoped(
       import_effect2.Effect.sleep(import_effect2.Duration.millis(ms)).pipe(
-        import_effect2.Effect.zipRight(validate("valueChange", path)),
+        import_effect2.Effect.flatMap(() => validate("valueChange", path)),
         import_effect2.Effect.ensuring(import_effect2.Effect.sync(() => pending.delete(path))),
-        import_effect2.Effect.catchAllCause(() => import_effect2.Effect.void)
+        import_effect2.Effect.catchCause(() => import_effect2.Effect.void)
       )
     );
     pending.set(path, fiber);
@@ -1316,7 +1328,6 @@ var makeFormRulesManifestArtifactExporter = (params) => ({
 });
 
 // src/internal/validators/index.ts
-var import_effect3 = require("effect");
 var ERROR_VALUE_MAX_BYTES = 256;
 var textEncoder = new TextEncoder();
 var jsonByteSize = (value) => {
@@ -1411,7 +1422,7 @@ var pattern = (decl) => {
 var schemaErrorMessage = (schemaError) => {
   let message;
   try {
-    message = import_effect3.ParseResult.TreeFormatter.formatErrorSync(schemaError);
+    message = schemaError instanceof Error ? schemaError.message || "schema invalid" : String(schemaError);
   } catch {
     message = "schema invalid";
   }
@@ -1549,28 +1560,28 @@ var list = (listPath, spec) => ({
 
 // src/internal/form/impl.ts
 var FormActions = {
-  setValue: import_effect4.Schema.Struct({ path: import_effect4.Schema.String, value: import_effect4.Schema.Unknown }),
-  blur: import_effect4.Schema.Struct({ path: import_effect4.Schema.String }),
-  submit: import_effect4.Schema.Void,
-  validate: import_effect4.Schema.Void,
-  validatePaths: import_effect4.Schema.Array(import_effect4.Schema.String),
-  submitAttempt: import_effect4.Schema.Void,
-  setSubmitting: import_effect4.Schema.Boolean,
-  reset: import_effect4.Schema.UndefinedOr(import_effect4.Schema.Unknown),
-  setError: import_effect4.Schema.Struct({ path: import_effect4.Schema.String, error: import_effect4.Schema.Unknown }),
-  clearErrors: import_effect4.Schema.UndefinedOr(import_effect4.Schema.Array(import_effect4.Schema.String)),
-  arrayAppend: import_effect4.Schema.Struct({ path: import_effect4.Schema.String, value: import_effect4.Schema.Unknown }),
-  arrayPrepend: import_effect4.Schema.Struct({ path: import_effect4.Schema.String, value: import_effect4.Schema.Unknown }),
-  arrayRemove: import_effect4.Schema.Struct({ path: import_effect4.Schema.String, index: import_effect4.Schema.Number }),
-  arraySwap: import_effect4.Schema.Struct({
-    path: import_effect4.Schema.String,
-    indexA: import_effect4.Schema.Number,
-    indexB: import_effect4.Schema.Number
+  setValue: import_effect3.Schema.Struct({ path: import_effect3.Schema.String, value: import_effect3.Schema.Unknown }),
+  blur: import_effect3.Schema.Struct({ path: import_effect3.Schema.String }),
+  submit: import_effect3.Schema.Void,
+  validate: import_effect3.Schema.Void,
+  validatePaths: import_effect3.Schema.Array(import_effect3.Schema.String),
+  submitAttempt: import_effect3.Schema.Void,
+  setSubmitting: import_effect3.Schema.Boolean,
+  reset: import_effect3.Schema.UndefinedOr(import_effect3.Schema.Unknown),
+  setError: import_effect3.Schema.Struct({ path: import_effect3.Schema.String, error: import_effect3.Schema.Unknown }),
+  clearErrors: import_effect3.Schema.UndefinedOr(import_effect3.Schema.Array(import_effect3.Schema.String)),
+  arrayAppend: import_effect3.Schema.Struct({ path: import_effect3.Schema.String, value: import_effect3.Schema.Unknown }),
+  arrayPrepend: import_effect3.Schema.Struct({ path: import_effect3.Schema.String, value: import_effect3.Schema.Unknown }),
+  arrayRemove: import_effect3.Schema.Struct({ path: import_effect3.Schema.String, index: import_effect3.Schema.Number }),
+  arraySwap: import_effect3.Schema.Struct({
+    path: import_effect3.Schema.String,
+    indexA: import_effect3.Schema.Number,
+    indexB: import_effect3.Schema.Number
   }),
-  arrayMove: import_effect4.Schema.Struct({
-    path: import_effect4.Schema.String,
-    from: import_effect4.Schema.Number,
-    to: import_effect4.Schema.Number
+  arrayMove: import_effect3.Schema.Struct({
+    path: import_effect3.Schema.String,
+    from: import_effect3.Schema.Number,
+    to: import_effect3.Schema.Number
   })
 };
 var initialMeta2 = () => ({
@@ -1580,22 +1591,20 @@ var initialMeta2 = () => ({
   errorCount: 0
 });
 var make2 = (id, config, extend) => {
-  const ErrorsSchema = import_effect4.Schema.Unknown;
-  const UiSchema = import_effect4.Schema.Unknown;
-  const MetaSchema = import_effect4.Schema.Struct({
-    submitCount: import_effect4.Schema.Number,
-    isSubmitting: import_effect4.Schema.Boolean,
-    isDirty: import_effect4.Schema.Boolean,
-    errorCount: import_effect4.Schema.Number
+  const ErrorsSchema = import_effect3.Schema.Unknown;
+  const UiSchema = import_effect3.Schema.Unknown;
+  const MetaSchema = import_effect3.Schema.Struct({
+    submitCount: import_effect3.Schema.Number,
+    isSubmitting: import_effect3.Schema.Boolean,
+    isDirty: import_effect3.Schema.Boolean,
+    errorCount: import_effect3.Schema.Number
+  });
+  const StateSchema = import_effect3.Schema.Struct({
+    ...config.values.fields ?? {},
+    errors: ErrorsSchema,
+    ui: UiSchema,
+    $form: MetaSchema
   });
-  const StateSchema = import_effect4.Schema.extend(
-    config.values,
-    import_effect4.Schema.Struct({
-      errors: ErrorsSchema,
-      ui: UiSchema,
-      $form: MetaSchema
-    })
-  );
   const Actions = FormActions;
   const reducers = makeFormReducers({
     initialValues: config.initialValues
@@ -1637,67 +1646,60 @@ var make2 = (id, config, extend) => {
     if (mode === "store" || mode === "index") return;
     throw new Error(`[Form.make] Invalid identity.mode for "${listPath}" (got "${String(mode)}")`);
   };
+  const isRelativeRuleDep = (dep, options) => {
+    const allowNumericRelativeDep = options?.allowNumericRelativeDep ?? true;
+    if (dep === "$root") return false;
+    if (dep.includes("[") || dep.includes("]") || dep.includes(".")) return false;
+    if (!allowNumericRelativeDep && /^[0-9]+$/.test(dep)) return false;
+    return true;
+  };
+  const prefixRuleDeps = (deps, prefix, options) => {
+    if (!Array.isArray(deps)) return void 0;
+    const out = [];
+    for (const raw of deps) {
+      if (typeof raw !== "string") continue;
+      const dep = raw.trim();
+      if (!dep) continue;
+      out.push(isRelativeRuleDep(dep, options) && prefix ? `${prefix}.${dep}` : dep);
+    }
+    return out;
+  };
+  const prefixRuleInputDeps = (input, prefix, options) => {
+    if (!input || typeof input !== "object") return input;
+    if (Array.isArray(input)) return input;
+    const anyInput = input;
+    const deps = prefixRuleDeps(anyInput.deps, prefix, options);
+    const validate = anyInput.validate;
+    if (typeof validate === "function") {
+      return deps !== void 0 ? { ...anyInput, deps } : input;
+    }
+    if (validate && typeof validate === "object" && !Array.isArray(validate)) {
+      const nextValidate = { ...validate };
+      for (const [name, raw] of Object.entries(validate)) {
+        if (!raw || typeof raw !== "object" || Array.isArray(raw)) continue;
+        const entryDeps = prefixRuleDeps(raw.deps, prefix, options);
+        if (entryDeps !== void 0) {
+          nextValidate[name] = { ...raw, deps: entryDeps };
+        }
+      }
+      return {
+        ...anyInput,
+        ...deps !== void 0 ? { deps } : {},
+        validate: nextValidate
+      };
+    }
+    return deps !== void 0 ? { ...anyInput, deps } : input;
+  };
   const compileRulesToTraitSpec = (rulesSpec2) => {
     if (!rulesSpec2 || rulesSpec2._tag !== "FormRulesSpec") {
       throw new Error(`[Form.make] "rules" must be a FormRulesSpec (from Form.rules(...)/rules.schema(...))`);
     }
-    const joinPath2 = (prefix, suffix) => {
-      if (!prefix) return suffix;
-      if (!suffix) return prefix;
-      return `${prefix}.${suffix}`;
-    };
     const dirnamePath = (path) => {
       const p = String(path ?? "").trim();
       if (!p) return "";
       const idx = p.lastIndexOf(".");
       return idx >= 0 ? p.slice(0, idx) : "";
     };
-    const isRelativeDep = (dep) => {
-      if (typeof dep !== "string") return false;
-      const d = dep.trim();
-      if (!d) return false;
-      if (d === "$root") return false;
-      if (d.includes("[") || d.includes("]")) return false;
-      if (d.includes(".")) return false;
-      return true;
-    };
-    const prefixDeps = (deps, prefix) => {
-      if (!Array.isArray(deps)) return void 0;
-      const out = [];
-      for (const raw of deps) {
-        if (typeof raw !== "string") continue;
-        const d = raw.trim();
-        if (!d) continue;
-        out.push(isRelativeDep(d) ? joinPath2(prefix, d) : d);
-      }
-      return out;
-    };
-    const prefixRuleInputDeps = (input, prefix) => {
-      if (!input || typeof input !== "object") return input;
-      if (Array.isArray(input)) return input;
-      const anyInput = input;
-      const deps = prefixDeps(anyInput.deps, prefix);
-      const validate = anyInput.validate;
-      if (typeof validate === "function") {
-        return deps !== void 0 ? { ...anyInput, deps } : input;
-      }
-      if (validate && typeof validate === "object" && !Array.isArray(validate)) {
-        const nextValidate = { ...validate };
-        for (const [name, raw] of Object.entries(validate)) {
-          if (!raw || typeof raw !== "object" || Array.isArray(raw)) continue;
-          const entryDeps = prefixDeps(raw.deps, prefix);
-          if (entryDeps !== void 0) {
-            nextValidate[name] = { ...raw, deps: entryDeps };
-          }
-        }
-        return {
-          ...anyInput,
-          ...deps !== void 0 ? { deps } : {},
-          validate: nextValidate
-        };
-      }
-      return deps !== void 0 ? { ...anyInput, deps } : input;
-    };
     const decls = Array.isArray(rulesSpec2.decls) ? rulesSpec2.decls : [];
     const spec = {};
     const declared = /* @__PURE__ */ new Set();
@@ -1872,45 +1874,9 @@ var make2 = (id, config, extend) => {
             const idx = valuePath.lastIndexOf(".");
             return idx >= 0 ? valuePath.slice(0, idx) : "";
           })();
-          const prefixDeps = (deps, prefix) => {
-            if (!Array.isArray(deps)) return void 0;
-            const out = [];
-            for (const raw of deps) {
-              if (typeof raw !== "string") continue;
-              const d = raw.trim();
-              if (!d) continue;
-              const isRelative = d !== "$root" && !d.includes("[") && !d.includes("]") && !d.includes(".") && !/^[0-9]+$/.test(d);
-              out.push(isRelative && prefix ? `${prefix}.${d}` : d);
-            }
-            return out;
-          };
-          const prefixRuleInputDeps = (input, prefix) => {
-            if (!input || typeof input !== "object") return input;
-            if (Array.isArray(input)) return input;
-            const anyInput = input;
-            const deps = prefixDeps(anyInput.deps, prefix);
-            const validate = anyInput.validate;
-            if (typeof validate === "function") {
-              return deps !== void 0 ? { ...anyInput, deps } : input;
-            }
-            if (validate && typeof validate === "object" && !Array.isArray(validate)) {
-              const nextValidate = { ...validate };
-              for (const [ruleName, raw] of Object.entries(validate)) {
-                if (!raw || typeof raw !== "object" || Array.isArray(raw)) continue;
-                const entryDeps = prefixDeps(raw.deps, prefix);
-                if (entryDeps !== void 0) {
-                  nextValidate[ruleName] = { ...raw, deps: entryDeps };
-                }
-              }
-              return {
-                ...anyInput,
-                ...deps !== void 0 ? { deps } : {},
-                validate: nextValidate
-              };
-            }
-            return deps !== void 0 ? { ...anyInput, deps } : input;
-          };
-          const ruleInput = prefixRuleInputDeps(decl.rule, depsPrefix);
+          const ruleInput = prefixRuleInputDeps(decl.rule, depsPrefix, {
+            allowNumericRelativeDep: false
+          });
           const rules3 = make(ruleInput);
           emitRuleSet({
             source: "rules",
@@ -2137,7 +2103,7 @@ var derived = (_valuesSchema) => {
 };
 
 // src/internal/dsl/rules.ts
-var import_effect5 = require("effect");
+var import_effect4 = require("effect");
 var normalizePrefix = (prefix) => {
   const p = String(prefix ?? "").trim();
   if (!p) return "";
@@ -2190,8 +2156,12 @@ var makeFieldNode = (rule) => ({
 var fieldFromSchema = (schema) => ({
   validate: {
     schema: (value) => {
-      const decoded = import_effect5.Schema.decodeUnknownEither(schema)(value);
-      return decoded._tag === "Right" ? void 0 : schemaErrorMessage(decoded.left);
+      try {
+        import_effect4.Schema.decodeUnknownSync(schema)(value);
+        return void 0;
+      } catch (error) {
+        return schemaErrorMessage(error);
+      }
     }
   }
 });
@@ -2415,7 +2385,7 @@ var rules = (_valuesSchema) => {
         return field(args[0], args[1], args[2]);
       }
       const input = args[0];
-      if (import_effect5.Schema.isSchema(input)) return makeFieldNode(fieldFromSchema(input));
+      if (import_effect4.Schema.isSchema(input)) return makeFieldNode(fieldFromSchema(input));
       return makeFieldNode(input);
     }
     build.field = field2;