@rebasepro/common 0.2.5 → 0.4.0

package/dist/data/query_builder.d.ts

@@ -1,4 +1,7 @@
-import { FindResponse, CollectionAccessor, QueryBuilderInterface, FilterOperator } from "@rebasepro/types";
+import { FindResponse, CollectionAccessor, QueryBuilderInterface, FilterOperator, LogicalCondition, WhereValue, FilterCondition } from "@rebasepro/types";
+export declare function or(...conditions: (FilterCondition | LogicalCondition)[]): LogicalCondition;
+export declare function and(...conditions: (FilterCondition | LogicalCondition)[]): LogicalCondition;
+export declare function cond(column: string, operator: FilterOperator, value: unknown): FilterCondition;
 export declare class QueryBuilder<M extends Record<string, unknown> = Record<string, unknown>> implements QueryBuilderInterface<M> {
     private collection;
     private params;
@@ -8,7 +11,8 @@ export declare class QueryBuilder<M extends Record<string, unknown> = Record<str
      * @example
      * client.collection('users').where('age', '>=', 18).find()
      */
-    where(column: keyof M & string, operator: FilterOperator, value: unknown): this;
+    where<K extends keyof M & string>(column: K, operator: FilterOperator, value: WhereValue<M[K]>): this;
+    where(logicalCondition: LogicalCondition): this;
     /**
      * Order the results by a specific column.
      * @example

package/dist/index.es.js

@@ -1973,6 +1973,13 @@ const defaultUsersCollection = {
   group: "Settings",
   openEntityMode: "dialog",
   disableDefaultActions: ["copy"],
+  securityRules: [{
+    operation: "select",
+    roles: ["admin"]
+  }, {
+    operations: ["insert", "update", "delete"],
+    roles: ["admin"]
+  }],
   sort: ["createdAt", "desc"],
   properties: {
     id: {
@@ -2079,6 +2086,7 @@ const defaultUsersCollection = {
       name: "Created At",
       type: "date",
       columnName: "created_at",
+      autoValue: "on_create",
       ui: {
         readOnly: true
       }
@@ -2099,29 +2107,24 @@ const defaultUsersCollection = {
   listProperties: ["displayName", "email", "roles", "createdAt"],
   propertiesOrder: ["id", "email", "displayName", "roles", "createdAt"]
 };
-function mapOperator(op) {
-  switch (op) {
-    case "==":
-      return "eq";
-    case "!=":
-      return "neq";
-    case ">":
-      return "gt";
-    case ">=":
-      return "gte";
-    case "<":
-      return "lt";
-    case "<=":
-      return "lte";
-    case "array-contains":
-      return "cs";
-    case "array-contains-any":
-      return "csa";
-    case "not-in":
-      return "nin";
-    default:
-      return op;
-  }
+function or(...conditions) {
+  return {
+    type: "or",
+    conditions
+  };
+}
+function and(...conditions) {
+  return {
+    type: "and",
+    conditions
+  };
+}
+function cond(column, operator, value) {
+  return {
+    column,
+    operator,
+    value
+  };
 }
 class QueryBuilder {
   constructor(collection) {
@@ -2130,23 +2133,30 @@ class QueryBuilder {
   params = {
     where: {}
   };
-  /**
-   * Add a filter condition to your query.
-   * @example
-   * client.collection('users').where('age', '>=', 18).find()
-   */
-  where(column, operator, value) {
+  where(columnOrCondition, operator, value) {
+    if (typeof columnOrCondition === "object" && columnOrCondition !== null && "type" in columnOrCondition) {
+      this.params.logical = columnOrCondition;
+      return this;
+    }
     if (!this.params.where) {
       this.params.where = {};
     }
-    const mappedOp = mapOperator(operator);
-    let formattedValue = value;
-    if (Array.isArray(value) && ["in", "nin", "cs", "csa"].includes(mappedOp)) {
-      formattedValue = `(${value.join(",")})`;
-    } else if (value === null) {
-      formattedValue = "null";
+    const column = columnOrCondition;
+    const condition = [operator, value];
+    const existing = this.params.where[column];
+    if (existing === void 0) {
+      this.params.where[column] = condition;
+    } else if (Array.isArray(existing) && existing.length > 0 && Array.isArray(existing[0])) {
+      this.params.where[column].push(condition);
+    } else {
+      let firstCondition;
+      if (Array.isArray(existing) && existing.length === 2 && typeof existing[0] === "string") {
+        firstCondition = existing;
+      } else {
+        firstCondition = ["==", existing];
+      }
+      this.params.where[column] = [firstCondition, condition];
     }
-    this.params.where[column] = mappedOp === "eq" ? String(formattedValue) : `${mappedOp}.${formattedValue}`;
     return this;
   }
   /**
@@ -2248,10 +2258,13 @@ function convertWhereToFilter(where) {
       filter[field] = ["==", rawValue];
       continue;
     }
-    if (Array.isArray(rawValue) && rawValue.length === 2) {
-      const [rawOp, val] = rawValue;
-      const mappedOp = operatorMap[rawOp] ?? "==";
-      filter[field] = [mappedOp, val];
+    if (Array.isArray(rawValue)) {
+      const conditions = Array.isArray(rawValue[0]) ? rawValue : [rawValue];
+      const mappedConditions = conditions.map(([rawOp, val]) => {
+        const mappedOp = operatorMap[rawOp] ?? "==";
+        return [mappedOp, val];
+      });
+      filter[field] = Array.isArray(rawValue[0]) ? mappedConditions : mappedConditions[0];
       continue;
     }
     if (typeof rawValue === "string") {
@@ -2389,8 +2402,12 @@ function createDriverAccessor(driver, slug) {
       });
     } : void 0,
     // Fluent Query Builder
-    where(column, operator, value) {
-      return new QueryBuilder(accessor).where(column, operator, value);
+    where(columnOrCondition, operator, value) {
+      const builder = new QueryBuilder(accessor);
+      if (typeof columnOrCondition === "object") {
+        return builder.where(columnOrCondition);
+      }
+      return builder.where(columnOrCondition, operator, value);
     },
     orderBy(column, ascending) {
       return new QueryBuilder(accessor).orderBy(column, ascending);
@@ -2440,6 +2457,7 @@ export {
   DEFAULT_ONE_OF_VALUE,
   QueryBuilder,
   addInitialSlash,
+  and,
   applyPropertyConditions,
   buildAdditionalFieldDelegate,
   buildCollection,
@@ -2457,6 +2475,7 @@ export {
   canEditEntity,
   canReadCollection,
   checkOperation,
+  cond,
   createRelationRef,
   createRelationRefWithData,
   defaultUsersCollection,
@@ -2488,6 +2507,7 @@ export {
   isPropertyBuilder,
   isReadOnly,
   normalizeToEntityRelation,
+  or,
   registerConditionOperations,
   removeInitialAndTrailingSlashes,
   removeInitialSlash,