nx-auto-cache-deps 0.0.2 → 0.0.3

package/dist/dependencies.js

@@ -14,7 +14,24 @@ const toWorkspacePath = (workspaceRoot, absolutePath) => {
     return path.split(sep).join('/');
 };
 const sortedUnique = (values) => [...new Set(values)].sort();
-export const toDependencyList = (accesses, workspaceRoot) => {
+const isWithin = (path, base) => base === '.' || path === base || path.startsWith(`${base}/`);
+/** 成果物そのもの・その中・その祖先のパス。成果物の削除や復元で状態が変わるため、入力として評価しない。 */
+const touchesOutput = (path, outputs) => outputs.some((output) => isWithin(path, output) || isWithin(output, path));
+const GLOB_CHARACTERS = /[*?[\]{}!]/;
+/**
+ * Nx の outputs（ワークスペースルートからの相対パス。glob を含みうる）を、除外に使うディレクトリまたはファイルのパスにする。
+ * glob はその手前のディレクトリまでに広げる。否定 (`!`) は除外を狭めるだけなので使わない。
+ */
+export const toOutputPaths = (outputs) => sortedUnique(outputs
+    .filter((output) => !output.startsWith('!'))
+    .map((output) => {
+    const segments = output.split('/');
+    const index = segments.findIndex((segment) => GLOB_CHARACTERS.test(segment));
+    return (index === -1 ? segments : segments.slice(0, index)).join('/');
+})
+    // 先頭から glob の outputs はワークスペース全体を除外してしまうため使わない
+    .filter((output) => output !== ''));
+export const toDependencyList = (accesses, workspaceRoot, outputs) => {
     const inWorkspace = accesses.flatMap((access) => {
         const path = toWorkspacePath(workspaceRoot, access.path);
         return path === undefined ? [] : [{ kind: access.kind, path }];
@@ -22,13 +39,23 @@ export const toDependencyList = (accesses, workspaceRoot) => {
     // 自分で書いたパスを入力にすると、成果物の更新だけで毎回ミスするため除く
     const written = new Set(inWorkspace.filter((a) => a.kind === 'write').map((a) => a.path));
     const observed = (kind) => sortedUnique(inWorkspace.filter((a) => a.kind === kind && !written.has(a.path)).map((a) => a.path));
-    return { version: 1, paths: observed('read'), directories: observed('readDir') };
+    return {
+        version: 2,
+        paths: observed('read').filter((path) => !touchesOutput(path, outputs)),
+        // 成果物の祖先の列挙は残し、評価時に成果物へ通じるエントリだけを無視する
+        directories: observed('readDir').filter((path) => !outputs.some((output) => isWithin(path, output))),
+        outputs: sortedUnique(outputs),
+    };
+};
+export const mergeDependencyLists = (a, b) => {
+    const outputs = sortedUnique([...a.outputs, ...b.outputs]);
+    return {
+        version: 2,
+        paths: sortedUnique([...a.paths, ...b.paths]).filter((path) => !touchesOutput(path, outputs)),
+        directories: sortedUnique([...a.directories, ...b.directories]).filter((path) => !outputs.some((output) => isWithin(path, output))),
+        outputs,
+    };
 };
-export const mergeDependencyLists = (a, b) => ({
-    version: 1,
-    paths: sortedUnique([...a.paths, ...b.paths]),
-    directories: sortedUnique([...a.directories, ...b.directories]),
-});
 const isMissingError = (error) => error instanceof Error && 'code' in error && (error.code === 'ENOENT' || error.code === 'ENOTDIR');
 const pathState = (absolutePath) => {
     const stats = statSync(absolutePath, { throwIfNoEntry: false });
@@ -40,9 +67,10 @@ const pathState = (absolutePath) => {
         return `file:${createHash('sha256').update(readFileSync(absolutePath)).digest('hex')}`;
     return 'other';
 };
-const directoryState = (absolutePath) => {
+const directoryState = (workspaceRoot, path, outputs) => {
     try {
-        return readdirSync(absolutePath, { withFileTypes: true })
+        return readdirSync(join(workspaceRoot, path), { withFileTypes: true })
+            .filter((entry) => !touchesOutput(path === '.' ? entry.name : `${path}/${entry.name}`, outputs))
             .map((entry) => `${entry.name}:${entry.isDirectory() ? 'd' : entry.isFile() ? 'f' : entry.isSymbolicLink() ? 'l' : 'o'}`)
             .sort()
             .join('\n');
@@ -59,6 +87,6 @@ export const fingerprint = (list, workspaceRoot) => {
     for (const path of list.paths)
         hash.update(`path\0${path}\0${pathState(join(workspaceRoot, path))}\0`);
     for (const path of list.directories)
-        hash.update(`dir\0${path}\0${directoryState(join(workspaceRoot, path))}\0`);
+        hash.update(`dir\0${path}\0${directoryState(workspaceRoot, path, list.outputs)}\0`);
     return hash.digest('hex');
 };

package/dist/executor.js

@@ -1,9 +1,9 @@
-import { cacheDir, logger } from '@nx/devkit';
+import { cacheDir, getOutputsForTargetAndConfiguration, logger } from '@nx/devkit';
 import { spawn } from 'node:child_process';
 import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { mergeDependencyLists, toDependencyList } from './dependencies.js';
+import { mergeDependencyLists, toDependencyList, toOutputPaths } from './dependencies.js';
 import { resolveTraceBinary } from './platform.js';
 import { dependencyListPath, readDependencyList, storeDirectory, taskKey, writeDependencyList } from './store.js';
 const runOriginalScript = fileURLToPath(new URL('./run-original.js', import.meta.url));
@@ -36,7 +36,11 @@ export default async function run(options, context) {
         }
         else if (code === 0) {
             const listPath = dependencyListPath(cacheDir, taskKey(project.root, targetName));
-            const observed = toDependencyList(report.accesses, context.root);
+            const node = context.projectGraph.nodes[projectName];
+            if (node === undefined)
+                throw new Error(`nx-auto-cache-deps: ${projectName} is not in the project graph`);
+            const outputs = getOutputsForTargetAndConfiguration({ project: projectName, target: targetName, ...(context.configurationName === undefined ? {} : { configuration: context.configurationName }) }, options, node);
+            const observed = toDependencyList(report.accesses, context.root, toOutputPaths(outputs));
             const stored = readDependencyList(listPath);
             writeDependencyList(listPath, stored.status === 'found' ? mergeDependencyLists(stored.list, observed) : observed);
         }

package/dist/store.js

@@ -8,11 +8,13 @@ export const dependencyListPath = (cacheDirectory, key) => join(storeDirectory(c
 const isDependencyList = (value) => typeof value === 'object' &&
     value !== null &&
     'version' in value &&
-    value.version === 1 &&
+    value.version === 2 &&
     'paths' in value &&
     Array.isArray(value.paths) &&
     'directories' in value &&
-    Array.isArray(value.directories);
+    Array.isArray(value.directories) &&
+    'outputs' in value &&
+    Array.isArray(value.outputs);
 export const readDependencyList = (path) => {
     let text;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx-auto-cache-deps",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Nx plugin that derives cache inputs from the files a task actually accessed",
   "license": "MIT",
   "type": "module",
@@ -16,7 +16,8 @@
     "dist",
     "schemas",
     "executors.json",
-    "generators.json"
+    "generators.json",
+    "THIRD_PARTY_LICENSES"
   ],
   "preferUnplugged": true,
   "scripts": {