sfdx-git-delta 7.4.0 → 7.4.2

package/lib/constant/metadataConstants.js

@@ -1,4 +1,14 @@
 'use strict';
+export const BOT_TYPE = 'Bot';
+export const BOT_VERSION_TYPE = 'BotVersion';
+export const CUSTOM_APPLICATION_SUFFIX = 'app';
+export const CUSTOM_METADATA_SUFFIX = 'md';
+export const DASHBOARD_TYPE = 'Dashboard';
+// A component named by the single segment below its type directory: every
+// content-container adapter except digitalExperience (depths below), and the
+// holder-scoped composed types, whose every file keys on that one segment.
+export const DEFAULT_CONTAINER_DEPTH = 1;
+export const DIGITAL_EXPERIENCE_ADAPTER = 'digitalExperience';
 // SDR adapters whose component is a directory owning an opaque content subtree
 // (StaticResource/ExperienceBundle/Document via mixedContent, Aura/LWC via
 // bundle, DigitalExperienceBundle via digitalExperience). When such a type is
@@ -6,18 +16,22 @@
 // metadata directories — so type resolution must stop there.
 export const CONTENT_CONTAINER_ADAPTERS = new Set([
     'bundle',
-    'digitalExperience',
+    DIGITAL_EXPERIENCE_ADAPTER,
     'mixedContent',
 ]);
-export const CUSTOM_APPLICATION_SUFFIX = 'app';
-export const CUSTOM_METADATA_SUFFIX = 'md';
 export const DIGITAL_EXPERIENCE_BUNDLE_TYPE = 'DigitalExperienceBundle';
+// SDR's canonical layout below `digitalExperiences/` is
+// `<baseType>/<spaceApiName>/<contentType>/<contentApiName>/<file>`: the
+// bundle is the first two segments, a page content folder the first four.
+export const DIGITAL_EXPERIENCE_BUNDLE_DEPTH = 2;
+export const DIGITAL_EXPERIENCE_CONTENT_DEPTH = 4;
 export const DIGITAL_EXPERIENCE_TYPE = 'DigitalExperience';
 export const EMAIL_SERVICES_FUNCTION_SUFFIX = 'xml';
 export const FIELD_DIRECTORY_NAME = 'fields';
 export const FLOW_DEFINITIONS_KEY = 'flowDefinitions';
 export const FLOW_XML_NAME = 'Flow';
 export const INFOLDER_SUFFIX = `Folder`;
+export const INFOLDER_SUFFIX_REGEX = new RegExp(`${INFOLDER_SUFFIX}$`);
 export const LABEL_DECOMPOSED_SUFFIX = 'label';
 export const MASTER_DETAIL_TAG = '<type>MasterDetail</type>';
 export const METAFILE_SUFFIX = '-meta.xml';
@@ -26,6 +40,16 @@ export const OBJECT_TRANSLATION_META_XML_SUFFIX = `objectTranslation${METAFILE_S
 export const OBJECT_TRANSLATION_TYPE = 'CustomObjectTranslation';
 export const OBJECT_TYPE = 'CustomObject';
 export const PERMISSIONSET_TYPE = 'PermissionSet';
+export const REPORT_TYPE = 'Report';
+// The Metadata API relocates these when the package lists them under a new
+// folder, so their former path must not be destroyed alongside the move.
+// Declared out of alphabetical order on purpose: the Set dereferences both
+// members at module evaluation, so filing it under F would read REPORT_TYPE
+// before its initialiser has run.
+export const FOLDER_MOVE_ON_DEPLOY_TYPES = new Set([
+    REPORT_TYPE,
+    DASHBOARD_TYPE,
+]);
 export const SHARING_RULE_TYPE = 'SharingRules';
 export const SUB_OBJECT_TYPES = [
     'BusinessProcess',
@@ -54,5 +78,6 @@ export const SUB_OBJECT_TYPES = [
 ];
 export const TRANSLATION_EXTENSION = 'translation';
 export const TRANSLATION_TYPE = 'Translations';
+export const VIRTUAL_BOT_TYPE = 'VirtualBot';
 export const WORKFLOW_TYPE = 'Workflow';
 //# sourceMappingURL=metadataConstants.js.map

package/lib/constant/metadataConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadataConstants.js","sourceRoot":"","sources":["../../src/constant/metadataConstants.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,+EAA+E;AAC/E,2EAA2E;AAC3E,8EAA8E;AAC9E,+EAA+E;AAC/E,6DAA6D;AAC7D,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC;IAChD,QAAQ;IACR,mBAAmB;IACnB,cAAc;CACf,CAAC,CAAA;AACF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,CAAA;AAC9C,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAA;AAC1C,MAAM,CAAC,MAAM,8BAA8B,GAAG,yBAAyB,CAAA;AACvE,MAAM,CAAC,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAC1D,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,CAAA;AACnD,MAAM,CAAC,MAAM,oBAAoB,GAAG,QAAQ,CAAA;AAC5C,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAA;AACrD,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAA;AACnC,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAA;AACvC,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAA;AAC9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,2BAA2B,CAAA;AAC5D,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAA;AAC1C,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,GAAG,CAAC,CAAA;AAC3D,MAAM,CAAC,MAAM,kCAAkC,GAAG,oBAAoB,eAAe,EAAE,CAAA;AACvF,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAA;AAChE,MAAM,CAAC,MAAM,WAAW,GAAG,cAAc,CAAA;AACzC,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAA;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAA;AAC/C,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,iBAAiB;IACjB,eAAe;IACf,aAAa;IACb,UAAU;IACV,OAAO;IACP,UAAU;IACV,YAAY;IACZ,qBAAqB;IACrB,kBAAkB;IAClB,kBAAkB;IAClB,eAAe;IACf,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,SAAS;IACT,eAAe;IACf,qBAAqB;IACrB,oBAAoB;IACpB,0BAA0B;IAC1B,yBAAyB;IACzB,cAAc;IACd,cAAc;IACd,cAAc;CACf,CAAA;AACD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAA;AAClD,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAA;AAC9C,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CAAA"}
+{"version":3,"file":"metadataConstants.js","sourceRoot":"","sources":["../../src/constant/metadataConstants.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,CAAA;AAC7B,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAA;AAC5C,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,CAAA;AAC9C,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAA;AAC1C,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAA;AACzC,0EAA0E;AAC1E,6EAA6E;AAC7E,2EAA2E;AAC3E,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAA;AACxC,MAAM,CAAC,MAAM,0BAA0B,GAAG,mBAAmB,CAAA;AAC7D,+EAA+E;AAC/E,2EAA2E;AAC3E,8EAA8E;AAC9E,+EAA+E;AAC/E,6DAA6D;AAC7D,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC;IAChD,QAAQ;IACR,0BAA0B;IAC1B,cAAc;CACf,CAAC,CAAA;AACF,MAAM,CAAC,MAAM,8BAA8B,GAAG,yBAAyB,CAAA;AACvE,wDAAwD;AACxD,yEAAyE;AACzE,0EAA0E;AAC1E,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,CAAA;AAChD,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,CAAA;AACjD,MAAM,CAAC,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAC1D,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,CAAA;AACnD,MAAM,CAAC,MAAM,oBAAoB,GAAG,QAAQ,CAAA;AAC5C,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAA;AACrD,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAA;AACnC,MAAM,CAAC,MAAM,eAAe,GAAG,QAAQ,CAAA;AACvC,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,GAAG,CAAC,CAAA;AACtE,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAA;AAC9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,2BAA2B,CAAA;AAC5D,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAA;AAC1C,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,GAAG,CAAC,CAAA;AAC3D,MAAM,CAAC,MAAM,kCAAkC,GAAG,oBAAoB,eAAe,EAAE,CAAA;AACvF,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAA;AAChE,MAAM,CAAC,MAAM,WAAW,GAAG,cAAc,CAAA;AACzC,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAA;AACjD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAA;AACnC,2EAA2E;AAC3E,yEAAyE;AACzE,2EAA2E;AAC3E,4EAA4E;AAC5E,kCAAkC;AAClC,MAAM,CAAC,MAAM,2BAA2B,GAAwB,IAAI,GAAG,CAAC;IACtE,WAAW;IACX,cAAc;CACf,CAAC,CAAA;AACF,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAA;AAC/C,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,iBAAiB;IACjB,eAAe;IACf,aAAa;IACb,UAAU;IACV,OAAO;IACP,UAAU;IACV,YAAY;IACZ,qBAAqB;IACrB,kBAAkB;IAClB,kBAAkB;IAClB,eAAe;IACf,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,SAAS;IACT,eAAe;IACf,qBAAqB;IACrB,oBAAoB;IACpB,0BAA0B;IAC1B,yBAAyB;IACzB,cAAc;IACd,cAAc;IACd,cAAc;CACf,CAAA;AACD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAA;AAClD,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAA;AAC9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAA;AAC5C,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CAAA"}

package/lib/main.js

@@ -1,7 +1,6 @@
 'use strict';
 import GitAdapter from './adapter/GitAdapter.js';
 import IOExecutor from './adapter/ioExecutor.js';
-import { createTreeReader, EMPTY_TREE_READER } from './adapter/treeReader.js';
 import { getDefinition } from './metadata/metadataManager.js';
 import { getPostProcessors } from './post-processor/postProcessorManager.js';
 import DiffLineInterpreter from './service/diffLineInterpreter.js';
@@ -15,6 +14,14 @@ import { parseSourceDirs } from './utils/pathspec.js';
 import RenameResolver from './utils/renameResolver.js';
 import RepoGitDiff from './utils/repoGitDiff.js';
 import { computeTreeIndexScope } from './utils/treeIndexScope.js';
+import { buildRunTreeReader } from './utils/treeReaderBuilder.js';
+const collectLines = async (lines) => {
+    const materialized = [];
+    for await (const line of lines) {
+        materialized.push(line);
+    }
+    return materialized;
+};
 export default async (configInput) => {
     // Stryker disable next-line StringLiteral -- equivalent: log content is observability only; tests assert on the returned Work, not lazy log lines
     Logger.trace('main: entry');
@@ -30,55 +37,28 @@ export default async (configInput) => {
         const configWarnings = await new ConfigValidator(config, rejections).validateConfig();
         const metadata = await getDefinition(config);
         const repoGitDiffHelper = new RepoGitDiff(config, metadata);
-        // The treeIndex scope read needs the full path set up front, so when
-        // generateDelta is on without an include override we materialize the
-        // streamed diff once. Otherwise we feed the async iterable straight
-        // into DiffLineInterpreter so handlers start firing while git is
-        // still emitting lines.
-        const needsScopeFromDiff = config.generateDelta && !config.include && !config.includeDestructive;
-        let lines;
-        if (needsScopeFromDiff) {
-            const materialized = [];
-            for await (const line of repoGitDiffHelper.getLines()) {
-                materialized.push(line);
-            }
-            lines = materialized;
-        }
-        // Stryker disable next-line BlockStatement -- equivalent: emptying the else block leaves `lines` undefined which downstream lineProcessor.process(undefined) iterates as empty; the test main.test.ts only asserts mockProcess was called with the materialized array in the if-branch fixture, and the else-body BlockStatement mutant on the assignment expression is observably equivalent because mockProcess accepts undefined under stryker's perTest path-coverage analysis
-        else {
-            lines = repoGitDiffHelper.getLines();
-        }
-        // Built here and threaded to every reader (DiffLineInterpreter,
-        // RenameResolver, IOExecutor, the post-processors) rather than cached
-        // on GitAdapter: one TreeIndex per revision, for this run only, so a
-        // reader can never see a different scope than the one this block just
-        // built under — the lesson from the shared, scope-keyed cache this
-        // replaces (see design history) is that a cache keyed by a value each
-        // reader recomputes is an implicit contract that will drift.
-        let trees = EMPTY_TREE_READER;
-        if (config.generateDelta) {
-            const gitAdapter = GitAdapter.getInstance(config);
-            let scopePaths = config.source;
-            if (needsScopeFromDiff) {
-                scopePaths = [
-                    ...computeTreeIndexScope(lines, metadata),
-                ];
-            }
-            if (scopePaths.length > 0) {
-                const [toIndex, fromIndex] = await Promise.all([
-                    gitAdapter.buildTreeIndex(config.to, scopePaths),
-                    gitAdapter.buildTreeIndex(config.from, scopePaths),
-                ]);
-                const entries = new Map();
-                // Stryker disable ConditionalExpression -- equivalent: forcing either guard to always run stores `undefined` at that revision key instead of skipping it, but the only reader is createTreeReader's `entries.get(revision) ?? NO_INDEX`, and Map.get answers `undefined` for an absent key and an explicitly-undefined value alike. `entries` is local to this block and exposes no has/size/enumeration, so no observer can tell the two apart
-                if (toIndex)
-                    entries.set(config.to, toIndex);
-                if (fromIndex)
-                    entries.set(config.from, fromIndex);
-                // Stryker restore ConditionalExpression
-                trees = createTreeReader(entries);
-            }
-        }
+        // The tree-index scope is read off the diff whenever no include file
+        // overrides it, so the stream is materialised once: computeTreeIndexScope
+        // and lineProcessor.process walk the same lines. With an include file the
+        // scope is config.source and the async iterable feeds straight into
+        // DiffLineInterpreter, so handlers fire while git is still emitting.
+        const needsScopeFromDiff = !config.include && !config.includeDestructive;
+        const materialized = needsScopeFromDiff
+            ? await collectLines(repoGitDiffHelper.getLines())
+            : undefined;
+        const lines = materialized ?? repoGitDiffHelper.getLines();
+        // The manifests must not depend on --generate-delta: every index-backed
+        // read that decides package.xml vs destructiveChanges.xml (container
+        // liveness, decomposed-holder liveness, the include listing) runs in
+        // every mode, so the run's two indexes are built in every mode. The flag
+        // gates only what is copied. Built here and threaded to every reader
+        // (DiffLineInterpreter, RenameResolver, IOExecutor, the post-processors)
+        // through RunContext rather than cached on GitAdapter, so no reader can
+        // see a different scope than the one this run built under.
+        const scopePaths = materialized
+            ? [...computeTreeIndexScope(materialized, metadata)]
+            : config.source;
+        const { trees, unindexed } = await buildRunTreeReader(GitAdapter.getInstance(config), config, scopePaths);
         const ctx = { config, metadata, trees };
         const lineProcessor = new DiffLineInterpreter(ctx);
         const postProcessors = getPostProcessors(ctx);
@@ -102,20 +82,41 @@ export default async (configInput) => {
         // changes at all — a non-empty manifest (e.g. members sourced by
         // --include-file independent of the diff) means the scope did its
         // job, so naming it as unmatched would be misleading.
+        const messages = new MessageService();
+        // tokens is a thunk, not a precomputed array: sanitizeForMessage must
+        // only run when the warning actually fires, matching the ternaries this
+        // replaces (some callers never set config.to/from, so an unconditional
+        // sanitizeForMessage(requestedTo) would crash on undefined).
+        const warnIf = (condition, key, tokens) => condition ? [new Error(messages.getMessage(key, tokens()))] : [];
         const unmatchedScopes = repoGitDiffHelper.getUnmatchedSourceScopes();
-        const sourceScopeWarnings = unmatchedScopes.length > 0 && changes.isEmpty()
-            ? [
-                new Error(new MessageService().getMessage('warning.SourceDirMatchedNothing', [
-                    // Sanitize each scope before joining: the length cap in
-                    // sanitizeForMessage must apply per scope, not to the
-                    // joined aggregate, or one long scope name silently
-                    // elides every scope listed after it.
-                    unmatchedScopes.map(sanitizeForMessage).join(', '),
-                    sanitizeForMessage(requestedFrom),
-                    sanitizeForMessage(requestedTo),
-                ])),
-            ]
-            : [];
+        const sourceScopeWarnings = warnIf(unmatchedScopes.length > 0 && changes.isEmpty(), 'warning.SourceDirMatchedNothing', () => [
+            // Sanitize each scope before joining: the length cap in
+            // sanitizeForMessage must apply per scope, not to the
+            // joined aggregate, or one long scope name silently
+            // elides every scope listed after it.
+            unmatchedScopes.map(sanitizeForMessage).join(', '),
+            sanitizeForMessage(requestedFrom),
+            sanitizeForMessage(requestedTo),
+        ]);
+        // Also final by this point. When the `to` listing could not be read,
+        // components moved into an ignored directory were not recognised as
+        // moves, so their deletions are reported destructively. That is the
+        // safe direction, but it is a degraded answer and must not be silent.
+        const probeFailure = repoGitDiffHelper.getHeldAdditionProbeFailure();
+        const ignoredMoveWarnings = warnIf(!!probeFailure, 'warning.IgnoredMoveCheckSkipped', 
+        // Non-null: this thunk only runs when warnIf's condition (!!probeFailure)
+        // is true, but the closure sits outside TS's narrowing of that check.
+        () => [
+            sanitizeForMessage(requestedTo),
+            probeFailure.candidateCount.toString(),
+        ]);
+        // Known as soon as the tree reader is built, but raised here with the
+        // rest of the warnings for a single review point. Only `to` is
+        // warn-worthy: it is the revision every liveness read (pathExists,
+        // readDirs) resolves through, so its degrade is what lets a live
+        // container land in destructiveChanges.xml. `from` only feeds deep-path
+        // member-name resolution, a narrower and already-attributed effect.
+        const treeIndexWarnings = warnIf(unindexed.includes(config.to), 'warning.TreeIndexUnavailable', () => [sanitizeForMessage(requestedTo)]);
         const work = {
             config,
             changes,
@@ -124,6 +125,8 @@ export default async (configInput) => {
                 ...assemblyWarnings,
                 ...processorWarnings,
                 ...sourceScopeWarnings,
+                ...ignoredMoveWarnings,
+                ...treeIndexWarnings,
             ],
         };
         // Stryker disable next-line StringLiteral -- equivalent: log content is observability only

package/lib/main.js.map

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

package/lib/metadata/MetadataRepositoryImpl.d.ts

@@ -6,21 +6,33 @@ export declare class MetadataRepositoryImpl implements MetadataRepository {
     protected readonly metadataPerDir: Map<string, Metadata>;
     protected readonly metadataPerXmlName: Map<string, Metadata>;
     private readonly pathCache;
+    private readonly unsafeExtensions;
     constructor(metadatas: Metadata[]);
     protected addSuffix(metadata: Metadata): void;
+    private registerSuffix;
     protected addSharedFolderSuffix(metadata: Metadata): void;
     protected addFolder(metadata: Metadata): void;
     protected addXmlName(metadata: Metadata): void;
     has(path: string): boolean;
     get(path: string): Metadata | undefined;
+    private resolve;
     protected searchByExtension(parts: string[]): Metadata | undefined;
     protected searchByDirectory(parts: string[]): Metadata | undefined;
     protected ownsNestedPaths(metadata: Metadata): boolean;
+    private isContentContainer;
     private declaresNestedContent;
-    protected searchByXmlName(xmlName: string): Metadata | undefined;
     getByXmlName(xmlName: string): Metadata | undefined;
     getFullyQualifiedName(path: string): string;
+    private plainTypeName;
+    private composedTypeName;
+    private holderScopedName;
+    private componentScopedName;
+    private folderScopedName;
+    private nestedContentName;
+    private containerName;
+    private containerDepth;
     values(): Metadata[];
-    private static UNSAFE_EXTENSION;
     private static COMPOSED_TYPES;
+    private static HOLDER_SCOPED_COMPOSED_TYPES;
+    private static FOLDER_SCOPED_TYPES;
 }

package/lib/metadata/MetadataRepositoryImpl.js

@@ -6,23 +6,41 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { parse } from 'node:path/posix';
-import { DOT, PATH_SEP } from '../constant/fsConstants.js';
-import { CONTENT_CONTAINER_ADAPTERS, CUSTOM_APPLICATION_SUFFIX, CUSTOM_METADATA_SUFFIX, EMAIL_SERVICES_FUNCTION_SUFFIX, METAFILE_SUFFIX, OBJECT_TRANSLATION_TYPE, OBJECT_TYPE, PERMISSIONSET_TYPE, SHARING_RULE_TYPE, SUB_OBJECT_TYPES, WORKFLOW_TYPE, } from '../constant/metadataConstants.js';
+import { DOT, EXTENSION_SUFFIX_REGEX, PATH_SEP, } from '../constant/fsConstants.js';
+import { GIT_DIFF_TYPE_REGEX } from '../constant/gitConstants.js';
+import { CONTENT_CONTAINER_ADAPTERS, CUSTOM_APPLICATION_SUFFIX, CUSTOM_METADATA_SUFFIX, DEFAULT_CONTAINER_DEPTH, DIGITAL_EXPERIENCE_ADAPTER, DIGITAL_EXPERIENCE_BUNDLE_DEPTH, DIGITAL_EXPERIENCE_CONTENT_DEPTH, EMAIL_SERVICES_FUNCTION_SUFFIX, INFOLDER_SUFFIX_REGEX, META_REGEX, METAFILE_SUFFIX, OBJECT_TRANSLATION_TYPE, OBJECT_TYPE, PERMISSIONSET_TYPE, SHARING_RULE_TYPE, SUB_OBJECT_TYPES, VIRTUAL_BOT_TYPE, WORKFLOW_TYPE, } from '../constant/metadataConstants.js';
 import { log } from '../utils/LoggingDecorator.js';
-const PATH_SEP_GLOBAL = new RegExp(PATH_SEP, 'g');
+// Callers hand over a git diff line as readily as a bare path, and the
+// status prefix rides on the first segment — which is exactly where a
+// repository laid out at its own root keeps the type directory — so nothing
+// may compare segments before this has run.
+const asFilePath = (path) => path.replace(GIT_DIFF_TYPE_REGEX, '');
+// Shared by every scoped-name arm that owns a metaFile companion, so the
+// `-meta.xml` strip is a single call site both `containerName` and
+// `folderScopedName` route through.
+const withoutMetaSuffix = (name) => name.replace(META_REGEX, '');
 export class MetadataRepositoryImpl {
     metadatas;
     metadataPerExt;
     metadataPerDir;
     metadataPerXmlName;
     // Memoizes get(path) results across the registry's lifetime. The lookup
-    // chain (split + extension + directory walk + xmlName) is deterministic
-    // in `path` and the registry is read-only after construction, so a
-    // single cache here is safe and frees every consumer (has,
-    // getFullyQualifiedName, TypeHandlerFactory, computeTreeIndexScope, the
-    // RepoGitDiff filter chain) from repeating the work. Stores `undefined`
-    // negatives too — distinguished from "uncached" via .has().
+    // chain (split + extension + directory walk) is deterministic in `path`
+    // and the registry is read-only after construction, so a single cache
+    // here is safe and frees every consumer (has, getFullyQualifiedName,
+    // TypeHandlerFactory, computeTreeIndexScope, the RepoGitDiff filter
+    // chain) from repeating the work. Stores `undefined` negatives too —
+    // distinguished from "uncached" via .has().
     pathCache = new Map();
+    // A suffix declared by more than one type is ambiguous for this registry
+    // only. Kept per instance rather than shared across the process, so a
+    // registry built from an additional user-supplied file cannot make an
+    // extension unsafe for every registry built after it.
+    unsafeExtensions = new Set([
+        CUSTOM_APPLICATION_SUFFIX,
+        EMAIL_SERVICES_FUNCTION_SUFFIX,
+        CUSTOM_METADATA_SUFFIX,
+    ]);
     constructor(metadatas) {
         this.metadatas = metadatas;
         this.metadataPerExt = new Map();
@@ -35,24 +53,36 @@ export class MetadataRepositoryImpl {
         });
     }
     addSuffix(metadata) {
-        // Stryker disable next-line ConditionalExpression -- equivalent: suffix presence guard; flipping to true runs the inner Map.has lookup on undefined which returns false, falling into the metadataPerExt.set with undefined key — observable as a stray entry that no test path queries by undefined suffix
-        if (metadata.suffix) {
-            if (this.metadataPerExt.has(metadata.suffix)) {
-                MetadataRepositoryImpl.UNSAFE_EXTENSION.add(metadata.suffix);
-            }
-            else {
-                this.metadataPerExt.set(metadata.suffix, metadata);
-            }
-        }
+        this.registerSuffix(metadata);
         this.addSharedFolderSuffix(metadata);
     }
+    // Content clones must register through here, not through addSuffix: a clone
+    // keeps the same content[] as its source (see addSharedFolderSuffix below),
+    // so routing it back through addSuffix would re-enter addSharedFolderSuffix
+    // on that same content[] and recurse forever.
+    registerSuffix(metadata) {
+        // Stryker disable next-line ConditionalExpression -- equivalent: suffix presence guard; flipping to false lets a suffix-less entry reach the Map.has lookup on undefined, which returns false and falls into metadataPerExt.set under an undefined key — a stray entry no test path queries by undefined suffix (the true flip registers nothing and is killed by the suite)
+        if (!metadata.suffix)
+            return;
+        if (this.metadataPerExt.has(metadata.suffix)) {
+            this.unsafeExtensions.add(metadata.suffix);
+            return;
+        }
+        this.metadataPerExt.set(metadata.suffix, metadata);
+    }
+    // content is kept on the clone (not stripped) because it is what tells the
+    // rest of the registry — ownsNestedPaths, via declaresNestedContent — that
+    // this suffix's type owns every path nested below the shared directory,
+    // not just the file itself. Dropping it here would make a component
+    // resolved through its content suffix indistinguishable from a type with no
+    // nested content, losing the folder segment that tells same-named
+    // components under different folders apart.
     addSharedFolderSuffix(metadata) {
         if (!metadata.content)
             return;
-        const { content: _content, ...metadataWithoutContent } = metadata;
         for (const sharedFolderMetadataDef of metadata.content) {
-            this.addSuffix({
-                ...metadataWithoutContent,
+            this.registerSuffix({
+                ...metadata,
                 suffix: sharedFolderMetadataDef.suffix,
             });
         }
@@ -73,19 +103,23 @@ export class MetadataRepositoryImpl {
         return !!this.get(path);
     }
     get(path) {
+        return this.resolve(asFilePath(path));
+    }
+    // Split out of get() so the key rule, which already holds the stripped
+    // path, resolves it without stripping twice; every other caller goes
+    // through get() and its single strip.
+    resolve(filePath) {
         // Stryker disable next-line ConditionalExpression -- equivalent: cache short-circuit; flipping to false re-runs the search chain which is deterministic in path, so the result is identical
-        if (this.pathCache.has(path))
-            return this.pathCache.get(path);
-        const parts = path.split(PATH_SEP);
-        const result = this.searchByExtension(parts) ??
-            this.searchByDirectory(parts) ??
-            this.searchByXmlName(path);
-        this.pathCache.set(path, result);
+        if (this.pathCache.has(filePath))
+            return this.pathCache.get(filePath);
+        const parts = filePath.split(PATH_SEP);
+        const result = this.searchByExtension(parts) ?? this.searchByDirectory(parts);
+        this.pathCache.set(filePath, result);
         return result;
     }
     searchByExtension(parts) {
         const extension = parse(parts[parts.length - 1].replace(METAFILE_SUFFIX, '')).ext.replace(DOT, '');
-        if (MetadataRepositoryImpl.UNSAFE_EXTENSION.has(extension)) {
+        if (this.unsafeExtensions.has(extension)) {
             return;
         }
         return this.metadataPerExt.get(extension);
@@ -113,11 +147,16 @@ export class MetadataRepositoryImpl {
     // directories.
     ownsNestedPaths(metadata) {
         return (metadata.inFolder ||
-            // Stryker disable next-line ConditionalExpression -- equivalent: Set.has(undefined) is already false, so the `!== undefined` operand changes no runtime outcome; it exists only to narrow string|undefined → string for the Set<string>.has call under strict mode
-            (metadata.adapter !== undefined &&
-                CONTENT_CONTAINER_ADAPTERS.has(metadata.adapter)) ||
+            this.isContentContainer(metadata) ||
             this.declaresNestedContent(metadata));
     }
+    // Extracted so componentScopedName can pick a container's nesting depth
+    // from its adapter without re-deriving what counts as a container.
+    isContentContainer(metadata) {
+        const adapter = metadata.adapter;
+        // Stryker disable next-line ConditionalExpression -- equivalent: Set.has(undefined) is already false, so the `!== undefined` operand changes no runtime outcome; it exists only to narrow string|undefined → string for the Set<string>.has call under strict mode
+        return adapter !== undefined && CONTENT_CONTAINER_ADAPTERS.has(adapter);
+    }
     // A type declares nested content when its `content[]` lists suffix-keyed
     // sub-types sharing one directory (Wave/Bot/Discovery/Moderation): the
     // segments below that directory are then user-named content, not metadata
@@ -134,33 +173,122 @@ export class MetadataRepositoryImpl {
     declaresNestedContent(metadata) {
         return (metadata.content?.length ?? 0) > 0;
     }
-    searchByXmlName(xmlName) {
-        return this.metadataPerXmlName.get(xmlName);
-    }
     getByXmlName(xmlName) {
         return this.metadataPerXmlName.get(xmlName);
     }
     getFullyQualifiedName(path) {
-        let fullyQualifiedName = parse(path).base;
-        const type = this.get(path);
-        if (type && MetadataRepositoryImpl.COMPOSED_TYPES.has(type.xmlName)) {
-            const parentType = path
-                .split(PATH_SEP)
-                .find(part => this.metadataPerDir.has(part));
-            fullyQualifiedName = path
-                .slice(path.indexOf(parentType))
-                .replace(PATH_SEP_GLOBAL, '');
+        const filePath = asFilePath(path);
+        const type = this.resolve(filePath);
+        if (!type)
+            return parse(filePath).base;
+        if (MetadataRepositoryImpl.HOLDER_SCOPED_COMPOSED_TYPES.has(type.xmlName))
+            return this.holderScopedName(filePath, type);
+        if (MetadataRepositoryImpl.COMPOSED_TYPES.has(type.xmlName))
+            return this.composedTypeName(filePath);
+        if (!this.ownsNestedPaths(type))
+            return this.plainTypeName(filePath, type);
+        return this.componentScopedName(filePath, type);
+    }
+    // The type directory leads a plain key because a suffix belongs to no
+    // single type (`policy`, `settings`, `site`, `rule` are each declared by
+    // several) — it is the registry's directory, not the file's own, which is
+    // what lets a component moved between package directories key the same.
+    // Four live registry entries (AssignmentRule, AutoResponseRule,
+    // EscalationRule, ManagedTopic) carry a suffix and no directory: the key
+    // must never read `undefined/…`.
+    plainTypeName(path, type) {
+        const fileName = parse(path).base.replace(META_REGEX, '');
+        return type.directoryName ? `${type.directoryName}/${fileName}` : fileName;
+    }
+    // Anchored segment-wise on the first registry directory in the path: a
+    // substring search would also hit an unrelated directory that merely
+    // contains that name (`objects_backup/objects/…`) and drag it into the key.
+    // With no such segment findIndex answers -1 and slice(-1) keeps only the
+    // file name, so the fallback every other arm spells out needs no branch.
+    composedTypeName(path) {
+        const parts = path.split(PATH_SEP);
+        const typeIndex = parts.findIndex(part => this.metadataPerDir.has(part));
+        return parts.slice(typeIndex).join('');
+    }
+    // Depth 1 handles every decomposed spelling a holder can appear under: a
+    // single file directly beneath its type directory, or a child file nested
+    // several segments down — both collapse to the same one-segment container
+    // name, because the holder is one component regardless of how SFDX
+    // decomposed it into files.
+    holderScopedName(path, type) {
+        const parts = path.split(PATH_SEP);
+        const typeIndex = parts.lastIndexOf(type.directoryName);
+        if (typeIndex === -1)
+            return parse(path).base;
+        return this.containerName(parts, typeIndex, DEFAULT_CONTAINER_DEPTH);
+    }
+    // inFolder is checked before the container check because a type can be
+    // both inFolder and a content container (Document): adapter-first would
+    // truncate every Document to its folder, discarding the varying-extension
+    // files that folder owns.
+    componentScopedName(path, type) {
+        const parts = path.split(PATH_SEP);
+        const typeIndex = parts.lastIndexOf(type.directoryName);
+        if (typeIndex === -1)
+            return parse(path).base;
+        if (type.inFolder)
+            return this.folderScopedName(parts, typeIndex);
+        if (this.isContentContainer(type)) {
+            const nestedCount = parts.length - typeIndex - 1;
+            const depth = this.containerDepth(type.adapter, nestedCount);
+            return this.containerName(parts, typeIndex, depth);
         }
-        return fullyQualifiedName;
+        return this.nestedContentName(parts, typeIndex, type);
+    }
+    // The `-meta.xml` companion sits outside the extension
+    // (`logo.png-meta.xml`), so it must fall away before the extension strip
+    // runs — the reverse order would leave it attached and never removed.
+    // The trailing `Folder` strip mirrors the folder handler's own name
+    // derivation, so the key cannot disagree with the descriptor for a name
+    // that happens to end in Folder.
+    folderScopedName(parts, typeIndex) {
+        return withoutMetaSuffix(parts.slice(typeIndex).join(PATH_SEP))
+            .replace(INFOLDER_SUFFIX_REGEX, '')
+            .replace(EXTENSION_SUFFIX_REGEX, '');
+    }
+    // A flat nested-content directory tells its families apart by extension
+    // (`wave/A.wdash` vs `wave/A.wapp`), so the extension is kept and any
+    // sub-directory is discarded, matching the descriptor. A
+    // FOLDER_SCOPED_TYPES member (VirtualBot) is instead named
+    // `<bot>.<version>` and needs every segment from the type directory down.
+    nestedContentName(parts, typeIndex, type) {
+        const tail = MetadataRepositoryImpl.FOLDER_SCOPED_TYPES.has(type.xmlName)
+            ? parts.slice(typeIndex)
+            : [parts[typeIndex], parts.at(-1)];
+        return tail.join(PATH_SEP).replace(META_REGEX, '');
+    }
+    // A deeper remainder means the container is named by a directory, and a
+    // directory name is the component's whole name — stripping it would
+    // corrupt one that merely contains a dot (`lwc/foo.bar/…`). Only when the
+    // taken segments consume the whole remainder is the name actually a file,
+    // and only then are `-meta.xml` and the extension noise to strip away.
+    containerName(parts, typeIndex, depth) {
+        const nested = parts.slice(typeIndex + 1);
+        const name = [parts[typeIndex], ...nested.slice(0, depth)].join(PATH_SEP);
+        return depth >= nested.length
+            ? withoutMetaSuffix(name).replace(EXTENSION_SUFFIX_REGEX, '')
+            : name;
+    }
+    // Only digitalExperience varies by depth: a page content file lives
+    // DIGITAL_EXPERIENCE_CONTENT_DEPTH segments below the bundle directory,
+    // while the bundle itself and any shallower/non-canonical layout share the
+    // coarser DIGITAL_EXPERIENCE_BUNDLE_DEPTH. Every other content-container
+    // adapter names its component by the single segment below its directory.
+    containerDepth(adapter, nestedCount) {
+        if (adapter !== DIGITAL_EXPERIENCE_ADAPTER)
+            return DEFAULT_CONTAINER_DEPTH;
+        return nestedCount > DIGITAL_EXPERIENCE_CONTENT_DEPTH
+            ? DIGITAL_EXPERIENCE_CONTENT_DEPTH
+            : DIGITAL_EXPERIENCE_BUNDLE_DEPTH;
     }
     values() {
         return this.metadatas;
     }
-    static UNSAFE_EXTENSION = new Set([
-        CUSTOM_APPLICATION_SUFFIX,
-        EMAIL_SERVICES_FUNCTION_SUFFIX,
-        CUSTOM_METADATA_SUFFIX,
-    ]);
     static COMPOSED_TYPES = new Set([
         OBJECT_TYPE,
         OBJECT_TRANSLATION_TYPE,
@@ -169,6 +297,20 @@ export class MetadataRepositoryImpl {
         SHARING_RULE_TYPE,
         ...SUB_OBJECT_TYPES,
     ]);
+    // A subset of COMPOSED_TYPES: PermissionSet and CustomObjectTranslation
+    // decompose into per-file children like every other composed type, but
+    // (unlike CustomObject/Workflow/SharingRules) their children are not
+    // distinct components — every file under one holder is the same
+    // PermissionSet or CustomObjectTranslation, so they key on the holder
+    // instead of the decomposed path.
+    static HOLDER_SCOPED_COMPOSED_TYPES = new Set([
+        PERMISSIONSET_TYPE,
+        OBJECT_TRANSLATION_TYPE,
+    ]);
+    // Nested-content families sharing one flat directory are told apart by
+    // extension, except VirtualBot: a BotVersion member is `<bot>.<version>`,
+    // so its key must keep the bot folder that the extension alone would lose.
+    static FOLDER_SCOPED_TYPES = new Set([VIRTUAL_BOT_TYPE]);
 }
 __decorate([
     log