@teambit/merge-lanes 1.0.503 → 1.0.505

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +197 -516
  3. package/dist/merge-lanes.main.runtime.js +7 -0
  4. package/dist/merge-lanes.main.runtime.js.map +1 -1
  5. package/package.json +24 -24
  6. /package/dist/{preview-1735217145314.js → preview-1736219851589.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -65,11 +65,7 @@
65
65
  "line": 78,
66
66
  "character": 24
67
67
  },
68
- "name": "Workspace",
69
- "componentId": {
70
- "scope": "teambit.workspace",
71
- "name": "workspace"
72
- }
68
+ "name": "Workspace"
73
69
  },
74
70
  {
75
71
  "__schema": "KeywordTypeSchema",
@@ -100,11 +96,7 @@
100
96
  "line": 79,
101
97
  "character": 22
102
98
  },
103
- "name": "MergingMain",
104
- "componentId": {
105
- "scope": "teambit.component",
106
- "name": "merging"
107
- }
99
+ "name": "MergingMain"
108
100
  },
109
101
  "isOptional": false,
110
102
  "isSpread": false
@@ -124,11 +116,7 @@
124
116
  "line": 80,
125
117
  "character": 21
126
118
  },
127
- "name": "LanesMain",
128
- "componentId": {
129
- "scope": "teambit.lanes",
130
- "name": "lanes"
131
- }
119
+ "name": "LanesMain"
132
120
  },
133
121
  "isOptional": false,
134
122
  "isSpread": false
@@ -148,11 +136,7 @@
148
136
  "line": 81,
149
137
  "character": 22
150
138
  },
151
- "name": "Logger",
152
- "componentId": {
153
- "scope": "teambit.harmony",
154
- "name": "logger"
155
- }
139
+ "name": "Logger"
156
140
  },
157
141
  "isOptional": false,
158
142
  "isSpread": false
@@ -172,11 +156,7 @@
172
156
  "line": 82,
173
157
  "character": 21
174
158
  },
175
- "name": "RemoveMain",
176
- "componentId": {
177
- "scope": "teambit.component",
178
- "name": "remove"
179
- }
159
+ "name": "RemoveMain"
180
160
  },
181
161
  "isOptional": false,
182
162
  "isSpread": false
@@ -196,11 +176,7 @@
196
176
  "line": 83,
197
177
  "character": 20
198
178
  },
199
- "name": "ScopeMain",
200
- "componentId": {
201
- "scope": "teambit.scope",
202
- "name": "scope"
203
- }
179
+ "name": "ScopeMain"
204
180
  },
205
181
  "isOptional": false,
206
182
  "isSpread": false
@@ -220,11 +196,7 @@
220
196
  "line": 84,
221
197
  "character": 23
222
198
  },
223
- "name": "ExportMain",
224
- "componentId": {
225
- "scope": "teambit.scope",
226
- "name": "export"
227
- }
199
+ "name": "ExportMain"
228
200
  },
229
201
  "isOptional": false,
230
202
  "isSpread": false
@@ -244,11 +216,7 @@
244
216
  "line": 85,
245
217
  "character": 23
246
218
  },
247
- "name": "ImporterMain",
248
- "componentId": {
249
- "scope": "teambit.scope",
250
- "name": "importer"
251
- }
219
+ "name": "ImporterMain"
252
220
  },
253
221
  "isOptional": false,
254
222
  "isSpread": false
@@ -268,11 +236,7 @@
268
236
  "line": 86,
269
237
  "character": 23
270
238
  },
271
- "name": "CheckoutMain",
272
- "componentId": {
273
- "scope": "teambit.component",
274
- "name": "checkout"
275
- }
239
+ "name": "CheckoutMain"
276
240
  },
277
241
  "isOptional": false,
278
242
  "isSpread": false
@@ -334,8 +298,7 @@
334
298
  "line": 89,
335
299
  "character": 51
336
300
  },
337
- "name": "MergeLaneOptions",
338
- "internalFilePath": "merge-lanes.main.runtime.ts"
301
+ "name": "MergeLaneOptions"
339
302
  },
340
303
  "isOptional": false,
341
304
  "isSpread": false
@@ -379,12 +342,7 @@
379
342
  "line": 100,
380
343
  "character": 18
381
344
  },
382
- "name": "LaneId",
383
- "componentId": {
384
- "scope": "teambit.lanes",
385
- "name": "lane-id",
386
- "version": "0.0.311"
387
- }
345
+ "name": "LaneId"
388
346
  },
389
347
  "isOptional": false,
390
348
  "isSpread": false
@@ -404,12 +362,7 @@
404
362
  "line": 101,
405
363
  "character": 20
406
364
  },
407
- "name": "LaneId",
408
- "componentId": {
409
- "scope": "teambit.lanes",
410
- "name": "lane-id",
411
- "version": "0.0.311"
412
- }
365
+ "name": "LaneId"
413
366
  },
414
367
  "isOptional": false,
415
368
  "isSpread": false
@@ -429,8 +382,7 @@
429
382
  "line": 102,
430
383
  "character": 14
431
384
  },
432
- "name": "MergeLaneOptions",
433
- "internalFilePath": "merge-lanes.main.runtime.ts"
385
+ "name": "MergeLaneOptions"
434
386
  },
435
387
  "isOptional": false,
436
388
  "isSpread": false
@@ -520,11 +472,7 @@
520
472
  "line": 106,
521
473
  "character": 25
522
474
  },
523
- "name": "ConfigMergeResult",
524
- "componentId": {
525
- "scope": "teambit.workspace",
526
- "name": "config-merger"
527
- }
475
+ "name": "ConfigMergeResult"
528
476
  }
529
477
  },
530
478
  "isOptional": false
@@ -552,12 +500,7 @@
552
500
  "line": 107,
553
501
  "character": 28
554
502
  },
555
- "name": "ComponentID",
556
- "componentId": {
557
- "scope": "teambit.component",
558
- "name": "component-id",
559
- "version": "1.2.2"
560
- }
503
+ "name": "ComponentID"
561
504
  }
562
505
  },
563
506
  "isOptional": false
@@ -585,8 +528,7 @@
585
528
  "line": 108,
586
529
  "character": 16
587
530
  },
588
- "name": "ConflictPerId",
589
- "internalFilePath": "merge-lanes.main.runtime.ts"
531
+ "name": "ConflictPerId"
590
532
  }
591
533
  },
592
534
  "isOptional": false
@@ -709,11 +651,7 @@
709
651
  "line": 344,
710
652
  "character": 39
711
653
  },
712
- "name": "CheckoutProps",
713
- "componentId": {
714
- "scope": "teambit.component",
715
- "name": "checkout"
716
- }
654
+ "name": "CheckoutProps"
717
655
  },
718
656
  "isOptional": false,
719
657
  "isSpread": false
@@ -733,8 +671,7 @@
733
671
  "line": 344,
734
672
  "character": 70
735
673
  },
736
- "name": "MergeAbortOpts",
737
- "internalFilePath": "merge-abort.cmd.ts"
674
+ "name": "MergeAbortOpts"
738
675
  },
739
676
  "isOptional": false,
740
677
  "isSpread": false
@@ -835,8 +772,7 @@
835
772
  "line": 403,
836
773
  "character": 22
837
774
  },
838
- "name": "MergeLaneOptions",
839
- "internalFilePath": "merge-lanes.main.runtime.ts"
775
+ "name": "MergeLaneOptions"
840
776
  }
841
777
  ]
842
778
  },
@@ -912,8 +848,7 @@
912
848
  "line": 404,
913
849
  "character": 14
914
850
  },
915
- "name": "MergeFromScopeResult",
916
- "internalFilePath": "merge-lanes.main.runtime.ts"
851
+ "name": "MergeFromScopeResult"
917
852
  }
918
853
  ]
919
854
  },
@@ -925,7 +860,7 @@
925
860
  "__schema": "VariableLikeSchema",
926
861
  "location": {
927
862
  "filePath": "merge-lanes.main.runtime.ts",
928
- "line": 497,
863
+ "line": 504,
929
864
  "character": 3
930
865
  },
931
866
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -934,7 +869,7 @@
934
869
  "__schema": "InferenceTypeSchema",
935
870
  "location": {
936
871
  "filePath": "merge-lanes.main.runtime.ts",
937
- "line": 497,
872
+ "line": 504,
938
873
  "character": 3
939
874
  },
940
875
  "type": "never[]"
@@ -946,7 +881,7 @@
946
881
  "__schema": "VariableLikeSchema",
947
882
  "location": {
948
883
  "filePath": "merge-lanes.main.runtime.ts",
949
- "line": 498,
884
+ "line": 505,
950
885
  "character": 3
951
886
  },
952
887
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -955,7 +890,7 @@
955
890
  "__schema": "InferenceTypeSchema",
956
891
  "location": {
957
892
  "filePath": "merge-lanes.main.runtime.ts",
958
- "line": 498,
893
+ "line": 505,
959
894
  "character": 3
960
895
  },
961
896
  "type": "Aspect[]"
@@ -967,7 +902,7 @@
967
902
  "__schema": "VariableLikeSchema",
968
903
  "location": {
969
904
  "filePath": "merge-lanes.main.runtime.ts",
970
- "line": 511,
905
+ "line": 518,
971
906
  "character": 3
972
907
  },
973
908
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -976,7 +911,7 @@
976
911
  "__schema": "InferenceTypeSchema",
977
912
  "location": {
978
913
  "filePath": "merge-lanes.main.runtime.ts",
979
- "line": 511,
914
+ "line": 518,
980
915
  "character": 3
981
916
  },
982
917
  "type": "RuntimeDefinition"
@@ -988,7 +923,7 @@
988
923
  "__schema": "FunctionLikeSchema",
989
924
  "location": {
990
925
  "filePath": "merge-lanes.main.runtime.ts",
991
- "line": 513,
926
+ "line": 520,
992
927
  "character": 3
993
928
  },
994
929
  "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -998,7 +933,7 @@
998
933
  "__schema": "ParameterSchema",
999
934
  "location": {
1000
935
  "filePath": "merge-lanes.main.runtime.ts",
1001
- "line": 513,
936
+ "line": 520,
1002
937
  "character": 25
1003
938
  },
1004
939
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -1006,7 +941,7 @@
1006
941
  "__schema": "TupleTypeSchema",
1007
942
  "location": {
1008
943
  "filePath": "merge-lanes.main.runtime.ts",
1009
- "line": 525,
944
+ "line": 532,
1010
945
  "character": 6
1011
946
  },
1012
947
  "elements": [
@@ -1014,144 +949,100 @@
1014
949
  "__schema": "TypeRefSchema",
1015
950
  "location": {
1016
951
  "filePath": "merge-lanes.main.runtime.ts",
1017
- "line": 526,
952
+ "line": 533,
1018
953
  "character": 5
1019
954
  },
1020
- "name": "LanesMain",
1021
- "componentId": {
1022
- "scope": "teambit.lanes",
1023
- "name": "lanes"
1024
- }
955
+ "name": "LanesMain"
1025
956
  },
1026
957
  {
1027
958
  "__schema": "TypeRefSchema",
1028
959
  "location": {
1029
960
  "filePath": "merge-lanes.main.runtime.ts",
1030
- "line": 527,
961
+ "line": 534,
1031
962
  "character": 5
1032
963
  },
1033
- "name": "CLIMain",
1034
- "componentId": {
1035
- "scope": "teambit.harmony",
1036
- "name": "cli"
1037
- }
964
+ "name": "CLIMain"
1038
965
  },
1039
966
  {
1040
967
  "__schema": "TypeRefSchema",
1041
968
  "location": {
1042
969
  "filePath": "merge-lanes.main.runtime.ts",
1043
- "line": 528,
970
+ "line": 535,
1044
971
  "character": 5
1045
972
  },
1046
- "name": "Workspace",
1047
- "componentId": {
1048
- "scope": "teambit.workspace",
1049
- "name": "workspace"
1050
- }
973
+ "name": "Workspace"
1051
974
  },
1052
975
  {
1053
976
  "__schema": "TypeRefSchema",
1054
977
  "location": {
1055
978
  "filePath": "merge-lanes.main.runtime.ts",
1056
- "line": 529,
979
+ "line": 536,
1057
980
  "character": 5
1058
981
  },
1059
- "name": "MergingMain",
1060
- "componentId": {
1061
- "scope": "teambit.component",
1062
- "name": "merging"
1063
- }
982
+ "name": "MergingMain"
1064
983
  },
1065
984
  {
1066
985
  "__schema": "TypeRefSchema",
1067
986
  "location": {
1068
987
  "filePath": "merge-lanes.main.runtime.ts",
1069
- "line": 530,
988
+ "line": 537,
1070
989
  "character": 5
1071
990
  },
1072
- "name": "LoggerMain",
1073
- "componentId": {
1074
- "scope": "teambit.harmony",
1075
- "name": "logger"
1076
- }
991
+ "name": "LoggerMain"
1077
992
  },
1078
993
  {
1079
994
  "__schema": "TypeRefSchema",
1080
995
  "location": {
1081
996
  "filePath": "merge-lanes.main.runtime.ts",
1082
- "line": 531,
997
+ "line": 538,
1083
998
  "character": 5
1084
999
  },
1085
- "name": "RemoveMain",
1086
- "componentId": {
1087
- "scope": "teambit.component",
1088
- "name": "remove"
1089
- }
1000
+ "name": "RemoveMain"
1090
1001
  },
1091
1002
  {
1092
1003
  "__schema": "TypeRefSchema",
1093
1004
  "location": {
1094
1005
  "filePath": "merge-lanes.main.runtime.ts",
1095
- "line": 532,
1006
+ "line": 539,
1096
1007
  "character": 5
1097
1008
  },
1098
- "name": "ScopeMain",
1099
- "componentId": {
1100
- "scope": "teambit.scope",
1101
- "name": "scope"
1102
- }
1009
+ "name": "ScopeMain"
1103
1010
  },
1104
1011
  {
1105
1012
  "__schema": "TypeRefSchema",
1106
1013
  "location": {
1107
1014
  "filePath": "merge-lanes.main.runtime.ts",
1108
- "line": 533,
1015
+ "line": 540,
1109
1016
  "character": 5
1110
1017
  },
1111
- "name": "ExportMain",
1112
- "componentId": {
1113
- "scope": "teambit.scope",
1114
- "name": "export"
1115
- }
1018
+ "name": "ExportMain"
1116
1019
  },
1117
1020
  {
1118
1021
  "__schema": "TypeRefSchema",
1119
1022
  "location": {
1120
1023
  "filePath": "merge-lanes.main.runtime.ts",
1121
- "line": 534,
1024
+ "line": 541,
1122
1025
  "character": 5
1123
1026
  },
1124
- "name": "ImporterMain",
1125
- "componentId": {
1126
- "scope": "teambit.scope",
1127
- "name": "importer"
1128
- }
1027
+ "name": "ImporterMain"
1129
1028
  },
1130
1029
  {
1131
1030
  "__schema": "TypeRefSchema",
1132
1031
  "location": {
1133
1032
  "filePath": "merge-lanes.main.runtime.ts",
1134
- "line": 535,
1033
+ "line": 542,
1135
1034
  "character": 5
1136
1035
  },
1137
- "name": "CheckoutMain",
1138
- "componentId": {
1139
- "scope": "teambit.component",
1140
- "name": "checkout"
1141
- }
1036
+ "name": "CheckoutMain"
1142
1037
  },
1143
1038
  {
1144
1039
  "__schema": "TypeRefSchema",
1145
1040
  "location": {
1146
1041
  "filePath": "merge-lanes.main.runtime.ts",
1147
- "line": 536,
1042
+ "line": 543,
1148
1043
  "character": 5
1149
1044
  },
1150
- "name": "GlobalConfigMain",
1151
- "componentId": {
1152
- "scope": "teambit.harmony",
1153
- "name": "global-config"
1154
- }
1045
+ "name": "GlobalConfigMain"
1155
1046
  }
1156
1047
  ]
1157
1048
  },
@@ -1163,7 +1054,7 @@
1163
1054
  "__schema": "InferenceTypeSchema",
1164
1055
  "location": {
1165
1056
  "filePath": "merge-lanes.main.runtime.ts",
1166
- "line": 513,
1057
+ "line": 520,
1167
1058
  "character": 3
1168
1059
  },
1169
1060
  "type": "Promise<MergeLanesMain>"
@@ -1269,11 +1160,7 @@
1269
1160
  "line": 41,
1270
1161
  "character": 18
1271
1162
  },
1272
- "name": "MergeStrategy",
1273
- "componentId": {
1274
- "scope": "teambit.component",
1275
- "name": "merging"
1276
- }
1163
+ "name": "MergeStrategy"
1277
1164
  },
1278
1165
  "isOptional": false
1279
1166
  },
@@ -1573,11 +1460,7 @@
1573
1460
  "line": 56,
1574
1461
  "character": 22
1575
1462
  },
1576
- "name": "MergeStrategy",
1577
- "componentId": {
1578
- "scope": "teambit.component",
1579
- "name": "merging"
1580
- }
1463
+ "name": "MergeStrategy"
1581
1464
  },
1582
1465
  "isOptional": true
1583
1466
  },
@@ -1857,12 +1740,7 @@
1857
1740
  "line": 67,
1858
1741
  "character": 14
1859
1742
  },
1860
- "name": "ComponentID",
1861
- "componentId": {
1862
- "scope": "teambit.component",
1863
- "name": "component-id",
1864
- "version": "1.2.2"
1865
- }
1743
+ "name": "ComponentID"
1866
1744
  }
1867
1745
  },
1868
1746
  "isOptional": false
@@ -1890,12 +1768,7 @@
1890
1768
  "line": 68,
1891
1769
  "character": 16
1892
1770
  },
1893
- "name": "ComponentID",
1894
- "componentId": {
1895
- "scope": "teambit.component",
1896
- "name": "component-id",
1897
- "version": "1.2.2"
1898
- }
1771
+ "name": "ComponentID"
1899
1772
  }
1900
1773
  },
1901
1774
  "isOptional": false
@@ -1997,8 +1870,7 @@
1997
1870
  "line": 70,
1998
1871
  "character": 15
1999
1872
  },
2000
- "name": "ConflictPerId",
2001
- "internalFilePath": "merge-lanes.main.runtime.ts"
1873
+ "name": "ConflictPerId"
2002
1874
  }
2003
1875
  },
2004
1876
  "isOptional": true
@@ -2026,12 +1898,7 @@
2026
1898
  "line": 71,
2027
1899
  "character": 16
2028
1900
  },
2029
- "name": "ComponentID",
2030
- "componentId": {
2031
- "scope": "teambit.component",
2032
- "name": "component-id",
2033
- "version": "1.2.2"
2034
- }
1901
+ "name": "ComponentID"
2035
1902
  }
2036
1903
  },
2037
1904
  "isOptional": true
@@ -2059,12 +1926,7 @@
2059
1926
  "line": 72,
2060
1927
  "character": 21
2061
1928
  },
2062
- "name": "ComponentID",
2063
- "componentId": {
2064
- "scope": "teambit.component",
2065
- "name": "component-id",
2066
- "version": "1.2.2"
2067
- }
1929
+ "name": "ComponentID"
2068
1930
  }
2069
1931
  },
2070
1932
  "isOptional": false
@@ -2135,11 +1997,7 @@
2135
1997
  "line": 78,
2136
1998
  "character": 24
2137
1999
  },
2138
- "name": "Workspace",
2139
- "componentId": {
2140
- "scope": "teambit.workspace",
2141
- "name": "workspace"
2142
- }
2000
+ "name": "Workspace"
2143
2001
  },
2144
2002
  {
2145
2003
  "__schema": "KeywordTypeSchema",
@@ -2170,11 +2028,7 @@
2170
2028
  "line": 79,
2171
2029
  "character": 22
2172
2030
  },
2173
- "name": "MergingMain",
2174
- "componentId": {
2175
- "scope": "teambit.component",
2176
- "name": "merging"
2177
- }
2031
+ "name": "MergingMain"
2178
2032
  },
2179
2033
  "isOptional": false,
2180
2034
  "isSpread": false
@@ -2194,11 +2048,7 @@
2194
2048
  "line": 80,
2195
2049
  "character": 21
2196
2050
  },
2197
- "name": "LanesMain",
2198
- "componentId": {
2199
- "scope": "teambit.lanes",
2200
- "name": "lanes"
2201
- }
2051
+ "name": "LanesMain"
2202
2052
  },
2203
2053
  "isOptional": false,
2204
2054
  "isSpread": false
@@ -2218,11 +2068,7 @@
2218
2068
  "line": 81,
2219
2069
  "character": 22
2220
2070
  },
2221
- "name": "Logger",
2222
- "componentId": {
2223
- "scope": "teambit.harmony",
2224
- "name": "logger"
2225
- }
2071
+ "name": "Logger"
2226
2072
  },
2227
2073
  "isOptional": false,
2228
2074
  "isSpread": false
@@ -2242,11 +2088,7 @@
2242
2088
  "line": 82,
2243
2089
  "character": 21
2244
2090
  },
2245
- "name": "RemoveMain",
2246
- "componentId": {
2247
- "scope": "teambit.component",
2248
- "name": "remove"
2249
- }
2091
+ "name": "RemoveMain"
2250
2092
  },
2251
2093
  "isOptional": false,
2252
2094
  "isSpread": false
@@ -2266,11 +2108,7 @@
2266
2108
  "line": 83,
2267
2109
  "character": 20
2268
2110
  },
2269
- "name": "ScopeMain",
2270
- "componentId": {
2271
- "scope": "teambit.scope",
2272
- "name": "scope"
2273
- }
2111
+ "name": "ScopeMain"
2274
2112
  },
2275
2113
  "isOptional": false,
2276
2114
  "isSpread": false
@@ -2290,11 +2128,7 @@
2290
2128
  "line": 84,
2291
2129
  "character": 23
2292
2130
  },
2293
- "name": "ExportMain",
2294
- "componentId": {
2295
- "scope": "teambit.scope",
2296
- "name": "export"
2297
- }
2131
+ "name": "ExportMain"
2298
2132
  },
2299
2133
  "isOptional": false,
2300
2134
  "isSpread": false
@@ -2314,11 +2148,7 @@
2314
2148
  "line": 85,
2315
2149
  "character": 23
2316
2150
  },
2317
- "name": "ImporterMain",
2318
- "componentId": {
2319
- "scope": "teambit.scope",
2320
- "name": "importer"
2321
- }
2151
+ "name": "ImporterMain"
2322
2152
  },
2323
2153
  "isOptional": false,
2324
2154
  "isSpread": false
@@ -2338,11 +2168,7 @@
2338
2168
  "line": 86,
2339
2169
  "character": 23
2340
2170
  },
2341
- "name": "CheckoutMain",
2342
- "componentId": {
2343
- "scope": "teambit.component",
2344
- "name": "checkout"
2345
- }
2171
+ "name": "CheckoutMain"
2346
2172
  },
2347
2173
  "isOptional": false,
2348
2174
  "isSpread": false
@@ -2404,8 +2230,7 @@
2404
2230
  "line": 89,
2405
2231
  "character": 51
2406
2232
  },
2407
- "name": "MergeLaneOptions",
2408
- "internalFilePath": "merge-lanes.main.runtime.ts"
2233
+ "name": "MergeLaneOptions"
2409
2234
  },
2410
2235
  "isOptional": false,
2411
2236
  "isSpread": false
@@ -2449,12 +2274,7 @@
2449
2274
  "line": 100,
2450
2275
  "character": 18
2451
2276
  },
2452
- "name": "LaneId",
2453
- "componentId": {
2454
- "scope": "teambit.lanes",
2455
- "name": "lane-id",
2456
- "version": "0.0.311"
2457
- }
2277
+ "name": "LaneId"
2458
2278
  },
2459
2279
  "isOptional": false,
2460
2280
  "isSpread": false
@@ -2474,12 +2294,7 @@
2474
2294
  "line": 101,
2475
2295
  "character": 20
2476
2296
  },
2477
- "name": "LaneId",
2478
- "componentId": {
2479
- "scope": "teambit.lanes",
2480
- "name": "lane-id",
2481
- "version": "0.0.311"
2482
- }
2297
+ "name": "LaneId"
2483
2298
  },
2484
2299
  "isOptional": false,
2485
2300
  "isSpread": false
@@ -2499,8 +2314,7 @@
2499
2314
  "line": 102,
2500
2315
  "character": 14
2501
2316
  },
2502
- "name": "MergeLaneOptions",
2503
- "internalFilePath": "merge-lanes.main.runtime.ts"
2317
+ "name": "MergeLaneOptions"
2504
2318
  },
2505
2319
  "isOptional": false,
2506
2320
  "isSpread": false
@@ -2590,11 +2404,7 @@
2590
2404
  "line": 106,
2591
2405
  "character": 25
2592
2406
  },
2593
- "name": "ConfigMergeResult",
2594
- "componentId": {
2595
- "scope": "teambit.workspace",
2596
- "name": "config-merger"
2597
- }
2407
+ "name": "ConfigMergeResult"
2598
2408
  }
2599
2409
  },
2600
2410
  "isOptional": false
@@ -2622,12 +2432,7 @@
2622
2432
  "line": 107,
2623
2433
  "character": 28
2624
2434
  },
2625
- "name": "ComponentID",
2626
- "componentId": {
2627
- "scope": "teambit.component",
2628
- "name": "component-id",
2629
- "version": "1.2.2"
2630
- }
2435
+ "name": "ComponentID"
2631
2436
  }
2632
2437
  },
2633
2438
  "isOptional": false
@@ -2655,8 +2460,7 @@
2655
2460
  "line": 108,
2656
2461
  "character": 16
2657
2462
  },
2658
- "name": "ConflictPerId",
2659
- "internalFilePath": "merge-lanes.main.runtime.ts"
2463
+ "name": "ConflictPerId"
2660
2464
  }
2661
2465
  },
2662
2466
  "isOptional": false
@@ -2779,11 +2583,7 @@
2779
2583
  "line": 344,
2780
2584
  "character": 39
2781
2585
  },
2782
- "name": "CheckoutProps",
2783
- "componentId": {
2784
- "scope": "teambit.component",
2785
- "name": "checkout"
2786
- }
2586
+ "name": "CheckoutProps"
2787
2587
  },
2788
2588
  "isOptional": false,
2789
2589
  "isSpread": false
@@ -2803,8 +2603,7 @@
2803
2603
  "line": 344,
2804
2604
  "character": 70
2805
2605
  },
2806
- "name": "MergeAbortOpts",
2807
- "internalFilePath": "merge-abort.cmd.ts"
2606
+ "name": "MergeAbortOpts"
2808
2607
  },
2809
2608
  "isOptional": false,
2810
2609
  "isSpread": false
@@ -2905,8 +2704,7 @@
2905
2704
  "line": 403,
2906
2705
  "character": 22
2907
2706
  },
2908
- "name": "MergeLaneOptions",
2909
- "internalFilePath": "merge-lanes.main.runtime.ts"
2707
+ "name": "MergeLaneOptions"
2910
2708
  }
2911
2709
  ]
2912
2710
  },
@@ -2982,8 +2780,7 @@
2982
2780
  "line": 404,
2983
2781
  "character": 14
2984
2782
  },
2985
- "name": "MergeFromScopeResult",
2986
- "internalFilePath": "merge-lanes.main.runtime.ts"
2783
+ "name": "MergeFromScopeResult"
2987
2784
  }
2988
2785
  ]
2989
2786
  },
@@ -2995,7 +2792,7 @@
2995
2792
  "__schema": "VariableLikeSchema",
2996
2793
  "location": {
2997
2794
  "filePath": "merge-lanes.main.runtime.ts",
2998
- "line": 497,
2795
+ "line": 504,
2999
2796
  "character": 3
3000
2797
  },
3001
2798
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -3004,7 +2801,7 @@
3004
2801
  "__schema": "InferenceTypeSchema",
3005
2802
  "location": {
3006
2803
  "filePath": "merge-lanes.main.runtime.ts",
3007
- "line": 497,
2804
+ "line": 504,
3008
2805
  "character": 3
3009
2806
  },
3010
2807
  "type": "never[]"
@@ -3016,7 +2813,7 @@
3016
2813
  "__schema": "VariableLikeSchema",
3017
2814
  "location": {
3018
2815
  "filePath": "merge-lanes.main.runtime.ts",
3019
- "line": 498,
2816
+ "line": 505,
3020
2817
  "character": 3
3021
2818
  },
3022
2819
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -3025,7 +2822,7 @@
3025
2822
  "__schema": "InferenceTypeSchema",
3026
2823
  "location": {
3027
2824
  "filePath": "merge-lanes.main.runtime.ts",
3028
- "line": 498,
2825
+ "line": 505,
3029
2826
  "character": 3
3030
2827
  },
3031
2828
  "type": "Aspect[]"
@@ -3037,7 +2834,7 @@
3037
2834
  "__schema": "VariableLikeSchema",
3038
2835
  "location": {
3039
2836
  "filePath": "merge-lanes.main.runtime.ts",
3040
- "line": 511,
2837
+ "line": 518,
3041
2838
  "character": 3
3042
2839
  },
3043
2840
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -3046,7 +2843,7 @@
3046
2843
  "__schema": "InferenceTypeSchema",
3047
2844
  "location": {
3048
2845
  "filePath": "merge-lanes.main.runtime.ts",
3049
- "line": 511,
2846
+ "line": 518,
3050
2847
  "character": 3
3051
2848
  },
3052
2849
  "type": "RuntimeDefinition"
@@ -3058,7 +2855,7 @@
3058
2855
  "__schema": "FunctionLikeSchema",
3059
2856
  "location": {
3060
2857
  "filePath": "merge-lanes.main.runtime.ts",
3061
- "line": 513,
2858
+ "line": 520,
3062
2859
  "character": 3
3063
2860
  },
3064
2861
  "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -3068,7 +2865,7 @@
3068
2865
  "__schema": "ParameterSchema",
3069
2866
  "location": {
3070
2867
  "filePath": "merge-lanes.main.runtime.ts",
3071
- "line": 513,
2868
+ "line": 520,
3072
2869
  "character": 25
3073
2870
  },
3074
2871
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -3076,7 +2873,7 @@
3076
2873
  "__schema": "TupleTypeSchema",
3077
2874
  "location": {
3078
2875
  "filePath": "merge-lanes.main.runtime.ts",
3079
- "line": 525,
2876
+ "line": 532,
3080
2877
  "character": 6
3081
2878
  },
3082
2879
  "elements": [
@@ -3084,144 +2881,100 @@
3084
2881
  "__schema": "TypeRefSchema",
3085
2882
  "location": {
3086
2883
  "filePath": "merge-lanes.main.runtime.ts",
3087
- "line": 526,
2884
+ "line": 533,
3088
2885
  "character": 5
3089
2886
  },
3090
- "name": "LanesMain",
3091
- "componentId": {
3092
- "scope": "teambit.lanes",
3093
- "name": "lanes"
3094
- }
2887
+ "name": "LanesMain"
3095
2888
  },
3096
2889
  {
3097
2890
  "__schema": "TypeRefSchema",
3098
2891
  "location": {
3099
2892
  "filePath": "merge-lanes.main.runtime.ts",
3100
- "line": 527,
2893
+ "line": 534,
3101
2894
  "character": 5
3102
2895
  },
3103
- "name": "CLIMain",
3104
- "componentId": {
3105
- "scope": "teambit.harmony",
3106
- "name": "cli"
3107
- }
2896
+ "name": "CLIMain"
3108
2897
  },
3109
2898
  {
3110
2899
  "__schema": "TypeRefSchema",
3111
2900
  "location": {
3112
2901
  "filePath": "merge-lanes.main.runtime.ts",
3113
- "line": 528,
2902
+ "line": 535,
3114
2903
  "character": 5
3115
2904
  },
3116
- "name": "Workspace",
3117
- "componentId": {
3118
- "scope": "teambit.workspace",
3119
- "name": "workspace"
3120
- }
2905
+ "name": "Workspace"
3121
2906
  },
3122
2907
  {
3123
2908
  "__schema": "TypeRefSchema",
3124
2909
  "location": {
3125
2910
  "filePath": "merge-lanes.main.runtime.ts",
3126
- "line": 529,
2911
+ "line": 536,
3127
2912
  "character": 5
3128
2913
  },
3129
- "name": "MergingMain",
3130
- "componentId": {
3131
- "scope": "teambit.component",
3132
- "name": "merging"
3133
- }
2914
+ "name": "MergingMain"
3134
2915
  },
3135
2916
  {
3136
2917
  "__schema": "TypeRefSchema",
3137
2918
  "location": {
3138
2919
  "filePath": "merge-lanes.main.runtime.ts",
3139
- "line": 530,
2920
+ "line": 537,
3140
2921
  "character": 5
3141
2922
  },
3142
- "name": "LoggerMain",
3143
- "componentId": {
3144
- "scope": "teambit.harmony",
3145
- "name": "logger"
3146
- }
2923
+ "name": "LoggerMain"
3147
2924
  },
3148
2925
  {
3149
2926
  "__schema": "TypeRefSchema",
3150
2927
  "location": {
3151
2928
  "filePath": "merge-lanes.main.runtime.ts",
3152
- "line": 531,
2929
+ "line": 538,
3153
2930
  "character": 5
3154
2931
  },
3155
- "name": "RemoveMain",
3156
- "componentId": {
3157
- "scope": "teambit.component",
3158
- "name": "remove"
3159
- }
2932
+ "name": "RemoveMain"
3160
2933
  },
3161
2934
  {
3162
2935
  "__schema": "TypeRefSchema",
3163
2936
  "location": {
3164
2937
  "filePath": "merge-lanes.main.runtime.ts",
3165
- "line": 532,
2938
+ "line": 539,
3166
2939
  "character": 5
3167
2940
  },
3168
- "name": "ScopeMain",
3169
- "componentId": {
3170
- "scope": "teambit.scope",
3171
- "name": "scope"
3172
- }
2941
+ "name": "ScopeMain"
3173
2942
  },
3174
2943
  {
3175
2944
  "__schema": "TypeRefSchema",
3176
2945
  "location": {
3177
2946
  "filePath": "merge-lanes.main.runtime.ts",
3178
- "line": 533,
2947
+ "line": 540,
3179
2948
  "character": 5
3180
2949
  },
3181
- "name": "ExportMain",
3182
- "componentId": {
3183
- "scope": "teambit.scope",
3184
- "name": "export"
3185
- }
2950
+ "name": "ExportMain"
3186
2951
  },
3187
2952
  {
3188
2953
  "__schema": "TypeRefSchema",
3189
2954
  "location": {
3190
2955
  "filePath": "merge-lanes.main.runtime.ts",
3191
- "line": 534,
2956
+ "line": 541,
3192
2957
  "character": 5
3193
2958
  },
3194
- "name": "ImporterMain",
3195
- "componentId": {
3196
- "scope": "teambit.scope",
3197
- "name": "importer"
3198
- }
2959
+ "name": "ImporterMain"
3199
2960
  },
3200
2961
  {
3201
2962
  "__schema": "TypeRefSchema",
3202
2963
  "location": {
3203
2964
  "filePath": "merge-lanes.main.runtime.ts",
3204
- "line": 535,
2965
+ "line": 542,
3205
2966
  "character": 5
3206
2967
  },
3207
- "name": "CheckoutMain",
3208
- "componentId": {
3209
- "scope": "teambit.component",
3210
- "name": "checkout"
3211
- }
2968
+ "name": "CheckoutMain"
3212
2969
  },
3213
2970
  {
3214
2971
  "__schema": "TypeRefSchema",
3215
2972
  "location": {
3216
2973
  "filePath": "merge-lanes.main.runtime.ts",
3217
- "line": 536,
2974
+ "line": 543,
3218
2975
  "character": 5
3219
2976
  },
3220
- "name": "GlobalConfigMain",
3221
- "componentId": {
3222
- "scope": "teambit.harmony",
3223
- "name": "global-config"
3224
- }
2977
+ "name": "GlobalConfigMain"
3225
2978
  }
3226
2979
  ]
3227
2980
  },
@@ -3233,7 +2986,7 @@
3233
2986
  "__schema": "InferenceTypeSchema",
3234
2987
  "location": {
3235
2988
  "filePath": "merge-lanes.main.runtime.ts",
3236
- "line": 513,
2989
+ "line": 520,
3237
2990
  "character": 3
3238
2991
  },
3239
2992
  "type": "Promise<MergeLanesMain>"
@@ -3251,7 +3004,7 @@
3251
3004
  "__schema": "UnImplementedSchema",
3252
3005
  "location": {
3253
3006
  "filePath": "merge-lanes.main.runtime.ts",
3254
- "line": 819,
3007
+ "line": 826,
3255
3008
  "character": 16
3256
3009
  },
3257
3010
  "name": "MergeLanesMain",
@@ -3263,7 +3016,7 @@
3263
3016
  "__schema": "FunctionLikeSchema",
3264
3017
  "location": {
3265
3018
  "filePath": "merge-lanes.main.runtime.ts",
3266
- "line": 559,
3019
+ "line": 566,
3267
3020
  "character": 1
3268
3021
  },
3269
3022
  "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -3273,7 +3026,7 @@
3273
3026
  "__schema": "ParameterSchema",
3274
3027
  "location": {
3275
3028
  "filePath": "merge-lanes.main.runtime.ts",
3276
- "line": 560,
3029
+ "line": 567,
3277
3030
  "character": 3
3278
3031
  },
3279
3032
  "name": "allComponentsStatus",
@@ -3281,21 +3034,17 @@
3281
3034
  "__schema": "TypeArraySchema",
3282
3035
  "location": {
3283
3036
  "filePath": "merge-lanes.main.runtime.ts",
3284
- "line": 560,
3037
+ "line": 567,
3285
3038
  "character": 24
3286
3039
  },
3287
3040
  "type": {
3288
3041
  "__schema": "TypeRefSchema",
3289
3042
  "location": {
3290
3043
  "filePath": "merge-lanes.main.runtime.ts",
3291
- "line": 560,
3044
+ "line": 567,
3292
3045
  "character": 24
3293
3046
  },
3294
- "name": "ComponentMergeStatus",
3295
- "componentId": {
3296
- "scope": "teambit.component",
3297
- "name": "merging"
3298
- }
3047
+ "name": "ComponentMergeStatus"
3299
3048
  }
3300
3049
  },
3301
3050
  "isOptional": false,
@@ -3305,7 +3054,7 @@
3305
3054
  "__schema": "ParameterSchema",
3306
3055
  "location": {
3307
3056
  "filePath": "merge-lanes.main.runtime.ts",
3308
- "line": 561,
3057
+ "line": 568,
3309
3058
  "character": 3
3310
3059
  },
3311
3060
  "name": "compIdsToKeep",
@@ -3313,22 +3062,17 @@
3313
3062
  "__schema": "TypeArraySchema",
3314
3063
  "location": {
3315
3064
  "filePath": "merge-lanes.main.runtime.ts",
3316
- "line": 561,
3065
+ "line": 568,
3317
3066
  "character": 18
3318
3067
  },
3319
3068
  "type": {
3320
3069
  "__schema": "TypeRefSchema",
3321
3070
  "location": {
3322
3071
  "filePath": "merge-lanes.main.runtime.ts",
3323
- "line": 561,
3072
+ "line": 568,
3324
3073
  "character": 18
3325
3074
  },
3326
- "name": "ComponentID",
3327
- "componentId": {
3328
- "scope": "teambit.component",
3329
- "name": "component-id",
3330
- "version": "1.2.2"
3331
- }
3075
+ "name": "ComponentID"
3332
3076
  }
3333
3077
  },
3334
3078
  "isOptional": false,
@@ -3338,7 +3082,7 @@
3338
3082
  "__schema": "ParameterSchema",
3339
3083
  "location": {
3340
3084
  "filePath": "merge-lanes.main.runtime.ts",
3341
- "line": 562,
3085
+ "line": 569,
3342
3086
  "character": 3
3343
3087
  },
3344
3088
  "name": "allBitIds",
@@ -3346,22 +3090,17 @@
3346
3090
  "__schema": "TypeArraySchema",
3347
3091
  "location": {
3348
3092
  "filePath": "merge-lanes.main.runtime.ts",
3349
- "line": 562,
3093
+ "line": 569,
3350
3094
  "character": 14
3351
3095
  },
3352
3096
  "type": {
3353
3097
  "__schema": "TypeRefSchema",
3354
3098
  "location": {
3355
3099
  "filePath": "merge-lanes.main.runtime.ts",
3356
- "line": 562,
3100
+ "line": 569,
3357
3101
  "character": 14
3358
3102
  },
3359
- "name": "ComponentID",
3360
- "componentId": {
3361
- "scope": "teambit.component",
3362
- "name": "component-id",
3363
- "version": "1.2.2"
3364
- }
3103
+ "name": "ComponentID"
3365
3104
  }
3366
3105
  },
3367
3106
  "isOptional": false,
@@ -3371,7 +3110,7 @@
3371
3110
  "__schema": "ParameterSchema",
3372
3111
  "location": {
3373
3112
  "filePath": "merge-lanes.main.runtime.ts",
3374
- "line": 563,
3113
+ "line": 570,
3375
3114
  "character": 3
3376
3115
  },
3377
3116
  "name": "legacyScope",
@@ -3379,7 +3118,7 @@
3379
3118
  "__schema": "TypeRefSchema",
3380
3119
  "location": {
3381
3120
  "filePath": "merge-lanes.main.runtime.ts",
3382
- "line": 563,
3121
+ "line": 570,
3383
3122
  "character": 16
3384
3123
  },
3385
3124
  "name": "LegacyScope"
@@ -3391,7 +3130,7 @@
3391
3130
  "__schema": "ParameterSchema",
3392
3131
  "location": {
3393
3132
  "filePath": "merge-lanes.main.runtime.ts",
3394
- "line": 564,
3133
+ "line": 571,
3395
3134
  "character": 3
3396
3135
  },
3397
3136
  "name": "includeDeps",
@@ -3399,7 +3138,7 @@
3399
3138
  "__schema": "InferenceTypeSchema",
3400
3139
  "location": {
3401
3140
  "filePath": "merge-lanes.main.runtime.ts",
3402
- "line": 564,
3141
+ "line": 571,
3403
3142
  "character": 3
3404
3143
  },
3405
3144
  "type": "boolean"
@@ -3412,7 +3151,7 @@
3412
3151
  "__schema": "ParameterSchema",
3413
3152
  "location": {
3414
3153
  "filePath": "merge-lanes.main.runtime.ts",
3415
- "line": 565,
3154
+ "line": 572,
3416
3155
  "character": 3
3417
3156
  },
3418
3157
  "name": "otherLane",
@@ -3420,15 +3159,10 @@
3420
3159
  "__schema": "TypeRefSchema",
3421
3160
  "location": {
3422
3161
  "filePath": "merge-lanes.main.runtime.ts",
3423
- "line": 565,
3162
+ "line": 572,
3424
3163
  "character": 15
3425
3164
  },
3426
- "name": "Lane",
3427
- "componentId": {
3428
- "scope": "teambit.scope",
3429
- "name": "objects",
3430
- "version": "0.0.11"
3431
- }
3165
+ "name": "Lane"
3432
3166
  },
3433
3167
  "isOptional": true,
3434
3168
  "isSpread": false
@@ -3437,7 +3171,7 @@
3437
3171
  "__schema": "ParameterSchema",
3438
3172
  "location": {
3439
3173
  "filePath": "merge-lanes.main.runtime.ts",
3440
- "line": 566,
3174
+ "line": 573,
3441
3175
  "character": 3
3442
3176
  },
3443
3177
  "name": "shouldSquash",
@@ -3445,7 +3179,7 @@
3445
3179
  "__schema": "KeywordTypeSchema",
3446
3180
  "location": {
3447
3181
  "filePath": "merge-lanes.main.runtime.ts",
3448
- "line": 566,
3182
+ "line": 573,
3449
3183
  "character": 18
3450
3184
  },
3451
3185
  "name": "boolean"
@@ -3458,7 +3192,7 @@
3458
3192
  "__schema": "TypeRefSchema",
3459
3193
  "location": {
3460
3194
  "filePath": "merge-lanes.main.runtime.ts",
3461
- "line": 567,
3195
+ "line": 574,
3462
3196
  "character": 4
3463
3197
  },
3464
3198
  "name": "Promise",
@@ -3467,21 +3201,17 @@
3467
3201
  "__schema": "TypeArraySchema",
3468
3202
  "location": {
3469
3203
  "filePath": "merge-lanes.main.runtime.ts",
3470
- "line": 567,
3204
+ "line": 574,
3471
3205
  "character": 12
3472
3206
  },
3473
3207
  "type": {
3474
3208
  "__schema": "TypeRefSchema",
3475
3209
  "location": {
3476
3210
  "filePath": "merge-lanes.main.runtime.ts",
3477
- "line": 567,
3211
+ "line": 574,
3478
3212
  "character": 12
3479
3213
  },
3480
- "name": "ComponentMergeStatus",
3481
- "componentId": {
3482
- "scope": "teambit.component",
3483
- "name": "merging"
3484
- }
3214
+ "name": "ComponentMergeStatus"
3485
3215
  }
3486
3216
  }
3487
3217
  ]
@@ -3494,7 +3224,7 @@
3494
3224
  "__schema": "FunctionLikeSchema",
3495
3225
  "location": {
3496
3226
  "filePath": "merge-lanes.main.runtime.ts",
3497
- "line": 676,
3227
+ "line": 683,
3498
3228
  "character": 1
3499
3229
  },
3500
3230
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -3504,7 +3234,7 @@
3504
3234
  "__schema": "ParameterSchema",
3505
3235
  "location": {
3506
3236
  "filePath": "merge-lanes.main.runtime.ts",
3507
- "line": 676,
3237
+ "line": 683,
3508
3238
  "character": 32
3509
3239
  },
3510
3240
  "name": "otherLaneId",
@@ -3512,15 +3242,10 @@
3512
3242
  "__schema": "TypeRefSchema",
3513
3243
  "location": {
3514
3244
  "filePath": "merge-lanes.main.runtime.ts",
3515
- "line": 676,
3245
+ "line": 683,
3516
3246
  "character": 45
3517
3247
  },
3518
- "name": "LaneId",
3519
- "componentId": {
3520
- "scope": "teambit.lanes",
3521
- "name": "lane-id",
3522
- "version": "0.0.311"
3523
- }
3248
+ "name": "LaneId"
3524
3249
  },
3525
3250
  "isOptional": false,
3526
3251
  "isSpread": false
@@ -3530,7 +3255,7 @@
3530
3255
  "__schema": "InferenceTypeSchema",
3531
3256
  "location": {
3532
3257
  "filePath": "merge-lanes.main.runtime.ts",
3533
- "line": 676,
3258
+ "line": 683,
3534
3259
  "character": 1
3535
3260
  },
3536
3261
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -3543,7 +3268,7 @@
3543
3268
  "__schema": "FunctionLikeSchema",
3544
3269
  "location": {
3545
3270
  "filePath": "merge-lanes.main.runtime.ts",
3546
- "line": 685,
3271
+ "line": 692,
3547
3272
  "character": 1
3548
3273
  },
3549
3274
  "signature": "function squashSnaps(succeededComponents: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, opts?: {\n messageTitle?: string;\n detachHead?: boolean;\n}): Promise<void>",
@@ -3553,7 +3278,7 @@
3553
3278
  "__schema": "ParameterSchema",
3554
3279
  "location": {
3555
3280
  "filePath": "merge-lanes.main.runtime.ts",
3556
- "line": 686,
3281
+ "line": 693,
3557
3282
  "character": 3
3558
3283
  },
3559
3284
  "name": "succeededComponents",
@@ -3561,21 +3286,17 @@
3561
3286
  "__schema": "TypeArraySchema",
3562
3287
  "location": {
3563
3288
  "filePath": "merge-lanes.main.runtime.ts",
3564
- "line": 686,
3289
+ "line": 693,
3565
3290
  "character": 24
3566
3291
  },
3567
3292
  "type": {
3568
3293
  "__schema": "TypeRefSchema",
3569
3294
  "location": {
3570
3295
  "filePath": "merge-lanes.main.runtime.ts",
3571
- "line": 686,
3296
+ "line": 693,
3572
3297
  "character": 24
3573
3298
  },
3574
- "name": "ComponentMergeStatus",
3575
- "componentId": {
3576
- "scope": "teambit.component",
3577
- "name": "merging"
3578
- }
3299
+ "name": "ComponentMergeStatus"
3579
3300
  }
3580
3301
  },
3581
3302
  "isOptional": false,
@@ -3585,7 +3306,7 @@
3585
3306
  "__schema": "ParameterSchema",
3586
3307
  "location": {
3587
3308
  "filePath": "merge-lanes.main.runtime.ts",
3588
- "line": 687,
3309
+ "line": 694,
3589
3310
  "character": 3
3590
3311
  },
3591
3312
  "name": "currentLaneId",
@@ -3593,15 +3314,10 @@
3593
3314
  "__schema": "TypeRefSchema",
3594
3315
  "location": {
3595
3316
  "filePath": "merge-lanes.main.runtime.ts",
3596
- "line": 687,
3317
+ "line": 694,
3597
3318
  "character": 18
3598
3319
  },
3599
- "name": "LaneId",
3600
- "componentId": {
3601
- "scope": "teambit.lanes",
3602
- "name": "lane-id",
3603
- "version": "0.0.311"
3604
- }
3320
+ "name": "LaneId"
3605
3321
  },
3606
3322
  "isOptional": false,
3607
3323
  "isSpread": false
@@ -3610,7 +3326,7 @@
3610
3326
  "__schema": "ParameterSchema",
3611
3327
  "location": {
3612
3328
  "filePath": "merge-lanes.main.runtime.ts",
3613
- "line": 688,
3329
+ "line": 695,
3614
3330
  "character": 3
3615
3331
  },
3616
3332
  "name": "otherLaneId",
@@ -3618,15 +3334,10 @@
3618
3334
  "__schema": "TypeRefSchema",
3619
3335
  "location": {
3620
3336
  "filePath": "merge-lanes.main.runtime.ts",
3621
- "line": 688,
3337
+ "line": 695,
3622
3338
  "character": 16
3623
3339
  },
3624
- "name": "LaneId",
3625
- "componentId": {
3626
- "scope": "teambit.lanes",
3627
- "name": "lane-id",
3628
- "version": "0.0.311"
3629
- }
3340
+ "name": "LaneId"
3630
3341
  },
3631
3342
  "isOptional": false,
3632
3343
  "isSpread": false
@@ -3635,7 +3346,7 @@
3635
3346
  "__schema": "ParameterSchema",
3636
3347
  "location": {
3637
3348
  "filePath": "merge-lanes.main.runtime.ts",
3638
- "line": 689,
3349
+ "line": 696,
3639
3350
  "character": 3
3640
3351
  },
3641
3352
  "name": "scope",
@@ -3643,7 +3354,7 @@
3643
3354
  "__schema": "TypeRefSchema",
3644
3355
  "location": {
3645
3356
  "filePath": "merge-lanes.main.runtime.ts",
3646
- "line": 689,
3357
+ "line": 696,
3647
3358
  "character": 10
3648
3359
  },
3649
3360
  "name": "LegacyScope"
@@ -3655,7 +3366,7 @@
3655
3366
  "__schema": "ParameterSchema",
3656
3367
  "location": {
3657
3368
  "filePath": "merge-lanes.main.runtime.ts",
3658
- "line": 690,
3369
+ "line": 697,
3659
3370
  "character": 3
3660
3371
  },
3661
3372
  "name": "opts",
@@ -3663,7 +3374,7 @@
3663
3374
  "__schema": "TypeLiteralSchema",
3664
3375
  "location": {
3665
3376
  "filePath": "merge-lanes.main.runtime.ts",
3666
- "line": 690,
3377
+ "line": 697,
3667
3378
  "character": 9
3668
3379
  },
3669
3380
  "members": [
@@ -3671,7 +3382,7 @@
3671
3382
  "__schema": "VariableLikeSchema",
3672
3383
  "location": {
3673
3384
  "filePath": "merge-lanes.main.runtime.ts",
3674
- "line": 690,
3385
+ "line": 697,
3675
3386
  "character": 11
3676
3387
  },
3677
3388
  "signature": "(property) messageTitle?: string | undefined",
@@ -3680,7 +3391,7 @@
3680
3391
  "__schema": "KeywordTypeSchema",
3681
3392
  "location": {
3682
3393
  "filePath": "merge-lanes.main.runtime.ts",
3683
- "line": 690,
3394
+ "line": 697,
3684
3395
  "character": 26
3685
3396
  },
3686
3397
  "name": "string"
@@ -3691,7 +3402,7 @@
3691
3402
  "__schema": "VariableLikeSchema",
3692
3403
  "location": {
3693
3404
  "filePath": "merge-lanes.main.runtime.ts",
3694
- "line": 690,
3405
+ "line": 697,
3695
3406
  "character": 34
3696
3407
  },
3697
3408
  "signature": "(property) detachHead?: boolean | undefined",
@@ -3700,7 +3411,7 @@
3700
3411
  "__schema": "KeywordTypeSchema",
3701
3412
  "location": {
3702
3413
  "filePath": "merge-lanes.main.runtime.ts",
3703
- "line": 690,
3414
+ "line": 697,
3704
3415
  "character": 47
3705
3416
  },
3706
3417
  "name": "boolean"
@@ -3718,7 +3429,7 @@
3718
3429
  "__schema": "InferenceTypeSchema",
3719
3430
  "location": {
3720
3431
  "filePath": "merge-lanes.main.runtime.ts",
3721
- "line": 685,
3432
+ "line": 692,
3722
3433
  "character": 1
3723
3434
  },
3724
3435
  "type": "Promise<void>"
@@ -3731,14 +3442,14 @@
3731
3442
  "__schema": "FunctionLikeSchema",
3732
3443
  "location": {
3733
3444
  "filePath": "merge-lanes.main.runtime.ts",
3734
- "line": 724,
3445
+ "line": 731,
3735
3446
  "character": 1
3736
3447
  },
3737
3448
  "doc": {
3738
3449
  "__schema": "DocSchema",
3739
3450
  "location": {
3740
3451
  "filePath": "merge-lanes.main.runtime.ts",
3741
- "line": 721,
3452
+ "line": 728,
3742
3453
  "character": 1
3743
3454
  },
3744
3455
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -3752,7 +3463,7 @@
3752
3463
  "__schema": "ParameterSchema",
3753
3464
  "location": {
3754
3465
  "filePath": "merge-lanes.main.runtime.ts",
3755
- "line": 725,
3466
+ "line": 732,
3756
3467
  "character": 3
3757
3468
  },
3758
3469
  "name": "currentLaneName",
@@ -3760,7 +3471,7 @@
3760
3471
  "__schema": "KeywordTypeSchema",
3761
3472
  "location": {
3762
3473
  "filePath": "merge-lanes.main.runtime.ts",
3763
- "line": 725,
3474
+ "line": 732,
3764
3475
  "character": 20
3765
3476
  },
3766
3477
  "name": "string"
@@ -3772,7 +3483,7 @@
3772
3483
  "__schema": "ParameterSchema",
3773
3484
  "location": {
3774
3485
  "filePath": "merge-lanes.main.runtime.ts",
3775
- "line": 726,
3486
+ "line": 733,
3776
3487
  "character": 3
3777
3488
  },
3778
3489
  "name": "otherLaneId",
@@ -3780,15 +3491,10 @@
3780
3491
  "__schema": "TypeRefSchema",
3781
3492
  "location": {
3782
3493
  "filePath": "merge-lanes.main.runtime.ts",
3783
- "line": 726,
3494
+ "line": 733,
3784
3495
  "character": 16
3785
3496
  },
3786
- "name": "LaneId",
3787
- "componentId": {
3788
- "scope": "teambit.lanes",
3789
- "name": "lane-id",
3790
- "version": "0.0.311"
3791
- }
3497
+ "name": "LaneId"
3792
3498
  },
3793
3499
  "isOptional": false,
3794
3500
  "isSpread": false
@@ -3797,7 +3503,7 @@
3797
3503
  "__schema": "ParameterSchema",
3798
3504
  "location": {
3799
3505
  "filePath": "merge-lanes.main.runtime.ts",
3800
- "line": 727,
3506
+ "line": 734,
3801
3507
  "character": 3
3802
3508
  },
3803
3509
  "name": "id",
@@ -3805,15 +3511,10 @@
3805
3511
  "__schema": "TypeRefSchema",
3806
3512
  "location": {
3807
3513
  "filePath": "merge-lanes.main.runtime.ts",
3808
- "line": 727,
3514
+ "line": 734,
3809
3515
  "character": 7
3810
3516
  },
3811
- "name": "ComponentID",
3812
- "componentId": {
3813
- "scope": "teambit.component",
3814
- "name": "component-id",
3815
- "version": "1.2.2"
3816
- }
3517
+ "name": "ComponentID"
3817
3518
  },
3818
3519
  "isOptional": false,
3819
3520
  "isSpread": false
@@ -3822,7 +3523,7 @@
3822
3523
  "__schema": "ParameterSchema",
3823
3524
  "location": {
3824
3525
  "filePath": "merge-lanes.main.runtime.ts",
3825
- "line": 728,
3526
+ "line": 735,
3826
3527
  "character": 3
3827
3528
  },
3828
3529
  "name": "divergeData",
@@ -3830,15 +3531,10 @@
3830
3531
  "__schema": "TypeRefSchema",
3831
3532
  "location": {
3832
3533
  "filePath": "merge-lanes.main.runtime.ts",
3833
- "line": 728,
3534
+ "line": 735,
3834
3535
  "character": 16
3835
3536
  },
3836
- "name": "SnapsDistance",
3837
- "componentId": {
3838
- "scope": "teambit.component",
3839
- "name": "snap-distance",
3840
- "version": "0.0.12"
3841
- }
3537
+ "name": "SnapsDistance"
3842
3538
  },
3843
3539
  "isOptional": false,
3844
3540
  "isSpread": false
@@ -3847,7 +3543,7 @@
3847
3543
  "__schema": "ParameterSchema",
3848
3544
  "location": {
3849
3545
  "filePath": "merge-lanes.main.runtime.ts",
3850
- "line": 729,
3546
+ "line": 736,
3851
3547
  "character": 3
3852
3548
  },
3853
3549
  "name": "log",
@@ -3855,15 +3551,10 @@
3855
3551
  "__schema": "TypeRefSchema",
3856
3552
  "location": {
3857
3553
  "filePath": "merge-lanes.main.runtime.ts",
3858
- "line": 729,
3554
+ "line": 736,
3859
3555
  "character": 8
3860
3556
  },
3861
- "name": "Log",
3862
- "componentId": {
3863
- "scope": "teambit.scope",
3864
- "name": "objects",
3865
- "version": "0.0.11"
3866
- }
3557
+ "name": "Log"
3867
3558
  },
3868
3559
  "isOptional": false,
3869
3560
  "isSpread": false
@@ -3872,7 +3563,7 @@
3872
3563
  "__schema": "ParameterSchema",
3873
3564
  "location": {
3874
3565
  "filePath": "merge-lanes.main.runtime.ts",
3875
- "line": 730,
3566
+ "line": 737,
3876
3567
  "character": 3
3877
3568
  },
3878
3569
  "name": "scope",
@@ -3880,7 +3571,7 @@
3880
3571
  "__schema": "TypeRefSchema",
3881
3572
  "location": {
3882
3573
  "filePath": "merge-lanes.main.runtime.ts",
3883
- "line": 730,
3574
+ "line": 737,
3884
3575
  "character": 10
3885
3576
  },
3886
3577
  "name": "LegacyScope"
@@ -3892,7 +3583,7 @@
3892
3583
  "__schema": "ParameterSchema",
3893
3584
  "location": {
3894
3585
  "filePath": "merge-lanes.main.runtime.ts",
3895
- "line": 731,
3586
+ "line": 738,
3896
3587
  "character": 3
3897
3588
  },
3898
3589
  "name": "componentFromModel",
@@ -3900,15 +3591,10 @@
3900
3591
  "__schema": "TypeRefSchema",
3901
3592
  "location": {
3902
3593
  "filePath": "merge-lanes.main.runtime.ts",
3903
- "line": 731,
3594
+ "line": 738,
3904
3595
  "character": 24
3905
3596
  },
3906
- "name": "Version",
3907
- "componentId": {
3908
- "scope": "teambit.scope",
3909
- "name": "objects",
3910
- "version": "0.0.11"
3911
- }
3597
+ "name": "Version"
3912
3598
  },
3913
3599
  "isOptional": true,
3914
3600
  "isSpread": false
@@ -3917,7 +3603,7 @@
3917
3603
  "__schema": "ParameterSchema",
3918
3604
  "location": {
3919
3605
  "filePath": "merge-lanes.main.runtime.ts",
3920
- "line": 732,
3606
+ "line": 739,
3921
3607
  "character": 3
3922
3608
  },
3923
3609
  "name": "opts",
@@ -3925,7 +3611,7 @@
3925
3611
  "__schema": "TypeLiteralSchema",
3926
3612
  "location": {
3927
3613
  "filePath": "merge-lanes.main.runtime.ts",
3928
- "line": 732,
3614
+ "line": 739,
3929
3615
  "character": 9
3930
3616
  },
3931
3617
  "members": [
@@ -3933,7 +3619,7 @@
3933
3619
  "__schema": "VariableLikeSchema",
3934
3620
  "location": {
3935
3621
  "filePath": "merge-lanes.main.runtime.ts",
3936
- "line": 732,
3622
+ "line": 739,
3937
3623
  "character": 11
3938
3624
  },
3939
3625
  "signature": "(property) messageTitle?: string | undefined",
@@ -3942,7 +3628,7 @@
3942
3628
  "__schema": "KeywordTypeSchema",
3943
3629
  "location": {
3944
3630
  "filePath": "merge-lanes.main.runtime.ts",
3945
- "line": 732,
3631
+ "line": 739,
3946
3632
  "character": 26
3947
3633
  },
3948
3634
  "name": "string"
@@ -3953,7 +3639,7 @@
3953
3639
  "__schema": "VariableLikeSchema",
3954
3640
  "location": {
3955
3641
  "filePath": "merge-lanes.main.runtime.ts",
3956
- "line": 732,
3642
+ "line": 739,
3957
3643
  "character": 34
3958
3644
  },
3959
3645
  "signature": "(property) detachHead?: boolean | undefined",
@@ -3962,7 +3648,7 @@
3962
3648
  "__schema": "KeywordTypeSchema",
3963
3649
  "location": {
3964
3650
  "filePath": "merge-lanes.main.runtime.ts",
3965
- "line": 732,
3651
+ "line": 739,
3966
3652
  "character": 47
3967
3653
  },
3968
3654
  "name": "boolean"
@@ -3980,7 +3666,7 @@
3980
3666
  "__schema": "TypeRefSchema",
3981
3667
  "location": {
3982
3668
  "filePath": "merge-lanes.main.runtime.ts",
3983
- "line": 733,
3669
+ "line": 740,
3984
3670
  "character": 4
3985
3671
  },
3986
3672
  "name": "Promise",
@@ -3989,7 +3675,7 @@
3989
3675
  "__schema": "TypeUnionSchema",
3990
3676
  "location": {
3991
3677
  "filePath": "merge-lanes.main.runtime.ts",
3992
- "line": 733,
3678
+ "line": 740,
3993
3679
  "character": 12
3994
3680
  },
3995
3681
  "types": [
@@ -3997,21 +3683,16 @@
3997
3683
  "__schema": "TypeRefSchema",
3998
3684
  "location": {
3999
3685
  "filePath": "merge-lanes.main.runtime.ts",
4000
- "line": 733,
3686
+ "line": 740,
4001
3687
  "character": 12
4002
3688
  },
4003
- "name": "Version",
4004
- "componentId": {
4005
- "scope": "teambit.scope",
4006
- "name": "objects",
4007
- "version": "0.0.11"
4008
- }
3689
+ "name": "Version"
4009
3690
  },
4010
3691
  {
4011
3692
  "__schema": "KeywordTypeSchema",
4012
3693
  "location": {
4013
3694
  "filePath": "merge-lanes.main.runtime.ts",
4014
- "line": 733,
3695
+ "line": 740,
4015
3696
  "character": 22
4016
3697
  },
4017
3698
  "name": "undefined"
@@ -4028,7 +3709,7 @@
4028
3709
  "__schema": "UnImplementedSchema",
4029
3710
  "location": {
4030
3711
  "filePath": "merge-lanes.main.runtime.ts",
4031
- "line": 817,
3712
+ "line": 824,
4032
3713
  "character": 1
4033
3714
  },
4034
3715
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -4077,7 +3758,7 @@
4077
3758
  "componentId": {
4078
3759
  "scope": "teambit.lanes",
4079
3760
  "name": "merge-lanes",
4080
- "version": "1.0.503"
3761
+ "version": "1.0.505"
4081
3762
  },
4082
3763
  "taggedModuleExports": []
4083
3764
  }