oipage 1.7.0 → 1.8.0-alpha.1

package/bin/website-plugins/loader/oipage-scss-loader.js

@@ -1,150 +1,150 @@
-// 参考：https://github.com/zxl20070701/zxl20070701.github.io/blob/master/bin/loader/scss.js
-let toSelector = function (preSelectorArray, deep) {
-    let selectors = preSelectorArray[0], i, j, k;
-    for (i = 1; i < deep; i++) {
-        let temp = [];
-        for (j = 0; j < selectors.length; j++) {
-            for (k = 0; k < preSelectorArray[i].length; k++) {
-                temp.push(selectors[j] + preSelectorArray[i][k]);
-            }
-        }
-        selectors = temp;
-    }
-    return "\n" + (selectors.join(',')) + "{\n";
-};
-let analyseBlock = function (source) {
-    let i = -1, currentChar = null;
-    let next = function () {
-        currentChar = i++ < source.length - 1 ? source[i] : null;
-        return currentChar;
-    }
-    let nextNValue = function (n) {
-        return source.substring(i, n + i > source.length ? source.length : n + i);
-    }
-    let blocks = [];
-    let currentBlock = "";
-    next();
-    while (true) {
-        while (new RegExp("[\\x20\\t\\r\\n\\f]").test(currentChar)) {
-            next();
-        }
-        if (currentChar == null) break;
-        if (nextNValue(2) == '/*') {
-
-            next();
-            next();
-            currentBlock = "/*";
-
-            while (nextNValue(2) != '*/' && currentChar != null) {
-                currentBlock += currentChar;
-                next();
-            }
-            if (currentChar == null) {
-                throw new Error('The comment is not closed.');
-            }
-            currentBlock += "*/";
-            next();
-            next();
-            blocks.push({
-                value: currentBlock,
-                type: "comment-double"
-            });
-        }
-        else if (nextNValue(2) == '//') {
-            currentBlock = '';
-
-            while (currentChar != '\n' && currentChar != null) {
-                currentBlock += currentChar;
-                next();
-            }
-
-            blocks.push({
-                value: currentBlock,
-                type: "comment-single"
-            });
-
-        }
-        else if (currentChar == '}') {
-
-            blocks.push({
-                value: "}",
-                type: "end"
-            });
-
-            next();
-
-        }
-        else {
-
-            currentBlock = '';
-            while (currentChar != '{' && currentChar != ';' && currentChar != null) {
-                currentBlock += currentChar;
-                next();
-            }
-            if (currentChar == null) {
-                throw new Error('Statement or code block missing closure.');
-            }
-            blocks.push({
-                value: currentBlock + currentChar,
-                type: {
-                    '{': "begin",
-                    ';': 'statement'
-                }[currentChar]
-            });
-            next();
-        }
-    }
-    return blocks;
-};
-module.exports = function (source) {
-    this.setFileType("application/javascript");
-    let blocks = analyseBlock(source + "");
-    let i, j, cssCode = "", preSelectorArray = [], deep = 0;
-    for (i = 0; i < blocks.length; i++) {
-        if (blocks[i].type == 'comment-double') {
-            cssCode += blocks[i].value;
-        }
-        else if (blocks[i].type == 'comment-single') {
-            cssCode += "\n/* " + blocks[i].value + " */\n";
-        }
-        else if (blocks[i].type == 'begin') {
-            let preSplit = blocks[i].value.split(',');
-            let preSelect = [];
-            for (j = 0; j < preSplit.length; j++) {
-                preSelect[j] = preSplit[j].replace(/\{$/, '').trim();
-                if (/^&/.test(preSelect[j])) {
-                    preSelect[j] = preSelect[j].replace(/^&/, '');
-                } else {
-                    preSelect[j] = " " + preSelect[j];
-                }
-            }
-            preSelectorArray[deep] = preSelect;
-            deep += 1;
-        }
-        else if (blocks[i].type == 'end') {
-            deep -= 1;
-        }
-        else if (blocks[i].type == 'statement') {
-            j = 1;
-            let preType = blocks[i - j].type;
-            while (['comment-double', 'comment-single'].indexOf(preType) > -1) {
-                j += 1;
-                preType = blocks[i - j].type;
-            }
-            if (['end', 'begin'].indexOf(preType) > -1) {
-                cssCode += toSelector(preSelectorArray, deep);
-            }
-            cssCode += "\n" + blocks[i].value + "\n";
-            j = 1;
-            let nextType = blocks[i + j].type;
-            while (['comment-double', 'comment-single'].indexOf(nextType) > -1) {
-                j += 1;
-                nextType = blocks[i + j].type;
-            }
-            if (['end', 'begin'].indexOf(nextType) > -1) {
-                cssCode += "\n}\n";
-            }
-        }
-    }
-    return `export default ${JSON.stringify(cssCode)}`;
+// 参考：https://github.com/zxl20070701/zxl20070701.github.io/blob/master/bin/loader/scss.js
+let toSelector = function (preSelectorArray, deep) {
+    let selectors = preSelectorArray[0], i, j, k;
+    for (i = 1; i < deep; i++) {
+        let temp = [];
+        for (j = 0; j < selectors.length; j++) {
+            for (k = 0; k < preSelectorArray[i].length; k++) {
+                temp.push(selectors[j] + preSelectorArray[i][k]);
+            }
+        }
+        selectors = temp;
+    }
+    return "\n" + (selectors.join(',')) + "{\n";
+};
+let analyseBlock = function (source) {
+    let i = -1, currentChar = null;
+    let next = function () {
+        currentChar = i++ < source.length - 1 ? source[i] : null;
+        return currentChar;
+    }
+    let nextNValue = function (n) {
+        return source.substring(i, n + i > source.length ? source.length : n + i);
+    }
+    let blocks = [];
+    let currentBlock = "";
+    next();
+    while (true) {
+        while (new RegExp("[\\x20\\t\\r\\n\\f]").test(currentChar)) {
+            next();
+        }
+        if (currentChar == null) break;
+        if (nextNValue(2) == '/*') {
+
+            next();
+            next();
+            currentBlock = "/*";
+
+            while (nextNValue(2) != '*/' && currentChar != null) {
+                currentBlock += currentChar;
+                next();
+            }
+            if (currentChar == null) {
+                throw new Error('The comment is not closed.');
+            }
+            currentBlock += "*/";
+            next();
+            next();
+            blocks.push({
+                value: currentBlock,
+                type: "comment-double"
+            });
+        }
+        else if (nextNValue(2) == '//') {
+            currentBlock = '';
+
+            while (currentChar != '\n' && currentChar != null) {
+                currentBlock += currentChar;
+                next();
+            }
+
+            blocks.push({
+                value: currentBlock,
+                type: "comment-single"
+            });
+
+        }
+        else if (currentChar == '}') {
+
+            blocks.push({
+                value: "}",
+                type: "end"
+            });
+
+            next();
+
+        }
+        else {
+
+            currentBlock = '';
+            while (currentChar != '{' && currentChar != ';' && currentChar != null) {
+                currentBlock += currentChar;
+                next();
+            }
+            if (currentChar == null) {
+                throw new Error('Statement or code block missing closure.');
+            }
+            blocks.push({
+                value: currentBlock + currentChar,
+                type: {
+                    '{': "begin",
+                    ';': 'statement'
+                }[currentChar]
+            });
+            next();
+        }
+    }
+    return blocks;
+};
+module.exports = function (source) {
+    this.setFileType("application/javascript");
+    let blocks = analyseBlock(source + "");
+    let i, j, cssCode = "", preSelectorArray = [], deep = 0;
+    for (i = 0; i < blocks.length; i++) {
+        if (blocks[i].type == 'comment-double') {
+            cssCode += blocks[i].value;
+        }
+        else if (blocks[i].type == 'comment-single') {
+            cssCode += "\n/* " + blocks[i].value + " */\n";
+        }
+        else if (blocks[i].type == 'begin') {
+            let preSplit = blocks[i].value.split(',');
+            let preSelect = [];
+            for (j = 0; j < preSplit.length; j++) {
+                preSelect[j] = preSplit[j].replace(/\{$/, '').trim();
+                if (/^&/.test(preSelect[j])) {
+                    preSelect[j] = preSelect[j].replace(/^&/, '');
+                } else {
+                    preSelect[j] = " " + preSelect[j];
+                }
+            }
+            preSelectorArray[deep] = preSelect;
+            deep += 1;
+        }
+        else if (blocks[i].type == 'end') {
+            deep -= 1;
+        }
+        else if (blocks[i].type == 'statement') {
+            j = 1;
+            let preType = blocks[i - j].type;
+            while (['comment-double', 'comment-single'].indexOf(preType) > -1) {
+                j += 1;
+                preType = blocks[i - j].type;
+            }
+            if (['end', 'begin'].indexOf(preType) > -1) {
+                cssCode += toSelector(preSelectorArray, deep);
+            }
+            cssCode += "\n" + blocks[i].value + "\n";
+            j = 1;
+            let nextType = blocks[i + j].type;
+            while (['comment-double', 'comment-single'].indexOf(nextType) > -1) {
+                j += 1;
+                nextType = blocks[i + j].type;
+            }
+            if (['end', 'begin'].indexOf(nextType) > -1) {
+                cssCode += "\n}\n";
+            }
+        }
+    }
+    return `export default ${JSON.stringify(cssCode)}`;
 };

package/nodejs/animation/index.d.ts

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

package/nodejs/animation/index.js

@@ -1,118 +1,126 @@
 /*!
-* animation of OIPage v1.7.0
+* animation of OIPage v1.8.0-alpha.1
 * 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 {object} 返回一个对象，包含一个stop方法，用于在动画结束前结束动画
- */
-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) {
-                if (!globalThis.requestAnimationFrame) {
-                    $timerId = setInterval(clock.tick, $interval);
-                } else {
-                    $timerId = globalThis.requestAnimationFrame(function step() {
-                        clock.tick();
-                        if ($timerId) $timerId = globalThis.requestAnimationFrame(step);
-                    });
-                }
-            }
-        },
-
-        //被定时器调用，遍历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) {
-                if (!globalThis.requestAnimationFrame) clearInterval($timerId);
-                else globalThis.cancelAnimationFrame($timerId);
-                $timerId = null;
-            }
-        }
-    };
-
-    var id = clock.timer(function (deep) {
-        //其中deep为0-1，表示改变的程度
-        doback(deep);
-    }, duration, callback);
-
-    return {
-        // 一个函数
-        // 用于在动画结束前结束动画
-        stop: function () {
-            var i;
-            for (i in $timers) {
-                if ($timers[i].id == id) {
-                    $timers[i].id = void 0;
-                    return;
-                }
-            }
-        }
-    };
-
+//当前正在运动的动画的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 {object} 返回一个对象，包含一个stop方法，用于在动画结束前结束动画
+ */
+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) {
+                try {
+                    if (globalThis && globalThis.requestAnimationFrame) {
+                        $timerId = globalThis.requestAnimationFrame(function step() {
+                            clock.tick();
+                            if ($timerId) $timerId = globalThis.requestAnimationFrame(step);
+                        });
+                    } else {
+                        $timerId = setInterval(clock.tick, $interval);
+                    }
+                } catch (e) {
+                    $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) {
+                try {
+                    if (globalThis && globalThis.requestAnimationFrame) globalThis.cancelAnimationFrame($timerId);
+                    else clearInterval($timerId);
+                } catch (e) {
+                    clearInterval($timerId);
+                }
+                $timerId = null;
+            }
+        }
+    };
+
+    var id = clock.timer(function (deep) {
+        //其中deep为0-1，表示改变的程度
+        doback(deep);
+    }, duration, callback);
+
+    return {
+        // 一个函数
+        // 用于在动画结束前结束动画
+        stop: function () {
+            var i;
+            for (i in $timers) {
+                if ($timers[i].id == id) {
+                    $timers[i].id = void 0;
+                    return;
+                }
+            }
+        }
+    };
+
 }
 exports.animation = animation;

package/nodejs/cmdlog/index.d.ts

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