@ruiapp/rapid-core 0.2.3 → 0.2.5

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @ruiapp/rapid-core
+
+## 0.2.4
+
+### Patch Changes
+
+- 146a99d: add between filterMode, range is deprecated

package/dist/dataAccess/dataAccessTypes.d.ts

@@ -2,12 +2,13 @@ export type DataAccessPgColumnTypes = "int4" | "int8" | "float4" | "float8" | "d
 export type RowFilterRelationalOperators = "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "contains" | "notContains" | "containsCS" | "notContainsCS" | "startsWith" | "notStartsWith" | "endsWith" | "notEndsWith";
 export type RowFilterArrayOperators = "arrayContains" | "arrayOverlap";
 export type RowFilterSetOperators = "in" | "notIn";
+export type RowFilterRangeOperators = "between";
 export type RowFilterLogicalOperators = "or" | "and";
 export type RowFilterUnaryOperators = "null" | "notNull";
 export type RowFilterExistenceOperators = "exists" | "notExists";
-export type RowFilterOperators = RowFilterRelationalOperators | RowFilterArrayOperators | RowFilterSetOperators | RowFilterLogicalOperators | RowFilterUnaryOperators | RowFilterExistenceOperators;
-export type RowFilterOptions = FindRowRelationalFilterOptions | FindRowArrayFilterOptions | FindRowSetFilterOptions | FindRowLogicalFilterOptions | FindRowUnaryFilterOptions | FindRowExistenceFilterOptions;
-export type RowNonRelationPropertyFilterOptions = FindRowRelationalFilterOptions | FindRowArrayFilterOptions | FindRowSetFilterOptions | FindRowUnaryFilterOptions;
+export type RowFilterOperators = RowFilterRelationalOperators | RowFilterArrayOperators | RowFilterSetOperators | RowFilterRangeOperators | RowFilterLogicalOperators | RowFilterUnaryOperators | RowFilterExistenceOperators;
+export type RowFilterOptions = FindRowRelationalFilterOptions | FindRowArrayFilterOptions | FindRowSetFilterOptions | FindRowRangeFilterOptions | FindRowLogicalFilterOptions | FindRowUnaryFilterOptions | FindRowExistenceFilterOptions;
+export type RowNonRelationPropertyFilterOptions = FindRowRelationalFilterOptions | FindRowArrayFilterOptions | FindRowSetFilterOptions | FindRowRangeFilterOptions | FindRowUnaryFilterOptions;
 export type ColumnSelectOptions = string | ColumnNameWithTableName;
 export type ColumnNameWithTableName = {
     name: string;
@@ -38,6 +39,12 @@ export interface FindRowSetFilterOptions {
     value: any[];
     itemType?: string;
 }
+export interface FindRowRangeFilterOptions {
+    field: ColumnSelectOptions;
+    operator: RowFilterRangeOperators;
+    value: any[];
+    itemType?: string;
+}
 export interface FindRowLogicalFilterOptions {
     operator: RowFilterLogicalOperators;
     filters: RowFilterOptions[];

package/dist/index.js

@@ -202,8 +202,8 @@ const pgPropertyTypeColumnMap = {
     "image[]": "jsonb",
 };
 
-const objLeftQuoteChar = '"';
-const objRightQuoteChar = '"';
+const objLeftQuoteChar = "\"";
+const objRightQuoteChar = "\"";
 const relationalOperatorsMap = new Map([
     ["eq", "="],
     ["ne", "<>"],
@@ -369,7 +369,7 @@ class QueryBuilder {
             paramToLiteral: false,
         };
         let { filters } = options;
-        let command = 'SELECT COUNT(*)::int as "count" FROM ';
+        let command = "SELECT COUNT(*)::int as \"count\" FROM ";
         command += this.quoteTable(model);
         if (filters && filters.length) {
             command += " WHERE ";
@@ -389,7 +389,7 @@ class QueryBuilder {
             paramToLiteral: false,
         };
         let { filters } = options;
-        let command = 'SELECT COUNT(*)::int as "count" FROM ';
+        let command = "SELECT COUNT(*)::int as \"count\" FROM ";
         command += `${this.quoteTable(derivedModel)} LEFT JOIN ${this.quoteTable(baseModel)} ON ${this.quoteObject(derivedModel.tableName)}.id = ${this.quoteObject(baseModel.tableName)}.id`;
         if (filters && filters.length) {
             command += " WHERE ";
@@ -535,6 +535,9 @@ function buildFilterQuery(level, ctx, filter) {
     else if (operator === "in" || operator === "notIn") {
         return buildInFilterQuery(ctx, filter);
     }
+    else if (operator === "between") {
+        return buildRangeFilterQuery(ctx, filter);
+    }
     else if (operator === "contains") {
         return buildContainsFilterQuery(ctx, filter);
     }
@@ -607,6 +610,24 @@ function buildInFilterQuery(ctx, filter) {
     }
     return command;
 }
+function buildRangeFilterQuery(ctx, filter) {
+    let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+    if (filter.operator === "between") {
+        if (filter.value.length != 2) {
+            throw new Error(`Filter operator '${filter.operator}' need two values.`);
+        }
+        command += " BETWEEN ";
+        ctx.params.push(filter.value[0]);
+        command += `$${ctx.params.length}`;
+        command += " AND ";
+        ctx.params.push(filter.value[1]);
+        command += `$${ctx.params.length}`;
+    }
+    else {
+        throw new Error(`Filter operator '${filter.operator}' is not supported.`);
+    }
+    return command;
+}
 function buildContainsFilterQuery(ctx, filter) {
     let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
     command += " LIKE ";
@@ -2196,7 +2217,7 @@ function getEntityPartChanges(server, model, before, after) {
     let changes = {};
     for (const key in after) {
         const property = getEntityPropertyByCode(server, model, key);
-        if (isOneRelationProperty(property)) {
+        if (property && isOneRelationProperty(property)) {
             const afterValue = after[key];
             const beforeValue = before[key] || before[property.targetIdColumnName];
             if (afterValue) {

package/package.json

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

package/src/dataAccess/dataAccessTypes.ts

@@ -32,6 +32,8 @@ export type RowFilterArrayOperators = "arrayContains" | "arrayOverlap";
 
 export type RowFilterSetOperators = "in" | "notIn";
 
+export type RowFilterRangeOperators = "between";
+
 export type RowFilterLogicalOperators = "or" | "and";
 
 export type RowFilterUnaryOperators = "null" | "notNull";
@@ -42,6 +44,7 @@ export type RowFilterOperators =
   | RowFilterRelationalOperators
   | RowFilterArrayOperators
   | RowFilterSetOperators
+  | RowFilterRangeOperators
   | RowFilterLogicalOperators
   | RowFilterUnaryOperators
   | RowFilterExistenceOperators;
@@ -50,6 +53,7 @@ export type RowFilterOptions =
   | FindRowRelationalFilterOptions
   | FindRowArrayFilterOptions
   | FindRowSetFilterOptions
+  | FindRowRangeFilterOptions
   | FindRowLogicalFilterOptions
   | FindRowUnaryFilterOptions
   | FindRowExistenceFilterOptions;
@@ -58,6 +62,7 @@ export type RowNonRelationPropertyFilterOptions =
   | FindRowRelationalFilterOptions
   | FindRowArrayFilterOptions
   | FindRowSetFilterOptions
+  | FindRowRangeFilterOptions
   | FindRowUnaryFilterOptions;
 
 export type ColumnSelectOptions = string | ColumnNameWithTableName;
@@ -98,6 +103,13 @@ export interface FindRowSetFilterOptions {
   itemType?: string;
 }
 
+export interface FindRowRangeFilterOptions {
+  field: ColumnSelectOptions;
+  operator: RowFilterRangeOperators;
+  value: any[];
+  itemType?: string;
+}
+
 export interface FindRowLogicalFilterOptions {
   operator: RowFilterLogicalOperators;
   filters: RowFilterOptions[];

package/src/helpers/entityHelpers.ts

@@ -16,7 +16,7 @@ export function getEntityPartChanges(server: IRpdServer, model: RpdDataModel, be
   let changes = {};
   for (const key in after) {
     const property = getEntityPropertyByCode(server, model, key);
-    if (isOneRelationProperty(property)) {
+    if (property && isOneRelationProperty(property)) {
       const afterValue: number | { id: number } | null = after[key];
       const beforeValue: number | { id: number } | null = before[key] || before[property.targetIdColumnName];
       if (afterValue) {

package/src/queryBuilder/queryBuilder.ts

@@ -15,11 +15,12 @@ import {
   ColumnNameWithTableName,
   DataAccessPgColumnTypes,
   FindRowArrayFilterOptions,
+  FindRowRangeFilterOptions,
 } from "~/dataAccess/dataAccessTypes";
 import { pgPropertyTypeColumnMap } from "~/dataAccess/columnTypeMapper";
 
-const objLeftQuoteChar = '"';
-const objRightQuoteChar = '"';
+const objLeftQuoteChar = "\"";
+const objRightQuoteChar = "\"";
 
 const relationalOperatorsMap = new Map<RowFilterRelationalOperators, string>([
   ["eq", "="],
@@ -222,7 +223,7 @@ export default class QueryBuilder {
       paramToLiteral: false,
     };
     let { filters } = options;
-    let command = 'SELECT COUNT(*)::int as "count" FROM ';
+    let command = "SELECT COUNT(*)::int as \"count\" FROM ";
 
     command += this.quoteTable(model);
 
@@ -246,7 +247,7 @@ export default class QueryBuilder {
       paramToLiteral: false,
     };
     let { filters } = options;
-    let command = 'SELECT COUNT(*)::int as "count" FROM ';
+    let command = "SELECT COUNT(*)::int as \"count\" FROM ";
 
     command += `${this.quoteTable(derivedModel)} LEFT JOIN ${this.quoteTable(baseModel)} ON ${this.quoteObject(derivedModel.tableName)}.id = ${this.quoteObject(
       baseModel.tableName,
@@ -413,6 +414,8 @@ function buildFilterQuery(level: number, ctx: BuildQueryContext, filter: RowFilt
     return buildUnaryFilterQuery(ctx, filter);
   } else if (operator === "in" || operator === "notIn") {
     return buildInFilterQuery(ctx, filter);
+  } else if (operator === "between") {
+    return buildRangeFilterQuery(ctx, filter);
   } else if (operator === "contains") {
     return buildContainsFilterQuery(ctx, filter);
   } else if (operator === "notContains") {
@@ -482,6 +485,31 @@ function buildInFilterQuery(ctx: BuildQueryContext, filter: FindRowSetFilterOpti
   return command;
 }
 
+function buildRangeFilterQuery(ctx: BuildQueryContext, filter: FindRowRangeFilterOptions) {
+  let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);
+
+  if (filter.operator === "between") {
+    if (filter.value.length != 2) {
+      throw new Error(`Filter operator '${filter.operator}' need two values.`);
+    }
+
+    command += " BETWEEN ";
+
+    ctx.params.push(filter.value[0]);
+    command += `$${ctx.params.length}`;
+
+    command += " AND "
+
+    ctx.params.push(filter.value[1]);
+    command += `$${ctx.params.length}`;
+
+  } else {
+    throw new Error(`Filter operator '${filter.operator}' is not supported.`);
+  }
+
+  return command;
+}
+
 function buildContainsFilterQuery(ctx: BuildQueryContext, filter: FindRowRelationalFilterOptions) {
   let command = ctx.builder.quoteColumn(ctx.model, filter.field, ctx.emitTableAlias);