Merge branch 'worktree-ts7-node24'

.gitignore

@@ -3,4 +3,4 @@ build/
 node_modules
 pnpm-debug.log
 tup.config
-dist/
+.cache/

.travis.yml

@@ -2,13 +2,13 @@ sudo: false
 dist: focal
 language: node_js
 node_js:
-  - '14'
+  - '24'
 cache:
   npm: false
   directories:
     - "~/.pnpm-store"
 before_install:
-  - curl -L https://unpkg.com/@pnpm/self-installer | node
+  - npm install -g pnpm
   - pnpm config set store-dir ~/.pnpm-store
 install:
   - pnpm install

README.md

@@ -12,7 +12,7 @@ This project depends on
 - [OptiPNG](http://optipng.sourceforge.net/) (optional)
 - [pngquant](https://pngquant.org/) (optional)
 - [pnpm](https://pnpm.js.org)
-- [node.js](https://nodejs.org) >= 13
+- [node.js](https://nodejs.org) >= 24
 - [wine](https://www.winehq.org/) (optional)
 - cwebp
 

Tupfile.lua

@@ -88,7 +88,7 @@ rule(
     "ps-pokemon.sheet.mjs",
     {
         display="ps pokemon sheet",
-        "node tools/sheet %f %o",
+        "node tools/sheet/index.ts %f %o",
         compresspng{config="SPRITESHEET"}
     },
     "build/ps/pokemonicons-sheet.png"
@@ -99,7 +99,7 @@ rule(
 --     display="ps trainers sheet",
 --     {"ps-trainers.sheet.mjs"},
 --     {
---         "node tools/sheet %f %o",
+--         "node tools/sheet/index.ts %f %o",
 --         compresspng{config="SPRITESHEET"}
 --     },
 --     {"build/ps/trainers-sheet.png"}
@@ -109,7 +109,7 @@ rule(
     "ps-items.sheet.mjs",
     {
         display="ps items sheet",
-        "node tools/sheet %f %o",
+        "node tools/sheet/index.ts %f %o",
         compresspng{config="SPRITESHEET"}
     },
     "build/ps/itemicons-sheet.png"
@@ -151,7 +151,7 @@ rule(
     spriteglob({"src/minisprites/pokemon/gen6/*", "src/minisprites/items/*"}, {a = false}),
     {
         display="smogdex sheet",
-        "node tools/smogdexspritesheet --image build/smogon/spritesheet.png --stylesheet build/smogon/spritesheet.css -- %f",
+        "node tools/smogdexspritesheet/index.ts --image build/smogon/spritesheet.png --stylesheet build/smogon/spritesheet.css -- %f",
         "cwebp -z 9 build/smogon/spritesheet.png -o build/smogon/spritesheet.webp",
         "rm build/smogon/spritesheet.png"
     },

data/lib/index.ts

@@ -1,7 +1,7 @@
 
 import path from 'path';
 import fs from 'fs';
-import root from '@smogon/sprite-root';
+import root from '@smogon/sprite-root/index.ts';
 
 const libdir = path.join(root, "data");
 
@@ -70,7 +70,7 @@ export function parseFilename(s : string) : SpriteFilename {
     if (s.length < 2)
         throw new Error(`Filename ${s} needs to be at least 2 characters'`);
 
-    const prefix = s[0];
+    const prefix = s[0]!;
     if (!prefix.match(/[a-z]/))
         throw new Error(`Filename ${s} must start with alpha character`);
 
@@ -79,14 +79,14 @@ export function parseFilename(s : string) : SpriteFilename {
     for (const part of parts.slice(1)) {
         if (part.length === 0)
             throw new Error(`Can't parse ${s}`);
-        extra.set(part[0], part.slice(1));
+        extra.set(part[0]!, part.slice(1));
     }
     
     if (prefix === 'x') {
-        const name = parts[0].slice(1);
+        const name = parts[0]!.slice(1);
         return {extension: true, name, extra};
     } else {
-        const id = parts[0];
+        const id = parts[0]!;
         return {extension: false, id, extra};
     }
 }

data/lib/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@smogon/sprite-data",
-    "private": "true",
+    "private": true,
     "type": "module",
     "dependencies": {
-        "@types/node": "^14.0.23"
-    },
-    "main": "./dist/index.js"
+        "@smogon/sprite-root": "workspace:*",
+        "@types/node": "^24.10.7"
+    }
 }

data/lib/tsconfig.json

@@ -1,8 +1,5 @@
 {
     "extends": "../../tsconfig-base",
-    "compilerOptions": {
-        "outDir": "dist"
-    },
     "references": [
         {"path": "../../lib/root"}
     ]

lib/root/index.ts

@@ -1,3 +1,4 @@
 
-import path = require('path');
-export = path.resolve(__dirname, "../../../" /* extra path component is because we will be in dist/ */);
+import path from 'path';
+
+export default path.resolve(import.meta.dirname, "../../");

lib/root/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@smogon/sprite-root",
+    "type": "module",
     "dependencies": {
-        "@types/node": "^14.10.1"
-    },
-    "main": "dist/index.js"
+        "@types/node": "^24.10.7"
+    }
 }

lib/root/tsconfig.json

@@ -1,9 +1,3 @@
 {
-    "extends": "../../tsconfig-base",
-    "compilerOptions": {
-        "outDir": "dist",
-        // We need commonjs for __dirname
-        "module": "commonjs",
-        "esModuleInterop": false
-    }
+    "extends": "../../tsconfig-base"
 }

package.json

@@ -1,13 +1,8 @@
 {
-    "dependencies": {
-        "@smogon/sprite-data": "",
-        "@smogon/sprite-root": "",
-        "@types/node": "^18.15.8"
-    },
     "scripts": {
         "build": "tsc --build tsconfig-workspace.json"
     },
     "devDependencies": {
-        "typescript": "^5.0.2"
+        "typescript": "~7.0.2"
     }
 }

pnpm-workspace.yaml

@@ -2,3 +2,5 @@ packages:
     - 'tools/*'
     - 'lib/*'
     - "data/lib"
+allowBuilds:
+    better-sqlite3: true

spritecollab_credit_names.txt

@@ -2,14 +2,14 @@ Name	Discord	Contact
 CHUNSOFT	CHUNSOFT	https://www.spike-chunsoft.com/
 Audino	<@!117780585635643396>	https://github.com/audinowho
 SilverDeoxys563	<@!204460364023201793>	https://www.reddit.com/user/SilverDeoxys563
-Tacocoa	<@!234720295292895232>	
+Tacocoa	<@!234720295292895232>	<@234720295292895232>
 Adrian	<@!218764902913802240>	<@218764902913802240>
 lokatts	<@!232091727094218752>	https://twitter.com/lokatts
 El_Pangoro_Parse	<@!200385851069300736>	<@200385851069300736>
 Prismatic	<@!215699178553212929>	prismaticphenomenal@gmail.com
-Scizivire	<@!207188665959448576>	
+Scizivire	<@!207188665959448576>	<@207188665959448576>
 Pencil	<@!171030521009274881>	https://twitter.com/Sea_of_Pencils
-Avery	<@!527611425670037516>	
+Avery	<@!527611425670037516>	<@527611425670037516>
 PixlHoopa	<@!310773087417270272>	
 	<@!195280695009083392>	
 YoukaiMinori	<@!91001329228464128>	<@91001329228464128>
@@ -17,11 +17,11 @@ lemongrass	<@!493293282064072715>	<@493293282064072715>
 frostibirb	<@!192178759376306176>	https://twitter.com/frostibirb
 NeroIntruder	<@!319945906600411179>	https://twitter.com/NeroIntruder
 Moo	<@!276949114212712449>	https://twitter.com/MoonMoonMemes
-Anonymous	<@!200318546750865418>	
+Anonymous	<@!200318546750865418>	<@200318546750865418>
 RaoKurai	<@!173896352554549248>	https://twitter.com/RaoKurai
-Lovi	<@!95650095034273792>	
+Lovi	<@!95650095034273792>	<@95650095034273792>
 Reppamon	<@!162389028061052928>	
-Chi	<@!95638225439166464>	
+Chi	<@!95638225439166464>	<@95638225439166464>
 Fable	<@!225813236589527041>	https://twitter.com/fabledpainter
 	<@!187019163452047360>	
 mucrush	MUCRUSH	https://www.deviantart.com/mucrush
@@ -32,8 +32,7 @@ Deltex12	<@!513590747694497792>	/u/Deltex12
 Fire_Scyther	<@!637407338772299776>	https://www.reddit.com/u/FireScyther
 Akai	<@!496039052370509824>	Akai#2823
 	<@!557599571170033664>	
-felis_licht	FELIS_LICHT	https://www.deviantart.com/felis-licht
-C_Pariah	<@!322382592202637322>	
+C_Pariah	<@!322382592202637322>	<@322382592202637322>
 Aviivix	<@!196351316681818112>	https://twitter.com/aviivix/
 RoyalRust	<@!388709039678423040>	
 Davilos	<@!457965696190513152>	https://www.deviantart.com/nddavilos
@@ -84,7 +83,7 @@ RelicCipher	<@!739304144552198285>	<@739304144552198285>
 Dasawkem	<@!183136061487054848>	https://dasawkem.carrd.co/#social
 Sharpen	<@!389193348474339338>	
 Noivern	<@!150809243816165377>	https://twitter.com/notarealnoivern
-Noo	<@!217899432652308480>	comics.town/@noo
+Noo	<@!217899432652308480>	https://artfight.net/~NooNoo_Skidoo
 Emmuffin	<@!356635814668664832>	https://twitter.com/Ernmuffin
 SuperFabbioGuy	<@!433058189240696835>	
 Frostdrop1	<@!173505019268694016>	
@@ -110,7 +109,7 @@ LornaWR	<@!598484619897077761>	https://twitter.com/LornaWR_
 	<@!828520880299966525>	
 Precascer	<@!340299853345325056>	https://twitter.com/Precascer
 Mr_L	<@!177522243985866754>	
-Murpi	<@!593113130213572610>	https://bsky.app/profile/murpia57.bsky.social
+Morei	<@!593113130213572610>	https://bsky.app/profile/murpia57.bsky.social
 "motherhenna(Helen)"	MOTHERHENNA	<@!543717476421074945>
 Fearless-Quit	<@!801938240562397194>	
 PhillipsYoung	<@!772726854188400641>	https://twitter.com/PhilliYoung196
@@ -147,7 +146,7 @@ JuanmaSG	<@!479305531522154507>	https://twitter.com/JuanmaSG55
 Caitemis	<@!330751862590406656>	https://caitemis-art.tumblr.com/
 Ray2064	<@!540823632054714388>	<@540823632054714388>
 avalancheman	<@!783493257506062387>	milesbehemoth@gmail.com
-◥θ┴θ◤	<@!215638650434617345>	
+◥θ┴θ◤	<@!215638650434617345>	DC:<@215638650434617345>
 MilesFarber	<@!207815740399681538>	https://github.com/MilesFarber
 Sugi	<@!537560911716810763>	<@537560911716810763>
 	<@!776403448220483615>	
@@ -168,7 +167,7 @@ LuchuIsASquirrel	<@!645827810048475136>	https://www.deviantart.com/luchuisasquir
 metalbear	METALBEAR	<@468408733433593856>
 NikolaP	<@!704349360929898516>	nikolasnonsense@gmail.com
 programmedsleepstate	<@!224476380790915072>	<@224476380790915072>
-ZoZoBab	<@!459080372672790548>	https://twitter.com/ZoZoBab
+ZoZoBab	<@!459080372672790548>	https://bsky.app/profile/zozobab.bsky.social
 	<@!571847167489343507>	
 ZacianSword	<@!382540582746324993>	
 Pink_no_tori	<@!872983950732165181>	https://twitter.com/pink_avian_poke
@@ -177,28 +176,28 @@ cosmosully	<@!411407718839222272>	https://twitter.com/cosmosully
 	<@!413387711152390145>	
 ShyStarryRain	<@!576876006636519434>	
 	<@!136619914512433152>	
-SkeleJ64	<@!291732421332697098>	<@291732421332697098>
+SkeleSpider	<@!291732421332697098>	https://linktr.ee/skelespider
 	<@!319728945920475137>	
-Garbage	<@!350050109741858829>	https://twitter.com/Just_Tr4sh
+G〜	<@!350050109741858829>	https://bsky.app/profile/justtr4sh.pmd.social
 LightBlueBlaze	<@!283045864509800468>	LightBlueBlaze@gmail.com
 Dejais	<@!375676609283358722>	<@375676609283358722>
 Jelly	<@!402702516866908160>	https://www.deviantart.com/drjellystone
 	<@!345629918861983747>	
-TawnySoup	<@!216640380408430592>	https://twitter.com/TawnySoup
+TawnySoup	<@!216640380408430592>	https://linktr.ee/tawnysoup
 skygummi	<@!138236921980649472>	https://twitter.com/skygummi
 Mooncaller	<@!181829556930347009>	<https://twitter.com/LunarPilgrim>
 lovefulpup	<@!280870537209839627>	
 Okami	<@!238146046146904069>	okamiromhacks@gmail.com
 EeveeandVulpix2000	<@!469246358180593668>	https://www.instagram.com/eeveeandvulpix2000/
 Sceptile	<@!965734014604410990>	
-Spikey-Valentine	<@!454421330058805251>	https://twitter.com/spikeyvalentine?s=21&t=KmiqQo0hvuT6bxZFEGAKbA
+Spikey-Valentine	<@!454421330058805251>	https://twitter.com/spikeyvalentine
 	<@!666846584310464552>	
 Gayschlatt	<@!560604377203736617>	
 	<@!727245570191786085>	
 	<@!237965255412547585>	
 Rudy	<@!232993356274335744>	magolor.neocities.org
 Azifel	<@!228121607158235136>	https://twitter.com/Aziifel
-distress	<@!177489961275097088>	artstation.com/distress
+distress	<@!177489961275097088>	https://www.artstation.com/distress/albums/1200843
 NeonCityRain	<@!331183966508023808>	https://neoncityrain.tumblr.com/
 Yari	YARI	Yari#1038
 VersuS/CelestialDrago	<@!305445863235518464>	
@@ -209,9 +208,10 @@ NOLASMOR	<@!833717817445974046>
 SingingMudkip	<@!220580080194289664>	
 Anon	<@!555919605265203232>	
 dariosparks	<@!399615223083958283>	
+anomalocaris	<@!275075929905168384>	https://twitter.com/radiodonta_lord
 ErrantWitch	<@!124232530651119618>	
 mothbeanie	<@!168876782575943680>	https://twitter.com/mothbeanie
-Deeshura	<@!157796074457661440>	https://github.com/Deeshura
+Deeshura	<@!157796074457661440>	https://bsky.app/profile/deeshura.bsky.social
 Ginnie	<@!722542425196724289>	
 silverfox88	<@!476409795239477248>	https://twitter.com/realsilverfox88
 Hemlock	<@!165623433458089984>	https://baphomets.neocities.org/
@@ -220,7 +220,7 @@ Limomon	<@!360948625901223950>	https://twitter.com/TheLimomon
 AllPatchedUp	<@!289213609773498368>	patchedupgalaxy@gmail.com
 Uni	<@!402958234371227648>	https://github.com/ArianaCastro01
 FrivolousAqua	<@!496032574179770379>	https://twitter.com/FrivolousAqua
-Bwappi	<@!193530896211509248>	https://www.tumblr.com/bwappi
+bwappi	<@!193530896211509248>	https://bsky.app/profile/bwappi.bsky.social
 shimx	<@!722565437925097613>	<@722565437925097613>
 Hanbei	<@!178669005538721792>	https://twitter.com/Hanbei
 Eliza	<@!176197318574342145>	https://twitter.com/elizathexpresso
@@ -234,7 +234,7 @@ mixy:3	<@!1113856747564695633>	https://x.com/MixyPurple?s=20
 Blanky	<@!230913498916323329>	https://www.tumblr.com/theblankest123
 Luna-Alex	<@!306213523057410048>	https://twitter.com/LunaAlex64
 Soulja	<@!229131140903075840>	https://twitter.com/OlSoulja
-	<@!288510084273668096>	
+Sonikku_A	<@!288510084273668096>	https://bsky.app/profile/knopguy.bsky.social
 DavKriz	<@!642311628557385738>	
 PoliteHoppip	<@!168414649039978496>	
 Ariakyu	<@!417445868694667264>	https://www.reddit.com/u/SoggyMinimum8386/s/0ULdU1GVNj
@@ -242,7 +242,7 @@ DeltaL	<@!272761782269902848>	averyderp.sm2@gmail.com
 	<@!439106499592192001>	
 Magu	<@!108260609241423872>	@magu_boi
 FissionCube	<@!203640888558223361>	https://twewyfinalmix.tumblr.com
-Trace_Was_Taken	<@!548668262616006668>	https://www.reddit.com/user/Timtanoboa/
+HopeBurnsBright2008	<@!548668262616006668>	https://www.reddit.com/user/Timtanoboa/
 Cloudy	<@!356187016054046723>	https://twitter.com/cloudyskys17695
 Richelieu	<@!155159458828255244>	
 Inv3rse	<@!656696412087648257>	<@656696412087648257>
@@ -250,8 +250,48 @@ Rustnuttie	<@!179733726421450752>	<@179733726421450752>
 electronvolt	<@!624279546845200394>	electronvolt@gamepad.club
 teddg	<@!255885525204992000>	<@255885525204992000>
 Gelius	<@!276428982683959296>	<@276428982683959296>
+Leif	<@!883792430720225350>	
 Cocosquid.	<@!1133042779782647808>	<@1133042779782647808>
 Pokejavi.	<@!823932975916777512>	<@823932975916777512>
-Semilia	<@!235878133499297793>	https://twitter.com/SemiSemily
+Semilia	<@!235878133499297793>	https://bsky.app/profile/misspresident.bsky.social
+Smingle	<@!185431200783925249>	https://twitter.com/TheSmingle
 Coksi	<@!143644728230019072>	https://coksi.carrd.co/
 CeleryGuy	<@!966056976217935872>	https://celeryguy.tumblr.com
+VOID	<@!224988883182551040>	<@224988883182551040>
+Kawaiitron	<@!412938965713158144>	<@412938965713158144>
+mosscoated	<@!713792248348672040>	<@713792248348672040>
+SpectrumStars	<@!1038631037284126741>	https://x.com/numbertism
+FalafelPorpoise	<@!338821717365489665>	https://bsky.app/profile/falafel-porpoise.bsky.social
+Riodise	<@!311963515563016193>	<@311963515563016193>
+Shadowcrafts	<@!1116961261331152986>	shadowcrafts@outlook.com
+rhys	<@!1327394227922931878>	https://bsky.app/profile/geckqua.bsky.social
+CinderedPhoenix	<@!252249733588975616>	ridiculouslybluecinderblock@gmail.com
+Fingernails	<@!862684221848027156>	https://www.demirramon.com/@Fingernails
+snarbs	<@!188463527089012737>	snarbs.art@gmail.com
+Xrit63	<@!512597386279780354>	Xrit63PMD@outlook.com
+LazerBlitz	<@!585276060136898591>	<@585276060136898591>
+FerMrack	FERMRACK	https://x.com/FerMrack_FM
+Giru	<@!1142997669489426493>	
+Luca	<@!1346728357529915405>	<@1346728357529915405>
+chikorene	<@!1346022682667388968>	<@1346022682667388968>
+GustavoMusinTG	GUSTAVOMUSINTG	https://x.com/GustavoMusinTG
+PinkKecleon	<@!521264207677620226>	https://twitter.com/PinkKecleon
+stressparticles	<@!416340821617541141>	<@416340821617541141>
+NickOnimura	<@!151462460316975104>	nickonimura.bsky.social
+brookriver	<@!255219192901402624>	https://brookriver.carrd.co/
+JustAGunk	<@!1377429093997477928>	<@1377429093997477928>
+Fresco	<@!488809643838144543>	marcfreixer@gmail.com
+Mitsubachi	<@!472136803554557956>	
+Neat_Neato	<@!181900575934382081>	imneatneato@gmail.com
+SethY	<@!268261643178344448>	https://linktr.ee/sethyuikora
+lumiscosity	<@!243013084510289921>	https://github.com/lumiscosity
+<ElGian>	<@!770438729575563284>	<gfcobross@gmail.com>
+<SKREE>	<@!350778126919401485>	<https://www.tumblr.com/blog/skree-like-a-pterodactyl>
+Felis-Licht	<@!273594331577974785>	https://www.deviantart.com/felis-licht/
+GenarftheUnfunny	<@!1038291154032136192>	bigshot1977kr0mer@gmail.com
+Ajifer	<@!1042498956082544640>	<@1042498956082544640>
+Johanne2	<@!225949425292410880>	https://github.com/Johanne2
+Kevin	<@!479925530129596426>	<@479925530129596426>
+jelEmerald	<@!1058057407592407081>	https://www.youtube.com/@jeltemreal
+radpeepo	<@!150308109489799169>	<https://linktr.ee/radpeepo>
+Crazy_Dragon	<@!605175889793253377>	https://www.reddit.com/user/FrontIndividual4188/submitted/