@teambit/git 1.0.258 → 1.0.260

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites tests="0" failures="0" errors="0" skipped="0">
3
- <testsuite name="teambit.git/git@1.0.258" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.git/git@1.0.260" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
@@ -22,13 +22,370 @@
22
22
  },
23
23
  "name": "GitMain",
24
24
  "exportNode": {
25
- "__schema": "TypeRefSchema",
25
+ "__schema": "ClassSchema",
26
26
  "location": {
27
- "filePath": "index.ts",
28
- "line": 3,
29
- "character": 15
27
+ "filePath": "git.main.runtime.ts",
28
+ "line": 30,
29
+ "character": 1
30
30
  },
31
- "name": "GitMain"
31
+ "signature": "class GitMain",
32
+ "name": "GitMain",
33
+ "members": [
34
+ {
35
+ "__schema": "ConstructorSchema",
36
+ "location": {
37
+ "filePath": "git.main.runtime.ts",
38
+ "line": 31,
39
+ "character": 3
40
+ },
41
+ "signature": "constructor GitMain(workspace: Workspace, config: GitExtWorkspaceConfig): GitMain",
42
+ "name": "constructor",
43
+ "params": [
44
+ {
45
+ "__schema": "ParameterSchema",
46
+ "location": {
47
+ "filePath": "git.main.runtime.ts",
48
+ "line": 32,
49
+ "character": 5
50
+ },
51
+ "name": "workspace",
52
+ "type": {
53
+ "__schema": "TypeRefSchema",
54
+ "location": {
55
+ "filePath": "git.main.runtime.ts",
56
+ "line": 32,
57
+ "character": 24
58
+ },
59
+ "name": "Workspace",
60
+ "componentId": {
61
+ "scope": "teambit.workspace",
62
+ "name": "workspace"
63
+ }
64
+ },
65
+ "isOptional": false,
66
+ "isSpread": false
67
+ },
68
+ {
69
+ "__schema": "ParameterSchema",
70
+ "location": {
71
+ "filePath": "git.main.runtime.ts",
72
+ "line": 36,
73
+ "character": 5
74
+ },
75
+ "name": "config",
76
+ "type": {
77
+ "__schema": "TypeRefSchema",
78
+ "location": {
79
+ "filePath": "git.main.runtime.ts",
80
+ "line": 36,
81
+ "character": 22
82
+ },
83
+ "name": "GitExtWorkspaceConfig",
84
+ "internalFilePath": "git.main.runtime.ts"
85
+ },
86
+ "isOptional": false,
87
+ "isSpread": false
88
+ }
89
+ ],
90
+ "returnType": {
91
+ "__schema": "ThisTypeSchema",
92
+ "location": {
93
+ "filePath": "git.main.runtime.ts",
94
+ "line": 30,
95
+ "character": 1
96
+ },
97
+ "name": "GitMain"
98
+ },
99
+ "modifiers": []
100
+ },
101
+ {
102
+ "__schema": "FunctionLikeSchema",
103
+ "location": {
104
+ "filePath": "git.main.runtime.ts",
105
+ "line": 39,
106
+ "character": 3
107
+ },
108
+ "signature": "(method) GitMain.mergeBitmaps(ancestor: string, current: string, other: string): Promise<string>",
109
+ "name": "mergeBitmaps",
110
+ "params": [
111
+ {
112
+ "__schema": "ParameterSchema",
113
+ "location": {
114
+ "filePath": "git.main.runtime.ts",
115
+ "line": 39,
116
+ "character": 22
117
+ },
118
+ "name": "ancestor",
119
+ "type": {
120
+ "__schema": "KeywordTypeSchema",
121
+ "location": {
122
+ "filePath": "git.main.runtime.ts",
123
+ "line": 39,
124
+ "character": 32
125
+ },
126
+ "name": "string"
127
+ },
128
+ "isOptional": false,
129
+ "isSpread": false
130
+ },
131
+ {
132
+ "__schema": "ParameterSchema",
133
+ "location": {
134
+ "filePath": "git.main.runtime.ts",
135
+ "line": 39,
136
+ "character": 40
137
+ },
138
+ "name": "current",
139
+ "type": {
140
+ "__schema": "KeywordTypeSchema",
141
+ "location": {
142
+ "filePath": "git.main.runtime.ts",
143
+ "line": 39,
144
+ "character": 49
145
+ },
146
+ "name": "string"
147
+ },
148
+ "isOptional": false,
149
+ "isSpread": false
150
+ },
151
+ {
152
+ "__schema": "ParameterSchema",
153
+ "location": {
154
+ "filePath": "git.main.runtime.ts",
155
+ "line": 39,
156
+ "character": 57
157
+ },
158
+ "name": "other",
159
+ "type": {
160
+ "__schema": "KeywordTypeSchema",
161
+ "location": {
162
+ "filePath": "git.main.runtime.ts",
163
+ "line": 39,
164
+ "character": 64
165
+ },
166
+ "name": "string"
167
+ },
168
+ "isOptional": false,
169
+ "isSpread": false
170
+ }
171
+ ],
172
+ "returnType": {
173
+ "__schema": "InferenceTypeSchema",
174
+ "location": {
175
+ "filePath": "git.main.runtime.ts",
176
+ "line": 39,
177
+ "character": 3
178
+ },
179
+ "type": "Promise<string>"
180
+ },
181
+ "modifiers": [
182
+ "async"
183
+ ]
184
+ },
185
+ {
186
+ "__schema": "FunctionLikeSchema",
187
+ "location": {
188
+ "filePath": "git.main.runtime.ts",
189
+ "line": 52,
190
+ "character": 3
191
+ },
192
+ "signature": "(method) GitMain.setGitMergeDriver(opts: SetGitMergeDriverOpts): Promise<boolean>",
193
+ "name": "setGitMergeDriver",
194
+ "params": [
195
+ {
196
+ "__schema": "ParameterSchema",
197
+ "location": {
198
+ "filePath": "git.main.runtime.ts",
199
+ "line": 52,
200
+ "character": 27
201
+ },
202
+ "name": "opts",
203
+ "type": {
204
+ "__schema": "TypeRefSchema",
205
+ "location": {
206
+ "filePath": "git.main.runtime.ts",
207
+ "line": 52,
208
+ "character": 33
209
+ },
210
+ "name": "SetGitMergeDriverOpts",
211
+ "internalFilePath": "git.main.runtime.ts"
212
+ },
213
+ "isOptional": false,
214
+ "isSpread": false
215
+ }
216
+ ],
217
+ "returnType": {
218
+ "__schema": "InferenceTypeSchema",
219
+ "location": {
220
+ "filePath": "git.main.runtime.ts",
221
+ "line": 52,
222
+ "character": 3
223
+ },
224
+ "type": "Promise<boolean>"
225
+ },
226
+ "modifiers": [
227
+ "async"
228
+ ]
229
+ },
230
+ {
231
+ "__schema": "VariableLikeSchema",
232
+ "location": {
233
+ "filePath": "git.main.runtime.ts",
234
+ "line": 114,
235
+ "character": 3
236
+ },
237
+ "signature": "(property) GitMain.slots: never[]",
238
+ "name": "slots",
239
+ "type": {
240
+ "__schema": "InferenceTypeSchema",
241
+ "location": {
242
+ "filePath": "git.main.runtime.ts",
243
+ "line": 114,
244
+ "character": 3
245
+ },
246
+ "type": "never[]"
247
+ },
248
+ "isOptional": true,
249
+ "defaultValue": "[]"
250
+ },
251
+ {
252
+ "__schema": "VariableLikeSchema",
253
+ "location": {
254
+ "filePath": "git.main.runtime.ts",
255
+ "line": 117,
256
+ "character": 3
257
+ },
258
+ "signature": "(property) GitMain.dependencies: Aspect[]",
259
+ "name": "dependencies",
260
+ "type": {
261
+ "__schema": "InferenceTypeSchema",
262
+ "location": {
263
+ "filePath": "git.main.runtime.ts",
264
+ "line": 117,
265
+ "character": 3
266
+ },
267
+ "type": "Aspect[]"
268
+ },
269
+ "isOptional": true,
270
+ "defaultValue": "[CLIAspect, WorkspaceAspect]"
271
+ },
272
+ {
273
+ "__schema": "VariableLikeSchema",
274
+ "location": {
275
+ "filePath": "git.main.runtime.ts",
276
+ "line": 119,
277
+ "character": 3
278
+ },
279
+ "signature": "(property) GitMain.runtime: RuntimeDefinition",
280
+ "name": "runtime",
281
+ "type": {
282
+ "__schema": "InferenceTypeSchema",
283
+ "location": {
284
+ "filePath": "git.main.runtime.ts",
285
+ "line": 119,
286
+ "character": 3
287
+ },
288
+ "type": "RuntimeDefinition"
289
+ },
290
+ "isOptional": true,
291
+ "defaultValue": "MainRuntime"
292
+ },
293
+ {
294
+ "__schema": "FunctionLikeSchema",
295
+ "location": {
296
+ "filePath": "git.main.runtime.ts",
297
+ "line": 121,
298
+ "character": 3
299
+ },
300
+ "signature": "(method) GitMain.provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig): Promise<GitMain>",
301
+ "name": "provider",
302
+ "params": [
303
+ {
304
+ "__schema": "ParameterSchema",
305
+ "location": {
306
+ "filePath": "git.main.runtime.ts",
307
+ "line": 121,
308
+ "character": 25
309
+ },
310
+ "name": "[ cli, workspace ]",
311
+ "type": {
312
+ "__schema": "TupleTypeSchema",
313
+ "location": {
314
+ "filePath": "git.main.runtime.ts",
315
+ "line": 121,
316
+ "character": 43
317
+ },
318
+ "elements": [
319
+ {
320
+ "__schema": "TypeRefSchema",
321
+ "location": {
322
+ "filePath": "git.main.runtime.ts",
323
+ "line": 121,
324
+ "character": 44
325
+ },
326
+ "name": "CLIMain",
327
+ "componentId": {
328
+ "scope": "teambit.harmony",
329
+ "name": "cli"
330
+ }
331
+ },
332
+ {
333
+ "__schema": "TypeRefSchema",
334
+ "location": {
335
+ "filePath": "git.main.runtime.ts",
336
+ "line": 121,
337
+ "character": 53
338
+ },
339
+ "name": "Workspace",
340
+ "componentId": {
341
+ "scope": "teambit.workspace",
342
+ "name": "workspace"
343
+ }
344
+ }
345
+ ]
346
+ },
347
+ "isOptional": false,
348
+ "isSpread": false
349
+ },
350
+ {
351
+ "__schema": "ParameterSchema",
352
+ "location": {
353
+ "filePath": "git.main.runtime.ts",
354
+ "line": 121,
355
+ "character": 65
356
+ },
357
+ "name": "config",
358
+ "type": {
359
+ "__schema": "TypeRefSchema",
360
+ "location": {
361
+ "filePath": "git.main.runtime.ts",
362
+ "line": 121,
363
+ "character": 73
364
+ },
365
+ "name": "GitExtWorkspaceConfig",
366
+ "internalFilePath": "git.main.runtime.ts"
367
+ },
368
+ "isOptional": false,
369
+ "isSpread": false
370
+ }
371
+ ],
372
+ "returnType": {
373
+ "__schema": "InferenceTypeSchema",
374
+ "location": {
375
+ "filePath": "git.main.runtime.ts",
376
+ "line": 121,
377
+ "character": 3
378
+ },
379
+ "type": "Promise<GitMain>"
380
+ },
381
+ "modifiers": [
382
+ "static",
383
+ "async"
384
+ ]
385
+ }
386
+ ],
387
+ "extendsNodes": [],
388
+ "implementNodes": []
32
389
  }
33
390
  },
34
391
  {
@@ -50,23 +407,769 @@
50
407
  },
51
408
  "name": "GitAspect",
52
409
  "exportNode": {
53
- "__schema": "TypeRefSchema",
410
+ "__schema": "VariableLikeSchema",
54
411
  "location": {
55
- "filePath": "index.ts",
56
- "line": 5,
57
- "character": 10
412
+ "filePath": "git.aspect.ts",
413
+ "line": 3,
414
+ "character": 14
415
+ },
416
+ "signature": "const GitAspect: Aspect",
417
+ "name": "GitAspect",
418
+ "type": {
419
+ "__schema": "TypeRefSchema",
420
+ "location": {
421
+ "filePath": "git.aspect.ts",
422
+ "line": 3,
423
+ "character": 14
424
+ },
425
+ "name": "Aspect",
426
+ "componentId": {
427
+ "scope": "teambit.harmony",
428
+ "name": "harmony",
429
+ "version": "0.4.6"
430
+ }
58
431
  },
59
- "name": "GitAspect"
432
+ "isOptional": false,
433
+ "defaultValue": "Aspect.create({\n id: 'teambit.git/git',\n})"
60
434
  }
61
435
  }
62
436
  ],
63
437
  "internals": []
64
438
  },
65
- "internals": [],
439
+ "internals": [
440
+ {
441
+ "__schema": "ModuleSchema",
442
+ "location": {
443
+ "filePath": "git.main.runtime.ts",
444
+ "line": 1,
445
+ "character": 1
446
+ },
447
+ "exports": [
448
+ {
449
+ "__schema": "InterfaceSchema",
450
+ "location": {
451
+ "filePath": "git.main.runtime.ts",
452
+ "line": 27,
453
+ "character": 1
454
+ },
455
+ "signature": "interface GitExtWorkspaceConfig",
456
+ "name": "GitExtWorkspaceConfig",
457
+ "members": [
458
+ {
459
+ "__schema": "VariableLikeSchema",
460
+ "location": {
461
+ "filePath": "git.main.runtime.ts",
462
+ "line": 28,
463
+ "character": 3
464
+ },
465
+ "signature": "(property) GitExtWorkspaceConfig.mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
466
+ "name": "mergeStrategy",
467
+ "type": {
468
+ "__schema": "TypeUnionSchema",
469
+ "location": {
470
+ "filePath": "git.main.runtime.ts",
471
+ "line": 28,
472
+ "character": 18
473
+ },
474
+ "types": [
475
+ {
476
+ "__schema": "LiteralTypeSchema",
477
+ "location": {
478
+ "filePath": "git.main.runtime.ts",
479
+ "line": 28,
480
+ "character": 18
481
+ },
482
+ "name": "'ours'"
483
+ },
484
+ {
485
+ "__schema": "LiteralTypeSchema",
486
+ "location": {
487
+ "filePath": "git.main.runtime.ts",
488
+ "line": 28,
489
+ "character": 27
490
+ },
491
+ "name": "'theirs'"
492
+ },
493
+ {
494
+ "__schema": "LiteralTypeSchema",
495
+ "location": {
496
+ "filePath": "git.main.runtime.ts",
497
+ "line": 28,
498
+ "character": 38
499
+ },
500
+ "name": "'manual'"
501
+ }
502
+ ]
503
+ },
504
+ "isOptional": false
505
+ }
506
+ ],
507
+ "extendsNodes": []
508
+ },
509
+ {
510
+ "__schema": "ClassSchema",
511
+ "location": {
512
+ "filePath": "git.main.runtime.ts",
513
+ "line": 30,
514
+ "character": 1
515
+ },
516
+ "signature": "class GitMain",
517
+ "name": "GitMain",
518
+ "members": [
519
+ {
520
+ "__schema": "ConstructorSchema",
521
+ "location": {
522
+ "filePath": "git.main.runtime.ts",
523
+ "line": 31,
524
+ "character": 3
525
+ },
526
+ "signature": "constructor GitMain(workspace: Workspace, config: GitExtWorkspaceConfig): GitMain",
527
+ "name": "constructor",
528
+ "params": [
529
+ {
530
+ "__schema": "ParameterSchema",
531
+ "location": {
532
+ "filePath": "git.main.runtime.ts",
533
+ "line": 32,
534
+ "character": 5
535
+ },
536
+ "name": "workspace",
537
+ "type": {
538
+ "__schema": "TypeRefSchema",
539
+ "location": {
540
+ "filePath": "git.main.runtime.ts",
541
+ "line": 32,
542
+ "character": 24
543
+ },
544
+ "name": "Workspace",
545
+ "componentId": {
546
+ "scope": "teambit.workspace",
547
+ "name": "workspace"
548
+ }
549
+ },
550
+ "isOptional": false,
551
+ "isSpread": false
552
+ },
553
+ {
554
+ "__schema": "ParameterSchema",
555
+ "location": {
556
+ "filePath": "git.main.runtime.ts",
557
+ "line": 36,
558
+ "character": 5
559
+ },
560
+ "name": "config",
561
+ "type": {
562
+ "__schema": "TypeRefSchema",
563
+ "location": {
564
+ "filePath": "git.main.runtime.ts",
565
+ "line": 36,
566
+ "character": 22
567
+ },
568
+ "name": "GitExtWorkspaceConfig",
569
+ "internalFilePath": "git.main.runtime.ts"
570
+ },
571
+ "isOptional": false,
572
+ "isSpread": false
573
+ }
574
+ ],
575
+ "returnType": {
576
+ "__schema": "ThisTypeSchema",
577
+ "location": {
578
+ "filePath": "git.main.runtime.ts",
579
+ "line": 30,
580
+ "character": 1
581
+ },
582
+ "name": "GitMain"
583
+ },
584
+ "modifiers": []
585
+ },
586
+ {
587
+ "__schema": "FunctionLikeSchema",
588
+ "location": {
589
+ "filePath": "git.main.runtime.ts",
590
+ "line": 39,
591
+ "character": 3
592
+ },
593
+ "signature": "(method) GitMain.mergeBitmaps(ancestor: string, current: string, other: string): Promise<string>",
594
+ "name": "mergeBitmaps",
595
+ "params": [
596
+ {
597
+ "__schema": "ParameterSchema",
598
+ "location": {
599
+ "filePath": "git.main.runtime.ts",
600
+ "line": 39,
601
+ "character": 22
602
+ },
603
+ "name": "ancestor",
604
+ "type": {
605
+ "__schema": "KeywordTypeSchema",
606
+ "location": {
607
+ "filePath": "git.main.runtime.ts",
608
+ "line": 39,
609
+ "character": 32
610
+ },
611
+ "name": "string"
612
+ },
613
+ "isOptional": false,
614
+ "isSpread": false
615
+ },
616
+ {
617
+ "__schema": "ParameterSchema",
618
+ "location": {
619
+ "filePath": "git.main.runtime.ts",
620
+ "line": 39,
621
+ "character": 40
622
+ },
623
+ "name": "current",
624
+ "type": {
625
+ "__schema": "KeywordTypeSchema",
626
+ "location": {
627
+ "filePath": "git.main.runtime.ts",
628
+ "line": 39,
629
+ "character": 49
630
+ },
631
+ "name": "string"
632
+ },
633
+ "isOptional": false,
634
+ "isSpread": false
635
+ },
636
+ {
637
+ "__schema": "ParameterSchema",
638
+ "location": {
639
+ "filePath": "git.main.runtime.ts",
640
+ "line": 39,
641
+ "character": 57
642
+ },
643
+ "name": "other",
644
+ "type": {
645
+ "__schema": "KeywordTypeSchema",
646
+ "location": {
647
+ "filePath": "git.main.runtime.ts",
648
+ "line": 39,
649
+ "character": 64
650
+ },
651
+ "name": "string"
652
+ },
653
+ "isOptional": false,
654
+ "isSpread": false
655
+ }
656
+ ],
657
+ "returnType": {
658
+ "__schema": "InferenceTypeSchema",
659
+ "location": {
660
+ "filePath": "git.main.runtime.ts",
661
+ "line": 39,
662
+ "character": 3
663
+ },
664
+ "type": "Promise<string>"
665
+ },
666
+ "modifiers": [
667
+ "async"
668
+ ]
669
+ },
670
+ {
671
+ "__schema": "FunctionLikeSchema",
672
+ "location": {
673
+ "filePath": "git.main.runtime.ts",
674
+ "line": 52,
675
+ "character": 3
676
+ },
677
+ "signature": "(method) GitMain.setGitMergeDriver(opts: SetGitMergeDriverOpts): Promise<boolean>",
678
+ "name": "setGitMergeDriver",
679
+ "params": [
680
+ {
681
+ "__schema": "ParameterSchema",
682
+ "location": {
683
+ "filePath": "git.main.runtime.ts",
684
+ "line": 52,
685
+ "character": 27
686
+ },
687
+ "name": "opts",
688
+ "type": {
689
+ "__schema": "TypeRefSchema",
690
+ "location": {
691
+ "filePath": "git.main.runtime.ts",
692
+ "line": 52,
693
+ "character": 33
694
+ },
695
+ "name": "SetGitMergeDriverOpts",
696
+ "internalFilePath": "git.main.runtime.ts"
697
+ },
698
+ "isOptional": false,
699
+ "isSpread": false
700
+ }
701
+ ],
702
+ "returnType": {
703
+ "__schema": "InferenceTypeSchema",
704
+ "location": {
705
+ "filePath": "git.main.runtime.ts",
706
+ "line": 52,
707
+ "character": 3
708
+ },
709
+ "type": "Promise<boolean>"
710
+ },
711
+ "modifiers": [
712
+ "async"
713
+ ]
714
+ },
715
+ {
716
+ "__schema": "VariableLikeSchema",
717
+ "location": {
718
+ "filePath": "git.main.runtime.ts",
719
+ "line": 114,
720
+ "character": 3
721
+ },
722
+ "signature": "(property) GitMain.slots: never[]",
723
+ "name": "slots",
724
+ "type": {
725
+ "__schema": "InferenceTypeSchema",
726
+ "location": {
727
+ "filePath": "git.main.runtime.ts",
728
+ "line": 114,
729
+ "character": 3
730
+ },
731
+ "type": "never[]"
732
+ },
733
+ "isOptional": true,
734
+ "defaultValue": "[]"
735
+ },
736
+ {
737
+ "__schema": "VariableLikeSchema",
738
+ "location": {
739
+ "filePath": "git.main.runtime.ts",
740
+ "line": 117,
741
+ "character": 3
742
+ },
743
+ "signature": "(property) GitMain.dependencies: Aspect[]",
744
+ "name": "dependencies",
745
+ "type": {
746
+ "__schema": "InferenceTypeSchema",
747
+ "location": {
748
+ "filePath": "git.main.runtime.ts",
749
+ "line": 117,
750
+ "character": 3
751
+ },
752
+ "type": "Aspect[]"
753
+ },
754
+ "isOptional": true,
755
+ "defaultValue": "[CLIAspect, WorkspaceAspect]"
756
+ },
757
+ {
758
+ "__schema": "VariableLikeSchema",
759
+ "location": {
760
+ "filePath": "git.main.runtime.ts",
761
+ "line": 119,
762
+ "character": 3
763
+ },
764
+ "signature": "(property) GitMain.runtime: RuntimeDefinition",
765
+ "name": "runtime",
766
+ "type": {
767
+ "__schema": "InferenceTypeSchema",
768
+ "location": {
769
+ "filePath": "git.main.runtime.ts",
770
+ "line": 119,
771
+ "character": 3
772
+ },
773
+ "type": "RuntimeDefinition"
774
+ },
775
+ "isOptional": true,
776
+ "defaultValue": "MainRuntime"
777
+ },
778
+ {
779
+ "__schema": "FunctionLikeSchema",
780
+ "location": {
781
+ "filePath": "git.main.runtime.ts",
782
+ "line": 121,
783
+ "character": 3
784
+ },
785
+ "signature": "(method) GitMain.provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig): Promise<GitMain>",
786
+ "name": "provider",
787
+ "params": [
788
+ {
789
+ "__schema": "ParameterSchema",
790
+ "location": {
791
+ "filePath": "git.main.runtime.ts",
792
+ "line": 121,
793
+ "character": 25
794
+ },
795
+ "name": "[ cli, workspace ]",
796
+ "type": {
797
+ "__schema": "TupleTypeSchema",
798
+ "location": {
799
+ "filePath": "git.main.runtime.ts",
800
+ "line": 121,
801
+ "character": 43
802
+ },
803
+ "elements": [
804
+ {
805
+ "__schema": "TypeRefSchema",
806
+ "location": {
807
+ "filePath": "git.main.runtime.ts",
808
+ "line": 121,
809
+ "character": 44
810
+ },
811
+ "name": "CLIMain",
812
+ "componentId": {
813
+ "scope": "teambit.harmony",
814
+ "name": "cli"
815
+ }
816
+ },
817
+ {
818
+ "__schema": "TypeRefSchema",
819
+ "location": {
820
+ "filePath": "git.main.runtime.ts",
821
+ "line": 121,
822
+ "character": 53
823
+ },
824
+ "name": "Workspace",
825
+ "componentId": {
826
+ "scope": "teambit.workspace",
827
+ "name": "workspace"
828
+ }
829
+ }
830
+ ]
831
+ },
832
+ "isOptional": false,
833
+ "isSpread": false
834
+ },
835
+ {
836
+ "__schema": "ParameterSchema",
837
+ "location": {
838
+ "filePath": "git.main.runtime.ts",
839
+ "line": 121,
840
+ "character": 65
841
+ },
842
+ "name": "config",
843
+ "type": {
844
+ "__schema": "TypeRefSchema",
845
+ "location": {
846
+ "filePath": "git.main.runtime.ts",
847
+ "line": 121,
848
+ "character": 73
849
+ },
850
+ "name": "GitExtWorkspaceConfig",
851
+ "internalFilePath": "git.main.runtime.ts"
852
+ },
853
+ "isOptional": false,
854
+ "isSpread": false
855
+ }
856
+ ],
857
+ "returnType": {
858
+ "__schema": "InferenceTypeSchema",
859
+ "location": {
860
+ "filePath": "git.main.runtime.ts",
861
+ "line": 121,
862
+ "character": 3
863
+ },
864
+ "type": "Promise<GitMain>"
865
+ },
866
+ "modifiers": [
867
+ "static",
868
+ "async"
869
+ ]
870
+ }
871
+ ],
872
+ "extendsNodes": [],
873
+ "implementNodes": []
874
+ },
875
+ {
876
+ "__schema": "UnImplementedSchema",
877
+ "location": {
878
+ "filePath": "git.main.runtime.ts",
879
+ "line": 133,
880
+ "character": 16
881
+ },
882
+ "name": "GitMain",
883
+ "type": "Identifier"
884
+ }
885
+ ],
886
+ "internals": [
887
+ {
888
+ "__schema": "TypeSchema",
889
+ "location": {
890
+ "filePath": "git.main.runtime.ts",
891
+ "line": 13,
892
+ "character": 1
893
+ },
894
+ "signature": "type SetGitMergeDriverOpts = {\n global?: boolean | undefined;\n}",
895
+ "name": "SetGitMergeDriverOpts",
896
+ "type": {
897
+ "__schema": "TypeLiteralSchema",
898
+ "location": {
899
+ "filePath": "git.main.runtime.ts",
900
+ "line": 13,
901
+ "character": 30
902
+ },
903
+ "members": [
904
+ {
905
+ "__schema": "VariableLikeSchema",
906
+ "location": {
907
+ "filePath": "git.main.runtime.ts",
908
+ "line": 14,
909
+ "character": 3
910
+ },
911
+ "signature": "(property) global?: boolean | undefined",
912
+ "name": "global",
913
+ "type": {
914
+ "__schema": "KeywordTypeSchema",
915
+ "location": {
916
+ "filePath": "git.main.runtime.ts",
917
+ "line": 14,
918
+ "character": 12
919
+ },
920
+ "name": "boolean"
921
+ },
922
+ "isOptional": true
923
+ }
924
+ ]
925
+ }
926
+ },
927
+ {
928
+ "__schema": "ModuleSchema",
929
+ "location": {
930
+ "filePath": "git.main.runtime.ts",
931
+ "line": 17,
932
+ "character": 1
933
+ },
934
+ "exports": [
935
+ {
936
+ "__schema": "VariableLikeSchema",
937
+ "location": {
938
+ "filePath": "git.main.runtime.ts",
939
+ "line": 17,
940
+ "character": 7
941
+ },
942
+ "signature": "const GIT_BASE_KEY: \"merge.bitmap-driver\"",
943
+ "name": "GIT_BASE_KEY",
944
+ "type": {
945
+ "__schema": "InferenceTypeSchema",
946
+ "location": {
947
+ "filePath": "git.main.runtime.ts",
948
+ "line": 17,
949
+ "character": 7
950
+ },
951
+ "type": "\"merge.bitmap-driver\""
952
+ },
953
+ "isOptional": false,
954
+ "defaultValue": "'merge.bitmap-driver'"
955
+ }
956
+ ],
957
+ "internals": []
958
+ },
959
+ {
960
+ "__schema": "ModuleSchema",
961
+ "location": {
962
+ "filePath": "git.main.runtime.ts",
963
+ "line": 18,
964
+ "character": 1
965
+ },
966
+ "exports": [
967
+ {
968
+ "__schema": "VariableLikeSchema",
969
+ "location": {
970
+ "filePath": "git.main.runtime.ts",
971
+ "line": 18,
972
+ "character": 7
973
+ },
974
+ "signature": "const GIT_NAME_KEY: \"merge.bitmap-driver.name\"",
975
+ "name": "GIT_NAME_KEY",
976
+ "type": {
977
+ "__schema": "InferenceTypeSchema",
978
+ "location": {
979
+ "filePath": "git.main.runtime.ts",
980
+ "line": 18,
981
+ "character": 7
982
+ },
983
+ "type": "\"merge.bitmap-driver.name\""
984
+ },
985
+ "isOptional": false,
986
+ "defaultValue": "`${GIT_BASE_KEY}.name`"
987
+ }
988
+ ],
989
+ "internals": []
990
+ },
991
+ {
992
+ "__schema": "ModuleSchema",
993
+ "location": {
994
+ "filePath": "git.main.runtime.ts",
995
+ "line": 19,
996
+ "character": 1
997
+ },
998
+ "exports": [
999
+ {
1000
+ "__schema": "VariableLikeSchema",
1001
+ "location": {
1002
+ "filePath": "git.main.runtime.ts",
1003
+ "line": 19,
1004
+ "character": 7
1005
+ },
1006
+ "signature": "const GIT_DRIVER_KEY: \"merge.bitmap-driver.driver\"",
1007
+ "name": "GIT_DRIVER_KEY",
1008
+ "type": {
1009
+ "__schema": "InferenceTypeSchema",
1010
+ "location": {
1011
+ "filePath": "git.main.runtime.ts",
1012
+ "line": 19,
1013
+ "character": 7
1014
+ },
1015
+ "type": "\"merge.bitmap-driver.driver\""
1016
+ },
1017
+ "isOptional": false,
1018
+ "defaultValue": "`${GIT_BASE_KEY}.driver`"
1019
+ }
1020
+ ],
1021
+ "internals": []
1022
+ },
1023
+ {
1024
+ "__schema": "ModuleSchema",
1025
+ "location": {
1026
+ "filePath": "git.main.runtime.ts",
1027
+ "line": 21,
1028
+ "character": 1
1029
+ },
1030
+ "exports": [
1031
+ {
1032
+ "__schema": "VariableLikeSchema",
1033
+ "location": {
1034
+ "filePath": "git.main.runtime.ts",
1035
+ "line": 21,
1036
+ "character": 7
1037
+ },
1038
+ "signature": "const GIT_NAME_VALUE: \"A custom merge driver used to resolve conflicts in .bitmap files\"",
1039
+ "name": "GIT_NAME_VALUE",
1040
+ "type": {
1041
+ "__schema": "InferenceTypeSchema",
1042
+ "location": {
1043
+ "filePath": "git.main.runtime.ts",
1044
+ "line": 21,
1045
+ "character": 7
1046
+ },
1047
+ "type": "\"A custom merge driver used to resolve conflicts in .bitmap files\""
1048
+ },
1049
+ "isOptional": false,
1050
+ "defaultValue": "'A custom merge driver used to resolve conflicts in .bitmap files'"
1051
+ }
1052
+ ],
1053
+ "internals": []
1054
+ },
1055
+ {
1056
+ "__schema": "ModuleSchema",
1057
+ "location": {
1058
+ "filePath": "git.main.runtime.ts",
1059
+ "line": 23,
1060
+ "character": 1
1061
+ },
1062
+ "exports": [
1063
+ {
1064
+ "__schema": "VariableLikeSchema",
1065
+ "location": {
1066
+ "filePath": "git.main.runtime.ts",
1067
+ "line": 23,
1068
+ "character": 7
1069
+ },
1070
+ "signature": "const GIT_DRIVER_VALUE: \"bd git merge-bitmaps %O %A %B\"",
1071
+ "name": "GIT_DRIVER_VALUE",
1072
+ "type": {
1073
+ "__schema": "InferenceTypeSchema",
1074
+ "location": {
1075
+ "filePath": "git.main.runtime.ts",
1076
+ "line": 23,
1077
+ "character": 7
1078
+ },
1079
+ "type": "\"bd git merge-bitmaps %O %A %B\""
1080
+ },
1081
+ "isOptional": false,
1082
+ "defaultValue": "'bd git merge-bitmaps %O %A %B'"
1083
+ }
1084
+ ],
1085
+ "internals": []
1086
+ },
1087
+ {
1088
+ "__schema": "ModuleSchema",
1089
+ "location": {
1090
+ "filePath": "git.main.runtime.ts",
1091
+ "line": 25,
1092
+ "character": 1
1093
+ },
1094
+ "exports": [
1095
+ {
1096
+ "__schema": "VariableLikeSchema",
1097
+ "location": {
1098
+ "filePath": "git.main.runtime.ts",
1099
+ "line": 25,
1100
+ "character": 7
1101
+ },
1102
+ "signature": "const GIT_ATTRIBUTES: \".bitmap merge=bitmap-driver\"",
1103
+ "name": "GIT_ATTRIBUTES",
1104
+ "type": {
1105
+ "__schema": "InferenceTypeSchema",
1106
+ "location": {
1107
+ "filePath": "git.main.runtime.ts",
1108
+ "line": 25,
1109
+ "character": 7
1110
+ },
1111
+ "type": "\".bitmap merge=bitmap-driver\""
1112
+ },
1113
+ "isOptional": false,
1114
+ "defaultValue": "'.bitmap merge=bitmap-driver'"
1115
+ }
1116
+ ],
1117
+ "internals": []
1118
+ },
1119
+ {
1120
+ "__schema": "UnImplementedSchema",
1121
+ "location": {
1122
+ "filePath": "git.main.runtime.ts",
1123
+ "line": 131,
1124
+ "character": 1
1125
+ },
1126
+ "name": "GitAspect.addRuntime(GitMain);",
1127
+ "type": "ExpressionStatement"
1128
+ }
1129
+ ]
1130
+ },
1131
+ {
1132
+ "__schema": "ModuleSchema",
1133
+ "location": {
1134
+ "filePath": "git.aspect.ts",
1135
+ "line": 1,
1136
+ "character": 1
1137
+ },
1138
+ "exports": [
1139
+ {
1140
+ "__schema": "VariableLikeSchema",
1141
+ "location": {
1142
+ "filePath": "git.aspect.ts",
1143
+ "line": 3,
1144
+ "character": 14
1145
+ },
1146
+ "signature": "const GitAspect: Aspect",
1147
+ "name": "GitAspect",
1148
+ "type": {
1149
+ "__schema": "TypeRefSchema",
1150
+ "location": {
1151
+ "filePath": "git.aspect.ts",
1152
+ "line": 3,
1153
+ "character": 14
1154
+ },
1155
+ "name": "Aspect",
1156
+ "componentId": {
1157
+ "scope": "teambit.harmony",
1158
+ "name": "harmony",
1159
+ "version": "0.4.6"
1160
+ }
1161
+ },
1162
+ "isOptional": false,
1163
+ "defaultValue": "Aspect.create({\n id: 'teambit.git/git',\n})"
1164
+ }
1165
+ ],
1166
+ "internals": []
1167
+ }
1168
+ ],
66
1169
  "componentId": {
67
1170
  "scope": "teambit.git",
68
1171
  "name": "git",
69
- "version": "1.0.258"
1172
+ "version": "1.0.260"
70
1173
  },
71
1174
  "taggedModuleExports": []
72
1175
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/git",
3
- "version": "1.0.258",
3
+ "version": "1.0.260",
4
4
  "homepage": "https://bit.cloud/teambit/git/git",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.git",
8
8
  "name": "git",
9
- "version": "1.0.258"
9
+ "version": "1.0.260"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -14,8 +14,8 @@
14
14
  "gitconfig": "2.0.8",
15
15
  "@teambit/harmony": "0.4.6",
16
16
  "@teambit/bit-error": "0.0.404",
17
- "@teambit/cli": "0.0.862",
18
- "@teambit/workspace": "1.0.258"
17
+ "@teambit/cli": "0.0.863",
18
+ "@teambit/workspace": "1.0.260"
19
19
  },
20
20
  "devDependencies": {
21
21
  "@types/fs-extra": "9.0.7",