axj-ab_ 1.0.4 → 1.0.7

package/dtsmake.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+cd `dirname $0`
+
+dtsmake -s index.js 

package/index.d.ts

@@ -1,168 +1,166 @@
-// Type definitions for assets/script/libs/abom.js
+// Type definitions for index.js
 // Project: [LIBRARY_URL_HERE] 
 // Definitions by: [YOUR_NAME_HERE] <[YOUR_URL_HERE]> 
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-export default ab_
-
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.route.!ret
-
+	
 	/**
 	 * 
 	 */
 	interface RouteRet {
-
+				
 		/**
 		 * 
 		 */
-		hash: string;
-
+		hash : string;
+		
 		/**
 		 * 
 		 */
-		search: {
+		search : {
 		}
-
+				
 		/**
 		 * 
 		 */
-		path: /* ab_.$route.path */ any;
+		path : /* ab_.$route.path */ any;
 	}
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.reqJs.!2
 	type ReqJs2 = (() => void);
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.reqModule.!ret
-	type ReqModuleRet = ((call: any) => void);
+	type ReqModuleRet = ((call : any) => void);
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.args.!0
 	type Args0 = Array<any>;
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.swap.!0
-
+	
 	/**
 	 * 
 	 */
 	interface Swap0 {
 	}
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.newReady.!ret
-
+	
 	/**
 	 * 
 	 */
 	interface NewReadyRet {
-
+				
 		/**
 		 * 
 		 */
 		start(): void;
-
+				
 		/**
 		 * 
 		 * @param back 
 		 */
-		(back: any): void;
+		(back : any): void;
 	}
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.newStart.!ret
-
+	
 	/**
 	 * 
 	 */
 	interface NewStartRet {
-
+				
 		/**
 		 * 
 		 */
 		waite(): void;
-
+				
 		/**
 		 * 
 		 * @param inited 
 		 */
-		(inited: any): void;
+		(inited : any): void;
 	}
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.cssSetRest.!1
 	type CssSetRest1 = Array<string>;
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.cssSetRest.!ret
-
+	
 	/**
 	 * 
 	 */
 	interface CssSetRestRet {
-
+				
 		/**
 		 * 
 		 * @param vals 
 		 */
-		set(vals: ab_.CssSetRestRet.Set0): void;
-
+		set(vals : ab_.CssSetRestRet.Set0): void;
+				
 		/**
 		 * 
 		 */
 		reset(): void;
 	}
 }
-declare namespace ab_.CssSetRestRet {
+declare namespace ab_.CssSetRestRet{
 	// ab_.cssSetRest.!ret.set.!0
 	type Set0 = Array<string>;
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.setPaths.!0
-
+	
 	/**
 	 * 
 	 */
 	interface SetPaths0 {
 	}
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.fullScreen.!ret
 	type FullScreenRet = (() => void);
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.funTimer.!ret
-
+	
 	/**
 	 * 
 	 */
 	interface FunTimerRet {
-
+				
 		/**
 		 * 
 		 * @param interval 
 		 */
-		start(interval: any): void;
-
+		start(interval : any): void;
+				
 		/**
 		 * 
 		 */
 		stop(): void;
 	}
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.loadState.!2
-
+	
 	/**
 	 * 
 	 */
 	interface LoadState2 {
 	}
 }
-declare namespace ab_ {
+declare namespace ab_{
 	// ab_.saveState.!0
-
+	
 	/**
 	 * 
 	 */
@@ -173,77 +171,87 @@ declare namespace ab_ {
 /**
  * 
  */
-declare namespace ab_ {
+export declare var _nextT : number;
 
+/**
+ * 
+ */
+declare namespace ab_{
+		
 	/**
 	 * 
 	 */
-	export var _ver: boolean;
-
+	export var _ver : boolean;
+		
 	/**
 	 * 
 	 */
-	export var local: boolean;
-
+	export var local : boolean;
+		
+	/**
+	 * 
+	 */
+	export var https : boolean;
+		
 	/**
 	 * 
 	 * @param fn 
 	 */
-	function fn(fn: any): void;
-
+	function fn(fn : any): void;
+		
 	/**
 	 * 
 	 */
 	function header(): void;
-
+		
 	/**
 	 * 
 	 */
 	function back(): void;
-
+		
 	/**
 	 * 
 	 * @param uri 
 	 * @param title 
 	 */
-	function push(uri: any, title: any): void;
-
+	function push(uri : any, title : any): void;
+		
 	/**
 	 * 
 	 * @param uri 
 	 * @param title 
 	 */
-	function replace(uri: any, title: any): void;
-
+	function replace(uri : any, title : any): void;
+		
 	/**
 	 * 
 	 * @param uri 
 	 * @param title 
 	 * @param alone 
 	 */
-	function open(uri: any, title: any, alone: any): void;
-
+	function open(uri : any, title : any, alone : any): void;
+		
 	/**
 	 * 
 	 * @param name 
 	 */
-	function get(name: any): void;
-
+	function get(name : any): void;
+		
 	/**
 	 * 
 	 * @param o 
 	 * @return  
 	 */
-	function empty(o: any): boolean;
-
+	function empty(o : any): boolean;
+		
 	/**
 	 * 
 	 * @param url 
 	 * @param para 
 	 * @return  
 	 */
-	function urlRm(url: any, para: any): any;
-
+	function urlRm(url : any, para : any): any;
+		
 	/**
 	 * 
 	 * @param url 
@@ -251,21 +259,21 @@ declare namespace ab_ {
 	 * @param force 
 	 * @return  
 	 */
-	function urlParas(url: any, paras: string, force: any): string;
-
+	function urlParas(url : any, paras : string, force : any): string;
+		
 	/**
 	 * 
 	 * @return  
 	 */
 	function urlPath(): string;
-
+		
 	/**
 	 * 
 	 * @param path 
 	 * @return  
 	 */
-	function pathDir(path: any): string;
-
+	function pathDir(path : any): string;
+		
 	/**
 	 * 
 	 * @param anch 
@@ -273,43 +281,57 @@ declare namespace ab_ {
 	 * @param set 
 	 * @return  
 	 */
-	function route(anch: any, url: any, set: any): ab_.RouteRet;
-
+	function route(anch : any, url : any, set : any): ab_.RouteRet;
+		
 	/**
 	 * 
 	 * @param el 
 	 * @return  
 	 */
-	function el(el: number): number;
-
+	function el(el : number): number;
+		
 	/**
 	 * 
 	 * @param url 
 	 * @return  
 	 */
-	function ver(url: string): string;
-
+	function ver(url : string): string;
+		
 	/**
 	 * 
 	 * @param href 
 	 * @param el 
 	 * @param media 
 	 */
-	function reqCss(href: any, el: any, media: any): void;
-
+	function reqCss(href : any, el : any, media : any): void;
+		
 	/**
 	 * 
 	 */
 	function call(): void;
-
+		
+	/**
+	 * 
+	 * @param requires 
+	 * @param fun 
+	 */
+	function requires(requires : any, fun : any): void;
+		
+	/**
+	 * 
+	 * @return  
+	 */
+	function nextT(): number;
+		
 	/**
 	 * 
 	 * @param js 
 	 * @param el 
-	 * @param call 
+	 * @param onload 
+	 * @param onerror 
 	 */
-	function reqJs(js: string, el: number, call: ab_.ReqJs2): void;
-
+	function reqJs(js : string, el : number, onload : ab_.ReqJs2, onerror : any): void;
+		
 	/**
 	 * 
 	 * @param name 
@@ -317,8 +339,8 @@ declare namespace ab_ {
 	 * @param csses 
 	 * @return  
 	 */
-	function reqModule(name: any, jses: any, csses: any): ab_.ReqModuleRet;
-
+	function reqModule(name : any, jses : any, csses : any): ab_.ReqModuleRet;
+		
 	/**
 	 * 
 	 * @param exp 
@@ -326,8 +348,13 @@ declare namespace ab_ {
 	 * @param $this 
 	 * @param res 
 	 */
-	function eval(exp: any, $page: any, $this: any, res: any): void;
-
+	function eval(exp : any, $page : any, $this : any, res : any): void;
+		
+	/**
+	 * 
+	 */
+	export var $center : /*no type*/{};
+		
 	/**
 	 * 
 	 * @param args 
@@ -335,8 +362,8 @@ declare namespace ab_ {
 	 * @param len 
 	 * @return  
 	 */
-	function args(args: ab_.Args0, off: number, len: number): Array</*!0.<i>*/ any>;
-
+	function args(args : ab_.Args0, off : number, len : number): Array</*!0.<i>*/ any>;
+		
 	/**
 	 * 
 	 * @param ary 
@@ -344,8 +371,8 @@ declare namespace ab_ {
 	 * @param to 
 	 * @return  
 	 */
-	function swap(ary: ab_.Swap0, from: any, to: any): ab_.Swap0;
-
+	function swap(ary : ab_.Swap0, from : any, to : any): ab_.Swap0;
+		
 	/**
 	 * 
 	 * @param ary 
@@ -353,105 +380,106 @@ declare namespace ab_ {
 	 * @param to 
 	 * @return  
 	 */
-	function reSort(ary: any, from: any, to: any): any;
-
+	function reSort(ary : any, from : any, to : any): any;
+		
 	/**
 	 * 
 	 * @param children 
 	 * @param fromI 
 	 * @param toI 
 	 */
-	function resetEl(children: any, fromI: any, toI: any): void;
-
+	function resetEl(children : any, fromI : any, toI : any): void;
+		
 	/**
 	 * 
 	 * @param from 
 	 * @param to 
 	 */
-	function swapEl(from: any, to: any): void;
-
+	function swapEl(from : any, to : any): void;
+		
 	/**
 	 * 
 	 * @param name 
 	 */
-	function post(name: any): void;
-
+	function post(name : any): void;
+		
 	/**
 	 * 
 	 * @param data 
 	 * @param i 
+	 * @param from 
 	 */
-	function posts(data: any, i: number, from: any): void;
-
+	function posts(data : any, i : number, from : any): void;
+		
 	/**
 	 * 
 	 */
-	export var langs: /*no type*/{};
-
+	export var langs : /*no type*/{};
+		
 	/**
 	 * 
 	 * @param lang 
 	 * @param call 
 	 */
-	function langChange(lang: any, call: any): void;
-
+	function langChange(lang : any, call : any): void;
+		
 	/**
 	 * 
 	 * @param key 
 	 * @param lang 
 	 */
-	function lang(key: any, lang: any): void;
-
+	function lang(key : any, lang : any): void;
+		
 	/**
 	 * 
 	 * @param key 
 	 * @param par 
 	 * @return  
 	 */
-	function i18n(key: any, par: any): any;
-
+	function i18n(key : any, par : any): any;
+		
 	/**
 	 * 
 	 * @return  
 	 */
 	function time(): number;
-
+		
 	/**
 	 * 
 	 * @param time 
 	 * @param max 
 	 * @return  
 	 */
-	function humTime(time: any, max: any): string;
-
+	function humTime(time : any, max : any): string;
+		
 	/**
 	 * 
 	 * @param size 
 	 * @return  
 	 */
-	function humSize(size: any): string;
-
+	function humSize(size : any): string;
+		
 	/**
 	 * 
 	 * @param json 
 	 * @return  
 	 */
-	function parseJson(json: any): any;
-
+	function parseJson(json : any): any;
+		
 	/**
 	 * 
 	 * @param obj 
 	 * @return  
 	 */
-	function toJson(obj: any): string;
-
+	function toJson(obj : any): string;
+		
 	/**
 	 * 
 	 * @param tpl 
 	 * @param render 
 	 */
-	function tplRender(tpl: any, render: any): void;
-
+	function tplRender(tpl : any, render : any): void;
+		
 	/**
 	 * 支持formData file var form = new FormData();form.append("file", fileObj);
 	 * @param loading 
@@ -461,8 +489,8 @@ declare namespace ab_ {
 	 * @param callback 
 	 * @param init 
 	 */
-	function xhrReq(loading: any, headers: any, url: any, posts: any, callback: any, init: any): void;
-
+	function xhrReq(loading : any, headers : any, url : any, posts : any, callback : any, init : any): void;
+		
 	/**
 	 * 
 	 * @param loading 
@@ -473,49 +501,49 @@ declare namespace ab_ {
 	 * @param callback 
 	 * @param init 
 	 */
-	function uniReq(loading: any, headers: any, url: any, posts: any, files: any, callback: any, init: any): void;
-
+	function uniReq(loading : any, headers : any, url : any, posts : any, files : any, callback : any, init : any): void;
+		
 	/**
 	 * 
 	 * @param last 
 	 * @return  
 	 */
-	function newReady(last: any): ab_.NewReadyRet;
-
+	function newReady(last : any): ab_.NewReadyRet;
+		
 	/**
 	 * 
 	 * @param run 
 	 * @return  
 	 */
-	function newStart(run: any): ab_.NewStartRet;
-
+	function newStart(run : any): ab_.NewStartRet;
+		
 	/**
 	 * 
 	 */
 	function vConsole(): void;
-
+		
 	/**
 	 * 
 	 * @param $el 
 	 * @param name 
 	 */
-	function getStyle($el: any, name: string): void;
-
+	function getStyle($el : any, name : string): void;
+		
 	/**
 	 * 
 	 * @param $el 
 	 * @param names 
 	 * @return  
 	 */
-	function cssSetRest($el: any, names: ab_.CssSetRest1): ab_.CssSetRestRet;
-
+	function cssSetRest($el : any, names : ab_.CssSetRest1): ab_.CssSetRestRet;
+		
 	/**
 	 * 
 	 * @param el 
 	 * @param tag 
 	 */
-	function cloneElement(el: any, tag: any): void;
-
+	function cloneElement(el : any, tag : any): void;
+		
 	/**
 	 * 
 	 * @param to 
@@ -523,29 +551,29 @@ declare namespace ab_ {
 	 * @param depth 
 	 * @return  
 	 */
-	function objectMerge(to: any, from: any, depth: number): any;
-
+	function objectMerge(to : any, from : any, depth : number): any;
+		
 	/**
 	 * 
 	 * @param inst 
 	 * @return  
 	 */
-	function keepAlive(inst: any): any;
-
+	function keepAlive(inst : any): any;
+		
 	/**
 	 * 
 	 * @param key 
 	 */
-	function keepAliveClose(key: any): void;
-
+	function keepAliveClose(key : any): void;
+		
 	/**
 	 * 
 	 * @param $keepAlive 
 	 * @param key 
 	 * @param cKey 
 	 */
-	function keepAliveDel($keepAlive: any, key: any, cKey: any): void;
-
+	function keepAliveDel($keepAlive : any, key : any, cKey : any): void;
+		
 	/**
 	 * 
 	 * @param model 
@@ -553,8 +581,8 @@ declare namespace ab_ {
 	 * @param fromI 
 	 * @return  
 	 */
-	function getPaths(model: any, paths: any, fromI: number):  /* error */ any;
-
+	function getPaths(model : any, paths : any, fromI : number):  /* error */ any;
+		
 	/**
 	 * 
 	 * @param model 
@@ -562,42 +590,37 @@ declare namespace ab_ {
 	 * @param paths 
 	 * @param fromI 
 	 */
-	function setPaths(model: ab_.SetPaths0, val: any, paths: any, fromI: number): void;
-
+	function setPaths(model : ab_.SetPaths0, val : any, paths : any, fromI : number): void;
+		
 	/**
 	 * 
 	 * @param time 
 	 * @return  
 	 */
-	function date(time: any): Date;
-
+	function date(time : any): Date;
+		
 	/**
 	 * 
 	 * @param time 
 	 * @param fmt 
 	 */
-	function formatTime(time: any, fmt: any): void;
-
+	function formatTime(time : any, fmt : any): void;
+		
 	/**
 	 * 
 	 * @param date 
 	 * @param fmt 
 	 * @return  
 	 */
-	function formatDate(date: Date, fmt: string): string;
-
-	/**
-	 * 
-	 */
-	function xhrOntimeout(): void;
-
+	function formatDate(date : Date, fmt : string): string;
+		
 	/**
 	 * 
 	 * @param name 
 	 * @return  
 	 */
-	function aName(name: any): string;
-
+	function aName(name : any): string;
+		
 	/**
 	 * 
 	 * @param a 
@@ -605,8 +628,8 @@ declare namespace ab_ {
 	 * @param underline 
 	 * @return  
 	 */
-	function aNameC(a: any, name: any, underline: any): any;
-
+	function aNameC(a : any, name : any, underline : any): any;
+		
 	/**
 	 * 
 	 * @param $this 
@@ -614,30 +637,32 @@ declare namespace ab_ {
 	 * @param fun 
 	 * @return  
 	 */
-	function fullScreen($this: any, $el: any, fun: any): ab_.FullScreenRet;
-
+	function fullScreen($this : any, $el : any, fun : any): ab_.FullScreenRet;
+		
 	/**
 	 * 
 	 * @param val 
+	 * @param cHead 
+	 * @param cEnd 
 	 * @return  
 	 */
-	function cvsVal(val: string): string;
-
+	function cvsVal(val : string, cHead : any, cEnd : any): string;
+		
 	/**
 	 * 
 	 * @param txt 
 	 * @param name 
 	 * @param bom 
 	 */
-	function downloadTxt(txt: string, name: any, bom: any): void;
-
+	function downloadTxt(txt : string, name : any, bom : any): void;
+		
 	/**
 	 * 
 	 * @param fun 
 	 * @return  
 	 */
-	function funTimer(fun: any): ab_.FunTimerRet;
-
+	function funTimer(fun : any): ab_.FunTimerRet;
+		
 	/**
 	 * 
 	 * @param bind 
@@ -646,8 +671,8 @@ declare namespace ab_ {
 	 * @param props 
 	 * @return  
 	 */
-	function loadState(bind: any, path: any, target: ab_.LoadState2, props: any): boolean;
-
+	function loadState(bind : any, path : any, target : ab_.LoadState2, props : any): boolean;
+		
 	/**
 	 * 
 	 * @param bind 
@@ -655,32 +680,32 @@ declare namespace ab_ {
 	 * @param target 
 	 * @param props 
 	 */
-	function saveState(bind: ab_.SaveState0, path: any, target: any, props: any): void;
-
+	function saveState(bind : ab_.SaveState0, path : any, target : any, props : any): void;
+	
 	/**
 	 * 
 	 */
-	namespace $route {
-
+	namespace $route{
+				
 		/**
 		 * 
 		 */
-		export var hash: string;
-
+		export var hash : string;
+				
 		/**
 		 * 
 		 */
-		export var path: Array</* [? */ any> | /* string] */ any;
-
+		export var path : Array</* [? */ any> | /* string] */ any;
+		
 		/**
 		 * 
 		 */
-		var search: {
+		var search : {
 		}
 	}
-
+		
 	/**
 	 * 
 	 */
-	export var vconsoled: boolean;
+	export var vconsoled : boolean;
 }

package/index.js

@@ -1,3 +1,5 @@
+let _nextT = 0
+
 var ab_ = {
 
     _ver: false,
@@ -233,15 +235,61 @@ var ab_ = {
         }
     },
 
-    reqJs(js, el, call) {
+    requires(requires, fun) {
+        if (!requires) {
+            return
+        }
+
+        if (requires && requires.webpack) {
+            requires.keys().forEach(key => {
+                fun(key, requires(key))
+            })
+
+        } else {
+            for (let key in requires) {
+                fun(key, requires[key])
+            }
+        }
+    },
+
+    nextT() {
+        var t = ab_.time()
+        if (t < _nextT) {
+            t = ++_nextT
+
+        } else {
+            _nextT = t
+        }
+
+        return t
+    },
+
+    reqJs(js, el, onload, onerror) {
         var script = document.createElement('script')
         script.type = 'text/javascript'
         if (call) {
-            if (script.readyState) { //IE
-                script.onreadystatechange = call
+            if (script.readyState !== undefined) {
+                //IE
+                if (onload || onerror) {
+                    script.onreadystatechange = function () {
+                        let state = script.readyState
+                        if (state && typeof (state) === 'string') {
+                            if (state === 'loaded') {
+                                onload && onload()
+
+                            } else if (state.indexOf('err') >= 0 || state.indexOf('fail') >= 0) {
+                                onerror && onerror()
+                            }
+
+                        } else {
+                            onload && onload()
+                        }
+                    }
+                }
 
             } else { //Other
-                script.onload = call
+                onload && (script.onload = call)
+                onerror && (script.onerror = onerror)
             }
         }
 
@@ -594,11 +642,16 @@ var ab_ = {
         })
     },
 
+    // xhrOntimeout() {
+    //     // console.log('请求超时。。')
+    // },
+
     // 支持formData file var form = new FormData();form.append("file", fileObj);
     xhrReq(loading, headers, url, posts, callback, init) {
         var xhr = new XMLHttpRequest()
+        var done = XMLHttpRequest.DONE || 4
         xhr.onreadystatechange = function () {
-            if (xhr.readyState === XMLHttpRequest.DONE) {
+            if (xhr.readyState === done) {
                 loading && loading()
                 if (callback) {
                     if (xhr.status === 200) {
@@ -1028,10 +1081,6 @@ var ab_ = {
         return fmt
     },
 
-    xhrOntimeout() {
-        // console.log('请求超时。。')
-    },
-
     aName(name) {
         if (typeof (name) !== 'string') {
             return ''
@@ -1136,9 +1185,32 @@ var ab_ = {
         }
     },
 
-    cvsVal(val) {
+    cvsVal(val, cHead, cEnd) {
+        if (cHead || cEnd) {
+            var head = 0
+            var last = val.length - 1
+            var cLast = last
+            for (; head <= last; head++) {
+                let c = val[head]
+                if (c !== '\r' && c !== '\n') {
+                    break
+                }
+            }
+
+            for (; cLast > head; cLast--) {
+                let c = val[cLast]
+                if (c !== '\r' && c !== '\n') {
+                    break
+                }
+            }
+
+            if (head > 0 || cLast < last) {
+                val = val.substr(head, cLast + 1 - cHead)
+            }
+        }
+
         if (typeof (val) === 'string') {
-            if (val.indexOf(',') >= 0 || val.indexOf('"') >= 0) {
+            if (val.indexOf(',') >= 0 || val.indexOf('"') >= 0 || val.indexOf('\r') >= 0 || val.indexOf('\n') >= 0) {
                 val = '"' + val.replace('"', '""') + '"'
             }
         }
@@ -1194,6 +1266,7 @@ var ab_ = {
 
         return self
     },
+
     loadState(bind, path, target, props) {
         var state = bind && bind['_$$state$$' + path]
         if (state && target) {
@@ -1206,6 +1279,7 @@ var ab_ = {
             return true
         }
     },
+
     saveState(bind, path, target, props) {
         if (bind && target) {
             var state = {}
@@ -1231,11 +1305,13 @@ try {
 }
 
 try {
-    if (globalThis.ab_) {
-        ab_ = globalThis.ab_
+    if (globalThis) {
+        if (globalThis.ab_) {
+            ab_ = globalThis.ab_
 
-    } else {
-        globalThis.ab_ = ab_
+        } else {
+            globalThis.ab_ = ab_
+        }
     }
 
 } catch (e) {

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "axj-ab_",
   "type": "commonjs",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
-  "license": "ISC"
-}
+  "license": "ISC",
+  "devDependencies": {
+    "tern": "^0.24.3"
+  }
+}