oak-domain 2.6.9 → 3.0.0

package/lib/utils/uuid.d.ts

@@ -10,3 +10,8 @@ export declare function generateNewIdAsync(option?: GenerateIdOption): Promise<s
 export declare function produceIds(): Promise<void>;
 export declare function setGenerateIdOption(option: GenerateIdOption): Promise<void>;
 export declare function generateNewId(): string;
+/**
+ * 在一些特殊场景下根据数据生成指定的uuid，长度不能超过36byte
+ * @param: input: 输入的数据数组，应保证唯一性
+ */
+export declare function formUuid(...input: string[]): string;

package/lib/utils/uuid.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateNewId = exports.setGenerateIdOption = exports.produceIds = exports.generateNewIdAsync = exports.expandUuidTo36Bytes = exports.shrinkUuidTo32Bytes = exports.sequentialUuid = void 0;
+exports.formUuid = exports.generateNewId = exports.setGenerateIdOption = exports.produceIds = exports.generateNewIdAsync = exports.expandUuidTo36Bytes = exports.shrinkUuidTo32Bytes = exports.sequentialUuid = void 0;
 var tslib_1 = require("tslib");
 var uuid_1 = require("uuid");
 var random_1 = require("./random/random");
@@ -192,3 +192,66 @@ function generateNewId() {
     }
 }
 exports.generateNewId = generateNewId;
+function stringToArrayBuffer(str) {
+    var bytes = new Array();
+    var len, c;
+    len = str.length;
+    for (var i = 0; i < len; i++) {
+        c = str.charCodeAt(i);
+        if (c >= 0x010000 && c <= 0x10FFFF) {
+            bytes.push(((c >> 18) & 0x07) | 0xF0);
+            bytes.push(((c >> 12) & 0x3F) | 0x80);
+            bytes.push(((c >> 6) & 0x3F) | 0x80);
+            bytes.push((c & 0x3F) | 0x80);
+        }
+        else if (c >= 0x000800 && c <= 0x00FFFF) {
+            bytes.push(((c >> 12) & 0x0F) | 0xE0);
+            bytes.push(((c >> 6) & 0x3F) | 0x80);
+            bytes.push((c & 0x3F) | 0x80);
+        }
+        else if (c >= 0x000080 && c <= 0x0007FF) {
+            bytes.push(((c >> 6) & 0x1F) | 0xC0);
+            bytes.push((c & 0x3F) | 0x80);
+        }
+        else {
+            bytes.push(c & 0xFF);
+        }
+    }
+    var array = new Int8Array(bytes.length);
+    for (var i = 0; i <= bytes.length; i++) {
+        array[i] = bytes[i];
+    }
+    return array;
+}
+/**
+ * 在一些特殊场景下根据数据生成指定的uuid，长度不能超过36byte
+ * @param: input: 输入的数据数组，应保证唯一性
+ */
+function formUuid() {
+    var input = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        input[_i] = arguments[_i];
+    }
+    var uuid = input.join('-');
+    if (uuid.length <= 36) {
+        return uuid;
+    }
+    var buffer = stringToArrayBuffer(uuid);
+    var b = new Array(16);
+    var i = 0;
+    do {
+        b[i++] = 0;
+    } while (i < 16);
+    i = 0;
+    while (i < buffer.length) {
+        b[i % 16] += buffer[i];
+        i++;
+    }
+    i = 0;
+    do {
+        b[i] = b[i] % 256;
+        i++;
+    } while (i < 16);
+    return unsafeStringify(b);
+}
+exports.formUuid = formUuid;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "2.6.9",
+    "version": "3.0.0",
     "author": {
         "name": "XuChang"
     },
@@ -8,7 +8,7 @@
         "make:domain": "ts-node scripts/make.ts",
         "build": "tsc",
         "prebuild": "npm run make:domain",
-        "test": "ts-node test/testFilter.ts"
+        "test": "ts-node test/test.ts"
     },
     "files": [
         "lib/**/*",
@@ -26,7 +26,7 @@
         "@types/lodash": "^4.14.182",
         "@types/luxon": "^2.0.9",
         "@types/mocha": "^8.2.0",
-        "@types/node": "^14.14.25",
+        "@types/node": "^14.18.48",
         "@types/node-schedule": "^2.1.0",
         "@types/react": "^17.0.2",
         "@types/uuid": "^8.3.0",

package/src/entities/ActionAuth.ts

@@ -1,49 +1,41 @@
 import { String } from '../types/DataType';
-import { LocaleDef } from '../types/Locale';
 import { EntityShape } from '../types/Entity';
-import { Index } from '../types/Storage';
 import { Schema as Relation } from './Relation';
+import { EntityDesc } from '../types/EntityDesc';
 
 type Actions = string[];
+type Paths = string[];
 
 export interface Schema extends EntityShape {
-    relation: Relation;
-    path: String<256>;
+    relation?: Relation;
+    paths: Paths;
     destEntity: String<32>;
     deActions: Actions;
 };
 
-
-const indexes: Index<Schema>[] = [
-    {
-        name: 'index_relation_path',
-        attributes: [
-            {
-                name: 'relation',
-            },
-            {
-                name: 'path',
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                relation: '关系',
+                paths: '路径',
+                destEntity: '目标对象',
+                deActions: '目标对象动作',
             },
-        ],
-        config: {
-            unique: true,
         },
     },
-];
-
-const locale: LocaleDef<
-    Schema,
-    '',
-    '',
-    {}
-> = {
-    zh_CN: {
-        name: '用户授权',
-        attr: {
-            relation: '关系',
-            path: '路径',
-            destEntity: '目标对象',
-            deActions: '目标对象动作',
+    indexes: [
+        {
+            name: 'index_entity_relation',
+            attributes: [
+                {
+                    name: 'destEntity',
+                },
+                {
+                    name: 'relation',
+                },
+            ],
         },
-    },
+    ],
 };

package/src/entities/I18n.ts

@@ -0,0 +1,46 @@
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    module: String<64>;
+    position: String<188>;
+    namespace: String<256>;
+    language: String<32>;
+    data: Object;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                module: '模块',
+                position: '文件位置',
+                namespace: '命名空间',
+                language: '语言',
+                data: '数据'
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'namespace_language',
+            attributes: [
+                {
+                    name: 'namespace',
+                },
+                {
+                    name: 'language',
+                }
+            ],
+            config: {
+                unique: true,
+            },
+        }
+    ],
+    configuration: {
+        actionType: 'readOnly',
+        static: true,
+    }
+};

package/src/entities/Modi.ts

@@ -1,8 +1,7 @@
 import { ActionDef } from '../types/Action';
 import { String } from '../types/DataType';
 import { EntityShape } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Index } from '../types/Storage';
+import { EntityDesc } from '../types/EntityDesc';
 
 export interface Schema extends EntityShape {
     targetEntity: String<32>;       // 要操作的目标对象
@@ -27,43 +26,44 @@ const IActionDef: ActionDef<IAction, IState> = {
 
 type Action = IAction;
 
-const indexes: Index<Schema>[] = [
-    {
-        name: 'index_state',
-        attributes: [
-            {
-                name: 'iState',
-                direction: 'ASC',
-            }
-        ],
-    },
-];
-
-const locale: LocaleDef<Schema, Action, '', {
+const entityDesc: EntityDesc<Schema, Action, '', {
     iState: IState,
 }> = {
-    zh_CN: {
-        name: '更新',
-        attr: {
-            targetEntity: '目标对象',
-            entity: '关联对象',
-            entityId: '关联对象Id',
-            action: '动作',
-            data: '数据',
-            filter: '条件',
-            extra: '其它',
-            iState: '状态',
-        },
-        action: {
-            abandon: '放弃',
-            apply: '应用',
-        },
-        v: {
-            iState: {
-                active: '活跃的',
-                abandoned: '放弃的',
-                applied: '应用的',
+    locales: {
+        zh_CN: {
+            name: '更新',
+            attr: {
+                targetEntity: '目标对象',
+                entity: '关联对象',
+                entityId: '关联对象Id',
+                action: '动作',
+                data: '数据',
+                filter: '条件',
+                extra: '其它',
+                iState: '状态',
+            },
+            action: {
+                abandon: '放弃',
+                apply: '应用',
+            },
+            v: {
+                iState: {
+                    active: '活跃的',
+                    abandoned: '放弃的',
+                    applied: '应用的',
+                },
             },
         },
     },
+    indexes: [
+        {
+            name: 'index_state',
+            attributes: [
+                {
+                    name: 'iState',
+                    direction: 'ASC',
+                }
+            ],
+        },
+    ],
 };

package/src/entities/ModiEntity.ts

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

package/src/entities/Oper.ts

@@ -1,7 +1,7 @@
 import { String, Int, Datetime, Image, Boolean, Text } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
 import { Schema as User } from './User';
+import { EntityDesc } from '../types/EntityDesc';
 
 export interface Schema extends EntityShape {
     action: String<16>;
@@ -12,20 +12,21 @@ export interface Schema extends EntityShape {
     targetEntity: String<32>;
 };
 
-const configuration: Configuration = {
-    actionType: 'appendOnly',
-}
-
-const locale: LocaleDef<Schema, '', '', {}> = {
-    zh_CN: {
-        name: '操作',
-        attr: {
-            action: '动作',
-            data: '数据',
-            filter: '选择条件',
-            extra: '其它',
-            operator: '操作者',
-            targetEntity: '关联对象',
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '操作',
+            attr: {
+                action: '动作',
+                data: '数据',
+                filter: '选择条件',
+                extra: '其它',
+                operator: '操作者',
+                targetEntity: '关联对象',
+            },
         },
     },
+    configuration: {
+        actionType: 'appendOnly',
+    }
 };

package/src/entities/OperEntity.ts

@@ -2,6 +2,7 @@ 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,
@@ -9,17 +10,18 @@ export interface Schema extends EntityShape {
     entityId: String<64>;
 };
 
-const config: Configuration = {
-    actionType: 'appendOnly',
-};
-
-const locale: LocaleDef<Schema, '', '', {}> = {
-    zh_CN: {
-        name: '操作对象连接',
-        attr: {
-            oper: '操作',
-            entity: '关联对象',
-            entityId: '关联对象id',
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '操作对象连接',
+            attr: {
+                oper: '操作',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
         },
     },
+    configuration: {
+        actionType: 'appendOnly',
+    }
 };

package/src/entities/Relation.ts

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

@@ -1,49 +1,43 @@
 import { String } from '../types/DataType';
-import { LocaleDef } from '../types/Locale';
 import { EntityShape } from '../types/Entity';
-import { Index } from '../types/Storage';
 import { Schema as Relation } from './Relation';
+import { EntityDesc } from '../types/EntityDesc';
 
-type Relations = string[];
-
+// destRelation需要有sourceRelation才能授权/除权
 export interface Schema extends EntityShape {
-    relation: Relation;
+    sourceRelation: Relation;
     path: String<256>;
-    destEntity: String<32>;
-    deRelations: Relations;
+    destRelation: Relation;
 };
 
-
-const indexes: Index<Schema>[] = [
-    {
-        name: 'index_relation_path',
-        attributes: [
-            {
-                name: 'relation',
-            },
-            {
-                name: 'path',
+const entityDesc: EntityDesc<Schema> = {
+    indexes: [
+        {
+            name: 'index_entity_relation_path',
+            attributes: [
+                {
+                    name: 'sourceRelation',
+                },
+                {
+                    name: 'path',
+                },
+                {
+                    name: 'destRelation',
+                },
+            ],
+            config: {
+                unique: true,
             },
-        ],
-        config: {
-            unique: true,
         },
-    },
-];
-
-const locale: LocaleDef<
-    Schema,
-    '',
-    '',
-    {}
-> = {
-    zh_CN: {
-        name: '用户授权',
-        attr: {
-            relation: '关系',
-            path: '路径',
-            destEntity: '目标对象',
-            deRelations: '目标对象关系',
+    ],
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                sourceRelation: '源关系',
+                path: '路径',
+                destRelation: '目标关系',
+            },
         },
-    },
+    }
 };

package/src/entities/User.ts

@@ -1,7 +1,7 @@
 import { String, Int, Text, Image, Datetime } from '../types/DataType';
-import { LocaleDef } from '../types/Locale';
 import { EntityShape } from '../types/Entity';
 import { ActionDef } from '../types/Action';
+import { EntityDesc } from '../types/EntityDesc';
 
 export interface Schema extends EntityShape {
     name?: String<16>;
@@ -15,32 +15,35 @@ type UserState = 'normal' | 'merged';
 
 type Action = UserAction;
 
+
 const UserActionDef: ActionDef<UserAction, UserState> = {
     stm: {
         mergeTo: ['normal', 'merged'],
     },
 };
 
-const locale: LocaleDef<Schema, Action, '', {
-    userState: UserState;
+const entityDesc: EntityDesc<Schema, Action, '', {
+    userState: UserState,
 }> = {
-    zh_CN: {
-        name: '用户',
-        attr: {
-            name: '姓名',
-            nickname: '昵称',
-            password: '密码',
-            ref: '指向用户',
-            userState: '状态',
-        },
-        action: {
-            mergeTo: '合并',
-        },
-        v: {
-            userState: {
-                normal: '正常',
-                merged: '已被合并',
+    locales: {
+        zh_CN: {
+            name: '用户',
+            attr: {
+                name: '姓名',
+                nickname: '昵称',
+                password: '密码',
+                ref: '指向用户',
+                userState: '状态',
             },
-        }
-    },
+            action: {
+                mergeTo: '合并',
+            },
+            v: {
+                userState: {
+                    normal: '正常',
+                    merged: '已被合并',
+                },
+            }
+        },
+    },    
 };