oipage 1.2.1 → 1.3.0-alpha.0

package/nodejs/cmdlog/index.js

@@ -1,82 +1,82 @@
 /*!
-* cmdlog of OIPage v1.2.1
+* cmdlog of OIPage v1.3.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 stringwidth = function (str) {
-    return str.length;
-};
-
-/**
- * 不换行打印
- * @param {string} stream 打印的内容
- */
-let linelog = (function (stream) {
-
-    // 用来记录前置有多少行需要回退
-    let prevLineCount = 0;
-
-    // 返回实际同行打印的方法
-    return function (nextStr) {
-        if (arguments.length == 0) {
-            prevLineCount = 0;
-            return;
-        }
-        let txt = "";
-
-        // 清除屏幕
-        for (let i = 0; i < prevLineCount; i++) {
-            txt += MOVE_LEFT + CLEAR_LINE + (i < prevLineCount - 1 ? MOVE_UP : '');
-        }
-
-        // 写入屏幕
-        stream.write(txt + nextStr);
-
-        // 重新计算需要回滚多少行
-        let prevLines = nextStr.split('\n');
-        prevLineCount = 0;
-        for (let i = 0; i < prevLines.length; i++) {
-            // 因为有时候文字过多，因此拿总长度除以一行长度得出真实的行数
-            prevLineCount += (Math.ceil(stringwidth(prevLines[i]) / stream.columns) || 1);
-        }
-
-    };
-})(process.stdout);
-
-/**
- * 进度打印
- * 
- * @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);
+// 预定义的常量
+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 stringwidth = function (str) {
+    return str.length;
+};
+
+/**
+ * 不换行打印
+ * @param {string} stream 打印的内容
+ */
+let linelog = (function (stream) {
+
+    // 用来记录前置有多少行需要回退
+    let prevLineCount = 0;
+
+    // 返回实际同行打印的方法
+    return function (nextStr) {
+        if (arguments.length == 0) {
+            prevLineCount = 0;
+            return;
+        }
+        let txt = "";
+
+        // 清除屏幕
+        for (let i = 0; i < prevLineCount; i++) {
+            txt += MOVE_LEFT + CLEAR_LINE + (i < prevLineCount - 1 ? MOVE_UP : '');
+        }
+
+        // 写入屏幕
+        stream.write(txt + nextStr);
+
+        // 重新计算需要回滚多少行
+        let prevLines = nextStr.split('\n');
+        prevLineCount = 0;
+        for (let i = 0; i < prevLines.length; i++) {
+            // 因为有时候文字过多，因此拿总长度除以一行长度得出真实的行数
+            prevLineCount += (Math.ceil(stringwidth(prevLines[i]) / stream.columns) || 1);
+        }
+
+    };
+})(process.stdout);
+
+/**
+ * 进度打印
+ * 
+ * @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.linelog = linelog;
 exports.deeplog = deeplog;

package/nodejs/disk/index.d.ts

@@ -1,17 +1,17 @@
-/**
- * 删除文件或文件夹
- */
-export interface deleteDiskType {
-    (diskPath: string): void
-}
-
-export let deleteDisk: deleteDiskType
-
-/**
- * 复制文件或文件夹
- */
-export interface copyDiskType {
-    (sourcePath: string, targetPath: string, isForce?: boolean): void
-}
-
+/**
+ * 删除文件或文件夹
+ */
+export interface deleteDiskType {
+    (diskPath: string): void
+}
+
+export let deleteDisk: deleteDiskType
+
+/**
+ * 复制文件或文件夹
+ */
+export interface copyDiskType {
+    (sourcePath: string, targetPath: string, isForce?: boolean): void
+}
+
 export let copyDisk: copyDiskType

package/nodejs/disk/index.js

@@ -1,85 +1,85 @@
 /*!
-* disk of OIPage v1.2.1
+* disk of OIPage v1.3.0-alpha.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-const { join } = require("path");
-const { existsSync, readdirSync, lstatSync, unlinkSync, rmdirSync, mkdirSync, copyFileSync } = require("fs");
-
-/**
- * 删除文件或文件夹
- * @param {string} diskPath 
- */
-function deleteDisk(diskPath) {
-    // 如果文件夹不存在，直接返回即可
-    if (!existsSync(diskPath)) return;
-
-    // 如果是文件，直接删除即可
-    if (!lstatSync(diskPath).isDirectory()) {
-        unlinkSync(diskPath);
-    } else {
-
-        // 读取子文件
-        const subFiles = readdirSync(diskPath);
-
-        subFiles.forEach(function (item) {
-
-            // 调用这个方法，删除子文件或文件夹
-            const curPath = join(diskPath, "./" + item);
-            deleteDisk(curPath);
-
-        });
-
-        // 等子文件或文件夹删除完毕以后，删除本文件夹
-        rmdirSync(diskPath);
-    }
-}
-
-/**
- * 复制文件或文件夹
- * @param {string} sourcePath 
- * @param {string} targetPath 
- * @param {boolean} isForce 可选，是否强制执行 
- */
-function copyDisk(sourcePath, targetPath, isForce) {
-
-    // 如果源文件不存在
-    if (!existsSync(sourcePath)) {
-        console.log("\x1b[0m\x1b[31m" + sourcePath + "\x1b[0m");
-        throw new Error("OIPage: The source path does not exist.");
-    }
-
-    // 如果模板文件已经存在
-    if (existsSync(targetPath)) {
-        if (isForce) {
-            deleteDisk(targetPath);
-        } else {
-            console.log("\x1b[0m\x1b[31m" + targetPath + "\x1b[0m");
-            throw new Error("OIPage: The target path already exists.");
-        }
-    }
-
-    (function copyDiskFun(sourcePath, targetPath) {
-        // 如果是文件，直接复制即可
-        if (!lstatSync(sourcePath).isDirectory()) {
-            copyFileSync(sourcePath, targetPath);
-        } else {
-
-            // 读取子文件
-            const subFiles = readdirSync(sourcePath);
-
-            // 如果文件夹不存在，创建
-            if (!existsSync(targetPath)) {
-                mkdirSync(targetPath, { recursive: true });
-            }
-
-            // 复制子文件或文件夹
-            subFiles.forEach(function (item) {
-                copyDiskFun(join(sourcePath, "./" + item), join(targetPath, "./" + item));
-            });
-
-        }
-    })(sourcePath, targetPath);
+const { join } = require("path");
+const { existsSync, readdirSync, lstatSync, unlinkSync, rmdirSync, mkdirSync, copyFileSync } = require("fs");
+
+/**
+ * 删除文件或文件夹
+ * @param {string} diskPath 
+ */
+function deleteDisk(diskPath) {
+    // 如果文件夹不存在，直接返回即可
+    if (!existsSync(diskPath)) return;
+
+    // 如果是文件，直接删除即可
+    if (!lstatSync(diskPath).isDirectory()) {
+        unlinkSync(diskPath);
+    } else {
+
+        // 读取子文件
+        const subFiles = readdirSync(diskPath);
+
+        subFiles.forEach(function (item) {
+
+            // 调用这个方法，删除子文件或文件夹
+            const curPath = join(diskPath, "./" + item);
+            deleteDisk(curPath);
+
+        });
+
+        // 等子文件或文件夹删除完毕以后，删除本文件夹
+        rmdirSync(diskPath);
+    }
+}
+
+/**
+ * 复制文件或文件夹
+ * @param {string} sourcePath 
+ * @param {string} targetPath 
+ * @param {boolean} isForce 可选，是否强制执行 
+ */
+function copyDisk(sourcePath, targetPath, isForce) {
+
+    // 如果源文件不存在
+    if (!existsSync(sourcePath)) {
+        console.log("\x1b[0m\x1b[31m" + sourcePath + "\x1b[0m");
+        throw new Error("OIPage: The source path does not exist.");
+    }
+
+    // 如果模板文件已经存在
+    if (existsSync(targetPath)) {
+        if (isForce) {
+            deleteDisk(targetPath);
+        } else {
+            console.log("\x1b[0m\x1b[31m" + targetPath + "\x1b[0m");
+            throw new Error("OIPage: The target path already exists.");
+        }
+    }
+
+    (function copyDiskFun(sourcePath, targetPath) {
+        // 如果是文件，直接复制即可
+        if (!lstatSync(sourcePath).isDirectory()) {
+            copyFileSync(sourcePath, targetPath);
+        } else {
+
+            // 读取子文件
+            const subFiles = readdirSync(sourcePath);
+
+            // 如果文件夹不存在，创建
+            if (!existsSync(targetPath)) {
+                mkdirSync(targetPath, { recursive: true });
+            }
+
+            // 复制子文件或文件夹
+            subFiles.forEach(function (item) {
+                copyDiskFun(join(sourcePath, "./" + item), join(targetPath, "./" + item));
+            });
+
+        }
+    })(sourcePath, targetPath);
 }
 exports.deleteDisk = deleteDisk;
 exports.copyDisk = copyDisk;

package/nodejs/logform/index.d.ts

@@ -1,19 +1,19 @@
-export interface inputType {
-    type: string
-    label: string
-}
-
-export interface selectType extends inputType {
-    value: Array<string>
-}
-
-/**
- * 表单输入
- * @param form 表单内容
- * @returns 返回一个结果数组
- */
-export interface logformType {
-    (config: Array<inputType | selectType>): Promise<Array<string | number>>
-}
-
+export interface inputType {
+    type: string
+    label: string
+}
+
+export interface selectType extends inputType {
+    value: Array<string>
+}
+
+/**
+ * 表单输入
+ * @param form 表单内容
+ * @returns 返回一个结果数组
+ */
+export interface logformType {
+    (config: Array<inputType | selectType>): Promise<Array<string | number>>
+}
+
 export let deeplog: logformType

package/nodejs/logform/index.js

@@ -1,100 +1,100 @@
 /*!
-* logform of OIPage v1.2.1
+* logform of OIPage v1.3.0-alpha.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {linelog} = require("../cmdlog/index.js");
-let getTitle = function (title) {
-    return "➤ " + title;
-};
-
-let closeForm = function () {
-    process.removeAllListeners("keypress");
-    rl.close();
-};
-
-let selectView = (title, list, index) => {
-    let txtArray = [];
-    for (let i = 0; i < list.length; i++) {
-        txtArray.push("    " + (i == index ? "●" : "○") + " " + list[i]);
-    }
-
-    linelog(`${title}\n${txtArray.join("\n")}\n`);
-};
-
-function logform(config) {
-    const rl = require("readline").createInterface({
-        input: process.stdin,
-        output: process.stdout
-    });
-
-    return new Promise(function (resolve, reject) {
-        let result = [], keyback = () => { };
-
-        console.log("");
-
-        process.stdin.on("keypress", (_str, key) => {
-            keyback(key.name);
-        });
-
-        let getResult = (index) => {
-            if (index >= config.length) {
-                closeForm();
-                resolve(result);
-            } else {
-                let item = config[index];
-
-                // 文本输入
-                if (item.type == "input") {
-
-                    rl.question(getTitle(item.label), (answer) => {
-                        result.push(answer);
-                        setTimeout(() => {
-                            console.log("");
-                            getResult(index + 1);
-                        }, 50);
-                    });
-
-                }
-
-                // 列表选择
-                else if (item.type == "select") {
-                    let title = getTitle(item.label);
-
-                    let selectIndex = 0;
-                    selectView(title, item.value, selectIndex);
-                    keyback = (keyname) => {
-                        if (keyname == "return") {
-                            result.push(selectIndex);
-                            keyback = () => { };
-                            linelog();
-                            setTimeout(() => {
-                                getResult(index + 1);
-                            }, 50);
-                        } else {
-                            if (keyname == "left" || keyname == "up") {
-                                if (selectIndex > 0) selectIndex -= 1;
-                                else selectIndex = item.value.length - 1;
-                            } else if (keyname == "right" || keyname == "down") {
-                                if (selectIndex < item.value.length - 1) selectIndex += 1;
-                                else selectIndex = 0;
-                            } else {
-                                return;
-                            }
-                            selectView(title, item.value, selectIndex);
-                        }
-                    };
-
-                }
-
-                // 非法类型
-                else {
-                    closeForm();
-                    reject(new Error("Illegal type！"));
-                }
-            }
-
-        };
-        getResult(0);
-    });
+let getTitle = function (title) {
+    return "➤ " + title;
+};
+
+let closeForm = function () {
+    process.removeAllListeners("keypress");
+    rl.close();
+};
+
+let selectView = (title, list, index) => {
+    let txtArray = [];
+    for (let i = 0; i < list.length; i++) {
+        txtArray.push("    " + (i == index ? "●" : "○") + " " + list[i]);
+    }
+
+    linelog(`${title}\n${txtArray.join("\n")}\n`);
+};
+
+function logform(config) {
+    const rl = require("readline").createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+
+    return new Promise(function (resolve, reject) {
+        let result = [], keyback = () => { };
+
+        console.log("");
+
+        process.stdin.on("keypress", (_str, key) => {
+            keyback(key.name);
+        });
+
+        let getResult = (index) => {
+            if (index >= config.length) {
+                closeForm();
+                resolve(result);
+            } else {
+                let item = config[index];
+
+                // 文本输入
+                if (item.type == "input") {
+
+                    rl.question(getTitle(item.label), (answer) => {
+                        result.push(answer);
+                        setTimeout(() => {
+                            console.log("");
+                            getResult(index + 1);
+                        }, 50);
+                    });
+
+                }
+
+                // 列表选择
+                else if (item.type == "select") {
+                    let title = getTitle(item.label);
+
+                    let selectIndex = 0;
+                    selectView(title, item.value, selectIndex);
+                    keyback = (keyname) => {
+                        if (keyname == "return") {
+                            result.push(selectIndex);
+                            keyback = () => { };
+                            linelog();
+                            setTimeout(() => {
+                                getResult(index + 1);
+                            }, 50);
+                        } else {
+                            if (keyname == "left" || keyname == "up") {
+                                if (selectIndex > 0) selectIndex -= 1;
+                                else selectIndex = item.value.length - 1;
+                            } else if (keyname == "right" || keyname == "down") {
+                                if (selectIndex < item.value.length - 1) selectIndex += 1;
+                                else selectIndex = 0;
+                            } else {
+                                return;
+                            }
+                            selectView(title, item.value, selectIndex);
+                        }
+                    };
+
+                }
+
+                // 非法类型
+                else {
+                    closeForm();
+                    reject(new Error("Illegal type！"));
+                }
+            }
+
+        };
+        getResult(0);
+    });
 }
 exports.logform = logform;

package/nodejs/reader/index.d.ts

@@ -0,0 +1,33 @@
+/**
+ * 文本分析读取器
+ */
+
+export interface readerInstanceType {
+
+    /**
+     * 当前字符位置
+     */
+    index: number
+
+    /**
+     * 当前字符内容
+     */
+    value: string
+
+    /**
+     * 读取下一个字符
+     */
+    readNext(): string
+
+    /**
+     * 获取往后count个值
+     * @param count 
+     */
+    getNextN(count: number): string
+}
+
+export interface readerType {
+    (plain: string): readerInstanceType
+}
+
+export let reader: readerType

package/nodejs/reader/index.js

@@ -0,0 +1,26 @@
+/*!
+* reader of OIPage v1.3.0-alpha.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;
+}
+exports.reader = reader;