sf-git-merge-driver 1.4.0-dev-156.21254415558-1 → 1.4.0-dev-159.21317248282-1

package/lib/types/mergeScenario.d.ts

@@ -14,4 +14,3 @@ export declare enum MergeScenario {
     ANCESTOR_AND_LOCAL = 110,// Ancestor and local have content, no other (110)
     ALL = 111
 }
-export declare const getScenario: (ancestor: any, local: any, other: any) => MergeScenario;

package/lib/types/mergeScenario.js

@@ -1,4 +1,3 @@
-import { isEmpty } from 'lodash-es';
 /**
  * Enum representing different merge scenarios based on content presence:
  * - First position: Ancestor content present (1) or absent (0)
@@ -16,23 +15,4 @@ export var MergeScenario;
     MergeScenario[MergeScenario["ANCESTOR_AND_LOCAL"] = 110] = "ANCESTOR_AND_LOCAL";
     MergeScenario[MergeScenario["ALL"] = 111] = "ALL";
 })(MergeScenario || (MergeScenario = {}));
-export const getScenario = (
-// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
-ancestor, 
-// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
-local, 
-// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
-other) => {
-    let scenario = MergeScenario.NONE;
-    if (!isEmpty(ancestor)) {
-        scenario += 100;
-    }
-    if (!isEmpty(local)) {
-        scenario += 10;
-    }
-    if (!isEmpty(other)) {
-        scenario += 1;
-    }
-    return scenario;
-};
 //# sourceMappingURL=mergeScenario.js.map

package/lib/types/mergeScenario.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeScenario.js","sourceRoot":"","sources":["../../src/types/mergeScenario.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC;;;;;GAKG;AACH,MAAM,CAAN,IAAY,aASX;AATD,WAAY,aAAa;IACvB,iDAAQ,CAAA;IACR,6DAAc,CAAA;IACd,8DAAe,CAAA;IACf,wEAAoB,CAAA;IACpB,qEAAmB,CAAA;IACnB,+EAAwB,CAAA;IACxB,+EAAwB,CAAA;IACxB,iDAAS,CAAA;AACX,CAAC,EATW,aAAa,KAAb,aAAa,QASxB;AAED,MAAM,CAAC,MAAM,WAAW,GAAG;AACzB,iFAAiF;AACjF,QAAa;AACb,iFAAiF;AACjF,KAAU;AACV,iFAAiF;AACjF,KAAU,EACK,EAAE;IACjB,IAAI,QAAQ,GAAkB,aAAa,CAAC,IAAI,CAAA;IAChD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,QAAQ,IAAI,GAAG,CAAA;IACjB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,QAAQ,IAAI,EAAE,CAAA;IAChB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,QAAQ,IAAI,CAAC,CAAA;IACf,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
+{"version":3,"file":"mergeScenario.js","sourceRoot":"","sources":["../../src/types/mergeScenario.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAN,IAAY,aASX;AATD,WAAY,aAAa;IACvB,iDAAQ,CAAA;IACR,6DAAc,CAAA;IACd,8DAAe,CAAA;IACf,wEAAoB,CAAA;IACpB,qEAAmB,CAAA;IACnB,+EAAwB,CAAA;IACxB,+EAAwB,CAAA;IACxB,iDAAS,CAAA;AACX,CAAC,EATW,aAAa,KAAb,aAAa,QASxB"}

package/lib/utils/mergeUtils.d.ts

@@ -1,7 +1,2 @@
-import type { JsonArray, JsonObject, JsonValue } from '../types/jsonTypes.js';
-export declare const isObject: (ancestor: JsonValue | undefined | null, local: JsonValue | undefined | null, other: JsonValue | undefined | null) => boolean;
-export declare const isStringArray: (ancestor: JsonValue | undefined | null, local: JsonValue | undefined | null, other: JsonValue | undefined | null) => boolean;
-export declare const ensureArray: (value: JsonValue) => JsonArray;
-export declare const getUniqueSortedProps: (...objects: (JsonObject | JsonArray)[]) => string[];
 export declare const detectEol: (text: string) => string;
 export declare const normalizeEol: (text: string, eol?: string) => string;

package/lib/utils/mergeUtils.js

@@ -1,23 +1,9 @@
-import { castArray, isNil } from 'lodash-es';
 import { EOL } from 'os';
 const CR = '\r';
 const LF = '\n';
 const CRLF = `${CR}${LF}`;
 const RE_CRLF = /\r\n/g;
 const RE_LF_OR_CRLF = /\r\n|\n/g;
-export const isObject = (ancestor, local, other) => 
-// typeof [ancestor, other, local].find(ele => !isNil(ele)) === 'object'
-[ancestor, local, other].some(ele => !isNil(ele) && typeof ele === 'object');
-export const isStringArray = (ancestor, local, other) => 
-// typeof [ancestor, other, local].find(ele => !isNil(ele)) === 'object'
-[ancestor, local, other].some(ele => !isNil(ele) &&
-    Array.isArray(ele) &&
-    ele.every(item => typeof item === 'string' || item instanceof String));
-export const ensureArray = (value) => isNil(value) ? [] : castArray(value);
-export const getUniqueSortedProps = (...objects) => Array.from(new Set([...objects]
-    .filter(jsonElement => ![undefined, null].includes(jsonElement))
-    .map(Object.keys)
-    .flat())).sort();
 export const detectEol = (text) => {
     if (!text) {
         return EOL;

package/lib/utils/mergeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeUtils.js","sourceRoot":"","sources":["../../src/utils/mergeUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mergeUtils.js","sourceRoot":"","sources":["../../src/utils/mergeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAA;AAExB,MAAM,EAAE,GAAG,IAAI,CAAA;AACf,MAAM,EAAE,GAAG,IAAI,CAAA;AACf,MAAM,IAAI,GAAG,GAAG,EAAE,GAAG,EAAE,EAAE,CAAA;AACzB,MAAM,OAAO,GAAG,OAAO,CAAA;AACvB,MAAM,aAAa,GAAG,UAAU,CAAA;AAEhC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAU,EAAE;IAChD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBAChC,OAAO,GAAG,IAAI,CAAA;YAChB,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,IAAI,CAAA;YACd,CAAC;YAED,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;gBACrB,OAAO,GAAG,CAAA;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,MAAc,GAAG,EAAU,EAAE;IACtE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,KAAK,GAAG,OAAO,CAAA;IACnB,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,KAAK,GAAG,aAAa,CAAA;IACvB,CAAC;IAED,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC,CAAA"}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "sf-git-merge-driver",
-  "version": "1.4.0-dev-156.21254415558-1",
+  "version": "1.4.0-dev-159.21317248282-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sf-git-merge-driver",
-      "version": "1.4.0-dev-156.21254415558-1",
+      "version": "1.4.0-dev-159.21317248282-1",
       "license": "MIT",
       "dependencies": {
         "@oclif/core": "^4.8.0",

package/oclif.manifest.json

@@ -170,7 +170,7 @@
           "char": "S",
           "name": "ancestor-conflict-tag",
           "summary": "string used to tag ancestor version in conflicts",
-          "default": "BASE",
+          "default": "base",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -179,7 +179,7 @@
           "char": "X",
           "name": "local-conflict-tag",
           "summary": "string used to tag local version in conflicts",
-          "default": "LOCAL",
+          "default": "ours",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -188,7 +188,7 @@
           "char": "Y",
           "name": "other-conflict-tag",
           "summary": "string used to tag other version in conflicts",
-          "default": "REMOTE",
+          "default": "theirs",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -338,5 +338,5 @@
       ]
     }
   },
-  "version": "1.4.0-dev-156.21254415558-1"
+  "version": "1.4.0-dev-159.21317248282-1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-git-merge-driver",
-  "description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
-  "version": "1.4.0-dev-156.21254415558-1",
+  "description": "Git merge driver for Salesforce metadata XML files - automatically resolves merge conflicts in profiles, permission sets, and 50+ metadata types",
+  "version": "1.4.0-dev-159.21317248282-1",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",

package/lib/merger/conflictMarker.d.ts

@@ -1,12 +0,0 @@
-import { conflicConfig } from '../types/conflictTypes.js';
-import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
-export declare class ConflictMarker {
-    private static hasConflict;
-    private static baseMarker;
-    private static localMarker;
-    private static otherMarker;
-    private static separatorMarker;
-    static hasConflictMarker(): boolean;
-    static addConflictMarkers(acc: JsonArray, local: JsonObject | JsonArray, ancestor: JsonObject | JsonArray, other: JsonObject | JsonArray): void;
-    static setConflictConfig(conflictConfig: conflicConfig): void;
-}

package/lib/merger/conflictMarker.js

@@ -1,48 +0,0 @@
-import { isEmpty } from 'lodash-es';
-import { ANCESTOR_CONFLICT_MARKER, LOCAL_CONFLICT_MARKER, OTHER_CONFLICT_MARKER, SEPARATOR, } from '../constant/conflictConstant.js';
-import { SALESFORCE_EOL } from '../constant/metadataConstant.js';
-import { TEXT_TAG } from '../constant/parserConstant.js';
-const buildMarker = (marker, size, tag) => {
-    return `${marker.repeat(size)} ${tag}`;
-};
-const buildSeparator = (size) => {
-    return `${SEPARATOR.repeat(size)}`;
-};
-const getEmptyValue = () => {
-    return { [TEXT_TAG]: SALESFORCE_EOL };
-};
-const getMarkerValue = (marker, withEol = false) => {
-    return { [TEXT_TAG]: `${withEol ? SALESFORCE_EOL : ''}${marker}` };
-};
-export class ConflictMarker {
-    static hasConflict = false;
-    static baseMarker;
-    static localMarker;
-    static otherMarker;
-    static separatorMarker;
-    static hasConflictMarker() {
-        return ConflictMarker.hasConflict;
-    }
-    static addConflictMarkers(acc, local, ancestor, other) {
-        ConflictMarker.hasConflict = true;
-        const [localValue, ancestorValue, otherValue] = [
-            local,
-            ancestor,
-            other,
-        ].map(value => (isEmpty(value) ? getEmptyValue() : value));
-        acc.push(getMarkerValue(ConflictMarker.localMarker, true));
-        acc.push(localValue);
-        acc.push(getMarkerValue(ConflictMarker.baseMarker));
-        acc.push(ancestorValue);
-        acc.push(getMarkerValue(ConflictMarker.separatorMarker));
-        acc.push(otherValue);
-        acc.push(getMarkerValue(ConflictMarker.otherMarker));
-    }
-    static setConflictConfig(conflictConfig) {
-        ConflictMarker.baseMarker = buildMarker(ANCESTOR_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.ancestorConflictTag);
-        ConflictMarker.localMarker = buildMarker(LOCAL_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.localConflictTag);
-        ConflictMarker.otherMarker = buildMarker(OTHER_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.otherConflictTag);
-        ConflictMarker.separatorMarker = buildSeparator(conflictConfig.conflictMarkerSize);
-    }
-}
-//# sourceMappingURL=conflictMarker.js.map

package/lib/merger/conflictMarker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,qBAAqB,EACrB,SAAS,GACV,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAIxD,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,IAAY,EAAE,GAAW,EAAU,EAAE;IACxE,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;AACxC,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE;IAC9C,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAA;AACpC,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,GAAe,EAAE;IACrC,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CACrB,MAAc,EACd,UAAmB,KAAK,EACZ,EAAE;IACd,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,CAAA;AACpE,CAAC,CAAA;AAED,MAAM,OAAO,cAAc;IACjB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAA;IAC1B,MAAM,CAAC,UAAU,CAAQ;IACzB,MAAM,CAAC,WAAW,CAAQ;IAC1B,MAAM,CAAC,WAAW,CAAQ;IAC1B,MAAM,CAAC,eAAe,CAAQ;IAE/B,MAAM,CAAC,iBAAiB;QAC7B,OAAO,cAAc,CAAC,WAAW,CAAA;IACnC,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAC9B,GAAc,EACd,KAA6B,EAC7B,QAAgC,EAChC,KAA6B;QAE7B,cAAc,CAAC,WAAW,GAAG,IAAI,CAAA;QACjC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,CAAC,GAAG;YAC9C,KAAK;YACL,QAAQ;YACR,KAAK;SACN,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;QAE1D,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAA;QAC1D,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACpB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAA;QACnD,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QACvB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAA;QACxD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACpB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAA;IACtD,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,cAA6B;QAC3D,cAAc,CAAC,UAAU,GAAG,WAAW,CACrC,wBAAwB,EACxB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,mBAAmB,CACnC,CAAA;QACD,cAAc,CAAC,WAAW,GAAG,WAAW,CACtC,qBAAqB,EACrB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,gBAAgB,CAChC,CAAA;QACD,cAAc,CAAC,WAAW,GAAG,WAAW,CACtC,qBAAqB,EACrB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,gBAAgB,CAChC,CAAA;QACD,cAAc,CAAC,eAAe,GAAG,cAAc,CAC7C,cAAc,CAAC,kBAAkB,CAClC,CAAA;IACH,CAAC"}

package/lib/merger/textAttribute.d.ts

@@ -1,3 +0,0 @@
-import type { JsonArray, JsonObject, JsonValue } from '../types/jsonTypes.js';
-export declare const generateObj: (value: JsonValue | null, attrib: string) => JsonObject;
-export declare const mergeTextAttribute: (ancestor: JsonValue | null, local: JsonValue | null, other: JsonValue | null, attrib: string) => JsonArray;

package/lib/merger/textAttribute.js

@@ -1,56 +0,0 @@
-import { deepEqual } from 'fast-equals';
-import { isNil } from 'lodash-es';
-import { TEXT_TAG } from '../constant/parserConstant.js';
-import { getScenario, MergeScenario } from '../types/mergeScenario.js';
-import { ConflictMarker } from './conflictMarker.js';
-export const generateObj = (value, attrib) => {
-    return isNil(value) ? {} : { [attrib]: [{ [TEXT_TAG]: value }] };
-};
-export const mergeTextAttribute = (ancestor, local, other, attrib) => {
-    const objAnc = generateObj(ancestor, attrib);
-    const objlocal = generateObj(local, attrib);
-    const objother = generateObj(other, attrib);
-    const scenario = getScenario(objAnc, objlocal, objother);
-    const acc = [];
-    // Early return for identical values
-    if (deepEqual(local, other) &&
-        (scenario === MergeScenario.LOCAL_AND_OTHER ||
-            scenario === MergeScenario.ALL)) {
-        return [objlocal];
-    }
-    // Handle specific merge scenarios
-    switch (scenario) {
-        case MergeScenario.OTHER_ONLY:
-            acc.push(objother);
-            break;
-        case MergeScenario.LOCAL_ONLY:
-            acc.push(objlocal);
-            break;
-        case MergeScenario.LOCAL_AND_OTHER:
-            ConflictMarker.addConflictMarkers(acc, objlocal, {}, objother);
-            break;
-        case MergeScenario.ANCESTOR_AND_OTHER:
-            if (ancestor !== other) {
-                ConflictMarker.addConflictMarkers(acc, {}, objAnc, objother);
-            }
-            break;
-        case MergeScenario.ANCESTOR_AND_LOCAL:
-            if (ancestor !== local) {
-                ConflictMarker.addConflictMarkers(acc, objlocal, objAnc, {});
-            }
-            break;
-        case MergeScenario.ALL:
-            if (ancestor === local) {
-                acc.push(objother);
-            }
-            else if (ancestor === other) {
-                acc.push(objlocal);
-            }
-            else {
-                ConflictMarker.addConflictMarkers(acc, objlocal, objAnc, objother);
-            }
-            break;
-    }
-    return acc;
-};
-//# sourceMappingURL=textAttribute.js.map

package/lib/merger/textAttribute.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"textAttribute.js","sourceRoot":"","sources":["../../src/merger/textAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAExD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,KAAuB,EACvB,MAAc,EACF,EAAE;IACd,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;AAClE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,QAA0B,EAC1B,KAAuB,EACvB,KAAuB,EACvB,MAAc,EACH,EAAE;IACb,MAAM,MAAM,GAAe,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAe,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAe,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAkB,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACvE,MAAM,GAAG,GAAc,EAAE,CAAA;IAEzB,oCAAoC;IACpC,IACE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;QACvB,CAAC,QAAQ,KAAK,aAAa,CAAC,eAAe;YACzC,QAAQ,KAAK,aAAa,CAAC,GAAG,CAAC,EACjC,CAAC;QACD,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnB,CAAC;IAED,kCAAkC;IAClC,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,aAAa,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClB,MAAK;QAEP,KAAK,aAAa,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClB,MAAK;QAEP,KAAK,aAAa,CAAC,eAAe;YAChC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;YAC9D,MAAK;QAEP,KAAK,aAAa,CAAC,kBAAkB;YACnC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YAC9D,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,kBAAkB;YACnC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;YAC9D,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,GAAG;YACpB,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACpB,CAAC;iBAAM,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBAC9B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACpB,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YACpE,CAAC;YACD,MAAK;IACT,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}