oipage 1.7.0-alpha.1 → 1.7.0-alpha.3

package/CHANGELOG

@@ -138,6 +138,11 @@ v1.6.0:
 v1.7.0:
     date:
     changes:
+        - 优化改造
+          1、types定义模块，方便使用时代码提示
+          2、使用requestAnimationFrame改造animation
+        - 修复bug
+          1、修复特殊情况下 “应用市场” 依赖查找错误问题
         - 新增功能
           1、API功能（Node.js）
             * remote HTTP请求

package/bin/website-plugins/intercept/getPackage.js

@@ -0,0 +1,18 @@
+const { readFileSync } = require("fs");
+const { join } = require("path");
+const { existsSync } = require("fs");
+
+module.exports = function (filpath) {
+
+    let node_modulesPath = join(__dirname, "../../../node_modules");
+
+    while (!existsSync(join(node_modulesPath, filpath)) && node_modulesPath != join(node_modulesPath, "../")) {
+        node_modulesPath = join(node_modulesPath, "../");
+    }
+
+    let source = readFileSync(join(node_modulesPath, filpath), {
+        encoding: "utf8"
+    });
+
+    return source;
+};

package/bin/website-plugins/intercept/oipage-vislite-intercept.js

@@ -1,6 +1,5 @@
-const { readFileSync } = require("fs");
-const { join } = require("path");
 const headFactory = require("./head.js");
+const getPackage = require("./getPackage.js");
 
 const head = headFactory();
 
@@ -20,9 +19,7 @@ module.exports = {
 
         response.writeHead(200, head);
 
-        let source = readFileSync(join(__dirname, "../../../node_modules/vislite/lib/index.umd.min.js"), {
-            encoding: "utf8"
-        });
+        let source =getPackage("vislite/lib/index.umd.min.js");
 
         response.write(`let module = { exports: {} };
 let exports = module.exports;

package/bin/website-plugins/intercept/oipage-zipaper-intercept.js

@@ -1,6 +1,5 @@
-const { readFileSync } = require("fs");
-const { join } = require("path");
 const headFactory = require("./head.js");
+const getPackage = require("./getPackage.js");
 
 const head = headFactory();
 
@@ -20,9 +19,7 @@ module.exports = {
 
         response.writeHead(200, head);
 
-        let source = readFileSync(join(__dirname, "../../../node_modules/zipaper/dist/Zipaper.min.js"), {
-            encoding: "utf8"
-        });
+        let source = getPackage("zipaper/dist/Zipaper.min.js");
 
         response.write(`let module = { exports: {} };
 let exports = module.exports;

package/nodejs/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.7.0-alpha.1
+* animation of OIPage v1.7.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
@@ -16,7 +16,7 @@ var $timerId;
  * @param {number} duration 动画时长，可选
  * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
  *
- * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
+ * @returns {object} 返回一个对象，包含一个stop方法，用于在动画结束前结束动画
  */
 function animation(doback, duration, callback) {
     if (arguments.length < 2) duration = 400;
@@ -43,7 +43,14 @@ function animation(doback, duration, callback) {
         //开启唯一的定时器timerId
         "start": function () {
             if (!$timerId) {
-                $timerId = setInterval(clock.tick, $interval);
+                if (!globalThis.requestAnimationFrame) {
+                    $timerId = setInterval(clock.tick, $interval);
+                } else {
+                    $timerId = globalThis.requestAnimationFrame(function step() {
+                        clock.tick();
+                        if ($timerId) $timerId = globalThis.requestAnimationFrame(step);
+                    });
+                }
             }
         },
 
@@ -81,7 +88,8 @@ function animation(doback, duration, callback) {
         //停止定时器，重置timerId=null
         "stop": function () {
             if ($timerId) {
-                clearInterval($timerId);
+                if (!globalThis.requestAnimationFrame) clearInterval($timerId);
+                else globalThis.cancelAnimationFrame($timerId);
                 $timerId = null;
             }
         }

package/nodejs/cmdlog/index.js

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

package/nodejs/disk/index.js

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

package/nodejs/format/index.js

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

package/nodejs/json/index.js

@@ -1,5 +1,5 @@
 /*!
-* json of OIPage v1.7.0-alpha.1
+* json of OIPage v1.7.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {reader} = require("../reader/index.js");

package/nodejs/logform/index.js

@@ -1,5 +1,5 @@
 /*!
-* logform of OIPage v1.7.0-alpha.1
+* logform of OIPage v1.7.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.7.0-alpha.1
+* reader of OIPage v1.7.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/remote/index.js

@@ -1,71 +1,71 @@
 /*!
-* remote of OIPage v1.7.0-alpha.1
+* remote of OIPage v1.7.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-const https = require('https');
-const http = require('http');
-
-let doResolve = (res, resolve) => {
-    res.setEncoding('utf8');
-
-    let data = "";
-    res.on('data', (chunk) => {
-        data += chunk;
-    });
-    res.on('end', () => {
-        resolve({
-            data: data.toString('utf8'),
-            headers: res.headers
-        });
-    });
-}
-
-// GET请求
-function get(url, headers = {}) {
-    return new Promise((resolve, reject) => {
-
-        let handler = /^https/.test(url) ? https : http;
-
-        // https://nodejs.org/download/release/v16.8.0/docs/api/http.html#http_http_get_options_callback
-        handler.get(url, {
-            headers
-        }, res => {
-            doResolve(res, resolve)
-        }).on('error', (e) => {
-            reject(e);
-        });
-    });
-};
-
-// POST请求
-function post(url, headers = {}, params = {}) {
-    return new Promise((resolve, reject) => {
-
-        let handler = /^https/.test(url) ? https : http;
-
-        let execArray = /https*:\/\/([^\/]+)(.+)?/.exec(url);
-        let hostport = execArray[1].split(":");
-
-        // https://nodejs.org/download/release/v16.8.0/docs/api/http.html#http_http_request_options_callback
-        const req = handler.request({
-            hostname: hostport[0],
-            port: hostport[1] || 80,
-            path: execArray[2] || "/",
-            method: "POST",
-            headers
-        }, (res) => {
-            doResolve(res, resolve);
-        });
-
-        req.write(JSON.stringify(params));
-
-        req.on('error', (e) => {
-            reject(e);
-        });
-        req.end();
-    });
-};
+const https = require('https');
+const http = require('http');
+
+let doResolve = (res, resolve) => {
+    res.setEncoding('utf8');
+
+    let data = "";
+    res.on('data', (chunk) => {
+        data += chunk;
+    });
+    res.on('end', () => {
+        resolve({
+            data: data.toString('utf8'),
+            headers: res.headers
+        });
+    });
+}
+
+// GET请求
+function get(url, headers = {}) {
+    return new Promise((resolve, reject) => {
+
+        let handler = /^https/.test(url) ? https : http;
+
+        // https://nodejs.org/download/release/v16.8.0/docs/api/http.html#http_http_get_options_callback
+        handler.get(url, {
+            headers
+        }, res => {
+            doResolve(res, resolve)
+        }).on('error', (e) => {
+            reject(e);
+        });
+    });
+};
+
+// POST请求
+function post(url, headers = {}, params = {}) {
+    return new Promise((resolve, reject) => {
+
+        let handler = /^https/.test(url) ? https : http;
+
+        let execArray = /https*:\/\/([^\/]+)(.+)?/.exec(url);
+        let hostport = execArray[1].split(":");
+
+        // https://nodejs.org/download/release/v16.8.0/docs/api/http.html#http_http_request_options_callback
+        const req = handler.request({
+            hostname: hostport[0],
+            port: hostport[1] || 80,
+            path: execArray[2] || "/",
+            method: "POST",
+            headers
+        }, (res) => {
+            doResolve(res, resolve);
+        });
+
+        req.write(JSON.stringify(params));
+
+        req.on('error', (e) => {
+            reject(e);
+        });
+        req.end();
+    });
+};
 
 exports.get = get;
 exports.post = post;

package/nodejs/throttle/index.js

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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "oipage",
-  "version": "1.7.0-alpha.1",
+  "version": "1.7.0-alpha.3",
   "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
   "sideEffects": false,
+  "typings": "./types/index.d.ts",
   "scripts": {
-    "dev": "node ./build/index.js watch",
+    "dev": "node ./bin/run run \"node ./build/index.js watch\" \"node ./bin/run serve --config ./oipage.config.js\"",
     "build": "node ./build/index.js",
-    "serve": "node ./bin/run serve --config ./oipage.config.js",
     "bug:issue5": "node ./bin/run run \"node ./bin/run serve\"",
     "bug:issue4": "node ./bin/run run \"node ./test/logform/index.spec.js\""
   },

package/types/index.d.ts

@@ -0,0 +1,37 @@
+// OIPage 模块定义 （程序自动生成，请勿修改）
+import "../nodejs/animation/index";
+declare module "oipage/nodejs/animation/index.js" {}
+import "../nodejs/cmdlog/index";
+declare module "oipage/nodejs/cmdlog/index.js" {}
+import "../nodejs/disk/index";
+declare module "oipage/nodejs/disk/index.js" {}
+import "../nodejs/format/index";
+declare module "oipage/nodejs/format/index.js" {}
+import "../nodejs/json/index";
+declare module "oipage/nodejs/json/index.js" {}
+import "../nodejs/logform/index";
+declare module "oipage/nodejs/logform/index.js" {}
+import "../nodejs/reader/index";
+declare module "oipage/nodejs/reader/index.js" {}
+import "../nodejs/remote/index";
+declare module "oipage/nodejs/remote/index.js" {}
+import "../nodejs/throttle/index";
+declare module "oipage/nodejs/throttle/index.js" {}
+import "../web/animation/index";
+declare module "oipage/web/animation/index.js" {}
+import "../web/format/index";
+declare module "oipage/web/format/index.js" {}
+import "../web/json/index";
+declare module "oipage/web/json/index.js" {}
+import "../web/onReady/index";
+declare module "oipage/web/onReady/index.js" {}
+import "../web/performChunk/index";
+declare module "oipage/web/performChunk/index.js" {}
+import "../web/reader/index";
+declare module "oipage/web/reader/index.js" {}
+import "../web/style/index";
+declare module "oipage/web/style/index.js" {}
+import "../web/throttle/index";
+declare module "oipage/web/throttle/index.js" {}
+import "../web/XMLHttpRequest/index";
+declare module "oipage/web/XMLHttpRequest/index.js" {}

package/web/XMLHttpRequest/index.js

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

package/web/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.7.0-alpha.1
+* animation of OIPage v1.7.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
@@ -16,7 +16,7 @@ var $timerId;
  * @param {number} duration 动画时长，可选
  * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
  *
- * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
+ * @returns {object} 返回一个对象，包含一个stop方法，用于在动画结束前结束动画
  */
 export function animation(doback, duration, callback) {
     if (arguments.length < 2) duration = 400;
@@ -43,7 +43,14 @@ export function animation(doback, duration, callback) {
         //开启唯一的定时器timerId
         "start": function () {
             if (!$timerId) {
-                $timerId = setInterval(clock.tick, $interval);
+                if (!globalThis.requestAnimationFrame) {
+                    $timerId = setInterval(clock.tick, $interval);
+                } else {
+                    $timerId = globalThis.requestAnimationFrame(function step() {
+                        clock.tick();
+                        if ($timerId) $timerId = globalThis.requestAnimationFrame(step);
+                    });
+                }
             }
         },
 
@@ -81,7 +88,8 @@ export function animation(doback, duration, callback) {
         //停止定时器，重置timerId=null
         "stop": function () {
             if ($timerId) {
-                clearInterval($timerId);
+                if (!globalThis.requestAnimationFrame) clearInterval($timerId);
+                else globalThis.cancelAnimationFrame($timerId);
                 $timerId = null;
             }
         }

package/web/format/index.js

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

package/web/json/index.js

@@ -1,5 +1,5 @@
 /*!
-* json of OIPage v1.7.0-alpha.1
+* json of OIPage v1.7.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 import {reader} from "../reader/index.js";

package/web/onReady/index.js

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

package/web/performChunk/index.js

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

package/web/reader/index.js

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

package/web/style/index.js

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

package/web/throttle/index.js

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