@astroapps/forms-core 1.0.1 → 1.1.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { ensureMetaValue, newControl, updateComputedValue, addDependent, createSyncEffect, createAsyncEffect, collectChanges, trackedValue, createCleanupScope, createEffect, trackControlChange, ControlChange, createScopedEffect, getControlPath, unsafeRestoreControl, getCurrentFields } from '@astroapps/controls';
+import { ensureMetaValue, newControl, updateComputedValue, addDependent, createSyncEffect, createAsyncEffect, collectChanges, trackedValue, createCleanupScope, createEffect, trackControlChange, ControlChange, getCurrentFields, getMetaValue, createScopedEffect, getControlPath, unsafeRestoreControl } from '@astroapps/controls';
 import jsonata from 'jsonata';
 import { v4 } from 'uuid';
 
@@ -1074,6 +1074,35 @@ function visitFormDataInContext(parentContext, node, cb) {
   const dataNode = lookupDataNode(node.definition, parentContext);
   return visitFormData(node, dataNode != null ? dataNode : parentContext, cb, !dataNode);
 }
+function visitFormDataNode(node, visitFn) {
+  const dataNode = lookupDataNode(node.formNode.definition, node.parentData);
+  const v = visitFn(node, dataNode);
+  if (v !== undefined) return v;
+  const parentData = dataNode != null ? dataNode : node.parentData;
+  if (parentData.schema.field.collection && parentData.elementIndex == null) {
+    const elemCount = parentData.control.elements.length;
+    for (let i = 0; i < elemCount; i++) {
+      const _v = visitChildren(parentData.getChildElement(i));
+      if (_v !== undefined) return _v;
+    }
+    return undefined;
+  } else {
+    return visitChildren(parentData);
+  }
+  function visitChildren(parentData) {
+    const children = node.formNode.getChildNodes();
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
+      const res = visitFormDataNode({
+        formNode: child,
+        parent: node,
+        parentData,
+        childIndex: i
+      }, visitFn);
+      if (res !== undefined) return res;
+    }
+  }
+}
 
 /**
  * Converts a JSON path array to a string.
@@ -1147,7 +1176,8 @@ const jsonataEval = (expr, {
   scope,
   returnResult,
   dataNode,
-  variables
+  variables,
+  runAsync
 }) => {
   const path = getJsonPath(dataNode);
   const pathString = jsonPathString(path, x => `#$i[${x}]`);
@@ -1174,7 +1204,8 @@ const jsonataEval = (expr, {
     // console.log(parsedJsonata.fields.fullExpr.value, evalResult, bindings);
     collectChanges(effect.collectUsage, () => returnResult(evalResult));
   }
-  createAsyncEffect(runJsonata, scope);
+  const asyncEffect = createAsyncEffect(runJsonata, scope);
+  runAsync(() => asyncEffect.start());
 };
 const uuidEval = (_, ctx) => {
   ctx.returnResult(v4());
@@ -1197,11 +1228,12 @@ const jsonataValidator = (validation, context) => {
     dataNode: context.parentData,
     returnResult: v => {
       trackControlChange(context.data.control, ControlChange.Validate);
-      console.log("Setting jsonata error", v);
+      // console.log("Setting jsonata error", v);
       context.data.control.setError("jsonata", v == null ? void 0 : v.toString());
     },
     schemaInterface: context.schemaInterface,
-    variables: context.formContext.fields.variables
+    variables: context.formContext.fields.variables,
+    runAsync: context.runAsync
   });
 };
 const lengthValidator = (lv, context) => {
@@ -1277,7 +1309,7 @@ function createValidators(def, context) {
     });
   }
 }
-function setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode) {
+function setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync) {
   const validationEnabled = createScopedComputed(controlImpl, () => !definition.hidden);
   const validatorsScope = createCleanupScope();
   createEffect(() => {
@@ -1296,7 +1328,8 @@ function setupValidation(controlImpl, definition, dataNode, schemaInterface, par
         addCleanup(cleanup) {
           validatorsScope.addCleanup(cleanup);
         },
-        formContext: controlImpl
+        formContext: controlImpl,
+        runAsync
       });
       createEffect(() => {
         if (!validationEnabled.value) return undefined;
@@ -1315,6 +1348,9 @@ function setupValidation(controlImpl, definition, dataNode, schemaInterface, par
   }, c => {}, controlImpl);
 }
 
+function getControlStateId(parent, formNode, stateKey) {
+  return parent.id + "$" + formNode.id + (stateKey != null ? stateKey : "");
+}
 function createFormState(schemaInterface, evaluators = defaultEvaluators) {
   // console.log("createFormState");
   const controlStates = newControl({});
@@ -1328,9 +1364,17 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
       // console.log("Cleanup form state");
       controlStates.cleanup();
     },
-    getControlState(parent, formNode, context) {
-      var _context$stateKey;
-      const stateId = parent.id + "$" + formNode.id + ((_context$stateKey = context.stateKey) != null ? _context$stateKey : "");
+    getExistingControlState(parent, formNode, stateKey) {
+      const stateId = getControlStateId(parent, formNode, stateKey);
+      const control = getCurrentFields(controlStates)[stateId];
+      if (control) {
+        var _getMetaValue;
+        return (_getMetaValue = getMetaValue(control, "impl")) == null ? void 0 : _getMetaValue.value;
+      }
+      return undefined;
+    },
+    getControlState(parent, formNode, context, runAsync) {
+      const stateId = getControlStateId(parent, formNode, context.stateKey);
       const controlImpl = controlStates.fields[stateId];
       controlImpl.value = context;
       function evalExpr(scope, init, nk, e, coerce) {
@@ -1343,7 +1387,8 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
             scope,
             dataNode: parent,
             variables: controlImpl.fields.variables,
-            schemaInterface
+            schemaInterface,
+            runAsync
           });
           return true;
         }
@@ -1395,7 +1440,8 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
           clearHidden: false,
           hidden: false,
           variables: (_controlImpl$fields$v = controlImpl.fields.variables.current.value) != null ? _controlImpl$fields$v : {},
-          stateId
+          stateId,
+          meta: newControl({})
         });
         const {
           dataNode,
@@ -1424,7 +1470,7 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
             dn.control.disabled = disabled.value;
           }
         }, scope);
-        setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode);
+        setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync);
         createSyncEffect(() => {
           var _dataNode$value;
           const dn = (_dataNode$value = dataNode.value) == null ? void 0 : _dataNode$value.control;
@@ -1517,5 +1563,5 @@ function createOverrideProxy(proxyFor, handlers) {
   });
 }
 
-export { ActionStyle, AdornmentPlacement, ControlAdornmentType, ControlDefinitionType, DataRenderType, DateComparison, DefaultSchemaInterface, DisplayDataType, DynamicPropertyType, ExpressionType, FieldType, FormNode, FormTree, GroupRenderType, IconLibrary, IconPlacement, SchemaDataNode, SchemaDataTree, SchemaDataTreeImpl, SchemaNode, SchemaTags, SchemaTree, SyncTextType, ValidationMessageType, ValidatorType, addFieldOption, boolField, buildSchema, compoundField, createControlMap, createFormLookup, createFormState, createFormTree, createOverrideProxy, createSchemaDataNode, createSchemaLookup, createSchemaNode, createSchemaTree, createScoped, createScopedComputed, dateField, dateTimeField, defaultCompoundField, defaultScalarField, defaultSchemaInterface, doubleField, fieldPathForDefinition, findField, fontAwesomeIcon, getDisplayOnlyOptions, getGroupRendererOptions, getJsonPath, getMetaFields, getRootDataNode, getSchemaFieldList, getSchemaNodePath, getSchemaNodePathString, getSchemaPath, getTagParam, hideDisplayOnly, intField, isActionControl, isArrayRenderer, isAutoCompleteClasses, isAutocompleteRenderer, isCheckEntryClasses, isCompoundField, isCompoundNode, isControlDisabled, isControlDisplayOnly, isControlReadonly, isDataControl, isDataGroupRenderer, isDateTimeRenderer, isDialogRenderer, isDisplayControl, isDisplayOnlyRenderer, isFlexRenderer, isGridRenderer, isGroupControl, isHtmlDisplay, isInlineRenderer, isScalarField, isSelectChildRenderer, isTabsRenderer, isTextDisplay, isTextfieldRenderer, isWizardRenderer, jsonPathString, legacyFormNode, lookupDataNode, makeCompoundField, makeParamTag, makeScalarField, makeSchemaDataNode, mergeField, mergeFields, missingField, relativePath, relativeSegmentPath, resolveSchemaNode, resolveSchemas, schemaDataForFieldPath, schemaDataForFieldRef, schemaForFieldPath, schemaForFieldRef, stringField, stringOptionsField, timeField, traverseData, traverseParents, traverseSchemaPath, validDataNode, visitControlData, visitControlDataArray, visitControlDefinition, visitFormData, visitFormDataInContext, withScalarOptions };
+export { ActionStyle, AdornmentPlacement, ControlAdornmentType, ControlDefinitionType, DataRenderType, DateComparison, DefaultSchemaInterface, DisplayDataType, DynamicPropertyType, ExpressionType, FieldType, FormNode, FormTree, GroupRenderType, IconLibrary, IconPlacement, SchemaDataNode, SchemaDataTree, SchemaDataTreeImpl, SchemaNode, SchemaTags, SchemaTree, SyncTextType, ValidationMessageType, ValidatorType, addFieldOption, boolField, buildSchema, compoundField, createControlMap, createFormLookup, createFormState, createFormTree, createOverrideProxy, createSchemaDataNode, createSchemaLookup, createSchemaNode, createSchemaTree, createScoped, createScopedComputed, dateField, dateTimeField, defaultCompoundField, defaultScalarField, defaultSchemaInterface, doubleField, fieldPathForDefinition, findField, fontAwesomeIcon, getControlStateId, getDisplayOnlyOptions, getGroupRendererOptions, getJsonPath, getMetaFields, getRootDataNode, getSchemaFieldList, getSchemaNodePath, getSchemaNodePathString, getSchemaPath, getTagParam, hideDisplayOnly, intField, isActionControl, isArrayRenderer, isAutoCompleteClasses, isAutocompleteRenderer, isCheckEntryClasses, isCompoundField, isCompoundNode, isControlDisabled, isControlDisplayOnly, isControlReadonly, isDataControl, isDataGroupRenderer, isDateTimeRenderer, isDialogRenderer, isDisplayControl, isDisplayOnlyRenderer, isFlexRenderer, isGridRenderer, isGroupControl, isHtmlDisplay, isInlineRenderer, isScalarField, isSelectChildRenderer, isTabsRenderer, isTextDisplay, isTextfieldRenderer, isWizardRenderer, jsonPathString, legacyFormNode, lookupDataNode, makeCompoundField, makeParamTag, makeScalarField, makeSchemaDataNode, mergeField, mergeFields, missingField, relativePath, relativeSegmentPath, resolveSchemaNode, resolveSchemas, schemaDataForFieldPath, schemaDataForFieldRef, schemaForFieldPath, schemaForFieldRef, stringField, stringOptionsField, timeField, traverseData, traverseParents, traverseSchemaPath, validDataNode, visitControlData, visitControlDataArray, visitControlDefinition, visitFormData, visitFormDataInContext, visitFormDataNode, withScalarOptions };
 //# sourceMappingURL=index.js.map