refactor: move cache to separate package

Author: johh

package.json

@@ -63,7 +63,9 @@
 		"sharp": "^0.27.2",
 		"svgo": "2"
 	},
-	"peerDependencies": {},
+	"peerDependencies": {
+		"@bsmth/loader-cache": "^1.0.1"
+	},
 	"husky": {
 		"hooks": {
 			"pre-commit": "lint-staged"

src/index.ts

@@ -1,4 +1,12 @@
+import { deprecate } from 'util';
+import { CachePlugin as _CachePlugin } from '@bsmth/loader-cache';
+
 export { default } from './loader';
-export { default as CachePlugin } from './plugin';
+
+export const CachePlugin = deprecate(
+	_CachePlugin,
+	'[@bsmth/img-loader]: CachePlugin has moved to `@bsmth/loader-cache`, '
+	+ 'please import it from there instead.',
+);
 
 export const raw = true;

src/lib/cache.ts

@@ -3,8 +3,11 @@ import { promises as fs } from 'fs';
 import { promisify } from 'util';
 import { exec } from 'child_process';
 
+import {
+	read as cacheRead,
+	getFilename,
+} from '@bsmth/loader-cache';
 import type BasisOptions from '../types/BasisOptions';
-import { getFile, getFilename } from './cache';
 import { trackJob, completeJob } from './jobTracker';
 
 const asyncExec = promisify( exec );
@@ -41,7 +44,7 @@ export default async function createBasisFile({
 		buffer: Buffer;
 		path: string;
 	}> {
-	const cached = await getFile({ inputHash, options, resource });
+	const cached = await cacheRead({ inputHash, options, resource });
 
 	if ( cached ) {
 		return cached;

src/lib/createBasisFile.ts

@@ -5,8 +5,11 @@ import imageminSvgo from 'imagemin-svgo';
 import imageminGifsicle from 'imagemin-gifsicle';
 
 import sharp from 'sharp';
+import {
+	read as cacheRead,
+	write as cacheWrite,
+} from '@bsmth/loader-cache';
 import type { ImgLoaderQualityOptions } from '../types/ImgLoaderOptions';
-import { getFile, writeFile } from './cache';
 import { completeJob, trackJob } from './jobTracker';
 
 
@@ -41,7 +44,7 @@ export default async function createImageFile({
 	}> {
 	const relevantOptions = options[compressorForType[type]];
 
-	const cached = await getFile({
+	const cached = await cacheRead({
 		options: relevantOptions,
 		inputHash,
 		resource,

src/lib/createImageFile.ts

@@ -1,7 +1,10 @@
 import sharp from 'sharp';
 
+import {
+	read as cacheRead,
+	write as cacheWrite,
+} from '@bsmth/loader-cache';
 import type { ImgLoaderInternalOptions } from '../types/ImgLoaderOptions';
-import { getFile, writeFile } from './cache';
 import { completeJob, trackJob } from './jobTracker';
 
 
@@ -34,7 +37,7 @@ export default async function resize({
 		resource,
 	};
 
-	const cached = await getFile( cacheOpts );
+	const cached = await cacheRead( cacheOpts );
 
 	if ( cached ) return cached;
 
@@ -53,7 +56,7 @@ export default async function resize({
 	});
 
 	const buffer = await texture.png().toBuffer();
-	const path = await writeFile({
+	const path = await cacheWrite({
 		buffer,
 		...cacheOpts,
 	});

src/lib/resize.ts

@@ -4,8 +4,8 @@ import path from 'path';
 import { promises as fs } from 'fs';
 import objHash from 'object-hash';
 
+import { ensureCacheReady } from '@bsmth/loader-cache';
 import defaultOptions from './defaultOptions';
-import { ensureCacheReady } from './lib/cache';
 import generateDeclarations from './lib/generateDeclarations';
 import deriveExportOptions from './lib/deriveExportOptions';
 import deriveOutputFilename from './lib/deriveOutputFilename';