oak-domain 5.0.8 → 5.0.10

package/lib/compiler/localeBuilder.js

@@ -124,7 +124,13 @@ class LocaleBuilder {
         const content = fs_1.default.readFileSync(filepath, {
             encoding: 'utf-8',
         });
-        return JSON.parse(content);
+        try {
+            return JSON.parse(content);
+        }
+        catch (err) {
+            console.error(`parse ${filepath} error`, err);
+            throw err;
+        }
     }
     parseFile(module, namespace, position, filename, filepath, watch) {
         const language = (filename.split('.')[0]).replace('_', '-'); // 历史原因，会命名成zh_CN.json

package/lib/compiler/schemalBuilder.js

@@ -584,7 +584,7 @@ function getImportedFilePath(path, fileSpecifierPath, filename) {
         return '';
     };
     if (fileSpecifierPath.startsWith('.')) {
-        importedFilepath = path_1.default.join(process.cwd(), path, fileSpecifierPath);
+        importedFilepath = path_1.default.join(path, fileSpecifierPath);
         const importedFilename = getExistedFileName();
         (0, assert_1.default)(importedFilename, `「${filename}」中import路径${fileSpecifierPath}找不到对应的声明`);
         return importedFilename;
@@ -2236,7 +2236,7 @@ function constructOperations(statements, entity) {
     }
     if (manyToOneSet) {
         for (const one of manyToOneSet) {
-            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[1])) {
+            if (one[1] !== 'entity') {
                 foreignKeyAttr.push(`${one[1]}Id`);
             }
         }
@@ -2260,7 +2260,7 @@ function constructOperations(statements, entity) {
          */
         const upsertOneNodes = [];
         for (const one of manyToOneSet) {
-            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
+            if (one[1] !== 'entity') {
                 const oneEntity = one[0];
                 const cascadeCreateNode = factory.createTypeLiteralNode([
                     factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
@@ -2472,7 +2472,7 @@ function constructOperations(statements, entity) {
     }
     if (manyToOneSet) {
         for (const one of manyToOneSet) {
-            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[1])) {
+            if (one[1] !== 'entity') {
                 foreignKeyAttr.push(`${one[1]}Id`);
             }
         }
@@ -2494,7 +2494,7 @@ function constructOperations(statements, entity) {
          */
         const upsertOneNodes = [];
         for (const one of manyToOneSet) {
-            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
+            if (one[1] !== 'entity') {
                 const cascadeCreateNode = factory.createTypeLiteralNode([
                     factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'CreateSingleOperation'))),
                     factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
@@ -2777,7 +2777,7 @@ function constructOperations(statements, entity) {
          */
         const upsertOneNodes = [];
         for (const one of manyToOneSet) {
-            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
+            if (one[1] !== 'entity') {
                 if (!Schema[one[0]].static) {
                     switch (Schema[one[0]].actionType) {
                         case 'crud': {

package/lib/store/CascadeStore.js

@@ -162,6 +162,7 @@ class CascadeStore extends RowStore_1.RowStore {
                         checkSortAttr(attr, sortAttr[attr], projNode[attr]);
                     }
                 }
+                assignNecessaryProjectionAttrs(projNode, necessaryAttrs);
             };
             sorterNode.forEach((node) => {
                 const { $attr } = node;

package/lib/store/TriggerExecutor.js

@@ -304,9 +304,17 @@ class TriggerExecutor {
                             return execPreTrigger(idx + 1);
                         }
                     }
-                    const number = await trigger.fn({ operation: operation }, context, option);
-                    if (number > 0 && process.env.NODE_ENV === 'development') {
-                        this.logger.info(`前触发器「${trigger.name}」成功触发了「${number}」行数据更改`);
+                    const closeRoot = trigger.asRoot && context.openRootMode();
+                    try {
+                        const number = await trigger.fn({ operation: operation }, context, option);
+                        if (number > 0 && process.env.NODE_ENV === 'development') {
+                            this.logger.info(`前触发器「${trigger.name}」成功触发了「${number}」行数据更改`);
+                        }
+                        closeRoot && closeRoot();
+                    }
+                    catch (err) {
+                        closeRoot && closeRoot();
+                        throw err;
                     }
                     return execPreTrigger(idx + 1);
                 };
@@ -338,26 +346,41 @@ class TriggerExecutor {
         (0, assert_1.default)(trigger && trigger.when === 'commit');
         (0, assert_1.default)(ids.length > 0);
         const { fn } = trigger;
-        const callback = await fn({ ids }, context, option);
-        if (trigger.strict === 'makeSure') {
-            // 这里开root模式，否则还可能有权限问题
-            context.openRootMode();
-            await context.operate(entity, {
-                id: await (0, uuid_1.generateNewIdAsync)(),
-                action: 'update',
-                data: {
-                    [Entity_1.TriggerDataAttribute]: null,
-                    [Entity_1.TriggerUuidAttribute]: null,
-                },
-                filter: {
-                    id: {
-                        $in: ids,
-                    }
+        const closeRoot = trigger.asRoot && context.openRootMode();
+        try {
+            const callback = await fn({ ids }, context, option);
+            if (trigger.strict === 'makeSure') {
+                // 这里开root模式，否则还可能有权限问题
+                const closeRoot2 = context.openRootMode();
+                try {
+                    await context.operate(entity, {
+                        id: await (0, uuid_1.generateNewIdAsync)(),
+                        action: 'update',
+                        data: {
+                            [Entity_1.TriggerDataAttribute]: null,
+                            [Entity_1.TriggerUuidAttribute]: null,
+                        },
+                        filter: {
+                            id: {
+                                $in: ids,
+                            }
+                        }
+                    }, { includedDeleted: true, blockTrigger: true });
+                    closeRoot2 && closeRoot2();
+                }
+                catch (err2) {
+                    closeRoot2 && closeRoot2();
+                    throw err2;
                 }
-            }, { includedDeleted: true, blockTrigger: true });
+            }
+            if (typeof callback === 'function') {
+                await callback(context, option);
+            }
+            closeRoot && closeRoot();
         }
-        if (typeof callback === 'function') {
-            await callback(context, option);
+        catch (err) {
+            closeRoot && closeRoot();
+            throw err;
         }
     }
     /**
@@ -407,12 +430,20 @@ class TriggerExecutor {
                         return;
                     }
                     const trigger = postTriggers[idx];
-                    const number = await trigger.fn({
-                        operation: operation,
-                        result: result,
-                    }, context, option);
-                    if (number > 0 && process.env.NODE_ENV === 'development') {
-                        this.logger.info(`后触发器「${trigger.name}」成功触发了「${number}」行数据更改`);
+                    const closeRoot = trigger.asRoot && context.openRootMode();
+                    try {
+                        const number = await trigger.fn({
+                            operation: operation,
+                            result: result,
+                        }, context, option);
+                        if (number > 0 && process.env.NODE_ENV === 'development') {
+                            this.logger.info(`后触发器「${trigger.name}」成功触发了「${number}」行数据更改`);
+                        }
+                        closeRoot && closeRoot();
+                    }
+                    catch (err) {
+                        closeRoot && closeRoot();
+                        throw err;
                     }
                     return execPostTrigger(idx + 1);
                 };

package/lib/store/checker.js

@@ -48,6 +48,9 @@ function translateCheckerInAsyncContext(checker, schema) {
             const fn = (async ({ operation }, context, option) => {
                 const { filter: operationFilter, data, action, bornAt } = operation;
                 const filter2 = typeof filter === 'function' ? await filter(operation, context, option) : filter;
+                if (!filter2) {
+                    return 0;
+                }
                 if (['select', 'count', 'stat'].includes(action)) {
                     operation.filter = (0, filter_1.combineFilters)(entity, context.getSchema(), [operationFilter, filter2]);
                     return 0;
@@ -142,6 +145,9 @@ function translateCheckerInSyncContext(checker, schema) {
             const fn = (operation, context, option) => {
                 const { filter: operationFilter, data, action, bornAt } = operation;
                 const filter2 = typeof filter === 'function' ? filter(operation, context, option) : filter;
+                if (!filter2) {
+                    return;
+                }
                 let operationFilter2 = operationFilter;
                 if (action === 'create') {
                     if (data) {

package/lib/types/Trigger.d.ts

@@ -21,6 +21,7 @@ interface TriggerBase<ED extends EntityDict, T extends keyof ED> {
     checkerType?: CheckerType;
     entity: T;
     name: string;
+    asRoot?: true;
     priority?: number;
 }
 export interface CreateTriggerBase<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends TriggerBase<ED, T> {

package/lib/types/Watcher.d.ts

@@ -1,3 +1,4 @@
+import { ReadOnlyAction } from "../actions/action";
 import { AsyncContext } from "../store/AsyncRowStore";
 import { EntityDict, OperationResult } from "./Entity";
 type ActionData<ED extends EntityDict, T extends keyof ED> = ED[T]['Update']['data'] | ED[T]['Remove']['data'];
@@ -5,7 +6,7 @@ export interface BBWatcher<ED extends EntityDict, T extends keyof ED> {
     name: string;
     entity: T;
     filter: ED[T]['Selection']['filter'] | (() => ED[T]['Selection']['filter']);
-    action: ED[T]['Operation']['action'];
+    action: Omit<ED[T]['Action'], 'create' | ReadOnlyAction>;
     actionData: ActionData<ED, T> | (() => Promise<ActionData<ED, T>>);
 }
 export interface WBWatcher<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>> {

package/lib/utils/projection.d.ts

@@ -2,3 +2,4 @@ import { EntityDict } from '../types/Entity';
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { StorageSchema } from '../types/Storage';
 export declare function makeProjection<ED extends BaseEntityDict & EntityDict, T extends keyof ED>(entity: T, schema: StorageSchema<ED>): ED[T]["Selection"]["data"];
+export declare function traverseProjection<ED extends BaseEntityDict & EntityDict, T extends keyof ED>(entity: T, schema: StorageSchema<ED>, projection: ED[T]['Selection']['data'], callback: <T2 extends keyof ED>(entity2: T2, projection2: ED[T2]['Selection']['data']) => void): void;

package/lib/utils/projection.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeProjection = void 0;
+exports.traverseProjection = exports.makeProjection = void 0;
 const Entity_1 = require("../types/Entity");
+const relation_1 = require("../store/relation");
 function makeProjection(entity, schema) {
     const { attributes } = schema[entity];
     const attrs = Object.keys(attributes);
@@ -13,3 +14,22 @@ function makeProjection(entity, schema) {
     return projection;
 }
 exports.makeProjection = makeProjection;
+function traverseProjection(entity, schema, projection, callback) {
+    const access = (entity2, proj) => {
+        callback(entity2, proj);
+        for (const attr in proj) {
+            const rel = (0, relation_1.judgeRelation)(schema, entity2, attr);
+            if (rel === 2) {
+                access(attr, proj[attr]);
+            }
+            else if (typeof rel === 'string') {
+                access(rel, proj[attr]);
+            }
+            else if (rel instanceof Array) {
+                access(rel[0], proj[attr].data);
+            }
+        }
+    };
+    access(entity, projection);
+}
+exports.traverseProjection = traverseProjection;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.0.8",
+    "version": "5.0.10",
     "author": {
         "name": "XuChang"
     },