@infrab4a/connect 4.4.1-beta.1 → 4.5.0

package/index.cjs.js

@@ -256,6 +256,7 @@ exports.Where = void 0;
     Where["NOTLIKE"] = "not like";
     Where["ISNULL"] = "is null";
     Where["ISNOTNULL"] = "is not null";
+    Where["IREGEX"] = "iregex";
 })(exports.Where || (exports.Where = {}));
 
 exports.UpdateOptionActions = void 0;
@@ -2248,9 +2249,6 @@ class UpdateUserImage {
 }
 
 class LineItem extends Product {
-    get pricePaidWithDiscount() {
-        return this.pricePaid - this.discount;
-    }
 }
 
 class ShippingMethod extends BaseModel {
@@ -3836,11 +3834,14 @@ var HasuraGraphQLWhere;
     HasuraGraphQLWhere["LT"] = "_lt";
     HasuraGraphQLWhere["LTE"] = "_lte";
     HasuraGraphQLWhere["LIKE"] = "_like";
+    HasuraGraphQLWhere["ILIKE"] = "_ilike";
     HasuraGraphQLWhere["NOTLIKE"] = "_nlike";
     HasuraGraphQLWhere["ISNULL"] = "_is_null";
     HasuraGraphQLWhere["ISNOTNULL"] = "_is_null";
     HasuraGraphQLWhere["JSON_CONTAINS"] = "_contains";
     HasuraGraphQLWhere["JSON_HAS_KEYS_ANY"] = "_has_keys_any";
+    HasuraGraphQLWhere["IREGEX"] = "_iregex";
+    HasuraGraphQLWhere["REGEX"] = "_regex";
 })(HasuraGraphQLWhere || (HasuraGraphQLWhere = {}));
 
 var HasuraGraphQLColumnType;
@@ -3871,9 +3872,47 @@ FilterOptionHelper.GetValueFromFilter = (filter, fieldOption) => {
         : (value) => filter.operator === exports.Where.LIKE && !Array.isArray(filter.value) && value.indexOf('%') < 0
             ? `%${value}%`
             : value;
-    return Array.isArray(filter.value) && !fieldOption.fields && [exports.Where.IN, exports.Where.NOTIN].includes(filter.operator)
+    const converterResult = Array.isArray(filter.value) && !fieldOption.fields && [exports.Where.IN, exports.Where.NOTIN].includes(filter.operator)
         ? filter.value.map((fieldValue) => converter(fieldValue))
         : converter(filter.value);
+    const newValue = filter.ignoreCase && !filter.ignoreAccent && !Array.isArray(filter.value) && converterResult.indexOf('%') < 0
+        ? `%${converterResult}%`
+        : converterResult;
+    return filter.ignoreAccent && !Array.isArray(filter.value)
+        ? FilterOptionHelper.buildInsensitiveSentence(newValue)
+        : newValue;
+};
+FilterOptionHelper.buildInsensitiveSentence = (value) => {
+    const valueWithoutAccents = FilterOptionHelper.removeAccents(value);
+    let result = '';
+    for (const char of valueWithoutAccents) {
+        const allCharOptions = [];
+        if (['a', 'e', 'i', 'o', 'u', 'c', 'A', 'E', 'I', 'O', 'U', 'C'].includes(char)) {
+            const charOptions = {
+                a: ['á', 'â', 'ã', 'à', 'a'],
+                e: ['é', 'ê', 'ẽ', 'è', 'e'],
+                i: ['í', 'î', 'ĩ', 'ì', 'i'],
+                o: ['ó', 'ô', 'õ', 'ò', 'o'],
+                u: ['ú', 'û', 'ũ', 'ù', 'u'],
+                c: ['ç', 'c'],
+                A: ['Á', 'Â', 'Ã', 'À', 'A'],
+                E: ['É', 'Ê', 'Ẽ', 'È', 'E'],
+                I: ['Í', 'Î', 'Ĩ', 'Ì', 'I'],
+                O: ['Ó', 'Ô', 'Õ', 'Ò', 'O'],
+                U: ['Ú', 'Û', 'Ũ', 'Ù', 'U'],
+                C: ['Ç', 'C'],
+            };
+            allCharOptions.push(...charOptions[char]);
+            result += `[${allCharOptions.join('')}]`;
+        }
+        else {
+            result += char;
+        }
+    }
+    return result;
+};
+FilterOptionHelper.removeAccents = (text) => {
+    return text.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
 };
 
 class BindFilterQueryHelper {
@@ -3917,8 +3956,14 @@ BindFilterQueryHelper.BuildOperatorSentence = (options, fieldOption) => ({
 BindFilterQueryHelper.GetHasuraOperator = (options, fieldOption) => FilterOptionHelper.CheckIfIsFilterOption(options)
     ? fieldOption.type === HasuraGraphQLColumnType.Jsonb
         ? BindFilterQueryHelper.GetHasuraJsonbOperator(options)
-        : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find((graphQLOperator) => graphQLOperator ===
-            Object.keys(exports.Where).find((operator) => exports.Where[operator] === (options === null || options === void 0 ? void 0 : options.operator)))]
+        : options.operator === exports.Where.LIKE && options.ignoreCase && options.ignoreAccent
+            ? HasuraGraphQLWhere.IREGEX
+            : options.operator === exports.Where.LIKE && options.ignoreAccent
+                ? HasuraGraphQLWhere.REGEX
+                : options.operator === exports.Where.LIKE && options.ignoreCase
+                    ? HasuraGraphQLWhere.ILIKE
+                    : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find((graphQLOperator) => graphQLOperator ===
+                        Object.keys(exports.Where).find((operator) => exports.Where[operator] === (options === null || options === void 0 ? void 0 : options.operator)))]
     : HasuraGraphQLWhere.EQUALS;
 BindFilterQueryHelper.GetHasuraJsonbOperator = (options) => options.operator === exports.Where.IN
     ? HasuraGraphQLWhere.JSON_CONTAINS

package/index.esm.js

@@ -232,6 +232,7 @@ var Where;
     Where["NOTLIKE"] = "not like";
     Where["ISNULL"] = "is null";
     Where["ISNOTNULL"] = "is not null";
+    Where["IREGEX"] = "iregex";
 })(Where || (Where = {}));
 
 var UpdateOptionActions;
@@ -2224,9 +2225,6 @@ class UpdateUserImage {
 }
 
 class LineItem extends Product {
-    get pricePaidWithDiscount() {
-        return this.pricePaid - this.discount;
-    }
 }
 
 class ShippingMethod extends BaseModel {
@@ -3812,11 +3810,14 @@ var HasuraGraphQLWhere;
     HasuraGraphQLWhere["LT"] = "_lt";
     HasuraGraphQLWhere["LTE"] = "_lte";
     HasuraGraphQLWhere["LIKE"] = "_like";
+    HasuraGraphQLWhere["ILIKE"] = "_ilike";
     HasuraGraphQLWhere["NOTLIKE"] = "_nlike";
     HasuraGraphQLWhere["ISNULL"] = "_is_null";
     HasuraGraphQLWhere["ISNOTNULL"] = "_is_null";
     HasuraGraphQLWhere["JSON_CONTAINS"] = "_contains";
     HasuraGraphQLWhere["JSON_HAS_KEYS_ANY"] = "_has_keys_any";
+    HasuraGraphQLWhere["IREGEX"] = "_iregex";
+    HasuraGraphQLWhere["REGEX"] = "_regex";
 })(HasuraGraphQLWhere || (HasuraGraphQLWhere = {}));
 
 var HasuraGraphQLColumnType;
@@ -3847,9 +3848,47 @@ FilterOptionHelper.GetValueFromFilter = (filter, fieldOption) => {
         : (value) => filter.operator === Where.LIKE && !Array.isArray(filter.value) && value.indexOf('%') < 0
             ? `%${value}%`
             : value;
-    return Array.isArray(filter.value) && !fieldOption.fields && [Where.IN, Where.NOTIN].includes(filter.operator)
+    const converterResult = Array.isArray(filter.value) && !fieldOption.fields && [Where.IN, Where.NOTIN].includes(filter.operator)
         ? filter.value.map((fieldValue) => converter(fieldValue))
         : converter(filter.value);
+    const newValue = filter.ignoreCase && !filter.ignoreAccent && !Array.isArray(filter.value) && converterResult.indexOf('%') < 0
+        ? `%${converterResult}%`
+        : converterResult;
+    return filter.ignoreAccent && !Array.isArray(filter.value)
+        ? FilterOptionHelper.buildInsensitiveSentence(newValue)
+        : newValue;
+};
+FilterOptionHelper.buildInsensitiveSentence = (value) => {
+    const valueWithoutAccents = FilterOptionHelper.removeAccents(value);
+    let result = '';
+    for (const char of valueWithoutAccents) {
+        const allCharOptions = [];
+        if (['a', 'e', 'i', 'o', 'u', 'c', 'A', 'E', 'I', 'O', 'U', 'C'].includes(char)) {
+            const charOptions = {
+                a: ['á', 'â', 'ã', 'à', 'a'],
+                e: ['é', 'ê', 'ẽ', 'è', 'e'],
+                i: ['í', 'î', 'ĩ', 'ì', 'i'],
+                o: ['ó', 'ô', 'õ', 'ò', 'o'],
+                u: ['ú', 'û', 'ũ', 'ù', 'u'],
+                c: ['ç', 'c'],
+                A: ['Á', 'Â', 'Ã', 'À', 'A'],
+                E: ['É', 'Ê', 'Ẽ', 'È', 'E'],
+                I: ['Í', 'Î', 'Ĩ', 'Ì', 'I'],
+                O: ['Ó', 'Ô', 'Õ', 'Ò', 'O'],
+                U: ['Ú', 'Û', 'Ũ', 'Ù', 'U'],
+                C: ['Ç', 'C'],
+            };
+            allCharOptions.push(...charOptions[char]);
+            result += `[${allCharOptions.join('')}]`;
+        }
+        else {
+            result += char;
+        }
+    }
+    return result;
+};
+FilterOptionHelper.removeAccents = (text) => {
+    return text.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
 };
 
 class BindFilterQueryHelper {
@@ -3893,8 +3932,14 @@ BindFilterQueryHelper.BuildOperatorSentence = (options, fieldOption) => ({
 BindFilterQueryHelper.GetHasuraOperator = (options, fieldOption) => FilterOptionHelper.CheckIfIsFilterOption(options)
     ? fieldOption.type === HasuraGraphQLColumnType.Jsonb
         ? BindFilterQueryHelper.GetHasuraJsonbOperator(options)
-        : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find((graphQLOperator) => graphQLOperator ===
-            Object.keys(Where).find((operator) => Where[operator] === (options === null || options === void 0 ? void 0 : options.operator)))]
+        : options.operator === Where.LIKE && options.ignoreCase && options.ignoreAccent
+            ? HasuraGraphQLWhere.IREGEX
+            : options.operator === Where.LIKE && options.ignoreAccent
+                ? HasuraGraphQLWhere.REGEX
+                : options.operator === Where.LIKE && options.ignoreCase
+                    ? HasuraGraphQLWhere.ILIKE
+                    : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find((graphQLOperator) => graphQLOperator ===
+                        Object.keys(Where).find((operator) => Where[operator] === (options === null || options === void 0 ? void 0 : options.operator)))]
     : HasuraGraphQLWhere.EQUALS;
 BindFilterQueryHelper.GetHasuraJsonbOperator = (options) => options.operator === Where.IN
     ? HasuraGraphQLWhere.JSON_CONTAINS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect",
-  "version": "4.4.1-beta.1",
+  "version": "4.5.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

package/src/domain/generic/repository/enums/where.enum.d.ts

@@ -10,5 +10,6 @@ export declare enum Where {
     LIKE = "like",
     NOTLIKE = "not like",
     ISNULL = "is null",
-    ISNOTNULL = "is not null"
+    ISNOTNULL = "is not null",
+    IREGEX = "iregex"
 }

package/src/domain/generic/repository/types/repository-find-filters.type.d.ts

@@ -5,6 +5,8 @@ import { Where } from '../enums/where.enum';
 export type RepositoryFindFieltersOptions<Model, FieldName extends keyof Model> = {
     operator: Where;
     value?: PropType<Model, FieldName> | PropType<Model, FieldName>[];
+    ignoreCase?: boolean;
+    ignoreAccent?: boolean;
 };
 export type RepositoryFindField<Model, FieldName extends keyof Model> = RepositoryFindFieltersOptions<Model, FieldName> | RepositoryFindFieltersOptions<Model, FieldName>[] | Partial<PropType<Model, FieldName>>;
 export type NestedRepositoryFindFieltersOptions<Model> = {

package/src/domain/shopping/models/line-item.d.ts

@@ -4,7 +4,5 @@ export declare class LineItem extends Product {
     quantity: number;
     isGift?: boolean;
     pricePaid?: number;
-    discount?: number;
     image?: string;
-    get pricePaidWithDiscount(): number;
 }

package/src/infra/hasura-graphql/enums/hasura-graphql-where.enum.d.ts

@@ -7,9 +7,12 @@ export declare enum HasuraGraphQLWhere {
     LT = "_lt",
     LTE = "_lte",
     LIKE = "_like",
+    ILIKE = "_ilike",
     NOTLIKE = "_nlike",
     ISNULL = "_is_null",
     ISNOTNULL = "_is_null",
     JSON_CONTAINS = "_contains",
-    JSON_HAS_KEYS_ANY = "_has_keys_any"
+    JSON_HAS_KEYS_ANY = "_has_keys_any",
+    IREGEX = "_iregex",
+    REGEX = "_regex"
 }

package/src/infra/hasura-graphql/mixins/helpers/filter-option.helper.d.ts

@@ -5,4 +5,6 @@ export declare class FilterOptionHelper {
         identifiersFields: any[];
     }, any>>(filter: any) => filter is RepositoryFindFieltersOptions<Model, any>;
     static GetValueFromFilter: <Model extends ModelBaseStructure<Model, Model["identifiersFields"][number]>>(filter: RepositoryFindFieltersOptions<Model, any>, fieldOption: ColumnOptions<any, any>) => any;
+    private static buildInsensitiveSentence;
+    private static removeAccents;
 }