@jayree/sfdx-plugin-manifest 2.6.3 → 2.7.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [2.7.0](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.6.4...v2.7.0) (2023-01-09)
+
+
+### Bug Fixes
+
+* **manifest:beta:git:diff:** fix output if ref2 is set ([9886831](https://github.com/jayree/sfdx-plugin-manifest/commit/9886831f7533d2b9d2bfdba2f1da5f94f2eb3caa))
+
+
+### Features
+
+* **manifest:beta:git:diff:** more enhancements and new sf flags. -d is now used for --source-dir ([1c6be65](https://github.com/jayree/sfdx-plugin-manifest/commit/1c6be65967f6c1fd0afa6ae590466563347d80aa))
+
+## [2.6.4](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.6.3...v2.6.4) (2023-01-09)
+
+
+### Bug Fixes
+
+* **manifest:beta:git:diff:** fix sourcepath parameter ([0cc68bf](https://github.com/jayree/sfdx-plugin-manifest/commit/0cc68bf9547cc3ea67c0b6b591c2166f2debc852))
+* **manifest:git:diff:** ignore modified forceignored metadata ([a264829](https://github.com/jayree/sfdx-plugin-manifest/commit/a26482954f18cb316b71e79d53191f2e6307b4c6))
+
 ## [2.6.3](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.6.2...v2.6.3) (2023-01-06)
 
 

package/README.md

@@ -3,32 +3,16 @@
 A Salesforce CLI plugin containing commands for creating manifest files from Salesforce orgs or git commits of sfdx projects.
 
 [![sfdx](https://img.shields.io/badge/cli-sfdx-brightgreen.svg)](https://developer.salesforce.com/tools/sfdxcli)
-[![Version](https://img.shields.io/npm/v/@jayree/sfdx-plugin-manifest.svg)](https://npmjs.org/package/@jayree/sfdx-plugin-manifest)
+[![NPM](https://img.shields.io/npm/v/@jayree/sfdx-plugin-manifest.svg?label=@jayree/sfdx-plugin-manifest)](https://npmjs.org/package/@jayree/sfdx-plugin-manifest)
 [![test-and-release](https://github.com/jayree/sfdx-plugin-manifest/actions/workflows/release.yml/badge.svg)](https://github.com/jayree/sfdx-plugin-manifest/actions/workflows/release.yml)
 [![Downloads/week](https://img.shields.io/npm/dw/@jayree/sfdx-plugin-manifest.svg)](https://npmjs.org/package/@jayree/sfdx-plugin-manifest)
 [![License](https://img.shields.io/npm/l/@jayree/sfdx-plugin-manifest.svg)](https://github.com/jayree-plugins/sfdx-plugin-manifest/blob/main/package.json)
 
-<!-- toc -->
-* [Usage](#usage)
-* [Commands](#commands)
-<!-- tocstop -->
-<!-- install -->
-
-## Usage
-
-<!-- usage -->
-```sh-session
-$ sfdx plugins:install @jayree/sfdx-plugin-manifest
-$ sfdx jayree:[COMMAND]
-running command...
-$ sfdx plugins
-@jayree/sfdx-plugin-manifest 2.6.3
-$ sfdx help jayree:[COMMAND]
-USAGE
-  $ sfdx jayree:COMMAND
-...
+## Install
+
+```bash
+sfdx plugins:install @jayree/sfdx-plugin-manifest
 ```
-<!-- usagestop -->
 
 ## Commands
 
@@ -40,61 +24,72 @@ USAGE
 
 ### `sfdx jayree:manifest:beta:git:diff`
 
-create a project manifest and destructiveChanges manifest that lists the metadata components you want to deploy or delete based on changes in your git history
+Create a project manifest and destructiveChanges manifest that lists the metadata components you want to deploy or delete based on changes in your git history.
 
 ```
 USAGE
-  $ sfdx jayree:manifest:beta:git:diff [-p <array>] [-o <string>] [-d] [--apiversion <string>] [--json] [--loglevel
-    trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
+  $ sfdx jayree:manifest:beta:git:diff [REF1] [REF2] [--json] [--api-version <value>] [-d <value>] [--output-dir <value>]
+    [--destructive-changes-only]
 
 ARGUMENTS
   REF1  base commit or branch
   REF2  commit or branch to compare to the base commit
 
 FLAGS
-  -d, --destructivechangesonly                                                      create a destructiveChanges manifest
-                                                                                    only (package.xml will be empty)
-  -o, --outputdir=<value>                                                           directory to save the created
-                                                                                    manifest files
-  -p, --sourcepath=<value>                                                          comma-separated list of paths to the
-                                                                                    local source files to include in the
-                                                                                    manifest
-  --apiversion=<value>                                                              override the api version used for
-                                                                                    api requests made by this command
-  --json                                                                            format output as json
-  --loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)  [default: warn] logging level for
-                                                                                    this command invocation
+  -d, --source-dir=<value>...  Path to the local source files to include in the manifest.
+  --api-version=<value>        Override the api version used for api requests made by this command
+  --destructive-changes-only   Create a destructiveChanges manifest only.
+  --output-dir=<value>         Directory to save the created manifest files.
+
+GLOBAL FLAGS
+  --json  Format output as json.
 
 DESCRIPTION
-  create a project manifest and destructiveChanges manifest that lists the metadata components you want to deploy or
-  delete based on changes in your git history
+  Create a project manifest and destructiveChanges manifest that lists the metadata components you want to deploy or
+  delete based on changes in your git history.
+
   Use this command to create a manifest and destructiveChanges manifest file based on the difference (git diff) of two
   git refs.
 
-  You can use all ways to spell <commit> which are valid for 'git diff'.
-  (See https://git-scm.com/docs/git-diff)
+  You can use all ways to spell <commit> which are valid for 'git diff' (See https://git-scm.com/docs/git-diff).
 
 EXAMPLES
-  $ sfdx jayree:manifest:beta:git:diff <commit> <commit>
+  Uses the changes between two arbitrary <commit>.
 
-  $ sfdx jayree:manifest:git:diff <commit>..<commit>
+    $ sfdx jayree:manifest:beta:git:diff <commit> <commit>
+    $ sfdx jayree:manifest:beta:git:diff <commit>..<commit>
 
-  uses the changes between two arbitrary <commit>
+  Uses the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both
+  <commit>.
 
-  $ sfdx jayree:manifest:beta:git:diff <commit>...<commit>
+    $ sfdx jayree:manifest:beta:git:diff <commit>...<commit>
 
-  uses the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.
+  Uses the diff of what is unique in branchB (REF2) and unique in branchA (REF1).
 
-  $ sfdx jayree:manifest:beta:git:diff branchA..branchB
+    $ sfdx jayree:manifest:beta:git:diff branchA..branchB
 
-  uses the diff of what is unique in branchB (REF2) and unique in branchA (REF1)
+  Uses the diff of what is unique in branchB (REF2).
 
-  $ sfdx jayree:manifest:beta:git:diff branchA...branchB
+    $ sfdx jayree:manifest:beta:git:diff branchA...branchB
 
-  uses the diff of what is unique in branchB (REF2)
+FLAG DESCRIPTIONS
+  -d, --source-dir=<value>...  Path to the local source files to include in the manifest.
+
+    The supplied path can be to a single file (in which case the operation is applied to only one file) or to a folder
+    (in which case the operation is applied to all metadata types in the directory and its subdirectories).
+
+    You can specify this flag more than once.
+
+  --destructive-changes-only  Create a destructiveChanges manifest only.
+
+    Use this flag to create a 'destructiveChanges.xml' and a blank 'package.xml'.
+
+  --output-dir=<value>  Directory to save the created manifest files.
+
+    The location can be an absolute path or relative to the current working directory.
 ```
 
-_See code: [src/commands/jayree/manifest/beta/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.6.3/src/commands/jayree/manifest/beta/git/diff.ts)_
+_See code: [src/commands/jayree/manifest/beta/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.7.0/src/commands/jayree/manifest/beta/git/diff.ts)_
 
 ### `sfdx jayree:manifest:cleanup`
 
@@ -122,7 +117,7 @@ EXAMPLES
   $ sfdx jayree:manifest:cleanup --manifest=package.xml --file=packageignore.xml
 ```
 
-_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.6.3/src/commands/jayree/manifest/cleanup.ts)_
+_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.7.0/src/commands/jayree/manifest/cleanup.ts)_
 
 ### `sfdx jayree:manifest:generate`
 
@@ -165,7 +160,7 @@ EXAMPLES
   <Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
 ```
 
-_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.6.3/src/commands/jayree/manifest/generate.ts)_
+_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.7.0/src/commands/jayree/manifest/generate.ts)_
 
 ### `sfdx jayree:manifest:git:diff`
 
@@ -219,5 +214,5 @@ EXAMPLES
   uses the diff of what is unique in branchB (REF2)
 ```
 
-_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.6.3/src/commands/jayree/manifest/git/diff.ts)_
+_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.7.0/src/commands/jayree/manifest/git/diff.ts)_
 <!-- commandsstop -->

package/lib/SDR-extra/collections/componentSetExtra.d.ts

@@ -1,7 +1,5 @@
 import { ComponentSet, OptionalTreeRegistryOptions } from '@salesforce/source-deploy-retrieve';
-import Debug from 'debug';
-export declare const debug: Debug.Debugger;
-export interface FromGitDiffOptions extends OptionalTreeRegistryOptions {
+interface FromGitDiffOptions extends OptionalTreeRegistryOptions {
     /**
      * Git ref to resolve components against
      */
@@ -36,3 +34,4 @@ export declare class ComponentSetExtra extends ComponentSet {
      */
     static fromGitDiff(options: FromGitDiffOptions): Promise<ComponentSet>;
 }
+export {};

package/lib/SDR-extra/collections/componentSetExtra.js

@@ -4,11 +4,13 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
+import path from 'path';
 import { ComponentSet, DestructiveChangesType, registry as untypedRegistry, } from '@salesforce/source-deploy-retrieve';
-import { SfProject } from '@salesforce/core';
+import { SfProject, Lifecycle } from '@salesforce/core';
 import Debug from 'debug';
-import { GitDiffResolver } from '../resolve/gitDiffResolver.js';
-export const debug = Debug('sf:gitDiff:ComponentSetExtra');
+import fs from 'graceful-fs';
+import { GitDiffResolver } from '../resolve/index.js';
+const debug = Debug('sf:gitDiff:ComponentSetExtra');
 export class ComponentSetExtra extends ComponentSet {
     static async fromGitDiff(input) {
         let fsPaths;
@@ -35,29 +37,44 @@ export class ComponentSetExtra extends ComponentSet {
         else {
             ref1 = input;
         }
-        const proj = await SfProject.resolve();
-        fsPaths = fsPaths || proj.getUniquePackageDirectories().map((pDir) => pDir.fullPath);
-        const gitDiffResolver = new GitDiffResolver();
+        const project = await SfProject.resolve();
+        const gitDiffResolver = new GitDiffResolver(project);
         const inclusiveFilter = await gitDiffResolver.resolve(ref1, ref2, fsPaths);
-        const components = ComponentSet.fromSource({
-            fsPaths,
-            include: inclusiveFilter,
-            tree,
-            registry,
-        });
         const childsTobeReplacedByParent = [
             ...Object.keys(untypedRegistry.types.workflow.children.types),
             ...Object.keys(untypedRegistry.types.sharingrules.children.types),
             ...Object.keys(untypedRegistry.types.customobjecttranslation.children.types),
             ...Object.keys(untypedRegistry.types.bot.children.types),
         ];
+        for (const component of inclusiveFilter.getSourceComponents()) {
+            if (childsTobeReplacedByParent.includes(component.type.id)) {
+                debug(`add parent ${component.parent.type.name}:${component.parent.fullName} of ${component.type.name}:${component.fullName} to manifest`);
+                inclusiveFilter.add(component.parent);
+            }
+        }
+        fsPaths =
+            fsPaths?.map((filepath) => path.resolve(filepath)).filter((filepath) => fs.existsSync(filepath)) ||
+                project.getUniquePackageDirectories().map((pDir) => pDir.fullPath);
+        debug({ fsPaths });
+        const components = ComponentSet.fromSource({
+            fsPaths,
+            include: inclusiveFilter,
+            tree,
+            registry,
+        });
         for (const component of inclusiveFilter.getSourceComponents()) {
             if (component.isMarkedForDelete()) {
                 components.add(component, DestructiveChangesType.POST);
             }
-            else if (childsTobeReplacedByParent.includes(component.type.id)) {
-                debug(`add parent ${component.parent.type.name}:${component.parent.fullName} of ${component.type.name}:${component.fullName} to manifest`);
-                components.add(component.parent);
+        }
+        for await (const component of inclusiveFilter.getSourceComponents()) {
+            if (!components
+                .getSourceComponents()
+                .find((localComponent) => !!localComponent
+                .getChildren()
+                .find((localChild) => component.type.name === localChild.type.name && component.fullName === localChild.fullName) ||
+                (component.type.name === localComponent.type.name && component.fullName === localComponent.fullName))) {
+                await Lifecycle.getInstance().emitWarning(`The component "${component.type.name}:${component.fullName}" was not found locally.`);
             }
         }
         return components;

package/lib/SDR-extra/collections/componentSetExtra.js.map

@@ -1 +1 @@
-{"version":3,"file":"componentSetExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/collections/componentSetExtra.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"componentSetExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/collections/componentSetExtra.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EACL,YAAY,EAGZ,sBAAsB,EAEtB,QAAQ,IAAI,eAAe,GAC5B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,KAAK,GAAG,KAAK,CAAC,8BAA8B,CAAC,CAAC;AAapD,MAAM,OAAO,iBAAkB,SAAQ,YAAY;IA0B1C,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAA6C;QAC3E,IAAI,OAAiB,CAAC;QACtB,IAAI,QAAwB,CAAC;QAC7B,IAAI,IAAmB,CAAC;QACxB,IAAI,IAAuB,CAAC;QAC5B,IAAI,IAAY,CAAC;QAEjB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;SACjB;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBAC5B,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACrB;iBAAM;gBACL,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC;aAClB;YACD,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YACxB,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC;YACtC,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC;SAC3B;aAAM;YACL,IAAI,GAAG,KAAK,CAAC;SACd;QAED,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAE1C,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3E,MAAM,0BAA0B,GAAG;YACjC,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC7D,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC;YACjE,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC5E,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;SACzD,CAAC;QAEF,KAAK,MAAM,SAAS,IAAI,eAAe,CAAC,mBAAmB,EAAE,EAAE;YAC7D,IAAI,0BAA0B,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBAC1D,KAAK,CACH,cAAc,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,QAAQ,cAAc,CACpI,CAAC;gBACF,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aACvC;SACF;QAED,OAAO;YACL,OAAO,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAChG,OAAO,CAAC,2BAA2B,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErE,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEnB,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;YACzC,OAAO;YACP,OAAO,EAAE,eAAe;YACxB,IAAI;YACJ,QAAQ;SACT,CAAC,CAAC;QAEH,KAAK,MAAM,SAAS,IAAI,eAAe,CAAC,mBAAmB,EAAE,EAAE;YAC7D,IAAI,SAAS,CAAC,iBAAiB,EAAE,EAAE;gBACjC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAC;aACxD;SACF;QAED,IAAI,KAAK,EAAE,MAAM,SAAS,IAAI,eAAe,CAAC,mBAAmB,EAAE,EAAE;YACnE,IACE,CAAC,UAAU;iBACR,mBAAmB,EAAE;iBACrB,IAAI,CACH,CAAC,cAAc,EAAE,EAAE,CACjB,CAAC,CAAC,cAAc;iBACb,WAAW,EAAE;iBACb,IAAI,CACH,CAAC,UAAU,EAAE,EAAE,CACb,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ,CAC7F;gBACH,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,QAAQ,KAAK,cAAc,CAAC,QAAQ,CAAC,CACvG,EACH;gBACA,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,WAAW,CACvC,kBAAkB,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,QAAQ,0BAA0B,CACtF,CAAC;aACH;SACF;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}

package/lib/SDR-extra/collections/index.d.ts

@@ -0,0 +1 @@
+export * from './componentSetExtra.js';

package/lib/SDR-extra/collections/index.js

@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2022, jayree
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+export * from './componentSetExtra.js';
+//# sourceMappingURL=index.js.map

package/lib/SDR-extra/collections/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/SDR-extra/collections/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,cAAc,wBAAwB,CAAC"}

package/lib/SDR-extra/index.d.ts

@@ -0,0 +1,3 @@
+export * from './collections/index.js';
+export * from './resolve/index.js';
+export * from './utils/index.js';

package/lib/SDR-extra/index.js

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2022, jayree
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+export * from './collections/index.js';
+export * from './resolve/index.js';
+export * from './utils/index.js';
+//# sourceMappingURL=index.js.map

package/lib/SDR-extra/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/SDR-extra/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC"}

package/lib/SDR-extra/resolve/gitDiffResolver.d.ts

@@ -1,18 +1,23 @@
 import { ComponentSet } from '@salesforce/source-deploy-retrieve';
-import Debug from 'debug';
-export declare const debug: Debug.Debugger;
+import { SfProject } from '@salesforce/core';
 /**
  * Resolver for metadata type and component objects from a git diff result
  *
  * @internal
  */
 export declare class GitDiffResolver {
-    private ref1VirtualTreeContainer;
     private ref2VirtualTreeContainer;
     private ref1Resolver;
     private ref2Resolver;
-    private static getFileStatus;
+    private gitDir;
+    private uniquePackageDirectories;
+    private localRepo;
+    /**
+     * @param dir SFDX project directory
+     */
+    constructor(project: SfProject);
     resolve(ref1: string, ref2: string, fsPaths: string[]): Promise<ComponentSet>;
+    private getFileStatus;
     private getComponentSet;
     private getChildComponentStatus;
 }

package/lib/SDR-extra/resolve/gitDiffResolver.js

@@ -6,14 +6,12 @@
  */
 import path from 'path';
 import { ComponentSet, RegistryAccess, MetadataResolver, SourceComponent, DestructiveChangesType, } from '@salesforce/source-deploy-retrieve';
-import { SfProject, SfError } from '@salesforce/core';
-import fs from 'fs-extra';
-import { parseMetadataXml } from '@salesforce/source-deploy-retrieve/lib/src/utils/index.js';
+import { SfError, Lifecycle } from '@salesforce/core';
 import equal from 'fast-deep-equal';
 import Debug from 'debug';
-import { resolveMultiRefString, resolveSingleRefString, getFileState, getStatus } from '../utils/git-extra.js';
-import { VirtualTreeContainerExtra } from './treeContainersExtra.js';
-export const debug = Debug('sf:gitDiff:resolver');
+import { GitRepo } from '../utils/localGitRepo.js';
+import { VirtualTreeContainerExtra, parseMetadataXml } from './index.js';
+const debug = Debug('sf:gitDiff:resolver');
 const registryAccess = new RegistryAccess();
 /**
  * Resolver for metadata type and component objects from a git diff result
@@ -21,104 +19,111 @@ const registryAccess = new RegistryAccess();
  * @internal
  */
 export class GitDiffResolver {
-    static async getFileStatus(ref1, ref2, dir, resolveSourcePaths) {
-        let files;
-        if (ref2) {
-            files = (await getFileState(ref1, ref2, dir)).filter((l) => resolveSourcePaths.some((f) => l.path.startsWith(f)));
-        }
-        else {
-            files = await getStatus(dir, ref1);
-            files = files.filter((l) => resolveSourcePaths.some((f) => l.path.startsWith(f)));
-        }
-        files = files.filter((file) => {
-            if (file.status === 'D') {
-                for (const sourcePath of resolveSourcePaths) {
-                    const defaultFolder = path.join(sourcePath, 'main', 'default');
-                    const filePath = file.path.replace(file.path.startsWith(defaultFolder) ? defaultFolder : sourcePath, '');
-                    const target = files.find((t) => t.path.endsWith(filePath) && t.status === 'A');
-                    if (target) {
-                        return false;
-                    }
-                }
-            }
-            return true;
+    /**
+     * @param dir SFDX project directory
+     */
+    constructor(project) {
+        this.gitDir = project.getPath();
+        this.uniquePackageDirectories = project.getUniquePackageDirectories().map((pDir) => pDir.fullPath);
+        this.localRepo = GitRepo.getInstance({
+            gitDir: this.gitDir,
+            packageDirs: this.uniquePackageDirectories,
         });
-        return files;
     }
     async resolve(ref1, ref2, fsPaths) {
-        const proj = await SfProject.resolve();
         if (ref2 === undefined) {
-            const { ref1: r1, ref2: r2 } = await resolveMultiRefString({ ref: ref1, dir: proj.getPath(), fs });
+            const { ref1: r1, ref2: r2 } = await this.localRepo.resolveMultiRefString(ref1);
             ref1 = r1;
             ref2 = r2;
         }
         else {
             const [r1, r2] = await Promise.all([
-                resolveSingleRefString({ ref: ref1, dir: proj.getPath(), fs }),
-                resolveSingleRefString({ ref: ref2, dir: proj.getPath(), fs }),
+                this.localRepo.resolveSingleRefString(ref1),
+                this.localRepo.resolveSingleRefString(ref2),
             ]);
             ref1 = r1;
             ref2 = r2;
         }
         debug({ ref1, ref2 });
-        const fileStatus = await GitDiffResolver.getFileStatus(ref1, ref2, proj.getPath(), fsPaths);
+        const fileStatus = await this.getFileStatus(ref1, ref2);
         debug({ fileStatus });
         const [ref1VirtualTreeContainer, ref2VirtualTreeContainer] = await Promise.all([
-            VirtualTreeContainerExtra.fromGitRef(ref1, proj.getPath(), fileStatus.filter((l) => l.status === 'M').map((l) => l.path)),
-            VirtualTreeContainerExtra.fromGitRef(ref2, proj.getPath(), fileStatus.filter((l) => l.status === 'M').map((l) => l.path)),
+            VirtualTreeContainerExtra.fromGitRef(ref1, this.gitDir, fileStatus.filter((l) => l.status === 'M').map((l) => l.path)),
+            VirtualTreeContainerExtra.fromGitRef(ref2, this.gitDir, fileStatus.filter((l) => l.status === 'M').map((l) => l.path)),
         ]);
-        this.ref1VirtualTreeContainer = ref1VirtualTreeContainer;
+        if (fsPaths) {
+            fsPaths.map((filepath) => {
+                filepath = path.resolve(filepath);
+                if (!ref1VirtualTreeContainer.exists(filepath) && !ref2VirtualTreeContainer.exists(filepath)) {
+                    throw new SfError(`The sourcepath "${filepath}" is not a valid source file path.`);
+                }
+            });
+        }
         this.ref2VirtualTreeContainer = ref2VirtualTreeContainer;
-        fsPaths = fsPaths.map((filepath) => {
-            filepath = path.resolve(filepath);
-            if (!this.ref1VirtualTreeContainer.exists(filepath) && !this.ref2VirtualTreeContainer.exists(filepath)) {
-                throw new SfError(`The sourcepath "${filepath}" is not a valid source file path.`);
+        this.ref1Resolver = new MetadataResolver(registryAccess, ref1VirtualTreeContainer);
+        this.ref2Resolver = new MetadataResolver(registryAccess, this.ref2VirtualTreeContainer);
+        return this.getComponentSet(fileStatus);
+    }
+    async getFileStatus(ref1, ref2) {
+        let files;
+        if (ref2) {
+            files = (await this.localRepo.getFileState({ ref1, ref2 })).filter((l) => this.uniquePackageDirectories.some((f) => l.path.startsWith(f)));
+        }
+        else {
+            files = await this.localRepo.getStatus(ref1);
+        }
+        files = files.filter((file) => {
+            if (file.status === 'D') {
+                for (const sourcePath of this.uniquePackageDirectories) {
+                    const defaultFolder = path.join(sourcePath, 'main', 'default');
+                    const filePath = file.path.replace(file.path.startsWith(defaultFolder) ? defaultFolder : sourcePath, '');
+                    const target = files.find((t) => t.path.endsWith(filePath) && t.status === 'A');
+                    // debug({ target, file, sourcePath, filePath });
+                    if (target) {
+                        return false;
+                    }
+                }
             }
-            return filepath;
+            return true;
         });
-        debug({ fsPaths });
-        this.ref1Resolver = new MetadataResolver(registryAccess, this.ref1VirtualTreeContainer);
-        this.ref2Resolver = new MetadataResolver(registryAccess, this.ref2VirtualTreeContainer);
-        return this.getComponentSet(fileStatus, fsPaths);
+        return files;
     }
-    async getComponentSet(gitLines, fsPaths) {
+    async getComponentSet(gitLines) {
         const results = new ComponentSet(undefined, registryAccess);
         const childComponentPromises = [];
         for (const [, { status, path: fpath }] of gitLines.entries()) {
-            if (!fsPaths || fsPaths.some((fsPath) => path.resolve(fpath).startsWith(fsPath))) {
-                if (status === 'D') {
-                    for (const c of this.ref1Resolver.getComponentsFromPath(fpath)) {
-                        // if the component supports partial delete AND there are files that are not deleted,
-                        // set the component for deploy, not for delete.
-                        // https://github.com/forcedotcom/source-tracking/blob/5cb32bef2e5860c0f8fc2afa3ea65432fe511a99/src/shared/localComponentSetArray.ts#L81
-                        if (!!c.type.supportsPartialDelete && c.content && this.ref2VirtualTreeContainer.exists(c.content)) {
-                            // all bundle types have a directory name
-                            try {
-                                this.ref2Resolver
-                                    .getComponentsFromPath(path.resolve(c.content))
-                                    .filter((input) => input instanceof SourceComponent)
-                                    .map((nonDeletedComponent) => {
-                                    results.add(nonDeletedComponent);
-                                });
-                            }
-                            catch (e) {
-                                debug(`unable to find component at ${c.content}.  That's ok if it was supposed to be deleted`);
-                            }
+            if (status === 'D') {
+                for (const c of this.ref1Resolver.getComponentsFromPath(fpath)) {
+                    // if the component supports partial delete AND there are files that are not deleted,
+                    // set the component for deploy, not for delete.
+                    // https://github.com/forcedotcom/source-tracking/blob/5cb32bef2e5860c0f8fc2afa3ea65432fe511a99/src/shared/localComponentSetArray.ts#L81
+                    if (!!c.type.supportsPartialDelete && c.content && this.ref2VirtualTreeContainer.exists(c.content)) {
+                        // all bundle types have a directory name
+                        try {
+                            this.ref2Resolver
+                                .getComponentsFromPath(path.resolve(c.content))
+                                .filter((input) => input instanceof SourceComponent)
+                                .map((nonDeletedComponent) => {
+                                results.add(nonDeletedComponent);
+                            });
                         }
-                        else {
-                            results.add(c, DestructiveChangesType.POST);
+                        catch (e) {
+                            debug(`unable to find component at ${c.content}.  That's ok if it was supposed to be deleted`);
                         }
                     }
-                }
-                else if (status === 'A') {
-                    for (const c of this.ref2Resolver.getComponentsFromPath(fpath)) {
-                        results.add(c);
+                    else {
+                        results.add(c, DestructiveChangesType.POST);
                     }
                 }
-                else {
-                    childComponentPromises.push(this.getChildComponentStatus(fpath));
+            }
+            else if (status === 'A') {
+                for (const c of this.ref2Resolver.getComponentsFromPath(fpath)) {
+                    results.add(c);
                 }
             }
+            else {
+                childComponentPromises.push(this.getChildComponentStatus(fpath));
+            }
         }
         for await (const check of childComponentPromises) {
             if (check.status === 0) {
@@ -129,6 +134,9 @@ export class GitDiffResolver {
             else if (check.status === -1) {
                 // unchanged file
             }
+            else if (check.status === -2) {
+                // forceignored file
+            }
             else {
                 for (const c of check.toDestructiveChanges) {
                     results.add(c, DestructiveChangesType.POST);
@@ -138,12 +146,10 @@ export class GitDiffResolver {
                 }
             }
         }
-        debug({
-            forceIgnoredPaths: {
-                ref1: Array.from(this.ref1Resolver.forceIgnoredPaths),
-                ref2: Array.from(this.ref2Resolver.forceIgnoredPaths),
-            },
-        });
+        const forceIgnored = Array.from(new Set([...this.ref1Resolver.forceIgnoredPaths, ...this.ref2Resolver.forceIgnoredPaths]));
+        for await (const file of forceIgnored) {
+            await Lifecycle.getInstance().emitWarning(`The forceignored file "${file}" was ignored.`);
+        }
         return results;
     }
     async getChildComponentStatus(fpath) {
@@ -152,6 +158,9 @@ export class GitDiffResolver {
         }
         const [ref2Component] = this.ref2Resolver.getComponentsFromPath(fpath); // git path only conaints files
         const [ref1Component] = this.ref1Resolver.getComponentsFromPath(fpath); // git path only conaints files
+        if (this.ref1Resolver.forceIgnoredPaths.has(fpath) || this.ref2Resolver.forceIgnoredPaths.has(fpath)) {
+            return { path: fpath, status: -2 };
+        }
         if (equal(await ref1Component.parseXml(), await ref2Component.parseXml())) {
             return { path: fpath, status: -1 };
         }