Merge pull request #180 from divriots/chore/no-global-state

chore: remove global state/conf

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divriots/jampack",
-  "version": "0.24.4",
+  "version": "0.25.0",
   "cache-version": {
     "img": "v1",
     "img-ext": "v1"
@@ -26,6 +26,7 @@
     "./state": "./dist/state.js"
   },
   "dependencies": {
+    "@commander-js/extra-typings": "^12.0.0",
     "@divriots/cheerio": "1.0.0-rc.12",
     "@proload/core": "^0.3.3",
     "@swc/core": "^1.4.16",
@@ -40,7 +41,7 @@
     "hasha": "^6.0.0",
     "html-minifier-terser": "^7.2.0",
     "kleur": "^4.1.5",
-    "lightningcss": "^1.24.1",
+    "lightningcss": "^1.25.1",
     "mini-svg-data-uri": "^1.4.4",
     "ora": "^8.0.1",
     "quicklink": "^2.3.0",

src/cache.ts

@@ -1,7 +1,7 @@
 import { hashSync as hasha } from 'hasha';
 import path from 'path';
 import * as fs from 'fs/promises';
-import $state from './state.js';
+import { GlobalState } from './state.js';
 import { CACHE_VERSIONS } from './packagejson.js';
 
 const listOfCategories = ['img', 'img-ext'] as const;
@@ -10,12 +10,12 @@ export type Category = (typeof listOfCategories)[number];
 
 export type CacheData = { buffer: Buffer; meta: any };
 
-function getCacheFolder(): string {
-  return $state.args.cache_folder || '.jampack/cache';
+function getCacheFolder(state: GlobalState): string {
+  return state.args.cache_folder || '.jampack/cache';
 }
 
-async function cleanCache(full: boolean) {
-  const CACHE_FOLDER = getCacheFolder();
+async function cleanCache(state: GlobalState, full?: boolean) {
+  const CACHE_FOLDER = getCacheFolder(state);
 
   if (full) {
     try {
@@ -59,8 +59,8 @@ async function cleanCache(full: boolean) {
   }
 }
 
-function computeCacheHash(buffer: Buffer, options?: any) {
-  if ($state.args.nocache) {
+function computeCacheHash(state: GlobalState, buffer: Buffer, options?: any) {
+  if (state.args.nocache) {
     return '';
   }
 
@@ -75,8 +75,12 @@ function getVersionOfCategory(category: Category): string {
   return CACHE_VERSIONS[category];
 }
 
-function getLocation(hash: string, category: Category): string {
-  const CACHE_FOLDER = getCacheFolder();
+function getLocation(
+  state: GlobalState,
+  hash: string,
+  category: Category
+): string {
+  const CACHE_FOLDER = getCacheFolder(state);
 
   return path.join(
     CACHE_FOLDER,
@@ -87,14 +91,15 @@ function getLocation(hash: string, category: Category): string {
 }
 
 async function getFromCache(
+  state: GlobalState,
   category: Category,
   hash: string
 ): Promise<CacheData | undefined> {
-  if ($state.args.nocache) {
+  if (state.args.nocache) {
     return undefined;
   }
 
-  const location = getLocation(hash, category);
+  const location = getLocation(state, hash, category);
 
   try {
     const buffer = await fs.readFile(path.join(location, 'data'));
@@ -111,15 +116,16 @@ async function getFromCache(
 }
 
 async function addToCache(
+  state: GlobalState,
   category: Category,
   hash: string,
   data: CacheData
 ): Promise<void> {
-  if ($state.args.nocache) {
+  if (state.args.nocache) {
     return;
   }
 
-  const location = getLocation(hash, category);
+  const location = getLocation(state, hash, category);
   await fs.mkdir(location, { recursive: true });
   await fs.writeFile(path.join(location, 'data'), data.buffer);
   await fs.writeFile(path.join(location, 'meta'), JSON.stringify(data.meta));