sf-git-merge-driver 1.0.0-dev-3.13992313901-1 → 1.0.0-dev-3.14022905562-1

package/README.md

@@ -47,7 +47,7 @@ EXAMPLES
     $ sf git merge driver install
 ```
 
-_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.13992313901-1/src/commands/git/merge/driver/install.ts)_
+_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14022905562-1/src/commands/git/merge/driver/install.ts)_
 
 ## `sf git merge driver run`
 
@@ -85,7 +85,7 @@ EXAMPLES
   - output-file is the path to the file where the merged content will be written
 ```
 
-_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.13992313901-1/src/commands/git/merge/driver/run.ts)_
+_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14022905562-1/src/commands/git/merge/driver/run.ts)_
 
 ## `sf git merge driver uninstall`
 
@@ -112,7 +112,7 @@ EXAMPLES
     $ sf git merge driver uninstall
 ```
 
-_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.13992313901-1/src/commands/git/merge/driver/uninstall.ts)_
+_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14022905562-1/src/commands/git/merge/driver/uninstall.ts)_
 <!-- commandsstop -->
 
 ## How It Works

package/lib/constant/conflicConstant.d.ts

@@ -0,0 +1,6 @@
+export declare const BASE = "||||||| BASE";
+export declare const LOCAL = "<<<<<<< LOCAL";
+export declare const NEWLINE = "\n";
+export declare const REMOTE = ">>>>>>> REMOTE";
+export declare const SEPARATOR = "=======";
+export declare const TEXT_TAG = "#text";

package/lib/constant/conflicConstant.js

@@ -0,0 +1,7 @@
+export const BASE = '||||||| BASE';
+export const LOCAL = '<<<<<<< LOCAL';
+export const NEWLINE = '\n';
+export const REMOTE = '>>>>>>> REMOTE';
+export const SEPARATOR = '=======';
+export const TEXT_TAG = '#text';
+//# sourceMappingURL=conflicConstant.js.map

package/lib/constant/conflicConstant.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflicConstant.js","sourceRoot":"","sources":["../../src/constant/conflicConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,IAAI,GAAG,cAAc,CAAA;AAClC,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAA;AACpC,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,CAAA;AAC3B,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAA;AACtC,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,CAAA;AAClC,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAA"}

package/lib/constant/metadataConstant.d.ts

@@ -1,54 +1,5 @@
-export declare const KEY_FIELD_METADATA: {
-    marketingAppExtActivities: string;
-    alerts: string;
-    fieldUpdates: string;
-    flowActions: string;
-    outboundMessages: string;
-    rules: string;
-    knowledgePublishes: string;
-    tasks: string;
-    send: string;
-    sharingCriteriaRules: string;
-    sharingGuestRules: string;
-    sharingOwnerRules: string;
-    sharingTerritoryRules: string;
-    assignmentRule: string;
-    autoResponseRule: string;
-    escalationRule: string;
-    matchingRules: string;
-    valueTranslation: string;
-    categoryGroupVisibilities: string;
-    applicationVisibilities: string;
-    classAccesses: string;
-    customMetadataTypeAccesses: string;
-    customPermissions: string;
-    customSettingAccesses: string;
-    externalDataSourceAccesses: string;
-    fieldPermissions: string;
-    flowAccesses: string;
-    loginFlows: string;
-    layoutAssignments: string;
-    loginHours: string;
-    loginIpRanges: string;
-    objectPermissions: string;
-    pageAccesses: string;
-    profileActionOverrides: string;
-    recordTypeVisibilities: string;
-    tabVisibilities: string;
-    userPermissions: string;
-    bots: string;
-    customApplications: string;
-    customLabels: string;
-    customPageWebLinks: string;
-    customTabs: string;
-    flowDefinitions: string;
-    pipelineInspMetricConfigs: string;
-    prompts: string;
-    quickActions: string;
-    reportTypes: string;
-    scontrols: string;
-    standardValue: string;
-    customValue: string;
-    labels: string;
-};
+/**
+ * Note: KEY_FIELD_METADATA has been moved to MetadataService
+ * @see MetadataService for key field extraction logic
+ */
 export declare const METADATA_TYPES_PATTERNS: string[];

package/lib/constant/metadataConstant.js

@@ -1,56 +1,7 @@
-export const KEY_FIELD_METADATA = {
-    marketingAppExtActivities: 'fullName',
-    alerts: 'fullName',
-    fieldUpdates: 'fullName',
-    flowActions: 'fullName',
-    outboundMessages: 'fullName',
-    rules: 'fullName',
-    knowledgePublishes: 'fullName',
-    tasks: 'fullName',
-    send: 'fullName',
-    sharingCriteriaRules: 'fullName',
-    sharingGuestRules: 'fullName',
-    sharingOwnerRules: 'fullName',
-    sharingTerritoryRules: 'fullName',
-    assignmentRule: 'fullName',
-    autoResponseRule: 'fullName',
-    escalationRule: 'fullName',
-    matchingRules: 'fullName',
-    valueTranslation: 'masterLabel',
-    categoryGroupVisibilities: 'dataCategoryGroup',
-    applicationVisibilities: 'application',
-    classAccesses: 'apexClass',
-    customMetadataTypeAccesses: 'name',
-    customPermissions: 'name',
-    customSettingAccesses: 'name',
-    externalDataSourceAccesses: 'externalDataSource',
-    fieldPermissions: 'field',
-    flowAccesses: 'flow',
-    loginFlows: 'friendlyname',
-    layoutAssignments: '<object>',
-    loginHours: '<array>',
-    loginIpRanges: '<array>',
-    objectPermissions: 'object',
-    pageAccesses: 'apexPage',
-    profileActionOverrides: 'actionName',
-    recordTypeVisibilities: 'recordType',
-    tabVisibilities: 'tab',
-    userPermissions: 'name',
-    bots: 'fullName',
-    customApplications: 'name',
-    customLabels: 'name',
-    customPageWebLinks: 'name',
-    customTabs: 'name',
-    flowDefinitions: 'fullName',
-    pipelineInspMetricConfigs: 'name',
-    prompts: 'name',
-    quickActions: 'name',
-    reportTypes: 'name',
-    scontrols: 'name',
-    standardValue: 'fullName',
-    customValue: 'fullName',
-    labels: 'fullName',
-};
+/**
+ * Note: KEY_FIELD_METADATA has been moved to MetadataService
+ * @see MetadataService for key field extraction logic
+ */
 export const METADATA_TYPES_PATTERNS = [
     'assignmentRules',
     'autoResponseRules',

package/lib/constant/metadataConstant.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadataConstant.js","sourceRoot":"","sources":["../../src/constant/metadataConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,yBAAyB,EAAE,UAAU;IACrC,MAAM,EAAE,UAAU;IAClB,YAAY,EAAE,UAAU;IACxB,WAAW,EAAE,UAAU;IACvB,gBAAgB,EAAE,UAAU;IAC5B,KAAK,EAAE,UAAU;IACjB,kBAAkB,EAAE,UAAU;IAC9B,KAAK,EAAE,UAAU;IACjB,IAAI,EAAE,UAAU;IAChB,oBAAoB,EAAE,UAAU;IAChC,iBAAiB,EAAE,UAAU;IAC7B,iBAAiB,EAAE,UAAU;IAC7B,qBAAqB,EAAE,UAAU;IACjC,cAAc,EAAE,UAAU;IAC1B,gBAAgB,EAAE,UAAU;IAC5B,cAAc,EAAE,UAAU;IAC1B,aAAa,EAAE,UAAU;IACzB,gBAAgB,EAAE,aAAa;IAC/B,yBAAyB,EAAE,mBAAmB;IAC9C,uBAAuB,EAAE,aAAa;IACtC,aAAa,EAAE,WAAW;IAC1B,0BAA0B,EAAE,MAAM;IAClC,iBAAiB,EAAE,MAAM;IACzB,qBAAqB,EAAE,MAAM;IAC7B,0BAA0B,EAAE,oBAAoB;IAChD,gBAAgB,EAAE,OAAO;IACzB,YAAY,EAAE,MAAM;IACpB,UAAU,EAAE,cAAc;IAC1B,iBAAiB,EAAE,UAAU;IAC7B,UAAU,EAAE,SAAS;IACrB,aAAa,EAAE,SAAS;IACxB,iBAAiB,EAAE,QAAQ;IAC3B,YAAY,EAAE,UAAU;IACxB,sBAAsB,EAAE,YAAY;IACpC,sBAAsB,EAAE,YAAY;IACpC,eAAe,EAAE,KAAK;IACtB,eAAe,EAAE,MAAM;IACvB,IAAI,EAAE,UAAU;IAChB,kBAAkB,EAAE,MAAM;IAC1B,YAAY,EAAE,MAAM;IACpB,kBAAkB,EAAE,MAAM;IAC1B,UAAU,EAAE,MAAM;IAClB,eAAe,EAAE,UAAU;IAC3B,yBAAyB,EAAE,MAAM;IACjC,OAAO,EAAE,MAAM;IACf,YAAY,EAAE,MAAM;IACpB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,MAAM;IACjB,aAAa,EAAE,UAAU;IACzB,WAAW,EAAE,UAAU;IACvB,MAAM,EAAE,UAAU;CACnB,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,iBAAiB;IACjB,mBAAmB;IACnB,iBAAiB;IACjB,gBAAgB;IAChB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,SAAS;IACT,cAAc;IACd,kBAAkB;IAClB,6BAA6B;IAC7B,UAAU;CACX,CAAA"}
+{"version":3,"file":"metadataConstant.js","sourceRoot":"","sources":["../../src/constant/metadataConstant.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,iBAAiB;IACjB,mBAAmB;IACnB,iBAAiB;IACjB,gBAAgB;IAChB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,SAAS;IACT,cAAc;IACd,kBAAkB;IAClB,6BAA6B;IAC7B,UAAU;CACX,CAAA"}

package/lib/merger/JsonMerger.d.ts

@@ -1,38 +1,4 @@
-export type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
-interface JsonObject {
-    [key: string]: JsonValue;
-}
-interface JsonArray extends Array<JsonValue> {
-}
+import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
 export declare class JsonMerger {
-    /**
-     * Main entry point for merging JSON values
-     */
-    mergeObjects(ancestor: JsonObject | JsonArray, ours: JsonObject | JsonArray, theirs: JsonObject | JsonArray, parent?: JsonObject | JsonArray): JsonArray;
-    private mergeTextAttribute;
-    /**
-     * Gets the typeof of the attribute
-     */
-    private getAttributePrimarytype;
-    /**
-     * Ensures a value is an array
-     */
-    private ensureArray;
-    /**
-     * Gets the key field for a property from KEY_FIELD_METADATA
-     */
-    private getKeyField;
-    /**
-     * Merges arrays using the specified key field if available
-     */
-    private mergeArrays;
-    /**
-     * Merges arrays by position
-     */
-    private mergeByPosition;
-    /**
-     * Merges arrays using a key field
-     */
-    private mergeByKeyField;
+    merge(ancestor: JsonObject | JsonArray, ours: JsonObject | JsonArray, theirs: JsonObject | JsonArray): JsonArray;
 }
-export {};