@teambit/merging 1.0.640 → 1.0.641
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -109,7 +109,7 @@ export declare class MergingMain {
|
|
|
109
109
|
/**
|
|
110
110
|
* merge multiple components according to the "allComponentsStatus".
|
|
111
111
|
*/
|
|
112
|
-
mergeSnaps({ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noAutoSnap, noSnap, tag, snapMessage, build, skipDependencyInstallation, detachHead, }: {
|
|
112
|
+
mergeSnaps({ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noAutoSnap, noSnap, tag, snapMessage, build, skipDependencyInstallation, detachHead, loose, }: {
|
|
113
113
|
mergeStrategy: MergeStrategy;
|
|
114
114
|
allComponentsStatus: ComponentMergeStatus[];
|
|
115
115
|
otherLaneId: LaneId;
|
|
@@ -121,6 +121,7 @@ export declare class MergingMain {
|
|
|
121
121
|
build?: boolean;
|
|
122
122
|
skipDependencyInstallation?: boolean;
|
|
123
123
|
detachHead?: boolean;
|
|
124
|
+
loose?: boolean;
|
|
124
125
|
}): Promise<ApplyVersionResults>;
|
|
125
126
|
removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>;
|
|
126
127
|
/**
|
|
@@ -279,7 +279,8 @@ class MergingMain {
|
|
|
279
279
|
snapMessage,
|
|
280
280
|
build,
|
|
281
281
|
skipDependencyInstallation,
|
|
282
|
-
detachHead
|
|
282
|
+
detachHead,
|
|
283
|
+
loose
|
|
283
284
|
}) {
|
|
284
285
|
const consumer = this.workspace?.consumer;
|
|
285
286
|
const legacyScope = this.scope.legacyScope;
|
|
@@ -365,7 +366,12 @@ class MergingMain {
|
|
|
365
366
|
removedComponents
|
|
366
367
|
};
|
|
367
368
|
}
|
|
368
|
-
return this.snapResolvedComponents(allComponentsStatus,
|
|
369
|
+
return this.snapResolvedComponents(allComponentsStatus, updatedComponents, {
|
|
370
|
+
snapMessage,
|
|
371
|
+
build,
|
|
372
|
+
laneId: currentLane?.toLaneId(),
|
|
373
|
+
loose
|
|
374
|
+
});
|
|
369
375
|
};
|
|
370
376
|
let mergeSnapResults = null;
|
|
371
377
|
let mergeSnapError;
|
|
@@ -634,7 +640,12 @@ class MergingMain {
|
|
|
634
640
|
mergeStrategy
|
|
635
641
|
}, localLaneObject, localLaneObject);
|
|
636
642
|
}
|
|
637
|
-
async snapResolvedComponents(allComponentsStatus,
|
|
643
|
+
async snapResolvedComponents(allComponentsStatus, updatedComponents, {
|
|
644
|
+
snapMessage,
|
|
645
|
+
build,
|
|
646
|
+
laneId,
|
|
647
|
+
loose
|
|
648
|
+
}) {
|
|
638
649
|
const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();
|
|
639
650
|
this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);
|
|
640
651
|
if (!unmergedComponents.length) return null;
|
|
@@ -658,14 +669,16 @@ class MergingMain {
|
|
|
658
669
|
build,
|
|
659
670
|
lane: laneId?.toString(),
|
|
660
671
|
updatedLegacyComponents: updatedComponents,
|
|
661
|
-
loadAspectOnlyForIds: getLoadAspectOnlyForIds()
|
|
672
|
+
loadAspectOnlyForIds: getLoadAspectOnlyForIds(),
|
|
673
|
+
loose
|
|
662
674
|
});
|
|
663
675
|
return results;
|
|
664
676
|
}
|
|
665
677
|
return this.snapping.snap({
|
|
666
678
|
legacyBitIds: ids,
|
|
667
679
|
build,
|
|
668
|
-
message: snapMessage
|
|
680
|
+
message: snapMessage,
|
|
681
|
+
loose
|
|
669
682
|
});
|
|
670
683
|
}
|
|
671
684
|
async tagAllLaneComponent(idsToTag, tagMessage, build) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_mergeVersion","_configStore","_application","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","application","merge","pattern","mergeStrategy","abort","resolve","noAutoSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","noSnap","tag","detachHead","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","loadAllAppsAsAspects","dedupe","updateExisting","import","err","error","consoleFailure","updatedComponents","legacyCompToWrite","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","detachedHeads","setHead","markVersionAsLocal","ids","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","getLoadAspectOnlyForIds","dataMergeResult","dataConflictedIds","conflictedAspects","aspectIds","aspectId","snapFromScope","componentId","aspects","getEntry","lane","updatedLegacyComponents","loadAspectOnlyForIds","tagMessage","unmodified","componentIds","idsByPattern","entry","unresolvedComponents","u","mergePending","listMergePendingComponents","componentsList","ComponentsList","allIds","getAllIdsAvailableOnLaneIncludeRemoved","componentsFromModel","getModelComponents","duringMergeComps","listDuringMergeStateComponents","mergePendingComponents","toComponentId","divergedData","getDivergeDataForMergePending","isDiverged","diverge","provider","cli","loggerMain","compWriter","configStore","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","ConfigStoreAspect","ConfigMergerAspect","DependencyResolverAspect","ApplicationAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace, AutoTagResult } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { UnmergedComponent } from '@teambit/legacy.scope';\nimport { Ref, Lane, ModelComponent } from '@teambit/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/component.snap-distance';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { DataMergeResult, MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\nimport {\n MergeStrategy,\n FileStatus,\n getMergeStrategyInteractive,\n MergeResultsThreeWay,\n MergeOptions,\n} from './merge-version';\nimport { ConfigStoreAspect, ConfigStoreMain } from '@teambit/config-store';\nimport { ApplicationAspect, ApplicationMain } from '@teambit/application';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type DivergedComponent = { id: ComponentID; diverge: SnapsDistance };\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n dataMergeResult?: DataMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n exportedIds?: ComponentID[];\n} | null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n newComponents?: ComponentID[]; // relevant for \"bit stash load\". (stashedBitmapEntries is populated)\n resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: MergeSnapResults;\n mergeSnapError?: Error;\n leftUnresolvedConflicts?: boolean;\n verbose?: boolean;\n newFromLane?: string[];\n newFromLaneAdded?: boolean;\n installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain,\n private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain,\n private application: ApplicationMain\n ) {}\n\n async merge(\n pattern: string,\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noAutoSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(pattern, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(pattern);\n } else {\n const bitIds = await this.getComponentsToMerge(pattern);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noAutoSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\n return mergeResults;\n }\n\n /**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: ComponentID[],\n mergeStrategy: MergeStrategy,\n noAutoSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n noAutoSnap: noAutoSnap,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n }\n\n /**\n * merge multiple components according to the \"allComponentsStatus\".\n */\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId,\n currentLane,\n noAutoSnap,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n detachHead,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noAutoSnap?: boolean;\n noSnap?: boolean;\n tag?: boolean;\n snapMessage?: string;\n build?: boolean;\n skipDependencyInstallation?: boolean;\n detachHead?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane,\n detachHead\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error | undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError =\n await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) legacyScope.objects.add(currentLane);\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n await deleteComponentsFiles(consumer, compBitIdsToRemove);\n await consumer.cleanFromBitMap(compBitIdsToRemove);\n }\n\n const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n // this is a workaround.\n // keep this here. although it gets called before snapping.\n // the reason is that when the installation is running, for some reason, some apps are unable to load in the same process.\n // they throw an error \"Cannot find module\" during the aspect loading.\n await this.application.loadAllAppsAsAspects();\n\n try {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n } catch (err: any) {\n this.logger.error(`failed installing packages`, err);\n this.logger.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const updatedComponents = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noAutoSnap || noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(\n allComponentsStatus,\n snapMessage,\n build,\n currentLane?.toLaneId(),\n updatedComponents\n );\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n mergeSnapResults,\n mergeSnapError,\n workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds || []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\n }\n\n /**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane,\n detachHead?: boolean\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n detachHead?: boolean;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n };\n\n const markAllFilesAsUnchanged = () => {\n if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n currentComponent.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n };\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n markAllFilesAsUnchanged();\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent || undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n if (detachHead) {\n modelComponent.detachedHeads.setHead(remoteHead);\n } else {\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n }\n legacyScope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id: idToLoad, filesStatus },\n component: currentComponent || undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(pattern: string): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(pattern);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(pattern);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane | undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n allComponentsStatus: ComponentMergeStatus[],\n snapMessage?: string,\n build?: boolean,\n laneId?: LaneId,\n updatedComponents?: ConsumerComponent[]\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const getLoadAspectOnlyForIds = (): ComponentIdList | undefined => {\n if (!allComponentsStatus.length || !allComponentsStatus[0].dataMergeResult) return undefined;\n const dataConflictedIds = allComponentsStatus\n .filter((c) => {\n const conflictedAspects = c.dataMergeResult?.conflictedAspects || {};\n const aspectIds = Object.keys(conflictedAspects);\n aspectIds.forEach((aspectId) =>\n this.logger.debug(\n `conflicted-data for \"${c.id.toString()}\". aspectId: ${aspectId}. reason: ${conflictedAspects[aspectId]}`\n )\n );\n return aspectIds.length;\n })\n .map((c) => c.id);\n return ComponentIdList.fromArray(dataConflictedIds);\n };\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({\n componentId: id.toString(),\n aspects: this.scope.legacyScope.objects.unmergedComponents.getEntry(id)?.mergedConfig,\n })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n updatedLegacyComponents: updatedComponents,\n loadAspectOnlyForIds: getLoadAspectOnlyForIds(),\n }\n );\n return results;\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage?: string,\n build?: boolean\n ): Promise<TagResults | null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n return this.snapping.tag({\n ids,\n build,\n message: tagMessage,\n unmodified: true,\n });\n }\n\n private async getIdsForUnmerged(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n const componentIds = await this.workspace.idsByPattern(pattern);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n return this.workspace.idsByPattern(pattern);\n }\n const mergePending = await this.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n\n async listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]> {\n const consumer = this.workspace.consumer;\n componentsList = componentsList || new ComponentsList(this.workspace);\n const allIds = consumer.bitMap.getAllIdsAvailableOnLaneIncludeRemoved();\n const componentsFromModel = await componentsList.getModelComponents();\n const duringMergeComps = componentsList.listDuringMergeStateComponents();\n const mergePendingComponents = await Promise.all(\n allIds.map(async (componentId: ComponentID) => {\n const modelComponent = componentsFromModel.find((c) => c.toComponentId().isEqualWithoutVersion(componentId));\n if (!modelComponent || duringMergeComps.hasWithoutVersion(componentId)) return null;\n const divergedData = await modelComponent.getDivergeDataForMergePending(consumer.scope.objects);\n if (!divergedData.isDiverged()) return null;\n return { id: modelComponent.toComponentId(), diverge: divergedData };\n })\n );\n return compact(mergePendingComponents);\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n ConfigStoreAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ApplicationAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n configStore,\n configMerger,\n depResolver,\n application,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n ConfigStoreMain,\n ConfigMergerMain,\n DependencyResolverMain,\n ApplicationMain,\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver,\n application\n );\n cli.register(new MergeCmd(merging, configStore));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_mergeVersion","_configStore","_application","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","application","merge","pattern","mergeStrategy","abort","resolve","noAutoSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","noSnap","tag","detachHead","loose","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","loadAllAppsAsAspects","dedupe","updateExisting","import","err","error","consoleFailure","updatedComponents","legacyCompToWrite","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","laneId","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","detachedHeads","setHead","markVersionAsLocal","ids","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","getLoadAspectOnlyForIds","dataMergeResult","dataConflictedIds","conflictedAspects","aspectIds","aspectId","snapFromScope","componentId","aspects","getEntry","lane","updatedLegacyComponents","loadAspectOnlyForIds","tagMessage","unmodified","componentIds","idsByPattern","entry","unresolvedComponents","u","mergePending","listMergePendingComponents","componentsList","ComponentsList","allIds","getAllIdsAvailableOnLaneIncludeRemoved","componentsFromModel","getModelComponents","duringMergeComps","listDuringMergeStateComponents","mergePendingComponents","toComponentId","divergedData","getDivergeDataForMergePending","isDiverged","diverge","provider","cli","loggerMain","compWriter","configStore","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","ConfigStoreAspect","ConfigMergerAspect","DependencyResolverAspect","ApplicationAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace, AutoTagResult } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { UnmergedComponent } from '@teambit/legacy.scope';\nimport { Ref, Lane, ModelComponent } from '@teambit/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/component.snap-distance';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { DataMergeResult, MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\nimport {\n MergeStrategy,\n FileStatus,\n getMergeStrategyInteractive,\n MergeResultsThreeWay,\n MergeOptions,\n} from './merge-version';\nimport { ConfigStoreAspect, ConfigStoreMain } from '@teambit/config-store';\nimport { ApplicationAspect, ApplicationMain } from '@teambit/application';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type DivergedComponent = { id: ComponentID; diverge: SnapsDistance };\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n dataMergeResult?: DataMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n exportedIds?: ComponentID[];\n} | null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n newComponents?: ComponentID[]; // relevant for \"bit stash load\". (stashedBitmapEntries is populated)\n resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: MergeSnapResults;\n mergeSnapError?: Error;\n leftUnresolvedConflicts?: boolean;\n verbose?: boolean;\n newFromLane?: string[];\n newFromLaneAdded?: boolean;\n installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain,\n private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain,\n private application: ApplicationMain\n ) {}\n\n async merge(\n pattern: string,\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noAutoSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(pattern, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(pattern);\n } else {\n const bitIds = await this.getComponentsToMerge(pattern);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noAutoSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\n return mergeResults;\n }\n\n /**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: ComponentID[],\n mergeStrategy: MergeStrategy,\n noAutoSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n noAutoSnap: noAutoSnap,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n }\n\n /**\n * merge multiple components according to the \"allComponentsStatus\".\n */\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId,\n currentLane,\n noAutoSnap,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n detachHead,\n loose,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noAutoSnap?: boolean;\n noSnap?: boolean;\n tag?: boolean;\n snapMessage?: string;\n build?: boolean;\n skipDependencyInstallation?: boolean;\n detachHead?: boolean;\n loose?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane,\n detachHead\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error | undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError =\n await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) legacyScope.objects.add(currentLane);\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n await deleteComponentsFiles(consumer, compBitIdsToRemove);\n await consumer.cleanFromBitMap(compBitIdsToRemove);\n }\n\n const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n // this is a workaround.\n // keep this here. although it gets called before snapping.\n // the reason is that when the installation is running, for some reason, some apps are unable to load in the same process.\n // they throw an error \"Cannot find module\" during the aspect loading.\n await this.application.loadAllAppsAsAspects();\n\n try {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n } catch (err: any) {\n this.logger.error(`failed installing packages`, err);\n this.logger.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const updatedComponents = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noAutoSnap || noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(allComponentsStatus, updatedComponents, {\n snapMessage,\n build,\n laneId: currentLane?.toLaneId(),\n loose,\n });\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n mergeSnapResults,\n mergeSnapError,\n workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds || []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\n }\n\n /**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane,\n detachHead?: boolean\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n detachHead?: boolean;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n };\n\n const markAllFilesAsUnchanged = () => {\n if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n currentComponent.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n };\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n markAllFilesAsUnchanged();\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent || undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n if (detachHead) {\n modelComponent.detachedHeads.setHead(remoteHead);\n } else {\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n }\n legacyScope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id: idToLoad, filesStatus },\n component: currentComponent || undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(pattern: string): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(pattern);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(pattern);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane | undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n allComponentsStatus: ComponentMergeStatus[],\n updatedComponents: ConsumerComponent[],\n {\n snapMessage,\n build,\n laneId,\n loose,\n }: {\n snapMessage?: string;\n build?: boolean;\n laneId?: LaneId;\n loose?: boolean;\n }\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const getLoadAspectOnlyForIds = (): ComponentIdList | undefined => {\n if (!allComponentsStatus.length || !allComponentsStatus[0].dataMergeResult) return undefined;\n const dataConflictedIds = allComponentsStatus\n .filter((c) => {\n const conflictedAspects = c.dataMergeResult?.conflictedAspects || {};\n const aspectIds = Object.keys(conflictedAspects);\n aspectIds.forEach((aspectId) =>\n this.logger.debug(\n `conflicted-data for \"${c.id.toString()}\". aspectId: ${aspectId}. reason: ${conflictedAspects[aspectId]}`\n )\n );\n return aspectIds.length;\n })\n .map((c) => c.id);\n return ComponentIdList.fromArray(dataConflictedIds);\n };\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({\n componentId: id.toString(),\n aspects: this.scope.legacyScope.objects.unmergedComponents.getEntry(id)?.mergedConfig,\n })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n updatedLegacyComponents: updatedComponents,\n loadAspectOnlyForIds: getLoadAspectOnlyForIds(),\n loose,\n }\n );\n return results;\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n loose,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage?: string,\n build?: boolean\n ): Promise<TagResults | null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n return this.snapping.tag({\n ids,\n build,\n message: tagMessage,\n unmodified: true,\n });\n }\n\n private async getIdsForUnmerged(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n const componentIds = await this.workspace.idsByPattern(pattern);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n return this.workspace.idsByPattern(pattern);\n }\n const mergePending = await this.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n\n async listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]> {\n const consumer = this.workspace.consumer;\n componentsList = componentsList || new ComponentsList(this.workspace);\n const allIds = consumer.bitMap.getAllIdsAvailableOnLaneIncludeRemoved();\n const componentsFromModel = await componentsList.getModelComponents();\n const duringMergeComps = componentsList.listDuringMergeStateComponents();\n const mergePendingComponents = await Promise.all(\n allIds.map(async (componentId: ComponentID) => {\n const modelComponent = componentsFromModel.find((c) => c.toComponentId().isEqualWithoutVersion(componentId));\n if (!modelComponent || duringMergeComps.hasWithoutVersion(componentId)) return null;\n const divergedData = await modelComponent.getDivergeDataForMergePending(consumer.scope.objects);\n if (!divergedData.isDiverged()) return null;\n return { id: modelComponent.toComponentId(), diverge: divergedData };\n })\n );\n return compact(mergePendingComponents);\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n ConfigStoreAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ApplicationAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n configStore,\n configMerger,\n depResolver,\n application,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n ConfigStoreMain,\n ConfigMergerMain,\n DependencyResolverMain,\n ApplicationMain,\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver,\n application\n );\n cli.register(new MergeCmd(merging, configStore));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":";;;;;;AAAA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,WAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,UAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,UAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,SAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,YAAA;EAAA,MAAAL,IAAA,GAAAM,sBAAA,CAAAL,OAAA;EAAAI,WAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,aAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,YAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,UAAA;EAAA,MAAAR,IAAA,GAAAC,OAAA;EAAAO,SAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,QAAA;EAAA,MAAAT,IAAA,GAAAC,OAAA;EAAAQ,OAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAU,OAAA;EAAA,MAAAV,IAAA,GAAAM,sBAAA,CAAAL,OAAA;EAAAS,MAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,QAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,OAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,QAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,OAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,aAAA;EAAA,MAAAb,IAAA,GAAAC,OAAA;EAAAY,YAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAc,YAAA;EAAA,MAAAd,IAAA,GAAAC,OAAA;EAAAa,WAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAe,iBAAA;EAAA,MAAAf,IAAA,GAAAC,OAAA;EAAAc,gBAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAgB,UAAA;EAAA,MAAAhB,IAAA,GAAAC,OAAA;EAAAe,SAAA,YAAAA,CAAA;IAAA,OAAAhB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiB,QAAA;EAAA,MAAAjB,IAAA,GAAAC,OAAA;EAAAgB,OAAA,YAAAA,CAAA;IAAA,OAAAjB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkB,QAAA;EAAA,MAAAlB,IAAA,GAAAC,OAAA;EAAAiB,OAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAmB,UAAA;EAAA,MAAAnB,IAAA,GAAAC,OAAA;EAAAkB,SAAA,YAAAA,CAAA;IAAA,OAAAnB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAoB,cAAA;EAAA,MAAApB,IAAA,GAAAC,OAAA;EAAAmB,aAAA,YAAAA,CAAA;IAAA,OAAApB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAAqB,oBAAA;EAAA,MAAArB,IAAA,GAAAC,OAAA;EAAAoB,mBAAA,YAAAA,CAAA;IAAA,OAAArB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAsB,SAAA;EAAA,MAAAtB,IAAA,GAAAC,OAAA;EAAAqB,QAAA,YAAAA,CAAA;IAAA,OAAAtB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAuB,OAAA;EAAA,MAAAvB,IAAA,GAAAC,OAAA;EAAAsB,MAAA,YAAAA,CAAA;IAAA,OAAAvB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAwB,UAAA;EAAA,MAAAxB,IAAA,GAAAC,OAAA;EAAAuB,SAAA,YAAAA,CAAA;IAAA,OAAAxB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAyB,SAAA;EAAA,MAAAzB,IAAA,GAAAC,OAAA;EAAAwB,QAAA,YAAAA,CAAA;IAAA,OAAAzB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA0B,qBAAA;EAAA,MAAA1B,IAAA,GAAAC,OAAA;EAAAyB,oBAAA,YAAAA,CAAA;IAAA,OAAA1B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA2B,cAAA;EAAA,MAAA3B,IAAA,GAAAC,OAAA;EAAA0B,aAAA,YAAAA,CAAA;IAAA,OAAA3B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAA4B,aAAA;EAAA,MAAA5B,IAAA,GAAAC,OAAA;EAAA2B,YAAA,YAAAA,CAAA;IAAA,OAAA5B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA6B,aAAA;EAAA,MAAA7B,IAAA,GAAAC,OAAA;EAAA4B,YAAA,YAAAA,CAAA;IAAA,OAAA7B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0E,SAAAM,uBAAAwB,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,QAAAH,CAAA,EAAAI,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAP,CAAA,OAAAM,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAR,CAAA,GAAAI,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAX,CAAA,EAAAI,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAf,CAAA,aAAAI,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAD,OAAA,CAAAG,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAArB,CAAA,EAAAM,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAF,OAAA,CAAAG,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAJ,CAAA;AAAA,SAAAmB,gBAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAmB,cAAA,CAAAnB,CAAA,MAAAJ,CAAA,GAAAM,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,IAAAoB,KAAA,EAAAnB,CAAA,EAAAO,UAAA,MAAAa,YAAA,MAAAC,QAAA,UAAA1B,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAuB,eAAAlB,CAAA,QAAAsB,CAAA,GAAAC,YAAA,CAAAvB,CAAA,uCAAAsB,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAvB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAwB,MAAA,CAAAC,WAAA,kBAAA9B,CAAA,QAAA2B,CAAA,GAAA3B,CAAA,CAAA+B,IAAA,CAAA1B,CAAA,EAAAD,CAAA,uCAAAuB,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAA5B,CAAA,GAAA6B,MAAA,GAAAC,MAAA,EAAA7B,CAAA;AA+B1E;;AAgCO,MAAM8B,WAAW,CAAC;EACvBC,WAAWA,CACDC,SAAoB,EACpBC,KAAgB,EAChBC,OAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EACtBC,MAAc,EACdC,eAAoC,EACpCC,QAAsB,EACtBC,MAAkB,EAClBC,MAAkB,EAClBC,YAA8B,EAC9BC,WAAmC,EACnCC,WAA4B,EACpC;IAAA,KAbQZ,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAc,GAAdA,MAAc;IAAA,KACdC,eAAoC,GAApCA,eAAoC;IAAA,KACpCC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,YAA8B,GAA9BA,YAA8B;IAAA,KAC9BC,WAAmC,GAAnCA,WAAmC;IAAA,KACnCC,WAA4B,GAA5BA,WAA4B;EACnC;EAEH,MAAMC,KAAKA,CACTC,OAAe,EACfC,aAA4B,EAC5BC,KAAc,EACdC,OAAgB,EAChBC,UAAmB,EACnBC,OAAe,EACfC,KAAc,EACdC,0BAAmC,EACL;IAC9B,IAAI,CAAC,IAAI,CAACrB,SAAS,EAAE,MAAM,KAAIsB,kCAAqB,EAAC,CAAC;IACtD,MAAMC,QAAkB,GAAG,IAAI,CAACvB,SAAS,CAACuB,QAAQ;IAClD,IAAIC,YAAY;IAChB,IAAIP,OAAO,EAAE;MACXO,YAAY,GAAG,MAAM,IAAI,CAACC,YAAY,CAACX,OAAO,EAAEK,OAAO,EAAEC,KAAK,CAAC;IACjE,CAAC,MAAM,IAAIJ,KAAK,EAAE;MAChBQ,YAAY,GAAG,MAAM,IAAI,CAACE,UAAU,CAACZ,OAAO,CAAC;IAC/C,CAAC,MAAM;MACL,MAAMa,MAAM,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAACd,OAAO,CAAC;MACvDU,YAAY,GAAG,MAAM,IAAI,CAACK,yBAAyB,CACjDN,QAAQ,EACRI,MAAM,EACNZ,aAAa,EACbG,UAAU,EACVC,OAAO,EACPC,KAAK,EACLC,0BACF,CAAC;IACH;IACA,MAAME,QAAQ,CAACO,SAAS,CAAC,OAAO,CAAC;IACjC,OAAON,YAAY;EACrB;;EAEA;AACF;AACA;AACA;EACE,MAAMK,yBAAyBA,CAC7BN,QAAkB,EAClBI,MAAqB,EACrBZ,aAA4B,EAC5BG,UAAmB,EACnBa,WAAmB,EACnBX,KAAc,EACdC,0BAAmC,EACL;IAC9B,MAAMW,aAAa,GAAGT,QAAQ,CAACU,gBAAgB,CAAC,CAAC;IACjD,MAAMC,iBAAiB,GAAG,MAAMX,QAAQ,CAACY,oBAAoB,CAAC,CAAC;IAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAC3DV,MAAM,EACNK,aAAa,EACbE,iBAAiB,EACjBnB,aACF,CAAC;IACD,MAAMuB,gBAAgB,GAAGF,mBAAmB,CAAC/D,MAAM,CAAEkE,CAAC,IAAKA,CAAC,CAACC,gBAAgB,IAAI,CAACD,CAAC,CAACE,qBAAqB,CAAC;IAC1G,IAAIH,gBAAgB,CAAC1D,MAAM,EAAE;MAC3B,MAAM8D,WAAW,GAAGJ,gBAAgB,CACjCK,GAAG,CACDC,eAAe,IACd,GAAGC,gBAAK,CAACC,IAAI,CAACF,eAAe,CAACG,EAAE,CAACC,QAAQ,CAAC,CAAC,CAAC,MAAMH,gBAAK,CAACI,GAAG,CAACL,eAAe,CAACJ,gBAA0B,CAAC,EAC3G,CAAC,CACAU,IAAI,CAAC,IAAI,CAAC;MACb,MAAM,KAAIC,oBAAQ,EAAC,mDAAmDT,WAAW,EAAE,CAAC;IACtF;IAEA,OAAO,IAAI,CAACU,UAAU,CAAC;MACrBrC,aAAa;MACbqB,mBAAmB;MACnBiB,WAAW,EAAErB,aAAa;MAC1BsB,WAAW,EAAEpB,iBAAiB;MAC9BhB,UAAU,EAAEA,UAAU;MACtBa,WAAW;MACXX,KAAK;MACLC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,MAAM+B,UAAUA,CAAC;IACfrC,aAAa;IACbqB,mBAAmB;IACnBiB,WAAW;IACXC,WAAW;IACXpC,UAAU;IACVqC,MAAM;IACNC,GAAG;IACHzB,WAAW;IACXX,KAAK;IACLC,0BAA0B;IAC1BoC,UAAU;IACVC;EAcF,CAAC,EAAgC;IAC/B,MAAMnC,QAAQ,GAAG,IAAI,CAACvB,SAAS,EAAEuB,QAAQ;IACzC,MAAMoC,WAAW,GAAG,IAAI,CAAC1D,KAAK,CAAC0D,WAAW;IAC1C,MAAMC,qBAAqB,GAAGxB,mBAAmB,CAACyB,IAAI,CACnDC,SAAS,IAAKA,SAAS,CAACtC,YAAY,IAAIsC,SAAS,CAACtC,YAAY,CAACuC,YAClE,CAAC;IACD,IAAIH,qBAAqB,IAAI,CAAC7C,aAAa,EAAE;MAC3CA,aAAa,GAAG,MAAM,IAAAiD,2CAA2B,EAAC,CAAC;IACrD;IACA,MAAM1B,gBAAoC,GAAGF,mBAAmB,CAC7D/D,MAAM,CAAE4F,eAAe,IAAKA,eAAe,CAACzB,gBAAgB,CAAC,CAC7DnE,MAAM,CAAE4F,eAAe,IAAK,CAACA,eAAe,CAACC,eAAe,CAAC,CAC7DvB,GAAG,CAAEsB,eAAe,KAAM;MACzBlB,EAAE,EAAEkB,eAAe,CAAClB,EAAE;MACtBP,gBAAgB,EAAEyB,eAAe,CAACzB,gBAA0B;MAC5DC,qBAAqB,EAAEwB,eAAe,CAACxB;IACzC,CAAC,CAAC,CAAC;IAEL,MAAM0B,oBAAoB,GAAG/B,mBAAmB,CAC7C/D,MAAM,CAAE4F,eAAe,IAAKA,eAAe,CAACC,eAAe,CAAC,CAC5DvB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACqB,aAAa,CAACC,SAAS,CAAC,CAAC;IAE5C,MAAMC,mBAAmB,GAAGlC,mBAAmB,CAAC/D,MAAM,CAAE4F,eAAe,IAAK,CAACA,eAAe,CAACzB,gBAAgB,CAAC;IAE9G,MAAM+B,yBAAyB,GAAGjB,WAAW,EAAEkB,cAAc,CAAC,CAAC;IAE/D,MAAMC,iBAAiB,GAAG,MAAM,IAAI,CAACC,oBAAoB,CACvDJ,mBAAmB,EACnBjB,WAAW,EACXtC,aAAa,EACbuC,WAAW,EACXG,UACF,CAAC;IAED,MAAMkB,cAAc,GAAG,IAAAC,iBAAO,EAACN,mBAAmB,CAAC3B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACsC,iBAAiB,CAAC,CAAC;IAEnF,MAAM;MAAEC,oBAAoB;MAAEC,sBAAsB;MAAEC;IAAuB,CAAC,GAAG,IAAI,CAAChF,SAAS,GAC3F,MAAM,IAAI,CAACU,YAAY,CAACuE,oCAAoC,CAACN,cAAc,CAAC,GAC5E;MAAEG,oBAAoB,EAAET,SAAS;MAAEU,sBAAsB,EAAEV,SAAS;MAAEW,sBAAsB,EAAEX;IAAU,CAAC;IAE7G,IAAIa,iCAAoD;IACxD,IAAIH,sBAAsB,EAAE;MAC1BG,iCAAiC,GAC/B,MAAM,IAAI,CAACxE,YAAY,CAACyE,0CAA0C,CAACJ,sBAAsB,CAAC;IAC9F;IACA,IAAI,IAAI,CAAC/E,SAAS,EAAE,MAAM,IAAI,CAACU,YAAY,CAAC0E,qCAAqC,CAACT,cAAc,CAAC;IAEjG,IAAIrB,WAAW,EAAEK,WAAW,CAAC0B,OAAO,CAACC,GAAG,CAAChC,WAAW,CAAC;IAErD,MAAMK,WAAW,CAAC0B,OAAO,CAACE,OAAO,CAAC,CAAC,CAAC,CAAC;;IAErC,MAAM5B,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IAEpD,IAAI,IAAI,CAACzF,SAAS,EAAE;MAClB,MAAMuB,QAAQ,CAACmE,WAAW,CAAC,SAASrC,WAAW,CAACL,QAAQ,CAAC,CAAC,EAAE,CAAC;MAC7D,MAAM,IAAI,CAAC2C,8BAA8B,CAAClB,iBAAiB,EAAEnB,WAAW,EAAEiB,yBAAyB,CAAC;IACtG;IAEA,IAAIJ,oBAAoB,CAACvF,MAAM,IAAI,IAAI,CAACoB,SAAS,EAAE;MACjD,MAAM4F,kBAAkB,GAAGC,8BAAe,CAACC,SAAS,CAAC3B,oBAAoB,CAAC;MAC1E,MAAM,IAAA4B,+BAAqB,EAACxE,QAAQ,EAAEqE,kBAAkB,CAAC;MACzD,MAAMrE,QAAQ,CAACyE,eAAe,CAACJ,kBAAkB,CAAC;IACpD;IAEA,MAAMK,iCAAiC,GAAG7D,mBAAmB,CAAC8D,IAAI,CAAE3D,CAAC,IAAKA,CAAC,CAACsC,iBAAiB,EAAEd,YAAY,CAAC,CAAC,CAAC;IAC9G,MAAMoC,uBAAuB,GAAGvC,qBAAqB,IAAI7C,aAAa,KAAK,QAAQ;IAEnF,IAAI,CAACM,0BAA0B,IAAI,CAAC8E,uBAAuB,IAAI,CAACF,iCAAiC,EAAE;MACjG;MACA;MACA;MACA;MACA,MAAM,IAAI,CAACrF,WAAW,CAACwF,oBAAoB,CAAC,CAAC;MAE7C,IAAI;QACF,MAAM,IAAI,CAAClG,OAAO,CAACA,OAAO,CAACmE,SAAS,EAAE;UACpCgC,MAAM,EAAE,IAAI;UACZC,cAAc,EAAE,KAAK;UACrBC,MAAM,EAAE;QACV,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOC,GAAQ,EAAE;QACjB,IAAI,CAACnG,MAAM,CAACoG,KAAK,CAAC,4BAA4B,EAAED,GAAG,CAAC;QACpD,IAAI,CAACnG,MAAM,CAACqG,cAAc,CACxB,uEAAuEF,GAAG,CAACrF,OAAO,EACpF,CAAC;MACH;IACF;IAEA,MAAMwF,iBAAiB,GAAG,IAAA/B,iBAAO,EAACH,iBAAiB,CAAC9B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACqE,iBAAiB,CAAC,CAAC;IAEpF,MAAMC,mBAAmB,GAAG,MAAAA,CAAA,KAAuC;MACjE;MACA;MACA,IAAI3F,UAAU,IAAIqC,MAAM,IAAI4C,uBAAuB,IAAIF,iCAAiC,EAAE;QACxF,OAAO,IAAI;MACb;MACA,IAAIzC,GAAG,EAAE;QACP,MAAMsD,QAAQ,GAAG1E,mBAAmB,CAACO,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;QACrD,MAAMgE,OAAO,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACF,QAAQ,EAAE/E,WAAW,EAAEX,KAAK,CAAC;QAC5E,IAAI,CAAC2F,OAAO,EAAE,OAAO,IAAI;QACzB,MAAM;UAAEE,gBAAgB;UAAEC,iBAAiB;UAAEC;QAAkB,CAAC,GAAGJ,OAAO;QAC1E,OAAO;UAAEK,iBAAiB,EAAEH,gBAAgB;UAAEI,kBAAkB,EAAEH,iBAAiB;UAAEC;QAAkB,CAAC;MAC1G;MACA,OAAO,IAAI,CAACG,sBAAsB,CAAClF,mBAAmB,EAAEuE,iBAAiB,EAAE;QACzE5E,WAAW;QACXX,KAAK;QACLmG,MAAM,EAAEjE,WAAW,EAAEkE,QAAQ,CAAC,CAAC;QAC/B9D;MACF,CAAC,CAAC;IACJ,CAAC;IACD,IAAI+D,gBAAkC,GAAG,IAAI;IAC7C,IAAIC,cAAiC;IACrC,MAAMC,cAAc,GAAG,IAAI,CAAC3H,SAAS,GAAG,IAAI,CAACA,SAAS,CAAC4H,MAAM,CAACC,YAAY,CAAC,CAAC,GAAG,IAAI;IACnF,IAAI;MACFJ,gBAAgB,GAAG,MAAMZ,mBAAmB,CAAC,CAAC;IAChD,CAAC,CAAC,OAAOL,GAAQ,EAAE;MACjB,IAAI,CAACnG,MAAM,CAACoG,KAAK,CAAC,sCAAsC,EAAED,GAAG,CAAC;MAC9DkB,cAAc,GAAGlB,GAAG;MACpB,IAAImB,cAAc,EAAE,IAAI,CAAC3H,SAAS,CAAC4H,MAAM,CAACE,mBAAmB,CAACH,cAAc,CAAC;IAC/E;IAEA,OAAO;MACLI,UAAU,EAAEtD,iBAAiB,CAAC9B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACyF,kBAAkB,CAAC;MAC9D1F,gBAAgB;MAChB6E,iBAAiB,EAAE,CAAC,GAAGhD,oBAAoB,EAAE,IAAIsD,gBAAgB,EAAEN,iBAAiB,IAAI,EAAE,CAAC,CAAC;MAC5FM,gBAAgB;MAChBC,cAAc;MACdO,2BAA2B,EAAE;QAC3BnD,oBAAoB;QACpBC,sBAAsB;QACtBC,sBAAsB;QACtBE;MACF,CAAC;MACDiB;IACF,CAAC;EACH;EAEA,MAAMR,8BAA8BA,CAClClB,iBAA0C,EAC1CnB,WAAkB,EAClBiB,yBAA2C,EAC3C;IACA,MAAM2D,kBAAkB,GAAG5E,WAAW,EAClCkB,cAAc,CAAC,CAAC,CACjBnG,MAAM,CAAE0E,EAAE,IAAK,CAACwB,yBAAyB,EAAE4D,iBAAiB,CAACpF,EAAE,CAAC,CAAC;IACpE,MAAMqF,2BAA2B,GAAGvC,8BAAe,CAACC,SAAS,CAACoC,kBAAkB,IAAI,EAAE,CAAC;IACvF,MAAMH,UAAU,GAAG,IAAAnD,iBAAO,EACxBH,iBAAiB,CACd9B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACqE,iBAAiB,CAAC,CAC/BvI,MAAM,CAAEkE,CAAC,IAAKA,CAAC,IAAI6F,2BAA2B,CAACD,iBAAiB,CAAC5F,CAAC,CAACQ,EAAE,CAAC,CAC3E,CAAC;IACD,MAAMsF,QAAQ,GAAGN,UAAU,CAACpF,GAAG,CAAEJ,CAAC,IAAK,IAAA+F,sCAAwB,EAAC/F,CAAC,CAAC,CAAC;IACnE,MAAMgG,SAAS,GAAG,IAAI,CAAC5H,WAAW,CAAC6H,oBAAoB,CAACH,QAAQ,CAAC;IACjE,IAAIE,SAAS,EAAE,MAAM,IAAI,CAAC5H,WAAW,CAAC8H,aAAa,CAAC,yBAAyB,CAAC;EAChF;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,MAAMC,cAAcA,CAClB/G,MAAqB;EAAE;EACvBgH,OAAmC,EACnCrF,WAAkB;EAAE;EACpBsF,SAAgB,EACiB;IACjC,MAAMC,mBAAmB,GAAG,KAAIC,0CAAmB,EACjD,IAAI,CAAC7I,KAAK,EACV,IAAI,CAACI,MAAM,EACX,IAAI,CAACE,QAAQ,EACboI,OAAO,EACP,IAAI,CAAC3I,SAAS,EACdsD,WAAW,EACXsF,SACF,CAAC;IACD,OAAOC,mBAAmB,CAACE,SAAS,CAACpH,MAAM,CAAC;EAC9C;EAEA,MAAc+C,oBAAoBA,CAChCJ,mBAA2C,EAC3CjB,WAAmB,EACnBtC,aAA4B,EAC5BuC,WAAkB,EAClBG,UAAoB,EACc;IAClC,MAAMgB,iBAAiB,GAAG,MAAM,IAAAuE,qBAAS,EACvC1E,mBAAmB,EACnB,OAAO;MAAE2E,gBAAgB;MAAElG,EAAE;MAAEvB,YAAY;MAAE0H,iBAAiB;MAAErE;IAAkB,CAAC,KAAK;MACtF,MAAMsE,cAAc,GAAG,MAAM,IAAI,CAAClJ,KAAK,CAAC0D,WAAW,CAACyF,iBAAiB,CAACrG,EAAE,CAAC;MACzE,MAAMsG,aAAa,GAAGhG,WAAW,CAACiG,SAAS,CAAC,CAAC,GAAGC,gBAAM,CAACC,IAAI,CAACnG,WAAW,CAACoG,IAAI,EAAE1G,EAAE,CAAC9C,KAAe,CAAC,GAAGoD,WAAW;MAC/G,OAAO,IAAI,CAACqG,YAAY,CAAC;QACvBT,gBAAgB;QAChBlG,EAAE;QACFvB,YAAY;QACZT,aAAa;QACb4I,UAAU,EAAER,cAAc,CAACS,MAAM,CAAC7G,EAAE,CAAC8G,OAAiB,CAAQ;QAC9DxG,WAAW,EAAEgG,aAAa;QAC1B/F,WAAW;QACX4F,iBAAiB;QACjBrE,iBAAiB;QACjBpB;MACF,CAAC,CAAC;IACJ,CACF,CAAC;IAED,IAAI,IAAI,CAACzD,SAAS,EAAE;MAClB,MAAM8J,YAAY,GAAG,IAAAlF,iBAAO,EAACH,iBAAiB,CAAC9B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACqE,iBAAiB,CAAC,CAAC;MAC/E,MAAMmD,wBAAwB,GAAG;QAC/BxI,QAAQ,EAAE,IAAI,CAACvB,SAAS,CAACuB,QAAQ;QACjCwG,UAAU,EAAE+B,YAAY;QACxBzI,0BAA0B,EAAE,IAAI;QAChC2I,WAAW,EAAE,KAAK;QAAE;QACpBC,qBAAqB,EAAE;MACzB,CAAC;MACD,MAAM,IAAI,CAAC3J,eAAe,CAAC4J,SAAS,CAACH,wBAAwB,CAAC;IAChE;IAEA,OAAOtF,iBAAiB;EAC1B;EAEA,MAAciF,YAAYA,CAAC;IACzBT,gBAAgB;IAChBlG,EAAE;IACFvB,YAAY;IACZT,aAAa;IACb4I,UAAU;IACVtG,WAAW;IACXC,WAAW;IACX4F,iBAAiB;IACjBrE,iBAAiB;IACjBpB;EAYF,CAAC,EAAkC;IACjC,MAAME,WAAW,GAAG,IAAI,CAAC1D,KAAK,CAAC0D,WAAW;IAC1C,IAAIwG,WAAW,GAAG,CAAC,CAAC;IACpB,MAAMC,iBAAoC,GAAG;MAC3CrH,EAAE,EAAE;QAAE0G,IAAI,EAAE1G,EAAE,CAACsH,QAAQ;QAAEpK,KAAK,EAAE8C,EAAE,CAAC9C;MAAM,CAAC;MAC1CqK,IAAI,EAAEX,UAAU;MAChBpC,MAAM,EAAElE;IACV,CAAC;IACDN,EAAE,GAAGkG,gBAAgB,GAAGA,gBAAgB,CAAClG,EAAE,GAAGA,EAAE;IAChD,MAAMoG,cAAc,GAAG,MAAMxF,WAAW,CAACyF,iBAAiB,CAACrG,EAAE,CAAC;IAE9D,MAAMwH,gBAAgB,GAAID,IAAS,IAAK;MACtC,IAAI,CAAChH,WAAW,EAAE,MAAM,IAAIkH,KAAK,CAAC,qDAAqD,CAAC;MACxF,IAAInH,WAAW,CAACiG,SAAS,CAAC,CAAC,EAAE;QAC3B,MAAMmB,YAAY,GAAGnH,WAAW,CAACyE,UAAU,CAAClE,IAAI,CAAEtB,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC2H,qBAAqB,CAAC3H,EAAE,CAAC,CAAC;QACvF,IAAI,CAAC0H,YAAY,EAAE;MACrB;MACAnH,WAAW,CAACqH,YAAY,CAAC;QAAE5H,EAAE;QAAEuH;MAAK,CAAC,CAAC;IACxC,CAAC;IAED,MAAMM,sBAAsB,GAAIhE,iBAAqC,IAAK;MACxE,IAAI,CAACqC,gBAAgB,EAAE,MAAM,IAAIuB,KAAK,CAAC,yDAAyD,CAAC;MACjG;MACA;MACA,IAAI,CAAClH,WAAW,EAAE,MAAM,IAAIkH,KAAK,CAAC,oDAAoD,CAAC;MACvF,IAAI,CAACtB,iBAAiB,EAAE,MAAM,IAAIsB,KAAK,CAAC,qCAAqC,CAAC;MAC9ED,gBAAgB,CAACrB,iBAAiB,CAAC2B,iBAAiB,CAAC;MACrDT,iBAAiB,CAACU,SAAS,GAAG;QAC5BC,aAAa,EAAE7B,iBAAiB,CAAC6B,aAAa;QAC9CF,iBAAiB,EAAE3B,iBAAiB,CAAC2B,iBAAiB;QACtDG,eAAe,EAAE9B,iBAAiB,CAAC8B;MACrC,CAAC;MACDrH,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACyF,QAAQ,CAACb,iBAAiB,CAAC;MAClE,OAAO;QAAEpC,kBAAkB,EAAE;UAAEjF,EAAE;UAAEoH;QAAY,CAAC;QAAErG,SAAS,EAAEmF,gBAAgB;QAAErC;MAAkB,CAAC;IACpG,CAAC;IAED,MAAMsE,uBAAuB,GAAGA,CAAA,KAAM;MACpC,IAAI,CAACjC,gBAAgB,EAAE,MAAM,IAAIuB,KAAK,CAAC,mDAAmDzH,EAAE,CAACC,QAAQ,CAAC,CAAC,EAAE,CAAC;MAC1GiG,gBAAgB,CAACkC,KAAK,CAACtM,OAAO,CAAEuM,IAAI,IAAK;QACvCjB,WAAW,CAAC,IAAAkB,mCAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;MACzE,CAAC,CAAC;IACJ,CAAC;IACD,IAAIhK,YAAY,IAAIA,YAAY,CAACuC,YAAY,IAAIhD,aAAa,KAAK0K,4BAAY,CAACC,IAAI,EAAE;MACpFR,uBAAuB,CAAC,CAAC;MACzBvH,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACyF,QAAQ,CAACb,iBAAiB,CAAC;MAClE,OAAO;QAAEpC,kBAAkB,EAAE;UAAEjF,EAAE;UAAEoH;QAAY,CAAC;QAAErG,SAAS,EAAEmF,gBAAgB,IAAI5E;MAAU,CAAC;IAC9F;IACA,IAAI6E,iBAAiB,EAAEyC,QAAQ,KAAK,MAAM,EAAE;MAC1CT,uBAAuB,CAAC,CAAC;MACzB,OAAON,sBAAsB,CAAC,CAAC;IACjC;IACA,MAAMgB,QAAQ,GAAG7I,EAAE,CAACqB,aAAa,CAACuF,UAAU,CAAC3G,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAM6I,QAAQ,GAAG,CAACrK,YAAY,IAAIT,aAAa,KAAK0K,4BAAY,CAACK,MAAM,GAAGF,QAAQ,GAAG7I,EAAE;IACvF,MAAMgJ,eAAe,GAAG,IAAI,CAAC/L,SAAS,GAClC,MAAM,IAAI,CAACA,SAAS,CAACuB,QAAQ,CAACyK,oCAAoC,CAACH,QAAQ,CAAC,GAC5E,MAAMlI,WAAW,CAACsI,oBAAoB,CAACJ,QAAQ,CAAC,CAAC,CAAC;IACtD,IAAIrK,YAAY,IAAIT,aAAa,KAAK0K,4BAAY,CAACK,MAAM,EAAE;MACzD;MACAC,eAAe,CAAClC,OAAO,GAAG9G,EAAE,CAAC8G,OAAO;IACtC;IACA,MAAMsB,KAAK,GAAGY,eAAe,CAACZ,KAAK;IACnC,IAAAe,4BAAgB,EAACf,KAAK,EAAEhB,WAAW,EAAElB,gBAAgB,IAAI5E,SAAS,CAAC;IAEnE,IAAI7C,YAAY,EAAE;MAChB;MACA,MAAM;QAAE2I,WAAW,EAAEgC,cAAc;QAAEC;MAAc,CAAC,GAAG,IAAAC,gCAAoB,EAAClB,KAAK,EAAE3J,YAAY,EAAET,aAAa,CAAC;MAC/GgL,eAAe,CAACZ,KAAK,GAAGiB,aAAa;MACrCjC,WAAW,GAAAzL,aAAA,CAAAA,aAAA,KAAQyL,WAAW,GAAKgC,cAAc,CAAE;IACrD;IAEA,IAAI,IAAI,CAACnM,SAAS,EAAE,MAAM,IAAAsM,+BAAmB,EAACnC,WAAW,EAAE,IAAI,CAACnK,SAAS,CAACuB,QAAQ,EAAE0H,gBAAgB,IAAI5E,SAAS,CAAC;IAElH,IAAIQ,iBAAiB,EAAE;MACrB,MAAM0H,wBAAwB,GAAG1H,iBAAiB,CAAC2H,2BAA2B,CAAC,CAAC;MAChF,IAAID,wBAAwB,EAAE;QAC5BnC,iBAAiB,CAACqC,YAAY,GAAGF,wBAAwB;QACzD;QACA;MACF;IACF;;IAEA;IACA;IACA,IAAI/K,YAAY,EAAE;MAChB,IAAIA,YAAY,CAACuC,YAAY,IAAIhD,aAAa,KAAK0K,4BAAY,CAACiB,MAAM,EAAE;QACtEtC,iBAAiB,CAACuC,aAAa,GAAGnL,YAAY,CAAC4K,aAAa,CAAC/N,MAAM,CAAEuO,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC,CAAClK,GAAG,CAAEiK,CAAC,IAAKA,CAAC,CAACE,QAAQ,CAAC;MAC/G;MACAnJ,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACyF,QAAQ,CAACb,iBAAiB,CAAC;IACpE,CAAC,MAAM,IAAI9G,WAAW,EAAE;MACtB,IAAI4F,iBAAiB,EAAE;QACrB;QACA,OAAO0B,sBAAsB,CAACmB,eAAe,CAAC;MAChD;MACAxB,gBAAgB,CAACZ,UAAU,CAAC;IAC9B,CAAC,MAAM;MACL;MACA,IAAIlG,UAAU,EAAE;QACd0F,cAAc,CAAC4D,aAAa,CAACC,OAAO,CAACrD,UAAU,CAAC;MAClD,CAAC,MAAM;QACLR,cAAc,CAAC6D,OAAO,CAACrD,UAAU,CAAC;QAClC;QACAR,cAAc,CAAC8D,kBAAkB,CAACtD,UAAU,CAAC3G,QAAQ,CAAC,CAAC,CAAC;MAC1D;MACAW,WAAW,CAAC0B,OAAO,CAACC,GAAG,CAAC6D,cAAc,CAAC;IACzC;IAEA,OAAO;MACLnB,kBAAkB,EAAE;QAAEjF,EAAE,EAAE8I,QAAQ;QAAE1B;MAAY,CAAC;MACjDrG,SAAS,EAAEmF,gBAAgB,IAAI5E,SAAS;MACxCuC,iBAAiB,EAAEmF;IACrB,CAAC;EACH;EAEA,MAAcrK,UAAUA,CAACZ,OAAe,EAAgC;IACtE,MAAMS,QAAQ,GAAG,IAAI,CAACvB,SAAS,CAACuB,QAAQ;IACxC,MAAM2L,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACrM,OAAO,CAAC;IACjD,MAAMiG,OAAO,GAAG,MAAM,IAAI,CAAC3G,QAAQ,CAACA,QAAQ,CAAC;MAAE8M,GAAG;MAAEE,KAAK,EAAE;IAAK,CAAC,CAAC;IAClEF,GAAG,CAACrO,OAAO,CAAEkE,EAAE,IAAKxB,QAAQ,CAACtB,KAAK,CAACoF,OAAO,CAACG,kBAAkB,CAAC6H,eAAe,CAACtK,EAAE,CAAC,CAAC;IAClF,MAAMxB,QAAQ,CAACtB,KAAK,CAACoF,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IACvD,OAAO;MAAE6H,iBAAiB,EAAEvG,OAAO,CAACgB;IAAW,CAAC;EAClD;EAEA,MAActG,YAAYA,CAACX,OAAe,EAAEiB,WAAmB,EAAEX,KAAc,EAAgC;IAC7G,MAAM8L,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACrM,OAAO,CAAC;IACjD;IACA,MAAM;MAAEsG;IAAkB,CAAC,GAAG,MAAM,IAAI,CAACjH,QAAQ,CAACoN,IAAI,CAAC;MACrDC,YAAY,EAAE3H,8BAAe,CAACC,SAAS,CAACoH,GAAG,CAACvK,GAAG,CAAEI,EAAE,IAAKA,EAAE,CAAC,CAAC;MAC5D3B,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;IACF,OAAO;MAAE0L,kBAAkB,EAAErG;IAAkB,CAAC;EAClD;EAEA,MAAc/E,sBAAsBA,CAClCV,MAAqB,EACrB4F,MAAc,EACdmG,eAAiC,EACjC3M,aAA4B,EACK;IACjC,MAAMmM,GAAG,GAAG,MAAMS,OAAO,CAACC,GAAG,CAC3BjM,MAAM,CAACgB,GAAG,CAAC,MAAOkL,KAAK,IAAK;MAC1B,MAAMC,eAAe,GAAGvG,MAAM,CAAC+B,SAAS,CAAC,CAAC,GAAGuE,KAAK,CAAC5N,KAAK,GAAGsH,MAAM,CAACtH,KAAK;MACvE,MAAM8N,YAAY,GAAGxE,gBAAM,CAACC,IAAI,CAACjC,MAAM,CAACkC,IAAI,EAAEqE,eAAyB,CAAC;MACxE,MAAMnE,UAAU,GAAG,MAAM,IAAI,CAAC3J,SAAS,CAACuB,QAAQ,CAACtB,KAAK,CAACoF,OAAO,CAAC2I,WAAW,CAACpE,MAAM,CAACmE,YAAY,EAAEF,KAAK,CAAC;MACtG,MAAMI,SAAS,GAAGF,YAAY,CAAC/K,QAAQ,CAAC,CAAC;MACzC,IAAI,CAAC2G,UAAU,EAAE;QACf,MAAM,KAAIxG,oBAAQ,EAAC,oCAAoC0K,KAAK,CAACK,sBAAsB,CAAC,CAAC,SAASD,SAAS,GAAG,CAAC;MAC7G;MACA,OAAOJ,KAAK,CAACzJ,aAAa,CAACuF,UAAU,CAAC3G,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CACH,CAAC;IAED,OAAO,IAAI,CAAC0F,cAAc,CAACwE,GAAG,EAAE;MAAEiB,YAAY,EAAE,KAAK;MAAEpN;IAAc,CAAC,EAAE2M,eAAe,EAAEA,eAAe,CAAC;EAC3G;EAEA,MAAcpG,sBAAsBA,CAClClF,mBAA2C,EAC3CuE,iBAAsC,EACtC;IACE5E,WAAW;IACXX,KAAK;IACLmG,MAAM;IACN7D;EAMF,CAAC,EAC0B;IAC3B,MAAM8B,kBAAkB,GAAG,IAAI,CAACvF,KAAK,CAAC0D,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAAC4I,aAAa,CAAC,CAAC;IAC5F,IAAI,CAAC/N,MAAM,CAACgO,KAAK,CAAC,8CAA8C7I,kBAAkB,CAAC5G,MAAM,CAACoE,QAAQ,CAAC,CAAC,aAAa,CAAC;IAClH,IAAI,CAACwC,kBAAkB,CAAC5G,MAAM,EAAE,OAAO,IAAI;IAC3C,MAAMsO,GAAG,GAAGrH,8BAAe,CAACC,SAAS,CAACN,kBAAkB,CAAC7C,GAAG,CAAE5E,CAAC,IAAKuQ,0BAAW,CAACC,UAAU,CAACxQ,CAAC,CAACgF,EAAE,CAAC,CAAC,CAAC;IAClG,IAAI,CAAC,IAAI,CAAC/C,SAAS,EAAE;MACnB,MAAMwO,uBAAuB,GAAGA,CAAA,KAAmC;QACjE,IAAI,CAACpM,mBAAmB,CAACxD,MAAM,IAAI,CAACwD,mBAAmB,CAAC,CAAC,CAAC,CAACqM,eAAe,EAAE,OAAOpK,SAAS;QAC5F,MAAMqK,iBAAiB,GAAGtM,mBAAmB,CAC1C/D,MAAM,CAAEkE,CAAC,IAAK;UACb,MAAMoM,iBAAiB,GAAGpM,CAAC,CAACkM,eAAe,EAAEE,iBAAiB,IAAI,CAAC,CAAC;UACpE,MAAMC,SAAS,GAAG3Q,MAAM,CAACC,IAAI,CAACyQ,iBAAiB,CAAC;UAChDC,SAAS,CAAC/P,OAAO,CAAEgQ,QAAQ,IACzB,IAAI,CAACxO,MAAM,CAACgO,KAAK,CACf,wBAAwB9L,CAAC,CAACQ,EAAE,CAACC,QAAQ,CAAC,CAAC,gBAAgB6L,QAAQ,aAAaF,iBAAiB,CAACE,QAAQ,CAAC,EACzG,CACF,CAAC;UACD,OAAOD,SAAS,CAAChQ,MAAM;QACzB,CAAC,CAAC,CACD+D,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;QACnB,OAAO8C,8BAAe,CAACC,SAAS,CAAC4I,iBAAiB,CAAC;MACrD,CAAC;MACD,MAAM3H,OAAO,GAAG,MAAM,IAAI,CAAC5G,QAAQ,CAAC2O,aAAa,CAC/C5B,GAAG,CAACvK,GAAG,CAAEI,EAAE,KAAM;QACfgM,WAAW,EAAEhM,EAAE,CAACC,QAAQ,CAAC,CAAC;QAC1BgM,OAAO,EAAE,IAAI,CAAC/O,KAAK,CAAC0D,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACyJ,QAAQ,CAAClM,EAAE,CAAC,EAAE0J;MAC3E,CAAC,CAAC,CAAC,EACH;QACEtL,OAAO,EAAEY,WAAW;QACpBX,KAAK;QACL8N,IAAI,EAAE3H,MAAM,EAAEvE,QAAQ,CAAC,CAAC;QACxBmM,uBAAuB,EAAExI,iBAAiB;QAC1CyI,oBAAoB,EAAEZ,uBAAuB,CAAC,CAAC;QAC/C9K;MACF,CACF,CAAC;MACD,OAAOqD,OAAO;IAChB;IACA,OAAO,IAAI,CAAC5G,QAAQ,CAACoN,IAAI,CAAC;MACxBC,YAAY,EAAEN,GAAG;MACjB9L,KAAK;MACLD,OAAO,EAAEY,WAAW;MACpB2B;IACF,CAAC,CAAC;EACJ;EAEA,MAAcsD,mBAAmBA,CAC/BF,QAAuB,EACvBuI,UAAmB,EACnBjO,KAAe,EACa;IAC5B,MAAM8L,GAAG,GAAGpG,QAAQ,CAACnE,GAAG,CAAEI,EAAE,IAAK;MAC/B,OAAOA,EAAE,CAACmL,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,IAAI,CAAC7N,MAAM,CAACgO,KAAK,CAAC,6CAA6CvH,QAAQ,CAAClI,MAAM,CAACoE,QAAQ,CAAC,CAAC,aAAa,CAAC;IACvG,OAAO,IAAI,CAAC7C,QAAQ,CAACqD,GAAG,CAAC;MACvB0J,GAAG;MACH9L,KAAK;MACLD,OAAO,EAAEkO,UAAU;MACnBC,UAAU,EAAE;IACd,CAAC,CAAC;EACJ;EAEA,MAAcnC,iBAAiBA,CAACrM,OAAgB,EAA0B;IACxE,IAAIA,OAAO,EAAE;MACX,MAAMyO,YAAY,GAAG,MAAM,IAAI,CAACvP,SAAS,CAACwP,YAAY,CAAC1O,OAAO,CAAC;MAC/DyO,YAAY,CAAC1Q,OAAO,CAAEkE,EAAE,IAAK;QAC3B,MAAM0M,KAAK,GAAG,IAAI,CAACzP,SAAS,CAACuB,QAAQ,CAACtB,KAAK,CAACoF,OAAO,CAACG,kBAAkB,CAACyJ,QAAQ,CAAClM,EAAE,CAAC;QACnF,IAAI,CAAC0M,KAAK,EAAE;UACV,MAAM,KAAItM,oBAAQ,EAAC,2BAA2BJ,EAAE,CAACC,QAAQ,CAAC,CAAC,kCAAkC,CAAC;QAChG;MACF,CAAC,CAAC;MACF,OAAOuM,YAAY;IACrB;IACA,MAAMG,oBAAoB,GAAG,IAAI,CAAC1P,SAAS,CAACuB,QAAQ,CAACtB,KAAK,CAACoF,OAAO,CAACG,kBAAkB,CAAC4I,aAAa,CAAC,CAAC;IACrG,IAAI,CAACsB,oBAAoB,CAAC9Q,MAAM,EAAE,MAAM,KAAIuE,oBAAQ,EAAC,oDAAoD,CAAC;IAC1G,OAAOuM,oBAAoB,CAAC/M,GAAG,CAAEgN,CAAC,IAAKrB,0BAAW,CAACC,UAAU,CAACoB,CAAC,CAAC5M,EAAE,CAAC,CAAC;EACtE;EAEA,MAAcnB,oBAAoBA,CAACd,OAAgB,EAA0B;IAC3E,IAAIA,OAAO,EAAE;MACX,OAAO,IAAI,CAACd,SAAS,CAACwP,YAAY,CAAC1O,OAAO,CAAC;IAC7C;IACA,MAAM8O,YAAY,GAAG,MAAM,IAAI,CAACC,0BAA0B,CAAC,CAAC;IAC5D,OAAOD,YAAY,CAACjN,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;EACtC;EAEA,MAAM8M,0BAA0BA,CAACC,cAA+B,EAAgC;IAC9F,MAAMvO,QAAQ,GAAG,IAAI,CAACvB,SAAS,CAACuB,QAAQ;IACxCuO,cAAc,GAAGA,cAAc,IAAI,KAAIC,wBAAc,EAAC,IAAI,CAAC/P,SAAS,CAAC;IACrE,MAAMgQ,MAAM,GAAGzO,QAAQ,CAACqG,MAAM,CAACqI,sCAAsC,CAAC,CAAC;IACvE,MAAMC,mBAAmB,GAAG,MAAMJ,cAAc,CAACK,kBAAkB,CAAC,CAAC;IACrE,MAAMC,gBAAgB,GAAGN,cAAc,CAACO,8BAA8B,CAAC,CAAC;IACxE,MAAMC,sBAAsB,GAAG,MAAM3C,OAAO,CAACC,GAAG,CAC9CoC,MAAM,CAACrN,GAAG,CAAC,MAAOoM,WAAwB,IAAK;MAC7C,MAAM5F,cAAc,GAAG+G,mBAAmB,CAACrM,IAAI,CAAEtB,CAAC,IAAKA,CAAC,CAACgO,aAAa,CAAC,CAAC,CAAC7F,qBAAqB,CAACqE,WAAW,CAAC,CAAC;MAC5G,IAAI,CAAC5F,cAAc,IAAIiH,gBAAgB,CAACjI,iBAAiB,CAAC4G,WAAW,CAAC,EAAE,OAAO,IAAI;MACnF,MAAMyB,YAAY,GAAG,MAAMrH,cAAc,CAACsH,6BAA6B,CAAClP,QAAQ,CAACtB,KAAK,CAACoF,OAAO,CAAC;MAC/F,IAAI,CAACmL,YAAY,CAACE,UAAU,CAAC,CAAC,EAAE,OAAO,IAAI;MAC3C,OAAO;QAAE3N,EAAE,EAAEoG,cAAc,CAACoH,aAAa,CAAC,CAAC;QAAEI,OAAO,EAAEH;MAAa,CAAC;IACtE,CAAC,CACH,CAAC;IACD,OAAO,IAAA5L,iBAAO,EAAC0L,sBAAsB,CAAC;EACxC;EAqBA,aAAaM,QAAQA,CAAC,CACpBC,GAAG,EACH7Q,SAAS,EACTC,KAAK,EACLE,QAAQ,EACRC,QAAQ,EACRF,OAAO,EACP4Q,UAAU,EACVC,UAAU,EACVxQ,QAAQ,EACRC,MAAM,EACNC,MAAM,EACNuQ,WAAW,EACXtQ,YAAY,EACZC,WAAW,EACXC,WAAW,CAiBZ,EAAE;IACD,MAAMP,MAAM,GAAGyQ,UAAU,CAACG,YAAY,CAACC,wBAAa,CAACnO,EAAE,CAAC;IACxD,MAAMoO,OAAO,GAAG,IAAIrR,WAAW,CAC7BE,SAAS,EACTC,KAAK,EACLC,OAAO,EACPC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACN0Q,UAAU,EACVxQ,QAAQ,EACRC,MAAM,EACNC,MAAM,EACNC,YAAY,EACZC,WAAW,EACXC,WACF,CAAC;IACDiQ,GAAG,CAACO,QAAQ,CAAC,KAAIC,oBAAQ,EAACF,OAAO,EAAEH,WAAW,CAAC,CAAC;IAChD,OAAOG,OAAO;EAChB;AACF;AAACG,OAAA,CAAAxR,WAAA,GAAAA,WAAA;AAAAhB,eAAA,CAxsBYgB,WAAW,WAioBP,EAAE;AAAAhB,eAAA,CAjoBNgB,WAAW,kBAkoBA,CACpByR,gBAAS,EACTC,4BAAe,EACfC,oBAAW,EACXC,0BAAc,EACdC,0BAAc,EACdC,wBAAa,EACbC,sBAAY,EACZC,wCAAqB,EACrBC,0BAAc,EACdC,sBAAY,EACZC,sBAAY,EACZC,gCAAiB,EACjBC,kCAAkB,EAClBC,8CAAwB,EACxBC,gCAAiB,CAClB;AAAAvT,eAAA,CAlpBUgB,WAAW,aAmpBLwS,kBAAW;AAuD9BpB,wBAAa,CAACqB,UAAU,CAACzS,WAAW,CAAC","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merging",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.641",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/component/merging",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.component",
|
|
8
8
|
"name": "merging",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.641"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "4.1.2",
|
|
@@ -17,34 +17,34 @@
|
|
|
17
17
|
"@teambit/component-id": "1.2.4",
|
|
18
18
|
"@teambit/lane-id": "0.0.312",
|
|
19
19
|
"@teambit/harmony": "0.4.7",
|
|
20
|
-
"@teambit/cli": "0.0.
|
|
21
|
-
"@teambit/config-merger": "0.0.
|
|
22
|
-
"@teambit/config-store": "0.0.
|
|
20
|
+
"@teambit/cli": "0.0.1218",
|
|
21
|
+
"@teambit/config-merger": "0.0.508",
|
|
22
|
+
"@teambit/config-store": "0.0.98",
|
|
23
23
|
"@teambit/legacy.constants": "0.0.11",
|
|
24
24
|
"@teambit/git.modules.git-executable": "0.0.12",
|
|
25
25
|
"@teambit/legacy.logger": "0.0.19",
|
|
26
26
|
"@teambit/legacy.utils": "0.0.21",
|
|
27
|
-
"@teambit/builder": "1.0.
|
|
27
|
+
"@teambit/builder": "1.0.641",
|
|
28
28
|
"@teambit/component.snap-distance": "0.0.54",
|
|
29
|
-
"@teambit/dependency-resolver": "1.0.
|
|
30
|
-
"@teambit/importer": "1.0.
|
|
29
|
+
"@teambit/dependency-resolver": "1.0.641",
|
|
30
|
+
"@teambit/importer": "1.0.641",
|
|
31
31
|
"@teambit/legacy.consumer-component": "0.0.54",
|
|
32
32
|
"@teambit/legacy.extension-data": "0.0.55",
|
|
33
33
|
"@teambit/legacy.scope": "0.0.53",
|
|
34
|
-
"@teambit/logger": "0.0.
|
|
35
|
-
"@teambit/objects": "0.0.
|
|
36
|
-
"@teambit/scope": "1.0.
|
|
37
|
-
"@teambit/workspace": "1.0.
|
|
38
|
-
"@teambit/application": "1.0.
|
|
39
|
-
"@teambit/checkout": "1.0.
|
|
40
|
-
"@teambit/component-writer": "1.0.
|
|
41
|
-
"@teambit/config": "0.0.
|
|
42
|
-
"@teambit/install": "1.0.
|
|
34
|
+
"@teambit/logger": "0.0.1311",
|
|
35
|
+
"@teambit/objects": "0.0.148",
|
|
36
|
+
"@teambit/scope": "1.0.641",
|
|
37
|
+
"@teambit/workspace": "1.0.641",
|
|
38
|
+
"@teambit/application": "1.0.641",
|
|
39
|
+
"@teambit/checkout": "1.0.641",
|
|
40
|
+
"@teambit/component-writer": "1.0.641",
|
|
41
|
+
"@teambit/config": "0.0.1392",
|
|
42
|
+
"@teambit/install": "1.0.641",
|
|
43
43
|
"@teambit/legacy.component-list": "0.0.107",
|
|
44
44
|
"@teambit/legacy.consumer": "0.0.53",
|
|
45
45
|
"@teambit/pkg.modules.component-package-name": "0.0.60",
|
|
46
|
-
"@teambit/remove": "1.0.
|
|
47
|
-
"@teambit/snapping": "1.0.
|
|
46
|
+
"@teambit/remove": "1.0.641",
|
|
47
|
+
"@teambit/snapping": "1.0.641",
|
|
48
48
|
"@teambit/toolbox.path.path": "0.0.8",
|
|
49
49
|
"@teambit/legacy.cli.prompts": "0.0.17",
|
|
50
50
|
"@teambit/component.sources": "0.0.105",
|
|
File without changes
|