oipage 1.3.0 → 1.3.1-alpha.0

package/bin/tools/format.js

@@ -1,76 +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 {*} 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.js

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

package/nodejs/cmdlog/index.js

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

package/nodejs/disk/index.js

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

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