@jayree/sfdx-plugin-manifest 2.5.2 → 2.6.0

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

@@ -0,0 +1,192 @@
+/*
+ * 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 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 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');
+const registryAccess = new RegistryAccess();
+/**
+ * Resolver for metadata type and component objects from a git diff result
+ *
+ * @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;
+        });
+        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 });
+            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 }),
+            ]);
+            ref1 = r1;
+            ref2 = r2;
+        }
+        debug({ ref1, ref2 });
+        const fileStatus = await GitDiffResolver.getFileStatus(ref1, ref2, proj.getPath(), fsPaths);
+        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)),
+        ]);
+        this.ref1VirtualTreeContainer = ref1VirtualTreeContainer;
+        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.`);
+            }
+            return filepath;
+        });
+        debug({ fsPaths });
+        this.ref1Resolver = new MetadataResolver(registryAccess, this.ref1VirtualTreeContainer);
+        this.ref2Resolver = new MetadataResolver(registryAccess, this.ref2VirtualTreeContainer);
+        return this.getComponentSet(fileStatus, fsPaths);
+    }
+    async getComponentSet(gitLines, fsPaths) {
+        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.
+                        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`);
+                            }
+                        }
+                        else {
+                            results.add(c, DestructiveChangesType.POST);
+                        }
+                    }
+                }
+                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) {
+                for (const c of this.ref2Resolver.getComponentsFromPath(check.path)) {
+                    results.add(c);
+                }
+            }
+            else if (check.status === -1) {
+                // unchanged file
+            }
+            else {
+                for (const c of check.toDestructiveChanges) {
+                    results.add(c, DestructiveChangesType.POST);
+                }
+                for (const c of check.toManifest) {
+                    results.add(c);
+                }
+            }
+        }
+        debug({
+            forceIgnoredPaths: {
+                ref1: Array.from(this.ref1Resolver.forceIgnoredPaths),
+                ref2: Array.from(this.ref2Resolver.forceIgnoredPaths),
+            },
+        });
+        return results;
+    }
+    async getChildComponentStatus(fpath) {
+        if (!parseMetadataXml(fpath)) {
+            return { path: fpath, status: 0 };
+        }
+        const [ref2Component] = this.ref2Resolver.getComponentsFromPath(fpath); // git path only conaints files
+        const [ref1Component] = this.ref1Resolver.getComponentsFromPath(fpath); // git path only conaints files
+        if (equal(await ref1Component.parseXml(), await ref2Component.parseXml())) {
+            return { path: fpath, status: -1 };
+        }
+        if (ref1Component.type.strictDirectoryName === true || !ref1Component.type.children) {
+            return { path: fpath, status: 0 };
+        }
+        const getUniqueIdentifier = (component) => `${component.type.name}#${component[component.type.uniqueIdElement]}`;
+        const ref2ChildUniqueIdArray = ref2Component
+            .getChildren()
+            .map((childComponent) => getUniqueIdentifier(childComponent));
+        const ref1ChildUniqueIdArray = ref1Component
+            .getChildren()
+            .map((childComponent) => getUniqueIdentifier(childComponent));
+        const childComponentsNotInRef2 = ref1Component
+            .getChildren()
+            .filter((childComponent) => !ref2ChildUniqueIdArray.includes(getUniqueIdentifier(childComponent))); // deleted
+        const childComponentsNotInRef1 = ref2Component
+            .getChildren()
+            .filter((childComponent) => !ref1ChildUniqueIdArray.includes(getUniqueIdentifier(childComponent))); // added
+        const childComponentsInRef1AndRef2 = ref1Component
+            .getChildren()
+            .filter((childComponent) => ref2ChildUniqueIdArray.includes(getUniqueIdentifier(childComponent))); // modified?
+        for await (const childComponentRef1 of childComponentsInRef1AndRef2) {
+            const [childComponentRef2] = ref2Component
+                .getChildren()
+                .filter((childComponent) => getUniqueIdentifier(childComponentRef1) === getUniqueIdentifier(childComponent));
+            if (!equal(await childComponentRef1.parseXml(), await childComponentRef2.parseXml())) {
+                childComponentsNotInRef1.push(childComponentRef2); // modified! -> add to added
+            }
+        }
+        return {
+            path: fpath,
+            status: 1 + childComponentsNotInRef2.length + childComponentsNotInRef1.length,
+            toManifest: childComponentsNotInRef1,
+            toDestructiveChanges: childComponentsNotInRef2,
+        };
+    }
+}
+//# sourceMappingURL=gitDiffResolver.js.map

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

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

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

@@ -0,0 +1,13 @@
+import { VirtualTreeContainer } from '@salesforce/source-deploy-retrieve';
+export declare class VirtualTreeContainerExtra extends VirtualTreeContainer {
+    /**
+     * Designed for recreating virtual files from a git ref
+     * To support use of MetadataResolver to also resolve metadata xmls file names can be provided
+     *
+     * @param ref git ref
+     * @param dir git dir
+     * @param includeBufferForFiles full paths to modified files
+     * @returns VirtualTreeContainer
+     */
+    static fromGitRef(ref: string, dir: string, includeBufferForFiles: string[]): Promise<VirtualTreeContainer>;
+}

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

@@ -0,0 +1,51 @@
+/*
+ * 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 path from 'path';
+import { VirtualTreeContainer } from '@salesforce/source-deploy-retrieve';
+import { parseMetadataXml } from '@salesforce/source-deploy-retrieve/lib/src/utils/index.js';
+import fs from 'fs-extra';
+import { listFullPathFiles, getOid, readBlobAsBuffer } from '../utils/git-extra.js';
+export class VirtualTreeContainerExtra extends VirtualTreeContainer {
+    /**
+     * Designed for recreating virtual files from a git ref
+     * To support use of MetadataResolver to also resolve metadata xmls file names can be provided
+     *
+     * @param ref git ref
+     * @param dir git dir
+     * @param includeBufferForFiles full paths to modified files
+     * @returns VirtualTreeContainer
+     */
+    static async fromGitRef(ref, dir, includeBufferForFiles) {
+        const paths = await listFullPathFiles(dir, ref);
+        const oid = await getOid(dir, ref);
+        const virtualDirectoryByFullPath = new Map();
+        for await (const filename of paths) {
+            let dirPath = path.dirname(filename);
+            virtualDirectoryByFullPath.set(dirPath, {
+                dirPath,
+                children: Array.from(new Set(virtualDirectoryByFullPath.get(dirPath)?.children ?? []).add({
+                    name: path.basename(filename),
+                    data: parseMetadataXml(filename) && includeBufferForFiles.includes(filename)
+                        ? oid
+                            ? await readBlobAsBuffer(dir, oid, filename)
+                            : await fs.readFile(filename)
+                        : Buffer.from(''),
+                })),
+            });
+            const splits = filename.split(path.sep);
+            for (let i = 1; i < splits.length - 1; i++) {
+                dirPath = splits.slice(0, i + 1).join(path.sep);
+                virtualDirectoryByFullPath.set(dirPath, {
+                    dirPath,
+                    children: Array.from(new Set(virtualDirectoryByFullPath.get(dirPath)?.children ?? []).add(splits[i + 1])),
+                });
+            }
+        }
+        return new VirtualTreeContainer(Array.from(virtualDirectoryByFullPath.values()));
+    }
+}
+//# sourceMappingURL=treeContainersExtra.js.map

package/lib/SDR-extra/resolve/treeContainersExtra.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"treeContainersExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/treeContainersExtra.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEpF,MAAM,OAAO,yBAA0B,SAAQ,oBAAoB;IACjE;;;;;;;;OAQG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAC5B,GAAW,EACX,GAAW,EACX,qBAA+B;QAE/B,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACnC,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAA4B,CAAC;QACvE,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,KAAK,EAAE;YAClC,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACrC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE;gBACtC,OAAO;gBACP,QAAQ,EAAE,KAAK,CAAC,IAAI,CAClB,IAAI,GAAG,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC;oBACnE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC7B,IAAI,EACF,gBAAgB,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBACpE,CAAC,CAAC,GAAG;4BACH,CAAC,CAAC,MAAM,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC;4BAC5C,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;iBACtB,CAAC,CACH;aACF,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1C,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAChD,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE;oBACtC,OAAO;oBACP,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAC1G,CAAC,CAAC;aACJ;SACF;QACD,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACnF,CAAC;CACF"}

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

@@ -0,0 +1,65 @@
+/// <reference types="node" resolution-mode="require"/>
+import { CallbackFsClient, PromiseFsClient } from 'isomorphic-git';
+import Debug from 'debug';
+export declare const debug: Debug.Debugger;
+export interface GetCommitLogOptions {
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    ref: string;
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    dir: string;
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    fs: CallbackFsClient | PromiseFsClient;
+}
+interface MultiRefStringOptions {
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    ref: string;
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    dir: string;
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    fs: CallbackFsClient | PromiseFsClient;
+}
+export declare function resolveMultiRefString(options: MultiRefStringOptions): Promise<{
+    ref1: string;
+    ref2: string;
+}>;
+interface SingleRefStringOptions {
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    ref: string;
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    dir: string;
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    fs: CallbackFsClient | PromiseFsClient;
+}
+export declare function resolveSingleRefString(options: SingleRefStringOptions): Promise<string>;
+export declare function getFileState(commitHash1: string, commitHash2: string, dir: string): Promise<[
+    {
+        path: string;
+        status: string;
+    }
+]>;
+export declare function getStatus(dir: string, ref: string): Promise<Array<{
+    path: string;
+    status: string;
+}>>;
+export declare function listFullPathFiles(dir: string, ref: string): Promise<string[]>;
+export declare function getOid(dir: string, ref: string): Promise<string>;
+export declare function readBlobAsBuffer(dir: string, oid: string, filename: string): Promise<Buffer>;
+export {};

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

@@ -0,0 +1,198 @@
+/*
+ * 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 'path';
+import git from 'isomorphic-git';
+import fs from 'fs-extra';
+import Debug from 'debug';
+export const debug = Debug('sf:gitDiff:extra');
+async function getCommitLog(options) {
+    try {
+        const [log] = await git.log({
+            fs: options.fs,
+            dir: options.dir,
+            ref: options.ref,
+            depth: 1,
+        });
+        return { oid: log.oid, parents: log.commit.parent };
+    }
+    catch (error) {
+        throw new Error(`ambiguous argument '${options.ref}': unknown revision or path not in the working tree.
+See more help with --help`);
+    }
+}
+export async function resolveMultiRefString(options) {
+    const a = options.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', options.ref.length === 1 ? '' : 's')}: ${options.ref}
+See more help with --help`);
+    }
+    if (a.length === 4) {
+        ref1 = (await git.findMergeBase({
+            fs: options.fs,
+            dir: options.dir,
+            oids: [ref2, ref1],
+        }))[0];
+    }
+    else {
+        ref1 = await resolveSingleRefString({ ref: ref1, dir: options.dir, fs: options.fs });
+    }
+    ref2 = await resolveSingleRefString({ ref: ref2, dir: options.dir, fs: options.fs });
+    return { ref1, ref2 };
+}
+export async function resolveSingleRefString(options) {
+    if (options.ref === undefined) {
+        return '';
+    }
+    if (!['~', '^'].some((el) => options.ref.includes(el))) {
+        return (await getCommitLog({ ref: options.ref, fs: options.fs, dir: options.dir })).oid;
+    }
+    const firstIndex = [options.ref.indexOf('^'), options.ref.indexOf('~')]
+        .filter((a) => a >= 0)
+        .reduce((a, b) => Math.min(a, b));
+    let ipath = options.ref.substring(firstIndex);
+    let resolvedRef = options.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 getCommitLog({ ref: resolvedRef, fs: options.fs, dir: options.dir })).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 getCommitLog({ ref: resolvedRef, fs: options.fs, dir: options.dir })).parents[0];
+            }
+        }
+        else {
+            resolvedRef = undefined;
+        }
+    }
+    if (resolvedRef === undefined) {
+        throw new Error(`ambiguous argument '${options.ref}': unknown revision or path not in the working tree.`);
+    }
+    return resolvedRef;
+}
+export async function getFileState(commitHash1, commitHash2, dir) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return git.walk({
+        fs,
+        dir,
+        trees: [git.TREE({ ref: commitHash1 }), git.TREE({ ref: commitHash2 })],
+        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(dir, ensureOSPath(filepath)),
+                    status: type,
+                };
+            }
+        },
+    });
+}
+export async function getStatus(dir, 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, ref });
+    const unstaged = statusMatrix
+        .filter((row) => [
+        [0, 2, 0],
+        [0, 0, 3],
+        [0, 2, 3],
+        [1, 2, 1],
+        [1, 0, 3],
+        [1, 1, 3],
+        [1, 2, 3],
+        [1, 1, 0],
+        [1, 2, 0],
+        [1, 0, 1], // deleted, unstaged
+    ].some((a) => a.every((val, index) => val === row.slice(1)[index])))
+        .map((row) => path.join(dir, ensureOSPath(row[0])));
+    debug({ unstaged });
+    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(dir, ensureOSPath(row[0])),
+        status: getStatusText(row.slice(1)),
+    }));
+    return gitlines;
+}
+function ensureOSPath(fpath) {
+    return fpath.split(path.posix.sep).join(path.sep);
+}
+function ensureGitRelPath(dir, fpath) {
+    return path.relative(dir, fpath).split(path.sep).join(path.posix.sep);
+}
+export async function listFullPathFiles(dir, ref) {
+    return (await git.listFiles({ fs, dir, ref })).map((p) => path.join(dir, ensureOSPath(p)));
+}
+export async function getOid(dir, ref) {
+    return ref ? git.resolveRef({ fs, dir, ref }) : '';
+}
+export async function readBlobAsBuffer(dir, oid, filename) {
+    return Buffer.from((await git.readBlob({ fs, dir, oid, filepath: ensureGitRelPath(dir, filename) })).blob);
+}
+//# sourceMappingURL=git-extra.js.map

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

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

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

@@ -0,0 +1,32 @@
+import { ArgInput } from '@oclif/core/lib/interfaces';
+import { FlagsConfig } from '@salesforce/command';
+import { JayreeSfdxCommand } from '../../../../../jayreeSfdxCommand.js';
+interface CreateCommandResult {
+    manifest?: {
+        path: string;
+        name: string;
+    };
+    destructiveChanges?: {
+        path: string;
+        name: string;
+    };
+}
+export default class gitDiff 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;
+    private outputDir;
+    private manifestName;
+    private destructiveChangesName;
+    private outputPath;
+    private componentSet;
+    private destructiveChangesOnly;
+    run(): Promise<CreateCommandResult>;
+    protected createManifest(): Promise<void>;
+    protected formatResult(): CreateCommandResult;
+}
+export {};