chore: update utils

.prettierrc

@@ -0,0 +1,5 @@
+{
+    "singleQuote": true,
+    "trailingComma": "all",
+    "printWidth": 120
+}

test/cache-buster/cacheBuster.test.ts

@@ -1,9 +1,9 @@
 import { existsSync } from 'node:fs';
 import { join } from 'upath';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { cacheBuster } from '../../src/cache-buster/index.js';
 import { Asset, AssetPack, path } from '../../src/core/index.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'cache-buster';
 

test/core/AssetWatcher.test.ts

@@ -1,9 +1,9 @@
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getInputDir } from '../../shared/test/index.js';
 import { Asset } from '../../src/core/Asset.js';
 import { AssetCache } from '../../src/core/AssetCache.js';
 import { AssetWatcher } from '../../src/core/AssetWatcher.js';
 import { logAssetGraph } from '../../src/core/utils/logAssetGraph.js';
+import { assetPath, createFolder, getInputDir } from '../utils/index.js';
 
 const pkg = 'core';
 

test/core/Assetpack.test.ts

@@ -2,19 +2,22 @@ import fs from 'fs-extra';
 import { existsSync } from 'node:fs';
 import { join } from 'path';
 import { describe, expect, it } from 'vitest';
+import { cacheBuster } from '../../src/cache-buster/cacheBuster.js';
+import { AssetPack } from '../../src/core/AssetPack.js';
+import { getHash } from '../../src/core/index.js';
+import { logAssetGraph } from '../../src/core/utils/logAssetGraph.js';
+import { pixiManifest } from '../../src/manifest/pixiManifest.js';
 import {
     assetPath,
     createAssetPipe,
     createFolder,
     getCacheDir,
     getInputDir,
     getOutputDir
-} from '../../shared/test/index.js';
-import { AssetPack } from '../../src/core/AssetPack.js';
-import { logAssetGraph } from '../../src/core/utils/logAssetGraph.js';
+} from '../utils/index.js';
 
-import type { MockAssetPipe } from '../../shared/test/index.js';
 import type { AssetPipe } from '../../src/core/pipes/AssetPipe.js';
+import type { MockAssetPipe } from '../utils/index.js';
 
 const pkg = 'core';
 
@@ -125,6 +128,73 @@ describe('Core', () =>
         expect(fs.readJSONSync(join(outputDir, 'json.json'))).toStrictEqual({ nice: 'test' });
     });
 
+    it('should delete previously hashed versions of an asset', { timeout: 10000 }, async () =>
+    {
+        const testName = 'watch-delete-hash';
+        const inputDir = `${getInputDir(pkg, testName)}/`;
+        const outputDir = getOutputDir(pkg, testName);
+
+        createFolder(
+            pkg,
+            {
+                name: testName,
+                files: [{
+                    name: 'json.json',
+                    content: assetPath('json/json.json'),
+                }],
+                folders: [],
+            });
+
+        const testFile = join(inputDir, 'json.json');
+
+        const assetpack = new AssetPack({
+            entry: inputDir, cacheLocation: getCacheDir(pkg, testName),
+            output: outputDir,
+            cache: true,
+            pipes: [
+                cacheBuster(),
+                pixiManifest(),
+            ]
+        });
+
+        await assetpack.watch();
+
+        const origHash = getHash(join(inputDir, 'json.json'));
+
+        expect(existsSync(join(outputDir, `json-${origHash}.json`))).toBe(true);
+
+        fs.writeJSONSync(testFile, { nice: 'test' });
+
+        await new Promise((resolve) =>
+        {
+            setTimeout(resolve, 1500);
+        });
+
+        expect(existsSync(join(outputDir, `json-${origHash}.json`))).toBe(false);
+        const newHash = getHash(join(inputDir, 'json.json'));
+
+        expect(existsSync(join(outputDir, `json-${newHash}.json`))).toBe(true);
+
+        fs.removeSync(testFile);
+
+        await new Promise((resolve) =>
+        {
+            setTimeout(resolve, 1500);
+        });
+
+        await assetpack.stop();
+
+        expect(existsSync(join(outputDir, `json-${origHash}.json`))).toBe(false);
+        expect(existsSync(join(outputDir, `json-${newHash}.json`))).toBe(false);
+        expect(fs.readJSONSync(join(outputDir, 'manifest.json'))).toStrictEqual({
+            bundles: [
+                {
+                    name: 'default',
+                    assets: []
+                }]
+        });
+    });
+
     it('should ignore specified files when watching', async () =>
     {
         const testName = 'watch-ignore';

test/core/Utils.test.ts

@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest';
-import { createAssetPipe, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/AssetPack.js';
 import { extractTagsFromFileName } from '../../src/core/utils/extractTagsFromFileName.js';
 import { generateCacheName } from '../../src/core/utils/generateCacheName.js';
+import { createAssetPipe, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 import type { Asset } from '../../src/core/Asset.js';
 import type { AssetPipe } from '../../src/core/index.js';

test/core/config.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { createAssetPipe } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
+import { createAssetPipe } from '../utils/index.js';
 
 import type { AssetPackConfig } from '../../src/core/config.js';
 

test/ffmpeg/Audio.test.ts

@@ -1,8 +1,8 @@
 import { existsSync } from 'node:fs';
 import { describe, expect, it, vi } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { audio } from '../../src/ffmpeg/index.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'ffmpeg';
 

test/image/Compress.test.ts

@@ -1,8 +1,8 @@
 import { existsSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { compress } from '../../src/image/compress.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'image';
 

test/image/Mipmap.test.ts

@@ -1,8 +1,8 @@
 import { existsSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { mipmap } from '../../src/image/mipmap.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'image';
 

test/json/Json.test.ts

@@ -1,8 +1,8 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { json } from '../../src/json/index.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'json';
 

test/manifest/Manifest.test.ts

@@ -1,21 +1,21 @@
 import fs from 'fs-extra';
 import { existsSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import {
-    assetPath,
-    createFolder,
-    getCacheDir,
-    getInputDir,
-    getOutputDir
-} from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { audio } from '../../src/ffmpeg/index.js';
 import { compress, mipmap } from '../../src/image/index.js';
 import { pixiManifest } from '../../src/manifest/index.js';
 import { spineAtlasManifestMod, spineAtlasMipmap } from '../../src/spine/index.js';
 import { texturePacker, texturePackerManifestMod } from '../../src/texture-packer/index.js';
+import {
+    assetPath,
+    createFolder,
+    getCacheDir,
+    getInputDir,
+    getOutputDir
+} from '../utils/index.js';
 
-import type { File } from '../../shared/test/index.js';
+import type { File } from '../utils/index.js';
 
 const pkg = 'manifest';
 

test/spine/spineAtlasAll.test.ts

@@ -1,13 +1,13 @@
 import { glob } from 'glob';
 import { readFileSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { cacheBuster } from '../../src/cache-buster/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { compress, mipmap } from '../../src/image/index.js';
 import { spineAtlasCacheBuster } from '../../src/spine/spineAtlasCacheBuster.js';
 import { spineAtlasCompress } from '../../src/spine/spineAtlasCompress.js';
 import { spineAtlasMipmap } from '../../src/spine/spineAtlasMipmap.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'spine';
 

test/spine/spineAtlasCacheBuster.test.ts

@@ -1,10 +1,10 @@
 import { glob } from 'glob';
 import { readFileSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { cacheBuster } from '../../src/cache-buster/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { spineAtlasCacheBuster } from '../../src/spine/spineAtlasCacheBuster.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'spine';
 

test/spine/spineAtlasCompress.test.ts

@@ -1,9 +1,9 @@
 import { readFileSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { compress } from '../../src/image/index.js';
 import { spineAtlasCompress } from '../../src/spine/spineAtlasCompress.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'spine';
 

test/spine/spineAtlasManifest.test.ts

@@ -1,9 +1,9 @@
 import { readFileSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { pixiManifest } from '../../src/manifest/index.js';
 import { spineAtlasManifestMod } from '../../src/spine/spineAtlasManifestMod.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'spine';
 

test/spine/spineAtlasMipmap.test.ts

@@ -1,9 +1,9 @@
 import { existsSync } from 'node:fs';
 import { describe, expect, it } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack } from '../../src/core/index.js';
 import { mipmap } from '../../src/image/index.js';
 import { spineAtlasMipmap } from '../../src/spine/spineAtlasMipmap.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
 const pkg = 'spine';
 

test/texture-packer/texturePacker.test.ts

@@ -2,40 +2,15 @@ import fs from 'fs-extra';
 import { existsSync } from 'node:fs';
 import sharp from 'sharp';
 import { describe, expect, it, vi } from 'vitest';
-import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../../shared/test/index.js';
 import { AssetPack, Logger } from '../../src/core/index.js';
 import { texturePacker } from '../../src/texture-packer/texturePacker.js';
+import { createTPSFolder } from '../utils/createTPSFolder.js';
+import { assetPath, createFolder, getCacheDir, getInputDir, getOutputDir } from '../utils/index.js';
 
-import type { File } from '../../shared/test/index.js';
+import type { File } from '../utils/index.js';
 
 const pkg = 'texture-packer';
 
-function genFolder(testName: string)
-{
-    const sprites: File[] = [];
-
-    for (let i = 0; i < 10; i++)
-    {
-        sprites.push({
-            name: `sprite${i}.png`,
-            content: assetPath(`image/sp-${i + 1}.png`),
-        });
-    }
-    createFolder(
-        pkg,
-        {
-            name: testName,
-            files: [],
-            folders: [
-                {
-                    name: 'sprites{tps}',
-                    files: sprites,
-                    folders: [],
-                },
-            ],
-        });
-}
-
 describe('Texture Packer', () =>
 {
     it('should create a sprite sheet', async () =>
@@ -44,7 +19,7 @@ describe('Texture Packer', () =>
         const inputDir = getInputDir(pkg, testName);
         const outputDir = getOutputDir(pkg, testName);
 
-        genFolder(testName);
+        createTPSFolder(testName, pkg);
 
         const assetpack = new AssetPack({
             entry: inputDir, cacheLocation: getCacheDir(pkg, testName),
@@ -83,7 +58,7 @@ describe('Texture Packer', () =>
         const inputDir = getInputDir(pkg, testName);
         const outputDir = getOutputDir(pkg, testName);
 
-        genFolder(testName);
+        createTPSFolder(testName, pkg);
 
         const size = 512;
 
@@ -119,7 +94,7 @@ describe('Texture Packer', () =>
         const inputDir = getInputDir(pkg, testName);
         const outputDir = getOutputDir(pkg, testName);
 
-        genFolder(testName);
+        createTPSFolder(testName, pkg);
 
         const assetpack = new AssetPack({
             entry: inputDir, cacheLocation: getCacheDir(pkg, testName),
@@ -152,7 +127,7 @@ describe('Texture Packer', () =>
         const inputDir = getInputDir(pkg, testName);
         const outputDir = getOutputDir(pkg, testName);
 
-        genFolder(testName);
+        createTPSFolder(testName, pkg);
 
         const assetpack = new AssetPack({
             entry: inputDir, cacheLocation: getCacheDir(pkg, testName),
@@ -276,7 +251,7 @@ describe('Texture Packer', () =>
         const inputDir = getInputDir(pkg, testName);
         const outputDir = getOutputDir(pkg, testName);
 
-        genFolder(testName);
+        createTPSFolder(testName, pkg);
 
         const assetpack = new AssetPack({
             entry: inputDir, cacheLocation: getCacheDir(pkg, testName),