@teambit/lanes 0.0.364 → 0.0.367
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.
- package/dist/create-lane.js +4 -2
- package/dist/create-lane.js.map +1 -1
- package/dist/lanes.docs.mdx +6 -0
- package/dist/lanes.main.runtime.js +1 -0
- package/dist/lanes.main.runtime.js.map +1 -1
- package/dist/merge-lanes.js +5 -3
- package/dist/merge-lanes.js.map +1 -1
- package/lanes.docs.mdx +6 -0
- package/package-tar/teambit-lanes-0.0.367.tgz +0 -0
- package/package.json +18 -18
- package/{preview-1658028499572.js → preview-1658460543237.js} +2 -2
- package/package-tar/teambit-lanes-0.0.364.tgz +0 -0
package/dist/create-lane.js
CHANGED
@@ -76,12 +76,14 @@ async function createLane(consumer, laneName, scopeName, remoteLane) {
|
|
76
76
|
return currentWorkspaceLane ? currentWorkspaceLane.ids : new (_bitId().BitIds)();
|
77
77
|
};
|
78
78
|
|
79
|
+
const forkedFrom = consumer.bitMap.remoteLaneId;
|
79
80
|
const newLane = remoteLane ? _lane().default.from({
|
80
81
|
name: laneName,
|
81
82
|
hash: remoteLane.hash().toString(),
|
82
83
|
log: remoteLane.log,
|
83
|
-
scope: remoteLane.scope
|
84
|
-
|
84
|
+
scope: remoteLane.scope,
|
85
|
+
forkedFrom
|
86
|
+
}) : _lane().default.create(laneName, scopeName, forkedFrom);
|
85
87
|
const dataToPopulate = await getDataToPopulateLaneObjectIfNeeded();
|
86
88
|
newLane.setLaneComponents(dataToPopulate);
|
87
89
|
await consumer.scope.lanes.saveLane(newLane);
|
package/dist/create-lane.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["createLane","consumer","laneName","scopeName","remoteLane","lanes","scope","listLanes","find","lane","name","BitError","throwForInvalidLaneName","getDataToPopulateLaneObjectIfNeeded","components","currentLaneObject","getCurrentLaneObject","getDataToPopulateWorkspaceLaneIfNeeded","BitIds","currentWorkspaceLane","bitMap","workspaceLane","ids","newLane","Lane","from","hash","toString","log","create","dataToPopulate","setLaneComponents","saveLane","workspaceConfig","WorkspaceLane","load","getPath","write","isValidLaneName","val","test"],"sources":["create-lane.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport Lane, { LaneComponent } from '@teambit/legacy/dist/scope/models/lane';\nimport WorkspaceLane from '@teambit/legacy/dist/consumer/bit-map/workspace-lane';\n\nexport async function createLane(\n consumer: Consumer,\n laneName: string,\n scopeName: string,\n remoteLane?: Lane\n): Promise<Lane> {\n const lanes = await consumer.scope.listLanes();\n if (lanes.find((lane) => lane.name === laneName)) {\n throw new BitError(`lane \"${laneName}\" already exists, to switch to this lane, please use \"bit switch\" command`);\n }\n throwForInvalidLaneName(laneName);\n const getDataToPopulateLaneObjectIfNeeded = async (): Promise<LaneComponent[]> => {\n if (remoteLane) return remoteLane.components;\n // when branching from one lane to another, copy components from the origin lane\n // when branching from main, no need to copy anything\n const currentLaneObject = await consumer.getCurrentLaneObject();\n return currentLaneObject ? currentLaneObject.components : [];\n };\n const getDataToPopulateWorkspaceLaneIfNeeded = (): BitIds => {\n if (remoteLane) return new BitIds(); // if remoteLane, this got created when importing a remote lane\n // when branching from one lane to another, copy components from the origin workspace-lane\n // when branching from main, no need to copy anything\n const currentWorkspaceLane = consumer.bitMap.workspaceLane;\n return currentWorkspaceLane ? currentWorkspaceLane.ids : new BitIds();\n };\n const newLane = remoteLane\n ? Lane.from({
|
1
|
+
{"version":3,"names":["createLane","consumer","laneName","scopeName","remoteLane","lanes","scope","listLanes","find","lane","name","BitError","throwForInvalidLaneName","getDataToPopulateLaneObjectIfNeeded","components","currentLaneObject","getCurrentLaneObject","getDataToPopulateWorkspaceLaneIfNeeded","BitIds","currentWorkspaceLane","bitMap","workspaceLane","ids","forkedFrom","remoteLaneId","newLane","Lane","from","hash","toString","log","create","dataToPopulate","setLaneComponents","saveLane","workspaceConfig","WorkspaceLane","load","getPath","write","isValidLaneName","val","test"],"sources":["create-lane.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport Lane, { LaneComponent } from '@teambit/legacy/dist/scope/models/lane';\nimport WorkspaceLane from '@teambit/legacy/dist/consumer/bit-map/workspace-lane';\n\nexport async function createLane(\n consumer: Consumer,\n laneName: string,\n scopeName: string,\n remoteLane?: Lane\n): Promise<Lane> {\n const lanes = await consumer.scope.listLanes();\n if (lanes.find((lane) => lane.name === laneName)) {\n throw new BitError(`lane \"${laneName}\" already exists, to switch to this lane, please use \"bit switch\" command`);\n }\n throwForInvalidLaneName(laneName);\n const getDataToPopulateLaneObjectIfNeeded = async (): Promise<LaneComponent[]> => {\n if (remoteLane) return remoteLane.components;\n // when branching from one lane to another, copy components from the origin lane\n // when branching from main, no need to copy anything\n const currentLaneObject = await consumer.getCurrentLaneObject();\n return currentLaneObject ? currentLaneObject.components : [];\n };\n const getDataToPopulateWorkspaceLaneIfNeeded = (): BitIds => {\n if (remoteLane) return new BitIds(); // if remoteLane, this got created when importing a remote lane\n // when branching from one lane to another, copy components from the origin workspace-lane\n // when branching from main, no need to copy anything\n const currentWorkspaceLane = consumer.bitMap.workspaceLane;\n return currentWorkspaceLane ? currentWorkspaceLane.ids : new BitIds();\n };\n const forkedFrom = consumer.bitMap.remoteLaneId;\n const newLane = remoteLane\n ? Lane.from({\n name: laneName,\n hash: remoteLane.hash().toString(),\n log: remoteLane.log,\n scope: remoteLane.scope,\n forkedFrom,\n })\n : Lane.create(laneName, scopeName, forkedFrom);\n const dataToPopulate = await getDataToPopulateLaneObjectIfNeeded();\n newLane.setLaneComponents(dataToPopulate);\n\n await consumer.scope.lanes.saveLane(newLane);\n\n const workspaceConfig = WorkspaceLane.load(laneName, consumer.scope.getPath());\n workspaceConfig.ids = getDataToPopulateWorkspaceLaneIfNeeded();\n await workspaceConfig.write();\n\n return newLane;\n}\n\nexport function throwForInvalidLaneName(laneName: string) {\n if (!isValidLaneName(laneName)) {\n throw new BitError(\n `lane \"${laneName}\" has invalid characters. lane name can only contain alphanumeric, lowercase characters, and the following [\"-\", \"_\", \"$\", \"!\"]`\n );\n }\n}\n\nfunction isValidLaneName(val: unknown): boolean {\n if (typeof val !== 'string') return false;\n // @todo: should we allow slash? if so, we should probably replace the lane-delimiter with something else. (maybe \":\")\n return /^[$\\-_!a-z0-9]+$/.test(val);\n}\n"],"mappings":";;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEO,eAAeA,UAAf,CACLC,QADK,EAELC,QAFK,EAGLC,SAHK,EAILC,UAJK,EAKU;EACf,MAAMC,KAAK,GAAG,MAAMJ,QAAQ,CAACK,KAAT,CAAeC,SAAf,EAApB;;EACA,IAAIF,KAAK,CAACG,IAAN,CAAYC,IAAD,IAAUA,IAAI,CAACC,IAAL,KAAcR,QAAnC,CAAJ,EAAkD;IAChD,MAAM,KAAIS,oBAAJ,EAAc,SAAQT,QAAS,2EAA/B,CAAN;EACD;;EACDU,uBAAuB,CAACV,QAAD,CAAvB;;EACA,MAAMW,mCAAmC,GAAG,YAAsC;IAChF,IAAIT,UAAJ,EAAgB,OAAOA,UAAU,CAACU,UAAlB,CADgE,CAEhF;IACA;;IACA,MAAMC,iBAAiB,GAAG,MAAMd,QAAQ,CAACe,oBAAT,EAAhC;IACA,OAAOD,iBAAiB,GAAGA,iBAAiB,CAACD,UAArB,GAAkC,EAA1D;EACD,CAND;;EAOA,MAAMG,sCAAsC,GAAG,MAAc;IAC3D,IAAIb,UAAJ,EAAgB,OAAO,KAAIc,eAAJ,GAAP,CAD2C,CACtB;IACrC;IACA;;IACA,MAAMC,oBAAoB,GAAGlB,QAAQ,CAACmB,MAAT,CAAgBC,aAA7C;IACA,OAAOF,oBAAoB,GAAGA,oBAAoB,CAACG,GAAxB,GAA8B,KAAIJ,eAAJ,GAAzD;EACD,CAND;;EAOA,MAAMK,UAAU,GAAGtB,QAAQ,CAACmB,MAAT,CAAgBI,YAAnC;EACA,MAAMC,OAAO,GAAGrB,UAAU,GACtBsB,eAAA,CAAKC,IAAL,CAAU;IACRjB,IAAI,EAAER,QADE;IAER0B,IAAI,EAAExB,UAAU,CAACwB,IAAX,GAAkBC,QAAlB,EAFE;IAGRC,GAAG,EAAE1B,UAAU,CAAC0B,GAHR;IAIRxB,KAAK,EAAEF,UAAU,CAACE,KAJV;IAKRiB;EALQ,CAAV,CADsB,GAQtBG,eAAA,CAAKK,MAAL,CAAY7B,QAAZ,EAAsBC,SAAtB,EAAiCoB,UAAjC,CARJ;EASA,MAAMS,cAAc,GAAG,MAAMnB,mCAAmC,EAAhE;EACAY,OAAO,CAACQ,iBAAR,CAA0BD,cAA1B;EAEA,MAAM/B,QAAQ,CAACK,KAAT,CAAeD,KAAf,CAAqB6B,QAArB,CAA8BT,OAA9B,CAAN;;EAEA,MAAMU,eAAe,GAAGC,wBAAA,CAAcC,IAAd,CAAmBnC,QAAnB,EAA6BD,QAAQ,CAACK,KAAT,CAAegC,OAAf,EAA7B,CAAxB;;EACAH,eAAe,CAACb,GAAhB,GAAsBL,sCAAsC,EAA5D;EACA,MAAMkB,eAAe,CAACI,KAAhB,EAAN;EAEA,OAAOd,OAAP;AACD;;AAEM,SAASb,uBAAT,CAAiCV,QAAjC,EAAmD;EACxD,IAAI,CAACsC,eAAe,CAACtC,QAAD,CAApB,EAAgC;IAC9B,MAAM,KAAIS,oBAAJ,EACH,SAAQT,QAAS,iIADd,CAAN;EAGD;AACF;;AAED,SAASsC,eAAT,CAAyBC,GAAzB,EAAgD;EAC9C,IAAI,OAAOA,GAAP,KAAe,QAAnB,EAA6B,OAAO,KAAP,CADiB,CAE9C;;EACA,OAAO,mBAAmBC,IAAnB,CAAwBD,GAAxB,CAAP;AACD"}
|
package/dist/lanes.docs.mdx
CHANGED
@@ -87,6 +87,12 @@ Summary of when/what lanes data is saved per command:
|
|
87
87
|
- in case the merge wasn't done and the user is trying to export, the remote blocks is as it finds out that its head doesn't exist on the incoming component.
|
88
88
|
- in case the snap-merge failed due to a conflict, it saves the conflict and heads data into `.bit/unmerged.json` file.
|
89
89
|
|
90
|
+
### Merge components
|
91
|
+
|
92
|
+
- to merge an entire lane, use `bit lane merge`.
|
93
|
+
- to get updates from a remote lane, run `bit import`, and then `bit checkout head`. alternatively, run `bit merge <component-id>` in one command.
|
94
|
+
- to merge an individual component from a lane to main, run `bit lane merge <lane> --pattern <component-id>` when on main.
|
95
|
+
|
90
96
|
### Useful APIs
|
91
97
|
|
92
98
|
- bit-map `getAllIdsAvailableOnLane()` filters the currently checked out lane.
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["LanesMain","constructor","workspace","scope","merging","componentAspect","logger","getLanes","name","remote","merged","showDefaultLane","notMerged","showMergeData","Boolean","consumer","remoteObj","getRemoteByName","lanes","listLanes","DEFAULT_LANE","defaultLane","getLaneDataOfDefaultLane","legacyScope","getLanesData","push","getCurrentLane","getCurrentLaneName","getCurrentLaneId","createLane","remoteScope","alias","BitError","throwForInvalidLaneName","defaultScope","setCurrentLane","trackLaneData","localLane","remoteLane","trackLane","onDestroy","localName","remoteName","laneId","parseLaneIdFromString","lane","loadLane","beforeTrackData","getRemoteTrackedDataByLocalLane","beforeTrackDataCloned","undefined","afterTrackData","aliasLane","laneName","includes","LANE_REMOTE_DELIMITER","trackData","laneNameWithoutScope","split","removeTrackLane","changeScope","remoteScopeBefore","saveLane","rename","currentName","newName","existingAliasWithNewName","remoteIdStr","previousAlias","getAliasByLaneId","WorkspaceLane","getPath","objects","remoteLanes","renameRefByNewLaneName","currentLaneName","clonedLaneToExport","clone","components","exported","exportErr","exportLane","err","error","id","toString","message","exportMany","laneObject","ids","BitIds","idsWithFutureScope","allVersions","importLane","scopeComponentImporter","ScopeComponentsImporter","getInstance","results","importLanes","removeLanes","laneNames","force","laneResults","mergeLane","options","mergeLanes","bitMap","syncWithLanes","workspaceLane","switchLanes","merge","getAll","skipDependencyInstallation","mergeStrategy","mergeOptions","Object","keys","MergeOptions","join","switchProps","existingOnWorkspaceOnly","checkoutProps","skipNpmInstall","verbose","ignorePackageJson","ignoreDist","isLane","promptMergeOptions","writeConfig","reset","all","LaneSwitcher","switch","getDiff","values","diffOptions","laneDiffGenerator","LaneDiffGenerator","generate","getLaneComponentModels","laneComponents","host","getHost","laneComponentIds","Promise","map","laneComponent","legacyIdWithVersion","changeVersion","head","resolveComponentId","getMany","getLaneReadmeComponent","laneReadmeComponent","readmeComponent","laneReadmeComponentId","get","removeLaneReadme","result","readmeComponentId","existingLaneConfig","getSpecificComponentConfig","LanesAspect","remoteLaneIdStr","toLaneId","readme","removeSpecificComponentConfig","addSpecificComponentConfig","setReadmeComponent","write","addLaneReadme","readmeComponentIdStr","readmeComponentBitId","_legacy","bitIds","scopeComponents","list","filter","component","getAuthoredAndImportedBitIdsOfDefaultLane","bitId","version","isMerged","provider","cli","graphql","community","loggerMain","createLogger","lanesMain","switchCmd","SwitchCmd","laneCmd","LaneCmd","getDocsDomain","commands","LaneListCmd","LaneShowCmd","LaneCreateCmd","LaneMergeCmd","LaneRemoveCmd","LaneChangeScopeCmd","LaneAliasCmd","LaneRenameCmd","LaneDiffCmd","LaneAddReadmeCmd","LaneRemoveReadmeCmd","LaneImportCmd","register","lanesSchema","CLIAspect","ScopeAspect","WorkspaceAspect","GraphqlAspect","CommunityAspect","MergingAspect","ComponentAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["lanes.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { ScopeMain, ScopeAspect } from '@teambit/scope';\nimport { GraphqlAspect, GraphqlMain } from '@teambit/graphql';\nimport { Workspace, WorkspaceAspect } from '@teambit/workspace';\nimport getRemoteByName from '@teambit/legacy/dist/remotes/get-remote-by-name';\nimport { LaneDiffCmd, LaneDiffGenerator } from '@teambit/lanes.modules.diff';\nimport { LaneData } from '@teambit/legacy/dist/scope/lanes/lanes';\nimport { LaneId, DEFAULT_LANE, LANE_REMOTE_DELIMITER } from '@teambit/lane-id';\nimport { BitError } from '@teambit/bit-error';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { DiffOptions } from '@teambit/legacy/dist/consumer/component-ops/components-diff';\nimport { exportMany } from '@teambit/legacy/dist/scope/component-ops/export-scope-components';\nimport {\n MergeStrategy,\n ApplyVersionResults,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { TrackLane } from '@teambit/legacy/dist/scope/scope-json';\nimport { CommunityAspect } from '@teambit/community';\nimport type { CommunityMain } from '@teambit/community';\nimport ComponentAspect, { Component, ComponentMain } from '@teambit/component';\nimport removeLanes from '@teambit/legacy/dist/consumer/lanes/remove-lanes';\nimport WorkspaceLane from '@teambit/legacy/dist/consumer/bit-map/workspace-lane';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { MergingMain, MergingAspect } from '@teambit/merging';\nimport { LanesAspect } from './lanes.aspect';\nimport {\n LaneCmd,\n LaneCreateCmd,\n LaneImportCmd,\n LaneListCmd,\n LaneMergeCmd,\n LaneRemoveCmd,\n LaneShowCmd,\n LaneChangeScopeCmd,\n LaneAliasCmd,\n LaneRenameCmd,\n LaneAddReadmeCmd,\n LaneRemoveReadmeCmd,\n} from './lane.cmd';\nimport { lanesSchema } from './lanes.graphql';\nimport { SwitchCmd } from './switch.cmd';\nimport { mergeLanes } from './merge-lanes';\nimport { LaneSwitcher } from './switch-lanes';\nimport { createLane, throwForInvalidLaneName } from './create-lane';\n\nexport { Lane };\n\nexport type LaneResults = {\n lanes: LaneData[];\n currentLane?: string | null;\n};\n\nexport type MergeLaneOptions = {\n remoteName: string | null;\n mergeStrategy: MergeStrategy;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash: boolean;\n pattern?: string;\n includeDeps?: boolean;\n};\n\nexport type CreateLaneOptions = {\n remoteScope?: string; // default to the defaultScope in workspace.jsonc\n alias?: string; // default to the remote name\n};\n\nexport type SwitchLaneOptions = {\n alias?: string;\n merge?: MergeStrategy;\n getAll?: boolean;\n skipDependencyInstallation?: boolean;\n verbose?: boolean;\n override?: boolean;\n};\n\nexport class LanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private scope: ScopeMain,\n private merging: MergingMain,\n private componentAspect: ComponentMain,\n private logger: Logger\n ) {}\n\n async getLanes({\n name,\n remote,\n merged,\n showDefaultLane,\n notMerged,\n }: {\n name?: string;\n remote?: string;\n merged?: boolean;\n showDefaultLane?: boolean;\n notMerged?: boolean;\n }): Promise<LaneData[]> {\n const showMergeData = Boolean(merged || notMerged);\n const consumer = this.workspace?.consumer;\n if (remote) {\n const remoteObj = await getRemoteByName(remote, consumer);\n const lanes = await remoteObj.listLanes(name, showMergeData);\n return lanes;\n }\n\n if (name === DEFAULT_LANE) {\n const defaultLane = await this.getLaneDataOfDefaultLane();\n return defaultLane ? [defaultLane] : [];\n }\n\n const lanes = await this.scope.legacyScope.lanes.getLanesData(this.scope.legacyScope, name, showMergeData);\n\n if (showDefaultLane) {\n const defaultLane = await this.getLaneDataOfDefaultLane();\n if (defaultLane) lanes.push(defaultLane);\n }\n\n return lanes;\n }\n\n getCurrentLane(): string | null {\n if (!this.workspace?.consumer) return null;\n return this.scope.legacyScope.lanes.getCurrentLaneName();\n }\n\n getCurrentLaneId(): LaneId | null {\n if (!this.workspace) return null;\n return this.scope.legacyScope.lanes.getCurrentLaneId();\n }\n\n async createLane(name: string, { remoteScope, alias }: CreateLaneOptions = {}): Promise<TrackLane> {\n if (!this.workspace) {\n throw new BitError(`unable to create a lane outside of Bit workspace`);\n }\n if (alias) {\n throwForInvalidLaneName(alias);\n }\n const scope = remoteScope || this.workspace.defaultScope;\n await createLane(this.workspace.consumer, name, scope);\n this.scope.legacyScope.lanes.setCurrentLane(name);\n const trackLaneData = {\n localLane: alias || name,\n remoteLane: name,\n remoteScope: scope,\n };\n this.scope.legacyScope.lanes.trackLane(trackLaneData);\n await this.workspace.consumer.onDestroy();\n\n return trackLaneData;\n }\n\n async trackLane(\n localName: string,\n remoteScope: string,\n remoteName?: string\n ): Promise<{ beforeTrackData?: TrackLane; afterTrackData: TrackLane }> {\n if (!this.workspace) {\n throw new BitError(`unable to track a lane outside of Bit workspace`);\n }\n const laneId = await this.scope.legacyScope.lanes.parseLaneIdFromString(localName);\n const lane = await this.scope.legacyScope.lanes.loadLane(laneId);\n if (!lane) {\n throw new BitError(`unable to find a local lane \"${localName}\"`);\n }\n const beforeTrackData = this.scope.legacyScope.lanes.getRemoteTrackedDataByLocalLane(localName);\n const beforeTrackDataCloned = beforeTrackData ? { ...beforeTrackData } : undefined;\n const afterTrackData = {\n localLane: localName,\n remoteLane: remoteName || beforeTrackData?.remoteLane || localName,\n remoteScope,\n };\n this.scope.legacyScope.lanes.trackLane(afterTrackData);\n await this.workspace.consumer.onDestroy();\n\n return { beforeTrackData: beforeTrackDataCloned, afterTrackData };\n }\n\n async aliasLane(laneName: string, alias: string): Promise<{ laneId: LaneId }> {\n if (!this.workspace) {\n throw new BitError(`unable to alias a lane outside of Bit workspace`);\n }\n if (alias.includes(LANE_REMOTE_DELIMITER)) {\n throw new BitError(`an alias cannot include a delimiter \"${LANE_REMOTE_DELIMITER}\"`);\n }\n if (alias === laneName) {\n throw new BitError(`an alias cannot be the same as the lane name`);\n }\n const laneId = await this.scope.legacyScope.lanes.parseLaneIdFromString(laneName);\n const lane = await this.scope.legacyScope.lanes.loadLane(laneId);\n if (!lane) {\n throw new BitError(`unable to find a local lane \"${laneName}\"`);\n }\n const trackData = {\n localLane: alias,\n remoteLane: laneId.name,\n remoteScope: laneId.scope,\n };\n const laneNameWithoutScope = laneName.includes(LANE_REMOTE_DELIMITER)\n ? laneName.split(LANE_REMOTE_DELIMITER)[1]\n : laneName;\n this.scope.legacyScope.lanes.removeTrackLane(laneNameWithoutScope);\n this.scope.legacyScope.lanes.trackLane(trackData);\n await this.workspace.consumer.onDestroy();\n\n return { laneId };\n }\n\n async changeScope(laneName: string, remoteScope: string): Promise<{ remoteScopeBefore: string }> {\n if (!this.workspace) {\n throw new BitError(`unable to change-scope of a lane outside of Bit workspace`);\n }\n const laneNameWithoutScope = laneName.includes(LANE_REMOTE_DELIMITER)\n ? laneName.split(LANE_REMOTE_DELIMITER)[1]\n : laneName;\n const laneId = await this.scope.legacyScope.lanes.parseLaneIdFromString(laneName);\n const lane = await this.scope.legacyScope.lanes.loadLane(laneId);\n if (!lane) {\n throw new BitError(`unable to find a local lane \"${laneName}\"`);\n }\n const remoteScopeBefore = lane.scope;\n lane.scope = remoteScope;\n const trackData = {\n localLane: laneNameWithoutScope,\n remoteLane: laneId.name,\n remoteScope,\n };\n this.scope.legacyScope.lanes.trackLane(trackData);\n await this.scope.legacyScope.lanes.saveLane(lane);\n await this.workspace.consumer.onDestroy();\n\n return { remoteScopeBefore };\n }\n\n /**\n * change a lane-name and if possible, export the lane to the remote\n */\n async rename(currentName: string, newName: string): Promise<{ exported: boolean; exportErr?: Error }> {\n if (!this.workspace) {\n throw new BitError(`unable to rename a lane outside of Bit workspace`);\n }\n throwForInvalidLaneName(newName);\n const existingAliasWithNewName = this.scope.legacyScope.lanes.getRemoteTrackedDataByLocalLane(newName);\n if (existingAliasWithNewName) {\n const remoteIdStr = `${existingAliasWithNewName.remoteLane}/${existingAliasWithNewName.remoteScope}`;\n throw new BitError(`unable to rename to ${newName}. this name is already used to track: ${remoteIdStr}`);\n }\n const laneNameWithoutScope = currentName.includes(LANE_REMOTE_DELIMITER)\n ? currentName.split(LANE_REMOTE_DELIMITER)[1]\n : currentName;\n const laneId = await this.scope.legacyScope.lanes.parseLaneIdFromString(currentName);\n const lane = await this.scope.legacyScope.lanes.loadLane(laneId);\n if (!lane) {\n throw new BitError(`unable to find a local lane \"${currentName}\"`);\n }\n\n // rename the workspace-lane file\n const previousAlias = this.scope.legacyScope.lanes.getAliasByLaneId(laneId);\n if (previousAlias) {\n await WorkspaceLane.rename(this.scope.legacyScope.getPath(), previousAlias, newName);\n }\n\n // rename the ref file\n await this.scope.legacyScope.objects.remoteLanes.renameRefByNewLaneName(laneNameWithoutScope, newName, lane.scope);\n\n // change tracking data\n const afterTrackData = {\n localLane: newName,\n remoteLane: newName,\n remoteScope: lane.scope,\n };\n this.scope.legacyScope.lanes.trackLane(afterTrackData);\n this.scope.legacyScope.lanes.removeTrackLane(laneNameWithoutScope);\n\n // change the lane object\n lane.name = newName;\n await this.scope.legacyScope.lanes.saveLane(lane);\n\n // change current-lane if needed\n const currentLaneName = this.getCurrentLane();\n if (currentLaneName === laneNameWithoutScope) this.scope.legacyScope.lanes.setCurrentLane(newName);\n\n // export the lane with only the name-change\n const clonedLaneToExport = lane.clone();\n clonedLaneToExport.components = []; // otherwise, it'll export the changes done on the components.\n let exported = false;\n let exportErr: Error | undefined;\n try {\n await this.exportLane(clonedLaneToExport);\n exported = true;\n } catch (err: any) {\n this.logger.error(`unable to export ${lane.id.toString()}: ${err.message}`);\n exportErr = err;\n }\n\n await this.workspace.consumer.onDestroy();\n\n return { exported, exportErr };\n }\n\n async exportLane(lane: Lane) {\n await exportMany({\n scope: this.scope.legacyScope,\n laneObject: lane,\n ids: new BitIds(),\n idsWithFutureScope: new BitIds(),\n allVersions: false,\n });\n }\n\n async importLane(laneId: LaneId): Promise<Lane> {\n const scopeComponentImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n const results = await scopeComponentImporter.importLanes([laneId]);\n return results[0];\n }\n\n async removeLanes(laneNames: string[], { remote, force }: { remote: boolean; force: boolean }): Promise<string[]> {\n const results = await removeLanes(this.workspace?.consumer, laneNames, remote, force);\n if (this.workspace) await this.workspace.consumer.onDestroy();\n\n return results.laneResults;\n }\n\n async mergeLane(\n laneName: string,\n options: MergeLaneOptions\n ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\n if (!this.workspace) {\n throw new BitError(`unable to merge a lane outside of Bit workspace`);\n }\n const results = await mergeLanes({\n merging: this.merging,\n workspace: this.workspace,\n laneName,\n ...options,\n });\n\n await this.workspace.consumer.onDestroy();\n this.workspace.consumer.bitMap.syncWithLanes(this.workspace.consumer.bitMap.workspaceLane);\n return results;\n }\n\n /**\n * switch to a different local or remote lane.\n * switching to a remote lane also imports and writes the components of that remote lane.\n * by default, only the components existing on the workspace will be imported from that lane, unless the \"getAll\"\n * flag is true.\n */\n async switchLanes(\n laneName: string,\n { alias, merge, getAll = false, skipDependencyInstallation = false }: SwitchLaneOptions\n ) {\n if (!this.workspace) {\n throw new BitError(`unable to switch lanes outside of Bit workspace`);\n }\n let mergeStrategy;\n if (merge && typeof merge === 'string') {\n const mergeOptions = Object.keys(MergeOptions);\n if (!mergeOptions.includes(merge)) {\n throw new BitError(`merge must be one of the following: ${mergeOptions.join(', ')}`);\n }\n mergeStrategy = merge;\n }\n if (alias) {\n throwForInvalidLaneName(alias);\n }\n\n const switchProps = {\n laneName,\n existingOnWorkspaceOnly: !getAll,\n alias,\n };\n const checkoutProps = {\n mergeStrategy,\n skipNpmInstall: skipDependencyInstallation,\n verbose: false, // not relevant in Harmony\n ignorePackageJson: true, // not relevant in Harmony\n ignoreDist: true, // not relevant in Harmony\n isLane: true,\n promptMergeOptions: false,\n writeConfig: false,\n reset: false,\n all: false,\n };\n return new LaneSwitcher(this.workspace, this.logger, switchProps, checkoutProps).switch();\n }\n\n /**\n * the values array may include zero to two values and will be processed as following:\n * [] => diff between the current lane and default lane. (only inside workspace).\n * [to] => diff between the current lane (or default-lane when in scope) and \"to\" lane.\n * [from, to] => diff between \"from\" lane and \"to\" lane.\n */\n public getDiff(values: string[], diffOptions: DiffOptions = {}) {\n const laneDiffGenerator = new LaneDiffGenerator(this.workspace, this.scope);\n return laneDiffGenerator.generate(values, diffOptions);\n }\n\n async getLaneComponentModels(lane: LaneData): Promise<Component[]> {\n if (!lane) return [];\n\n const laneComponents = lane.components;\n const host = this.componentAspect.getHost();\n const laneComponentIds = await Promise.all(\n laneComponents.map((laneComponent) => {\n const legacyIdWithVersion = laneComponent.id.changeVersion(laneComponent.head);\n return host.resolveComponentId(legacyIdWithVersion);\n })\n );\n const components = await host.getMany(laneComponentIds);\n return components;\n }\n\n async getLaneReadmeComponent(lane: LaneData): Promise<Component | undefined> {\n if (!lane) return undefined;\n const laneReadmeComponent = lane.readmeComponent;\n if (!laneReadmeComponent) return undefined;\n const host = this.componentAspect.getHost();\n const laneReadmeComponentId = await host.resolveComponentId(\n laneReadmeComponent.id.changeVersion(laneReadmeComponent.head)\n );\n const readmeComponent = await host.get(laneReadmeComponentId);\n return readmeComponent;\n }\n\n async removeLaneReadme(laneName?: string): Promise<{ result: boolean; message?: string }> {\n if (!this.workspace) {\n throw new BitError('unable to remove the lane readme component outside of Bit workspace');\n }\n const currentLaneName = this.getCurrentLane();\n\n if (!laneName && !currentLaneName) {\n return {\n result: false,\n message: 'unable to remove the lane readme component. Either pass a laneName or switch to a lane',\n };\n }\n\n const scope: LegacyScope = this.workspace.scope.legacyScope;\n const laneId: LaneId = laneName\n ? await scope.lanes.parseLaneIdFromString(laneName)\n : (this.getCurrentLaneId() as LaneId);\n const lane: Lane | null | undefined = await scope.loadLane(laneId);\n\n if (!lane?.readmeComponent) {\n throw new BitError(`there is no readme component added to the lane ${laneName || currentLaneName}`);\n }\n\n const readmeComponentId = await this.workspace.resolveComponentId(lane.readmeComponent.id);\n const existingLaneConfig =\n (await this.workspace.getSpecificComponentConfig(readmeComponentId, LanesAspect.id)) || {};\n\n const remoteLaneIdStr = lane.toLaneId().toString();\n\n if (existingLaneConfig.readme) {\n delete existingLaneConfig.readme[remoteLaneIdStr];\n await this.workspace.removeSpecificComponentConfig(readmeComponentId, LanesAspect.id, false);\n await this.workspace.addSpecificComponentConfig(readmeComponentId, LanesAspect.id, existingLaneConfig);\n }\n\n lane.setReadmeComponent(undefined);\n await scope.lanes.saveLane(lane);\n await this.workspace.bitMap.write();\n\n return { result: true };\n }\n\n async addLaneReadme(readmeComponentIdStr: string, laneName?: string): Promise<{ result: boolean; message?: string }> {\n if (!this.workspace) {\n throw new BitError(`unable to track a lane readme component outside of Bit workspace`);\n }\n const readmeComponentId = await this.workspace.resolveComponentId(readmeComponentIdStr);\n\n const readmeComponentBitId = readmeComponentId._legacy;\n const scope: LegacyScope = this.workspace.scope.legacyScope;\n const laneId: LaneId = laneName\n ? await scope.lanes.parseLaneIdFromString(laneName)\n : (this.getCurrentLaneId() as LaneId);\n\n const lane: Lane | null | undefined = await scope.loadLane(laneId);\n\n if (!lane) {\n return { result: false, message: `cannot find lane ${laneName}` };\n }\n\n lane.setReadmeComponent(readmeComponentBitId);\n await scope.lanes.saveLane(lane);\n\n const existingLaneConfig =\n (await this.workspace.getSpecificComponentConfig(readmeComponentId, LanesAspect.id)) || {};\n\n const remoteLaneIdStr = lane.toLaneId().toString();\n\n if (existingLaneConfig.readme) {\n await this.workspace.addSpecificComponentConfig(readmeComponentId, LanesAspect.id, {\n ...existingLaneConfig,\n readme: {\n ...existingLaneConfig.readme,\n [remoteLaneIdStr]: true,\n },\n });\n } else {\n await this.workspace.addSpecificComponentConfig(readmeComponentId, LanesAspect.id, {\n ...existingLaneConfig,\n readme: {\n [remoteLaneIdStr]: true,\n },\n });\n }\n await this.workspace.bitMap.write();\n return { result: true };\n }\n\n private async getLaneDataOfDefaultLane(): Promise<LaneData | null> {\n const consumer = this.workspace?.consumer;\n let bitIds: BitId[] = [];\n if (!consumer) {\n const scopeComponents = await this.scope.list();\n bitIds = scopeComponents.filter((component) => component.head).map((component) => component.id._legacy);\n } else {\n bitIds = consumer.bitMap.getAuthoredAndImportedBitIdsOfDefaultLane();\n }\n\n return {\n name: DEFAULT_LANE,\n remote: null,\n components: bitIds.map((bitId) => ({ id: bitId, head: bitId.version as string })),\n isMerged: null,\n };\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n ScopeAspect,\n WorkspaceAspect,\n GraphqlAspect,\n CommunityAspect,\n MergingAspect,\n ComponentAspect,\n LoggerAspect,\n ];\n static runtime = MainRuntime;\n static async provider([cli, scope, workspace, graphql, community, merging, component, loggerMain]: [\n CLIMain,\n ScopeMain,\n Workspace,\n GraphqlMain,\n CommunityMain,\n MergingMain,\n ComponentMain,\n LoggerMain\n ]) {\n const logger = loggerMain.createLogger(LanesAspect.id);\n const lanesMain = new LanesMain(workspace, scope, merging, component, logger);\n const switchCmd = new SwitchCmd(lanesMain);\n const laneCmd = new LaneCmd(lanesMain, workspace, scope, community.getDocsDomain());\n laneCmd.commands = [\n new LaneListCmd(lanesMain, workspace, scope),\n switchCmd,\n new LaneShowCmd(lanesMain, workspace, scope),\n new LaneCreateCmd(lanesMain),\n new LaneMergeCmd(lanesMain),\n new LaneRemoveCmd(lanesMain),\n new LaneChangeScopeCmd(lanesMain),\n new LaneAliasCmd(lanesMain),\n new LaneRenameCmd(lanesMain),\n new LaneDiffCmd(workspace, scope),\n new LaneAddReadmeCmd(lanesMain),\n new LaneRemoveReadmeCmd(lanesMain),\n new LaneImportCmd(switchCmd),\n ];\n cli.register(laneCmd, switchCmd);\n graphql.register(lanesSchema(lanesMain));\n return lanesMain;\n }\n}\n\nLanesAspect.addRuntime(LanesMain);\n\nexport default LanesMain;\n"],"mappings":"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"}
|
1
|
+
{"version":3,"names":["LanesMain","constructor","workspace","scope","merging","componentAspect","logger","getLanes","name","remote","merged","showDefaultLane","notMerged","showMergeData","Boolean","consumer","remoteObj","getRemoteByName","lanes","listLanes","DEFAULT_LANE","defaultLane","getLaneDataOfDefaultLane","legacyScope","getLanesData","push","getCurrentLane","getCurrentLaneName","getCurrentLaneId","createLane","remoteScope","alias","BitError","throwForInvalidLaneName","defaultScope","setCurrentLane","trackLaneData","localLane","remoteLane","trackLane","scopeJson","setLaneAsNew","onDestroy","localName","remoteName","laneId","parseLaneIdFromString","lane","loadLane","beforeTrackData","getRemoteTrackedDataByLocalLane","beforeTrackDataCloned","undefined","afterTrackData","aliasLane","laneName","includes","LANE_REMOTE_DELIMITER","trackData","laneNameWithoutScope","split","removeTrackLane","changeScope","remoteScopeBefore","saveLane","rename","currentName","newName","existingAliasWithNewName","remoteIdStr","previousAlias","getAliasByLaneId","WorkspaceLane","getPath","objects","remoteLanes","renameRefByNewLaneName","currentLaneName","clonedLaneToExport","clone","components","exported","exportErr","exportLane","err","error","id","toString","message","exportMany","laneObject","ids","BitIds","idsWithFutureScope","allVersions","importLane","scopeComponentImporter","ScopeComponentsImporter","getInstance","results","importLanes","removeLanes","laneNames","force","laneResults","mergeLane","options","mergeLanes","bitMap","syncWithLanes","workspaceLane","switchLanes","merge","getAll","skipDependencyInstallation","mergeStrategy","mergeOptions","Object","keys","MergeOptions","join","switchProps","existingOnWorkspaceOnly","checkoutProps","skipNpmInstall","verbose","ignorePackageJson","ignoreDist","isLane","promptMergeOptions","writeConfig","reset","all","LaneSwitcher","switch","getDiff","values","diffOptions","laneDiffGenerator","LaneDiffGenerator","generate","getLaneComponentModels","laneComponents","host","getHost","laneComponentIds","Promise","map","laneComponent","legacyIdWithVersion","changeVersion","head","resolveComponentId","getMany","getLaneReadmeComponent","laneReadmeComponent","readmeComponent","laneReadmeComponentId","get","removeLaneReadme","result","readmeComponentId","existingLaneConfig","getSpecificComponentConfig","LanesAspect","remoteLaneIdStr","toLaneId","readme","removeSpecificComponentConfig","addSpecificComponentConfig","setReadmeComponent","write","addLaneReadme","readmeComponentIdStr","readmeComponentBitId","_legacy","bitIds","scopeComponents","list","filter","component","getAuthoredAndImportedBitIdsOfDefaultLane","bitId","version","isMerged","provider","cli","graphql","community","loggerMain","createLogger","lanesMain","switchCmd","SwitchCmd","laneCmd","LaneCmd","getDocsDomain","commands","LaneListCmd","LaneShowCmd","LaneCreateCmd","LaneMergeCmd","LaneRemoveCmd","LaneChangeScopeCmd","LaneAliasCmd","LaneRenameCmd","LaneDiffCmd","LaneAddReadmeCmd","LaneRemoveReadmeCmd","LaneImportCmd","register","lanesSchema","CLIAspect","ScopeAspect","WorkspaceAspect","GraphqlAspect","CommunityAspect","MergingAspect","ComponentAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["lanes.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { ScopeMain, ScopeAspect } from '@teambit/scope';\nimport { GraphqlAspect, GraphqlMain } from '@teambit/graphql';\nimport { Workspace, WorkspaceAspect } from '@teambit/workspace';\nimport getRemoteByName from '@teambit/legacy/dist/remotes/get-remote-by-name';\nimport { LaneDiffCmd, LaneDiffGenerator } from '@teambit/lanes.modules.diff';\nimport { LaneData } from '@teambit/legacy/dist/scope/lanes/lanes';\nimport { LaneId, DEFAULT_LANE, LANE_REMOTE_DELIMITER } from '@teambit/lane-id';\nimport { BitError } from '@teambit/bit-error';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { DiffOptions } from '@teambit/legacy/dist/consumer/component-ops/components-diff';\nimport { exportMany } from '@teambit/legacy/dist/scope/component-ops/export-scope-components';\nimport {\n MergeStrategy,\n ApplyVersionResults,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { TrackLane } from '@teambit/legacy/dist/scope/scope-json';\nimport { CommunityAspect } from '@teambit/community';\nimport type { CommunityMain } from '@teambit/community';\nimport ComponentAspect, { Component, ComponentMain } from '@teambit/component';\nimport removeLanes from '@teambit/legacy/dist/consumer/lanes/remove-lanes';\nimport WorkspaceLane from '@teambit/legacy/dist/consumer/bit-map/workspace-lane';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { MergingMain, MergingAspect } from '@teambit/merging';\nimport { LanesAspect } from './lanes.aspect';\nimport {\n LaneCmd,\n LaneCreateCmd,\n LaneImportCmd,\n LaneListCmd,\n LaneMergeCmd,\n LaneRemoveCmd,\n LaneShowCmd,\n LaneChangeScopeCmd,\n LaneAliasCmd,\n LaneRenameCmd,\n LaneAddReadmeCmd,\n LaneRemoveReadmeCmd,\n} from './lane.cmd';\nimport { lanesSchema } from './lanes.graphql';\nimport { SwitchCmd } from './switch.cmd';\nimport { mergeLanes } from './merge-lanes';\nimport { LaneSwitcher } from './switch-lanes';\nimport { createLane, throwForInvalidLaneName } from './create-lane';\n\nexport { Lane };\n\nexport type LaneResults = {\n lanes: LaneData[];\n currentLane?: string | null;\n};\n\nexport type MergeLaneOptions = {\n remoteName: string | null;\n mergeStrategy: MergeStrategy;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash: boolean;\n pattern?: string;\n includeDeps?: boolean;\n};\n\nexport type CreateLaneOptions = {\n remoteScope?: string; // default to the defaultScope in workspace.jsonc\n alias?: string; // default to the remote name\n};\n\nexport type SwitchLaneOptions = {\n alias?: string;\n merge?: MergeStrategy;\n getAll?: boolean;\n skipDependencyInstallation?: boolean;\n verbose?: boolean;\n override?: boolean;\n};\n\nexport class LanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private scope: ScopeMain,\n private merging: MergingMain,\n private componentAspect: ComponentMain,\n private logger: Logger\n ) {}\n\n async getLanes({\n name,\n remote,\n merged,\n showDefaultLane,\n notMerged,\n }: {\n name?: string;\n remote?: string;\n merged?: boolean;\n showDefaultLane?: boolean;\n notMerged?: boolean;\n }): Promise<LaneData[]> {\n const showMergeData = Boolean(merged || notMerged);\n const consumer = this.workspace?.consumer;\n if (remote) {\n const remoteObj = await getRemoteByName(remote, consumer);\n const lanes = await remoteObj.listLanes(name, showMergeData);\n return lanes;\n }\n\n if (name === DEFAULT_LANE) {\n const defaultLane = await this.getLaneDataOfDefaultLane();\n return defaultLane ? [defaultLane] : [];\n }\n\n const lanes = await this.scope.legacyScope.lanes.getLanesData(this.scope.legacyScope, name, showMergeData);\n\n if (showDefaultLane) {\n const defaultLane = await this.getLaneDataOfDefaultLane();\n if (defaultLane) lanes.push(defaultLane);\n }\n\n return lanes;\n }\n\n getCurrentLane(): string | null {\n if (!this.workspace?.consumer) return null;\n return this.scope.legacyScope.lanes.getCurrentLaneName();\n }\n\n getCurrentLaneId(): LaneId | null {\n if (!this.workspace) return null;\n return this.scope.legacyScope.lanes.getCurrentLaneId();\n }\n\n async createLane(name: string, { remoteScope, alias }: CreateLaneOptions = {}): Promise<TrackLane> {\n if (!this.workspace) {\n throw new BitError(`unable to create a lane outside of Bit workspace`);\n }\n if (alias) {\n throwForInvalidLaneName(alias);\n }\n const scope = remoteScope || this.workspace.defaultScope;\n await createLane(this.workspace.consumer, name, scope);\n this.scope.legacyScope.lanes.setCurrentLane(name);\n const trackLaneData = {\n localLane: alias || name,\n remoteLane: name,\n remoteScope: scope,\n };\n this.scope.legacyScope.lanes.trackLane(trackLaneData);\n this.scope.legacyScope.scopeJson.setLaneAsNew(name);\n await this.workspace.consumer.onDestroy();\n\n return trackLaneData;\n }\n\n async trackLane(\n localName: string,\n remoteScope: string,\n remoteName?: string\n ): Promise<{ beforeTrackData?: TrackLane; afterTrackData: TrackLane }> {\n if (!this.workspace) {\n throw new BitError(`unable to track a lane outside of Bit workspace`);\n }\n const laneId = await this.scope.legacyScope.lanes.parseLaneIdFromString(localName);\n const lane = await this.scope.legacyScope.lanes.loadLane(laneId);\n if (!lane) {\n throw new BitError(`unable to find a local lane \"${localName}\"`);\n }\n const beforeTrackData = this.scope.legacyScope.lanes.getRemoteTrackedDataByLocalLane(localName);\n const beforeTrackDataCloned = beforeTrackData ? { ...beforeTrackData } : undefined;\n const afterTrackData = {\n localLane: localName,\n remoteLane: remoteName || beforeTrackData?.remoteLane || localName,\n remoteScope,\n };\n this.scope.legacyScope.lanes.trackLane(afterTrackData);\n await this.workspace.consumer.onDestroy();\n\n return { beforeTrackData: beforeTrackDataCloned, afterTrackData };\n }\n\n async aliasLane(laneName: string, alias: string): Promise<{ laneId: LaneId }> {\n if (!this.workspace) {\n throw new BitError(`unable to alias a lane outside of Bit workspace`);\n }\n if (alias.includes(LANE_REMOTE_DELIMITER)) {\n throw new BitError(`an alias cannot include a delimiter \"${LANE_REMOTE_DELIMITER}\"`);\n }\n if (alias === laneName) {\n throw new BitError(`an alias cannot be the same as the lane name`);\n }\n const laneId = await this.scope.legacyScope.lanes.parseLaneIdFromString(laneName);\n const lane = await this.scope.legacyScope.lanes.loadLane(laneId);\n if (!lane) {\n throw new BitError(`unable to find a local lane \"${laneName}\"`);\n }\n const trackData = {\n localLane: alias,\n remoteLane: laneId.name,\n remoteScope: laneId.scope,\n };\n const laneNameWithoutScope = laneName.includes(LANE_REMOTE_DELIMITER)\n ? laneName.split(LANE_REMOTE_DELIMITER)[1]\n : laneName;\n this.scope.legacyScope.lanes.removeTrackLane(laneNameWithoutScope);\n this.scope.legacyScope.lanes.trackLane(trackData);\n await this.workspace.consumer.onDestroy();\n\n return { laneId };\n }\n\n async changeScope(laneName: string, remoteScope: string): Promise<{ remoteScopeBefore: string }> {\n if (!this.workspace) {\n throw new BitError(`unable to change-scope of a lane outside of Bit workspace`);\n }\n const laneNameWithoutScope = laneName.includes(LANE_REMOTE_DELIMITER)\n ? laneName.split(LANE_REMOTE_DELIMITER)[1]\n : laneName;\n const laneId = await this.scope.legacyScope.lanes.parseLaneIdFromString(laneName);\n const lane = await this.scope.legacyScope.lanes.loadLane(laneId);\n if (!lane) {\n throw new BitError(`unable to find a local lane \"${laneName}\"`);\n }\n const remoteScopeBefore = lane.scope;\n lane.scope = remoteScope;\n const trackData = {\n localLane: laneNameWithoutScope,\n remoteLane: laneId.name,\n remoteScope,\n };\n this.scope.legacyScope.lanes.trackLane(trackData);\n await this.scope.legacyScope.lanes.saveLane(lane);\n await this.workspace.consumer.onDestroy();\n\n return { remoteScopeBefore };\n }\n\n /**\n * change a lane-name and if possible, export the lane to the remote\n */\n async rename(currentName: string, newName: string): Promise<{ exported: boolean; exportErr?: Error }> {\n if (!this.workspace) {\n throw new BitError(`unable to rename a lane outside of Bit workspace`);\n }\n throwForInvalidLaneName(newName);\n const existingAliasWithNewName = this.scope.legacyScope.lanes.getRemoteTrackedDataByLocalLane(newName);\n if (existingAliasWithNewName) {\n const remoteIdStr = `${existingAliasWithNewName.remoteLane}/${existingAliasWithNewName.remoteScope}`;\n throw new BitError(`unable to rename to ${newName}. this name is already used to track: ${remoteIdStr}`);\n }\n const laneNameWithoutScope = currentName.includes(LANE_REMOTE_DELIMITER)\n ? currentName.split(LANE_REMOTE_DELIMITER)[1]\n : currentName;\n const laneId = await this.scope.legacyScope.lanes.parseLaneIdFromString(currentName);\n const lane = await this.scope.legacyScope.lanes.loadLane(laneId);\n if (!lane) {\n throw new BitError(`unable to find a local lane \"${currentName}\"`);\n }\n\n // rename the workspace-lane file\n const previousAlias = this.scope.legacyScope.lanes.getAliasByLaneId(laneId);\n if (previousAlias) {\n await WorkspaceLane.rename(this.scope.legacyScope.getPath(), previousAlias, newName);\n }\n\n // rename the ref file\n await this.scope.legacyScope.objects.remoteLanes.renameRefByNewLaneName(laneNameWithoutScope, newName, lane.scope);\n\n // change tracking data\n const afterTrackData = {\n localLane: newName,\n remoteLane: newName,\n remoteScope: lane.scope,\n };\n this.scope.legacyScope.lanes.trackLane(afterTrackData);\n this.scope.legacyScope.lanes.removeTrackLane(laneNameWithoutScope);\n\n // change the lane object\n lane.name = newName;\n await this.scope.legacyScope.lanes.saveLane(lane);\n\n // change current-lane if needed\n const currentLaneName = this.getCurrentLane();\n if (currentLaneName === laneNameWithoutScope) this.scope.legacyScope.lanes.setCurrentLane(newName);\n\n // export the lane with only the name-change\n const clonedLaneToExport = lane.clone();\n clonedLaneToExport.components = []; // otherwise, it'll export the changes done on the components.\n let exported = false;\n let exportErr: Error | undefined;\n try {\n await this.exportLane(clonedLaneToExport);\n exported = true;\n } catch (err: any) {\n this.logger.error(`unable to export ${lane.id.toString()}: ${err.message}`);\n exportErr = err;\n }\n\n await this.workspace.consumer.onDestroy();\n\n return { exported, exportErr };\n }\n\n async exportLane(lane: Lane) {\n await exportMany({\n scope: this.scope.legacyScope,\n laneObject: lane,\n ids: new BitIds(),\n idsWithFutureScope: new BitIds(),\n allVersions: false,\n });\n }\n\n async importLane(laneId: LaneId): Promise<Lane> {\n const scopeComponentImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n const results = await scopeComponentImporter.importLanes([laneId]);\n return results[0];\n }\n\n async removeLanes(laneNames: string[], { remote, force }: { remote: boolean; force: boolean }): Promise<string[]> {\n const results = await removeLanes(this.workspace?.consumer, laneNames, remote, force);\n if (this.workspace) await this.workspace.consumer.onDestroy();\n\n return results.laneResults;\n }\n\n async mergeLane(\n laneName: string,\n options: MergeLaneOptions\n ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\n if (!this.workspace) {\n throw new BitError(`unable to merge a lane outside of Bit workspace`);\n }\n const results = await mergeLanes({\n merging: this.merging,\n workspace: this.workspace,\n laneName,\n ...options,\n });\n\n await this.workspace.consumer.onDestroy();\n this.workspace.consumer.bitMap.syncWithLanes(this.workspace.consumer.bitMap.workspaceLane);\n return results;\n }\n\n /**\n * switch to a different local or remote lane.\n * switching to a remote lane also imports and writes the components of that remote lane.\n * by default, only the components existing on the workspace will be imported from that lane, unless the \"getAll\"\n * flag is true.\n */\n async switchLanes(\n laneName: string,\n { alias, merge, getAll = false, skipDependencyInstallation = false }: SwitchLaneOptions\n ) {\n if (!this.workspace) {\n throw new BitError(`unable to switch lanes outside of Bit workspace`);\n }\n let mergeStrategy;\n if (merge && typeof merge === 'string') {\n const mergeOptions = Object.keys(MergeOptions);\n if (!mergeOptions.includes(merge)) {\n throw new BitError(`merge must be one of the following: ${mergeOptions.join(', ')}`);\n }\n mergeStrategy = merge;\n }\n if (alias) {\n throwForInvalidLaneName(alias);\n }\n\n const switchProps = {\n laneName,\n existingOnWorkspaceOnly: !getAll,\n alias,\n };\n const checkoutProps = {\n mergeStrategy,\n skipNpmInstall: skipDependencyInstallation,\n verbose: false, // not relevant in Harmony\n ignorePackageJson: true, // not relevant in Harmony\n ignoreDist: true, // not relevant in Harmony\n isLane: true,\n promptMergeOptions: false,\n writeConfig: false,\n reset: false,\n all: false,\n };\n return new LaneSwitcher(this.workspace, this.logger, switchProps, checkoutProps).switch();\n }\n\n /**\n * the values array may include zero to two values and will be processed as following:\n * [] => diff between the current lane and default lane. (only inside workspace).\n * [to] => diff between the current lane (or default-lane when in scope) and \"to\" lane.\n * [from, to] => diff between \"from\" lane and \"to\" lane.\n */\n public getDiff(values: string[], diffOptions: DiffOptions = {}) {\n const laneDiffGenerator = new LaneDiffGenerator(this.workspace, this.scope);\n return laneDiffGenerator.generate(values, diffOptions);\n }\n\n async getLaneComponentModels(lane: LaneData): Promise<Component[]> {\n if (!lane) return [];\n\n const laneComponents = lane.components;\n const host = this.componentAspect.getHost();\n const laneComponentIds = await Promise.all(\n laneComponents.map((laneComponent) => {\n const legacyIdWithVersion = laneComponent.id.changeVersion(laneComponent.head);\n return host.resolveComponentId(legacyIdWithVersion);\n })\n );\n const components = await host.getMany(laneComponentIds);\n return components;\n }\n\n async getLaneReadmeComponent(lane: LaneData): Promise<Component | undefined> {\n if (!lane) return undefined;\n const laneReadmeComponent = lane.readmeComponent;\n if (!laneReadmeComponent) return undefined;\n const host = this.componentAspect.getHost();\n const laneReadmeComponentId = await host.resolveComponentId(\n laneReadmeComponent.id.changeVersion(laneReadmeComponent.head)\n );\n const readmeComponent = await host.get(laneReadmeComponentId);\n return readmeComponent;\n }\n\n async removeLaneReadme(laneName?: string): Promise<{ result: boolean; message?: string }> {\n if (!this.workspace) {\n throw new BitError('unable to remove the lane readme component outside of Bit workspace');\n }\n const currentLaneName = this.getCurrentLane();\n\n if (!laneName && !currentLaneName) {\n return {\n result: false,\n message: 'unable to remove the lane readme component. Either pass a laneName or switch to a lane',\n };\n }\n\n const scope: LegacyScope = this.workspace.scope.legacyScope;\n const laneId: LaneId = laneName\n ? await scope.lanes.parseLaneIdFromString(laneName)\n : (this.getCurrentLaneId() as LaneId);\n const lane: Lane | null | undefined = await scope.loadLane(laneId);\n\n if (!lane?.readmeComponent) {\n throw new BitError(`there is no readme component added to the lane ${laneName || currentLaneName}`);\n }\n\n const readmeComponentId = await this.workspace.resolveComponentId(lane.readmeComponent.id);\n const existingLaneConfig =\n (await this.workspace.getSpecificComponentConfig(readmeComponentId, LanesAspect.id)) || {};\n\n const remoteLaneIdStr = lane.toLaneId().toString();\n\n if (existingLaneConfig.readme) {\n delete existingLaneConfig.readme[remoteLaneIdStr];\n await this.workspace.removeSpecificComponentConfig(readmeComponentId, LanesAspect.id, false);\n await this.workspace.addSpecificComponentConfig(readmeComponentId, LanesAspect.id, existingLaneConfig);\n }\n\n lane.setReadmeComponent(undefined);\n await scope.lanes.saveLane(lane);\n await this.workspace.bitMap.write();\n\n return { result: true };\n }\n\n async addLaneReadme(readmeComponentIdStr: string, laneName?: string): Promise<{ result: boolean; message?: string }> {\n if (!this.workspace) {\n throw new BitError(`unable to track a lane readme component outside of Bit workspace`);\n }\n const readmeComponentId = await this.workspace.resolveComponentId(readmeComponentIdStr);\n\n const readmeComponentBitId = readmeComponentId._legacy;\n const scope: LegacyScope = this.workspace.scope.legacyScope;\n const laneId: LaneId = laneName\n ? await scope.lanes.parseLaneIdFromString(laneName)\n : (this.getCurrentLaneId() as LaneId);\n\n const lane: Lane | null | undefined = await scope.loadLane(laneId);\n\n if (!lane) {\n return { result: false, message: `cannot find lane ${laneName}` };\n }\n\n lane.setReadmeComponent(readmeComponentBitId);\n await scope.lanes.saveLane(lane);\n\n const existingLaneConfig =\n (await this.workspace.getSpecificComponentConfig(readmeComponentId, LanesAspect.id)) || {};\n\n const remoteLaneIdStr = lane.toLaneId().toString();\n\n if (existingLaneConfig.readme) {\n await this.workspace.addSpecificComponentConfig(readmeComponentId, LanesAspect.id, {\n ...existingLaneConfig,\n readme: {\n ...existingLaneConfig.readme,\n [remoteLaneIdStr]: true,\n },\n });\n } else {\n await this.workspace.addSpecificComponentConfig(readmeComponentId, LanesAspect.id, {\n ...existingLaneConfig,\n readme: {\n [remoteLaneIdStr]: true,\n },\n });\n }\n await this.workspace.bitMap.write();\n return { result: true };\n }\n\n private async getLaneDataOfDefaultLane(): Promise<LaneData | null> {\n const consumer = this.workspace?.consumer;\n let bitIds: BitId[] = [];\n if (!consumer) {\n const scopeComponents = await this.scope.list();\n bitIds = scopeComponents.filter((component) => component.head).map((component) => component.id._legacy);\n } else {\n bitIds = consumer.bitMap.getAuthoredAndImportedBitIdsOfDefaultLane();\n }\n\n return {\n name: DEFAULT_LANE,\n remote: null,\n components: bitIds.map((bitId) => ({ id: bitId, head: bitId.version as string })),\n isMerged: null,\n };\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n ScopeAspect,\n WorkspaceAspect,\n GraphqlAspect,\n CommunityAspect,\n MergingAspect,\n ComponentAspect,\n LoggerAspect,\n ];\n static runtime = MainRuntime;\n static async provider([cli, scope, workspace, graphql, community, merging, component, loggerMain]: [\n CLIMain,\n ScopeMain,\n Workspace,\n GraphqlMain,\n CommunityMain,\n MergingMain,\n ComponentMain,\n LoggerMain\n ]) {\n const logger = loggerMain.createLogger(LanesAspect.id);\n const lanesMain = new LanesMain(workspace, scope, merging, component, logger);\n const switchCmd = new SwitchCmd(lanesMain);\n const laneCmd = new LaneCmd(lanesMain, workspace, scope, community.getDocsDomain());\n laneCmd.commands = [\n new LaneListCmd(lanesMain, workspace, scope),\n switchCmd,\n new LaneShowCmd(lanesMain, workspace, scope),\n new LaneCreateCmd(lanesMain),\n new LaneMergeCmd(lanesMain),\n new LaneRemoveCmd(lanesMain),\n new LaneChangeScopeCmd(lanesMain),\n new LaneAliasCmd(lanesMain),\n new LaneRenameCmd(lanesMain),\n new LaneDiffCmd(workspace, scope),\n new LaneAddReadmeCmd(lanesMain),\n new LaneRemoveReadmeCmd(lanesMain),\n new LaneImportCmd(switchCmd),\n ];\n cli.register(laneCmd, switchCmd);\n graphql.register(lanesSchema(lanesMain));\n return lanesMain;\n }\n}\n\nLanesAspect.addRuntime(LanesMain);\n\nexport default LanesMain;\n"],"mappings":"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"}
|
package/dist/merge-lanes.js
CHANGED
@@ -100,7 +100,7 @@ async function mergeLanes({
|
|
100
100
|
const currentLaneId = consumer.getCurrentLaneId();
|
101
101
|
|
102
102
|
if (!remoteName && laneName === currentLaneId.name) {
|
103
|
-
throw new (_bitError().BitError)(`unable to
|
103
|
+
throw new (_bitError().BitError)(`unable to merge lane "${laneName}", you're already at this lane. to get updates, simply run "bit checkout head"`);
|
104
104
|
}
|
105
105
|
|
106
106
|
const parsedLaneId = await consumer.getParsedLaneId(laneName);
|
@@ -113,7 +113,8 @@ async function mergeLanes({
|
|
113
113
|
const isDefaultLane = laneName === _laneId().DEFAULT_LANE;
|
114
114
|
|
115
115
|
if (isDefaultLane) {
|
116
|
-
|
116
|
+
if (!localLane) throw new Error(`unable to merge ${_laneId().DEFAULT_LANE}, the current lane was not found`);
|
117
|
+
bitIds = await consumer.scope.getDefaultLaneIdsFromLane(localLane);
|
117
118
|
otherLaneName = _laneId().DEFAULT_LANE;
|
118
119
|
} else if (remoteName) {
|
119
120
|
const remoteLaneId = _laneId().LaneId.from(parsedLaneId.name, remoteName);
|
@@ -134,7 +135,6 @@ async function mergeLanes({
|
|
134
135
|
}
|
135
136
|
|
136
137
|
let allComponentsStatus = await getAllComponentsStatus();
|
137
|
-
throwForFailures();
|
138
138
|
|
139
139
|
if (pattern) {
|
140
140
|
const componentIds = await workspace.resolveMultipleComponentIds(bitIds);
|
@@ -166,6 +166,8 @@ async function mergeLanes({
|
|
166
166
|
});
|
167
167
|
}
|
168
168
|
|
169
|
+
throwForFailures();
|
170
|
+
|
169
171
|
if (squash) {
|
170
172
|
squashSnaps(allComponentsStatus, laneName, consumer);
|
171
173
|
}
|
package/dist/merge-lanes.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["mergeLanes","merging","workspace","laneName","mergeStrategy","remoteName","noSnap","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","pattern","includeDeps","consumer","currentLaneId","getCurrentLaneId","name","BitError","parsedLaneId","getParsedLaneId","localLane","isDefault","scope","loadLane","bitIds","otherLane","remoteLane","otherLaneName","isDefaultLane","DEFAULT_LANE","bitMap","getAuthoredAndImportedBitIdsOfDefaultLane","filter","id","hasVersion","remoteLaneId","LaneId","from","objects","remoteLanes","getRemoteLane","length","getRemoteBitIds","components","map","c","changeVersion","head","toString","allComponentsStatus","getAllComponentsStatus","throwForFailures","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","_legacy","squashSnaps","mergeResults","mergeSnaps","laneId","mergedSuccessfully","failedComponents","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","syncWithLanes","workspaceLane","readmeComponentId","hash","remove","ids","force","remote","track","deleteFiles","readmeResult","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","failureMsgs","chalk","bold","red","join","compIdsToKeep","allBitIds","bitIdsFromPattern","BitIds","fromArray","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","pMapSeries","compId","fromStatus","Error","divergeData","remoteVersions","snapsOnRemoteOnly","modelComponent","getModelComponent","localVersion","versionObj","loadVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","d","depsUniq","uniqFromArray","succeededComponents","componentFromModel","isDiverged","isLocalAhead","isRemoteAhead","remoteSnaps","commonSnapBeforeDiverge","addAsOnlyParent","parents","ref","removeParent","squashedSnaps","snap","isEqual","setSquashed","add"],"sources":["merge-lanes.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { BitError } from '@teambit/bit-error';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ApplyVersionResults } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ComponentID } from '@teambit/component-id';\nimport { Workspace } from '@teambit/workspace';\nimport { LaneId, DEFAULT_LANE } from '@teambit/lane-id';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { MergingMain, ComponentMergeStatus } from '@teambit/merging';\nimport { remove } from '@teambit/legacy/dist/api/consumer';\nimport { MergeLaneOptions } from './lanes.main.runtime';\n\nexport async function mergeLanes({\n merging,\n workspace,\n laneName,\n mergeStrategy,\n remoteName,\n noSnap,\n snapMessage,\n existingOnWorkspaceOnly,\n build,\n keepReadme,\n squash,\n pattern,\n includeDeps,\n}: {\n merging: MergingMain;\n workspace: Workspace;\n laneName: string;\n} & MergeLaneOptions): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\n const consumer = workspace.consumer;\n const currentLaneId = consumer.getCurrentLaneId();\n if (!remoteName && laneName === currentLaneId.name) {\n throw new BitError(`unable to switch to lane \"${laneName}\", you're already checked out to this lane`);\n }\n const parsedLaneId = await consumer.getParsedLaneId(laneName);\n const localLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n let bitIds: BitId[];\n let otherLane: Lane | null | undefined;\n let remoteLane;\n let otherLaneName: string;\n const isDefaultLane = laneName === DEFAULT_LANE;\n\n if (isDefaultLane) {\n bitIds = consumer.bitMap.getAuthoredAndImportedBitIdsOfDefaultLane().filter((id) => id.hasVersion());\n otherLaneName = DEFAULT_LANE;\n } else if (remoteName) {\n const remoteLaneId = LaneId.from(parsedLaneId.name, remoteName);\n remoteLane = await consumer.scope.objects.remoteLanes.getRemoteLane(remoteLaneId);\n if (!remoteLane.length) {\n throw new BitError(\n `unable to switch to \"${laneName}\" of \"${remoteName}\", the remote lane was not found or not fetched locally`\n );\n }\n bitIds = await consumer.scope.objects.remoteLanes.getRemoteBitIds(remoteLaneId);\n otherLaneName = `${remoteName}/${parsedLaneId.name}`;\n } else {\n otherLane = await consumer.scope.loadLane(parsedLaneId);\n if (!otherLane) throw new BitError(`unable to switch to \"${laneName}\", the lane was not found`);\n bitIds = otherLane.components.map((c) => c.id.changeVersion(c.head.toString()));\n otherLaneName = parsedLaneId.name;\n }\n\n let allComponentsStatus = await getAllComponentsStatus();\n\n throwForFailures();\n\n if (pattern) {\n const componentIds = await workspace.resolveMultipleComponentIds(bitIds);\n const compIdsFromPattern = workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n workspace,\n includeDeps\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n }\n });\n }\n if (existingOnWorkspaceOnly) {\n const workspaceIds = await workspace.listIds();\n const compIdsFromPattern = workspaceIds.filter((id) =>\n allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n workspace,\n includeDeps\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n }\n });\n }\n\n if (squash) {\n squashSnaps(allComponentsStatus, laneName, consumer);\n }\n\n const mergeResults = await merging.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n remoteName,\n laneId: parsedLaneId,\n localLane,\n noSnap,\n snapMessage,\n build,\n });\n\n const mergedSuccessfully =\n !mergeResults.failedComponents ||\n mergeResults.failedComponents.length === 0 ||\n mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n let deleteResults = {};\n\n if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n await consumer.bitMap.syncWithLanes(consumer.bitMap.workspaceLane);\n\n const readmeComponentId = [\n otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash).toString(),\n ];\n\n deleteResults = await remove({\n ids: readmeComponentId,\n force: false,\n remote: false,\n track: false,\n deleteFiles: true,\n });\n } else if (otherLane && !otherLane.readmeComponent) {\n deleteResults = { readmeResult: `lane ${otherLane.name} doesn't have a readme component` };\n }\n\n return { mergeResults, deleteResults };\n\n async function getAllComponentsStatus(): Promise<ComponentMergeStatus[]> {\n const tmp = new Tmp(consumer.scope);\n try {\n const componentsStatus = await Promise.all(\n bitIds.map((bitId) => merging.getComponentMergeStatus(bitId, localLane, otherLaneName))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n }\n\n function throwForFailures() {\n const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n }\n}\n\nasync function filterComponentsStatus(\n allComponentsStatus: ComponentMergeStatus[],\n compIdsToKeep: ComponentID[],\n allBitIds: BitId[],\n workspace: Workspace,\n includeDeps = false\n): Promise<ComponentMergeStatus[]> {\n const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n const filteredComponentStatus: ComponentMergeStatus[] = [];\n const depsToAdd: BitId[] = [];\n await pMapSeries(compIdsToKeep, async (compId) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n if (fromStatus.unmergedMessage) {\n return;\n }\n const { divergeData } = fromStatus;\n if (!divergeData) {\n throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n }\n const remoteVersions = divergeData.snapsOnRemoteOnly;\n if (!remoteVersions.length) {\n return;\n }\n const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n // optimization suggestion: if squash is given, check only the last version.\n await pMapSeries(remoteVersions, async (localVersion) => {\n const versionObj = await modelComponent.loadVersion(localVersion.toString(), workspace.consumer.scope.objects);\n const flattenedDeps = versionObj.getAllFlattenedDependencies();\n const depsNotIncludeInPattern = bitIdsNotFromPattern.filter((id) => flattenedDeps.hasWithoutVersion(id));\n if (!depsNotIncludeInPattern.length) {\n return;\n }\n if (!includeDeps) {\n throw new BitError(`unable to merge ${compId.toString()}.\nit has the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsNotIncludeInPattern.map((d) => d.toString()).join('\\n')}`);\n }\n depsToAdd.push(...depsNotIncludeInPattern);\n });\n });\n if (depsToAdd.length) {\n const depsUniq = BitIds.uniqFromArray(depsToAdd);\n depsUniq.forEach((id) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n });\n }\n return filteredComponentStatus;\n}\n\nfunction squashSnaps(allComponentsStatus: ComponentMergeStatus[], laneName: string, consumer: Consumer) {\n const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n succeededComponents.forEach(({ id, divergeData, componentFromModel }) => {\n if (!divergeData) {\n throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n }\n if (divergeData.isDiverged()) {\n throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to ${laneName} first, merging this lane, then switching back to this lane and merging ${laneName}`);\n }\n if (divergeData.isLocalAhead()) {\n // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n return;\n }\n if (!divergeData.isRemoteAhead()) {\n // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n return;\n }\n // remote is ahead and was not diverge.\n const remoteSnaps = divergeData.snapsOnRemoteOnly;\n if (remoteSnaps.length === 0) {\n throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n }\n if (remoteSnaps.length === 1) {\n // nothing to squash. it has only one commit.\n return;\n }\n if (!componentFromModel) {\n throw new Error('unable to squash, the componentFromModel is missing');\n }\n\n // do the squash.\n if (divergeData.commonSnapBeforeDiverge) {\n componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n } else {\n // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n }\n const squashedSnaps = remoteSnaps.filter((snap) => !snap.isEqual(componentFromModel.hash()));\n componentFromModel.setSquashed(squashedSnaps);\n consumer.scope.objects.add(componentFromModel);\n });\n}\n"],"mappings":"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"}
|
1
|
+
{"version":3,"names":["mergeLanes","merging","workspace","laneName","mergeStrategy","remoteName","noSnap","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","pattern","includeDeps","consumer","currentLaneId","getCurrentLaneId","name","BitError","parsedLaneId","getParsedLaneId","localLane","isDefault","scope","loadLane","bitIds","otherLane","remoteLane","otherLaneName","isDefaultLane","DEFAULT_LANE","Error","getDefaultLaneIdsFromLane","remoteLaneId","LaneId","from","objects","remoteLanes","getRemoteLane","length","getRemoteBitIds","components","map","c","id","changeVersion","head","toString","allComponentsStatus","getAllComponentsStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","mergedSuccessfully","failedComponents","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","bitMap","syncWithLanes","workspaceLane","readmeComponentId","hash","remove","ids","force","remote","track","deleteFiles","readmeResult","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","failureMsgs","chalk","bold","red","join","compIdsToKeep","allBitIds","bitIdsFromPattern","BitIds","fromArray","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","pMapSeries","compId","fromStatus","divergeData","remoteVersions","snapsOnRemoteOnly","modelComponent","getModelComponent","localVersion","versionObj","loadVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","d","depsUniq","uniqFromArray","succeededComponents","componentFromModel","isDiverged","isLocalAhead","isRemoteAhead","remoteSnaps","commonSnapBeforeDiverge","addAsOnlyParent","parents","ref","removeParent","squashedSnaps","snap","isEqual","setSquashed","add"],"sources":["merge-lanes.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { BitError } from '@teambit/bit-error';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ApplyVersionResults } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ComponentID } from '@teambit/component-id';\nimport { Workspace } from '@teambit/workspace';\nimport { LaneId, DEFAULT_LANE } from '@teambit/lane-id';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { MergingMain, ComponentMergeStatus } from '@teambit/merging';\nimport { remove } from '@teambit/legacy/dist/api/consumer';\nimport { MergeLaneOptions } from './lanes.main.runtime';\n\nexport async function mergeLanes({\n merging,\n workspace,\n laneName,\n mergeStrategy,\n remoteName,\n noSnap,\n snapMessage,\n existingOnWorkspaceOnly,\n build,\n keepReadme,\n squash,\n pattern,\n includeDeps,\n}: {\n merging: MergingMain;\n workspace: Workspace;\n laneName: string;\n} & MergeLaneOptions): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\n const consumer = workspace.consumer;\n const currentLaneId = consumer.getCurrentLaneId();\n if (!remoteName && laneName === currentLaneId.name) {\n throw new BitError(\n `unable to merge lane \"${laneName}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n );\n }\n const parsedLaneId = await consumer.getParsedLaneId(laneName);\n const localLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n let bitIds: BitId[];\n let otherLane: Lane | null | undefined;\n let remoteLane;\n let otherLaneName: string;\n const isDefaultLane = laneName === DEFAULT_LANE;\n\n if (isDefaultLane) {\n if (!localLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n bitIds = await consumer.scope.getDefaultLaneIdsFromLane(localLane);\n otherLaneName = DEFAULT_LANE;\n } else if (remoteName) {\n const remoteLaneId = LaneId.from(parsedLaneId.name, remoteName);\n remoteLane = await consumer.scope.objects.remoteLanes.getRemoteLane(remoteLaneId);\n if (!remoteLane.length) {\n throw new BitError(\n `unable to switch to \"${laneName}\" of \"${remoteName}\", the remote lane was not found or not fetched locally`\n );\n }\n bitIds = await consumer.scope.objects.remoteLanes.getRemoteBitIds(remoteLaneId);\n otherLaneName = `${remoteName}/${parsedLaneId.name}`;\n } else {\n otherLane = await consumer.scope.loadLane(parsedLaneId);\n if (!otherLane) throw new BitError(`unable to switch to \"${laneName}\", the lane was not found`);\n bitIds = otherLane.components.map((c) => c.id.changeVersion(c.head.toString()));\n otherLaneName = parsedLaneId.name;\n }\n\n let allComponentsStatus = await getAllComponentsStatus();\n\n if (pattern) {\n const componentIds = await workspace.resolveMultipleComponentIds(bitIds);\n const compIdsFromPattern = workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n workspace,\n includeDeps\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n }\n });\n }\n if (existingOnWorkspaceOnly) {\n const workspaceIds = await workspace.listIds();\n const compIdsFromPattern = workspaceIds.filter((id) =>\n allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n workspace,\n includeDeps\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n }\n });\n }\n\n throwForFailures();\n\n if (squash) {\n squashSnaps(allComponentsStatus, laneName, consumer);\n }\n\n const mergeResults = await merging.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n remoteName,\n laneId: parsedLaneId,\n localLane,\n noSnap,\n snapMessage,\n build,\n });\n\n const mergedSuccessfully =\n !mergeResults.failedComponents ||\n mergeResults.failedComponents.length === 0 ||\n mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n let deleteResults = {};\n\n if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n await consumer.bitMap.syncWithLanes(consumer.bitMap.workspaceLane);\n\n const readmeComponentId = [\n otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash).toString(),\n ];\n\n deleteResults = await remove({\n ids: readmeComponentId,\n force: false,\n remote: false,\n track: false,\n deleteFiles: true,\n });\n } else if (otherLane && !otherLane.readmeComponent) {\n deleteResults = { readmeResult: `lane ${otherLane.name} doesn't have a readme component` };\n }\n\n return { mergeResults, deleteResults };\n\n async function getAllComponentsStatus(): Promise<ComponentMergeStatus[]> {\n const tmp = new Tmp(consumer.scope);\n try {\n const componentsStatus = await Promise.all(\n bitIds.map((bitId) => merging.getComponentMergeStatus(bitId, localLane, otherLaneName))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n }\n\n function throwForFailures() {\n const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n }\n}\n\nasync function filterComponentsStatus(\n allComponentsStatus: ComponentMergeStatus[],\n compIdsToKeep: ComponentID[],\n allBitIds: BitId[],\n workspace: Workspace,\n includeDeps = false\n): Promise<ComponentMergeStatus[]> {\n const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n const filteredComponentStatus: ComponentMergeStatus[] = [];\n const depsToAdd: BitId[] = [];\n await pMapSeries(compIdsToKeep, async (compId) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n if (fromStatus.unmergedMessage) {\n return;\n }\n const { divergeData } = fromStatus;\n if (!divergeData) {\n throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n }\n const remoteVersions = divergeData.snapsOnRemoteOnly;\n if (!remoteVersions.length) {\n return;\n }\n const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n // optimization suggestion: if squash is given, check only the last version.\n await pMapSeries(remoteVersions, async (localVersion) => {\n const versionObj = await modelComponent.loadVersion(localVersion.toString(), workspace.consumer.scope.objects);\n const flattenedDeps = versionObj.getAllFlattenedDependencies();\n const depsNotIncludeInPattern = bitIdsNotFromPattern.filter((id) => flattenedDeps.hasWithoutVersion(id));\n if (!depsNotIncludeInPattern.length) {\n return;\n }\n if (!includeDeps) {\n throw new BitError(`unable to merge ${compId.toString()}.\nit has the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsNotIncludeInPattern.map((d) => d.toString()).join('\\n')}`);\n }\n depsToAdd.push(...depsNotIncludeInPattern);\n });\n });\n if (depsToAdd.length) {\n const depsUniq = BitIds.uniqFromArray(depsToAdd);\n depsUniq.forEach((id) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n });\n }\n return filteredComponentStatus;\n}\n\nfunction squashSnaps(allComponentsStatus: ComponentMergeStatus[], laneName: string, consumer: Consumer) {\n const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n succeededComponents.forEach(({ id, divergeData, componentFromModel }) => {\n if (!divergeData) {\n throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n }\n if (divergeData.isDiverged()) {\n throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to ${laneName} first, merging this lane, then switching back to this lane and merging ${laneName}`);\n }\n if (divergeData.isLocalAhead()) {\n // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n return;\n }\n if (!divergeData.isRemoteAhead()) {\n // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n return;\n }\n // remote is ahead and was not diverge.\n const remoteSnaps = divergeData.snapsOnRemoteOnly;\n if (remoteSnaps.length === 0) {\n throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n }\n if (remoteSnaps.length === 1) {\n // nothing to squash. it has only one commit.\n return;\n }\n if (!componentFromModel) {\n throw new Error('unable to squash, the componentFromModel is missing');\n }\n\n // do the squash.\n if (divergeData.commonSnapBeforeDiverge) {\n componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n } else {\n // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n }\n const squashedSnaps = remoteSnaps.filter((snap) => !snap.isEqual(componentFromModel.hash()));\n componentFromModel.setSquashed(squashedSnaps);\n consumer.scope.objects.add(componentFromModel);\n });\n}\n"],"mappings":";;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGO,eAAeA,UAAf,CAA0B;EAC/BC,OAD+B;EAE/BC,SAF+B;EAG/BC,QAH+B;EAI/BC,aAJ+B;EAK/BC,UAL+B;EAM/BC,MAN+B;EAO/BC,WAP+B;EAQ/BC,uBAR+B;EAS/BC,KAT+B;EAU/BC,UAV+B;EAW/BC,MAX+B;EAY/BC,OAZ+B;EAa/BC;AAb+B,CAA1B,EAkBmF;EACxF,MAAMC,QAAQ,GAAGZ,SAAS,CAACY,QAA3B;EACA,MAAMC,aAAa,GAAGD,QAAQ,CAACE,gBAAT,EAAtB;;EACA,IAAI,CAACX,UAAD,IAAeF,QAAQ,KAAKY,aAAa,CAACE,IAA9C,EAAoD;IAClD,MAAM,KAAIC,oBAAJ,EACH,yBAAwBf,QAAS,gFAD9B,CAAN;EAGD;;EACD,MAAMgB,YAAY,GAAG,MAAML,QAAQ,CAACM,eAAT,CAAyBjB,QAAzB,CAA3B;EACA,MAAMkB,SAAS,GAAGN,aAAa,CAACO,SAAd,KAA4B,IAA5B,GAAmC,MAAMR,QAAQ,CAACS,KAAT,CAAeC,QAAf,CAAwBT,aAAxB,CAA3D;EACA,IAAIU,MAAJ;EACA,IAAIC,SAAJ;EACA,IAAIC,UAAJ;EACA,IAAIC,aAAJ;;EACA,MAAMC,aAAa,GAAG1B,QAAQ,KAAK2B,sBAAnC;;EAEA,IAAID,aAAJ,EAAmB;IACjB,IAAI,CAACR,SAAL,EAAgB,MAAM,IAAIU,KAAJ,CAAW,mBAAkBD,sBAAa,kCAA1C,CAAN;IAChBL,MAAM,GAAG,MAAMX,QAAQ,CAACS,KAAT,CAAeS,yBAAf,CAAyCX,SAAzC,CAAf;IACAO,aAAa,GAAGE,sBAAhB;EACD,CAJD,MAIO,IAAIzB,UAAJ,EAAgB;IACrB,MAAM4B,YAAY,GAAGC,gBAAA,CAAOC,IAAP,CAAYhB,YAAY,CAACF,IAAzB,EAA+BZ,UAA/B,CAArB;;IACAsB,UAAU,GAAG,MAAMb,QAAQ,CAACS,KAAT,CAAea,OAAf,CAAuBC,WAAvB,CAAmCC,aAAnC,CAAiDL,YAAjD,CAAnB;;IACA,IAAI,CAACN,UAAU,CAACY,MAAhB,EAAwB;MACtB,MAAM,KAAIrB,oBAAJ,EACH,wBAAuBf,QAAS,SAAQE,UAAW,yDADhD,CAAN;IAGD;;IACDoB,MAAM,GAAG,MAAMX,QAAQ,CAACS,KAAT,CAAea,OAAf,CAAuBC,WAAvB,CAAmCG,eAAnC,CAAmDP,YAAnD,CAAf;IACAL,aAAa,GAAI,GAAEvB,UAAW,IAAGc,YAAY,CAACF,IAAK,EAAnD;EACD,CAVM,MAUA;IACLS,SAAS,GAAG,MAAMZ,QAAQ,CAACS,KAAT,CAAeC,QAAf,CAAwBL,YAAxB,CAAlB;IACA,IAAI,CAACO,SAAL,EAAgB,MAAM,KAAIR,oBAAJ,EAAc,wBAAuBf,QAAS,2BAA9C,CAAN;IAChBsB,MAAM,GAAGC,SAAS,CAACe,UAAV,CAAqBC,GAArB,CAA0BC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,aAAL,CAAmBF,CAAC,CAACG,IAAF,CAAOC,QAAP,EAAnB,CAAhC,CAAT;IACAnB,aAAa,GAAGT,YAAY,CAACF,IAA7B;EACD;;EAED,IAAI+B,mBAAmB,GAAG,MAAMC,sBAAsB,EAAtD;;EAEA,IAAIrC,OAAJ,EAAa;IACX,MAAMsC,YAAY,GAAG,MAAMhD,SAAS,CAACiD,2BAAV,CAAsC1B,MAAtC,CAA3B;IACA,MAAM2B,kBAAkB,GAAGlD,SAAS,CAACqB,KAAV,CAAgB8B,6BAAhB,CAA8CzC,OAA9C,EAAuDsC,YAAvD,CAA3B;IACAF,mBAAmB,GAAG,MAAMM,sBAAsB,CAChDN,mBADgD,EAEhDI,kBAFgD,EAGhD3B,MAHgD,EAIhDvB,SAJgD,EAKhDW,WALgD,CAAlD;IAOAY,MAAM,CAAC8B,OAAP,CAAgBC,KAAD,IAAW;MACxB,IAAI,CAACR,mBAAmB,CAACS,IAApB,CAA0Bd,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKc,qBAAL,CAA2BF,KAA3B,CAAhC,CAAL,EAAyE;QACvER,mBAAmB,CAACW,IAApB,CAAyB;UAAEf,EAAE,EAAEY,KAAN;UAAaI,oBAAoB,EAAE,IAAnC;UAAyCC,eAAe,EAAG;QAA3D,CAAzB;MACD;IACF,CAJD;EAKD;;EACD,IAAIrD,uBAAJ,EAA6B;IAC3B,MAAMsD,YAAY,GAAG,MAAM5D,SAAS,CAAC6D,OAAV,EAA3B;IACA,MAAMX,kBAAkB,GAAGU,YAAY,CAACE,MAAb,CAAqBpB,EAAD,IAC7CI,mBAAmB,CAACS,IAApB,CAA0Bd,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKc,qBAAL,CAA2Bd,EAAE,CAACqB,OAA9B,CAAhC,CADyB,CAA3B;IAGAjB,mBAAmB,GAAG,MAAMM,sBAAsB,CAChDN,mBADgD,EAEhDI,kBAFgD,EAGhD3B,MAHgD,EAIhDvB,SAJgD,EAKhDW,WALgD,CAAlD;IAOAY,MAAM,CAAC8B,OAAP,CAAgBC,KAAD,IAAW;MACxB,IAAI,CAACR,mBAAmB,CAACS,IAApB,CAA0Bd,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKc,qBAAL,CAA2BF,KAA3B,CAAhC,CAAL,EAAyE;QACvER,mBAAmB,CAACW,IAApB,CAAyB;UAAEf,EAAE,EAAEY,KAAN;UAAaI,oBAAoB,EAAE,IAAnC;UAAyCC,eAAe,EAAG;QAA3D,CAAzB;MACD;IACF,CAJD;EAKD;;EAEDK,gBAAgB;;EAEhB,IAAIvD,MAAJ,EAAY;IACVwD,WAAW,CAACnB,mBAAD,EAAsB7C,QAAtB,EAAgCW,QAAhC,CAAX;EACD;;EAED,MAAMsD,YAAY,GAAG,MAAMnE,OAAO,CAACoE,UAAR,CAAmB;IAC5CjE,aAD4C;IAE5C4C,mBAF4C;IAG5C3C,UAH4C;IAI5CiE,MAAM,EAAEnD,YAJoC;IAK5CE,SAL4C;IAM5Cf,MAN4C;IAO5CC,WAP4C;IAQ5CE;EAR4C,CAAnB,CAA3B;EAWA,MAAM8D,kBAAkB,GACtB,CAACH,YAAY,CAACI,gBAAd,IACAJ,YAAY,CAACI,gBAAb,CAA8BjC,MAA9B,KAAyC,CADzC,IAEA6B,YAAY,CAACI,gBAAb,CAA8BC,KAA9B,CAAqCC,eAAD,IAAqBA,eAAe,CAACC,qBAAzE,CAHF;EAKA,IAAIC,aAAa,GAAG,EAApB;;EAEA,IAAI,CAAClE,UAAD,IAAegB,SAAf,IAA4BA,SAAS,CAACmD,eAAtC,IAAyDN,kBAA7D,EAAiF;IAAA;;IAC/E,MAAMzD,QAAQ,CAACgE,MAAT,CAAgBC,aAAhB,CAA8BjE,QAAQ,CAACgE,MAAT,CAAgBE,aAA9C,CAAN;IAEA,MAAMC,iBAAiB,GAAG,CACxBvD,SAAS,CAACmD,eAAV,CAA0BjC,EAA1B,CAA6BC,aAA7B,0BAA2CnB,SAAS,CAACmD,eAArD,oFAA2C,sBAA2B/B,IAAtE,2DAA2C,uBAAiCoC,IAA5E,EAAkFnC,QAAlF,EADwB,CAA1B;IAIA6B,aAAa,GAAG,MAAM,IAAAO,kBAAA,EAAO;MAC3BC,GAAG,EAAEH,iBADsB;MAE3BI,KAAK,EAAE,KAFoB;MAG3BC,MAAM,EAAE,KAHmB;MAI3BC,KAAK,EAAE,KAJoB;MAK3BC,WAAW,EAAE;IALc,CAAP,CAAtB;EAOD,CAdD,MAcO,IAAI9D,SAAS,IAAI,CAACA,SAAS,CAACmD,eAA5B,EAA6C;IAClDD,aAAa,GAAG;MAAEa,YAAY,EAAG,QAAO/D,SAAS,CAACT,IAAK;IAAvC,CAAhB;EACD;;EAED,OAAO;IAAEmD,YAAF;IAAgBQ;EAAhB,CAAP;;EAEA,eAAe3B,sBAAf,GAAyE;IACvE,MAAMyC,GAAG,GAAG,KAAIC,mBAAJ,EAAQ7E,QAAQ,CAACS,KAAjB,CAAZ;;IACA,IAAI;MACF,MAAMqE,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAR,CAC7BrE,MAAM,CAACiB,GAAP,CAAYc,KAAD,IAAWvD,OAAO,CAAC8F,uBAAR,CAAgCvC,KAAhC,EAAuCnC,SAAvC,EAAkDO,aAAlD,CAAtB,CAD6B,CAA/B;MAGA,MAAM8D,GAAG,CAACM,KAAJ,EAAN;MACA,OAAOJ,gBAAP;IACD,CAND,CAME,OAAOK,GAAP,EAAiB;MACjB,MAAMP,GAAG,CAACM,KAAJ,EAAN;MACA,MAAMC,GAAN;IACD;EACF;;EAED,SAAS/B,gBAAT,GAA4B;IAC1B,MAAMM,gBAAgB,GAAGxB,mBAAmB,CAACgB,MAApB,CAA4BrB,CAAD,IAAOA,CAAC,CAACkB,eAAF,IAAqB,CAAClB,CAAC,CAACiB,oBAA1D,CAAzB;;IACA,IAAIY,gBAAgB,CAACjC,MAArB,EAA6B;MAC3B,MAAM2D,WAAW,GAAG1B,gBAAgB,CACjC9B,GADiB,CAEfgC,eAAD,IACG,GAAEyB,gBAAA,CAAMC,IAAN,CAAW1B,eAAe,CAAC9B,EAAhB,CAAmBG,QAAnB,EAAX,CAA0C,MAAKoD,gBAAA,CAAME,GAAN,CAAU3B,eAAe,CAACb,eAA1B,CAAqD,EAHzF,EAKjByC,IALiB,CAKZ,IALY,CAApB;MAMA,MAAM,KAAIpF,oBAAJ,EAAc,mDAAkDgF,WAAY,EAA5E,CAAN;IACD;EACF;AACF;;AAED,eAAe5C,sBAAf,CACEN,mBADF,EAEEuD,aAFF,EAGEC,SAHF,EAIEtG,SAJF,EAKEW,WAAW,GAAG,KALhB,EAMmC;EACjC,MAAM4F,iBAAiB,GAAGC,eAAA,CAAOC,SAAP,CAAiBJ,aAAa,CAAC7D,GAAd,CAAmBC,CAAD,IAAOA,CAAC,CAACsB,OAA3B,CAAjB,CAA1B;;EACA,MAAM2C,oBAAoB,GAAGJ,SAAS,CAACxC,MAAV,CAAkBR,KAAD,IAAW,CAACiD,iBAAiB,CAACI,iBAAlB,CAAoCrD,KAApC,CAA7B,CAA7B;EACA,MAAMsD,uBAA+C,GAAG,EAAxD;EACA,MAAMC,SAAkB,GAAG,EAA3B;EACA,MAAM,IAAAC,qBAAA,EAAWT,aAAX,EAA0B,MAAOU,MAAP,IAAkB;IAChD,MAAMC,UAAU,GAAGlE,mBAAmB,CAACS,IAApB,CAA0Bd,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKc,qBAAL,CAA2BuD,MAAM,CAAChD,OAAlC,CAAhC,CAAnB;;IACA,IAAI,CAACiD,UAAL,EAAiB;MACf,MAAM,IAAInF,KAAJ,CAAW,0CAAyCkF,MAAM,CAAClE,QAAP,EAAkB,sBAAtE,CAAN;IACD;;IACD+D,uBAAuB,CAACnD,IAAxB,CAA6BuD,UAA7B;;IACA,IAAIA,UAAU,CAACrD,eAAf,EAAgC;MAC9B;IACD;;IACD,MAAM;MAAEsD;IAAF,IAAkBD,UAAxB;;IACA,IAAI,CAACC,WAAL,EAAkB;MAChB,MAAM,IAAIpF,KAAJ,CAAW,0DAAyDkF,MAAM,CAAClE,QAAP,EAAkB,EAAtF,CAAN;IACD;;IACD,MAAMqE,cAAc,GAAGD,WAAW,CAACE,iBAAnC;;IACA,IAAI,CAACD,cAAc,CAAC7E,MAApB,EAA4B;MAC1B;IACD;;IACD,MAAM+E,cAAc,GAAG,MAAMpH,SAAS,CAACY,QAAV,CAAmBS,KAAnB,CAAyBgG,iBAAzB,CAA2CN,MAAM,CAAChD,OAAlD,CAA7B,CAjBgD,CAkBhD;;IACA,MAAM,IAAA+C,qBAAA,EAAWI,cAAX,EAA2B,MAAOI,YAAP,IAAwB;MACvD,MAAMC,UAAU,GAAG,MAAMH,cAAc,CAACI,WAAf,CAA2BF,YAAY,CAACzE,QAAb,EAA3B,EAAoD7C,SAAS,CAACY,QAAV,CAAmBS,KAAnB,CAAyBa,OAA7E,CAAzB;MACA,MAAMuF,aAAa,GAAGF,UAAU,CAACG,2BAAX,EAAtB;MACA,MAAMC,uBAAuB,GAAGjB,oBAAoB,CAAC5C,MAArB,CAA6BpB,EAAD,IAAQ+E,aAAa,CAACd,iBAAd,CAAgCjE,EAAhC,CAApC,CAAhC;;MACA,IAAI,CAACiF,uBAAuB,CAACtF,MAA7B,EAAqC;QACnC;MACD;;MACD,IAAI,CAAC1B,WAAL,EAAkB;QAChB,MAAM,KAAIK,oBAAJ,EAAc,mBAAkB+F,MAAM,CAAClE,QAAP,EAAkB;AAChE;AACA,EAAE8E,uBAAuB,CAACnF,GAAxB,CAA6BoF,CAAD,IAAOA,CAAC,CAAC/E,QAAF,EAAnC,EAAiDuD,IAAjD,CAAsD,IAAtD,CAA4D,EAFhD,CAAN;MAGD;;MACDS,SAAS,CAACpD,IAAV,CAAe,GAAGkE,uBAAlB;IACD,CAbK,CAAN;EAcD,CAjCK,CAAN;;EAkCA,IAAId,SAAS,CAACxE,MAAd,EAAsB;IACpB,MAAMwF,QAAQ,GAAGrB,eAAA,CAAOsB,aAAP,CAAqBjB,SAArB,CAAjB;;IACAgB,QAAQ,CAACxE,OAAT,CAAkBX,EAAD,IAAQ;MACvB,MAAMsE,UAAU,GAAGlE,mBAAmB,CAACS,IAApB,CAA0Bd,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKc,qBAAL,CAA2Bd,EAA3B,CAAhC,CAAnB;;MACA,IAAI,CAACsE,UAAL,EAAiB;QACf,MAAM,IAAInF,KAAJ,CAAW,0CAAyCa,EAAE,CAACG,QAAH,EAAc,sBAAlE,CAAN;MACD;;MACD+D,uBAAuB,CAACnD,IAAxB,CAA6BuD,UAA7B;IACD,CAND;EAOD;;EACD,OAAOJ,uBAAP;AACD;;AAED,SAAS3C,WAAT,CAAqBnB,mBAArB,EAAkE7C,QAAlE,EAAoFW,QAApF,EAAwG;EACtG,MAAMmH,mBAAmB,GAAGjF,mBAAmB,CAACgB,MAApB,CAA4BrB,CAAD,IAAO,CAACA,CAAC,CAACkB,eAArC,CAA5B;EACAoE,mBAAmB,CAAC1E,OAApB,CAA4B,CAAC;IAAEX,EAAF;IAAMuE,WAAN;IAAmBe;EAAnB,CAAD,KAA6C;IACvE,IAAI,CAACf,WAAL,EAAkB;MAChB,MAAM,IAAIpF,KAAJ,CAAW,iDAAgDa,EAAE,CAACG,QAAH,EAAc,EAAzE,CAAN;IACD;;IACD,IAAIoE,WAAW,CAACgB,UAAZ,EAAJ,EAA8B;MAC5B,MAAM,KAAIjH,oBAAJ,EAAc,4BAA2B0B,EAAE,CAACG,QAAH,EAAc;AACnE,wBAAwB5C,QAAS,2EAA0EA,QAAS,EADxG,CAAN;IAED;;IACD,IAAIgH,WAAW,CAACiB,YAAZ,EAAJ,EAAgC;MAC9B;MACA;IACD;;IACD,IAAI,CAACjB,WAAW,CAACkB,aAAZ,EAAL,EAAkC;MAChC;MACA;IACD,CAfsE,CAgBvE;;;IACA,MAAMC,WAAW,GAAGnB,WAAW,CAACE,iBAAhC;;IACA,IAAIiB,WAAW,CAAC/F,MAAZ,KAAuB,CAA3B,EAA8B;MAC5B,MAAM,IAAIR,KAAJ,CAAW,sDAAX,CAAN;IACD;;IACD,IAAIuG,WAAW,CAAC/F,MAAZ,KAAuB,CAA3B,EAA8B;MAC5B;MACA;IACD;;IACD,IAAI,CAAC2F,kBAAL,EAAyB;MACvB,MAAM,IAAInG,KAAJ,CAAU,qDAAV,CAAN;IACD,CA3BsE,CA6BvE;;;IACA,IAAIoF,WAAW,CAACoB,uBAAhB,EAAyC;MACvCL,kBAAkB,CAACM,eAAnB,CAAmCrB,WAAW,CAACoB,uBAA/C;IACD,CAFD,MAEO;MACL;MACAL,kBAAkB,CAACO,OAAnB,CAA2BlF,OAA3B,CAAoCmF,GAAD,IAASR,kBAAkB,CAACS,YAAnB,CAAgCD,GAAhC,CAA5C;IACD;;IACD,MAAME,aAAa,GAAGN,WAAW,CAACtE,MAAZ,CAAoB6E,IAAD,IAAU,CAACA,IAAI,CAACC,OAAL,CAAaZ,kBAAkB,CAAChD,IAAnB,EAAb,CAA9B,CAAtB;IACAgD,kBAAkB,CAACa,WAAnB,CAA+BH,aAA/B;IACA9H,QAAQ,CAACS,KAAT,CAAea,OAAf,CAAuB4G,GAAvB,CAA2Bd,kBAA3B;EACD,CAvCD;AAwCD"}
|
package/lanes.docs.mdx
CHANGED
@@ -87,6 +87,12 @@ Summary of when/what lanes data is saved per command:
|
|
87
87
|
- in case the merge wasn't done and the user is trying to export, the remote blocks is as it finds out that its head doesn't exist on the incoming component.
|
88
88
|
- in case the snap-merge failed due to a conflict, it saves the conflict and heads data into `.bit/unmerged.json` file.
|
89
89
|
|
90
|
+
### Merge components
|
91
|
+
|
92
|
+
- to merge an entire lane, use `bit lane merge`.
|
93
|
+
- to get updates from a remote lane, run `bit import`, and then `bit checkout head`. alternatively, run `bit merge <component-id>` in one command.
|
94
|
+
- to merge an individual component from a lane to main, run `bit lane merge <lane> --pattern <component-id>` when on main.
|
95
|
+
|
90
96
|
### Useful APIs
|
91
97
|
|
92
98
|
- bit-map `getAllIdsAvailableOnLane()` filters the currently checked out lane.
|
Binary file
|
package/package.json
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
{
|
2
2
|
"name": "@teambit/lanes",
|
3
|
-
"version": "0.0.
|
3
|
+
"version": "0.0.367",
|
4
4
|
"homepage": "https://bit.dev/teambit/lanes/lanes",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"componentId": {
|
7
7
|
"scope": "teambit.lanes",
|
8
8
|
"name": "lanes",
|
9
|
-
"version": "0.0.
|
9
|
+
"version": "0.0.367"
|
10
10
|
},
|
11
11
|
"dependencies": {
|
12
12
|
"chalk": "2.4.2",
|
@@ -18,24 +18,24 @@
|
|
18
18
|
"core-js": "^3.0.0",
|
19
19
|
"@teambit/harmony": "0.3.3",
|
20
20
|
"@teambit/bit-error": "0.0.394",
|
21
|
-
"@teambit/cli": "0.0.
|
22
|
-
"@teambit/merging": "0.0.
|
23
|
-
"@teambit/scope": "0.0.
|
24
|
-
"@teambit/workspace": "0.0.
|
25
|
-
"@teambit/graphql": "0.0.
|
26
|
-
"@teambit/community": "0.0.
|
27
|
-
"@teambit/component": "0.0.
|
28
|
-
"@teambit/lane-id": "0.0.
|
29
|
-
"@teambit/lanes.modules.diff": "0.0.
|
30
|
-
"@teambit/legacy-bit-id": "0.0.
|
31
|
-
"@teambit/logger": "0.0.
|
21
|
+
"@teambit/cli": "0.0.528",
|
22
|
+
"@teambit/merging": "0.0.110",
|
23
|
+
"@teambit/scope": "0.0.795",
|
24
|
+
"@teambit/workspace": "0.0.795",
|
25
|
+
"@teambit/graphql": "0.0.795",
|
26
|
+
"@teambit/community": "0.0.76",
|
27
|
+
"@teambit/component": "0.0.795",
|
28
|
+
"@teambit/lane-id": "0.0.47",
|
29
|
+
"@teambit/lanes.modules.diff": "0.0.156",
|
30
|
+
"@teambit/legacy-bit-id": "0.0.400",
|
31
|
+
"@teambit/logger": "0.0.621",
|
32
32
|
"@teambit/design.ui.pages.not-found": "0.0.356",
|
33
|
-
"@teambit/lanes.ui.lanes": "0.0.
|
34
|
-
"@teambit/sidebar": "0.0.
|
33
|
+
"@teambit/lanes.ui.lanes": "0.0.96",
|
34
|
+
"@teambit/sidebar": "0.0.795",
|
35
35
|
"@teambit/ui-foundation.ui.menu": "0.0.487",
|
36
36
|
"@teambit/ui-foundation.ui.react-router.slot-router": "0.0.490",
|
37
|
-
"@teambit/ui": "0.0.
|
38
|
-
"@teambit/component-id": "0.0.
|
37
|
+
"@teambit/ui": "0.0.795",
|
38
|
+
"@teambit/component-id": "0.0.403"
|
39
39
|
},
|
40
40
|
"devDependencies": {
|
41
41
|
"@types/react": "^17.0.8",
|
@@ -51,7 +51,7 @@
|
|
51
51
|
},
|
52
52
|
"peerDependencies": {
|
53
53
|
"react-router-dom": "^6.0.0",
|
54
|
-
"@teambit/legacy": "1.0.
|
54
|
+
"@teambit/legacy": "1.0.310",
|
55
55
|
"react-dom": "^16.8.0 || ^17.0.0",
|
56
56
|
"react": "^16.8.0 || ^17.0.0"
|
57
57
|
},
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@0.0.
|
2
|
-
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@0.0.
|
1
|
+
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@0.0.367/dist/lanes.composition.js';
|
2
|
+
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@0.0.367/dist/lanes.docs.mdx';
|
3
3
|
|
4
4
|
export const compositions = [compositions_0];
|
5
5
|
export const overview = [overview_0];
|
Binary file
|