@teambit/stash 1.0.173 → 1.0.174

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.173" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.component/stash@1.0.174" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/artifacts/schema.json

@@ -17,7 +17,7 @@
         "__schema": "ClassSchema",
         "location": {
           "filePath": "stash.main.runtime.ts",
-          "line": 14,
+          "line": 15,
           "character": 1
         },
         "signature": "class StashMain",
@@ -27,7 +27,7 @@
             "__schema": "ConstructorSchema",
             "location": {
               "filePath": "stash.main.runtime.ts",
-              "line": 16,
+              "line": 17,
               "character": 3
             },
             "signature": "constructor StashMain(workspace: Workspace, checkout: CheckoutMain, snapping: SnappingMain): StashMain",
@@ -37,7 +37,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 16,
+                  "line": 17,
                   "character": 15
                 },
                 "name": "workspace",
@@ -45,7 +45,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 16,
+                    "line": 17,
                     "character": 34
                   },
                   "name": "Workspace"
@@ -57,7 +57,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 16,
+                  "line": 17,
                   "character": 45
                 },
                 "name": "checkout",
@@ -65,7 +65,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 16,
+                    "line": 17,
                     "character": 63
                   },
                   "name": "CheckoutMain"
@@ -77,7 +77,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 16,
+                  "line": 17,
                   "character": 77
                 },
                 "name": "snapping",
@@ -85,7 +85,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 16,
+                    "line": 17,
                     "character": 95
                   },
                   "name": "SnappingMain"
@@ -98,7 +98,7 @@
               "__schema": "ThisTypeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 14,
+                "line": 15,
                 "character": 1
               },
               "name": "StashMain"
@@ -109,7 +109,7 @@
             "__schema": "FunctionLikeSchema",
             "location": {
               "filePath": "stash.main.runtime.ts",
-              "line": 20,
+              "line": 21,
               "character": 3
             },
             "signature": "(method) StashMain.save(options: {\n    message?: string;\n    pattern?: string;\n}): Promise<ComponentID[]>",
@@ -119,7 +119,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 20,
+                  "line": 21,
                   "character": 14
                 },
                 "name": "options",
@@ -127,7 +127,7 @@
                   "__schema": "TypeLiteralSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 20,
+                    "line": 21,
                     "character": 23
                   },
                   "members": [
@@ -135,7 +135,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "stash.main.runtime.ts",
-                        "line": 20,
+                        "line": 21,
                         "character": 25
                       },
                       "signature": "(property) message?: string | undefined",
@@ -144,7 +144,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "stash.main.runtime.ts",
-                          "line": 20,
+                          "line": 21,
                           "character": 35
                         },
                         "name": "string"
@@ -155,7 +155,7 @@
                       "__schema": "VariableLikeSchema",
                       "location": {
                         "filePath": "stash.main.runtime.ts",
-                        "line": 20,
+                        "line": 21,
                         "character": 43
                       },
                       "signature": "(property) pattern?: string | undefined",
@@ -164,7 +164,7 @@
                         "__schema": "KeywordTypeSchema",
                         "location": {
                           "filePath": "stash.main.runtime.ts",
-                          "line": 20,
+                          "line": 21,
                           "character": 53
                         },
                         "name": "string"
@@ -181,7 +181,7 @@
               "__schema": "TypeRefSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 20,
+                "line": 21,
                 "character": 64
               },
               "name": "Promise",
@@ -190,14 +190,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 20,
+                    "line": 21,
                     "character": 72
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "stash.main.runtime.ts",
-                      "line": 20,
+                      "line": 21,
                       "character": 72
                     },
                     "name": "ComponentID"
@@ -213,17 +213,39 @@
             "__schema": "FunctionLikeSchema",
             "location": {
               "filePath": "stash.main.runtime.ts",
-              "line": 61,
+              "line": 62,
               "character": 3
             },
-            "signature": "(method) StashMain.loadLatest(): Promise<ComponentID[]>",
+            "signature": "(method) StashMain.loadLatest(checkoutProps?: CheckoutProps): Promise<ComponentID[]>",
             "name": "loadLatest",
-            "params": [],
+            "params": [
+              {
+                "__schema": "ParameterSchema",
+                "location": {
+                  "filePath": "stash.main.runtime.ts",
+                  "line": 62,
+                  "character": 20
+                },
+                "name": "checkoutProps",
+                "type": {
+                  "__schema": "TypeRefSchema",
+                  "location": {
+                    "filePath": "stash.main.runtime.ts",
+                    "line": 62,
+                    "character": 35
+                  },
+                  "name": "CheckoutProps"
+                },
+                "isOptional": true,
+                "defaultValue": "{}",
+                "isSpread": false
+              }
+            ],
             "returnType": {
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 61,
+                "line": 62,
                 "character": 3
               },
               "type": "Promise<ComponentID[]>"
@@ -236,7 +258,7 @@
             "__schema": "VariableLikeSchema",
             "location": {
               "filePath": "stash.main.runtime.ts",
-              "line": 94,
+              "line": 107,
               "character": 3
             },
             "signature": "(property) StashMain.slots: never[]",
@@ -245,7 +267,7 @@
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 94,
+                "line": 107,
                 "character": 3
               },
               "type": "never[]"
@@ -257,7 +279,7 @@
             "__schema": "VariableLikeSchema",
             "location": {
               "filePath": "stash.main.runtime.ts",
-              "line": 95,
+              "line": 108,
               "character": 3
             },
             "signature": "(property) StashMain.dependencies: Aspect[]",
@@ -266,7 +288,7 @@
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 95,
+                "line": 108,
                 "character": 3
               },
               "type": "Aspect[]"
@@ -278,7 +300,7 @@
             "__schema": "VariableLikeSchema",
             "location": {
               "filePath": "stash.main.runtime.ts",
-              "line": 96,
+              "line": 109,
               "character": 3
             },
             "signature": "(property) StashMain.runtime: RuntimeDefinition",
@@ -287,7 +309,7 @@
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 96,
+                "line": 109,
                 "character": 3
               },
               "type": "RuntimeDefinition"
@@ -299,7 +321,7 @@
             "__schema": "FunctionLikeSchema",
             "location": {
               "filePath": "stash.main.runtime.ts",
-              "line": 97,
+              "line": 110,
               "character": 3
             },
             "signature": "(method) StashMain.provider([cli, workspace, checkout, snapping]: [CLIMain, Workspace, CheckoutMain, SnappingMain]): Promise<StashMain>",
@@ -309,7 +331,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 97,
+                  "line": 110,
                   "character": 25
                 },
                 "name": "[ cli, workspace, checkout, snapping ]",
@@ -317,7 +339,7 @@
                   "__schema": "TupleTypeSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 97,
+                    "line": 110,
                     "character": 63
                   },
                   "elements": [
@@ -325,7 +347,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "stash.main.runtime.ts",
-                        "line": 97,
+                        "line": 110,
                         "character": 64
                       },
                       "name": "CLIMain"
@@ -334,7 +356,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "stash.main.runtime.ts",
-                        "line": 97,
+                        "line": 110,
                         "character": 73
                       },
                       "name": "Workspace"
@@ -343,7 +365,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "stash.main.runtime.ts",
-                        "line": 97,
+                        "line": 110,
                         "character": 84
                       },
                       "name": "CheckoutMain"
@@ -352,7 +374,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "stash.main.runtime.ts",
-                        "line": 97,
+                        "line": 110,
                         "character": 98
                       },
                       "name": "SnappingMain"
@@ -367,7 +389,7 @@
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 97,
+                "line": 110,
                 "character": 3
               },
               "type": "Promise<StashMain>"
@@ -433,7 +455,7 @@
           "__schema": "ClassSchema",
           "location": {
             "filePath": "stash.main.runtime.ts",
-            "line": 14,
+            "line": 15,
             "character": 1
           },
           "signature": "class StashMain",
@@ -443,7 +465,7 @@
               "__schema": "ConstructorSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 16,
+                "line": 17,
                 "character": 3
               },
               "signature": "constructor StashMain(workspace: Workspace, checkout: CheckoutMain, snapping: SnappingMain): StashMain",
@@ -453,7 +475,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 16,
+                    "line": 17,
                     "character": 15
                   },
                   "name": "workspace",
@@ -461,7 +483,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "stash.main.runtime.ts",
-                      "line": 16,
+                      "line": 17,
                       "character": 34
                     },
                     "name": "Workspace"
@@ -473,7 +495,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 16,
+                    "line": 17,
                     "character": 45
                   },
                   "name": "checkout",
@@ -481,7 +503,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "stash.main.runtime.ts",
-                      "line": 16,
+                      "line": 17,
                       "character": 63
                     },
                     "name": "CheckoutMain"
@@ -493,7 +515,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 16,
+                    "line": 17,
                     "character": 77
                   },
                   "name": "snapping",
@@ -501,7 +523,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "stash.main.runtime.ts",
-                      "line": 16,
+                      "line": 17,
                       "character": 95
                     },
                     "name": "SnappingMain"
@@ -514,7 +536,7 @@
                 "__schema": "ThisTypeSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 14,
+                  "line": 15,
                   "character": 1
                 },
                 "name": "StashMain"
@@ -525,7 +547,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 20,
+                "line": 21,
                 "character": 3
               },
               "signature": "(method) StashMain.save(options: {\n    message?: string;\n    pattern?: string;\n}): Promise<ComponentID[]>",
@@ -535,7 +557,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 20,
+                    "line": 21,
                     "character": 14
                   },
                   "name": "options",
@@ -543,7 +565,7 @@
                     "__schema": "TypeLiteralSchema",
                     "location": {
                       "filePath": "stash.main.runtime.ts",
-                      "line": 20,
+                      "line": 21,
                       "character": 23
                     },
                     "members": [
@@ -551,7 +573,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "stash.main.runtime.ts",
-                          "line": 20,
+                          "line": 21,
                           "character": 25
                         },
                         "signature": "(property) message?: string | undefined",
@@ -560,7 +582,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "stash.main.runtime.ts",
-                            "line": 20,
+                            "line": 21,
                             "character": 35
                           },
                           "name": "string"
@@ -571,7 +593,7 @@
                         "__schema": "VariableLikeSchema",
                         "location": {
                           "filePath": "stash.main.runtime.ts",
-                          "line": 20,
+                          "line": 21,
                           "character": 43
                         },
                         "signature": "(property) pattern?: string | undefined",
@@ -580,7 +602,7 @@
                           "__schema": "KeywordTypeSchema",
                           "location": {
                             "filePath": "stash.main.runtime.ts",
-                            "line": 20,
+                            "line": 21,
                             "character": 53
                           },
                           "name": "string"
@@ -597,7 +619,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 20,
+                  "line": 21,
                   "character": 64
                 },
                 "name": "Promise",
@@ -606,14 +628,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "stash.main.runtime.ts",
-                      "line": 20,
+                      "line": 21,
                       "character": 72
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "stash.main.runtime.ts",
-                        "line": 20,
+                        "line": 21,
                         "character": 72
                       },
                       "name": "ComponentID"
@@ -629,17 +651,39 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 61,
+                "line": 62,
                 "character": 3
               },
-              "signature": "(method) StashMain.loadLatest(): Promise<ComponentID[]>",
+              "signature": "(method) StashMain.loadLatest(checkoutProps?: CheckoutProps): Promise<ComponentID[]>",
               "name": "loadLatest",
-              "params": [],
+              "params": [
+                {
+                  "__schema": "ParameterSchema",
+                  "location": {
+                    "filePath": "stash.main.runtime.ts",
+                    "line": 62,
+                    "character": 20
+                  },
+                  "name": "checkoutProps",
+                  "type": {
+                    "__schema": "TypeRefSchema",
+                    "location": {
+                      "filePath": "stash.main.runtime.ts",
+                      "line": 62,
+                      "character": 35
+                    },
+                    "name": "CheckoutProps"
+                  },
+                  "isOptional": true,
+                  "defaultValue": "{}",
+                  "isSpread": false
+                }
+              ],
               "returnType": {
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 61,
+                  "line": 62,
                   "character": 3
                 },
                 "type": "Promise<ComponentID[]>"
@@ -652,7 +696,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 94,
+                "line": 107,
                 "character": 3
               },
               "signature": "(property) StashMain.slots: never[]",
@@ -661,7 +705,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 94,
+                  "line": 107,
                   "character": 3
                 },
                 "type": "never[]"
@@ -673,7 +717,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 95,
+                "line": 108,
                 "character": 3
               },
               "signature": "(property) StashMain.dependencies: Aspect[]",
@@ -682,7 +726,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 95,
+                  "line": 108,
                   "character": 3
                 },
                 "type": "Aspect[]"
@@ -694,7 +738,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 96,
+                "line": 109,
                 "character": 3
               },
               "signature": "(property) StashMain.runtime: RuntimeDefinition",
@@ -703,7 +747,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 96,
+                  "line": 109,
                   "character": 3
                 },
                 "type": "RuntimeDefinition"
@@ -715,7 +759,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "stash.main.runtime.ts",
-                "line": 97,
+                "line": 110,
                 "character": 3
               },
               "signature": "(method) StashMain.provider([cli, workspace, checkout, snapping]: [CLIMain, Workspace, CheckoutMain, SnappingMain]): Promise<StashMain>",
@@ -725,7 +769,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "stash.main.runtime.ts",
-                    "line": 97,
+                    "line": 110,
                     "character": 25
                   },
                   "name": "[ cli, workspace, checkout, snapping ]",
@@ -733,7 +777,7 @@
                     "__schema": "TupleTypeSchema",
                     "location": {
                       "filePath": "stash.main.runtime.ts",
-                      "line": 97,
+                      "line": 110,
                       "character": 63
                     },
                     "elements": [
@@ -741,7 +785,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "stash.main.runtime.ts",
-                          "line": 97,
+                          "line": 110,
                           "character": 64
                         },
                         "name": "CLIMain"
@@ -750,7 +794,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "stash.main.runtime.ts",
-                          "line": 97,
+                          "line": 110,
                           "character": 73
                         },
                         "name": "Workspace"
@@ -759,7 +803,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "stash.main.runtime.ts",
-                          "line": 97,
+                          "line": 110,
                           "character": 84
                         },
                         "name": "CheckoutMain"
@@ -768,7 +812,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "stash.main.runtime.ts",
-                          "line": 97,
+                          "line": 110,
                           "character": 98
                         },
                         "name": "SnappingMain"
@@ -783,7 +827,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "stash.main.runtime.ts",
-                  "line": 97,
+                  "line": 110,
                   "character": 3
                 },
                 "type": "Promise<StashMain>"
@@ -801,7 +845,7 @@
           "__schema": "UnImplementedSchema",
           "location": {
             "filePath": "stash.main.runtime.ts",
-            "line": 108,
+            "line": 121,
             "character": 16
           },
           "name": "StashMain",
@@ -813,7 +857,7 @@
           "__schema": "UnImplementedSchema",
           "location": {
             "filePath": "stash.main.runtime.ts",
-            "line": 106,
+            "line": 119,
             "character": 1
           },
           "name": "StashAspect.addRuntime(StashMain);",
@@ -862,7 +906,7 @@
   "componentId": {
     "scope": "teambit.component",
     "name": "stash",
-    "version": "1.0.173"
+    "version": "1.0.174"
   },
   "taggedModuleExports": []
 }

package/dist/stash-data.d.ts

@@ -1,8 +1,7 @@
 import { ComponentID, ComponentIdObj } from '@teambit/component-id';
-import { Ref } from '@teambit/legacy/dist/scope/objects';
 export type StashCompData = {
     id: ComponentID;
-    hash: Ref;
+    hash: string;
 };
 export type StashCompDataWithIdObj = {
     id: ComponentIdObj;

package/dist/stash-data.js

@@ -11,13 +11,6 @@ function _componentId() {
   };
   return data;
 }
-function _objects() {
-  const data = require("@teambit/legacy/dist/scope/objects");
-  _objects = function () {
-    return data;
-  };
-  return data;
-}
 class StashData {
   constructor(metadata, stashCompsData) {
     this.metadata = metadata;
@@ -30,9 +23,8 @@ class StashData {
         id,
         hash
       }) => ({
-        // id: { scope: id.scope, name: id.fullName },
         id: id.changeVersion(undefined).toObject(),
-        hash: hash.toString()
+        hash
       }))
     };
   }
@@ -41,7 +33,7 @@ class StashData {
       const id = _componentId().ComponentID.fromObject(compData.id);
       return {
         id,
-        hash: _objects().Ref.from(compData.hash)
+        hash: compData.hash
       };
     }));
     return new StashData(obj.metadata, stashCompsData);

package/dist/stash-data.js.map

@@ -1 +1 @@
-{"version":3,"names":["_componentId","data","require","_objects","StashData","constructor","metadata","stashCompsData","toObject","map","id","hash","changeVersion","undefined","toString","fromObject","obj","Promise","all","compData","ComponentID","Ref","from","exports"],"sources":["stash-data.ts"],"sourcesContent":["import { ComponentID, ComponentIdObj } from '@teambit/component-id';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\n\nexport type StashCompData = { id: ComponentID; hash: Ref };\nexport type StashCompDataWithIdObj = { id: ComponentIdObj; hash: string };\nexport type StashMetadata = { message?: string };\nexport type StashDataObj = {\n  metadata: StashMetadata;\n  stashCompsData: StashCompDataWithIdObj[];\n};\n\nexport class StashData {\n  constructor(readonly metadata: StashMetadata, readonly stashCompsData: StashCompData[]) {}\n\n  toObject(): StashDataObj {\n    return {\n      metadata: this.metadata,\n      stashCompsData: this.stashCompsData.map(({ id, hash }) => ({\n        // id: { scope: id.scope, name: id.fullName },\n        id: id.changeVersion(undefined).toObject(),\n        hash: hash.toString(),\n      })),\n    };\n  }\n\n  static async fromObject(obj: Record<string, any>): Promise<StashData> {\n    const stashCompsData = await Promise.all(\n      obj.stashCompsData.map(async (compData) => {\n        const id = ComponentID.fromObject(compData.id);\n        return {\n          id,\n          hash: Ref.from(compData.hash),\n        };\n      })\n    );\n    return new StashData(obj.metadata, stashCompsData);\n  }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,aAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,YAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,SAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,QAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUO,MAAMG,SAAS,CAAC;EACrBC,WAAWA,CAAUC,QAAuB,EAAWC,cAA+B,EAAE;IAAA,KAAnED,QAAuB,GAAvBA,QAAuB;IAAA,KAAWC,cAA+B,GAA/BA,cAA+B;EAAG;EAEzFC,QAAQA,CAAA,EAAiB;IACvB,OAAO;MACLF,QAAQ,EAAE,IAAI,CAACA,QAAQ;MACvBC,cAAc,EAAE,IAAI,CAACA,cAAc,CAACE,GAAG,CAAC,CAAC;QAAEC,EAAE;QAAEC;MAAK,CAAC,MAAM;QACzD;QACAD,EAAE,EAAEA,EAAE,CAACE,aAAa,CAACC,SAAS,CAAC,CAACL,QAAQ,CAAC,CAAC;QAC1CG,IAAI,EAAEA,IAAI,CAACG,QAAQ,CAAC;MACtB,CAAC,CAAC;IACJ,CAAC;EACH;EAEA,aAAaC,UAAUA,CAACC,GAAwB,EAAsB;IACpE,MAAMT,cAAc,GAAG,MAAMU,OAAO,CAACC,GAAG,CACtCF,GAAG,CAACT,cAAc,CAACE,GAAG,CAAC,MAAOU,QAAQ,IAAK;MACzC,MAAMT,EAAE,GAAGU,0BAAW,CAACL,UAAU,CAACI,QAAQ,CAACT,EAAE,CAAC;MAC9C,OAAO;QACLA,EAAE;QACFC,IAAI,EAAEU,cAAG,CAACC,IAAI,CAACH,QAAQ,CAACR,IAAI;MAC9B,CAAC;IACH,CAAC,CACH,CAAC;IACD,OAAO,IAAIP,SAAS,CAACY,GAAG,CAACV,QAAQ,EAAEC,cAAc,CAAC;EACpD;AACF;AAACgB,OAAA,CAAAnB,SAAA,GAAAA,SAAA"}
+{"version":3,"names":["_componentId","data","require","StashData","constructor","metadata","stashCompsData","toObject","map","id","hash","changeVersion","undefined","fromObject","obj","Promise","all","compData","ComponentID","exports"],"sources":["stash-data.ts"],"sourcesContent":["import { ComponentID, ComponentIdObj } from '@teambit/component-id';\n\nexport type StashCompData = { id: ComponentID; hash: string };\nexport type StashCompDataWithIdObj = { id: ComponentIdObj; hash: string };\nexport type StashMetadata = { message?: string };\nexport type StashDataObj = {\n  metadata: StashMetadata;\n  stashCompsData: StashCompDataWithIdObj[];\n};\n\nexport class StashData {\n  constructor(readonly metadata: StashMetadata, readonly stashCompsData: StashCompData[]) {}\n\n  toObject(): StashDataObj {\n    return {\n      metadata: this.metadata,\n      stashCompsData: this.stashCompsData.map(({ id, hash }) => ({\n        id: id.changeVersion(undefined).toObject(),\n        hash,\n      })),\n    };\n  }\n\n  static async fromObject(obj: Record<string, any>): Promise<StashData> {\n    const stashCompsData = await Promise.all(\n      obj.stashCompsData.map(async (compData) => {\n        const id = ComponentID.fromObject(compData.id);\n        return {\n          id,\n          hash: compData.hash,\n        };\n      })\n    );\n    return new StashData(obj.metadata, stashCompsData);\n  }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,aAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,YAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUO,MAAME,SAAS,CAAC;EACrBC,WAAWA,CAAUC,QAAuB,EAAWC,cAA+B,EAAE;IAAA,KAAnED,QAAuB,GAAvBA,QAAuB;IAAA,KAAWC,cAA+B,GAA/BA,cAA+B;EAAG;EAEzFC,QAAQA,CAAA,EAAiB;IACvB,OAAO;MACLF,QAAQ,EAAE,IAAI,CAACA,QAAQ;MACvBC,cAAc,EAAE,IAAI,CAACA,cAAc,CAACE,GAAG,CAAC,CAAC;QAAEC,EAAE;QAAEC;MAAK,CAAC,MAAM;QACzDD,EAAE,EAAEA,EAAE,CAACE,aAAa,CAACC,SAAS,CAAC,CAACL,QAAQ,CAAC,CAAC;QAC1CG;MACF,CAAC,CAAC;IACJ,CAAC;EACH;EAEA,aAAaG,UAAUA,CAACC,GAAwB,EAAsB;IACpE,MAAMR,cAAc,GAAG,MAAMS,OAAO,CAACC,GAAG,CACtCF,GAAG,CAACR,cAAc,CAACE,GAAG,CAAC,MAAOS,QAAQ,IAAK;MACzC,MAAMR,EAAE,GAAGS,0BAAW,CAACL,UAAU,CAACI,QAAQ,CAACR,EAAE,CAAC;MAC9C,OAAO;QACLA,EAAE;QACFC,IAAI,EAAEO,QAAQ,CAACP;MACjB,CAAC;IACH,CAAC,CACH,CAAC;IACD,OAAO,IAAIP,SAAS,CAACW,GAAG,CAACT,QAAQ,EAAEC,cAAc,CAAC;EACpD;AACF;AAACa,OAAA,CAAAhB,SAAA,GAAAA,SAAA"}

package/dist/stash.cmd.d.ts

@@ -1,3 +1,4 @@
+import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
 import { Command, CommandOptions } from '@teambit/cli';
 import { StashMain } from './stash.main.runtime';
 export declare class StashSaveCmd implements Command {
@@ -13,6 +14,12 @@ export declare class StashSaveCmd implements Command {
         message?: string;
     }): Promise<string>;
 }
+type StashLoadOpts = {
+    autoMergeResolve?: MergeStrategy;
+    manual?: boolean;
+    forceOurs?: boolean;
+    forceTheirs?: boolean;
+};
 export declare class StashLoadCmd implements Command {
     private stash;
     name: string;
@@ -21,14 +28,13 @@ export declare class StashLoadCmd implements Command {
     options: CommandOptions;
     loader: boolean;
     constructor(stash: StashMain);
-    report(): Promise<string>;
+    report(_arg: any, { autoMergeResolve, forceOurs, forceTheirs, manual }: StashLoadOpts): Promise<string>;
 }
 export declare class StashCmd implements Command {
     private stash;
     name: string;
     description: string;
     group: string;
-    private: boolean;
     options: CommandOptions;
     loader: boolean;
     commands: Command[];
@@ -38,3 +44,4 @@ export declare class StashCmd implements Command {
         message?: string;
     }): Promise<string>;
 }
+export {};

package/dist/stash.cmd.js

@@ -18,6 +18,13 @@ function _constants() {
   };
   return data;
 }
+function _bitError() {
+  const data = require("@teambit/bit-error");
+  _bitError = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
@@ -49,11 +56,28 @@ class StashLoadCmd {
     _defineProperty(this, "name", 'load');
     _defineProperty(this, "description", 'load latest stash, checkout components and delete stash');
     _defineProperty(this, "group", 'development');
-    _defineProperty(this, "options", []);
+    _defineProperty(this, "options", [['', 'auto-merge-resolve <merge-strategy>', 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'manual', 'same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers'], ['', 'force-ours', 'do not merge, preserve local files as is'], ['', 'force-theirs', 'do not merge, just overwrite with incoming files']]);
     _defineProperty(this, "loader", true);
   }
-  async report() {
-    const compIds = await this.stash.loadLatest();
+  async report(_arg, {
+    autoMergeResolve,
+    forceOurs,
+    forceTheirs,
+    manual
+  }) {
+    if (forceOurs && forceTheirs) {
+      throw new (_bitError().BitError)('please use either --force-ours or --force-theirs, not both');
+    }
+    if (autoMergeResolve && autoMergeResolve !== 'ours' && autoMergeResolve !== 'theirs' && autoMergeResolve !== 'manual') {
+      throw new (_bitError().BitError)('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');
+    }
+    if (manual) autoMergeResolve = 'manual';
+    const checkoutProps = {
+      mergeStrategy: autoMergeResolve,
+      forceOurs,
+      forceTheirs
+    };
+    const compIds = await this.stash.loadLatest(checkoutProps);
     return _chalk().default.green(`checked out ${compIds.length} components according to the latest stash`);
   }
 }
@@ -64,8 +88,6 @@ class StashCmd {
     _defineProperty(this, "name", 'stash [sub-command]');
     _defineProperty(this, "description", 'EXPERIMENTAL (more like a POC). stash modified components');
     _defineProperty(this, "group", 'development');
-    _defineProperty(this, "private", true);
-    // too early to make it public. it's still in a POC mode.
     _defineProperty(this, "options", [['p', 'pattern', _constants().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","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","StashSaveCmd","constructor","stash","COMPONENT_PATTERN_HELP","report","_arg","pattern","message","compIds","save","chalk","green","length","exports","StashLoadCmd","loadLatest","StashCmd","undefined"],"sources":["stash.cmd.ts"],"sourcesContent":["// eslint-disable-next-line max-classes-per-file\nimport chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';\nimport { StashMain } from './stash.main.runtime';\n\nexport class StashSaveCmd implements Command {\n  name = 'save';\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\n  constructor(private stash: StashMain) {}\n\n  async report(\n    _arg: any,\n    {\n      pattern,\n      message,\n    }: {\n      pattern?: string;\n      message?: string;\n    }\n  ) {\n    const compIds = await this.stash.save({ pattern, message });\n    return chalk.green(`stashed ${compIds.length} components`);\n  }\n}\n\nexport class StashLoadCmd implements Command {\n  name = 'load';\n  description = 'load latest stash, checkout components and delete stash';\n  group = 'development';\n  options = [] as CommandOptions;\n  loader = true;\n\n  constructor(private stash: StashMain) {}\n\n  async report() {\n    const compIds = await this.stash.loadLatest();\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 = 'EXPERIMENTAL (more like a POC). stash modified components';\n  group = 'development';\n  private = true; // too early to make it public. it's still in a POC mode.\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(\n    _arg: any,\n    {\n      pattern,\n      message,\n    }: {\n      pattern?: string;\n      message?: string;\n    }\n  ) {\n    return new StashSaveCmd(this.stash).report(undefined, { pattern, message });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_constants","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","StashSaveCmd","constructor","stash","COMPONENT_PATTERN_HELP","report","_arg","pattern","message","compIds","save","chalk","green","length","exports","StashLoadCmd","autoMergeResolve","forceOurs","forceTheirs","manual","BitError","checkoutProps","mergeStrategy","loadLatest","StashCmd","undefined"],"sources":["stash.cmd.ts"],"sourcesContent":["// eslint-disable-next-line max-classes-per-file\nimport chalk from 'chalk';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\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  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\n  constructor(private stash: StashMain) {}\n\n  async report(\n    _arg: any,\n    {\n      pattern,\n      message,\n    }: {\n      pattern?: string;\n      message?: string;\n    }\n  ) {\n    const compIds = await this.stash.save({ pattern, message });\n    return chalk.green(`stashed ${compIds.length} components`);\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';\n  description = 'load latest stash, checkout components and delete stash';\n  group = 'development';\n  options = [\n    [\n      '',\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(_arg, { 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);\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 = 'EXPERIMENTAL (more like a POC). 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(\n    _arg: any,\n    {\n      pattern,\n      message,\n    }: {\n      pattern?: string;\n      message?: string;\n    }\n  ) {\n    return new StashSaveCmd(this.stash).report(undefined, { pattern, message });\n  }\n}\n"],"mappings":"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"}

package/dist/stash.main.runtime.d.ts

@@ -2,7 +2,7 @@ import { Workspace } from '@teambit/workspace';
 import { SnappingMain } from '@teambit/snapping';
 import { ComponentID } from '@teambit/component';
 import { CLIMain } from '@teambit/cli';
-import { CheckoutMain } from '@teambit/checkout';
+import { CheckoutMain, CheckoutProps } from '@teambit/checkout';
 export declare class StashMain {
     private workspace;
     private checkout;
@@ -13,7 +13,7 @@ export declare class StashMain {
         message?: string;
         pattern?: string;
     }): Promise<ComponentID[]>;
-    loadLatest(): Promise<ComponentID[]>;
+    loadLatest(checkoutProps?: CheckoutProps): Promise<ComponentID[]>;
     private addComponentDataToRepo;
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];

package/dist/stash.main.runtime.js

@@ -39,6 +39,13 @@ function _cli() {
   };
   return data;
 }
+function _objects() {
+  const data = require("@teambit/legacy/dist/scope/objects");
+  _objects = function () {
+    return data;
+  };
+  return data;
+}
 function _checkout() {
   const data = require("@teambit/checkout");
   _checkout = function () {
@@ -74,6 +81,8 @@ function _stashFiles() {
   };
   return data;
 }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -103,7 +112,7 @@ class StashMain {
       const versionObj = await this.addComponentDataToRepo(comp);
       return {
         id: comp.id,
-        hash: versionObj.hash()
+        hash: versionObj.hash().toString()
       };
     }));
     await this.workspace.scope.legacyScope.objects.persist();
@@ -121,7 +130,7 @@ class StashMain {
     });
     return modifiedCompIds;
   }
-  async loadLatest() {
+  async loadLatest(checkoutProps = {}) {
     const stashFile = await this.stashFiles.getLatestStashFile();
     if (!stashFile) {
       throw new (_bitError().BitError)('no stashed components found');
@@ -129,22 +138,32 @@ class StashMain {
     const stashData = await this.stashFiles.getStashData(stashFile);
     const compIds = stashData.stashCompsData.map(c => c.id);
     const versionPerId = stashData.stashCompsData.map(c => c.id.changeVersion(c.hash.toString()));
-    await this.checkout.checkout({
+    await this.checkout.checkout(_objectSpread(_objectSpread({}, checkoutProps), {}, {
       ids: compIds,
       skipNpmInstall: true,
       versionPerId,
-      skipUpdatingBitmap: true
-    });
+      skipUpdatingBitmap: true,
+      promptMergeOptions: true,
+      loadStash: true
+    }));
     await this.stashFiles.deleteStashFile(stashFile);
     return compIds;
   }
   async addComponentDataToRepo(component) {
+    const previousVersion = component.getSnapHash();
     const consumerComponent = component.state._consumer.clone();
     consumerComponent.setNewVersion();
     const {
       version,
       files
     } = await this.workspace.scope.legacyScope.sources.consumerComponentToVersion(consumerComponent);
+    if (previousVersion) {
+      // 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);
+      version.addAsOnlyParent(parent);
+    }
     const repo = this.workspace.scope.legacyScope.objects;
     repo.add(version);
     files.forEach(file => repo.add(file.file));

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

@@ -1 +1 @@
-{"version":3,"names":["_workspace","data","require","_snapping","_bitError","_lodash","_cli","_checkout","_stash","_stash2","_stashData","_stashFiles","_defineProperty","obj","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","StashMain","constructor","workspace","checkout","snapping","stashFiles","StashFiles","save","options","compIds","pattern","idsByPattern","listIds","comps","getMany","modifiedComps","compact","Promise","all","map","comp","head","undefined","isModified","length","consumeComponents","state","_consumer","_addFlattenedDependenciesToComponents","hashPerId","versionObj","addComponentDataToRepo","id","hash","scope","legacyScope","objects","persist","stashData","StashData","message","saveStashData","modifiedCompIds","c","ids","skipNpmInstall","reset","loadLatest","stashFile","getLatestStashFile","BitError","getStashData","stashCompsData","versionPerId","changeVersion","toString","skipUpdatingBitmap","deleteStashFile","component","consumerComponent","clone","setNewVersion","version","files","sources","consumerComponentToVersion","repo","add","forEach","file","provider","cli","stashMain","stashCmd","StashCmd","commands","StashSaveCmd","StashLoadCmd","register","exports","CLIAspect","WorkspaceAspect","CheckoutAspect","SnappingAspect","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 { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { StashAspect } from './stash.aspect';\nimport { StashCmd, StashLoadCmd, StashSaveCmd } from './stash.cmd';\nimport { StashData } from './stash-data';\nimport { StashFiles } from './stash-files';\n\nexport class StashMain {\n  private stashFiles: StashFiles;\n  constructor(private workspace: Workspace, private checkout: CheckoutMain, private snapping: SnappingMain) {\n    this.stashFiles = new StashFiles(workspace);\n  }\n\n  async save(options: { message?: string; pattern?: string }): Promise<ComponentID[]> {\n    const compIds = options?.pattern\n      ? await this.workspace.idsByPattern(options?.pattern)\n      : await this.workspace.listIds();\n    const comps = await this.workspace.getMany(compIds);\n    const modifiedComps = compact(\n      await Promise.all(\n        comps.map(async (comp) => {\n          if (!comp.head) return undefined; // it's new\n          const isModified = await this.workspace.isModified(comp);\n          if (isModified) return comp;\n          return undefined;\n        })\n      )\n    );\n    if (!modifiedComps.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 = modifiedComps.map((comp) => comp.state._consumer);\n    await this.snapping._addFlattenedDependenciesToComponents(consumeComponents);\n    const hashPerId = await Promise.all(\n      modifiedComps.map(async (comp) => {\n        const versionObj = await this.addComponentDataToRepo(comp);\n        return { id: comp.id, hash: versionObj.hash() };\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\n    return modifiedCompIds;\n  }\n\n  async loadLatest() {\n    const stashFile = 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 compIds = stashData.stashCompsData.map((c) => c.id);\n    const versionPerId = stashData.stashCompsData.map((c) => c.id.changeVersion(c.hash.toString()));\n\n    await this.checkout.checkout({\n      ids: compIds,\n      skipNpmInstall: true,\n      versionPerId,\n      skipUpdatingBitmap: true,\n    });\n\n    await this.stashFiles.deleteStashFile(stashFile);\n\n    return compIds;\n  }\n\n  private async addComponentDataToRepo(component: Component) {\n    const consumerComponent = component.state._consumer.clone() as ConsumerComponent;\n    consumerComponent.setNewVersion();\n    const { version, files } = await this.workspace.scope.legacyScope.sources.consumerComponentToVersion(\n      consumerComponent\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];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, checkout, snapping]: [CLIMain, Workspace, CheckoutMain, SnappingMain]) {\n    const stashMain = new StashMain(workspace, checkout, snapping);\n    const stashCmd = new StashCmd(stashMain);\n    stashCmd.commands = [new StashSaveCmd(stashMain), new StashLoadCmd(stashMain)];\n    cli.register(stashCmd);\n    return stashMain;\n  }\n}\n\nStashAspect.addRuntime(StashMain);\n\nexport default StashMain;\n"],"mappings":"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"}
+{"version":3,"names":["_workspace","data","require","_snapping","_bitError","_lodash","_cli","_objects","_checkout","_stash","_stash2","_stashData","_stashFiles","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","StashMain","constructor","workspace","checkout","snapping","stashFiles","StashFiles","save","options","compIds","pattern","idsByPattern","listIds","comps","getMany","modifiedComps","compact","Promise","all","map","comp","head","undefined","isModified","consumeComponents","state","_consumer","_addFlattenedDependenciesToComponents","hashPerId","versionObj","addComponentDataToRepo","id","hash","toString","scope","legacyScope","objects","persist","stashData","StashData","message","saveStashData","modifiedCompIds","c","ids","skipNpmInstall","reset","loadLatest","checkoutProps","stashFile","getLatestStashFile","BitError","getStashData","stashCompsData","versionPerId","changeVersion","skipUpdatingBitmap","promptMergeOptions","loadStash","deleteStashFile","component","previousVersion","getSnapHash","consumerComponent","clone","setNewVersion","version","files","sources","consumerComponentToVersion","modelComponent","Error","parent","Ref","from","addAsOnlyParent","repo","add","file","provider","cli","stashMain","stashCmd","StashCmd","commands","StashSaveCmd","StashLoadCmd","register","exports","CLIAspect","WorkspaceAspect","CheckoutAspect","SnappingAspect","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, StashLoadCmd, StashSaveCmd } from './stash.cmd';\nimport { StashData } from './stash-data';\nimport { StashFiles } from './stash-files';\n\nexport class StashMain {\n  private stashFiles: StashFiles;\n  constructor(private workspace: Workspace, private checkout: CheckoutMain, private snapping: SnappingMain) {\n    this.stashFiles = new StashFiles(workspace);\n  }\n\n  async save(options: { message?: string; pattern?: string }): Promise<ComponentID[]> {\n    const compIds = options?.pattern\n      ? await this.workspace.idsByPattern(options?.pattern)\n      : await this.workspace.listIds();\n    const comps = await this.workspace.getMany(compIds);\n    const modifiedComps = compact(\n      await Promise.all(\n        comps.map(async (comp) => {\n          if (!comp.head) return undefined; // it's new\n          const isModified = await this.workspace.isModified(comp);\n          if (isModified) return comp;\n          return undefined;\n        })\n      )\n    );\n    if (!modifiedComps.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 = modifiedComps.map((comp) => comp.state._consumer);\n    await this.snapping._addFlattenedDependenciesToComponents(consumeComponents);\n    const hashPerId = await Promise.all(\n      modifiedComps.map(async (comp) => {\n        const versionObj = await this.addComponentDataToRepo(comp);\n        return { id: comp.id, hash: versionObj.hash().toString() };\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\n    return modifiedCompIds;\n  }\n\n  async loadLatest(checkoutProps: CheckoutProps = {}) {\n    const stashFile = 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 compIds = stashData.stashCompsData.map((c) => c.id);\n    const versionPerId = stashData.stashCompsData.map((c) => c.id.changeVersion(c.hash.toString()));\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    });\n\n    await this.stashFiles.deleteStashFile(stashFile);\n\n    return compIds;\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    const { version, files } = await this.workspace.scope.legacyScope.sources.consumerComponentToVersion(\n      consumerComponent\n    );\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];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, checkout, snapping]: [CLIMain, Workspace, CheckoutMain, SnappingMain]) {\n    const stashMain = new StashMain(workspace, checkout, snapping);\n    const stashCmd = new StashCmd(stashMain);\n    stashCmd.commands = [new StashSaveCmd(stashMain), new StashLoadCmd(stashMain)];\n    cli.register(stashCmd);\n    return stashMain;\n  }\n}\n\nStashAspect.addRuntime(StashMain);\n\nexport default StashMain;\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/stash",
-  "version": "1.0.173",
+  "version": "1.0.174",
   "homepage": "https://bit.cloud/teambit/component/stash",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "stash",
-    "version": "1.0.173"
+    "version": "1.0.174"
   },
   "dependencies": {
     "fs-extra": "10.0.0",
@@ -16,11 +16,11 @@
     "@teambit/component-id": "1.2.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/workspace": "1.0.173",
+    "@teambit/workspace": "1.0.174",
+    "@teambit/checkout": "1.0.174",
     "@teambit/cli": "0.0.851",
-    "@teambit/checkout": "1.0.173",
-    "@teambit/component": "1.0.173",
-    "@teambit/snapping": "1.0.173"
+    "@teambit/component": "1.0.174",
+    "@teambit/snapping": "1.0.174"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",