Skip to content

Commit 2584570

Browse files
caseywebdevcaseywebdev
committed
Handle more edge cases, 4.9.5
1 parent c30fe80 commit 2584570

9 files changed

Lines changed: 223 additions & 138 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cogs",
3-
"version": "4.9.4",
3+
"version": "4.9.5",
44
"type": "module",
55
"author": "Casey Foster <c@sey.me>",
66
"description": "The fast file transform pipeline.",

‎src/build-config.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import npath from 'node:path';
33

44
import _ from 'underscore';
55

6-
import getBuild from './get-build.js';
6+
import getBuilds from './get-builds.js';
77
import maybeWrite from './maybe-write.js';
88
import setExt from './set-ext.js';
99
import sortObj from './sort-obj.js';
1010
import writeBuffer from './write-buffer.js';
1111

12-
const flattenBuilds = build => [build, ...build.builds.flatMap(flattenBuilds)];
12+
const { Buffer } = globalThis;
1313

1414
const saveManifest = async ({ env, manifest, onError, onResult }) => {
1515
const { manifestPath } = env;
@@ -74,16 +74,15 @@ const saveBuilds = async ({ env, manifest, onError, onResult }) =>
7474
await Promise.all(
7575
(await getPaths(pattern)).map(async path => {
7676
try {
77-
const builds = flattenBuilds(
78-
await getBuild({
79-
env,
80-
maxChunkSize: target.maxChunkSize,
81-
path,
82-
transformers: target.transformers
83-
})
84-
);
8577
await Promise.all(
86-
_.map(builds, async build => {
78+
(
79+
await getBuilds({
80+
env,
81+
maxChunkSize: target.maxChunkSize,
82+
path,
83+
transformers: target.transformers
84+
})
85+
).map(async build => {
8786
await saveBuild({
8887
build,
8988
manifest,

‎src/cli.test.js‎

Lines changed: 68 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,76 @@ import { promises as fs } from 'node:fs';
44

55
const deleteBuilt = async () => {
66
try {
7-
await fs.unlink('test-fixtures/a.built');
8-
await fs.unlink('test-fixtures/b.built');
9-
await fs.unlink('test-fixtures/c.built');
10-
await fs.unlink('test-fixtures/e.built');
11-
await fs.unlink('test-fixtures/f.built');
7+
for await (const path of fs.glob('test-fixtures/*.built')) {
8+
await fs.unlink(path);
9+
}
1210
} catch (er) {
1311
if (er.code !== 'ENOENT') throw er;
1412
}
1513
};
1614

17-
export default async done => {
18-
await deleteBuilt();
19-
const ps = spawn('node', ['src/cli.js', '-c', 'test-fixtures/config.js'], {
20-
stdio: ['inherit', 'inherit', 'inherit']
21-
});
22-
ps.on('exit', async code => {
23-
try {
24-
assert.equal(code, 0);
25-
assert.equal(
26-
(await fs.readFile('test-fixtures/a.built')).toString(),
27-
'# start\nA\nG\n# end\n'
28-
);
29-
assert.equal(
30-
(await fs.readFile('test-fixtures/b.built')).toString(),
31-
'# start\nB\nD\n# end\n'
32-
);
33-
assert.equal(
34-
(await fs.readFile('test-fixtures/c.built')).toString(),
35-
'# start\nC\n# end\n'
36-
);
37-
assert.equal(
38-
(await fs.readFile('test-fixtures/e.built')).toString(),
39-
'# start\nE\n# end\n'
40-
);
41-
assert.equal(
42-
(await fs.readFile('test-fixtures/f.built')).toString(),
43-
'# start\nF\n# end\n'
44-
);
45-
await deleteBuilt();
46-
done();
47-
} catch (er) {
48-
done(er);
49-
}
50-
});
51-
};
15+
export default [
16+
async done => {
17+
await deleteBuilt();
18+
const ps = spawn('node', ['src/cli.js', '-c', 'test-fixtures/config.js'], {
19+
stdio: ['inherit', 'inherit', 'inherit']
20+
});
21+
ps.on('exit', async code => {
22+
try {
23+
assert.equal(code, 0);
24+
assert.equal(
25+
(await fs.readFile('test-fixtures/a.built')).toString(),
26+
'# start\nA\nG\n# end\n'
27+
);
28+
assert.equal(
29+
(await fs.readFile('test-fixtures/b.built')).toString(),
30+
'# start\nB\nD\n# end\n'
31+
);
32+
assert.equal(
33+
(await fs.readFile('test-fixtures/c.built')).toString(),
34+
'# start\nC\n# end\n'
35+
);
36+
assert.equal(
37+
(await fs.readFile('test-fixtures/e.built')).toString(),
38+
'# start\nE\n# end\n'
39+
);
40+
assert.equal(
41+
(await fs.readFile('test-fixtures/f.built')).toString(),
42+
'# start\nF\n# end\n'
43+
);
44+
await deleteBuilt();
45+
done();
46+
} catch (er) {
47+
done(er);
48+
}
49+
});
50+
},
51+
52+
async done => {
53+
await deleteBuilt();
54+
const ps = spawn('node', ['src/cli.js', '-c', 'test-fixtures/config2.js'], {
55+
stdio: ['inherit', 'inherit', 'inherit']
56+
});
57+
ps.on('exit', async code => {
58+
try {
59+
assert.equal(code, 0);
60+
assert.equal(
61+
(await fs.readFile('test-fixtures/a.built')).toString(),
62+
'# start\nA\nD\n# end\n'
63+
);
64+
assert.equal(
65+
(await fs.readFile('test-fixtures/b.built')).toString(),
66+
'# start\nB\n# end\n'
67+
);
68+
assert.equal(
69+
(await fs.readFile('test-fixtures/c.built')).toString(),
70+
'# start\nC\n# end\n'
71+
);
72+
await deleteBuilt();
73+
done();
74+
} catch (er) {
75+
done(er);
76+
}
77+
});
78+
}
79+
];

‎src/get-build.js‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎src/get-builds.js‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
import _ from 'underscore';
2+
3+
import applyTransformers from './apply-transformers.js';
4+
import walk from './walk.js';
5+
6+
const { Buffer } = globalThis;
7+
8+
const getSharedParent = (a, b) => {
9+
while (a.depth > b.depth) a = a.parent;
10+
while (b.depth > a.depth) b = b.parent;
11+
while (a !== b) [a, b] = [a.parent, b.parent];
12+
return a;
13+
};
14+
15+
const resolve = async ({ env, path }, parent, depth = 0, cache = new Map()) => {
16+
if (cache.has(path)) {
17+
const build = cache.get(path);
18+
if (build.parent) {
19+
parent = getSharedParent(build.parent, parent);
20+
if (build.parent !== parent) {
21+
build.parent.builds.delete(build);
22+
parent.builds.add(build);
23+
build.parent = parent;
24+
build.depth = build.parent.depth + 1;
25+
}
26+
}
27+
return build;
28+
}
29+
30+
const build = { builds: new Set(), depth, parent, path };
31+
parent?.builds.add(build);
32+
cache.set(path, build);
33+
34+
const files = await walk({ env, path });
35+
await Promise.all(
36+
files.flatMap(({ builds }) =>
37+
builds.map(path => resolve({ env, path }, build, depth + 1, cache))
38+
)
39+
);
40+
build.files = _.indexBy(files, 'path');
41+
return build;
42+
};
43+
44+
const getAllFiles = build => [
45+
...Object.values(build.files).map(file => ({ build, file })),
46+
...[...build.builds].flatMap(getAllFiles)
47+
];
48+
49+
const prune = ({ builds, files }) => {
50+
builds.forEach(prune);
51+
52+
const seenFiles = {};
53+
for (const build of builds) {
54+
for (const { build: fileBuild, file } of getAllFiles(build)) {
55+
const { path } = file;
56+
if (files[path]) delete fileBuild.files[path];
57+
else if (seenFiles[path] && seenFiles[path].path !== fileBuild.path) {
58+
files[path] = file;
59+
delete fileBuild.files[path];
60+
delete seenFiles[path].files[path];
61+
delete seenFiles[path];
62+
} else seenFiles[path] = fileBuild;
63+
}
64+
}
65+
};
66+
67+
const getBuffers = async ({ files, maxChunkSize, path, transformers }) => {
68+
let size = 0;
69+
let chunks = [];
70+
const buffers = [];
71+
for (const path in files) {
72+
const { buffer } = files[path];
73+
if (size && maxChunkSize && size + buffer.length > maxChunkSize) {
74+
buffers.push(Buffer.concat(chunks));
75+
size = 0;
76+
chunks = [];
77+
}
78+
size += buffer.length;
79+
chunks.push(buffer);
80+
}
81+
if (chunks.length) buffers.push(Buffer.concat(chunks));
82+
83+
return {
84+
path,
85+
buffers: await Promise.all(
86+
buffers.map(
87+
async buffer =>
88+
(
89+
await applyTransformers({
90+
file: { buffer, builds: [], links: [], path, requires: [path] },
91+
transformers
92+
})
93+
).buffer
94+
)
95+
)
96+
};
97+
};
98+
99+
const flattenBuilds = build => [
100+
build,
101+
...[...build.builds].flatMap(flattenBuilds)
102+
];
103+
104+
export default async ({ env, maxChunkSize, path, transformers }) => {
105+
const build = await resolve({ env, path });
106+
prune(build);
107+
return await Promise.all(
108+
flattenBuilds(build).map(({ path, files }) =>
109+
getBuffers({ files, maxChunkSize, path, transformers })
110+
)
111+
);
112+
};

‎src/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import getBuild from './get-build.js';
1+
import getBuilds from './get-builds.js';
22
import normalizeConfig from './normalize-config.js';
33

4-
export default { getBuild, normalizeConfig };
4+
export default { getBuilds, normalizeConfig };

‎test-fixtures/config2.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
export default {
2+
main: {
3+
transformers: 'test-fixtures/transformer2.js',
4+
builds: {
5+
'test-fixtures/a.txt': {
6+
ext: { '.txt': '.built' },
7+
transformers: {
8+
fn: ({ file: { buffer } }) => ({
9+
buffer: Buffer.from(`# start\n${buffer}# end\n`)
10+
})
11+
}
12+
}
13+
}
14+
}
15+
};

‎test-fixtures/transformer.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ export default ({ file: { path } }) =>
99
builds: ['test-fixtures/e.txt', 'test-fixtures/f.txt']
1010
},
1111
'test-fixtures/c.txt': {
12-
requires: ['test-fixtures/c.txt', 'test-fixtures/g.txt'],
13-
builds: ['test-fixtures/e.txt']
12+
requires: ['test-fixtures/c.txt', 'test-fixtures/g.txt']
1413
},
1514
'test-fixtures/e.txt': {
1615
requires: [

0 commit comments

Comments
 (0)