@roots/bud-cache 6.15.1 → 6.15.2

package/lib/helpers.d.ts

@@ -0,0 +1,2 @@
+import type { File } from "@roots/bud-framework/context";
+export declare const isBuildDependency: (file: File) => boolean;

package/lib/helpers.js

@@ -0,0 +1,9 @@
+export const isBuildDependency = (file) => [
+    `.npmrc`,
+    `.pnpmfile`,
+    `.yarnrc`,
+    `jsconfig`,
+    `package`,
+    `pnpm-workspace`,
+    `tsconfig`,
+].includes(file.name) || file.bud;

package/lib/service.d.ts

@@ -1,6 +1,6 @@
 import type { Bud } from '@roots/bud-framework';
-import type { Configuration } from '@roots/bud-framework/config';
-import type { Cache as BudCache } from '@roots/bud-framework/services';
+import type { Configuration, FileCacheOptions } from '@roots/bud-framework/config';
+import type { Cache as BudCache, CacheCallback as Callback } from '@roots/bud-framework/services/cache';
 import { Service } from '@roots/bud-framework/service';
 /**
  * {@link Bud.cache}
@@ -10,6 +10,11 @@ export default class Cache extends Service implements BudCache {
      * {@link BudCache.enabled}
      */
     enabled: boolean;
+    set allowCollectingMemory(value: Callback<FileCacheOptions[`allowCollectingMemory`]>);
+    /**
+     * {@link BudCache.allowCollectingMemory}
+     */
+    get allowCollectingMemory(): FileCacheOptions[`allowCollectingMemory`];
     /**
      * {@link Service.boot}
      */
@@ -17,13 +22,13 @@ export default class Cache extends Service implements BudCache {
     /**
      *{@link BudCache.buildDependencies}
      */
-    get buildDependencies(): Record<string, Array<string>>;
-    set buildDependencies(dependencies: Record<string, Array<string>>);
+    get buildDependencies(): FileCacheOptions[`buildDependencies`];
+    set buildDependencies(dependencies: Callback<FileCacheOptions[`buildDependencies`]>);
     /**
      * {@link BudCache.cacheDirectory}
      */
     get cacheDirectory(): string;
-    set cacheDirectory(directory: string);
+    set cacheDirectory(directory: Callback<FileCacheOptions[`cacheDirectory`]>);
     /**
      * {@link BudCache.configuration}
      * @readonly
@@ -33,6 +38,24 @@ export default class Cache extends Service implements BudCache {
      * {@link BudCache.flush}
      */
     flush(): Promise<void>;
+    /**
+     * Get {@link BudCache.allowCollectingMemory}
+     */
+    getAllowCollectingMemory(): boolean | undefined;
+    /**
+     * Get {@link BudCache.buildDependencies}
+     */
+    getBuildDependencies(): {
+        [index: string]: string[];
+    } | undefined;
+    /**
+     * Get {@link BudCache.cacheDirectory}
+     */
+    getCacheDirectory(): string;
+    /**
+     * Get {@link BudCache.type}
+     */
+    getType(): "filesystem" | "memory";
     /**
      * {@link BudCache.name}
      */
@@ -42,14 +65,30 @@ export default class Cache extends Service implements BudCache {
      * {@link BudCache.register}
      */
     register?(bud: Bud): Promise<void>;
+    /**
+     * Set {@link BudCache.allowCollectingMemory}
+     */
+    setAllowCollectingMemory(value: Callback<FileCacheOptions[`allowCollectingMemory`]>): this;
+    /**
+     * Set {@link BudCache.buildDependencies}
+     */
+    setBuildDependencies(dependencies: ((records?: Record<string, Array<string>>) => Record<string, Array<string>>) | Record<string, Array<string>>): this;
+    /**
+     * Set {@link BudCache.cacheDirectory}
+     */
+    setCacheDirectory(directory: Callback<FileCacheOptions[`cacheDirectory`]>): this;
+    /**
+     * Set {@link BudCache.type}
+     */
+    setType(type: Callback<FileCacheOptions[`type`]>): this;
+    set type(type: Callback<FileCacheOptions[`type`]>);
     /**
      * {@link BudCache.type}
      */
     get type(): 'filesystem' | 'memory';
-    set type(type: 'filesystem' | 'memory');
+    set version(version: string);
     /**
      * {@link BudCache.version}
      */
     get version(): string | undefined;
-    set version(version: string);
 }

package/lib/service.js

@@ -1,5 +1,6 @@
 import { __decorate } from "tslib";
 import { join } from 'node:path';
+import { isBuildDependency } from '@roots/bud-cache/helpers';
 import { Service } from '@roots/bud-framework/service';
 import { bind } from '@roots/bud-support/decorators/bind';
 import isString from '@roots/bud-support/lodash/isString';
@@ -7,6 +8,17 @@ import isString from '@roots/bud-support/lodash/isString';
  * {@link Bud.cache}
  */
 export default class Cache extends Service {
+    set allowCollectingMemory(value) {
+        this.app.hooks.on(`build.cache.allowCollectingMemory`, value);
+    }
+    /**
+     * {@link BudCache.allowCollectingMemory}
+     */
+    get allowCollectingMemory() {
+        const fallback = true;
+        const value = this.app.hooks.filter(`build.cache.allowCollectingMemory`, fallback);
+        return typeof value === `boolean` ? value : fallback;
+    }
     /**
      * {@link Service.boot}
      */
@@ -20,15 +32,17 @@ export default class Cache extends Service {
      *{@link BudCache.buildDependencies}
      */
     get buildDependencies() {
-        const baseDependencies = {
-            bud: [
-                this.app.context.files[`package`]?.path,
-                ...Object.values(this.app.context.files)
-                    .filter(({ bud }) => bud)
-                    .map(({ path }) => path),
-            ].filter(Boolean),
+        const dependencies = new Set([
+            this.app.context.files[`package`]?.path,
+            ...Object.values(this.app.context.files)
+                .filter(isBuildDependency)
+                .map(({ path }) => path),
+        ].filter(Boolean));
+        const records = {
+            bud: [...dependencies],
         };
-        return (this.app.hooks.filter(`build.cache.buildDependencies`, baseDependencies) ?? baseDependencies);
+        return (this.app.hooks.filter(`build.cache.buildDependencies`, records) ??
+            records);
     }
     set buildDependencies(dependencies) {
         this.app.hooks.on(`build.cache.buildDependencies`, dependencies);
@@ -37,7 +51,9 @@ export default class Cache extends Service {
      * {@link BudCache.cacheDirectory}
      */
     get cacheDirectory() {
-        return (this.app.hooks.filter(`build.cache.cacheDirectory`, this.app.path(`@storage`, this.app.label, `cache`)) ?? this.app.path(`@storage`, this.app.label, `cache`));
+        const fallback = this.app.path(`@storage`, this.app.label, `cache`);
+        return (this.app.hooks.filter(`build.cache.cacheDirectory`, fallback) ??
+            fallback);
     }
     set cacheDirectory(directory) {
         this.app.hooks.on(`build.cache.cacheDirectory`, directory);
@@ -52,7 +68,7 @@ export default class Cache extends Service {
         if (this.type === `memory`)
             return true;
         return {
-            allowCollectingMemory: true,
+            allowCollectingMemory: this.allowCollectingMemory,
             buildDependencies: this.buildDependencies,
             cacheDirectory: this.cacheDirectory,
             compression: this.app.isDevelopment ? false : `brotli`,
@@ -72,11 +88,36 @@ export default class Cache extends Service {
     async flush() {
         await this.app.fs.remove(this.cacheDirectory);
     }
+    /**
+     * Get {@link BudCache.allowCollectingMemory}
+     */
+    getAllowCollectingMemory() {
+        return this.allowCollectingMemory;
+    }
+    /**
+     * Get {@link BudCache.buildDependencies}
+     */
+    getBuildDependencies() {
+        return this.buildDependencies;
+    }
+    /**
+     * Get {@link BudCache.cacheDirectory}
+     */
+    getCacheDirectory() {
+        return this.cacheDirectory;
+    }
+    /**
+     * Get {@link BudCache.type}
+     */
+    getType() {
+        return this.type;
+    }
     /**
      * {@link BudCache.name}
      */
     get name() {
-        return (this.app.hooks.filter(`build.cache.name`, this.app.hooks.filter(`build.name`, join(this.app.mode, ...Object.values(this.app.context._ ?? {})))) ?? join(this.app.mode, ...Object.values(this.app.context._ ?? {})));
+        const fallback = join(this.app.mode, ...Object.values(this.app.context._ ?? {}));
+        return (this.app.hooks.filter(`build.cache.name`, this.app.hooks.filter(`build.name`, fallback)) ?? fallback);
     }
     set name(name) {
         this.app.hooks.on(`build.cache.name`, name);
@@ -88,16 +129,48 @@ export default class Cache extends Service {
         this.enabled = bud.context.cache !== false;
         this.version = bud.context.bud.version;
     }
+    /**
+     * Set {@link BudCache.allowCollectingMemory}
+     */
+    setAllowCollectingMemory(value) {
+        this.allowCollectingMemory = value;
+        return this;
+    }
+    /**
+     * Set {@link BudCache.buildDependencies}
+     */
+    setBuildDependencies(dependencies) {
+        this.buildDependencies = dependencies;
+        return this;
+    }
+    /**
+     * Set {@link BudCache.cacheDirectory}
+     */
+    setCacheDirectory(directory) {
+        this.cacheDirectory = directory;
+        return this;
+    }
+    /**
+     * Set {@link BudCache.type}
+     */
+    setType(type) {
+        this.type = type;
+        return this;
+    }
+    set type(type) {
+        this.app.hooks.on(`build.cache.type`, type);
+    }
     /**
      * {@link BudCache.type}
      */
     get type() {
-        return (this.app.hooks.filter(`build.cache.type`, isString(this.app.context.cache)
+        const fallback = isString(this.app.context.cache)
             ? this.app.context.cache
-            : `filesystem`) ?? `filesystem`);
+            : `filesystem`;
+        return this.app.hooks.filter(`build.cache.type`) ?? fallback;
     }
-    set type(type) {
-        this.app.hooks.on(`build.cache.type`, type);
+    set version(version) {
+        this.app.hooks.on(`build.cache.version`, version);
     }
     /**
      * {@link BudCache.version}
@@ -105,9 +178,6 @@ export default class Cache extends Service {
     get version() {
         return this.app.hooks.filter(`build.cache.version`, undefined);
     }
-    set version(version) {
-        this.app.hooks.on(`build.cache.version`, version);
-    }
 }
 __decorate([
     bind

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-cache",
-  "version": "6.15.1",
+  "version": "6.15.2",
   "description": "Config caching",
   "engines": {
     "node": ">=16"
@@ -50,6 +50,7 @@
   "type": "module",
   "exports": {
     ".": "./lib/index.js",
+    "./helpers": "./lib/helpers.js",
     "./service": "./lib/service.js"
   },
   "typesVersions": {
@@ -57,6 +58,9 @@
       ".": [
         "./lib/index.d.ts"
       ],
+      "./helpers": [
+        "./lib/helpers.d.ts"
+      ],
       "service": [
         "./lib/service.d.ts"
       ]
@@ -68,8 +72,8 @@
     "@skypack/package-check": "0.2.2"
   },
   "dependencies": {
-    "@roots/bud-framework": "6.15.1",
-    "@roots/bud-support": "6.15.1",
+    "@roots/bud-framework": "6.15.2",
+    "@roots/bud-support": "6.15.2",
     "strip-ansi": "7.1.0",
     "tslib": "2.6.1"
   },

package/src/helpers.ts

@@ -0,0 +1,11 @@
+import type { File } from "@roots/bud-framework/context";
+
+export const isBuildDependency = (file: File): boolean => [
+  `.npmrc`,
+  `.pnpmfile`,
+  `.yarnrc`,
+  `jsconfig`,
+  `package`,
+  `pnpm-workspace`,
+  `tsconfig`,
+].includes(file.name) || file.bud

package/src/service.ts

@@ -1,9 +1,16 @@
 import type {Bud} from '@roots/bud-framework'
-import type {Configuration} from '@roots/bud-framework/config'
-import type {Cache as BudCache} from '@roots/bud-framework/services'
+import type {
+  Configuration,
+  FileCacheOptions,
+} from '@roots/bud-framework/config'
+import type {
+  Cache as BudCache,
+  CacheCallback as Callback,
+} from '@roots/bud-framework/services/cache'
 
 import {join} from 'node:path'
 
+import {isBuildDependency} from '@roots/bud-cache/helpers'
 import {Service} from '@roots/bud-framework/service'
 import {bind} from '@roots/bud-support/decorators/bind'
 import isString from '@roots/bud-support/lodash/isString'
@@ -16,6 +23,24 @@ export default class Cache extends Service implements BudCache {
    * {@link BudCache.enabled}
    */
   public declare enabled: boolean
+  public set allowCollectingMemory(
+    value: Callback<FileCacheOptions[`allowCollectingMemory`]>,
+  ) {
+    this.app.hooks.on(`build.cache.allowCollectingMemory`, value)
+  }
+
+  /**
+   * {@link BudCache.allowCollectingMemory}
+   */
+  public get allowCollectingMemory(): FileCacheOptions[`allowCollectingMemory`] {
+    const fallback = true
+
+    const value = this.app.hooks.filter(
+      `build.cache.allowCollectingMemory`,
+      fallback,
+    )
+    return typeof value === `boolean` ? value : fallback
+  }
 
   /**
    * {@link Service.boot}
@@ -30,25 +55,26 @@ export default class Cache extends Service implements BudCache {
   /**
    *{@link BudCache.buildDependencies}
    */
-  public get buildDependencies(): Record<string, Array<string>> {
-    const baseDependencies = {
-      bud: [
+  public get buildDependencies(): FileCacheOptions[`buildDependencies`] {
+    const dependencies = new Set(
+      [
         this.app.context.files[`package`]?.path,
         ...Object.values(this.app.context.files)
-          .filter(({bud}) => bud)
+          .filter(isBuildDependency)
           .map(({path}) => path),
       ].filter(Boolean),
+    )
+    const records = {
+      bud: [...dependencies],
     }
 
     return (
-      this.app.hooks.filter(
-        `build.cache.buildDependencies`,
-        baseDependencies,
-      ) ?? baseDependencies
+      this.app.hooks.filter(`build.cache.buildDependencies`, records) ??
+      records
     )
   }
   public set buildDependencies(
-    dependencies: Record<string, Array<string>>,
+    dependencies: Callback<FileCacheOptions[`buildDependencies`]>,
   ) {
     this.app.hooks.on(`build.cache.buildDependencies`, dependencies)
   }
@@ -57,14 +83,16 @@ export default class Cache extends Service implements BudCache {
    * {@link BudCache.cacheDirectory}
    */
   public get cacheDirectory(): string {
+    const fallback = this.app.path(`@storage`, this.app.label, `cache`)
     return (
-      this.app.hooks.filter(
-        `build.cache.cacheDirectory`,
-        this.app.path(`@storage`, this.app.label, `cache`),
-      ) ?? this.app.path(`@storage`, this.app.label, `cache`)
+      this.app.hooks.filter(`build.cache.cacheDirectory`, fallback) ??
+      fallback
     )
   }
-  public set cacheDirectory(directory: string) {
+
+  public set cacheDirectory(
+    directory: Callback<FileCacheOptions[`cacheDirectory`]>,
+  ) {
     this.app.hooks.on(`build.cache.cacheDirectory`, directory)
   }
 
@@ -77,7 +105,7 @@ export default class Cache extends Service implements BudCache {
     if (this.type === `memory`) return true
 
     return {
-      allowCollectingMemory: true,
+      allowCollectingMemory: this.allowCollectingMemory,
       buildDependencies: this.buildDependencies,
       cacheDirectory: this.cacheDirectory,
       compression: this.app.isDevelopment ? false : `brotli`,
@@ -91,7 +119,6 @@ export default class Cache extends Service implements BudCache {
       type: this.type,
     }
   }
-
   /**
    * {@link BudCache.flush}
    */
@@ -100,20 +127,48 @@ export default class Cache extends Service implements BudCache {
     await this.app.fs.remove(this.cacheDirectory)
   }
 
+  /**
+   * Get {@link BudCache.allowCollectingMemory}
+   */
+  public getAllowCollectingMemory() {
+    return this.allowCollectingMemory
+  }
+  /**
+   * Get {@link BudCache.buildDependencies}
+   */
+  public getBuildDependencies() {
+    return this.buildDependencies
+  }
+
+  /**
+   * Get {@link BudCache.cacheDirectory}
+   */
+  public getCacheDirectory() {
+    return this.cacheDirectory
+  }
+  /**
+   * Get {@link BudCache.type}
+   */
+  public getType() {
+    return this.type
+  }
+
   /**
    * {@link BudCache.name}
    */
   public get name(): string {
+    const fallback = join(
+      this.app.mode,
+      ...Object.values(this.app.context._ ?? {}),
+    )
     return (
       this.app.hooks.filter(
         `build.cache.name`,
-        this.app.hooks.filter(
-          `build.name`,
-          join(this.app.mode, ...Object.values(this.app.context._ ?? {})),
-        ),
-      ) ?? join(this.app.mode, ...Object.values(this.app.context._ ?? {}))
+        this.app.hooks.filter(`build.name`, fallback),
+      ) ?? fallback
     )
   }
+
   public set name(name: string) {
     this.app.hooks.on(`build.cache.name`, name)
   }
@@ -125,31 +180,70 @@ export default class Cache extends Service implements BudCache {
     this.enabled = bud.context.cache !== false
     this.version = bud.context.bud.version
   }
+  /**
+   * Set {@link BudCache.allowCollectingMemory}
+   */
+  public setAllowCollectingMemory(
+    value: Callback<FileCacheOptions[`allowCollectingMemory`]>,
+  ): this {
+    this.allowCollectingMemory = value
+    return this
+  }
 
   /**
-   * {@link BudCache.type}
+   * Set {@link BudCache.buildDependencies}
    */
-  public get type(): 'filesystem' | 'memory' {
-    return (
-      this.app.hooks.filter(
-        `build.cache.type`,
-        isString(this.app.context.cache)
-          ? this.app.context.cache
-          : `filesystem`,
-      ) ?? `filesystem`
-    )
+  public setBuildDependencies(
+    dependencies:
+      | ((
+          records?: Record<string, Array<string>>,
+        ) => Record<string, Array<string>>)
+      | Record<string, Array<string>>,
+  ) {
+    this.buildDependencies = dependencies
+    return this
   }
-  public set type(type: 'filesystem' | 'memory') {
+
+  /**
+   * Set {@link BudCache.cacheDirectory}
+   */
+  public setCacheDirectory(
+    directory: Callback<FileCacheOptions[`cacheDirectory`]>,
+  ) {
+    this.cacheDirectory = directory
+    return this
+  }
+
+  /**
+   * Set {@link BudCache.type}
+   */
+  public setType(type: Callback<FileCacheOptions[`type`]>) {
+    this.type = type
+    return this
+  }
+
+  public set type(type: Callback<FileCacheOptions[`type`]>) {
     this.app.hooks.on(`build.cache.type`, type)
   }
 
   /**
-   * {@link BudCache.version}
+   * {@link BudCache.type}
    */
-  public get version(): string | undefined {
-    return this.app.hooks.filter(`build.cache.version`, undefined)
+  public get type(): 'filesystem' | 'memory' {
+    const fallback = isString(this.app.context.cache)
+      ? this.app.context.cache
+      : `filesystem`
+
+    return this.app.hooks.filter(`build.cache.type`) ?? fallback
   }
+
   public set version(version: string) {
     this.app.hooks.on(`build.cache.version`, version)
   }
+  /**
+   * {@link BudCache.version}
+   */
+  public get version(): string | undefined {
+    return this.app.hooks.filter(`build.cache.version`, undefined)
+  }
 }