hysteria-orm 11.0.7 → 11.0.9

package/lib/index.d.cts

@@ -1997,6 +1997,14 @@ declare class InterpreterUtils {
     private readonly autoUpdateColumns;
     constructor(model: typeof Model);
     formatStringColumn(dbType: SqlDataSourceType, column: string): string;
+    /**
+     * @description Formats a column WITHOUT table qualification.
+     * ON CONFLICT target lists (Postgres/SQLite) and `excluded.<col>` refs require
+     * bare column names; table-qualified ModelKey refs like "sets.id" must reduce to
+     * "id". Mirrors formatStringColumn's qualified branch (split(".")[1]) so the
+     * bare output is identical minus the "table". prefix.
+     */
+    formatStringColumnBare(dbType: SqlDataSourceType, column: string): string;
     /**
      * @description Formats the table name for the database type, idempotent for quoting
      */
@@ -2072,15 +2080,15 @@ declare class ModelManager<T extends Model> {
     /**
      * @description Finds all records that match the input
      */
-    find<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input?: FindType<T, S, R>): Promise<ModelWithoutRelations<T>[]>;
+    find<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input?: FindType<T, S, R>): Promise<FindReturnType<T, S, R>[]>;
     /**
      * @description Finds the first record that matches the input
      */
-    findOne<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<ModelWithoutRelations<T> | null>;
+    findOne<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<FindReturnType<T, S, R> | null>;
     /**
      * @description Finds the first record that matches the input or throws an error
      */
-    findOneOrFail<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<ModelWithoutRelations<T>>;
+    findOneOrFail<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<FindReturnType<T, S, R>>;
     /**
      * @description Finds a record by its primary key
      * @description Ignores all model hooks
@@ -6193,15 +6201,15 @@ declare class ModelQueryBuilder<T extends Model, S extends Record<string, any> =
     /**
      * @description Finds multiple records.
      */
-    find<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input?: FindType<T, MK, MR>): Promise<ModelWithoutRelations<T>[]>;
+    find<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input?: FindType<T, MK, MR>): Promise<FindReturnType<T, MK, MR>[]>;
     /**
      * @description Finds a single record.
      */
-    findOne<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input: FindOneType<T, MK, MR>): Promise<ModelWithoutRelations<T> | null>;
+    findOne<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input: FindOneType<T, MK, MR>): Promise<FindReturnType<T, MK, MR> | null>;
     /**
      * @description Finds a single record or throws.
      */
-    findOneOrFail<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input: FindOneType<T, MK, MR>): Promise<ModelWithoutRelations<T>>;
+    findOneOrFail<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input: FindOneType<T, MK, MR>): Promise<FindReturnType<T, MK, MR>>;
     /**
      * @description Finds a single record by primary key.
      */

package/lib/index.d.ts

@@ -1997,6 +1997,14 @@ declare class InterpreterUtils {
     private readonly autoUpdateColumns;
     constructor(model: typeof Model);
     formatStringColumn(dbType: SqlDataSourceType, column: string): string;
+    /**
+     * @description Formats a column WITHOUT table qualification.
+     * ON CONFLICT target lists (Postgres/SQLite) and `excluded.<col>` refs require
+     * bare column names; table-qualified ModelKey refs like "sets.id" must reduce to
+     * "id". Mirrors formatStringColumn's qualified branch (split(".")[1]) so the
+     * bare output is identical minus the "table". prefix.
+     */
+    formatStringColumnBare(dbType: SqlDataSourceType, column: string): string;
     /**
      * @description Formats the table name for the database type, idempotent for quoting
      */
@@ -2072,15 +2080,15 @@ declare class ModelManager<T extends Model> {
     /**
      * @description Finds all records that match the input
      */
-    find<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input?: FindType<T, S, R>): Promise<ModelWithoutRelations<T>[]>;
+    find<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input?: FindType<T, S, R>): Promise<FindReturnType<T, S, R>[]>;
     /**
      * @description Finds the first record that matches the input
      */
-    findOne<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<ModelWithoutRelations<T> | null>;
+    findOne<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<FindReturnType<T, S, R> | null>;
     /**
      * @description Finds the first record that matches the input or throws an error
      */
-    findOneOrFail<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<ModelWithoutRelations<T>>;
+    findOneOrFail<S extends ModelKey<T>[] = never[], R extends ModelRelation<T>[] = never[]>(input: FindOneType<T, S, R>): Promise<FindReturnType<T, S, R>>;
     /**
      * @description Finds a record by its primary key
      * @description Ignores all model hooks
@@ -6193,15 +6201,15 @@ declare class ModelQueryBuilder<T extends Model, S extends Record<string, any> =
     /**
      * @description Finds multiple records.
      */
-    find<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input?: FindType<T, MK, MR>): Promise<ModelWithoutRelations<T>[]>;
+    find<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input?: FindType<T, MK, MR>): Promise<FindReturnType<T, MK, MR>[]>;
     /**
      * @description Finds a single record.
      */
-    findOne<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input: FindOneType<T, MK, MR>): Promise<ModelWithoutRelations<T> | null>;
+    findOne<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input: FindOneType<T, MK, MR>): Promise<FindReturnType<T, MK, MR> | null>;
     /**
      * @description Finds a single record or throws.
      */
-    findOneOrFail<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input: FindOneType<T, MK, MR>): Promise<ModelWithoutRelations<T>>;
+    findOneOrFail<MK extends ModelKey<T>[] = never[], MR extends ModelRelation<T>[] = never[]>(input: FindOneType<T, MK, MR>): Promise<FindReturnType<T, MK, MR>>;
     /**
      * @description Finds a single record by primary key.
      */