Leahnaya/sprites
1
0
Fork 0
mirror of https://github.com/smogon/sprites.git synced 2026-09-27 19:57:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fold stamped copying into Manifest

Browse Source 
The ctx is #private now; Manifest.copy(f, dest, name) owns the
hash-stamp-record-queue sequence (absorbing set()'s duplicate-key
check), and the sprite-name resolution in spritecopy/itemspritecopy
stays outside as free functions calling it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Christopher Monsanto
2026-08-17 23:41:26 -04:00
parent 40bd3052f5
commit e3055ae3f5
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rules/publish.ts
View File

@@ -10,20 +10,25 @@ export type Sprite = Artifact | SrcFile;
// The unhashed -> hashed name mapping published beside a stamped set.
export class Manifest {
readonly ctx: DeployCtx;
#ctx: DeployCtx;
#entries = new Map<string, string>();
constructor(ctx: DeployCtx) {
this.ctx = ctx;
this.#ctx = ctx;
}
set(key: string, value: string): void {
// Queue a copy of `f` under `dir` with a content-stamped name and record
// the unhashed -> hashed mapping.
async copy(f: Sprite, {dir, ext}: Dest, name: string): Promise<void> {
let h = await this.#ctx.hash(f);
let key = `${name}.${extOf(f, ext)}`;
// ActionQueue only dedups final dsts; hashed dsts differ even when
// unhashed names collide, so check the key explicitly.
if (this.#entries.has(key)) {
throw new Error(`duplicate sprite name ${key}`);
}
this.#entries.set(key, value);
this.#entries.set(key, `${name}-${h}.${extOf(f, ext)}`);
this.#ctx.copy(f, `${dir}/${name}-${h}.${extOf(f, ext)}`);
}
write(dst: string): void {
@@ -31,7 +36,7 @@ export class Manifest {
for (let [k, v] of [...this.#entries].sort((a, b) => a[0] < b[0] ? -1 : 1)) {
sorted[k] = v;
}
this.ctx.write(dst, JSON.stringify(sorted, null, 4) + '\n');
this.#ctx.write(dst, JSON.stringify(sorted, null, 4) + '\n');
}
}
@@ -58,14 +63,6 @@ export function toPSID(name: string): string {
return name.toLowerCase().replace(/[^a-z0-9]+/g, '');
}
// Copy with a content-hash-stamped name and record the unhashed -> hashed
// mapping in `manifest`.
export async function stampcopy(manifest: Manifest, f: Sprite, {dir, ext}: Dest, name: string): Promise<void> {
let h = await manifest.ctx.hash(f);
manifest.set(`${name}.${extOf(f, ext)}`, `${name}-${h}.${extOf(f, ext)}`);
manifest.ctx.copy(f, `${dir}/${name}-${h}.${extOf(f, ext)}`);
}
export async function spritecopy(manifest: Manifest, f: Sprite, dest: Dest,
allowUnknown = false): Promise<void> {
let sn = spritedata.parseFilename(f.name);
@@ -100,7 +97,7 @@ export async function spritecopy(manifest: Manifest, f: Sprite, dest: Dest,
name += '-gmax';
}
await stampcopy(manifest, f, dest, name);
await manifest.copy(f, dest, name);
}
// TODO: merge with above
@@ -114,7 +111,7 @@ export async function itemspritecopy(manifest: Manifest, f: Sprite, dest: Dest):
throw new Error(`Not an item sprite: ${f.name}`);
}
for (let n of sd.names) {
await stampcopy(manifest, f, dest, toSmogonAlias(n));
await manifest.copy(f, dest, toSmogonAlias(n));
}
}