@kizmann/pico-js 2.0.7 → 2.0.9

package/src/dom/{DomFinder.js → DomFinder.ts}

@@ -1,12 +1,16 @@
-import { Arr, Mix, Obj, Dom } from "../index.esm.js";
-import { PicoDom } from "../utils/Dom.js";
+import { Arr, Mix, Obj, Dom } from "../index.esm.ts";
+import { PicoDomInterface, PicoDom } from "../utils/Dom.ts";
+
+export interface PicoDomFinder extends PicoDomInterface
+{
+    //
+}
 
 /**
  * @memberof PicoDom
  */
-export class PicoDomFinderStatic
+export class PicoDomFinder
 {
-
     /**
      * Filter nodes by type
      *
@@ -14,11 +18,11 @@ export class PicoDomFinderStatic
      *
      * @param {any} nodes Source nodes
      * @param {number} [filter] Node type
-     * @returns {Array<Element>} Filtered nodes
+     * @returns {Array<any>} Filtered nodes
      */
-    static filterNodes(nodes, filter = 1)
+    static filterNodes(nodes : any, filter : number = 1) : Array<any>
     {
-        return Arr.filter(Mix.nodes(nodes), (el) => {
+        return Arr.filter(Mix.nodes(nodes), (el : any) => {
             return el.nodeType === filter;
         });
     }
@@ -28,20 +32,26 @@ export class PicoDomFinderStatic
      *
      * @example Dom.getNodePoint(100, 100)
      *
-     * @param {number} posx X position
-     * @param {number} posy Y position
-     * @returns {Array<Element>} Nodes at point
+     * @param {any} event Event data
+     * @returns {Array<any>} Nodes at point
      */
-    static getNodePoint(posx, posy)
+    static getNodePoint(event : any) : Array<any>
     {
-        let el = null;
+        if ( event.touches?.[0] ) {
+            event = event.touches[0];
+        }
+
+        let [el, src] = [
+            null, [event.clientX, event.clientY]
+        ];
 
         if ( Dom.doc().elementsFromPoint != null ) {
-            el = document.elementsFromPoint(posx, posy);
+            el = document.elementsFromPoint(src[0], src[1]);
         }
 
         if ( Dom.doc().msElementsFromPoint != null ) {
-            el = document.msElementsFromPoint(posx, posy);
+            // @ts-ignore
+            el = document.msElementsFromPoint(src[0], src[1]);
         }
 
         return el;
@@ -54,9 +64,9 @@ export class PicoDomFinderStatic
      *
      * @param {string} selector Node selector
      * @param {any} [event] Event object
-     * @returns {Element} Found element
+     * @returns {any} Found element
      */
-    static getNodeEvent(selector, event = {})
+    static getNodeEvent(selector : string, event : any = {}) : any
     {
         let target = event.srcElement;
 
@@ -64,10 +74,10 @@ export class PicoDomFinderStatic
             target = event.target;
         }
 
-        let { type, clientX, clientY } = event;
+        let { type } = event;
 
         if ( /^(drag[a-z]*|drop$)/.test(type) ) {
-            target = Dom.getNodePoint(clientX, clientY);
+            target = Dom.getNodePoint(event);
         }
 
         if ( Mix.isArr(target) ) {
@@ -81,35 +91,6 @@ export class PicoDomFinderStatic
         return target.closest(selector);
     }
 
-}
-
-/**
- * @memberof PicoDom
- * @extends {PicoDom}
- */
-export class PicoDomFinderInstance
-{
-    /**
-     * Resolve input elements
-     *
-     * @example Dom._constructFinder(".item")
-     *
-     * @param {any} el Input value
-     * @returns {any} Resolved elements
-     */
-    static _constructFinder(el)
-    {
-        if ( typeof el === 'string' ) {
-            el = document.querySelectorAll(el);
-        }
-
-        if ( el instanceof NodeList ) {
-            el = Mix.nodes(el);
-        }
-
-        return el;
-    }
-
     /**
      * Get node type
      *
@@ -118,9 +99,9 @@ export class PicoDomFinderInstance
      * @param {number} [fallback] Fallback value
      * @returns {number} Node type
      */
-    getNodeType(fallback = -1)
+    getNodeType(fallback : number = -1) : number
     {
-        if ( ! this.el ) {
+        if ( !this.el ) {
             return fallback;
         }
 
@@ -135,9 +116,9 @@ export class PicoDomFinderInstance
      * @param {any} [fallback] Fallback value
      * @returns {PicoDom} Parent instance
      */
-    getNodeParent(fallback = null)
+    getNodeParent(fallback : any = null) : PicoDom
     {
-        if ( ! this.el ) {
+        if ( !this.el ) {
             return fallback;
         }
 
@@ -152,9 +133,9 @@ export class PicoDomFinderInstance
      * @param {any} [fallback] Fallback value
      * @returns {PicoDom} Prev instance
      */
-    getNodePrev(fallback = null)
+    getNodePrev(fallback : any = null) : PicoDom
     {
-        if ( ! this.el ) {
+        if ( !this.el ) {
             return fallback;
         }
 
@@ -169,9 +150,9 @@ export class PicoDomFinderInstance
      * @param {any} [fallback] Fallback value
      * @returns {PicoDom} Next instance
      */
-    getNodeNext(fallback = null)
+    getNodeNext(fallback : any = null) : PicoDom
     {
-        if ( ! this.el ) {
+        if ( !this.el ) {
             return fallback;
         }
 
@@ -185,11 +166,11 @@ export class PicoDomFinderInstance
      *
      * @param {number} [type] Node type
      * @param {any} [fallback] Fallback value
-     * @returns {Array<Element>} Child nodes
+     * @returns {Array<any>} Child nodes
      */
-    getNodeChilds(type = -1, fallback = [])
+    getNodeChilds(type : number = -1, fallback : any = []) : Array<any>
     {
-        if ( ! this.el ) {
+        if ( !this.el ) {
             return fallback;
         }
 
@@ -199,7 +180,7 @@ export class PicoDomFinderInstance
             return childs;
         }
 
-        return Arr.filter(childs, (el) => {
+        return Arr.filter(childs, (el : any) => {
             return el.nodeType === type;
         });
     }
@@ -212,11 +193,11 @@ export class PicoDomFinderInstance
      * @param {number} [filter] Node type
      * @returns {PicoDom} Current instance
      */
-    sanatize(filter = 1)
+    sanatize(filter : number = 1) : PicoDom
     {
         this.els = Dom.filterNodes(this.els, filter);
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -225,12 +206,12 @@ export class PicoDomFinderInstance
      * @example Dom.find("div").filter(".active")
      *
      * @param {any} selector Filter selector
-     * @returns {Array<Element>} Filtered nodes
+     * @returns {Array<any>} Filtered nodes
      */
-    filter(selector)
+    filter(selector : any) : Array<any>
     {
         if ( typeof selector !== 'function' ) {
-            selector = (el) => Dom.find(el).is(selector);
+            selector = (el : any) => Dom.find(el).is(selector);
         }
 
         return Arr.filter(this.els, selector);
@@ -242,12 +223,12 @@ export class PicoDomFinderInstance
      * @example Dom.find("div").except(".active")
      *
      * @param {any} selector Exclude selector
-     * @returns {Array<Element>} Filtered nodes
+     * @returns {Array<any>} Filtered nodes
      */
-    except(selector)
+    except(selector : any) : Array<any>
     {
         if ( typeof selector !== 'function' ) {
-            selector = (el) => ! Dom.find(el).is(selector);
+            selector = (el : any) => !Dom.find(el).is(selector);
         }
 
         return Arr.filter(this.els, selector);
@@ -261,7 +242,7 @@ export class PicoDomFinderInstance
      * @param {any} selector Search selector
      * @returns {PicoDom} Dom instance
      */
-    find(selector)
+    find(selector : any) : PicoDom
     {
         if ( this.el == null ) {
             return Dom.find(null);
@@ -285,16 +266,16 @@ export class PicoDomFinderInstance
     /**
      * Get element by index
      *
-     * @example Dom.find("div").get(0) // => Element
+     * @example Dom.find("div").get(0) // => HTMLElement
      *
      * @param {number} [index] Node index
      * @returns {any} Found element
      */
-    get(index = - 1)
+    get(index : number = -1) : any
     {
         let nodes = this.els;
 
-        if ( index === - 1 ) {
+        if ( index === -1 ) {
             return nodes;
         }
 
@@ -304,12 +285,12 @@ export class PicoDomFinderInstance
     /**
      * Get first element
      *
-     * @example Dom.find("div").first() // => Element
+     * @example Dom.find("div").first() // => HTMLElement
      *
      * @param {number} [offset] Node offset
      * @returns {any} Found element
      */
-    first(offset = 0)
+    first(offset : number = 0) : any
     {
         return this.get(offset);
     }
@@ -317,12 +298,12 @@ export class PicoDomFinderInstance
     /**
      * Get last element
      *
-     * @example Dom.find("div").last() // => Element
+     * @example Dom.find("div").last() // => HTMLElement
      *
      * @param {number} [offset] Node offset
      * @returns {any} Found element
      */
-    last(offset = 1)
+    last(offset : number = 1) : any
     {
         return Arr.get(this.els, this.els.length - offset);
     }
@@ -332,10 +313,10 @@ export class PicoDomFinderInstance
      *
      * @example Dom.find("div").each((el) => console.log(el))
      *
-     * @param {function} cb Callback fn
+     * @param {Function} cb Callback fn
      * @returns {PicoDom} Current instance
      */
-    each(cb)
+    each(cb : Function) : PicoDom
     {
         return (this, Arr.each(this.els, cb));
     }
@@ -345,21 +326,21 @@ export class PicoDomFinderInstance
      *
      * @example Dom.find("div").loopParent((el) => console.log(el))
      *
-     * @param {function} cb Callback fn
+     * @param {Function} cb Callback fn
      * @param {any} [boundry] Loop limit
      * @returns {PicoDom} Current instance
      */
-    loopParent(cb, boundry = null)
+    loopParent(cb : Function, boundry : any = null) : PicoDom
     {
         if ( boundry == null ) {
             boundry = Dom.win();
         }
 
-        for ( let el = this.el; el && el !== boundry; el = el.parentNode ) {
+        for ( let el : any = this.el; el && el !== boundry; el = el.parentNode ) {
             cb.call({}, el);
         }
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -369,7 +350,7 @@ export class PicoDomFinderInstance
      *
      * @returns {PicoDom} Parent instance
      */
-    parent()
+    parent() : PicoDom
     {
         let parent = this.getNodeParent();
 
@@ -389,12 +370,10 @@ export class PicoDomFinderInstance
      * @param {number} [filter] Node type
      * @returns {PicoDom} Child instance
      */
-    child(selector, filter = 1)
+    child(selector : any = null, filter : number = 1) : PicoDom
     {
-        for ( let el of this.els ) {
-            if ( el.nodeType === filter ) {
-                return Dom.find(el);
-            }
+        for ( let el of this.childs(selector, filter) ) {
+            return Dom.find(el);
         }
 
         return Dom.find(null);
@@ -407,9 +386,9 @@ export class PicoDomFinderInstance
      *
      * @param {any} [selector] Child selector
      * @param {number} [filter] Node type
-     * @returns {Array<Element>} Child elements
+     * @returns {Array<any>} Child elements
      */
-    childs(selector = null, filter = 1)
+    childs(selector : any = null, filter : number = 1) : Array<any>
     {
         let childs = this.getNodeChilds(filter);
 
@@ -428,22 +407,30 @@ export class PicoDomFinderInstance
      * @example Dom.find("div").closest(".container")
      *
      * @param {any} selector Target selector
-     * @returns {Element} Found element
+     * @returns {any} Found element
      */
-    closest(selector)
+    closest(selector : any) : any
     {
         if ( this.el === selector ) {
             return this.el;
         }
 
-        for ( let el = this; el.el != null; el = el.getNodeParent() ) {
+        for ( let el : any = this; el.el != null; el = el.getNodeParent() ) {
             if ( el.is(selector) ) return el.el;
         }
 
         return null;
     }
 
-    upnode(selector)
+    /**
+     * Get closest instance
+     *
+     * @example Dom.find("div").upnode(".container")
+     *
+     * @param {any} selector
+     * @returns {PicoDom}
+     */
+    upnode(selector : any) : PicoDom
     {
         return Dom.find(...[
             this.closest(selector)
@@ -458,7 +445,7 @@ export class PicoDomFinderInstance
      * @param {number} [type] Node type
      * @returns {PicoDom} Prev instance
      */
-    prev(type = 1)
+    prev(type : number = 1) : PicoDom
     {
         let el = this.getNodePrev();
 
@@ -477,7 +464,7 @@ export class PicoDomFinderInstance
      * @param {number} [type] Node type
      * @returns {PicoDom} Next instance
      */
-    next(type = 1)
+    next(type : number = 1) : PicoDom
     {
         let el = this.getNodeNext();
 
@@ -495,7 +482,7 @@ export class PicoDomFinderInstance
      *
      * @returns {number} Count value
      */
-    length()
+    length() : number
     {
         return this.els.length;
     }
@@ -506,16 +493,17 @@ export class PicoDomFinderInstance
      * @example Dom.find("div").is(".active") // => true
      *
      * @param {any} selector Test selector
+     * @param {boolean} [empty] Test selector
      * @returns {boolean} True if matches
      */
-    is(selector)
+    is(selector : any, empty : boolean = false) : boolean
     {
         if ( this.el === selector ) {
             return true;
         }
 
         if ( this.el == null ) {
-            return false;
+            return empty;
         }
 
         for ( let el of this.parent().find(selector).get() ) {
@@ -533,7 +521,7 @@ export class PicoDomFinderInstance
      * @param {any} selector Test selector
      * @returns {boolean} True if matches
      */
-    matches(selector)
+    matches(selector : any) : boolean
     {
         if ( this.el === selector ) {
             return true;
@@ -557,7 +545,7 @@ export class PicoDomFinderInstance
      *
      * @returns {boolean} True if empty
      */
-    empty()
+    empty() : boolean
     {
         return this.length() < 1 || this.el == null;
     }
@@ -569,7 +557,7 @@ export class PicoDomFinderInstance
      *
      * @returns {boolean} True if visible
      */
-    visible()
+    visible() : boolean
     {
         if ( this.el == null ) {
             return false;
@@ -586,7 +574,7 @@ export class PicoDomFinderInstance
      * @param {any} selector Parent selector
      * @returns {boolean} True if matches
      */
-    above(selector)
+    above(selector : any) : boolean
     {
         // Parent is exacly selector
         return this.parent().is(selector);
@@ -600,7 +588,7 @@ export class PicoDomFinderInstance
      * @param {any} selector Target selector
      * @returns {boolean} True if inside
      */
-    inside(selector)
+    inside(selector : any) : boolean
     {
         // Has parent of selector
         return this.closest(selector) != null;
@@ -614,7 +602,7 @@ export class PicoDomFinderInstance
      * @param {any} selector Target selector
      * @returns {boolean} True if contains
      */
-    contains(selector)
+    contains(selector : any) : boolean
     {
         // Has child of selector
         return this.el.contains(selector);
@@ -622,57 +610,33 @@ export class PicoDomFinderInstance
 
 }
 
-/**
- * @see PicoDom.above
- */
-PicoDomFinderInstance.prototype.isParent = function (...args) {
+// @ts-ignore
+PicoDomFinder.prototype.isParent = function (...args : Parameters<typeof PicoDomFinder.prototype.above>) {
     console.warn('Dom.isParent() is deprecated, use Dom.above() instead.');
     return this.above(...args);
 };
 
-/**
- * @see PicoDom.prev
- */
-PicoDomFinderInstance.prototype.previous = function () {
+// @ts-ignore
+PicoDomFinder.prototype.previous = function () {
     console.warn('Dom.previous() is deprecated, use Dom.prev() instead.');
     return this.prev();
 };
 
-/**
- * @see PicoDom.filter
- */
-PicoDomFinderInstance.prototype.where = function (...args) {
+// @ts-ignore
+PicoDomFinder.prototype.where = function (...args : Parameters<typeof PicoDomFinder.prototype.filter>) {
     console.warn('Dom.where() is deprecated, use Dom.filter() instead.');
     return this.filter(...args);
 };
 
-/**
- * @see PicoDom.except
- */
-PicoDomFinderInstance.prototype.not = function (...args) {
+// @ts-ignore
+PicoDomFinder.prototype.not = function (...args : Parameters<typeof PicoDomFinder.prototype.except>) {
     console.warn('Dom.not() is deprecated, use Dom.except() instead.');
     return this.except(...args);
 };
 
-PicoDomFinderInstance.prototype.getNot = () => {
+// @ts-ignore
+PicoDomFinder.prototype.getNot = () => {
     console.error('Dom.getNot() is not implemented anymore.');
 };
 
-/**
- * @param {typeof PicoDom} self
- * @returns {typeof PicoDom}
- */
-export const PicoDomFinderPlugin = function (self) {
-
-    Obj.each(Mix.class(PicoDomFinderStatic), (fn, id) => {
-        self[id] = fn;
-    });
-
-    Obj.each(Mix.proto(PicoDomFinderInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    self.init.push(PicoDomFinderInstance._constructFinder);
-
-    return self;
-}
+export default PicoDomFinder;

package/src/dom/DomForm.ts

@@ -0,0 +1,38 @@
+import { PicoDomInterface } from "../utils/Dom.ts";
+import PicoDomFinder from "./DomFinder.js";
+
+export interface PicoDomForm extends PicoDomInterface,
+    PicoDomFinder
+{
+    //
+}
+
+/**
+ * @memberof PicoDom
+ */
+export class PicoDomForm
+{
+    /**
+     * Get or set input value
+     *
+     * @example Dom.find("input").value("hello")
+     *
+     * @param {any} [value] Input value
+     * @returns {any} Value or instance
+     */
+    value(value : any = undefined) : any
+    {
+        if ( value === undefined ) {
+            return this.el.value;
+        }
+
+        this.each((el : any) => {
+            el.value = value;
+        });
+
+        return this;
+    }
+
+}
+
+export default PicoDomForm;