oak-domain 2.2.0 → 2.3.1

package/lib/types/Expression.js

@@ -361,7 +361,7 @@ function getAttrRefInExpression(expression) {
         _a['#current'] = [],
         _a);
     var check = function (node) {
-        var _a;
+        var _a, e_3, _b;
         if (node['#attr']) {
             result['#current'].push(node['#attr']);
         }
@@ -375,9 +375,24 @@ function getAttrRefInExpression(expression) {
                     _a));
             }
         }
-        else {
-            for (var attr in expression) {
-                check(expression[attr]);
+        else if (node instanceof Array) {
+            try {
+                for (var node_1 = tslib_1.__values(node), node_1_1 = node_1.next(); !node_1_1.done; node_1_1 = node_1.next()) {
+                    var subNode = node_1_1.value;
+                    check(subNode);
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (node_1_1 && !node_1_1.done && (_b = node_1.return)) _b.call(node_1);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+        }
+        else if (typeof node === 'object') {
+            for (var attr in node) {
+                check(node[attr]);
             }
         }
     };

package/lib/types/Storage.d.ts

@@ -1,5 +1,5 @@
 import { ActionType } from '.';
-import { EntityDict, EntityShape, InstinctiveAttributes } from './Entity';
+import { EntityDict, EntityShape, InstinctiveAttributes, RelationHierarchy } from './Entity';
 import { DataType, DataTypeParams } from './schema/DataTypes';
 export declare type Ref = 'ref';
 export interface Column<SH extends EntityShape> {
@@ -36,7 +36,7 @@ export declare type UniqConstraint<SH extends EntityShape> = {
     attributes: Array<keyof SH>;
     type?: string;
 };
-export interface StorageDesc<SH extends EntityShape> {
+export interface StorageDesc<SH extends EntityShape, Relation extends string = ''> {
     storageName?: string;
     comment?: string;
     attributes: Attributes<SH>;
@@ -48,8 +48,9 @@ export interface StorageDesc<SH extends EntityShape> {
     static?: true;
     actions: string[];
     actionType: ActionType;
+    relationHierarchy?: RelationHierarchy<Relation>;
     view?: true;
 }
 export declare type StorageSchema<ED extends EntityDict> = {
-    [K in keyof ED]: StorageDesc<ED[K]['OpSchema']>;
+    [K in keyof ED]: StorageDesc<ED[K]['OpSchema'], any>;
 };

package/lib/types/Timer.d.ts

@@ -1,4 +1,3 @@
-import { RecurrenceRule, RecurrenceSpecDateRange, RecurrenceSpecObjLit } from 'node-schedule';
 import { EntityDict } from './Entity';
 import { AsyncContext } from "../store/AsyncRowStore";
 declare type RoutineFn<ED extends EntityDict, Cxt extends AsyncContext<ED>> = (context: Cxt) => Promise<string>;
@@ -8,7 +7,7 @@ export declare type Routine<ED extends EntityDict, Cxt extends AsyncContext<ED>>
 };
 export declare type Timer<ED extends EntityDict, Cxt extends AsyncContext<ED>> = {
     name: string;
-    cron: RecurrenceRule | RecurrenceSpecDateRange | RecurrenceSpecObjLit | Date | string | number;
+    cron: string;
     fn: RoutineFn<ED, Cxt>;
 };
 export {};

package/lib/types/Trigger.d.ts

@@ -25,6 +25,11 @@ export interface CreateTriggerCrossTxn<ED extends EntityDict, T extends keyof ED
     strict?: 'takeEasy' | 'makeSure';
 }
 export declare type CreateTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = CreateTriggerInTxn<ED, T, Cxt> | CreateTriggerCrossTxn<ED, T, Cxt>;
+/**
+ * update trigger如果带有filter，说明只对存在限定条件的行起作用。此时系统在进行相应动作时，
+ * 会判定当前动作的filter条件和trigger所定义的filter是否有交集（即有同时满足两个条件的行）
+ * 只要有，就会触发trigger。要注意的是这个条件是exists而不是all
+ */
 export interface UpdateTriggerBase<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends TriggerBase<ED, T> {
     action: Exclude<ED[T]['Action'], GenericAction> | 'update' | Array<Exclude<ED[T]['Action'], GenericAction> | 'update'>;
     attributes?: keyof ED[T]['OpSchema'] | Array<keyof ED[T]['OpSchema']>;
@@ -32,6 +37,7 @@ export interface UpdateTriggerBase<ED extends EntityDict, T extends keyof ED, Cx
     fn: (event: {
         operation: ED[T]['Update'];
     }, context: Cxt, option: OperateOption) => Promise<number> | number;
+    filter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Update'], context: Cxt, option: OperateOption) => ED[T]['Update']['filter']);
 }
 export interface UpdateTriggerInTxn<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends UpdateTriggerBase<ED, T, Cxt> {
     when: 'before' | 'after';
@@ -41,12 +47,18 @@ export interface UpdateTriggerCrossTxn<ED extends EntityDict, T extends keyof ED
     strict?: 'takeEasy' | 'makeSure';
 }
 export declare type UpdateTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = UpdateTriggerInTxn<ED, T, Cxt> | UpdateTriggerCrossTxn<ED, T, Cxt>;
+/**
+ * 同update trigger一样，remove trigger如果带有filter，说明只对存在限定条件的行起作用。此时系统在进行相应动作时，
+ * 会判定当前动作的filter条件和trigger所定义的filter是否有交集（即有同时满足两个条件的行）
+ * 只要有，就会触发trigger。要注意的是这个条件是exists而不是all
+ */
 export interface RemoveTriggerBase<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends TriggerBase<ED, T> {
     action: 'remove';
     check?: (operation: ED[T]['Remove']) => boolean;
     fn: (event: {
         operation: ED[T]['Remove'];
     }, context: Cxt, option: OperateOption) => Promise<number> | number;
+    filter?: ED[T]['Remove']['filter'] | ((operation: ED[T]['Remove'], context: Cxt, option: OperateOption) => ED[T]['Remove']['filter']);
 }
 export interface RemoveTriggerInTxn<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends RemoveTriggerBase<ED, T, Cxt> {
     when: 'before' | 'after';

package/lib/utils/SimpleConnector.js

@@ -3,8 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimpleConnector = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
+var stream_1 = require("stream");
 var types_1 = require("../types");
 function makeContentTypeAndBody(data) {
+    //
+    if (process.env.OAK_PLATFORM !== 'wechatMp') {
+        if (data instanceof FormData) {
+            return {
+                contentType: 'multipart/form-data',
+                body: data,
+            };
+        }
+    }
     return {
         contentType: 'application/json',
         body: JSON.stringify(data),
@@ -82,6 +92,11 @@ var SimpleConnector = /** @class */ (function (_super) {
         });
     };
     SimpleConnector.prototype.serializeResult = function (result, context, headers, body) {
+        if (result instanceof stream_1.Stream) {
+            return {
+                body: result,
+            };
+        }
         return {
             body: {
                 result: result,

package/lib/utils/cron.d.ts

@@ -0,0 +1 @@
+export declare function schedule(cron: string, fn: (date: Date) => any): void;

package/lib/utils/cron.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schedule = void 0;
+var tslib_1 = require("tslib");
+var cronjs_matcher_1 = require("@datasert/cronjs-matcher");
+var dayjs_1 = tslib_1.__importDefault(require("dayjs"));
+function schedule(cron, fn) {
+    var futureMatches = (0, cronjs_matcher_1.getFutureMatches)(cron, {
+        matchCount: 1,
+    });
+    var date = (0, dayjs_1.default)(futureMatches[0]);
+    var interval = date.diff((0, dayjs_1.default)(), 'ms');
+    setTimeout(function () {
+        fn(new Date());
+        schedule(cron, fn);
+    }, interval);
+}
+exports.schedule = schedule;

package/lib/utils/lodash.d.ts

@@ -2,4 +2,19 @@
  * 避免lodash打包体积过大
  * 像assign, keys尽量使用Object的函数
  */
-export { unset, pull, uniq, uniqBy, get, set, intersection, omit, merge, cloneDeep, pick, isEqual, union, difference, groupBy, } from 'lodash';
+import unset from 'lodash/unset';
+import uniqBy from 'lodash/uniqBy';
+import pull from 'lodash/pull';
+import uniq from 'lodash/uniq';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import intersection from 'lodash/intersection';
+import omit from 'lodash/omit';
+import merge from 'lodash/merge';
+import cloneDeep from 'lodash/cloneDeep';
+import pick from 'lodash/pick';
+import isEqual from 'lodash/isEqual';
+import union from 'lodash/union';
+import difference from 'lodash/difference';
+import groupBy from 'lodash/groupBy';
+export { unset, pull, uniq, uniqBy, get, set, intersection, omit, merge, cloneDeep, pick, isEqual, union, difference, groupBy, };

package/lib/utils/lodash.js

@@ -1,38 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.groupBy = exports.difference = exports.union = exports.isEqual = exports.pick = exports.cloneDeep = exports.merge = exports.omit = exports.intersection = exports.set = exports.get = exports.uniqBy = exports.uniq = exports.pull = exports.unset = void 0;
+var tslib_1 = require("tslib");
 /**
  * 避免lodash打包体积过大
  * 像assign, keys尽量使用Object的函数
  */
-/* import unset from 'lodash/unset';
-import uniqBy from 'lodash/uniqBy';
-import pull from 'lodash/pull';
-import uniq from 'lodash/uniq';
-import get from 'lodash/get';
-import set from 'lodash/set';
-import intersection from 'lodash/intersection';
-import omit from 'lodash/omit';
-import merge from 'lodash/merge';
-import cloneDeep from 'lodash/cloneDeep';
-import pick from 'lodash/pick';
-import isEqual from 'lodash/isEqual';
-import union from 'lodash/union';
-import difference from 'lodash/difference';
-import groupBy from 'lodash/groupBy'; */
-var lodash_1 = require("lodash");
-Object.defineProperty(exports, "unset", { enumerable: true, get: function () { return lodash_1.unset; } });
-Object.defineProperty(exports, "pull", { enumerable: true, get: function () { return lodash_1.pull; } });
-Object.defineProperty(exports, "uniq", { enumerable: true, get: function () { return lodash_1.uniq; } });
-Object.defineProperty(exports, "uniqBy", { enumerable: true, get: function () { return lodash_1.uniqBy; } });
-Object.defineProperty(exports, "get", { enumerable: true, get: function () { return lodash_1.get; } });
-Object.defineProperty(exports, "set", { enumerable: true, get: function () { return lodash_1.set; } });
-Object.defineProperty(exports, "intersection", { enumerable: true, get: function () { return lodash_1.intersection; } });
-Object.defineProperty(exports, "omit", { enumerable: true, get: function () { return lodash_1.omit; } });
-Object.defineProperty(exports, "merge", { enumerable: true, get: function () { return lodash_1.merge; } });
-Object.defineProperty(exports, "cloneDeep", { enumerable: true, get: function () { return lodash_1.cloneDeep; } });
-Object.defineProperty(exports, "pick", { enumerable: true, get: function () { return lodash_1.pick; } });
-Object.defineProperty(exports, "isEqual", { enumerable: true, get: function () { return lodash_1.isEqual; } });
-Object.defineProperty(exports, "union", { enumerable: true, get: function () { return lodash_1.union; } });
-Object.defineProperty(exports, "difference", { enumerable: true, get: function () { return lodash_1.difference; } });
-Object.defineProperty(exports, "groupBy", { enumerable: true, get: function () { return lodash_1.groupBy; } });
+var unset_1 = tslib_1.__importDefault(require("lodash/unset"));
+exports.unset = unset_1.default;
+var uniqBy_1 = tslib_1.__importDefault(require("lodash/uniqBy"));
+exports.uniqBy = uniqBy_1.default;
+var pull_1 = tslib_1.__importDefault(require("lodash/pull"));
+exports.pull = pull_1.default;
+var uniq_1 = tslib_1.__importDefault(require("lodash/uniq"));
+exports.uniq = uniq_1.default;
+var get_1 = tslib_1.__importDefault(require("lodash/get"));
+exports.get = get_1.default;
+var set_1 = tslib_1.__importDefault(require("lodash/set"));
+exports.set = set_1.default;
+var intersection_1 = tslib_1.__importDefault(require("lodash/intersection"));
+exports.intersection = intersection_1.default;
+var omit_1 = tslib_1.__importDefault(require("lodash/omit"));
+exports.omit = omit_1.default;
+var merge_1 = tslib_1.__importDefault(require("lodash/merge"));
+exports.merge = merge_1.default;
+var cloneDeep_1 = tslib_1.__importDefault(require("lodash/cloneDeep"));
+exports.cloneDeep = cloneDeep_1.default;
+var pick_1 = tslib_1.__importDefault(require("lodash/pick"));
+exports.pick = pick_1.default;
+var isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
+exports.isEqual = isEqual_1.default;
+var union_1 = tslib_1.__importDefault(require("lodash/union"));
+exports.union = union_1.default;
+var difference_1 = tslib_1.__importDefault(require("lodash/difference"));
+exports.difference = difference_1.default;
+var groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
+exports.groupBy = groupBy_1.default;
+// export {
+//     unset,
+//     pull,
+//     uniq,
+//     uniqBy,
+//     get,
+//     set,
+//     intersection,
+//     omit,
+//     merge,
+//     cloneDeep,
+//     pick,
+//     isEqual,
+//     union,
+//     difference,
+//     groupBy,
+// } from 'lodash';

package/lib/utils/uuid.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateNewId = exports.setGenerateIdOption = exports.produceIds = exports.generateNewIdAsync = exports.expandUuidTo36Bytes = exports.shrinkUuidTo32Bytes = exports.sequentialUuid = void 0;
 var tslib_1 = require("tslib");
-var assert_1 = tslib_1.__importDefault(require("assert"));
 var uuid_1 = require("uuid");
 var random_1 = require("./random/random");
 var _nodeId;
@@ -172,11 +171,24 @@ function setGenerateIdOption(option) {
 }
 exports.setGenerateIdOption = setGenerateIdOption;
 function generateNewId() {
-    (0, assert_1.default)(ID_BUFFER.length > 0, '缓存的id已经用完，请提前调用produceIds以确保缓冲池中有足够的预分配id');
-    var id = ID_BUFFER.pop();
-    if (ID_BUFFER.length < 64) {
-        produceIds();
+    if (ID_BUFFER.length > 0) {
+        var id = ID_BUFFER.pop();
+        if (ID_BUFFER.length < 64) {
+            produceIds();
+        }
+        return id;
+    }
+    else {
+        // 如果没来的及填满缓冲池，这里用一个简单的算法产生同步id（在小程序环境下跑出来过）
+        var random = new Uint8Array(16);
+        var iter = 0;
+        do {
+            random[iter] = Math.ceil(Math.random() * 1000) % 128;
+        } while (++iter < 16);
+        if ((ID_OPTION === null || ID_OPTION === void 0 ? void 0 : ID_OPTION.shuffle) || process.env.NODE_ENV === 'development') {
+            return (0, uuid_1.v4)({ random: random });
+        }
+        return sequentialUuid({ random: random });
     }
-    return id;
 }
 exports.generateNewId = generateNewId;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "2.2.0",
+    "version": "2.3.1",
     "author": {
         "name": "XuChang"
     },
@@ -27,7 +27,6 @@
         "@types/luxon": "^2.0.9",
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.14.25",
-        "@types/node-schedule": "^2.1.0",
         "@types/react": "^17.0.2",
         "@types/uuid": "^8.3.0",
         "@types/wechat-miniprogram": "^3.4.1",
@@ -41,6 +40,7 @@
         "typescript": "~4.7.4"
     },
     "dependencies": {
+        "@datasert/cronjs-matcher": "^1.2.0",
         "dayjs": "^1.11.5",
         "lodash": "^4.17.21",
         "uuid": "^9.0.0"