@rsdk/db.typeorm 5.11.0-next.3 → 5.11.0-next.5

package/dist/flat-order.d.ts

@@ -0,0 +1,16 @@
+import type { FindOptionsOrder } from 'typeorm';
+type OrderNormalizedType = 'ASC' | 'DESC';
+type OrderNullsNormalizedType = 'FIRST' | 'LAST';
+type OrderWithNullsNormalizedType = {
+    direction?: OrderNormalizedType | undefined;
+    nulls?: OrderNullsNormalizedType | undefined;
+};
+type FlatNormalizedType = OrderNormalizedType | OrderWithNullsNormalizedType;
+/**
+ * Метод для "разглаживания" сортировки в запросах для получения простой структуры сортировки.
+ * @param obj - исходные условия сортировки
+ * @param concatenator - символ-соединитель для условий
+ * @returns Запись в формате "Ключ - Значение (ASC или DESC)"
+ */
+export declare function flatOrder(obj: Record<string, FindOptionsOrder<unknown>>, concatenator?: string): Record<string, FlatNormalizedType>;
+export {};

package/dist/flat-order.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.flatOrder = flatOrder;
+const DIRECTION_SET = new Set(['ASC', 'DESC', 'asc', 'desc']);
+const NULLS_SET = new Set(['FIRST', 'LAST', 'first', 'last']);
+const SCHEMA = {
+    direction: DIRECTION_SET,
+    nulls: NULLS_SET,
+};
+/**
+ * Метод для "разглаживания" сортировки в запросах для получения простой структуры сортировки.
+ * @param obj - исходные условия сортировки
+ * @param concatenator - символ-соединитель для условий
+ * @returns Запись в формате "Ключ - Значение (ASC или DESC)"
+ */
+function flatOrder(obj, concatenator = '.') {
+    return Object.entries(obj).reduce((acc, [key, value]) => {
+        if (typeof value !== 'object') {
+            acc[key] = castOrderValue(value);
+            return acc;
+        }
+        if (Object.entries(value).every(([key, val]) => !!SCHEMA[key] && SCHEMA[key].has(val))) {
+            const validated = value;
+            acc[key] = {};
+            if (validated.direction) {
+                acc[key].direction = castOrderValue(validated.direction);
+            }
+            if (validated.nulls) {
+                acc[key].nulls = castNullsValue(validated.nulls);
+            }
+            return acc;
+        }
+        const flattenedChild = flatOrder(value, concatenator);
+        return {
+            ...acc,
+            ...Object.fromEntries(Object.keys(flattenedChild).map((childKey) => [
+                `${key}${concatenator}${childKey}`,
+                flattenedChild[childKey],
+            ])),
+        };
+    }, {});
+}
+function castOrderValue(value) {
+    switch (value) {
+        case 1:
+        case 'ASC':
+        case 'asc':
+            return 'ASC';
+        case 'desc':
+        case 'DESC':
+        case -1:
+            return 'DESC';
+        default:
+            throw new Error('Got unexpected value for cast');
+    }
+}
+function castNullsValue(value) {
+    switch (value) {
+        case 'FIRST':
+        case 'first':
+            return 'FIRST';
+        case 'LAST':
+        case 'last':
+            return 'LAST';
+        default:
+            throw new Error('Got unexpected value for cast');
+    }
+}
+//# sourceMappingURL=flat-order.js.map

package/dist/flat-order.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flat-order.js","sourceRoot":"","sources":["../src/flat-order.ts"],"names":[],"mappings":";;AA2BA,8BA2CC;AA1DD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AAC9D,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;AAC9D,MAAM,MAAM,GAAoC;IAC9C,SAAS,EAAE,aAAa;IACxB,KAAK,EAAE,SAAS;CACjB,CAAC;AAIF;;;;;GAKG;AACH,SAAgB,SAAS,CACvB,GAA8C,EAC9C,YAAY,GAAG,GAAG;IAElB,OAAO,MAAM,CAAC,OAAO,CAA4B,GAAG,CAAC,CAAC,MAAM,CAC1D,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACpB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,GAAG,CAAC;QACb,CAAC;QAED,IACE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CACzB,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAa,CAAC,CAChE,EACD,CAAC;YACD,MAAM,SAAS,GAAG,KAAqC,CAAC;YAExD,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACd,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;gBACxB,GAAG,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAC3D,CAAC;YACD,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;gBACpB,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACnD,CAAC;YAED,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAEtD,OAAO;YACL,GAAG,GAAG;YACN,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAC5C,GAAG,GAAG,GAAG,YAAY,GAAG,QAAQ,EAAE;gBAClC,cAAc,CAAC,QAAQ,CAAC;aACzB,CAAC,CACH;SACF,CAAC;IACJ,CAAC,EACD,EAAwC,CACzC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,KAA4B;IAClD,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,CAAC;QACP,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,CAAC,CAAC;YACL,OAAO,MAAM,CAAC;QAChB;YACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAqB;IAC3C,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,OAAO;YACV,OAAO,OAAO,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;QAChB;YACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC;AACH,CAAC"}

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export { TypeOrmPlugin } from './typeorm.plugin';
 export { IsolationLevel } from './types';
 export { OverrideEntity } from './metadata/override-entity.decorator';
 export { TypeOrmEntity } from './metadata/typeorm-entity.decorator';
+export { flatOrder } from './flat-order';
 export declare const Runner: TransactionRunner<import("./types").IsolationLevel, import("./internal/context").TypeOrmContext>;
 export declare const Transactional: (payload?: {
     isolation?: import("./types").IsolationLevel;

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transactional = exports.Runner = exports.TypeOrmEntity = exports.OverrideEntity = exports.IsolationLevel = exports.TypeOrmPlugin = exports.DataSourceExtractor = void 0;
+exports.Transactional = exports.Runner = exports.flatOrder = exports.TypeOrmEntity = exports.OverrideEntity = exports.IsolationLevel = exports.TypeOrmPlugin = exports.DataSourceExtractor = void 0;
 const db_1 = require("@rsdk/db");
 const strategy_1 = require("./internal/strategy");
 var data_source_extractor_1 = require("./data-source-extractor");
@@ -13,6 +13,8 @@ var override_entity_decorator_1 = require("./metadata/override-entity.decorator"
 Object.defineProperty(exports, "OverrideEntity", { enumerable: true, get: function () { return override_entity_decorator_1.OverrideEntity; } });
 var typeorm_entity_decorator_1 = require("./metadata/typeorm-entity.decorator");
 Object.defineProperty(exports, "TypeOrmEntity", { enumerable: true, get: function () { return typeorm_entity_decorator_1.TypeOrmEntity; } });
+var flat_order_1 = require("./flat-order");
+Object.defineProperty(exports, "flatOrder", { enumerable: true, get: function () { return flat_order_1.flatOrder; } });
 exports.Runner = new db_1.TransactionRunner(new strategy_1.TypeOrmTransactionalStrategy());
 exports.Transactional = exports.Runner.Transactional.bind(exports.Runner);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iCAA6C;AAE7C,kDAAmE;AAEnE,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAE5B,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,iCAAyC;AAAhC,uGAAA,cAAc,OAAA;AACvB,kFAAsE;AAA7D,2HAAA,cAAc,OAAA;AACvB,gFAAoE;AAA3D,yHAAA,aAAa,OAAA;AAET,QAAA,MAAM,GAAG,IAAI,sBAAiB,CAAC,IAAI,uCAA4B,EAAE,CAAC,CAAC;AACnE,QAAA,aAAa,GAAG,cAAM,CAAC,aAAa,CAAC,IAAI,CAAC,cAAM,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iCAA6C;AAE7C,kDAAmE;AAEnE,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAE5B,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,iCAAyC;AAAhC,uGAAA,cAAc,OAAA;AACvB,kFAAsE;AAA7D,2HAAA,cAAc,OAAA;AACvB,gFAAoE;AAA3D,yHAAA,aAAa,OAAA;AACtB,2CAAyC;AAAhC,uGAAA,SAAS,OAAA;AAEL,QAAA,MAAM,GAAG,IAAI,sBAAiB,CAAC,IAAI,uCAA4B,EAAE,CAAC,CAAC;AACnE,QAAA,aAAa,GAAG,cAAM,CAAC,aAAa,CAAC,IAAI,CAAC,cAAM,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/db.typeorm",
-  "version": "5.11.0-next.3",
+  "version": "5.11.0-next.5",
   "description": "TypeOrm module for platform",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -28,5 +28,5 @@
     "rxjs": "^7.1.0",
     "typeorm": "^0.3.12"
   },
-  "gitHead": "aa43c0b62a5a8fb72694f3d9112ab19960e30265"
+  "gitHead": "d4dd4adcfcfd2e334917b11d2867806014886f1d"
 }

package/src/flat-order.ts

@@ -0,0 +1,99 @@
+import type { FindOptionsOrder, FindOptionsOrderValue } from 'typeorm';
+
+type OrderNullsType = 'FIRST' | 'LAST' | 'first' | 'last';
+
+type OrderNormalizedType = 'ASC' | 'DESC';
+type OrderNullsNormalizedType = 'FIRST' | 'LAST';
+
+type OrderWithNullsNormalizedType = {
+  direction?: OrderNormalizedType | undefined;
+  nulls?: OrderNullsNormalizedType | undefined;
+};
+
+const DIRECTION_SET = new Set(['ASC', 'DESC', 'asc', 'desc']);
+const NULLS_SET = new Set(['FIRST', 'LAST', 'first', 'last']);
+const SCHEMA: { [key: string]: Set<unknown> } = {
+  direction: DIRECTION_SET,
+  nulls: NULLS_SET,
+};
+
+type FlatNormalizedType = OrderNormalizedType | OrderWithNullsNormalizedType;
+
+/**
+ * Метод для "разглаживания" сортировки в запросах для получения простой структуры сортировки.
+ * @param obj - исходные условия сортировки
+ * @param concatenator - символ-соединитель для условий
+ * @returns Запись в формате "Ключ - Значение (ASC или DESC)"
+ */
+export function flatOrder(
+  obj: Record<string, FindOptionsOrder<unknown>>,
+  concatenator = '.',
+): Record<string, FlatNormalizedType> {
+  return Object.entries<FindOptionsOrder<unknown>>(obj).reduce(
+    (acc, [key, value]) => {
+      if (typeof value !== 'object') {
+        acc[key] = castOrderValue(value);
+        return acc;
+      }
+
+      if (
+        Object.entries(value).every(
+          ([key, val]) => !!SCHEMA[key] && SCHEMA[key].has(val as string),
+        )
+      ) {
+        const validated = value as OrderWithNullsNormalizedType;
+
+        acc[key] = {};
+        if (validated.direction) {
+          acc[key].direction = castOrderValue(validated.direction);
+        }
+        if (validated.nulls) {
+          acc[key].nulls = castNullsValue(validated.nulls);
+        }
+
+        return acc;
+      }
+
+      const flattenedChild = flatOrder(value, concatenator);
+
+      return {
+        ...acc,
+        ...Object.fromEntries(
+          Object.keys(flattenedChild).map((childKey) => [
+            `${key}${concatenator}${childKey}`,
+            flattenedChild[childKey],
+          ]),
+        ),
+      };
+    },
+    {} as Record<string, FlatNormalizedType>,
+  );
+}
+
+function castOrderValue(value: FindOptionsOrderValue): OrderNormalizedType {
+  switch (value) {
+    case 1:
+    case 'ASC':
+    case 'asc':
+      return 'ASC';
+    case 'desc':
+    case 'DESC':
+    case -1:
+      return 'DESC';
+    default:
+      throw new Error('Got unexpected value for cast');
+  }
+}
+
+function castNullsValue(value: OrderNullsType): OrderNullsNormalizedType {
+  switch (value) {
+    case 'FIRST':
+    case 'first':
+      return 'FIRST';
+    case 'LAST':
+    case 'last':
+      return 'LAST';
+    default:
+      throw new Error('Got unexpected value for cast');
+  }
+}

package/src/index.ts

@@ -8,6 +8,7 @@ export { TypeOrmPlugin } from './typeorm.plugin';
 export { IsolationLevel } from './types';
 export { OverrideEntity } from './metadata/override-entity.decorator';
 export { TypeOrmEntity } from './metadata/typeorm-entity.decorator';
+export { flatOrder } from './flat-order';
 
 export const Runner = new TransactionRunner(new TypeOrmTransactionalStrategy());
 export const Transactional = Runner.Transactional.bind(Runner);