bazis 0.113.0 → 0.114.0

package/core/infra/connectors/codex/CodexAppServerClient.ts

@@ -232,7 +232,7 @@ export class CodexAppServerClient implements CodexClient {
         if (method === "account/updated") this.modelCache = undefined;
       }, () => { this.clearLogin(); this.modelCache = undefined; });
       const initialized = await client.request("initialize", {
-        clientInfo: { name: "bazis", title: "Bazis", version: "0.113.0" }, capabilities: { experimentalApi: true },
+        clientInfo: { name: "bazis", title: "Bazis", version: "0.114.0" }, capabilities: { experimentalApi: true },
       }, 15_000, signal);
       if (resolve(text(initialized.codexHome, 4096)) !== this.paths.home) throw new CodexError("PROTOCOL_ERROR");
       client.notify("initialized");

package/library/orm/Query/EntityQuery.ts

@@ -164,7 +164,7 @@ export class EntityQuery<T extends object, TResult = T> {
       result[i] = entity;
     }
     if (this.plan.includes.length > 0) {
-      await new IncludeLoader(this.runtime).load(this.model, result as object[], this.plan.includes, this.plan.noTracking);
+      await new IncludeLoader(this.runtime, this.plan.ignoreQueryFilters).load(this.model, result as object[], this.plan.includes, this.plan.noTracking);
     }
     return result as unknown as TResult[];
   }

package/library/orm/Query/IncludeLoader.ts

@@ -19,7 +19,11 @@ interface Level {
  * together in memory. This avoids the Cartesian product of collection JOINs.
  */
 export class IncludeLoader {
-  constructor(private readonly runtime: DbContextRuntime) {}
+  /**
+   * `ignoreQueryFilters` comes from the main query: when it turned the filters
+   * off, included entities are read without them too (as in EF Core).
+   */
+  constructor(private readonly runtime: DbContextRuntime, private readonly ignoreQueryFilters = false) {}
 
   async load(rootModel: EntityModel, roots: object[], paths: readonly (readonly string[])[], noTracking: boolean): Promise<void> {
     if (roots.length === 0) {
@@ -156,14 +160,19 @@ export class IncludeLoader {
     return model.key[0];
   }
 
+  private translator(model: EntityModel): SqlTranslator {
+    return new SqlTranslator(model, this.runtime.provider.dialect, this.ignoreQueryFilters ? [] : effectiveQueryFilters(model, this.runtime.context));
+  }
+
   private async queryIn(model: EntityModel, property: string, values: readonly unknown[], noTracking: boolean): Promise<object[]> {
-    const translator = new SqlTranslator(model, this.runtime.provider.dialect, effectiveQueryFilters(model, this.runtime.context));
+    const translator = this.translator(model);
     const result: object[] = [];
     const chunkSize = maxParametersPerInList(this.runtime.provider);
     for (let start = 0; start < values.length; start += chunkSize) {
       const chunk = values.slice(start, start + chunkSize);
       const { sql, params } = translator.selectAll({
         ...EMPTY_PLAN,
+        ignoreQueryFilters: this.ignoreQueryFilters,
         conditions: [{ kind: "in", property, values: chunk }],
         noTracking,
       });
@@ -181,7 +190,7 @@ export class IncludeLoader {
 
   private async queryTuples(model: EntityModel, properties: readonly string[], values: readonly (readonly unknown[])[], noTracking: boolean): Promise<object[]> {
     const result: object[] = []; const perTuple = properties.length; const chunkSize = Math.max(1, Math.floor(maxParametersPerInList(this.runtime.provider) / perTuple));
-    for (let start = 0; start < values.length; start += chunkSize) { const translator = new SqlTranslator(model, this.runtime.provider.dialect, effectiveQueryFilters(model, this.runtime.context)); const { sql, params } = translator.selectAll({ ...EMPTY_PLAN, conditions: [{ kind: "tuples", properties, values: values.slice(start, start + chunkSize) }], noTracking }); for (let entity of (await this.runtime.provider.query(sql, params)).map((row) => materialize<object>(model, row, this.runtime.provider.dialect))) { if (!noTracking) entity = this.runtime.tracker.trackLoaded(entity, model); result.push(entity); } }
+    for (let start = 0; start < values.length; start += chunkSize) { const translator = this.translator(model); const { sql, params } = translator.selectAll({ ...EMPTY_PLAN, ignoreQueryFilters: this.ignoreQueryFilters, conditions: [{ kind: "tuples", properties, values: values.slice(start, start + chunkSize) }], noTracking }); for (let entity of (await this.runtime.provider.query(sql, params)).map((row) => materialize<object>(model, row, this.runtime.provider.dialect))) { if (!noTracking) entity = this.runtime.tracker.trackLoaded(entity, model); result.push(entity); } }
     return result;
   }
   private tuple(model: EntityModel, values: readonly unknown[]): string | undefined {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bazis",
-  "version": "0.113.0",
+  "version": "0.114.0",
   "description": "Modular backend framework for Bun in TypeScript: DI wired by codegen, HTTP, a PostgreSQL ORM, JWT, WebSocket, agents and a CLI.",
   "license": "MIT",
   "author": "Alexander Alenin",