oak-domain 5.0.4 → 5.0.6

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

@@ -16,10 +16,10 @@ function checkUniqueBetweenRows(rows, uniqAttrs) {
         let s = '';
         for (const a of uniqAttrs) {
             if (row[a] === null || row[a] === undefined) {
-                s + row.id;
+                s += row.id;
             }
             else {
-                s + `-${row[a]}`;
+                s += `-${row[a]}`;
             }
         }
         if (dict[s]) {
@@ -188,7 +188,17 @@ function createActionTransformerCheckers(actionDefDict) {
                     type: 'row',
                     entity,
                     filter: conditionalFilter,
-                    errMsg: '',
+                    errMsg: '数据状态已经改变',
+                    inconsistentRows: {
+                        entity,
+                        selection: (filter) => ({
+                            data: {
+                                id: 1,
+                                [attr]: 1,
+                            },
+                            filter,
+                        }),
+                    },
                 });
                 // 这里用data类型的checker改数据了不太好，先这样
                 checkers.push({
@@ -331,7 +341,6 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                 }
                 if (f) {
                     const rr = (0, filter_1.contains)(entity, context.getSchema(), data, f);
-                    console.log(rr);
                     const result = (0, filter_1.checkFilterContains)(entity, context, f, filter, true);
                     if (result instanceof Promise) {
                         return result.then((v) => {

package/lib/store/checker.js

@@ -63,12 +63,13 @@ 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;
                         }
                         else {
-                            const rows2 = await context.select(entity, {
+                            // 可能会暴露隐私信息，暂时不能这样做。by Xc
+                            /* const rows2 = await context.select(entity, {
                                 data: getFullProjection(entity, context.getSchema()),
                                 filter: Object.assign({}, operationFilter, {
                                     $not: filter2,
@@ -76,9 +77,9 @@ function translateCheckerInAsyncContext(checker, schema) {
                             }, {
                                 dontCollect: true,
                                 blockTrigger: true,
-                            });
-                            const e = new Exception_1.OakRowInconsistencyException(undefined, errMsg);
-                            e.addData(entity, rows2);
+                            }); */
+                            const e = new Exception_1.OakRowInconsistencyException(errMsg);
+                            // e.addData(entity, rows2);
                             throw e;
                         }
                     };
@@ -155,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 {
@@ -257,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;
                                 }
@@ -266,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;
                             }
@@ -292,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;
                                 }
@@ -309,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

@@ -1,9 +1,14 @@
-import { EntityDict, OpRecord, SelectOpResult } from "./Entity";
+import { EntityDict, OpRecord } from "./Entity";
 export declare class OakException<ED extends EntityDict> extends Error {
-    opRecord: SelectOpResult<ED>;
+    opRecords: OpRecord<ED>[];
     constructor(message?: string);
     addData<T extends keyof ED>(entity: T, rows: Partial<ED[T]['OpSchema']>[]): void;
-    setOpRecords(opRecord: SelectOpResult<ED>): void;
+    setOpRecords(opRecords: OpRecord<ED>[]): void;
+    getSerialData(): {
+        name: string;
+        message: string;
+        opRecords: OpRecord<ED>[];
+    };
     toString(): string;
 }
 export declare class OakMakeSureByMySelfException<ED extends EntityDict> extends OakException<ED> {
@@ -62,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;
 }
 /**
@@ -158,6 +162,6 @@ export declare class OakExternalException<ED extends EntityDict> extends OakUser
 export declare function makeException<ED extends EntityDict>(data: {
     name: string;
     message?: string;
-    opRecords: SelectOpResult<ED>;
+    opRecords: OpRecord<ED>[];
     [A: string]: any;
 }): OakException<ED> | undefined;

package/lib/types/Exception.js

@@ -1,10 +1,8 @@
 "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"));
 class OakException extends Error {
-    opRecord;
+    opRecords;
     constructor(message) {
         super(message);
         this.name = new.target.name;
@@ -17,36 +15,32 @@ class OakException extends Error {
         else {
             this.__proto__ = new.target.prototype;
         }
-        this.opRecord = {
-            a: 's',
-            d: {},
-        };
+        this.opRecords = [];
     }
     addData(entity, rows) {
-        const { d } = this.opRecord;
-        const addSingleRow = (rowRoot, row) => {
-            const { id } = row;
-            if (rowRoot[id]) {
-                Object.assign(rowRoot[id], row);
-            }
-            else {
-                rowRoot[id] = row;
+        const record = {
+            a: 's',
+            d: {
+                [entity]: {},
             }
         };
-        if (!d[entity]) {
-            d[entity] = {};
+        for (const row of rows) {
+            record.d[entity][row.id] = row;
         }
-        rows.forEach(row => addSingleRow(d[entity], row));
+        this.opRecords.push(record);
     }
-    setOpRecords(opRecord) {
-        this.opRecord = opRecord;
+    setOpRecords(opRecords) {
+        this.opRecords = opRecords;
     }
-    toString() {
-        return JSON.stringify({
+    getSerialData() {
+        return {
             name: this.constructor.name,
             message: this.message,
-            opRecord: this.opRecord,
-        });
+            opRecords: this.opRecords,
+        };
+    }
+    toString() {
+        return JSON.stringify(this.getSerialData());
     }
 }
 exports.OakException = OakException;
@@ -85,9 +79,9 @@ class OakNoRelationDefException extends OakDataException {
         this.actions = actions;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
-            name: this.constructor.name,
-            message: this.message,
+            ...data,
             entity: this.entity,
             action: this.actions,
         });
@@ -105,7 +99,11 @@ class OakRowUnexistedException extends OakDataException {
         this.rows = rows;
     }
     toString() {
-        return JSON.stringify({ rows: this.rows });
+        const data = super.getSerialData();
+        return JSON.stringify({
+            ...data,
+            rows: this.rows
+        });
     }
     getRows() {
         return this.rows;
@@ -135,15 +133,9 @@ exports.OakServerProxyException = OakServerProxyException;
  *
  */
 class OakRowInconsistencyException extends OakUserException {
-    constructor(data, message) {
-        super(message);
-        (0, assert_1.default)(!data, '现在使用addData接口来传数据');
-    }
     toString() {
-        return JSON.stringify({
-            name: this.constructor.name,
-            message: this.message,
-        });
+        const data = super.getSerialData();
+        return JSON.stringify(data);
     }
 }
 exports.OakRowInconsistencyException = OakRowInconsistencyException;
@@ -169,10 +161,10 @@ class OakInputIllegalException extends OakUserException {
         this.attributes = this.attributes.map(ele => `${prefix}.${ele}`);
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
+            ...data,
             entity: this.entity,
-            name: this.constructor.name,
-            message: this.message,
             attributes: this.attributes,
         });
     }
@@ -209,10 +201,10 @@ class OakUserUnpermittedException extends OakUserException {
         this.operation = operation;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
+            ...data,
             entity: this.entity,
-            name: this.constructor.name,
-            message: this.message,
             operation: this.operation,
         });
     }
@@ -231,10 +223,10 @@ class OakUserInvisibleException extends OakUserException {
         this.operation = operation;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
+            ...data,
             entity: this.entity,
-            name: this.constructor.name,
-            message: this.message,
             operation: this.operation,
         });
     }
@@ -279,9 +271,9 @@ class OakCongruentRowExists extends OakUserException {
         return this.entity;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
-            name: this.constructor.name,
-            message: this.message,
+            ...data,
             data: this.data,
             entity: this.entity,
         });
@@ -310,9 +302,9 @@ class OakPreConditionUnsetException extends OakUserException {
             this.code = code;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
-            name: this.constructor.name,
-            message: this.message,
+            ...data,
             code: this.code,
             entity: this.entity,
         });
@@ -333,9 +325,10 @@ class OakExternalException extends OakUserException {
         this.data = data;
     }
     toString() {
+        const data = super.getSerialData();
         return JSON.stringify({
+            ...data,
             code: this.code,
-            message: this.message,
             source: this.source,
             data: this.data,
         });
@@ -355,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/package.json

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