@jayree/sfdx-plugin-manifest 2.5.3 → 2.6.1

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [2.6.1](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.6.0...v2.6.1) (2023-01-01)
+
+
+### Bug Fixes
+
+* update changelog ([0829ae1](https://github.com/jayree/sfdx-plugin-manifest/commit/0829ae1362fec75ede6c8d63f669fabb6d6c1243))
+
+# [2.6.0](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.5.3...v2.6.0) (2023-01-01)
+
+
+### Bug Fixes
+
+* **gitdiff:** fix diff status of childComponents ([ef13e60](https://github.com/jayree/sfdx-plugin-manifest/commit/ef13e600df02bf23aa764084686c0eb789055c20))
+
+
+### Features
+
+* **manifest:beta:git:diff:** added new beta command manifest:beta:git:diff ([f4b6242](https://github.com/jayree/sfdx-plugin-manifest/commit/f4b6242e52a4a04d1279e2090dcf1fe37aca2ff2))
+
+I recommend that you try the new manifest:beta:git:diff command.\
+I plan to make the beta command generally available in the near future.
+
 ## [2.5.3](https://github.com/jayree/sfdx-plugin-manifest/compare/v2.5.2...v2.5.3) (2022-12-31)
 
 

package/README.md

@@ -22,7 +22,7 @@ $ sfdx plugins:install @jayree/sfdx-plugin-manifest
 $ sfdx jayree:[COMMAND]
 running command...
 $ sfdx plugins
-@jayree/sfdx-plugin-manifest 2.5.3
+@jayree/sfdx-plugin-manifest 2.6.1
 $ sfdx help jayree:[COMMAND]
 USAGE
   $ sfdx jayree:COMMAND
@@ -33,10 +33,69 @@ USAGE
 ## Commands
 
 <!-- commands -->
+* [`sfdx jayree:manifest:beta:git:diff`](#sfdx-jayreemanifestbetagitdiff)
 * [`sfdx jayree:manifest:cleanup`](#sfdx-jayreemanifestcleanup)
 * [`sfdx jayree:manifest:generate`](#sfdx-jayreemanifestgenerate)
 * [`sfdx jayree:manifest:git:diff`](#sfdx-jayreemanifestgitdiff)
 
+### `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
+
+```
+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]
+
+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
+
+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
+  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)
+
+EXAMPLES
+  $ sfdx jayree:manifest:beta:git:diff <commit> <commit>
+
+  $ sfdx jayree:manifest:git:diff <commit>..<commit>
+
+  uses the changes between two arbitrary <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>.
+
+  $ sfdx jayree:manifest:beta:git:diff branchA..branchB
+
+  uses the diff of what is unique in branchB (REF2) and unique in branchA (REF1)
+
+  $ sfdx jayree:manifest:beta:git:diff branchA...branchB
+
+  uses the diff of what is unique in branchB (REF2)
+```
+
+_See code: [src/commands/jayree/manifest/beta/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.6.1/src/commands/jayree/manifest/beta/git/diff.ts)_
+
 ### `sfdx jayree:manifest:cleanup`
 
 removes those tags from a manifest file that are present in a second manifest file
@@ -63,7 +122,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.5.3/src/commands/jayree/manifest/cleanup.ts)_
+_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.6.1/src/commands/jayree/manifest/cleanup.ts)_
 
 ### `sfdx jayree:manifest:generate`
 
@@ -106,7 +165,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.5.3/src/commands/jayree/manifest/generate.ts)_
+_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v2.6.1/src/commands/jayree/manifest/generate.ts)_
 
 ### `sfdx jayree:manifest:git:diff`
 
@@ -160,5 +219,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.5.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.6.1/src/commands/jayree/manifest/git/diff.ts)_
 <!-- commandsstop -->

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

@@ -0,0 +1,38 @@
+import { ComponentSet, OptionalTreeRegistryOptions } from '@salesforce/source-deploy-retrieve';
+import Debug from 'debug';
+export declare const debug: Debug.Debugger;
+export interface FromGitDiffOptions extends OptionalTreeRegistryOptions {
+    /**
+     * Git ref to resolve components against
+     */
+    ref: string | string[];
+    /**
+     * File paths or directory paths to resolve components against
+     */
+    fsPaths?: string[];
+}
+export declare class ComponentSetExtra extends ComponentSet {
+    /**
+     * Resolve metadata components from git diff <ref> HEAD.
+     *
+     * @param ref Git ref to resolve components against HEAD
+     * @returns ComponentSet of source resolved components
+     */
+    static fromGitDiff(ref: string): Promise<ComponentSet>;
+    /**
+     * Resolve metadata components from git diff <ref1> <ref2>.
+     *
+     * @param refs Git refs to resolve components against
+     * @returns ComponentSet of source resolved components
+     */
+    static fromGitDiff(refs: string[]): Promise<ComponentSet>;
+    /**
+     * Resolve metadata components from git diff.
+     * Customize the resolution process using an options object, such as specifying filters
+     * and resolving against a different file system abstraction (see {@link TreeContainer}).
+     *
+     * @param options
+     * @returns ComponentSet of source resolved components
+     */
+    static fromGitDiff(options: FromGitDiffOptions): Promise<ComponentSet>;
+}

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

@@ -0,0 +1,66 @@
+/*
+ * 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 { ComponentSet, DestructiveChangesType, registry as untypedRegistry, } from '@salesforce/source-deploy-retrieve';
+import { SfProject } from '@salesforce/core';
+import Debug from 'debug';
+import { GitDiffResolver } from '../resolve/gitDiffResolver.js';
+export const debug = Debug('sf:gitDiff:ComponentSetExtra');
+export class ComponentSetExtra extends ComponentSet {
+    static async fromGitDiff(input) {
+        let fsPaths;
+        let registry;
+        let tree;
+        let ref1;
+        let ref2;
+        if (Array.isArray(input)) {
+            ref1 = input[0];
+            ref2 = input[1];
+        }
+        else if (typeof input === 'object') {
+            if (Array.isArray(input.ref)) {
+                ref1 = input.ref[0];
+                ref2 = input.ref[1];
+            }
+            else {
+                ref1 = input.ref;
+            }
+            fsPaths = input.fsPaths;
+            registry = input.registry ?? registry;
+            tree = input.tree ?? tree;
+        }
+        else {
+            ref1 = input;
+        }
+        const proj = await SfProject.resolve();
+        fsPaths = fsPaths || proj.getUniquePackageDirectories().map((pDir) => pDir.fullPath);
+        const gitDiffResolver = new GitDiffResolver();
+        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 (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);
+            }
+        }
+        return components;
+    }
+}
+//# sourceMappingURL=componentSetExtra.js.map

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

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

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

@@ -0,0 +1,18 @@
+import { ComponentSet } from '@salesforce/source-deploy-retrieve';
+import Debug from 'debug';
+export declare const debug: Debug.Debugger;
+/**
+ * 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;
+    resolve(ref1: string, ref2: string, fsPaths: string[]): Promise<ComponentSet>;
+    private getComponentSet;
+    private getChildComponentStatus;
+}

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 {};