oak-domain 5.0.5 → 5.0.7

package/lib/compiler/schemalBuilder.js

@@ -572,51 +572,54 @@ function analyzeImportDeclaration(node, referencedSchemas, additionalImports, fi
  * @param filename
  * @returns
  */
-function searchImportedPath(path, fileSpecifierPath, filename) {
-    const cwd = process.cwd();
-    const fileSpecifierPaths = fileSpecifierPath.split('/');
-    const moduleName = fileSpecifierPaths[0] || fileSpecifierPaths[1];
-    (0, assert_1.default)(moduleName);
-    // 找到path路径对应的最近package.json
-    const paths = path.split('/');
-    for (let iter = paths.length; iter >= 0; iter--) {
-        const paths2 = paths.slice(0, iter);
-        const pkgJsonPath = path_1.default.join(cwd, ...paths2, 'package.json');
-        if ((0, fs_1.existsSync)(pkgJsonPath)) {
-            const pkgJson = require(pkgJsonPath);
-            if (pkgJson.dependencies?.hasOwnProperty(moduleName)) {
-                const dependentPath = pkgJson.dependencies[moduleName];
-                if (dependentPath.trimStart().startsWith('file:')) {
-                    const dependentFilePath = dependentPath.trimStart().slice(5);
-                    return path_1.default.join(pkgJsonPath, '..', dependentFilePath, ...(fileSpecifierPaths[0] ? fileSpecifierPaths.slice(1) : (fileSpecifierPaths.slice(2))));
-                }
-                else {
-                    return path_1.default.join(pkgJsonPath, '..', 'node_modules', fileSpecifierPath);
+function getImportedFilePath(path, fileSpecifierPath, filename) {
+    let importedFilepath = '';
+    const getExistedFileName = () => {
+        if ((0, fs_1.existsSync)(`${importedFilepath}.ts`)) {
+            return `${importedFilepath}.ts`;
+        }
+        else if ((0, fs_1.existsSync)(`${importedFilepath}.d.ts`)) {
+            return `${importedFilepath}.d.ts`;
+        }
+        return '';
+    };
+    if (fileSpecifierPath.startsWith('.')) {
+        importedFilepath = path_1.default.join(process.cwd(), path, fileSpecifierPath);
+        const importedFilename = getExistedFileName();
+        (0, assert_1.default)(importedFilename, `「${filename}」中import路径${fileSpecifierPath}找不到对应的声明`);
+        return importedFilename;
+    }
+    else {
+        const cwd = process.cwd();
+        const fileSpecifierPaths = fileSpecifierPath.split('/');
+        const moduleName = fileSpecifierPaths[0] || fileSpecifierPaths[1];
+        (0, assert_1.default)(moduleName);
+        // 从path向外找package.json -> node_modules直至找到fileSpecifier
+        const paths = path.split('/');
+        for (let iter = paths.length; iter >= 0; iter--) {
+            const paths2 = paths.slice(0, iter);
+            const pkgJsonPath = path_1.default.join(cwd, ...paths2, 'package.json');
+            if ((0, fs_1.existsSync)(pkgJsonPath)) {
+                const pkgJson = require(pkgJsonPath);
+                if (pkgJson.dependencies?.hasOwnProperty(moduleName)) {
+                    const dependentPath = pkgJson.dependencies[moduleName];
+                    if (dependentPath.trimStart().startsWith('file:')) {
+                        const dependentFilePath = dependentPath.trimStart().slice(5);
+                        importedFilepath = path_1.default.join(pkgJsonPath, '..', dependentFilePath, ...(fileSpecifierPaths[0] ? fileSpecifierPaths.slice(1) : (fileSpecifierPaths.slice(2))));
+                    }
+                    else {
+                        importedFilepath = path_1.default.join(pkgJsonPath, '..', 'node_modules', fileSpecifierPath);
+                    }
+                    const importedFilename = getExistedFileName();
+                    if (importedFilename) {
+                        return importedFilename;
+                    }
                 }
             }
         }
     }
     (0, assert_1.default)(false, `「${filename}」中import路径${fileSpecifierPath}找不到对应的声明`);
 }
-/**
- * 获得import的某个文件的绝对路径
- * @param path
- * @param fileSpecifierPath
- * @returns
- */
-function getImportedFilePath(path, fileSpecifierPath, filename) {
-    let importedFilename = fileSpecifierPath.startsWith('.') ? path_1.default.join(process.cwd(), path, fileSpecifierPath) : searchImportedPath(path, fileSpecifierPath, filename);
-    if ((0, fs_1.existsSync)(`${importedFilename}.ts`)) {
-        return `${importedFilename}.ts`;
-    }
-    else if ((0, fs_1.existsSync)(`${importedFilename}.d.ts`)) {
-        return `${importedFilename}.d.ts`;
-    }
-    else {
-        // 目前不可能引用js文件
-        (0, assert_1.default)(false, `「${filename}」import路径${fileSpecifierPath}找不到对应的文件`);
-    }
-}
 function analyzeSchemaDefinition(node, moduleName, filename, path, program, referencedSchemas, schemaAttrs, enumAttributes, importAttrFrom, relativePath) {
     let hasEntityAttr = false;
     let hasEntityIdAttr = false;

package/lib/store/AsyncRowStore.js

@@ -92,7 +92,7 @@ class AsyncContext {
                 (0, assert_1.default)(!action_1.readOnlyActions.includes(action));
                 this.opRecords.push({
                     id,
-                    a: 'u',
+                    a: action,
                     e: entity,
                     d: data,
                     f: filter,

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/store/checker.js

@@ -63,7 +63,7 @@ function translateCheckerInAsyncContext(checker, schema) {
                                 dontCollect: true,
                                 blockTrigger: true,
                             });
-                            const e = new Exception_1.OakRowInconsistencyException(undefined, errMsg);
+                            const e = new Exception_1.OakRowInconsistencyException(errMsg);
                             e.addData(entity2, rows2);
                             throw e;
                         }
@@ -78,7 +78,7 @@ function translateCheckerInAsyncContext(checker, schema) {
                                 dontCollect: true,
                                 blockTrigger: true,
                             }); */
-                            const e = new Exception_1.OakRowInconsistencyException(undefined, errMsg);
+                            const e = new Exception_1.OakRowInconsistencyException(errMsg);
                             // e.addData(entity, rows2);
                             throw e;
                         }
@@ -156,7 +156,7 @@ function translateCheckerInSyncContext(checker, schema) {
                 if ((0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter2, true)) {
                     return;
                 }
-                const e = new Exception_1.OakRowInconsistencyException(undefined, errMsg || 'row checker condition illegal');
+                const e = new Exception_1.OakRowInconsistencyException(errMsg || 'row checker condition illegal');
                 throw e;
             };
             return {
@@ -258,7 +258,7 @@ function createRemoveCheckers(schema) {
                         if (result instanceof Promise) {
                             promises.push(result.then(([row]) => {
                                 if (row) {
-                                    const err = new Exception_1.OakRowInconsistencyException(undefined, `您无法删除存在有效数据「${e}」关联的行`);
+                                    const err = new Exception_1.OakRowInconsistencyException(`您无法删除存在有效数据「${e}」关联的行`);
                                     err.addData(e, [row]);
                                     throw err;
                                 }
@@ -267,7 +267,7 @@ function createRemoveCheckers(schema) {
                         else {
                             const [row] = result;
                             if (row) {
-                                const err = new Exception_1.OakRowInconsistencyException(undefined, `您无法删除存在有效数据「${e}」关联的行`);
+                                const err = new Exception_1.OakRowInconsistencyException(`您无法删除存在有效数据「${e}」关联的行`);
                                 err.addData(e, [row]);
                                 throw err;
                             }
@@ -293,7 +293,7 @@ function createRemoveCheckers(schema) {
                         if (result instanceof Promise) {
                             promises.push(result.then(([row]) => {
                                 if (row) {
-                                    const e = new Exception_1.OakRowInconsistencyException(undefined, `您无法删除存在有效数据「${otm}」关联的行`);
+                                    const e = new Exception_1.OakRowInconsistencyException(`您无法删除存在有效数据「${otm}」关联的行`);
                                     e.addData(otm, [row]);
                                     throw e;
                                 }
@@ -310,7 +310,7 @@ function createRemoveCheckers(schema) {
                                         }
                                     }
                                 };
-                                const e = new Exception_1.OakRowInconsistencyException(undefined, `您无法删除存在有效数据「${otm}」关联的行`);
+                                const e = new Exception_1.OakRowInconsistencyException(`您无法删除存在有效数据「${otm}」关联的行`);
                                 e.addData(otm, [row]);
                                 throw e;
                             }

package/lib/store/filter.js

@@ -12,7 +12,16 @@ function translateCreateDataToFilter(schema, entity, data, allowUnrecoganized) {
         const rel = (0, relation_1.judgeRelation)(schema, entity, attr, allowUnrecoganized);
         if (rel === 1) {
             // 只需要记住id和各种外键属性，不这样处理有些古怪的属性比如coordinate，其作为createdata和作为filter并不同构
-            if (!['geometry', 'geography', 'st_geometry', 'st_point'].includes(schema[entity].attributes[attr]?.type)) {
+            if (![
+                'geometry',
+                'geography',
+                'st_geometry',
+                'st_point',
+                'function',
+                'sequence',
+                'array',
+                'object'
+            ].includes(schema[entity].attributes[attr]?.type)) {
                 data2[attr] = data[attr];
             }
         }
@@ -1602,9 +1611,7 @@ function checkDeduceFilters(dfc, context) {
  * @returns
  */
 function checkFilterContains(entity, context, contained, filter, dataCompare, warningOnDataCompare) {
-    if (!filter) {
-        throw new types_1.OakRowInconsistencyException();
-    }
+    (0, assert_1.default)(filter);
     const schema = context.getSchema();
     const result = contains(entity, schema, filter, contained);
     if (typeof result === 'boolean') {
@@ -1620,9 +1627,7 @@ function checkFilterContains(entity, context, contained, filter, dataCompare, wa
 }
 exports.checkFilterContains = checkFilterContains;
 function checkFilterRepel(entity, context, filter1, filter2, dataCompare, warningOnDataCompare) {
-    if (!filter2) {
-        throw new types_1.OakRowInconsistencyException();
-    }
+    (0, assert_1.default)(filter2);
     const schema = context.getSchema();
     const result = repel(entity, schema, filter2, filter1);
     if (typeof result === 'boolean') {

package/lib/types/Entity.d.ts

@@ -153,7 +153,7 @@ export type CreateOpResult<ED extends EntityDict, T extends keyof ED> = {
 };
 export type UpdateOpResult<ED extends EntityDict, T extends keyof ED> = {
     id: string;
-    a: 'u';
+    a: string;
     e: T;
     d: UpdateOperationData;
     f?: Filter;

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);
+}
 /**
  * 网络中断异常
  */
@@ -67,7 +67,6 @@ export declare class OakServerProxyException<ED extends EntityDict> extends OakE
  *
  */
 export declare class OakRowInconsistencyException<ED extends EntityDict> extends OakUserException<ED> {
-    constructor(data?: OpRecord<ED>, message?: string);
     toString(): string;
 }
 /**

package/lib/types/Exception.js

@@ -1,8 +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;
-const tslib_1 = require("tslib");
-const assert_1 = tslib_1.__importDefault(require("assert"));
+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) {
@@ -53,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;
@@ -119,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;
 /**
  * 网络中断异常
  */
@@ -135,10 +133,6 @@ exports.OakServerProxyException = OakServerProxyException;
  *
  */
 class OakRowInconsistencyException extends OakUserException {
-    constructor(data, message) {
-        super(message);
-        (0, assert_1.default)(!data, '现在使用addData接口来传数据');
-    }
     toString() {
         const data = super.getSerialData();
         return JSON.stringify(data);
@@ -354,7 +348,7 @@ function makeException(data) {
             break;
         }
         case 'OakRowInconsistencyException': {
-            e = new OakRowInconsistencyException(data.data, data.message);
+            e = new OakRowInconsistencyException(data.message);
             break;
         }
         case 'OakInputIllegalException': {

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/package.json

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