@teambit/merging 1.0.424 → 1.0.426
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/artifacts/schema.json
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"__schema": "FunctionLikeSchema",
|
|
27
27
|
"location": {
|
|
28
28
|
"filePath": "merge-cmd.ts",
|
|
29
|
-
"line":
|
|
29
|
+
"line": 144,
|
|
30
30
|
"character": 1
|
|
31
31
|
},
|
|
32
32
|
"signature": "function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceConfigUpdateResult, }: ApplyVersionResults & {\n configMergeResults?: ConfigMergeResult[];\n}): string",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"__schema": "ParameterSchema",
|
|
37
37
|
"location": {
|
|
38
38
|
"filePath": "merge-cmd.ts",
|
|
39
|
-
"line":
|
|
39
|
+
"line": 144,
|
|
40
40
|
"character": 29
|
|
41
41
|
},
|
|
42
42
|
"name": "{ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceConfigUpdateResult }",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"__schema": "TypeIntersectionSchema",
|
|
45
45
|
"location": {
|
|
46
46
|
"filePath": "merge-cmd.ts",
|
|
47
|
-
"line":
|
|
47
|
+
"line": 155,
|
|
48
48
|
"character": 4
|
|
49
49
|
},
|
|
50
50
|
"types": [
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"__schema": "TypeRefSchema",
|
|
53
53
|
"location": {
|
|
54
54
|
"filePath": "merge-cmd.ts",
|
|
55
|
-
"line":
|
|
55
|
+
"line": 155,
|
|
56
56
|
"character": 4
|
|
57
57
|
},
|
|
58
58
|
"name": "ApplyVersionResults"
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"__schema": "TypeLiteralSchema",
|
|
62
62
|
"location": {
|
|
63
63
|
"filePath": "merge-cmd.ts",
|
|
64
|
-
"line":
|
|
64
|
+
"line": 155,
|
|
65
65
|
"character": 26
|
|
66
66
|
},
|
|
67
67
|
"members": [
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
"__schema": "VariableLikeSchema",
|
|
70
70
|
"location": {
|
|
71
71
|
"filePath": "merge-cmd.ts",
|
|
72
|
-
"line":
|
|
72
|
+
"line": 155,
|
|
73
73
|
"character": 28
|
|
74
74
|
},
|
|
75
75
|
"signature": "(property) configMergeResults?: ConfigMergeResult[] | undefined",
|
|
@@ -78,14 +78,14 @@
|
|
|
78
78
|
"__schema": "TypeArraySchema",
|
|
79
79
|
"location": {
|
|
80
80
|
"filePath": "merge-cmd.ts",
|
|
81
|
-
"line":
|
|
81
|
+
"line": 155,
|
|
82
82
|
"character": 49
|
|
83
83
|
},
|
|
84
84
|
"type": {
|
|
85
85
|
"__schema": "TypeRefSchema",
|
|
86
86
|
"location": {
|
|
87
87
|
"filePath": "merge-cmd.ts",
|
|
88
|
-
"line":
|
|
88
|
+
"line": 155,
|
|
89
89
|
"character": 49
|
|
90
90
|
},
|
|
91
91
|
"name": "ConfigMergeResult",
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
"__schema": "InferenceTypeSchema",
|
|
108
108
|
"location": {
|
|
109
109
|
"filePath": "merge-cmd.ts",
|
|
110
|
-
"line":
|
|
110
|
+
"line": 145,
|
|
111
111
|
"character": 3
|
|
112
112
|
},
|
|
113
113
|
"name": "components",
|
|
@@ -118,7 +118,7 @@
|
|
|
118
118
|
"__schema": "InferenceTypeSchema",
|
|
119
119
|
"location": {
|
|
120
120
|
"filePath": "merge-cmd.ts",
|
|
121
|
-
"line":
|
|
121
|
+
"line": 146,
|
|
122
122
|
"character": 3
|
|
123
123
|
},
|
|
124
124
|
"name": "failedComponents",
|
|
@@ -129,7 +129,7 @@
|
|
|
129
129
|
"__schema": "InferenceTypeSchema",
|
|
130
130
|
"location": {
|
|
131
131
|
"filePath": "merge-cmd.ts",
|
|
132
|
-
"line":
|
|
132
|
+
"line": 147,
|
|
133
133
|
"character": 3
|
|
134
134
|
},
|
|
135
135
|
"name": "removedComponents",
|
|
@@ -140,7 +140,7 @@
|
|
|
140
140
|
"__schema": "InferenceTypeSchema",
|
|
141
141
|
"location": {
|
|
142
142
|
"filePath": "merge-cmd.ts",
|
|
143
|
-
"line":
|
|
143
|
+
"line": 148,
|
|
144
144
|
"character": 3
|
|
145
145
|
},
|
|
146
146
|
"name": "version",
|
|
@@ -151,7 +151,7 @@
|
|
|
151
151
|
"__schema": "InferenceTypeSchema",
|
|
152
152
|
"location": {
|
|
153
153
|
"filePath": "merge-cmd.ts",
|
|
154
|
-
"line":
|
|
154
|
+
"line": 149,
|
|
155
155
|
"character": 3
|
|
156
156
|
},
|
|
157
157
|
"name": "mergeSnapResults",
|
|
@@ -162,7 +162,7 @@
|
|
|
162
162
|
"__schema": "InferenceTypeSchema",
|
|
163
163
|
"location": {
|
|
164
164
|
"filePath": "merge-cmd.ts",
|
|
165
|
-
"line":
|
|
165
|
+
"line": 150,
|
|
166
166
|
"character": 3
|
|
167
167
|
},
|
|
168
168
|
"name": "mergeSnapError",
|
|
@@ -173,7 +173,7 @@
|
|
|
173
173
|
"__schema": "InferenceTypeSchema",
|
|
174
174
|
"location": {
|
|
175
175
|
"filePath": "merge-cmd.ts",
|
|
176
|
-
"line":
|
|
176
|
+
"line": 151,
|
|
177
177
|
"character": 3
|
|
178
178
|
},
|
|
179
179
|
"name": "leftUnresolvedConflicts",
|
|
@@ -184,7 +184,7 @@
|
|
|
184
184
|
"__schema": "InferenceTypeSchema",
|
|
185
185
|
"location": {
|
|
186
186
|
"filePath": "merge-cmd.ts",
|
|
187
|
-
"line":
|
|
187
|
+
"line": 152,
|
|
188
188
|
"character": 3
|
|
189
189
|
},
|
|
190
190
|
"name": "verbose",
|
|
@@ -195,7 +195,7 @@
|
|
|
195
195
|
"__schema": "VariableLikeSchema",
|
|
196
196
|
"location": {
|
|
197
197
|
"filePath": "merge-cmd.ts",
|
|
198
|
-
"line":
|
|
198
|
+
"line": 155,
|
|
199
199
|
"character": 28
|
|
200
200
|
},
|
|
201
201
|
"signature": "(property) configMergeResults?: ConfigMergeResult[] | undefined",
|
|
@@ -204,14 +204,14 @@
|
|
|
204
204
|
"__schema": "TypeArraySchema",
|
|
205
205
|
"location": {
|
|
206
206
|
"filePath": "merge-cmd.ts",
|
|
207
|
-
"line":
|
|
207
|
+
"line": 155,
|
|
208
208
|
"character": 49
|
|
209
209
|
},
|
|
210
210
|
"type": {
|
|
211
211
|
"__schema": "TypeRefSchema",
|
|
212
212
|
"location": {
|
|
213
213
|
"filePath": "merge-cmd.ts",
|
|
214
|
-
"line":
|
|
214
|
+
"line": 155,
|
|
215
215
|
"character": 49
|
|
216
216
|
},
|
|
217
217
|
"name": "ConfigMergeResult",
|
|
@@ -227,7 +227,7 @@
|
|
|
227
227
|
"__schema": "InferenceTypeSchema",
|
|
228
228
|
"location": {
|
|
229
229
|
"filePath": "merge-cmd.ts",
|
|
230
|
-
"line":
|
|
230
|
+
"line": 154,
|
|
231
231
|
"character": 3
|
|
232
232
|
},
|
|
233
233
|
"name": "workspaceConfigUpdateResult",
|
|
@@ -242,7 +242,7 @@
|
|
|
242
242
|
"__schema": "KeywordTypeSchema",
|
|
243
243
|
"location": {
|
|
244
244
|
"filePath": "merge-cmd.ts",
|
|
245
|
-
"line":
|
|
245
|
+
"line": 155,
|
|
246
246
|
"character": 73
|
|
247
247
|
},
|
|
248
248
|
"name": "string"
|
|
@@ -265,14 +265,14 @@
|
|
|
265
265
|
"__schema": "FunctionLikeSchema",
|
|
266
266
|
"location": {
|
|
267
267
|
"filePath": "merge-cmd.ts",
|
|
268
|
-
"line":
|
|
268
|
+
"line": 317,
|
|
269
269
|
"character": 1
|
|
270
270
|
},
|
|
271
271
|
"doc": {
|
|
272
272
|
"__schema": "DocSchema",
|
|
273
273
|
"location": {
|
|
274
274
|
"filePath": "merge-cmd.ts",
|
|
275
|
-
"line":
|
|
275
|
+
"line": 313,
|
|
276
276
|
"character": 1
|
|
277
277
|
},
|
|
278
278
|
"raw": "/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */",
|
|
@@ -286,7 +286,7 @@
|
|
|
286
286
|
"__schema": "ParameterSchema",
|
|
287
287
|
"location": {
|
|
288
288
|
"filePath": "merge-cmd.ts",
|
|
289
|
-
"line":
|
|
289
|
+
"line": 317,
|
|
290
290
|
"character": 36
|
|
291
291
|
},
|
|
292
292
|
"name": "components",
|
|
@@ -294,14 +294,14 @@
|
|
|
294
294
|
"__schema": "TypeArraySchema",
|
|
295
295
|
"location": {
|
|
296
296
|
"filePath": "merge-cmd.ts",
|
|
297
|
-
"line":
|
|
297
|
+
"line": 317,
|
|
298
298
|
"character": 48
|
|
299
299
|
},
|
|
300
300
|
"type": {
|
|
301
301
|
"__schema": "TypeRefSchema",
|
|
302
302
|
"location": {
|
|
303
303
|
"filePath": "merge-cmd.ts",
|
|
304
|
-
"line":
|
|
304
|
+
"line": 317,
|
|
305
305
|
"character": 48
|
|
306
306
|
},
|
|
307
307
|
"name": "ApplyVersionResult"
|
|
@@ -314,7 +314,7 @@
|
|
|
314
314
|
"__schema": "ParameterSchema",
|
|
315
315
|
"location": {
|
|
316
316
|
"filePath": "merge-cmd.ts",
|
|
317
|
-
"line":
|
|
317
|
+
"line": 317,
|
|
318
318
|
"character": 70
|
|
319
319
|
},
|
|
320
320
|
"name": "addName",
|
|
@@ -322,7 +322,7 @@
|
|
|
322
322
|
"__schema": "InferenceTypeSchema",
|
|
323
323
|
"location": {
|
|
324
324
|
"filePath": "merge-cmd.ts",
|
|
325
|
-
"line":
|
|
325
|
+
"line": 317,
|
|
326
326
|
"character": 70
|
|
327
327
|
},
|
|
328
328
|
"type": "boolean"
|
|
@@ -335,7 +335,7 @@
|
|
|
335
335
|
"__schema": "ParameterSchema",
|
|
336
336
|
"location": {
|
|
337
337
|
"filePath": "merge-cmd.ts",
|
|
338
|
-
"line":
|
|
338
|
+
"line": 317,
|
|
339
339
|
"character": 86
|
|
340
340
|
},
|
|
341
341
|
"name": "showVersion",
|
|
@@ -343,7 +343,7 @@
|
|
|
343
343
|
"__schema": "InferenceTypeSchema",
|
|
344
344
|
"location": {
|
|
345
345
|
"filePath": "merge-cmd.ts",
|
|
346
|
-
"line":
|
|
346
|
+
"line": 317,
|
|
347
347
|
"character": 86
|
|
348
348
|
},
|
|
349
349
|
"type": "boolean"
|
|
@@ -357,7 +357,7 @@
|
|
|
357
357
|
"__schema": "KeywordTypeSchema",
|
|
358
358
|
"location": {
|
|
359
359
|
"filePath": "merge-cmd.ts",
|
|
360
|
-
"line":
|
|
360
|
+
"line": 317,
|
|
361
361
|
"character": 108
|
|
362
362
|
},
|
|
363
363
|
"name": "string"
|
|
@@ -380,7 +380,7 @@
|
|
|
380
380
|
"__schema": "FunctionLikeSchema",
|
|
381
381
|
"location": {
|
|
382
382
|
"filePath": "merge-cmd.ts",
|
|
383
|
-
"line":
|
|
383
|
+
"line": 343,
|
|
384
384
|
"character": 1
|
|
385
385
|
},
|
|
386
386
|
"signature": "function conflictSummaryReport(components: ApplyVersionResult[]): {\n conflictedComponents: number;\n conflictedFiles: number;\n conflictStr: string;\n}",
|
|
@@ -390,7 +390,7 @@
|
|
|
390
390
|
"__schema": "ParameterSchema",
|
|
391
391
|
"location": {
|
|
392
392
|
"filePath": "merge-cmd.ts",
|
|
393
|
-
"line":
|
|
393
|
+
"line": 343,
|
|
394
394
|
"character": 39
|
|
395
395
|
},
|
|
396
396
|
"name": "components",
|
|
@@ -398,14 +398,14 @@
|
|
|
398
398
|
"__schema": "TypeArraySchema",
|
|
399
399
|
"location": {
|
|
400
400
|
"filePath": "merge-cmd.ts",
|
|
401
|
-
"line":
|
|
401
|
+
"line": 343,
|
|
402
402
|
"character": 51
|
|
403
403
|
},
|
|
404
404
|
"type": {
|
|
405
405
|
"__schema": "TypeRefSchema",
|
|
406
406
|
"location": {
|
|
407
407
|
"filePath": "merge-cmd.ts",
|
|
408
|
-
"line":
|
|
408
|
+
"line": 343,
|
|
409
409
|
"character": 51
|
|
410
410
|
},
|
|
411
411
|
"name": "ApplyVersionResult"
|
|
@@ -419,7 +419,7 @@
|
|
|
419
419
|
"__schema": "TypeLiteralSchema",
|
|
420
420
|
"location": {
|
|
421
421
|
"filePath": "merge-cmd.ts",
|
|
422
|
-
"line":
|
|
422
|
+
"line": 343,
|
|
423
423
|
"character": 74
|
|
424
424
|
},
|
|
425
425
|
"members": [
|
|
@@ -427,7 +427,7 @@
|
|
|
427
427
|
"__schema": "VariableLikeSchema",
|
|
428
428
|
"location": {
|
|
429
429
|
"filePath": "merge-cmd.ts",
|
|
430
|
-
"line":
|
|
430
|
+
"line": 344,
|
|
431
431
|
"character": 3
|
|
432
432
|
},
|
|
433
433
|
"signature": "(property) conflictedComponents: number",
|
|
@@ -436,7 +436,7 @@
|
|
|
436
436
|
"__schema": "KeywordTypeSchema",
|
|
437
437
|
"location": {
|
|
438
438
|
"filePath": "merge-cmd.ts",
|
|
439
|
-
"line":
|
|
439
|
+
"line": 344,
|
|
440
440
|
"character": 25
|
|
441
441
|
},
|
|
442
442
|
"name": "number"
|
|
@@ -447,7 +447,7 @@
|
|
|
447
447
|
"__schema": "VariableLikeSchema",
|
|
448
448
|
"location": {
|
|
449
449
|
"filePath": "merge-cmd.ts",
|
|
450
|
-
"line":
|
|
450
|
+
"line": 345,
|
|
451
451
|
"character": 3
|
|
452
452
|
},
|
|
453
453
|
"signature": "(property) conflictedFiles: number",
|
|
@@ -456,7 +456,7 @@
|
|
|
456
456
|
"__schema": "KeywordTypeSchema",
|
|
457
457
|
"location": {
|
|
458
458
|
"filePath": "merge-cmd.ts",
|
|
459
|
-
"line":
|
|
459
|
+
"line": 345,
|
|
460
460
|
"character": 20
|
|
461
461
|
},
|
|
462
462
|
"name": "number"
|
|
@@ -467,7 +467,7 @@
|
|
|
467
467
|
"__schema": "VariableLikeSchema",
|
|
468
468
|
"location": {
|
|
469
469
|
"filePath": "merge-cmd.ts",
|
|
470
|
-
"line":
|
|
470
|
+
"line": 346,
|
|
471
471
|
"character": 3
|
|
472
472
|
},
|
|
473
473
|
"signature": "(property) conflictStr: string",
|
|
@@ -476,7 +476,7 @@
|
|
|
476
476
|
"__schema": "KeywordTypeSchema",
|
|
477
477
|
"location": {
|
|
478
478
|
"filePath": "merge-cmd.ts",
|
|
479
|
-
"line":
|
|
479
|
+
"line": 346,
|
|
480
480
|
"character": 16
|
|
481
481
|
},
|
|
482
482
|
"name": "string"
|
|
@@ -503,7 +503,7 @@
|
|
|
503
503
|
"__schema": "FunctionLikeSchema",
|
|
504
504
|
"location": {
|
|
505
505
|
"filePath": "merge-cmd.ts",
|
|
506
|
-
"line":
|
|
506
|
+
"line": 372,
|
|
507
507
|
"character": 1
|
|
508
508
|
},
|
|
509
509
|
"signature": "function installationErrorOutput(installationError?: Error): string",
|
|
@@ -513,7 +513,7 @@
|
|
|
513
513
|
"__schema": "ParameterSchema",
|
|
514
514
|
"location": {
|
|
515
515
|
"filePath": "merge-cmd.ts",
|
|
516
|
-
"line":
|
|
516
|
+
"line": 372,
|
|
517
517
|
"character": 41
|
|
518
518
|
},
|
|
519
519
|
"name": "installationError",
|
|
@@ -521,7 +521,7 @@
|
|
|
521
521
|
"__schema": "TypeRefSchema",
|
|
522
522
|
"location": {
|
|
523
523
|
"filePath": "merge-cmd.ts",
|
|
524
|
-
"line":
|
|
524
|
+
"line": 372,
|
|
525
525
|
"character": 61
|
|
526
526
|
},
|
|
527
527
|
"name": "Error"
|
|
@@ -534,7 +534,7 @@
|
|
|
534
534
|
"__schema": "InferenceTypeSchema",
|
|
535
535
|
"location": {
|
|
536
536
|
"filePath": "merge-cmd.ts",
|
|
537
|
-
"line":
|
|
537
|
+
"line": 372,
|
|
538
538
|
"character": 1
|
|
539
539
|
},
|
|
540
540
|
"type": "string"
|
|
@@ -557,7 +557,7 @@
|
|
|
557
557
|
"__schema": "FunctionLikeSchema",
|
|
558
558
|
"location": {
|
|
559
559
|
"filePath": "merge-cmd.ts",
|
|
560
|
-
"line":
|
|
560
|
+
"line": 382,
|
|
561
561
|
"character": 1
|
|
562
562
|
},
|
|
563
563
|
"signature": "function compilationErrorOutput(compilationError?: Error): string",
|
|
@@ -567,7 +567,7 @@
|
|
|
567
567
|
"__schema": "ParameterSchema",
|
|
568
568
|
"location": {
|
|
569
569
|
"filePath": "merge-cmd.ts",
|
|
570
|
-
"line":
|
|
570
|
+
"line": 382,
|
|
571
571
|
"character": 40
|
|
572
572
|
},
|
|
573
573
|
"name": "compilationError",
|
|
@@ -575,7 +575,7 @@
|
|
|
575
575
|
"__schema": "TypeRefSchema",
|
|
576
576
|
"location": {
|
|
577
577
|
"filePath": "merge-cmd.ts",
|
|
578
|
-
"line":
|
|
578
|
+
"line": 382,
|
|
579
579
|
"character": 59
|
|
580
580
|
},
|
|
581
581
|
"name": "Error"
|
|
@@ -588,7 +588,7 @@
|
|
|
588
588
|
"__schema": "InferenceTypeSchema",
|
|
589
589
|
"location": {
|
|
590
590
|
"filePath": "merge-cmd.ts",
|
|
591
|
-
"line":
|
|
591
|
+
"line": 382,
|
|
592
592
|
"character": 1
|
|
593
593
|
},
|
|
594
594
|
"type": "string"
|
|
@@ -611,7 +611,7 @@
|
|
|
611
611
|
"__schema": "FunctionLikeSchema",
|
|
612
612
|
"location": {
|
|
613
613
|
"filePath": "merge-cmd.ts",
|
|
614
|
-
"line":
|
|
614
|
+
"line": 391,
|
|
615
615
|
"character": 1
|
|
616
616
|
},
|
|
617
617
|
"signature": "function getRemovedOutput(removedComponents?: ComponentID[]): string",
|
|
@@ -621,7 +621,7 @@
|
|
|
621
621
|
"__schema": "ParameterSchema",
|
|
622
622
|
"location": {
|
|
623
623
|
"filePath": "merge-cmd.ts",
|
|
624
|
-
"line":
|
|
624
|
+
"line": 391,
|
|
625
625
|
"character": 34
|
|
626
626
|
},
|
|
627
627
|
"name": "removedComponents",
|
|
@@ -629,14 +629,14 @@
|
|
|
629
629
|
"__schema": "TypeArraySchema",
|
|
630
630
|
"location": {
|
|
631
631
|
"filePath": "merge-cmd.ts",
|
|
632
|
-
"line":
|
|
632
|
+
"line": 391,
|
|
633
633
|
"character": 54
|
|
634
634
|
},
|
|
635
635
|
"type": {
|
|
636
636
|
"__schema": "TypeRefSchema",
|
|
637
637
|
"location": {
|
|
638
638
|
"filePath": "merge-cmd.ts",
|
|
639
|
-
"line":
|
|
639
|
+
"line": 391,
|
|
640
640
|
"character": 54
|
|
641
641
|
},
|
|
642
642
|
"name": "ComponentID",
|
|
@@ -655,7 +655,7 @@
|
|
|
655
655
|
"__schema": "InferenceTypeSchema",
|
|
656
656
|
"location": {
|
|
657
657
|
"filePath": "merge-cmd.ts",
|
|
658
|
-
"line":
|
|
658
|
+
"line": 391,
|
|
659
659
|
"character": 1
|
|
660
660
|
},
|
|
661
661
|
"type": "string"
|
|
@@ -678,7 +678,7 @@
|
|
|
678
678
|
"__schema": "FunctionLikeSchema",
|
|
679
679
|
"location": {
|
|
680
680
|
"filePath": "merge-cmd.ts",
|
|
681
|
-
"line":
|
|
681
|
+
"line": 398,
|
|
682
682
|
"character": 1
|
|
683
683
|
},
|
|
684
684
|
"signature": "function getAddedOutput(addedComponents?: ComponentID[]): string",
|
|
@@ -688,7 +688,7 @@
|
|
|
688
688
|
"__schema": "ParameterSchema",
|
|
689
689
|
"location": {
|
|
690
690
|
"filePath": "merge-cmd.ts",
|
|
691
|
-
"line":
|
|
691
|
+
"line": 398,
|
|
692
692
|
"character": 32
|
|
693
693
|
},
|
|
694
694
|
"name": "addedComponents",
|
|
@@ -696,14 +696,14 @@
|
|
|
696
696
|
"__schema": "TypeArraySchema",
|
|
697
697
|
"location": {
|
|
698
698
|
"filePath": "merge-cmd.ts",
|
|
699
|
-
"line":
|
|
699
|
+
"line": 398,
|
|
700
700
|
"character": 50
|
|
701
701
|
},
|
|
702
702
|
"type": {
|
|
703
703
|
"__schema": "TypeRefSchema",
|
|
704
704
|
"location": {
|
|
705
705
|
"filePath": "merge-cmd.ts",
|
|
706
|
-
"line":
|
|
706
|
+
"line": 398,
|
|
707
707
|
"character": 50
|
|
708
708
|
},
|
|
709
709
|
"name": "ComponentID",
|
|
@@ -722,7 +722,7 @@
|
|
|
722
722
|
"__schema": "InferenceTypeSchema",
|
|
723
723
|
"location": {
|
|
724
724
|
"filePath": "merge-cmd.ts",
|
|
725
|
-
"line":
|
|
725
|
+
"line": 398,
|
|
726
726
|
"character": 1
|
|
727
727
|
},
|
|
728
728
|
"type": "string"
|
|
@@ -745,7 +745,7 @@
|
|
|
745
745
|
"__schema": "FunctionLikeSchema",
|
|
746
746
|
"location": {
|
|
747
747
|
"filePath": "merge-cmd.ts",
|
|
748
|
-
"line":
|
|
748
|
+
"line": 267,
|
|
749
749
|
"character": 1
|
|
750
750
|
},
|
|
751
751
|
"signature": "function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string",
|
|
@@ -755,7 +755,7 @@
|
|
|
755
755
|
"__schema": "ParameterSchema",
|
|
756
756
|
"location": {
|
|
757
757
|
"filePath": "merge-cmd.ts",
|
|
758
|
-
"line":
|
|
758
|
+
"line": 267,
|
|
759
759
|
"character": 48
|
|
760
760
|
},
|
|
761
761
|
"name": "workspaceConfigUpdateResult",
|
|
@@ -763,7 +763,7 @@
|
|
|
763
763
|
"__schema": "TypeRefSchema",
|
|
764
764
|
"location": {
|
|
765
765
|
"filePath": "merge-cmd.ts",
|
|
766
|
-
"line":
|
|
766
|
+
"line": 267,
|
|
767
767
|
"character": 78
|
|
768
768
|
},
|
|
769
769
|
"name": "WorkspaceConfigUpdateResult",
|
|
@@ -780,7 +780,7 @@
|
|
|
780
780
|
"__schema": "KeywordTypeSchema",
|
|
781
781
|
"location": {
|
|
782
782
|
"filePath": "merge-cmd.ts",
|
|
783
|
-
"line":
|
|
783
|
+
"line": 267,
|
|
784
784
|
"character": 108
|
|
785
785
|
},
|
|
786
786
|
"name": "string"
|
|
@@ -1400,7 +1400,7 @@
|
|
|
1400
1400
|
"componentId": {
|
|
1401
1401
|
"scope": "teambit.component",
|
|
1402
1402
|
"name": "sources",
|
|
1403
|
-
"version": "0.0.
|
|
1403
|
+
"version": "0.0.34"
|
|
1404
1404
|
}
|
|
1405
1405
|
},
|
|
1406
1406
|
"isOptional": false
|
|
@@ -1596,7 +1596,7 @@
|
|
|
1596
1596
|
"componentId": {
|
|
1597
1597
|
"scope": "teambit.component",
|
|
1598
1598
|
"name": "sources",
|
|
1599
|
-
"version": "0.0.
|
|
1599
|
+
"version": "0.0.34"
|
|
1600
1600
|
}
|
|
1601
1601
|
},
|
|
1602
1602
|
"isOptional": true
|
|
@@ -1678,7 +1678,7 @@
|
|
|
1678
1678
|
"componentId": {
|
|
1679
1679
|
"scope": "teambit.component",
|
|
1680
1680
|
"name": "sources",
|
|
1681
|
-
"version": "0.0.
|
|
1681
|
+
"version": "0.0.34"
|
|
1682
1682
|
}
|
|
1683
1683
|
},
|
|
1684
1684
|
"isOptional": false
|
|
@@ -1918,7 +1918,7 @@
|
|
|
1918
1918
|
"componentId": {
|
|
1919
1919
|
"scope": "teambit.component",
|
|
1920
1920
|
"name": "sources",
|
|
1921
|
-
"version": "0.0.
|
|
1921
|
+
"version": "0.0.34"
|
|
1922
1922
|
}
|
|
1923
1923
|
},
|
|
1924
1924
|
"isOptional": false
|
|
@@ -2000,7 +2000,7 @@
|
|
|
2000
2000
|
"componentId": {
|
|
2001
2001
|
"scope": "teambit.component",
|
|
2002
2002
|
"name": "sources",
|
|
2003
|
-
"version": "0.0.
|
|
2003
|
+
"version": "0.0.34"
|
|
2004
2004
|
}
|
|
2005
2005
|
},
|
|
2006
2006
|
"isOptional": false
|
|
@@ -3885,7 +3885,7 @@
|
|
|
3885
3885
|
"__schema": "FunctionLikeSchema",
|
|
3886
3886
|
"location": {
|
|
3887
3887
|
"filePath": "merging.main.runtime.ts",
|
|
3888
|
-
"line":
|
|
3888
|
+
"line": 352,
|
|
3889
3889
|
"character": 3
|
|
3890
3890
|
},
|
|
3891
3891
|
"signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
|
|
@@ -3895,7 +3895,7 @@
|
|
|
3895
3895
|
"__schema": "ParameterSchema",
|
|
3896
3896
|
"location": {
|
|
3897
3897
|
"filePath": "merging.main.runtime.ts",
|
|
3898
|
-
"line":
|
|
3898
|
+
"line": 353,
|
|
3899
3899
|
"character": 5
|
|
3900
3900
|
},
|
|
3901
3901
|
"name": "componentsResults",
|
|
@@ -3903,14 +3903,14 @@
|
|
|
3903
3903
|
"__schema": "TypeArraySchema",
|
|
3904
3904
|
"location": {
|
|
3905
3905
|
"filePath": "merging.main.runtime.ts",
|
|
3906
|
-
"line":
|
|
3906
|
+
"line": 353,
|
|
3907
3907
|
"character": 24
|
|
3908
3908
|
},
|
|
3909
3909
|
"type": {
|
|
3910
3910
|
"__schema": "TypeRefSchema",
|
|
3911
3911
|
"location": {
|
|
3912
3912
|
"filePath": "merging.main.runtime.ts",
|
|
3913
|
-
"line":
|
|
3913
|
+
"line": 353,
|
|
3914
3914
|
"character": 24
|
|
3915
3915
|
},
|
|
3916
3916
|
"name": "ApplyVersionWithComps",
|
|
@@ -3927,7 +3927,7 @@
|
|
|
3927
3927
|
"__schema": "ParameterSchema",
|
|
3928
3928
|
"location": {
|
|
3929
3929
|
"filePath": "merging.main.runtime.ts",
|
|
3930
|
-
"line":
|
|
3930
|
+
"line": 354,
|
|
3931
3931
|
"character": 5
|
|
3932
3932
|
},
|
|
3933
3933
|
"name": "currentLane",
|
|
@@ -3935,7 +3935,7 @@
|
|
|
3935
3935
|
"__schema": "TypeRefSchema",
|
|
3936
3936
|
"location": {
|
|
3937
3937
|
"filePath": "merging.main.runtime.ts",
|
|
3938
|
-
"line":
|
|
3938
|
+
"line": 354,
|
|
3939
3939
|
"character": 19
|
|
3940
3940
|
},
|
|
3941
3941
|
"name": "Lane",
|
|
@@ -3948,7 +3948,7 @@
|
|
|
3948
3948
|
"__schema": "ParameterSchema",
|
|
3949
3949
|
"location": {
|
|
3950
3950
|
"filePath": "merging.main.runtime.ts",
|
|
3951
|
-
"line":
|
|
3951
|
+
"line": 355,
|
|
3952
3952
|
"character": 5
|
|
3953
3953
|
},
|
|
3954
3954
|
"name": "currentLaneIdsBeforeMerge",
|
|
@@ -3956,7 +3956,7 @@
|
|
|
3956
3956
|
"__schema": "TypeRefSchema",
|
|
3957
3957
|
"location": {
|
|
3958
3958
|
"filePath": "merging.main.runtime.ts",
|
|
3959
|
-
"line":
|
|
3959
|
+
"line": 355,
|
|
3960
3960
|
"character": 33
|
|
3961
3961
|
},
|
|
3962
3962
|
"name": "ComponentIdList",
|
|
@@ -3974,7 +3974,7 @@
|
|
|
3974
3974
|
"__schema": "InferenceTypeSchema",
|
|
3975
3975
|
"location": {
|
|
3976
3976
|
"filePath": "merging.main.runtime.ts",
|
|
3977
|
-
"line":
|
|
3977
|
+
"line": 352,
|
|
3978
3978
|
"character": 3
|
|
3979
3979
|
},
|
|
3980
3980
|
"type": "Promise<void>"
|
|
@@ -3987,14 +3987,14 @@
|
|
|
3987
3987
|
"__schema": "FunctionLikeSchema",
|
|
3988
3988
|
"location": {
|
|
3989
3989
|
"filePath": "merging.main.runtime.ts",
|
|
3990
|
-
"line":
|
|
3990
|
+
"line": 377,
|
|
3991
3991
|
"character": 3
|
|
3992
3992
|
},
|
|
3993
3993
|
"doc": {
|
|
3994
3994
|
"__schema": "DocSchema",
|
|
3995
3995
|
"location": {
|
|
3996
3996
|
"filePath": "merging.main.runtime.ts",
|
|
3997
|
-
"line":
|
|
3997
|
+
"line": 371,
|
|
3998
3998
|
"character": 3
|
|
3999
3999
|
},
|
|
4000
4000
|
"raw": "/**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */",
|
|
@@ -4008,7 +4008,7 @@
|
|
|
4008
4008
|
"__schema": "ParameterSchema",
|
|
4009
4009
|
"location": {
|
|
4010
4010
|
"filePath": "merging.main.runtime.ts",
|
|
4011
|
-
"line":
|
|
4011
|
+
"line": 378,
|
|
4012
4012
|
"character": 5
|
|
4013
4013
|
},
|
|
4014
4014
|
"name": "bitIds",
|
|
@@ -4016,14 +4016,14 @@
|
|
|
4016
4016
|
"__schema": "TypeArraySchema",
|
|
4017
4017
|
"location": {
|
|
4018
4018
|
"filePath": "merging.main.runtime.ts",
|
|
4019
|
-
"line":
|
|
4019
|
+
"line": 378,
|
|
4020
4020
|
"character": 13
|
|
4021
4021
|
},
|
|
4022
4022
|
"type": {
|
|
4023
4023
|
"__schema": "TypeRefSchema",
|
|
4024
4024
|
"location": {
|
|
4025
4025
|
"filePath": "merging.main.runtime.ts",
|
|
4026
|
-
"line":
|
|
4026
|
+
"line": 378,
|
|
4027
4027
|
"character": 13
|
|
4028
4028
|
},
|
|
4029
4029
|
"name": "ComponentID",
|
|
@@ -4041,7 +4041,7 @@
|
|
|
4041
4041
|
"__schema": "ParameterSchema",
|
|
4042
4042
|
"location": {
|
|
4043
4043
|
"filePath": "merging.main.runtime.ts",
|
|
4044
|
-
"line":
|
|
4044
|
+
"line": 379,
|
|
4045
4045
|
"character": 5
|
|
4046
4046
|
},
|
|
4047
4047
|
"name": "options",
|
|
@@ -4049,7 +4049,7 @@
|
|
|
4049
4049
|
"__schema": "TypeRefSchema",
|
|
4050
4050
|
"location": {
|
|
4051
4051
|
"filePath": "merging.main.runtime.ts",
|
|
4052
|
-
"line":
|
|
4052
|
+
"line": 379,
|
|
4053
4053
|
"character": 14
|
|
4054
4054
|
},
|
|
4055
4055
|
"name": "MergeStatusProviderOptions",
|
|
@@ -4062,7 +4062,7 @@
|
|
|
4062
4062
|
"__schema": "ParameterSchema",
|
|
4063
4063
|
"location": {
|
|
4064
4064
|
"filePath": "merging.main.runtime.ts",
|
|
4065
|
-
"line":
|
|
4065
|
+
"line": 380,
|
|
4066
4066
|
"character": 5
|
|
4067
4067
|
},
|
|
4068
4068
|
"name": "currentLane",
|
|
@@ -4070,7 +4070,7 @@
|
|
|
4070
4070
|
"__schema": "TypeRefSchema",
|
|
4071
4071
|
"location": {
|
|
4072
4072
|
"filePath": "merging.main.runtime.ts",
|
|
4073
|
-
"line":
|
|
4073
|
+
"line": 380,
|
|
4074
4074
|
"character": 19
|
|
4075
4075
|
},
|
|
4076
4076
|
"name": "Lane",
|
|
@@ -4083,7 +4083,7 @@
|
|
|
4083
4083
|
"__schema": "ParameterSchema",
|
|
4084
4084
|
"location": {
|
|
4085
4085
|
"filePath": "merging.main.runtime.ts",
|
|
4086
|
-
"line":
|
|
4086
|
+
"line": 381,
|
|
4087
4087
|
"character": 5
|
|
4088
4088
|
},
|
|
4089
4089
|
"name": "otherLane",
|
|
@@ -4091,7 +4091,7 @@
|
|
|
4091
4091
|
"__schema": "TypeRefSchema",
|
|
4092
4092
|
"location": {
|
|
4093
4093
|
"filePath": "merging.main.runtime.ts",
|
|
4094
|
-
"line":
|
|
4094
|
+
"line": 381,
|
|
4095
4095
|
"character": 17
|
|
4096
4096
|
},
|
|
4097
4097
|
"name": "Lane",
|
|
@@ -4105,7 +4105,7 @@
|
|
|
4105
4105
|
"__schema": "TypeRefSchema",
|
|
4106
4106
|
"location": {
|
|
4107
4107
|
"filePath": "merging.main.runtime.ts",
|
|
4108
|
-
"line":
|
|
4108
|
+
"line": 382,
|
|
4109
4109
|
"character": 6
|
|
4110
4110
|
},
|
|
4111
4111
|
"name": "Promise",
|
|
@@ -4114,14 +4114,14 @@
|
|
|
4114
4114
|
"__schema": "TypeArraySchema",
|
|
4115
4115
|
"location": {
|
|
4116
4116
|
"filePath": "merging.main.runtime.ts",
|
|
4117
|
-
"line":
|
|
4117
|
+
"line": 382,
|
|
4118
4118
|
"character": 14
|
|
4119
4119
|
},
|
|
4120
4120
|
"type": {
|
|
4121
4121
|
"__schema": "TypeRefSchema",
|
|
4122
4122
|
"location": {
|
|
4123
4123
|
"filePath": "merging.main.runtime.ts",
|
|
4124
|
-
"line":
|
|
4124
|
+
"line": 382,
|
|
4125
4125
|
"character": 14
|
|
4126
4126
|
},
|
|
4127
4127
|
"name": "ComponentMergeStatus"
|
|
@@ -4137,7 +4137,7 @@
|
|
|
4137
4137
|
"__schema": "VariableLikeSchema",
|
|
4138
4138
|
"location": {
|
|
4139
4139
|
"filePath": "merging.main.runtime.ts",
|
|
4140
|
-
"line":
|
|
4140
|
+
"line": 675,
|
|
4141
4141
|
"character": 3
|
|
4142
4142
|
},
|
|
4143
4143
|
"signature": "(property) MergingMain.slots: never[]",
|
|
@@ -4146,7 +4146,7 @@
|
|
|
4146
4146
|
"__schema": "InferenceTypeSchema",
|
|
4147
4147
|
"location": {
|
|
4148
4148
|
"filePath": "merging.main.runtime.ts",
|
|
4149
|
-
"line":
|
|
4149
|
+
"line": 675,
|
|
4150
4150
|
"character": 3
|
|
4151
4151
|
},
|
|
4152
4152
|
"type": "never[]"
|
|
@@ -4158,7 +4158,7 @@
|
|
|
4158
4158
|
"__schema": "VariableLikeSchema",
|
|
4159
4159
|
"location": {
|
|
4160
4160
|
"filePath": "merging.main.runtime.ts",
|
|
4161
|
-
"line":
|
|
4161
|
+
"line": 676,
|
|
4162
4162
|
"character": 3
|
|
4163
4163
|
},
|
|
4164
4164
|
"signature": "(property) MergingMain.dependencies: Aspect[]",
|
|
@@ -4167,7 +4167,7 @@
|
|
|
4167
4167
|
"__schema": "InferenceTypeSchema",
|
|
4168
4168
|
"location": {
|
|
4169
4169
|
"filePath": "merging.main.runtime.ts",
|
|
4170
|
-
"line":
|
|
4170
|
+
"line": 676,
|
|
4171
4171
|
"character": 3
|
|
4172
4172
|
},
|
|
4173
4173
|
"type": "Aspect[]"
|
|
@@ -4179,7 +4179,7 @@
|
|
|
4179
4179
|
"__schema": "VariableLikeSchema",
|
|
4180
4180
|
"location": {
|
|
4181
4181
|
"filePath": "merging.main.runtime.ts",
|
|
4182
|
-
"line":
|
|
4182
|
+
"line": 692,
|
|
4183
4183
|
"character": 3
|
|
4184
4184
|
},
|
|
4185
4185
|
"signature": "(property) MergingMain.runtime: RuntimeDefinition",
|
|
@@ -4188,7 +4188,7 @@
|
|
|
4188
4188
|
"__schema": "InferenceTypeSchema",
|
|
4189
4189
|
"location": {
|
|
4190
4190
|
"filePath": "merging.main.runtime.ts",
|
|
4191
|
-
"line":
|
|
4191
|
+
"line": 692,
|
|
4192
4192
|
"character": 3
|
|
4193
4193
|
},
|
|
4194
4194
|
"type": "RuntimeDefinition"
|
|
@@ -4200,7 +4200,7 @@
|
|
|
4200
4200
|
"__schema": "FunctionLikeSchema",
|
|
4201
4201
|
"location": {
|
|
4202
4202
|
"filePath": "merging.main.runtime.ts",
|
|
4203
|
-
"line":
|
|
4203
|
+
"line": 693,
|
|
4204
4204
|
"character": 3
|
|
4205
4205
|
},
|
|
4206
4206
|
"signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain\n]): Promise<MergingMain>",
|
|
@@ -4210,7 +4210,7 @@
|
|
|
4210
4210
|
"__schema": "ParameterSchema",
|
|
4211
4211
|
"location": {
|
|
4212
4212
|
"filePath": "merging.main.runtime.ts",
|
|
4213
|
-
"line":
|
|
4213
|
+
"line": 693,
|
|
4214
4214
|
"character": 25
|
|
4215
4215
|
},
|
|
4216
4216
|
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
|
|
@@ -4218,7 +4218,7 @@
|
|
|
4218
4218
|
"__schema": "TupleTypeSchema",
|
|
4219
4219
|
"location": {
|
|
4220
4220
|
"filePath": "merging.main.runtime.ts",
|
|
4221
|
-
"line":
|
|
4221
|
+
"line": 708,
|
|
4222
4222
|
"character": 6
|
|
4223
4223
|
},
|
|
4224
4224
|
"elements": [
|
|
@@ -4226,7 +4226,7 @@
|
|
|
4226
4226
|
"__schema": "TypeRefSchema",
|
|
4227
4227
|
"location": {
|
|
4228
4228
|
"filePath": "merging.main.runtime.ts",
|
|
4229
|
-
"line":
|
|
4229
|
+
"line": 709,
|
|
4230
4230
|
"character": 5
|
|
4231
4231
|
},
|
|
4232
4232
|
"name": "CLIMain",
|
|
@@ -4239,7 +4239,7 @@
|
|
|
4239
4239
|
"__schema": "TypeRefSchema",
|
|
4240
4240
|
"location": {
|
|
4241
4241
|
"filePath": "merging.main.runtime.ts",
|
|
4242
|
-
"line":
|
|
4242
|
+
"line": 710,
|
|
4243
4243
|
"character": 5
|
|
4244
4244
|
},
|
|
4245
4245
|
"name": "Workspace",
|
|
@@ -4252,7 +4252,7 @@
|
|
|
4252
4252
|
"__schema": "TypeRefSchema",
|
|
4253
4253
|
"location": {
|
|
4254
4254
|
"filePath": "merging.main.runtime.ts",
|
|
4255
|
-
"line":
|
|
4255
|
+
"line": 711,
|
|
4256
4256
|
"character": 5
|
|
4257
4257
|
},
|
|
4258
4258
|
"name": "ScopeMain",
|
|
@@ -4265,7 +4265,7 @@
|
|
|
4265
4265
|
"__schema": "TypeRefSchema",
|
|
4266
4266
|
"location": {
|
|
4267
4267
|
"filePath": "merging.main.runtime.ts",
|
|
4268
|
-
"line":
|
|
4268
|
+
"line": 712,
|
|
4269
4269
|
"character": 5
|
|
4270
4270
|
},
|
|
4271
4271
|
"name": "SnappingMain",
|
|
@@ -4278,7 +4278,7 @@
|
|
|
4278
4278
|
"__schema": "TypeRefSchema",
|
|
4279
4279
|
"location": {
|
|
4280
4280
|
"filePath": "merging.main.runtime.ts",
|
|
4281
|
-
"line":
|
|
4281
|
+
"line": 713,
|
|
4282
4282
|
"character": 5
|
|
4283
4283
|
},
|
|
4284
4284
|
"name": "CheckoutMain",
|
|
@@ -4291,7 +4291,7 @@
|
|
|
4291
4291
|
"__schema": "TypeRefSchema",
|
|
4292
4292
|
"location": {
|
|
4293
4293
|
"filePath": "merging.main.runtime.ts",
|
|
4294
|
-
"line":
|
|
4294
|
+
"line": 714,
|
|
4295
4295
|
"character": 5
|
|
4296
4296
|
},
|
|
4297
4297
|
"name": "InstallMain",
|
|
@@ -4304,7 +4304,7 @@
|
|
|
4304
4304
|
"__schema": "TypeRefSchema",
|
|
4305
4305
|
"location": {
|
|
4306
4306
|
"filePath": "merging.main.runtime.ts",
|
|
4307
|
-
"line":
|
|
4307
|
+
"line": 715,
|
|
4308
4308
|
"character": 5
|
|
4309
4309
|
},
|
|
4310
4310
|
"name": "LoggerMain",
|
|
@@ -4317,7 +4317,7 @@
|
|
|
4317
4317
|
"__schema": "TypeRefSchema",
|
|
4318
4318
|
"location": {
|
|
4319
4319
|
"filePath": "merging.main.runtime.ts",
|
|
4320
|
-
"line":
|
|
4320
|
+
"line": 716,
|
|
4321
4321
|
"character": 5
|
|
4322
4322
|
},
|
|
4323
4323
|
"name": "ComponentWriterMain",
|
|
@@ -4330,7 +4330,7 @@
|
|
|
4330
4330
|
"__schema": "TypeRefSchema",
|
|
4331
4331
|
"location": {
|
|
4332
4332
|
"filePath": "merging.main.runtime.ts",
|
|
4333
|
-
"line":
|
|
4333
|
+
"line": 717,
|
|
4334
4334
|
"character": 5
|
|
4335
4335
|
},
|
|
4336
4336
|
"name": "ImporterMain",
|
|
@@ -4343,7 +4343,7 @@
|
|
|
4343
4343
|
"__schema": "TypeRefSchema",
|
|
4344
4344
|
"location": {
|
|
4345
4345
|
"filePath": "merging.main.runtime.ts",
|
|
4346
|
-
"line":
|
|
4346
|
+
"line": 718,
|
|
4347
4347
|
"character": 5
|
|
4348
4348
|
},
|
|
4349
4349
|
"name": "ConfigMain",
|
|
@@ -4356,7 +4356,7 @@
|
|
|
4356
4356
|
"__schema": "TypeRefSchema",
|
|
4357
4357
|
"location": {
|
|
4358
4358
|
"filePath": "merging.main.runtime.ts",
|
|
4359
|
-
"line":
|
|
4359
|
+
"line": 719,
|
|
4360
4360
|
"character": 5
|
|
4361
4361
|
},
|
|
4362
4362
|
"name": "RemoveMain",
|
|
@@ -4369,7 +4369,7 @@
|
|
|
4369
4369
|
"__schema": "TypeRefSchema",
|
|
4370
4370
|
"location": {
|
|
4371
4371
|
"filePath": "merging.main.runtime.ts",
|
|
4372
|
-
"line":
|
|
4372
|
+
"line": 720,
|
|
4373
4373
|
"character": 5
|
|
4374
4374
|
},
|
|
4375
4375
|
"name": "GlobalConfigMain",
|
|
@@ -4382,7 +4382,7 @@
|
|
|
4382
4382
|
"__schema": "TypeRefSchema",
|
|
4383
4383
|
"location": {
|
|
4384
4384
|
"filePath": "merging.main.runtime.ts",
|
|
4385
|
-
"line":
|
|
4385
|
+
"line": 721,
|
|
4386
4386
|
"character": 5
|
|
4387
4387
|
},
|
|
4388
4388
|
"name": "ConfigMergerMain",
|
|
@@ -4395,7 +4395,7 @@
|
|
|
4395
4395
|
"__schema": "TypeRefSchema",
|
|
4396
4396
|
"location": {
|
|
4397
4397
|
"filePath": "merging.main.runtime.ts",
|
|
4398
|
-
"line":
|
|
4398
|
+
"line": 722,
|
|
4399
4399
|
"character": 5
|
|
4400
4400
|
},
|
|
4401
4401
|
"name": "DependencyResolverMain",
|
|
@@ -4414,7 +4414,7 @@
|
|
|
4414
4414
|
"__schema": "InferenceTypeSchema",
|
|
4415
4415
|
"location": {
|
|
4416
4416
|
"filePath": "merging.main.runtime.ts",
|
|
4417
|
-
"line":
|
|
4417
|
+
"line": 693,
|
|
4418
4418
|
"character": 3
|
|
4419
4419
|
},
|
|
4420
4420
|
"type": "Promise<MergingMain>"
|
|
@@ -5539,16 +5539,16 @@
|
|
|
5539
5539
|
"__schema": "ParameterSchema",
|
|
5540
5540
|
"location": {
|
|
5541
5541
|
"filePath": "merge-cmd.ts",
|
|
5542
|
-
"line":
|
|
5543
|
-
"character":
|
|
5542
|
+
"line": 57,
|
|
5543
|
+
"character": 5
|
|
5544
5544
|
},
|
|
5545
5545
|
"name": "merging",
|
|
5546
5546
|
"type": {
|
|
5547
5547
|
"__schema": "TypeRefSchema",
|
|
5548
5548
|
"location": {
|
|
5549
5549
|
"filePath": "merge-cmd.ts",
|
|
5550
|
-
"line":
|
|
5551
|
-
"character":
|
|
5550
|
+
"line": 57,
|
|
5551
|
+
"character": 22
|
|
5552
5552
|
},
|
|
5553
5553
|
"name": "MergingMain"
|
|
5554
5554
|
},
|
|
@@ -5559,16 +5559,16 @@
|
|
|
5559
5559
|
"__schema": "ParameterSchema",
|
|
5560
5560
|
"location": {
|
|
5561
5561
|
"filePath": "merge-cmd.ts",
|
|
5562
|
-
"line":
|
|
5563
|
-
"character":
|
|
5562
|
+
"line": 58,
|
|
5563
|
+
"character": 5
|
|
5564
5564
|
},
|
|
5565
5565
|
"name": "globalConfig",
|
|
5566
5566
|
"type": {
|
|
5567
5567
|
"__schema": "TypeRefSchema",
|
|
5568
5568
|
"location": {
|
|
5569
5569
|
"filePath": "merge-cmd.ts",
|
|
5570
|
-
"line":
|
|
5571
|
-
"character":
|
|
5570
|
+
"line": 58,
|
|
5571
|
+
"character": 27
|
|
5572
5572
|
},
|
|
5573
5573
|
"name": "GlobalConfigMain",
|
|
5574
5574
|
"componentId": {
|
|
@@ -5595,7 +5595,7 @@
|
|
|
5595
5595
|
"__schema": "FunctionLikeSchema",
|
|
5596
5596
|
"location": {
|
|
5597
5597
|
"filePath": "merge-cmd.ts",
|
|
5598
|
-
"line":
|
|
5598
|
+
"line": 61,
|
|
5599
5599
|
"character": 3
|
|
5600
5600
|
},
|
|
5601
5601
|
"signature": "(method) MergeCmd.report([pattern]: [string], { ours, theirs, manual, autoMergeResolve, abort, resolve, build, noSnap, verbose, message, skipDependencyInstallation, }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: MergeStrategy;\n abort?: boolean;\n resolve?: boolean;\n build?: boolean;\n noSnap?: boolean;\n verbose?: boolean;\n message: string;\n skipDependencyInstallation?: boolean;\n}): Promise<string>",
|
|
@@ -5605,7 +5605,7 @@
|
|
|
5605
5605
|
"__schema": "ParameterSchema",
|
|
5606
5606
|
"location": {
|
|
5607
5607
|
"filePath": "merge-cmd.ts",
|
|
5608
|
-
"line":
|
|
5608
|
+
"line": 62,
|
|
5609
5609
|
"character": 5
|
|
5610
5610
|
},
|
|
5611
5611
|
"name": "[ pattern ]",
|
|
@@ -5613,7 +5613,7 @@
|
|
|
5613
5613
|
"__schema": "TupleTypeSchema",
|
|
5614
5614
|
"location": {
|
|
5615
5615
|
"filePath": "merge-cmd.ts",
|
|
5616
|
-
"line":
|
|
5616
|
+
"line": 62,
|
|
5617
5617
|
"character": 16
|
|
5618
5618
|
},
|
|
5619
5619
|
"elements": [
|
|
@@ -5621,7 +5621,7 @@
|
|
|
5621
5621
|
"__schema": "KeywordTypeSchema",
|
|
5622
5622
|
"location": {
|
|
5623
5623
|
"filePath": "merge-cmd.ts",
|
|
5624
|
-
"line":
|
|
5624
|
+
"line": 62,
|
|
5625
5625
|
"character": 17
|
|
5626
5626
|
},
|
|
5627
5627
|
"name": "string"
|
|
@@ -5635,7 +5635,7 @@
|
|
|
5635
5635
|
"__schema": "ParameterSchema",
|
|
5636
5636
|
"location": {
|
|
5637
5637
|
"filePath": "merge-cmd.ts",
|
|
5638
|
-
"line":
|
|
5638
|
+
"line": 63,
|
|
5639
5639
|
"character": 5
|
|
5640
5640
|
},
|
|
5641
5641
|
"name": "{ ours = false, theirs = false, manual = false, autoMergeResolve, abort = false, resolve = false, build = false, noSnap = false, verbose = false, message, skipDependencyInstallation = false }",
|
|
@@ -5643,7 +5643,7 @@
|
|
|
5643
5643
|
"__schema": "TypeLiteralSchema",
|
|
5644
5644
|
"location": {
|
|
5645
5645
|
"filePath": "merge-cmd.ts",
|
|
5646
|
-
"line":
|
|
5646
|
+
"line": 75,
|
|
5647
5647
|
"character": 8
|
|
5648
5648
|
},
|
|
5649
5649
|
"members": [
|
|
@@ -5651,7 +5651,7 @@
|
|
|
5651
5651
|
"__schema": "VariableLikeSchema",
|
|
5652
5652
|
"location": {
|
|
5653
5653
|
"filePath": "merge-cmd.ts",
|
|
5654
|
-
"line":
|
|
5654
|
+
"line": 76,
|
|
5655
5655
|
"character": 7
|
|
5656
5656
|
},
|
|
5657
5657
|
"signature": "(property) ours?: boolean | undefined",
|
|
@@ -5660,7 +5660,7 @@
|
|
|
5660
5660
|
"__schema": "KeywordTypeSchema",
|
|
5661
5661
|
"location": {
|
|
5662
5662
|
"filePath": "merge-cmd.ts",
|
|
5663
|
-
"line":
|
|
5663
|
+
"line": 76,
|
|
5664
5664
|
"character": 14
|
|
5665
5665
|
},
|
|
5666
5666
|
"name": "boolean"
|
|
@@ -5671,7 +5671,7 @@
|
|
|
5671
5671
|
"__schema": "VariableLikeSchema",
|
|
5672
5672
|
"location": {
|
|
5673
5673
|
"filePath": "merge-cmd.ts",
|
|
5674
|
-
"line":
|
|
5674
|
+
"line": 77,
|
|
5675
5675
|
"character": 7
|
|
5676
5676
|
},
|
|
5677
5677
|
"signature": "(property) theirs?: boolean | undefined",
|
|
@@ -5680,7 +5680,7 @@
|
|
|
5680
5680
|
"__schema": "KeywordTypeSchema",
|
|
5681
5681
|
"location": {
|
|
5682
5682
|
"filePath": "merge-cmd.ts",
|
|
5683
|
-
"line":
|
|
5683
|
+
"line": 77,
|
|
5684
5684
|
"character": 16
|
|
5685
5685
|
},
|
|
5686
5686
|
"name": "boolean"
|
|
@@ -5691,7 +5691,7 @@
|
|
|
5691
5691
|
"__schema": "VariableLikeSchema",
|
|
5692
5692
|
"location": {
|
|
5693
5693
|
"filePath": "merge-cmd.ts",
|
|
5694
|
-
"line":
|
|
5694
|
+
"line": 78,
|
|
5695
5695
|
"character": 7
|
|
5696
5696
|
},
|
|
5697
5697
|
"signature": "(property) manual?: boolean | undefined",
|
|
@@ -5700,7 +5700,7 @@
|
|
|
5700
5700
|
"__schema": "KeywordTypeSchema",
|
|
5701
5701
|
"location": {
|
|
5702
5702
|
"filePath": "merge-cmd.ts",
|
|
5703
|
-
"line":
|
|
5703
|
+
"line": 78,
|
|
5704
5704
|
"character": 16
|
|
5705
5705
|
},
|
|
5706
5706
|
"name": "boolean"
|
|
@@ -5711,7 +5711,7 @@
|
|
|
5711
5711
|
"__schema": "VariableLikeSchema",
|
|
5712
5712
|
"location": {
|
|
5713
5713
|
"filePath": "merge-cmd.ts",
|
|
5714
|
-
"line":
|
|
5714
|
+
"line": 79,
|
|
5715
5715
|
"character": 7
|
|
5716
5716
|
},
|
|
5717
5717
|
"signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
|
|
@@ -5720,7 +5720,7 @@
|
|
|
5720
5720
|
"__schema": "TypeRefSchema",
|
|
5721
5721
|
"location": {
|
|
5722
5722
|
"filePath": "merge-cmd.ts",
|
|
5723
|
-
"line":
|
|
5723
|
+
"line": 79,
|
|
5724
5724
|
"character": 26
|
|
5725
5725
|
},
|
|
5726
5726
|
"name": "MergeStrategy"
|
|
@@ -5731,7 +5731,7 @@
|
|
|
5731
5731
|
"__schema": "VariableLikeSchema",
|
|
5732
5732
|
"location": {
|
|
5733
5733
|
"filePath": "merge-cmd.ts",
|
|
5734
|
-
"line":
|
|
5734
|
+
"line": 80,
|
|
5735
5735
|
"character": 7
|
|
5736
5736
|
},
|
|
5737
5737
|
"signature": "(property) abort?: boolean | undefined",
|
|
@@ -5740,7 +5740,7 @@
|
|
|
5740
5740
|
"__schema": "KeywordTypeSchema",
|
|
5741
5741
|
"location": {
|
|
5742
5742
|
"filePath": "merge-cmd.ts",
|
|
5743
|
-
"line":
|
|
5743
|
+
"line": 80,
|
|
5744
5744
|
"character": 15
|
|
5745
5745
|
},
|
|
5746
5746
|
"name": "boolean"
|
|
@@ -5751,7 +5751,7 @@
|
|
|
5751
5751
|
"__schema": "VariableLikeSchema",
|
|
5752
5752
|
"location": {
|
|
5753
5753
|
"filePath": "merge-cmd.ts",
|
|
5754
|
-
"line":
|
|
5754
|
+
"line": 81,
|
|
5755
5755
|
"character": 7
|
|
5756
5756
|
},
|
|
5757
5757
|
"signature": "(property) resolve?: boolean | undefined",
|
|
@@ -5760,7 +5760,7 @@
|
|
|
5760
5760
|
"__schema": "KeywordTypeSchema",
|
|
5761
5761
|
"location": {
|
|
5762
5762
|
"filePath": "merge-cmd.ts",
|
|
5763
|
-
"line":
|
|
5763
|
+
"line": 81,
|
|
5764
5764
|
"character": 17
|
|
5765
5765
|
},
|
|
5766
5766
|
"name": "boolean"
|
|
@@ -5771,7 +5771,7 @@
|
|
|
5771
5771
|
"__schema": "VariableLikeSchema",
|
|
5772
5772
|
"location": {
|
|
5773
5773
|
"filePath": "merge-cmd.ts",
|
|
5774
|
-
"line":
|
|
5774
|
+
"line": 82,
|
|
5775
5775
|
"character": 7
|
|
5776
5776
|
},
|
|
5777
5777
|
"signature": "(property) build?: boolean | undefined",
|
|
@@ -5780,7 +5780,7 @@
|
|
|
5780
5780
|
"__schema": "KeywordTypeSchema",
|
|
5781
5781
|
"location": {
|
|
5782
5782
|
"filePath": "merge-cmd.ts",
|
|
5783
|
-
"line":
|
|
5783
|
+
"line": 82,
|
|
5784
5784
|
"character": 15
|
|
5785
5785
|
},
|
|
5786
5786
|
"name": "boolean"
|
|
@@ -5791,7 +5791,7 @@
|
|
|
5791
5791
|
"__schema": "VariableLikeSchema",
|
|
5792
5792
|
"location": {
|
|
5793
5793
|
"filePath": "merge-cmd.ts",
|
|
5794
|
-
"line":
|
|
5794
|
+
"line": 83,
|
|
5795
5795
|
"character": 7
|
|
5796
5796
|
},
|
|
5797
5797
|
"signature": "(property) noSnap?: boolean | undefined",
|
|
@@ -5800,7 +5800,7 @@
|
|
|
5800
5800
|
"__schema": "KeywordTypeSchema",
|
|
5801
5801
|
"location": {
|
|
5802
5802
|
"filePath": "merge-cmd.ts",
|
|
5803
|
-
"line":
|
|
5803
|
+
"line": 83,
|
|
5804
5804
|
"character": 16
|
|
5805
5805
|
},
|
|
5806
5806
|
"name": "boolean"
|
|
@@ -5811,7 +5811,7 @@
|
|
|
5811
5811
|
"__schema": "VariableLikeSchema",
|
|
5812
5812
|
"location": {
|
|
5813
5813
|
"filePath": "merge-cmd.ts",
|
|
5814
|
-
"line":
|
|
5814
|
+
"line": 84,
|
|
5815
5815
|
"character": 7
|
|
5816
5816
|
},
|
|
5817
5817
|
"signature": "(property) verbose?: boolean | undefined",
|
|
@@ -5820,7 +5820,7 @@
|
|
|
5820
5820
|
"__schema": "KeywordTypeSchema",
|
|
5821
5821
|
"location": {
|
|
5822
5822
|
"filePath": "merge-cmd.ts",
|
|
5823
|
-
"line":
|
|
5823
|
+
"line": 84,
|
|
5824
5824
|
"character": 17
|
|
5825
5825
|
},
|
|
5826
5826
|
"name": "boolean"
|
|
@@ -5831,7 +5831,7 @@
|
|
|
5831
5831
|
"__schema": "VariableLikeSchema",
|
|
5832
5832
|
"location": {
|
|
5833
5833
|
"filePath": "merge-cmd.ts",
|
|
5834
|
-
"line":
|
|
5834
|
+
"line": 85,
|
|
5835
5835
|
"character": 7
|
|
5836
5836
|
},
|
|
5837
5837
|
"signature": "(property) message: string",
|
|
@@ -5840,7 +5840,7 @@
|
|
|
5840
5840
|
"__schema": "KeywordTypeSchema",
|
|
5841
5841
|
"location": {
|
|
5842
5842
|
"filePath": "merge-cmd.ts",
|
|
5843
|
-
"line":
|
|
5843
|
+
"line": 85,
|
|
5844
5844
|
"character": 16
|
|
5845
5845
|
},
|
|
5846
5846
|
"name": "string"
|
|
@@ -5851,7 +5851,7 @@
|
|
|
5851
5851
|
"__schema": "VariableLikeSchema",
|
|
5852
5852
|
"location": {
|
|
5853
5853
|
"filePath": "merge-cmd.ts",
|
|
5854
|
-
"line":
|
|
5854
|
+
"line": 86,
|
|
5855
5855
|
"character": 7
|
|
5856
5856
|
},
|
|
5857
5857
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -5860,7 +5860,7 @@
|
|
|
5860
5860
|
"__schema": "KeywordTypeSchema",
|
|
5861
5861
|
"location": {
|
|
5862
5862
|
"filePath": "merge-cmd.ts",
|
|
5863
|
-
"line":
|
|
5863
|
+
"line": 86,
|
|
5864
5864
|
"character": 36
|
|
5865
5865
|
},
|
|
5866
5866
|
"name": "boolean"
|
|
@@ -5875,7 +5875,7 @@
|
|
|
5875
5875
|
"__schema": "VariableLikeSchema",
|
|
5876
5876
|
"location": {
|
|
5877
5877
|
"filePath": "merge-cmd.ts",
|
|
5878
|
-
"line":
|
|
5878
|
+
"line": 76,
|
|
5879
5879
|
"character": 7
|
|
5880
5880
|
},
|
|
5881
5881
|
"signature": "(property) ours?: boolean | undefined",
|
|
@@ -5884,7 +5884,7 @@
|
|
|
5884
5884
|
"__schema": "KeywordTypeSchema",
|
|
5885
5885
|
"location": {
|
|
5886
5886
|
"filePath": "merge-cmd.ts",
|
|
5887
|
-
"line":
|
|
5887
|
+
"line": 76,
|
|
5888
5888
|
"character": 14
|
|
5889
5889
|
},
|
|
5890
5890
|
"name": "boolean"
|
|
@@ -5895,7 +5895,7 @@
|
|
|
5895
5895
|
"__schema": "VariableLikeSchema",
|
|
5896
5896
|
"location": {
|
|
5897
5897
|
"filePath": "merge-cmd.ts",
|
|
5898
|
-
"line":
|
|
5898
|
+
"line": 77,
|
|
5899
5899
|
"character": 7
|
|
5900
5900
|
},
|
|
5901
5901
|
"signature": "(property) theirs?: boolean | undefined",
|
|
@@ -5904,7 +5904,7 @@
|
|
|
5904
5904
|
"__schema": "KeywordTypeSchema",
|
|
5905
5905
|
"location": {
|
|
5906
5906
|
"filePath": "merge-cmd.ts",
|
|
5907
|
-
"line":
|
|
5907
|
+
"line": 77,
|
|
5908
5908
|
"character": 16
|
|
5909
5909
|
},
|
|
5910
5910
|
"name": "boolean"
|
|
@@ -5915,7 +5915,7 @@
|
|
|
5915
5915
|
"__schema": "VariableLikeSchema",
|
|
5916
5916
|
"location": {
|
|
5917
5917
|
"filePath": "merge-cmd.ts",
|
|
5918
|
-
"line":
|
|
5918
|
+
"line": 78,
|
|
5919
5919
|
"character": 7
|
|
5920
5920
|
},
|
|
5921
5921
|
"signature": "(property) manual?: boolean | undefined",
|
|
@@ -5924,7 +5924,7 @@
|
|
|
5924
5924
|
"__schema": "KeywordTypeSchema",
|
|
5925
5925
|
"location": {
|
|
5926
5926
|
"filePath": "merge-cmd.ts",
|
|
5927
|
-
"line":
|
|
5927
|
+
"line": 78,
|
|
5928
5928
|
"character": 16
|
|
5929
5929
|
},
|
|
5930
5930
|
"name": "boolean"
|
|
@@ -5935,7 +5935,7 @@
|
|
|
5935
5935
|
"__schema": "VariableLikeSchema",
|
|
5936
5936
|
"location": {
|
|
5937
5937
|
"filePath": "merge-cmd.ts",
|
|
5938
|
-
"line":
|
|
5938
|
+
"line": 79,
|
|
5939
5939
|
"character": 7
|
|
5940
5940
|
},
|
|
5941
5941
|
"signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
|
|
@@ -5944,7 +5944,7 @@
|
|
|
5944
5944
|
"__schema": "TypeRefSchema",
|
|
5945
5945
|
"location": {
|
|
5946
5946
|
"filePath": "merge-cmd.ts",
|
|
5947
|
-
"line":
|
|
5947
|
+
"line": 79,
|
|
5948
5948
|
"character": 26
|
|
5949
5949
|
},
|
|
5950
5950
|
"name": "MergeStrategy"
|
|
@@ -5955,7 +5955,7 @@
|
|
|
5955
5955
|
"__schema": "VariableLikeSchema",
|
|
5956
5956
|
"location": {
|
|
5957
5957
|
"filePath": "merge-cmd.ts",
|
|
5958
|
-
"line":
|
|
5958
|
+
"line": 80,
|
|
5959
5959
|
"character": 7
|
|
5960
5960
|
},
|
|
5961
5961
|
"signature": "(property) abort?: boolean | undefined",
|
|
@@ -5964,7 +5964,7 @@
|
|
|
5964
5964
|
"__schema": "KeywordTypeSchema",
|
|
5965
5965
|
"location": {
|
|
5966
5966
|
"filePath": "merge-cmd.ts",
|
|
5967
|
-
"line":
|
|
5967
|
+
"line": 80,
|
|
5968
5968
|
"character": 15
|
|
5969
5969
|
},
|
|
5970
5970
|
"name": "boolean"
|
|
@@ -5975,7 +5975,7 @@
|
|
|
5975
5975
|
"__schema": "VariableLikeSchema",
|
|
5976
5976
|
"location": {
|
|
5977
5977
|
"filePath": "merge-cmd.ts",
|
|
5978
|
-
"line":
|
|
5978
|
+
"line": 81,
|
|
5979
5979
|
"character": 7
|
|
5980
5980
|
},
|
|
5981
5981
|
"signature": "(property) resolve?: boolean | undefined",
|
|
@@ -5984,7 +5984,7 @@
|
|
|
5984
5984
|
"__schema": "KeywordTypeSchema",
|
|
5985
5985
|
"location": {
|
|
5986
5986
|
"filePath": "merge-cmd.ts",
|
|
5987
|
-
"line":
|
|
5987
|
+
"line": 81,
|
|
5988
5988
|
"character": 17
|
|
5989
5989
|
},
|
|
5990
5990
|
"name": "boolean"
|
|
@@ -5995,7 +5995,7 @@
|
|
|
5995
5995
|
"__schema": "VariableLikeSchema",
|
|
5996
5996
|
"location": {
|
|
5997
5997
|
"filePath": "merge-cmd.ts",
|
|
5998
|
-
"line":
|
|
5998
|
+
"line": 82,
|
|
5999
5999
|
"character": 7
|
|
6000
6000
|
},
|
|
6001
6001
|
"signature": "(property) build?: boolean | undefined",
|
|
@@ -6004,7 +6004,7 @@
|
|
|
6004
6004
|
"__schema": "KeywordTypeSchema",
|
|
6005
6005
|
"location": {
|
|
6006
6006
|
"filePath": "merge-cmd.ts",
|
|
6007
|
-
"line":
|
|
6007
|
+
"line": 82,
|
|
6008
6008
|
"character": 15
|
|
6009
6009
|
},
|
|
6010
6010
|
"name": "boolean"
|
|
@@ -6015,7 +6015,7 @@
|
|
|
6015
6015
|
"__schema": "VariableLikeSchema",
|
|
6016
6016
|
"location": {
|
|
6017
6017
|
"filePath": "merge-cmd.ts",
|
|
6018
|
-
"line":
|
|
6018
|
+
"line": 83,
|
|
6019
6019
|
"character": 7
|
|
6020
6020
|
},
|
|
6021
6021
|
"signature": "(property) noSnap?: boolean | undefined",
|
|
@@ -6024,7 +6024,7 @@
|
|
|
6024
6024
|
"__schema": "KeywordTypeSchema",
|
|
6025
6025
|
"location": {
|
|
6026
6026
|
"filePath": "merge-cmd.ts",
|
|
6027
|
-
"line":
|
|
6027
|
+
"line": 83,
|
|
6028
6028
|
"character": 16
|
|
6029
6029
|
},
|
|
6030
6030
|
"name": "boolean"
|
|
@@ -6035,7 +6035,7 @@
|
|
|
6035
6035
|
"__schema": "VariableLikeSchema",
|
|
6036
6036
|
"location": {
|
|
6037
6037
|
"filePath": "merge-cmd.ts",
|
|
6038
|
-
"line":
|
|
6038
|
+
"line": 84,
|
|
6039
6039
|
"character": 7
|
|
6040
6040
|
},
|
|
6041
6041
|
"signature": "(property) verbose?: boolean | undefined",
|
|
@@ -6044,7 +6044,7 @@
|
|
|
6044
6044
|
"__schema": "KeywordTypeSchema",
|
|
6045
6045
|
"location": {
|
|
6046
6046
|
"filePath": "merge-cmd.ts",
|
|
6047
|
-
"line":
|
|
6047
|
+
"line": 84,
|
|
6048
6048
|
"character": 17
|
|
6049
6049
|
},
|
|
6050
6050
|
"name": "boolean"
|
|
@@ -6055,7 +6055,7 @@
|
|
|
6055
6055
|
"__schema": "VariableLikeSchema",
|
|
6056
6056
|
"location": {
|
|
6057
6057
|
"filePath": "merge-cmd.ts",
|
|
6058
|
-
"line":
|
|
6058
|
+
"line": 85,
|
|
6059
6059
|
"character": 7
|
|
6060
6060
|
},
|
|
6061
6061
|
"signature": "(property) message: string",
|
|
@@ -6064,7 +6064,7 @@
|
|
|
6064
6064
|
"__schema": "KeywordTypeSchema",
|
|
6065
6065
|
"location": {
|
|
6066
6066
|
"filePath": "merge-cmd.ts",
|
|
6067
|
-
"line":
|
|
6067
|
+
"line": 85,
|
|
6068
6068
|
"character": 16
|
|
6069
6069
|
},
|
|
6070
6070
|
"name": "string"
|
|
@@ -6075,7 +6075,7 @@
|
|
|
6075
6075
|
"__schema": "VariableLikeSchema",
|
|
6076
6076
|
"location": {
|
|
6077
6077
|
"filePath": "merge-cmd.ts",
|
|
6078
|
-
"line":
|
|
6078
|
+
"line": 86,
|
|
6079
6079
|
"character": 7
|
|
6080
6080
|
},
|
|
6081
6081
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -6084,7 +6084,7 @@
|
|
|
6084
6084
|
"__schema": "KeywordTypeSchema",
|
|
6085
6085
|
"location": {
|
|
6086
6086
|
"filePath": "merge-cmd.ts",
|
|
6087
|
-
"line":
|
|
6087
|
+
"line": 86,
|
|
6088
6088
|
"character": 36
|
|
6089
6089
|
},
|
|
6090
6090
|
"name": "boolean"
|
|
@@ -6099,7 +6099,7 @@
|
|
|
6099
6099
|
"__schema": "InferenceTypeSchema",
|
|
6100
6100
|
"location": {
|
|
6101
6101
|
"filePath": "merge-cmd.ts",
|
|
6102
|
-
"line":
|
|
6102
|
+
"line": 61,
|
|
6103
6103
|
"character": 3
|
|
6104
6104
|
},
|
|
6105
6105
|
"type": "Promise<string>"
|
|
@@ -6132,7 +6132,7 @@
|
|
|
6132
6132
|
"_legacy": {
|
|
6133
6133
|
"scope": "teambit.component",
|
|
6134
6134
|
"name": "merging",
|
|
6135
|
-
"version": "1.0.
|
|
6135
|
+
"version": "1.0.426"
|
|
6136
6136
|
},
|
|
6137
6137
|
"_scope": "teambit.component"
|
|
6138
6138
|
}
|
|
@@ -6144,7 +6144,7 @@
|
|
|
6144
6144
|
"__schema": "FunctionLikeSchema",
|
|
6145
6145
|
"location": {
|
|
6146
6146
|
"filePath": "merge-cmd.ts",
|
|
6147
|
-
"line":
|
|
6147
|
+
"line": 144,
|
|
6148
6148
|
"character": 1
|
|
6149
6149
|
},
|
|
6150
6150
|
"signature": "function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceConfigUpdateResult, }: ApplyVersionResults & {\n configMergeResults?: ConfigMergeResult[];\n}): string",
|
|
@@ -6154,7 +6154,7 @@
|
|
|
6154
6154
|
"__schema": "ParameterSchema",
|
|
6155
6155
|
"location": {
|
|
6156
6156
|
"filePath": "merge-cmd.ts",
|
|
6157
|
-
"line":
|
|
6157
|
+
"line": 144,
|
|
6158
6158
|
"character": 29
|
|
6159
6159
|
},
|
|
6160
6160
|
"name": "{ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceConfigUpdateResult }",
|
|
@@ -6162,7 +6162,7 @@
|
|
|
6162
6162
|
"__schema": "TypeIntersectionSchema",
|
|
6163
6163
|
"location": {
|
|
6164
6164
|
"filePath": "merge-cmd.ts",
|
|
6165
|
-
"line":
|
|
6165
|
+
"line": 155,
|
|
6166
6166
|
"character": 4
|
|
6167
6167
|
},
|
|
6168
6168
|
"types": [
|
|
@@ -6170,7 +6170,7 @@
|
|
|
6170
6170
|
"__schema": "TypeRefSchema",
|
|
6171
6171
|
"location": {
|
|
6172
6172
|
"filePath": "merge-cmd.ts",
|
|
6173
|
-
"line":
|
|
6173
|
+
"line": 155,
|
|
6174
6174
|
"character": 4
|
|
6175
6175
|
},
|
|
6176
6176
|
"name": "ApplyVersionResults"
|
|
@@ -6179,7 +6179,7 @@
|
|
|
6179
6179
|
"__schema": "TypeLiteralSchema",
|
|
6180
6180
|
"location": {
|
|
6181
6181
|
"filePath": "merge-cmd.ts",
|
|
6182
|
-
"line":
|
|
6182
|
+
"line": 155,
|
|
6183
6183
|
"character": 26
|
|
6184
6184
|
},
|
|
6185
6185
|
"members": [
|
|
@@ -6187,7 +6187,7 @@
|
|
|
6187
6187
|
"__schema": "VariableLikeSchema",
|
|
6188
6188
|
"location": {
|
|
6189
6189
|
"filePath": "merge-cmd.ts",
|
|
6190
|
-
"line":
|
|
6190
|
+
"line": 155,
|
|
6191
6191
|
"character": 28
|
|
6192
6192
|
},
|
|
6193
6193
|
"signature": "(property) configMergeResults?: ConfigMergeResult[] | undefined",
|
|
@@ -6196,14 +6196,14 @@
|
|
|
6196
6196
|
"__schema": "TypeArraySchema",
|
|
6197
6197
|
"location": {
|
|
6198
6198
|
"filePath": "merge-cmd.ts",
|
|
6199
|
-
"line":
|
|
6199
|
+
"line": 155,
|
|
6200
6200
|
"character": 49
|
|
6201
6201
|
},
|
|
6202
6202
|
"type": {
|
|
6203
6203
|
"__schema": "TypeRefSchema",
|
|
6204
6204
|
"location": {
|
|
6205
6205
|
"filePath": "merge-cmd.ts",
|
|
6206
|
-
"line":
|
|
6206
|
+
"line": 155,
|
|
6207
6207
|
"character": 49
|
|
6208
6208
|
},
|
|
6209
6209
|
"name": "ConfigMergeResult",
|
|
@@ -6225,7 +6225,7 @@
|
|
|
6225
6225
|
"__schema": "InferenceTypeSchema",
|
|
6226
6226
|
"location": {
|
|
6227
6227
|
"filePath": "merge-cmd.ts",
|
|
6228
|
-
"line":
|
|
6228
|
+
"line": 145,
|
|
6229
6229
|
"character": 3
|
|
6230
6230
|
},
|
|
6231
6231
|
"name": "components",
|
|
@@ -6236,7 +6236,7 @@
|
|
|
6236
6236
|
"__schema": "InferenceTypeSchema",
|
|
6237
6237
|
"location": {
|
|
6238
6238
|
"filePath": "merge-cmd.ts",
|
|
6239
|
-
"line":
|
|
6239
|
+
"line": 146,
|
|
6240
6240
|
"character": 3
|
|
6241
6241
|
},
|
|
6242
6242
|
"name": "failedComponents",
|
|
@@ -6247,7 +6247,7 @@
|
|
|
6247
6247
|
"__schema": "InferenceTypeSchema",
|
|
6248
6248
|
"location": {
|
|
6249
6249
|
"filePath": "merge-cmd.ts",
|
|
6250
|
-
"line":
|
|
6250
|
+
"line": 147,
|
|
6251
6251
|
"character": 3
|
|
6252
6252
|
},
|
|
6253
6253
|
"name": "removedComponents",
|
|
@@ -6258,7 +6258,7 @@
|
|
|
6258
6258
|
"__schema": "InferenceTypeSchema",
|
|
6259
6259
|
"location": {
|
|
6260
6260
|
"filePath": "merge-cmd.ts",
|
|
6261
|
-
"line":
|
|
6261
|
+
"line": 148,
|
|
6262
6262
|
"character": 3
|
|
6263
6263
|
},
|
|
6264
6264
|
"name": "version",
|
|
@@ -6269,7 +6269,7 @@
|
|
|
6269
6269
|
"__schema": "InferenceTypeSchema",
|
|
6270
6270
|
"location": {
|
|
6271
6271
|
"filePath": "merge-cmd.ts",
|
|
6272
|
-
"line":
|
|
6272
|
+
"line": 149,
|
|
6273
6273
|
"character": 3
|
|
6274
6274
|
},
|
|
6275
6275
|
"name": "mergeSnapResults",
|
|
@@ -6280,7 +6280,7 @@
|
|
|
6280
6280
|
"__schema": "InferenceTypeSchema",
|
|
6281
6281
|
"location": {
|
|
6282
6282
|
"filePath": "merge-cmd.ts",
|
|
6283
|
-
"line":
|
|
6283
|
+
"line": 150,
|
|
6284
6284
|
"character": 3
|
|
6285
6285
|
},
|
|
6286
6286
|
"name": "mergeSnapError",
|
|
@@ -6291,7 +6291,7 @@
|
|
|
6291
6291
|
"__schema": "InferenceTypeSchema",
|
|
6292
6292
|
"location": {
|
|
6293
6293
|
"filePath": "merge-cmd.ts",
|
|
6294
|
-
"line":
|
|
6294
|
+
"line": 151,
|
|
6295
6295
|
"character": 3
|
|
6296
6296
|
},
|
|
6297
6297
|
"name": "leftUnresolvedConflicts",
|
|
@@ -6302,7 +6302,7 @@
|
|
|
6302
6302
|
"__schema": "InferenceTypeSchema",
|
|
6303
6303
|
"location": {
|
|
6304
6304
|
"filePath": "merge-cmd.ts",
|
|
6305
|
-
"line":
|
|
6305
|
+
"line": 152,
|
|
6306
6306
|
"character": 3
|
|
6307
6307
|
},
|
|
6308
6308
|
"name": "verbose",
|
|
@@ -6313,7 +6313,7 @@
|
|
|
6313
6313
|
"__schema": "VariableLikeSchema",
|
|
6314
6314
|
"location": {
|
|
6315
6315
|
"filePath": "merge-cmd.ts",
|
|
6316
|
-
"line":
|
|
6316
|
+
"line": 155,
|
|
6317
6317
|
"character": 28
|
|
6318
6318
|
},
|
|
6319
6319
|
"signature": "(property) configMergeResults?: ConfigMergeResult[] | undefined",
|
|
@@ -6322,14 +6322,14 @@
|
|
|
6322
6322
|
"__schema": "TypeArraySchema",
|
|
6323
6323
|
"location": {
|
|
6324
6324
|
"filePath": "merge-cmd.ts",
|
|
6325
|
-
"line":
|
|
6325
|
+
"line": 155,
|
|
6326
6326
|
"character": 49
|
|
6327
6327
|
},
|
|
6328
6328
|
"type": {
|
|
6329
6329
|
"__schema": "TypeRefSchema",
|
|
6330
6330
|
"location": {
|
|
6331
6331
|
"filePath": "merge-cmd.ts",
|
|
6332
|
-
"line":
|
|
6332
|
+
"line": 155,
|
|
6333
6333
|
"character": 49
|
|
6334
6334
|
},
|
|
6335
6335
|
"name": "ConfigMergeResult",
|
|
@@ -6345,7 +6345,7 @@
|
|
|
6345
6345
|
"__schema": "InferenceTypeSchema",
|
|
6346
6346
|
"location": {
|
|
6347
6347
|
"filePath": "merge-cmd.ts",
|
|
6348
|
-
"line":
|
|
6348
|
+
"line": 154,
|
|
6349
6349
|
"character": 3
|
|
6350
6350
|
},
|
|
6351
6351
|
"name": "workspaceConfigUpdateResult",
|
|
@@ -6360,7 +6360,7 @@
|
|
|
6360
6360
|
"__schema": "KeywordTypeSchema",
|
|
6361
6361
|
"location": {
|
|
6362
6362
|
"filePath": "merge-cmd.ts",
|
|
6363
|
-
"line":
|
|
6363
|
+
"line": 155,
|
|
6364
6364
|
"character": 73
|
|
6365
6365
|
},
|
|
6366
6366
|
"name": "string"
|
|
@@ -6373,7 +6373,7 @@
|
|
|
6373
6373
|
"__schema": "FunctionLikeSchema",
|
|
6374
6374
|
"location": {
|
|
6375
6375
|
"filePath": "merge-cmd.ts",
|
|
6376
|
-
"line":
|
|
6376
|
+
"line": 267,
|
|
6377
6377
|
"character": 1
|
|
6378
6378
|
},
|
|
6379
6379
|
"signature": "function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string",
|
|
@@ -6383,7 +6383,7 @@
|
|
|
6383
6383
|
"__schema": "ParameterSchema",
|
|
6384
6384
|
"location": {
|
|
6385
6385
|
"filePath": "merge-cmd.ts",
|
|
6386
|
-
"line":
|
|
6386
|
+
"line": 267,
|
|
6387
6387
|
"character": 48
|
|
6388
6388
|
},
|
|
6389
6389
|
"name": "workspaceConfigUpdateResult",
|
|
@@ -6391,7 +6391,7 @@
|
|
|
6391
6391
|
"__schema": "TypeRefSchema",
|
|
6392
6392
|
"location": {
|
|
6393
6393
|
"filePath": "merge-cmd.ts",
|
|
6394
|
-
"line":
|
|
6394
|
+
"line": 267,
|
|
6395
6395
|
"character": 78
|
|
6396
6396
|
},
|
|
6397
6397
|
"name": "WorkspaceConfigUpdateResult",
|
|
@@ -6408,7 +6408,7 @@
|
|
|
6408
6408
|
"__schema": "KeywordTypeSchema",
|
|
6409
6409
|
"location": {
|
|
6410
6410
|
"filePath": "merge-cmd.ts",
|
|
6411
|
-
"line":
|
|
6411
|
+
"line": 267,
|
|
6412
6412
|
"character": 108
|
|
6413
6413
|
},
|
|
6414
6414
|
"name": "string"
|
|
@@ -6421,14 +6421,14 @@
|
|
|
6421
6421
|
"__schema": "FunctionLikeSchema",
|
|
6422
6422
|
"location": {
|
|
6423
6423
|
"filePath": "merge-cmd.ts",
|
|
6424
|
-
"line":
|
|
6424
|
+
"line": 317,
|
|
6425
6425
|
"character": 1
|
|
6426
6426
|
},
|
|
6427
6427
|
"doc": {
|
|
6428
6428
|
"__schema": "DocSchema",
|
|
6429
6429
|
"location": {
|
|
6430
6430
|
"filePath": "merge-cmd.ts",
|
|
6431
|
-
"line":
|
|
6431
|
+
"line": 313,
|
|
6432
6432
|
"character": 1
|
|
6433
6433
|
},
|
|
6434
6434
|
"raw": "/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */",
|
|
@@ -6442,7 +6442,7 @@
|
|
|
6442
6442
|
"__schema": "ParameterSchema",
|
|
6443
6443
|
"location": {
|
|
6444
6444
|
"filePath": "merge-cmd.ts",
|
|
6445
|
-
"line":
|
|
6445
|
+
"line": 317,
|
|
6446
6446
|
"character": 36
|
|
6447
6447
|
},
|
|
6448
6448
|
"name": "components",
|
|
@@ -6450,14 +6450,14 @@
|
|
|
6450
6450
|
"__schema": "TypeArraySchema",
|
|
6451
6451
|
"location": {
|
|
6452
6452
|
"filePath": "merge-cmd.ts",
|
|
6453
|
-
"line":
|
|
6453
|
+
"line": 317,
|
|
6454
6454
|
"character": 48
|
|
6455
6455
|
},
|
|
6456
6456
|
"type": {
|
|
6457
6457
|
"__schema": "TypeRefSchema",
|
|
6458
6458
|
"location": {
|
|
6459
6459
|
"filePath": "merge-cmd.ts",
|
|
6460
|
-
"line":
|
|
6460
|
+
"line": 317,
|
|
6461
6461
|
"character": 48
|
|
6462
6462
|
},
|
|
6463
6463
|
"name": "ApplyVersionResult"
|
|
@@ -6470,7 +6470,7 @@
|
|
|
6470
6470
|
"__schema": "ParameterSchema",
|
|
6471
6471
|
"location": {
|
|
6472
6472
|
"filePath": "merge-cmd.ts",
|
|
6473
|
-
"line":
|
|
6473
|
+
"line": 317,
|
|
6474
6474
|
"character": 70
|
|
6475
6475
|
},
|
|
6476
6476
|
"name": "addName",
|
|
@@ -6478,7 +6478,7 @@
|
|
|
6478
6478
|
"__schema": "InferenceTypeSchema",
|
|
6479
6479
|
"location": {
|
|
6480
6480
|
"filePath": "merge-cmd.ts",
|
|
6481
|
-
"line":
|
|
6481
|
+
"line": 317,
|
|
6482
6482
|
"character": 70
|
|
6483
6483
|
},
|
|
6484
6484
|
"type": "boolean"
|
|
@@ -6491,7 +6491,7 @@
|
|
|
6491
6491
|
"__schema": "ParameterSchema",
|
|
6492
6492
|
"location": {
|
|
6493
6493
|
"filePath": "merge-cmd.ts",
|
|
6494
|
-
"line":
|
|
6494
|
+
"line": 317,
|
|
6495
6495
|
"character": 86
|
|
6496
6496
|
},
|
|
6497
6497
|
"name": "showVersion",
|
|
@@ -6499,7 +6499,7 @@
|
|
|
6499
6499
|
"__schema": "InferenceTypeSchema",
|
|
6500
6500
|
"location": {
|
|
6501
6501
|
"filePath": "merge-cmd.ts",
|
|
6502
|
-
"line":
|
|
6502
|
+
"line": 317,
|
|
6503
6503
|
"character": 86
|
|
6504
6504
|
},
|
|
6505
6505
|
"type": "boolean"
|
|
@@ -6513,7 +6513,7 @@
|
|
|
6513
6513
|
"__schema": "KeywordTypeSchema",
|
|
6514
6514
|
"location": {
|
|
6515
6515
|
"filePath": "merge-cmd.ts",
|
|
6516
|
-
"line":
|
|
6516
|
+
"line": 317,
|
|
6517
6517
|
"character": 108
|
|
6518
6518
|
},
|
|
6519
6519
|
"name": "string"
|
|
@@ -6526,7 +6526,7 @@
|
|
|
6526
6526
|
"__schema": "FunctionLikeSchema",
|
|
6527
6527
|
"location": {
|
|
6528
6528
|
"filePath": "merge-cmd.ts",
|
|
6529
|
-
"line":
|
|
6529
|
+
"line": 343,
|
|
6530
6530
|
"character": 1
|
|
6531
6531
|
},
|
|
6532
6532
|
"signature": "function conflictSummaryReport(components: ApplyVersionResult[]): {\n conflictedComponents: number;\n conflictedFiles: number;\n conflictStr: string;\n}",
|
|
@@ -6536,7 +6536,7 @@
|
|
|
6536
6536
|
"__schema": "ParameterSchema",
|
|
6537
6537
|
"location": {
|
|
6538
6538
|
"filePath": "merge-cmd.ts",
|
|
6539
|
-
"line":
|
|
6539
|
+
"line": 343,
|
|
6540
6540
|
"character": 39
|
|
6541
6541
|
},
|
|
6542
6542
|
"name": "components",
|
|
@@ -6544,14 +6544,14 @@
|
|
|
6544
6544
|
"__schema": "TypeArraySchema",
|
|
6545
6545
|
"location": {
|
|
6546
6546
|
"filePath": "merge-cmd.ts",
|
|
6547
|
-
"line":
|
|
6547
|
+
"line": 343,
|
|
6548
6548
|
"character": 51
|
|
6549
6549
|
},
|
|
6550
6550
|
"type": {
|
|
6551
6551
|
"__schema": "TypeRefSchema",
|
|
6552
6552
|
"location": {
|
|
6553
6553
|
"filePath": "merge-cmd.ts",
|
|
6554
|
-
"line":
|
|
6554
|
+
"line": 343,
|
|
6555
6555
|
"character": 51
|
|
6556
6556
|
},
|
|
6557
6557
|
"name": "ApplyVersionResult"
|
|
@@ -6565,7 +6565,7 @@
|
|
|
6565
6565
|
"__schema": "TypeLiteralSchema",
|
|
6566
6566
|
"location": {
|
|
6567
6567
|
"filePath": "merge-cmd.ts",
|
|
6568
|
-
"line":
|
|
6568
|
+
"line": 343,
|
|
6569
6569
|
"character": 74
|
|
6570
6570
|
},
|
|
6571
6571
|
"members": [
|
|
@@ -6573,7 +6573,7 @@
|
|
|
6573
6573
|
"__schema": "VariableLikeSchema",
|
|
6574
6574
|
"location": {
|
|
6575
6575
|
"filePath": "merge-cmd.ts",
|
|
6576
|
-
"line":
|
|
6576
|
+
"line": 344,
|
|
6577
6577
|
"character": 3
|
|
6578
6578
|
},
|
|
6579
6579
|
"signature": "(property) conflictedComponents: number",
|
|
@@ -6582,7 +6582,7 @@
|
|
|
6582
6582
|
"__schema": "KeywordTypeSchema",
|
|
6583
6583
|
"location": {
|
|
6584
6584
|
"filePath": "merge-cmd.ts",
|
|
6585
|
-
"line":
|
|
6585
|
+
"line": 344,
|
|
6586
6586
|
"character": 25
|
|
6587
6587
|
},
|
|
6588
6588
|
"name": "number"
|
|
@@ -6593,7 +6593,7 @@
|
|
|
6593
6593
|
"__schema": "VariableLikeSchema",
|
|
6594
6594
|
"location": {
|
|
6595
6595
|
"filePath": "merge-cmd.ts",
|
|
6596
|
-
"line":
|
|
6596
|
+
"line": 345,
|
|
6597
6597
|
"character": 3
|
|
6598
6598
|
},
|
|
6599
6599
|
"signature": "(property) conflictedFiles: number",
|
|
@@ -6602,7 +6602,7 @@
|
|
|
6602
6602
|
"__schema": "KeywordTypeSchema",
|
|
6603
6603
|
"location": {
|
|
6604
6604
|
"filePath": "merge-cmd.ts",
|
|
6605
|
-
"line":
|
|
6605
|
+
"line": 345,
|
|
6606
6606
|
"character": 20
|
|
6607
6607
|
},
|
|
6608
6608
|
"name": "number"
|
|
@@ -6613,7 +6613,7 @@
|
|
|
6613
6613
|
"__schema": "VariableLikeSchema",
|
|
6614
6614
|
"location": {
|
|
6615
6615
|
"filePath": "merge-cmd.ts",
|
|
6616
|
-
"line":
|
|
6616
|
+
"line": 346,
|
|
6617
6617
|
"character": 3
|
|
6618
6618
|
},
|
|
6619
6619
|
"signature": "(property) conflictStr: string",
|
|
@@ -6622,7 +6622,7 @@
|
|
|
6622
6622
|
"__schema": "KeywordTypeSchema",
|
|
6623
6623
|
"location": {
|
|
6624
6624
|
"filePath": "merge-cmd.ts",
|
|
6625
|
-
"line":
|
|
6625
|
+
"line": 346,
|
|
6626
6626
|
"character": 16
|
|
6627
6627
|
},
|
|
6628
6628
|
"name": "string"
|
|
@@ -6639,7 +6639,7 @@
|
|
|
6639
6639
|
"__schema": "FunctionLikeSchema",
|
|
6640
6640
|
"location": {
|
|
6641
6641
|
"filePath": "merge-cmd.ts",
|
|
6642
|
-
"line":
|
|
6642
|
+
"line": 372,
|
|
6643
6643
|
"character": 1
|
|
6644
6644
|
},
|
|
6645
6645
|
"signature": "function installationErrorOutput(installationError?: Error): string",
|
|
@@ -6649,7 +6649,7 @@
|
|
|
6649
6649
|
"__schema": "ParameterSchema",
|
|
6650
6650
|
"location": {
|
|
6651
6651
|
"filePath": "merge-cmd.ts",
|
|
6652
|
-
"line":
|
|
6652
|
+
"line": 372,
|
|
6653
6653
|
"character": 41
|
|
6654
6654
|
},
|
|
6655
6655
|
"name": "installationError",
|
|
@@ -6657,7 +6657,7 @@
|
|
|
6657
6657
|
"__schema": "TypeRefSchema",
|
|
6658
6658
|
"location": {
|
|
6659
6659
|
"filePath": "merge-cmd.ts",
|
|
6660
|
-
"line":
|
|
6660
|
+
"line": 372,
|
|
6661
6661
|
"character": 61
|
|
6662
6662
|
},
|
|
6663
6663
|
"name": "Error"
|
|
@@ -6670,7 +6670,7 @@
|
|
|
6670
6670
|
"__schema": "InferenceTypeSchema",
|
|
6671
6671
|
"location": {
|
|
6672
6672
|
"filePath": "merge-cmd.ts",
|
|
6673
|
-
"line":
|
|
6673
|
+
"line": 372,
|
|
6674
6674
|
"character": 1
|
|
6675
6675
|
},
|
|
6676
6676
|
"type": "string"
|
|
@@ -6683,7 +6683,7 @@
|
|
|
6683
6683
|
"__schema": "FunctionLikeSchema",
|
|
6684
6684
|
"location": {
|
|
6685
6685
|
"filePath": "merge-cmd.ts",
|
|
6686
|
-
"line":
|
|
6686
|
+
"line": 382,
|
|
6687
6687
|
"character": 1
|
|
6688
6688
|
},
|
|
6689
6689
|
"signature": "function compilationErrorOutput(compilationError?: Error): string",
|
|
@@ -6693,7 +6693,7 @@
|
|
|
6693
6693
|
"__schema": "ParameterSchema",
|
|
6694
6694
|
"location": {
|
|
6695
6695
|
"filePath": "merge-cmd.ts",
|
|
6696
|
-
"line":
|
|
6696
|
+
"line": 382,
|
|
6697
6697
|
"character": 40
|
|
6698
6698
|
},
|
|
6699
6699
|
"name": "compilationError",
|
|
@@ -6701,7 +6701,7 @@
|
|
|
6701
6701
|
"__schema": "TypeRefSchema",
|
|
6702
6702
|
"location": {
|
|
6703
6703
|
"filePath": "merge-cmd.ts",
|
|
6704
|
-
"line":
|
|
6704
|
+
"line": 382,
|
|
6705
6705
|
"character": 59
|
|
6706
6706
|
},
|
|
6707
6707
|
"name": "Error"
|
|
@@ -6714,7 +6714,7 @@
|
|
|
6714
6714
|
"__schema": "InferenceTypeSchema",
|
|
6715
6715
|
"location": {
|
|
6716
6716
|
"filePath": "merge-cmd.ts",
|
|
6717
|
-
"line":
|
|
6717
|
+
"line": 382,
|
|
6718
6718
|
"character": 1
|
|
6719
6719
|
},
|
|
6720
6720
|
"type": "string"
|
|
@@ -6727,7 +6727,7 @@
|
|
|
6727
6727
|
"__schema": "FunctionLikeSchema",
|
|
6728
6728
|
"location": {
|
|
6729
6729
|
"filePath": "merge-cmd.ts",
|
|
6730
|
-
"line":
|
|
6730
|
+
"line": 391,
|
|
6731
6731
|
"character": 1
|
|
6732
6732
|
},
|
|
6733
6733
|
"signature": "function getRemovedOutput(removedComponents?: ComponentID[]): string",
|
|
@@ -6737,7 +6737,7 @@
|
|
|
6737
6737
|
"__schema": "ParameterSchema",
|
|
6738
6738
|
"location": {
|
|
6739
6739
|
"filePath": "merge-cmd.ts",
|
|
6740
|
-
"line":
|
|
6740
|
+
"line": 391,
|
|
6741
6741
|
"character": 34
|
|
6742
6742
|
},
|
|
6743
6743
|
"name": "removedComponents",
|
|
@@ -6745,14 +6745,14 @@
|
|
|
6745
6745
|
"__schema": "TypeArraySchema",
|
|
6746
6746
|
"location": {
|
|
6747
6747
|
"filePath": "merge-cmd.ts",
|
|
6748
|
-
"line":
|
|
6748
|
+
"line": 391,
|
|
6749
6749
|
"character": 54
|
|
6750
6750
|
},
|
|
6751
6751
|
"type": {
|
|
6752
6752
|
"__schema": "TypeRefSchema",
|
|
6753
6753
|
"location": {
|
|
6754
6754
|
"filePath": "merge-cmd.ts",
|
|
6755
|
-
"line":
|
|
6755
|
+
"line": 391,
|
|
6756
6756
|
"character": 54
|
|
6757
6757
|
},
|
|
6758
6758
|
"name": "ComponentID",
|
|
@@ -6771,7 +6771,7 @@
|
|
|
6771
6771
|
"__schema": "InferenceTypeSchema",
|
|
6772
6772
|
"location": {
|
|
6773
6773
|
"filePath": "merge-cmd.ts",
|
|
6774
|
-
"line":
|
|
6774
|
+
"line": 391,
|
|
6775
6775
|
"character": 1
|
|
6776
6776
|
},
|
|
6777
6777
|
"type": "string"
|
|
@@ -6784,7 +6784,7 @@
|
|
|
6784
6784
|
"__schema": "FunctionLikeSchema",
|
|
6785
6785
|
"location": {
|
|
6786
6786
|
"filePath": "merge-cmd.ts",
|
|
6787
|
-
"line":
|
|
6787
|
+
"line": 398,
|
|
6788
6788
|
"character": 1
|
|
6789
6789
|
},
|
|
6790
6790
|
"signature": "function getAddedOutput(addedComponents?: ComponentID[]): string",
|
|
@@ -6794,7 +6794,7 @@
|
|
|
6794
6794
|
"__schema": "ParameterSchema",
|
|
6795
6795
|
"location": {
|
|
6796
6796
|
"filePath": "merge-cmd.ts",
|
|
6797
|
-
"line":
|
|
6797
|
+
"line": 398,
|
|
6798
6798
|
"character": 32
|
|
6799
6799
|
},
|
|
6800
6800
|
"name": "addedComponents",
|
|
@@ -6802,14 +6802,14 @@
|
|
|
6802
6802
|
"__schema": "TypeArraySchema",
|
|
6803
6803
|
"location": {
|
|
6804
6804
|
"filePath": "merge-cmd.ts",
|
|
6805
|
-
"line":
|
|
6805
|
+
"line": 398,
|
|
6806
6806
|
"character": 50
|
|
6807
6807
|
},
|
|
6808
6808
|
"type": {
|
|
6809
6809
|
"__schema": "TypeRefSchema",
|
|
6810
6810
|
"location": {
|
|
6811
6811
|
"filePath": "merge-cmd.ts",
|
|
6812
|
-
"line":
|
|
6812
|
+
"line": 398,
|
|
6813
6813
|
"character": 50
|
|
6814
6814
|
},
|
|
6815
6815
|
"name": "ComponentID",
|
|
@@ -6828,7 +6828,7 @@
|
|
|
6828
6828
|
"__schema": "InferenceTypeSchema",
|
|
6829
6829
|
"location": {
|
|
6830
6830
|
"filePath": "merge-cmd.ts",
|
|
6831
|
-
"line":
|
|
6831
|
+
"line": 398,
|
|
6832
6832
|
"character": 1
|
|
6833
6833
|
},
|
|
6834
6834
|
"type": "string"
|
|
@@ -6843,7 +6843,7 @@
|
|
|
6843
6843
|
"__schema": "FunctionLikeSchema",
|
|
6844
6844
|
"location": {
|
|
6845
6845
|
"filePath": "merge-cmd.ts",
|
|
6846
|
-
"line":
|
|
6846
|
+
"line": 299,
|
|
6847
6847
|
"character": 1
|
|
6848
6848
|
},
|
|
6849
6849
|
"signature": "function getWorkspaceDepsOutput(workspaceDepsUpdates?: WorkspaceDepsUpdates): string",
|
|
@@ -6853,7 +6853,7 @@
|
|
|
6853
6853
|
"__schema": "ParameterSchema",
|
|
6854
6854
|
"location": {
|
|
6855
6855
|
"filePath": "merge-cmd.ts",
|
|
6856
|
-
"line":
|
|
6856
|
+
"line": 299,
|
|
6857
6857
|
"character": 33
|
|
6858
6858
|
},
|
|
6859
6859
|
"name": "workspaceDepsUpdates",
|
|
@@ -6861,7 +6861,7 @@
|
|
|
6861
6861
|
"__schema": "TypeRefSchema",
|
|
6862
6862
|
"location": {
|
|
6863
6863
|
"filePath": "merge-cmd.ts",
|
|
6864
|
-
"line":
|
|
6864
|
+
"line": 299,
|
|
6865
6865
|
"character": 56
|
|
6866
6866
|
},
|
|
6867
6867
|
"name": "WorkspaceDepsUpdates",
|
|
@@ -6878,7 +6878,7 @@
|
|
|
6878
6878
|
"__schema": "KeywordTypeSchema",
|
|
6879
6879
|
"location": {
|
|
6880
6880
|
"filePath": "merge-cmd.ts",
|
|
6881
|
-
"line":
|
|
6881
|
+
"line": 299,
|
|
6882
6882
|
"character": 79
|
|
6883
6883
|
},
|
|
6884
6884
|
"name": "string"
|
|
@@ -6983,7 +6983,7 @@
|
|
|
6983
6983
|
"componentId": {
|
|
6984
6984
|
"scope": "teambit.component",
|
|
6985
6985
|
"name": "sources",
|
|
6986
|
-
"version": "0.0.
|
|
6986
|
+
"version": "0.0.34"
|
|
6987
6987
|
}
|
|
6988
6988
|
},
|
|
6989
6989
|
"isOptional": false
|
|
@@ -7179,7 +7179,7 @@
|
|
|
7179
7179
|
"componentId": {
|
|
7180
7180
|
"scope": "teambit.component",
|
|
7181
7181
|
"name": "sources",
|
|
7182
|
-
"version": "0.0.
|
|
7182
|
+
"version": "0.0.34"
|
|
7183
7183
|
}
|
|
7184
7184
|
},
|
|
7185
7185
|
"isOptional": true
|
|
@@ -7261,7 +7261,7 @@
|
|
|
7261
7261
|
"componentId": {
|
|
7262
7262
|
"scope": "teambit.component",
|
|
7263
7263
|
"name": "sources",
|
|
7264
|
-
"version": "0.0.
|
|
7264
|
+
"version": "0.0.34"
|
|
7265
7265
|
}
|
|
7266
7266
|
},
|
|
7267
7267
|
"isOptional": false
|
|
@@ -7501,7 +7501,7 @@
|
|
|
7501
7501
|
"componentId": {
|
|
7502
7502
|
"scope": "teambit.component",
|
|
7503
7503
|
"name": "sources",
|
|
7504
|
-
"version": "0.0.
|
|
7504
|
+
"version": "0.0.34"
|
|
7505
7505
|
}
|
|
7506
7506
|
},
|
|
7507
7507
|
"isOptional": false
|
|
@@ -7583,7 +7583,7 @@
|
|
|
7583
7583
|
"componentId": {
|
|
7584
7584
|
"scope": "teambit.component",
|
|
7585
7585
|
"name": "sources",
|
|
7586
|
-
"version": "0.0.
|
|
7586
|
+
"version": "0.0.34"
|
|
7587
7587
|
}
|
|
7588
7588
|
},
|
|
7589
7589
|
"isOptional": false
|
|
@@ -10983,7 +10983,7 @@
|
|
|
10983
10983
|
"__schema": "FunctionLikeSchema",
|
|
10984
10984
|
"location": {
|
|
10985
10985
|
"filePath": "merging.main.runtime.ts",
|
|
10986
|
-
"line":
|
|
10986
|
+
"line": 352,
|
|
10987
10987
|
"character": 3
|
|
10988
10988
|
},
|
|
10989
10989
|
"signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
|
|
@@ -10993,7 +10993,7 @@
|
|
|
10993
10993
|
"__schema": "ParameterSchema",
|
|
10994
10994
|
"location": {
|
|
10995
10995
|
"filePath": "merging.main.runtime.ts",
|
|
10996
|
-
"line":
|
|
10996
|
+
"line": 353,
|
|
10997
10997
|
"character": 5
|
|
10998
10998
|
},
|
|
10999
10999
|
"name": "componentsResults",
|
|
@@ -11001,14 +11001,14 @@
|
|
|
11001
11001
|
"__schema": "TypeArraySchema",
|
|
11002
11002
|
"location": {
|
|
11003
11003
|
"filePath": "merging.main.runtime.ts",
|
|
11004
|
-
"line":
|
|
11004
|
+
"line": 353,
|
|
11005
11005
|
"character": 24
|
|
11006
11006
|
},
|
|
11007
11007
|
"type": {
|
|
11008
11008
|
"__schema": "TypeRefSchema",
|
|
11009
11009
|
"location": {
|
|
11010
11010
|
"filePath": "merging.main.runtime.ts",
|
|
11011
|
-
"line":
|
|
11011
|
+
"line": 353,
|
|
11012
11012
|
"character": 24
|
|
11013
11013
|
},
|
|
11014
11014
|
"name": "ApplyVersionWithComps",
|
|
@@ -11025,7 +11025,7 @@
|
|
|
11025
11025
|
"__schema": "ParameterSchema",
|
|
11026
11026
|
"location": {
|
|
11027
11027
|
"filePath": "merging.main.runtime.ts",
|
|
11028
|
-
"line":
|
|
11028
|
+
"line": 354,
|
|
11029
11029
|
"character": 5
|
|
11030
11030
|
},
|
|
11031
11031
|
"name": "currentLane",
|
|
@@ -11033,7 +11033,7 @@
|
|
|
11033
11033
|
"__schema": "TypeRefSchema",
|
|
11034
11034
|
"location": {
|
|
11035
11035
|
"filePath": "merging.main.runtime.ts",
|
|
11036
|
-
"line":
|
|
11036
|
+
"line": 354,
|
|
11037
11037
|
"character": 19
|
|
11038
11038
|
},
|
|
11039
11039
|
"name": "Lane",
|
|
@@ -11046,7 +11046,7 @@
|
|
|
11046
11046
|
"__schema": "ParameterSchema",
|
|
11047
11047
|
"location": {
|
|
11048
11048
|
"filePath": "merging.main.runtime.ts",
|
|
11049
|
-
"line":
|
|
11049
|
+
"line": 355,
|
|
11050
11050
|
"character": 5
|
|
11051
11051
|
},
|
|
11052
11052
|
"name": "currentLaneIdsBeforeMerge",
|
|
@@ -11054,7 +11054,7 @@
|
|
|
11054
11054
|
"__schema": "TypeRefSchema",
|
|
11055
11055
|
"location": {
|
|
11056
11056
|
"filePath": "merging.main.runtime.ts",
|
|
11057
|
-
"line":
|
|
11057
|
+
"line": 355,
|
|
11058
11058
|
"character": 33
|
|
11059
11059
|
},
|
|
11060
11060
|
"name": "ComponentIdList",
|
|
@@ -11072,7 +11072,7 @@
|
|
|
11072
11072
|
"__schema": "InferenceTypeSchema",
|
|
11073
11073
|
"location": {
|
|
11074
11074
|
"filePath": "merging.main.runtime.ts",
|
|
11075
|
-
"line":
|
|
11075
|
+
"line": 352,
|
|
11076
11076
|
"character": 3
|
|
11077
11077
|
},
|
|
11078
11078
|
"type": "Promise<void>"
|
|
@@ -11085,14 +11085,14 @@
|
|
|
11085
11085
|
"__schema": "FunctionLikeSchema",
|
|
11086
11086
|
"location": {
|
|
11087
11087
|
"filePath": "merging.main.runtime.ts",
|
|
11088
|
-
"line":
|
|
11088
|
+
"line": 377,
|
|
11089
11089
|
"character": 3
|
|
11090
11090
|
},
|
|
11091
11091
|
"doc": {
|
|
11092
11092
|
"__schema": "DocSchema",
|
|
11093
11093
|
"location": {
|
|
11094
11094
|
"filePath": "merging.main.runtime.ts",
|
|
11095
|
-
"line":
|
|
11095
|
+
"line": 371,
|
|
11096
11096
|
"character": 3
|
|
11097
11097
|
},
|
|
11098
11098
|
"raw": "/**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */",
|
|
@@ -11106,7 +11106,7 @@
|
|
|
11106
11106
|
"__schema": "ParameterSchema",
|
|
11107
11107
|
"location": {
|
|
11108
11108
|
"filePath": "merging.main.runtime.ts",
|
|
11109
|
-
"line":
|
|
11109
|
+
"line": 378,
|
|
11110
11110
|
"character": 5
|
|
11111
11111
|
},
|
|
11112
11112
|
"name": "bitIds",
|
|
@@ -11114,14 +11114,14 @@
|
|
|
11114
11114
|
"__schema": "TypeArraySchema",
|
|
11115
11115
|
"location": {
|
|
11116
11116
|
"filePath": "merging.main.runtime.ts",
|
|
11117
|
-
"line":
|
|
11117
|
+
"line": 378,
|
|
11118
11118
|
"character": 13
|
|
11119
11119
|
},
|
|
11120
11120
|
"type": {
|
|
11121
11121
|
"__schema": "TypeRefSchema",
|
|
11122
11122
|
"location": {
|
|
11123
11123
|
"filePath": "merging.main.runtime.ts",
|
|
11124
|
-
"line":
|
|
11124
|
+
"line": 378,
|
|
11125
11125
|
"character": 13
|
|
11126
11126
|
},
|
|
11127
11127
|
"name": "ComponentID",
|
|
@@ -11139,7 +11139,7 @@
|
|
|
11139
11139
|
"__schema": "ParameterSchema",
|
|
11140
11140
|
"location": {
|
|
11141
11141
|
"filePath": "merging.main.runtime.ts",
|
|
11142
|
-
"line":
|
|
11142
|
+
"line": 379,
|
|
11143
11143
|
"character": 5
|
|
11144
11144
|
},
|
|
11145
11145
|
"name": "options",
|
|
@@ -11147,7 +11147,7 @@
|
|
|
11147
11147
|
"__schema": "TypeRefSchema",
|
|
11148
11148
|
"location": {
|
|
11149
11149
|
"filePath": "merging.main.runtime.ts",
|
|
11150
|
-
"line":
|
|
11150
|
+
"line": 379,
|
|
11151
11151
|
"character": 14
|
|
11152
11152
|
},
|
|
11153
11153
|
"name": "MergeStatusProviderOptions",
|
|
@@ -11160,7 +11160,7 @@
|
|
|
11160
11160
|
"__schema": "ParameterSchema",
|
|
11161
11161
|
"location": {
|
|
11162
11162
|
"filePath": "merging.main.runtime.ts",
|
|
11163
|
-
"line":
|
|
11163
|
+
"line": 380,
|
|
11164
11164
|
"character": 5
|
|
11165
11165
|
},
|
|
11166
11166
|
"name": "currentLane",
|
|
@@ -11168,7 +11168,7 @@
|
|
|
11168
11168
|
"__schema": "TypeRefSchema",
|
|
11169
11169
|
"location": {
|
|
11170
11170
|
"filePath": "merging.main.runtime.ts",
|
|
11171
|
-
"line":
|
|
11171
|
+
"line": 380,
|
|
11172
11172
|
"character": 19
|
|
11173
11173
|
},
|
|
11174
11174
|
"name": "Lane",
|
|
@@ -11181,7 +11181,7 @@
|
|
|
11181
11181
|
"__schema": "ParameterSchema",
|
|
11182
11182
|
"location": {
|
|
11183
11183
|
"filePath": "merging.main.runtime.ts",
|
|
11184
|
-
"line":
|
|
11184
|
+
"line": 381,
|
|
11185
11185
|
"character": 5
|
|
11186
11186
|
},
|
|
11187
11187
|
"name": "otherLane",
|
|
@@ -11189,7 +11189,7 @@
|
|
|
11189
11189
|
"__schema": "TypeRefSchema",
|
|
11190
11190
|
"location": {
|
|
11191
11191
|
"filePath": "merging.main.runtime.ts",
|
|
11192
|
-
"line":
|
|
11192
|
+
"line": 381,
|
|
11193
11193
|
"character": 17
|
|
11194
11194
|
},
|
|
11195
11195
|
"name": "Lane",
|
|
@@ -11203,7 +11203,7 @@
|
|
|
11203
11203
|
"__schema": "TypeRefSchema",
|
|
11204
11204
|
"location": {
|
|
11205
11205
|
"filePath": "merging.main.runtime.ts",
|
|
11206
|
-
"line":
|
|
11206
|
+
"line": 382,
|
|
11207
11207
|
"character": 6
|
|
11208
11208
|
},
|
|
11209
11209
|
"name": "Promise",
|
|
@@ -11212,14 +11212,14 @@
|
|
|
11212
11212
|
"__schema": "TypeArraySchema",
|
|
11213
11213
|
"location": {
|
|
11214
11214
|
"filePath": "merging.main.runtime.ts",
|
|
11215
|
-
"line":
|
|
11215
|
+
"line": 382,
|
|
11216
11216
|
"character": 14
|
|
11217
11217
|
},
|
|
11218
11218
|
"type": {
|
|
11219
11219
|
"__schema": "TypeRefSchema",
|
|
11220
11220
|
"location": {
|
|
11221
11221
|
"filePath": "merging.main.runtime.ts",
|
|
11222
|
-
"line":
|
|
11222
|
+
"line": 382,
|
|
11223
11223
|
"character": 14
|
|
11224
11224
|
},
|
|
11225
11225
|
"name": "ComponentMergeStatus"
|
|
@@ -11235,7 +11235,7 @@
|
|
|
11235
11235
|
"__schema": "VariableLikeSchema",
|
|
11236
11236
|
"location": {
|
|
11237
11237
|
"filePath": "merging.main.runtime.ts",
|
|
11238
|
-
"line":
|
|
11238
|
+
"line": 675,
|
|
11239
11239
|
"character": 3
|
|
11240
11240
|
},
|
|
11241
11241
|
"signature": "(property) MergingMain.slots: never[]",
|
|
@@ -11244,7 +11244,7 @@
|
|
|
11244
11244
|
"__schema": "InferenceTypeSchema",
|
|
11245
11245
|
"location": {
|
|
11246
11246
|
"filePath": "merging.main.runtime.ts",
|
|
11247
|
-
"line":
|
|
11247
|
+
"line": 675,
|
|
11248
11248
|
"character": 3
|
|
11249
11249
|
},
|
|
11250
11250
|
"type": "never[]"
|
|
@@ -11256,7 +11256,7 @@
|
|
|
11256
11256
|
"__schema": "VariableLikeSchema",
|
|
11257
11257
|
"location": {
|
|
11258
11258
|
"filePath": "merging.main.runtime.ts",
|
|
11259
|
-
"line":
|
|
11259
|
+
"line": 676,
|
|
11260
11260
|
"character": 3
|
|
11261
11261
|
},
|
|
11262
11262
|
"signature": "(property) MergingMain.dependencies: Aspect[]",
|
|
@@ -11265,7 +11265,7 @@
|
|
|
11265
11265
|
"__schema": "InferenceTypeSchema",
|
|
11266
11266
|
"location": {
|
|
11267
11267
|
"filePath": "merging.main.runtime.ts",
|
|
11268
|
-
"line":
|
|
11268
|
+
"line": 676,
|
|
11269
11269
|
"character": 3
|
|
11270
11270
|
},
|
|
11271
11271
|
"type": "Aspect[]"
|
|
@@ -11277,7 +11277,7 @@
|
|
|
11277
11277
|
"__schema": "VariableLikeSchema",
|
|
11278
11278
|
"location": {
|
|
11279
11279
|
"filePath": "merging.main.runtime.ts",
|
|
11280
|
-
"line":
|
|
11280
|
+
"line": 692,
|
|
11281
11281
|
"character": 3
|
|
11282
11282
|
},
|
|
11283
11283
|
"signature": "(property) MergingMain.runtime: RuntimeDefinition",
|
|
@@ -11286,7 +11286,7 @@
|
|
|
11286
11286
|
"__schema": "InferenceTypeSchema",
|
|
11287
11287
|
"location": {
|
|
11288
11288
|
"filePath": "merging.main.runtime.ts",
|
|
11289
|
-
"line":
|
|
11289
|
+
"line": 692,
|
|
11290
11290
|
"character": 3
|
|
11291
11291
|
},
|
|
11292
11292
|
"type": "RuntimeDefinition"
|
|
@@ -11298,7 +11298,7 @@
|
|
|
11298
11298
|
"__schema": "FunctionLikeSchema",
|
|
11299
11299
|
"location": {
|
|
11300
11300
|
"filePath": "merging.main.runtime.ts",
|
|
11301
|
-
"line":
|
|
11301
|
+
"line": 693,
|
|
11302
11302
|
"character": 3
|
|
11303
11303
|
},
|
|
11304
11304
|
"signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain\n]): Promise<MergingMain>",
|
|
@@ -11308,7 +11308,7 @@
|
|
|
11308
11308
|
"__schema": "ParameterSchema",
|
|
11309
11309
|
"location": {
|
|
11310
11310
|
"filePath": "merging.main.runtime.ts",
|
|
11311
|
-
"line":
|
|
11311
|
+
"line": 693,
|
|
11312
11312
|
"character": 25
|
|
11313
11313
|
},
|
|
11314
11314
|
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
|
|
@@ -11316,7 +11316,7 @@
|
|
|
11316
11316
|
"__schema": "TupleTypeSchema",
|
|
11317
11317
|
"location": {
|
|
11318
11318
|
"filePath": "merging.main.runtime.ts",
|
|
11319
|
-
"line":
|
|
11319
|
+
"line": 708,
|
|
11320
11320
|
"character": 6
|
|
11321
11321
|
},
|
|
11322
11322
|
"elements": [
|
|
@@ -11324,7 +11324,7 @@
|
|
|
11324
11324
|
"__schema": "TypeRefSchema",
|
|
11325
11325
|
"location": {
|
|
11326
11326
|
"filePath": "merging.main.runtime.ts",
|
|
11327
|
-
"line":
|
|
11327
|
+
"line": 709,
|
|
11328
11328
|
"character": 5
|
|
11329
11329
|
},
|
|
11330
11330
|
"name": "CLIMain",
|
|
@@ -11337,7 +11337,7 @@
|
|
|
11337
11337
|
"__schema": "TypeRefSchema",
|
|
11338
11338
|
"location": {
|
|
11339
11339
|
"filePath": "merging.main.runtime.ts",
|
|
11340
|
-
"line":
|
|
11340
|
+
"line": 710,
|
|
11341
11341
|
"character": 5
|
|
11342
11342
|
},
|
|
11343
11343
|
"name": "Workspace",
|
|
@@ -11350,7 +11350,7 @@
|
|
|
11350
11350
|
"__schema": "TypeRefSchema",
|
|
11351
11351
|
"location": {
|
|
11352
11352
|
"filePath": "merging.main.runtime.ts",
|
|
11353
|
-
"line":
|
|
11353
|
+
"line": 711,
|
|
11354
11354
|
"character": 5
|
|
11355
11355
|
},
|
|
11356
11356
|
"name": "ScopeMain",
|
|
@@ -11363,7 +11363,7 @@
|
|
|
11363
11363
|
"__schema": "TypeRefSchema",
|
|
11364
11364
|
"location": {
|
|
11365
11365
|
"filePath": "merging.main.runtime.ts",
|
|
11366
|
-
"line":
|
|
11366
|
+
"line": 712,
|
|
11367
11367
|
"character": 5
|
|
11368
11368
|
},
|
|
11369
11369
|
"name": "SnappingMain",
|
|
@@ -11376,7 +11376,7 @@
|
|
|
11376
11376
|
"__schema": "TypeRefSchema",
|
|
11377
11377
|
"location": {
|
|
11378
11378
|
"filePath": "merging.main.runtime.ts",
|
|
11379
|
-
"line":
|
|
11379
|
+
"line": 713,
|
|
11380
11380
|
"character": 5
|
|
11381
11381
|
},
|
|
11382
11382
|
"name": "CheckoutMain",
|
|
@@ -11389,7 +11389,7 @@
|
|
|
11389
11389
|
"__schema": "TypeRefSchema",
|
|
11390
11390
|
"location": {
|
|
11391
11391
|
"filePath": "merging.main.runtime.ts",
|
|
11392
|
-
"line":
|
|
11392
|
+
"line": 714,
|
|
11393
11393
|
"character": 5
|
|
11394
11394
|
},
|
|
11395
11395
|
"name": "InstallMain",
|
|
@@ -11402,7 +11402,7 @@
|
|
|
11402
11402
|
"__schema": "TypeRefSchema",
|
|
11403
11403
|
"location": {
|
|
11404
11404
|
"filePath": "merging.main.runtime.ts",
|
|
11405
|
-
"line":
|
|
11405
|
+
"line": 715,
|
|
11406
11406
|
"character": 5
|
|
11407
11407
|
},
|
|
11408
11408
|
"name": "LoggerMain",
|
|
@@ -11415,7 +11415,7 @@
|
|
|
11415
11415
|
"__schema": "TypeRefSchema",
|
|
11416
11416
|
"location": {
|
|
11417
11417
|
"filePath": "merging.main.runtime.ts",
|
|
11418
|
-
"line":
|
|
11418
|
+
"line": 716,
|
|
11419
11419
|
"character": 5
|
|
11420
11420
|
},
|
|
11421
11421
|
"name": "ComponentWriterMain",
|
|
@@ -11428,7 +11428,7 @@
|
|
|
11428
11428
|
"__schema": "TypeRefSchema",
|
|
11429
11429
|
"location": {
|
|
11430
11430
|
"filePath": "merging.main.runtime.ts",
|
|
11431
|
-
"line":
|
|
11431
|
+
"line": 717,
|
|
11432
11432
|
"character": 5
|
|
11433
11433
|
},
|
|
11434
11434
|
"name": "ImporterMain",
|
|
@@ -11441,7 +11441,7 @@
|
|
|
11441
11441
|
"__schema": "TypeRefSchema",
|
|
11442
11442
|
"location": {
|
|
11443
11443
|
"filePath": "merging.main.runtime.ts",
|
|
11444
|
-
"line":
|
|
11444
|
+
"line": 718,
|
|
11445
11445
|
"character": 5
|
|
11446
11446
|
},
|
|
11447
11447
|
"name": "ConfigMain",
|
|
@@ -11454,7 +11454,7 @@
|
|
|
11454
11454
|
"__schema": "TypeRefSchema",
|
|
11455
11455
|
"location": {
|
|
11456
11456
|
"filePath": "merging.main.runtime.ts",
|
|
11457
|
-
"line":
|
|
11457
|
+
"line": 719,
|
|
11458
11458
|
"character": 5
|
|
11459
11459
|
},
|
|
11460
11460
|
"name": "RemoveMain",
|
|
@@ -11467,7 +11467,7 @@
|
|
|
11467
11467
|
"__schema": "TypeRefSchema",
|
|
11468
11468
|
"location": {
|
|
11469
11469
|
"filePath": "merging.main.runtime.ts",
|
|
11470
|
-
"line":
|
|
11470
|
+
"line": 720,
|
|
11471
11471
|
"character": 5
|
|
11472
11472
|
},
|
|
11473
11473
|
"name": "GlobalConfigMain",
|
|
@@ -11480,7 +11480,7 @@
|
|
|
11480
11480
|
"__schema": "TypeRefSchema",
|
|
11481
11481
|
"location": {
|
|
11482
11482
|
"filePath": "merging.main.runtime.ts",
|
|
11483
|
-
"line":
|
|
11483
|
+
"line": 721,
|
|
11484
11484
|
"character": 5
|
|
11485
11485
|
},
|
|
11486
11486
|
"name": "ConfigMergerMain",
|
|
@@ -11493,7 +11493,7 @@
|
|
|
11493
11493
|
"__schema": "TypeRefSchema",
|
|
11494
11494
|
"location": {
|
|
11495
11495
|
"filePath": "merging.main.runtime.ts",
|
|
11496
|
-
"line":
|
|
11496
|
+
"line": 722,
|
|
11497
11497
|
"character": 5
|
|
11498
11498
|
},
|
|
11499
11499
|
"name": "DependencyResolverMain",
|
|
@@ -11512,7 +11512,7 @@
|
|
|
11512
11512
|
"__schema": "InferenceTypeSchema",
|
|
11513
11513
|
"location": {
|
|
11514
11514
|
"filePath": "merging.main.runtime.ts",
|
|
11515
|
-
"line":
|
|
11515
|
+
"line": 693,
|
|
11516
11516
|
"character": 3
|
|
11517
11517
|
},
|
|
11518
11518
|
"type": "Promise<MergingMain>"
|
|
@@ -11639,7 +11639,7 @@
|
|
|
11639
11639
|
"__schema": "UnImplementedSchema",
|
|
11640
11640
|
"location": {
|
|
11641
11641
|
"filePath": "merging.main.runtime.ts",
|
|
11642
|
-
"line":
|
|
11642
|
+
"line": 744,
|
|
11643
11643
|
"character": 1
|
|
11644
11644
|
},
|
|
11645
11645
|
"name": "MergingAspect.addRuntime(MergingMain);",
|
|
@@ -11688,7 +11688,7 @@
|
|
|
11688
11688
|
"componentId": {
|
|
11689
11689
|
"scope": "teambit.component",
|
|
11690
11690
|
"name": "merging",
|
|
11691
|
-
"version": "1.0.
|
|
11691
|
+
"version": "1.0.426"
|
|
11692
11692
|
},
|
|
11693
11693
|
"taggedModuleExports": []
|
|
11694
11694
|
}
|