fix: 箭头函数中使用arguments存在未知bug，用...args代替

.gitignore

@@ -11,5 +11,6 @@
 .DS_Store
 npm-debug.log*
 
-/.idea
 /storybook-static
+
+jsCodeStructure.html

package.json

@@ -52,6 +52,7 @@
     "jsdom": "^11.0.0",
     "less": "^2.7.2",
     "less-loader": "^4.0.0",
+    "lodash-webpack-plugin": "^0.11.4",
     "mockjs": "^1.0.1-beta3",
     "path": "^0.12.7",
     "react-test-renderer": "^16.2.0",

src/router.js

@@ -4,7 +4,7 @@ import { Router } from 'dva-react-router-3/router';
 import isString from 'lodash/isString';
 import config from './utils/config';
 import { isAuthed, hasDomain, histories } from './utils/auth';
-import { fullPath, makePromise0 } from './utils/helper';
+import { fullPath } from './utils/helper';
 import { processError } from './utils/error';
 import App from './routes/app';
 import { getMenus, getModuleInfo, getModuleLayout } from './data/modules';
@@ -89,10 +89,10 @@ const createRoutes = async (app, modules, groups, basePath) => {
         name: showName,
       };
       if (layout.route) {
-        const modelBundle = await makePromise0(require('bundle-loader!./models/main/modules/' + layout.route + '/index.js').default); // eslint-disable-line import/no-dynamic-require, prefer-template, global-require
-        registerModel(app, modelBundle);
-        const routeBundle = await makePromise0(require('bundle-loader!./routes/main/modules/' + layout.route + '/index.js').default); // eslint-disable-line import/no-dynamic-require, prefer-template, global-require
-        route.component = routeBundle;
+        const modelBundle = await import(`./models/main/modules/${layout.route}`);
+        registerModel(app, modelBundle.default);
+        const routeBundle = await import(`./routes/main/modules/${layout.route}`);
+        route.component = routeBundle.default;
         if (routeBundle.route) {
           for (const key in routeBundle.route) {
             // noinspection JSUnfilteredForInLoop
@@ -177,10 +177,13 @@ function RouterConfig({ history, app }) {
         {
           path: 'login',
           getComponent(ignored, cb) {
-            require.ensure([], (require) => {
-              registerModel(app, require('./models/login').default);
-              cb(null, require('./routes/login').default);
-            }, 'login');
+            Promise.all([
+              import('./models/login'),
+              import('./routes/login'),
+            ]).then(([model, route]) => {
+              registerModel(app, model.default);
+              cb(null, route.default);
+            });
           },
         },
         {
@@ -189,10 +192,13 @@ function RouterConfig({ history, app }) {
             maybeLogin(replace).then(() => cb()).catch(err => cb(err));
           },
           getComponent(ignored, cb) {
-            require.ensure([], (require) => {
-              registerModel(app, require('./models/domain').default);
-              cb(null, require('./routes/domain').default);
-            }, 'domain');
+            Promise.all([
+              import('./models/domain'),
+              import('./routes/domain'),
+            ]).then(([model, route]) => {
+              registerModel(app, model.default);
+              cb(null, route.default);
+            });
           },
         },
         {
@@ -201,10 +207,13 @@ function RouterConfig({ history, app }) {
             authenticated(replace).then(() => cb()).catch(err => cb(err));
           },
           getComponent(ignored, cb) {
-            require.ensure([], (require) => {
-              registerModel(app, require('./models/main').default);
-              cb(null, require('./routes/main').default);
-            }, 'main');
+            Promise.all([
+              import('./models/main'),
+              import('./routes/main'),
+            ]).then(([model, route]) => {
+              registerModel(app, model.default);
+              cb(null, route.default);
+            });
           },
           getChildRoutes: (nextState, cb) => {
             getMenus()
@@ -232,10 +241,13 @@ function RouterConfig({ history, app }) {
         authenticated(replace).then(() => cb()).catch(err => cb(err));
       },
       getComponent(ignored, cb) {
-        require.ensure([], (require) => {
-          registerModel(app, require('./models/main/modules/' + config.fastNavigationPage).default); // eslint-disable-line import/no-dynamic-require, prefer-template
-          cb(null, require('./routes/main/modules/' + config.fastNavigationPage).default); // eslint-disable-line import/no-dynamic-require, prefer-template
-        }, 'fastNav');
+        Promise.all([
+          import(`./models/main/modules/${config.fastNavigationPage}`),
+          import(`./routes/main/modules/${config.fastNavigationPage}`),
+        ]).then(([model, route]) => {
+          registerModel(app, model.default);
+          cb(null, route.default);
+        });
       },
     });
   }

src/services/resource.js

@@ -79,16 +79,16 @@ export class Query {
    * modify_time: 上一次修改时间,
    * uri: 资源定位符
    */
-  setOrder = () => {
-    const argn = arguments.length;
+  setOrder = (...args) => {
+    const argn = args.length;
     if (argn > 0) {
       this.orders = [];
       let lastOrder;
       for (let i = 0; i < argn; ++i) {
-        if (lastOrder !== undefined && (typeof arguments[i] === 'boolean')) {
+        if (lastOrder !== undefined && (typeof args[i] === 'boolean')) {
           this.orders.push({
             target: lastOrder,
-            asc: arguments[i],
+            asc: args[i],
           });
           lastOrder = undefined;
         } else if (lastOrder !== undefined) {
@@ -96,9 +96,9 @@ export class Query {
             target: lastOrder,
             asc: true,
           });
-          lastOrder = arguments[i];
+          lastOrder = args[i];
         } else {
-          lastOrder = arguments[i];
+          lastOrder = args[i];
         }
       }
       if (lastOrder !== undefined) {

src/utils/auth.js

@@ -60,7 +60,7 @@ export async function hasDomain() {
   return getDomain().then(result => !!result);
 }
 
-const normHistory = (history, size) => {
+const normHistory = size => (history) => {
   if (!history) {
     history = {};
   }
@@ -109,58 +109,56 @@ const prev = (i, size) => {
 
 export const histories = {
   async getLatest(name) {
-    let history = await db.get(`history.${name}`).value();
-    history = normHistory(history);
-    if (history.empty) {
-      return null;
-    }
-    return history.data[prev(history.top, history.size)];
+    return db(`history.${name}`)(normHistory(), (history) => {
+      if (history.empty) {
+        return null;
+      }
+      return history.data[prev(history.top, history.size)];
+    });
   },
   async createHistory(name, size) {
-    let history = db.get(`history.${name}`).value();
-    history = normHistory(history, size);
-    return db.set(`history.${name}`, history).write();
+    return db(`history.${name}`).write(normHistory(size));
   },
   async destroyHistory(name) {
-    return db.unset(`history.${name}`).write();
+    return db(`history.${name}`).delete();
   },
   async getHistory(name, size) {
-    let history = db.get(`history.${name}`).value();
-    history = normHistory(history, size);
-    if (history.empty) {
-      return [];
-    } else if (history.top > history.start) {
-      return history.data.slice(history.start, history.top);
-    } else {
-      return [...history.data.slice(history.start, history.size), ...history.data.slice(0, history.top)];
-    }
+    return db(`history.${name}`)(normHistory(size), (h) => {
+      if (h.empty) {
+        return [];
+      } else if (h.top > h.start) {
+        return h.data.slice(h.start, h.top);
+      } else {
+        return [...h.data.slice(h.start, h.size), ...h.data.slice(0, h.top)];
+      }
+    });
   },
   async pushHistory(name, value, size) {
-    let history = await db.get(`history.${name}`).value();
-    history = normHistory(history, size);
-    history.data[history.top] = value;
-    const nextPos = next(history.top, history.size);
-    if (!history.empty && history.start === history.top) {
-      history.top = history.start = nextPos;
-    } else {
-      history.top = nextPos;
-    }
-    if (history.empty) {
-      history.empty = false;
-    }
-    return db.set(`history.${name}`, history).write();
+    return db(`history.${name}`).write(normHistory(size), (history) => {
+      history.data[history.top] = value;
+      const nextPos = next(history.top, history.size);
+      if (!history.empty && history.start === history.top) {
+        history.top = history.start = nextPos;
+      } else {
+        history.top = nextPos;
+      }
+      if (history.empty) {
+        history.empty = false;
+      }
+      return history;
+    });
   },
   async popHistory(name) {
-    let history = await db.get(`history.${name}`).value();
-    history = normHistory(history);
-    if (history.empty) {
-      return;
-    }
-    history.top = prev(history.top, history.size);
-    if (history.top === history.start) {
-      history.empty = true;
-    }
-    return db.set(`history.${name}`, history).write();
+    return db(`history.${name}`).write(normHistory(), (history) => {
+      if (history.empty) {
+        return;
+      }
+      history.top = prev(history.top, history.size);
+      if (history.top === history.start) {
+        history.empty = true;
+      }
+      return history;
+    });
   },
   async init() {
     return db.read();

src/utils/db.js

+/* eslint-disable no-param-reassign */
 /** @module utils/db */
-import low from 'lowdb';
+import flow from 'lodash/flow';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 import LocalStorage from 'lowdb/adapters/LocalStorage';
+import { isPromise } from './helper';
 
-const adapter = new LocalStorage('db');
+// eslint-disable-next-line no-underscore-dangle
+const _adapter_ = new LocalStorage('db');
 
 /**
- * @typedef {Object} DB
- * @template {T}
+ * @param {CreateDB} db
+ * @param key
+ * @param adapter
+ * @return {*}
  */
+const init = function init(db, key, adapter) {
+  db.read = () => {
+    const r = adapter.read();
+
+    return isPromise(r) ? r.then(db.plant) : db.plant(r);
+  };
+
+  db.write = (...args) => {
+    const value = args.length > 0 && args[0] !== undefined ? args[0] : db.getState();
+
+    const w = adapter.write(db.getState());
+
+    return isPromise(w) ? w.then(() => {
+      return value;
+    }) : value;
+  };
+
+  db.plant = (state) => {
+    db[key] = state;
+    return db;
+  };
+
+  db.getState = () => {
+    return db[key];
+  };
+
+  db.setState = (state) => {
+    db.plant(state);
+    return db;
+  };
+
+  return db.read();
+};
 
 /**
- * @member {Function} DB~get
- * @param {Array.<string>|string} path
+ * @typedef {Function} CreateDB
+ * @param {string} path
  * @param {*} [defaultValue]
- * @return {DB.<*>}
+ * @return {DB}
  */
 
 /**
- * @member {Function} DB~set
- * @param {Array.<string>|string} path
- * @param value
- * @return {DB}
+ * @member {Function} CreateDB~read
+ * @return {*|Promise.<*>}
  */
 
 /**
- * @member {Function} DB~find
- * @template {T}
- * @param {Function} [predicate=_.identity]
- * @param {number} [fromIndex=0]
- * @return {DB.<T>}
+ * @member {Function} CreateDB~write
+ * @param {*} [state]
+ * @return {*|Promise.<*>}
  */
 
 /**
- * @member {Function} DB~unset
- * @param {Array.<string>|string} path
- * @return {DB.<boolean>}
+ * @member {Function} CreateDB~plant
+ * @param {*} state
+ * @return {CreateDB}
  */
 
 /**
- * @member {Function} DB~read
- * @return {Promise.<*>}
+ * @member {Function} CreateDB~getState
+ * @return {*}
+ */
+
+/**
+ * @member {Function} CreateDB~setState
+ * @param {*} state
+ * @return {CreateDB}
+ */
+
+/**
+ * @typedef {Function} DB
+ * @param {...Function} functions
+ * @return {*}
  */
 
 /**
  * @member {Function} DB~write
- * @return {Promise.<*>}
+ * @param {...Function} functions
+ * @return {*|Promise.<*>}
  */
 
 /**
- * @member {Function} DB~value
- * @template {T}
- * @return {Promise.<T>}
+ * @member {Function} DB~delete
+ * @return {*|Promise.<*>}
  */
 
 /**
- * @type {DB.<*>}
+ * @return {CreateDB}
  */
-const db = low(adapter);
+const CreateDB = () => {
+  function db(path, defaultValue) {
+    function getValue(...functions) {
+      const result = get(db.getState(), path, defaultValue);
+      return flow(...functions)(result);
+    }
+
+    getValue.write = (...args) => {
+      const result = getValue(...args);
+      set(db.getState(), path, result);
+      return db.write();
+    };
+    getValue.delete = (flush = true) => {
+      unset(db.getState(), path);
+      return flush ? db.write() : db.getState();
+    };
+
+    return getValue;
+  }
 
-export default db;
+  return init(db, '__state__', _adapter_);
+};
+export default CreateDB();
 

src/utils/helper.js

@@ -123,3 +123,6 @@ export function filterValidParams(params) {
   return pickBy(params, negate(isUndefined));
 }
 
+export function isPromise(obj) {
+  return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
+}

stories/lib/login.js

+import { authorize, login } from '../../src/services/login';
+import { switchDomain } from '../../src/services/domain';
+import { encrypt } from '../../src/utils/helper';
+import { validate } from '../../src/services/login/password';
+import { setToken } from '../../src/utils/auth';
+
+export default async function (userName, password, domainPath) {
+  const { tokenId } = await login({ type: 'userName', data: userName });
+  const authRequest = await validate(password, encrypt(tokenId));
+  await authorize(authRequest);
+  await setToken(tokenId);
+  if (domainPath) {
+    await switchDomain(domainPath);
+  }
+}

webpack.config.js

+const LodashModuleReplacementPlugin = require('lodash-webpack-plugin');
+
 module.exports = function webpack(config) {
+  console.log(config);
   config.module.rules.push({
     test: /\.ejs$/,
     loader: 'ejs-loader',
   });
+  // config.plugins.push(
+  //   new LodashModuleReplacementPlugin(),
+  // );
   return config;
 };