seperate fromDisk migration loader

Author: tim-smart

.changeset/unlucky-squids-add.md

@@ -0,0 +1,8 @@
+---
+"@sqlfx/sqlite": patch
+"@sqlfx/mysql": patch
+"@sqlfx/sql": patch
+"@sqlfx/pg": patch
+---
+
+seperate fromDisk migration loader

docs/sql/Migrator.ts.md

@@ -24,7 +24,6 @@ Added in v1.0.0
   - [ResolvedMigration (type alias)](#resolvedmigration-type-alias)
 - [utils](#utils)
   - [fromBabelGlob](#frombabelglob)
-  - [fromDisk](#fromdisk)
   - [fromGlob](#fromglob)
 
 ---
@@ -143,16 +142,6 @@ export declare const fromBabelGlob: (migrations: Record<string, any>) => Loader
 
 Added in v1.0.0
 
-## fromDisk
-
-**Signature**
-
-```ts
-export declare const fromDisk: (directory: string) => Loader
-```
-
-Added in v1.0.0
-
 ## fromGlob
 
 **Signature**

docs/sql/Migrator/Node.ts.md

@@ -0,0 +1,30 @@
+---
+title: Migrator/Node.ts
+nav_order: 5
+parent: "@sqlfx/sql"
+---
+
+## Node overview
+
+Added in v1.0.0
+
+---
+
+<h2 class="text-delta">Table of contents</h2>
+
+- [utils](#utils)
+  - [fromDisk](#fromdisk)
+
+---
+
+# utils
+
+## fromDisk
+
+**Signature**
+
+```ts
+export declare const fromDisk: (directory: string) => Loader
+```
+
+Added in v1.0.0

docs/sql/Schema.ts.md

@@ -1,6 +1,6 @@
 ---
 title: Schema.ts
-nav_order: 5
+nav_order: 6
 parent: "@sqlfx/sql"
 ---
 

docs/sql/Statement.ts.md

@@ -1,6 +1,6 @@
 ---
 title: Statement.ts
-nav_order: 6
+nav_order: 7
 parent: "@sqlfx/sql"
 ---
 

docs/sql/Transform.ts.md

@@ -1,6 +1,6 @@
 ---
 title: Transform.ts
-nav_order: 7
+nav_order: 8
 parent: "@sqlfx/sql"
 ---
 

docs/sqlite/MigratorNode.ts.md renamed to docs/sqlite/Migrator/Node.ts.md

@@ -1,10 +1,10 @@
 ---
-title: MigratorNode.ts
+title: Migrator/Node.ts
 nav_order: 5
 parent: "@sqlfx/sqlite"
 ---
 
-## MigratorNode overview
+## Node overview
 
 Added in v1.0.0
 

packages/mysql/src/Migrator.ts

@@ -7,28 +7,29 @@ import * as Layer from "@effect/io/Layer"
 import * as Sql from "@sqlfx/mysql"
 import type { SqlError } from "@sqlfx/sql/Error"
 import * as _ from "@sqlfx/sql/Migrator"
+import { fromDisk } from "@sqlfx/sql/Migrator/Node"
 import { execFile } from "node:child_process"
 import * as NFS from "node:fs"
 import * as Path from "node:path"
 
-const { fromBabelGlob, fromDisk, fromGlob } = _
+const { fromBabelGlob, fromGlob } = _
 
 export {
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromDisk,
+  fromBabelGlob,
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromGlob,
+  fromDisk,
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromBabelGlob,
+  fromGlob,
 }
 
 /**

packages/pg/src/Migrator.ts

@@ -7,28 +7,29 @@ import * as Layer from "@effect/io/Layer"
 import * as Pg from "@sqlfx/pg"
 import type { SqlError } from "@sqlfx/sql/Error"
 import * as _ from "@sqlfx/sql/Migrator"
+import { fromDisk } from "@sqlfx/sql/Migrator/Node"
 import { execFile } from "node:child_process"
 import * as NFS from "node:fs"
 import * as Path from "node:path"
 
-const { fromBabelGlob, fromDisk, fromGlob } = _
+const { fromBabelGlob, fromGlob } = _
 
 export {
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromDisk,
+  fromBabelGlob,
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromGlob,
+  fromDisk,
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromBabelGlob,
+  fromGlob,
 }
 
 /**

packages/sql/src/Migrator.ts

@@ -140,7 +140,9 @@ export const make =
             ),
           ),
           Effect.flatMap(_ =>
-            _.default
+            Effect.isEffect(_)
+              ? Effect.succeed(_)
+              : _.default
               ? Effect.succeed(_.default?.default ?? _.default)
               : Effect.fail(
                   MigrationError({
@@ -283,46 +285,6 @@ export const make =
       return completed
     })
 
-/**
- * @since 1.0.0
- */
-export const fromDisk = (directory: string): Loader =>
-  pipe(
-    Effect.promise(() => import("node:fs")),
-    Effect.map(NFS =>
-      NFS.readdirSync(directory)
-        .map(_ =>
-          Option.fromNullable(_.match(/^(?:.*\/)?(\d+)_([^.]+)\.(js|ts)$/)),
-        )
-        .flatMap(
-          Option.match({
-            onNone: () => [],
-            onSome: ([basename, id, name]): ReadonlyArray<ResolvedMigration> =>
-              [
-                [
-                  Number(id),
-                  name,
-                  Effect.promise(
-                    () =>
-                      import(
-                        /* @vite-ignore */
-                        `${directory}/${basename}`
-                      ),
-                  ),
-                ],
-              ] as const,
-          }),
-        )
-        .sort(([a], [b]) => a - b),
-    ),
-    Effect.catchAllDefect(_ =>
-      Effect.as(
-        Effect.logDebug(`Could not load migrations from disk: ${_}`),
-        [],
-      ),
-    ),
-  )
-
 const migrationOrder = Order.make<ResolvedMigration>(([a], [b]) =>
   Order.number(a, b),
 )

packages/sql/src/Migrator/Node.ts

@@ -0,0 +1,47 @@
+/**
+ * @since 1.0.0
+ */
+import { pipe } from "@effect/data/Function"
+import * as Option from "@effect/data/Option"
+import * as Effect from "@effect/io/Effect"
+import type { Loader, ResolvedMigration } from "@sqlfx/sql/Migrator"
+
+/**
+ * @since 1.0.0
+ */
+export const fromDisk = (directory: string): Loader =>
+  pipe(
+    Effect.promise(() => import("node:fs")),
+    Effect.map(NFS =>
+      NFS.readdirSync(directory)
+        .map(_ =>
+          Option.fromNullable(_.match(/^(?:.*\/)?(\d+)_([^.]+)\.(js|ts)$/)),
+        )
+        .flatMap(
+          Option.match({
+            onNone: () => [],
+            onSome: ([basename, id, name]): ReadonlyArray<ResolvedMigration> =>
+              [
+                [
+                  Number(id),
+                  name,
+                  Effect.promise(
+                    () =>
+                      import(
+                        /* @vite-ignore */
+                        `${directory}/${basename}`
+                      ),
+                  ),
+                ],
+              ] as const,
+          }),
+        )
+        .sort(([a], [b]) => a - b),
+    ),
+    Effect.catchAllDefect(_ =>
+      Effect.as(
+        Effect.logDebug(`Could not load migrations from disk: ${_}`),
+        [],
+      ),
+    ),
+  )

packages/sqlite/src/MigratorNode.ts renamed to packages/sqlite/src/Migrator/Node.ts

@@ -5,27 +5,31 @@ import * as Effect from "@effect/io/Effect"
 import * as Layer from "@effect/io/Layer"
 import type { SqlError } from "@sqlfx/sql/Error"
 import * as _ from "@sqlfx/sql/Migrator"
-import type { SqliteClient } from "@sqlfx/sqlite/node"
+import { fromDisk } from "@sqlfx/sql/Migrator/Node"
 import * as internal from "@sqlfx/sqlite/internal/client"
+import type { SqliteClient } from "@sqlfx/sqlite/node"
+import { execFile } from "node:child_process"
+import * as NFS from "node:fs"
+import * as Path from "node:path"
 
-const { fromBabelGlob, fromDisk, fromGlob } = _
+const { fromBabelGlob, fromGlob } = _
 
 export {
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromDisk,
+  fromBabelGlob,
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromGlob,
+  fromDisk,
   /**
    * @category loader
    * @since 1.0.0
    */
-  fromBabelGlob,
+  fromGlob,
 }
 
 /**
@@ -51,12 +55,6 @@ export const run: (
   },
   dumpSchema: (sql, path, table) =>
     Effect.gen(function* ($) {
-      const { execFile } = yield* $(
-        Effect.promise(() => import("node:child_process")),
-      )
-      const NFS = yield* $(Effect.promise(() => import("node:fs")))
-      const Path = yield* $(Effect.promise(() => import("node:path")))
-
       const sqliteDump = (args: Array<string>) =>
         Effect.map(
           Effect.async<never, _.MigrationError, string>(resume => {