@zenstackhq/runtime 3.0.0-alpha.15 → 3.0.0-alpha.17

package/dist/{contract-BYc34jr_.d.cts → contract-C6xcEG6Q.d.cts}

@@ -1,6 +1,6 @@
 import Decimal, { Decimal as Decimal$1 } from 'decimal.js';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, BuiltinType, GetModel, FieldDef, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, DataSourceProvider, ProcedureDef } from '@zenstackhq/sdk/schema';
-import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, RootOperationNode, QueryResult, UnknownRow, OperationNode, SqliteDialectConfig, PostgresDialectConfig, KyselyConfig } from 'kysely';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, BuiltinType, GetModel, FieldDef, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
+import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, RootOperationNode, QueryResult, UnknownRow, OperationNode, Dialect, KyselyConfig } from 'kysely';
 
 type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 type NullableIf<T, Condition extends boolean> = Condition extends true ? T | null : T;
@@ -705,7 +705,6 @@ type OnQueryHookContext<Schema extends SchemaDef, Model extends GetModels<Schema
  */
 declare function definePlugin<Schema extends SchemaDef>(plugin: RuntimePlugin<Schema>): RuntimePlugin<Schema>;
 
-type DialectConfig<Provider extends DataSourceProvider> = Provider['type'] extends 'sqlite' ? Optional<SqliteDialectConfig, 'database'> : Provider['type'] extends 'postgresql' ? Optional<PostgresDialectConfig, 'pool'> : never;
 type ZModelFunctionContext<Schema extends SchemaDef> = {
     dialect: BaseCrudDialect<Schema>;
     model: GetModels<Schema>;
@@ -717,9 +716,9 @@ type ZModelFunction<Schema extends SchemaDef> = (eb: ExpressionBuilder<ToKyselyS
  */
 type ClientOptions<Schema extends SchemaDef> = {
     /**
-     * Database dialect configuration.
+     * Kysely dialect.
      */
-    dialectConfig: DialectConfig<Schema['provider']>;
+    dialect: Dialect;
     /**
      * Custom function definitions.
      */

package/dist/{contract-BYc34jr_.d.ts → contract-C6xcEG6Q.d.ts}

@@ -1,6 +1,6 @@
 import Decimal, { Decimal as Decimal$1 } from 'decimal.js';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, BuiltinType, GetModel, FieldDef, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, DataSourceProvider, ProcedureDef } from '@zenstackhq/sdk/schema';
-import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, RootOperationNode, QueryResult, UnknownRow, OperationNode, SqliteDialectConfig, PostgresDialectConfig, KyselyConfig } from 'kysely';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, BuiltinType, GetModel, FieldDef, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
+import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, RootOperationNode, QueryResult, UnknownRow, OperationNode, Dialect, KyselyConfig } from 'kysely';
 
 type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 type NullableIf<T, Condition extends boolean> = Condition extends true ? T | null : T;
@@ -705,7 +705,6 @@ type OnQueryHookContext<Schema extends SchemaDef, Model extends GetModels<Schema
  */
 declare function definePlugin<Schema extends SchemaDef>(plugin: RuntimePlugin<Schema>): RuntimePlugin<Schema>;
 
-type DialectConfig<Provider extends DataSourceProvider> = Provider['type'] extends 'sqlite' ? Optional<SqliteDialectConfig, 'database'> : Provider['type'] extends 'postgresql' ? Optional<PostgresDialectConfig, 'pool'> : never;
 type ZModelFunctionContext<Schema extends SchemaDef> = {
     dialect: BaseCrudDialect<Schema>;
     model: GetModels<Schema>;
@@ -717,9 +716,9 @@ type ZModelFunction<Schema extends SchemaDef> = (eb: ExpressionBuilder<ToKyselyS
  */
 type ClientOptions<Schema extends SchemaDef> = {
     /**
-     * Database dialect configuration.
+     * Kysely dialect.
      */
-    dialectConfig: DialectConfig<Schema['provider']>;
+    dialect: Dialect;
     /**
      * Custom function definitions.
      */

package/dist/index.cjs

@@ -43,7 +43,6 @@ module.exports = __toCommonJS(src_exports);
 // src/client/client-impl.ts
 var import_common_helpers13 = require("@zenstackhq/common-helpers");
 var import_kysely16 = require("kysely");
-var import_ts_pattern19 = require("ts-pattern");
 
 // src/client/crud/operations/aggregate.ts
 var import_kysely9 = require("kysely");
@@ -6460,17 +6459,16 @@ var ClientImpl = class _ClientImpl {
       this.kyselyRaw = baseClient.kyselyRaw;
       this.auth = baseClient.auth;
     } else {
-      const dialect = this.getKyselyDialect();
-      const driver = new ZenStackDriver(dialect.createDriver(), new import_kysely16.Log(this.$options.log ?? []));
-      const compiler = dialect.createQueryCompiler();
-      const adapter = dialect.createAdapter();
+      const driver = new ZenStackDriver(options.dialect.createDriver(), new import_kysely16.Log(this.$options.log ?? []));
+      const compiler = options.dialect.createQueryCompiler();
+      const adapter = options.dialect.createAdapter();
       const connectionProvider = new import_kysely16.DefaultConnectionProvider(driver);
       this.kyselyProps = {
         config: {
-          dialect,
+          dialect: options.dialect,
           log: this.$options.log
         },
-        dialect,
+        dialect: options.dialect,
         driver,
         executor: executor ?? new ZenStackQueryExecutor(this, driver, compiler, adapter, connectionProvider)
       };
@@ -6497,15 +6495,6 @@ var ClientImpl = class _ClientImpl {
   withExecutor(executor) {
     return new _ClientImpl(this.schema, this.$options, this, executor);
   }
-  getKyselyDialect() {
-    return (0, import_ts_pattern19.match)(this.schema.provider.type).with("sqlite", () => this.makeSqliteKyselyDialect()).with("postgresql", () => this.makePostgresKyselyDialect()).exhaustive();
-  }
-  makePostgresKyselyDialect() {
-    return new import_kysely16.PostgresDialect(this.options.dialectConfig);
-  }
-  makeSqliteKyselyDialect() {
-    return new import_kysely16.SqliteDialect(this.options.dialectConfig);
-  }
   // implementation
   async $transaction(input, options) {
     (0, import_common_helpers13.invariant)(typeof input === "function" || Array.isArray(input) && input.every((p) => p.then && p.cb), "Invalid transaction input, expected a function or an array of ZenStackPromise");