@danielhritcu/zenstack-orm 3.5.4 → 3.5.5

package/dist/index.d.cts

@@ -637,6 +637,13 @@ type FieldSlicingOptions = {
      */
     excludedFilterKinds?: readonly FilterKind[];
 };
+/**
+ * Configuration for default where clauses applied to all queries.
+ * `$all` applies to every model. Model-specific keys override `$all`.
+ */
+type DefaultWhereConfig = {
+    $all?: Record<string, unknown>;
+} & Record<string, Record<string, unknown> | undefined>;
 /**
  * Partial ORM client options that defines customizable behaviors.
  */
@@ -659,6 +666,17 @@ type QueryOptions<Schema extends SchemaDef> = {
  * ZenStack client options.
  */
 type ClientOptions<Schema extends SchemaDef> = QueryOptions<Schema> & {
+    /**
+     * Default query options applied to all operations.
+     */
+    default?: {
+        /**
+         * Default where clauses merged into every query. `$all` applies to all models.
+         * Model-specific keys override `$all`. Accepts a static object or a function
+         * for request-scoped values.
+         */
+        where?: DefaultWhereConfig | (() => DefaultWhereConfig);
+    };
     /**
      * Kysely dialect.
      */
@@ -3374,4 +3392,4 @@ declare namespace schemaUtils {
   export { schemaUtils_ExpressionVisitor as ExpressionVisitor, schemaUtils_MatchingExpressionVisitor as MatchingExpressionVisitor, type schemaUtils_VisitResult as VisitResult };
 }
 
-export { type AfterEntityMutationCallback, type AggregateArgs, type AggregateResult, AllCrudOperations, type AllModelOperations, AllReadOperations, AnyNull, AnyNullClass, type AnyPlugin, type AuthType, BaseCrudDialect, type BatchResult, type BeforeEntityMutationCallback, type BooleanFilter, type BytesFilter, CRUD, CRUD_EXT, type ClientConstructor, type ClientContract, type ClientOptions, type ComputedFieldsOptions, CoreCreateOperations, CoreCrudOperations, CoreDeleteOperations, CoreReadOperations, CoreUpdateOperations, CoreWriteOperations, type CountArgs, type CountResult, type CreateArgs, type CreateInput, type CreateManyAndReturnArgs, type CreateManyArgs, type CreateManyInput, type DateTimeFilter, DbNull, DbNullClass, type DefaultModelResult, type DeleteArgs, type DeleteManyArgs, type EntityMutationHooksDef, type ExistsArgs, type ExtClientMembersBase, type ExtQueryArgsBase, type ExtResultBase, type ExtResultInferenceArgs, type ExtResultSelectOmitFields, type ExtractExtResult, type FilterKind, type FindArgs, type FindFirstArgs, type FindManyArgs, type FindUniqueArgs, type GetAllIncludedOperations, type GetIncludedOperations, type GetProcedure, type GetProcedureNames, type GetProcedureParams, type GetQueryOptions, type GetSlicedFilterKindsForField, type GetSlicedModels, type GetSlicedOperations, type GetSlicedProcedures, type GroupByArgs, type GroupByResult, type HasComputedFields, type HasProcedures, type IncludeInput, InputValidator, type JsonArray, type JsonFilter, JsonNull, JsonNullClass, type JsonNullValues, type JsonObject, type JsonValue, kyselyUtils as KyselyUtils, LOGICAL_COMBINATORS, type MapModelFieldType, type ModelAllowsCreate, type ModelHasRequiredUnsupportedField, type ModelOperations, type ModelResult, type ModelSlicingOptions, type NullsOrder, type NumberFilter, ORMError, ORMErrorReason, type OmitConfig, type OmitInput, type OnKyselyQueryArgs, type OnKyselyQueryCallback, type OnProcedureHookContext, type OperationsRequiringCreate, type OrderBy, type PluginAfterEntityMutationArgs, type PluginBeforeEntityMutationArgs, type ProcedureEnvelope, type ProcedureFunc, type ProcedureHandlerFunc, type ProcedureOperations, type ProceduresOptions, type ProceedKyselyQueryFunction, type QueryOptions, queryUtils as QueryUtils, RejectedByPolicyReason, type RuntimePlugin, schemaUtils as SchemaUtils, type SelectAwareExtResult, type SelectIncludeOmit, type SelectInput, type SelectSubset, type SimplifiedPlainResult, type SimplifiedResult, type SlicingOptions, type SortOrder, type StringFilter, type Subset, type ToKysely, type TransactionClientContract, TransactionIsolationLevel, type TypeDefResult, type TypedJsonFilter, type UpdateArgs, type UpdateInput, type UpdateManyAndReturnArgs, type UpdateManyArgs, type UpsertArgs, type WhereInput, type WhereUniqueInput, ZENSTACK_QUERY_KIND_SYMBOL, ZENSTACK_QUERY_SYMBOL, type ZModelFunction, type ZModelFunctionContext, ZenStackClient, type ZenStackPromise, type ZenStackQueryKind, createQuerySchemaFactory, definePlugin, getCrudDialect };
+export { type AfterEntityMutationCallback, type AggregateArgs, type AggregateResult, AllCrudOperations, type AllModelOperations, AllReadOperations, AnyNull, AnyNullClass, type AnyPlugin, type AuthType, BaseCrudDialect, type BatchResult, type BeforeEntityMutationCallback, type BooleanFilter, type BytesFilter, CRUD, CRUD_EXT, type ClientConstructor, type ClientContract, type ClientOptions, type ComputedFieldsOptions, CoreCreateOperations, CoreCrudOperations, CoreDeleteOperations, CoreReadOperations, CoreUpdateOperations, CoreWriteOperations, type CountArgs, type CountResult, type CreateArgs, type CreateInput, type CreateManyAndReturnArgs, type CreateManyArgs, type CreateManyInput, type DateTimeFilter, DbNull, DbNullClass, type DefaultModelResult, type DefaultWhereConfig, type DeleteArgs, type DeleteManyArgs, type EntityMutationHooksDef, type ExistsArgs, type ExtClientMembersBase, type ExtQueryArgsBase, type ExtResultBase, type ExtResultInferenceArgs, type ExtResultSelectOmitFields, type ExtractExtResult, type FilterKind, type FindArgs, type FindFirstArgs, type FindManyArgs, type FindUniqueArgs, type GetAllIncludedOperations, type GetIncludedOperations, type GetProcedure, type GetProcedureNames, type GetProcedureParams, type GetQueryOptions, type GetSlicedFilterKindsForField, type GetSlicedModels, type GetSlicedOperations, type GetSlicedProcedures, type GroupByArgs, type GroupByResult, type HasComputedFields, type HasProcedures, type IncludeInput, InputValidator, type JsonArray, type JsonFilter, JsonNull, JsonNullClass, type JsonNullValues, type JsonObject, type JsonValue, kyselyUtils as KyselyUtils, LOGICAL_COMBINATORS, type MapModelFieldType, type ModelAllowsCreate, type ModelHasRequiredUnsupportedField, type ModelOperations, type ModelResult, type ModelSlicingOptions, type NullsOrder, type NumberFilter, ORMError, ORMErrorReason, type OmitConfig, type OmitInput, type OnKyselyQueryArgs, type OnKyselyQueryCallback, type OnProcedureHookContext, type OperationsRequiringCreate, type OrderBy, type PluginAfterEntityMutationArgs, type PluginBeforeEntityMutationArgs, type ProcedureEnvelope, type ProcedureFunc, type ProcedureHandlerFunc, type ProcedureOperations, type ProceduresOptions, type ProceedKyselyQueryFunction, type QueryOptions, queryUtils as QueryUtils, RejectedByPolicyReason, type RuntimePlugin, schemaUtils as SchemaUtils, type SelectAwareExtResult, type SelectIncludeOmit, type SelectInput, type SelectSubset, type SimplifiedPlainResult, type SimplifiedResult, type SlicingOptions, type SortOrder, type StringFilter, type Subset, type ToKysely, type TransactionClientContract, TransactionIsolationLevel, type TypeDefResult, type TypedJsonFilter, type UpdateArgs, type UpdateInput, type UpdateManyAndReturnArgs, type UpdateManyArgs, type UpsertArgs, type WhereInput, type WhereUniqueInput, ZENSTACK_QUERY_KIND_SYMBOL, ZENSTACK_QUERY_SYMBOL, type ZModelFunction, type ZModelFunctionContext, ZenStackClient, type ZenStackPromise, type ZenStackQueryKind, createQuerySchemaFactory, definePlugin, getCrudDialect };

package/dist/index.d.ts

@@ -637,6 +637,13 @@ type FieldSlicingOptions = {
      */
     excludedFilterKinds?: readonly FilterKind[];
 };
+/**
+ * Configuration for default where clauses applied to all queries.
+ * `$all` applies to every model. Model-specific keys override `$all`.
+ */
+type DefaultWhereConfig = {
+    $all?: Record<string, unknown>;
+} & Record<string, Record<string, unknown> | undefined>;
 /**
  * Partial ORM client options that defines customizable behaviors.
  */
@@ -659,6 +666,17 @@ type QueryOptions<Schema extends SchemaDef> = {
  * ZenStack client options.
  */
 type ClientOptions<Schema extends SchemaDef> = QueryOptions<Schema> & {
+    /**
+     * Default query options applied to all operations.
+     */
+    default?: {
+        /**
+         * Default where clauses merged into every query. `$all` applies to all models.
+         * Model-specific keys override `$all`. Accepts a static object or a function
+         * for request-scoped values.
+         */
+        where?: DefaultWhereConfig | (() => DefaultWhereConfig);
+    };
     /**
      * Kysely dialect.
      */
@@ -3374,4 +3392,4 @@ declare namespace schemaUtils {
   export { schemaUtils_ExpressionVisitor as ExpressionVisitor, schemaUtils_MatchingExpressionVisitor as MatchingExpressionVisitor, type schemaUtils_VisitResult as VisitResult };
 }
 
-export { type AfterEntityMutationCallback, type AggregateArgs, type AggregateResult, AllCrudOperations, type AllModelOperations, AllReadOperations, AnyNull, AnyNullClass, type AnyPlugin, type AuthType, BaseCrudDialect, type BatchResult, type BeforeEntityMutationCallback, type BooleanFilter, type BytesFilter, CRUD, CRUD_EXT, type ClientConstructor, type ClientContract, type ClientOptions, type ComputedFieldsOptions, CoreCreateOperations, CoreCrudOperations, CoreDeleteOperations, CoreReadOperations, CoreUpdateOperations, CoreWriteOperations, type CountArgs, type CountResult, type CreateArgs, type CreateInput, type CreateManyAndReturnArgs, type CreateManyArgs, type CreateManyInput, type DateTimeFilter, DbNull, DbNullClass, type DefaultModelResult, type DeleteArgs, type DeleteManyArgs, type EntityMutationHooksDef, type ExistsArgs, type ExtClientMembersBase, type ExtQueryArgsBase, type ExtResultBase, type ExtResultInferenceArgs, type ExtResultSelectOmitFields, type ExtractExtResult, type FilterKind, type FindArgs, type FindFirstArgs, type FindManyArgs, type FindUniqueArgs, type GetAllIncludedOperations, type GetIncludedOperations, type GetProcedure, type GetProcedureNames, type GetProcedureParams, type GetQueryOptions, type GetSlicedFilterKindsForField, type GetSlicedModels, type GetSlicedOperations, type GetSlicedProcedures, type GroupByArgs, type GroupByResult, type HasComputedFields, type HasProcedures, type IncludeInput, InputValidator, type JsonArray, type JsonFilter, JsonNull, JsonNullClass, type JsonNullValues, type JsonObject, type JsonValue, kyselyUtils as KyselyUtils, LOGICAL_COMBINATORS, type MapModelFieldType, type ModelAllowsCreate, type ModelHasRequiredUnsupportedField, type ModelOperations, type ModelResult, type ModelSlicingOptions, type NullsOrder, type NumberFilter, ORMError, ORMErrorReason, type OmitConfig, type OmitInput, type OnKyselyQueryArgs, type OnKyselyQueryCallback, type OnProcedureHookContext, type OperationsRequiringCreate, type OrderBy, type PluginAfterEntityMutationArgs, type PluginBeforeEntityMutationArgs, type ProcedureEnvelope, type ProcedureFunc, type ProcedureHandlerFunc, type ProcedureOperations, type ProceduresOptions, type ProceedKyselyQueryFunction, type QueryOptions, queryUtils as QueryUtils, RejectedByPolicyReason, type RuntimePlugin, schemaUtils as SchemaUtils, type SelectAwareExtResult, type SelectIncludeOmit, type SelectInput, type SelectSubset, type SimplifiedPlainResult, type SimplifiedResult, type SlicingOptions, type SortOrder, type StringFilter, type Subset, type ToKysely, type TransactionClientContract, TransactionIsolationLevel, type TypeDefResult, type TypedJsonFilter, type UpdateArgs, type UpdateInput, type UpdateManyAndReturnArgs, type UpdateManyArgs, type UpsertArgs, type WhereInput, type WhereUniqueInput, ZENSTACK_QUERY_KIND_SYMBOL, ZENSTACK_QUERY_SYMBOL, type ZModelFunction, type ZModelFunctionContext, ZenStackClient, type ZenStackPromise, type ZenStackQueryKind, createQuerySchemaFactory, definePlugin, getCrudDialect };
+export { type AfterEntityMutationCallback, type AggregateArgs, type AggregateResult, AllCrudOperations, type AllModelOperations, AllReadOperations, AnyNull, AnyNullClass, type AnyPlugin, type AuthType, BaseCrudDialect, type BatchResult, type BeforeEntityMutationCallback, type BooleanFilter, type BytesFilter, CRUD, CRUD_EXT, type ClientConstructor, type ClientContract, type ClientOptions, type ComputedFieldsOptions, CoreCreateOperations, CoreCrudOperations, CoreDeleteOperations, CoreReadOperations, CoreUpdateOperations, CoreWriteOperations, type CountArgs, type CountResult, type CreateArgs, type CreateInput, type CreateManyAndReturnArgs, type CreateManyArgs, type CreateManyInput, type DateTimeFilter, DbNull, DbNullClass, type DefaultModelResult, type DefaultWhereConfig, type DeleteArgs, type DeleteManyArgs, type EntityMutationHooksDef, type ExistsArgs, type ExtClientMembersBase, type ExtQueryArgsBase, type ExtResultBase, type ExtResultInferenceArgs, type ExtResultSelectOmitFields, type ExtractExtResult, type FilterKind, type FindArgs, type FindFirstArgs, type FindManyArgs, type FindUniqueArgs, type GetAllIncludedOperations, type GetIncludedOperations, type GetProcedure, type GetProcedureNames, type GetProcedureParams, type GetQueryOptions, type GetSlicedFilterKindsForField, type GetSlicedModels, type GetSlicedOperations, type GetSlicedProcedures, type GroupByArgs, type GroupByResult, type HasComputedFields, type HasProcedures, type IncludeInput, InputValidator, type JsonArray, type JsonFilter, JsonNull, JsonNullClass, type JsonNullValues, type JsonObject, type JsonValue, kyselyUtils as KyselyUtils, LOGICAL_COMBINATORS, type MapModelFieldType, type ModelAllowsCreate, type ModelHasRequiredUnsupportedField, type ModelOperations, type ModelResult, type ModelSlicingOptions, type NullsOrder, type NumberFilter, ORMError, ORMErrorReason, type OmitConfig, type OmitInput, type OnKyselyQueryArgs, type OnKyselyQueryCallback, type OnProcedureHookContext, type OperationsRequiringCreate, type OrderBy, type PluginAfterEntityMutationArgs, type PluginBeforeEntityMutationArgs, type ProcedureEnvelope, type ProcedureFunc, type ProcedureHandlerFunc, type ProcedureOperations, type ProceduresOptions, type ProceedKyselyQueryFunction, type QueryOptions, queryUtils as QueryUtils, RejectedByPolicyReason, type RuntimePlugin, schemaUtils as SchemaUtils, type SelectAwareExtResult, type SelectIncludeOmit, type SelectInput, type SelectSubset, type SimplifiedPlainResult, type SimplifiedResult, type SlicingOptions, type SortOrder, type StringFilter, type Subset, type ToKysely, type TransactionClientContract, TransactionIsolationLevel, type TypeDefResult, type TypedJsonFilter, type UpdateArgs, type UpdateInput, type UpdateManyAndReturnArgs, type UpdateManyArgs, type UpsertArgs, type WhereInput, type WhereUniqueInput, ZENSTACK_QUERY_KIND_SYMBOL, ZENSTACK_QUERY_SYMBOL, type ZModelFunction, type ZModelFunctionContext, ZenStackClient, type ZenStackPromise, type ZenStackQueryKind, createQuerySchemaFactory, definePlugin, getCrudDialect };

package/dist/index.js

@@ -617,7 +617,7 @@ __name(tmpAlias, "tmpAlias");
 
 // src/client/crud/operations/base.ts
 import { createId as cuid2 } from "@paralleldrive/cuid2";
-import { clone, enumerate as enumerate2, invariant as invariant7, isPlainObject as isPlainObject2 } from "@zenstackhq/common-helpers";
+import { clone, enumerate as enumerate2, invariant as invariant7, isPlainObject as isPlainObject3 } from "@zenstackhq/common-helpers";
 import { default as cuid1 } from "cuid";
 import { createQueryId, expressionBuilder as expressionBuilder5, sql as sql5 } from "kysely";
 import { nanoid } from "nanoid";
@@ -2775,6 +2775,224 @@ function getCrudDialect(schema, options) {
 }
 __name(getCrudDialect, "getCrudDialect");
 
+// src/client/plugins/search.ts
+import { isPlainObject as isPlainObject2 } from "@zenstackhq/common-helpers";
+function isSearchPayload(value) {
+  return isPlainObject2(value) && typeof value.q === "string" && (value.fields !== void 0 || value.profile !== void 0);
+}
+__name(isSearchPayload, "isSearchPayload");
+function buildStringFilter(mode, token) {
+  if (mode === "equals") return {
+    equals: token,
+    mode: "insensitive"
+  };
+  if (mode === "startsWith") return {
+    startsWith: token,
+    mode: "insensitive"
+  };
+  return {
+    contains: token,
+    mode: "insensitive"
+  };
+}
+__name(buildStringFilter, "buildStringFilter");
+function unique(arr) {
+  return [
+    ...new Set(arr)
+  ];
+}
+__name(unique, "unique");
+function extractSearch(where) {
+  if (Array.isArray(where)) {
+    let found2;
+    const cleaned2 = [];
+    for (const item of where) {
+      const result = extractSearch(item);
+      if (result.search) found2 = result.search;
+      cleaned2.push(result.where);
+    }
+    return {
+      where: cleaned2,
+      search: found2
+    };
+  }
+  if (!isPlainObject2(where)) {
+    return {
+      where
+    };
+  }
+  const obj = where;
+  let found;
+  const cleaned = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (key === "search" && isSearchPayload(value)) {
+      found = value;
+      continue;
+    }
+    if (key === "AND" || key === "OR") {
+      const result = extractSearch(value);
+      if (result.search) found = result.search;
+      cleaned[key] = result.where;
+    } else if (key === "NOT") {
+      const result = extractSearch(value);
+      if (result.search) found = result.search;
+      cleaned[key] = result.where;
+    } else {
+      cleaned[key] = value;
+    }
+  }
+  return {
+    where: cleaned,
+    search: found
+  };
+}
+__name(extractSearch, "extractSearch");
+function buildTokenFilter(model, fields, token, mode, models, virtualRelations) {
+  const clauses = [];
+  const modelDef = models[model];
+  if (!modelDef) return void 0;
+  for (const [fieldName, fieldSpec] of Object.entries(fields)) {
+    const schemaDef = modelDef.fields[fieldName];
+    if (schemaDef) {
+      if (schemaDef.relation) {
+        const childFields = fieldSpec === true ? void 0 : fieldSpec;
+        if (!childFields) continue;
+        const childFilter = buildTokenFilter(schemaDef.type, childFields, token, mode, models, virtualRelations);
+        if (childFilter) {
+          if (schemaDef.array) {
+            clauses.push({
+              [fieldName]: {
+                some: childFilter
+              }
+            });
+          } else {
+            clauses.push({
+              [fieldName]: childFilter
+            });
+          }
+        }
+      } else if (schemaDef.type === "String") {
+        clauses.push({
+          [fieldName]: buildStringFilter(mode, token)
+        });
+      }
+    } else if (virtualRelations) {
+      const modelVRs = virtualRelations[model];
+      const vr = modelVRs?.[fieldName];
+      if (!vr) continue;
+      const childFields = fieldSpec === true ? void 0 : fieldSpec;
+      if (!childFields) continue;
+      if (vr.kind === "filtered" && vr.relation) {
+        const sourceFieldDef = modelDef.fields[vr.relation];
+        if (!sourceFieldDef) continue;
+        const childFilter = buildTokenFilter(sourceFieldDef.type, childFields, token, mode, models, virtualRelations);
+        if (childFilter) {
+          const mergedChild = vr.where ? {
+            AND: [
+              childFilter,
+              vr.where
+            ]
+          } : childFilter;
+          if (sourceFieldDef.array) {
+            clauses.push({
+              [vr.relation]: {
+                some: mergedChild
+              }
+            });
+          } else {
+            clauses.push({
+              [vr.relation]: mergedChild
+            });
+          }
+        }
+      } else if (vr.kind === "through" && vr.path) {
+        const [sourceField, ...restPath] = vr.path;
+        if (!sourceField) continue;
+        const sourceFieldDef = modelDef.fields[sourceField];
+        if (!sourceFieldDef) continue;
+        let currentModel2 = sourceFieldDef.type;
+        for (const segment of restPath) {
+          const m = models[currentModel2];
+          if (!m) break;
+          const f = m.fields[segment];
+          if (!f) break;
+          currentModel2 = f.type;
+        }
+        const childFilter = buildTokenFilter(currentModel2, childFields, token, mode, models, virtualRelations);
+        if (childFilter) {
+          let wrapped = childFilter;
+          for (let i = restPath.length - 1; i >= 0; i--) {
+            const seg = restPath[i];
+            wrapped = {
+              [seg]: wrapped
+            };
+          }
+          if (sourceFieldDef.array) {
+            clauses.push({
+              [sourceField]: {
+                some: wrapped
+              }
+            });
+          } else {
+            clauses.push({
+              [sourceField]: wrapped
+            });
+          }
+        }
+      }
+    }
+  }
+  if (clauses.length === 0) return void 0;
+  if (clauses.length === 1) return clauses[0];
+  return {
+    OR: clauses
+  };
+}
+__name(buildTokenFilter, "buildTokenFilter");
+function expandSearch(model, where, searchDefaults, schemaModels, virtualRelations) {
+  if (!where || !isPlainObject2(where)) return {
+    where
+  };
+  const { where: remaining, search: search2 } = extractSearch(where);
+  if (!search2) return {
+    where
+  };
+  const profile = search2.profile ? searchDefaults?.[model]?.[search2.profile] : void 0;
+  const fields = search2.fields ?? profile?.fields;
+  if (!fields) return {
+    where: remaining
+  };
+  const mode = search2.mode ?? profile?.mode ?? "contains";
+  const strategy = search2.strategy ?? profile?.strategy ?? "all";
+  const tokens = unique(search2.q.trim().split(/\s+/).map((t) => t.toLowerCase()).filter(Boolean));
+  if (tokens.length === 0) return {
+    where: remaining
+  };
+  const tokenClauses = tokens.map((t) => buildTokenFilter(model, fields, t, mode, schemaModels, virtualRelations)).filter((c) => c !== void 0);
+  if (tokenClauses.length === 0) return {
+    where: remaining
+  };
+  const searchWhere = tokenClauses.length === 1 ? tokenClauses[0] : strategy === "any" ? {
+    OR: tokenClauses
+  } : {
+    AND: tokenClauses
+  };
+  const remainingObj = remaining;
+  const hasRemaining = Object.keys(remainingObj).length > 0;
+  if (!hasRemaining) return {
+    where: searchWhere
+  };
+  return {
+    where: {
+      AND: [
+        remainingObj,
+        searchWhere
+      ]
+    }
+  };
+}
+__name(expandSearch, "expandSearch");
+
 // src/client/crud/operations/base.ts
 var CoreCrudOperations2 = [
   "findMany",
@@ -3133,9 +3351,49 @@ var BaseOperationHandler = class {
     return result;
   }
   // --- End schema plugin defaults ---
+  // --- Search expansion ---
+  applySearchExpansion(model, args) {
+    const searchDefaults = this.schema.plugins?.searchDefaults;
+    if (!searchDefaults) return args;
+    if (!args?.where) return args;
+    const schemaModels = this.schema.models;
+    if (!schemaModels) return args;
+    const virtualRelations = this.schema.plugins?.virtualRelations;
+    const { where } = expandSearch(model, args.where, searchDefaults, schemaModels, virtualRelations);
+    return {
+      ...args,
+      where
+    };
+  }
+  // --- End search expansion ---
+  applyDefaultWhere(model, args) {
+    const defaultOpt = this.client?.$options?.default?.where;
+    if (!defaultOpt) return args;
+    const config = typeof defaultOpt === "function" ? defaultOpt() : defaultOpt;
+    if (!config) return args;
+    const modelWhere = config[model] ?? config.$all;
+    if (!modelWhere || typeof modelWhere !== "object") return args;
+    let result = args ? {
+      ...args
+    } : {};
+    const userWhere = result.where ?? {};
+    const mergedWhere = {
+      ...userWhere
+    };
+    const modelFields = this.schema.models?.[model]?.fields;
+    for (const [key, value] of Object.entries(modelWhere)) {
+      if (key in userWhere) continue;
+      if (modelFields && !(key in modelFields)) continue;
+      mergedWhere[key] = value;
+    }
+    result.where = Object.keys(mergedWhere).length > 0 ? mergedWhere : void 0;
+    return result;
+  }
   async read(kysely, model, args) {
-    const defaultedArgs = this.applySchemaPluginDefaults(model, args);
-    const { args: rewrittenArgs, plan } = this.rewriteVirtualRelations(model, defaultedArgs);
+    const defaultWhereArgs = this.applyDefaultWhere(model, args);
+    const defaultedArgs = this.applySchemaPluginDefaults(model, defaultWhereArgs);
+    const searchExpandedArgs = this.applySearchExpansion(model, defaultedArgs);
+    const { args: rewrittenArgs, plan } = this.rewriteVirtualRelations(model, searchExpandedArgs);
     const query = this.buildReadQuery(model, rewrittenArgs);
     let result = [];
     const compiled = kysely.getExecutor().compileQuery(query.toOperationNode(), createQueryId());
@@ -4555,7 +4813,7 @@ var BaseOperationHandler = class {
       for (const [key, value] of Object.entries(args)) {
         if (value === void 0) {
           delete args[key];
-        } else if (value && isPlainObject2(value)) {
+        } else if (value && isPlainObject3(value)) {
           this.doNormalizeArgs(value);
         }
       }
@@ -5357,10 +5615,10 @@ var ZodSchemaFactory = class {
   }
   makeFindSchema(model, operation, options) {
     const fields = {};
-    const unique = operation === "findUnique";
+    const unique2 = operation === "findUnique";
     const findOne = operation === "findUnique" || operation === "findFirst";
-    const where = this.makeWhereSchema(model, unique, false, false, options);
-    if (unique) {
+    const where = this.makeWhereSchema(model, unique2, false, false, options);
+    if (unique2) {
       fields["where"] = where;
     } else {
       fields["where"] = where.optional();
@@ -5368,7 +5626,7 @@ var ZodSchemaFactory = class {
     fields["select"] = this.makeSelectSchema(model, options).optional().nullable();
     fields["include"] = this.makeIncludeSchema(model, options).optional().nullable();
     fields["omit"] = this.makeOmitSchema(model).optional().nullable();
-    if (!unique) {
+    if (!unique2) {
       fields["skip"] = this.makeSkipSchema().optional();
       if (findOne) {
         fields["take"] = z.literal(1).optional();
@@ -5384,7 +5642,7 @@ var ZodSchemaFactory = class {
     result = this.refineForSelectIncludeMutuallyExclusive(result);
     result = this.refineForSelectOmitMutuallyExclusive(result);
     result = this.refineForSelectHasTruthyField(result);
-    if (!unique) {
+    if (!unique2) {
       result = result.optional();
     }
     return result;
@@ -5445,8 +5703,8 @@ var ZodSchemaFactory = class {
     });
     return finalSchema;
   }
-  makeWhereSchema(model, unique, withoutRelationFields = false, withAggregations = false, options) {
-    const uniqueFieldNames = unique ? getUniqueFields(this.schema, model).filter((uf) => (
+  makeWhereSchema(model, unique2, withoutRelationFields = false, withAggregations = false, options) {
+    const uniqueFieldNames = unique2 ? getUniqueFields(this.schema, model).filter((uf) => (
       // single-field unique
       "def" in uf
     )).map((uf) => uf.name) : void 0;
@@ -5502,7 +5760,7 @@ var ZodSchemaFactory = class {
         fields[field] = fieldSchema.optional();
       }
     }
-    if (unique) {
+    if (unique2) {
       const uniqueFields = getUniqueFields(this.schema, model);
       for (const uniqueField of uniqueFields) {
         if ("defs" in uniqueField) {
@@ -5539,7 +5797,7 @@ var ZodSchemaFactory = class {
     fields["NOT"] = this.orArray(z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields, false, options)), true).optional();
     const baseWhere = z.strictObject(fields);
     let result = baseWhere;
-    if (unique) {
+    if (unique2) {
       const uniqueFields = getUniqueFields(this.schema, model);
       if (uniqueFields.length === 0) {
         throw createInternalError(`Model "${model}" has no unique fields`);