oak-domain 3.0.2 → 3.0.4

package/lib/types/Demand.d.ts

@@ -1,12 +1,12 @@
 import { RefOrExpression } from "./Expression";
 import { OneOf } from "./Polyfill";
 export declare const EXPRESSION_PREFIX = "$expr";
-export declare type NodeId = `node-${number}`;
-export declare type ExpressionKey = '$expr' | '$expr1' | '$expr2' | '$expr3' | '$expr4' | '$expr5' | '$expr6' | '$expr7' | '$expr8' | '$expr9' | '$expr10' | '$expr11' | '$expr12' | '$expr13' | '$expr14' | '$expr15' | '$expr16' | '$expr17' | '$expr18' | '$expr19' | '$expr20';
-export declare type ExprOp<A> = {
+export type NodeId = `node-${number}`;
+export type ExpressionKey = '$expr' | '$expr1' | '$expr2' | '$expr3' | '$expr4' | '$expr5' | '$expr6' | '$expr7' | '$expr8' | '$expr9' | '$expr10' | '$expr11' | '$expr12' | '$expr13' | '$expr14' | '$expr15' | '$expr16' | '$expr17' | '$expr18' | '$expr19' | '$expr20';
+export type ExprOp<A> = {
     [K in ExpressionKey]: RefOrExpression<A>;
 };
-export declare type Q_NumberComparisonValue = number | OneOf<{
+export type Q_NumberComparisonValue = number | OneOf<{
     $gt: number;
     $lt: number;
     $gte: number;
@@ -17,7 +17,7 @@ export declare type Q_NumberComparisonValue = number | OneOf<{
     $nin: number[];
     $between: [number, number];
 }>;
-export declare type Q_StringComparisonValue = string | OneOf<{
+export type Q_StringComparisonValue = string | OneOf<{
     $gt: string;
     $lt: string;
     $gte: string;
@@ -30,58 +30,58 @@ export declare type Q_StringComparisonValue = string | OneOf<{
     $in: string[];
     $nin: string[];
 }>;
-export declare type Q_BooleanComparisonValue = boolean;
-export declare type Q_DateComparisonValue = Q_NumberComparisonValue;
-export declare type Q_EnumComparisonValue<E> = E | OneOf<{
+export type Q_BooleanComparisonValue = boolean;
+export type Q_DateComparisonValue = Q_NumberComparisonValue;
+export type Q_EnumComparisonValue<E> = E | OneOf<{
     $in: E[];
     $nin: E[];
     $ne: E;
 }>;
-export declare type Q_ExistsValue = {
+export type Q_ExistsValue = {
     $exists: boolean;
 };
-export declare type Q_NumberValue = Q_NumberComparisonValue | Q_ExistsValue;
-export declare type Q_StringValue = Q_StringComparisonValue | Q_ExistsValue;
-export declare type Q_BooleanValue = Q_BooleanComparisonValue | Q_ExistsValue;
-export declare type Q_DateValue = Q_DateComparisonValue | Q_ExistsValue;
-export declare type Q_EnumValue<E> = Q_EnumComparisonValue<E> | Q_ExistsValue;
-export declare type Q_State<S> = S | {
+export type Q_NumberValue = Q_NumberComparisonValue | Q_ExistsValue;
+export type Q_StringValue = Q_StringComparisonValue | Q_ExistsValue;
+export type Q_BooleanValue = Q_BooleanComparisonValue | Q_ExistsValue;
+export type Q_DateValue = Q_DateComparisonValue | Q_ExistsValue;
+export type Q_EnumValue<E> = Q_EnumComparisonValue<E> | Q_ExistsValue;
+export type Q_State<S> = S | {
     $in: S[];
 } | {
     $nin: S[];
 } | Q_ExistsValue;
-export declare type Q_FullTextValue = {
+export type Q_FullTextValue = {
     $search: string;
     $language?: 'zh_CN' | 'en_US';
 };
-export declare type Q_FullTextKey = '$text';
-export declare type FulltextFilter = {
+export type Q_FullTextKey = '$text';
+export type FulltextFilter = {
     [F in Q_FullTextKey]?: Q_FullTextValue;
 };
-declare type Q_LogicKey = '$and' | '$or';
-declare type Q_LinearLogicKey = '$not';
-export declare type MakeFilterWrapper<F extends Object> = {
+type Q_LogicKey = '$and' | '$or';
+type Q_LinearLogicKey = '$not';
+export type MakeFilterWrapper<F extends Object> = {
     [Q in Q_LogicKey]?: Array<MakeFilterWrapper<F>>;
 } & {
     [Q in Q_LinearLogicKey]?: MakeFilterWrapper<F>;
 } & Partial<F>;
-export declare type MakeFilter<F extends Object> = {
+export type MakeFilter<F extends Object> = {
     '#id'?: NodeId;
 } & MakeFilterWrapper<F>;
-export declare type RefAttr<A> = {
+export type RefAttr<A> = {
     '#attr': A;
 } | {
     '#refId': NodeId;
     '#refAttr': string;
 };
 export declare function isRefAttrNode<A>(node: any): node is RefAttr<A>;
-export declare type JsonFilter<O extends any> = O extends Array<infer P> ? (JsonFilter<P> | undefined)[] | {
+export type JsonFilter<O extends any> = O extends Array<infer P> ? (JsonFilter<P> | undefined)[] | {
     $contains?: P | P[];
     $overlaps?: P | P[];
 } : O extends number ? Q_NumberValue : O extends string ? Q_StringValue : O extends boolean ? Q_BooleanValue : O extends Record<string, any> ? {
     [A in keyof O]?: JsonFilter<O[A]>;
 } : never;
-export declare type SubQueryPredicateMetadata = {
+export type SubQueryPredicateMetadata = {
     '#sqp'?: 'in' | 'not in' | 'all' | 'not all';
 };
 export declare const SUB_QUERY_PREDICATE_KEYWORD = "#sqp";

package/lib/types/Endpoint.d.ts

@@ -8,4 +8,4 @@ export interface EndpointItem<ED extends EntityDict, BackCxt extends AsyncContex
     method: 'get' | 'post' | 'put' | 'delete';
     fn: (context: BackCxt, params: Record<string, string>, headers: IncomingHttpHeaders, req: IncomingMessage, body?: any) => Promise<any>;
 }
-export declare type Endpoint<ED extends EntityDict, BackCxt extends AsyncContext<ED>> = EndpointItem<ED, BackCxt> | EndpointItem<ED, BackCxt>[];
+export type Endpoint<ED extends EntityDict, BackCxt extends AsyncContext<ED>> = EndpointItem<ED, BackCxt> | EndpointItem<ED, BackCxt>[];

package/lib/types/Entity.d.ts

@@ -1,59 +1,61 @@
 import { ReadOnlyAction } from '../actions/action';
 import { PrimaryKey, Sequence } from './DataType';
-declare type TriggerDataAttributeType = '$$triggerData$$';
-declare type TriggerTimestampAttributeType = '$$triggerTimestamp$$';
-declare type PrimaryKeyAttributeType = 'id';
-declare type CreateAtAttributeType = '$$createAt$$';
-declare type UpdateAtAttributeType = '$$updateAt$$';
-declare type DeleteAtAttributeType = '$$deleteAt$$';
-declare type SeqAttributeType = '$$seq$$';
+type TriggerDataAttributeType = '$$triggerData$$';
+type TriggerUuidAttributeType = '$$triggerUuid$$';
+type PrimaryKeyAttributeType = 'id';
+type CreateAtAttributeType = '$$createAt$$';
+type UpdateAtAttributeType = '$$updateAt$$';
+type DeleteAtAttributeType = '$$deleteAt$$';
+type SeqAttributeType = '$$seq$$';
 export declare const TriggerDataAttribute = "$$triggerData$$";
-export declare const TriggerTimestampAttribute = "$$triggerTimestamp$$";
+export declare const TriggerUuidAttribute = "$$triggerUuid$$";
 export declare const PrimaryKeyAttribute = "id";
 export declare const CreateAtAttribute = "$$createAt$$";
 export declare const UpdateAtAttribute = "$$updateAt$$";
 export declare const DeleteAtAttribute = "$$deleteAt$$";
 export declare const SeqAttribute = "$$seq$$";
-export declare type InstinctiveAttributes = PrimaryKeyAttributeType | CreateAtAttributeType | UpdateAtAttributeType | DeleteAtAttributeType | TriggerDataAttributeType | TriggerTimestampAttributeType | SeqAttributeType;
+export type InstinctiveAttributes = PrimaryKeyAttributeType | CreateAtAttributeType | UpdateAtAttributeType | DeleteAtAttributeType | TriggerDataAttributeType | SeqAttributeType | TriggerUuidAttributeType;
 export declare const initinctiveAttributes: string[];
-declare type FilterPart<A extends string, F extends Object | undefined> = {
+type FilterPart<A extends string, F extends Object | undefined> = {
     filter?: A extends 'create' ? undefined : F;
     indexFrom?: A extends 'create' ? undefined : number;
     count?: A extends 'create' ? undefined : number;
 };
-export declare type SelectOption = {
+export type SelectOption = {
     dontCollect?: boolean;
     blockTrigger?: true;
     obscure?: boolean;
     forUpdate?: true;
     includedDeleted?: true;
-    ignoreForeignKeyMiss?: true;
+    ignoreAttrMiss?: true;
     dummy?: 1;
 };
-export declare type OperateOption = {
+export type OperateOption = {
     blockTrigger?: true;
     dontCollect?: boolean;
     dontCreateOper?: boolean;
     dontCreateModi?: boolean;
+    includedDeleted?: true;
     allowExists?: boolean;
     modiParentId?: string;
     modiParentEntity?: string;
     deletePhysically?: boolean;
+    applyingModi?: boolean;
     dummy?: 1;
 };
-export declare type FormUpdateData<SH extends GeneralEntityShape> = Partial<{
-    [K in keyof Omit<SH, InstinctiveAttributes>]: SH[K] | null;
+export type FormUpdateData<SH extends GeneralEntityShape> = Partial<{
+    [K in keyof Omit<SH, "id" | "$$createAt$$" | "$$seq$$">]: SH[K] | null;
 }>;
-export declare type FormCreateData<SH extends GeneralEntityShape> = Partial<Omit<SH, InstinctiveAttributes>> & {
+export type FormCreateData<SH extends GeneralEntityShape> = Partial<SH> & {
     id: string;
 };
-export declare type Operation<A extends string, D extends Projection, F extends Filter | undefined = undefined, S extends Sorter | undefined = undefined> = {
+export type Operation<A extends string, D extends Projection, F extends Filter | undefined = undefined, S extends Sorter | undefined = undefined> = {
     id: string;
     action: A;
     data: D;
     sorter?: S;
 } & FilterPart<A, F>;
-export declare type Selection<A extends ReadOnlyAction, D extends Projection, F extends Filter | undefined = undefined, S extends Sorter | undefined = undefined> = {
+export type Selection<A extends ReadOnlyAction, D extends Projection, F extends Filter | undefined = undefined, S extends Sorter | undefined = undefined> = {
     id?: string;
     action?: A;
     data: D;
@@ -71,7 +73,7 @@ export interface EntityShape {
 export interface GeneralEntityShape extends EntityShape {
     [K: string]: any;
 }
-export declare type MakeAction<A extends string> = A;
+export type MakeAction<A extends string> = A;
 export interface EntityDef {
     Schema: GeneralEntityShape;
     OpSchema: GeneralEntityShape;
@@ -93,79 +95,79 @@ export interface EntityDict {
 export interface OtmSubProjection extends Omit<Operation<'select', any, any, any>, 'action'> {
     $entity: string;
 }
-export declare type AggregationOp = `#max-${number}` | `#min-${number}` | `#avg-${number}` | `#count-${number}` | `#sum-${number}`;
-export declare type DeduceAggregationData<P extends Projection> = {
+export type AggregationOp = `#max-${number}` | `#min-${number}` | `#avg-${number}` | `#count-${number}` | `#sum-${number}`;
+export type DeduceAggregationData<P extends Projection> = {
     [A in AggregationOp]?: P;
 } & {
     '#aggr'?: P;
 };
-export declare type AggregationResult<SH extends GeneralEntityShape> = Array<{
+export type AggregationResult<SH extends GeneralEntityShape> = Array<{
     [A in AggregationOp]?: number | string;
 } & {
     '#data'?: Partial<SH>;
 }>;
-export declare type AttrFilter<SH extends GeneralEntityShape> = {
+export type AttrFilter<SH extends GeneralEntityShape> = {
     [K in keyof SH]?: any;
 };
-declare type SortAttr = {
+type SortAttr = {
     [K: string]: any;
 };
-declare type SorterItem = {
+type SorterItem = {
     $attr: SortAttr;
     $direction?: "asc" | "desc";
 };
-declare type Sorter = Array<SorterItem>;
-declare type Filter = {
+type Sorter = Array<SorterItem>;
+type Filter = {
     [K: string]: any;
 };
-declare type Projection = {
+type Projection = {
     [K: string]: any;
 };
-export declare type DeduceAggregation<P extends Projection, F extends Filter, S extends Sorter> = Omit<Selection<'aggregate', DeduceAggregationData<P>, F, S>, 'action'>;
-declare type CreateOperationData = {
+export type DeduceAggregation<P extends Projection, F extends Filter, S extends Sorter> = Omit<Selection<'aggregate', DeduceAggregationData<P>, F, S>, 'action'>;
+type CreateOperationData = {
     id: string;
     [K: string]: any;
 };
-declare type CreateSingleOperation = Operation<'create', CreateOperationData, undefined, undefined>;
-declare type CreateMultipleOperation = Operation<'create', Array<CreateOperationData>, undefined, undefined>;
-declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-declare type UpdateOperationData = {
+type CreateSingleOperation = Operation<'create', CreateOperationData, undefined, undefined>;
+type CreateMultipleOperation = Operation<'create', Array<CreateOperationData>, undefined, undefined>;
+type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
+type UpdateOperationData = {
     id?: never;
     [k: string]: any;
 };
-export declare type UpdateOperation = Operation<string, UpdateOperationData, Filter, Sorter>;
-declare type RemoveOperationData = {
+export type UpdateOperation = Operation<string, UpdateOperationData, Filter, Sorter>;
+type RemoveOperationData = {
     [k: string]: any;
 };
-export declare type RemoveOperation = Operation<'remove', RemoveOperationData, Filter, Sorter>;
-export declare type CUDOperation = CreateOperation | UpdateOperation | RemoveOperation;
-export declare type CreateOpResult<ED extends EntityDict, T extends keyof ED> = {
+export type RemoveOperation = Operation<'remove', RemoveOperationData, Filter, Sorter>;
+export type CUDOperation = CreateOperation | UpdateOperation | RemoveOperation;
+export type CreateOpResult<ED extends EntityDict, T extends keyof ED> = {
     a: 'c';
     e: T;
     d: ED[T]['OpSchema'] | ED[T]['OpSchema'][];
 };
-export declare type UpdateOpResult<ED extends EntityDict, T extends keyof ED> = {
+export type UpdateOpResult<ED extends EntityDict, T extends keyof ED> = {
     a: 'u';
     e: T;
     d: UpdateOperationData;
     f?: Filter;
 };
-export declare type RemoveOpResult<ED extends EntityDict, T extends keyof ED> = {
+export type RemoveOpResult<ED extends EntityDict, T extends keyof ED> = {
     a: 'r';
     e: T;
     f?: Filter;
 };
-export declare type RelationHierarchy<R extends string> = {
+export type RelationHierarchy<R extends string> = {
     [K in R]?: R[];
 };
-export declare type CascadeRelationItem = {
+export type CascadeRelationItem = {
     cascadePath: string;
     relations?: string[];
 };
-export declare type CascadeRelationAuth<R extends string> = {
+export type CascadeRelationAuth<R extends string> = {
     [K in R]?: CascadeRelationItem | (CascadeRelationItem | CascadeRelationItem[])[];
 };
-export declare type SelectOpResult<ED extends EntityDict> = {
+export type SelectOpResult<ED extends EntityDict> = {
     a: 's';
     d: {
         [T in keyof ED]?: {
@@ -173,21 +175,28 @@ export declare type SelectOpResult<ED extends EntityDict> = {
         };
     };
 };
-export declare type OpRecord<ED extends EntityDict> = CreateOpResult<ED, keyof ED> | UpdateOpResult<ED, keyof ED> | RemoveOpResult<ED, keyof ED> | SelectOpResult<ED>;
-export declare type OperationResult<ED extends EntityDict> = {
+export type OpRecord<ED extends EntityDict> = CreateOpResult<ED, keyof ED> | UpdateOpResult<ED, keyof ED> | RemoveOpResult<ED, keyof ED> | SelectOpResult<ED>;
+export type OperationResult<ED extends EntityDict> = {
     [K in keyof ED]?: {
         [A in ED[K]['Action']]?: number;
     };
 };
-export declare type ActionType = 'readOnly' | 'appendOnly' | 'excludeUpdate' | 'excludeRemove' | 'crud';
-export declare type Configuration = {
+export type ActionType = 'readOnly' | 'appendOnly' | 'excludeUpdate' | 'excludeRemove' | 'crud';
+export type Configuration = {
     actionType?: ActionType;
     static?: boolean;
 };
-export declare type AuthCascadePath<ED extends EntityDict> = [keyof ED, string, keyof ED, boolean];
-export declare type AuthDeduceRelationMap<ED extends EntityDict> = {
+export type AuthDeduceRelationMap<ED extends EntityDict> = {
     [T in keyof ED]?: keyof ED[T]['OpSchema'];
 };
-export declare type SelectFreeEntities<ED extends EntityDict> = (keyof ED)[];
-export declare type OtmKey<K extends string> = K | `${K}$${number}`;
+export type SelectFreeEntities<ED extends EntityDict> = (keyof ED)[];
+export type UpdateFreeDict<ED extends EntityDict> = {
+    [A in keyof ED]?: string[];
+};
+export type OtmKey<K extends string> = K | `${K}$${number}`;
+export interface SubDataDef<ED extends EntityDict, T extends keyof ED> {
+    id: string;
+    entity: T;
+    filter: ED[T]['Selection']['filter'];
+}
 export {};

package/lib/types/Entity.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initinctiveAttributes = exports.SeqAttribute = exports.DeleteAtAttribute = exports.UpdateAtAttribute = exports.CreateAtAttribute = exports.PrimaryKeyAttribute = exports.TriggerTimestampAttribute = exports.TriggerDataAttribute = void 0;
+exports.initinctiveAttributes = exports.SeqAttribute = exports.DeleteAtAttribute = exports.UpdateAtAttribute = exports.CreateAtAttribute = exports.PrimaryKeyAttribute = exports.TriggerUuidAttribute = exports.TriggerDataAttribute = void 0;
 exports.TriggerDataAttribute = '$$triggerData$$';
-exports.TriggerTimestampAttribute = '$$triggerTimestamp$$';
+exports.TriggerUuidAttribute = '$$triggerUuid$$';
 exports.PrimaryKeyAttribute = 'id';
 exports.CreateAtAttribute = '$$createAt$$';
 exports.UpdateAtAttribute = '$$updateAt$$';
 exports.DeleteAtAttribute = '$$deleteAt$$';
 exports.SeqAttribute = '$$seq$$';
-exports.initinctiveAttributes = [exports.PrimaryKeyAttribute, exports.TriggerDataAttribute, exports.TriggerTimestampAttribute, exports.CreateAtAttribute, exports.UpdateAtAttribute, exports.DeleteAtAttribute, exports.SeqAttribute];
+exports.initinctiveAttributes = [exports.PrimaryKeyAttribute, exports.TriggerDataAttribute, exports.TriggerUuidAttribute, exports.CreateAtAttribute, exports.UpdateAtAttribute, exports.DeleteAtAttribute, exports.SeqAttribute];
+;
 ;
 ;
 ;

package/lib/types/EntityDesc.d.ts

@@ -1,8 +1,9 @@
 import { LocaleDef } from './Locale';
 import { Index } from './Storage';
 import { EntityShape, Configuration } from './Entity';
-export declare type EntityDesc<Schema extends EntityShape, Action extends string = '', Relation extends string = '', V extends Record<string, string> = {}> = {
+export type EntityDesc<Schema extends EntityShape, Action extends string = '', Relation extends string = '', V extends Record<string, string> = {}> = {
     locales: LocaleDef<Schema, Action, Relation, V>;
     indexes?: Index<Schema>[];
     configuration?: Configuration;
+    recursiveDepth?: number;
 };

package/lib/types/Environment.d.ts

@@ -1,4 +1,4 @@
-export declare type WechatMpEnv = {
+export type WechatMpEnv = {
     type: 'wechatMp';
     brand: string;
     model: string;
@@ -33,7 +33,7 @@ export declare type WechatMpEnv = {
     deviceOrientation: 'portrait' | 'landscape';
     localStorageEnabled: true;
 };
-export declare type WebEnv = {
+export type WebEnv = {
     type: 'web';
     visitorId: string;
     platform: {
@@ -51,7 +51,7 @@ export declare type WebEnv = {
     language: string;
     localStorageEnabled: boolean;
 };
-export declare type ServerEnv = {
+export type ServerEnv = {
     type: 'server';
 };
-export declare type Environment = WechatMpEnv | WebEnv | ServerEnv;
+export type Environment = WechatMpEnv | WebEnv | ServerEnv;

package/lib/types/Exception.d.ts

@@ -43,10 +43,18 @@ export declare class OakRowUnexistedException<ED extends EntityDict> extends Oak
         selection: any;
     }[];
 }
-export declare class OakExternalException extends Error {
-}
+/**
+ * 可接受的、由用户操作造成的异常
+ */
 export declare class OakUserException<ED extends EntityDict> extends OakException<ED> {
 }
+/**
+ * 网络中断异常
+ */
+export declare class OakNetworkException<ED extends EntityDict> extends OakException<ED> {
+}
+export declare class OakServerProxyException<ED extends EntityDict> extends OakException<ED> {
+}
 /**
  * 数据不一致异常，系统认为现有的数据不允许相应的动作时抛此异常
  *
@@ -67,6 +75,9 @@ export declare class OakInputIllegalException<ED extends EntityDict> extends Oak
     addAttributesPrefix(prefix: string): void;
     toString(): string;
 }
+/**
+ * 属性为空时抛的异常
+ */
 export declare class OakAttrNotNullException<ED extends EntityDict> extends OakInputIllegalException<ED> {
     constructor(entity: keyof ED, attributes: string[], message?: string);
 }
@@ -75,6 +86,11 @@ export declare class OakAttrNotNullException<ED extends EntityDict> extends OakI
  */
 export declare class OakUserUnpermittedException<ED extends EntityDict> extends OakUserException<ED> {
 }
+/**
+ * 用户查询权限不够抛出异常
+ */
+export declare class OakUserInvisibleException<ED extends EntityDict> extends OakUserException<ED> {
+}
 /**
  * 用户未登录抛的异常
  */
@@ -98,15 +114,31 @@ export declare class OakCongruentRowExists<ED extends EntityDict, T extends keyo
     getEntity(): T;
     toString(): string;
 }
+/**
+ * 死锁抛的异常
+ */
 export declare class OakDeadlock<ED extends EntityDict> extends OakUserException<ED> {
     constructor(message?: string | undefined);
 }
+/**
+ * 前置条件不满足抛的异常
+ */
 export declare class OakPreConditionUnsetException<ED extends EntityDict> extends OakUserException<ED> {
     entity?: keyof ED;
     code?: string;
     constructor(message?: string | undefined, entity?: keyof ED | undefined, code?: string | undefined);
     toString(): string;
 }
+/**
+ * 调用外部接口抛出的异常
+ */
+export declare class OakExternalException<ED extends EntityDict> extends OakUserException<ED> {
+    code?: string;
+    source: string;
+    data?: any;
+    constructor(source: string, code?: string, message?: string, data?: any);
+    toString(): string;
+}
 export declare function makeException<ED extends EntityDict>(data: {
     name: string;
     message?: string;