@teambit/merging 0.0.31 → 0.0.34

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.
Files changed (8) hide show
  1. package/dist/merge-cmd.js.map +1 -1
  2. package/dist/merging.main.runtime.d.ts +1 -0
  3. package/dist/merging.main.runtime.js +7 -5
  4. package/dist/merging.main.runtime.js.map +1 -1
  5. package/package-tar/teambit-merging-0.0.34.tgz +0 -0
  6. package/package.json +8 -8
  7. /package/{preview-1650804247524.js → preview-1651029886240.js} +0 -0
  8. package/package-tar/teambit-merging-0.0.31.tgz +0 -0
package/dist/merge-cmd.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["merge-cmd.ts"],"names":["MergeCmd","constructor","merging","report","values","ours","theirs","manual","abort","resolve","build","noSnap","message","BUILD_ON_CI","Boolean","mergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","getSuccessOutput","length","bold","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","comps","component","componentOutput","toString","autoTag","filter","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","failedComponent","red","failureMessage"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAKA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAGO,MAAMA,QAAN,CAAkC;AAqBvCC,EAAAA,WAAW,CAASC,OAAT,EAA+B;AAAA,SAAtBA,OAAsB,GAAtBA,OAAsB;AAAA,kDApBnC,mBAoBmC;AAAA,8DAnBvB,+CAmBuB;AAAA,mDAlBlC,aAkBkC;AAAA,yDAjB3B;AACjB;AACA;AACA,IAAI,gCAAc,aAAd,CAA6B,EAcW;AAAA,mDAblC,EAakC;AAAA,qDAZhC,CACR,CAAC,EAAD,EAAK,MAAL,EAAa,gFAAb,CADQ,EAER,CAAC,EAAD,EAAK,QAAL,EAAe,qFAAf,CAFQ,EAGR,CAAC,EAAD,EAAK,QAAL,EAAe,6FAAf,CAHQ,EAIR,CAAC,EAAD,EAAK,OAAL,EAAc,0FAAd,CAJQ,EAKR,CAAC,EAAD,EAAK,SAAL,EAAgB,2FAAhB,CALQ,EAMR,CAAC,EAAD,EAAK,SAAL,EAAgB,8EAAhB,CANQ,EAOR,CAAC,EAAD,EAAK,OAAL,EAAc,wFAAd,CAPQ,EAQR,CAAC,GAAD,EAAM,mBAAN,EAA2B,8DAA3B,CARQ,CAYgC;AAAA,oDAFjC,IAEiC;AAAE;;AAEhC,QAANC,MAAM,CACV,CAACC,MAAM,GAAG,EAAV,CADU,EAEV;AACEC,IAAAA,IAAI,GAAG,KADT;AAEEC,IAAAA,MAAM,GAAG,KAFX;AAGEC,IAAAA,MAAM,GAAG,KAHX;AAIEC,IAAAA,KAAK,GAAG,KAJV;AAKEC,IAAAA,OAAO,GAAG,KALZ;AAMEC,IAAAA,KAAK,GAAG,KANV;AAOEC,IAAAA,MAAM,GAAG,KAPX;AAQEC,IAAAA;AARF,GAFU,EAqBV;AACAF,IAAAA,KAAK,GAAG,uCAAiBG,4BAAjB,IAAgCC,OAAO,CAACJ,KAAD,CAAvC,GAAiD,IAAzD;AACA,UAAMK,aAAa,GAAG,sCAAiBV,IAAjB,EAAuBC,MAAvB,EAA+BC,MAA/B,CAAtB;AACA,QAAIC,KAAK,IAAIC,OAAb,EAAsB,MAAM,KAAIO,oBAAJ,EAAa,oDAAb,CAAN;AACtB,QAAIL,MAAM,IAAIC,OAAd,EAAuB,MAAM,KAAII,oBAAJ,EAAa,qDAAb,CAAN;AACvB,UAAM;AACJC,MAAAA,UADI;AAEJC,MAAAA,gBAFI;AAGJC,MAAAA,OAHI;AAIJC,MAAAA,kBAJI;AAKJC,MAAAA,iBALI;AAMJC,MAAAA;AANI,QAOmB,MAAM,KAAKpB,OAAL,CAAaqB,KAAb,CAC7BnB,MAD6B,EAE7BW,aAF6B,EAG7BP,KAH6B,EAI7BC,OAJ6B,EAK7BE,MAL6B,EAM7BC,OAN6B,EAO7BF,KAP6B,CAP/B;;AAgBA,QAAIU,kBAAJ,EAAwB;AACtB,YAAMI,KAAK,GAAG,sCAAd;AACA,YAAMC,aAAa,GAAGL,kBAAkB,CAACM,GAAnB,CAAwBC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,sBAAL,EAA9B,EAA6DC,IAA7D,CAAkE,IAAlE,CAAtB;AACA,aAAOC,iBAAMC,SAAN,CAAgBR,KAAhB,IAAyBO,iBAAME,KAAN,CAAYR,aAAZ,CAAhC;AACD;;AACD,QAAIJ,iBAAJ,EAAuB;AACrB,YAAMG,KAAK,GAAG,gEAAd;AACA,YAAMC,aAAa,GAAGJ,iBAAiB,CAACK,GAAlB,CAAuBC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,sBAAL,EAA7B,EAA4DC,IAA5D,CAAiE,IAAjE,CAAtB;AACA,aAAOC,iBAAMC,SAAN,CAAgBR,KAAhB,IAAyBO,iBAAME,KAAN,CAAYR,aAAZ,CAAhC;AACD;;AACD,WAAOS,WAAW,CAAC;AACjBjB,MAAAA,UADiB;AAEjBC,MAAAA,gBAFiB;AAGjBC,MAAAA,OAHiB;AAIjBG,MAAAA;AAJiB,KAAD,CAAlB;AAMD;;AAjFsC;;;;AAoFlC,SAASY,WAAT,CAAqB;AAAEjB,EAAAA,UAAF;AAAcC,EAAAA,gBAAd;AAAgCC,EAAAA,OAAhC;AAAyCG,EAAAA;AAAzC,CAArB,EAA+G;AACpH,QAAMa,gBAAgB,GAAG,MAAM;AAC7B,QAAI,CAAClB,UAAD,IAAe,CAACA,UAAU,CAACmB,MAA/B,EAAuC,OAAO,EAAP,CADV,CAE7B;;AACA,UAAMZ,KAAK,GAAI,iCAAgCL,OAAO,GAAI,gBAAeY,iBAAMM,IAAN,CAAWlB,OAAX,CAAoB,EAAvC,GAA2C,EAAG,IAApG,CAH6B,CAI7B;;AACA,WAAOY,iBAAMC,SAAN,CAAgBR,KAAhB,IAAyBO,iBAAME,KAAN,CAAY,wCAAmBhB,UAAnB,CAAZ,CAAhC;AACD,GAND;;AAQA,QAAMqB,cAAc,GAAG,MAAM;AAC3B,QAAI,CAAChB,gBAAD,IAAqB,CAACA,gBAAgB,CAACiB,iBAA3C,EAA8D,OAAO,EAAP;AAC9D,UAAM;AAAEA,MAAAA,iBAAF;AAAqBC,MAAAA;AAArB,QAA4ClB,gBAAlD;;AACA,UAAMmB,gBAAgB,GAAIC,KAAD,IAAW;AAClC,aAAOA,KAAK,CACThB,GADI,CACCiB,SAAD,IAAe;AAClB,YAAIC,eAAe,GAAI,UAASD,SAAS,CAACf,EAAV,CAAaiB,QAAb,EAAwB,EAAxD;AACA,cAAMC,OAAO,GAAGN,kBAAkB,CAACO,MAAnB,CAA2BC,MAAD,IACxCA,MAAM,CAACC,WAAP,CAAmBC,4BAAnB,CAAgDP,SAAS,CAACf,EAA1D,CADc,CAAhB;;AAGA,YAAIkB,OAAO,CAACV,MAAZ,EAAoB;AAClB,gBAAMe,WAAW,GAAGL,OAAO,CAACpB,GAAR,CAAa0B,CAAD,IAAOA,CAAC,CAACT,SAAF,CAAYf,EAAZ,CAAeiB,QAAf,EAAnB,CAApB;AACAD,UAAAA,eAAe,IAAK,YAAWS,6BAAiB,KAAIF,WAAW,CAACrB,IAAZ,CAAiB,IAAjB,CAAuB,EAA3E;AACD;;AACD,eAAOc,eAAP;AACD,OAXI,EAYJd,IAZI,CAYC,IAZD,CAAP;AAaD,KAdD;;AAgBA,WAAQ,KAAIC,iBAAMC,SAAN,CACV,0BADU,CAEV,MAAK,kDAAmD,MAAKS,gBAAgB,CAACF,iBAAD,CAAoB,IAFnG;AAGD,GAtBD;;AAwBA,QAAMe,gBAAgB,GAAG,MAAM;AAC7B,QAAI,CAACpC,gBAAD,IAAqB,CAACA,gBAAgB,CAACkB,MAA3C,EAAmD,OAAO,EAAP;AACnD,UAAMZ,KAAK,GAAG,2DAAd;AACA,UAAM+B,IAAI,GAAGrC,gBAAgB,CAC1BQ,GADU,CAER8B,eAAD,IACG,GAAEzB,iBAAMM,IAAN,CAAWmB,eAAe,CAAC5B,EAAhB,CAAmBiB,QAAnB,EAAX,CAA0C,MAAKd,iBAAM0B,GAAN,CAAUD,eAAe,CAACE,cAA1B,CAA0C,EAHrF,EAKV5B,IALU,CAKL,IALK,CAAb;AAMA,WAAQ,GAAEC,iBAAMC,SAAN,CAAgBR,KAAhB,CAAuB,KAAI+B,IAAK,MAA1C;AACD,GAVD;;AAYA,SAAOpB,gBAAgB,KAAKmB,gBAAgB,EAArC,GAA0ChB,cAAc,EAA/D;AACD","sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG } from '@teambit/legacy/dist/constants';\nimport {\n ApplyVersionResults,\n getMergeStrategy,\n applyVersionReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { MergingMain } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n name = 'merge [values...]';\n shortDescription = 'merge changes of different component versions';\n group = 'development';\n description = `merge changes of different component versions\n \\`bit merge <version> [ids...]\\` => merge changes of the given version into the checked out version\n \\`bit merge [ids...]\\` => EXPERIMENTAL. merge changes of the remote head into local, optionally use '--abort' or '--resolve'\n ${WILDCARD_HELP('merge 0.0.1')}`;\n alias = '';\n options = [\n ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'],\n ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n ] as CommandOptions;\n loader = true;\n\n constructor(private merging: MergingMain) {}\n\n async report(\n [values = []]: [string[]],\n {\n ours = false,\n theirs = false,\n manual = false,\n abort = false,\n resolve = false,\n build = false,\n noSnap = false,\n message,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n abort?: boolean;\n resolve?: boolean;\n build?: boolean;\n noSnap?: boolean;\n message: string;\n }\n ) {\n build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n const {\n components,\n failedComponents,\n version,\n resolvedComponents,\n abortedComponents,\n mergeSnapResults,\n }: ApplyVersionResults = await this.merging.merge(\n values,\n mergeStrategy as any,\n abort,\n resolve,\n noSnap,\n message,\n build\n );\n if (resolvedComponents) {\n const title = 'successfully resolved component(s)\\n';\n const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n if (abortedComponents) {\n const title = 'successfully aborted the merge of the following component(s)\\n';\n const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n return mergeReport({\n components,\n failedComponents,\n version,\n mergeSnapResults,\n });\n }\n}\n\nexport function mergeReport({ components, failedComponents, version, mergeSnapResults }: ApplyVersionResults): string {\n const getSuccessOutput = () => {\n if (!components || !components.length) return '';\n // @ts-ignore version is set in case of merge command\n const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n // @ts-ignore components is set in case of merge command\n return chalk.underline(title) + chalk.green(applyVersionReport(components));\n };\n\n const getSnapsOutput = () => {\n if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n const outputComponents = (comps) => {\n return comps\n .map((component) => {\n let componentOutput = ` > ${component.id.toString()}`;\n const autoTag = autoSnappedResults.filter((result) =>\n result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n );\n if (autoTag.length) {\n const autoTagComp = autoTag.map((a) => a.component.id.toString());\n componentOutput += `\\n ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n }\n return componentOutput;\n })\n .join('\\n');\n };\n\n return `\\n${chalk.underline(\n 'merge-snapped components'\n )}\\n(${'components that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n };\n\n const getFailureOutput = () => {\n if (!failedComponents || !failedComponents.length) return '';\n const title = 'the merge has been canceled on the following component(s)';\n const body = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.failureMessage)}`\n )\n .join('\\n');\n return `${chalk.underline(title)}\\n${body}\\n\\n`;\n };\n\n return getSuccessOutput() + getFailureOutput() + getSnapsOutput();\n}\n"]}
1
+ {"version":3,"sources":["merge-cmd.ts"],"names":["MergeCmd","constructor","merging","report","values","ours","theirs","manual","abort","resolve","build","noSnap","message","BUILD_ON_CI","Boolean","mergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","getSuccessOutput","length","bold","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","comps","component","componentOutput","toString","autoTag","filter","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","failedComponent","red","failureMessage"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAKA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAGO,MAAMA,QAAN,CAAkC;AAqBvCC,EAAAA,WAAW,CAASC,OAAT,EAA+B;AAAA,SAAtBA,OAAsB,GAAtBA,OAAsB;AAAA,kDApBnC,mBAoBmC;AAAA,8DAnBvB,+CAmBuB;AAAA,mDAlBlC,aAkBkC;AAAA,yDAjB3B;AACjB;AACA;AACA,IAAI,gCAAc,aAAd,CAA6B,EAcW;AAAA,mDAblC,EAakC;AAAA,qDAZhC,CACR,CAAC,EAAD,EAAK,MAAL,EAAa,gFAAb,CADQ,EAER,CAAC,EAAD,EAAK,QAAL,EAAe,qFAAf,CAFQ,EAGR,CAAC,EAAD,EAAK,QAAL,EAAe,6FAAf,CAHQ,EAIR,CAAC,EAAD,EAAK,OAAL,EAAc,0FAAd,CAJQ,EAKR,CAAC,EAAD,EAAK,SAAL,EAAgB,2FAAhB,CALQ,EAMR,CAAC,EAAD,EAAK,SAAL,EAAgB,8EAAhB,CANQ,EAOR,CAAC,EAAD,EAAK,OAAL,EAAc,wFAAd,CAPQ,EAQR,CAAC,GAAD,EAAM,mBAAN,EAA2B,8DAA3B,CARQ,CAYgC;AAAA,oDAFjC,IAEiC;AAAE;;AAEhC,QAANC,MAAM,CACV,CAACC,MAAM,GAAG,EAAV,CADU,EAEV;AACEC,IAAAA,IAAI,GAAG,KADT;AAEEC,IAAAA,MAAM,GAAG,KAFX;AAGEC,IAAAA,MAAM,GAAG,KAHX;AAIEC,IAAAA,KAAK,GAAG,KAJV;AAKEC,IAAAA,OAAO,GAAG,KALZ;AAMEC,IAAAA,KAAK,GAAG,KANV;AAOEC,IAAAA,MAAM,GAAG,KAPX;AAQEC,IAAAA;AARF,GAFU,EAqBV;AACAF,IAAAA,KAAK,GAAG,uCAAiBG,4BAAjB,IAAgCC,OAAO,CAACJ,KAAD,CAAvC,GAAiD,IAAzD;AACA,UAAMK,aAAa,GAAG,sCAAiBV,IAAjB,EAAuBC,MAAvB,EAA+BC,MAA/B,CAAtB;AACA,QAAIC,KAAK,IAAIC,OAAb,EAAsB,MAAM,KAAIO,oBAAJ,EAAa,oDAAb,CAAN;AACtB,QAAIL,MAAM,IAAIC,OAAd,EAAuB,MAAM,KAAII,oBAAJ,EAAa,qDAAb,CAAN;AACvB,UAAM;AACJC,MAAAA,UADI;AAEJC,MAAAA,gBAFI;AAGJC,MAAAA,OAHI;AAIJC,MAAAA,kBAJI;AAKJC,MAAAA,iBALI;AAMJC,MAAAA;AANI,QAOmB,MAAM,KAAKpB,OAAL,CAAaqB,KAAb,CAC7BnB,MAD6B,EAE7BW,aAF6B,EAG7BP,KAH6B,EAI7BC,OAJ6B,EAK7BE,MAL6B,EAM7BC,OAN6B,EAO7BF,KAP6B,CAP/B;;AAgBA,QAAIU,kBAAJ,EAAwB;AACtB,YAAMI,KAAK,GAAG,sCAAd;AACA,YAAMC,aAAa,GAAGL,kBAAkB,CAACM,GAAnB,CAAwBC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,sBAAL,EAA9B,EAA6DC,IAA7D,CAAkE,IAAlE,CAAtB;AACA,aAAOC,iBAAMC,SAAN,CAAgBR,KAAhB,IAAyBO,iBAAME,KAAN,CAAYR,aAAZ,CAAhC;AACD;;AACD,QAAIJ,iBAAJ,EAAuB;AACrB,YAAMG,KAAK,GAAG,gEAAd;AACA,YAAMC,aAAa,GAAGJ,iBAAiB,CAACK,GAAlB,CAAuBC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,sBAAL,EAA7B,EAA4DC,IAA5D,CAAiE,IAAjE,CAAtB;AACA,aAAOC,iBAAMC,SAAN,CAAgBR,KAAhB,IAAyBO,iBAAME,KAAN,CAAYR,aAAZ,CAAhC;AACD;;AAED,WAAOS,WAAW,CAAC;AACjBjB,MAAAA,UADiB;AAEjBC,MAAAA,gBAFiB;AAGjBC,MAAAA,OAHiB;AAIjBG,MAAAA;AAJiB,KAAD,CAAlB;AAMD;;AAlFsC;;;;AAqFlC,SAASY,WAAT,CAAqB;AAAEjB,EAAAA,UAAF;AAAcC,EAAAA,gBAAd;AAAgCC,EAAAA,OAAhC;AAAyCG,EAAAA;AAAzC,CAArB,EAA+G;AACpH,QAAMa,gBAAgB,GAAG,MAAM;AAC7B,QAAI,CAAClB,UAAD,IAAe,CAACA,UAAU,CAACmB,MAA/B,EAAuC,OAAO,EAAP,CADV,CAE7B;;AACA,UAAMZ,KAAK,GAAI,iCAAgCL,OAAO,GAAI,gBAAeY,iBAAMM,IAAN,CAAWlB,OAAX,CAAoB,EAAvC,GAA2C,EAAG,IAApG,CAH6B,CAI7B;;AACA,WAAOY,iBAAMC,SAAN,CAAgBR,KAAhB,IAAyBO,iBAAME,KAAN,CAAY,wCAAmBhB,UAAnB,CAAZ,CAAhC;AACD,GAND;;AAQA,QAAMqB,cAAc,GAAG,MAAM;AAC3B,QAAI,CAAChB,gBAAD,IAAqB,CAACA,gBAAgB,CAACiB,iBAA3C,EAA8D,OAAO,EAAP;AAC9D,UAAM;AAAEA,MAAAA,iBAAF;AAAqBC,MAAAA;AAArB,QAA4ClB,gBAAlD;;AACA,UAAMmB,gBAAgB,GAAIC,KAAD,IAAW;AAClC,aAAOA,KAAK,CACThB,GADI,CACCiB,SAAD,IAAe;AAClB,YAAIC,eAAe,GAAI,UAASD,SAAS,CAACf,EAAV,CAAaiB,QAAb,EAAwB,EAAxD;AACA,cAAMC,OAAO,GAAGN,kBAAkB,CAACO,MAAnB,CAA2BC,MAAD,IACxCA,MAAM,CAACC,WAAP,CAAmBC,4BAAnB,CAAgDP,SAAS,CAACf,EAA1D,CADc,CAAhB;;AAGA,YAAIkB,OAAO,CAACV,MAAZ,EAAoB;AAClB,gBAAMe,WAAW,GAAGL,OAAO,CAACpB,GAAR,CAAa0B,CAAD,IAAOA,CAAC,CAACT,SAAF,CAAYf,EAAZ,CAAeiB,QAAf,EAAnB,CAApB;AACAD,UAAAA,eAAe,IAAK,YAAWS,6BAAiB,KAAIF,WAAW,CAACrB,IAAZ,CAAiB,IAAjB,CAAuB,EAA3E;AACD;;AACD,eAAOc,eAAP;AACD,OAXI,EAYJd,IAZI,CAYC,IAZD,CAAP;AAaD,KAdD;;AAgBA,WAAQ,KAAIC,iBAAMC,SAAN,CACV,0BADU,CAEV,MAAK,kDAAmD,MAAKS,gBAAgB,CAACF,iBAAD,CAAoB,IAFnG;AAGD,GAtBD;;AAwBA,QAAMe,gBAAgB,GAAG,MAAM;AAC7B,QAAI,CAACpC,gBAAD,IAAqB,CAACA,gBAAgB,CAACkB,MAA3C,EAAmD,OAAO,EAAP;AACnD,UAAMZ,KAAK,GAAG,2DAAd;AACA,UAAM+B,IAAI,GAAGrC,gBAAgB,CAC1BQ,GADU,CAER8B,eAAD,IACG,GAAEzB,iBAAMM,IAAN,CAAWmB,eAAe,CAAC5B,EAAhB,CAAmBiB,QAAnB,EAAX,CAA0C,MAAKd,iBAAM0B,GAAN,CAAUD,eAAe,CAACE,cAA1B,CAA0C,EAHrF,EAKV5B,IALU,CAKL,IALK,CAAb;AAMA,WAAQ,GAAEC,iBAAMC,SAAN,CAAgBR,KAAhB,CAAuB,KAAI+B,IAAK,MAA1C;AACD,GAVD;;AAYA,SAAOpB,gBAAgB,KAAKmB,gBAAgB,EAArC,GAA0ChB,cAAc,EAA/D;AACD","sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG } from '@teambit/legacy/dist/constants';\nimport {\n ApplyVersionResults,\n getMergeStrategy,\n applyVersionReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { MergingMain } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n name = 'merge [values...]';\n shortDescription = 'merge changes of different component versions';\n group = 'development';\n description = `merge changes of different component versions\n \\`bit merge <version> [ids...]\\` => merge changes of the given version into the checked out version\n \\`bit merge [ids...]\\` => EXPERIMENTAL. merge changes of the remote head into local, optionally use '--abort' or '--resolve'\n ${WILDCARD_HELP('merge 0.0.1')}`;\n alias = '';\n options = [\n ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'],\n ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n ] as CommandOptions;\n loader = true;\n\n constructor(private merging: MergingMain) {}\n\n async report(\n [values = []]: [string[]],\n {\n ours = false,\n theirs = false,\n manual = false,\n abort = false,\n resolve = false,\n build = false,\n noSnap = false,\n message,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n abort?: boolean;\n resolve?: boolean;\n build?: boolean;\n noSnap?: boolean;\n message: string;\n }\n ) {\n build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n const {\n components,\n failedComponents,\n version,\n resolvedComponents,\n abortedComponents,\n mergeSnapResults,\n }: ApplyVersionResults = await this.merging.merge(\n values,\n mergeStrategy as any,\n abort,\n resolve,\n noSnap,\n message,\n build\n );\n if (resolvedComponents) {\n const title = 'successfully resolved component(s)\\n';\n const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n if (abortedComponents) {\n const title = 'successfully aborted the merge of the following component(s)\\n';\n const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n\n return mergeReport({\n components,\n failedComponents,\n version,\n mergeSnapResults,\n });\n }\n}\n\nexport function mergeReport({ components, failedComponents, version, mergeSnapResults }: ApplyVersionResults): string {\n const getSuccessOutput = () => {\n if (!components || !components.length) return '';\n // @ts-ignore version is set in case of merge command\n const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n // @ts-ignore components is set in case of merge command\n return chalk.underline(title) + chalk.green(applyVersionReport(components));\n };\n\n const getSnapsOutput = () => {\n if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n const outputComponents = (comps) => {\n return comps\n .map((component) => {\n let componentOutput = ` > ${component.id.toString()}`;\n const autoTag = autoSnappedResults.filter((result) =>\n result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n );\n if (autoTag.length) {\n const autoTagComp = autoTag.map((a) => a.component.id.toString());\n componentOutput += `\\n ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n }\n return componentOutput;\n })\n .join('\\n');\n };\n\n return `\\n${chalk.underline(\n 'merge-snapped components'\n )}\\n(${'components that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n };\n\n const getFailureOutput = () => {\n if (!failedComponents || !failedComponents.length) return '';\n const title = 'the merge has been canceled on the following component(s)';\n const body = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.failureMessage)}`\n )\n .join('\\n');\n return `${chalk.underline(title)}\\n${body}\\n\\n`;\n };\n\n return getSuccessOutput() + getFailureOutput() + getSnapsOutput();\n}\n"]}
package/dist/merging.main.runtime.d.ts CHANGED
@@ -14,6 +14,7 @@ export declare type ComponentStatus = {
14
14
  componentFromModel?: Version;
15
15
  id: BitId;
16
16
  failureMessage?: string;
17
+ unchangedLegitimately?: boolean;
17
18
  mergeResults?: MergeResultsThreeWay | null;
18
19
  };
19
20
  export declare class MergingMain {
package/dist/merging.main.runtime.js CHANGED
@@ -388,7 +388,8 @@ class MergingMain {
388
388
 
389
389
  const failedComponents = allComponentsStatus.filter(componentStatus => componentStatus.failureMessage).map(componentStatus => ({
390
390
  id: componentStatus.id,
391
- failureMessage: componentStatus.failureMessage
391
+ failureMessage: componentStatus.failureMessage,
392
+ unchangedLegitimately: componentStatus.unchangedLegitimately
392
393
  }));
393
394
  const succeededComponents = allComponentsStatus.filter(componentStatus => !componentStatus.failureMessage); // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,
394
395
  // which can be an issue when some components are also dependencies of others
@@ -431,8 +432,9 @@ class MergingMain {
431
432
  id
432
433
  };
433
434
 
434
- const returnFailure = msg => {
435
+ const returnFailure = (msg, unchangedLegitimately = false) => {
435
436
  componentStatus.failureMessage = msg;
437
+ componentStatus.unchangedLegitimately = unchangedLegitimately;
436
438
  return componentStatus;
437
439
  };
438
440
 
@@ -473,7 +475,7 @@ class MergingMain {
473
475
  if (currentlyUsedVersion === version) {
474
476
  // @todo: maybe this check is not needed as we check for diverge later on
475
477
  if (localLane || modelComponent.hasHead()) {
476
- return returnFailure(`component ${id.toStringWithoutVersion()} is already merged`);
478
+ return returnFailure(`component ${id.toStringWithoutVersion()} is already merged`, true);
477
479
  }
478
480
  }
479
481
 
@@ -498,7 +500,7 @@ class MergingMain {
498
500
  if (!divergeData.isDiverged()) {
499
501
  if (divergeData.isLocalAhead()) {
500
502
  // do nothing!
501
- return returnFailure(`component ${component.id.toString()} is ahead, nothing to merge`);
503
+ return returnFailure(`component ${component.id.toString()} is ahead, nothing to merge`, true);
502
504
  }
503
505
 
504
506
  if (divergeData.isRemoteAhead()) {
@@ -512,7 +514,7 @@ class MergingMain {
512
514
  } // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal
513
515
 
514
516
 
515
- return returnFailure(`component ${component.id.toString()} is already merged`);
517
+ return returnFailure(`component ${component.id.toString()} is already merged`, true);
516
518
  }
517
519
 
518
520
  const baseSnap = divergeData.commonSnapBeforeDiverge; // must be set when isTrueMerge
package/dist/merging.main.runtime.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["merging.main.runtime.ts"],"names":["MergingMain","constructor","workspace","snapping","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","ConsumerNotFound","isLegacy","LanesIsDisabled","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","onDestroy","snapMessage","localLaneId","getCurrentLaneId","localLaneObject","getCurrentLaneObject","remoteTrackedLane","scope","lanes","getRemoteTrackedDataByLocalLane","name","isDefault","Error","allComponentsStatus","getAllComponentsStatus","mergeSnaps","remoteName","remoteScope","laneId","localLane","componentWithConflict","find","component","hasConflicts","failedComponents","filter","componentStatus","failureMessage","map","id","succeededComponents","componentsResults","componentFromFS","modelComponent","getModelComponent","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","existingOnWorkspaceOnly","returnFailure","msg","getModelComponentIfExist","GeneralError","toString","unmerged","getEntry","resolved","toStringWithoutVersion","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","existOnCurrentLane","isIdAvailableOnCurrentLane","componentOnLane","loadVersion","componentFromModel","currentlyUsedVersion","hasHead","loadComponent","componentModificationStatus","getComponentStatusById","modified","repo","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","from","otherLaneHead","divergeData","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","otherLabel","currentComponent","currentLabel","filesStatus","unmergedComponent","remote","lane","MergeOptions","ours","files","forEach","file","relative","FileStatus","unchanged","addEntry","remoteId","changeVersion","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","componentMap","origin","COMPONENT_ORIGINS","AUTHORED","dependencies","devDependencies","shouldWritePackageJson","rootDir","packageJsonPath","path","join","getPath","fs","pathExists","shouldInstallNpmPackages","writePackageJson","updated","modifiedStatus","modifiedFiles","originallySharedDir","shouldDependenciesSaveAsComponents","shouldDependenciesSavedAsComponents","dependenciesSavedAsComponents","saveDependenciesAsComponents","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writeAll","manual","unmergedPaths","f","conflict","filePath","addComponent","setHead","markVersionAsLocal","getIdsForUnresolved","results","reset","removeComponent","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","resolveUnmerged","resolvedComponents","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteLaneName","remoteLane","remoteScopeName","remoteLaneId","RemoteLaneId","remoteLanes","remoteLaneIdStr","clear","err","getResolvedComponents","logger","debug","length","r","idsStr","getParsedId","entry","unresolvedComponents","getComponents","u","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"mappings":"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","sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport { LanesIsDisabled } from '@teambit/legacy/dist/consumer/lanes/exceptions/lanes-is-disabled';\nimport {\n ApplyVersionResults,\n MergeStrategy,\n mergeVersion,\n ApplyVersionResult,\n FailedComponents,\n FileStatus,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport fs from 'fs-extra';\nimport mapSeries from 'p-map-series';\nimport path from 'path';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { COMPONENT_ORIGINS } from '@teambit/legacy/dist/constants';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport LaneId, { LocalLaneId, RemoteLaneId } from '@teambit/legacy/dist/lane-id/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport checkoutVersion, { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { TrackLane } from '@teambit/legacy/dist/scope/scope-json';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\nexport type ComponentStatus = {\n componentFromFS?: Component | null;\n componentFromModel?: Version;\n id: BitId;\n failureMessage?: string;\n mergeResults?: MergeResultsThreeWay | null;\n};\n\nexport class MergingMain {\n private consumer: Consumer;\n constructor(private workspace: Workspace, private snapping: SnappingMain) {\n this.consumer = this.workspace?.consumer;\n }\n\n /**\n * merge components according to the \"values\" param.\n * if the first param is a version, then merge the component ids to that version.\n * otherwise, merge from the remote head to the local.\n */\n async merge(\n values: string[],\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noSnap: boolean,\n message: string,\n build: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new ConsumerNotFound();\n const consumer: Consumer = this.workspace.consumer;\n if (consumer.isLegacy && (noSnap || message || abort || resolve)) {\n throw new LanesIsDisabled();\n }\n let mergeResults;\n const firstValue = R.head(values);\n if (resolve) {\n mergeResults = await this.resolveMerge(consumer, values, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(consumer, values);\n } else if (!BitId.isValidVersion(firstValue)) {\n const bitIds = this.getComponentsToMerge(consumer, values);\n // @todo: version could be the lane only or remote/lane\n mergeResults = await this.mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, message, build);\n } else {\n const version = firstValue;\n const ids = R.tail(values);\n const bitIds = this.getComponentsToMerge(consumer, ids);\n mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n }\n await consumer.onDestroy();\n return mergeResults;\n }\n\n /**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: BitId[],\n mergeStrategy: MergeStrategy,\n noSnap: boolean,\n snapMessage: string,\n build: boolean\n ): Promise<ApplyVersionResults> {\n const localLaneId = consumer.getCurrentLaneId();\n const localLaneObject = await consumer.getCurrentLaneObject();\n const remoteTrackedLane = consumer.scope.lanes.getRemoteTrackedDataByLocalLane(localLaneId.name);\n if (!localLaneId.isDefault() && !remoteTrackedLane) {\n throw new Error(`unable to find a remote tracked to the local lane \"${localLaneId.name}\"`);\n }\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n localLaneId,\n localLaneObject,\n remoteTrackedLane\n );\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n remoteName: remoteTrackedLane ? remoteTrackedLane.remoteScope : null,\n laneId: localLaneId,\n localLane: localLaneObject,\n noSnap,\n snapMessage,\n build,\n });\n }\n\n /**\n * merge multiple components according to the \"allComponentsStatus\".\n */\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n remoteName,\n laneId,\n localLane,\n noSnap,\n snapMessage,\n build,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentStatus[];\n remoteName: string | null;\n laneId: LaneId;\n localLane: Lane | null;\n noSnap: boolean;\n snapMessage: string;\n build: boolean;\n }) {\n const consumer = this.workspace.consumer;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.failureMessage)\n .map((componentStatus) => ({ id: componentStatus.id, failureMessage: componentStatus.failureMessage as string }));\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.failureMessage);\n // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n // which can be an issue when some components are also dependencies of others\n const componentsResults = await mapSeries(succeededComponents, async ({ componentFromFS, id, mergeResults }) => {\n const modelComponent = await consumer.scope.getModelComponent(id);\n return this.applyVersion({\n consumer,\n componentFromFS,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n remoteName: remoteName || componentFromFS?.scope || null,\n laneId,\n localLane,\n });\n });\n\n if (localLane) consumer.scope.objects.add(localLane);\n\n await consumer.scope.objects.persist(); // persist anyway, it localLane is null it should save all main heads\n\n await consumer.scope.objects.unmergedComponents.write();\n\n const mergeSnapResults = noSnap ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n return { components: componentsResults, failedComponents, mergeSnapResults };\n }\n\n async getComponentMergeStatus(\n id: BitId,\n localLane: Lane | null,\n otherLaneName: string,\n existingOnWorkspaceOnly = false\n ): Promise<ComponentStatus> {\n const consumer = this.workspace.consumer;\n const componentStatus: ComponentStatus = { id };\n const returnFailure = (msg: string) => {\n componentStatus.failureMessage = msg;\n return componentStatus;\n };\n const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n if (!modelComponent) {\n throw new GeneralError(\n `component ${id.toString()} is on the lane but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n if (unmerged && unmerged.resolved === false) {\n return returnFailure(\n `component ${id.toStringWithoutVersion()} has conflicts that need to be resolved first, please use bit merge --resolve/--abort`\n );\n }\n const version = id.version as string;\n const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n const existOnCurrentLane = existingBitMapId && consumer.bitMap.isIdAvailableOnCurrentLane(existingBitMapId);\n const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n if (!existingBitMapId && existingOnWorkspaceOnly) {\n return returnFailure(`component ${id.toStringWithoutVersion()} is not in the workspace`);\n }\n if (!existingBitMapId || !existOnCurrentLane) {\n return { componentFromFS: null, componentFromModel: componentOnLane, id, mergeResults: null };\n }\n const currentlyUsedVersion = existingBitMapId.version;\n if (currentlyUsedVersion === version) {\n // @todo: maybe this check is not needed as we check for diverge later on\n if (localLane || modelComponent.hasHead()) {\n return returnFailure(`component ${id.toStringWithoutVersion()} is already merged`);\n }\n }\n const component = await consumer.loadComponent(existingBitMapId);\n const componentModificationStatus = await consumer.getComponentStatusById(component.id);\n if (componentModificationStatus.modified) {\n throw new GeneralError(\n `unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`\n );\n }\n const repo = consumer.scope.objects;\n const laneHeadIsDifferentThanCheckedOut =\n localLane && currentlyUsedVersion && modelComponent.laneHeadLocal?.toString() !== currentlyUsedVersion;\n const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(currentlyUsedVersion) : null;\n\n const otherLaneHead = modelComponent.getRef(version);\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, localHead);\n if (!divergeData.isDiverged()) {\n if (divergeData.isLocalAhead()) {\n // do nothing!\n return returnFailure(`component ${component.id.toString()} is ahead, nothing to merge`);\n }\n if (divergeData.isRemoteAhead()) {\n // just override with the model data\n return {\n componentFromFS: component,\n componentFromModel: componentOnLane,\n id,\n mergeResults: null,\n };\n }\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return returnFailure(`component ${component.id.toString()} is already merged`);\n }\n const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n const mergeResults = await threeWayMerge({\n consumer,\n otherComponent,\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n currentComponent: component,\n currentLabel: `${currentlyUsedVersion} (local)`,\n baseComponent,\n });\n return { componentFromFS: component, id, mergeResults };\n }\n\n private async applyVersion({\n consumer,\n componentFromFS,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n remoteName,\n laneId,\n localLane,\n }: {\n consumer: Consumer;\n componentFromFS: Component | null | undefined;\n id: BitId;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n remoteName: string | null;\n laneId: LaneId;\n localLane: Lane | null;\n }): Promise<ApplyVersionResult> {\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n // @ts-ignore\n id: { name: id.name, scope: id.scope },\n // @ts-ignore\n head: remoteHead,\n // @ts-ignore\n remote: remoteName,\n lane: laneId.name,\n resolved: false, // could be changed later\n };\n id = componentFromFS ? componentFromFS.id : id;\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n componentFromFS.files.forEach((file) => {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n unmergedComponent.resolved = true;\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n\n return { id, filesStatus };\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n const componentMap = componentFromFS && componentFromFS.componentMap;\n if (componentFromFS && !componentMap) throw new GeneralError('applyVersion: componentMap was not found');\n if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED && !id.scope) {\n componentWithDependencies.dependencies = [];\n componentWithDependencies.devDependencies = [];\n }\n const shouldWritePackageJson = async (): Promise<boolean> => {\n if (!componentMap) return true;\n const rootDir = componentMap && componentMap.rootDir;\n if (!rootDir) return false;\n const packageJsonPath = path.join(consumer.getPath(), rootDir, 'package.json');\n return fs.pathExists(packageJsonPath);\n };\n const shouldInstallNpmPackages = (): boolean => {\n if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED) return false;\n return true;\n };\n const writePackageJson = await shouldWritePackageJson();\n\n const files = componentWithDependencies.component.files;\n files.forEach((file) => {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n });\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(\n files,\n mergeResults,\n mergeStrategy,\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n componentWithDependencies.component.originallySharedDir\n );\n componentWithDependencies.component.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n const shouldDependenciesSaveAsComponents = await consumer.shouldDependenciesSavedAsComponents([id]);\n componentWithDependencies.component.dependenciesSavedAsComponents =\n shouldDependenciesSaveAsComponents[0].saveDependenciesAsComponents;\n\n const manyComponentsWriter = new ManyComponentsWriter({\n consumer,\n componentsWithDependencies: [componentWithDependencies],\n installNpmPackages: shouldInstallNpmPackages(),\n override: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n verbose: false, // @todo: do we need a flag here?\n writeDists: true, // @todo: do we need a flag here?\n writePackageJson,\n });\n await manyComponentsWriter.writeAll();\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.resolved = false;\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n } else {\n unmergedComponent.resolved = true;\n }\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (localLane) {\n localLane.addComponent({ id, head: remoteHead });\n } else {\n // this is main\n const modelComponent = await consumer.scope.getModelComponent(id);\n if (!consumer.isLegacy) {\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n }\n consumer.scope.objects.add(modelComponent);\n }\n\n return { id, filesStatus };\n }\n\n private async abortMerge(consumer: Consumer, values: string[]): Promise<ApplyVersionResults> {\n const ids = this.getIdsForUnresolved(consumer, values);\n // @ts-ignore not clear yet what to do with other flags\n const results = await checkoutVersion(consumer, { ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.name));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(\n consumer: Consumer,\n values: string[],\n snapMessage: string,\n build: boolean\n ): Promise<ApplyVersionResults> {\n const ids = this.getIdsForUnresolved(consumer, values);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: BitIds.fromArray(ids),\n resolveUnmerged: true,\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: BitId[],\n localLaneId: LocalLaneId,\n localLaneObject: Lane | null,\n remoteTrackedLane?: TrackLane\n ): Promise<ComponentStatus[]> {\n const tmp = new Tmp(this.consumer.scope);\n try {\n const componentsStatus = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteLaneName = remoteTrackedLane ? remoteTrackedLane.remoteLane : localLaneId.name;\n const remoteScopeName = remoteTrackedLane ? remoteTrackedLane.remoteScope : bitId.scope;\n const remoteLaneId = RemoteLaneId.from(remoteLaneName, remoteScopeName as string);\n const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const remoteLaneIdStr = remoteLaneId.toString();\n if (!remoteHead)\n throw new GeneralError(\n `unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${remoteLaneIdStr}\"`\n );\n return this.getComponentMergeStatus(\n bitId.changeVersion(remoteHead.toString()),\n localLaneObject,\n remoteLaneIdStr\n );\n })\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n }\n\n private async snapResolvedComponents(\n consumer: Consumer,\n snapMessage: string,\n build: boolean\n ): Promise<null | { snappedComponents: Component[]; autoSnappedResults: AutoTagResult[] }> {\n const resolvedComponents = consumer.scope.objects.unmergedComponents.getResolvedComponents();\n logger.debug(`merge-snaps, snapResolvedComponents, total ${resolvedComponents.length.toString()} components`);\n if (!resolvedComponents.length) return null;\n const ids = BitIds.fromArray(resolvedComponents.map((r) => new BitId(r.id)));\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private getIdsForUnresolved(consumer: Consumer, idsStr?: string[]): BitId[] {\n if (idsStr && idsStr.length) {\n const bitIds = idsStr.map((id) => consumer.getParsedId(id));\n bitIds.forEach((id) => {\n const entry = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n if (!entry) {\n throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return bitIds;\n }\n const unresolvedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => new BitId(u.id));\n }\n\n private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n if (hasWildcard(ids)) {\n const componentsList = new ComponentsList(consumer);\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect];\n static runtime = MainRuntime;\n static async provider([cli, workspace, snapping]: [CLIMain, Workspace, SnappingMain]) {\n const merging = new MergingMain(workspace, snapping);\n cli.register(new MergeCmd(merging));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"]}
1
+ {"version":3,"sources":["merging.main.runtime.ts"],"names":["MergingMain","constructor","workspace","snapping","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","ConsumerNotFound","isLegacy","LanesIsDisabled","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","onDestroy","snapMessage","localLaneId","getCurrentLaneId","localLaneObject","getCurrentLaneObject","remoteTrackedLane","scope","lanes","getRemoteTrackedDataByLocalLane","name","isDefault","Error","allComponentsStatus","getAllComponentsStatus","mergeSnaps","remoteName","remoteScope","laneId","localLane","componentWithConflict","find","component","hasConflicts","failedComponents","filter","componentStatus","failureMessage","map","id","unchangedLegitimately","succeededComponents","componentsResults","componentFromFS","modelComponent","getModelComponent","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","existingOnWorkspaceOnly","returnFailure","msg","getModelComponentIfExist","GeneralError","toString","unmerged","getEntry","resolved","toStringWithoutVersion","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","existOnCurrentLane","isIdAvailableOnCurrentLane","componentOnLane","loadVersion","componentFromModel","currentlyUsedVersion","hasHead","loadComponent","componentModificationStatus","getComponentStatusById","modified","repo","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","from","otherLaneHead","divergeData","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","otherLabel","currentComponent","currentLabel","filesStatus","unmergedComponent","remote","lane","MergeOptions","ours","files","forEach","file","relative","FileStatus","unchanged","addEntry","remoteId","changeVersion","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","componentMap","origin","COMPONENT_ORIGINS","AUTHORED","dependencies","devDependencies","shouldWritePackageJson","rootDir","packageJsonPath","path","join","getPath","fs","pathExists","shouldInstallNpmPackages","writePackageJson","updated","modifiedStatus","modifiedFiles","originallySharedDir","shouldDependenciesSaveAsComponents","shouldDependenciesSavedAsComponents","dependenciesSavedAsComponents","saveDependenciesAsComponents","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writeAll","manual","unmergedPaths","f","conflict","filePath","addComponent","setHead","markVersionAsLocal","getIdsForUnresolved","results","reset","removeComponent","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","resolveUnmerged","resolvedComponents","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteLaneName","remoteLane","remoteScopeName","remoteLaneId","RemoteLaneId","remoteLanes","remoteLaneIdStr","clear","err","getResolvedComponents","logger","debug","length","r","idsStr","getParsedId","entry","unresolvedComponents","getComponents","u","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"mappings":"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","sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport { LanesIsDisabled } from '@teambit/legacy/dist/consumer/lanes/exceptions/lanes-is-disabled';\nimport {\n ApplyVersionResults,\n MergeStrategy,\n mergeVersion,\n ApplyVersionResult,\n FailedComponents,\n FileStatus,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport fs from 'fs-extra';\nimport mapSeries from 'p-map-series';\nimport path from 'path';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { COMPONENT_ORIGINS } from '@teambit/legacy/dist/constants';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport LaneId, { LocalLaneId, RemoteLaneId } from '@teambit/legacy/dist/lane-id/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport checkoutVersion, { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { TrackLane } from '@teambit/legacy/dist/scope/scope-json';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\nexport type ComponentStatus = {\n componentFromFS?: Component | null;\n componentFromModel?: Version;\n id: BitId;\n failureMessage?: string;\n unchangedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n mergeResults?: MergeResultsThreeWay | null;\n};\n\nexport class MergingMain {\n private consumer: Consumer;\n constructor(private workspace: Workspace, private snapping: SnappingMain) {\n this.consumer = this.workspace?.consumer;\n }\n\n /**\n * merge components according to the \"values\" param.\n * if the first param is a version, then merge the component ids to that version.\n * otherwise, merge from the remote head to the local.\n */\n async merge(\n values: string[],\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noSnap: boolean,\n message: string,\n build: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new ConsumerNotFound();\n const consumer: Consumer = this.workspace.consumer;\n if (consumer.isLegacy && (noSnap || message || abort || resolve)) {\n throw new LanesIsDisabled();\n }\n let mergeResults;\n const firstValue = R.head(values);\n if (resolve) {\n mergeResults = await this.resolveMerge(consumer, values, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(consumer, values);\n } else if (!BitId.isValidVersion(firstValue)) {\n const bitIds = this.getComponentsToMerge(consumer, values);\n // @todo: version could be the lane only or remote/lane\n mergeResults = await this.mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, message, build);\n } else {\n const version = firstValue;\n const ids = R.tail(values);\n const bitIds = this.getComponentsToMerge(consumer, ids);\n mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n }\n await consumer.onDestroy();\n return mergeResults;\n }\n\n /**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: BitId[],\n mergeStrategy: MergeStrategy,\n noSnap: boolean,\n snapMessage: string,\n build: boolean\n ): Promise<ApplyVersionResults> {\n const localLaneId = consumer.getCurrentLaneId();\n const localLaneObject = await consumer.getCurrentLaneObject();\n const remoteTrackedLane = consumer.scope.lanes.getRemoteTrackedDataByLocalLane(localLaneId.name);\n if (!localLaneId.isDefault() && !remoteTrackedLane) {\n throw new Error(`unable to find a remote tracked to the local lane \"${localLaneId.name}\"`);\n }\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n localLaneId,\n localLaneObject,\n remoteTrackedLane\n );\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n remoteName: remoteTrackedLane ? remoteTrackedLane.remoteScope : null,\n laneId: localLaneId,\n localLane: localLaneObject,\n noSnap,\n snapMessage,\n build,\n });\n }\n\n /**\n * merge multiple components according to the \"allComponentsStatus\".\n */\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n remoteName,\n laneId,\n localLane,\n noSnap,\n snapMessage,\n build,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentStatus[];\n remoteName: string | null;\n laneId: LaneId;\n localLane: Lane | null;\n noSnap: boolean;\n snapMessage: string;\n build: boolean;\n }) {\n const consumer = this.workspace.consumer;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.failureMessage)\n .map((componentStatus) => ({\n id: componentStatus.id,\n failureMessage: componentStatus.failureMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.failureMessage);\n // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n // which can be an issue when some components are also dependencies of others\n const componentsResults = await mapSeries(succeededComponents, async ({ componentFromFS, id, mergeResults }) => {\n const modelComponent = await consumer.scope.getModelComponent(id);\n return this.applyVersion({\n consumer,\n componentFromFS,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n remoteName: remoteName || componentFromFS?.scope || null,\n laneId,\n localLane,\n });\n });\n\n if (localLane) consumer.scope.objects.add(localLane);\n\n await consumer.scope.objects.persist(); // persist anyway, it localLane is null it should save all main heads\n\n await consumer.scope.objects.unmergedComponents.write();\n\n const mergeSnapResults = noSnap ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n return { components: componentsResults, failedComponents, mergeSnapResults };\n }\n\n async getComponentMergeStatus(\n id: BitId,\n localLane: Lane | null,\n otherLaneName: string,\n existingOnWorkspaceOnly = false\n ): Promise<ComponentStatus> {\n const consumer = this.workspace.consumer;\n const componentStatus: ComponentStatus = { id };\n const returnFailure = (msg: string, unchangedLegitimately = false) => {\n componentStatus.failureMessage = msg;\n componentStatus.unchangedLegitimately = unchangedLegitimately;\n return componentStatus;\n };\n const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n if (!modelComponent) {\n throw new GeneralError(\n `component ${id.toString()} is on the lane but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n if (unmerged && unmerged.resolved === false) {\n return returnFailure(\n `component ${id.toStringWithoutVersion()} has conflicts that need to be resolved first, please use bit merge --resolve/--abort`\n );\n }\n const version = id.version as string;\n const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n const existOnCurrentLane = existingBitMapId && consumer.bitMap.isIdAvailableOnCurrentLane(existingBitMapId);\n const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n if (!existingBitMapId && existingOnWorkspaceOnly) {\n return returnFailure(`component ${id.toStringWithoutVersion()} is not in the workspace`);\n }\n if (!existingBitMapId || !existOnCurrentLane) {\n return { componentFromFS: null, componentFromModel: componentOnLane, id, mergeResults: null };\n }\n const currentlyUsedVersion = existingBitMapId.version;\n if (currentlyUsedVersion === version) {\n // @todo: maybe this check is not needed as we check for diverge later on\n if (localLane || modelComponent.hasHead()) {\n return returnFailure(`component ${id.toStringWithoutVersion()} is already merged`, true);\n }\n }\n const component = await consumer.loadComponent(existingBitMapId);\n const componentModificationStatus = await consumer.getComponentStatusById(component.id);\n if (componentModificationStatus.modified) {\n throw new GeneralError(\n `unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`\n );\n }\n const repo = consumer.scope.objects;\n const laneHeadIsDifferentThanCheckedOut =\n localLane && currentlyUsedVersion && modelComponent.laneHeadLocal?.toString() !== currentlyUsedVersion;\n const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(currentlyUsedVersion) : null;\n\n const otherLaneHead = modelComponent.getRef(version);\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, localHead);\n if (!divergeData.isDiverged()) {\n if (divergeData.isLocalAhead()) {\n // do nothing!\n return returnFailure(`component ${component.id.toString()} is ahead, nothing to merge`, true);\n }\n if (divergeData.isRemoteAhead()) {\n // just override with the model data\n return {\n componentFromFS: component,\n componentFromModel: componentOnLane,\n id,\n mergeResults: null,\n };\n }\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return returnFailure(`component ${component.id.toString()} is already merged`, true);\n }\n const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n const mergeResults = await threeWayMerge({\n consumer,\n otherComponent,\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n currentComponent: component,\n currentLabel: `${currentlyUsedVersion} (local)`,\n baseComponent,\n });\n return { componentFromFS: component, id, mergeResults };\n }\n\n private async applyVersion({\n consumer,\n componentFromFS,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n remoteName,\n laneId,\n localLane,\n }: {\n consumer: Consumer;\n componentFromFS: Component | null | undefined;\n id: BitId;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n remoteName: string | null;\n laneId: LaneId;\n localLane: Lane | null;\n }): Promise<ApplyVersionResult> {\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n // @ts-ignore\n id: { name: id.name, scope: id.scope },\n // @ts-ignore\n head: remoteHead,\n // @ts-ignore\n remote: remoteName,\n lane: laneId.name,\n resolved: false, // could be changed later\n };\n id = componentFromFS ? componentFromFS.id : id;\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n componentFromFS.files.forEach((file) => {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n unmergedComponent.resolved = true;\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n\n return { id, filesStatus };\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n const componentMap = componentFromFS && componentFromFS.componentMap;\n if (componentFromFS && !componentMap) throw new GeneralError('applyVersion: componentMap was not found');\n if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED && !id.scope) {\n componentWithDependencies.dependencies = [];\n componentWithDependencies.devDependencies = [];\n }\n const shouldWritePackageJson = async (): Promise<boolean> => {\n if (!componentMap) return true;\n const rootDir = componentMap && componentMap.rootDir;\n if (!rootDir) return false;\n const packageJsonPath = path.join(consumer.getPath(), rootDir, 'package.json');\n return fs.pathExists(packageJsonPath);\n };\n const shouldInstallNpmPackages = (): boolean => {\n if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED) return false;\n return true;\n };\n const writePackageJson = await shouldWritePackageJson();\n\n const files = componentWithDependencies.component.files;\n files.forEach((file) => {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n });\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(\n files,\n mergeResults,\n mergeStrategy,\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n componentWithDependencies.component.originallySharedDir\n );\n componentWithDependencies.component.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n const shouldDependenciesSaveAsComponents = await consumer.shouldDependenciesSavedAsComponents([id]);\n componentWithDependencies.component.dependenciesSavedAsComponents =\n shouldDependenciesSaveAsComponents[0].saveDependenciesAsComponents;\n\n const manyComponentsWriter = new ManyComponentsWriter({\n consumer,\n componentsWithDependencies: [componentWithDependencies],\n installNpmPackages: shouldInstallNpmPackages(),\n override: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n verbose: false, // @todo: do we need a flag here?\n writeDists: true, // @todo: do we need a flag here?\n writePackageJson,\n });\n await manyComponentsWriter.writeAll();\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.resolved = false;\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n } else {\n unmergedComponent.resolved = true;\n }\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (localLane) {\n localLane.addComponent({ id, head: remoteHead });\n } else {\n // this is main\n const modelComponent = await consumer.scope.getModelComponent(id);\n if (!consumer.isLegacy) {\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n }\n consumer.scope.objects.add(modelComponent);\n }\n\n return { id, filesStatus };\n }\n\n private async abortMerge(consumer: Consumer, values: string[]): Promise<ApplyVersionResults> {\n const ids = this.getIdsForUnresolved(consumer, values);\n // @ts-ignore not clear yet what to do with other flags\n const results = await checkoutVersion(consumer, { ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.name));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(\n consumer: Consumer,\n values: string[],\n snapMessage: string,\n build: boolean\n ): Promise<ApplyVersionResults> {\n const ids = this.getIdsForUnresolved(consumer, values);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: BitIds.fromArray(ids),\n resolveUnmerged: true,\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: BitId[],\n localLaneId: LocalLaneId,\n localLaneObject: Lane | null,\n remoteTrackedLane?: TrackLane\n ): Promise<ComponentStatus[]> {\n const tmp = new Tmp(this.consumer.scope);\n try {\n const componentsStatus = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteLaneName = remoteTrackedLane ? remoteTrackedLane.remoteLane : localLaneId.name;\n const remoteScopeName = remoteTrackedLane ? remoteTrackedLane.remoteScope : bitId.scope;\n const remoteLaneId = RemoteLaneId.from(remoteLaneName, remoteScopeName as string);\n const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const remoteLaneIdStr = remoteLaneId.toString();\n if (!remoteHead)\n throw new GeneralError(\n `unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${remoteLaneIdStr}\"`\n );\n return this.getComponentMergeStatus(\n bitId.changeVersion(remoteHead.toString()),\n localLaneObject,\n remoteLaneIdStr\n );\n })\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n }\n\n private async snapResolvedComponents(\n consumer: Consumer,\n snapMessage: string,\n build: boolean\n ): Promise<null | { snappedComponents: Component[]; autoSnappedResults: AutoTagResult[] }> {\n const resolvedComponents = consumer.scope.objects.unmergedComponents.getResolvedComponents();\n logger.debug(`merge-snaps, snapResolvedComponents, total ${resolvedComponents.length.toString()} components`);\n if (!resolvedComponents.length) return null;\n const ids = BitIds.fromArray(resolvedComponents.map((r) => new BitId(r.id)));\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private getIdsForUnresolved(consumer: Consumer, idsStr?: string[]): BitId[] {\n if (idsStr && idsStr.length) {\n const bitIds = idsStr.map((id) => consumer.getParsedId(id));\n bitIds.forEach((id) => {\n const entry = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n if (!entry) {\n throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return bitIds;\n }\n const unresolvedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => new BitId(u.id));\n }\n\n private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n if (hasWildcard(ids)) {\n const componentsList = new ComponentsList(consumer);\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect];\n static runtime = MainRuntime;\n static async provider([cli, workspace, snapping]: [CLIMain, Workspace, SnappingMain]) {\n const merging = new MergingMain(workspace, snapping);\n cli.register(new MergeCmd(merging));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"]}
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "0.0.31",
3
+ "version": "0.0.34",
4
4
  "homepage": "https://bit.dev/teambit/component/merging",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.component",
8
8
  "name": "merging",
9
- "version": "0.0.31"
9
+ "version": "0.0.34"
10
10
  },
11
11
  "dependencies": {
12
- "chalk": "2.4.2",
12
+ "chalk": "4.1.2",
13
13
  "fs-extra": "10.0.0",
14
14
  "p-map-series": "2.1.0",
15
15
  "ramda": "0.27.1",
@@ -17,9 +17,9 @@
17
17
  "core-js": "^3.0.0",
18
18
  "@teambit/harmony": "0.3.3",
19
19
  "@teambit/bit-error": "0.0.394",
20
- "@teambit/cli": "0.0.476",
21
- "@teambit/snapping": "0.0.31",
22
- "@teambit/workspace": "0.0.716"
20
+ "@teambit/cli": "0.0.478",
21
+ "@teambit/snapping": "0.0.34",
22
+ "@teambit/workspace": "0.0.719"
23
23
  },
24
24
  "devDependencies": {
25
25
  "@types/fs-extra": "9.0.7",
@@ -31,7 +31,7 @@
31
31
  "@types/node": "12.20.4"
32
32
  },
33
33
  "peerDependencies": {
34
- "@teambit/legacy": "1.0.256",
34
+ "@teambit/legacy": "1.0.258",
35
35
  "react-dom": "^16.8.0 || ^17.0.0",
36
36
  "react": "^16.8.0 || ^17.0.0"
37
37
  },
@@ -59,7 +59,7 @@
59
59
  "react": "-"
60
60
  },
61
61
  "peerDependencies": {
62
- "@teambit/legacy": "1.0.256",
62
+ "@teambit/legacy": "1.0.258",
63
63
  "react-dom": "^16.8.0 || ^17.0.0",
64
64
  "react": "^16.8.0 || ^17.0.0"
65
65
  }