@schukai/monster 1.26.0 → 1.28.1

package/source/util/freeze.js

@@ -14,7 +14,7 @@ import {validateObject} from '../types/validate.js';
  *
  * ```
  * <script type="module">
- * import {Monster} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.26.0/dist/monster.js';
+ * import {Monster} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.28.1/dist/monster.js';
  * Monster.Util.deepFreeze({})
  * </script>
  * ```
@@ -23,7 +23,7 @@ import {validateObject} from '../types/validate.js';
  *
  * ```
  * <script type="module">
- * import {deepFreeze} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.26.0/dist/modules/util/freeze.js';
+ * import {deepFreeze} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.28.1/dist/modules/util/freeze.js';
  * deepFreeze({})
  * </script>
  * ```

package/source/util/processing.js

@@ -77,7 +77,7 @@ class Callback {
  *
  * ```
  * <script type="module">
- * import {Monster} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.26.0/dist/monster.js';
+ * import {Monster} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.28.1/dist/monster.js';
  * new Monster.Util.Processing()
  * </script>
  * ```
@@ -86,13 +86,13 @@ class Callback {
  *
  * ```
  * <script type="module">
- * import {Processing} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.26.0/dist/modules/util/processing.js';
+ * import {Processing} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.28.1/dist/modules/util/processing.js';
  * new Processing();
  * </script>
  * ```
  *
  * @example
- * import {Processing} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.26.0/dist/modules/util/processing.js';
+ * import {Processing} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.28.1/dist/modules/util/processing.js';
  *
  * let startTime = +new Date();
  *

package/source/util/trimspaces.js

@@ -16,7 +16,7 @@ import {validateString} from "../types/validate.js";
  *
  * ```
  * <script type="module">
- * import {Monster} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.26.0/dist/monster.js';
+ * import {Monster} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.28.1/dist/monster.js';
  * Monster.Util.trimSpaces(" hello ")
  * </script>
  * ```
@@ -25,7 +25,7 @@ import {validateString} from "../types/validate.js";
  *
  * ```
  * <script type="module">
- * import {trimSpaces} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.26.0/dist/modules/util/trimspaces.js';
+ * import {trimSpaces} from 'https://cdn.jsdelivr.net/npm/@schukai/monster@1.28.1/dist/modules/util/trimspaces.js';
  * trimSpaces(' hello \\ ')
  * </script>
  * ```

package/test/cases/data/buildtree.js

@@ -3,7 +3,6 @@
 import {expect} from "chai"
 import {buildTree} from "../../../source/data/buildtree.js";
 import {NodeList} from "../../../source/types/nodelist.js";
-import {NodeRecursiveIterator} from "../../../source/types/noderecursiveiterator.js";
 
 
 describe('buildTree', function () {
@@ -50,18 +49,9 @@ describe('buildTree', function () {
 
             const nodes = buildTree(objects, 'dataset.*', 'id', 'parent');
 
-            let result = ""
-            nodes.forEach(node => {
-                new NodeRecursiveIterator(node).forEach(n => {
-                    result +="".padStart(n.level * 2, '.') + (n.value.name);
-                });
-
-            });
-
-            expect(result).to.be.equal('vehicle..car....SUV....sports car..truck..motorcycle');
             expect(nodes).to.be.instanceOf(NodeList);
             expect(nodes.length).to.equal(1);
-            expect(nodes.length).to.equal(1);
+            expect(nodes.toString()).to.be.equal('{"id":"1","name":"vehicle","parent":null}\n ├{"id":"2","name":"car","parent":"1"}\n | ├{"id":"5","name":"SUV","parent":"2"}\n | └{"id":"6","name":"sports car","parent":"2"}\n ├{"id":"3","name":"truck","parent":"1"}\n └{"id":"4","name":"motorcycle","parent":"1"}' );
 
 
         })
@@ -116,9 +106,9 @@ describe('buildTree', function () {
         });
 
         [
-            [obj1, 'dataset.*', '1,2,3,4,6,5'],
+            [obj1, 'dataset.*', '{"id":"1","name":"Test 1","address":"Here 1","parent":null}\n ├{"id":"2","name":"Test 2","address":"Here 2","parent":"1"}\n | ├{"id":"3","name":"Test 3","address":"Here 3","parent":"2"}\n | └{"id":"4","name":"Test 4","address":"Here 4","parent":"2"}\n | | └{"id":"6","name":"Test 6","address":"Here 6","parent":"4"}\n └{"id":"5","name":"Test 5","address":"Here 5","parent":"1"}'],
             [obj1, 'x', ''],
-            [obj1, 'dataset.*', '1,2,3,4,6,5'],
+            [obj1, 'dataset.*', '{"id":"1","name":"Test 1","address":"Here 1","parent":null}\n ├{"id":"2","name":"Test 2","address":"Here 2","parent":"1"}\n | ├{"id":"3","name":"Test 3","address":"Here 3","parent":"2"}\n | └{"id":"4","name":"Test 4","address":"Here 4","parent":"2"}\n | | └{"id":"6","name":"Test 6","address":"Here 6","parent":"4"}\n └{"id":"5","name":"Test 5","address":"Here 5","parent":"1"}'],
         ].forEach(function (data) {
 
             let a = data.shift()
@@ -127,18 +117,91 @@ describe('buildTree', function () {
 
             it('buildTree(' + JSON.stringify(a) + ',' + JSON.stringify(b) + ') should return ' + JSON.stringify(c) + ' ', function () {
                 let nodelist = buildTree(a, b, 'id', 'parent');
+                expect(nodelist.toString()).to.be.eql(c);
+            });
+        });
 
-                let result = [];
 
-                const firstNode = nodelist.toArray().shift();
-                
-                if (firstNode) {
-                    for (const node of new NodeRecursiveIterator(firstNode)) {
-                        result.push(node.value.id);
-                    }
+    });
+
+    describe('buildTree() test 2', function () {
+
+        /**
+         * 2
+         *    1
+         *    3
+         * 4
+         *    6
+         * 5
+         *
+         */
+        let obj1 = {
+            dataset: {
+                "1": {
+                    id: "1",
+                    name: "Test 1",
+                    address: "Here 1",
+                    parent: "2"
+                },
+                "2": {
+                    id: "2",
+                    name: "Test 2",
+                    address: "Here 2",
+                    parent: "0"
+                },
+                "3": {
+                    id: "3",
+                    name: "Test 3",
+                    address: "Here 3",
+                    parent: "2"
+                },
+                "4": {
+                    id: "4",
+                    name: "Test 4",
+                    address: "Here 4",
+                    parent: "0"
+                },
+                "5": {
+                    id: "5",
+                    name: "Test 5",
+                    address: "Here 5",
+                    parent: "0"
+                },
+                "6": {
+                    id: "6",
+                    name: "Test 6",
+                    address: "Here 6",
+                    parent: "4"
+                },
+                "7": {
+                    id: "7",
+                    name: "Test 7",
+                    address: "Here 7",
+                    parent: "1"
                 }
+            }
+        };
+
+        it('should return Node Instance.', function () {
+            expect(buildTree({}, '')).to.be.instanceOf(NodeList);
+        });
+
+        [
+            [obj1, 'dataset.*', '{"id":"2","name":"Test 2","address":"Here 2","parent":"0"}\n ├{"id":"1","name":"Test 1","address":"Here 1","parent":"2"}\n | └{"id":"7","name":"Test 7","address":"Here 7","parent":"1"}\n └{"id":"3","name":"Test 3","address":"Here 3","parent":"2"}\n{"id":"4","name":"Test 4","address":"Here 4","parent":"0"}\n └{"id":"6","name":"Test 6","address":"Here 6","parent":"4"}\n{"id":"5","name":"Test 5","address":"Here 5","parent":"0"}'],
+            [obj1, 'x', ''],
+        ].forEach(function (data) {
+
+            let a = data.shift()
+            let b = data.shift()
+            let c = data.shift()
+
+            it('buildTree(' + JSON.stringify(a) + ',' + JSON.stringify(b) + ') should return ' + JSON.stringify(c) + ' ', function () {
+                let nodelist = buildTree(a, b, 'id', 'parent', {
+                    rootReferences: ['0']
+                });
+
+                expect(nodelist.toString()).to.be.equal(c);
 
-                expect(result.join(',')).to.be.equal(c);
             });
         });
 

package/test/cases/dom/attributes.js

@@ -14,7 +14,8 @@ import {
     removeAttributeToken,
     removeObjectLink,
     replaceAttributeToken,
-    toggleAttributeToken
+    toggleAttributeToken,
+    findClosestByClass
 } from "../../../source/dom/attributes.js";
 
 import {initJSDOM} from "../../util/jsdom.js";
@@ -37,12 +38,13 @@ describe('Attributes', function () {
     </div>
 </div>
 `;
+        
         html3 = `<div data-monster-role="test1">
-    <div data-monster-role="sub1" id="a1">
-        <div data-monster-role="sub2" id="a2">
-            <div data-monster-role="sub3" id="a3">
-                <div data-monster-role="sub4" id="a4">
-                    <div data-monster-role="sub5" id="a5"></div>
+    <div data-monster-role="sub1" id="a1" class="sub1">
+        <div data-monster-role="sub2" id="a2" class="sub2">
+            <div data-monster-role="sub3" id="a3" class="sub3">
+                <div data-monster-role="sub4" id="a4" class="sub4">
+                    <div data-monster-role="sub5" id="a5" class="sub5"></div>
                 </div>
             </div>
         </div>
@@ -154,6 +156,27 @@ describe('Attributes', function () {
                 })
 
 
+            });
+        }); 
+        
+        describe('find closest Element with class', function () {
+
+            [
+                ['a5',  'sub3', 'sub3'],
+                ['a5',  'sub1', 'sub1'],
+                ['a4',  'sub1', 'sub1'],
+                ['a3',  'sub1', 'sub1'],
+                ['a5',  'sub5', 'sub5']
+            ].forEach(function (data) {
+
+                let a = data.shift()
+                let b = data.shift()
+                let c = data.shift()
+                it('findClosestByClass(' + a + ', ' + b + ') should return ' + c, function () {
+                    expect(findClosestByClass(document.getElementById(a), b).getAttribute('class')).to.be.equal(c);
+                })
+
+
             });
         });
     });

package/test/cases/dom/events.js

@@ -2,7 +2,7 @@
 
 import {expect} from "chai"
 
-import {fireEvent, findTargetElementFromEvent} from "../../../source/dom/events.js";
+import {fireEvent, findTargetElementFromEvent, fireCustomEvent} from "../../../source/dom/events.js";
 import {initJSDOM} from "../../util/jsdom.js";
 
 describe('Events', function () {
@@ -78,6 +78,71 @@ describe('Events', function () {
             expect(() => fireEvent({}, 'touch')).to.throw(Error);
             
         });
+    });   
+    
+    describe('fireCustomEvent()', function () {
+        it('should fire a click event', function (done) {
+            let div = document.createElement('div');
+            div.addEventListener('click', () => {
+                done();
+            })
+            fireCustomEvent(div, 'click');
+        });
+
+        it('should fire a touch event', function (done) {
+            let div = document.createElement('div');
+            div.addEventListener('touch', () => {
+                done();
+            })
+            fireCustomEvent(div, 'touch');
+        });
+
+        it('should fire a touch event on collection1', function (done) {
+            let div = document.createElement('div');
+            div.addEventListener('touch', (e) => {
+                if(e.detail.detail!=='hello world') {
+                    done('error');    
+                }
+                done();
+            })
+
+            div.appendChild(document.createElement('div'));
+            let collection = div.querySelectorAll('div');
+
+            fireCustomEvent(collection, 'touch', "hello world");
+        });
+        
+        it('should fire a touch event on collection2', function (done) {
+            let div = document.createElement('div');
+            div.addEventListener('touch', (e) => {
+                if(e.detail.a!=='hello world') {
+                    done('error');    
+                }
+                done();
+            })
+
+            div.appendChild(document.createElement('div'));
+            let collection = div.querySelectorAll('div');
+
+            fireCustomEvent(collection, 'touch', {a:"hello world"});
+        });
+
+        it('should fire a touch event', function (done) {
+            let div = document.createElement('div');
+            div.addEventListener('touch', () => {
+                done();
+            })
+
+            div.appendChild(document.createElement('div'));
+            let collection = div.querySelectorAll('div');
+
+
+            fireCustomEvent(collection, 'touch');
+        });
+
+        it('should throw error', function () {
+            expect(() => fireCustomEvent({}, 'touch')).to.throw(Error);
+        });
     });
 
 

package/test/cases/dom/template.js

@@ -1,16 +1,11 @@
 'use strict';
 
 import {expect} from "chai"
+import {ATTRIBUTE_THEME_NAME} from "../../../source/dom/constants.js";
 
 import {findDocumentTemplate, Template} from "../../../source/dom/template.js";
 import {initJSDOM} from "../../util/jsdom.js";
 
-const html1 = `
-
-<template id="mytemplate"></template>
-
-`;
-
 
 describe('Template', function () {
 
@@ -20,7 +15,8 @@ describe('Template', function () {
 
     beforeEach(() => {
         let mocks = document.getElementById('mocks');
-        mocks.innerHTML = html1;
+        mocks.innerHTML = `
+            <template id="mytemplate"></template>`;
     })
 
     afterEach(() => {
@@ -75,14 +71,76 @@ describe('Template', function () {
     });
 
     describe('.findDocumentTemplate()', function () {
-        it('should throw Template not found', function () {
-            const div = document.createElement('div');
-            div.remove();
-            let t = findDocumentTemplate("mytemplate", div);
-            expect(t).is.instanceof(Template);
+        describe('Template', function () {
+            it('should find template over ownerDocument', function () {
+                const div = document.createElement('div');
+                div.remove();
+                let t = findDocumentTemplate("mytemplate", div);
+                expect(t).is.instanceof(Template);
+
+            })
+        });
 
-        })
-    });
+        describe('Thmened Template', function () {
+            let memAttributeValue;
+
+            beforeEach(() => {
+                let mocks = document.getElementById('mocks');
+                mocks.innerHTML = `
+                    <template id="mytemplate"><p>1</p></template>
+                    <template id="mytemplate-monster"><p>2</p></template>
+                    <template id="mytemplate-testtheme"><p>4</p></template>
+                    <template id="myprefix-mytemplate-monster"><p>3</p></template>
+                `;
+
+                let html = document.querySelector('html');
+                if (html.hasAttribute(ATTRIBUTE_THEME_NAME)) {
+                    memAttributeValue = html.getAttribute(ATTRIBUTE_THEME_NAME)
+                }
+
+            })
+
+            afterEach(() => {
+                let mocks = document.getElementById('mocks');
+                mocks.innerHTML = "";
 
+                let html = document.querySelector('html');
 
+                if (html.hasAttribute(ATTRIBUTE_THEME_NAME)) {
+                    html.removeAttribute(ATTRIBUTE_THEME_NAME);
+                }
+
+                if (memAttributeValue) {
+                    html.setAttribute(ATTRIBUTE_THEME_NAME, memAttributeValue)
+                }
+
+            })
+
+
+            it('should find template over ownerDocument', function () {
+                let html = document.querySelector('html');
+                const div = document.createElement('div');
+                div.setAttribute('data-monster-template-prefix', 'myprefix')
+                div.remove();
+                let t1 = findDocumentTemplate("mytemplate", div);
+                expect(t1).is.instanceof(Template);
+                expect(t1.createDocumentFragment().textContent).is.equal("3");
+
+                div.removeAttribute('data-monster-template-prefix')
+                let t2 = findDocumentTemplate("mytemplate", div);
+                expect(t2).is.instanceof(Template);
+                expect(t2.createDocumentFragment().textContent).is.equal("2");
+
+                html.setAttribute(ATTRIBUTE_THEME_NAME,'testtheme');
+                let a= html.outerHTML;
+                let t3 = findDocumentTemplate("mytemplate", div);
+                expect(t3).is.instanceof(Template);
+                expect(t3.createDocumentFragment().textContent).is.equal("4");
+
+
+            })
+        });
+
+
+    });
 });