mirror of
https://github.com/smogon/sprites.git
synced 2026-09-08 18:15:45 -05:00
deploy/script: runOnFile takes aq
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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', () => {
|
||||
|
||||
Reference in New Issue
Block a user