@mouryaamit/nx-polystack 1.0.3 → 1.1.1

package/dist/src/generators/migrate/generator.js

@@ -179,9 +179,15 @@ async function migrateBatch(tree, schema) {
     if (schema.rewriteImports !== undefined)
         cli.rewriteImports = schema.rewriteImports;
     const done = [];
-    for (const entry of entries) {
+    for (const [i, entry] of entries.entries()) {
+        // Imports may resolve into what earlier entries copied; the last entry also fixes earlier
+        // entries' imports into what later entries copied (NX-62).
+        const batchHooks = {
+            otherMoves: done.flatMap((d) => d.moves),
+            earlier: i === entries.length - 1 ? done : undefined,
+        };
         try {
-            const outcome = await migrateOne(tree, (0, batch_1.mergeEntryOptions)(entry, defaults, cli));
+            const outcome = await migrateOne(tree, (0, batch_1.mergeEntryOptions)(entry, defaults, cli), batchHooks);
             if (outcome)
                 done.push(outcome);
         }
@@ -213,8 +219,63 @@ async function migrateBatch(tree, schema) {
         }
     };
 }
+/**
+ * The last `--config` entry: imports of earlier entries that pointed outside the projects they
+ * brought in are resolved again with every entry's moves, in the last entry's tree (so its
+ * rollback undoes them). Only those imports are touched; earlier reports are written again.
+ */
+function resolveEarlierImports(tree, earlier, ownMoves) {
+    const all = [...earlier.flatMap((e) => e.moves), ...ownMoves];
+    const out = [];
+    for (const e of earlier) {
+        const imports = e.data.imports;
+        if (!imports)
+            continue;
+        const open = imports.unresolved.filter((u) => rewrite_1.LATER_RESOLVABLE.has(u.why));
+        if (open.length === 0)
+            continue;
+        const r = (0, rewrite_1.rewriteImports)(tree, {
+            sourceDir: e.sourceDir,
+            moves: e.moves,
+            otherMoves: all.filter((m) => !e.moves.includes(m)),
+            only: new Set(open.map((u) => `${u.file}\0${u.spec}`)),
+        });
+        // The second look replaces the open entries: ones it does not list again now resolve
+        // (rewritten, or already right); ones it lists again carry its reason.
+        const looked = new Set(open.map((u) => `${u.file}\0${u.spec}`));
+        const before = JSON.stringify(imports.unresolved);
+        imports.unresolved = [
+            ...imports.unresolved.filter((u) => !looked.has(`${u.file}\0${u.spec}`)),
+            ...r.unresolved,
+        ];
+        if (r.rewritten.length === 0 && JSON.stringify(imports.unresolved) === before)
+            continue;
+        imports.rewritten.push(...r.rewritten);
+        imports.deepImports.push(...r.deepImports);
+        imports.missingPackages = [
+            ...new Set([...imports.missingPackages, ...r.missingPackages]),
+        ].sort();
+        e.rerender(tree);
+        out.push(...r.rewritten);
+    }
+    return out;
+}
+/** Runs the batch follow-up for the last entry and records it in its report data. */
+function applyBatchHooks(tree, data, hooks) {
+    if (!hooks?.earlier || hooks.earlier.length === 0)
+        return;
+    const resolved = resolveEarlierImports(tree, hooks.earlier, data.moves ?? []);
+    if (resolved.length === 0)
+        return;
+    if (data.imports)
+        data.imports.resolvedEarlier = resolved;
+    else {
+        data.notes.push(`Rewrote ${resolved.length} import(s) in earlier \`--config\` entries that point into the ` +
+            `projects this entry brought in: ${[...new Set(resolved.map((r) => r.file))].join(', ')}.`);
+    }
+}
 /** One migration (the --source path). Undefined for --detect. */
-async function migrateOne(tree, schema) {
+async function migrateOne(tree, schema, batch) {
     const sourceDir = resolveSource(tree, schema.source);
     const maxFiles = schema.maxFiles ?? copy_1.DEFAULT_MAX_FILES;
     if (!Number.isInteger(maxFiles) || maxFiles < 1) {
@@ -240,7 +301,7 @@ async function migrateOne(tree, schema) {
         if (dir !== undefined && !schema.dirInherited) {
             throw new Error(`migrate: --dir is for single-app sources; the ${adapter.id} adapter keeps the source layout.`);
         }
-        return migrateWorkspace(tree, schema, adapter, detection, forced, sourceDir, maxFiles, projects);
+        return migrateWorkspace(tree, schema, adapter, detection, forced, sourceDir, maxFiles, projects, batch);
     }
     if ((projects && projects.length > 0) || schema.noDeps || schema.prefix) {
         throw new Error(`migrate: --projects, --no-deps and --prefix are for Nx workspace sources; the ` +
@@ -277,14 +338,19 @@ async function migrateOne(tree, schema) {
     adapter.preflight?.(rec.tree, ctx);
     const data = adapter.migrate(rec.tree, ctx);
     if (ctx.rewriteImports) {
-        data.imports = (0, rewrite_1.rewriteImports)(rec.tree, { sourceDir, moves: data.moves ?? [] });
+        data.imports = (0, rewrite_1.rewriteImports)(rec.tree, {
+            sourceDir,
+            moves: data.moves ?? [],
+            otherMoves: batch?.otherMoves,
+        });
     }
+    applyBatchHooks(rec.tree, data, batch);
     if (dir && knipMissesNestedApps(tree)) {
         data.notes.push(`knip.json lists \`apps/*/src/main.ts\` as an entry, which does not reach ${projectRoot}; ` +
             'change it to `apps/**/src/main.ts` so `npm run stale-code` does not report the app as unused.');
     }
     const reportPath = `docs/migrations/${name}.md`;
-    rec.tree.write(reportPath, (0, report_1.renderReport)({
+    const reportArgs = {
         name,
         adapterId: adapter.id,
         adapterLabel: adapter.label,
@@ -294,15 +360,24 @@ async function migrateOne(tree, schema) {
         minConfidence: schema.minConfidence,
         source: schema.sourceLabel ?? schema.source,
         data,
-    }));
+    };
+    const rerender = (t) => t.write(reportPath, (0, report_1.renderReport)(reportArgs));
+    rerender(rec.tree);
     // Copied source files are not run through Prettier: they stay as the source had them.
     (0, llm_block_1.refreshLlmBlocks)(rec.tree);
     recordManifest(tree, rec.originals, name, adapter.id, schema.sourceLabel ?? schema.source, data);
     devkit_1.logger.info(`Migrated ${sourceDir} into ${projectRoot} with the ${adapter.id} adapter. ` +
         `Report: ${reportPath}. Undo with: pstack migrate --rollback=${name}`);
-    return { name, installTask: data.installTask };
+    return {
+        name,
+        installTask: data.installTask,
+        moves: data.moves ?? [],
+        sourceDir,
+        data,
+        rerender,
+    };
 }
-async function migrateWorkspace(tree, schema, adapter, detection, forced, sourceDir, maxFiles, projects) {
+async function migrateWorkspace(tree, schema, adapter, detection, forced, sourceDir, maxFiles, projects, batch) {
     const suggested = adapter.defaultName(sourceDir);
     const name = schema.name ?? (suggested ? (0, names_1.kebabName)(suggested) : '');
     if (!name || !names_3.NAME_RE.test(name)) {
@@ -326,9 +401,14 @@ async function migrateWorkspace(tree, schema, adapter, detection, forced, source
     adapter.preflight(rec.tree, ctx);
     const data = adapter.migrate(rec.tree, ctx);
     if (ctx.rewriteImports) {
-        data.imports = (0, rewrite_1.rewriteImports)(rec.tree, { sourceDir, moves: data.moves ?? [] });
+        data.imports = (0, rewrite_1.rewriteImports)(rec.tree, {
+            sourceDir,
+            moves: data.moves ?? [],
+            otherMoves: batch?.otherMoves,
+        });
     }
-    rec.tree.write(reportPath, (0, report_1.renderReport)({
+    applyBatchHooks(rec.tree, data, batch);
+    const reportArgs = {
         name,
         adapterId: adapter.id,
         adapterLabel: adapter.label,
@@ -337,11 +417,20 @@ async function migrateWorkspace(tree, schema, adapter, detection, forced, source
         minConfidence: schema.minConfidence,
         source: schema.sourceLabel ?? schema.source,
         data,
-    }));
+    };
+    const rerender = (t) => t.write(reportPath, (0, report_1.renderReport)(reportArgs));
+    rerender(rec.tree);
     (0, llm_block_1.refreshLlmBlocks)(rec.tree);
     recordManifest(tree, rec.originals, name, adapter.id, schema.sourceLabel ?? schema.source, data);
     devkit_1.logger.info(`Imported ${data.projects.length} project(s) from ${sourceDir} with the ${adapter.id} ` +
         `adapter. Report: ${reportPath}. Undo with: pstack migrate --rollback=${name}`);
-    return { name, installTask: data.installTask };
+    return {
+        name,
+        installTask: data.installTask,
+        moves: data.moves ?? [],
+        sourceDir,
+        data,
+        rerender,
+    };
 }
 //# sourceMappingURL=generator.js.map

package/dist/src/generators/migrate/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/migrate/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/migrate/generator.ts"],"names":[],"mappings":"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"}

package/dist/src/generators/migrate/imports/rewrite.d.ts

@@ -14,7 +14,11 @@ export interface ImportMove {
     /** Copied files, relative to the folder. */
     files: string[];
 }
-export type RewriteKind = 'cross-project' | 'base-url' | 'nrwl' | 'node-modules';
+export type RewriteKind = 'cross-project' | 'base-url' | 'nrwl' | 'node-modules'
+/** Angular templateUrl / styleUrl / styleUrls (NX-60). */
+ | 'resource'
+/** A bare Sass path that resolved through the source load paths (NX-61). */
+ | 'sass-load-path';
 export interface ImportRewrite {
     /** File in the workspace tree. */
     file: string;
@@ -37,10 +41,22 @@ export interface ImportRewriteResult {
     }[];
     /** `@nx/*` packages the rewritten imports use that the workspace package.json does not declare. */
     missingPackages: string[];
+    /**
+     * `--config` batches (NX-62): imports of earlier entries that pointed into a project this entry
+     * brought in, rewritten after this entry's copy (they are part of this entry's rollback).
+     */
+    resolvedEarlier?: ImportRewrite[];
 }
+/** Reasons an import is listed that a later `--config` entry's copy can make resolvable (NX-62). */
+export declare const LATER_RESOLVABLE: Set<string>;
 export interface RewriteOptions {
     /** Absolute source repo root. */
     sourceDir: string;
+    /** The folders this run copied: only their files are rewritten. */
     moves: ImportMove[];
+    /** Folders other `--config` entries copied: imports may resolve into them (NX-62). */
+    otherMoves?: ImportMove[];
+    /** Only these imports (`file\0spec`) are looked at; everything else is left alone (NX-62). */
+    only?: Set<string>;
 }
 export declare function rewriteImports(tree: Tree, opts: RewriteOptions): ImportRewriteResult;

package/dist/src/generators/migrate/imports/rewrite.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rewriteImports = void 0;
+exports.rewriteImports = exports.LATER_RESOLVABLE = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
 const source_1 = require("../source");
+/** Reasons an import is listed that a later `--config` entry's copy can make resolvable (NX-62). */
+exports.LATER_RESOLVABLE = new Set([
+    'points outside the imported projects',
+    'resolves through the source `baseUrl` to a file that was not imported',
+    'resolves through the source Sass load paths to a file that was not imported',
+]);
 const CODE = /\.(ts|tsx|mts|cts|js|jsx|mjs|cjs)$/;
 const SCSS = /\.scss$/;
 /**
@@ -15,6 +21,11 @@ const CODE_IMPORT = /(\bfrom\s*|\bimport\s*\(\s*|\bimport\s+|\brequire(?:\.resol
 /** Sass module rules; each quoted path in them is a candidate. */
 const SCSS_RULE = /@(?:use|import|forward)\s+[^;{}]+/g;
 const QUOTED = /(['"])([^'"\n]+)\1/g;
+/** Angular component resources: templateUrl / styleUrl values and styleUrls entries (NX-60). */
+const RESOURCE_URL = /(\b(?:templateUrl|styleUrl)\s*:\s*)(['"`])([^'"`\n]+)\2/g;
+const RESOURCE_LIST = /(\bstyleUrls\s*:\s*\[)([^\]]*)\]/g;
+/** Sass paths that are never files under a load path: built-ins, URLs, plain CSS imports. */
+const SASS_NOT_BARE = /^(?:~|\/|sass:|[a-z][a-z0-9+.-]*:|\/\/)|\.css$/i;
 /** @nrwl/* packages without an @nx/* successor. */
 const NRWL_KEEP = new Set(['@nrwl/nx-cloud', '@nrwl/tao', '@nrwl/cli']);
 /** @nrwl/* packages whose @nx/* successor has another name. */
@@ -67,7 +78,7 @@ function sassCandidates(p) {
         `${p}/index.scss`,
     ];
 }
-const candidates = (p, sass) => (sass ? sassCandidates(p) : codeCandidates(p));
+const candidates = (p, mode) => mode === 'sass' ? sassCandidates(p) : mode === 'resource' ? [p] : codeCandidates(p);
 function rewriteImports(tree, opts) {
     const result = {
         rewritten: [],
@@ -78,10 +89,13 @@ function rewriteImports(tree, opts) {
     const seen = new Set();
     const deepSeen = new Set();
     const sourceRoot = toPosix(path.resolve(opts.sourceDir));
-    const moves = opts.moves
+    const norm = (list) => list
         .map((m) => ({ ...m, from: toPosix(path.resolve(m.from)) }))
         .sort((a, b) => b.from.length - a.from.length);
-    const moveOf = (abs) => moves.find((m) => abs === m.from || abs.startsWith(`${m.from}/`));
+    const moves = norm(opts.moves);
+    const known = norm([...opts.moves, ...(opts.otherMoves ?? [])]);
+    const only = opts.only;
+    const moveOf = (abs) => known.find((m) => abs === m.from || abs.startsWith(`${m.from}/`));
     const mapPath = (abs) => {
         const m = moveOf(abs);
         if (!m)
@@ -93,7 +107,7 @@ function rewriteImports(tree, opts) {
     const aliases = workspaceAliases(tree, wsBaseUrl);
     const baseUrls = baseUrlReader(sourceRoot);
     /** The tree path resolves to a file (copied, or already in the workspace). */
-    const inTree = (p, sass) => candidates(p, sass).some((c) => tree.exists(c) && tree.isFile(c));
+    const inTree = (p, mode) => candidates(p, mode).some((c) => tree.exists(c) && tree.isFile(c));
     const statCache = new Map();
     const isSourceFileAbs = (abs) => {
         let hit = statCache.get(abs);
@@ -105,6 +119,18 @@ function rewriteImports(tree, opts) {
     };
     const dependencyNames = sourceDependencyNames(sourceRoot);
     const nxPackages = new Set();
+    const sourceLoadPaths = sourceSassLoadPaths(sourceRoot, moves);
+    const workspaceLoadPaths = workspaceSassLoadPaths(tree);
+    // Sass load paths in the moved projects that do not exist in the workspace (NX-61).
+    for (const move of only ? [] : moves) {
+        const pj = `${move.to}/project.json`;
+        for (const p of projectLoadPaths(tree, pj)) {
+            if (p === 'node_modules' || p.startsWith('node_modules/'))
+                continue;
+            if (!tree.exists(p))
+                leave(pj, p, 'Sass load path that does not exist in the workspace');
+        }
+    }
     for (const move of moves) {
         for (const rel of move.files) {
             const code = CODE.test(rel) && !rel.endsWith('.d.ts');
@@ -126,7 +152,10 @@ function rewriteImports(tree, opts) {
             };
             const viaAlias = (target) => aliases.get(target) ?? aliases.get(target.replace(/\.(ts|tsx|js|mjs|cjs)$/, ''));
             /** New specifier for `spec`, or undefined to keep it. */
-            const rewrite = (spec, sass) => {
+            const rewrite = (spec, mode) => {
+                if (only && !only.has(`${file}\0${spec}`))
+                    return undefined;
+                const sass = mode !== 'code';
                 if (!sass) {
                     const nrwl = /^@nrwl\/([^/]+)(.*)$/.exec(spec);
                     if (nrwl) {
@@ -156,17 +185,17 @@ function rewriteImports(tree, opts) {
                     // Inside the same copied folder the path is unchanged. Only a file that exists in the
                     // source but was not copied (a project that was not selected, a skipped folder) is a
                     // problem; text that resolves nowhere (a comment, a generated file) is left alone.
-                    if (moveOf(abs) === move) {
-                        const copied = inTree(mapPath(abs), sass);
-                        if (!copied && candidates(abs, sass).some((c) => isSourceFileAbs(c))) {
+                    if (moveOf(abs)?.to === move.to) {
+                        const copied = inTree(mapPath(abs), mode);
+                        if (!copied && candidates(abs, mode).some((c) => isSourceFileAbs(c))) {
                             leave(file, spec, 'points to a file that was not copied');
                         }
                         return undefined;
                     }
                     const target = mapPath(abs);
-                    if (target === undefined || !inTree(target, sass)) {
+                    if (target === undefined || !inTree(target, mode)) {
                         // Still resolves in the workspace (an Nx root file such as jest.preset.js): keep it.
-                        if (inTree(asIs, sass))
+                        if (inTree(asIs, mode))
                             return undefined;
                         leave(file, spec, target === undefined
                             ? 'points outside the imported projects'
@@ -183,7 +212,7 @@ function rewriteImports(tree, opts) {
                         deepSeen.add(`${file}\0${kept}`);
                         result.deepImports.push({ file, spec: kept });
                     }
-                    return record(file, 'cross-project', spec, kept);
+                    return record(file, mode === 'resource' ? 'resource' : 'cross-project', spec, kept);
                 }
                 if (sass || spec.startsWith('~'))
                     return undefined;
@@ -204,30 +233,94 @@ function rewriteImports(tree, opts) {
                 if (!local)
                     return undefined;
                 const target = mapPath(abs);
-                if (target === undefined || !inTree(target, false)) {
+                if (target === undefined || !inTree(target, 'code')) {
                     leave(file, spec, 'resolves through the source `baseUrl` to a file that was not imported');
                     return undefined;
                 }
                 if (wsBaseUrl !== undefined && path.posix.normalize(`${wsBaseUrl}/${spec}`) === target) {
                     return undefined; // still resolves through the workspace baseUrl
                 }
-                const alias = moveOf(abs) === move ? undefined : viaAlias(target);
+                const alias = moveOf(abs)?.to === move.to ? undefined : viaAlias(target);
                 return record(file, 'base-url', spec, alias ?? relativeTo(target));
             };
+            /**
+             * A bare Sass path, resolved like Sass: from the stylesheet's folder, then through the
+             * source load paths (NX-61). Kept when it still resolves to the same file in the workspace.
+             */
+            const rewriteBare = (spec) => {
+                if (only && !only.has(`${file}\0${spec}`))
+                    return undefined;
+                const exists = (abs) => sassCandidates(abs).some((c) => isSourceFileAbs(c));
+                const own = path.posix.normalize(`${sourceDirOfFile}/${spec}`);
+                let abs;
+                let viaLoadPath = false;
+                if (exists(own))
+                    abs = own;
+                else {
+                    for (const dir of sourceLoadPaths(sourceFile)) {
+                        const candidate = path.posix.normalize(`${dir}/${spec}`);
+                        if (exists(candidate)) {
+                            abs = candidate;
+                            viaLoadPath = true;
+                            break;
+                        }
+                    }
+                }
+                if (abs === undefined)
+                    return undefined;
+                // The source's node_modules is the workspace's (a common `includePaths: ["node_modules"]`).
+                if (abs.startsWith(`${sourceRoot}/node_modules/`))
+                    return undefined;
+                if (!viaLoadPath && moveOf(abs)?.to === move.to)
+                    return undefined;
+                const target = mapPath(abs);
+                if (target === undefined || !inTree(target, 'sass')) {
+                    leave(file, spec, viaLoadPath
+                        ? 'resolves through the source Sass load paths to a file that was not imported'
+                        : 'points to a file that was not copied');
+                    return undefined;
+                }
+                const loadPaths = workspaceLoadPaths(treeDirOfFile);
+                // Sass takes the first folder where the path exists.
+                const first = [treeDirOfFile, ...loadPaths]
+                    .map((dir) => path.posix.normalize(`${dir}/${spec}`))
+                    .find((there) => inTree(there, 'sass'));
+                if (first === target)
+                    return undefined;
+                return record(file, 'sass-load-path', spec, relativeTo(target));
+            };
             let next = text;
             if (code) {
                 next = next.replace(CODE_IMPORT, (whole, lead, q, spec) => {
-                    const r = rewrite(spec, false);
+                    const r = rewrite(spec, 'code');
                     return r === undefined ? whole : `${lead}${q}${r}${q}`;
                 });
-            }
-            else {
-                next = next.replace(SCSS_RULE, (rule) => rule.replace(QUOTED, (whole, q, spec) => {
+                const resource = (whole, q, spec) => {
                     if (!isRelative(spec))
                         return whole;
-                    const r = rewrite(spec, true);
+                    const r = rewrite(spec, 'resource');
                     return r === undefined ? whole : `${q}${r}${q}`;
-                }));
+                };
+                next = next.replace(RESOURCE_URL, (whole, lead, q, spec) => `${lead}${resource(`${q}${spec}${q}`, q, spec)}`);
+                next = next.replace(RESOURCE_LIST, (whole, lead, list) => `${lead}${list.replace(QUOTED, (w, q, spec) => resource(w, q, spec))}]`);
+            }
+            else {
+                next = next.replace(SCSS_RULE, (whole) => {
+                    // Only the URL list: `with (...)` values, `as`, `show` and `hide` are not paths.
+                    const end = whole.search(/\s(?:with|as|show|hide)\b/);
+                    const rule = end < 0 ? whole : whole.slice(0, end);
+                    const rest = end < 0 ? '' : whole.slice(end);
+                    return `${rule.replace(QUOTED, (whole, q, spec) => {
+                        if (isRelative(spec)) {
+                            const r = rewrite(spec, 'sass');
+                            return r === undefined ? whole : `${q}${r}${q}`;
+                        }
+                        if (SASS_NOT_BARE.test(spec) || /url\(\s*$/.test(rule.slice(0, rule.indexOf(whole))))
+                            return whole;
+                        const r = rewriteBare(spec);
+                        return r === undefined ? whole : `${q}${r}${q}`;
+                    })}${rest}`;
+                });
             }
             if (next !== text)
                 tree.write(file, next);
@@ -379,4 +472,89 @@ function baseUrlReader(sourceRoot) {
     };
     return lookup;
 }
+/** stylePreprocessorOptions.includePaths of every target (options and configurations). */
+function includePathsOf(targets) {
+    const out = [];
+    if (!targets || typeof targets !== 'object')
+        return out;
+    for (const target of Object.values(targets)) {
+        if (!target || typeof target !== 'object')
+            continue;
+        const t = target;
+        const blocks = [
+            t['options'],
+            ...Object.values(t['configurations'] ?? {}),
+        ];
+        for (const block of blocks) {
+            const spo = block?.['stylePreprocessorOptions'];
+            const list = spo?.['includePaths'];
+            if (Array.isArray(list))
+                for (const p of list)
+                    if (typeof p === 'string')
+                        out.push(p);
+        }
+    }
+    return out;
+}
+/**
+ * Source Sass load paths per stylesheet (NX-61): the includePaths of the source project that owns
+ * the file — the angular.json project with the longest root containing it, or the project.json at
+ * a copied folder — resolved against the source root. Sass only uses the owning project's paths.
+ */
+function sourceSassLoadPaths(sourceRoot, moves) {
+    const projects = [];
+    const abs = (p) => path.posix.normalize(`${sourceRoot}/${p}`).replace(/\/$/, '');
+    const angular = (0, source_1.readSourceJson)(sourceRoot, 'angular.json');
+    for (const project of Object.values(angular?.projects ?? {})) {
+        const p = project;
+        const root = typeof p?.['root'] === 'string' ? p['root'] : '';
+        projects.push({
+            root: root ? abs(root) : sourceRoot,
+            paths: includePathsOf(p?.['architect'] ?? p?.['targets']).map(abs),
+        });
+    }
+    for (const m of moves) {
+        const pj = (0, source_1.readSourceJson)(m.from, 'project.json');
+        if (pj)
+            projects.push({ root: m.from, paths: includePathsOf(pj.targets).map(abs) });
+    }
+    projects.sort((a, b) => b.root.length - a.root.length);
+    return (absFile) => {
+        const owner = projects.find((p) => absFile.startsWith(`${p.root}/`));
+        return owner ? [...new Set(owner.paths)] : [];
+    };
+}
+/** includePaths of one workspace project.json (workspace-relative, normalised). */
+function projectLoadPaths(tree, projectJson) {
+    if (!tree.exists(projectJson))
+        return [];
+    try {
+        const json = JSON.parse(tree.read(projectJson, 'utf8') ?? '{}');
+        return [
+            ...new Set(includePathsOf(json.targets).map((p) => path.posix.normalize(p).replace(/\/$/, ''))),
+        ];
+    }
+    catch {
+        return [];
+    }
+}
+/** For a workspace folder: the Sass load paths of the project that owns it (nearest project.json). */
+function workspaceSassLoadPaths(tree) {
+    const cache = new Map();
+    const lookup = (dir) => {
+        const hit = cache.get(dir);
+        if (hit)
+            return hit;
+        let out;
+        if (tree.exists(`${dir}/project.json`))
+            out = projectLoadPaths(tree, `${dir}/project.json`);
+        else if (dir === '.' || dir === '' || !dir.includes('/'))
+            out = [];
+        else
+            out = lookup(path.posix.dirname(dir));
+        cache.set(dir, out);
+        return out;
+    };
+    return lookup;
+}
 //# sourceMappingURL=rewrite.js.map