@drizzle-adapter/d1 1.0.5 → 1.0.7

package/dist/Adapter/D1DrizzleMigrator.js

@@ -1,5 +1,4 @@
 import { DrizzleD1Database } from 'drizzle-orm/d1/driver';
-import { migrate } from 'drizzle-orm/d1/migrator';
 export class D1DrizzleMigrator {
     config;
     /**
@@ -16,6 +15,7 @@ export class D1DrizzleMigrator {
      * @param {DrizzleClientInterface} client The Drizzle client.
      */
     async migrate(client) {
+        const { migrate } = await import('drizzle-orm/d1/migrator');
         await migrate(client, {
             migrationsFolder: this.config.DATABASE_MIGRATIONS_FOLDER,
             migrationsTable: this.config.DATABASE_MIGRATIONS_TABLE,

package/dist/Adapter/index.d.ts

@@ -1,3 +1,2 @@
 export * from './D1DrizzleAdapter.js';
 export * from './D1DrizzleConnection.js';
-export * from './D1DrizzleMigrator.js';

package/dist/Adapter/index.js

@@ -1,3 +1,2 @@
 export * from './D1DrizzleAdapter.js';
 export * from './D1DrizzleConnection.js';
-export * from './D1DrizzleMigrator.js';

package/dist/Factory/D1DrizzleDataTypesFactory.d.ts

@@ -0,0 +1,11 @@
+import type { DrizzleDataTypesFactoryInterface, TypeDrizzleDatabaseConfig } from '@drizzle-adapter/core';
+import { SqliteCoreDrizzleDataTypes } from '@drizzle-adapter/sqlite-core';
+export declare class D1DrizzleDataTypesFactory implements DrizzleDataTypesFactoryInterface {
+    /**
+     * Creates a new data types instance.
+     *
+     * @param {TypeDrizzleDatabaseConfig} _config - Not used in this implementation
+     * @returns {SqliteCoreDrizzleDataTypes}
+     */
+    create(_config: TypeDrizzleDatabaseConfig): SqliteCoreDrizzleDataTypes;
+}

package/dist/Factory/D1DrizzleDataTypesFactory.js

@@ -0,0 +1,12 @@
+import { SqliteCoreDrizzleDataTypes } from '@drizzle-adapter/sqlite-core';
+export class D1DrizzleDataTypesFactory {
+    /**
+     * Creates a new data types instance.
+     *
+     * @param {TypeDrizzleDatabaseConfig} _config - Not used in this implementation
+     * @returns {SqliteCoreDrizzleDataTypes}
+     */
+    create(_config) {
+        return new SqliteCoreDrizzleDataTypes();
+    }
+}

package/dist/Factory/D1DrizzleMigratorFactory.d.ts

@@ -1,5 +1,5 @@
 import type { DrizzleMigratorFactoryInterface, TypeDrizzleMigratorConfig } from '@drizzle-adapter/core';
-import { D1DrizzleMigrator } from '../Adapter/index.js';
+import { D1DrizzleMigrator } from '../migrator.js';
 export declare class D1DrizzleMigratorFactory implements DrizzleMigratorFactoryInterface {
     /**
      * Returns a new migrator.

package/dist/Factory/D1DrizzleMigratorFactory.js

@@ -1,4 +1,4 @@
-import { D1DrizzleMigrator } from '../Adapter/index.js';
+import { D1DrizzleMigrator } from '../migrator.js';
 export class D1DrizzleMigratorFactory {
     /**
      * Returns a new migrator.

package/dist/Factory/index.d.ts

@@ -1,2 +1,2 @@
 export * from './D1DrizzleAdapterFactory.js';
-export * from './D1DrizzleMigratorFactory.js';
+export * from './D1DrizzleDataTypesFactory.js';

package/dist/Factory/index.js

@@ -1,2 +1,2 @@
 export * from './D1DrizzleAdapterFactory.js';
-export * from './D1DrizzleMigratorFactory.js';
+export * from './D1DrizzleDataTypesFactory.js';

package/dist/index.js

@@ -3,7 +3,8 @@ export * from './Factory/index.js';
 export * from './Interface/index.js';
 export * from './Type/index.js';
 // default export so that core factory can use it directly
-import { D1DrizzleAdapterFactory, D1DrizzleMigratorFactory } from './Factory/index.js';
+import { D1DrizzleAdapterFactory, D1DrizzleDataTypesFactory } from './Factory/index.js';
 export default D1DrizzleAdapterFactory;
-import { DrizzleAdapterFactoryRegistry } from '@drizzle-adapter/core';
-DrizzleAdapterFactoryRegistry.register('d1', D1DrizzleAdapterFactory, D1DrizzleMigratorFactory);
+import { DrizzleAdapterFactoryRegistry, DrizzleDataTypesFactoryRegistry } from '@drizzle-adapter/core';
+DrizzleAdapterFactoryRegistry.registerAdapterFactory('d1', D1DrizzleAdapterFactory);
+DrizzleDataTypesFactoryRegistry.registerDataTypesFactory('d1', D1DrizzleDataTypesFactory);

package/dist/migrator.d.ts

@@ -0,0 +1,4 @@
+export * from './Adapter/D1DrizzleMigrator.js';
+export * from './Factory/D1DrizzleMigratorFactory.js';
+import { D1DrizzleMigratorFactory } from './Factory/D1DrizzleMigratorFactory.js';
+export default D1DrizzleMigratorFactory;

package/dist/migrator.js

@@ -0,0 +1,7 @@
+export * from './Adapter/D1DrizzleMigrator.js';
+export * from './Factory/D1DrizzleMigratorFactory.js';
+// default export so that core factory can use it directly
+import { D1DrizzleMigratorFactory } from './Factory/D1DrizzleMigratorFactory.js';
+export default D1DrizzleMigratorFactory;
+import { DrizzleMigratorFactoryRegistry } from '@drizzle-adapter/core/migrator';
+DrizzleMigratorFactoryRegistry.registerMigratorFactory('d1', D1DrizzleMigratorFactory);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@drizzle-adapter/d1",
   "type": "module",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "devDependencies": {

package/src/Adapter/D1DrizzleMigrator.ts

@@ -1,6 +1,5 @@
 import type { DrizzleMigratorInterface, TypeDrizzleMigratorConfig } from '@drizzle-adapter/core';
 import { DrizzleD1Database } from 'drizzle-orm/d1/driver';
-import { migrate } from 'drizzle-orm/d1/migrator';
 import type { D1DrizzleClientInterface } from '../Interface';
 
 export class D1DrizzleMigrator implements DrizzleMigratorInterface
@@ -19,6 +18,7 @@ export class D1DrizzleMigrator implements DrizzleMigratorInterface
 	 */
 	public async migrate(client: D1DrizzleClientInterface): Promise<void>
 	{
+		const { migrate } = await import('drizzle-orm/d1/migrator');
 		await migrate(client as unknown as DrizzleD1Database<Record<string, unknown>>, {
 			migrationsFolder: this.config.DATABASE_MIGRATIONS_FOLDER,
 			migrationsTable: this.config.DATABASE_MIGRATIONS_TABLE,

package/src/Adapter/index.ts

@@ -1,3 +1,2 @@
 export * from './D1DrizzleAdapter';
 export * from './D1DrizzleConnection';
-export * from './D1DrizzleMigrator';

package/src/Factory/D1DrizzleDataTypesFactory.ts

@@ -0,0 +1,16 @@
+import type { DrizzleDataTypesFactoryInterface, TypeDrizzleDatabaseConfig } from '@drizzle-adapter/core';
+import { SqliteCoreDrizzleDataTypes } from '@drizzle-adapter/sqlite-core';
+
+export class D1DrizzleDataTypesFactory implements DrizzleDataTypesFactoryInterface
+{
+	/**
+	 * Creates a new data types instance.
+	 *
+	 * @param {TypeDrizzleDatabaseConfig} _config - Not used in this implementation
+	 * @returns {SqliteCoreDrizzleDataTypes}
+	 */
+	public create(_config: TypeDrizzleDatabaseConfig): SqliteCoreDrizzleDataTypes
+	{
+		return new SqliteCoreDrizzleDataTypes();
+	}
+}

package/src/Factory/D1DrizzleMigratorFactory.ts

@@ -1,5 +1,5 @@
 import type { DrizzleMigratorFactoryInterface, TypeDrizzleMigratorConfig } from '@drizzle-adapter/core';
-import { D1DrizzleMigrator } from '../Adapter';
+import { D1DrizzleMigrator } from '../migrator';
 
 export class D1DrizzleMigratorFactory implements DrizzleMigratorFactoryInterface
 {

package/src/Factory/index.ts

@@ -1,2 +1,2 @@
 export * from './D1DrizzleAdapterFactory';
-export * from './D1DrizzleMigratorFactory';
+export * from './D1DrizzleDataTypesFactory';

package/src/index.ts

@@ -4,8 +4,10 @@ export * from './Interface';
 export * from './Type';
 
 // default export so that core factory can use it directly
-import { D1DrizzleAdapterFactory, D1DrizzleMigratorFactory } from './Factory';
+import { D1DrizzleAdapterFactory, D1DrizzleDataTypesFactory } from './Factory';
 export default D1DrizzleAdapterFactory;
 
-import { DrizzleAdapterFactoryRegistry } from '@drizzle-adapter/core';
-DrizzleAdapterFactoryRegistry.register('d1', D1DrizzleAdapterFactory, D1DrizzleMigratorFactory);
+import { DrizzleAdapterFactoryRegistry, DrizzleDataTypesFactoryRegistry } from '@drizzle-adapter/core';
+DrizzleAdapterFactoryRegistry.registerAdapterFactory('d1', D1DrizzleAdapterFactory);
+DrizzleDataTypesFactoryRegistry.registerDataTypesFactory('d1', D1DrizzleDataTypesFactory);
+

package/src/migrator.ts

@@ -0,0 +1,9 @@
+export * from './Adapter/D1DrizzleMigrator';
+export * from './Factory/D1DrizzleMigratorFactory';
+
+// default export so that core factory can use it directly
+import { D1DrizzleMigratorFactory } from './Factory/D1DrizzleMigratorFactory';
+export default D1DrizzleMigratorFactory;
+
+import { DrizzleMigratorFactoryRegistry } from '@drizzle-adapter/core/migrator';
+DrizzleMigratorFactoryRegistry.registerMigratorFactory('d1', D1DrizzleMigratorFactory);

package/tests/Factory/D1DrizzleDataTypesFactory.test.ts

@@ -0,0 +1,11 @@
+import { describe, it, expect } from 'vitest';
+import { D1DrizzleDataTypesFactory } from '../../src/Factory/D1DrizzleDataTypesFactory';
+import { SqliteCoreDrizzleDataTypes } from '@drizzle-adapter/sqlite-core';
+
+describe('D1DrizzleDataTypesFactory', () => {
+	it('should create an instance of SqliteCoreDrizzleDataTypes', () => {
+		const factory = new D1DrizzleDataTypesFactory();
+		const dataTypes = factory.create({ DATABASE_DRIVER: 'd1' });
+		expect(dataTypes).toBeInstanceOf(SqliteCoreDrizzleDataTypes);
+	});
+});

package/tests/Factory/D1DrizzleMigratorFactory.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
-import { D1DrizzleMigratorFactory } from '../../src/Factory';
-import { D1DrizzleMigrator } from '../../src/Adapter';
+import { D1DrizzleMigratorFactory } from '../../src/Factory/D1DrizzleMigratorFactory';
+import { D1DrizzleMigrator } from '../../src/Adapter/D1DrizzleMigrator';
 import type { TypeDrizzleMigratorConfig } from '@drizzle-adapter/core';
 
 describe('D1DrizzleMigratorFactory', () => {

package/tsconfig.json

@@ -6,7 +6,7 @@
 		"module": "ESNext",
 		
 		// Node module resolution
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"verbatimModuleSyntax": true,
 		"esModuleInterop": true,