From d150893cc475299536e76516125321cef9041948 Mon Sep 17 00:00:00 2001
From: Christopher Monsanto <chris@monsan.to>
Date: Mon, 24 Aug 2020 03:36:49 -0400
Subject: [PATCH] deploy/script: runOnFile takes aq

---
 tools/deploy/index.ts       | 3 +--
 tools/deploy/script.ts      | 4 ++--
 tools/deploy/test/script.js | 7 +++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/deploy/index.ts b/tools/deploy/index.ts
index ffb44006..5bfd8d7c 100644
--- a/tools/deploy/index.ts
+++ b/tools/deploy/index.ts
@@ -50,8 +50,7 @@ program
         
         for (const src of files) {
             try {
-                const dst = script.runOnFile(scr, src);
-                aq.copy(src, dst);
+                script.runOnFile(scr, src, aq);
             } catch(e) {
                 // Move to script.runOnFile?
                 aq.throw(e);
diff --git a/tools/deploy/script.ts b/tools/deploy/script.ts
index ee6c93f0..df54ff50 100644
--- a/tools/deploy/script.ts
+++ b/tools/deploy/script.ts
@@ -166,7 +166,7 @@ function makeEnv(srcDir : string, queue: ActionQueue) {
     }
 }
 
-export function runOnFile(scr : Script, src : string) : string {
+export function runOnFile(scr : Script, src : string, queue: ActionQueue) {
     const input = pathlib.path(src, {dir: ""});
     const result = scr.runInNewContext({
         __proto__: ENV_PROTO,
@@ -178,7 +178,7 @@ export function runOnFile(scr : Script, src : string) : string {
     }
     const output = pathlib.update(input, result);
     const dst = pathlib.format(output);
-    return dst;
+    queue.copy(src, dst);
 }
 
 export function run(scr : Script, srcDir : string, queue : ActionQueue) {
diff --git a/tools/deploy/test/script.js b/tools/deploy/test/script.js
index 04b23ac6..1b4522a0 100644
--- a/tools/deploy/test/script.js
+++ b/tools/deploy/test/script.js
@@ -24,8 +24,11 @@ it('aq', () => {
 
 it('runOnFile', () => {
     const scr = new script.Script('({name: "25"})', 'expr');
-    const dst = script.runOnFile(scr, '/foo/bar/pikachu.png');
-    expect(dst).toEqual('25.png');
+    const aq = new script.ActionQueue();
+    script.runOnFile(scr, '/foo/bar/pikachu.png', aq);
+    expect(aq.log).toEqual(expect.arrayContaining([
+        {type: 'Copy', src: '/foo/bar/pikachu.png', dst: "25.png", valid: 'Success', debugObjs: []},
+    ]));
 });
 
 it('run identity', () => {