oipage 1.3.0-alpha.2 → 1.3.0-alpha.3

package/CHANGELOG

@@ -58,7 +58,11 @@ v1.3.0:
       - 新增功能
         1、API功能（浏览器）
           * reader 文本分析读取器
+          * performChunk 空闲执行分片函数
+          * strToJson JSON字符串解析
         2、API功能（Node.js）
           * reader 文本分析读取器
+          * strToJson JSON字符串解析
         3、开发服务器
           * 新增 devServer.intercept 请求拦截
+          * 新增对 if-modified-since和last-modified 之304协商缓存的支持

package/bin/serve.js

@@ -38,12 +38,27 @@ module.exports = function (config) {
             let fileType = mineTypes[dotName]; // 文件类型
             let fileInfo = statSync(filePath);
 
+            let fileModifiedTime = new Date(fileInfo.mtime).toString();
+
             let responseHeader = {
                 'Content-type': (fileType || "text/plain") + ";charset=utf-8",
                 'Access-Control-Allow-Origin': '*',
-                'Server': 'Powered by OIPage-dev-server@' + packageValue.version
+                'Server': 'Powered by OIPage-dev-server@' + packageValue.version,
+                'Cache-Control': 'no-cache',
+                'Last-Modified': fileModifiedTime
             };
 
+            if (headers["If-Modified-Since"]) {
+                let ifModifiedSince = new Date(headers["If-Modified-Since"]).valueOf()
+                let lastModified = new Date(fileModifiedTime).valueOf()
+                if (lastModified <= ifModifiedSince) {
+                    response.writeHead('304', responseHeader);
+                    response.end();
+                    console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Cache File: " + url + "\x1b[0m " + new Date().toLocaleString()+"\x1b[33m\x1b[1m 304\x1b[0m");
+                    return;
+                }
+            }
+
             let sendType = "";
             let entry = headers.Accept !== "*/*";
 

package/nodejs/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.3.0-alpha.2
+* animation of OIPage v1.3.0-alpha.3
 * 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-alpha.3
 * 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-alpha.3
 * 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-alpha.3
+* 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-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {linelog} = require("../cmdlog/index.js");

package/nodejs/reader/index.js

@@ -1,5 +1,5 @@
 /*!
-* reader of OIPage v1.3.0-alpha.2
+* reader of OIPage v1.3.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
@@ -18,7 +18,7 @@ function reader(plain) {
 
     // 获取往后num个值
     handler.getNextN = function (num) {
-        return express.substring(handler.index, num + handler.index > plain.length ? plain.length : num + handler.index);
+        return plain.substring(handler.index, num + handler.index > plain.length ? plain.length : num + handler.index);
     };
 
     return handler;

package/nodejs/throttle/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oipage",
-  "version": "1.3.0-alpha.2",
+  "version": "1.3.0-alpha.3",
   "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
   "sideEffects": false,
   "scripts": {

package/web/animation/index.js

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

package/web/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/web/json/index.js

@@ -0,0 +1,211 @@
+/*!
+* json of OIPage v1.3.0-alpha.3
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+import {reader} from "../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;
+};
+
+export 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.');
+
+    }
+
+}

package/web/onReady/index.js

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

package/web/performChunk/index.d.ts

@@ -0,0 +1,5 @@
+export interface performChunkType {
+    (chunkFun: () => boolean): void
+}
+
+export let reader: performChunkType

package/web/performChunk/index.js

@@ -0,0 +1,24 @@
+/*!
+* performChunk of OIPage v1.3.0-alpha.3
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
+export function performChunk(chunkFun) {
+    let isRuning = true;
+
+    function run() {
+        if (!isRuning) return;
+
+        // 被调度为一个任务队列中的回调函数，仅在浏览器空闲时执行
+        // https://developer.mozilla.org/zh-CN/docs/Web/API/Window/requestIdleCallback
+        requestIdleCallback(function (idle) {
+
+            // 如果当前剩余时间还有，且还有剩余任务
+            while (idle.timeRemaining() > 0 && isRuning) {
+                isRuning = chunkFun()
+            }
+            run();
+        });
+    }
+    run();
+}

package/web/reader/index.js

@@ -1,5 +1,5 @@
 /*!
-* reader of OIPage v1.3.0-alpha.2
+* reader of OIPage v1.3.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
@@ -18,7 +18,7 @@ export function reader(plain) {
 
     // 获取往后num个值
     handler.getNextN = function (num) {
-        return express.substring(handler.index, num + handler.index > plain.length ? plain.length : num + handler.index);
+        return plain.substring(handler.index, num + handler.index > plain.length ? plain.length : num + handler.index);
     };
 
     return handler;

package/web/style/index.js

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

package/web/throttle/index.js

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