@simplysm/sd-orm-common - npm Package Compare versions

Comparing version 3.1.142 to 3.1.152

dist/index.d.ts

 export * from "./common";
 export * from "./decorator";
 export * from "./definition";
-export * from "./index";
 export * from "./model";
@@ -6,0 +5,0 @@ export * from "./query-definition";

dist/index.js

@@ -7,3 +7,2 @@ "use strict";
 tslib_1.__exportStar(require("./definition"), exports);
-tslib_1.__exportStar(require("./index"), exports);
 tslib_1.__exportStar(require("./model"), exports);
@@ -10,0 +9,0 @@ tslib_1.__exportStar(require("./query-definition"), exports);

dist/util/QueryUtil.js

@@ -169,2 +169,3 @@ "use strict";
                 const grouped = [];
+                const groupedMultiMap = new Map();
                 for (const item of result) {
@@ -185,16 +186,18 @@ const keyObjKeys = Object.keys(item).filter((key) => !key.startsWith(joinKey + "."));
                     else {
-                        const existsRecord = grouped.single((item1) => sd_core_common_1.ObjectUtil.equal(item1.key, keyObj));
-                        if (existsRecord) {
-                            existsRecord.values.push(valueObj);
+                        const keyJson = sd_core_common_1.JsonConvert.stringify(keyObj);
+                        if (groupedMultiMap.has(keyJson)) {
+                            groupedMultiMap.get(keyJson).push(valueObj);
                         }
                         else {
-                            grouped.push({ key: keyObj, values: [valueObj] });
+                            const valueArr = [valueObj];
+                            grouped.push({ key: keyObj, values: valueArr });
+                            groupedMultiMap.set(keyJson, valueArr);
                         }
                     }
                 }
-                result = grouped.map((item) => {
-                    if (item.values instanceof Array) {
+                result = grouped.map((groupedItem) => {
+                    if (groupedItem.values instanceof Array) {
                         return {
-                            ...item.key,
-                            [joinKey]: item.values
+                            ...groupedItem.key,
+                            [joinKey]: groupedItem.values
                                 .filter((item1) => Object.keys(item1)
@@ -207,5 +210,5 @@ .filter((key) => !(item1[key] instanceof Array) || item1[key].length > 0)
                         return {
-                            ...item.key,
-                            ...Object.keys(item.values).length > 0 ? {
-                                [joinKey]: item.values
+                            ...groupedItem.key,
+                            ...Object.keys(groupedItem.values).length > 0 ? {
+                                [joinKey]: groupedItem.values
                             } : {}
@@ -212,0 +215,0 @@ };

package.json

 {
   "name": "@simplysm/sd-orm-common",
-  "version": "3.1.142",
+  "version": "3.1.152",
   "description": "심플리즘 패키지 - ORM 모듈 (browser/node)",
@@ -13,3 +13,3 @@ "author": "김석래",
   "dependencies": {
-    "@simplysm/sd-core-common": "3.1.142"
+    "@simplysm/sd-core-common": "3.1.152"
   },
@@ -16,0 +16,0 @@ "devDependencies": {

src/index.ts

 export * from "./common";
 export * from "./decorator";
 export * from "./definition";
-export * from "./index";
 export * from "./model";
@@ -6,0 +5,0 @@ export * from "./query-definition";

src/util/QueryUtil.ts

@@ -10,3 +10,3 @@ import {ITableNameDef} from "../definition";
 import {QueryUnit} from "../query/QueryUnit";
-import {DateOnly, DateTime, ObjectUtil, Time, Type, Uuid} from "@simplysm/sd-core-common";
+import {DateOnly, DateTime, JsonConvert, Time, Type, Uuid} from "@simplysm/sd-core-common";
 import {Queryable} from "../query/Queryable";
@@ -185,3 +185,5 @@ import {IQueryResultParseOption} from "../query-definition";
       for (const joinKey of joinKeys) {
+        // const grouped = new Map<string, any | any[]>();
         const grouped: { key: any; values: any | any[] }[] = [];
+        const groupedMultiMap = new Map<string, any | any[]>();
 
@@ -205,8 +207,10 @@ for (const item of result) {
           else {
-            const existsRecord = grouped.single((item1) => ObjectUtil.equal(item1.key, keyObj));
-            if (existsRecord) {
-              existsRecord.values.push(valueObj);
+            const keyJson = JsonConvert.stringify(keyObj);
+            if (groupedMultiMap.has(keyJson)) {
+              groupedMultiMap.get(keyJson).push(valueObj);
             }
             else {
-              grouped.push({key: keyObj, values: [valueObj]});
+              const valueArr = [valueObj];
+              grouped.push({key: keyObj, values: valueArr});
+              groupedMultiMap.set(keyJson, valueArr);
             }
@@ -216,7 +220,7 @@ }
 
-        result = grouped.map((item) => {
-          if (item.values instanceof Array) {
+        result = grouped.map((groupedItem) => {
+          if (groupedItem.values instanceof Array) {
             return {
-              ...item.key,
-              [joinKey]: item.values
+              ...groupedItem.key,
+              [joinKey]: groupedItem.values
                 .filter((item1) =>
@@ -231,5 +235,5 @@ Object.keys(item1)
             return {
-              ...item.key,
-              ...Object.keys(item.values).length > 0 ? {
-                [joinKey]: item.values
+              ...groupedItem.key,
+              ...Object.keys(groupedItem.values).length > 0 ? {
+                [joinKey]: groupedItem.values
               } : {}
@@ -236,0 +240,0 @@ };

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

713825

increased by0.11%

Lines of code

9354

increased by0.03%

Dependency changes

• + Added@simplysm/sd-core-common@3.1.152(transitive)

• - Removed@simplysm/sd-core-common@3.1.142(transitive)

• Updated@simplysm/sd-core-common@3.1.152