refactor: move progress ui to separate package

Author: johh

package.json

@@ -53,6 +53,7 @@
 	"dependencies": {
 		"chalk": "^4.1.0",
 		"imagemin": "^7.0.1",
+		"@bsmth/loader-progress": "^1.0.0",
 		"imagemin-gifsicle": "^7.0.0",
 		"imagemin-mozjpeg": "^9.0.0",
 		"imagemin-pngquant": "^9.0.1",

src/lib/createBasisFile.ts

@@ -7,8 +7,8 @@ import {
 	read as cacheRead,
 	getFilename,
 } from '@bsmth/loader-cache';
+import { trackJob } from '@bsmth/loader-progress';
 import type BasisOptions from '../types/BasisOptions';
-import { trackJob, completeJob } from './jobTracker';
 
 const asyncExec = promisify( exec );
 
@@ -115,7 +115,7 @@ export default async function createBasisFile({
 		}
 	}
 
-	const job = trackJob({
+	const completeJob = trackJob({
 		reportName,
 		text: 'compressing .basis',
 	});
@@ -126,7 +126,7 @@ export default async function createBasisFile({
 	if ( stderr ) {
 		throw new Error( `BASIS COMPRESSION FAILED: ${stderr}` );
 	} else {
-		completeJob( job );
+		completeJob();
 	}
 
 

src/lib/createImageFile.ts

@@ -9,8 +9,8 @@ import {
 	read as cacheRead,
 	write as cacheWrite,
 } from '@bsmth/loader-cache';
+import { trackJob } from '@bsmth/loader-progress';
 import type { ImgLoaderQualityOptions } from '../types/ImgLoaderOptions';
-import { completeJob, trackJob } from './jobTracker';
 
 
 interface CreateImageFileProps {
@@ -52,7 +52,7 @@ export default async function createImageFile({
 
 	if ( cached ) return cached;
 
-	const job = trackJob({
+	const completeJob = trackJob({
 		reportName,
 		text: `compressing .${type}`,
 	});
@@ -84,14 +84,14 @@ export default async function createImageFile({
 		});
 	}
 
-	const path = await writeFile({
+	const path = await cacheWrite({
 		buffer: outBuffer,
 		options: relevantOptions,
 		inputHash,
 		resource,
 	});
 
-	completeJob( job );
+	completeJob();
 
 	return {
 		buffer: outBuffer,

src/lib/jobTracker.ts

@@ -4,8 +4,8 @@ import {
 	read as cacheRead,
 	write as cacheWrite,
 } from '@bsmth/loader-cache';
+import { trackJob } from '@bsmth/loader-progress';
 import type { ImgLoaderInternalOptions } from '../types/ImgLoaderOptions';
-import { completeJob, trackJob } from './jobTracker';
 
 
 interface ResizeProps {
@@ -41,7 +41,7 @@ export default async function resize({
 
 	if ( cached ) return cached;
 
-	const job = trackJob({
+	const completeJob = trackJob({
 		reportName,
 		text: options.forcePowerOfTwo ? 'resizing to POT' : 'downscaling',
 	});
@@ -61,7 +61,7 @@ export default async function resize({
 		...cacheOpts,
 	});
 
-	completeJob( job );
+	completeJob();
 
 	return {
 		buffer,

src/lib/resize.ts

@@ -894,6 +894,13 @@
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
   integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+"@bsmth/loader-progress@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@bsmth/loader-progress/-/loader-progress-1.0.0.tgz#bba93adc9b3aa9333930b71f1bfe7d29ecc5234e"
+  integrity sha512-8lmNHLuK/HZdIUjSWzUSKMtRAez+HspqG3CXqlxkFS52ud6XdNbEavUGsEu/SRvITYfnNt8wmkMmuUOYvJPKag==
+  dependencies:
+    chalk "^4.1.1"
+    ora "^5.4.0"
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"