Skip to content

Commit

Permalink
Merge pull request drizzle-team#3061 from w3cj/update-monodriver-asyn…
Browse files Browse the repository at this point in the history 
…c-imports

fix: add import extensions to async imports for monodriver
  • Loading branch information
@AndriiSherman
AndriiSherman authored Oct 7, 2024
2 parents d88dd74 + decb0c1 commit dc3c155
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 28 deletions.
12 changes: 12 additions & 0 deletions drizzle-orm/scripts/fix-imports.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ await Promise.all(cjsFiles.map(async (file) => {
path.value.argument.value = resolvePathAlias(path.value.argument.value, file);
this.traverse(path);
},
visitAwaitExpression(path) {
if (print(path.value).code.startsWith(`await import("./`)) {
path.value.argument.arguments[0].value = fixImportPath(path.value.argument.arguments[0].value, file, '.cjs');
}
this.traverse(path);
},
});

await fs.writeFile(file, print(code).code);
Expand Down Expand Up @@ -83,6 +89,12 @@ await Promise.all(esmFiles.map(async (file) => {
path.value.argument.value = fixImportPath(path.value.argument.value, file, '.js');
this.traverse(path);
},
visitAwaitExpression(path) {
if (print(path.value).code.startsWith(`await import("./`)) {
path.value.argument.arguments[0].value = fixImportPath(path.value.argument.arguments[0].value, file, '.js');
}
this.traverse(path);
},
});

await fs.writeFile(file, print(code).code);
Expand Down
28 changes: 14 additions & 14 deletions drizzle-orm/src/monodriver.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ export async function drizzle<
switch (client) {
case 'node-postgres': {
const defpg = await import('pg').catch(() => importError('pg'));
const { drizzle } = await import('./node-postgres');
const { drizzle } = await import('./node-postgres/index.ts');

if (typeof params[0] === 'object') {
const { connection, ...drizzleConfig } = params[0] as
Expand Down Expand Up @@ -343,7 +343,7 @@ export async function drizzle<
const { RDSDataClient } = await import('@aws-sdk/client-rds-data').catch(() =>
importError('@aws-sdk/client-rds-data')
);
const { drizzle } = await import('./aws-data-api/pg');
const { drizzle } = await import('./aws-data-api/pg/index.ts');

const instance = new RDSDataClient(rdsConfig);
const db = drizzle(instance, { resourceArn, database, secretArn, ...drizzleConfig });
Expand All @@ -352,7 +352,7 @@ export async function drizzle<
}
case 'better-sqlite3': {
const { default: Client } = await import('better-sqlite3').catch(() => importError('better-sqlite3'));
const { drizzle } = await import('./better-sqlite3');
const { drizzle } = await import('./better-sqlite3/index.ts');

if (typeof params[0] === 'object') {
const { connection, ...drizzleConfig } = params[0] as {
Expand Down Expand Up @@ -383,7 +383,7 @@ export async function drizzle<
const { Database: Client } = await import('bun:sqlite').catch(() => {
throw new Error(`Please use bun to use 'bun:sqlite' for Drizzle ORM to connect to database`);
});
const { drizzle } = await import('./bun-sqlite');
const { drizzle } = await import('./bun-sqlite/index.ts');

if (typeof params[0] === 'object') {
const { connection, ...drizzleConfig } = params[0] as {
Expand Down Expand Up @@ -415,7 +415,7 @@ export async function drizzle<
case 'd1': {
const { connection, ...drizzleConfig } = params[0] as { connection: AnyD1Database } & DrizzleConfig;

const { drizzle } = await import('./d1');
const { drizzle } = await import('./d1/index.ts');

const db = drizzle(connection, drizzleConfig);

Expand All @@ -424,7 +424,7 @@ export async function drizzle<
case 'libsql':
case 'turso': {
const { createClient } = await import('@libsql/client').catch(() => importError('@libsql/client'));
const { drizzle } = await import('./libsql');
const { drizzle } = await import('./libsql/index.ts');

if (typeof params[0] === 'string') {
const instance = createClient({
Expand All @@ -444,7 +444,7 @@ export async function drizzle<
}
case 'mysql2': {
const { createPool } = await import('mysql2/promise').catch(() => importError('mysql2'));
const { drizzle } = await import('./mysql2');
const { drizzle } = await import('./mysql2/index.ts');

if (typeof params[0] === 'object') {
const { connection, ...drizzleConfig } = params[0] as
Expand All @@ -466,7 +466,7 @@ export async function drizzle<
}
case 'neon-http': {
const { neon } = await import('@neondatabase/serverless').catch(() => importError('@neondatabase/serverless'));
const { drizzle } = await import('./neon-http');
const { drizzle } = await import('./neon-http/index.ts');

if (typeof params[0] === 'object') {
const { connection, ...drizzleConfig } = params[0] as { connection: MonodriverNeonHttpConfig } & DrizzleConfig;
Expand Down Expand Up @@ -495,7 +495,7 @@ export async function drizzle<
const { Pool, neonConfig } = await import('@neondatabase/serverless').catch(() =>
importError('@neondatabase/serverless')
);
const { drizzle } = await import('./neon-serverless');
const { drizzle } = await import('./neon-serverless/index.ts');
if (typeof params[0] === 'string') {
const instance = new Pool({
connectionString: params[0],
Expand Down Expand Up @@ -534,7 +534,7 @@ export async function drizzle<
}
case 'planetscale': {
const { Client } = await import('@planetscale/database').catch(() => importError('@planetscale/database'));
const { drizzle } = await import('./planetscale-serverless');
const { drizzle } = await import('./planetscale-serverless/index.ts');

if (typeof params[0] === 'object') {
const { connection, ...drizzleConfig } = params[0] as
Expand All @@ -561,7 +561,7 @@ export async function drizzle<
}
case 'postgres-js': {
const { default: client } = await import('postgres').catch(() => importError('postgres'));
const { drizzle } = await import('./postgres-js');
const { drizzle } = await import('./postgres-js/index.ts');

if (typeof params[0] === 'object') {
const { connection, ...drizzleConfig } = params[0] as {
Expand Down Expand Up @@ -590,7 +590,7 @@ export async function drizzle<
}
case 'tidb-serverless': {
const { connect } = await import('@tidbcloud/serverless').catch(() => importError('@tidbcloud/serverless'));
const { drizzle } = await import('./tidb-serverless');
const { drizzle } = await import('./tidb-serverless/index.ts');

if (typeof params[0] === 'string') {
const instance = connect({
Expand All @@ -617,7 +617,7 @@ export async function drizzle<
case 'vercel-postgres': {
const drizzleConfig = params[0] as DrizzleConfig | undefined;
const { sql } = await import('@vercel/postgres').catch(() => importError('@vercel/postgres'));
const { drizzle } = await import('./vercel-postgres');
const { drizzle } = await import('./vercel-postgres/index.ts');

const db = drizzle(sql, drizzleConfig);

Expand All @@ -626,7 +626,7 @@ export async function drizzle<

case 'pglite': {
const { PGlite } = await import('@electric-sql/pglite').catch(() => importError('@electric-sql/pglite'));
const { drizzle } = await import('./pglite');
const { drizzle } = await import('./pglite/index.ts');

if (typeof params[0] === 'object') {
const { connection, ...drizzleConfig } = params[0] as {
Expand Down
28 changes: 14 additions & 14 deletions drizzle-orm/src/monomigrator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,72 +36,72 @@ export async function migrate(
) {
switch ((<any> db).constructor[entityKind]) {
case 'AwsDataApiPgDatabase': {
const { migrate } = await import('./aws-data-api/pg/migrator');
const { migrate } = await import('./aws-data-api/pg/migrator.ts');

return migrate(db as AwsDataApiPgDatabase, config as MigrationConfig);
}
case 'BetterSQLite3Database': {
const { migrate } = await import('./better-sqlite3/migrator');
const { migrate } = await import('./better-sqlite3/migrator.ts');

return migrate(db as BetterSQLite3Database, config as MigrationConfig);
}
case 'BunSQLiteDatabase': {
const { migrate } = await import('./bun-sqlite/migrator');
const { migrate } = await import('./bun-sqlite/migrator.ts');

return migrate(db as BunSQLiteDatabase, config as MigrationConfig);
}
case 'D1Database': {
const { migrate } = await import('./d1/migrator');
const { migrate } = await import('./d1/migrator.ts');

return migrate(db as DrizzleD1Database, config as MigrationConfig);
}
case 'LibSQLDatabase': {
const { migrate } = await import('./libsql/migrator');
const { migrate } = await import('./libsql/migrator.ts');

return migrate(db as LibSQLDatabase, config as MigrationConfig);
}
case 'MySql2Database': {
const { migrate } = await import('./mysql2/migrator');
const { migrate } = await import('./mysql2/migrator.ts');

return migrate(db as MySql2Database, config as MigrationConfig);
}
case 'NeonHttpDatabase': {
const { migrate } = await import('./neon-http/migrator');
const { migrate } = await import('./neon-http/migrator.ts');

return migrate(db as NeonHttpDatabase, config as MigrationConfig);
}
case 'NeonServerlessDatabase': {
const { migrate } = await import('./neon-serverless/migrator');
const { migrate } = await import('./neon-serverless/migrator.ts');

return migrate(db as NeonDatabase, config as MigrationConfig);
}
case 'NodePgDatabase': {
const { migrate } = await import('./node-postgres/migrator');
const { migrate } = await import('./node-postgres/migrator.ts');

return migrate(db as NodePgDatabase, config as MigrationConfig);
}
case 'PlanetScaleDatabase': {
const { migrate } = await import('./planetscale-serverless/migrator');
const { migrate } = await import('./planetscale-serverless/migrator.ts');

return migrate(db as PlanetScaleDatabase, config as MigrationConfig);
}
case 'PostgresJsDatabase': {
const { migrate } = await import('./postgres-js/migrator');
const { migrate } = await import('./postgres-js/migrator.ts');

return migrate(db as PostgresJsDatabase, config as MigrationConfig);
}
case 'TiDBServerlessDatabase': {
const { migrate } = await import('./tidb-serverless/migrator');
const { migrate } = await import('./tidb-serverless/migrator.ts');

return migrate(db as TiDBServerlessDatabase, config as MigrationConfig);
}
case 'VercelPgDatabase': {
const { migrate } = await import('./vercel-postgres/migrator');
const { migrate } = await import('./vercel-postgres/migrator.ts');

return migrate(db as VercelPgDatabase, config as MigrationConfig);
}
case 'PgliteDatabase': {
const { migrate } = await import('./pglite/migrator');
const { migrate } = await import('./pglite/migrator.ts');

return migrate(db as PgliteDatabase, config as MigrationConfig);
}
Expand Down

0 comments on commit dc3c155

Please sign in to comment.