oak-domain 2.0.3 → 2.2.0

package/lib/compiler/schemalBuilder.js

@@ -367,7 +367,7 @@ function analyzeEntity(filename, path, program, relativePath) {
                 var hasEntityAttr_1 = false;
                 var hasEntityIdAttr_1 = false;
                 var members = node.members, heritageClauses = node.heritageClauses;
-                (0, assert_1.default)(['EntityShape', 'FileCarrierEntityShape'].includes(heritageClauses[0].types[0].expression.text));
+                (0, assert_1.default)(['EntityShape'].includes(heritageClauses[0].types[0].expression.text), moduleName);
                 members.forEach(function (attrNode) {
                     var _a, _b;
                     var _c = attrNode, type = _c.type, name = _c.name, questionToken = _c.questionToken;
@@ -439,39 +439,33 @@ function analyzeEntity(filename, path, program, relativePath) {
                             }
                         }
                     }
-                    if (attrName === 'entity'
-                        && ts.isTypeReferenceNode(type)
-                        && ts.isIdentifier(type.typeName)) {
+                    if (attrName === 'entity') {
+                        (0, assert_1.default)(ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName), "\u300C".concat(moduleName, "\u300D\u4E2Dentity\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<32>\u7C7B\u578B\uFF0Centity\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
                         var typeArguments = type.typeArguments;
-                        if (type.typeName.text === 'String'
+                        (0, assert_1.default)(type.typeName.text === 'String'
                             && typeArguments
-                            && typeArguments.length === 1) {
-                            var _d = tslib_1.__read(typeArguments, 1), node_1 = _d[0];
-                            if (ts.isLiteralTypeNode(node_1) && ts.isNumericLiteral(node_1.literal)) {
-                                if (parseInt(node_1.literal.text) > 32) {
-                                    console.warn("\u300C\u300D\u4E2Dentity\u5C5E\u6027\u5B9A\u4E49\u7684\u957F\u5EA6\u5927\u4E8E32\uFF0C\u8BF7\u786E\u8BA4\u5B83\u4E0D\u662F\u4E00\u4E2A\u53CD\u6307\u5BF9\u8C61");
-                                }
-                                else {
-                                    hasEntityAttr_1 = true;
-                                }
+                            && typeArguments.length === 1, "\u300C".concat(moduleName, "\u300D\u4E2Dentity\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<32>\u7C7B\u578B\uFF0Centity\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
+                        var _d = tslib_1.__read(typeArguments, 1), node_1 = _d[0];
+                        if (ts.isLiteralTypeNode(node_1) && ts.isNumericLiteral(node_1.literal)) {
+                            if (parseInt(node_1.literal.text) > 32) {
+                                (0, assert_1.default)(false, "\u300C".concat(moduleName, "\u300D\u4E2Dentity\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<32>\u7C7B\u578B\uFF0Centity\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
+                            }
+                            else {
+                                hasEntityAttr_1 = true;
                             }
                         }
                     }
-                    if (attrName === 'entityId'
-                        && ts.isTypeReferenceNode(type)
-                        && ts.isIdentifier(type.typeName)) {
+                    if (attrName === 'entityId') {
+                        (0, assert_1.default)(ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName), "\u300C".concat(moduleName, "\u300D\u4E2DentityId\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<64>\u7C7B\u578B\uFF0CentityId\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
                         var typeArguments = type.typeArguments;
-                        if (type.typeName.text === 'String'
-                            && typeArguments
-                            && typeArguments.length === 1) {
-                            var _e = tslib_1.__read(typeArguments, 1), node_2 = _e[0];
-                            if (ts.isLiteralTypeNode(node_2) && ts.isNumericLiteral(node_2.literal)) {
-                                if (parseInt(node_2.literal.text) !== 64) {
-                                    console.warn("\u300C".concat(filename, "\u300D\u4E2DentityId\u5C5E\u6027\u5B9A\u4E49\u7684\u957F\u5EA6\u4E0D\u7B49\u4E8E64\uFF0C\u8BF7\u786E\u8BA4\u5B83\u4E0D\u662F\u4E00\u4E2A\u53CD\u6307\u5BF9\u8C61"));
-                                }
-                                else {
-                                    hasEntityIdAttr_1 = true;
-                                }
+                        (0, assert_1.default)(type.typeName.text === 'String' && typeArguments && typeArguments.length === 1, "\u300C".concat(moduleName, "\u300D\u4E2DentityId\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<64>\u7C7B\u578B\uFF0CentityId\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
+                        var _e = tslib_1.__read(typeArguments, 1), node_2 = _e[0];
+                        if (ts.isLiteralTypeNode(node_2) && ts.isNumericLiteral(node_2.literal)) {
+                            if (parseInt(node_2.literal.text) !== 64) {
+                                (0, assert_1.default)(false, "\u300C".concat(moduleName, "\u300D\u4E2DentityId\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<64>\u7C7B\u578B\uFF0CentityId\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
+                            }
+                            else {
+                                hasEntityIdAttr_1 = true;
                             }
                         }
                     }

package/lib/store/AsyncRowStore.d.ts

@@ -34,6 +34,7 @@ export declare abstract class AsyncContext<ED extends EntityDict> implements Con
     abstract isRoot(): boolean;
     abstract getCurrentUserId(allowUnloggedIn?: boolean): string | undefined;
     abstract toString(): string;
+    abstract allowUserUpdate(): boolean;
 }
 export interface AsyncRowStore<ED extends EntityDict, Cxt extends Context> extends RowStore<ED> {
     operate<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: OP): Promise<OperationResult<ED>>;

package/lib/store/SyncRowStore.d.ts

@@ -15,6 +15,7 @@ export declare abstract class SyncContext<ED extends EntityDict> implements Cont
     select<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], option: OP): Partial<ED[T]["Schema"]>[];
     count<T extends keyof ED, OP extends SelectOption>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, option: OP): number;
     mergeMultipleResults(toBeMerged: OperationResult<ED>[]): OperationResult<ED>;
+    abstract allowUserUpdate(): boolean;
 }
 export interface SyncRowStore<ED extends EntityDict, Cxt extends Context> extends RowStore<ED> {
     operate<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: OP): OperationResult<ED>;

package/lib/store/selection.js

@@ -59,6 +59,13 @@ function reinforceSelection(schema, entity, selection) {
                 else if (attr === '$not') {
                     checkFilterNode_1(entity2, filterNode[attr], projectionNode);
                 }
+                else if (attr === '$text') {
+                    // 全文检索首先要有fulltext索引，其次要把fulltext的相关属性加到projection里
+                    var indexes = schema[entity2].indexes;
+                    var fulltextIndex = indexes.find(function (ele) { return ele.config && ele.config.type === 'fulltext'; });
+                    var attributes = fulltextIndex.attributes;
+                    necessaryAttrs.push.apply(necessaryAttrs, tslib_1.__spreadArray([], tslib_1.__read((attributes.map(function (ele) { return ele.name; }))), false));
+                }
                 else {
                     if (attr.toLowerCase().startsWith(Demand_1.EXPRESSION_PREFIX)) {
                         var exprResult = (0, types_1.getAttrRefInExpression)(filterNode[attr]);

package/lib/types/Auth.d.ts

@@ -7,7 +7,7 @@ export declare type DataChecker<ED extends EntityDict, T extends keyof ED, Cxt e
     priority?: number;
     type: 'data';
     entity: T;
-    action: Omit<ED[T]['Action'], 'remove'>;
+    action: Omit<ED[T]['Action'], 'remove'> | Array<Omit<ED[T]['Action'], 'remove'>>;
     checker: (data: ED[T]['Create']['data'] | ED[T]['Update']['data'], context: Cxt) => void;
 };
 export declare type RowChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {

package/lib/types/Context.d.ts

@@ -2,5 +2,6 @@ export interface Context {
     getCurrentTxnId(): string | undefined;
     getCurrentUserId(allowUnloggedIn?: boolean): string | undefined;
     isRoot(): boolean;
+    allowUserUpdate(): boolean;
     toString(): string;
 }

package/lib/types/Timer.d.ts

@@ -0,0 +1,14 @@
+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>;
+export declare type Routine<ED extends EntityDict, Cxt extends AsyncContext<ED>> = {
+    name: string;
+    fn: RoutineFn<ED, Cxt>;
+};
+export declare type Timer<ED extends EntityDict, Cxt extends AsyncContext<ED>> = {
+    name: string;
+    cron: RecurrenceRule | RecurrenceSpecDateRange | RecurrenceSpecObjLit | Date | string | number;
+    fn: RoutineFn<ED, Cxt>;
+};
+export {};

package/lib/types/Timer.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/index.d.ts

@@ -16,3 +16,4 @@ export * from './Exception';
 export * from './Watcher';
 export * from './AppLoader';
 export * from './Connector';
+export * from './Timer';

package/lib/types/index.js

@@ -19,3 +19,4 @@ tslib_1.__exportStar(require("./Exception"), exports);
 tslib_1.__exportStar(require("./Watcher"), exports);
 tslib_1.__exportStar(require("./AppLoader"), exports);
 tslib_1.__exportStar(require("./Connector"), exports);
+tslib_1.__exportStar(require("./Timer"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "2.0.3",
+    "version": "2.2.0",
     "author": {
         "name": "XuChang"
     },
@@ -27,6 +27,7 @@
         "@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",