@diyaner/egg-typeorm 2.4.0 → 2.6.0

package/lib/EggDataSource.d.ts

@@ -1,4 +1,4 @@
-import { DataSource, QueryRunner } from "typeorm";
+import { DataSource, EntityTarget, ObjectLiteral, QueryRunner } from "typeorm";
 /**
  * custom extend typeorm's DataSource class
  */
@@ -44,4 +44,8 @@ export declare class EggDataSource extends DataSource {
      * @param isSubfix 是否为后缀
      */
     getShardingEntity<T extends Function>(CLZ: T, tableName: string, isSubfix?: boolean): Promise<T>;
+    /** 从素对象创建实体实例对象
+     * - 解决typeorm内部未处理Date, Json等类型的问题
+     */
+    createEntityInstance<T extends ObjectLiteral>(EntityClass: EntityTarget<T>, plainObject: any): T;
 }

package/lib/EggDataSource.js

@@ -186,6 +186,94 @@ class EggDataSource extends typeorm_1.DataSource {
         this.eggCustomAddSplitEntityCacheMap.set(name, Classes);
         return Classes;
     }
+    /** 从素对象创建实体实例对象
+     * - 解决typeorm内部未处理Date, Json等类型的问题
+     */
+    createEntityInstance(EntityClass, plainObject) {
+        var _a, _b;
+        // const instance = this.manager.create(entityClass, plainObject);
+        const instance = new EntityClass();
+        const metadata = this.getMetadata(EntityClass);
+        // 普通属性，一对一，或多对一关系处理
+        if (metadata && metadata.columns) {
+            for (const column of metadata.columns) {
+                // console.log(column.propertyName, column.type);
+                if (column.type === "datetime") {
+                    let value = plainObject[column.propertyName] ? new Date(plainObject[column.propertyName]) : null;
+                    if (value && value.toString() === "Invalid Date") {
+                        value = null;
+                    }
+                    // @ts-ignore
+                    instance[column.propertyName] = value;
+                }
+                else if (column.type === "simple-json") {
+                    const value = plainObject[column.propertyName];
+                    if (value && typeof value === "string") {
+                        try {
+                            // @ts-ignore
+                            instance[column.propertyName] = JSON.parse(value);
+                        }
+                        catch (error) {
+                            // @ts-ignore
+                            instance[column.propertyName] = null;
+                        }
+                    }
+                }
+                else if (column.type === "simple-array") {
+                    const value = plainObject[column.propertyName];
+                    if (value && typeof value === "string") {
+                        // @ts-ignore
+                        instance[column.propertyName] = value.split(",");
+                    }
+                }
+                else if (column.relationMetadata) {
+                    const relationMetadata = column.relationMetadata;
+                    // console.log(column.relationMetadata.propertyName);
+                    // console.log(column.relationMetadata.relationType);
+                    const value = plainObject[relationMetadata.propertyName];
+                    if (!value)
+                        continue;
+                    const relationType = relationMetadata.relationType;
+                    if (relationType === "one-to-one" || relationType === "many-to-one") {
+                        // @ts-ignore
+                        instance[relationMetadata.propertyName] = this.createEntityInstance(relationMetadata.type, value);
+                    }
+                    else if (relationType === "one-to-many" || relationType === "many-to-many") {
+                        // @ts-ignore
+                        instance[relationMetadata.propertyName] = value.map((item) => {
+                            return this.createEntityInstance(relationMetadata.type, item);
+                        });
+                    }
+                }
+                else {
+                    if (plainObject[column.propertyName] !== undefined) {
+                        instance[column.propertyName] = plainObject[column.propertyName];
+                    }
+                }
+            }
+        }
+        // 一对多关系处理
+        (_a = metadata.oneToManyRelations) === null || _a === void 0 ? void 0 : _a.forEach((relation) => {
+            const value = plainObject[relation.propertyName];
+            if (Array.isArray(value)) {
+                // @ts-ignore
+                instance[relation.propertyName] = value.map((item) => {
+                    return this.createEntityInstance(relation.type, item);
+                });
+            }
+        });
+        // 多对多关系处理
+        (_b = metadata.manyToManyRelations) === null || _b === void 0 ? void 0 : _b.forEach((relation) => {
+            const value = plainObject[relation.propertyName];
+            if (Array.isArray(value)) {
+                // @ts-ignore
+                instance[relation.propertyName] = value.map((item) => {
+                    return this.createEntityInstance(relation.type, item);
+                });
+            }
+        });
+        return instance;
+    }
 }
 exports.EggDataSource = EggDataSource;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWdnRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkVnZ0RhdGFTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLHFDQUEyRTtBQUMzRSw0RkFBeUY7QUFDekYsOEZBQTJGO0FBQzNGLDBEQUEwRDtBQUUxRDs7R0FFRztBQUNILE1BQWEsYUFBYyxTQUFRLG9CQUFVO0lBQTdDOztRQUNTLCtCQUEwQixHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO1FBQy9ELDZCQUE2QjtRQUNyQiwyQ0FBc0MsR0FBRyxJQUFJLEdBQUcsRUFBb0IsQ0FBQztRQUU3RSxrQkFBa0I7UUFDVixvQ0FBK0IsR0FBRyxJQUFJLEdBQUcsRUFBb0IsQ0FBQztJQTJMdkUsQ0FBQztJQTFMQTs7Ozs7O09BTUc7SUFDSCxLQUFLLENBQUMsV0FBVyxDQUFxQixHQUFHLFNBQXNCO1FBQzlELElBQUksUUFBUSxHQUFHLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFTLEVBQUUsSUFBSSxFQUFFLEVBQUU7WUFDbkQsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzlDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztZQUNoQixPQUFPLElBQUksQ0FBQztRQUNiLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNQLFFBQVEsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNqRixJQUFJLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQztZQUFFLE9BQU8sSUFBSSxDQUFDO1FBRXZDLEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFLENB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggDataSource.js","sourceRoot":"","sources":["EggDataSource.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diyaner/egg-typeorm",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "description": "egg plugin for nodejs orm freamwork typeorm.",
   "eggPlugin": {
     "name": "typeorm"
@@ -23,7 +23,7 @@
     "egg": "^3.23.0",
     "egg-bin": "^6.9.0",
     "egg-ci": "^1.11.0",
-    "egg-mock": "^3.21.0",
+    "egg-mock": "^5.15.2",
     "eslint": "^5.13.0",
     "eslint-config-egg": "^7.1.0",
     "mysql2": "^3.9.7",