oak-domain 5.0.8 → 5.0.9

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/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/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/package.json

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