@jinntec/fore 2.4.0 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jinntec/fore",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Fore - declarative user interfaces in plain HTML",
   "module": "./index.js",
   "publishConfig": {

package/src/fore.js

@@ -300,33 +300,29 @@ export class Fore {
       const { children } = startElement;
       if (children) {
         for (const element of Array.from(children)) {
-          if (element.nodeName.toUpperCase() === 'FX-FORE') {
-            break;
-          }
-          if (Fore.isUiElement(element.nodeName)) {
-            /**
-             * @type {import('./ForeElementMixin.js').default}
-             */
-            const foreElement = element;
-
-            if (typeof foreElement.refresh === 'function') {
-              if (
-                force &&
-                typeof force === 'object' &&
-                force.reason === 'index-function' &&
-                foreElement._dependencies.isInvalidatedByIndexFunction()
-              ) {
-                element.refresh(force);
-                continue;
-              } else if (force === true) {
-                element.refresh(force);
-              }
+            if (element.nodeName.toUpperCase() === 'FX-FORE') {
+              break;
+            }
+            if (Fore.isUiElement(element.nodeName) && typeof element.refresh === 'function') {
+                /**
+                 * @type {import('./ForeElementMixin.js').default}
+                 */
+                if (
+                    force &&
+                    typeof force === 'object' &&
+                    force.reason === 'index-function' &&
+                    element._dependencies.isInvalidatedByIndexFunction()
+                ) {
+                    element.refresh(force);
+                    continue;
+                } else if (force === true) {
+                    element.refresh(force);
+                }
+                // console.log('refreshing', element, element?.ref);
+                // console.log('refreshing ',element);
+            } else if (element.nodeName.toUpperCase() !== 'FX-MODEL') {
+                Fore.refreshChildren(element, force);
             }
-            // console.log('refreshing', element, element?.ref);
-            // console.log('refreshing ',element);
-          } else if (element.nodeName.toUpperCase() !== 'FX-MODEL') {
-            Fore.refreshChildren(element, force);
-          }
         }
       }
       resolve('done');

package/src/fx-model.js

@@ -416,10 +416,12 @@ export class FxModel extends HTMLElement {
             modelItem.required = compute;
             this.formElement.addToRefresh(modelItem); // let fore know that modelItem needs refresh
             if (!modelItem.node.textContent) {
+/*
               console.log(
                 'node is required but has no value ',
                 XPathUtil.getDocPath(modelItem.node),
               );
+*/
               valid = false;
             }
             // if (!compute) valid = false;
@@ -508,7 +510,7 @@ export class FxModel extends HTMLElement {
           ? this.fore.parentNode.host.closest('fx-fore')
           : this.fore.parentNode.closest('fx-fore');
       if (parentFore) {
-        console.log('shared instances from parent', this.parentNode.id);
+        // console.log('shared instances from parent', this.parentNode.id);
         const parentInstances = parentFore.getModel().instances;
         const shared = parentInstances.filter(shared => shared.hasAttribute('shared'));
         found = shared.find(found => found.id === id);