cache-cmd 0.2.0-dev.4a662091d40f9510cff02e70023e5919708daa8f → 0.2.0-dev.7098ba3784d94f8515529435c60343ac3e724316

package/README.md

@@ -1,6 +1,6 @@
 # cache-cmd
 
-Cache a command based on
+Run and cache a command based on
 
 -   time since last run
 -   file change
@@ -8,38 +8,40 @@ Cache a command based on
 ## Install
 
 ```sh
+# Using npm
+npm add --save-dev cache-cmd
+# Using pnpm
+pnpm add --save-dev cache-cmd
+# Using yarn
 yarn add --dev cache-cmd
 ```
 
-or
-
-```sh
-npm install --save-dev cache-cmd
-```
-
 ## Usage
 
 ```sh
 # Shows help
-yarn cache-cmd --help
+npm exec -- cache-cmd --help
 
 # Runs command if it was not run in the last 20s
-yarn cache-cmd "echo ran this command" --time 20s
+npm exec -- cache-cmd "echo ran this command" --time 20s
 
-# Runs comand if yarn.lock in current directory changed since last run
-yarn cache-cmd "yarn install" --file yarn.lock
+# Runs command if package-lock.json in current directory changed since last run
+npm exec -- cache-cmd "npm install" --file package-lock.json
 
 # Additionally uses custom cache directory instead of default in node_modules
-yarn cache-cmd "yarn install" --file yarn.lock --cache-dir .config/cache
+npm exec -- cache-cmd "npm install" --file package-lock.json --cache-dir .config/cache
 
 # Runs command if it was not run in a month or any of the files changed
-yarn cache-cmd "yarn install" --time 1mo --file yarn.lock --file package.json
+npm exec -- cache-cmd "npm install" --time 1mo --file package-lock.json --file package.json
 
 # Shows path to cache directory
-yarn cache-cmd cache dir
+npm exec -- cache-cmd cache dir
 
 # Clear cache
-yarn cache-cmd cache clear
+npm exec -- cache-cmd cache clear
+
+# You can also run it with npx to skip the install step
+npx cache-cmd "echo ran this command" --time 20s
 ```
 
 You can use it to execute commands conditionally in `package.json` scripts.
@@ -47,7 +49,7 @@ You can use it to execute commands conditionally in `package.json` scripts.
 ```json
 {
     "scripts": {
-        "dev": "cache-cmd \"yarn\" --file yarn.lock && start-dev-server"
+        "start-dev": "cache-cmd \"npm install\" --file package-lock.json && start-dev-server"
     }
 }
 ```

package/dist/cli.cjs

@@ -144,6 +144,7 @@ async function runCommand({
   shouldCacheOnError
 }) {
   if (!cacheByTime && cacheByFiles.length === 0) {
+    console.log(`Executing command "${command}" due to no caching options provided`);
     await execSh__default["default"].promise(command);
     return;
   }
@@ -176,28 +177,31 @@ async function runCommand({
   })();
 
   if (areFileHashesEqual && isWithinCacheTime) {
+    console.log([`Skipping command "${command}" due to`, [fileHashes && 'unchanged files', duration && 'being within cache time'].filter(Boolean).join(' and ')].join(' '));
     return;
   }
 
+  console.log([`Executing command "${command}" due to`, [fileHashes && 'changed files', duration && 'cache time passing'].filter(Boolean).join(' and ')].join(' '));
   let execPromise = execSh__default["default"].promise(command);
 
+  function setCache() {
+    cache.setKey(cacheKey, {
+      lastRun: currentDate,
+      fileHashes
+    });
+    cache.save(true);
+    console.log(`Cache saved for command "${command}"`);
+  }
+
   if (shouldCacheOnError) {
     execPromise = execPromise.catch(error => {
-      cache.setKey(cacheKey, {
-        lastRun: currentDate,
-        fileHashes
-      });
-      cache.save(true);
+      setCache();
       throw error;
     });
   }
 
   await execPromise;
-  cache.setKey(cacheKey, {
-    lastRun: currentDate,
-    fileHashes
-  });
-  cache.save(true);
+  setCache();
 }
 
 hardRejection__default["default"]();

package/dist/cli.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"cli.cjs","sources":["../src/utils/get-cache-dir.ts","../src/cache-clear.ts","../src/cache-dir.ts","../src/utils/get-cache-key.ts","../src/utils/get-duration.ts","../src/utils/get-file-hashes.ts","../src/utils/get-file-paths.ts","../src/run.ts","../src/cli.ts"],"sourcesContent":["import path from 'path'\n\nimport findCacheDir from 'find-cache-dir'\nimport makeDir from 'make-dir'\n\nimport { name } from '../../package.json'\n\nexport function getCacheDirectoryPath(relativeCacheDirectoryPath: string | undefined) {\n    if (relativeCacheDirectoryPath) {\n        return path.resolve(process.cwd(), relativeCacheDirectoryPath)\n    }\n\n    const resolvedCacheDirectory = findCacheDir({ name })\n\n    if (!resolvedCacheDirectory) {\n        throw Error('Could not find cache directory. Please provide a cache directory manually.')\n    }\n\n    return resolvedCacheDirectory\n}\n\nexport function createCache(relativeCacheDirectoryPath: string | undefined) {\n    if (relativeCacheDirectoryPath) {\n        const absoluteCacheDirectoryPath = makeDir.sync(relativeCacheDirectoryPath)\n\n        return absoluteCacheDirectoryPath\n    }\n\n    const resolvedCachePath = findCacheDir({ name, create: true })\n\n    if (!resolvedCachePath) {\n        throw Error('Could not find cache directory. Please provide a cache directory manually.')\n    }\n\n    return resolvedCachePath\n}\n","import del from 'del'\n\nimport { getCacheDirectoryPath } from './utils/get-cache-dir'\n\nexport function clearCacheDirectory(relativeCacheDirectory: string | undefined) {\n    const deletedPaths = del.sync(getCacheDirectoryPath(relativeCacheDirectory))\n\n    if (deletedPaths.length === 0) {\n        console.log('No cache to clear')\n    } else if (deletedPaths.length === 1) {\n        console.log(`Deleted: ${deletedPaths[0]}`)\n    } else {\n        console.log('Deleted:\\n', deletedPaths.join('\\n'))\n    }\n}\n","import { getCacheDirectoryPath } from './utils/get-cache-dir'\n\nexport function showCacheDirectory(relativeCacheDirectory: string | undefined) {\n    console.log(getCacheDirectoryPath(relativeCacheDirectory))\n}\n","interface GetCacheKeyProps {\n    duration: Duration | undefined\n    filePaths: string[]\n    command: string\n}\n\ninterface Duration {\n    years: number | undefined\n    months: number | undefined\n    weeks: number | undefined\n    days: number | undefined\n    hours: number | undefined\n    minutes: number | undefined\n    seconds: number | undefined\n}\n\nexport function getCacheKey({ duration, filePaths, command }: GetCacheKeyProps) {\n    return [\n        'cwd:' + process.cwd(),\n        'cmd:' + command,\n        duration && 'time:' + JSON.stringify(duration),\n        filePaths.length !== 0 && 'files:' + filePaths.join(','),\n    ]\n        .filter(Boolean)\n        .join(' ---')\n}\n","export function getDuration(durationString: string) {\n    if (!/^(\\d+[a-z]+)+$/gi.test(durationString)) {\n        throw Error(`Invalid duration: ${durationString}`)\n    }\n\n    const duration = {\n        years: undefined as undefined | number,\n        months: undefined as undefined | number,\n        weeks: undefined as undefined | number,\n        days: undefined as undefined | number,\n        hours: undefined as undefined | number,\n        minutes: undefined as undefined | number,\n        seconds: undefined as undefined | number,\n    }\n\n    durationString.match(/\\d+[a-z]+/gi)!.forEach((durationPart) => {\n        const [, stringQuantity, unitShort] = /(\\d+)([a-z]+)/gi.exec(durationPart)!\n        const quantity = Number(stringQuantity)\n\n        const unitLong = (\n            {\n                y: 'years',\n                mo: 'months',\n                w: 'weeks',\n                d: 'days',\n                h: 'hours',\n                m: 'minutes',\n                s: 'seconds',\n            } as const\n        )[unitShort!]\n\n        if (Number.isNaN(quantity) || !unitLong) {\n            throw Error(`Invalid duration part: ${durationPart}`)\n        }\n\n        if (duration[unitLong] !== undefined) {\n            throw Error(`Duration with unit ${unitLong} was supplied multiple times`)\n        }\n\n        duration[unitLong] = quantity\n    })\n\n    return duration\n}\n","import hasha from 'hasha'\n\nexport async function getFileHashes(filePaths: string[]) {\n    return Object.fromEntries(\n        await Promise.all(\n            filePaths.map((filePath) =>\n                hasha\n                    .fromFile(filePath, { algorithm: 'md5' })\n                    .then((hash) => [filePath, hash] as const)\n            )\n        )\n    )\n}\n","import path from 'path'\n\nexport function getFilePaths(relativeFilePaths: string[]) {\n    const cwd = process.cwd()\n\n    return relativeFilePaths.map((file) => path.resolve(cwd, file)).sort()\n}\n","import { add, isAfter } from 'date-fns'\nimport execSh from 'exec-sh'\nimport flatCache from 'flat-cache'\nimport { isEqual } from 'lodash'\n\nimport { createCache } from './utils/get-cache-dir'\nimport { getCacheKey } from './utils/get-cache-key'\nimport { getDuration } from './utils/get-duration'\nimport { getFileHashes } from './utils/get-file-hashes'\nimport { getFilePaths } from './utils/get-file-paths'\n\ninterface RunCommandProps {\n    relativeCacheDirectory: string | undefined\n    command: string\n    cacheByTime: string | undefined\n    cacheByFiles: string[]\n    shouldCacheOnError: boolean | undefined\n}\n\nexport async function runCommand({\n    relativeCacheDirectory,\n    command,\n    cacheByTime: cacheByTime,\n    cacheByFiles: cacheByFiles,\n    shouldCacheOnError,\n}: RunCommandProps) {\n    if (!cacheByTime && cacheByFiles.length === 0) {\n        await execSh.promise(command)\n        return\n    }\n\n    const cache = flatCache.load('commands-cache.json', createCache(relativeCacheDirectory))\n    const filePaths = getFilePaths(cacheByFiles)\n    const duration = cacheByTime ? getDuration(cacheByTime) : undefined\n\n    const cacheKey = getCacheKey({ duration, filePaths, command })\n\n    const cacheData: unknown = cache.getKey(cacheKey)\n\n    const fileHashes = filePaths.length === 0 ? undefined : await getFileHashes(filePaths)\n    const currentDate = new Date()\n\n    const areFileHashesEqual = isEqual((cacheData as any)?.fileHashes, fileHashes)\n    const isWithinCacheTime = (() => {\n        if (!duration) {\n            return true\n        }\n\n        const lastRun = (cacheData as any)?.lastRun\n\n        if (!lastRun) {\n            return false\n        }\n\n        return isAfter(add(new Date(lastRun), duration), currentDate)\n    })()\n\n    if (areFileHashesEqual && isWithinCacheTime) {\n        return\n    }\n\n    let execPromise = execSh.promise(command)\n\n    if (shouldCacheOnError) {\n        execPromise = execPromise.catch((error: unknown) => {\n            cache.setKey(cacheKey, {\n                lastRun: currentDate,\n                fileHashes,\n            })\n            cache.save(true)\n\n            throw error\n        })\n    }\n\n    await execPromise\n\n    cache.setKey(cacheKey, {\n        lastRun: currentDate,\n        fileHashes,\n    })\n    cache.save(true)\n}\n","#!/usr/bin/env node\n\nimport hardRejection from 'hard-rejection'\nimport sade from 'sade'\n\nimport { version } from '../package.json'\n\nimport { clearCacheDirectory } from './cache-clear'\nimport { showCacheDirectory } from './cache-dir'\nimport { runCommand } from './run'\n\nhardRejection()\n\nconst program = sade('cache-cmd')\n\nprogram\n    .version(version)\n    .describe('Run and cache a command based on various factors')\n    .option(\n        '-c, --cache-dir',\n        'Cache directory to use (default: .cache/cache-cmd in nearest node_modules)'\n    )\n\nprogram\n    .command(\n        'run <command>',\n        'Run cached command (if no <command> provided, this is the default)',\n        { default: true }\n    )\n    .option('-f, --file', 'Run command only when file content changes')\n    .option('-t, --time', 'Run command only after specified time (unit with s,m,h,d,w,mo,y)')\n    .option('--cache-on-error', 'Cache command run even when command exits with non-zero exit code')\n    .example('run \"echo ran this command\" --time 20s')\n    .example('run \"./may-fail\" --time 20s --cache-on-error')\n    .example('run \"yarn install\" --file yarn.lock')\n    .example('run \"yarn install\" --file yarn.lock --cache-dir .config/cache')\n    .example('run \"yarn install\" --time 1mo --file yarn.lock --file package.json')\n    .action((command: unknown, options: Record<string, unknown>) => {\n        const cacheDirectory = options['cache-dir']\n        const time = options.time\n        const file = options.file\n        const shouldCacheOnError = options['cache-on-error']\n        const files: unknown[] = file === undefined ? [] : Array.isArray(file) ? file : [file]\n\n        if (typeof command !== 'string') {\n            throw Error('Invalid <command> supplied')\n        }\n\n        if (cacheDirectory !== undefined && typeof cacheDirectory !== 'string') {\n            throw Error('Invalid --cache-dir supplied')\n        }\n\n        if (time !== undefined && typeof time !== 'string') {\n            throw Error('Invalid --time supplied')\n        }\n\n        if (files.some((file) => typeof file !== 'string')) {\n            throw Error('Invalid --file supplied')\n        }\n\n        if (shouldCacheOnError !== undefined && typeof shouldCacheOnError !== 'boolean') {\n            throw Error('Invalid --cache-on-error supplied')\n        }\n\n        runCommand({\n            relativeCacheDirectory: cacheDirectory,\n            command,\n            cacheByTime: time,\n            cacheByFiles: files as string[],\n            shouldCacheOnError,\n        })\n    })\n\nprogram\n    .command('cache dir', 'Show cache directory path used by cache-cmd')\n    .action((options: Record<string, unknown>) => {\n        const cacheDirectory = options['cache-dir']\n\n        if (cacheDirectory !== undefined && typeof cacheDirectory !== 'string') {\n            throw Error('Invalid --cache-dir supplied')\n        }\n\n        showCacheDirectory(cacheDirectory)\n    })\n\nprogram\n    .command('cache clear', 'Clear cache used by cache-cmd')\n    .action((options: Record<string, unknown>) => {\n        const cacheDirectory = options['cache-dir']\n\n        if (cacheDirectory !== undefined && typeof cacheDirectory !== 'string') {\n            throw Error('Invalid --cache-dir supplied')\n        }\n\n        clearCacheDirectory(cacheDirectory)\n    })\n\nprogram.parse(process.argv)\n"],"names":["getCacheDirectoryPath","relativeCacheDirectoryPath","path","resolve","process","cwd","resolvedCacheDirectory","findCacheDir","name","Error","createCache","absoluteCacheDirectoryPath","makeDir","sync","resolvedCachePath","create","clearCacheDirectory","relativeCacheDirectory","deletedPaths","del","length","console","log","join","showCacheDirectory","getCacheKey","duration","filePaths","command","JSON","stringify","filter","Boolean","getDuration","durationString","test","years","undefined","months","weeks","days","hours","minutes","seconds","match","forEach","durationPart","stringQuantity","unitShort","exec","quantity","Number","unitLong","y","mo","w","d","h","m","s","isNaN","getFileHashes","Object","fromEntries","Promise","all","map","filePath","hasha","fromFile","algorithm","then","hash","getFilePaths","relativeFilePaths","file","sort","runCommand","cacheByTime","cacheByFiles","shouldCacheOnError","execSh","promise","cache","flatCache","load","cacheKey","cacheData","getKey","fileHashes","currentDate","Date","areFileHashesEqual","isEqual","isWithinCacheTime","lastRun","isAfter","add","execPromise","catch","error","setKey","save","hardRejection","program","sade","version","describe","option","default","example","action","options","cacheDirectory","time","files","Array","isArray","some","parse","argv"],"mappings":"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"}
+{"version":3,"file":"cli.cjs","sources":["../src/utils/get-cache-dir.ts","../src/cache-clear.ts","../src/cache-dir.ts","../src/utils/get-cache-key.ts","../src/utils/get-duration.ts","../src/utils/get-file-hashes.ts","../src/utils/get-file-paths.ts","../src/run.ts","../src/cli.ts"],"sourcesContent":["import path from 'path'\n\nimport findCacheDir from 'find-cache-dir'\nimport makeDir from 'make-dir'\n\nimport { name } from '../../package.json'\n\nexport function getCacheDirectoryPath(relativeCacheDirectoryPath: string | undefined) {\n    if (relativeCacheDirectoryPath) {\n        return path.resolve(process.cwd(), relativeCacheDirectoryPath)\n    }\n\n    const resolvedCacheDirectory = findCacheDir({ name })\n\n    if (!resolvedCacheDirectory) {\n        throw Error('Could not find cache directory. Please provide a cache directory manually.')\n    }\n\n    return resolvedCacheDirectory\n}\n\nexport function createCache(relativeCacheDirectoryPath: string | undefined) {\n    if (relativeCacheDirectoryPath) {\n        const absoluteCacheDirectoryPath = makeDir.sync(relativeCacheDirectoryPath)\n\n        return absoluteCacheDirectoryPath\n    }\n\n    const resolvedCachePath = findCacheDir({ name, create: true })\n\n    if (!resolvedCachePath) {\n        throw Error('Could not find cache directory. Please provide a cache directory manually.')\n    }\n\n    return resolvedCachePath\n}\n","import del from 'del'\n\nimport { getCacheDirectoryPath } from './utils/get-cache-dir'\n\nexport function clearCacheDirectory(relativeCacheDirectory: string | undefined) {\n    const deletedPaths = del.sync(getCacheDirectoryPath(relativeCacheDirectory))\n\n    if (deletedPaths.length === 0) {\n        console.log('No cache to clear')\n    } else if (deletedPaths.length === 1) {\n        console.log(`Deleted: ${deletedPaths[0]}`)\n    } else {\n        console.log('Deleted:\\n', deletedPaths.join('\\n'))\n    }\n}\n","import { getCacheDirectoryPath } from './utils/get-cache-dir'\n\nexport function showCacheDirectory(relativeCacheDirectory: string | undefined) {\n    console.log(getCacheDirectoryPath(relativeCacheDirectory))\n}\n","interface GetCacheKeyProps {\n    duration: Duration | undefined\n    filePaths: string[]\n    command: string\n}\n\ninterface Duration {\n    years: number | undefined\n    months: number | undefined\n    weeks: number | undefined\n    days: number | undefined\n    hours: number | undefined\n    minutes: number | undefined\n    seconds: number | undefined\n}\n\nexport function getCacheKey({ duration, filePaths, command }: GetCacheKeyProps) {\n    return [\n        'cwd:' + process.cwd(),\n        'cmd:' + command,\n        duration && 'time:' + JSON.stringify(duration),\n        filePaths.length !== 0 && 'files:' + filePaths.join(','),\n    ]\n        .filter(Boolean)\n        .join(' ---')\n}\n","export function getDuration(durationString: string) {\n    if (!/^(\\d+[a-z]+)+$/gi.test(durationString)) {\n        throw Error(`Invalid duration: ${durationString}`)\n    }\n\n    const duration = {\n        years: undefined as undefined | number,\n        months: undefined as undefined | number,\n        weeks: undefined as undefined | number,\n        days: undefined as undefined | number,\n        hours: undefined as undefined | number,\n        minutes: undefined as undefined | number,\n        seconds: undefined as undefined | number,\n    }\n\n    durationString.match(/\\d+[a-z]+/gi)!.forEach((durationPart) => {\n        const [, stringQuantity, unitShort] = /(\\d+)([a-z]+)/gi.exec(durationPart)!\n        const quantity = Number(stringQuantity)\n\n        const unitLong = (\n            {\n                y: 'years',\n                mo: 'months',\n                w: 'weeks',\n                d: 'days',\n                h: 'hours',\n                m: 'minutes',\n                s: 'seconds',\n            } as const\n        )[unitShort!]\n\n        if (Number.isNaN(quantity) || !unitLong) {\n            throw Error(`Invalid duration part: ${durationPart}`)\n        }\n\n        if (duration[unitLong] !== undefined) {\n            throw Error(`Duration with unit ${unitLong} was supplied multiple times`)\n        }\n\n        duration[unitLong] = quantity\n    })\n\n    return duration\n}\n","import hasha from 'hasha'\n\nexport async function getFileHashes(filePaths: string[]) {\n    return Object.fromEntries(\n        await Promise.all(\n            filePaths.map((filePath) =>\n                hasha\n                    .fromFile(filePath, { algorithm: 'md5' })\n                    .then((hash) => [filePath, hash] as const)\n            )\n        )\n    )\n}\n","import path from 'path'\n\nexport function getFilePaths(relativeFilePaths: string[]) {\n    const cwd = process.cwd()\n\n    return relativeFilePaths.map((file) => path.resolve(cwd, file)).sort()\n}\n","import { add, isAfter } from 'date-fns'\nimport execSh from 'exec-sh'\nimport flatCache from 'flat-cache'\nimport { isEqual } from 'lodash'\n\nimport { createCache } from './utils/get-cache-dir'\nimport { getCacheKey } from './utils/get-cache-key'\nimport { getDuration } from './utils/get-duration'\nimport { getFileHashes } from './utils/get-file-hashes'\nimport { getFilePaths } from './utils/get-file-paths'\n\ninterface RunCommandProps {\n    relativeCacheDirectory: string | undefined\n    command: string\n    cacheByTime: string | undefined\n    cacheByFiles: string[]\n    shouldCacheOnError: boolean | undefined\n}\n\nexport async function runCommand({\n    relativeCacheDirectory,\n    command,\n    cacheByTime: cacheByTime,\n    cacheByFiles: cacheByFiles,\n    shouldCacheOnError,\n}: RunCommandProps) {\n    if (!cacheByTime && cacheByFiles.length === 0) {\n        console.log(`Executing command \"${command}\" due to no caching options provided`)\n        await execSh.promise(command)\n        return\n    }\n\n    const cache = flatCache.load('commands-cache.json', createCache(relativeCacheDirectory))\n    const filePaths = getFilePaths(cacheByFiles)\n    const duration = cacheByTime ? getDuration(cacheByTime) : undefined\n\n    const cacheKey = getCacheKey({ duration, filePaths, command })\n\n    const cacheData: unknown = cache.getKey(cacheKey)\n\n    const fileHashes = filePaths.length === 0 ? undefined : await getFileHashes(filePaths)\n    const currentDate = new Date()\n\n    const areFileHashesEqual = isEqual((cacheData as any)?.fileHashes, fileHashes)\n    const isWithinCacheTime = (() => {\n        if (!duration) {\n            return true\n        }\n\n        const lastRun = (cacheData as any)?.lastRun\n\n        if (!lastRun) {\n            return false\n        }\n\n        return isAfter(add(new Date(lastRun), duration), currentDate)\n    })()\n\n    if (areFileHashesEqual && isWithinCacheTime) {\n        console.log(\n            [\n                `Skipping command \"${command}\" due to`,\n                [fileHashes && 'unchanged files', duration && 'being within cache time']\n                    .filter(Boolean)\n                    .join(' and '),\n            ].join(' ')\n        )\n        return\n    }\n\n    console.log(\n        [\n            `Executing command \"${command}\" due to`,\n            [fileHashes && 'changed files', duration && 'cache time passing']\n                .filter(Boolean)\n                .join(' and '),\n        ].join(' ')\n    )\n    let execPromise = execSh.promise(command)\n\n    function setCache() {\n        cache.setKey(cacheKey, {\n            lastRun: currentDate,\n            fileHashes,\n        })\n        cache.save(true)\n        console.log(`Cache saved for command \"${command}\"`)\n    }\n\n    if (shouldCacheOnError) {\n        execPromise = execPromise.catch((error: unknown) => {\n            setCache()\n\n            throw error\n        })\n    }\n\n    await execPromise\n\n    setCache()\n}\n","#!/usr/bin/env node\n\nimport hardRejection from 'hard-rejection'\nimport sade from 'sade'\n\nimport { version } from '../package.json'\n\nimport { clearCacheDirectory } from './cache-clear'\nimport { showCacheDirectory } from './cache-dir'\nimport { runCommand } from './run'\n\nhardRejection()\n\nconst program = sade('cache-cmd')\n\nprogram\n    .version(version)\n    .describe('Run and cache a command based on various factors')\n    .option(\n        '-c, --cache-dir',\n        'Cache directory to use (default: .cache/cache-cmd in nearest node_modules)'\n    )\n\nprogram\n    .command(\n        'run <command>',\n        'Run cached command (if no <command> provided, this is the default)',\n        { default: true }\n    )\n    .option('-f, --file', 'Run command only when file content changes')\n    .option('-t, --time', 'Run command only after specified time (unit with s,m,h,d,w,mo,y)')\n    .option('--cache-on-error', 'Cache command run even when command exits with non-zero exit code')\n    .example('run \"echo ran this command\" --time 20s')\n    .example('run \"./may-fail\" --time 20s --cache-on-error')\n    .example('run \"yarn install\" --file yarn.lock')\n    .example('run \"yarn install\" --file yarn.lock --cache-dir .config/cache')\n    .example('run \"yarn install\" --time 1mo --file yarn.lock --file package.json')\n    .action((command: unknown, options: Record<string, unknown>) => {\n        const cacheDirectory = options['cache-dir']\n        const time = options.time\n        const file = options.file\n        const shouldCacheOnError = options['cache-on-error']\n        const files: unknown[] = file === undefined ? [] : Array.isArray(file) ? file : [file]\n\n        if (typeof command !== 'string') {\n            throw Error('Invalid <command> supplied')\n        }\n\n        if (cacheDirectory !== undefined && typeof cacheDirectory !== 'string') {\n            throw Error('Invalid --cache-dir supplied')\n        }\n\n        if (time !== undefined && typeof time !== 'string') {\n            throw Error('Invalid --time supplied')\n        }\n\n        if (files.some((file) => typeof file !== 'string')) {\n            throw Error('Invalid --file supplied')\n        }\n\n        if (shouldCacheOnError !== undefined && typeof shouldCacheOnError !== 'boolean') {\n            throw Error('Invalid --cache-on-error supplied')\n        }\n\n        runCommand({\n            relativeCacheDirectory: cacheDirectory,\n            command,\n            cacheByTime: time,\n            cacheByFiles: files as string[],\n            shouldCacheOnError,\n        })\n    })\n\nprogram\n    .command('cache dir', 'Show cache directory path used by cache-cmd')\n    .action((options: Record<string, unknown>) => {\n        const cacheDirectory = options['cache-dir']\n\n        if (cacheDirectory !== undefined && typeof cacheDirectory !== 'string') {\n            throw Error('Invalid --cache-dir supplied')\n        }\n\n        showCacheDirectory(cacheDirectory)\n    })\n\nprogram\n    .command('cache clear', 'Clear cache used by cache-cmd')\n    .action((options: Record<string, unknown>) => {\n        const cacheDirectory = options['cache-dir']\n\n        if (cacheDirectory !== undefined && typeof cacheDirectory !== 'string') {\n            throw Error('Invalid --cache-dir supplied')\n        }\n\n        clearCacheDirectory(cacheDirectory)\n    })\n\nprogram.parse(process.argv)\n"],"names":["getCacheDirectoryPath","relativeCacheDirectoryPath","path","resolve","process","cwd","resolvedCacheDirectory","findCacheDir","name","Error","createCache","absoluteCacheDirectoryPath","makeDir","sync","resolvedCachePath","create","clearCacheDirectory","relativeCacheDirectory","deletedPaths","del","length","console","log","join","showCacheDirectory","getCacheKey","duration","filePaths","command","JSON","stringify","filter","Boolean","getDuration","durationString","test","years","undefined","months","weeks","days","hours","minutes","seconds","match","forEach","durationPart","stringQuantity","unitShort","exec","quantity","Number","unitLong","y","mo","w","d","h","m","s","isNaN","getFileHashes","Object","fromEntries","Promise","all","map","filePath","hasha","fromFile","algorithm","then","hash","getFilePaths","relativeFilePaths","file","sort","runCommand","cacheByTime","cacheByFiles","shouldCacheOnError","execSh","promise","cache","flatCache","load","cacheKey","cacheData","getKey","fileHashes","currentDate","Date","areFileHashesEqual","isEqual","isWithinCacheTime","lastRun","isAfter","add","execPromise","setCache","setKey","save","catch","error","hardRejection","program","sade","version","describe","option","default","example","action","options","cacheDirectory","time","files","Array","isArray","some","parse","argv"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cache-cmd",
-    "version": "0.2.0-dev.4a662091d40f9510cff02e70023e5919708daa8f",
+    "version": "0.2.0-dev.7098ba3784d94f8515529435c60343ac3e724316",
     "description": "Cache a command based on various factors",
     "keywords": [
         "cache",

package/src/run.ts

@@ -25,6 +25,7 @@ export async function runCommand({
     shouldCacheOnError,
 }: RunCommandProps) {
     if (!cacheByTime && cacheByFiles.length === 0) {
+        console.log(`Executing command "${command}" due to no caching options provided`)
         await execSh.promise(command)
         return
     }
@@ -56,18 +57,39 @@ export async function runCommand({
     })()
 
     if (areFileHashesEqual && isWithinCacheTime) {
+        console.log(
+            [
+                `Skipping command "${command}" due to`,
+                [fileHashes && 'unchanged files', duration && 'being within cache time']
+                    .filter(Boolean)
+                    .join(' and '),
+            ].join(' ')
+        )
         return
     }
 
+    console.log(
+        [
+            `Executing command "${command}" due to`,
+            [fileHashes && 'changed files', duration && 'cache time passing']
+                .filter(Boolean)
+                .join(' and '),
+        ].join(' ')
+    )
     let execPromise = execSh.promise(command)
 
+    function setCache() {
+        cache.setKey(cacheKey, {
+            lastRun: currentDate,
+            fileHashes,
+        })
+        cache.save(true)
+        console.log(`Cache saved for command "${command}"`)
+    }
+
     if (shouldCacheOnError) {
         execPromise = execPromise.catch((error: unknown) => {
-            cache.setKey(cacheKey, {
-                lastRun: currentDate,
-                fileHashes,
-            })
-            cache.save(true)
+            setCache()
 
             throw error
         })
@@ -75,9 +97,5 @@ export async function runCommand({
 
     await execPromise
 
-    cache.setKey(cacheKey, {
-        lastRun: currentDate,
-        fileHashes,
-    })
-    cache.save(true)
+    setCache()
 }