oak-domain 2.6.10 → 3.0.1

package/lib/actions/action.d.ts

@@ -8,7 +8,7 @@ export declare type RelationAction = 'grant' | 'revoke';
 export declare const readOnlyActions: string[];
 export declare const appendOnlyActions: string[];
 export declare const excludeUpdateActions: string[];
-export declare const exludeRemoveActions: string[];
+export declare const excludeRemoveActions: string[];
 export declare const genericActions: string[];
 export declare const relationActions: string[];
 export declare type AbleAction = 'enable' | 'disable';

package/lib/actions/action.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeAbleActionDef = exports.relationActions = exports.genericActions = exports.exludeRemoveActions = exports.excludeUpdateActions = exports.appendOnlyActions = exports.readOnlyActions = void 0;
+exports.makeAbleActionDef = exports.relationActions = exports.genericActions = exports.excludeRemoveActions = exports.excludeUpdateActions = exports.appendOnlyActions = exports.readOnlyActions = void 0;
 exports.readOnlyActions = ['count', 'stat', 'download', 'select', 'aggregate'];
 exports.appendOnlyActions = exports.readOnlyActions.concat('create');
 exports.excludeUpdateActions = exports.appendOnlyActions.concat('remove');
-exports.exludeRemoveActions = exports.appendOnlyActions.concat('update');
+exports.excludeRemoveActions = exports.appendOnlyActions.concat('update');
 exports.genericActions = exports.excludeUpdateActions.concat('update');
 exports.relationActions = ['grant', 'revoke'];
 var makeAbleActionDef = function (initialState) { return ({

package/lib/base-app-domain/ActionAuth/Schema.d.ts

@@ -1,26 +1,28 @@
-import { String, ForeignKey } from "../../types/DataType";
-import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
+import { ForeignKey, JsonProjection } from "../../types/DataType";
+import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey, JsonFilter, SubQueryPredicateMetadata } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
-import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult } from "../../types/Entity";
 import { GenericAction } from "../../actions/action";
+import { String } from "../../types/DataType";
+import { EntityShape } from "../../types/Entity";
 import * as Relation from "../Relation/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
 import * as OperEntity from "../OperEntity/Schema";
 declare type Actions = string[];
+declare type Paths = string[];
 export declare type OpSchema = EntityShape & {
-    relationId: ForeignKey<"relation">;
-    path: String<256>;
+    relationId?: ForeignKey<"relation"> | null;
+    paths: Paths;
     destEntity: String<32>;
     deActions: Actions;
 };
 export declare type OpAttr = keyof OpSchema;
 export declare type Schema = EntityShape & {
-    relationId: ForeignKey<"relation">;
-    path: String<256>;
+    relationId?: ForeignKey<"relation"> | null;
+    paths: Paths;
     destEntity: String<32>;
     deActions: Actions;
-    relation: Relation.Schema;
+    relation?: Relation.Schema | null;
     modiEntity$entity?: Array<ModiEntity.Schema>;
     modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
     operEntity$entity?: Array<OperEntity.Schema>;
@@ -29,15 +31,17 @@ export declare type Schema = EntityShape & {
     [A in ExpressionKey]?: any;
 };
 declare type AttrFilter = {
-    id: Q_StringValue | SubQuery.ActionAuthIdSubQuery;
+    id: Q_StringValue;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
-    relationId: Q_StringValue | SubQuery.RelationIdSubQuery;
+    relationId: Q_StringValue;
     relation: Relation.Filter;
-    path: Q_StringValue;
+    paths: JsonFilter<Paths>;
     destEntity: Q_StringValue;
-    deActions: Q_EnumValue<Actions>;
+    deActions: JsonFilter<Actions>;
+    modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
+    operEntity$entity: OperEntity.Filter & SubQueryPredicateMetadata;
 };
 export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
 export declare type Projection = {
@@ -49,9 +53,9 @@ export declare type Projection = {
     $$seq$$?: number;
     relationId?: number;
     relation?: Relation.Projection;
-    path?: number;
+    paths?: number | JsonProjection<Paths>;
     destEntity?: number;
-    deActions?: number;
+    deActions?: number | JsonProjection<Actions>;
     modiEntity$entity?: ModiEntity.Selection & {
         $entity: "modiEntity";
     };
@@ -84,7 +88,7 @@ export declare type SortAttr = {
 } | {
     relation: Relation.SortAttr;
 } | {
-    path: number;
+    paths: number;
 } | {
     destEntity: number;
 } | {
@@ -98,16 +102,16 @@ export declare type SortNode = {
 };
 export declare type Sorter = SortNode[];
 export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
-export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
+export declare type Selection<P extends Object = Projection> = SelectOperation<P>;
 export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
 export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "relationId">> & (({
     relationId?: never;
-    relation: Relation.CreateSingleOperation;
+    relation?: Relation.CreateSingleOperation;
 } | {
-    relationId: String<64>;
+    relationId: ForeignKey<"relation">;
     relation?: Relation.UpdateOperation;
 } | {
-    relationId: String<64>;
+    relationId?: ForeignKey<"relation">;
 })) & {
     modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
     operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
@@ -126,7 +130,7 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "relatio
     relationId?: never;
 } | {
     relation?: never;
-    relationId?: String<64> | null;
+    relationId?: ForeignKey<"relation"> | null;
 })) & {
     [k: string]: any;
     modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;

package/lib/base-app-domain/ActionAuth/Storage.js

@@ -5,16 +5,12 @@ var action_1 = require("../../actions/action");
 exports.desc = {
     attributes: {
         relationId: {
-            notNull: true,
             type: "ref",
             ref: "relation"
         },
-        path: {
+        paths: {
             notNull: true,
-            type: "varchar",
-            params: {
-                length: 256
-            }
+            type: "object"
         },
         destEntity: {
             notNull: true,
@@ -32,18 +28,15 @@ exports.desc = {
     actions: action_1.genericActions,
     indexes: [
         {
-            name: 'index_relation_path',
+            name: 'index_entity_relation',
             attributes: [
                 {
-                    name: "relationId"
+                    name: 'destEntity'
                 },
                 {
-                    name: 'path'
+                    name: "relationId"
                 },
-            ],
-            config: {
-                unique: true
-            }
+            ]
         }
     ]
 };

package/lib/base-app-domain/ActionDefDict.d.ts

@@ -5,4 +5,5 @@ export declare const ActionDefDict: {
     user: {
         userState: import("../types").ActionDef<string, string>;
     };
+    userEntityGrant: {};
 };

package/lib/base-app-domain/ActionDefDict.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionDefDict = void 0;
 var Action_1 = require("./Modi/Action");
 var Action_2 = require("./User/Action");
+var Action_3 = require("./UserEntityGrant/Action");
 exports.ActionDefDict = {
     modi: Action_1.ActionDefDict,
-    user: Action_2.ActionDefDict
+    user: Action_2.ActionDefDict,
+    userEntityGrant: Action_3.ActionDefDict
 };

package/lib/base-app-domain/EntityDict.d.ts

@@ -1,4 +1,5 @@
 import { EntityDef as ActionAuth } from "./ActionAuth/Schema";
+import { EntityDef as I18n } from "./I18n/Schema";
 import { EntityDef as Modi } from "./Modi/Schema";
 import { EntityDef as ModiEntity } from "./ModiEntity/Schema";
 import { EntityDef as Oper } from "./Oper/Schema";
@@ -10,6 +11,7 @@ import { EntityDef as UserEntityGrant } from "./UserEntityGrant/Schema";
 import { EntityDef as UserRelation } from "./UserRelation/Schema";
 export declare type EntityDict = {
     actionAuth: ActionAuth;
+    i18n: I18n;
     modi: Modi;
     modiEntity: ModiEntity;
     oper: Oper;

package/lib/base-app-domain/I18n/Schema.d.ts

@@ -0,0 +1,129 @@
+import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "../../types/Demand";
+import { OneOf } from "../../types/Polyfill";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult } from "../../types/Entity";
+import { ReadOnlyAction } from "../../actions/action";
+import { String } from "../../types/DataType";
+import { EntityShape } from "../../types/Entity";
+import * as ModiEntity from "../ModiEntity/Schema";
+import * as OperEntity from "../OperEntity/Schema";
+export declare type OpSchema = EntityShape & {
+    module: String<64>;
+    position: String<188>;
+    namespace: String<256>;
+    language: String<32>;
+    data: Object;
+};
+export declare type OpAttr = keyof OpSchema;
+export declare type Schema = EntityShape & {
+    module: String<64>;
+    position: String<188>;
+    namespace: String<256>;
+    language: String<32>;
+    data: Object;
+    modiEntity$entity?: Array<ModiEntity.Schema>;
+    modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
+    operEntity$entity?: Array<OperEntity.Schema>;
+    operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
+} & {
+    [A in ExpressionKey]?: any;
+};
+declare type AttrFilter = {
+    id: Q_StringValue;
+    $$createAt$$: Q_DateValue;
+    $$seq$$: Q_StringValue;
+    $$updateAt$$: Q_DateValue;
+    module: Q_StringValue;
+    position: Q_StringValue;
+    namespace: Q_StringValue;
+    language: Q_StringValue;
+    data: Object;
+    modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
+    operEntity$entity: OperEntity.Filter & SubQueryPredicateMetadata;
+};
+export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
+export declare type Projection = {
+    "#id"?: NodeId;
+    [k: string]: any;
+    id?: number;
+    $$createAt$$?: number;
+    $$updateAt$$?: number;
+    $$seq$$?: number;
+    module?: number;
+    position?: number;
+    namespace?: number;
+    language?: number;
+    data?: number | Object;
+    modiEntity$entity?: ModiEntity.Selection & {
+        $entity: "modiEntity";
+    };
+    modiEntity$entity$$aggr?: ModiEntity.Aggregation & {
+        $entity: "modiEntity";
+    };
+    operEntity$entity?: OperEntity.Selection & {
+        $entity: "operEntity";
+    };
+    operEntity$entity$$aggr?: OperEntity.Aggregation & {
+        $entity: "operEntity";
+    };
+} & Partial<ExprOp<OpAttr | string>>;
+declare type I18nIdProjection = OneOf<{
+    id: number;
+}>;
+export declare type SortAttr = {
+    id: number;
+} | {
+    $$createAt$$: number;
+} | {
+    $$seq$$: number;
+} | {
+    $$updateAt$$: number;
+} | {
+    module: number;
+} | {
+    position: number;
+} | {
+    namespace: number;
+} | {
+    language: number;
+} | {
+    [k: string]: any;
+} | OneOf<ExprOp<OpAttr | string>>;
+export declare type SortNode = {
+    $attr: SortAttr;
+    $direction?: "asc" | "desc";
+};
+export declare type Sorter = SortNode[];
+export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
+export declare type Selection<P extends Object = Projection> = SelectOperation<P>;
+export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
+export declare type CreateOperationData = FormCreateData<OpSchema> & {
+    modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
+    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
+};
+export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
+export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
+export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
+export declare type UpdateOperationData = FormUpdateData<OpSchema> & {
+    [k: string]: any;
+    modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
+    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
+};
+export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
+export declare type RemoveOperationData = {};
+export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
+export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
+export declare type I18nIdSubQuery = Selection<I18nIdProjection>;
+export declare type EntityDef = {
+    Schema: Schema;
+    OpSchema: OpSchema;
+    Action: OakMakeAction<ReadOnlyAction> | string;
+    Selection: Selection;
+    Aggregation: Aggregation;
+    Operation: Operation;
+    Create: CreateOperation;
+    Update: UpdateOperation;
+    Remove: RemoveOperation;
+    CreateSingle: CreateSingleOperation;
+    CreateMulti: CreateMultipleOperation;
+};
+export {};

package/lib/base-app-domain/I18n/Schema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/base-app-domain/I18n/Storage.d.ts

@@ -0,0 +1,3 @@
+import { StorageDesc } from "../../types/Storage";
+import { OpSchema } from "./Schema";
+export declare const desc: StorageDesc<OpSchema>;

package/lib/base-app-domain/I18n/Storage.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.desc = void 0;
+var action_1 = require("../../actions/action");
+exports.desc = {
+    attributes: {
+        module: {
+            notNull: true,
+            type: "varchar",
+            params: {
+                length: 64
+            }
+        },
+        position: {
+            notNull: true,
+            type: "varchar",
+            params: {
+                length: 188
+            }
+        },
+        namespace: {
+            notNull: true,
+            type: "varchar",
+            params: {
+                length: 256
+            }
+        },
+        language: {
+            notNull: true,
+            type: "varchar",
+            params: {
+                length: 32
+            }
+        },
+        data: {
+            notNull: true,
+            type: "object"
+        }
+    },
+    static: true,
+    actionType: "readOnly",
+    actions: action_1.readOnlyActions,
+    indexes: [
+        {
+            name: 'namespace_language',
+            attributes: [
+                {
+                    name: 'namespace'
+                },
+                {
+                    name: 'language'
+                }
+            ],
+            config: {
+                unique: true
+            }
+        }
+    ]
+};

package/lib/base-app-domain/Modi/Action.d.ts

@@ -3,8 +3,8 @@ import { GenericAction } from "../../actions/action";
 export declare type IState = 'active' | 'applied' | 'abandoned' | string;
 export declare type IAction = 'apply' | 'abandon' | string;
 export declare type ParticularAction = IAction;
-export declare type Action = GenericAction | ParticularAction | string;
 export declare const actions: string[];
+export declare type Action = GenericAction | ParticularAction | string;
 export declare const ActionDefDict: {
     iState: ActionDef<string, string>;
 };

package/lib/base-app-domain/Modi/Schema.d.ts

@@ -1,9 +1,9 @@
-import { String } from "../../types/DataType";
-import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
+import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
-import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult } from "../../types/Entity";
 import { Action, ParticularAction, IState } from "./Action";
+import { String } from "../../types/DataType";
+import { EntityShape } from "../../types/Entity";
 import * as ModiEntity from "../ModiEntity/Schema";
 export declare type OpSchema = EntityShape & {
     targetEntity: String<32>;
@@ -31,7 +31,7 @@ export declare type Schema = EntityShape & {
     [A in ExpressionKey]?: any;
 };
 declare type AttrFilter = {
-    id: Q_StringValue | SubQuery.ModiIdSubQuery;
+    id: Q_StringValue;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
@@ -43,6 +43,7 @@ declare type AttrFilter = {
     filter: Object;
     extra: Object;
     iState: Q_EnumValue<IState>;
+    modiEntity$modi: ModiEntity.Filter & SubQueryPredicateMetadata;
 };
 export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
 export declare type Projection = {
@@ -56,9 +57,9 @@ export declare type Projection = {
     entity?: number;
     entityId?: number;
     action?: number;
-    data?: number;
-    filter?: number;
-    extra?: number;
+    data?: number | Object;
+    filter?: number | Object;
+    extra?: number | Object;
     iState?: number;
     modiEntity$modi?: ModiEntity.Selection & {
         $entity: "modiEntity";
@@ -97,7 +98,7 @@ export declare type SortNode = {
 };
 export declare type Sorter = SortNode[];
 export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
-export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
+export declare type Selection<P extends Object = Projection> = SelectOperation<P>;
 export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
 export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
     entity?: string;