oak-domain 5.0.6 → 5.0.8

package/lib/store/IntrinsicCheckers.js

@@ -340,7 +340,6 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                     }
                 }
                 if (f) {
-                    const rr = (0, filter_1.contains)(entity, context.getSchema(), data, f);
                     const result = (0, filter_1.checkFilterContains)(entity, context, f, filter, true);
                     if (result instanceof Promise) {
                         return result.then((v) => {

package/lib/store/RelationAuth.js

@@ -475,7 +475,7 @@ class RelationAuth {
         // extraFilter?: ED[T2]['Selection']['filter'],
         path, child, hasParent, extraFilter) => {
             const { action, data, filter } = operation;
-            const filter2 = action === 'create' ? makeCreateFilter(entity, operation) : (0, lodash_1.cloneDeep)(filter);
+            const filter2 = action === 'create' ? makeCreateFilter(entity, operation) : filter ? (0, lodash_1.cloneDeep)(filter) : {};
             (0, assert_1.default)(filter2);
             if (extraFilter) {
                 Object.assign(filter2, extraFilter);

package/lib/types/Exception.d.ts

@@ -15,21 +15,6 @@ export declare class OakMakeSureByMySelfException<ED extends EntityDict> extends
 }
 export declare class OakDataException<ED extends EntityDict> extends OakException<ED> {
 }
-export declare class OakUniqueViolationException<ED extends EntityDict> extends OakException<ED> {
-    rows: Array<{
-        id?: string;
-        attrs: string[];
-    }>;
-    constructor(rows: Array<{
-        id?: string;
-        attrs: string[];
-    }>, message?: string);
-}
-export declare class OakImportDataParseException<ED extends EntityDict> extends OakException<ED> {
-    line: number;
-    header?: string;
-    constructor(message: string, line: number, header?: string);
-}
 export declare class OakNoRelationDefException<ED extends EntityDict, T extends keyof ED> extends OakDataException<ED> {
     entity: T;
     actions: ED[T]['Action'][];
@@ -55,6 +40,21 @@ export declare class OakRowUnexistedException<ED extends EntityDict> extends Oak
  */
 export declare class OakUserException<ED extends EntityDict> extends OakException<ED> {
 }
+export declare class OakUniqueViolationException<ED extends EntityDict> extends OakUserException<ED> {
+    rows: Array<{
+        id?: string;
+        attrs: string[];
+    }>;
+    constructor(rows: Array<{
+        id?: string;
+        attrs: string[];
+    }>, message?: string);
+}
+export declare class OakImportDataParseException<ED extends EntityDict> extends OakUserException<ED> {
+    line: number;
+    header?: string;
+    constructor(message: string, line: number, header?: string);
+}
 /**
  * 网络中断异常
  */

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakDataException = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
+exports.makeException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
 class OakException extends Error {
     opRecords;
     constructor(message) {
@@ -51,25 +51,6 @@ exports.OakMakeSureByMySelfException = OakMakeSureByMySelfException;
 class OakDataException extends OakException {
 }
 exports.OakDataException = OakDataException;
-class OakUniqueViolationException extends OakException {
-    rows;
-    constructor(rows, message) {
-        super(message || '您更新的数据违反了唯一性约束');
-        this.rows = rows;
-    }
-}
-exports.OakUniqueViolationException = OakUniqueViolationException;
-class OakImportDataParseException extends OakException {
-    line;
-    header;
-    // message必传，描述具体错误的数据内容
-    constructor(message, line, header) {
-        super(message);
-        this.line = line;
-        this.header = header;
-    }
-}
-exports.OakImportDataParseException = OakImportDataParseException;
 class OakNoRelationDefException extends OakDataException {
     entity;
     actions;
@@ -117,6 +98,25 @@ class OakUserException extends OakException {
 }
 exports.OakUserException = OakUserException;
 ;
+class OakUniqueViolationException extends OakUserException {
+    rows;
+    constructor(rows, message) {
+        super(message || '您更新的数据违反了唯一性约束');
+        this.rows = rows;
+    }
+}
+exports.OakUniqueViolationException = OakUniqueViolationException;
+class OakImportDataParseException extends OakUserException {
+    line;
+    header;
+    // message必传，描述具体错误的数据内容
+    constructor(message, line, header) {
+        super(message);
+        this.line = line;
+        this.header = header;
+    }
+}
+exports.OakImportDataParseException = OakImportDataParseException;
 /**
  * 网络中断异常
  */

package/lib/utils/executor.d.ts

@@ -0,0 +1,5 @@
+/**
+ *
+ * @param units 各个执行单元，需要流水线执行，可能是同步也可能是异步
+ */
+export declare function pipeline(...units: Array<(result?: any) => any>): any;

package/lib/utils/executor.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pipeline = void 0;
+/**
+ *
+ * @param units 各个执行单元，需要流水线执行，可能是同步也可能是异步
+ */
+function pipeline(...units) {
+    const exec = (idx, resultPrev) => {
+        const unit = units[idx];
+        if (!unit) {
+            return resultPrev;
+        }
+        const result = unit(resultPrev);
+        if (result instanceof Promise) {
+            return result.then((resultSync) => exec(idx + 1, resultSync));
+        }
+        return exec(idx + 1, result);
+    };
+    return exec(0);
+}
+exports.pipeline = pipeline;

package/lib/utils/money.d.ts

@@ -2,5 +2,5 @@ declare const ToCent: (float: number) => number;
 declare const ToYuan: (int: number) => number;
 declare const StringToCent: (value: string, allowNegative?: true) => number | undefined;
 declare const CentToString: (value: number, fixed?: number) => string | undefined;
-declare const ThousandCont: (value: number, decimalPlaces?: number) => string | undefined;
+declare const ThousandCont: (value: number | string, decimalPlaces?: number) => string | undefined;
 export { ToCent, ToYuan, StringToCent, CentToString, ThousandCont };

package/lib/utils/money.js

@@ -23,7 +23,7 @@ const CentToString = (value, fixed) => {
 };
 exports.CentToString = CentToString;
 const ThousandCont = (value, decimalPlaces) => {
-    let value1 = `${value}`;
+    let value1 = typeof value === 'number' ? `${value}` : value;
     const numArr = value1.split('.');
     value1 = numArr[0];
     let result = '';

package/lib/utils/uuid.d.ts

@@ -15,3 +15,5 @@ export declare function generateNewId(): string;
  * @param: input: 输入的数据数组，应保证唯一性
  */
 export declare function formUuid(...input: string[]): string;
+export declare function compressTo32(uuid: string): string;
+export declare function decompressFrom32(compressed: string): string;

package/lib/utils/uuid.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formUuid = exports.generateNewId = exports.setGenerateIdOption = exports.produceIds = exports.generateNewIdAsync = exports.expandUuidTo36Bytes = exports.shrinkUuidTo32Bytes = exports.sequentialUuid = void 0;
+exports.decompressFrom32 = exports.compressTo32 = exports.formUuid = exports.generateNewId = exports.setGenerateIdOption = exports.produceIds = exports.generateNewIdAsync = exports.expandUuidTo36Bytes = exports.shrinkUuidTo32Bytes = exports.sequentialUuid = void 0;
 const uuid_1 = require("uuid");
 const random_1 = require("./random/random");
 let _nodeId;
@@ -216,3 +216,17 @@ function formUuid(...input) {
     return unsafeStringify(b);
 }
 exports.formUuid = formUuid;
+function compressTo32(uuid) {
+    return uuid.replace(/-/g, '');
+}
+exports.compressTo32 = compressTo32;
+function decompressFrom32(compressed) {
+    return [
+        compressed.slice(0, 8),
+        compressed.slice(8, 12),
+        compressed.slice(12, 16),
+        compressed.slice(16, 20),
+        compressed.slice(20)
+    ].join('-');
+}
+exports.decompressFrom32 = decompressFrom32;

package/package.json

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