@teambit/git 1.0.257 → 1.0.259

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.257" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.git/git@1.0.259" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
@@ -14,370 +14,379 @@
14
14
  },
15
15
  "exports": [
16
16
  {
17
- "__schema": "ClassSchema",
17
+ "__schema": "ExportSchema",
18
18
  "location": {
19
- "filePath": "git.main.runtime.ts",
20
- "line": 30,
21
- "character": 1
19
+ "filePath": "index.ts",
20
+ "line": 3,
21
+ "character": 15
22
22
  },
23
- "signature": "class GitMain",
24
23
  "name": "GitMain",
25
- "members": [
26
- {
27
- "__schema": "ConstructorSchema",
28
- "location": {
29
- "filePath": "git.main.runtime.ts",
30
- "line": 31,
31
- "character": 3
32
- },
33
- "signature": "constructor GitMain(workspace: Workspace, config: GitExtWorkspaceConfig): GitMain",
34
- "name": "constructor",
35
- "params": [
36
- {
37
- "__schema": "ParameterSchema",
38
- "location": {
39
- "filePath": "git.main.runtime.ts",
40
- "line": 32,
41
- "character": 5
42
- },
43
- "name": "workspace",
44
- "type": {
45
- "__schema": "TypeRefSchema",
24
+ "exportNode": {
25
+ "__schema": "ClassSchema",
26
+ "location": {
27
+ "filePath": "git.main.runtime.ts",
28
+ "line": 30,
29
+ "character": 1
30
+ },
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
46
  "location": {
47
47
  "filePath": "git.main.runtime.ts",
48
48
  "line": 32,
49
- "character": 24
49
+ "character": 5
50
50
  },
51
- "name": "Workspace",
52
- "componentId": {
53
- "scope": "teambit.workspace",
54
- "name": "workspace"
55
- }
56
- },
57
- "isOptional": false,
58
- "isSpread": false
59
- },
60
- {
61
- "__schema": "ParameterSchema",
62
- "location": {
63
- "filePath": "git.main.runtime.ts",
64
- "line": 36,
65
- "character": 5
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
66
67
  },
67
- "name": "config",
68
- "type": {
69
- "__schema": "TypeRefSchema",
68
+ {
69
+ "__schema": "ParameterSchema",
70
70
  "location": {
71
71
  "filePath": "git.main.runtime.ts",
72
72
  "line": 36,
73
- "character": 22
73
+ "character": 5
74
74
  },
75
- "name": "GitExtWorkspaceConfig",
76
- "internalFilePath": "git.main.runtime.ts"
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
77
96
  },
78
- "isOptional": false,
79
- "isSpread": false
80
- }
81
- ],
82
- "returnType": {
83
- "__schema": "ThisTypeSchema",
97
+ "name": "GitMain"
98
+ },
99
+ "modifiers": []
100
+ },
101
+ {
102
+ "__schema": "FunctionLikeSchema",
84
103
  "location": {
85
104
  "filePath": "git.main.runtime.ts",
86
- "line": 30,
87
- "character": 1
105
+ "line": 39,
106
+ "character": 3
88
107
  },
89
- "name": "GitMain"
90
- },
91
- "modifiers": []
92
- },
93
- {
94
- "__schema": "FunctionLikeSchema",
95
- "location": {
96
- "filePath": "git.main.runtime.ts",
97
- "line": 39,
98
- "character": 3
99
- },
100
- "signature": "(method) GitMain.mergeBitmaps(ancestor: string, current: string, other: string): Promise<string>",
101
- "name": "mergeBitmaps",
102
- "params": [
103
- {
104
- "__schema": "ParameterSchema",
105
- "location": {
106
- "filePath": "git.main.runtime.ts",
107
- "line": 39,
108
- "character": 22
109
- },
110
- "name": "ancestor",
111
- "type": {
112
- "__schema": "KeywordTypeSchema",
108
+ "signature": "(method) GitMain.mergeBitmaps(ancestor: string, current: string, other: string): Promise<string>",
109
+ "name": "mergeBitmaps",
110
+ "params": [
111
+ {
112
+ "__schema": "ParameterSchema",
113
113
  "location": {
114
114
  "filePath": "git.main.runtime.ts",
115
115
  "line": 39,
116
- "character": 32
116
+ "character": 22
117
117
  },
118
- "name": "string"
119
- },
120
- "isOptional": false,
121
- "isSpread": false
122
- },
123
- {
124
- "__schema": "ParameterSchema",
125
- "location": {
126
- "filePath": "git.main.runtime.ts",
127
- "line": 39,
128
- "character": 40
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
129
130
  },
130
- "name": "current",
131
- "type": {
132
- "__schema": "KeywordTypeSchema",
131
+ {
132
+ "__schema": "ParameterSchema",
133
133
  "location": {
134
134
  "filePath": "git.main.runtime.ts",
135
135
  "line": 39,
136
- "character": 49
136
+ "character": 40
137
137
  },
138
- "name": "string"
139
- },
140
- "isOptional": false,
141
- "isSpread": false
142
- },
143
- {
144
- "__schema": "ParameterSchema",
145
- "location": {
146
- "filePath": "git.main.runtime.ts",
147
- "line": 39,
148
- "character": 57
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
149
150
  },
150
- "name": "other",
151
- "type": {
152
- "__schema": "KeywordTypeSchema",
151
+ {
152
+ "__schema": "ParameterSchema",
153
153
  "location": {
154
154
  "filePath": "git.main.runtime.ts",
155
155
  "line": 39,
156
- "character": 64
156
+ "character": 57
157
157
  },
158
- "name": "string"
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
159
178
  },
160
- "isOptional": false,
161
- "isSpread": false
162
- }
163
- ],
164
- "returnType": {
165
- "__schema": "InferenceTypeSchema",
179
+ "type": "Promise<string>"
180
+ },
181
+ "modifiers": [
182
+ "async"
183
+ ]
184
+ },
185
+ {
186
+ "__schema": "FunctionLikeSchema",
166
187
  "location": {
167
188
  "filePath": "git.main.runtime.ts",
168
- "line": 39,
189
+ "line": 52,
169
190
  "character": 3
170
191
  },
171
- "type": "Promise<string>"
172
- },
173
- "modifiers": [
174
- "async"
175
- ]
176
- },
177
- {
178
- "__schema": "FunctionLikeSchema",
179
- "location": {
180
- "filePath": "git.main.runtime.ts",
181
- "line": 52,
182
- "character": 3
183
- },
184
- "signature": "(method) GitMain.setGitMergeDriver(opts: SetGitMergeDriverOpts): Promise<boolean>",
185
- "name": "setGitMergeDriver",
186
- "params": [
187
- {
188
- "__schema": "ParameterSchema",
189
- "location": {
190
- "filePath": "git.main.runtime.ts",
191
- "line": 52,
192
- "character": 27
193
- },
194
- "name": "opts",
195
- "type": {
196
- "__schema": "TypeRefSchema",
192
+ "signature": "(method) GitMain.setGitMergeDriver(opts: SetGitMergeDriverOpts): Promise<boolean>",
193
+ "name": "setGitMergeDriver",
194
+ "params": [
195
+ {
196
+ "__schema": "ParameterSchema",
197
197
  "location": {
198
198
  "filePath": "git.main.runtime.ts",
199
199
  "line": 52,
200
- "character": 33
200
+ "character": 27
201
201
  },
202
- "name": "SetGitMergeDriverOpts",
203
- "internalFilePath": "git.main.runtime.ts"
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
204
223
  },
205
- "isOptional": false,
206
- "isSpread": false
207
- }
208
- ],
209
- "returnType": {
210
- "__schema": "InferenceTypeSchema",
211
- "location": {
212
- "filePath": "git.main.runtime.ts",
213
- "line": 52,
214
- "character": 3
224
+ "type": "Promise<boolean>"
215
225
  },
216
- "type": "Promise<boolean>"
217
- },
218
- "modifiers": [
219
- "async"
220
- ]
221
- },
222
- {
223
- "__schema": "VariableLikeSchema",
224
- "location": {
225
- "filePath": "git.main.runtime.ts",
226
- "line": 114,
227
- "character": 3
226
+ "modifiers": [
227
+ "async"
228
+ ]
228
229
  },
229
- "signature": "(property) GitMain.slots: never[]",
230
- "name": "slots",
231
- "type": {
232
- "__schema": "InferenceTypeSchema",
230
+ {
231
+ "__schema": "VariableLikeSchema",
233
232
  "location": {
234
233
  "filePath": "git.main.runtime.ts",
235
234
  "line": 114,
236
235
  "character": 3
237
236
  },
238
- "type": "never[]"
239
- },
240
- "isOptional": true,
241
- "defaultValue": "[]"
242
- },
243
- {
244
- "__schema": "VariableLikeSchema",
245
- "location": {
246
- "filePath": "git.main.runtime.ts",
247
- "line": 117,
248
- "character": 3
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": "[]"
249
250
  },
250
- "signature": "(property) GitMain.dependencies: Aspect[]",
251
- "name": "dependencies",
252
- "type": {
253
- "__schema": "InferenceTypeSchema",
251
+ {
252
+ "__schema": "VariableLikeSchema",
254
253
  "location": {
255
254
  "filePath": "git.main.runtime.ts",
256
255
  "line": 117,
257
256
  "character": 3
258
257
  },
259
- "type": "Aspect[]"
260
- },
261
- "isOptional": true,
262
- "defaultValue": "[CLIAspect, WorkspaceAspect]"
263
- },
264
- {
265
- "__schema": "VariableLikeSchema",
266
- "location": {
267
- "filePath": "git.main.runtime.ts",
268
- "line": 119,
269
- "character": 3
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]"
270
271
  },
271
- "signature": "(property) GitMain.runtime: RuntimeDefinition",
272
- "name": "runtime",
273
- "type": {
274
- "__schema": "InferenceTypeSchema",
272
+ {
273
+ "__schema": "VariableLikeSchema",
275
274
  "location": {
276
275
  "filePath": "git.main.runtime.ts",
277
276
  "line": 119,
278
277
  "character": 3
279
278
  },
280
- "type": "RuntimeDefinition"
281
- },
282
- "isOptional": true,
283
- "defaultValue": "MainRuntime"
284
- },
285
- {
286
- "__schema": "FunctionLikeSchema",
287
- "location": {
288
- "filePath": "git.main.runtime.ts",
289
- "line": 121,
290
- "character": 3
291
- },
292
- "signature": "(method) GitMain.provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig): Promise<GitMain>",
293
- "name": "provider",
294
- "params": [
295
- {
296
- "__schema": "ParameterSchema",
279
+ "signature": "(property) GitMain.runtime: RuntimeDefinition",
280
+ "name": "runtime",
281
+ "type": {
282
+ "__schema": "InferenceTypeSchema",
297
283
  "location": {
298
284
  "filePath": "git.main.runtime.ts",
299
- "line": 121,
300
- "character": 25
285
+ "line": 119,
286
+ "character": 3
301
287
  },
302
- "name": "[ cli, workspace ]",
303
- "type": {
304
- "__schema": "TupleTypeSchema",
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
305
  "location": {
306
306
  "filePath": "git.main.runtime.ts",
307
307
  "line": 121,
308
- "character": 43
308
+ "character": 25
309
309
  },
310
- "elements": [
311
- {
312
- "__schema": "TypeRefSchema",
313
- "location": {
314
- "filePath": "git.main.runtime.ts",
315
- "line": 121,
316
- "character": 44
317
- },
318
- "name": "CLIMain",
319
- "componentId": {
320
- "scope": "teambit.harmony",
321
- "name": "cli"
322
- }
310
+ "name": "[ cli, workspace ]",
311
+ "type": {
312
+ "__schema": "TupleTypeSchema",
313
+ "location": {
314
+ "filePath": "git.main.runtime.ts",
315
+ "line": 121,
316
+ "character": 43
323
317
  },
324
- {
325
- "__schema": "TypeRefSchema",
326
- "location": {
327
- "filePath": "git.main.runtime.ts",
328
- "line": 121,
329
- "character": 53
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
+ }
330
331
  },
331
- "name": "Workspace",
332
- "componentId": {
333
- "scope": "teambit.workspace",
334
- "name": "workspace"
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
+ }
335
344
  }
336
- }
337
- ]
338
- },
339
- "isOptional": false,
340
- "isSpread": false
341
- },
342
- {
343
- "__schema": "ParameterSchema",
344
- "location": {
345
- "filePath": "git.main.runtime.ts",
346
- "line": 121,
347
- "character": 65
345
+ ]
346
+ },
347
+ "isOptional": false,
348
+ "isSpread": false
348
349
  },
349
- "name": "config",
350
- "type": {
351
- "__schema": "TypeRefSchema",
350
+ {
351
+ "__schema": "ParameterSchema",
352
352
  "location": {
353
353
  "filePath": "git.main.runtime.ts",
354
354
  "line": 121,
355
- "character": 73
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"
356
367
  },
357
- "name": "GitExtWorkspaceConfig",
358
- "internalFilePath": "git.main.runtime.ts"
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
359
378
  },
360
- "isOptional": false,
361
- "isSpread": false
362
- }
363
- ],
364
- "returnType": {
365
- "__schema": "InferenceTypeSchema",
366
- "location": {
367
- "filePath": "git.main.runtime.ts",
368
- "line": 121,
369
- "character": 3
379
+ "type": "Promise<GitMain>"
370
380
  },
371
- "type": "Promise<GitMain>"
372
- },
373
- "modifiers": [
374
- "static",
375
- "async"
376
- ]
377
- }
378
- ],
379
- "extendsNodes": [],
380
- "implementNodes": []
381
+ "modifiers": [
382
+ "static",
383
+ "async"
384
+ ]
385
+ }
386
+ ],
387
+ "extendsNodes": [],
388
+ "implementNodes": []
389
+ }
381
390
  },
382
391
  {
383
392
  "__schema": "UnImplementedSchema",
@@ -390,30 +399,39 @@
390
399
  "type": "Identifier"
391
400
  },
392
401
  {
393
- "__schema": "VariableLikeSchema",
402
+ "__schema": "ExportSchema",
394
403
  "location": {
395
- "filePath": "git.aspect.ts",
396
- "line": 3,
397
- "character": 14
404
+ "filePath": "index.ts",
405
+ "line": 5,
406
+ "character": 10
398
407
  },
399
- "signature": "const GitAspect: Aspect",
400
408
  "name": "GitAspect",
401
- "type": {
402
- "__schema": "TypeRefSchema",
409
+ "exportNode": {
410
+ "__schema": "VariableLikeSchema",
403
411
  "location": {
404
412
  "filePath": "git.aspect.ts",
405
413
  "line": 3,
406
414
  "character": 14
407
415
  },
408
- "name": "Aspect",
409
- "componentId": {
410
- "scope": "teambit.harmony",
411
- "name": "harmony",
412
- "version": "0.4.6"
413
- }
414
- },
415
- "isOptional": false,
416
- "defaultValue": "Aspect.create({\n id: 'teambit.git/git',\n})"
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
+ }
431
+ },
432
+ "isOptional": false,
433
+ "defaultValue": "Aspect.create({\n id: 'teambit.git/git',\n})"
434
+ }
417
435
  }
418
436
  ],
419
437
  "internals": []
@@ -1151,7 +1169,7 @@
1151
1169
  "componentId": {
1152
1170
  "scope": "teambit.git",
1153
1171
  "name": "git",
1154
- "version": "1.0.257"
1172
+ "version": "1.0.259"
1155
1173
  },
1156
1174
  "taggedModuleExports": []
1157
1175
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/git",
3
- "version": "1.0.257",
3
+ "version": "1.0.259",
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.257"
9
+ "version": "1.0.259"
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.257"
17
+ "@teambit/cli": "0.0.863",
18
+ "@teambit/workspace": "1.0.259"
19
19
  },
20
20
  "devDependencies": {
21
21
  "@types/fs-extra": "9.0.7",