@ruiapp/rapid-core 0.8.16 → 0.8.18

package/dist/dataAccess/dataAccessTypes.d.ts

@@ -1,5 +1,5 @@
 export type DataAccessPgColumnTypes = "int4" | "int8" | "float4" | "float8" | "decimal" | "text" | "text[]" | "bool" | "date" | "time" | "timestamptz" | "jsonb";
-export type RowFilterRelationalOperators = "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "contains" | "notContains" | "containsCS" | "notContainsCS" | "startsWith" | "notStartsWith" | "endsWith" | "notEndsWith";
+export type RowFilterRelationalOperators = "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "matches" | "matchesCS" | "contains" | "notContains" | "containsCS" | "notContainsCS" | "startsWith" | "notStartsWith" | "endsWith" | "notEndsWith";
 export type RowFilterArrayOperators = "arrayContains" | "arrayOverlap";
 export type RowFilterSetOperators = "in" | "notIn";
 export type RowFilterRangeOperators = "between";

package/dist/index.js

@@ -522,12 +522,24 @@ function buildFilterQuery(level, ctx, filter) {
     else if (operator === "between") {
         return buildRangeFilterQuery(ctx, filter);
     }
+    else if (operator === "matches") {
+        return buildMatchesFilterQuery(ctx, filter);
+    }
+    else if (operator === "matchesCS") {
+        return buildMatchesCSFilterQuery(ctx, filter);
+    }
     else if (operator === "contains") {
         return buildContainsFilterQuery(ctx, filter);
     }
+    else if (operator === "containsCS") {
+        return buildContainsCSFilterQuery(ctx, filter);
+    }
     else if (operator === "notContains") {
         return buildNotContainsFilterQuery(ctx, filter);
     }
+    else if (operator === "notContainsCS") {
+        return buildNotContainsCSFilterQuery(ctx, filter);
+    }
     else if (operator === "startsWith") {
         return buildStartsWithFilterQuery(ctx, filter);
     }
@@ -612,6 +624,34 @@ function buildRangeFilterQuery(ctx, filter) {
     }
     return command;
 }
+function convertSearchTextToLikeParamValue(searchText) {
+    if (lodash.isNil(searchText)) {
+        return searchText;
+    }
+    let result = searchText.replace(/\*/g, "%");
+    result = result.replace(/\?/g, "_");
+    return result;
+}
+function buildMatchesFilterQuery(ctx, filter) {
+    let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+    command += " ILIKE ";
+    if (ctx.paramToLiteral) ;
+    else {
+        ctx.params.push(`%${convertSearchTextToLikeParamValue(filter.value)}%`);
+        command += "$" + ctx.params.length;
+    }
+    return command;
+}
+function buildMatchesCSFilterQuery(ctx, filter) {
+    let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+    command += " LIKE ";
+    if (ctx.paramToLiteral) ;
+    else {
+        ctx.params.push(`%${convertSearchTextToLikeParamValue(filter.value)}%`);
+        command += "$" + ctx.params.length;
+    }
+    return command;
+}
 function buildContainsFilterQuery(ctx, filter) {
     let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
     command += " ILIKE ";
@@ -622,6 +662,16 @@ function buildContainsFilterQuery(ctx, filter) {
     }
     return command;
 }
+function buildContainsCSFilterQuery(ctx, filter) {
+    let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+    command += " LIKE ";
+    if (ctx.paramToLiteral) ;
+    else {
+        ctx.params.push(`%${filter.value}%`);
+        command += "$" + ctx.params.length;
+    }
+    return command;
+}
 function buildNotContainsFilterQuery(ctx, filter) {
     let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
     command += " NOT ILIKE ";
@@ -632,6 +682,16 @@ function buildNotContainsFilterQuery(ctx, filter) {
     }
     return command;
 }
+function buildNotContainsCSFilterQuery(ctx, filter) {
+    let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+    command += " NOT LIKE ";
+    if (ctx.paramToLiteral) ;
+    else {
+        ctx.params.push(`%${filter.value}%`);
+        command += "$" + ctx.params.length;
+    }
+    return command;
+}
 function buildStartsWithFilterQuery(ctx, filter) {
     let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
     command += " ILIKE ";
@@ -6829,7 +6889,7 @@ async function handler$d(plugin, ctx, options) {
             },
             {
                 operator: "null",
-                field: "deletedAt",
+                field: "deleted_at",
             },
         ],
     }, routeContext?.getDbTransactionClient());

package/dist/types.d.ts

@@ -481,7 +481,7 @@ export interface IRpdDataAccessor<T = any> {
     count(options: CountRowOptions, databaseClient: IDatabaseClient | null): Promise<number>;
     deleteById(id: any, databaseClient: IDatabaseClient | null): Promise<void>;
 }
-export type EntityFilterRelationalOperators = "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "contains" | "notContains" | "containsCS" | "notContainsCS" | "startsWith" | "notStartsWith" | "endsWith" | "notEndsWith";
+export type EntityFilterRelationalOperators = "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "matches" | "matchesCS" | "contains" | "notContains" | "containsCS" | "notContainsCS" | "startsWith" | "notStartsWith" | "endsWith" | "notEndsWith";
 export type EntityFilterArrayOperators = "arrayContains" | "arrayOverlap";
 export type EntityFilterSetOperators = "in" | "notIn";
 export type EntityFilterLogicalOperators = "or" | "and";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.8.16",
+  "version": "0.8.18",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dataAccess/dataAccessTypes.ts

@@ -19,6 +19,8 @@ export type RowFilterRelationalOperators =
   | "lte"
   | "gt"
   | "gte"
+  | "matches"
+  | "matchesCS"
   | "contains"
   | "notContains"
   | "containsCS"

package/src/plugins/auth/actionHandlers/createSession.ts

@@ -28,7 +28,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
         },
         {
           operator: "null",
-          field: "deletedAt",
+          field: "deleted_at",
         },
       ],
     },

package/src/queryBuilder/queryBuilder.ts

@@ -1,4 +1,4 @@
-import { find, isBoolean, isNull, isNumber, isString, isUndefined } from "lodash";
+import { find, isBoolean, isNil, isNull, isNumber, isString, isUndefined } from "lodash";
 import { RpdDataModel, RpdDataModelProperty, CreateEntityOptions, QuoteTableOptions, DatabaseQuery, IQueryBuilder } from "../types";
 import {
   CountRowOptions,
@@ -420,10 +420,18 @@ function buildFilterQuery(level: number, ctx: BuildQueryContext, filter: RowFilt
     return buildInFilterQuery(ctx, filter);
   } else if (operator === "between") {
     return buildRangeFilterQuery(ctx, filter);
+  } else if (operator === "matches") {
+    return buildMatchesFilterQuery(ctx, filter);
+  } else if (operator === "matchesCS") {
+    return buildMatchesCSFilterQuery(ctx, filter);
   } else if (operator === "contains") {
     return buildContainsFilterQuery(ctx, filter);
+  } else if (operator === "containsCS") {
+    return buildContainsCSFilterQuery(ctx, filter);
   } else if (operator === "notContains") {
     return buildNotContainsFilterQuery(ctx, filter);
+  } else if (operator === "notContainsCS") {
+    return buildNotContainsCSFilterQuery(ctx, filter);
   } else if (operator === "startsWith") {
     return buildStartsWithFilterQuery(ctx, filter);
   } else if (operator === "notStartsWith") {
@@ -513,6 +521,46 @@ function buildRangeFilterQuery(ctx: BuildQueryContext, filter: FindRowRangeFilte
   return command;
 }
 
+function convertSearchTextToLikeParamValue(searchText: string) {
+  if (isNil(searchText)) {
+    return searchText;
+  }
+
+  let result = searchText.replace(/\*/g, "%");
+  result = result.replace(/\?/g, "_");
+  return result;
+}
+
+function buildMatchesFilterQuery(ctx: BuildQueryContext, filter: FindRowRelationalFilterOptions) {
+  let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+
+  command += " ILIKE ";
+
+  if (ctx.paramToLiteral) {
+    // TODO: implement it
+  } else {
+    ctx.params.push(`%${convertSearchTextToLikeParamValue(filter.value)}%`);
+    command += "$" + ctx.params.length;
+  }
+
+  return command;
+}
+
+function buildMatchesCSFilterQuery(ctx: BuildQueryContext, filter: FindRowRelationalFilterOptions) {
+  let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+
+  command += " LIKE ";
+
+  if (ctx.paramToLiteral) {
+    // TODO: implement it
+  } else {
+    ctx.params.push(`%${convertSearchTextToLikeParamValue(filter.value)}%`);
+    command += "$" + ctx.params.length;
+  }
+
+  return command;
+}
+
 function buildContainsFilterQuery(ctx: BuildQueryContext, filter: FindRowRelationalFilterOptions) {
   let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
 
@@ -528,6 +576,21 @@ function buildContainsFilterQuery(ctx: BuildQueryContext, filter: FindRowRelatio
   return command;
 }
 
+function buildContainsCSFilterQuery(ctx: BuildQueryContext, filter: FindRowRelationalFilterOptions) {
+  let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+
+  command += " LIKE ";
+
+  if (ctx.paramToLiteral) {
+    // TODO: implement it
+  } else {
+    ctx.params.push(`%${filter.value}%`);
+    command += "$" + ctx.params.length;
+  }
+
+  return command;
+}
+
 function buildNotContainsFilterQuery(ctx: BuildQueryContext, filter: FindRowRelationalFilterOptions) {
   let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
 
@@ -542,6 +605,20 @@ function buildNotContainsFilterQuery(ctx: BuildQueryContext, filter: FindRowRela
   return command;
 }
 
+function buildNotContainsCSFilterQuery(ctx: BuildQueryContext, filter: FindRowRelationalFilterOptions) {
+  let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+
+  command += " NOT LIKE ";
+  if (ctx.paramToLiteral) {
+    // TODO: implement it
+  } else {
+    ctx.params.push(`%${filter.value}%`);
+    command += "$" + ctx.params.length;
+  }
+
+  return command;
+}
+
 function buildStartsWithFilterQuery(ctx: BuildQueryContext, filter: FindRowRelationalFilterOptions) {
   let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
 

package/src/types.ts

@@ -591,6 +591,8 @@ export type EntityFilterRelationalOperators =
   | "lte"
   | "gt"
   | "gte"
+  | "matches"
+  | "matchesCS"
   | "contains"
   | "notContains"
   | "containsCS"