oipage 1.3.0-alpha.2 → 1.3.0

package/bin/tools/format.js

@@ -1,89 +1,76 @@
-/**
- * 把字节转换成更可读的内容
- * @param {*} value 
- * @returns 
- */
-exports.formatByte = function (value) {
-    if (value < 1024) return value + "Byte";
-
-    let kb = value / 1024;
-    if (kb < 1024) return kb.toFixed(1) + "KB";
-
-    let mb = kb / 1024;
-    if (mb < 1024) return mb.toFixed(1) + "MB";
-
-    let gb = mb / 1024;
-    return gb.toFixed(1) + "GB";
-};
-
-/**
- * 把时间变成更可读的格式
- * @param {*} value 
- * @returns 
- */
-exports.formatTime = function (value) {
-    let year = value.getFullYear();
-    let month = value.getMonth() + 1;
-    let day = value.getDate();
-
-    let hour = value.getHours();
-    let minutes = value.getMinutes();
-
-    let today = new Date();
-    if (year == today.getFullYear() && month == today.getMonth() + 1 && day == today.getDate()) {
-        return "今天 " + hour + ":" + minutes;
-    } else {
-        return year + "年" + month + "月" + day + "日 " + hour + ":" + minutes;
-    }
-};
-
-/**
- * 命令行参数解析
- * @param {*} argvs 
- * @param {*} shorts 
- * @param {*} isArray 是否按序号记录
- * @returns 
- */
-exports.formatArgv = function (argvs, shorts, isArray) {
-    let result = {}, keyName = "args", value = [];
-    if (isArray) result["value"] = [];
-
-    let pushValue = function () {
-        if (isArray && keyName !== "args") {
-            result["value"].push({
-                name: keyName,
-                value
-            });
-        } else {
-            result[keyName] = value;
-        }
-    };
-
-    for (let index = 3; index < argvs.length; index++) {
-        let argv = argvs[index];
-
-        if (/^\-/.test(argv)) {
-            pushValue();
-            keyName = shorts[argv] || argv;
-            value = [];
-        } else {
-            value.push(argv);
-        }
-    }
-    pushValue();
-
-    return result;
-};
-
-/**
- * 请求头解析
- * @param {*} rawHeaders 
- * @returns 
- */
-exports.formatRawHeaders = function (rawHeaders) {
-    let headers = {};
-    for (let i = 0; i < rawHeaders.length - 1; i += 2) {
-        headers[rawHeaders[i]] = rawHeaders[i + 1];
-    }
-    return headers;
+/**
+ * 把字节转换成更可读的内容
+ * @param {*} value 
+ * @returns 
+ */
+exports.formatByte = function (value) {
+    if (value < 1024) return value + "Byte";
+
+    let kb = value / 1024;
+    if (kb < 1024) return kb.toFixed(1) + "KB";
+
+    let mb = kb / 1024;
+    if (mb < 1024) return mb.toFixed(1) + "MB";
+
+    let gb = mb / 1024;
+    return gb.toFixed(1) + "GB";
+};
+
+/**
+ * 把时间变成更可读的格式
+ * @param {*} value 
+ * @returns 
+ */
+exports.formatTime = function (value) {
+    let year = value.getFullYear();
+    let month = value.getMonth() + 1;
+    let day = value.getDate();
+
+    let hour = value.getHours();
+    let minutes = value.getMinutes();
+
+    let today = new Date();
+    if (year == today.getFullYear() && month == today.getMonth() + 1 && day == today.getDate()) {
+        return "今天 " + hour + ":" + minutes;
+    } else {
+        return year + "年" + month + "月" + day + "日 " + hour + ":" + minutes;
+    }
+};
+
+/**
+ * 命令行参数解析
+ * @param {*} argvs 
+ * @param {*} shorts 
+ * @param {*} isArray 是否按序号记录
+ * @returns 
+ */
+exports.formatArgv = function (argvs, shorts, isArray) {
+    let result = {}, keyName = "args", value = [];
+    if (isArray) result["value"] = [];
+
+    let pushValue = function () {
+        if (isArray && keyName !== "args") {
+            result["value"].push({
+                name: keyName,
+                value
+            });
+        } else {
+            result[keyName] = value;
+        }
+    };
+
+    for (let index = 3; index < argvs.length; index++) {
+        let argv = argvs[index];
+
+        if (/^\-/.test(argv)) {
+            pushValue();
+            keyName = shorts[argv] || argv;
+            value = [];
+        } else {
+            value.push(argv);
+        }
+    }
+    pushValue();
+
+    return result;
 };

package/bin/tools/resolveImport.js

@@ -1,89 +1,89 @@
-const { readFileSync, existsSync, lstatSync } = require("fs");
-const { join } = require("path");
-const { testIntercept } = require("../intercept.js");
-
-module.exports = function (basePath, filePath, entry, intercept, isDownload) {
-    basePath = join(basePath, "./");
-
-    let source = readFileSync(filePath);
-    let resolveImport = content => content;
-
-    let __resolveImport = function (content) {
-        return content.replace(/import [^'"]* from (['"])([^'"]*)['"]/sg, function (_importCode, _, _importUrl) {
-            if (/^[./]/.test(_importUrl)) {
-                return _importCode;
-            } else {
-                return _importCode.replace(_importUrl, _importUrl.replace(/([^/])+/s, function (npmName) {
-
-                    if (testIntercept(npmName, intercept)) {
-                        return "/@modules/" + npmName;
-                    } else {
-
-                        let node_modulesRootPath = join(filePath, "../");
-                        let prePath = "";
-                        while (true) {
-                            let npmBundlePath = join(node_modulesRootPath, "./node_modules/", npmName);
-
-                            // 如果存在
-                            if (existsSync(npmBundlePath) && lstatSync(npmBundlePath).isDirectory()) {
-                                let npmNameValue = npmName;
-
-                                // 对于类似 import VISLite from "vislite"
-                                // 需要把包名解析成具体的文件
-                                if (!/\//.test(_importUrl)) {
-                                    let bundlePackage = require(join(npmBundlePath, "./package.json"));
-                                    npmNameValue = npmName + "/" + bundlePackage.main;
-                                }
-
-                                return (prePath ? prePath : "./") + "node_modules/" + npmNameValue;
-                            }
-
-                            if (node_modulesRootPath === basePath) {
-
-                                // 如果命令行根目录是一个项目
-                                let packagePath = join(basePath, "./package.json");
-                                if (existsSync(packagePath) && !lstatSync(packagePath).isDirectory()) {
-                                    let bundlePackage = require(packagePath);
-                                    if (!/\//.test(_importUrl)) {
-                                        return "/" + bundlePackage.main;
-                                    } else {
-                                        return "/"
-                                    }
-                                }
-
-                                return npmName;
-                            } else {
-                                node_modulesRootPath = join(node_modulesRootPath, "../");
-                                prePath = "../" + prePath;
-                            }
-                        }
-
-                    }
-                }));
-            }
-        });
-    };
-
-    // 如果是下载
-    if (isDownload) {
-        // todo
-    }
-
-    // 如果不是直接访问的
-    else if (!entry) {
-        source += "";
-        resolveImport = (content, notResolve) => notResolve ? content : __resolveImport(content);
-    }
-
-    // 如果是.html或.htm结尾
-    else if (/\.html{0,1}$/.test(filePath)) {
-        source = (source + "").replace(/<script type="module">(.*)<\/script>/sg, function (_, _matchCode) {
-            return `<script type="module">${__resolveImport(_matchCode)}</script>`;
-        });
-    }
-
-    return {
-        source,
-        resolveImport
-    };
+const { readFileSync, existsSync, lstatSync } = require("fs");
+const { join } = require("path");
+const { testIntercept } = require("../intercept.js");
+
+module.exports = function (basePath, filePath, entry, intercept, isDownload) {
+    basePath = join(basePath, "./");
+
+    let source = readFileSync(filePath);
+    let resolveImport = content => content;
+
+    let __resolveImport = function (content) {
+        return content.replace(/import [^'"]* from (['"])([^'"]*)['"]/sg, function (_importCode, _, _importUrl) {
+            if (/^[./]/.test(_importUrl)) {
+                return _importCode;
+            } else {
+                return _importCode.replace(_importUrl, _importUrl.replace(/([^/])+/s, function (npmName) {
+
+                    if (testIntercept(npmName, intercept)) {
+                        return "/@modules/" + npmName;
+                    } else {
+
+                        let node_modulesRootPath = join(filePath, "../");
+                        let prePath = "";
+                        while (true) {
+                            let npmBundlePath = join(node_modulesRootPath, "./node_modules/", npmName);
+
+                            // 如果存在
+                            if (existsSync(npmBundlePath) && lstatSync(npmBundlePath).isDirectory()) {
+                                let npmNameValue = npmName;
+
+                                // 对于类似 import VISLite from "vislite"
+                                // 需要把包名解析成具体的文件
+                                if (!/\//.test(_importUrl)) {
+                                    let bundlePackage = require(join(npmBundlePath, "./package.json"));
+                                    npmNameValue = npmName + "/" + bundlePackage.main;
+                                }
+
+                                return (prePath ? prePath : "./") + "node_modules/" + npmNameValue;
+                            }
+
+                            if (node_modulesRootPath === basePath) {
+
+                                // 如果命令行根目录是一个项目
+                                let packagePath = join(basePath, "./package.json");
+                                if (existsSync(packagePath) && !lstatSync(packagePath).isDirectory()) {
+                                    let bundlePackage = require(packagePath);
+                                    if (!/\//.test(_importUrl)) {
+                                        return "/" + bundlePackage.main;
+                                    } else {
+                                        return "/"
+                                    }
+                                }
+
+                                return npmName;
+                            } else {
+                                node_modulesRootPath = join(node_modulesRootPath, "../");
+                                prePath = "../" + prePath;
+                            }
+                        }
+
+                    }
+                }));
+            }
+        });
+    };
+
+    // 如果是下载
+    if (isDownload) {
+        // todo
+    }
+
+    // 如果不是直接访问的
+    else if (!entry) {
+        source += "";
+        resolveImport = (content, notResolve) => notResolve ? content : __resolveImport(content);
+    }
+
+    // 如果是.html或.htm结尾
+    else if (/\.html{0,1}$/.test(filePath)) {
+        source = (source + "").replace(/<script type="module">(.*)<\/script>/sg, function (_, _matchCode) {
+            return `<script type="module">${__resolveImport(_matchCode)}</script>`;
+        });
+    }
+
+    return {
+        source,
+        resolveImport
+    };
 };

package/nodejs/animation/index.d.ts

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

package/nodejs/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.3.0-alpha.2
+* animation of OIPage v1.3.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/cmdlog/index.js

@@ -1,5 +1,5 @@
 /*!
-* cmdlog of OIPage v1.3.0-alpha.2
+* cmdlog of OIPage v1.3.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/disk/index.js

@@ -1,5 +1,5 @@
 /*!
-* disk of OIPage v1.3.0-alpha.2
+* disk of OIPage v1.3.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/json/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 把一段字符串变成json返回
+ * @param express 非严格json字符串
+ * @returns 返回一个JSON对象
+ */
+export interface strToJsonType {
+    (express:string): object
+}
+
+export let strToJson: strToJsonType

package/nodejs/json/index.js

@@ -0,0 +1,212 @@
+/*!
+* json of OIPage v1.3.0
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+const {reader} = require("../reader/index.js");
+let calcValue = function (word) {
+    if (word.type != 'string' && word.type != 'object') {
+
+        // 数字
+        if (/[+-]{0,1}\d{1,}\.{0,1}\d{0,}/.test(word.value)) {
+            return +word.value;
+        }
+
+        // undefined
+        else if (word.value == 'undefined') {
+            return undefined;
+        }
+
+        // null
+        else if (word.value == 'null') {
+            return null;
+        }
+
+        // false
+        else if (word.value == 'false') {
+            return false;
+        }
+
+        // true
+        else if (word.value == 'true') {
+            return true;
+        }
+
+    }
+
+    return word.value;
+};
+
+let toValue = function (wordArray) {
+    let value;
+
+    // 是json
+    if (wordArray[0].value == '{') {
+        value = {};
+        for (let i = 3; i < wordArray.length; i += 4) {
+            value[wordArray[i - 2].value] = calcValue(wordArray[i]);
+        }
+    }
+
+    // 数组
+    else {
+        value = [];
+        for (let i = 2; i < wordArray.length; i += 2) {
+            value.push(calcValue(wordArray[i - 1]));
+        }
+    }
+
+    return {
+        type: "object",
+        value: value
+    };
+};
+
+let analyseWord = function (express) {
+    // 剔除开头和结尾的空白
+    express = express.trim();
+
+    // 获取字符串分析对象
+    let readerHandler = reader(express);
+
+    let wordArray = [];
+    let tempWord = "";
+    readerHandler.readNext();
+
+    // 定义一个追加普通串的方法
+    let pushNormal = function () {
+        tempWord = tempWord.trim();
+        if (tempWord != '') {
+            wordArray.push({
+                type: /\d%/.test(tempWord) ? "string" : "normal",
+                value: tempWord
+            });
+        }
+        tempWord = "";
+    };
+
+    while (true) {
+
+        if (readerHandler.index >= express.length) break;
+
+        // 单行注释
+        if (readerHandler.getNextN(2) == '//') {
+            while (!/\n/.test(readerHandler.readNext()) && readerHandler.index < express.length);
+        }
+
+        // 多行注释
+        else if (readerHandler.getNextN(2) == '/*') {
+            while (readerHandler.getNextN(2) != '*/') {
+                if (readerHandler.index >= express.length) {
+                    throw new Error("Multiline comment not closed correctly : " + express + "\nstep='analyseWord-searchEndComment'");
+                }
+                readerHandler.readNext();
+            }
+            readerHandler.readNext();
+            readerHandler.readNext();
+        }
+
+        // 如果是边界符号
+        else if (['{', '}', ',', '[', ']', ':'].indexOf(readerHandler.value) > -1) {
+            pushNormal();
+
+            wordArray.push({
+                type: "insign",
+                value: readerHandler.value
+            });
+            readerHandler.readNext();
+        }
+
+        // 如果遇到字符串，应该是一个独立的单词
+        else if (['"', "'"].indexOf(readerHandler.value) > -1) {
+
+            let tempStrWord = "";
+            while (['"', "'"].indexOf(readerHandler.readNext()) < 0) {
+                if (readerHandler.index >= express.length) {
+                    throw new Error("The string is not closed correctly : " + express + "\nstep='analyseWord-searchString',currentStrWord=" + tempStrWord);
+                }
+                tempStrWord += readerHandler.value;
+            }
+            readerHandler.readNext();
+            wordArray.push({
+                type: "string",
+                value: tempStrWord
+            });
+
+        } else {
+            tempWord += readerHandler.value;
+            readerHandler.readNext();
+        }
+
+    }
+
+    return wordArray;
+};
+
+function strToJson(express) {
+    if (typeof express === "string") {
+
+        // 先分析出来单词
+        let wordArray = analyseWord(express);
+
+        /**
+         * 思路：
+         * 从后往前找，找到第一个需要归结的，直接归结，
+         * 归结完毕以后，继续，直到找到开头，说明归结完毕，
+         * 这样设计的好处是：
+         * 从后往前找，一定是叶子，这就消除了递归。
+         */
+        let i = wordArray.length - 1, j;
+
+        // 只要单词数组归结完毕
+        while (wordArray.length > 1) {
+
+            // 从后往前找第一个需要归结的子对象
+            while (i >= 0 && (wordArray[i].type != 'insign' || ['{', '['].indexOf(wordArray[i].value) < 0)) {
+                i = i - 1;
+            }
+
+            if (i < 0) {
+                // 如果到开头都没有遇到，缺少开始符号
+                throw new Error("Illegal express : " + express + "\nstep='toOne-searchBeginIndex',wordArray=" + wordArray);
+            }
+
+            // 然后合并
+            j = i + 1;
+            let subWordArray = [wordArray[i]];
+            while (j < wordArray.length && (wordArray[j].type != 'insign' || wordArray[j].value != {
+                "{": "}",
+                "[": "]"
+            }[wordArray[i].value])) {
+                subWordArray.push(wordArray[j]);
+                j = j + 1;
+            }
+
+            if (j >= wordArray.length) {
+                // 如果到结尾都没有需要应该闭合的符号，缺少闭合符号
+                throw new Error("Illegal express : " + express + "\nstep='toOne-searchEndIndex',wordArray=" + wordArray);
+            } else {
+
+                // 结尾追加进去
+                subWordArray.push(wordArray[j]);
+
+                // 归结
+                wordArray[i] = toValue(subWordArray);
+
+                // 调整
+                wordArray.splice(i + 1, j - i);
+            }
+
+
+        }
+
+        // 返回计算结果
+        return wordArray[0].value;
+
+    } else {
+
+        throw new Error('The data passed is not a string.');
+
+    }
+
+}
+exports.strToJson = strToJson;

package/nodejs/logform/index.js

@@ -1,5 +1,5 @@
 /*!
-* logform of OIPage v1.3.0-alpha.2
+* logform of OIPage v1.3.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {linelog} = require("../cmdlog/index.js");

package/nodejs/reader/index.js

@@ -1,26 +1,26 @@
 /*!
-* reader of OIPage v1.3.0-alpha.2
+* reader of OIPage v1.3.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-function reader(plain) {
-
-    let handler = {
-        index: -1,
-        value: null
-    };
-
-    // 读取下一个字符
-    handler.readNext = function () {
-        handler.value = handler.index++ < plain.length - 1 ? plain[handler.index] : null;
-        return handler.value;
-    };
-
-    // 获取往后num个值
-    handler.getNextN = function (num) {
-        return express.substring(handler.index, num + handler.index > plain.length ? plain.length : num + handler.index);
-    };
-
-    return handler;
+function reader(plain) {
+
+    let handler = {
+        index: -1,
+        value: null
+    };
+
+    // 读取下一个字符
+    handler.readNext = function () {
+        handler.value = handler.index++ < plain.length - 1 ? plain[handler.index] : null;
+        return handler.value;
+    };
+
+    // 获取往后num个值
+    handler.getNextN = function (num) {
+        return plain.substring(handler.index, num + handler.index > plain.length ? plain.length : num + handler.index);
+    };
+
+    return handler;
 }
 exports.reader = reader;

package/nodejs/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.3.0-alpha.2
+* throttle of OIPage v1.3.0
 * git+https://github.com/oi-contrib/OIPage.git
 */