@jinntec/fore 2.6.0 → 2.7.0

package/index.js

@@ -67,3 +67,5 @@ import './src/ui/fx-control-menu.js';
 
 import './src/functions/fx-function.js';
 import './src/functions/fx-functionlib.js';
+
+export default {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jinntec/fore",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "Fore - declarative user interfaces in plain HTML",
   "module": "./index.js",
   "publishConfig": {
@@ -32,10 +32,12 @@
   "dependencies": {
     "@jinntec/jinn-toast": "^1.0.5",
     "@picocss/pico": "^2.0.6",
+    "chai": "^5.2.1",
     "fontoxpath": "^3.33.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.17.12",
+    "@jinntec/jinn-codemirror": "^1.17.6",
     "@open-wc/building-rollup": "^2.0.1",
     "@open-wc/eslint-config": "^7.0.0",
     "@open-wc/prettier-config": "^0.1.10",
@@ -43,6 +45,7 @@
     "@open-wc/testing": "^3.1.5",
     "@open-wc/testing-karma": "^4.0.9",
     "@open-wc/testing-karma-bs": "^1.3.94",
+    "@polymer/iron-iconset": "^3.0.1",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-strip": "^2.1.0",
@@ -51,7 +54,6 @@
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "cypress": "^13.16.0",
     "deepmerge": "^4.2.2",
-    "es-dev-server": "^2.1.0",
     "eslint": "^8.16.0",
     "eslint-plugin-prettier": "^5.1.3",
     "husky": "^8.0.1",
@@ -66,12 +68,16 @@
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-minify-html-literals": "^1.2.6",
     "rollup-plugin-version-injector": "^1.3.3",
+    "sinon": "^15.2.0",
+    "sinon-chai": "^4.0.0",
     "typescript": "^4.7.2",
+    "vite": "^7.0.5",
     "web-component-analyzer": "^1.1.6",
     "xmlserializer": "^0.6.1"
   },
   "scripts": {
     "test": "karma start",
+    "test:all": "karma start --grep test/**/*.test.js",
     "lint:eslint": "eslint .",
     "format:eslint": "eslint . --fix",
     "lint:prettier": "prettier \"**/*.js\" --check --ignore-path .eslintignore",
@@ -86,11 +92,11 @@
     "test:bs": "karma start karma.bs.config.js --coverage",
     "start:build": "cd dist && es-dev-server --open",
     "build": "rimraf dist && rollup -c rollup.config.js",
-    "start": "es-dev-server --app-index doc/index.html --node-resolve --watch --open",
+    "start": "vite --open --port 8090 --host",
     "preversion": "npm run test",
     "prepare": "npm run build",
     "install-demos": "npm i && cd demo && npm i",
-    "start-cypress": "es-dev-server --app-index doc/index.html --node-resolve",
+    "start-cypress": "npm run start",
     "websocket-server": "node websocket-server.js"
   },
   "keywords": [

package/resources/fore.css

@@ -12,10 +12,6 @@
         --inspector-handle-width: 30px;
     }
 
-    [unresolved] {
-        display: none;
-    }
-
     [disabled] {
         pointer-events: none;
         cursor: default;
@@ -145,7 +141,7 @@
     }
 
     fx-group, fx-switch, fx-repeat, fx-dialog {
-        display: block;
+        /*display: block;*/
         position: relative;
     }
 
@@ -294,5 +290,5 @@
 	 * For on-demand stuff, if it has no value initially,hide it
 	 */
 	[on-demand] {
-		display: none
+		display: none !important;
 	}

package/src/DependencyNotifyingDomFacade.js

@@ -24,6 +24,7 @@ export class DependencyNotifyingDomFacade {
    */
   // eslint-disable-next-line class-methods-use-this
   getAllAttributes(node) {
+    this._onNodeTouched(node); // <== Important!
     return Array.from(node.attributes);
   }
 
@@ -35,7 +36,10 @@ export class DependencyNotifyingDomFacade {
    */
   // eslint-disable-next-line class-methods-use-this
   getAttribute(node, attributeName) {
-    return node.getAttribute(attributeName);
+    const attr = node.getAttributeNode(attributeName);
+    console.log('[DomFacade] getAttribute touched:', attr);
+    if (attr) this._onNodeTouched(attr);
+    return attr?.value ?? null;
   }
 
   /**
@@ -61,10 +65,12 @@ export class DependencyNotifyingDomFacade {
    */
   getData(node) {
     if (node.nodeType === Node.ATTRIBUTE_NODE) {
+      // console.log('[DomFacade] getData on attribute:', node);
       this._onNodeTouched(node);
       return node.value;
     }
     // Text node
+    // console.log('[DomFacade] getData on text node parent:', node.parentNode);
     this._onNodeTouched(node.parentNode);
     return node.data;
   }
@@ -95,14 +101,12 @@ export class DependencyNotifyingDomFacade {
    */
   // eslint-disable-next-line class-methods-use-this
   getLastChild(node, bucket) {
-    const matchingNodes = node
-      .getChildNodes()
-      .filter(childNode => !bucket || getBucketsForNode(childNode).includes(bucket));
-    const matchNode = matchingNodes[matchingNodes.length - 1];
-    if (matchNode) {
-      return matchNode;
-    }
-    return null;
+    const children = Array.from(node.childNodes).filter(
+      child => !bucket || getBucketsForNode(child).includes(bucket),
+    );
+    const last = children[children.length - 1];
+    if (last) this._onNodeTouched(last);
+    return last || null;
   }
 
   /**
@@ -133,7 +137,16 @@ export class DependencyNotifyingDomFacade {
    */
   // eslint-disable-next-line class-methods-use-this
   getParentNode(node) {
-    return node.parentNode;
+    const parent = node.parentNode;
+    /*
+    if (
+      parent &&
+      (parent.nodeType === Node.ELEMENT_NODE || parent.nodeType === Node.ATTRIBUTE_NODE)
+    ) {
+      this._onNodeTouched(parent);
+    }
+*/
+    return parent;
   }
 
   /**
@@ -145,17 +158,10 @@ export class DependencyNotifyingDomFacade {
    */
   // eslint-disable-next-line class-methods-use-this
   getPreviousSibling(node, bucket) {
-    for (
-      let { previousSibling } = node;
-      previousSibling;
-      previousSibling = previousSibling.previousSibling
-    ) {
-      if (bucket && !getBucketsForNode(previousSibling).includes(bucket)) {
-        // eslint-disable-next-line no-continue
-        continue;
-      }
-
-      return previousSibling;
+    for (let sibling = node.previousSibling; sibling; sibling = sibling.previousSibling) {
+      if (bucket && !getBucketsForNode(sibling).includes(bucket)) continue;
+      this._onNodeTouched(sibling);
+      return sibling;
     }
     return null;
   }