@teambit/stash 1.0.486 → 1.0.488

package/artifacts/__bit_junit.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="0" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.component/stash@1.0.486" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.component/stash@1.0.488" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/artifacts/schema.json

@@ -1236,7 +1236,7 @@
   "componentId": {
     "scope": "teambit.component",
     "name": "stash",
-    "version": "1.0.486"
+    "version": "1.0.488"
   },
   "taggedModuleExports": []
 }

package/dist/stash.cmd.js

@@ -11,9 +11,9 @@ function _chalk() {
   };
   return data;
 }
-function _constants() {
-  const data = require("@teambit/legacy/dist/constants");
-  _constants = function () {
+function _legacy() {
+  const data = require("@teambit/legacy.constants");
+  _legacy = function () {
     return data;
   };
   return data;
@@ -36,7 +36,7 @@ class StashSaveCmd {
     _defineProperty(this, "alias", 's');
     _defineProperty(this, "description", 'stash modified components');
     _defineProperty(this, "group", 'development');
-    _defineProperty(this, "options", [['p', 'pattern', _constants().COMPONENT_PATTERN_HELP], ['', 'include-new', 'EXPERIMENTAL. by default, only modified components are stashed. use this flag to include new components'], ['m', 'message <string>', 'message to be attached to the stashed components']]);
+    _defineProperty(this, "options", [['p', 'pattern', _legacy().COMPONENT_PATTERN_HELP], ['', 'include-new', 'EXPERIMENTAL. by default, only modified components are stashed. use this flag to include new components'], ['m', 'message <string>', 'message to be attached to the stashed components']]);
     _defineProperty(this, "loader", true);
   }
   async report(_arg, {
@@ -107,7 +107,7 @@ class StashCmd {
     _defineProperty(this, "name", 'stash <sub-command>');
     _defineProperty(this, "description", 'stash modified components');
     _defineProperty(this, "group", 'development');
-    _defineProperty(this, "options", [['p', 'pattern', _constants().COMPONENT_PATTERN_HELP], ['m', 'message <string>', 'message to be attached to the stashed components']]);
+    _defineProperty(this, "options", [['p', 'pattern', _legacy().COMPONENT_PATTERN_HELP], ['m', 'message <string>', 'message to be attached to the stashed components']]);
     _defineProperty(this, "loader", true);
     _defineProperty(this, "commands", []);
   }

package/dist/stash.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_constants","_bitError","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","StashSaveCmd","constructor","stash","COMPONENT_PATTERN_HELP","report","_arg","pattern","message","includeNew","compIds","save","chalk","green","length","exports","StashListCmd","list","map","listItem","id","components","join","StashLoadCmd","stashId","autoMergeResolve","forceOurs","forceTheirs","manual","BitError","checkoutProps","mergeStrategy","loadLatest","StashCmd","unrecognizedSubcommand","red"],"sources":["stash.cmd.ts"],"sourcesContent":["// eslint-disable-next-line max-classes-per-file\nimport chalk from 'chalk';\nimport { MergeStrategy } from '@teambit/merging';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { CheckoutProps } from '@teambit/checkout';\nimport { COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { StashMain } from './stash.main.runtime';\n\nexport class StashSaveCmd implements Command {\n  name = 'save';\n  alias = 's';\n  description = 'stash modified components';\n  group = 'development';\n  options = [\n    ['p', 'pattern', COMPONENT_PATTERN_HELP],\n    [\n      '',\n      'include-new',\n      'EXPERIMENTAL. by default, only modified components are stashed. use this flag to include new components',\n    ],\n    ['m', 'message <string>', 'message to be attached to the stashed components'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private stash: StashMain) {}\n\n  async report(\n    _arg: any,\n    {\n      pattern,\n      message,\n      includeNew,\n    }: {\n      pattern?: string;\n      message?: string;\n      includeNew?: boolean;\n    }\n  ) {\n    const compIds = await this.stash.save({ pattern, message, includeNew });\n    return chalk.green(`stashed ${compIds.length} components`);\n  }\n}\n\nexport class StashListCmd implements Command {\n  name = 'list';\n  description = 'list stash';\n  group = 'development';\n  options = [] as CommandOptions;\n  loader = true;\n\n  constructor(private stash: StashMain) {}\n\n  async report() {\n    const list = await this.stash.list();\n    return list\n      .map((listItem) => `${listItem.id} (${listItem.components.length} components) ${listItem.message || ''}`)\n      .join('\\n');\n  }\n}\n\ntype StashLoadOpts = {\n  autoMergeResolve?: MergeStrategy;\n  manual?: boolean;\n  forceOurs?: boolean;\n  forceTheirs?: boolean;\n};\n\nexport class StashLoadCmd implements Command {\n  name = 'load [stash-id]';\n  alias = 'pop';\n  description = 'apply the changes according to the stash. if no stash-id provided, it loads the latest stash';\n  group = 'development';\n  options = [\n    [\n      'r',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    ['', 'force-ours', 'do not merge, preserve local files as is'],\n    ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private stash: StashMain) {}\n\n  async report([stashId]: [string], { autoMergeResolve, forceOurs, forceTheirs, manual }: StashLoadOpts) {\n    if (forceOurs && forceTheirs) {\n      throw new BitError('please use either --force-ours or --force-theirs, not both');\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n\n    const checkoutProps: CheckoutProps = {\n      mergeStrategy: autoMergeResolve,\n      forceOurs,\n      forceTheirs,\n    };\n    const compIds = await this.stash.loadLatest(checkoutProps, stashId);\n    return chalk.green(`checked out ${compIds.length} components according to the latest stash`);\n  }\n}\n\nexport class StashCmd implements Command {\n  name = 'stash <sub-command>';\n  description = 'stash modified components';\n  group = 'development';\n  options = [\n    ['p', 'pattern', COMPONENT_PATTERN_HELP],\n    ['m', 'message <string>', 'message to be attached to the stashed components'],\n  ] as CommandOptions;\n  loader = true;\n  commands: Command[] = [];\n\n  constructor(private stash: StashMain) {}\n\n  async report([unrecognizedSubcommand]: [string]) {\n    return chalk.red(\n      `\"${unrecognizedSubcommand}\" is not a subcommand of \"stash\", please run \"bit stash --help\" to list the subcommands`\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_legacy","_bitError","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","StashSaveCmd","constructor","stash","COMPONENT_PATTERN_HELP","report","_arg","pattern","message","includeNew","compIds","save","chalk","green","length","exports","StashListCmd","list","map","listItem","id","components","join","StashLoadCmd","stashId","autoMergeResolve","forceOurs","forceTheirs","manual","BitError","checkoutProps","mergeStrategy","loadLatest","StashCmd","unrecognizedSubcommand","red"],"sources":["stash.cmd.ts"],"sourcesContent":["// eslint-disable-next-line max-classes-per-file\nimport chalk from 'chalk';\nimport { MergeStrategy } from '@teambit/merging';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { CheckoutProps } from '@teambit/checkout';\nimport { COMPONENT_PATTERN_HELP } from '@teambit/legacy.constants';\nimport { BitError } from '@teambit/bit-error';\nimport { StashMain } from './stash.main.runtime';\n\nexport class StashSaveCmd implements Command {\n  name = 'save';\n  alias = 's';\n  description = 'stash modified components';\n  group = 'development';\n  options = [\n    ['p', 'pattern', COMPONENT_PATTERN_HELP],\n    [\n      '',\n      'include-new',\n      'EXPERIMENTAL. by default, only modified components are stashed. use this flag to include new components',\n    ],\n    ['m', 'message <string>', 'message to be attached to the stashed components'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private stash: StashMain) {}\n\n  async report(\n    _arg: any,\n    {\n      pattern,\n      message,\n      includeNew,\n    }: {\n      pattern?: string;\n      message?: string;\n      includeNew?: boolean;\n    }\n  ) {\n    const compIds = await this.stash.save({ pattern, message, includeNew });\n    return chalk.green(`stashed ${compIds.length} components`);\n  }\n}\n\nexport class StashListCmd implements Command {\n  name = 'list';\n  description = 'list stash';\n  group = 'development';\n  options = [] as CommandOptions;\n  loader = true;\n\n  constructor(private stash: StashMain) {}\n\n  async report() {\n    const list = await this.stash.list();\n    return list\n      .map((listItem) => `${listItem.id} (${listItem.components.length} components) ${listItem.message || ''}`)\n      .join('\\n');\n  }\n}\n\ntype StashLoadOpts = {\n  autoMergeResolve?: MergeStrategy;\n  manual?: boolean;\n  forceOurs?: boolean;\n  forceTheirs?: boolean;\n};\n\nexport class StashLoadCmd implements Command {\n  name = 'load [stash-id]';\n  alias = 'pop';\n  description = 'apply the changes according to the stash. if no stash-id provided, it loads the latest stash';\n  group = 'development';\n  options = [\n    [\n      'r',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    ['', 'force-ours', 'do not merge, preserve local files as is'],\n    ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private stash: StashMain) {}\n\n  async report([stashId]: [string], { autoMergeResolve, forceOurs, forceTheirs, manual }: StashLoadOpts) {\n    if (forceOurs && forceTheirs) {\n      throw new BitError('please use either --force-ours or --force-theirs, not both');\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n\n    const checkoutProps: CheckoutProps = {\n      mergeStrategy: autoMergeResolve,\n      forceOurs,\n      forceTheirs,\n    };\n    const compIds = await this.stash.loadLatest(checkoutProps, stashId);\n    return chalk.green(`checked out ${compIds.length} components according to the latest stash`);\n  }\n}\n\nexport class StashCmd implements Command {\n  name = 'stash <sub-command>';\n  description = 'stash modified components';\n  group = 'development';\n  options = [\n    ['p', 'pattern', COMPONENT_PATTERN_HELP],\n    ['m', 'message <string>', 'message to be attached to the stashed components'],\n  ] as CommandOptions;\n  loader = true;\n  commands: Command[] = [];\n\n  constructor(private stash: StashMain) {}\n\n  async report([unrecognizedSubcommand]: [string]) {\n    return chalk.red(\n      `\"${unrecognizedSubcommand}\" is not a subcommand of \"stash\", please run \"bit stash --help\" to list the subcommands`\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/stash.main.runtime.js

@@ -39,9 +39,9 @@ function _cli() {
   };
   return data;
 }
-function _objects() {
-  const data = require("@teambit/legacy/dist/scope/objects");
-  _objects = function () {
+function _scope() {
+  const data = require("@teambit/scope.objects");
+  _scope = function () {
     return data;
   };
   return data;
@@ -209,7 +209,7 @@ class StashMain {
       // set the parent, we need it for the "stash-load" to function as the "base" version for the three-way-merge.
       const modelComponent = consumerComponent.modelComponent;
       if (!modelComponent) throw new Error(`unable to find ModelComponent for ${consumerComponent.id.toString()}`);
-      const parent = _objects().Ref.from(previousVersion);
+      const parent = _scope().Ref.from(previousVersion);
       version.addAsOnlyParent(parent);
     }
     const repo = this.workspace.scope.legacyScope.objects;

package/dist/stash.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_workspace","data","require","_snapping","_bitError","_lodash","_cli","_objects","_checkout","_stash","_stash2","_stashData","_stashFiles","_harmonyModules","_remove","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","StashMain","constructor","workspace","checkout","snapping","remove","stashFiles","StashFiles","save","options","compIds","pattern","idsByPattern","listIds","comps","getMany","newComps","modifiedComps","compact","Promise","all","map","comp","head","includeNew","undefined","isModified","allComps","consumeComponents","state","_consumer","_addFlattenedDependenciesToComponents","hashPerId","versionObj","addComponentDataToRepo","id","hash","toString","bitmapEntry","bitMap","getBitmapEntry","toPlainObject","isNew","hasVersion","scope","legacyScope","objects","persist","stashData","StashData","message","saveStashData","modifiedCompIds","c","ids","skipNpmInstall","reset","newCompIds","removeLocallyByIds","list","getStashFiles","file","getStashData","replace","metadata","components","stashCompsData","loadLatest","checkoutProps","stashId","stashFile","getLatestStashFile","BitError","stashModifiedCompsData","stashNewCompsData","versionPerId","changeVersion","stashedBitmapEntries","s","skipUpdatingBitmap","promptMergeOptions","loadStash","deleteStashFile","component","previousVersion","getSnapHash","consumerComponent","clone","setNewVersion","log","getBasicLog","version","files","sources","consumerComponentToVersion","modelComponent","Error","parent","Ref","from","addAsOnlyParent","repo","add","provider","cli","stashMain","stashCmd","StashCmd","commands","StashSaveCmd","StashLoadCmd","StashListCmd","register","exports","CLIAspect","WorkspaceAspect","CheckoutAspect","SnappingAspect","RemoveAspect","MainRuntime","StashAspect","addRuntime","_default","default"],"sources":["stash.main.runtime.ts"],"sourcesContent":["import { WorkspaceAspect, Workspace } from '@teambit/workspace';\nimport { SnappingAspect, SnappingMain } from '@teambit/snapping';\nimport { Component, ComponentID } from '@teambit/component';\nimport { BitError } from '@teambit/bit-error';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { compact } from 'lodash';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { CheckoutAspect, CheckoutMain, CheckoutProps } from '@teambit/checkout';\nimport { StashAspect } from './stash.aspect';\nimport { StashCmd, StashListCmd, StashLoadCmd, StashSaveCmd } from './stash.cmd';\nimport { StashData } from './stash-data';\nimport { StashFiles } from './stash-files';\nimport { getBasicLog } from '@teambit/harmony.modules.get-basic-log';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\n\ntype ListResult = {\n  id: string;\n  message?: string;\n  components: string[];\n};\n\nexport class StashMain {\n  private stashFiles: StashFiles;\n  constructor(\n    private workspace: Workspace,\n    private checkout: CheckoutMain,\n    private snapping: SnappingMain,\n    private remove: RemoveMain\n  ) {\n    this.stashFiles = new StashFiles(workspace);\n  }\n\n  async save(options: { message?: string; pattern?: string; includeNew?: boolean }): Promise<ComponentID[]> {\n    const compIds = options?.pattern ? await this.workspace.idsByPattern(options?.pattern) : this.workspace.listIds();\n    const comps = await this.workspace.getMany(compIds);\n    const newComps: Component[] = [];\n    const modifiedComps = compact(\n      await Promise.all(\n        comps.map(async (comp) => {\n          if (!comp.head) {\n            // it's a new component\n            if (options.includeNew) newComps.push(comp);\n            return undefined;\n          }\n          const isModified = await this.workspace.isModified(comp);\n          if (isModified) return comp;\n          return undefined;\n        })\n      )\n    );\n    const allComps = [...modifiedComps, ...newComps];\n    if (!allComps.length) return [];\n\n    // per comp: create Version object, save it in the local scope and return the hash. don't save anything in the .bitmap\n    const consumeComponents = allComps.map((comp) => comp.state._consumer);\n    await this.snapping._addFlattenedDependenciesToComponents(consumeComponents);\n    const hashPerId = await Promise.all(\n      allComps.map(async (comp) => {\n        const versionObj = await this.addComponentDataToRepo(comp);\n        return {\n          id: comp.id,\n          hash: versionObj.hash().toString(),\n          bitmapEntry: this.workspace.bitMap.getBitmapEntry(comp.id).toPlainObject(),\n          isNew: !comp.id.hasVersion(),\n        };\n      })\n    );\n    await this.workspace.scope.legacyScope.objects.persist();\n    const stashData = new StashData({ message: options?.message }, hashPerId);\n    await this.stashFiles.saveStashData(stashData);\n\n    // reset all modified components\n    const modifiedCompIds = modifiedComps.map((c) => c.id);\n    await this.checkout.checkout({\n      ids: modifiedCompIds,\n      skipNpmInstall: true,\n      reset: true,\n    });\n    // remove new components from the workspace\n    const newCompIds = newComps.map((c) => c.id);\n    if (newComps.length) {\n      await this.remove.removeLocallyByIds(newCompIds);\n    }\n\n    return [...modifiedCompIds, ...newCompIds];\n  }\n\n  async list(): Promise<ListResult[]> {\n    const stashFiles = await this.stashFiles.getStashFiles();\n    return Promise.all(\n      stashFiles.map(async (file) => {\n        const stashData = await this.stashFiles.getStashData(file);\n        return {\n          id: file.replace('.json', ''),\n          message: stashData.metadata.message,\n          components: stashData.stashCompsData.map((c) => c.id.toString()),\n        };\n      })\n    );\n  }\n\n  async loadLatest(checkoutProps: CheckoutProps = {}, stashId?: string) {\n    const stashFile = stashId ? `${stashId}.json` : await this.stashFiles.getLatestStashFile();\n    if (!stashFile) {\n      throw new BitError('no stashed components found');\n    }\n    const stashData = await this.stashFiles.getStashData(stashFile);\n    const stashModifiedCompsData = stashData.stashCompsData.filter((c) => !c.isNew);\n    const stashNewCompsData = stashData.stashCompsData.filter((c) => c.isNew);\n    const compIds = stashModifiedCompsData.map((c) => c.id);\n    const versionPerId = stashModifiedCompsData.map((c) => c.id.changeVersion(c.hash.toString()));\n    const stashedBitmapEntries = stashNewCompsData.map((s) => ({\n      ...s.bitmapEntry,\n      id: s.id.changeVersion(s.hash.toString()),\n    }));\n\n    await this.checkout.checkout({\n      ...checkoutProps,\n      ids: compIds,\n      skipNpmInstall: true,\n      versionPerId,\n      skipUpdatingBitmap: true,\n      promptMergeOptions: true,\n      loadStash: true,\n      stashedBitmapEntries,\n    });\n\n    await this.stashFiles.deleteStashFile(stashFile);\n\n    return [...compIds, ...stashNewCompsData.map((c) => c.id)];\n  }\n\n  private async addComponentDataToRepo(component: Component) {\n    const previousVersion = component.getSnapHash();\n    const consumerComponent = component.state._consumer.clone() as ConsumerComponent;\n    consumerComponent.setNewVersion();\n    if (!consumerComponent.log) {\n      consumerComponent.log = await getBasicLog();\n    }\n    const { version, files } =\n      await this.workspace.scope.legacyScope.sources.consumerComponentToVersion(consumerComponent);\n    if (previousVersion) {\n      // set the parent, we need it for the \"stash-load\" to function as the \"base\" version for the three-way-merge.\n      const modelComponent = consumerComponent.modelComponent;\n      if (!modelComponent) throw new Error(`unable to find ModelComponent for ${consumerComponent.id.toString()}`);\n      const parent = Ref.from(previousVersion);\n      version.addAsOnlyParent(parent);\n    }\n\n    const repo = this.workspace.scope.legacyScope.objects;\n    repo.add(version);\n    files.forEach((file) => repo.add(file.file));\n    return version;\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, CheckoutAspect, SnappingAspect, RemoveAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, checkout, snapping, remove]: [\n    CLIMain,\n    Workspace,\n    CheckoutMain,\n    SnappingMain,\n    RemoveMain,\n  ]) {\n    const stashMain = new StashMain(workspace, checkout, snapping, remove);\n    const stashCmd = new StashCmd(stashMain);\n    stashCmd.commands = [new StashSaveCmd(stashMain), new StashLoadCmd(stashMain), new StashListCmd(stashMain)];\n    cli.register(stashCmd);\n    return stashMain;\n  }\n}\n\nStashAspect.addRuntime(StashMain);\n\nexport default StashMain;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_workspace","data","require","_snapping","_bitError","_lodash","_cli","_scope","_checkout","_stash","_stash2","_stashData","_stashFiles","_harmonyModules","_remove","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","StashMain","constructor","workspace","checkout","snapping","remove","stashFiles","StashFiles","save","options","compIds","pattern","idsByPattern","listIds","comps","getMany","newComps","modifiedComps","compact","Promise","all","map","comp","head","includeNew","undefined","isModified","allComps","consumeComponents","state","_consumer","_addFlattenedDependenciesToComponents","hashPerId","versionObj","addComponentDataToRepo","id","hash","toString","bitmapEntry","bitMap","getBitmapEntry","toPlainObject","isNew","hasVersion","scope","legacyScope","objects","persist","stashData","StashData","message","saveStashData","modifiedCompIds","c","ids","skipNpmInstall","reset","newCompIds","removeLocallyByIds","list","getStashFiles","file","getStashData","replace","metadata","components","stashCompsData","loadLatest","checkoutProps","stashId","stashFile","getLatestStashFile","BitError","stashModifiedCompsData","stashNewCompsData","versionPerId","changeVersion","stashedBitmapEntries","s","skipUpdatingBitmap","promptMergeOptions","loadStash","deleteStashFile","component","previousVersion","getSnapHash","consumerComponent","clone","setNewVersion","log","getBasicLog","version","files","sources","consumerComponentToVersion","modelComponent","Error","parent","Ref","from","addAsOnlyParent","repo","add","provider","cli","stashMain","stashCmd","StashCmd","commands","StashSaveCmd","StashLoadCmd","StashListCmd","register","exports","CLIAspect","WorkspaceAspect","CheckoutAspect","SnappingAspect","RemoveAspect","MainRuntime","StashAspect","addRuntime","_default","default"],"sources":["stash.main.runtime.ts"],"sourcesContent":["import { WorkspaceAspect, Workspace } from '@teambit/workspace';\nimport { SnappingAspect, SnappingMain } from '@teambit/snapping';\nimport { Component, ComponentID } from '@teambit/component';\nimport { BitError } from '@teambit/bit-error';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { compact } from 'lodash';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Ref } from '@teambit/scope.objects';\nimport { CheckoutAspect, CheckoutMain, CheckoutProps } from '@teambit/checkout';\nimport { StashAspect } from './stash.aspect';\nimport { StashCmd, StashListCmd, StashLoadCmd, StashSaveCmd } from './stash.cmd';\nimport { StashData } from './stash-data';\nimport { StashFiles } from './stash-files';\nimport { getBasicLog } from '@teambit/harmony.modules.get-basic-log';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\n\ntype ListResult = {\n  id: string;\n  message?: string;\n  components: string[];\n};\n\nexport class StashMain {\n  private stashFiles: StashFiles;\n  constructor(\n    private workspace: Workspace,\n    private checkout: CheckoutMain,\n    private snapping: SnappingMain,\n    private remove: RemoveMain\n  ) {\n    this.stashFiles = new StashFiles(workspace);\n  }\n\n  async save(options: { message?: string; pattern?: string; includeNew?: boolean }): Promise<ComponentID[]> {\n    const compIds = options?.pattern ? await this.workspace.idsByPattern(options?.pattern) : this.workspace.listIds();\n    const comps = await this.workspace.getMany(compIds);\n    const newComps: Component[] = [];\n    const modifiedComps = compact(\n      await Promise.all(\n        comps.map(async (comp) => {\n          if (!comp.head) {\n            // it's a new component\n            if (options.includeNew) newComps.push(comp);\n            return undefined;\n          }\n          const isModified = await this.workspace.isModified(comp);\n          if (isModified) return comp;\n          return undefined;\n        })\n      )\n    );\n    const allComps = [...modifiedComps, ...newComps];\n    if (!allComps.length) return [];\n\n    // per comp: create Version object, save it in the local scope and return the hash. don't save anything in the .bitmap\n    const consumeComponents = allComps.map((comp) => comp.state._consumer);\n    await this.snapping._addFlattenedDependenciesToComponents(consumeComponents);\n    const hashPerId = await Promise.all(\n      allComps.map(async (comp) => {\n        const versionObj = await this.addComponentDataToRepo(comp);\n        return {\n          id: comp.id,\n          hash: versionObj.hash().toString(),\n          bitmapEntry: this.workspace.bitMap.getBitmapEntry(comp.id).toPlainObject(),\n          isNew: !comp.id.hasVersion(),\n        };\n      })\n    );\n    await this.workspace.scope.legacyScope.objects.persist();\n    const stashData = new StashData({ message: options?.message }, hashPerId);\n    await this.stashFiles.saveStashData(stashData);\n\n    // reset all modified components\n    const modifiedCompIds = modifiedComps.map((c) => c.id);\n    await this.checkout.checkout({\n      ids: modifiedCompIds,\n      skipNpmInstall: true,\n      reset: true,\n    });\n    // remove new components from the workspace\n    const newCompIds = newComps.map((c) => c.id);\n    if (newComps.length) {\n      await this.remove.removeLocallyByIds(newCompIds);\n    }\n\n    return [...modifiedCompIds, ...newCompIds];\n  }\n\n  async list(): Promise<ListResult[]> {\n    const stashFiles = await this.stashFiles.getStashFiles();\n    return Promise.all(\n      stashFiles.map(async (file) => {\n        const stashData = await this.stashFiles.getStashData(file);\n        return {\n          id: file.replace('.json', ''),\n          message: stashData.metadata.message,\n          components: stashData.stashCompsData.map((c) => c.id.toString()),\n        };\n      })\n    );\n  }\n\n  async loadLatest(checkoutProps: CheckoutProps = {}, stashId?: string) {\n    const stashFile = stashId ? `${stashId}.json` : await this.stashFiles.getLatestStashFile();\n    if (!stashFile) {\n      throw new BitError('no stashed components found');\n    }\n    const stashData = await this.stashFiles.getStashData(stashFile);\n    const stashModifiedCompsData = stashData.stashCompsData.filter((c) => !c.isNew);\n    const stashNewCompsData = stashData.stashCompsData.filter((c) => c.isNew);\n    const compIds = stashModifiedCompsData.map((c) => c.id);\n    const versionPerId = stashModifiedCompsData.map((c) => c.id.changeVersion(c.hash.toString()));\n    const stashedBitmapEntries = stashNewCompsData.map((s) => ({\n      ...s.bitmapEntry,\n      id: s.id.changeVersion(s.hash.toString()),\n    }));\n\n    await this.checkout.checkout({\n      ...checkoutProps,\n      ids: compIds,\n      skipNpmInstall: true,\n      versionPerId,\n      skipUpdatingBitmap: true,\n      promptMergeOptions: true,\n      loadStash: true,\n      stashedBitmapEntries,\n    });\n\n    await this.stashFiles.deleteStashFile(stashFile);\n\n    return [...compIds, ...stashNewCompsData.map((c) => c.id)];\n  }\n\n  private async addComponentDataToRepo(component: Component) {\n    const previousVersion = component.getSnapHash();\n    const consumerComponent = component.state._consumer.clone() as ConsumerComponent;\n    consumerComponent.setNewVersion();\n    if (!consumerComponent.log) {\n      consumerComponent.log = await getBasicLog();\n    }\n    const { version, files } =\n      await this.workspace.scope.legacyScope.sources.consumerComponentToVersion(consumerComponent);\n    if (previousVersion) {\n      // set the parent, we need it for the \"stash-load\" to function as the \"base\" version for the three-way-merge.\n      const modelComponent = consumerComponent.modelComponent;\n      if (!modelComponent) throw new Error(`unable to find ModelComponent for ${consumerComponent.id.toString()}`);\n      const parent = Ref.from(previousVersion);\n      version.addAsOnlyParent(parent);\n    }\n\n    const repo = this.workspace.scope.legacyScope.objects;\n    repo.add(version);\n    files.forEach((file) => repo.add(file.file));\n    return version;\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, CheckoutAspect, SnappingAspect, RemoveAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, checkout, snapping, remove]: [\n    CLIMain,\n    Workspace,\n    CheckoutMain,\n    SnappingMain,\n    RemoveMain,\n  ]) {\n    const stashMain = new StashMain(workspace, checkout, snapping, remove);\n    const stashCmd = new StashCmd(stashMain);\n    stashCmd.commands = [new StashSaveCmd(stashMain), new StashLoadCmd(stashMain), new StashListCmd(stashMain)];\n    cli.register(stashCmd);\n    return stashMain;\n  }\n}\n\nStashAspect.addRuntime(StashMain);\n\nexport default StashMain;\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/stash",
-  "version": "1.0.486",
+  "version": "1.0.488",
   "homepage": "https://bit.cloud/teambit/component/stash",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "stash",
-    "version": "1.0.486"
+    "version": "1.0.488"
   },
   "dependencies": {
     "fs-extra": "10.0.0",
@@ -16,14 +16,17 @@
     "@teambit/component-id": "1.2.2",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/workspace": "1.0.486",
-    "@teambit/checkout": "1.0.486",
-    "@teambit/cli": "0.0.1063",
-    "@teambit/merging": "1.0.486",
-    "@teambit/component": "1.0.486",
-    "@teambit/harmony.modules.get-basic-log": "0.0.1",
-    "@teambit/remove": "1.0.486",
-    "@teambit/snapping": "1.0.486"
+    "@teambit/workspace": "1.0.488",
+    "@teambit/checkout": "1.0.488",
+    "@teambit/cli": "0.0.1065",
+    "@teambit/legacy.constants": "0.0.1",
+    "@teambit/merging": "1.0.488",
+    "@teambit/component": "1.0.488",
+    "@teambit/harmony.modules.get-basic-log": "0.0.2",
+    "@teambit/legacy.consumer-component": "0.0.2",
+    "@teambit/remove": "1.0.488",
+    "@teambit/scope.objects": "0.0.1",
+    "@teambit/snapping": "1.0.488"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",