egg-born-module-a-base-sync - npm Package Compare versions

Comparing version 4.8.42 to 4.8.43

backend/src/bean/bean.atom/bean.atom_1.js

 const require3 = require('require3');
 const debug = require3('debug')('sql');
-const uuid = require3('uuid');
 const mparse = require3('egg-born-mparse').default;
@@ -387,3 +386,3 @@
         if (atomStaticKey) {
-          atomStaticKey = uuid.v4().replace(/-/g, '');
+          atomStaticKey = ctx.bean.util.uuidv4();
         }
@@ -390,0 +389,0 @@ atomRevision = 0;

backend/src/bean/bean.atomBase/bean.atomBase_0.js

 const require3 = require('require3');
-const uuid = require3('uuid');
 const ExcelJS = require3('exceljs');
@@ -24,3 +23,3 @@
       if (!item.atomStaticKey) {
-        item.atomStaticKey = uuid.v4().replace(/-/g, '');
+        item.atomStaticKey = this.ctx.bean.util.uuidv4();
       }
@@ -27,0 +26,0 @@ // atomSimple

backend/src/bean/bean.auth.js

@@ -1,5 +0,1 @@
-const require3 = require('require3');
-const uuid = require3('uuid');
-const extend = require3('@zhennann/extend');
-
 module.exports = ctx => {
@@ -67,3 +63,3 @@ const moduleInfo = ctx.app.meta.mockUtil.parseInfoFromPackage(__dirname);
       if (needClientId) {
-        info.clientId = uuid.v4().replace(/-/g, '');
+        info.clientId = ctx.bean.util.uuidv4();
       }
@@ -96,3 +92,3 @@ // login info event
       // config base
-      config = extend(true, config, {
+      config = ctx.bean.util.extend(config, {
         modules: {
@@ -118,3 +114,3 @@ 'a-base': {
       // account
-      const account = extend(true, {}, ctx.config.module(moduleInfo.relativeName).account);
+      const account = ctx.bean.util.extend({}, ctx.config.module(moduleInfo.relativeName).account);
       account.activatedRoles = undefined;
@@ -126,3 +122,3 @@ // url
           const moduleConfig = ctx.config.module(relativeName);
-          extend(true, account.url, moduleConfig.account.url);
+          ctx.bean.util.extend(account.url, moduleConfig.account.url);
         }
@@ -174,3 +170,3 @@ }
       if (!_user.token) {
-        _user.token = uuid.v4().replace(/-/g, '');
+        _user.token = ctx.bean.util.uuidv4();
       }
@@ -177,0 +173,0 @@ await this.redisAuth.set(key, _user.token, 'PX', ctx.session.maxAge);

backend/src/bean/bean.base.js

 const path = require('path');
 const require3 = require('require3');
 const fse = require3('fs-extra');
-const extend = require3('@zhennann/extend');
 
@@ -323,3 +322,3 @@ const _modulesLocales = {};
       const _actionsSystemMeta = ctx.constant.module(moduleInfo.relativeName).atom.actionMeta;
-      const _actionsAll = extend(true, {}, _actionsSystemMeta, _actions);
+      const _actionsAll = ctx.bean.util.extend({}, _actionsSystemMeta, _actions);
       for (const key in _actionsAll) {
@@ -353,3 +352,3 @@ if (key === 'custom') continue;
           }
-          const authProvider = extend(true, {}, _authProvider);
+          const authProvider = ctx.bean.util.extend({}, _authProvider);
           this._prepareAuthProvider(relativeName, providerName, authProvider);
@@ -385,3 +384,3 @@ authProviders[providerFullName] = authProvider;
       }
-      return extend(true, {}, _meta, metaScene);
+      return ctx.bean.util.extend({}, _meta, metaScene);
     }
@@ -388,0 +387,0 @@

backend/src/bean/bean.role/bean.role_base.js

@@ -1,3 +0,1 @@
-const require3 = require('require3');
-const extend = require3('@zhennann/extend');
 const initData15 = require('../version/initData15.js');
@@ -391,3 +389,3 @@
           // add
-          role = extend(true, { module }, role, { roleIdParent });
+          role = ctx.bean.util.extend({ module }, role, { roleIdParent });
           roleIds[roleName] = await this.add(role);
@@ -394,0 +392,0 @@ }

backend/src/bean/bean.user/bean.user_0.js

@@ -1,4 +0,1 @@
-const require3 = require('require3');
-const uuid = require3('uuid');
-
 const _usersAnonymous = {};
@@ -85,3 +82,3 @@
       if (!_anonymousId) {
-        _anonymousId = uuid.v4().replace(/-/g, '');
+        _anonymousId = ctx.bean.util.uuidv4();
         const maxAge = this.config.auth.maxAge.anonymous;
@@ -88,0 +85,0 @@ ctx.cookies.set('anonymous', _anonymousId, { encrypt: true, maxAge });

backend/src/bean/bean.user/bean.user_1.js

@@ -1,4 +0,1 @@
-const require3 = require('require3');
-const extend = require3('@zhennann/extend');
-
 module.exports = ctx => {
@@ -138,3 +135,3 @@ const moduleInfo = ctx.app.meta.mockUtil.parseInfoFromPackage(__dirname);
       if (removePrivacy) {
-        fields = extend(true, {}, fields);
+        fields = ctx.bean.util.extend({}, fields);
         const privacyFields = ctx.config.module(moduleInfo.relativeName).user.privacyFields.split(',');
@@ -141,0 +138,0 @@ for (const privacyField of privacyFields) {

backend/src/bean/bean.util.js

 const require3 = require('require3');
+const uuid = require3('uuid');
+const extend = require3('@zhennann/extend');
 const currency = require3('@zhennann/currency').default;
@@ -15,2 +17,10 @@ const moment = require3('moment');
 
+    get uuid() {
+      return uuid;
+    }
+
+    uuidv4() {
+      return uuid.v4().replace(/-/g, '');
+    }
+
     page(_page, force = true) {
@@ -31,2 +41,6 @@ const pageSize = this.localConfig.pageSize;
 
+    extend(...args) {
+      return extend(true, ...args);
+    }
+
     currency(options) {
@@ -33,0 +47,0 @@ return currency(options);

backend/src/bean/middleware.cors.js

 const URL = require('url').URL;
 const require3 = require('require3');
-const extend = require3('@zhennann/extend');
 const koaCors = require3('@koa/cors');
@@ -33,3 +32,3 @@
       // options
-      const optionsCors = extend(true, {}, optionsDefault, options);
+      const optionsCors = ctx.bean.util.extend({}, optionsDefault, options);
 
@@ -36,0 +35,0 @@ // origin

backend/src/bean/version/init2.js

@@ -1,3 +0,1 @@
-const require3 = require('require3');
-const extend = require3('@zhennann/extend');
 const initData = require('./initData2.js');
@@ -39,3 +37,3 @@
       // user: root
-      const userRoot = extend(true, {}, initData.users.root);
+      const userRoot = ctx.bean.util.extend({}, initData.users.root);
       userRoot.item.email = options.email;
@@ -47,3 +45,3 @@ userRoot.item.mobile = options.mobile;
       if (demo.enable) {
-        const userAdmin = extend(true, {}, initData.users.admin);
+        const userAdmin = ctx.bean.util.extend({}, initData.users.admin);
         users.push(userAdmin);
@@ -50,0 +48,0 @@ }

backend/src/service/layoutConfig.js

@@ -1,4 +0,1 @@
-const require3 = require('require3');
-const extend = require3('@zhennann/extend');
-
 module.exports = app => {
@@ -18,3 +15,3 @@ class Settings extends app.Service {
       const layoutConfig = await this.load({ module, user });
-      const data = extend(true, {}, layoutConfig || {}, { [key]: value });
+      const data = this.ctx.bean.util.extend({}, layoutConfig || {}, { [key]: value });
       await this.save({ module, data, user });
@@ -21,0 +18,0 @@ }

package.json

 {
   "name": "egg-born-module-a-base-sync",
-  "version": "4.8.42",
+  "version": "4.8.43",
   "title": "Base",
@@ -24,2 +24,3 @@ "eggBornModule": {
     "@zhennann/currency": "^1.0.3",
+    "@zhennann/extend": "^3.0.2",
     "@zhennann/trim-html": "^0.1.12",
@@ -26,0 +27,0 @@ "exceljs": "^4.3.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of downloads

8

increased by33.33%

Worsened metrics

Total package byte prevSize

3641180

decreased by-0.04%

Dependency count

8

increased by14.29%

Lines of code

60050

decreased by-0.02%

Dependency changes

• + Added@zhennann/extend@^3.0.2

• + Added@zhennann/extend@3.0.2(transitive)