oipage 1.6.0 → 1.7.0-alpha.1

package/nodejs/disk/index.js

@@ -1,172 +1,172 @@
 /*!
-* disk of OIPage v1.6.0
+* disk of OIPage v1.7.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-const { join } = require("path");
-const { existsSync, readdirSync, lstatSync, unlinkSync, rmdirSync, mkdirSync, copyFileSync, symlinkSync } = require("fs");
-const { execSync } = require("child_process");
-
-/**
- * 删除文件或文件夹
- * @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);
-}
-
-/**
- * 移动文件或文件夹
- * @param {string} sourcePath 
- * @param {string} targetPath 
- * @param {boolean} isForce 可选，是否强制执行 
- */
-function moveDisk(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.");
-        }
-    }
-
-    // 如果是文件，直接剪切即可
-    if (!lstatSync(sourcePath).isDirectory()) {
-        copyFileSync(sourcePath, targetPath);
-        unlinkSync(sourcePath);
-    } else {
-
-        // 读取子文件
-        const subFiles = readdirSync(sourcePath);
-
-        // 如果文件夹不存在，创建
-        if (!existsSync(targetPath)) {
-            mkdirSync(targetPath, { recursive: true });
-        }
-
-        // 移动子文件或文件夹
-        subFiles.forEach(function (file) {
-            moveDisk(join(sourcePath, "./" + file), join(targetPath, "./" + file));
-        });
-
-        // 移动完子文件或文件夹以后（移动完毕也意味着子文件或文件夹被删除了）
-        rmdirSync(sourcePath);
-    }
-}
-
-/**
- * 遍历当前文件或文件夹中所有文件
- * @param {string} sourcePath 
- * @param {function} callback 
- */
-function listDisk(sourcePath, callback) {
-    // 文件夹 
-    if (lstatSync(sourcePath).isDirectory()) {
-
-        // 读取子文件
-        const subFiles = readdirSync(sourcePath);
-        subFiles.forEach(function (file) {
-            listDisk(join(sourcePath, "./" + file), callback);
-        });
-    }
-
-    // 文件
-    else {
-        let folder = join(sourcePath, "../");
-
-        callback({
-            "name": sourcePath.replace(folder, ""),
-            "path": sourcePath,
-            "folder": folder
-        });
-    }
-}
-
-/**
- * 软链接文件或文件夹
- * @param {*} sourcePath 
- * @param {*} targetPath 
- */
-function linkDisk(sourcePath, targetPath) {
-    const type = lstatSync(sourcePath).isDirectory() ? 'junction' : 'file';
-    symlinkSync(sourcePath, targetPath, type);
+const { join } = require("path");
+const { existsSync, readdirSync, lstatSync, unlinkSync, rmdirSync, mkdirSync, copyFileSync, symlinkSync } = require("fs");
+const { execSync } = require("child_process");
+
+/**
+ * 删除文件或文件夹
+ * @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);
+}
+
+/**
+ * 移动文件或文件夹
+ * @param {string} sourcePath 
+ * @param {string} targetPath 
+ * @param {boolean} isForce 可选，是否强制执行 
+ */
+function moveDisk(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.");
+        }
+    }
+
+    // 如果是文件，直接剪切即可
+    if (!lstatSync(sourcePath).isDirectory()) {
+        copyFileSync(sourcePath, targetPath);
+        unlinkSync(sourcePath);
+    } else {
+
+        // 读取子文件
+        const subFiles = readdirSync(sourcePath);
+
+        // 如果文件夹不存在，创建
+        if (!existsSync(targetPath)) {
+            mkdirSync(targetPath, { recursive: true });
+        }
+
+        // 移动子文件或文件夹
+        subFiles.forEach(function (file) {
+            moveDisk(join(sourcePath, "./" + file), join(targetPath, "./" + file));
+        });
+
+        // 移动完子文件或文件夹以后（移动完毕也意味着子文件或文件夹被删除了）
+        rmdirSync(sourcePath);
+    }
+}
+
+/**
+ * 遍历当前文件或文件夹中所有文件
+ * @param {string} sourcePath 
+ * @param {function} callback 
+ */
+function listDisk(sourcePath, callback) {
+    // 文件夹 
+    if (lstatSync(sourcePath).isDirectory()) {
+
+        // 读取子文件
+        const subFiles = readdirSync(sourcePath);
+        subFiles.forEach(function (file) {
+            listDisk(join(sourcePath, "./" + file), callback);
+        });
+    }
+
+    // 文件
+    else {
+        let folder = join(sourcePath, "../");
+
+        callback({
+            "name": sourcePath.replace(folder, ""),
+            "path": sourcePath,
+            "folder": folder
+        });
+    }
+}
+
+/**
+ * 软链接文件或文件夹
+ * @param {*} sourcePath 
+ * @param {*} targetPath 
+ */
+function linkDisk(sourcePath, targetPath) {
+    const type = lstatSync(sourcePath).isDirectory() ? 'junction' : 'file';
+    symlinkSync(sourcePath, targetPath, type);
 }
 exports.deleteDisk = deleteDisk;
 exports.copyDisk = copyDisk;

package/nodejs/format/index.d.ts

@@ -1,29 +1,29 @@
-/**
- * 数字格式化
- */
-export interface numberFormatType {
-    (input: number | string): string
-}
-
-export let numberFormat: numberFormatType
-
-/**
- * 日期格式化
- */
-export interface dateFormatType {
-    (input?: string | Date, option?: {
-
-        /**
-         * 输入格式
-         */
-        inputFormat?: string
-
-        /**
-         * 输出格式
-         */
-        format?: string
-    }): string
-}
-
-export let dateFormat: dateFormatType
-
+/**
+ * 数字格式化
+ */
+export interface numberFormatType {
+    (input: number | string): string
+}
+
+export let numberFormat: numberFormatType
+
+/**
+ * 日期格式化
+ */
+export interface dateFormatType {
+    (input?: string | Date, option?: {
+
+        /**
+         * 输入格式
+         */
+        inputFormat?: string
+
+        /**
+         * 输出格式
+         */
+        format?: string
+    }): string
+}
+
+export let dateFormat: dateFormatType
+

package/nodejs/format/index.js

@@ -1,114 +1,114 @@
 /*!
-* format of OIPage v1.6.0
+* format of OIPage v1.7.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-function numberFormat(input) {
-    if (!input && input !== 0) {
-        return '';
-    } else {
-        input = input + "";
-
-        var decimalValue, integerValue;
-
-        var dotIndex = input.indexOf('.');
-        if (dotIndex == -1) {
-            decimalValue = ".00";
-            integerValue = input;
-        } else {
-            var temp = input.split(".");
-            decimalValue = "." + (temp[1] + "0").substring(0, 2);
-            integerValue = temp[0];
-        }
-
-        var integerArray = []
-        for (var index = integerValue.length; index > 0; index -= 3) {
-            integerArray.unshift(integerValue.substring(index > 2 ? index - 3 : 0, index));
-        }
-
-        return integerArray.join(",").replace(/^\-,/, "-") + decimalValue;
-    }
-}
-
-function dateFormat(input, option) {
-    option = option || {};
-    var dateObj;
-
-    // 如果无值，就用当前日期
-    if (!input) {
-        dateObj = new Date();
-    }
-
-    // 日期对象
-    else if (typeof input == 'object' && input.constructor === Date) {
-        dateObj = input;
-    }
-
-    // 否则就尝试创建日期对象
-    else if (!option.inputFormat) {
-        dateObj = new Date(input);
-        if (dateObj + "" == "Invalid Date") {
-            console.error("非法的日期格式：" + input, dateObj);
-            return "";
-        }
-    }
-
-    // 年、月、日、时、分、秒
-    var single = {
-        yyyy: 0, MM: 0, dd: 0, HH: 0, mm: 0, ss: 0
-    };
-
-    // 如果获取了日期实例
-    if (dateObj) {
-
-        single.yyyy = dateObj.getFullYear();
-        single.MM = dateObj.getMonth() + 1;
-        single.dd = dateObj.getDate();
-
-        single.HH = dateObj.getHours();
-        single.mm = dateObj.getMinutes();
-        single.ss = dateObj.getSeconds();
-    }
-
-    // 否则只能借助 inputFormat 来解析
-    else {
-        var inputFormat = option.inputFormat + "", valIndex = 0;
-        for (var index = 0; index < inputFormat.length; index++) {
-
-            // 年
-            if (inputFormat.substring(index, index + 4) == "yyyy") {
-                single.yyyy = +input.substring(valIndex, valIndex + 4);
-
-                valIndex += 4;
-                index += 3;
-            } else {
-                var curFlag = inputFormat.substring(index, index + 2);
-                if (["MM", "dd", "HH", "mm", "ss"].indexOf(curFlag) > -1) {
-                    var valContent = input[valIndex];
-                    if (/\d/.test(input[valIndex + 1])) {
-                        valContent += input[valIndex + 1];
-                        valIndex += 2;
-                    } else {
-                        valIndex += 1;
-                    }
-
-                    (single)[curFlag] = +valContent;
-                    index += 1;
-                } else {
-                    valIndex += 1;
-                }
-            }
-        }
-    }
-
-    if (single.MM < 10) single.MM = "0" + single.MM;
-    if (single.dd < 10) single.dd = "0" + single.dd;
-    if (single.HH < 10) single.HH = "0" + single.HH;
-    if (single.mm < 10) single.mm = "0" + single.mm;
-    if (single.ss < 10) single.ss = "0" + single.ss;
-
-    var format = option.format || "yyyy/MM/dd";
-    return format.replace("yyyy", single.yyyy).replace("MM", single.MM).replace("dd", single.dd).replace("HH", single.HH).replace("mm", single.mm).replace("ss", single.ss);
+function numberFormat(input) {
+    if (!input && input !== 0) {
+        return '';
+    } else {
+        input = input + "";
+
+        var decimalValue, integerValue;
+
+        var dotIndex = input.indexOf('.');
+        if (dotIndex == -1) {
+            decimalValue = ".00";
+            integerValue = input;
+        } else {
+            var temp = input.split(".");
+            decimalValue = "." + (temp[1] + "0").substring(0, 2);
+            integerValue = temp[0];
+        }
+
+        var integerArray = []
+        for (var index = integerValue.length; index > 0; index -= 3) {
+            integerArray.unshift(integerValue.substring(index > 2 ? index - 3 : 0, index));
+        }
+
+        return integerArray.join(",").replace(/^\-,/, "-") + decimalValue;
+    }
+}
+
+function dateFormat(input, option) {
+    option = option || {};
+    var dateObj;
+
+    // 如果无值，就用当前日期
+    if (!input) {
+        dateObj = new Date();
+    }
+
+    // 日期对象
+    else if (typeof input == 'object' && input.constructor === Date) {
+        dateObj = input;
+    }
+
+    // 否则就尝试创建日期对象
+    else if (!option.inputFormat) {
+        dateObj = new Date(input);
+        if (dateObj + "" == "Invalid Date") {
+            console.error("非法的日期格式：" + input, dateObj);
+            return "";
+        }
+    }
+
+    // 年、月、日、时、分、秒
+    var single = {
+        yyyy: 0, MM: 0, dd: 0, HH: 0, mm: 0, ss: 0
+    };
+
+    // 如果获取了日期实例
+    if (dateObj) {
+
+        single.yyyy = dateObj.getFullYear();
+        single.MM = dateObj.getMonth() + 1;
+        single.dd = dateObj.getDate();
+
+        single.HH = dateObj.getHours();
+        single.mm = dateObj.getMinutes();
+        single.ss = dateObj.getSeconds();
+    }
+
+    // 否则只能借助 inputFormat 来解析
+    else {
+        var inputFormat = option.inputFormat + "", valIndex = 0;
+        for (var index = 0; index < inputFormat.length; index++) {
+
+            // 年
+            if (inputFormat.substring(index, index + 4) == "yyyy") {
+                single.yyyy = +input.substring(valIndex, valIndex + 4);
+
+                valIndex += 4;
+                index += 3;
+            } else {
+                var curFlag = inputFormat.substring(index, index + 2);
+                if (["MM", "dd", "HH", "mm", "ss"].indexOf(curFlag) > -1) {
+                    var valContent = input[valIndex];
+                    if (/\d/.test(input[valIndex + 1])) {
+                        valContent += input[valIndex + 1];
+                        valIndex += 2;
+                    } else {
+                        valIndex += 1;
+                    }
+
+                    (single)[curFlag] = +valContent;
+                    index += 1;
+                } else {
+                    valIndex += 1;
+                }
+            }
+        }
+    }
+
+    if (single.MM < 10) single.MM = "0" + single.MM;
+    if (single.dd < 10) single.dd = "0" + single.dd;
+    if (single.HH < 10) single.HH = "0" + single.HH;
+    if (single.mm < 10) single.mm = "0" + single.mm;
+    if (single.ss < 10) single.ss = "0" + single.ss;
+
+    var format = option.format || "yyyy/MM/dd";
+    return format.replace("yyyy", single.yyyy).replace("MM", single.MM).replace("dd", single.dd).replace("HH", single.HH).replace("mm", single.mm).replace("ss", single.ss);
 };
 exports.dateFormat = dateFormat;
 exports.numberFormat = numberFormat;

package/nodejs/json/index.d.ts

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