@nocobase/server 0.9.1-alpha.1 → 0.9.2-alpha.1

package/lib/middlewares/data-wrapping.js

@@ -5,69 +5,51 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.dataWrapping = dataWrapping;
 exports.default = void 0;
-
 function _stream() {
   const data = _interopRequireDefault(require("stream"));
-
   _stream = function _stream() {
     return data;
   };
-
   return data;
 }
-
 const _excluded = ["rows"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 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); }); }; }
-
 function dataWrapping() {
   return /*#__PURE__*/function () {
     var _dataWrapping = _asyncToGenerator(function* (ctx, next) {
       yield next();
-
       if (ctx.withoutDataWrapping) {
         return;
-      } // if (!ctx?.action?.params) {
+      }
+      // if (!ctx?.action?.params) {
       //   return;
       // }
-
-
       if (ctx.body instanceof _stream().default.Readable) {
         return;
       }
-
       if (ctx.body instanceof Buffer) {
         return;
       }
-
       if (!ctx.body) {
         var _ctx$action;
-
         if (((_ctx$action = ctx.action) === null || _ctx$action === void 0 ? void 0 : _ctx$action.actionName) == 'get') {
           ctx.status = 200;
         }
       }
-
       if (Array.isArray(ctx.body)) {
         ctx.body = {
           data: ctx.body
         };
         return;
       }
-
       if (ctx.body) {
         const _ctx$body = ctx.body,
-              rows = _ctx$body.rows,
-              meta = _objectWithoutProperties(_ctx$body, _excluded);
-
+          rows = _ctx$body.rows,
+          meta = _objectWithoutProperties(_ctx$body, _excluded);
         if (rows) {
           ctx.body = {
             data: rows,
@@ -77,7 +59,6 @@ function dataWrapping() {
           ctx.body = {
             data: ctx.body
           };
-
           if (ctx.bodyMeta) {
             ctx.body.meta = ctx.bodyMeta;
           }
@@ -88,14 +69,11 @@ function dataWrapping() {
         };
       }
     });
-
     function dataWrapping(_x, _x2) {
       return _dataWrapping.apply(this, arguments);
     }
-
     return dataWrapping;
   }();
 }
-
 var _default = dataWrapping;
 exports.default = _default;

package/lib/middlewares/db2resource.js

@@ -5,29 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.db2resource = db2resource;
 exports.default = void 0;
-
 function _resourcer() {
   const data = require("@nocobase/resourcer");
-
   _resourcer = function _resourcer() {
     return data;
   };
-
   return data;
 }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function db2resource(ctx, next) {
   const resourcer = ctx.resourcer;
   const database = ctx.db;
@@ -38,41 +28,33 @@ function db2resource(ctx, next) {
     prefix: resourcer.options.prefix,
     accessors: resourcer.options.accessors
   });
-
   if (!params) {
     return next();
   }
-
-  const resourceName = (0, _resourcer().getNameByParams)(params); // 如果资源名称未被定义
-
+  const resourceName = (0, _resourcer().getNameByParams)(params);
+  // 如果资源名称未被定义
   if (resourcer.isDefined(resourceName)) {
     return next();
   }
-
   const _resourceName$split = resourceName.split('.'),
-        _resourceName$split2 = _slicedToArray(_resourceName$split, 2),
-        collectionName = _resourceName$split2[0],
-        fieldName = _resourceName$split2[1]; // 如果经过加载后是已经定义的表
-
-
+    _resourceName$split2 = _slicedToArray(_resourceName$split, 2),
+    collectionName = _resourceName$split2[0],
+    fieldName = _resourceName$split2[1];
+  // 如果经过加载后是已经定义的表
   if (!database.hasCollection(collectionName)) {
     return next();
   }
-
   const collection = database.getCollection(collectionName);
   let resourceType = 'single';
-
   if (fieldName && collection.hasField(fieldName)) {
     const field = collection.getField(fieldName);
     resourceType = field.type;
   }
-
   resourcer.define({
     type: resourceType,
     name: resourceName
   });
   return next();
 }
-
 var _default = db2resource;
 exports.default = _default;

package/lib/middlewares/i18n.js

@@ -4,15 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.i18n = i18n;
-
 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); }); }; }
-
 function i18n(_x, _x2) {
   return _i18n.apply(this, arguments);
 }
-
 function _i18n() {
   _i18n = _asyncToGenerator(function* (ctx, next) {
     const i18n = ctx.app.i18n.cloneInstance({
@@ -20,18 +16,14 @@ function _i18n() {
     });
     ctx.i18n = i18n;
     ctx.t = i18n.t.bind(i18n);
-
     ctx.getCurrentLocale = () => {
       const lng = ctx.get('X-Locale') || ctx.request.query.locale || ctx.app.i18n.language || ctx.acceptsLanguages().shift() || 'en-US';
       return lng;
     };
-
     const lng = ctx.getCurrentLocale();
-
     if (lng !== '*' && lng) {
       i18n.changeLanguage(lng);
     }
-
     yield next();
   });
   return _i18n.apply(this, arguments);

package/lib/middlewares/index.d.ts

@@ -1,2 +1,3 @@
 export * from './data-wrapping';
 export * from './db2resource';
+export { parseVariables } from './parse-variables';

package/lib/middlewares/index.js

@@ -3,11 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
+var _exportNames = {
+  parseVariables: true
+};
+Object.defineProperty(exports, "parseVariables", {
+  enumerable: true,
+  get: function get() {
+    return _parseVariables.parseVariables;
+  }
+});
 var _dataWrapping = require("./data-wrapping");
-
 Object.keys(_dataWrapping).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _dataWrapping[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -16,11 +24,10 @@ Object.keys(_dataWrapping).forEach(function (key) {
     }
   });
 });
-
 var _db2resource = require("./db2resource");
-
 Object.keys(_db2resource).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _db2resource[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -28,4 +35,5 @@ Object.keys(_db2resource).forEach(function (key) {
       return _db2resource[key];
     }
   });
-});
+});
+var _parseVariables = require("./parse-variables");

package/lib/middlewares/parse-variables.d.ts

@@ -0,0 +1 @@
+export declare const parseVariables: (ctx: any, next: any) => Promise<any>;

package/lib/middlewares/parse-variables.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseVariables = void 0;
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
+    return data;
+  };
+  return data;
+}
+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); }); }; }
+function getUser(ctx) {
+  return /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* ({
+      fields
+    }) {
+      var _ctx$logger, _ctx$logger2;
+      const userFields = fields.filter(f => f && ctx.db.getFieldByPath('users.' + f));
+      (_ctx$logger = ctx.logger) === null || _ctx$logger === void 0 ? void 0 : _ctx$logger.info('filter-parse: ', {
+        userFields
+      });
+      if (!ctx.state.currentUser) {
+        return;
+      }
+      if (!userFields.length) {
+        return;
+      }
+      const user = yield ctx.db.getRepository('users').findOne({
+        filterByTk: ctx.state.currentUser.id,
+        fields: userFields
+      });
+      (_ctx$logger2 = ctx.logger) === null || _ctx$logger2 === void 0 ? void 0 : _ctx$logger2.info('filter-parse: ', {
+        $user: user === null || user === void 0 ? void 0 : user.toJSON()
+      });
+      return user;
+    });
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+}
+function isNumeric(str) {
+  if (typeof str === 'number') return true;
+  if (typeof str != 'string') return false;
+  return !isNaN(str) && !isNaN(parseFloat(str));
+}
+const parseVariables = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(function* (ctx, next) {
+    const filter = ctx.action.params.filter;
+    if (!filter) {
+      return next();
+    }
+    ctx.action.params.filter = yield (0, _utils().parseFilter)(filter, {
+      timezone: ctx.get('x-timezone'),
+      now: new Date().toISOString(),
+      getField: path => {
+        const fieldPath = path.split('.').filter(p => !p.startsWith('$') && !isNumeric(p)).join('.');
+        const resourceName = ctx.action.resourceName;
+        return ctx.db.getFieldByPath(`${resourceName}.${fieldPath}`);
+      },
+      vars: {
+        $system: {
+          now: new Date().toISOString()
+        },
+        $date: (0, _utils().getDateVars)(),
+        $user: getUser(ctx)
+      }
+    });
+    yield next();
+  });
+  return function parseVariables(_x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+exports.parseVariables = parseVariables;

package/lib/migration.js

@@ -4,26 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Migration = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 class Migration extends _database().Migration {
   get app() {
     return this.context.app;
   }
-
   get plugin() {
     return this.context.plugin;
   }
-
 }
-
 exports.Migration = Migration;

package/lib/plugin-manager/index.d.ts

@@ -1 +1 @@
-export * from './PluginManager';
+export * from './plugin-manager';

package/lib/plugin-manager/index.js

@@ -3,16 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _PluginManager = require("./PluginManager");
-
-Object.keys(_PluginManager).forEach(function (key) {
+var _pluginManager = require("./plugin-manager");
+Object.keys(_pluginManager).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _PluginManager[key]) return;
+  if (key in exports && exports[key] === _pluginManager[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _PluginManager[key];
+      return _pluginManager[key];
     }
   });
 });

package/lib/plugin-manager/options/collection.d.ts

@@ -1,16 +1,2 @@
-declare const _default: {
-    name: string;
-    namespace: string;
-    duplicator: string;
-    repository: string;
-    fields: ({
-        type: string;
-        name: string;
-        unique: boolean;
-    } | {
-        type: string;
-        name: string;
-        unique?: undefined;
-    })[];
-};
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/lib/plugin-manager/options/collection.js

@@ -4,9 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = {
+function _database() {
+  const data = require("@nocobase/database");
+  _database = function _database() {
+    return data;
+  };
+  return data;
+}
+var _default = (0, _database().defineCollection)({
   name: 'applicationPlugins',
-  namespace: 'core',
+  namespace: 'core.applicationPlugins',
   duplicator: 'required',
   repository: 'PluginManagerRepository',
   fields: [{
@@ -29,5 +36,5 @@ var _default = {
     type: 'json',
     name: 'options'
   }]
-};
+});
 exports.default = _default;

package/lib/plugin-manager/options/resource.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 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); }); }; }
-
 var _default = {
   name: 'pm',
   actions: {
@@ -16,69 +13,56 @@ var _default = {
       return _asyncToGenerator(function* () {
         const pm = ctx.app.pm;
         const filterByTk = ctx.action.params.filterByTk;
-
         if (!filterByTk) {
           ctx.throw(400, 'plugin name invalid');
         }
-
         yield pm.add(filterByTk);
         ctx.body = filterByTk;
         yield next();
       })();
     },
-
     enable(ctx, next) {
       return _asyncToGenerator(function* () {
         const pm = ctx.app.pm;
         const filterByTk = ctx.action.params.filterByTk;
-
         if (!filterByTk) {
           ctx.throw(400, 'plugin name invalid');
         }
-
         yield pm.enable(filterByTk);
         ctx.body = filterByTk;
         yield next();
       })();
     },
-
     disable(ctx, next) {
       return _asyncToGenerator(function* () {
         const pm = ctx.app.pm;
         const filterByTk = ctx.action.params.filterByTk;
-
         if (!filterByTk) {
           ctx.throw(400, 'plugin name invalid');
         }
-
         yield pm.disable(filterByTk);
         ctx.body = filterByTk;
         yield next();
       })();
     },
-
     upgrade(ctx, next) {
       return _asyncToGenerator(function* () {
         ctx.body = 'ok';
         yield next();
       })();
     },
-
     remove(ctx, next) {
       return _asyncToGenerator(function* () {
         const pm = ctx.app.pm;
         const filterByTk = ctx.action.params.filterByTk;
-
         if (!filterByTk) {
           ctx.throw(400, 'plugin name invalid');
         }
-
         yield pm.remove(filterByTk);
         ctx.body = filterByTk;
         yield next();
       })();
     }
-
   }
 };
 exports.default = _default;

package/lib/plugin-manager/{PluginManagerRepository.d.ts → plugin-manager-repository.d.ts}

@@ -1,5 +1,5 @@
 import { Repository } from '@nocobase/database';
-import { PluginManager } from './PluginManager';
+import { PluginManager } from './plugin-manager';
 export declare class PluginManagerRepository extends Repository {
     pm: PluginManager;
     setPluginManager(pm: PluginManager): void;