oak-domain 5.0.17 → 5.0.18

package/lib/compiler/schemalBuilder.js

@@ -715,7 +715,9 @@ function analyzeSchemaDefinition(node, moduleName, filename, path, program, refe
                 }
             }
             else {
-                throw new Error(`对象${moduleName}中定义的属性${attrName}是不可识别的数组类别`);
+                schemaAttrs.push(attrNode);
+                analyzeExternalAttrImport(type.elementType, program, importAttrFrom, relativePath);
+                // throw new Error(`对象${moduleName}中定义的属性${attrName}是不可识别的数组类别`);
             }
         }
         else {
@@ -1398,7 +1400,7 @@ function constructSchema(statements, entity) {
             }
         }
         else {
-            (0, assert_1.default)(ts.isUnionTypeNode(type) || ts.isLiteralTypeNode(type), `${entity}有非法的属性类型定义${name.text}`);
+            // assert(ts.isUnionTypeNode(type!) || ts.isLiteralTypeNode(type!), `${entity}有非法的属性类型定义${(<ts.Identifier>name).text}`);
             members.push(factory.createPropertySignature(undefined, name, questionToken, questionToken ? factory.createUnionTypeNode([
                 type,
                 factory.createLiteralTypeNode(factory.createNull())

package/package.json

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

package/src/entities/ModiEntity.ts

@@ -1,26 +1,26 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { Schema as Modi } from './Modi';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    modi: Modi,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '更新对象连接',
-            attr: {
-                modi: '更新',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { Schema as Modi } from './Modi';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    modi: Modi,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '更新对象连接',
+            attr: {
+                modi: '更新',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/OperEntity.ts

@@ -1,27 +1,27 @@
-import { String } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Schema as Oper } from './Oper';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    oper: Oper,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '操作对象连接',
-            attr: {
-                oper: '操作',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape, Configuration } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Schema as Oper } from './Oper';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    oper: Oper,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '操作对象连接',
+            attr: {
+                oper: '操作',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/Relation.ts

@@ -1,43 +1,43 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    entity: String<32>;
-    entityId?: String<64>;        // 可以为空
-    name?: String<32>;
-    display?: String<32>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                name: '关系',
-                entity: '目标对象',
-                entityId: '目标对象id',
-                display: '显示值',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_targetEntity_entityId_name',
-            attributes: [
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'name',
-                }
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    entity: String<32>;
+    entityId?: String<64>;        // 可以为空
+    name?: String<32>;
+    display?: String<32>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                name: '关系',
+                entity: '目标对象',
+                entityId: '目标对象id',
+                display: '显示值',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_targetEntity_entityId_name',
+            attributes: [
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'name',
+                }
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};

package/src/entities/UserEntityClaim.ts

@@ -1,30 +1,30 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-import { Schema as UserEntityGrant } from './UserEntityGrant';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { Schema as UserRelation } from './UserRelation';
-
-export interface Schema extends EntityShape {
-    ueg: UserEntityGrant;
-    user: User;
-    relation: Relation;
-    claimEntityId: String<64>;
-    userRelation: UserRelation;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权领取',
-            attr: {
-                ueg: '授权',
-                user: '用户',
-                relation: '关系',
-                claimEntityId: '对象Id',
-                userRelation: '用户关系',
-            },
-        },
-    },
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+import { Schema as UserEntityGrant } from './UserEntityGrant';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { Schema as UserRelation } from './UserRelation';
+
+export interface Schema extends EntityShape {
+    ueg: UserEntityGrant;
+    user: User;
+    relation: Relation;
+    claimEntityId: String<64>;
+    userRelation: UserRelation;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权领取',
+            attr: {
+                ueg: '授权',
+                user: '用户',
+                relation: '关系',
+                claimEntityId: '对象Id',
+                userRelation: '用户关系',
+            },
+        },
+    },
 };

package/src/entities/UserEntityGrant.ts

@@ -1,24 +1,24 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-type RelationIds = string[];
-
-export interface Schema extends EntityShape {
-    relationEntity: String<32>;
-    relationEntityFilter: Object;
-    relationIds: RelationIds;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                relationIds: '关系',
-                relationEntity: '关联对象',
-                relationEntityFilter: '对象限定条件',
-            },
-        },
-    },
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+type RelationIds = string[];
+
+export interface Schema extends EntityShape {
+    relationEntity: String<32>;
+    relationEntityFilter: Object;
+    relationIds: RelationIds;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                relationIds: '关系',
+                relationEntity: '关联对象',
+                relationEntityFilter: '对象限定条件',
+            },
+        },
+    },
+};

package/src/entities/UserRelation.ts

@@ -1,50 +1,50 @@
-import { String } from '../types/DataType';
-import { LocaleDef } from '../types/Locale';
-import { EntityShape } from '../types/Entity';
-import { Index } from '../types/Storage';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    user: User;
-    relation: Relation;
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户对象关系',
-            attr: {
-                user: '关系',
-                relation: '目标关系',
-                entity: '目标对象',
-                entityId: '目标对象ID',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_user_entity_entityId_relation',
-            attributes: [
-                {
-                    name: 'user',
-                },
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'relation',
-                },
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    user: User;
+    relation: Relation;
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户对象关系',
+            attr: {
+                user: '关系',
+                relation: '目标关系',
+                entity: '目标对象',
+                entityId: '目标对象ID',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_user_entity_entityId_relation',
+            attributes: [
+                {
+                    name: 'user',
+                },
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'relation',
+                },
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};