@jayree/sfdx-plugin-manifest 2.6.4 → 2.7.1

package/lib/SDR-extra/utils/localGitRepo.d.ts

@@ -0,0 +1,39 @@
+/// <reference types="node" resolution-mode="require"/>
+interface GitRepoOptions {
+    gitDir: string;
+    packageDirs?: string[];
+}
+export declare class GitRepo {
+    private static instanceMap;
+    gitDir: string;
+    private packageDirs;
+    private constructor();
+    static getInstance(options: GitRepoOptions): GitRepo;
+    resolveMultiRefString(ref: string): Promise<{
+        ref1: string;
+        ref2: string;
+    }>;
+    resolveSingleRefString(ref: string): Promise<string>;
+    getStatus(ref: string): Promise<Array<{
+        path: string;
+        status: string;
+    }>>;
+    getFileState(options: {
+        ref1: string;
+        ref2: string;
+    }): Promise<[
+        {
+            path: string;
+            status: string;
+        }
+    ]>;
+    listFullPathFiles(ref: string): Promise<string[]>;
+    getOid(ref: string): Promise<string>;
+    readBlobAsBuffer(options: {
+        oid: string;
+        filename: string;
+    }): Promise<Buffer>;
+    private getCommitLog;
+    private ensureGitRelPath;
+}
+export {};

package/lib/SDR-extra/utils/localGitRepo.js

@@ -0,0 +1,239 @@
+/*
+ * 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
+ */
+import util from 'util';
+import path from 'node:path';
+import git from 'isomorphic-git';
+import { Lifecycle } from '@salesforce/core';
+import fs from 'graceful-fs';
+export class GitRepo {
+    constructor(options) {
+        this.gitDir = options.gitDir;
+        this.packageDirs = options.packageDirs;
+    }
+    static getInstance(options) {
+        if (!GitRepo.instanceMap.has(options.gitDir)) {
+            const newInstance = new GitRepo(options);
+            GitRepo.instanceMap.set(options.gitDir, newInstance);
+        }
+        return GitRepo.instanceMap.get(options.gitDir);
+    }
+    async resolveMultiRefString(ref) {
+        const a = ref.split('.');
+        let ref1;
+        let ref2;
+        if (a.length === 3 || a.length === 4) {
+            ref1 = a[0];
+            ref2 = a[a.length - 1];
+        }
+        else if (a.length === 1) {
+            ref1 = a[0];
+            ref2 = undefined;
+        }
+        else {
+            throw new Error(`Ambiguous ${util.format('argument%s', ref.length === 1 ? '' : 's')}: ${ref}
+  See more help with --help`);
+        }
+        if (a.length === 4) {
+            ref1 = (await git.findMergeBase({
+                fs,
+                dir: this.gitDir,
+                oids: [ref2, ref1],
+            }))[0];
+        }
+        else {
+            ref1 = await this.resolveSingleRefString(ref1);
+        }
+        ref2 = await this.resolveSingleRefString(ref2);
+        return { ref1, ref2 };
+    }
+    async resolveSingleRefString(ref) {
+        if (ref === undefined) {
+            return '';
+        }
+        if (!['~', '^'].some((el) => ref.includes(el))) {
+            return (await this.getCommitLog(ref)).oid;
+        }
+        const firstIndex = [ref.indexOf('^'), ref.indexOf('~')].filter((a) => a >= 0).reduce((a, b) => Math.min(a, b));
+        let ipath = ref.substring(firstIndex);
+        let resolvedRef = ref.substring(0, firstIndex);
+        while (ipath.length && resolvedRef !== undefined) {
+            if (ipath.startsWith('^')) {
+                ipath = ipath.substring(1);
+                let next = Number(ipath.substring(0, 1));
+                ipath = next ? ipath.substring(1) : ipath;
+                next = next ? next : 1;
+                // eslint-disable-next-line no-await-in-loop
+                resolvedRef = (await this.getCommitLog(resolvedRef)).parents[next - 1];
+            }
+            else if (ipath.startsWith('~')) {
+                ipath = ipath.substring(1);
+                let next = Number(ipath.substring(0, 1));
+                ipath = next ? ipath.substring(1) : ipath;
+                next = next ? next : 1;
+                for (let index = 0; index <= next - 1; index++) {
+                    // eslint-disable-next-line no-await-in-loop
+                    resolvedRef = (await this.getCommitLog(resolvedRef)).parents[0];
+                }
+            }
+            else {
+                resolvedRef = undefined;
+            }
+        }
+        if (resolvedRef === undefined) {
+            throw new Error(`ambiguous argument '${ref}': unknown revision or path not in the working tree.`);
+        }
+        return resolvedRef;
+    }
+    async getStatus(ref) {
+        const getStatusText = (row) => {
+            if ([
+                [0, 2, 2],
+                [0, 2, 3], // added, staged, with unstaged changes
+            ].some((a) => a.every((val, index) => val === row[index]))) {
+                return 'A';
+            }
+            if ([
+                [1, 0, 0],
+                [1, 0, 1],
+                [1, 1, 0],
+                [1, 2, 0],
+                [1, 0, 3], // modified, staged, with unstaged deletion
+            ].some((a) => a.every((val, index) => val === row[index]))) {
+                return 'D';
+            }
+            if ([
+                [1, 2, 1],
+                [1, 2, 2],
+                [1, 2, 3], // modified, staged, with unstaged changes
+            ].some((a) => a.every((val, index) => val === row[index]))) {
+                return 'M';
+            }
+        };
+        const statusMatrix = await git.statusMatrix({
+            fs,
+            dir: this.gitDir,
+            ref,
+            filter: (f) => this.packageDirs ? this.packageDirs.some((fDir) => f.startsWith(this.ensureGitRelPath(fDir))) : true,
+        });
+        const warningMatrix = statusMatrix.filter((row) => [
+            [0, 2, 3],
+            [1, 0, 3],
+            [1, 2, 3],
+            [1, 1, 0],
+            [1, 2, 0],
+            [0, 0, 3],
+            [1, 1, 3],
+            [1, 2, 1],
+            [1, 0, 1],
+            [0, 2, 0], // new, untracked
+        ].some((a) => a.every((val, index) => val === row.slice(1)[index])));
+        if (warningMatrix.length) {
+            const buildWarningArray = (warnings) => {
+                const LifecycleInstance = Lifecycle.getInstance();
+                const emitWarningArray = [];
+                warnings.forEach((warning) => {
+                    const filteredChanges = warningMatrix
+                        .filter((row) => warning.filter.some((a) => a.every((val, index) => val === row.slice(1)[index])))
+                        .map((row) => path.join(this.gitDir, ensureOSPath(row[0])));
+                    for (const file of filteredChanges) {
+                        emitWarningArray.push(LifecycleInstance.emitWarning(util.format(warning.message, file)));
+                    }
+                });
+                return emitWarningArray;
+            };
+            // prettier-ignore
+            await Promise.all(buildWarningArray([
+                { filter: [[0, 2, 3], [1, 0, 3], [1, 2, 3], [1, 1, 0], [1, 2, 0]], message: 'The staged file with unstaged changes "%s" was processed.', },
+                { filter: [[0, 0, 3], [1, 1, 3]], message: 'The staged file with unstaged changes "%s" was ignored.', },
+                { filter: [[1, 2, 1], [1, 0, 1]], message: 'The unstaged file "%s" was processed.', },
+                { filter: [[0, 2, 0]], message: 'The untracked file "%s" was ignored.', },
+            ]));
+        }
+        const gitlines = statusMatrix
+            .filter((row) => ![
+            [0, 0, 0],
+            [1, 1, 1],
+            [0, 0, 3],
+            [0, 2, 0],
+            [1, 1, 3], // modified, staged, with unstaged original file
+        ].some((a) => a.every((val, index) => val === row.slice(1)[index])))
+            .map((row) => ({
+            path: path.join(this.gitDir, ensureOSPath(row[0])),
+            status: getStatusText(row.slice(1)),
+        }));
+        return gitlines;
+    }
+    async getFileState(options) {
+        const gitDir = this.gitDir;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return git.walk({
+            fs,
+            dir: this.gitDir,
+            trees: [git.TREE({ ref: options.ref1 }), git.TREE({ ref: options.ref2 })],
+            async map(filepath, [A, B]) {
+                if (filepath === '.' || (await A?.type()) === 'tree' || (await B?.type()) === 'tree') {
+                    return;
+                }
+                const Aoid = await A?.oid();
+                const Boid = await B?.oid();
+                let type = 'EQ';
+                if (Aoid !== Boid) {
+                    type = 'M';
+                }
+                if (Aoid === undefined) {
+                    type = 'A';
+                }
+                if (Boid === undefined) {
+                    type = 'D';
+                }
+                if (type !== 'EQ') {
+                    return {
+                        path: path.join(gitDir, ensureOSPath(filepath)),
+                        status: type,
+                    };
+                }
+            },
+        });
+    }
+    async listFullPathFiles(ref) {
+        return (await git.listFiles({ fs, dir: this.gitDir, ref })).map((p) => path.join(this.gitDir, ensureOSPath(p)));
+    }
+    async getOid(ref) {
+        return ref ? git.resolveRef({ fs, dir: this.gitDir, ref }) : '';
+    }
+    async readBlobAsBuffer(options) {
+        return Buffer.from((await git.readBlob({
+            fs,
+            dir: this.gitDir,
+            oid: options.oid,
+            filepath: this.ensureGitRelPath(options.filename),
+        })).blob);
+    }
+    async getCommitLog(ref) {
+        try {
+            const [log] = await git.log({
+                fs,
+                dir: this.gitDir,
+                ref,
+                depth: 1,
+            });
+            return { oid: log.oid, parents: log.commit.parent };
+        }
+        catch (error) {
+            throw new Error(`ambiguous argument '${ref}': unknown revision or path not in the working tree.
+  See more help with --help`);
+        }
+    }
+    ensureGitRelPath(fpath) {
+        return path.relative(this.gitDir, fpath).split(path.sep).join(path.posix.sep);
+    }
+}
+GitRepo.instanceMap = new Map();
+function ensureOSPath(fpath) {
+    return fpath.split(path.posix.sep).join(path.sep);
+}
+//# sourceMappingURL=localGitRepo.js.map

package/lib/SDR-extra/utils/localGitRepo.js.map

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

package/lib/commands/jayree/manifest/beta/git/diff.d.ts

@@ -1,6 +1,6 @@
 import { ArgInput } from '@oclif/core/lib/interfaces';
-import { FlagsConfig } from '@salesforce/command';
-import { JayreeSfdxCommand } from '../../../../../jayreeSfdxCommand.js';
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { Optional } from '@salesforce/ts-types';
 export interface GitDiffCommandResult {
     manifest?: {
         path: string;
@@ -11,14 +11,18 @@ export interface GitDiffCommandResult {
         name: string;
     };
 }
-export default class GitDiffCommand extends JayreeSfdxCommand {
-    static description: string;
-    static examples: string[];
-    static args: ArgInput;
-    protected static flagsConfig: FlagsConfig;
-    protected static requiresUsername: boolean;
-    protected static supportsDevhubUsername: boolean;
-    protected static requiresProject: boolean;
+export default class GitDiffCommand extends SfCommand<GitDiffCommandResult> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly args: ArgInput;
+    static readonly requiresProject = true;
+    static readonly flags: {
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        'output-dir': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'destructive-changes-only': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
     private outputDir;
     private manifestName;
     private destructiveChangesName;
@@ -26,6 +30,7 @@ export default class GitDiffCommand extends JayreeSfdxCommand {
     private componentSet;
     private destructiveChangesOnly;
     run(): Promise<GitDiffCommandResult>;
+    protected getSourceApiVersion(): Promise<Optional<string>>;
     protected createManifest(): Promise<void>;
     protected formatResult(): GitDiffCommandResult;
 }

package/lib/commands/jayree/manifest/beta/git/diff.js

@@ -4,31 +4,40 @@
  * 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 os from 'os';
-import { join } from 'path';
-import { flags } from '@salesforce/command';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { Messages } from '@salesforce/core';
 import fs from 'fs-extra';
 import { DestructiveChangesType } from '@salesforce/source-deploy-retrieve';
-import { JayreeSfdxCommand } from '../../../../../jayreeSfdxCommand.js';
-import { ComponentSetExtra } from '../../../../../SDR-extra/collections/componentSetExtra.js';
-Messages.importMessagesDirectory(new URL('./', import.meta.url).pathname);
+import { SfCommand, Flags, orgApiVersionFlagWithDeprecations, arrayWithDeprecation } from '@salesforce/sf-plugins-core';
+import { getString } from '@salesforce/ts-types';
+import { ComponentSetExtra } from '../../../../../SDR-extra/index.js';
+// eslint-disable-next-line no-underscore-dangle
+const __filename = fileURLToPath(import.meta.url);
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = dirname(__filename);
+Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'gitdiffbeta');
-export default class GitDiffCommand extends JayreeSfdxCommand {
+export default class GitDiffCommand extends SfCommand {
     async run() {
         await this.createManifest();
         return this.formatResult();
     }
+    async getSourceApiVersion() {
+        const projectConfig = await this.project.resolveProjectConfig();
+        return getString(projectConfig, 'sourceApiVersion');
+    }
     async createManifest() {
+        const { flags, args } = await this.parse(GitDiffCommand);
         this.manifestName = 'package.xml';
         this.destructiveChangesName = 'destructiveChanges.xml';
-        this.outputDir = this.getFlag('outputdir');
-        this.destructiveChangesOnly = this.getFlag('destructivechangesonly');
+        this.outputDir = flags['output-dir'];
+        this.destructiveChangesOnly = flags['destructive-changes-only'];
         this.componentSet = await ComponentSetExtra.fromGitDiff({
-            ref: [this.args.ref1, this.args.ref2],
-            fsPaths: this.getFlag('sourcepath'),
+            ref: [args.ref1, args.ref2],
+            fsPaths: flags['source-dir'],
         });
-        this.componentSet.sourceApiVersion = this.getFlag('apiversion') ?? (await this.getSourceApiVersion());
+        this.componentSet.sourceApiVersion = flags['api-version'] ?? (await this.getSourceApiVersion());
         if (this.outputDir) {
             await fs.ensureDir(this.outputDir);
             this.outputPath = join(this.outputDir, this.manifestName);
@@ -52,26 +61,26 @@ export default class GitDiffCommand extends JayreeSfdxCommand {
         }
     }
     formatResult() {
-        if (!this.isJsonOutput()) {
+        if (!this.jsonEnabled()) {
             if (this.componentSet.size) {
                 if (this.destructiveChangesOnly && !this.componentSet.getTypesOfDestructiveChanges().length) {
-                    this.ux.log(messages.getMessage('nocomponents'));
+                    this.log(messages.getMessage('noComponents'));
                 }
                 else if (this.outputDir) {
-                    this.ux.log(messages.getMessage('successOutputDir', [this.manifestName, this.outputDir]));
+                    this.log(messages.getMessage('successOutputDir', [this.manifestName, this.outputDir]));
                     if (this.componentSet.getTypesOfDestructiveChanges().length) {
-                        this.ux.log(messages.getMessage('successOutputDir', [this.destructiveChangesName, this.outputDir]));
+                        this.log(messages.getMessage('successOutputDir', [this.destructiveChangesName, this.outputDir]));
                     }
                 }
                 else {
-                    this.ux.log(messages.getMessage('success', [this.manifestName]));
+                    this.log(messages.getMessage('success', [this.manifestName]));
                     if (this.componentSet.getTypesOfDestructiveChanges().length) {
-                        this.ux.log(messages.getMessage('success', [this.destructiveChangesName]));
+                        this.log(messages.getMessage('success', [this.destructiveChangesName]));
                     }
                 }
             }
             else {
-                this.ux.log(messages.getMessage('nocomponents'));
+                this.log(messages.getMessage('noComponents'));
             }
         }
         if (this.componentSet.getTypesOfDestructiveChanges().length) {
@@ -91,8 +100,9 @@ export default class GitDiffCommand extends JayreeSfdxCommand {
         }
     }
 }
+GitDiffCommand.summary = messages.getMessage('summary');
 GitDiffCommand.description = messages.getMessage('description');
-GitDiffCommand.examples = messages.getMessage('examples').split(os.EOL);
+GitDiffCommand.examples = messages.getMessages('examples');
 GitDiffCommand.args = [
     {
         name: 'ref1',
@@ -104,24 +114,28 @@ GitDiffCommand.args = [
         description: 'commit or branch to compare to the base commit',
     },
 ];
-GitDiffCommand.flagsConfig = {
-    apiversion: flags.builtin({}),
-    sourcepath: flags.array({
-        char: 'p',
-        description: messages.getMessage('flags.sourcepath'),
+GitDiffCommand.requiresProject = true;
+GitDiffCommand.flags = {
+    'api-version': orgApiVersionFlagWithDeprecations,
+    'source-dir': arrayWithDeprecation({
+        char: 'd',
+        summary: messages.getMessage('flags.source-dir.summary'),
+        description: messages.getMessage('flags.source-dir.description'),
+        deprecateAliases: true,
+        aliases: ['sourcepath', 'p'],
     }),
-    outputdir: flags.string({
-        char: 'o',
-        description: messages.getMessage('flags.outputdir'),
+    'output-dir': Flags.directory({
+        summary: messages.getMessage('flags.output-dir.summary'),
+        description: messages.getMessage('flags.output-dir.description'),
         default: '',
+        deprecateAliases: true,
+        aliases: ['outputdir', 'o'],
     }),
-    destructivechangesonly: flags.boolean({
-        char: 'd',
-        description: messages.getMessage('flags.destructivechangesonly'),
-        default: false,
+    'destructive-changes-only': Flags.boolean({
+        summary: messages.getMessage('flags.destructive-changes-only.summary'),
+        description: messages.getMessage('flags.destructive-changes-only.description'),
+        deprecateAliases: true,
+        aliases: ['destructivechangesonly'],
     }),
 };
-GitDiffCommand.requiresUsername = false;
-GitDiffCommand.supportsDevhubUsername = false;
-GitDiffCommand.requiresProject = true;
 //# sourceMappingURL=diff.js.map

package/lib/commands/jayree/manifest/beta/git/diff.js.map

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

package/lib/commands/jayree/manifest/cleanup.js

@@ -5,12 +5,18 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import os from 'os';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { flags } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
 import fs from 'fs-extra';
 import { JayreeSfdxCommand } from '../../../jayreeSfdxCommand.js';
 import { cleanupManifestFile } from '../../../utils/manifest.js';
-Messages.importMessagesDirectory(new URL('./', import.meta.url).pathname);
+// eslint-disable-next-line no-underscore-dangle
+const __filename = fileURLToPath(import.meta.url);
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = dirname(__filename);
+Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'manifestcleanup');
 export default class CleanupManifest extends JayreeSfdxCommand {
     async run() {

package/lib/commands/jayree/manifest/cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/cleanup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,KAAK,EAAe,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,QAAQ,CAAC,uBAAuB,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;AAE1E,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,iBAAiB,CAAC,CAAC;AAE1F,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,iBAAiB;IAoBrD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAS,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;YAChC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,EAAE,CAAC,SAAS,CAChB,IAAI,EACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BP,CACM,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,mCAAmC,IAAI,eAAe,CAAC,CAAC;SACrE;aAAM;YACL,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAS,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;SACnE;QACD,OAAO;IACT,CAAC;;AA3Da,2BAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAExD,wBAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AAEtD,2BAAW,GAAgB;IAC1C,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;QACvB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;KAC5D,CAAC;IACF,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;KACxD,CAAC;CACH,CAAC;AAEe,gCAAgB,GAAG,KAAK,CAAC;AACzB,sCAAsB,GAAG,KAAK,CAAC;AAC/B,+BAAe,GAAG,IAAI,CAAC"}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../src/commands/jayree/manifest/cleanup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,EAAe,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,QAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,iBAAiB,CAAC,CAAC;AAE1F,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,iBAAiB;IAoBrD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAS,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;YAChC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,EAAE,CAAC,SAAS,CAChB,IAAI,EACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BP,CACM,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,mCAAmC,IAAI,eAAe,CAAC,CAAC;SACrE;aAAM;YACL,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAS,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;SACnE;QACD,OAAO;IACT,CAAC;;AA3Da,2BAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAExD,wBAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AAEtD,2BAAW,GAAgB;IAC1C,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;QACvB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;KAC5D,CAAC;IACF,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;KACxD,CAAC;CACH,CAAC;AAEe,gCAAgB,GAAG,KAAK,CAAC;AACzB,sCAAsB,GAAG,KAAK,CAAC;AAC/B,+BAAe,GAAG,IAAI,CAAC"}

package/lib/commands/jayree/manifest/generate.js

@@ -5,14 +5,20 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import os from 'os';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { flags } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
 import { RegistryAccess, ComponentSet } from '@salesforce/source-deploy-retrieve';
 import { ensureArray } from '@salesforce/kit';
 import fs from 'fs-extra';
 import { JayreeSfdxCommand } from '../../../jayreeSfdxCommand.js';
+// eslint-disable-next-line no-underscore-dangle
+const __filename = fileURLToPath(import.meta.url);
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = dirname(__filename);
+Messages.importMessagesDirectory(__dirname);
 const registryAccess = new RegistryAccess();
-Messages.importMessagesDirectory(new URL('./', import.meta.url).pathname);
 const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'manifestgenerate');
 export default class GeneratePackageXML extends JayreeSfdxCommand {
     // eslint-disable-next-line complexity

package/lib/commands/jayree/manifest/generate.js.map

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

package/lib/commands/jayree/manifest/git/diff.js

@@ -5,7 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import os from 'os';
-import { join, dirname, resolve } from 'path';
+import { join, dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { flags } from '@salesforce/command';
 import { Messages, SfError } from '@salesforce/core';
 import fs from 'fs-extra';
@@ -14,7 +15,11 @@ import kit from '@salesforce/kit';
 import { DestructiveChangesType } from '@salesforce/source-deploy-retrieve';
 import { JayreeSfdxCommand } from '../../../../jayreeSfdxCommand.js';
 import { getGitResults, createVirtualTreeContainer, fixComponentSetChilds, getGitDiff, debug, getGitArgsFromArgv, } from '../../../../utils/gitdiff.js';
-Messages.importMessagesDirectory(new URL('./', import.meta.url).pathname);
+// eslint-disable-next-line no-underscore-dangle
+const __filename = fileURLToPath(import.meta.url);
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = dirname(__filename);
+Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@jayree/sfdx-plugin-manifest', 'gitdiff');
 const logger = new Logger({ useIcons: false });
 // eslint-disable-next-line @typescript-eslint/require-await