@flowscripter/pluggable-io-framework 1.2.5 → 1.2.7

package/dist/src/copyMove.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copyMove.d.ts","sourceRoot":"","sources":["../../src/copyMove.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAEnB,KAAK,UAAU,EAIf,KAAK,cAAc,EACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EACL,KAAK,kBAAkB,EAGxB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9D,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IACpC,6FAA6F;IAC7F,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC;;;;;OAKG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACzC;;;;;OAKG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACjD,sFAAsF;IACtF,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC;CAC/B;AA+WD;;;;;;;;;;;;GAYG;AACH,wBAAsB,IAAI,CACxB,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAOf;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CACxB,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAOf"}
+{"version":3,"file":"copyMove.d.ts","sourceRoot":"","sources":["../../src/copyMove.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAEnB,KAAK,UAAU,EAIf,KAAK,cAAc,EACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EACL,KAAK,kBAAkB,EAGxB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9D,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IACpC,6FAA6F;IAC7F,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC;;;;;OAKG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACzC;;;;;OAKG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACjD,sFAAsF;IACtF,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC;CAC/B;AAmXD;;;;;;;;;;;;GAYG;AACH,wBAAsB,IAAI,CACxB,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAOf;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CACxB,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAOf"}

package/dist/src/copyMove.js

@@ -183,15 +183,18 @@ async function resolveRecursiveDestRoot(sourcePath, sink, destPath) {
     return joinPath(destPath, baseName);
 }
 async function recursiveTransfer(source, sourcePath, sink, destPath, options, mode) {
+    const resolvedDestRoot = await resolveRecursiveDestRoot(sourcePath, sink, destPath);
     if (source.canDirectTransfer?.(sink) && source.supportsRecursiveDirectTransfer) {
-        const directFn = mode === "copy" ? source.directCopy : source.directMove;
-        if (directFn) {
-            const operationId = crypto.randomUUID();
-            await directFn(sourcePath, destPath, { operationId, hooks: options.telemetry ?? {} });
+        const telemetry = { operationId: crypto.randomUUID(), hooks: options.telemetry ?? {} };
+        if (mode === "copy" && source.directCopy) {
+            await source.directCopy(sourcePath, resolvedDestRoot, telemetry);
+            return;
+        }
+        if (mode === "move" && source.directMove) {
+            await source.directMove(sourcePath, resolvedDestRoot, telemetry);
             return;
         }
     }
-    const resolvedDestRoot = await resolveRecursiveDestRoot(sourcePath, sink, destPath);
     const recursiveOperationId = crypto.randomUUID();
     const limiter = options.concurrencyLimiter ?? defaultConcurrencyLimiter;
     let discovered = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/pluggable-io-framework",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "A pluggable source/sink IO framework using https://github.com/flowscripter/dynamic-plugin-framework",
   "keywords": [
     "bun",
@@ -40,13 +40,13 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@flowscripter/dynamic-plugin-framework": "^2.2.12",
-    "@flowscripter/pluggable-io-framework-api": "^1.1.5"
+    "@flowscripter/dynamic-plugin-framework": "^2.2.14",
+    "@flowscripter/pluggable-io-framework-api": "^1.1.6"
   },
   "devDependencies": {
     "@types/bun": "^1.4.2",
-    "oxfmt": "0.70.0",
-    "oxlint": "1.85.0"
+    "oxfmt": "0.71.0",
+    "oxlint": "1.86.0"
   },
   "peerDependencies": {
     "typescript": "^7.0.2"

package/src/copyMove.ts

@@ -324,16 +324,20 @@ async function recursiveTransfer(
   options: TransferOptions,
   mode: "copy" | "move",
 ): Promise<void> {
+  const resolvedDestRoot = await resolveRecursiveDestRoot(sourcePath, sink, destPath);
+
   if (source.canDirectTransfer?.(sink) && source.supportsRecursiveDirectTransfer) {
-    const directFn = mode === "copy" ? source.directCopy : source.directMove;
-    if (directFn) {
-      const operationId = crypto.randomUUID();
-      await directFn(sourcePath, destPath, { operationId, hooks: options.telemetry ?? {} });
+    const telemetry = { operationId: crypto.randomUUID(), hooks: options.telemetry ?? {} };
+    if (mode === "copy" && source.directCopy) {
+      await source.directCopy(sourcePath, resolvedDestRoot, telemetry);
+      return;
+    }
+    if (mode === "move" && source.directMove) {
+      await source.directMove(sourcePath, resolvedDestRoot, telemetry);
       return;
     }
   }
 
-  const resolvedDestRoot = await resolveRecursiveDestRoot(sourcePath, sink, destPath);
   const recursiveOperationId = crypto.randomUUID();
   const limiter = options.concurrencyLimiter ?? defaultConcurrencyLimiter;