@zenstackhq/orm 3.0.0-beta.31 → 3.0.0-beta.33

package/dist/index.d.cts

@@ -335,6 +335,7 @@ interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
     description?: string;
     /**
      * Custom function implementations.
+     * @private
      */
     functions?: Record<string, ZModelFunction<Schema>>;
     /**
@@ -495,6 +496,8 @@ type ClientOptions<Schema extends SchemaDef> = {
     dialect: Dialect;
     /**
      * Custom function definitions.
+     *
+     * @private
      */
     functions?: Record<string, ZModelFunction<Schema>>;
     /**
@@ -579,7 +582,7 @@ type QueryLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, F
 type OptionsLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>, Options extends QueryOptions<Schema>> = Model extends keyof Options['omit'] ? Field extends keyof Options['omit'][Model] ? Options['omit'][Model][Field] extends boolean ? Options['omit'][Model][Field] : undefined : undefined : undefined;
 type SchemaLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = GetModelField<Schema, Model, Field>['omit'] extends true ? true : false;
 type ModelSelectResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Select, Omit, Options extends QueryOptions<Schema>> = {
-    [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model> ? Key : never : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapModelFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? Select[Key] extends FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> ? 'select' extends keyof Select[Key] ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Pick<Select[Key], 'select'>, Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Pick<Select[Key], 'include' | 'omit'>, Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : DefaultModelResult<Schema, RelationFieldType<Schema, Model, Key>, Omit, Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : never;
+    [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model> ? Key : never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapModelFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Select[Key], Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : never;
 };
 type SelectCountResult<Schema extends SchemaDef, Model extends GetModels<Schema>, C> = C extends true ? {
     [Key in RelationFields<Schema, Model> as FieldIsArray<Schema, Model, Key> extends true ? Key : never]: number;
@@ -589,16 +592,17 @@ type SelectCountResult<Schema extends SchemaDef, Model extends GetModels<Schema>
     [Key in keyof S]: number;
 } : never;
 type ModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args = {}, Options extends QueryOptions<Schema> = QueryOptions<Schema>, Optional = false, Array = false> = WrapType<Args extends {
-    select: infer S;
-    omit?: infer O;
-} ? ModelSelectResult<Schema, Model, S, O, Options> : Args extends {
-    include: infer I;
-    omit?: infer O;
-} ? DefaultModelResult<Schema, Model, O, Options, false, false> & {
-    [Key in keyof I & RelationFields<Schema, Model> as I[Key] extends false | undefined ? never : Key]: I[Key] extends FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, I[Key], Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : DefaultModelResult<Schema, RelationFieldType<Schema, Model, Key>, undefined, Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>>;
+    select: infer S extends object;
+    omit?: infer O extends object;
+} & Record<string, unknown> ? ModelSelectResult<Schema, Model, S, O, Options> : Args extends {
+    include: infer I extends object;
+    omit?: infer O extends object;
+} & Record<string, unknown> ? // select all non-omitted scalar fields
+DefaultModelResult<Schema, Model, O, Options, false, false> & {
+    [Key in keyof I & RelationFields<Schema, Model> as I[Key] extends false | undefined ? never : Key]: ModelResult<Schema, RelationFieldType<Schema, Model, Key>, I[Key], Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>>;
 } : Args extends {
     omit: infer O;
-} ? DefaultModelResult<Schema, Model, O, Options, false, false> : DefaultModelResult<Schema, Model, undefined, Options, false, false>, Optional, Array>;
+} & Record<string, unknown> ? DefaultModelResult<Schema, Model, O, Options, false, false> : DefaultModelResult<Schema, Model, undefined, Options, false, false>, Optional, Array>;
 type SimplifiedResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args = {}, Options extends QueryOptions<Schema> = QueryOptions<Schema>, Optional = false, Array = false> = Simplify<ModelResult<Schema, Model, Args, Options, Optional, Array>>;
 type SimplifiedPlainResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args = {}, Options extends QueryOptions<Schema> = QueryOptions<Schema>> = Simplify<ModelResult<Schema, Model, Args, Options, false, false>>;
 type TypeDefResult<Schema extends SchemaDef, TypeDef extends GetTypeDefs<Schema>, Partial extends boolean = false> = PartialIf<Optional<{

package/dist/index.d.ts

@@ -335,6 +335,7 @@ interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
     description?: string;
     /**
      * Custom function implementations.
+     * @private
      */
     functions?: Record<string, ZModelFunction<Schema>>;
     /**
@@ -495,6 +496,8 @@ type ClientOptions<Schema extends SchemaDef> = {
     dialect: Dialect;
     /**
      * Custom function definitions.
+     *
+     * @private
      */
     functions?: Record<string, ZModelFunction<Schema>>;
     /**
@@ -579,7 +582,7 @@ type QueryLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, F
 type OptionsLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>, Options extends QueryOptions<Schema>> = Model extends keyof Options['omit'] ? Field extends keyof Options['omit'][Model] ? Options['omit'][Model][Field] extends boolean ? Options['omit'][Model][Field] : undefined : undefined : undefined;
 type SchemaLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = GetModelField<Schema, Model, Field>['omit'] extends true ? true : false;
 type ModelSelectResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Select, Omit, Options extends QueryOptions<Schema>> = {
-    [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model> ? Key : never : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapModelFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? Select[Key] extends FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> ? 'select' extends keyof Select[Key] ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Pick<Select[Key], 'select'>, Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Pick<Select[Key], 'include' | 'omit'>, Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : DefaultModelResult<Schema, RelationFieldType<Schema, Model, Key>, Omit, Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : never;
+    [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model> ? Key : never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapModelFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Select[Key], Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : never;
 };
 type SelectCountResult<Schema extends SchemaDef, Model extends GetModels<Schema>, C> = C extends true ? {
     [Key in RelationFields<Schema, Model> as FieldIsArray<Schema, Model, Key> extends true ? Key : never]: number;
@@ -589,16 +592,17 @@ type SelectCountResult<Schema extends SchemaDef, Model extends GetModels<Schema>
     [Key in keyof S]: number;
 } : never;
 type ModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args = {}, Options extends QueryOptions<Schema> = QueryOptions<Schema>, Optional = false, Array = false> = WrapType<Args extends {
-    select: infer S;
-    omit?: infer O;
-} ? ModelSelectResult<Schema, Model, S, O, Options> : Args extends {
-    include: infer I;
-    omit?: infer O;
-} ? DefaultModelResult<Schema, Model, O, Options, false, false> & {
-    [Key in keyof I & RelationFields<Schema, Model> as I[Key] extends false | undefined ? never : Key]: I[Key] extends FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, I[Key], Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : DefaultModelResult<Schema, RelationFieldType<Schema, Model, Key>, undefined, Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>>;
+    select: infer S extends object;
+    omit?: infer O extends object;
+} & Record<string, unknown> ? ModelSelectResult<Schema, Model, S, O, Options> : Args extends {
+    include: infer I extends object;
+    omit?: infer O extends object;
+} & Record<string, unknown> ? // select all non-omitted scalar fields
+DefaultModelResult<Schema, Model, O, Options, false, false> & {
+    [Key in keyof I & RelationFields<Schema, Model> as I[Key] extends false | undefined ? never : Key]: ModelResult<Schema, RelationFieldType<Schema, Model, Key>, I[Key], Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>>;
 } : Args extends {
     omit: infer O;
-} ? DefaultModelResult<Schema, Model, O, Options, false, false> : DefaultModelResult<Schema, Model, undefined, Options, false, false>, Optional, Array>;
+} & Record<string, unknown> ? DefaultModelResult<Schema, Model, O, Options, false, false> : DefaultModelResult<Schema, Model, undefined, Options, false, false>, Optional, Array>;
 type SimplifiedResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args = {}, Options extends QueryOptions<Schema> = QueryOptions<Schema>, Optional = false, Array = false> = Simplify<ModelResult<Schema, Model, Args, Options, Optional, Array>>;
 type SimplifiedPlainResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args = {}, Options extends QueryOptions<Schema> = QueryOptions<Schema>> = Simplify<ModelResult<Schema, Model, Args, Options, false, false>>;
 type TypeDefResult<Schema extends SchemaDef, TypeDef extends GetTypeDefs<Schema>, Partial extends boolean = false> = PartialIf<Optional<{

package/dist/index.js

@@ -396,15 +396,16 @@ function getManyToManyRelation(schema, model, field) {
   if (!fieldDef.array || !fieldDef.relation?.opposite) {
     return void 0;
   }
+  const realModel = fieldDef.originModel ?? model;
   const oppositeFieldDef = requireField(schema, fieldDef.type, fieldDef.relation.opposite);
   if (oppositeFieldDef.array) {
     const sortedModelNames = [
-      model,
+      realModel,
       fieldDef.type
     ].sort();
     let orderedFK;
-    if (model !== fieldDef.type) {
-      orderedFK = sortedModelNames[0] === model ? [
+    if (realModel !== fieldDef.type) {
+      orderedFK = sortedModelNames[0] === realModel ? [
         "A",
         "B"
       ] : [
@@ -424,7 +425,7 @@ function getManyToManyRelation(schema, model, field) {
         "A"
       ];
     }
-    const modelIdFields = requireIdFields(schema, model);
+    const modelIdFields = requireIdFields(schema, realModel);
     invariant(modelIdFields.length === 1, "Only single-field ID is supported for many-to-many relation");
     const otherIdFields = requireIdFields(schema, fieldDef.type);
     invariant(otherIdFields.length === 1, "Only single-field ID is supported for many-to-many relation");
@@ -6324,7 +6325,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
           parameters
         };
       }
-      return connection.executeQuery(compiled);
+      return this.internalExecuteQuery(connection, compiled);
     }
     if ((InsertQueryNode.is(query) || UpdateQueryNode.is(query)) && this.hasEntityMutationPluginsWithAfterMutationHooks) {
       query = {
@@ -6353,7 +6354,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
       return beforeMutationEntities;
     }, "loadBeforeMutationEntities");
     await this.callBeforeMutationHooks(finalQuery, mutationInfo, loadBeforeMutationEntities, connectionClient, queryId);
-    const result = await connection.executeQuery(compiled);
+    const result = await this.internalExecuteQuery(connection, compiled);
     if (!this.driver.isTransactionConnection(connection)) {
       await this.callAfterMutationHooks(result, finalQuery, mutationInfo, connectionClient, "all", queryId);
     } else {
@@ -6490,7 +6491,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
       where: this.andNodes(selectQueryNode.where, where)
     };
     const compiled = this.compileQuery(selectQueryNode, createQueryId2());
-    const result = await connection.executeQuery(compiled);
+    const result = await this.internalExecuteQuery(connection, compiled);
     return result.rows;
   }
   andNodes(condition1, condition2) {
@@ -6502,6 +6503,13 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
       return condition2;
     }
   }
+  async internalExecuteQuery(connection, compiledQuery) {
+    try {
+      return await connection.executeQuery(compiledQuery);
+    } catch (err) {
+      throw createDBQueryError("Failed to execute query", err, compiledQuery.sql, compiledQuery.parameters);
+    }
+  }
 };
 
 // src/client/functions.ts