@rebasepro/server-core 0.2.1 → 0.2.3

package/dist/common/src/data/query_builder.d.ts

@@ -0,0 +1,51 @@
+import { FindResponse, CollectionAccessor, QueryBuilderInterface, FilterOperator } from "@rebasepro/types";
+export declare class QueryBuilder<M extends Record<string, unknown> = Record<string, unknown>> implements QueryBuilderInterface<M> {
+    private collection;
+    private params;
+    constructor(collection: CollectionAccessor<M>);
+    /**
+     * Add a filter condition to your query.
+     * @example
+     * client.collection('users').where('age', '>=', 18).find()
+     */
+    where(column: keyof M & string, operator: FilterOperator, value: unknown): this;
+    /**
+     * Order the results by a specific column.
+     * @example
+     * client.collection('users').orderBy('createdAt', 'desc').find()
+     */
+    orderBy(column: keyof M & string, ascending?: "asc" | "desc"): this;
+    /**
+     * Limit the number of results returned.
+     */
+    limit(count: number): this;
+    /**
+     * Skip the first N results.
+     */
+    offset(count: number): this;
+    /**
+     * Set a free-text search string if supported by the backend.
+     */
+    search(searchString: string): this;
+    /**
+     * Include related entities in the response.
+     * Relations will be populated with full entity data instead of just IDs.
+     *
+     * @param relations - Relation names to include, or "*" for all.
+     * @example
+     * // Include specific relations
+     * client.data.posts.include("tags", "author").find()
+     *
+     * // Include all relations
+     * client.data.posts.include("*").find()
+     */
+    include(...relations: string[]): this;
+    /**
+     * Execute the find query and return the results.
+     */
+    find(): Promise<FindResponse<M>>;
+    /**
+     * Listen to realtime updates matching this query.
+     */
+    listen(onUpdate: (data: FindResponse<M>) => void, onError?: (error: Error) => void): () => void;
+}

package/dist/common/src/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./util";
 export * from "./collections";
 export * from "./data/buildRebaseData";
+export * from "./data/query_builder";

package/dist/index.es.js

@@ -1165,42 +1165,6 @@ function enumToObjectEntries(enumValues) {
     });
   }
 }
-function getSubcollections(collection) {
-  if (collection.childCollections) {
-    return collection.childCollections() ?? [];
-  }
-  if (getDataSourceCapabilities(collection.driver).supportsSubcollections && collection.subcollections) {
-    return collection.subcollections() ?? [];
-  }
-  if (getDataSourceCapabilities(collection.driver).supportsRelations && collection.relations) {
-    const manyRelations = collection.relations.filter((r) => r.cardinality === "many");
-    return manyRelations.map((r) => {
-      const target = r.target();
-      if (!target) return void 0;
-      const relationKey = r.relationName || target.slug;
-      let customName;
-      if (collection.properties) {
-        const prop = Object.entries(collection.properties).find(([_, p]) => p.type === "relation" && p.relationName === relationKey);
-        if (prop && prop[1].name) {
-          customName = prop[1].name;
-        }
-      }
-      const baseOverrides = {
-        slug: relationKey
-      };
-      if (customName) {
-        baseOverrides.name = customName;
-        baseOverrides.singularName = customName;
-      }
-      const targetWithOverrides = {
-        ...target,
-        ...baseOverrides
-      };
-      return r.overrides ? mergeDeep(targetWithOverrides, r.overrides) : targetWithOverrides;
-    }).filter((c) => Boolean(c));
-  }
-  return [];
-}
 function sanitizeRelation(relation, sourceCollection, resolveCollection) {
   if (!relation.target) {
     throw new Error("Relation is missing a `target` collection.");
@@ -1232,6 +1196,8 @@ function sanitizeRelation(relation, sourceCollection, resolveCollection) {
     } else {
       targetCollection = evaluated;
     }
+  } else if (rawTarget && typeof rawTarget === "object") {
+    targetCollection = rawTarget;
   }
   if (!targetCollection) {
     throw new Error("Relation is missing a valid `target` collection.");
@@ -1351,11 +1317,14 @@ function resolveCollectionRelations(collection) {
   const registeredRelationNames = /* @__PURE__ */ new Set();
   if (relCollection.relations) {
     relCollection.relations.forEach((relation) => {
-      const normalizedRelation = sanitizeRelation(relation, collection);
-      const relationKey = normalizedRelation.relationName;
-      if (relationKey) {
-        relations[relationKey] = normalizedRelation;
-        registeredRelationNames.add(relationKey);
+      try {
+        const normalizedRelation = sanitizeRelation(relation, collection);
+        const relationKey = normalizedRelation.relationName;
+        if (relationKey) {
+          relations[relationKey] = normalizedRelation;
+          registeredRelationNames.add(relationKey);
+        }
+      } catch (e) {
       }
     });
   }
@@ -1403,12 +1372,8 @@ function resolvePropertyRelation({
       overrides: relProp.overrides
     };
   }
-  const relation = (sourceCollection.relations ?? []).find((rel) => rel.relationName === relProp.relationName);
-  if (!relation) {
-    console.warn(`Unrecognized relation format for property '${propertyKey}' in collection '${sourceCollection.slug}'`);
-    return void 0;
-  }
-  return relation;
+  console.warn(`Unrecognized or missing relation target for property '${propertyKey}' in collection '${sourceCollection.slug}'`);
+  return void 0;
 }
 function getTableName(collection) {
   if (getDataSourceCapabilities(collection.driver).supportsRelations) {
@@ -1424,6 +1389,43 @@ function findRelation(resolvedRelations, key) {
   if (snakeKey !== key && resolvedRelations[snakeKey]) return resolvedRelations[snakeKey];
   return void 0;
 }
+function getSubcollections(collection) {
+  if (collection.childCollections) {
+    return collection.childCollections() ?? [];
+  }
+  if (getDataSourceCapabilities(collection.driver).supportsSubcollections && collection.subcollections) {
+    return collection.subcollections() ?? [];
+  }
+  if (getDataSourceCapabilities(collection.driver).supportsRelations) {
+    const resolvedRelations = resolveCollectionRelations(collection);
+    const manyRelations = Object.values(resolvedRelations).filter((r) => r.cardinality === "many");
+    return manyRelations.map((r) => {
+      const target = r.target();
+      if (!target) return void 0;
+      const relationKey = r.relationName || target.slug;
+      let customName;
+      if (collection.properties) {
+        const prop = Object.entries(collection.properties).find(([_, p]) => p.type === "relation" && p.relationName === relationKey);
+        if (prop && prop[1].name) {
+          customName = prop[1].name;
+        }
+      }
+      const baseOverrides = {
+        slug: relationKey
+      };
+      if (customName) {
+        baseOverrides.name = customName;
+        baseOverrides.singularName = customName;
+      }
+      const targetWithOverrides = {
+        ...target,
+        ...baseOverrides
+      };
+      return r.overrides ? mergeDeep(targetWithOverrides, r.overrides) : targetWithOverrides;
+    }).filter((c) => Boolean(c));
+  }
+  return [];
+}
 var logic = { exports: {} };
 (function(module, exports) {
   (function(root, factory) {
@@ -2331,8 +2333,18 @@ class CollectionRegistry {
     const mergedRelationsRaw = [...extractedRelations];
     for (const manual of manualRelations) {
       const name2 = manual.relationName;
-      if (!name2 || !mergedRelationsRaw.find((r) => r.relationName === name2)) {
+      if (!name2) {
         mergedRelationsRaw.push(manual);
+      } else {
+        const existingIndex = mergedRelationsRaw.findIndex((r) => r.relationName === name2);
+        if (existingIndex === -1) {
+          mergedRelationsRaw.push(manual);
+        } else {
+          mergedRelationsRaw[existingIndex] = {
+            ...manual,
+            ...mergedRelationsRaw[existingIndex]
+          };
+        }
       }
     }
     let mergedRelations = mergedRelationsRaw;
@@ -2552,6 +2564,118 @@ class CollectionRegistry {
     };
   }
 }
+function mapOperator$1(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;
+  }
+}
+class QueryBuilder {
+  constructor(collection) {
+    this.collection = collection;
+  }
+  params = {
+    where: {}
+  };
+  /**
+   * Add a filter condition to your query.
+   * @example
+   * client.collection('users').where('age', '>=', 18).find()
+   */
+  where(column, operator, value) {
+    if (!this.params.where) {
+      this.params.where = {};
+    }
+    const mappedOp = mapOperator$1(operator);
+    let formattedValue = value;
+    if (Array.isArray(value) && ["in", "nin", "cs", "csa"].includes(mappedOp)) {
+      formattedValue = `(${value.join(",")})`;
+    } else if (value === null) {
+      formattedValue = "null";
+    }
+    this.params.where[column] = mappedOp === "eq" ? String(formattedValue) : `${mappedOp}.${formattedValue}`;
+    return this;
+  }
+  /**
+   * Order the results by a specific column.
+   * @example
+   * client.collection('users').orderBy('createdAt', 'desc').find()
+   */
+  orderBy(column, ascending = "asc") {
+    this.params.orderBy = `${column}:${ascending}`;
+    return this;
+  }
+  /**
+   * Limit the number of results returned.
+   */
+  limit(count) {
+    this.params.limit = count;
+    return this;
+  }
+  /**
+   * Skip the first N results.
+   */
+  offset(count) {
+    this.params.offset = count;
+    return this;
+  }
+  /**
+   * Set a free-text search string if supported by the backend.
+   */
+  search(searchString) {
+    this.params.searchString = searchString;
+    return this;
+  }
+  /**
+   * Include related entities in the response.
+   * Relations will be populated with full entity data instead of just IDs.
+   *
+   * @param relations - Relation names to include, or "*" for all.
+   * @example
+   * // Include specific relations
+   * client.data.posts.include("tags", "author").find()
+   *
+   * // Include all relations
+   * client.data.posts.include("*").find()
+   */
+  include(...relations) {
+    this.params.include = relations;
+    return this;
+  }
+  /**
+   * Execute the find query and return the results.
+   */
+  async find() {
+    return this.collection.find(this.params);
+  }
+  /**
+   * Listen to realtime updates matching this query.
+   */
+  listen(onUpdate, onError) {
+    if (!this.collection.listen) {
+      throw new Error("Listen is only available when RebaseClient is configured with a websocketUrl.");
+    }
+    return this.collection.listen(this.params, onUpdate, onError);
+  }
+}
 class BackendCollectionRegistry extends CollectionRegistry {
   /**
    * Get the available relation keys for a given collection path.
@@ -2779,7 +2903,7 @@ function codeToStatus(code2) {
   };
   return map2[code2];
 }
-function mapOperator$1(op) {
+function mapOperator(op) {
   switch (op) {
     case "eq":
       return "==";
@@ -2824,7 +2948,7 @@ function parseQueryOptions(query) {
       if (parts.length >= 2) {
         const op = parts[0];
         const val = parts.slice(1).join(".");
-        const rebaseOp = mapOperator$1(op);
+        const rebaseOp = mapOperator(op);
         if (rebaseOp) {
           let parsedVal = val;
           if (val === "true") parsedVal = true;
@@ -24998,118 +25122,6 @@ function createCron(transport, options2) {
     toggleJob
   };
 }
-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;
-  }
-}
-class QueryBuilder {
-  constructor(collection) {
-    this.collection = collection;
-  }
-  params = {
-    where: {}
-  };
-  /**
-   * Add a filter condition to your query.
-   * @example
-   * client.collection('users').where('age', '>=', 18).find()
-   */
-  where(column, operator, value) {
-    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";
-    }
-    this.params.where[column] = mappedOp === "eq" ? String(formattedValue) : `${mappedOp}.${formattedValue}`;
-    return this;
-  }
-  /**
-   * Order the results by a specific column.
-   * @example
-   * client.collection('users').orderBy('createdAt', 'desc').find()
-   */
-  orderBy(column, ascending = "asc") {
-    this.params.orderBy = `${column}:${ascending}`;
-    return this;
-  }
-  /**
-   * Limit the number of results returned.
-   */
-  limit(count) {
-    this.params.limit = count;
-    return this;
-  }
-  /**
-   * Skip the first N results.
-   */
-  offset(count) {
-    this.params.offset = count;
-    return this;
-  }
-  /**
-   * Set a free-text search string if supported by the backend.
-   */
-  search(searchString) {
-    this.params.searchString = searchString;
-    return this;
-  }
-  /**
-   * Include related entities in the response.
-   * Relations will be populated with full entity data instead of just IDs.
-   *
-   * @param relations - Relation names to include, or "*" for all.
-   * @example
-   * // Include specific relations
-   * client.data.posts.include("tags", "author").find()
-   *
-   * // Include all relations
-   * client.data.posts.include("*").find()
-   */
-  include(...relations) {
-    this.params.include = relations;
-    return this;
-  }
-  /**
-   * Execute the find query and return the results.
-   */
-  async find() {
-    return this.collection.find(this.params);
-  }
-  /**
-   * Listen to realtime updates matching this query.
-   */
-  listen(onUpdate, onError) {
-    if (!this.collection.listen) {
-      throw new Error("Listen is only available when RebaseClient is configured with a websocketUrl.");
-    }
-    return this.collection.listen(this.params, onUpdate, onError);
-  }
-}
 function rowToEntity(row, slug) {
   return {
     id: row.id,