oipage 1.2.1 → 1.3.0-alpha.1

package/bin/tools/resolve404.js

@@ -1,84 +1,84 @@
-const { readdirSync, lstatSync, readFileSync, statSync } = require("fs");
-const { join } = require("path");
-const { formatByte, formatTime } = require("./format");
-const mineTypes = require("../data/mineTypes.json");
-
-const img_folder = "data:image/png;base64," + readFileSync(join(__dirname, "../images/folder.png")).toString('base64');
-const img_file = "data:image/png;base64," + readFileSync(join(__dirname, "../images/file.png")).toString('base64');
-
-const template_404 = readFileSync(join(__dirname, "../template/404.html"), {
-    encoding: "utf8"
-})
-    .replace("${img_folder}", img_folder)
-    .replace("${img_file}", img_file);
-
-module.exports = function (filePath, url) {
-
-    let subItems = [];
-
-    try {
-        subItems = readdirSync(filePath);
-        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read Folder: " + url + '\x1b[0m ' + new Date().toLocaleString());
-    } catch (e) {
-        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read " + (/\/$/.test(url) ? "Folder" : "File") + ": \x1b[35m" + url + ' 404 Not Found\x1b[0m ' + new Date().toLocaleString());
-        try {
-            if (!/\/$/.test(url) || url === "/") {
-                filePath = join(filePath, "../");
-                subItems = readdirSync(filePath);
-            }
-        } catch (e) { }
-    }
-
-    let template = "";
-    for (let i in subItems) {
-        let isDirectory = lstatSync(join(filePath, subItems[i])).isDirectory();
-        let statObj = statSync(join(filePath, subItems[i]));
-
-        // 文件夹
-        if (isDirectory) {
-            template += `<tr class="folder">
-            <th class="name">
-                <a href='./${subItems[i]}/'>${subItems[i]}</a>
-            </th>
-            <th>
-                ${formatTime(statObj.mtime)}
-            </th>
-            <th>
-                文件夹
-            </th>
-            <th>
-                -
-            </th>
-            <th>
-                <a href='./${subItems[i]}/' class="btn">打开</a>
-            </th>
-        </tr>`;
-        }
-
-        // 文件
-        else {
-            let dotName = /\./.test(subItems[i]) ? subItems[i].match(/\.([^.]+)$/)[1] : "";
-
-            template += `<tr class="file">
-            <th class="name">
-                <a href='./${subItems[i]}'>${subItems[i]}</a>
-            </th>
-            <th>
-                ${formatTime(statObj.mtime)}
-            </th>
-            <th>
-                ${mineTypes[dotName] || "text/plain"}
-            </th>
-            <th>
-            ${formatByte(statObj.size)}
-        </th>
-            <th>
-                <a href='./${subItems[i]}' class="btn">访问</a>
-                <a href='./${subItems[i]}?download' class="btn" download='${subItems[i]}'>下载</a>
-            </th>
-        </tr>`;
-        }
-    }
-
-    return template_404.replace("${current}", filePath).replace("${template}", template);
+const { readdirSync, lstatSync, readFileSync, statSync } = require("fs");
+const { join } = require("path");
+const { formatByte, formatTime } = require("./format");
+const mineTypes = require("../data/mineTypes.json");
+
+const img_folder = "data:image/png;base64," + readFileSync(join(__dirname, "../images/folder.png")).toString('base64');
+const img_file = "data:image/png;base64," + readFileSync(join(__dirname, "../images/file.png")).toString('base64');
+
+const template_404 = readFileSync(join(__dirname, "../template/404.html"), {
+    encoding: "utf8"
+})
+    .replace("${img_folder}", img_folder)
+    .replace("${img_file}", img_file);
+
+module.exports = function (filePath, url) {
+
+    let subItems = [];
+
+    try {
+        subItems = readdirSync(filePath);
+        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read Folder: " + url + '\x1b[0m ' + new Date().toLocaleString());
+    } catch (e) {
+        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read " + (/\/$/.test(url) ? "Folder" : "File") + ": \x1b[35m" + url + ' 404 Not Found\x1b[0m ' + new Date().toLocaleString());
+        try {
+            if (!/\/$/.test(url) || url === "/") {
+                filePath = join(filePath, "../");
+                subItems = readdirSync(filePath);
+            }
+        } catch (e) { }
+    }
+
+    let template = "";
+    for (let i in subItems) {
+        let isDirectory = lstatSync(join(filePath, subItems[i])).isDirectory();
+        let statObj = statSync(join(filePath, subItems[i]));
+
+        // 文件夹
+        if (isDirectory) {
+            template += `<tr class="folder">
+            <th class="name">
+                <a href='./${subItems[i]}/'>${subItems[i]}</a>
+            </th>
+            <th>
+                ${formatTime(statObj.mtime)}
+            </th>
+            <th>
+                文件夹
+            </th>
+            <th>
+                -
+            </th>
+            <th>
+                <a href='./${subItems[i]}/' class="btn">打开</a>
+            </th>
+        </tr>`;
+        }
+
+        // 文件
+        else {
+            let dotName = /\./.test(subItems[i]) ? subItems[i].match(/\.([^.]+)$/)[1] : "";
+
+            template += `<tr class="file">
+            <th class="name">
+                <a href='./${subItems[i]}'>${subItems[i]}</a>
+            </th>
+            <th>
+                ${formatTime(statObj.mtime)}
+            </th>
+            <th>
+                ${mineTypes[dotName] || "text/plain"}
+            </th>
+            <th>
+            ${formatByte(statObj.size)}
+        </th>
+            <th>
+                <a href='./${subItems[i]}' class="btn">访问</a>
+                <a href='./${subItems[i]}?download' class="btn" download='${subItems[i]}'>下载</a>
+            </th>
+        </tr>`;
+        }
+    }
+
+    return template_404.replace("${current}", filePath).replace("${template}", template);
 };

package/bin/tools/resolveImport.js

@@ -2,6 +2,8 @@ const { readFileSync, existsSync, lstatSync } = require("fs");
 const { join } = require("path");
 
 module.exports = function (basePath, filePath, entry, isDownload) {
+    basePath = join(basePath, "./");
+
     let source = readFileSync(filePath);
     let resolveImport = content => content;
 
@@ -44,7 +46,7 @@ module.exports = function (basePath, filePath, entry, isDownload) {
                                 }
                             }
 
-                            return npmName;
+                            return "/@modules/" + npmName;
                         } else {
                             node_modulesRootPath = join(node_modulesRootPath, "../");
                             prePath = "../" + prePath;

package/nodejs/animation/index.d.ts

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

package/nodejs/animation/index.js

@@ -1,110 +1,110 @@
 /*!
-* animation of OIPage v1.2.1
+* animation of OIPage v1.3.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 {function} 返回一个函数，调用该函数，可以提前结束动画
- */
-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) {
-                $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) {
-                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;
-                }
-            }
-        }
-    };
-
+//当前正在运动的动画的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 {function} 返回一个函数，调用该函数，可以提前结束动画
+ */
+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) {
+                $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) {
+                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

package/nodejs/cmdlog/index.js

@@ -1,82 +1,82 @@
 /*!
-* cmdlog of OIPage v1.2.1
+* cmdlog of OIPage v1.3.0-alpha.1
 * 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