@getstrata/core 0.5.97 → 0.5.99

package/dist/entries/database/query.js

@@ -74,7 +74,7 @@ function buildOperatorClauses(column, operator, params) {
     clauses.push(`${column} <= ${pushParam(params, operator.lte)}`);
   }
   if (operator.ilike !== undefined) {
-    clauses.push(`${column} ILIKE ${pushParam(params, `%${operator.ilike}%`)}`);
+    clauses.push(`${column} ILIKE ${pushParam(params, operator.ilike)}`);
   }
   if (operator.tsMatch !== undefined) {
     clauses.push(`${column} @@ plainto_tsquery('english', ${pushParam(params, operator.tsMatch)})`);
@@ -112,7 +112,16 @@ function buildWhereClause(tableName, where = {}) {
     params
   };
 }
+function remapExistsSql(sql, existsParams, params) {
+  const offset = params.length;
+  params.push(...existsParams);
+  return sql.replace(/\$(\d+)/g, (_match, index) => `$${offset + Number(index)}`);
+}
 function buildWhereNodeClause(tableName, node, params) {
+  if ("exists" in node) {
+    const body = remapExistsSql(node.exists.sql, node.exists.params, params);
+    return `${node.exists.not ? "NOT " : ""}EXISTS (${body})`;
+  }
   if ("where" in node) {
     return appendWhereParts(tableName, node.where, params);
   }

package/dist/entries/database/repositoryQuery.js

@@ -74,7 +74,7 @@ function buildOperatorClauses(column, operator, params) {
     clauses.push(`${column} <= ${pushParam(params, operator.lte)}`);
   }
   if (operator.ilike !== undefined) {
-    clauses.push(`${column} ILIKE ${pushParam(params, `%${operator.ilike}%`)}`);
+    clauses.push(`${column} ILIKE ${pushParam(params, operator.ilike)}`);
   }
   if (operator.tsMatch !== undefined) {
     clauses.push(`${column} @@ plainto_tsquery('english', ${pushParam(params, operator.tsMatch)})`);
@@ -112,7 +112,16 @@ function buildWhereClause(tableName, where = {}) {
     params
   };
 }
+function remapExistsSql(sql, existsParams, params) {
+  const offset = params.length;
+  params.push(...existsParams);
+  return sql.replace(/\$(\d+)/g, (_match, index) => `$${offset + Number(index)}`);
+}
 function buildWhereNodeClause(tableName, node, params) {
+  if ("exists" in node) {
+    const body = remapExistsSql(node.exists.sql, node.exists.params, params);
+    return `${node.exists.not ? "NOT " : ""}EXISTS (${body})`;
+  }
   if ("where" in node) {
     return appendWhereParts(tableName, node.where, params);
   }
@@ -484,6 +493,23 @@ class RepositoryQuery {
     this.queryOptions = { ...this.queryOptions, limit };
     return this;
   }
+  whereNull(column) {
+    return this.where({ [column]: null });
+  }
+  whereNotNull(column) {
+    return this.where({ [column]: { isNull: false } });
+  }
+  whereIn(column, values) {
+    return this.where({ [column]: values });
+  }
+  whereExists(sql, params = []) {
+    this.whereNodes.push({ kind: "and", exists: { sql, params } });
+    return this;
+  }
+  whereNotExists(sql, params = []) {
+    this.whereNodes.push({ kind: "and", exists: { sql, params, not: true } });
+    return this;
+  }
   offset(offset) {
     this.queryOptions = { ...this.queryOptions, offset };
     return this;
@@ -553,13 +579,30 @@ class RepositoryQuery {
     });
     return this;
   }
+  withBelongsToMany(as, relation, relatedRepository, options = {}) {
+    this.eagerLoads.push({
+      kind: "belongsToMany",
+      as,
+      relation,
+      repository: relatedRepository,
+      options
+    });
+    return this;
+  }
   async get() {
     const rows = await this.repository.findAll(this.buildOptions());
     return await this.attach(rows);
   }
   async first() {
-    const rows = await this.get();
-    return rows[0] ?? null;
+    const rows = await this.repository.findAll({ ...this.buildOptions(), limit: 1 });
+    const attached = await this.attach(rows);
+    return attached[0] ?? null;
+  }
+  async count() {
+    return await this.repository.count(this.buildOptions());
+  }
+  async attachToRows(rows) {
+    return await this.attach(rows);
   }
   async paginate(options) {
     return await this.repository.paginate({
@@ -631,6 +674,15 @@ class RepositoryQuery {
         }));
         continue;
       }
+      if (load.kind === "belongsToMany") {
+        const relation2 = load.relation;
+        const grouped2 = await this.repository.loadBelongsToManyForParents(rows, relation2, load.repository, load.options);
+        result = result.map((row) => ({
+          ...row,
+          [load.as]: grouped2.get(row[relation2.parentKey]) ?? []
+        }));
+        continue;
+      }
       if (load.kind === "morphTo") {
         const relation2 = load.relation;
         const grouped2 = await this.repository.loadMorphToForChildren(rows, relation2, load.morphRepositories ?? new Map, load.options);

package/dist/entries/database/schema.js

@@ -341,7 +341,7 @@ function buildOperatorClauses(column, operator, params) {
     clauses.push(`${column} <= ${pushParam(params, operator.lte)}`);
   }
   if (operator.ilike !== undefined) {
-    clauses.push(`${column} ILIKE ${pushParam(params, `%${operator.ilike}%`)}`);
+    clauses.push(`${column} ILIKE ${pushParam(params, operator.ilike)}`);
   }
   if (operator.tsMatch !== undefined) {
     clauses.push(`${column} @@ plainto_tsquery('english', ${pushParam(params, operator.tsMatch)})`);
@@ -379,7 +379,16 @@ function buildWhereClause(tableName, where = {}) {
     params
   };
 }
+function remapExistsSql(sql, existsParams, params) {
+  const offset = params.length;
+  params.push(...existsParams);
+  return sql.replace(/\$(\d+)/g, (_match, index) => `$${offset + Number(index)}`);
+}
 function buildWhereNodeClause(tableName, node, params) {
+  if ("exists" in node) {
+    const body = remapExistsSql(node.exists.sql, node.exists.params, params);
+    return `${node.exists.not ? "NOT " : ""}EXISTS (${body})`;
+  }
   if ("where" in node) {
     return appendWhereParts(tableName, node.where, params);
   }

package/dist/entries/http/resources.js

@@ -3,6 +3,70 @@
 function serializeDate(value) {
   return value instanceof Date ? value.toISOString() : value;
 }
+function whenLoaded(model, relation, transform) {
+  const value = model.loaded(relation);
+  if (value === undefined) {
+    return;
+  }
+  return transform ? transform(value) : value;
+}
+
+class JsonResource {
+  resource;
+  static wrap = "data";
+  extra = {};
+  constructor(resource) {
+    this.resource = resource;
+  }
+  static make(resource) {
+    return new JsonResource(resource);
+  }
+  static collection(items) {
+    return new ResourceCollection(items);
+  }
+  additional(data) {
+    this.extra = { ...this.extra, ...data };
+    return this;
+  }
+  when(condition, value) {
+    return condition ? value : undefined;
+  }
+  whenLoaded(relation, transform) {
+    const model = this.resource;
+    if (typeof model.loaded !== "function") {
+      return;
+    }
+    return whenLoaded(model, relation, transform);
+  }
+  toArray() {
+    if (this.resource && typeof this.resource === "object" && "toArray" in this.resource) {
+      return this.resource.toArray();
+    }
+    return { ...this.resource };
+  }
+  toResponse() {
+    const wrap = this.constructor.wrap;
+    const payload = this.toArray();
+    if (wrap === null) {
+      return { ...payload, ...this.extra };
+    }
+    return { [wrap]: payload, ...this.extra };
+  }
+}
+
+class ResourceCollection extends JsonResource {
+  toArray() {
+    const items = this.resource.map((item) => item instanceof JsonResource ? item.toArray() : { ...item });
+    const wrap = this.constructor.wrap;
+    if (wrap === null) {
+      return { data: items };
+    }
+    return { [wrap]: items };
+  }
+  toResponse() {
+    return { ...this.toArray(), ...this.extra };
+  }
+}
 function toResourceCollection(items, transformer) {
   return items.map(transformer);
 }
@@ -13,7 +77,10 @@ function toPaginatedResourceCollection(items, meta, transformer) {
   };
 }
 export {
+  JsonResource,
+  ResourceCollection,
   serializeDate,
   toPaginatedResourceCollection,
-  toResourceCollection
+  toResourceCollection,
+  whenLoaded
 };

package/dist/framework/public-api.d.ts

@@ -29,11 +29,13 @@ export { bindBunSql, createBunSqlPool } from "../core/database/bunSql.ts";
 export { createDatabaseConnection } from "../core/database/connection.ts";
 export { getActiveDatabaseConnection, runWithDatabaseConnection, } from "../core/database/connectionContext.ts";
 export { getDefaultDatabasePool, getDefaultDatabaseQuery, registerDefaultDatabasePool, } from "../core/database/defaultConnection.ts";
+export { Factory } from "../core/database/factory.ts";
+export { foreignKeyFromTable, pivotTableName, singularize } from "../core/database/inflection.ts";
 export { withMigrationLock } from "../core/database/migrations/advisoryLock.ts";
 export { freshDatabase, getMigrationStatus, loadMigrationsFromDirectory, migrateDatabase, rollbackDatabase, } from "../core/database/migrations/runner.ts";
 export type { Migration, MigrationDatabase, MigrationStatus, } from "../core/database/migrations/types.ts";
 export type { CastType, GlobalScopeFn, ModelConstructor } from "../core/database/model.ts";
-export { applyCasts, dehydrateValue, filterMassAssignable, hydrateValue, Model, registerModelRepository, } from "../core/database/model.ts";
+export { applyCasts, BelongsToManyRelationQuery, BelongsToRelationQuery, dehydrateValue, filterMassAssignable, HasManyRelationQuery, HasOneRelationQuery, hydrateValue, Model, ModelQuery, MorphManyRelationQuery, MorphOneRelationQuery, MorphToRelationQuery, registerModelClass, registerModelRepository, } from "../core/database/model.ts";
 export { createDatabaseQueryProxy } from "../core/database/queryProxy.ts";
 export type { BelongsToManyRelation, BelongsToRelation, HasManyRelation, HasOneRelation, MorphManyRelation, MorphOneRelation, MorphToRelation, } from "../core/database/relationships.ts";
 export { belongsTo, belongsToMany, hasMany, hasOne, indexBelongsToManyRelation, indexBelongsToRelation, indexHasManyRelation, indexHasOneRelation, indexMorphManyRelation, indexMorphOneRelation, indexMorphToRelation, morphMany, morphOne, morphTo, } from "../core/database/relationships.ts";
@@ -77,7 +79,7 @@ export { currentRequestMeta, runWithRequestMeta } from "../core/http/requestMeta
 export { createRequireAbilityMiddleware } from "../core/http/requireAbilityMiddleware.ts";
 export { createRequireGlobalAdminMiddleware } from "../core/http/requireGlobalAdminMiddleware.ts";
 export { createRequireWebAuthMiddleware } from "../core/http/requireWebAuthMiddleware.ts";
-export { serializeDate, toPaginatedResourceCollection, toResourceCollection, } from "../core/http/resources.ts";
+export { JsonResource, ResourceCollection, serializeDate, toPaginatedResourceCollection, toResourceCollection, whenLoaded, } from "../core/http/resources.ts";
 export { createdResponse, jsonResponse, noContentResponse, withErrorHandling, } from "../core/http/response.ts";
 export type { RouteRequest } from "../core/http/route.ts";
 export { loginRedirectLocation, safeInternalRedirectPath, sanitizeInternalPath, } from "../core/http/safeInternalPath.ts";