@nocobase/test 0.9.1-alpha.2 → 0.9.2-alpha.2

package/lib/index.js

@@ -16,19 +16,14 @@ Object.defineProperty(exports, "mockDatabase", {
 });
 exports.pgOnly = void 0;
 exports.randomStr = randomStr;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 var _mockServer = require("./mockServer");
-
 Object.keys(_mockServer).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -40,11 +35,8 @@ Object.keys(_mockServer).forEach(function (key) {
     }
   });
 });
-
 const pgOnly = () => process.env.DB_DIALECT == 'postgres' ? describe : describe.skip;
-
 exports.pgOnly = pgOnly;
-
 function randomStr() {
   // create random string
   return Math.random().toString(36).substring(2);

package/lib/mockServer.js

@@ -7,77 +7,57 @@ exports.MockServer = void 0;
 exports.createMockServer = createMockServer;
 exports.default = void 0;
 exports.mockServer = mockServer;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 function _server() {
   const data = _interopRequireWildcard(require("@nocobase/server"));
-
   _server = function _server() {
     return data;
   };
-
   return data;
 }
-
 function _qs() {
   const data = _interopRequireDefault(require("qs"));
-
   _qs = function _qs() {
     return data;
   };
-
   return data;
 }
-
 function _supertest() {
   const data = _interopRequireDefault(require("supertest"));
-
   _supertest = function _supertest() {
     return data;
   };
-
   return data;
 }
-
 const _excluded = ["filterByTk", "values", "file"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 class MockServer extends _server().default {
   loadAndInstall(options = {}) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       yield _this.load({
         method: 'install'
       });
+      if (options.afterLoad) {
+        yield options.afterLoad(_this);
+      }
       yield _this.install(_objectSpread(_objectSpread({}, options), {}, {
         sync: {
           force: false,
@@ -88,20 +68,16 @@ class MockServer extends _server().default {
       }));
     })();
   }
-
   cleanDb() {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       yield _this2.db.clean({
         drop: true
       });
     })();
   }
-
   agent() {
     const agent = _supertest().default.agent(this.appManager.callback());
-
     const prefix = this.resourcer.options.prefix;
     const proxy = new Proxy(agent, {
       get(target, method, receiver) {
@@ -112,96 +88,74 @@ class MockServer extends _server().default {
               get(target, method, receiver) {
                 return (params = {}) => {
                   let filterByTk = params.filterByTk,
-                      _params$values = params.values,
-                      values = _params$values === void 0 ? {} : _params$values,
-                      file = params.file,
-                      restParams = _objectWithoutProperties(params, _excluded);
-
+                    _params$values = params.values,
+                    values = _params$values === void 0 ? {} : _params$values,
+                    file = params.file,
+                    restParams = _objectWithoutProperties(params, _excluded);
                   if (params.associatedIndex) {
                     resourceOf = params.associatedIndex;
                   }
-
                   if (params.resourceIndex) {
                     filterByTk = params.resourceIndex;
                   }
-
                   let url = prefix || '';
-
                   if (keys.length > 1) {
                     url += `/${keys[0]}/${resourceOf}/${keys[1]}`;
                   } else {
                     url += `/${name}`;
                   }
-
                   url += `:${method}`;
-
                   if (filterByTk) {
                     url += `/${filterByTk}`;
                   }
-
                   const queryString = _qs().default.stringify(restParams, {
                     arrayFormat: 'brackets'
                   });
-
                   switch (method) {
                     case 'upload':
                       return agent.post(`${url}?${queryString}`).attach('file', file).field(values);
-
                     case 'list':
                     case 'get':
                       return agent.get(`${url}?${queryString}`);
-
                     default:
                       return agent.post(`${url}?${queryString}`).send(values);
                   }
                 };
               }
-
             });
             return proxy;
           };
         }
-
         return agent[method];
       }
-
     });
     return proxy;
   }
-
 }
-
 exports.MockServer = MockServer;
-
 function mockServer(options = {}) {
   if (typeof TextEncoder === 'undefined') {
     global.TextEncoder = require('util').TextEncoder;
   }
-
   if (typeof TextDecoder === 'undefined') {
     global.TextDecoder = require('util').TextDecoder;
-  } // @ts-ignore
-
-
+  }
+  // @ts-ignore
   if (!_server().PluginManager.findPackagePatched) {
     _server().PluginManager.getPackageJson = () => {
       return {
         version: '0.0.0'
       };
-    }; // @ts-ignore
-
-
+    };
+    // @ts-ignore
     _server().PluginManager.findPackagePatched = true;
   }
-
   let database;
-
   if ((options === null || options === void 0 ? void 0 : options.database) instanceof _database().Database) {
     database = options.database;
   } else {
     database = (0, _database().mockDatabase)((options === null || options === void 0 ? void 0 : options.database) || {});
   }
-
   const app = new MockServer(_objectSpread(_objectSpread({
     acl: false
   }, options), {}, {
@@ -210,8 +164,6 @@ function mockServer(options = {}) {
   app.pm.generateClientFile = /*#__PURE__*/_asyncToGenerator(function* () {});
   return app;
 }
-
 function createMockServer() {}
-
 var _default = mockServer;
 exports.default = _default;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@nocobase/test",
-  "version": "0.9.1-alpha.2",
+  "version": "0.9.2-alpha.2",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/server": "0.9.1-alpha.2",
+    "@nocobase/server": "0.9.2-alpha.2",
     "@types/supertest": "^2.0.11",
     "mockjs": "^1.1.0",
     "mysql2": "^2.3.3",
@@ -14,5 +14,5 @@
     "sqlite3": "^5.0.8",
     "supertest": "^6.1.6"
   },
-  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
+  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
 }