@kizmann/pico-js 2.0.7 → 2.0.9

package/package.json

@@ -1,18 +1,15 @@
 {
     "name": "@kizmann/pico-js",
-    "version": "2.0.7",
+    "version": "2.0.9",
     "license": "MIT",
     "type": "module",
     "private": false,
     "author": "Eduard Kizmann <kizmann@protonmail.ch>",
     "repository": "https://github.com/vankizmann/pico-js",
-    "main": "./src/index.esm.js",
+    "main": "./dist/pico-js.esm.js",
     "unpkg": "./dist/pico-js.browser.js",
-    "jsnext:main": "./src/index.esm.js",
+    "jsnext:main": "./dist/pico-js.esm.js",
     "typings": "./types/index.esm.d.ts",
-    "imports": {
-        "#src/*": "./src/*"
-    },
     "files": [
         "dist/",
         "src/",
@@ -36,6 +33,7 @@
         "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
         "@babel/plugin-transform-runtime": "^7.28.5",
         "@babel/preset-env": "^7.4.4",
+        "@babel/preset-typescript": "^7.28.5",
         "babel-loader": "^8.0.6",
         "cross-env": "^5.1",
         "css-loader": "^3.2.0",

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

@@ -1,19 +1,17 @@
-import { Arr, Dom, For, Mix, Obj } from "../index.esm.js";
-import { PicoDom } from "../utils/Dom.js";
+import { Arr, Dom, For, Mix, Obj } from "../index.esm.ts";
+import { PicoDom, PicoDomInterface } from "../utils/Dom.ts";
+import PicoDomFinder from "./DomFinder.js";
 
-/**
- * @memberof PicoDom
- */
-export class PicoDomAttributeStatic
+export interface PicoDomAttribute extends PicoDomInterface,
+    PicoDomFinder
 {
     //
 }
 
 /**
  * @memberof PicoDom
- * @extends {PicoDom}
  */
-export class PicoDomAttributeInstance
+export class PicoDomAttribute
 {
     /**
      * Get or set attribute
@@ -23,9 +21,9 @@ export class PicoDomAttributeInstance
      * @param {string} key Attr key
      * @param {any} [value] Attr value
      * @param {any} [fallback] Fallback value
-     * @returns {any|PicoDom} Attr value or instance
+     * @returns {any} Attr value or instance
      */
-    attr(key, value = undefined, fallback = null)
+    attr(key : string, value : any = undefined, fallback : any = null) : any
     {
         if ( this.el == null ) {
             return value ? this : fallback;
@@ -62,9 +60,9 @@ export class PicoDomAttributeInstance
      * @param {string} key Data key
      * @param {any} [value] Data value
      * @param {any} [fallback] Fallback value
-     * @returns {any|PicoDom} Data value or instance
+     * @returns {any} Data value or instance
      */
-    data(key, value = undefined, fallback = null)
+    data(key : string, value : any = undefined, fallback : any = null) : any
     {
         return this.attr('data-' + key, value, fallback);
     }
@@ -78,7 +76,7 @@ export class PicoDomAttributeInstance
      * @param {any} [fallback] Fallback value
      * @returns {any} Computed style
      */
-    computed(key = null, fallback = null)
+    computed(key : any = null, fallback : any = null) : any
     {
         if ( this.el == null ) {
             return fallback;
@@ -104,9 +102,9 @@ export class PicoDomAttributeInstance
      *
      * @param {any} [value] Style value
      * @param {boolean} [combine] Combine style
-     * @returns {any|PicoDom} Style or instance
+     * @returns {any} Style or instance
      */
-    style(value = undefined, combine = true)
+    style(value : any = undefined, combine : boolean = true) : any
     {
         if ( this.el == null ) {
             return this;
@@ -164,9 +162,9 @@ export class PicoDomAttributeInstance
      *
      * @param {any} [value] Class value
      * @param {boolean} [combine] Combine classes
-     * @returns {any|PicoDom} Classes or instance
+     * @returns {any} Classes or instance
      */
-    class(value = undefined, combine = false)
+    class(value : any = undefined, combine : boolean = false) : any
     {
         if ( this.el == null ) {
             return this;
@@ -201,15 +199,15 @@ export class PicoDomAttributeInstance
      * @example Dom.find("div").html("<span></span>")
      *
      * @param {any} [html] HTML content
-     * @returns {string|PicoDom} HTML or instance
+     * @returns {any} HTML or instance
      */
-    html(html = undefined)
+    html(html : any = undefined) : any
     {
         if ( html === undefined ) {
             return this.el.innerHTML;
         }
 
-        this.each((el) => {
+        this.each((el : any) => {
             el.innerHTML = html;
         });
 
@@ -221,11 +219,11 @@ export class PicoDomAttributeInstance
      *
      * @example Dom.find("div").actual((el) => el.offsetWidth, { display: "block" })
      *
-     * @param {function} cb Callback fn
+     * @param {Function} cb Callback fn
      * @param {any} [style] Temp style
      * @returns {any} Callback result
      */
-    actual(cb, style = null)
+    actual(cb : Function, style : any = null) : any
     {
         let backup = this.attr('style');
 
@@ -246,9 +244,9 @@ export class PicoDomAttributeInstance
      * @param {any} cls Class name
      * @returns {boolean} True if has class
      */
-    hasClass(cls)
+    hasClass(cls : any) : boolean
     {
-        if ( ! Mix.isArr(cls) ) {
+        if ( !Mix.isArr(cls) ) {
             cls = [cls];
         }
 
@@ -263,14 +261,14 @@ export class PicoDomAttributeInstance
      * @param {any} cls Class name
      * @returns {PicoDom} Current instance
      */
-    addClass(cls)
+    addClass(cls : any) : PicoDom
     {
         if ( this.el == null ) {
-            return this;
+            return <PicoDom> <unknown> this;
         }
 
         if ( this.els.length > 1 ) {
-            return this.each((el) => Dom.find(el).addClass(cls));
+            return this.each((el : any) => Dom.find(el).addClass(cls));
         }
 
         let result = this.el.className.split(' ');
@@ -283,7 +281,7 @@ export class PicoDomAttributeInstance
 
         this.el.className = Arr.unique(result).join(' ');
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -294,14 +292,14 @@ export class PicoDomAttributeInstance
      * @param {any} cls Class name
      * @returns {PicoDom} Current instance
      */
-    remClass(cls)
+    remClass(cls : any) : PicoDom
     {
         if ( this.el == null ) {
-            return this;
+            return <PicoDom> <unknown> this;
         }
 
         if ( this.els.length > 1 ) {
-            return this.each((el) => Dom.find(el).remClass(cls));
+            return this.each((el : any) => Dom.find(el).remClass(cls));
         }
 
         let result = this.el.className.split(' ');
@@ -314,7 +312,7 @@ export class PicoDomAttributeInstance
 
         this.el.className = Arr.unique(result).join(' ');
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -325,10 +323,10 @@ export class PicoDomAttributeInstance
      * @param {any} cls Class name
      * @returns {PicoDom} Current instance
      */
-    toggleClass(cls)
+    toggleClass(cls : any) : PicoDom
     {
         if ( this.els.length > 1 ) {
-            return this.each((el) => Dom.find(el).toggleClass(cls));
+            return this.each((el : any) => Dom.find(el).toggleClass(cls));
         }
 
         if ( this.hasClass(cls) ) {
@@ -347,13 +345,13 @@ export class PicoDomAttributeInstance
      * @param {boolean} [state] Target state
      * @returns {PicoDom} Current instance
      */
-    stateClass(cls, state = true)
+    stateClass(cls : any, state : boolean = true) : PicoDom
     {
         if ( this.els.length > 1 ) {
-            return this.each((el) => Dom.find(el).stateClass(cls));
+            return this.each((el : any) => Dom.find(el).stateClass(cls));
         }
 
-        if ( ! state ) {
+        if ( !state ) {
             return this.remClass(cls);
         }
 
@@ -362,37 +360,16 @@ export class PicoDomAttributeInstance
 
 }
 
-/**
- * @see PicoDom.style
- */
-PicoDomAttributeInstance.prototype.css = function (...args) {
+// @ts-ignore
+PicoDomAttribute.prototype.css = function (...args : Parameters<typeof PicoDomAttribute.style>) {
     console.warn('Dom.css() is deprecated, use Dom.style() instead.');
     return this.style(...args);
 };
 
-/**
- * @see PicoDom.remClass
- */
-PicoDomAttributeInstance.prototype.removeClass = function (...args) {
+// @ts-ignore
+PicoDomAttribute.prototype.removeClass = function (...args : Parameters<typeof PicoDomAttribute.remClass>) {
     console.warn('Dom.removeClass() is deprecated, use Dom.remClass() instead.');
     return this.remClass(...args);
 };
 
-/**
- * @param {typeof PicoDom} self
- * @returns {typeof PicoDom}
- */
-export const PicoDomAttributePlugin = function (self) {
-
-    Obj.each(Mix.class(PicoDomAttributeStatic), (fn, id) => {
-        self[id] = fn;
-    });
-
-    Obj.each(Mix.proto(PicoDomAttributeInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    // self.init.push(PicoDomAttributeInstance.constructor);
-
-    return self;
-}
+export default PicoDomAttribute;

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

@@ -1,10 +1,17 @@
-import { Arr, Dom, Mix, Obj } from "../index.esm.js";
-import { PicoDom } from "../utils/Dom.js";
+import { Dom, Mix, Obj } from "../index.esm.ts";
+import { PicoDom, PicoDomInterface } from "../utils/Dom.ts";
+import PicoDomFinder from "./DomFinder.js";
+
+export interface PicoDomBuilder extends PicoDomInterface,
+    PicoDomFinder
+{
+    //
+}
 
 /**
  * @memberof PicoDom
  */
-export class PicoDomBuilderStatic
+export class PicoDomBuilder
 {
     /**
      * Create element from tag
@@ -15,7 +22,7 @@ export class PicoDomBuilderStatic
      * @param {any} [options] Attr options
      * @returns {PicoDom} Dom instance
      */
-    static make(el, options = {})
+    static make(el : any, options : any = {}) : PicoDom
     {
         if ( el instanceof Dom ) {
             el = el.el;
@@ -39,14 +46,7 @@ export class PicoDomBuilderStatic
 
         return ini;
     }
-}
 
-/**
- * @memberof PicoDom
- * @extends {PicoDom}
- */
-export class PicoDomBuilderInstance
-{
     /**
      * Prepend value to element
      *
@@ -55,13 +55,13 @@ export class PicoDomBuilderInstance
      * @param {any} value Prepend value
      * @returns {PicoDom} Current instance
      */
-    prepend(value)
+    prepend(value : any) : PicoDom
     {
-        this.each((el) => {
+        this.each((el : any) => {
             if ( el.prepend != null ) el.prepend(value);
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -72,13 +72,13 @@ export class PicoDomBuilderInstance
      * @param {any} value Target element
      * @returns {PicoDom} Current instance
      */
-    prependTo(value)
+    prependTo(value : any) : PicoDom
     {
-        Dom.find(value).each((el) => {
+        Dom.find(value).each((el : any) => {
             if ( el.prepend != null ) el.prepend(this.el);
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -89,13 +89,13 @@ export class PicoDomBuilderInstance
      * @param {any} value Append value
      * @returns {PicoDom} Current instance
      */
-    append(value)
+    append(value : any) : PicoDom
     {
-        this.each((el) => {
+        this.each((el : any) => {
             if ( el.append != null ) el.append(value);
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -106,13 +106,13 @@ export class PicoDomBuilderInstance
      * @param {any} value Target element
      * @returns {PicoDom} Current instance
      */
-    appendTo(value)
+    appendTo(value : any) : PicoDom
     {
-        Dom.find(value).each((el) => {
+        Dom.find(value).each((el : any) => {
             if ( el.append != null ) el.append(this.el);
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -123,32 +123,15 @@ export class PicoDomBuilderInstance
      * @param {any} value Replacement value
      * @returns {PicoDom} Current instance
      */
-    replace(value)
+    replace(value : any) : PicoDom
     {
-        this.parent().each(el, (el) => {
+        this.parent().each((el : any) => {
             (el.insertBefore(value, el), el.removeChild(el));
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
 }
 
-/**
- * @param {typeof PicoDom} self
- * @returns {typeof PicoDom}
- */
-export const PicoDomBuilderPlugin = function (self) {
-
-    Obj.each(Mix.class(PicoDomBuilderStatic), (fn, id) => {
-        self[id] = fn;
-    });
-
-    Obj.each(Mix.proto(PicoDomBuilderInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    // self.init.push(PicoDomBuilderInstance.constructor);
-
-    return self;
-}
+export default PicoDomBuilder;