oak-domain 5.1.4 → 5.1.6

package/lib/compiler/dependencyBuilder.js

@@ -588,9 +588,17 @@ function outputFeatureIndex(dependencies, briefNames, sourceFile, printer, filen
             importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("FeatureDict"), factory.createIdentifier(fdName))])), factory.createStringLiteral(dep), undefined));
             fdNames.push(fdName);
         });
-        const stmt4 = statements[4], stmt5 = statements[5];
-        (0, assert_1.default)(ts.isImportDeclaration(stmt4) && ts.isFunctionDeclaration(stmt5));
-        const { name, parameters } = stmt5;
+        let i = 0;
+        while (true) {
+            const stmt = statements[i];
+            if (ts.isFunctionDeclaration(stmt)) {
+                break;
+            }
+            i++;
+        }
+        const stmt3 = statements[i - 1], stmt4 = statements[i];
+        (0, assert_1.default)(ts.isImportDeclaration(stmt3) && ts.isFunctionDeclaration(stmt4));
+        const { name, parameters } = stmt4;
         (0, assert_1.default)(ts.isIdentifier(name) && name.text === 'create' && parameters.length === 1);
         const [param] = parameters;
         const { name: paramName, type } = param;
@@ -604,9 +612,9 @@ function outputFeatureIndex(dependencies, briefNames, sourceFile, printer, filen
             ])
         });
         statements2 = [
-            ...statements.slice(0, 5),
+            ...statements.slice(0, i),
             ...importStatements,
-            ...statements.slice(5)
+            ...statements.slice(i)
         ];
         if (isModule) {
             statements2.push(factory.createFunctionDeclaration([
@@ -756,7 +764,7 @@ function tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer) {
         const moduleTemplateDir = join(moduleDir, 'template');
         if ((0, fs_1.existsSync)(moduleTemplateDir)) {
             // data.ts中规定的初始化数据，拷贝到data目录下，并注入到data/index.ts
-            const dataFile = join(moduleTemplateDir, 'data', 'data.ts');
+            const dataFile = join(moduleTemplateDir, 'data.ts');
             if ((0, fs_1.existsSync)(dataFile)) {
                 const prjDataFile = join(cwd, 'src', 'data', `${briefNames[idx]}Data.ts`);
                 if (!(0, fs_1.existsSync)(prjDataFile)) {

package/lib/store/RelationAuth.js

@@ -148,7 +148,7 @@ class RelationAuth {
                 if (!entity2) {
                     entity2 = relations[0]?.entity;
                 }
-                else {
+                else if (relations.length) {
                     (0, assert_1.default)(entity2 === relations[0]?.entity);
                 }
                 return relations.map(ele => ele.id);
@@ -156,6 +156,7 @@ class RelationAuth {
             const relationIds = getRelationIds();
             if (relationIds instanceof Promise) {
                 return relationIds.then((ids) => {
+                    (0, assert_1.default)(ids.length > 0);
                     return Promise.all(ids.map(ele => checkOnRelationId(entity2, ele, entityFilter))).then((value) => {
                         if (intersection) {
                             return !(value.includes(false));
@@ -164,6 +165,10 @@ class RelationAuth {
                     });
                 });
             }
+            if (relationIds.length === 0) {
+                // 如果没有relationId（前端cache中），直接返回false
+                return false;
+            }
             const value = relationIds.map(ele => checkOnRelationId(entity2, ele, entityFilter));
             if (intersection) {
                 return !(value.includes(false));

package/package.json

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