@magicpixelart/cli 0.6.3 → 0.6.4

package/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.6.4] - 2026-10-17
+
+### Fixed
+- Spine rigs in big games: every skeleton export is scanned (0.6.3 stopped at 200, which could miss the main character's rig).
+- Only files named as views of one character (`rabbit_front`, `rabbit_side`, `rabbit_back`) become one rig; unrelated exports in the same folder no longer merge.
+- When two rigs match the same folder, the one named like the folder wins (`rabbit` over a goat that reuses the rabbit's parts).
+- Sync says when it finds Spine exports but no synced folder for them, instead of staying silent.
+
 ## [0.6.3] - 2026-10-17
 
 ### Added

package/dist/commands/spine.js

@@ -6,6 +6,7 @@
  * sent (hash remembered in `.magicpixel/state.json`).
  */
 import { existsSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import kleur from 'kleur';
 import { loadConfig, loadState, saveState } from '../config.js';
@@ -56,13 +57,17 @@ export async function runSpineRigs(opts = {}) {
         const record = {};
         for (const batch of batchRigs([...pending])) {
             try {
-                const results = await upload(batch.map((r) => ({
+                const payload = await Promise.all(batch.map(async (r) => ({
                     name: r.name,
                     folderPath: r.folderPath,
                     baseFolderPath: r.baseFolderPath,
-                    views: r.views.map((v) => ({ name: v.name, json: v.file.json })),
+                    views: await Promise.all(r.views.map(async (v) => ({
+                        name: v.name,
+                        json: JSON.parse(await readFile(v.file.abs, 'utf8')),
+                    }))),
                     hash: r.hash,
                 })));
+                const results = await upload(payload);
                 batch.forEach((rig, i) => {
                     const res = results[i]?.name === rig.name ? results[i] : results.find((x) => x?.name === rig.name);
                     const status = res?.status ?? 'error';
@@ -119,6 +124,13 @@ export async function syncSpineRigsQuietly(opts) {
         const outcome = await (opts.run ?? runSpineRigs)({ config: opts.config, gameIndex: opts.gameIndex, dryRun: opts.dryRun });
         if (opts.quiet)
             return outcome;
+        if (outcome.skeletons > 0 && outcome.rigs.length === 0 && !warnedThisProcess) {
+            // Say why no preview appears instead of staying silent.
+            warnedThisProcess = true;
+            console.log();
+            console.log(kleur.dim(`${icon('tip')} Found ${outcome.skeletons} Spine skeleton export${outcome.skeletons === 1 ? '' : 's'}, but no synced folder holds their part PNGs. Run \`${'npx @magicpixelart/cli spine --dry-run'}\` for details.`));
+            return outcome;
+        }
         const lines = outcome.rigs.filter((o) => {
             if (opts.verbose)
                 return true;

package/dist/util/spine.js

@@ -28,7 +28,6 @@ export const MAX_RIGS_PER_REQUEST = 10;
 /** Bytes read to decide whether a .json is a skeleton export. */
 const HEAD_BYTES = 300;
 /** Stop after this many skeletons; a game with more is not what this is for. */
-const MAX_SKELETONS = 200;
 /** A folder is a skin folder when at least this share of its PNGs are rig images. */
 const SKIN_SHARE = 0.5;
 /** Base folder / view grouping need at least this share of the rig's images. */
@@ -183,8 +182,6 @@ export async function findSkeletonFiles(roots, base, skipDirs = []) {
     const skeletons = [];
     const skipped = [];
     await Promise.all(candidates.map((abs) => io(async () => {
-        if (skeletons.length >= MAX_SKELETONS)
-            return;
         const rel = relative(base, abs).replace(/\\/g, '/');
         try {
             if (!looksLikeSkeleton(await readHead(abs)))
@@ -199,7 +196,8 @@ export async function findSkeletonFiles(roots, base, skipDirs = []) {
             const info = readSkeletonImages(json);
             if (!info)
                 return;
-            skeletons.push({ abs, rel, text, json, ...info });
+            // Keep only what matching needs: a big game has hundreds of exports.
+            skeletons.push({ abs, rel, sha256: createHash('sha256').update(text).digest('hex'), size, ...info });
         }
         catch {
             /* not JSON after all / unreadable — not a skeleton we can use */
@@ -250,45 +248,23 @@ function countIn(set, keys) {
 function isInside(segments, root) {
     return segments.length >= root.length && root.every((s, i) => segments[i] === s);
 }
-/** Groups skeletons in one directory into rigs (views of the same character). */
-export function groupSkeletons(skeletons, folders) {
-    const byDir = new Map();
-    for (const s of skeletons) {
-        const d = dirname(s.abs);
-        byDir.set(d, [...(byDir.get(d) ?? []), s]);
-    }
-    const groups = [];
-    for (const files of byDir.values()) {
-        const keys = files.map((f) => new Set(f.images.map(imageKey)));
-        const parent = files.map((_, i) => i);
-        const find = (i) => (parent[i] === i ? i : (parent[i] = find(parent[i])));
-        for (let i = 0; i < files.length; i++) {
-            for (let j = i + 1; j < files.length; j++) {
-                if (sameRig(keys[i], keys[j], folders))
-                    parent[find(i)] = find(j);
-            }
-        }
-        const byRoot = new Map();
-        files.forEach((f, i) => byRoot.set(find(i), [...(byRoot.get(find(i)) ?? []), f]));
-        groups.push(...byRoot.values());
-    }
-    return groups;
-}
+/** Camera-facing suffixes that mark one view of a character (`rabbit_front.json`). */
+const VIEW_SUFFIX = /[_-](front|side|back|north|south|east|west|left|right|up|down)$/i;
 /**
- * Two skeletons are views of one rig when their images overlap heavily, or
- * when one synced folder holds most of both (views whose parts are named per
- * view, `head_front` / `head_side`, still share every skin folder).
+ * Groups skeletons into rigs. Only files in one directory whose names differ
+ * by a view suffix (`rabbit_front`, `rabbit_side`, `rabbit_back`) are views of
+ * one character; every other export is a rig of its own, even when it shares
+ * a folder or part names with others (a `Spine/` folder of unrelated props).
  */
-function sameRig(a, b, folders) {
-    if (a.size === 0 || b.size === 0)
-        return false;
-    if (countIn(a, b) >= COVER_SHARE * Math.min(a.size, b.size))
-        return true;
-    for (const f of folders.values()) {
-        if (countIn(f.pngs, a) >= COVER_SHARE * a.size && countIn(f.pngs, b) >= COVER_SHARE * b.size)
-            return true;
+export function groupSkeletons(skeletons) {
+    const groups = new Map();
+    for (const s of skeletons) {
+        const stem = basename(s.abs).replace(/\.json$/i, '');
+        const character = stem.replace(VIEW_SUFFIX, '');
+        const key = character !== stem ? `${dirname(s.abs)}\0${character.toLowerCase()}` : s.abs;
+        groups.set(key, [...(groups.get(key) ?? []), s]);
     }
-    return false;
+    return [...groups.values()];
 }
 export function rigHash(rig) {
     const h = createHash('sha256');
@@ -296,7 +272,7 @@ export function rigHash(rig) {
         name: rig.name,
         folderPath: rig.folderPath,
         baseFolderPath: rig.baseFolderPath,
-        views: rig.views.map((v) => [v.name, createHash('sha256').update(v.text).digest('hex')]),
+        views: rig.views.map((v) => [v.name, v.sha256]),
     }));
     return h.digest('hex');
 }
@@ -308,7 +284,7 @@ const label = (names) => `${names[names.length - 1]}/`;
 export function detectRigs(skeletons, pngs, base = process.cwd()) {
     const folders = indexFolders(pngs);
     const rigs = [];
-    for (const group of groupSkeletons(skeletons, folders)) {
+    for (const group of groupSkeletons(skeletons)) {
         const files = [...group].sort((a, b) => a.abs.localeCompare(b.abs)).slice(0, MAX_VIEWS_PER_RIG);
         const names = viewNames(files.map((f) => basename(f.abs)));
         const views = files
@@ -377,7 +353,7 @@ export function detectRigs(skeletons, pngs, base = process.cwd()) {
             skins: skinCount,
             baseFolderPath,
             baseFolderLabel: baseFolder ? label(baseFolder.f.names) : null,
-            hash: rigHash({ name, folderPath, baseFolderPath, views: views.map((v) => ({ name: v.name, text: v.file.text })) }),
+            hash: rigHash({ name, folderPath, baseFolderPath, views: views.map((v) => ({ name: v.name, sha256: v.file.sha256 })) }),
         });
     }
     return onePerFolder(rigs).sort((a, b) => a.name.localeCompare(b.name) || a.folderPath.join('/').localeCompare(b.folderPath.join('/')));
@@ -385,11 +361,13 @@ export function detectRigs(skeletons, pngs, base = process.cwd()) {
 /**
  * A folder holds one rig. When several exports bind to the same folder (an
  * old 3.8 copy next to the 4.3 one), keep the one the preview can read, then
- * the one with the most views and images.
+ * the one named like the folder, then the one with the most views and images.
  */
 function onePerFolder(rigs) {
     const score = (r) => [
         rigVersionSupported(r) ? 1 : 0,
+        // `rabbit_*.json` over a goat that reuses the rabbit's part names.
+        r.name.toLowerCase().replace(/[^a-z0-9]+/g, '-') === r.folderPath[r.folderPath.length - 1] ? 1 : 0,
         r.views.length,
         new Set(r.views.flatMap((v) => v.file.images)).size,
     ];
@@ -429,7 +407,7 @@ export function batchRigs(rigs, maxBytes = 16 * 1024 * 1024) {
     let cur = [];
     let bytes = 0;
     for (const r of rigs) {
-        const size = r.views.reduce((n, v) => n + v.file.text.length, 0);
+        const size = r.views.reduce((n, v) => n + v.file.size, 0);
         if (cur.length > 0 && (cur.length >= MAX_RIGS_PER_REQUEST || bytes + size > maxBytes)) {
             out.push(cur);
             cur = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicpixelart/cli",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Sync MagicPixel pixel-art assets to your local project.",
   "type": "module",
   "bin": {