oipage 0.3.0 → 1.0.0-alpha.1

package/nodejs/deeplog/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 进度打印
+ * @param percentum 进度0-100 
+ * @param stream 说明文字,可选
+ */
+export interface deeplogType {
+    (percentum: number, stream?: string): void
+}
+
+export let deeplog: deeplogType

package/nodejs/deeplog/index.js

@@ -0,0 +1,35 @@
+/*!
+* deeplog of OIPage v1.0.0-alpha.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+const {linelog} = require("../linelog/index.js");
+/**
+ * 进度打印
+ * 
+ * @param {number} percentum 进度0-100 
+ * @param {string} stream 说明文字,可选
+ */
+function deeplog (percentum, stream) {
+    if (arguments.length == 0) {
+        linelog();
+        return;
+    }
+
+    if (arguments.length <= 1) stream = "";
+
+    let txt = "",
+        i = 0;
+
+    // 补充已经有的进度
+    for (; i <= percentum && i <= 100; i += 5) {
+        txt += "█";
+    }
+
+    // 补充余下的空白
+    for (; i <= 100; i += 5) {
+        txt += "░";
+    }
+
+    linelog(percentum.toFixed(2) + "%[" + txt + "]" + stream);
+};
+exports.deeplog = deeplog;

package/nodejs/linelog/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 单行打印
+ * @param stream 打印的内容
+ */
+export interface linelogType {
+    (stream: string): void
+}
+
+export let linelog: linelogType

package/nodejs/{core/log.js → linelog/index.js}

@@ -1,31 +1,18 @@
-// 日志
-exports.log = function (txt) {
-    console.log("\x1B[32m" + txt + "\x1B[39m");
-};
-
-// 警告
-exports.warn = function (txt) {
-    console.log("\x1B[33m" + txt + "\x1B[39m");
-};
-
-// 错误
-exports.error = function (txt) {
-    console.log("\x1B[35m" + txt + "\x1B[39m");
-};
-
-
-// 计算字符串长度的方法
-const stringwidth = function (str) {
-    return str.length;
-};
-
+/*!
+* linelog of OIPage v1.0.0-alpha.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
 // 预定义的常量
 const MOVE_LEFT = Buffer.from('1b5b3130303044', 'hex').toString();
 const MOVE_UP = Buffer.from('1b5b3141', 'hex').toString();
 const CLEAR_LINE = Buffer.from('1b5b304b', 'hex').toString();
 
-// 不换行打印
-const linelog = (function (stream) {
+/**
+ * 不换行打印
+ * @param {string} stream 打印的内容
+ */
+let linelog = (function (stream) {
 
     // 用来记录前置有多少行需要回退
     let prevLineCount = 0;
@@ -56,35 +43,5 @@ const linelog = (function (stream) {
 
     };
 })(process.stdout);
-
-exports.linelog = linelog;
-
-/**
- * 进度打印
- * 
- * @param {number} percentum 进度0-100 
- * @param {string} stream 说明文字,可选择
- */
-exports.deeplog = function (percentum, stream) {
-    if (arguments.length == 0) {
-        linelog();
-        return;
-    }
-
-    if (arguments.length <= 1) stream = "";
-
-    let txt = "",
-        i = 0;
-
-    // 补充已经有的进度
-    for (; i <= percentum && i <= 100; i += 5) {
-        txt += "█";
-    }
-
-    // 补充余下的空白
-    for (; i <= 100; i += 5) {
-        txt += "░";
-    }
-
-    linelog(percentum.toFixed(2) + "%[" + txt + "]" + stream);
-};
+
+exports.linelog = linelog;

package/{corejs → nodejs}/throttle/index.js

@@ -1,4 +1,9 @@
-export function throttle(callback, _option) {
+/*!
+* throttle of OIPage v1.0.0-alpha.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
+function throttle(callback, _option) {
 
     // 缺省值
     var option = {
@@ -6,7 +11,7 @@ export function throttle(callback, _option) {
         keep: false,
         opportunity: "end"
     };
-
+    
     // 校对
     if (_option) {
         for (var key in _option) {
@@ -47,4 +52,5 @@ export function throttle(callback, _option) {
         }
 
     };
-};
+};
+exports.throttle = throttle;

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "oipage",
-  "version": "0.3.0",
-  "description": "OI页面快速开发辅助库，包括核心包、Nodejs、浏览器、样式文件等",
-  "main": "./nodejs/index.js",
-  "typings": "./types/index.d.ts",
+  "version": "1.0.0-alpha.1",
+  "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
   "sideEffects": false,
+  "scripts": {
+    "dev": "node ./build/index.js watch",
+    "build": "node ./build/index.js",
+    "serve": "node ./bin/run serve",
+    "doc": ""
+  },
   "bin": {
     "oipage-cli": "bin/run"
   },
@@ -30,5 +34,8 @@
   "bugs": {
     "url": "https://github.com/oi-contrib/OIPage/issues"
   },
-  "homepage": "https://github.com/oi-contrib/OIPage"
+  "homepage": "https://github.com/oi-contrib/OIPage",
+  "devDependencies": {
+    "oipage": "^0.2.0"
+  }
 }

package/web/animation/index.d.ts

@@ -0,0 +1,12 @@
+interface animationFun {
+    (deep: number): void
+}
+
+/**
+ * 轮询动画，返回一个函数，调用该函数，可以提前结束动画
+ */
+export interface animationType {
+    (doback: animationFun, duration?: number, callback?: animationFun): Function
+}
+
+export let animation: animationType

package/web/animation/index.js

@@ -0,0 +1,108 @@
+/*!
+* animation of OIPage v1.0.0-alpha.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
+//当前正在运动的动画的tick函数堆栈
+var $timers = [];
+//唯一定时器的定时间隔
+var $interval = 13;
+//定时器ID
+var $timerId;
+
+/**
+ * 动画轮播
+ * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
+ * @param {number} duration 动画时长，可选
+ * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
+ *
+ * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
+ */
+function animation(doback, duration, callback) {
+    if (arguments.length < 2) duration = 400;
+    if (arguments.length < 3) callback = function () { };
+
+    var clock = {
+        //把tick函数推入堆栈
+        "timer": function (tick, duration, callback) {
+            if (!tick) {
+                throw new Error('Tick is required!');
+            }
+            var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
+            $timers.push({
+                "id": id,
+                "createTime": new Date(),
+                "tick": tick,
+                "duration": duration,
+                "callback": callback
+            });
+            clock.start();
+            return id;
+        },
+
+        //开启唯一的定时器timerId
+        "start": function () {
+            if (!$timerId) {
+                $timerId = setInterval(clock.tick, $interval);
+            }
+        },
+
+        //被定时器调用，遍历timers堆栈
+        "tick": function () {
+            var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
+
+            $timers = [];
+            $timers.length = 0;
+
+            for (flag = 0; flag < timers.length; flag++) {
+                //初始化数据
+                timer = timers[flag];
+                createTime = timer.createTime;
+                tick = timer.tick;
+                duration = timer.duration;
+                callback = timer.callback;
+
+                //执行
+                passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
+                passTime = passTime > 1 ? 1 : passTime;
+                tick(passTime);
+                if (passTime < 1 && timer.id) {
+                    //动画没有结束再添加
+                    $timers.push(timer);
+                } else {
+                    callback(passTime);
+                }
+            }
+            if ($timers.length <= 0) {
+                clock.stop();
+            }
+        },
+
+        //停止定时器，重置timerId=null
+        "stop": function () {
+            if ($timerId) {
+                clearInterval($timerId);
+                $timerId = null;
+            }
+        }
+    };
+
+    var id = clock.timer(function (deep) {
+        //其中deep为0-1，表示改变的程度
+        doback(deep);
+    }, duration, callback);
+
+    // 返回一个函数
+    // 用于在动画结束前结束动画
+    return function () {
+        var i;
+        for (i in $timers) {
+            if ($timers[i].id == id) {
+                $timers[i].id = void 0;
+                return;
+            }
+        }
+    };
+
+};
+export let animation = animation;

package/{browserjs → web}/getStyle/index.js

@@ -1,4 +1,9 @@
-export function getStyle(el, name) {
+/*!
+* getStyle of OIPage v1.0.0-alpha.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
+function getStyle(el, name) {
 
     // 获取结点的全部样式
     var allStyle = document.defaultView && document.defaultView.getComputedStyle ?
@@ -10,4 +15,5 @@ export function getStyle(el, name) {
         allStyle.getPropertyValue(name) :
         allStyle;
 
-};
+};
+export let getStyle = getStyle;

package/{browserjs → web}/onReady/index.js

@@ -1,8 +1,14 @@
-export function onReady(callback) {
+/*!
+* onReady of OIPage v1.0.0-alpha.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
+function onReady(callback) {
     var readyState = document.readyState;
     if (readyState === 'interactive' || readyState === 'complete') {
         callback();
     } else {
         window.addEventListener("DOMContentLoaded", callback);
     }
-};
+};
+export let onReady = onReady;

package/web/setStyle/index.js

@@ -0,0 +1,11 @@
+/*!
+* setStyle of OIPage v1.0.0-alpha.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
+function setStyle(el, styles) {
+    for (var key in styles) {
+        el.style[key] = styles[key];
+    }
+};
+export let setStyle = setStyle;

package/web/throttle/index.d.ts

@@ -0,0 +1,31 @@
+export type throttleOpportunityType = "begin" | "end" | "wide"
+
+export interface throttleOptionType {
+
+    /**
+     * 节流时长
+     */
+    time?: number
+
+    /**
+     * 是否持续节流
+     */
+    keep?: boolean
+
+    /**
+     * 执行时机
+     *
+     * begin（开始触发）、end（结束触发）、wide（第一次开始触发，其余结束触发）
+     */
+    opportunity?: throttleOpportunityType
+
+}
+
+/**
+ * 节流函数
+ */
+export interface throttleType {
+    (callback: Function, option?: throttleOptionType): Function
+}
+
+export let throttle: throttleType

package/web/throttle/index.js

@@ -0,0 +1,56 @@
+/*!
+* throttle of OIPage v1.0.0-alpha.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
+function throttle(callback, _option) {
+
+    // 缺省值
+    var option = {
+        time: 200,
+        keep: false,
+        opportunity: "end"
+    };
+    
+    // 校对
+    if (_option) {
+        for (var key in _option) {
+            option[key] = _option[key];
+        }
+    }
+
+    var hadInterval = false, hadClick = false, oneClick = false, arg;
+    return function () {
+        const _this = this;
+        arg = arguments;
+
+        // 如果前置任务都完成了
+        if (!hadInterval) {
+            if (option.opportunity != 'end') {
+                callback.apply(_this, arg);
+            }
+            hadInterval = true;
+
+            var interval = setInterval(() => {
+                if (hadClick) {
+                    if (!option.keep) {
+                        callback.apply(_this, arg);
+                    }
+                } else {
+                    if (option.opportunity != 'begin') {
+                        if (oneClick || option.opportunity == 'end') callback.apply(_this, arg);
+                    }
+                    hadInterval = false;
+                    oneClick = false;
+                    clearInterval(interval);
+                }
+                hadClick = false;
+            }, option.time);
+        } else {
+            hadClick = true;
+            oneClick = true;
+        }
+
+    };
+};
+export let throttle = throttle;

package/AUTHORS.txt

@@ -1,6 +0,0 @@
-Authors ordered by first contribution.
-
-zxl20070701 <1904314465@qq.com> <https://github.com/zxl20070701>
-
------------------------------------------------------
-We thank all of them for their contributions!

package/bin/options.js

@@ -1,74 +0,0 @@
-module.exports = {
-
-  // 命令参数配置
-  "options": {
-    version: {
-      short: 'v',
-      info: '[0]Display the version of OIPage.',
-      demo: 'oipage-cli --version|-v'
-    },
-    help: {
-      short: 'h',
-      info: '[1]Display this help text.',
-      demo: 'oipage-cli --help|-h <term>'
-    },
-    server: {
-      short: 's',
-      info: '[2]Render source server.',
-      demo: 'oipage-cli --server|-s [port|20000] [basePath|./]'
-    },
-    config: {
-      short: 'c',
-      info: '[3]Specify a configuration file.',
-      demo: 'oipage-cli --config|-c ./OIPage.config.js'
-    },
-    delete: {
-      info: '[4]Delete file or folder.',
-      demo: 'oipage-cli --delete targetPath'
-    },
-    copy: {
-      info: '[5]Copy file or folder.',
-      demo: 'oipage-cli --copy sourcePath targetPath'
-    },
-    pick: {
-      info: '[6]Copy all files in the folder to the specified location.',
-      demo: 'oipage-cli --pick sourcePath targetPath'
-    },
-    move: {
-      info: '[7]Move file or folder.',
-      demo: 'oipage-cli --move sourcePath targetPath'
-    },
-    network: {
-      info: '[8]Display network information.',
-      demo: 'oipage-cli --network'
-    },
-    get: {
-      info: '[9]HTTP GET.',
-      demo: 'oipage-cli --get url'
-    },
-    post: {
-      info: '[10]HTTP POST.',
-      demo: 'oipage-cli --post url'
-    },
-    cat: {
-      info: '[11]Show file.',
-      demo: 'oipage-cli --cat path'
-    },
-    run: {
-      info: '[12]Run multiple commands.',
-      demo: 'oipage-cli --run \"commands1\" \"commands2\" \"commands3\"'
-    }
-  },
-
-  // 帮助信息
-  "help": `
-  Usage: oipage-cli <command>
-  
-  Where <command> is one of:
-    --help, -h, --server, -s, --version, -v, --config, -c, --delete, --copy, --pick, --move, --network, --get, --post, --cat
-  
-  oipage-cli --help|-h <term>       search for help on <term>
-  oipage-cli --help|-h              involved overview
-    `
-
-};

package/browserjs/index.d.ts

@@ -1,13 +0,0 @@
-import { getStyleType } from "./getStyle"
-import { setStyleType } from "./setStyle"
-import { onReadyType } from "./onReady"
-
-export default class Corejs {
-    static getStyle: getStyleType
-    static setStyle: setStyleType
-    static onReady: onReadyType
-}
-
-export let getStyle: getStyleType
-export let setStyle: setStyleType
-export let onReady: onReadyType

package/browserjs/index.js

@@ -1,9 +0,0 @@
-import { getStyle } from "./getStyle/index.js";
-import { setStyle } from "./setStyle/index.js";
-import { onReady } from "./onReady/index.js";
-
-export default {
-    getStyle: getStyle,
-    setStyle: setStyle,
-    onReady: onReady
-};

package/browserjs/setStyle/index.js

@@ -1,5 +0,0 @@
-export function setStyle(el, styles) {
-    for (var key in styles) {
-        el.style[key] = styles[key];
-    }
-};

package/corejs/index.d.ts

@@ -1,10 +0,0 @@
-import { animationType } from "./animation"
-import { throttleType } from "./throttle"
-
-export default class Corejs {
-    static animation: animationType
-    static throttle: throttleType
-}
-
-export let animation: animationType
-export let throttle: throttleType

package/corejs/index.js

@@ -1,7 +0,0 @@
-import { animation } from "./animation/index.js";
-import { throttle } from "./throttle/index.js";
-
-export default {
-    animation: animation,
-    throttle: throttle
-};