@teambit/merging 1.0.321 → 1.0.322
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
|
@@ -2582,7 +2582,7 @@
|
|
|
2582
2582
|
"__schema": "ClassSchema",
|
|
2583
2583
|
"location": {
|
|
2584
2584
|
"filePath": "merging.main.runtime.ts",
|
|
2585
|
-
"line":
|
|
2585
|
+
"line": 112,
|
|
2586
2586
|
"character": 1
|
|
2587
2587
|
},
|
|
2588
2588
|
"signature": "class MergingMain",
|
|
@@ -2592,7 +2592,7 @@
|
|
|
2592
2592
|
"__schema": "ConstructorSchema",
|
|
2593
2593
|
"location": {
|
|
2594
2594
|
"filePath": "merging.main.runtime.ts",
|
|
2595
|
-
"line":
|
|
2595
|
+
"line": 113,
|
|
2596
2596
|
"character": 3
|
|
2597
2597
|
},
|
|
2598
2598
|
"signature": "constructor MergingMain(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain, depResolver: DependencyResolverMain): MergingMain",
|
|
@@ -2602,7 +2602,7 @@
|
|
|
2602
2602
|
"__schema": "ParameterSchema",
|
|
2603
2603
|
"location": {
|
|
2604
2604
|
"filePath": "merging.main.runtime.ts",
|
|
2605
|
-
"line":
|
|
2605
|
+
"line": 114,
|
|
2606
2606
|
"character": 5
|
|
2607
2607
|
},
|
|
2608
2608
|
"name": "workspace",
|
|
@@ -2610,7 +2610,7 @@
|
|
|
2610
2610
|
"__schema": "TypeRefSchema",
|
|
2611
2611
|
"location": {
|
|
2612
2612
|
"filePath": "merging.main.runtime.ts",
|
|
2613
|
-
"line":
|
|
2613
|
+
"line": 114,
|
|
2614
2614
|
"character": 24
|
|
2615
2615
|
},
|
|
2616
2616
|
"name": "Workspace",
|
|
@@ -2626,7 +2626,7 @@
|
|
|
2626
2626
|
"__schema": "ParameterSchema",
|
|
2627
2627
|
"location": {
|
|
2628
2628
|
"filePath": "merging.main.runtime.ts",
|
|
2629
|
-
"line":
|
|
2629
|
+
"line": 115,
|
|
2630
2630
|
"character": 5
|
|
2631
2631
|
},
|
|
2632
2632
|
"name": "scope",
|
|
@@ -2634,7 +2634,7 @@
|
|
|
2634
2634
|
"__schema": "TypeRefSchema",
|
|
2635
2635
|
"location": {
|
|
2636
2636
|
"filePath": "merging.main.runtime.ts",
|
|
2637
|
-
"line":
|
|
2637
|
+
"line": 115,
|
|
2638
2638
|
"character": 20
|
|
2639
2639
|
},
|
|
2640
2640
|
"name": "ScopeMain",
|
|
@@ -2650,7 +2650,7 @@
|
|
|
2650
2650
|
"__schema": "ParameterSchema",
|
|
2651
2651
|
"location": {
|
|
2652
2652
|
"filePath": "merging.main.runtime.ts",
|
|
2653
|
-
"line":
|
|
2653
|
+
"line": 116,
|
|
2654
2654
|
"character": 5
|
|
2655
2655
|
},
|
|
2656
2656
|
"name": "install",
|
|
@@ -2658,7 +2658,7 @@
|
|
|
2658
2658
|
"__schema": "TypeRefSchema",
|
|
2659
2659
|
"location": {
|
|
2660
2660
|
"filePath": "merging.main.runtime.ts",
|
|
2661
|
-
"line":
|
|
2661
|
+
"line": 116,
|
|
2662
2662
|
"character": 22
|
|
2663
2663
|
},
|
|
2664
2664
|
"name": "InstallMain",
|
|
@@ -2674,7 +2674,7 @@
|
|
|
2674
2674
|
"__schema": "ParameterSchema",
|
|
2675
2675
|
"location": {
|
|
2676
2676
|
"filePath": "merging.main.runtime.ts",
|
|
2677
|
-
"line":
|
|
2677
|
+
"line": 117,
|
|
2678
2678
|
"character": 5
|
|
2679
2679
|
},
|
|
2680
2680
|
"name": "snapping",
|
|
@@ -2682,7 +2682,7 @@
|
|
|
2682
2682
|
"__schema": "TypeRefSchema",
|
|
2683
2683
|
"location": {
|
|
2684
2684
|
"filePath": "merging.main.runtime.ts",
|
|
2685
|
-
"line":
|
|
2685
|
+
"line": 117,
|
|
2686
2686
|
"character": 23
|
|
2687
2687
|
},
|
|
2688
2688
|
"name": "SnappingMain",
|
|
@@ -2698,7 +2698,7 @@
|
|
|
2698
2698
|
"__schema": "ParameterSchema",
|
|
2699
2699
|
"location": {
|
|
2700
2700
|
"filePath": "merging.main.runtime.ts",
|
|
2701
|
-
"line":
|
|
2701
|
+
"line": 118,
|
|
2702
2702
|
"character": 5
|
|
2703
2703
|
},
|
|
2704
2704
|
"name": "checkout",
|
|
@@ -2706,7 +2706,7 @@
|
|
|
2706
2706
|
"__schema": "TypeRefSchema",
|
|
2707
2707
|
"location": {
|
|
2708
2708
|
"filePath": "merging.main.runtime.ts",
|
|
2709
|
-
"line":
|
|
2709
|
+
"line": 118,
|
|
2710
2710
|
"character": 23
|
|
2711
2711
|
},
|
|
2712
2712
|
"name": "CheckoutMain",
|
|
@@ -2722,7 +2722,7 @@
|
|
|
2722
2722
|
"__schema": "ParameterSchema",
|
|
2723
2723
|
"location": {
|
|
2724
2724
|
"filePath": "merging.main.runtime.ts",
|
|
2725
|
-
"line":
|
|
2725
|
+
"line": 119,
|
|
2726
2726
|
"character": 5
|
|
2727
2727
|
},
|
|
2728
2728
|
"name": "logger",
|
|
@@ -2730,7 +2730,7 @@
|
|
|
2730
2730
|
"__schema": "TypeRefSchema",
|
|
2731
2731
|
"location": {
|
|
2732
2732
|
"filePath": "merging.main.runtime.ts",
|
|
2733
|
-
"line":
|
|
2733
|
+
"line": 119,
|
|
2734
2734
|
"character": 21
|
|
2735
2735
|
},
|
|
2736
2736
|
"name": "Logger",
|
|
@@ -2746,7 +2746,7 @@
|
|
|
2746
2746
|
"__schema": "ParameterSchema",
|
|
2747
2747
|
"location": {
|
|
2748
2748
|
"filePath": "merging.main.runtime.ts",
|
|
2749
|
-
"line":
|
|
2749
|
+
"line": 120,
|
|
2750
2750
|
"character": 5
|
|
2751
2751
|
},
|
|
2752
2752
|
"name": "componentWriter",
|
|
@@ -2754,7 +2754,7 @@
|
|
|
2754
2754
|
"__schema": "TypeRefSchema",
|
|
2755
2755
|
"location": {
|
|
2756
2756
|
"filePath": "merging.main.runtime.ts",
|
|
2757
|
-
"line":
|
|
2757
|
+
"line": 120,
|
|
2758
2758
|
"character": 30
|
|
2759
2759
|
},
|
|
2760
2760
|
"name": "ComponentWriterMain",
|
|
@@ -2770,7 +2770,7 @@
|
|
|
2770
2770
|
"__schema": "ParameterSchema",
|
|
2771
2771
|
"location": {
|
|
2772
2772
|
"filePath": "merging.main.runtime.ts",
|
|
2773
|
-
"line":
|
|
2773
|
+
"line": 121,
|
|
2774
2774
|
"character": 5
|
|
2775
2775
|
},
|
|
2776
2776
|
"name": "importer",
|
|
@@ -2778,7 +2778,7 @@
|
|
|
2778
2778
|
"__schema": "TypeRefSchema",
|
|
2779
2779
|
"location": {
|
|
2780
2780
|
"filePath": "merging.main.runtime.ts",
|
|
2781
|
-
"line":
|
|
2781
|
+
"line": 121,
|
|
2782
2782
|
"character": 23
|
|
2783
2783
|
},
|
|
2784
2784
|
"name": "ImporterMain",
|
|
@@ -2794,7 +2794,7 @@
|
|
|
2794
2794
|
"__schema": "ParameterSchema",
|
|
2795
2795
|
"location": {
|
|
2796
2796
|
"filePath": "merging.main.runtime.ts",
|
|
2797
|
-
"line":
|
|
2797
|
+
"line": 122,
|
|
2798
2798
|
"character": 5
|
|
2799
2799
|
},
|
|
2800
2800
|
"name": "config",
|
|
@@ -2802,7 +2802,7 @@
|
|
|
2802
2802
|
"__schema": "TypeRefSchema",
|
|
2803
2803
|
"location": {
|
|
2804
2804
|
"filePath": "merging.main.runtime.ts",
|
|
2805
|
-
"line":
|
|
2805
|
+
"line": 122,
|
|
2806
2806
|
"character": 21
|
|
2807
2807
|
},
|
|
2808
2808
|
"name": "ConfigMain",
|
|
@@ -2818,7 +2818,7 @@
|
|
|
2818
2818
|
"__schema": "ParameterSchema",
|
|
2819
2819
|
"location": {
|
|
2820
2820
|
"filePath": "merging.main.runtime.ts",
|
|
2821
|
-
"line":
|
|
2821
|
+
"line": 123,
|
|
2822
2822
|
"character": 5
|
|
2823
2823
|
},
|
|
2824
2824
|
"name": "remove",
|
|
@@ -2826,7 +2826,7 @@
|
|
|
2826
2826
|
"__schema": "TypeRefSchema",
|
|
2827
2827
|
"location": {
|
|
2828
2828
|
"filePath": "merging.main.runtime.ts",
|
|
2829
|
-
"line":
|
|
2829
|
+
"line": 123,
|
|
2830
2830
|
"character": 21
|
|
2831
2831
|
},
|
|
2832
2832
|
"name": "RemoveMain",
|
|
@@ -2842,7 +2842,7 @@
|
|
|
2842
2842
|
"__schema": "ParameterSchema",
|
|
2843
2843
|
"location": {
|
|
2844
2844
|
"filePath": "merging.main.runtime.ts",
|
|
2845
|
-
"line":
|
|
2845
|
+
"line": 124,
|
|
2846
2846
|
"character": 5
|
|
2847
2847
|
},
|
|
2848
2848
|
"name": "configMerger",
|
|
@@ -2850,7 +2850,7 @@
|
|
|
2850
2850
|
"__schema": "TypeRefSchema",
|
|
2851
2851
|
"location": {
|
|
2852
2852
|
"filePath": "merging.main.runtime.ts",
|
|
2853
|
-
"line":
|
|
2853
|
+
"line": 124,
|
|
2854
2854
|
"character": 27
|
|
2855
2855
|
},
|
|
2856
2856
|
"name": "ConfigMergerMain",
|
|
@@ -2866,7 +2866,7 @@
|
|
|
2866
2866
|
"__schema": "ParameterSchema",
|
|
2867
2867
|
"location": {
|
|
2868
2868
|
"filePath": "merging.main.runtime.ts",
|
|
2869
|
-
"line":
|
|
2869
|
+
"line": 125,
|
|
2870
2870
|
"character": 5
|
|
2871
2871
|
},
|
|
2872
2872
|
"name": "depResolver",
|
|
@@ -2874,7 +2874,7 @@
|
|
|
2874
2874
|
"__schema": "TypeRefSchema",
|
|
2875
2875
|
"location": {
|
|
2876
2876
|
"filePath": "merging.main.runtime.ts",
|
|
2877
|
-
"line":
|
|
2877
|
+
"line": 125,
|
|
2878
2878
|
"character": 26
|
|
2879
2879
|
},
|
|
2880
2880
|
"name": "DependencyResolverMain",
|
|
@@ -2891,7 +2891,7 @@
|
|
|
2891
2891
|
"__schema": "ThisTypeSchema",
|
|
2892
2892
|
"location": {
|
|
2893
2893
|
"filePath": "merging.main.runtime.ts",
|
|
2894
|
-
"line":
|
|
2894
|
+
"line": 112,
|
|
2895
2895
|
"character": 1
|
|
2896
2896
|
},
|
|
2897
2897
|
"name": "MergingMain"
|
|
@@ -2902,7 +2902,7 @@
|
|
|
2902
2902
|
"__schema": "FunctionLikeSchema",
|
|
2903
2903
|
"location": {
|
|
2904
2904
|
"filePath": "merging.main.runtime.ts",
|
|
2905
|
-
"line":
|
|
2905
|
+
"line": 128,
|
|
2906
2906
|
"character": 3
|
|
2907
2907
|
},
|
|
2908
2908
|
"signature": "(method) MergingMain.merge(pattern: string, mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>",
|
|
@@ -2912,7 +2912,7 @@
|
|
|
2912
2912
|
"__schema": "ParameterSchema",
|
|
2913
2913
|
"location": {
|
|
2914
2914
|
"filePath": "merging.main.runtime.ts",
|
|
2915
|
-
"line":
|
|
2915
|
+
"line": 129,
|
|
2916
2916
|
"character": 5
|
|
2917
2917
|
},
|
|
2918
2918
|
"name": "pattern",
|
|
@@ -2920,7 +2920,7 @@
|
|
|
2920
2920
|
"__schema": "KeywordTypeSchema",
|
|
2921
2921
|
"location": {
|
|
2922
2922
|
"filePath": "merging.main.runtime.ts",
|
|
2923
|
-
"line":
|
|
2923
|
+
"line": 129,
|
|
2924
2924
|
"character": 14
|
|
2925
2925
|
},
|
|
2926
2926
|
"name": "string"
|
|
@@ -2932,7 +2932,7 @@
|
|
|
2932
2932
|
"__schema": "ParameterSchema",
|
|
2933
2933
|
"location": {
|
|
2934
2934
|
"filePath": "merging.main.runtime.ts",
|
|
2935
|
-
"line":
|
|
2935
|
+
"line": 130,
|
|
2936
2936
|
"character": 5
|
|
2937
2937
|
},
|
|
2938
2938
|
"name": "mergeStrategy",
|
|
@@ -2940,7 +2940,7 @@
|
|
|
2940
2940
|
"__schema": "TypeRefSchema",
|
|
2941
2941
|
"location": {
|
|
2942
2942
|
"filePath": "merging.main.runtime.ts",
|
|
2943
|
-
"line":
|
|
2943
|
+
"line": 130,
|
|
2944
2944
|
"character": 20
|
|
2945
2945
|
},
|
|
2946
2946
|
"name": "MergeStrategy"
|
|
@@ -2952,7 +2952,7 @@
|
|
|
2952
2952
|
"__schema": "ParameterSchema",
|
|
2953
2953
|
"location": {
|
|
2954
2954
|
"filePath": "merging.main.runtime.ts",
|
|
2955
|
-
"line":
|
|
2955
|
+
"line": 131,
|
|
2956
2956
|
"character": 5
|
|
2957
2957
|
},
|
|
2958
2958
|
"name": "abort",
|
|
@@ -2960,7 +2960,7 @@
|
|
|
2960
2960
|
"__schema": "KeywordTypeSchema",
|
|
2961
2961
|
"location": {
|
|
2962
2962
|
"filePath": "merging.main.runtime.ts",
|
|
2963
|
-
"line":
|
|
2963
|
+
"line": 131,
|
|
2964
2964
|
"character": 12
|
|
2965
2965
|
},
|
|
2966
2966
|
"name": "boolean"
|
|
@@ -2972,7 +2972,7 @@
|
|
|
2972
2972
|
"__schema": "ParameterSchema",
|
|
2973
2973
|
"location": {
|
|
2974
2974
|
"filePath": "merging.main.runtime.ts",
|
|
2975
|
-
"line":
|
|
2975
|
+
"line": 132,
|
|
2976
2976
|
"character": 5
|
|
2977
2977
|
},
|
|
2978
2978
|
"name": "resolve",
|
|
@@ -2980,7 +2980,7 @@
|
|
|
2980
2980
|
"__schema": "KeywordTypeSchema",
|
|
2981
2981
|
"location": {
|
|
2982
2982
|
"filePath": "merging.main.runtime.ts",
|
|
2983
|
-
"line":
|
|
2983
|
+
"line": 132,
|
|
2984
2984
|
"character": 14
|
|
2985
2985
|
},
|
|
2986
2986
|
"name": "boolean"
|
|
@@ -2992,7 +2992,7 @@
|
|
|
2992
2992
|
"__schema": "ParameterSchema",
|
|
2993
2993
|
"location": {
|
|
2994
2994
|
"filePath": "merging.main.runtime.ts",
|
|
2995
|
-
"line":
|
|
2995
|
+
"line": 133,
|
|
2996
2996
|
"character": 5
|
|
2997
2997
|
},
|
|
2998
2998
|
"name": "noSnap",
|
|
@@ -3000,7 +3000,7 @@
|
|
|
3000
3000
|
"__schema": "KeywordTypeSchema",
|
|
3001
3001
|
"location": {
|
|
3002
3002
|
"filePath": "merging.main.runtime.ts",
|
|
3003
|
-
"line":
|
|
3003
|
+
"line": 133,
|
|
3004
3004
|
"character": 13
|
|
3005
3005
|
},
|
|
3006
3006
|
"name": "boolean"
|
|
@@ -3012,7 +3012,7 @@
|
|
|
3012
3012
|
"__schema": "ParameterSchema",
|
|
3013
3013
|
"location": {
|
|
3014
3014
|
"filePath": "merging.main.runtime.ts",
|
|
3015
|
-
"line":
|
|
3015
|
+
"line": 134,
|
|
3016
3016
|
"character": 5
|
|
3017
3017
|
},
|
|
3018
3018
|
"name": "message",
|
|
@@ -3020,7 +3020,7 @@
|
|
|
3020
3020
|
"__schema": "KeywordTypeSchema",
|
|
3021
3021
|
"location": {
|
|
3022
3022
|
"filePath": "merging.main.runtime.ts",
|
|
3023
|
-
"line":
|
|
3023
|
+
"line": 134,
|
|
3024
3024
|
"character": 14
|
|
3025
3025
|
},
|
|
3026
3026
|
"name": "string"
|
|
@@ -3032,7 +3032,7 @@
|
|
|
3032
3032
|
"__schema": "ParameterSchema",
|
|
3033
3033
|
"location": {
|
|
3034
3034
|
"filePath": "merging.main.runtime.ts",
|
|
3035
|
-
"line":
|
|
3035
|
+
"line": 135,
|
|
3036
3036
|
"character": 5
|
|
3037
3037
|
},
|
|
3038
3038
|
"name": "build",
|
|
@@ -3040,7 +3040,7 @@
|
|
|
3040
3040
|
"__schema": "KeywordTypeSchema",
|
|
3041
3041
|
"location": {
|
|
3042
3042
|
"filePath": "merging.main.runtime.ts",
|
|
3043
|
-
"line":
|
|
3043
|
+
"line": 135,
|
|
3044
3044
|
"character": 12
|
|
3045
3045
|
},
|
|
3046
3046
|
"name": "boolean"
|
|
@@ -3052,7 +3052,7 @@
|
|
|
3052
3052
|
"__schema": "ParameterSchema",
|
|
3053
3053
|
"location": {
|
|
3054
3054
|
"filePath": "merging.main.runtime.ts",
|
|
3055
|
-
"line":
|
|
3055
|
+
"line": 136,
|
|
3056
3056
|
"character": 5
|
|
3057
3057
|
},
|
|
3058
3058
|
"name": "skipDependencyInstallation",
|
|
@@ -3060,7 +3060,7 @@
|
|
|
3060
3060
|
"__schema": "KeywordTypeSchema",
|
|
3061
3061
|
"location": {
|
|
3062
3062
|
"filePath": "merging.main.runtime.ts",
|
|
3063
|
-
"line":
|
|
3063
|
+
"line": 136,
|
|
3064
3064
|
"character": 33
|
|
3065
3065
|
},
|
|
3066
3066
|
"name": "boolean"
|
|
@@ -3073,7 +3073,7 @@
|
|
|
3073
3073
|
"__schema": "TypeRefSchema",
|
|
3074
3074
|
"location": {
|
|
3075
3075
|
"filePath": "merging.main.runtime.ts",
|
|
3076
|
-
"line":
|
|
3076
|
+
"line": 137,
|
|
3077
3077
|
"character": 6
|
|
3078
3078
|
},
|
|
3079
3079
|
"name": "Promise",
|
|
@@ -3082,7 +3082,7 @@
|
|
|
3082
3082
|
"__schema": "TypeRefSchema",
|
|
3083
3083
|
"location": {
|
|
3084
3084
|
"filePath": "merging.main.runtime.ts",
|
|
3085
|
-
"line":
|
|
3085
|
+
"line": 137,
|
|
3086
3086
|
"character": 14
|
|
3087
3087
|
},
|
|
3088
3088
|
"name": "ApplyVersionResults"
|
|
@@ -3097,14 +3097,14 @@
|
|
|
3097
3097
|
"__schema": "FunctionLikeSchema",
|
|
3098
3098
|
"location": {
|
|
3099
3099
|
"filePath": "merging.main.runtime.ts",
|
|
3100
|
-
"line":
|
|
3100
|
+
"line": 165,
|
|
3101
3101
|
"character": 3
|
|
3102
3102
|
},
|
|
3103
3103
|
"doc": {
|
|
3104
3104
|
"__schema": "DocSchema",
|
|
3105
3105
|
"location": {
|
|
3106
3106
|
"filePath": "merging.main.runtime.ts",
|
|
3107
|
-
"line":
|
|
3107
|
+
"line": 161,
|
|
3108
3108
|
"character": 3
|
|
3109
3109
|
},
|
|
3110
3110
|
"raw": "/**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */",
|
|
@@ -3118,7 +3118,7 @@
|
|
|
3118
3118
|
"__schema": "ParameterSchema",
|
|
3119
3119
|
"location": {
|
|
3120
3120
|
"filePath": "merging.main.runtime.ts",
|
|
3121
|
-
"line":
|
|
3121
|
+
"line": 166,
|
|
3122
3122
|
"character": 5
|
|
3123
3123
|
},
|
|
3124
3124
|
"name": "consumer",
|
|
@@ -3126,7 +3126,7 @@
|
|
|
3126
3126
|
"__schema": "TypeRefSchema",
|
|
3127
3127
|
"location": {
|
|
3128
3128
|
"filePath": "merging.main.runtime.ts",
|
|
3129
|
-
"line":
|
|
3129
|
+
"line": 166,
|
|
3130
3130
|
"character": 15
|
|
3131
3131
|
},
|
|
3132
3132
|
"name": "Consumer",
|
|
@@ -3139,7 +3139,7 @@
|
|
|
3139
3139
|
"__schema": "ParameterSchema",
|
|
3140
3140
|
"location": {
|
|
3141
3141
|
"filePath": "merging.main.runtime.ts",
|
|
3142
|
-
"line":
|
|
3142
|
+
"line": 167,
|
|
3143
3143
|
"character": 5
|
|
3144
3144
|
},
|
|
3145
3145
|
"name": "bitIds",
|
|
@@ -3147,14 +3147,14 @@
|
|
|
3147
3147
|
"__schema": "TypeArraySchema",
|
|
3148
3148
|
"location": {
|
|
3149
3149
|
"filePath": "merging.main.runtime.ts",
|
|
3150
|
-
"line":
|
|
3150
|
+
"line": 167,
|
|
3151
3151
|
"character": 13
|
|
3152
3152
|
},
|
|
3153
3153
|
"type": {
|
|
3154
3154
|
"__schema": "TypeRefSchema",
|
|
3155
3155
|
"location": {
|
|
3156
3156
|
"filePath": "merging.main.runtime.ts",
|
|
3157
|
-
"line":
|
|
3157
|
+
"line": 167,
|
|
3158
3158
|
"character": 13
|
|
3159
3159
|
},
|
|
3160
3160
|
"name": "ComponentID",
|
|
@@ -3172,7 +3172,7 @@
|
|
|
3172
3172
|
"__schema": "ParameterSchema",
|
|
3173
3173
|
"location": {
|
|
3174
3174
|
"filePath": "merging.main.runtime.ts",
|
|
3175
|
-
"line":
|
|
3175
|
+
"line": 168,
|
|
3176
3176
|
"character": 5
|
|
3177
3177
|
},
|
|
3178
3178
|
"name": "mergeStrategy",
|
|
@@ -3180,7 +3180,7 @@
|
|
|
3180
3180
|
"__schema": "TypeRefSchema",
|
|
3181
3181
|
"location": {
|
|
3182
3182
|
"filePath": "merging.main.runtime.ts",
|
|
3183
|
-
"line":
|
|
3183
|
+
"line": 168,
|
|
3184
3184
|
"character": 20
|
|
3185
3185
|
},
|
|
3186
3186
|
"name": "MergeStrategy"
|
|
@@ -3192,7 +3192,7 @@
|
|
|
3192
3192
|
"__schema": "ParameterSchema",
|
|
3193
3193
|
"location": {
|
|
3194
3194
|
"filePath": "merging.main.runtime.ts",
|
|
3195
|
-
"line":
|
|
3195
|
+
"line": 169,
|
|
3196
3196
|
"character": 5
|
|
3197
3197
|
},
|
|
3198
3198
|
"name": "noSnap",
|
|
@@ -3200,7 +3200,7 @@
|
|
|
3200
3200
|
"__schema": "KeywordTypeSchema",
|
|
3201
3201
|
"location": {
|
|
3202
3202
|
"filePath": "merging.main.runtime.ts",
|
|
3203
|
-
"line":
|
|
3203
|
+
"line": 169,
|
|
3204
3204
|
"character": 13
|
|
3205
3205
|
},
|
|
3206
3206
|
"name": "boolean"
|
|
@@ -3212,7 +3212,7 @@
|
|
|
3212
3212
|
"__schema": "ParameterSchema",
|
|
3213
3213
|
"location": {
|
|
3214
3214
|
"filePath": "merging.main.runtime.ts",
|
|
3215
|
-
"line":
|
|
3215
|
+
"line": 170,
|
|
3216
3216
|
"character": 5
|
|
3217
3217
|
},
|
|
3218
3218
|
"name": "snapMessage",
|
|
@@ -3220,7 +3220,7 @@
|
|
|
3220
3220
|
"__schema": "KeywordTypeSchema",
|
|
3221
3221
|
"location": {
|
|
3222
3222
|
"filePath": "merging.main.runtime.ts",
|
|
3223
|
-
"line":
|
|
3223
|
+
"line": 170,
|
|
3224
3224
|
"character": 18
|
|
3225
3225
|
},
|
|
3226
3226
|
"name": "string"
|
|
@@ -3232,7 +3232,7 @@
|
|
|
3232
3232
|
"__schema": "ParameterSchema",
|
|
3233
3233
|
"location": {
|
|
3234
3234
|
"filePath": "merging.main.runtime.ts",
|
|
3235
|
-
"line":
|
|
3235
|
+
"line": 171,
|
|
3236
3236
|
"character": 5
|
|
3237
3237
|
},
|
|
3238
3238
|
"name": "build",
|
|
@@ -3240,7 +3240,7 @@
|
|
|
3240
3240
|
"__schema": "KeywordTypeSchema",
|
|
3241
3241
|
"location": {
|
|
3242
3242
|
"filePath": "merging.main.runtime.ts",
|
|
3243
|
-
"line":
|
|
3243
|
+
"line": 171,
|
|
3244
3244
|
"character": 12
|
|
3245
3245
|
},
|
|
3246
3246
|
"name": "boolean"
|
|
@@ -3252,7 +3252,7 @@
|
|
|
3252
3252
|
"__schema": "ParameterSchema",
|
|
3253
3253
|
"location": {
|
|
3254
3254
|
"filePath": "merging.main.runtime.ts",
|
|
3255
|
-
"line":
|
|
3255
|
+
"line": 172,
|
|
3256
3256
|
"character": 5
|
|
3257
3257
|
},
|
|
3258
3258
|
"name": "skipDependencyInstallation",
|
|
@@ -3260,7 +3260,7 @@
|
|
|
3260
3260
|
"__schema": "KeywordTypeSchema",
|
|
3261
3261
|
"location": {
|
|
3262
3262
|
"filePath": "merging.main.runtime.ts",
|
|
3263
|
-
"line":
|
|
3263
|
+
"line": 172,
|
|
3264
3264
|
"character": 33
|
|
3265
3265
|
},
|
|
3266
3266
|
"name": "boolean"
|
|
@@ -3273,7 +3273,7 @@
|
|
|
3273
3273
|
"__schema": "TypeRefSchema",
|
|
3274
3274
|
"location": {
|
|
3275
3275
|
"filePath": "merging.main.runtime.ts",
|
|
3276
|
-
"line":
|
|
3276
|
+
"line": 173,
|
|
3277
3277
|
"character": 6
|
|
3278
3278
|
},
|
|
3279
3279
|
"name": "Promise",
|
|
@@ -3282,7 +3282,7 @@
|
|
|
3282
3282
|
"__schema": "TypeRefSchema",
|
|
3283
3283
|
"location": {
|
|
3284
3284
|
"filePath": "merging.main.runtime.ts",
|
|
3285
|
-
"line":
|
|
3285
|
+
"line": 173,
|
|
3286
3286
|
"character": 14
|
|
3287
3287
|
},
|
|
3288
3288
|
"name": "ApplyVersionResults"
|
|
@@ -3297,14 +3297,14 @@
|
|
|
3297
3297
|
"__schema": "FunctionLikeSchema",
|
|
3298
3298
|
"location": {
|
|
3299
3299
|
"filePath": "merging.main.runtime.ts",
|
|
3300
|
-
"line":
|
|
3300
|
+
"line": 208,
|
|
3301
3301
|
"character": 3
|
|
3302
3302
|
},
|
|
3303
3303
|
"doc": {
|
|
3304
3304
|
"__schema": "DocSchema",
|
|
3305
3305
|
"location": {
|
|
3306
3306
|
"filePath": "merging.main.runtime.ts",
|
|
3307
|
-
"line":
|
|
3307
|
+
"line": 205,
|
|
3308
3308
|
"character": 3
|
|
3309
3309
|
},
|
|
3310
3310
|
"raw": "/**\n * merge multiple components according to the \"allComponentsStatus\".\n */",
|
|
@@ -3318,7 +3318,7 @@
|
|
|
3318
3318
|
"__schema": "ParameterSchema",
|
|
3319
3319
|
"location": {
|
|
3320
3320
|
"filePath": "merging.main.runtime.ts",
|
|
3321
|
-
"line":
|
|
3321
|
+
"line": 208,
|
|
3322
3322
|
"character": 20
|
|
3323
3323
|
},
|
|
3324
3324
|
"name": "{ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noSnap, tag, snapMessage, build, skipDependencyInstallation }",
|
|
@@ -3326,7 +3326,7 @@
|
|
|
3326
3326
|
"__schema": "TypeLiteralSchema",
|
|
3327
3327
|
"location": {
|
|
3328
3328
|
"filePath": "merging.main.runtime.ts",
|
|
3329
|
-
"line":
|
|
3329
|
+
"line": 218,
|
|
3330
3330
|
"character": 6
|
|
3331
3331
|
},
|
|
3332
3332
|
"members": [
|
|
@@ -3334,7 +3334,7 @@
|
|
|
3334
3334
|
"__schema": "VariableLikeSchema",
|
|
3335
3335
|
"location": {
|
|
3336
3336
|
"filePath": "merging.main.runtime.ts",
|
|
3337
|
-
"line":
|
|
3337
|
+
"line": 219,
|
|
3338
3338
|
"character": 5
|
|
3339
3339
|
},
|
|
3340
3340
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -3343,7 +3343,7 @@
|
|
|
3343
3343
|
"__schema": "TypeRefSchema",
|
|
3344
3344
|
"location": {
|
|
3345
3345
|
"filePath": "merging.main.runtime.ts",
|
|
3346
|
-
"line":
|
|
3346
|
+
"line": 219,
|
|
3347
3347
|
"character": 20
|
|
3348
3348
|
},
|
|
3349
3349
|
"name": "MergeStrategy"
|
|
@@ -3354,7 +3354,7 @@
|
|
|
3354
3354
|
"__schema": "VariableLikeSchema",
|
|
3355
3355
|
"location": {
|
|
3356
3356
|
"filePath": "merging.main.runtime.ts",
|
|
3357
|
-
"line":
|
|
3357
|
+
"line": 220,
|
|
3358
3358
|
"character": 5
|
|
3359
3359
|
},
|
|
3360
3360
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -3363,14 +3363,14 @@
|
|
|
3363
3363
|
"__schema": "TypeArraySchema",
|
|
3364
3364
|
"location": {
|
|
3365
3365
|
"filePath": "merging.main.runtime.ts",
|
|
3366
|
-
"line":
|
|
3366
|
+
"line": 220,
|
|
3367
3367
|
"character": 26
|
|
3368
3368
|
},
|
|
3369
3369
|
"type": {
|
|
3370
3370
|
"__schema": "TypeRefSchema",
|
|
3371
3371
|
"location": {
|
|
3372
3372
|
"filePath": "merging.main.runtime.ts",
|
|
3373
|
-
"line":
|
|
3373
|
+
"line": 220,
|
|
3374
3374
|
"character": 26
|
|
3375
3375
|
},
|
|
3376
3376
|
"name": "ComponentMergeStatus"
|
|
@@ -3382,7 +3382,7 @@
|
|
|
3382
3382
|
"__schema": "VariableLikeSchema",
|
|
3383
3383
|
"location": {
|
|
3384
3384
|
"filePath": "merging.main.runtime.ts",
|
|
3385
|
-
"line":
|
|
3385
|
+
"line": 221,
|
|
3386
3386
|
"character": 5
|
|
3387
3387
|
},
|
|
3388
3388
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -3391,7 +3391,7 @@
|
|
|
3391
3391
|
"__schema": "TypeRefSchema",
|
|
3392
3392
|
"location": {
|
|
3393
3393
|
"filePath": "merging.main.runtime.ts",
|
|
3394
|
-
"line":
|
|
3394
|
+
"line": 221,
|
|
3395
3395
|
"character": 5
|
|
3396
3396
|
},
|
|
3397
3397
|
"name": "LaneId",
|
|
@@ -3407,7 +3407,7 @@
|
|
|
3407
3407
|
"__schema": "VariableLikeSchema",
|
|
3408
3408
|
"location": {
|
|
3409
3409
|
"filePath": "merging.main.runtime.ts",
|
|
3410
|
-
"line":
|
|
3410
|
+
"line": 222,
|
|
3411
3411
|
"character": 5
|
|
3412
3412
|
},
|
|
3413
3413
|
"signature": "(property) currentLane?: Lane | undefined",
|
|
@@ -3416,7 +3416,7 @@
|
|
|
3416
3416
|
"__schema": "TypeRefSchema",
|
|
3417
3417
|
"location": {
|
|
3418
3418
|
"filePath": "merging.main.runtime.ts",
|
|
3419
|
-
"line":
|
|
3419
|
+
"line": 222,
|
|
3420
3420
|
"character": 19
|
|
3421
3421
|
},
|
|
3422
3422
|
"name": "Lane",
|
|
@@ -3428,7 +3428,7 @@
|
|
|
3428
3428
|
"__schema": "VariableLikeSchema",
|
|
3429
3429
|
"location": {
|
|
3430
3430
|
"filePath": "merging.main.runtime.ts",
|
|
3431
|
-
"line":
|
|
3431
|
+
"line": 223,
|
|
3432
3432
|
"character": 5
|
|
3433
3433
|
},
|
|
3434
3434
|
"signature": "(property) noSnap?: boolean | undefined",
|
|
@@ -3437,7 +3437,7 @@
|
|
|
3437
3437
|
"__schema": "KeywordTypeSchema",
|
|
3438
3438
|
"location": {
|
|
3439
3439
|
"filePath": "merging.main.runtime.ts",
|
|
3440
|
-
"line":
|
|
3440
|
+
"line": 223,
|
|
3441
3441
|
"character": 14
|
|
3442
3442
|
},
|
|
3443
3443
|
"name": "boolean"
|
|
@@ -3448,7 +3448,7 @@
|
|
|
3448
3448
|
"__schema": "VariableLikeSchema",
|
|
3449
3449
|
"location": {
|
|
3450
3450
|
"filePath": "merging.main.runtime.ts",
|
|
3451
|
-
"line":
|
|
3451
|
+
"line": 224,
|
|
3452
3452
|
"character": 5
|
|
3453
3453
|
},
|
|
3454
3454
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -3457,7 +3457,7 @@
|
|
|
3457
3457
|
"__schema": "KeywordTypeSchema",
|
|
3458
3458
|
"location": {
|
|
3459
3459
|
"filePath": "merging.main.runtime.ts",
|
|
3460
|
-
"line":
|
|
3460
|
+
"line": 224,
|
|
3461
3461
|
"character": 11
|
|
3462
3462
|
},
|
|
3463
3463
|
"name": "boolean"
|
|
@@ -3468,7 +3468,7 @@
|
|
|
3468
3468
|
"__schema": "VariableLikeSchema",
|
|
3469
3469
|
"location": {
|
|
3470
3470
|
"filePath": "merging.main.runtime.ts",
|
|
3471
|
-
"line":
|
|
3471
|
+
"line": 225,
|
|
3472
3472
|
"character": 5
|
|
3473
3473
|
},
|
|
3474
3474
|
"signature": "(property) snapMessage?: string | undefined",
|
|
@@ -3477,7 +3477,7 @@
|
|
|
3477
3477
|
"__schema": "KeywordTypeSchema",
|
|
3478
3478
|
"location": {
|
|
3479
3479
|
"filePath": "merging.main.runtime.ts",
|
|
3480
|
-
"line":
|
|
3480
|
+
"line": 225,
|
|
3481
3481
|
"character": 19
|
|
3482
3482
|
},
|
|
3483
3483
|
"name": "string"
|
|
@@ -3488,7 +3488,7 @@
|
|
|
3488
3488
|
"__schema": "VariableLikeSchema",
|
|
3489
3489
|
"location": {
|
|
3490
3490
|
"filePath": "merging.main.runtime.ts",
|
|
3491
|
-
"line":
|
|
3491
|
+
"line": 226,
|
|
3492
3492
|
"character": 5
|
|
3493
3493
|
},
|
|
3494
3494
|
"signature": "(property) build?: boolean | undefined",
|
|
@@ -3497,7 +3497,7 @@
|
|
|
3497
3497
|
"__schema": "KeywordTypeSchema",
|
|
3498
3498
|
"location": {
|
|
3499
3499
|
"filePath": "merging.main.runtime.ts",
|
|
3500
|
-
"line":
|
|
3500
|
+
"line": 226,
|
|
3501
3501
|
"character": 13
|
|
3502
3502
|
},
|
|
3503
3503
|
"name": "boolean"
|
|
@@ -3508,7 +3508,7 @@
|
|
|
3508
3508
|
"__schema": "VariableLikeSchema",
|
|
3509
3509
|
"location": {
|
|
3510
3510
|
"filePath": "merging.main.runtime.ts",
|
|
3511
|
-
"line":
|
|
3511
|
+
"line": 227,
|
|
3512
3512
|
"character": 5
|
|
3513
3513
|
},
|
|
3514
3514
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -3517,7 +3517,7 @@
|
|
|
3517
3517
|
"__schema": "KeywordTypeSchema",
|
|
3518
3518
|
"location": {
|
|
3519
3519
|
"filePath": "merging.main.runtime.ts",
|
|
3520
|
-
"line":
|
|
3520
|
+
"line": 227,
|
|
3521
3521
|
"character": 34
|
|
3522
3522
|
},
|
|
3523
3523
|
"name": "boolean"
|
|
@@ -3532,7 +3532,7 @@
|
|
|
3532
3532
|
"__schema": "VariableLikeSchema",
|
|
3533
3533
|
"location": {
|
|
3534
3534
|
"filePath": "merging.main.runtime.ts",
|
|
3535
|
-
"line":
|
|
3535
|
+
"line": 219,
|
|
3536
3536
|
"character": 5
|
|
3537
3537
|
},
|
|
3538
3538
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -3541,7 +3541,7 @@
|
|
|
3541
3541
|
"__schema": "TypeRefSchema",
|
|
3542
3542
|
"location": {
|
|
3543
3543
|
"filePath": "merging.main.runtime.ts",
|
|
3544
|
-
"line":
|
|
3544
|
+
"line": 219,
|
|
3545
3545
|
"character": 20
|
|
3546
3546
|
},
|
|
3547
3547
|
"name": "MergeStrategy"
|
|
@@ -3552,7 +3552,7 @@
|
|
|
3552
3552
|
"__schema": "VariableLikeSchema",
|
|
3553
3553
|
"location": {
|
|
3554
3554
|
"filePath": "merging.main.runtime.ts",
|
|
3555
|
-
"line":
|
|
3555
|
+
"line": 220,
|
|
3556
3556
|
"character": 5
|
|
3557
3557
|
},
|
|
3558
3558
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -3561,14 +3561,14 @@
|
|
|
3561
3561
|
"__schema": "TypeArraySchema",
|
|
3562
3562
|
"location": {
|
|
3563
3563
|
"filePath": "merging.main.runtime.ts",
|
|
3564
|
-
"line":
|
|
3564
|
+
"line": 220,
|
|
3565
3565
|
"character": 26
|
|
3566
3566
|
},
|
|
3567
3567
|
"type": {
|
|
3568
3568
|
"__schema": "TypeRefSchema",
|
|
3569
3569
|
"location": {
|
|
3570
3570
|
"filePath": "merging.main.runtime.ts",
|
|
3571
|
-
"line":
|
|
3571
|
+
"line": 220,
|
|
3572
3572
|
"character": 26
|
|
3573
3573
|
},
|
|
3574
3574
|
"name": "ComponentMergeStatus"
|
|
@@ -3580,7 +3580,7 @@
|
|
|
3580
3580
|
"__schema": "VariableLikeSchema",
|
|
3581
3581
|
"location": {
|
|
3582
3582
|
"filePath": "merging.main.runtime.ts",
|
|
3583
|
-
"line":
|
|
3583
|
+
"line": 221,
|
|
3584
3584
|
"character": 5
|
|
3585
3585
|
},
|
|
3586
3586
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -3589,7 +3589,7 @@
|
|
|
3589
3589
|
"__schema": "TypeRefSchema",
|
|
3590
3590
|
"location": {
|
|
3591
3591
|
"filePath": "merging.main.runtime.ts",
|
|
3592
|
-
"line":
|
|
3592
|
+
"line": 221,
|
|
3593
3593
|
"character": 5
|
|
3594
3594
|
},
|
|
3595
3595
|
"name": "LaneId",
|
|
@@ -3605,7 +3605,7 @@
|
|
|
3605
3605
|
"__schema": "VariableLikeSchema",
|
|
3606
3606
|
"location": {
|
|
3607
3607
|
"filePath": "merging.main.runtime.ts",
|
|
3608
|
-
"line":
|
|
3608
|
+
"line": 222,
|
|
3609
3609
|
"character": 5
|
|
3610
3610
|
},
|
|
3611
3611
|
"signature": "(property) currentLane?: Lane | undefined",
|
|
@@ -3614,7 +3614,7 @@
|
|
|
3614
3614
|
"__schema": "TypeRefSchema",
|
|
3615
3615
|
"location": {
|
|
3616
3616
|
"filePath": "merging.main.runtime.ts",
|
|
3617
|
-
"line":
|
|
3617
|
+
"line": 222,
|
|
3618
3618
|
"character": 19
|
|
3619
3619
|
},
|
|
3620
3620
|
"name": "Lane",
|
|
@@ -3626,7 +3626,7 @@
|
|
|
3626
3626
|
"__schema": "VariableLikeSchema",
|
|
3627
3627
|
"location": {
|
|
3628
3628
|
"filePath": "merging.main.runtime.ts",
|
|
3629
|
-
"line":
|
|
3629
|
+
"line": 223,
|
|
3630
3630
|
"character": 5
|
|
3631
3631
|
},
|
|
3632
3632
|
"signature": "(property) noSnap?: boolean | undefined",
|
|
@@ -3635,7 +3635,7 @@
|
|
|
3635
3635
|
"__schema": "KeywordTypeSchema",
|
|
3636
3636
|
"location": {
|
|
3637
3637
|
"filePath": "merging.main.runtime.ts",
|
|
3638
|
-
"line":
|
|
3638
|
+
"line": 223,
|
|
3639
3639
|
"character": 14
|
|
3640
3640
|
},
|
|
3641
3641
|
"name": "boolean"
|
|
@@ -3646,7 +3646,7 @@
|
|
|
3646
3646
|
"__schema": "VariableLikeSchema",
|
|
3647
3647
|
"location": {
|
|
3648
3648
|
"filePath": "merging.main.runtime.ts",
|
|
3649
|
-
"line":
|
|
3649
|
+
"line": 224,
|
|
3650
3650
|
"character": 5
|
|
3651
3651
|
},
|
|
3652
3652
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -3655,7 +3655,7 @@
|
|
|
3655
3655
|
"__schema": "KeywordTypeSchema",
|
|
3656
3656
|
"location": {
|
|
3657
3657
|
"filePath": "merging.main.runtime.ts",
|
|
3658
|
-
"line":
|
|
3658
|
+
"line": 224,
|
|
3659
3659
|
"character": 11
|
|
3660
3660
|
},
|
|
3661
3661
|
"name": "boolean"
|
|
@@ -3666,7 +3666,7 @@
|
|
|
3666
3666
|
"__schema": "VariableLikeSchema",
|
|
3667
3667
|
"location": {
|
|
3668
3668
|
"filePath": "merging.main.runtime.ts",
|
|
3669
|
-
"line":
|
|
3669
|
+
"line": 225,
|
|
3670
3670
|
"character": 5
|
|
3671
3671
|
},
|
|
3672
3672
|
"signature": "(property) snapMessage?: string | undefined",
|
|
@@ -3675,7 +3675,7 @@
|
|
|
3675
3675
|
"__schema": "KeywordTypeSchema",
|
|
3676
3676
|
"location": {
|
|
3677
3677
|
"filePath": "merging.main.runtime.ts",
|
|
3678
|
-
"line":
|
|
3678
|
+
"line": 225,
|
|
3679
3679
|
"character": 19
|
|
3680
3680
|
},
|
|
3681
3681
|
"name": "string"
|
|
@@ -3686,7 +3686,7 @@
|
|
|
3686
3686
|
"__schema": "VariableLikeSchema",
|
|
3687
3687
|
"location": {
|
|
3688
3688
|
"filePath": "merging.main.runtime.ts",
|
|
3689
|
-
"line":
|
|
3689
|
+
"line": 226,
|
|
3690
3690
|
"character": 5
|
|
3691
3691
|
},
|
|
3692
3692
|
"signature": "(property) build?: boolean | undefined",
|
|
@@ -3695,7 +3695,7 @@
|
|
|
3695
3695
|
"__schema": "KeywordTypeSchema",
|
|
3696
3696
|
"location": {
|
|
3697
3697
|
"filePath": "merging.main.runtime.ts",
|
|
3698
|
-
"line":
|
|
3698
|
+
"line": 226,
|
|
3699
3699
|
"character": 13
|
|
3700
3700
|
},
|
|
3701
3701
|
"name": "boolean"
|
|
@@ -3706,7 +3706,7 @@
|
|
|
3706
3706
|
"__schema": "VariableLikeSchema",
|
|
3707
3707
|
"location": {
|
|
3708
3708
|
"filePath": "merging.main.runtime.ts",
|
|
3709
|
-
"line":
|
|
3709
|
+
"line": 227,
|
|
3710
3710
|
"character": 5
|
|
3711
3711
|
},
|
|
3712
3712
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -3715,7 +3715,7 @@
|
|
|
3715
3715
|
"__schema": "KeywordTypeSchema",
|
|
3716
3716
|
"location": {
|
|
3717
3717
|
"filePath": "merging.main.runtime.ts",
|
|
3718
|
-
"line":
|
|
3718
|
+
"line": 227,
|
|
3719
3719
|
"character": 34
|
|
3720
3720
|
},
|
|
3721
3721
|
"name": "boolean"
|
|
@@ -3730,7 +3730,7 @@
|
|
|
3730
3730
|
"__schema": "TypeRefSchema",
|
|
3731
3731
|
"location": {
|
|
3732
3732
|
"filePath": "merging.main.runtime.ts",
|
|
3733
|
-
"line":
|
|
3733
|
+
"line": 228,
|
|
3734
3734
|
"character": 7
|
|
3735
3735
|
},
|
|
3736
3736
|
"name": "Promise",
|
|
@@ -3739,7 +3739,7 @@
|
|
|
3739
3739
|
"__schema": "TypeRefSchema",
|
|
3740
3740
|
"location": {
|
|
3741
3741
|
"filePath": "merging.main.runtime.ts",
|
|
3742
|
-
"line":
|
|
3742
|
+
"line": 228,
|
|
3743
3743
|
"character": 15
|
|
3744
3744
|
},
|
|
3745
3745
|
"name": "ApplyVersionResults"
|
|
@@ -3754,7 +3754,7 @@
|
|
|
3754
3754
|
"__schema": "FunctionLikeSchema",
|
|
3755
3755
|
"location": {
|
|
3756
3756
|
"filePath": "merging.main.runtime.ts",
|
|
3757
|
-
"line":
|
|
3757
|
+
"line": 351,
|
|
3758
3758
|
"character": 3
|
|
3759
3759
|
},
|
|
3760
3760
|
"signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
|
|
@@ -3764,7 +3764,7 @@
|
|
|
3764
3764
|
"__schema": "ParameterSchema",
|
|
3765
3765
|
"location": {
|
|
3766
3766
|
"filePath": "merging.main.runtime.ts",
|
|
3767
|
-
"line":
|
|
3767
|
+
"line": 352,
|
|
3768
3768
|
"character": 5
|
|
3769
3769
|
},
|
|
3770
3770
|
"name": "componentsResults",
|
|
@@ -3772,14 +3772,14 @@
|
|
|
3772
3772
|
"__schema": "TypeArraySchema",
|
|
3773
3773
|
"location": {
|
|
3774
3774
|
"filePath": "merging.main.runtime.ts",
|
|
3775
|
-
"line":
|
|
3775
|
+
"line": 352,
|
|
3776
3776
|
"character": 24
|
|
3777
3777
|
},
|
|
3778
3778
|
"type": {
|
|
3779
3779
|
"__schema": "TypeRefSchema",
|
|
3780
3780
|
"location": {
|
|
3781
3781
|
"filePath": "merging.main.runtime.ts",
|
|
3782
|
-
"line":
|
|
3782
|
+
"line": 352,
|
|
3783
3783
|
"character": 24
|
|
3784
3784
|
},
|
|
3785
3785
|
"name": "ApplyVersionWithComps",
|
|
@@ -3796,7 +3796,7 @@
|
|
|
3796
3796
|
"__schema": "ParameterSchema",
|
|
3797
3797
|
"location": {
|
|
3798
3798
|
"filePath": "merging.main.runtime.ts",
|
|
3799
|
-
"line":
|
|
3799
|
+
"line": 353,
|
|
3800
3800
|
"character": 5
|
|
3801
3801
|
},
|
|
3802
3802
|
"name": "currentLane",
|
|
@@ -3804,7 +3804,7 @@
|
|
|
3804
3804
|
"__schema": "TypeRefSchema",
|
|
3805
3805
|
"location": {
|
|
3806
3806
|
"filePath": "merging.main.runtime.ts",
|
|
3807
|
-
"line":
|
|
3807
|
+
"line": 353,
|
|
3808
3808
|
"character": 19
|
|
3809
3809
|
},
|
|
3810
3810
|
"name": "Lane",
|
|
@@ -3817,7 +3817,7 @@
|
|
|
3817
3817
|
"__schema": "ParameterSchema",
|
|
3818
3818
|
"location": {
|
|
3819
3819
|
"filePath": "merging.main.runtime.ts",
|
|
3820
|
-
"line":
|
|
3820
|
+
"line": 354,
|
|
3821
3821
|
"character": 5
|
|
3822
3822
|
},
|
|
3823
3823
|
"name": "currentLaneIdsBeforeMerge",
|
|
@@ -3825,7 +3825,7 @@
|
|
|
3825
3825
|
"__schema": "TypeRefSchema",
|
|
3826
3826
|
"location": {
|
|
3827
3827
|
"filePath": "merging.main.runtime.ts",
|
|
3828
|
-
"line":
|
|
3828
|
+
"line": 354,
|
|
3829
3829
|
"character": 33
|
|
3830
3830
|
},
|
|
3831
3831
|
"name": "ComponentIdList",
|
|
@@ -3843,7 +3843,7 @@
|
|
|
3843
3843
|
"__schema": "InferenceTypeSchema",
|
|
3844
3844
|
"location": {
|
|
3845
3845
|
"filePath": "merging.main.runtime.ts",
|
|
3846
|
-
"line":
|
|
3846
|
+
"line": 351,
|
|
3847
3847
|
"character": 3
|
|
3848
3848
|
},
|
|
3849
3849
|
"type": "Promise<void>"
|
|
@@ -3856,14 +3856,14 @@
|
|
|
3856
3856
|
"__schema": "FunctionLikeSchema",
|
|
3857
3857
|
"location": {
|
|
3858
3858
|
"filePath": "merging.main.runtime.ts",
|
|
3859
|
-
"line":
|
|
3859
|
+
"line": 376,
|
|
3860
3860
|
"character": 3
|
|
3861
3861
|
},
|
|
3862
3862
|
"doc": {
|
|
3863
3863
|
"__schema": "DocSchema",
|
|
3864
3864
|
"location": {
|
|
3865
3865
|
"filePath": "merging.main.runtime.ts",
|
|
3866
|
-
"line":
|
|
3866
|
+
"line": 370,
|
|
3867
3867
|
"character": 3
|
|
3868
3868
|
},
|
|
3869
3869
|
"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 */",
|
|
@@ -3877,7 +3877,7 @@
|
|
|
3877
3877
|
"__schema": "ParameterSchema",
|
|
3878
3878
|
"location": {
|
|
3879
3879
|
"filePath": "merging.main.runtime.ts",
|
|
3880
|
-
"line":
|
|
3880
|
+
"line": 377,
|
|
3881
3881
|
"character": 5
|
|
3882
3882
|
},
|
|
3883
3883
|
"name": "bitIds",
|
|
@@ -3885,14 +3885,14 @@
|
|
|
3885
3885
|
"__schema": "TypeArraySchema",
|
|
3886
3886
|
"location": {
|
|
3887
3887
|
"filePath": "merging.main.runtime.ts",
|
|
3888
|
-
"line":
|
|
3888
|
+
"line": 377,
|
|
3889
3889
|
"character": 13
|
|
3890
3890
|
},
|
|
3891
3891
|
"type": {
|
|
3892
3892
|
"__schema": "TypeRefSchema",
|
|
3893
3893
|
"location": {
|
|
3894
3894
|
"filePath": "merging.main.runtime.ts",
|
|
3895
|
-
"line":
|
|
3895
|
+
"line": 377,
|
|
3896
3896
|
"character": 13
|
|
3897
3897
|
},
|
|
3898
3898
|
"name": "ComponentID",
|
|
@@ -3910,7 +3910,7 @@
|
|
|
3910
3910
|
"__schema": "ParameterSchema",
|
|
3911
3911
|
"location": {
|
|
3912
3912
|
"filePath": "merging.main.runtime.ts",
|
|
3913
|
-
"line":
|
|
3913
|
+
"line": 378,
|
|
3914
3914
|
"character": 5
|
|
3915
3915
|
},
|
|
3916
3916
|
"name": "options",
|
|
@@ -3918,7 +3918,7 @@
|
|
|
3918
3918
|
"__schema": "TypeRefSchema",
|
|
3919
3919
|
"location": {
|
|
3920
3920
|
"filePath": "merging.main.runtime.ts",
|
|
3921
|
-
"line":
|
|
3921
|
+
"line": 378,
|
|
3922
3922
|
"character": 14
|
|
3923
3923
|
},
|
|
3924
3924
|
"name": "MergeStatusProviderOptions",
|
|
@@ -3931,7 +3931,7 @@
|
|
|
3931
3931
|
"__schema": "ParameterSchema",
|
|
3932
3932
|
"location": {
|
|
3933
3933
|
"filePath": "merging.main.runtime.ts",
|
|
3934
|
-
"line":
|
|
3934
|
+
"line": 379,
|
|
3935
3935
|
"character": 5
|
|
3936
3936
|
},
|
|
3937
3937
|
"name": "currentLane",
|
|
@@ -3939,7 +3939,7 @@
|
|
|
3939
3939
|
"__schema": "TypeRefSchema",
|
|
3940
3940
|
"location": {
|
|
3941
3941
|
"filePath": "merging.main.runtime.ts",
|
|
3942
|
-
"line":
|
|
3942
|
+
"line": 379,
|
|
3943
3943
|
"character": 19
|
|
3944
3944
|
},
|
|
3945
3945
|
"name": "Lane",
|
|
@@ -3952,7 +3952,7 @@
|
|
|
3952
3952
|
"__schema": "ParameterSchema",
|
|
3953
3953
|
"location": {
|
|
3954
3954
|
"filePath": "merging.main.runtime.ts",
|
|
3955
|
-
"line":
|
|
3955
|
+
"line": 380,
|
|
3956
3956
|
"character": 5
|
|
3957
3957
|
},
|
|
3958
3958
|
"name": "otherLane",
|
|
@@ -3960,7 +3960,7 @@
|
|
|
3960
3960
|
"__schema": "TypeRefSchema",
|
|
3961
3961
|
"location": {
|
|
3962
3962
|
"filePath": "merging.main.runtime.ts",
|
|
3963
|
-
"line":
|
|
3963
|
+
"line": 380,
|
|
3964
3964
|
"character": 17
|
|
3965
3965
|
},
|
|
3966
3966
|
"name": "Lane",
|
|
@@ -3974,7 +3974,7 @@
|
|
|
3974
3974
|
"__schema": "TypeRefSchema",
|
|
3975
3975
|
"location": {
|
|
3976
3976
|
"filePath": "merging.main.runtime.ts",
|
|
3977
|
-
"line":
|
|
3977
|
+
"line": 381,
|
|
3978
3978
|
"character": 6
|
|
3979
3979
|
},
|
|
3980
3980
|
"name": "Promise",
|
|
@@ -3983,14 +3983,14 @@
|
|
|
3983
3983
|
"__schema": "TypeArraySchema",
|
|
3984
3984
|
"location": {
|
|
3985
3985
|
"filePath": "merging.main.runtime.ts",
|
|
3986
|
-
"line":
|
|
3986
|
+
"line": 381,
|
|
3987
3987
|
"character": 14
|
|
3988
3988
|
},
|
|
3989
3989
|
"type": {
|
|
3990
3990
|
"__schema": "TypeRefSchema",
|
|
3991
3991
|
"location": {
|
|
3992
3992
|
"filePath": "merging.main.runtime.ts",
|
|
3993
|
-
"line":
|
|
3993
|
+
"line": 381,
|
|
3994
3994
|
"character": 14
|
|
3995
3995
|
},
|
|
3996
3996
|
"name": "ComponentMergeStatus"
|
|
@@ -4006,7 +4006,7 @@
|
|
|
4006
4006
|
"__schema": "VariableLikeSchema",
|
|
4007
4007
|
"location": {
|
|
4008
4008
|
"filePath": "merging.main.runtime.ts",
|
|
4009
|
-
"line":
|
|
4009
|
+
"line": 674,
|
|
4010
4010
|
"character": 3
|
|
4011
4011
|
},
|
|
4012
4012
|
"signature": "(property) MergingMain.slots: never[]",
|
|
@@ -4015,7 +4015,7 @@
|
|
|
4015
4015
|
"__schema": "InferenceTypeSchema",
|
|
4016
4016
|
"location": {
|
|
4017
4017
|
"filePath": "merging.main.runtime.ts",
|
|
4018
|
-
"line":
|
|
4018
|
+
"line": 674,
|
|
4019
4019
|
"character": 3
|
|
4020
4020
|
},
|
|
4021
4021
|
"type": "never[]"
|
|
@@ -4027,7 +4027,7 @@
|
|
|
4027
4027
|
"__schema": "VariableLikeSchema",
|
|
4028
4028
|
"location": {
|
|
4029
4029
|
"filePath": "merging.main.runtime.ts",
|
|
4030
|
-
"line":
|
|
4030
|
+
"line": 675,
|
|
4031
4031
|
"character": 3
|
|
4032
4032
|
},
|
|
4033
4033
|
"signature": "(property) MergingMain.dependencies: Aspect[]",
|
|
@@ -4036,7 +4036,7 @@
|
|
|
4036
4036
|
"__schema": "InferenceTypeSchema",
|
|
4037
4037
|
"location": {
|
|
4038
4038
|
"filePath": "merging.main.runtime.ts",
|
|
4039
|
-
"line":
|
|
4039
|
+
"line": 675,
|
|
4040
4040
|
"character": 3
|
|
4041
4041
|
},
|
|
4042
4042
|
"type": "Aspect[]"
|
|
@@ -4048,7 +4048,7 @@
|
|
|
4048
4048
|
"__schema": "VariableLikeSchema",
|
|
4049
4049
|
"location": {
|
|
4050
4050
|
"filePath": "merging.main.runtime.ts",
|
|
4051
|
-
"line":
|
|
4051
|
+
"line": 691,
|
|
4052
4052
|
"character": 3
|
|
4053
4053
|
},
|
|
4054
4054
|
"signature": "(property) MergingMain.runtime: RuntimeDefinition",
|
|
@@ -4057,7 +4057,7 @@
|
|
|
4057
4057
|
"__schema": "InferenceTypeSchema",
|
|
4058
4058
|
"location": {
|
|
4059
4059
|
"filePath": "merging.main.runtime.ts",
|
|
4060
|
-
"line":
|
|
4060
|
+
"line": 691,
|
|
4061
4061
|
"character": 3
|
|
4062
4062
|
},
|
|
4063
4063
|
"type": "RuntimeDefinition"
|
|
@@ -4069,7 +4069,7 @@
|
|
|
4069
4069
|
"__schema": "FunctionLikeSchema",
|
|
4070
4070
|
"location": {
|
|
4071
4071
|
"filePath": "merging.main.runtime.ts",
|
|
4072
|
-
"line":
|
|
4072
|
+
"line": 692,
|
|
4073
4073
|
"character": 3
|
|
4074
4074
|
},
|
|
4075
4075
|
"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>",
|
|
@@ -4079,7 +4079,7 @@
|
|
|
4079
4079
|
"__schema": "ParameterSchema",
|
|
4080
4080
|
"location": {
|
|
4081
4081
|
"filePath": "merging.main.runtime.ts",
|
|
4082
|
-
"line":
|
|
4082
|
+
"line": 692,
|
|
4083
4083
|
"character": 25
|
|
4084
4084
|
},
|
|
4085
4085
|
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
|
|
@@ -4087,7 +4087,7 @@
|
|
|
4087
4087
|
"__schema": "TupleTypeSchema",
|
|
4088
4088
|
"location": {
|
|
4089
4089
|
"filePath": "merging.main.runtime.ts",
|
|
4090
|
-
"line":
|
|
4090
|
+
"line": 707,
|
|
4091
4091
|
"character": 6
|
|
4092
4092
|
},
|
|
4093
4093
|
"elements": [
|
|
@@ -4095,7 +4095,7 @@
|
|
|
4095
4095
|
"__schema": "TypeRefSchema",
|
|
4096
4096
|
"location": {
|
|
4097
4097
|
"filePath": "merging.main.runtime.ts",
|
|
4098
|
-
"line":
|
|
4098
|
+
"line": 708,
|
|
4099
4099
|
"character": 5
|
|
4100
4100
|
},
|
|
4101
4101
|
"name": "CLIMain",
|
|
@@ -4108,7 +4108,7 @@
|
|
|
4108
4108
|
"__schema": "TypeRefSchema",
|
|
4109
4109
|
"location": {
|
|
4110
4110
|
"filePath": "merging.main.runtime.ts",
|
|
4111
|
-
"line":
|
|
4111
|
+
"line": 709,
|
|
4112
4112
|
"character": 5
|
|
4113
4113
|
},
|
|
4114
4114
|
"name": "Workspace",
|
|
@@ -4121,7 +4121,7 @@
|
|
|
4121
4121
|
"__schema": "TypeRefSchema",
|
|
4122
4122
|
"location": {
|
|
4123
4123
|
"filePath": "merging.main.runtime.ts",
|
|
4124
|
-
"line":
|
|
4124
|
+
"line": 710,
|
|
4125
4125
|
"character": 5
|
|
4126
4126
|
},
|
|
4127
4127
|
"name": "ScopeMain",
|
|
@@ -4134,7 +4134,7 @@
|
|
|
4134
4134
|
"__schema": "TypeRefSchema",
|
|
4135
4135
|
"location": {
|
|
4136
4136
|
"filePath": "merging.main.runtime.ts",
|
|
4137
|
-
"line":
|
|
4137
|
+
"line": 711,
|
|
4138
4138
|
"character": 5
|
|
4139
4139
|
},
|
|
4140
4140
|
"name": "SnappingMain",
|
|
@@ -4147,7 +4147,7 @@
|
|
|
4147
4147
|
"__schema": "TypeRefSchema",
|
|
4148
4148
|
"location": {
|
|
4149
4149
|
"filePath": "merging.main.runtime.ts",
|
|
4150
|
-
"line":
|
|
4150
|
+
"line": 712,
|
|
4151
4151
|
"character": 5
|
|
4152
4152
|
},
|
|
4153
4153
|
"name": "CheckoutMain",
|
|
@@ -4160,7 +4160,7 @@
|
|
|
4160
4160
|
"__schema": "TypeRefSchema",
|
|
4161
4161
|
"location": {
|
|
4162
4162
|
"filePath": "merging.main.runtime.ts",
|
|
4163
|
-
"line":
|
|
4163
|
+
"line": 713,
|
|
4164
4164
|
"character": 5
|
|
4165
4165
|
},
|
|
4166
4166
|
"name": "InstallMain",
|
|
@@ -4173,7 +4173,7 @@
|
|
|
4173
4173
|
"__schema": "TypeRefSchema",
|
|
4174
4174
|
"location": {
|
|
4175
4175
|
"filePath": "merging.main.runtime.ts",
|
|
4176
|
-
"line":
|
|
4176
|
+
"line": 714,
|
|
4177
4177
|
"character": 5
|
|
4178
4178
|
},
|
|
4179
4179
|
"name": "LoggerMain",
|
|
@@ -4186,7 +4186,7 @@
|
|
|
4186
4186
|
"__schema": "TypeRefSchema",
|
|
4187
4187
|
"location": {
|
|
4188
4188
|
"filePath": "merging.main.runtime.ts",
|
|
4189
|
-
"line":
|
|
4189
|
+
"line": 715,
|
|
4190
4190
|
"character": 5
|
|
4191
4191
|
},
|
|
4192
4192
|
"name": "ComponentWriterMain",
|
|
@@ -4199,7 +4199,7 @@
|
|
|
4199
4199
|
"__schema": "TypeRefSchema",
|
|
4200
4200
|
"location": {
|
|
4201
4201
|
"filePath": "merging.main.runtime.ts",
|
|
4202
|
-
"line":
|
|
4202
|
+
"line": 716,
|
|
4203
4203
|
"character": 5
|
|
4204
4204
|
},
|
|
4205
4205
|
"name": "ImporterMain",
|
|
@@ -4212,7 +4212,7 @@
|
|
|
4212
4212
|
"__schema": "TypeRefSchema",
|
|
4213
4213
|
"location": {
|
|
4214
4214
|
"filePath": "merging.main.runtime.ts",
|
|
4215
|
-
"line":
|
|
4215
|
+
"line": 717,
|
|
4216
4216
|
"character": 5
|
|
4217
4217
|
},
|
|
4218
4218
|
"name": "ConfigMain",
|
|
@@ -4225,7 +4225,7 @@
|
|
|
4225
4225
|
"__schema": "TypeRefSchema",
|
|
4226
4226
|
"location": {
|
|
4227
4227
|
"filePath": "merging.main.runtime.ts",
|
|
4228
|
-
"line":
|
|
4228
|
+
"line": 718,
|
|
4229
4229
|
"character": 5
|
|
4230
4230
|
},
|
|
4231
4231
|
"name": "RemoveMain",
|
|
@@ -4238,7 +4238,7 @@
|
|
|
4238
4238
|
"__schema": "TypeRefSchema",
|
|
4239
4239
|
"location": {
|
|
4240
4240
|
"filePath": "merging.main.runtime.ts",
|
|
4241
|
-
"line":
|
|
4241
|
+
"line": 719,
|
|
4242
4242
|
"character": 5
|
|
4243
4243
|
},
|
|
4244
4244
|
"name": "GlobalConfigMain",
|
|
@@ -4251,7 +4251,7 @@
|
|
|
4251
4251
|
"__schema": "TypeRefSchema",
|
|
4252
4252
|
"location": {
|
|
4253
4253
|
"filePath": "merging.main.runtime.ts",
|
|
4254
|
-
"line":
|
|
4254
|
+
"line": 720,
|
|
4255
4255
|
"character": 5
|
|
4256
4256
|
},
|
|
4257
4257
|
"name": "ConfigMergerMain",
|
|
@@ -4264,7 +4264,7 @@
|
|
|
4264
4264
|
"__schema": "TypeRefSchema",
|
|
4265
4265
|
"location": {
|
|
4266
4266
|
"filePath": "merging.main.runtime.ts",
|
|
4267
|
-
"line":
|
|
4267
|
+
"line": 721,
|
|
4268
4268
|
"character": 5
|
|
4269
4269
|
},
|
|
4270
4270
|
"name": "DependencyResolverMain",
|
|
@@ -4283,7 +4283,7 @@
|
|
|
4283
4283
|
"__schema": "InferenceTypeSchema",
|
|
4284
4284
|
"location": {
|
|
4285
4285
|
"filePath": "merging.main.runtime.ts",
|
|
4286
|
-
"line":
|
|
4286
|
+
"line": 692,
|
|
4287
4287
|
"character": 3
|
|
4288
4288
|
},
|
|
4289
4289
|
"type": "Promise<MergingMain>"
|
|
@@ -4310,7 +4310,7 @@
|
|
|
4310
4310
|
"__schema": "TypeSchema",
|
|
4311
4311
|
"location": {
|
|
4312
4312
|
"filePath": "merging.main.runtime.ts",
|
|
4313
|
-
"line":
|
|
4313
|
+
"line": 62,
|
|
4314
4314
|
"character": 1
|
|
4315
4315
|
},
|
|
4316
4316
|
"signature": "type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null | undefined;\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n configMergeResult?: ConfigMergeResult | undefined;\n}",
|
|
@@ -4319,7 +4319,7 @@
|
|
|
4319
4319
|
"__schema": "TypeIntersectionSchema",
|
|
4320
4320
|
"location": {
|
|
4321
4321
|
"filePath": "merging.main.runtime.ts",
|
|
4322
|
-
"line":
|
|
4322
|
+
"line": 62,
|
|
4323
4323
|
"character": 36
|
|
4324
4324
|
},
|
|
4325
4325
|
"types": [
|
|
@@ -4327,7 +4327,7 @@
|
|
|
4327
4327
|
"__schema": "TypeRefSchema",
|
|
4328
4328
|
"location": {
|
|
4329
4329
|
"filePath": "merging.main.runtime.ts",
|
|
4330
|
-
"line":
|
|
4330
|
+
"line": 62,
|
|
4331
4331
|
"character": 36
|
|
4332
4332
|
},
|
|
4333
4333
|
"name": "ComponentStatusBase",
|
|
@@ -4340,7 +4340,7 @@
|
|
|
4340
4340
|
"__schema": "TypeLiteralSchema",
|
|
4341
4341
|
"location": {
|
|
4342
4342
|
"filePath": "merging.main.runtime.ts",
|
|
4343
|
-
"line":
|
|
4343
|
+
"line": 62,
|
|
4344
4344
|
"character": 58
|
|
4345
4345
|
},
|
|
4346
4346
|
"members": [
|
|
@@ -4348,7 +4348,7 @@
|
|
|
4348
4348
|
"__schema": "VariableLikeSchema",
|
|
4349
4349
|
"location": {
|
|
4350
4350
|
"filePath": "merging.main.runtime.ts",
|
|
4351
|
-
"line":
|
|
4351
|
+
"line": 63,
|
|
4352
4352
|
"character": 3
|
|
4353
4353
|
},
|
|
4354
4354
|
"signature": "(property) mergeResults?: MergeResultsThreeWay | null | undefined",
|
|
@@ -4357,7 +4357,7 @@
|
|
|
4357
4357
|
"__schema": "TypeUnionSchema",
|
|
4358
4358
|
"location": {
|
|
4359
4359
|
"filePath": "merging.main.runtime.ts",
|
|
4360
|
-
"line":
|
|
4360
|
+
"line": 63,
|
|
4361
4361
|
"character": 18
|
|
4362
4362
|
},
|
|
4363
4363
|
"types": [
|
|
@@ -4365,7 +4365,7 @@
|
|
|
4365
4365
|
"__schema": "TypeRefSchema",
|
|
4366
4366
|
"location": {
|
|
4367
4367
|
"filePath": "merging.main.runtime.ts",
|
|
4368
|
-
"line":
|
|
4368
|
+
"line": 63,
|
|
4369
4369
|
"character": 18
|
|
4370
4370
|
},
|
|
4371
4371
|
"name": "MergeResultsThreeWay"
|
|
@@ -4374,7 +4374,7 @@
|
|
|
4374
4374
|
"__schema": "LiteralTypeSchema",
|
|
4375
4375
|
"location": {
|
|
4376
4376
|
"filePath": "merging.main.runtime.ts",
|
|
4377
|
-
"line":
|
|
4377
|
+
"line": 63,
|
|
4378
4378
|
"character": 41
|
|
4379
4379
|
},
|
|
4380
4380
|
"name": "null"
|
|
@@ -4387,7 +4387,7 @@
|
|
|
4387
4387
|
"__schema": "VariableLikeSchema",
|
|
4388
4388
|
"location": {
|
|
4389
4389
|
"filePath": "merging.main.runtime.ts",
|
|
4390
|
-
"line":
|
|
4390
|
+
"line": 64,
|
|
4391
4391
|
"character": 3
|
|
4392
4392
|
},
|
|
4393
4393
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -4396,7 +4396,7 @@
|
|
|
4396
4396
|
"__schema": "TypeRefSchema",
|
|
4397
4397
|
"location": {
|
|
4398
4398
|
"filePath": "merging.main.runtime.ts",
|
|
4399
|
-
"line":
|
|
4399
|
+
"line": 64,
|
|
4400
4400
|
"character": 17
|
|
4401
4401
|
},
|
|
4402
4402
|
"name": "SnapsDistance",
|
|
@@ -4408,7 +4408,7 @@
|
|
|
4408
4408
|
"__schema": "VariableLikeSchema",
|
|
4409
4409
|
"location": {
|
|
4410
4410
|
"filePath": "merging.main.runtime.ts",
|
|
4411
|
-
"line":
|
|
4411
|
+
"line": 65,
|
|
4412
4412
|
"character": 3
|
|
4413
4413
|
},
|
|
4414
4414
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -4417,7 +4417,7 @@
|
|
|
4417
4417
|
"__schema": "TypeRefSchema",
|
|
4418
4418
|
"location": {
|
|
4419
4419
|
"filePath": "merging.main.runtime.ts",
|
|
4420
|
-
"line":
|
|
4420
|
+
"line": 65,
|
|
4421
4421
|
"character": 23
|
|
4422
4422
|
},
|
|
4423
4423
|
"name": "ResolveUnrelatedData",
|
|
@@ -4429,7 +4429,7 @@
|
|
|
4429
4429
|
"__schema": "VariableLikeSchema",
|
|
4430
4430
|
"location": {
|
|
4431
4431
|
"filePath": "merging.main.runtime.ts",
|
|
4432
|
-
"line":
|
|
4432
|
+
"line": 66,
|
|
4433
4433
|
"character": 3
|
|
4434
4434
|
},
|
|
4435
4435
|
"signature": "(property) configMergeResult?: ConfigMergeResult | undefined",
|
|
@@ -4438,7 +4438,7 @@
|
|
|
4438
4438
|
"__schema": "TypeRefSchema",
|
|
4439
4439
|
"location": {
|
|
4440
4440
|
"filePath": "merging.main.runtime.ts",
|
|
4441
|
-
"line":
|
|
4441
|
+
"line": 66,
|
|
4442
4442
|
"character": 23
|
|
4443
4443
|
},
|
|
4444
4444
|
"name": "ConfigMergeResult",
|
|
@@ -4467,7 +4467,7 @@
|
|
|
4467
4467
|
"__schema": "TypeSchema",
|
|
4468
4468
|
"location": {
|
|
4469
4469
|
"filePath": "merging.main.runtime.ts",
|
|
4470
|
-
"line":
|
|
4470
|
+
"line": 93,
|
|
4471
4471
|
"character": 1
|
|
4472
4472
|
},
|
|
4473
4473
|
"signature": "type ApplyVersionResults = {\n components?: ApplyVersionResult[] | undefined;\n version?: string | undefined;\n failedComponents?: FailedComponents[] | undefined;\n removedComponents?: ComponentID[] | undefined;\n ... 11 more ...;\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined;\n}",
|
|
@@ -4476,7 +4476,7 @@
|
|
|
4476
4476
|
"__schema": "TypeLiteralSchema",
|
|
4477
4477
|
"location": {
|
|
4478
4478
|
"filePath": "merging.main.runtime.ts",
|
|
4479
|
-
"line":
|
|
4479
|
+
"line": 93,
|
|
4480
4480
|
"character": 35
|
|
4481
4481
|
},
|
|
4482
4482
|
"members": [
|
|
@@ -4484,7 +4484,7 @@
|
|
|
4484
4484
|
"__schema": "VariableLikeSchema",
|
|
4485
4485
|
"location": {
|
|
4486
4486
|
"filePath": "merging.main.runtime.ts",
|
|
4487
|
-
"line":
|
|
4487
|
+
"line": 94,
|
|
4488
4488
|
"character": 3
|
|
4489
4489
|
},
|
|
4490
4490
|
"signature": "(property) components?: ApplyVersionResult[] | undefined",
|
|
@@ -4493,14 +4493,14 @@
|
|
|
4493
4493
|
"__schema": "TypeArraySchema",
|
|
4494
4494
|
"location": {
|
|
4495
4495
|
"filePath": "merging.main.runtime.ts",
|
|
4496
|
-
"line":
|
|
4496
|
+
"line": 94,
|
|
4497
4497
|
"character": 16
|
|
4498
4498
|
},
|
|
4499
4499
|
"type": {
|
|
4500
4500
|
"__schema": "TypeRefSchema",
|
|
4501
4501
|
"location": {
|
|
4502
4502
|
"filePath": "merging.main.runtime.ts",
|
|
4503
|
-
"line":
|
|
4503
|
+
"line": 94,
|
|
4504
4504
|
"character": 16
|
|
4505
4505
|
},
|
|
4506
4506
|
"name": "ApplyVersionResult"
|
|
@@ -4512,7 +4512,7 @@
|
|
|
4512
4512
|
"__schema": "VariableLikeSchema",
|
|
4513
4513
|
"location": {
|
|
4514
4514
|
"filePath": "merging.main.runtime.ts",
|
|
4515
|
-
"line":
|
|
4515
|
+
"line": 95,
|
|
4516
4516
|
"character": 3
|
|
4517
4517
|
},
|
|
4518
4518
|
"signature": "(property) version?: string | undefined",
|
|
@@ -4521,7 +4521,7 @@
|
|
|
4521
4521
|
"__schema": "KeywordTypeSchema",
|
|
4522
4522
|
"location": {
|
|
4523
4523
|
"filePath": "merging.main.runtime.ts",
|
|
4524
|
-
"line":
|
|
4524
|
+
"line": 95,
|
|
4525
4525
|
"character": 13
|
|
4526
4526
|
},
|
|
4527
4527
|
"name": "string"
|
|
@@ -4532,7 +4532,7 @@
|
|
|
4532
4532
|
"__schema": "VariableLikeSchema",
|
|
4533
4533
|
"location": {
|
|
4534
4534
|
"filePath": "merging.main.runtime.ts",
|
|
4535
|
-
"line":
|
|
4535
|
+
"line": 96,
|
|
4536
4536
|
"character": 3
|
|
4537
4537
|
},
|
|
4538
4538
|
"signature": "(property) failedComponents?: FailedComponents[] | undefined",
|
|
@@ -4541,14 +4541,14 @@
|
|
|
4541
4541
|
"__schema": "TypeArraySchema",
|
|
4542
4542
|
"location": {
|
|
4543
4543
|
"filePath": "merging.main.runtime.ts",
|
|
4544
|
-
"line":
|
|
4544
|
+
"line": 96,
|
|
4545
4545
|
"character": 22
|
|
4546
4546
|
},
|
|
4547
4547
|
"type": {
|
|
4548
4548
|
"__schema": "TypeRefSchema",
|
|
4549
4549
|
"location": {
|
|
4550
4550
|
"filePath": "merging.main.runtime.ts",
|
|
4551
|
-
"line":
|
|
4551
|
+
"line": 96,
|
|
4552
4552
|
"character": 22
|
|
4553
4553
|
},
|
|
4554
4554
|
"name": "FailedComponents"
|
|
@@ -4560,7 +4560,7 @@
|
|
|
4560
4560
|
"__schema": "VariableLikeSchema",
|
|
4561
4561
|
"location": {
|
|
4562
4562
|
"filePath": "merging.main.runtime.ts",
|
|
4563
|
-
"line":
|
|
4563
|
+
"line": 97,
|
|
4564
4564
|
"character": 3
|
|
4565
4565
|
},
|
|
4566
4566
|
"signature": "(property) removedComponents?: ComponentID[] | undefined",
|
|
@@ -4569,14 +4569,14 @@
|
|
|
4569
4569
|
"__schema": "TypeArraySchema",
|
|
4570
4570
|
"location": {
|
|
4571
4571
|
"filePath": "merging.main.runtime.ts",
|
|
4572
|
-
"line":
|
|
4572
|
+
"line": 97,
|
|
4573
4573
|
"character": 23
|
|
4574
4574
|
},
|
|
4575
4575
|
"type": {
|
|
4576
4576
|
"__schema": "TypeRefSchema",
|
|
4577
4577
|
"location": {
|
|
4578
4578
|
"filePath": "merging.main.runtime.ts",
|
|
4579
|
-
"line":
|
|
4579
|
+
"line": 97,
|
|
4580
4580
|
"character": 23
|
|
4581
4581
|
},
|
|
4582
4582
|
"name": "ComponentID",
|
|
@@ -4593,7 +4593,7 @@
|
|
|
4593
4593
|
"__schema": "VariableLikeSchema",
|
|
4594
4594
|
"location": {
|
|
4595
4595
|
"filePath": "merging.main.runtime.ts",
|
|
4596
|
-
"line":
|
|
4596
|
+
"line": 98,
|
|
4597
4597
|
"character": 3
|
|
4598
4598
|
},
|
|
4599
4599
|
"signature": "(property) addedComponents?: ComponentID[] | undefined",
|
|
@@ -4602,14 +4602,14 @@
|
|
|
4602
4602
|
"__schema": "TypeArraySchema",
|
|
4603
4603
|
"location": {
|
|
4604
4604
|
"filePath": "merging.main.runtime.ts",
|
|
4605
|
-
"line":
|
|
4605
|
+
"line": 98,
|
|
4606
4606
|
"character": 21
|
|
4607
4607
|
},
|
|
4608
4608
|
"type": {
|
|
4609
4609
|
"__schema": "TypeRefSchema",
|
|
4610
4610
|
"location": {
|
|
4611
4611
|
"filePath": "merging.main.runtime.ts",
|
|
4612
|
-
"line":
|
|
4612
|
+
"line": 98,
|
|
4613
4613
|
"character": 21
|
|
4614
4614
|
},
|
|
4615
4615
|
"name": "ComponentID",
|
|
@@ -4626,7 +4626,7 @@
|
|
|
4626
4626
|
"__schema": "VariableLikeSchema",
|
|
4627
4627
|
"location": {
|
|
4628
4628
|
"filePath": "merging.main.runtime.ts",
|
|
4629
|
-
"line":
|
|
4629
|
+
"line": 99,
|
|
4630
4630
|
"character": 3
|
|
4631
4631
|
},
|
|
4632
4632
|
"signature": "(property) resolvedComponents?: ConsumerComponent[] | undefined",
|
|
@@ -4635,14 +4635,14 @@
|
|
|
4635
4635
|
"__schema": "TypeArraySchema",
|
|
4636
4636
|
"location": {
|
|
4637
4637
|
"filePath": "merging.main.runtime.ts",
|
|
4638
|
-
"line":
|
|
4638
|
+
"line": 99,
|
|
4639
4639
|
"character": 24
|
|
4640
4640
|
},
|
|
4641
4641
|
"type": {
|
|
4642
4642
|
"__schema": "TypeRefSchema",
|
|
4643
4643
|
"location": {
|
|
4644
4644
|
"filePath": "merging.main.runtime.ts",
|
|
4645
|
-
"line":
|
|
4645
|
+
"line": 99,
|
|
4646
4646
|
"character": 24
|
|
4647
4647
|
},
|
|
4648
4648
|
"name": "ConsumerComponent",
|
|
@@ -4655,7 +4655,7 @@
|
|
|
4655
4655
|
"__schema": "VariableLikeSchema",
|
|
4656
4656
|
"location": {
|
|
4657
4657
|
"filePath": "merging.main.runtime.ts",
|
|
4658
|
-
"line":
|
|
4658
|
+
"line": 100,
|
|
4659
4659
|
"character": 3
|
|
4660
4660
|
},
|
|
4661
4661
|
"signature": "(property) abortedComponents?: ApplyVersionResult[] | undefined",
|
|
@@ -4664,14 +4664,14 @@
|
|
|
4664
4664
|
"__schema": "TypeArraySchema",
|
|
4665
4665
|
"location": {
|
|
4666
4666
|
"filePath": "merging.main.runtime.ts",
|
|
4667
|
-
"line":
|
|
4667
|
+
"line": 100,
|
|
4668
4668
|
"character": 23
|
|
4669
4669
|
},
|
|
4670
4670
|
"type": {
|
|
4671
4671
|
"__schema": "TypeRefSchema",
|
|
4672
4672
|
"location": {
|
|
4673
4673
|
"filePath": "merging.main.runtime.ts",
|
|
4674
|
-
"line":
|
|
4674
|
+
"line": 100,
|
|
4675
4675
|
"character": 23
|
|
4676
4676
|
},
|
|
4677
4677
|
"name": "ApplyVersionResult"
|
|
@@ -4683,7 +4683,7 @@
|
|
|
4683
4683
|
"__schema": "VariableLikeSchema",
|
|
4684
4684
|
"location": {
|
|
4685
4685
|
"filePath": "merging.main.runtime.ts",
|
|
4686
|
-
"line":
|
|
4686
|
+
"line": 101,
|
|
4687
4687
|
"character": 3
|
|
4688
4688
|
},
|
|
4689
4689
|
"signature": "(property) mergeSnapResults?: MergeSnapResults | undefined",
|
|
@@ -4692,7 +4692,7 @@
|
|
|
4692
4692
|
"__schema": "TypeRefSchema",
|
|
4693
4693
|
"location": {
|
|
4694
4694
|
"filePath": "merging.main.runtime.ts",
|
|
4695
|
-
"line":
|
|
4695
|
+
"line": 101,
|
|
4696
4696
|
"character": 22
|
|
4697
4697
|
},
|
|
4698
4698
|
"name": "MergeSnapResults",
|
|
@@ -4704,7 +4704,7 @@
|
|
|
4704
4704
|
"__schema": "VariableLikeSchema",
|
|
4705
4705
|
"location": {
|
|
4706
4706
|
"filePath": "merging.main.runtime.ts",
|
|
4707
|
-
"line":
|
|
4707
|
+
"line": 102,
|
|
4708
4708
|
"character": 3
|
|
4709
4709
|
},
|
|
4710
4710
|
"signature": "(property) mergeSnapError?: Error | undefined",
|
|
@@ -4713,7 +4713,7 @@
|
|
|
4713
4713
|
"__schema": "TypeRefSchema",
|
|
4714
4714
|
"location": {
|
|
4715
4715
|
"filePath": "merging.main.runtime.ts",
|
|
4716
|
-
"line":
|
|
4716
|
+
"line": 102,
|
|
4717
4717
|
"character": 20
|
|
4718
4718
|
},
|
|
4719
4719
|
"name": "Error"
|
|
@@ -4724,7 +4724,7 @@
|
|
|
4724
4724
|
"__schema": "VariableLikeSchema",
|
|
4725
4725
|
"location": {
|
|
4726
4726
|
"filePath": "merging.main.runtime.ts",
|
|
4727
|
-
"line":
|
|
4727
|
+
"line": 103,
|
|
4728
4728
|
"character": 3
|
|
4729
4729
|
},
|
|
4730
4730
|
"signature": "(property) leftUnresolvedConflicts?: boolean | undefined",
|
|
@@ -4733,7 +4733,7 @@
|
|
|
4733
4733
|
"__schema": "KeywordTypeSchema",
|
|
4734
4734
|
"location": {
|
|
4735
4735
|
"filePath": "merging.main.runtime.ts",
|
|
4736
|
-
"line":
|
|
4736
|
+
"line": 103,
|
|
4737
4737
|
"character": 29
|
|
4738
4738
|
},
|
|
4739
4739
|
"name": "boolean"
|
|
@@ -4744,7 +4744,7 @@
|
|
|
4744
4744
|
"__schema": "VariableLikeSchema",
|
|
4745
4745
|
"location": {
|
|
4746
4746
|
"filePath": "merging.main.runtime.ts",
|
|
4747
|
-
"line":
|
|
4747
|
+
"line": 104,
|
|
4748
4748
|
"character": 3
|
|
4749
4749
|
},
|
|
4750
4750
|
"signature": "(property) verbose?: boolean | undefined",
|
|
@@ -4753,7 +4753,7 @@
|
|
|
4753
4753
|
"__schema": "KeywordTypeSchema",
|
|
4754
4754
|
"location": {
|
|
4755
4755
|
"filePath": "merging.main.runtime.ts",
|
|
4756
|
-
"line":
|
|
4756
|
+
"line": 104,
|
|
4757
4757
|
"character": 13
|
|
4758
4758
|
},
|
|
4759
4759
|
"name": "boolean"
|
|
@@ -4764,7 +4764,7 @@
|
|
|
4764
4764
|
"__schema": "VariableLikeSchema",
|
|
4765
4765
|
"location": {
|
|
4766
4766
|
"filePath": "merging.main.runtime.ts",
|
|
4767
|
-
"line":
|
|
4767
|
+
"line": 105,
|
|
4768
4768
|
"character": 3
|
|
4769
4769
|
},
|
|
4770
4770
|
"signature": "(property) newFromLane?: string[] | undefined",
|
|
@@ -4773,14 +4773,14 @@
|
|
|
4773
4773
|
"__schema": "TypeArraySchema",
|
|
4774
4774
|
"location": {
|
|
4775
4775
|
"filePath": "merging.main.runtime.ts",
|
|
4776
|
-
"line":
|
|
4776
|
+
"line": 105,
|
|
4777
4777
|
"character": 17
|
|
4778
4778
|
},
|
|
4779
4779
|
"type": {
|
|
4780
4780
|
"__schema": "KeywordTypeSchema",
|
|
4781
4781
|
"location": {
|
|
4782
4782
|
"filePath": "merging.main.runtime.ts",
|
|
4783
|
-
"line":
|
|
4783
|
+
"line": 105,
|
|
4784
4784
|
"character": 17
|
|
4785
4785
|
},
|
|
4786
4786
|
"name": "string"
|
|
@@ -4792,7 +4792,7 @@
|
|
|
4792
4792
|
"__schema": "VariableLikeSchema",
|
|
4793
4793
|
"location": {
|
|
4794
4794
|
"filePath": "merging.main.runtime.ts",
|
|
4795
|
-
"line":
|
|
4795
|
+
"line": 106,
|
|
4796
4796
|
"character": 3
|
|
4797
4797
|
},
|
|
4798
4798
|
"signature": "(property) newFromLaneAdded?: boolean | undefined",
|
|
@@ -4801,7 +4801,7 @@
|
|
|
4801
4801
|
"__schema": "KeywordTypeSchema",
|
|
4802
4802
|
"location": {
|
|
4803
4803
|
"filePath": "merging.main.runtime.ts",
|
|
4804
|
-
"line":
|
|
4804
|
+
"line": 106,
|
|
4805
4805
|
"character": 22
|
|
4806
4806
|
},
|
|
4807
4807
|
"name": "boolean"
|
|
@@ -4812,7 +4812,7 @@
|
|
|
4812
4812
|
"__schema": "VariableLikeSchema",
|
|
4813
4813
|
"location": {
|
|
4814
4814
|
"filePath": "merging.main.runtime.ts",
|
|
4815
|
-
"line":
|
|
4815
|
+
"line": 107,
|
|
4816
4816
|
"character": 3
|
|
4817
4817
|
},
|
|
4818
4818
|
"signature": "(property) installationError?: Error | undefined",
|
|
@@ -4821,7 +4821,7 @@
|
|
|
4821
4821
|
"__schema": "TypeRefSchema",
|
|
4822
4822
|
"location": {
|
|
4823
4823
|
"filePath": "merging.main.runtime.ts",
|
|
4824
|
-
"line":
|
|
4824
|
+
"line": 107,
|
|
4825
4825
|
"character": 23
|
|
4826
4826
|
},
|
|
4827
4827
|
"name": "Error"
|
|
@@ -4832,7 +4832,7 @@
|
|
|
4832
4832
|
"__schema": "VariableLikeSchema",
|
|
4833
4833
|
"location": {
|
|
4834
4834
|
"filePath": "merging.main.runtime.ts",
|
|
4835
|
-
"line":
|
|
4835
|
+
"line": 108,
|
|
4836
4836
|
"character": 3
|
|
4837
4837
|
},
|
|
4838
4838
|
"signature": "(property) compilationError?: Error | undefined",
|
|
@@ -4841,7 +4841,7 @@
|
|
|
4841
4841
|
"__schema": "TypeRefSchema",
|
|
4842
4842
|
"location": {
|
|
4843
4843
|
"filePath": "merging.main.runtime.ts",
|
|
4844
|
-
"line":
|
|
4844
|
+
"line": 108,
|
|
4845
4845
|
"character": 22
|
|
4846
4846
|
},
|
|
4847
4847
|
"name": "Error"
|
|
@@ -4852,7 +4852,7 @@
|
|
|
4852
4852
|
"__schema": "VariableLikeSchema",
|
|
4853
4853
|
"location": {
|
|
4854
4854
|
"filePath": "merging.main.runtime.ts",
|
|
4855
|
-
"line":
|
|
4855
|
+
"line": 109,
|
|
4856
4856
|
"character": 3
|
|
4857
4857
|
},
|
|
4858
4858
|
"signature": "(property) workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined",
|
|
@@ -4861,7 +4861,7 @@
|
|
|
4861
4861
|
"__schema": "TypeRefSchema",
|
|
4862
4862
|
"location": {
|
|
4863
4863
|
"filePath": "merging.main.runtime.ts",
|
|
4864
|
-
"line":
|
|
4864
|
+
"line": 109,
|
|
4865
4865
|
"character": 33
|
|
4866
4866
|
},
|
|
4867
4867
|
"name": "WorkspaceConfigUpdateResult",
|
|
@@ -4888,7 +4888,7 @@
|
|
|
4888
4888
|
"__schema": "TypeSchema",
|
|
4889
4889
|
"location": {
|
|
4890
4890
|
"filePath": "merging.main.runtime.ts",
|
|
4891
|
-
"line":
|
|
4891
|
+
"line": 91,
|
|
4892
4892
|
"character": 1
|
|
4893
4893
|
},
|
|
4894
4894
|
"signature": "type ApplyVersionResult = {\n id: ComponentID;\n filesStatus: FilesStatus;\n}",
|
|
@@ -4897,7 +4897,7 @@
|
|
|
4897
4897
|
"__schema": "TypeLiteralSchema",
|
|
4898
4898
|
"location": {
|
|
4899
4899
|
"filePath": "merging.main.runtime.ts",
|
|
4900
|
-
"line":
|
|
4900
|
+
"line": 91,
|
|
4901
4901
|
"character": 34
|
|
4902
4902
|
},
|
|
4903
4903
|
"members": [
|
|
@@ -4905,7 +4905,7 @@
|
|
|
4905
4905
|
"__schema": "VariableLikeSchema",
|
|
4906
4906
|
"location": {
|
|
4907
4907
|
"filePath": "merging.main.runtime.ts",
|
|
4908
|
-
"line":
|
|
4908
|
+
"line": 91,
|
|
4909
4909
|
"character": 36
|
|
4910
4910
|
},
|
|
4911
4911
|
"signature": "(property) id: ComponentID",
|
|
@@ -4914,7 +4914,7 @@
|
|
|
4914
4914
|
"__schema": "TypeRefSchema",
|
|
4915
4915
|
"location": {
|
|
4916
4916
|
"filePath": "merging.main.runtime.ts",
|
|
4917
|
-
"line":
|
|
4917
|
+
"line": 91,
|
|
4918
4918
|
"character": 36
|
|
4919
4919
|
},
|
|
4920
4920
|
"name": "ComponentID",
|
|
@@ -4930,7 +4930,7 @@
|
|
|
4930
4930
|
"__schema": "VariableLikeSchema",
|
|
4931
4931
|
"location": {
|
|
4932
4932
|
"filePath": "merging.main.runtime.ts",
|
|
4933
|
-
"line":
|
|
4933
|
+
"line": 91,
|
|
4934
4934
|
"character": 53
|
|
4935
4935
|
},
|
|
4936
4936
|
"signature": "(property) filesStatus: FilesStatus",
|
|
@@ -4939,7 +4939,7 @@
|
|
|
4939
4939
|
"__schema": "TypeRefSchema",
|
|
4940
4940
|
"location": {
|
|
4941
4941
|
"filePath": "merging.main.runtime.ts",
|
|
4942
|
-
"line":
|
|
4942
|
+
"line": 91,
|
|
4943
4943
|
"character": 53
|
|
4944
4944
|
},
|
|
4945
4945
|
"name": "FilesStatus"
|
|
@@ -4962,7 +4962,7 @@
|
|
|
4962
4962
|
"__schema": "TypeSchema",
|
|
4963
4963
|
"location": {
|
|
4964
4964
|
"filePath": "merging.main.runtime.ts",
|
|
4965
|
-
"line":
|
|
4965
|
+
"line": 82,
|
|
4966
4966
|
"character": 1
|
|
4967
4967
|
},
|
|
4968
4968
|
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
@@ -4971,7 +4971,7 @@
|
|
|
4971
4971
|
"__schema": "TypeLiteralSchema",
|
|
4972
4972
|
"location": {
|
|
4973
4973
|
"filePath": "merging.main.runtime.ts",
|
|
4974
|
-
"line":
|
|
4974
|
+
"line": 82,
|
|
4975
4975
|
"character": 27
|
|
4976
4976
|
},
|
|
4977
4977
|
"members": [
|
|
@@ -4979,14 +4979,14 @@
|
|
|
4979
4979
|
"__schema": "IndexSignatureSchema",
|
|
4980
4980
|
"location": {
|
|
4981
4981
|
"filePath": "merging.main.runtime.ts",
|
|
4982
|
-
"line":
|
|
4982
|
+
"line": 82,
|
|
4983
4983
|
"character": 29
|
|
4984
4984
|
},
|
|
4985
4985
|
"keyType": {
|
|
4986
4986
|
"__schema": "ParameterSchema",
|
|
4987
4987
|
"location": {
|
|
4988
4988
|
"filePath": "merging.main.runtime.ts",
|
|
4989
|
-
"line":
|
|
4989
|
+
"line": 82,
|
|
4990
4990
|
"character": 30
|
|
4991
4991
|
},
|
|
4992
4992
|
"name": "fileName",
|
|
@@ -4994,7 +4994,7 @@
|
|
|
4994
4994
|
"__schema": "KeywordTypeSchema",
|
|
4995
4995
|
"location": {
|
|
4996
4996
|
"filePath": "merging.main.runtime.ts",
|
|
4997
|
-
"line":
|
|
4997
|
+
"line": 82,
|
|
4998
4998
|
"character": 40
|
|
4999
4999
|
},
|
|
5000
5000
|
"name": "string"
|
|
@@ -5006,7 +5006,7 @@
|
|
|
5006
5006
|
"__schema": "TypeOperatorSchema",
|
|
5007
5007
|
"location": {
|
|
5008
5008
|
"filePath": "merging.main.runtime.ts",
|
|
5009
|
-
"line":
|
|
5009
|
+
"line": 82,
|
|
5010
5010
|
"character": 49
|
|
5011
5011
|
},
|
|
5012
5012
|
"name": "keyof",
|
|
@@ -5014,7 +5014,7 @@
|
|
|
5014
5014
|
"__schema": "TypeQuerySchema",
|
|
5015
5015
|
"location": {
|
|
5016
5016
|
"filePath": "merging.main.runtime.ts",
|
|
5017
|
-
"line":
|
|
5017
|
+
"line": 82,
|
|
5018
5018
|
"character": 55
|
|
5019
5019
|
},
|
|
5020
5020
|
"signature": "(alias) const FileStatus: {\n merged: string;\n manual: string;\n binaryConflict: string;\n updated: string;\n added: string;\n removed: string;\n overridden: string;\n unchanged: string;\n remainDeleted: string;\n deletedConflict: string;\n}\nimport FileStatus",
|
|
@@ -5022,7 +5022,7 @@
|
|
|
5022
5022
|
"__schema": "TypeRefSchema",
|
|
5023
5023
|
"location": {
|
|
5024
5024
|
"filePath": "merging.main.runtime.ts",
|
|
5025
|
-
"line":
|
|
5025
|
+
"line": 82,
|
|
5026
5026
|
"character": 62
|
|
5027
5027
|
},
|
|
5028
5028
|
"name": "FileStatus"
|
|
@@ -5046,7 +5046,7 @@
|
|
|
5046
5046
|
"__schema": "TypeSchema",
|
|
5047
5047
|
"location": {
|
|
5048
5048
|
"filePath": "merging.main.runtime.ts",
|
|
5049
|
-
"line":
|
|
5049
|
+
"line": 79,
|
|
5050
5050
|
"character": 1
|
|
5051
5051
|
},
|
|
5052
5052
|
"signature": "type FailedComponents = {\n id: ComponentID;\n unchangedMessage: string;\n unchangedLegitimately?: boolean | undefined;\n}",
|
|
@@ -5055,7 +5055,7 @@
|
|
|
5055
5055
|
"__schema": "TypeLiteralSchema",
|
|
5056
5056
|
"location": {
|
|
5057
5057
|
"filePath": "merging.main.runtime.ts",
|
|
5058
|
-
"line":
|
|
5058
|
+
"line": 79,
|
|
5059
5059
|
"character": 32
|
|
5060
5060
|
},
|
|
5061
5061
|
"members": [
|
|
@@ -5063,7 +5063,7 @@
|
|
|
5063
5063
|
"__schema": "VariableLikeSchema",
|
|
5064
5064
|
"location": {
|
|
5065
5065
|
"filePath": "merging.main.runtime.ts",
|
|
5066
|
-
"line":
|
|
5066
|
+
"line": 79,
|
|
5067
5067
|
"character": 34
|
|
5068
5068
|
},
|
|
5069
5069
|
"signature": "(property) id: ComponentID",
|
|
@@ -5072,7 +5072,7 @@
|
|
|
5072
5072
|
"__schema": "TypeRefSchema",
|
|
5073
5073
|
"location": {
|
|
5074
5074
|
"filePath": "merging.main.runtime.ts",
|
|
5075
|
-
"line":
|
|
5075
|
+
"line": 79,
|
|
5076
5076
|
"character": 34
|
|
5077
5077
|
},
|
|
5078
5078
|
"name": "ComponentID",
|
|
@@ -5088,7 +5088,7 @@
|
|
|
5088
5088
|
"__schema": "VariableLikeSchema",
|
|
5089
5089
|
"location": {
|
|
5090
5090
|
"filePath": "merging.main.runtime.ts",
|
|
5091
|
-
"line":
|
|
5091
|
+
"line": 79,
|
|
5092
5092
|
"character": 51
|
|
5093
5093
|
},
|
|
5094
5094
|
"signature": "(property) unchangedMessage: string",
|
|
@@ -5097,7 +5097,7 @@
|
|
|
5097
5097
|
"__schema": "KeywordTypeSchema",
|
|
5098
5098
|
"location": {
|
|
5099
5099
|
"filePath": "merging.main.runtime.ts",
|
|
5100
|
-
"line":
|
|
5100
|
+
"line": 79,
|
|
5101
5101
|
"character": 69
|
|
5102
5102
|
},
|
|
5103
5103
|
"name": "string"
|
|
@@ -5108,7 +5108,7 @@
|
|
|
5108
5108
|
"__schema": "VariableLikeSchema",
|
|
5109
5109
|
"location": {
|
|
5110
5110
|
"filePath": "merging.main.runtime.ts",
|
|
5111
|
-
"line":
|
|
5111
|
+
"line": 79,
|
|
5112
5112
|
"character": 77
|
|
5113
5113
|
},
|
|
5114
5114
|
"signature": "(property) unchangedLegitimately?: boolean | undefined",
|
|
@@ -5117,7 +5117,7 @@
|
|
|
5117
5117
|
"__schema": "KeywordTypeSchema",
|
|
5118
5118
|
"location": {
|
|
5119
5119
|
"filePath": "merging.main.runtime.ts",
|
|
5120
|
-
"line":
|
|
5120
|
+
"line": 79,
|
|
5121
5121
|
"character": 101
|
|
5122
5122
|
},
|
|
5123
5123
|
"name": "boolean"
|
|
@@ -5995,7 +5995,7 @@
|
|
|
5995
5995
|
"_legacy": {
|
|
5996
5996
|
"scope": "teambit.component",
|
|
5997
5997
|
"name": "merging",
|
|
5998
|
-
"version": "1.0.
|
|
5998
|
+
"version": "1.0.322"
|
|
5999
5999
|
},
|
|
6000
6000
|
"_scope": "teambit.component"
|
|
6001
6001
|
}
|
|
@@ -8449,7 +8449,7 @@
|
|
|
8449
8449
|
"__schema": "TypeSchema",
|
|
8450
8450
|
"location": {
|
|
8451
8451
|
"filePath": "merging.main.runtime.ts",
|
|
8452
|
-
"line":
|
|
8452
|
+
"line": 62,
|
|
8453
8453
|
"character": 1
|
|
8454
8454
|
},
|
|
8455
8455
|
"signature": "type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null | undefined;\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n configMergeResult?: ConfigMergeResult | undefined;\n}",
|
|
@@ -8458,7 +8458,7 @@
|
|
|
8458
8458
|
"__schema": "TypeIntersectionSchema",
|
|
8459
8459
|
"location": {
|
|
8460
8460
|
"filePath": "merging.main.runtime.ts",
|
|
8461
|
-
"line":
|
|
8461
|
+
"line": 62,
|
|
8462
8462
|
"character": 36
|
|
8463
8463
|
},
|
|
8464
8464
|
"types": [
|
|
@@ -8466,7 +8466,7 @@
|
|
|
8466
8466
|
"__schema": "TypeRefSchema",
|
|
8467
8467
|
"location": {
|
|
8468
8468
|
"filePath": "merging.main.runtime.ts",
|
|
8469
|
-
"line":
|
|
8469
|
+
"line": 62,
|
|
8470
8470
|
"character": 36
|
|
8471
8471
|
},
|
|
8472
8472
|
"name": "ComponentStatusBase",
|
|
@@ -8479,7 +8479,7 @@
|
|
|
8479
8479
|
"__schema": "TypeLiteralSchema",
|
|
8480
8480
|
"location": {
|
|
8481
8481
|
"filePath": "merging.main.runtime.ts",
|
|
8482
|
-
"line":
|
|
8482
|
+
"line": 62,
|
|
8483
8483
|
"character": 58
|
|
8484
8484
|
},
|
|
8485
8485
|
"members": [
|
|
@@ -8487,7 +8487,7 @@
|
|
|
8487
8487
|
"__schema": "VariableLikeSchema",
|
|
8488
8488
|
"location": {
|
|
8489
8489
|
"filePath": "merging.main.runtime.ts",
|
|
8490
|
-
"line":
|
|
8490
|
+
"line": 63,
|
|
8491
8491
|
"character": 3
|
|
8492
8492
|
},
|
|
8493
8493
|
"signature": "(property) mergeResults?: MergeResultsThreeWay | null | undefined",
|
|
@@ -8496,7 +8496,7 @@
|
|
|
8496
8496
|
"__schema": "TypeUnionSchema",
|
|
8497
8497
|
"location": {
|
|
8498
8498
|
"filePath": "merging.main.runtime.ts",
|
|
8499
|
-
"line":
|
|
8499
|
+
"line": 63,
|
|
8500
8500
|
"character": 18
|
|
8501
8501
|
},
|
|
8502
8502
|
"types": [
|
|
@@ -8504,7 +8504,7 @@
|
|
|
8504
8504
|
"__schema": "TypeRefSchema",
|
|
8505
8505
|
"location": {
|
|
8506
8506
|
"filePath": "merging.main.runtime.ts",
|
|
8507
|
-
"line":
|
|
8507
|
+
"line": 63,
|
|
8508
8508
|
"character": 18
|
|
8509
8509
|
},
|
|
8510
8510
|
"name": "MergeResultsThreeWay"
|
|
@@ -8513,7 +8513,7 @@
|
|
|
8513
8513
|
"__schema": "LiteralTypeSchema",
|
|
8514
8514
|
"location": {
|
|
8515
8515
|
"filePath": "merging.main.runtime.ts",
|
|
8516
|
-
"line":
|
|
8516
|
+
"line": 63,
|
|
8517
8517
|
"character": 41
|
|
8518
8518
|
},
|
|
8519
8519
|
"name": "null"
|
|
@@ -8526,7 +8526,7 @@
|
|
|
8526
8526
|
"__schema": "VariableLikeSchema",
|
|
8527
8527
|
"location": {
|
|
8528
8528
|
"filePath": "merging.main.runtime.ts",
|
|
8529
|
-
"line":
|
|
8529
|
+
"line": 64,
|
|
8530
8530
|
"character": 3
|
|
8531
8531
|
},
|
|
8532
8532
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -8535,7 +8535,7 @@
|
|
|
8535
8535
|
"__schema": "TypeRefSchema",
|
|
8536
8536
|
"location": {
|
|
8537
8537
|
"filePath": "merging.main.runtime.ts",
|
|
8538
|
-
"line":
|
|
8538
|
+
"line": 64,
|
|
8539
8539
|
"character": 17
|
|
8540
8540
|
},
|
|
8541
8541
|
"name": "SnapsDistance",
|
|
@@ -8547,7 +8547,7 @@
|
|
|
8547
8547
|
"__schema": "VariableLikeSchema",
|
|
8548
8548
|
"location": {
|
|
8549
8549
|
"filePath": "merging.main.runtime.ts",
|
|
8550
|
-
"line":
|
|
8550
|
+
"line": 65,
|
|
8551
8551
|
"character": 3
|
|
8552
8552
|
},
|
|
8553
8553
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -8556,7 +8556,7 @@
|
|
|
8556
8556
|
"__schema": "TypeRefSchema",
|
|
8557
8557
|
"location": {
|
|
8558
8558
|
"filePath": "merging.main.runtime.ts",
|
|
8559
|
-
"line":
|
|
8559
|
+
"line": 65,
|
|
8560
8560
|
"character": 23
|
|
8561
8561
|
},
|
|
8562
8562
|
"name": "ResolveUnrelatedData",
|
|
@@ -8568,7 +8568,7 @@
|
|
|
8568
8568
|
"__schema": "VariableLikeSchema",
|
|
8569
8569
|
"location": {
|
|
8570
8570
|
"filePath": "merging.main.runtime.ts",
|
|
8571
|
-
"line":
|
|
8571
|
+
"line": 66,
|
|
8572
8572
|
"character": 3
|
|
8573
8573
|
},
|
|
8574
8574
|
"signature": "(property) configMergeResult?: ConfigMergeResult | undefined",
|
|
@@ -8577,7 +8577,7 @@
|
|
|
8577
8577
|
"__schema": "TypeRefSchema",
|
|
8578
8578
|
"location": {
|
|
8579
8579
|
"filePath": "merging.main.runtime.ts",
|
|
8580
|
-
"line":
|
|
8580
|
+
"line": 66,
|
|
8581
8581
|
"character": 23
|
|
8582
8582
|
},
|
|
8583
8583
|
"name": "ConfigMergeResult",
|
|
@@ -8597,7 +8597,7 @@
|
|
|
8597
8597
|
"__schema": "TypeSchema",
|
|
8598
8598
|
"location": {
|
|
8599
8599
|
"filePath": "merging.main.runtime.ts",
|
|
8600
|
-
"line":
|
|
8600
|
+
"line": 69,
|
|
8601
8601
|
"character": 1
|
|
8602
8602
|
},
|
|
8603
8603
|
"signature": "type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n mergeProps?: {\n ...;\n } | undefined;\n}",
|
|
@@ -8606,7 +8606,7 @@
|
|
|
8606
8606
|
"__schema": "TypeIntersectionSchema",
|
|
8607
8607
|
"location": {
|
|
8608
8608
|
"filePath": "merging.main.runtime.ts",
|
|
8609
|
-
"line":
|
|
8609
|
+
"line": 69,
|
|
8610
8610
|
"character": 54
|
|
8611
8611
|
},
|
|
8612
8612
|
"types": [
|
|
@@ -8614,7 +8614,7 @@
|
|
|
8614
8614
|
"__schema": "TypeRefSchema",
|
|
8615
8615
|
"location": {
|
|
8616
8616
|
"filePath": "merging.main.runtime.ts",
|
|
8617
|
-
"line":
|
|
8617
|
+
"line": 69,
|
|
8618
8618
|
"character": 54
|
|
8619
8619
|
},
|
|
8620
8620
|
"name": "ComponentStatusBase",
|
|
@@ -8627,7 +8627,7 @@
|
|
|
8627
8627
|
"__schema": "TypeLiteralSchema",
|
|
8628
8628
|
"location": {
|
|
8629
8629
|
"filePath": "merging.main.runtime.ts",
|
|
8630
|
-
"line":
|
|
8630
|
+
"line": 69,
|
|
8631
8631
|
"character": 76
|
|
8632
8632
|
},
|
|
8633
8633
|
"members": [
|
|
@@ -8635,7 +8635,7 @@
|
|
|
8635
8635
|
"__schema": "VariableLikeSchema",
|
|
8636
8636
|
"location": {
|
|
8637
8637
|
"filePath": "merging.main.runtime.ts",
|
|
8638
|
-
"line":
|
|
8638
|
+
"line": 70,
|
|
8639
8639
|
"character": 3
|
|
8640
8640
|
},
|
|
8641
8641
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -8644,7 +8644,7 @@
|
|
|
8644
8644
|
"__schema": "TypeRefSchema",
|
|
8645
8645
|
"location": {
|
|
8646
8646
|
"filePath": "merging.main.runtime.ts",
|
|
8647
|
-
"line":
|
|
8647
|
+
"line": 70,
|
|
8648
8648
|
"character": 17
|
|
8649
8649
|
},
|
|
8650
8650
|
"name": "SnapsDistance",
|
|
@@ -8656,7 +8656,7 @@
|
|
|
8656
8656
|
"__schema": "VariableLikeSchema",
|
|
8657
8657
|
"location": {
|
|
8658
8658
|
"filePath": "merging.main.runtime.ts",
|
|
8659
|
-
"line":
|
|
8659
|
+
"line": 71,
|
|
8660
8660
|
"character": 3
|
|
8661
8661
|
},
|
|
8662
8662
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -8665,7 +8665,7 @@
|
|
|
8665
8665
|
"__schema": "TypeRefSchema",
|
|
8666
8666
|
"location": {
|
|
8667
8667
|
"filePath": "merging.main.runtime.ts",
|
|
8668
|
-
"line":
|
|
8668
|
+
"line": 71,
|
|
8669
8669
|
"character": 23
|
|
8670
8670
|
},
|
|
8671
8671
|
"name": "ResolveUnrelatedData",
|
|
@@ -8677,7 +8677,7 @@
|
|
|
8677
8677
|
"__schema": "VariableLikeSchema",
|
|
8678
8678
|
"location": {
|
|
8679
8679
|
"filePath": "merging.main.runtime.ts",
|
|
8680
|
-
"line":
|
|
8680
|
+
"line": 72,
|
|
8681
8681
|
"character": 3
|
|
8682
8682
|
},
|
|
8683
8683
|
"signature": "(property) mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n} | undefined",
|
|
@@ -8686,7 +8686,7 @@
|
|
|
8686
8686
|
"__schema": "TypeLiteralSchema",
|
|
8687
8687
|
"location": {
|
|
8688
8688
|
"filePath": "merging.main.runtime.ts",
|
|
8689
|
-
"line":
|
|
8689
|
+
"line": 72,
|
|
8690
8690
|
"character": 16
|
|
8691
8691
|
},
|
|
8692
8692
|
"members": [
|
|
@@ -8694,7 +8694,7 @@
|
|
|
8694
8694
|
"__schema": "VariableLikeSchema",
|
|
8695
8695
|
"location": {
|
|
8696
8696
|
"filePath": "merging.main.runtime.ts",
|
|
8697
|
-
"line":
|
|
8697
|
+
"line": 73,
|
|
8698
8698
|
"character": 5
|
|
8699
8699
|
},
|
|
8700
8700
|
"signature": "(property) otherLaneHead: Ref",
|
|
@@ -8703,7 +8703,7 @@
|
|
|
8703
8703
|
"__schema": "TypeRefSchema",
|
|
8704
8704
|
"location": {
|
|
8705
8705
|
"filePath": "merging.main.runtime.ts",
|
|
8706
|
-
"line":
|
|
8706
|
+
"line": 73,
|
|
8707
8707
|
"character": 5
|
|
8708
8708
|
},
|
|
8709
8709
|
"name": "Ref",
|
|
@@ -8715,7 +8715,7 @@
|
|
|
8715
8715
|
"__schema": "VariableLikeSchema",
|
|
8716
8716
|
"location": {
|
|
8717
8717
|
"filePath": "merging.main.runtime.ts",
|
|
8718
|
-
"line":
|
|
8718
|
+
"line": 74,
|
|
8719
8719
|
"character": 5
|
|
8720
8720
|
},
|
|
8721
8721
|
"signature": "(property) currentId: ComponentID",
|
|
@@ -8724,7 +8724,7 @@
|
|
|
8724
8724
|
"__schema": "TypeRefSchema",
|
|
8725
8725
|
"location": {
|
|
8726
8726
|
"filePath": "merging.main.runtime.ts",
|
|
8727
|
-
"line":
|
|
8727
|
+
"line": 74,
|
|
8728
8728
|
"character": 5
|
|
8729
8729
|
},
|
|
8730
8730
|
"name": "ComponentID",
|
|
@@ -8740,7 +8740,7 @@
|
|
|
8740
8740
|
"__schema": "VariableLikeSchema",
|
|
8741
8741
|
"location": {
|
|
8742
8742
|
"filePath": "merging.main.runtime.ts",
|
|
8743
|
-
"line":
|
|
8743
|
+
"line": 75,
|
|
8744
8744
|
"character": 5
|
|
8745
8745
|
},
|
|
8746
8746
|
"signature": "(property) modelComponent: ModelComponent",
|
|
@@ -8749,7 +8749,7 @@
|
|
|
8749
8749
|
"__schema": "TypeRefSchema",
|
|
8750
8750
|
"location": {
|
|
8751
8751
|
"filePath": "merging.main.runtime.ts",
|
|
8752
|
-
"line":
|
|
8752
|
+
"line": 75,
|
|
8753
8753
|
"character": 5
|
|
8754
8754
|
},
|
|
8755
8755
|
"name": "ModelComponent",
|
|
@@ -8770,7 +8770,7 @@
|
|
|
8770
8770
|
"__schema": "TypeSchema",
|
|
8771
8771
|
"location": {
|
|
8772
8772
|
"filePath": "merging.main.runtime.ts",
|
|
8773
|
-
"line":
|
|
8773
|
+
"line": 79,
|
|
8774
8774
|
"character": 1
|
|
8775
8775
|
},
|
|
8776
8776
|
"signature": "type FailedComponents = {\n id: ComponentID;\n unchangedMessage: string;\n unchangedLegitimately?: boolean | undefined;\n}",
|
|
@@ -8779,7 +8779,7 @@
|
|
|
8779
8779
|
"__schema": "TypeLiteralSchema",
|
|
8780
8780
|
"location": {
|
|
8781
8781
|
"filePath": "merging.main.runtime.ts",
|
|
8782
|
-
"line":
|
|
8782
|
+
"line": 79,
|
|
8783
8783
|
"character": 32
|
|
8784
8784
|
},
|
|
8785
8785
|
"members": [
|
|
@@ -8787,7 +8787,7 @@
|
|
|
8787
8787
|
"__schema": "VariableLikeSchema",
|
|
8788
8788
|
"location": {
|
|
8789
8789
|
"filePath": "merging.main.runtime.ts",
|
|
8790
|
-
"line":
|
|
8790
|
+
"line": 79,
|
|
8791
8791
|
"character": 34
|
|
8792
8792
|
},
|
|
8793
8793
|
"signature": "(property) id: ComponentID",
|
|
@@ -8796,7 +8796,7 @@
|
|
|
8796
8796
|
"__schema": "TypeRefSchema",
|
|
8797
8797
|
"location": {
|
|
8798
8798
|
"filePath": "merging.main.runtime.ts",
|
|
8799
|
-
"line":
|
|
8799
|
+
"line": 79,
|
|
8800
8800
|
"character": 34
|
|
8801
8801
|
},
|
|
8802
8802
|
"name": "ComponentID",
|
|
@@ -8812,7 +8812,7 @@
|
|
|
8812
8812
|
"__schema": "VariableLikeSchema",
|
|
8813
8813
|
"location": {
|
|
8814
8814
|
"filePath": "merging.main.runtime.ts",
|
|
8815
|
-
"line":
|
|
8815
|
+
"line": 79,
|
|
8816
8816
|
"character": 51
|
|
8817
8817
|
},
|
|
8818
8818
|
"signature": "(property) unchangedMessage: string",
|
|
@@ -8821,7 +8821,7 @@
|
|
|
8821
8821
|
"__schema": "KeywordTypeSchema",
|
|
8822
8822
|
"location": {
|
|
8823
8823
|
"filePath": "merging.main.runtime.ts",
|
|
8824
|
-
"line":
|
|
8824
|
+
"line": 79,
|
|
8825
8825
|
"character": 69
|
|
8826
8826
|
},
|
|
8827
8827
|
"name": "string"
|
|
@@ -8832,7 +8832,7 @@
|
|
|
8832
8832
|
"__schema": "VariableLikeSchema",
|
|
8833
8833
|
"location": {
|
|
8834
8834
|
"filePath": "merging.main.runtime.ts",
|
|
8835
|
-
"line":
|
|
8835
|
+
"line": 79,
|
|
8836
8836
|
"character": 77
|
|
8837
8837
|
},
|
|
8838
8838
|
"signature": "(property) unchangedLegitimately?: boolean | undefined",
|
|
@@ -8841,7 +8841,7 @@
|
|
|
8841
8841
|
"__schema": "KeywordTypeSchema",
|
|
8842
8842
|
"location": {
|
|
8843
8843
|
"filePath": "merging.main.runtime.ts",
|
|
8844
|
-
"line":
|
|
8844
|
+
"line": 79,
|
|
8845
8845
|
"character": 101
|
|
8846
8846
|
},
|
|
8847
8847
|
"name": "boolean"
|
|
@@ -8855,7 +8855,7 @@
|
|
|
8855
8855
|
"__schema": "TypeSchema",
|
|
8856
8856
|
"location": {
|
|
8857
8857
|
"filePath": "merging.main.runtime.ts",
|
|
8858
|
-
"line":
|
|
8858
|
+
"line": 82,
|
|
8859
8859
|
"character": 1
|
|
8860
8860
|
},
|
|
8861
8861
|
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
@@ -8864,7 +8864,7 @@
|
|
|
8864
8864
|
"__schema": "TypeLiteralSchema",
|
|
8865
8865
|
"location": {
|
|
8866
8866
|
"filePath": "merging.main.runtime.ts",
|
|
8867
|
-
"line":
|
|
8867
|
+
"line": 82,
|
|
8868
8868
|
"character": 27
|
|
8869
8869
|
},
|
|
8870
8870
|
"members": [
|
|
@@ -8872,14 +8872,14 @@
|
|
|
8872
8872
|
"__schema": "IndexSignatureSchema",
|
|
8873
8873
|
"location": {
|
|
8874
8874
|
"filePath": "merging.main.runtime.ts",
|
|
8875
|
-
"line":
|
|
8875
|
+
"line": 82,
|
|
8876
8876
|
"character": 29
|
|
8877
8877
|
},
|
|
8878
8878
|
"keyType": {
|
|
8879
8879
|
"__schema": "ParameterSchema",
|
|
8880
8880
|
"location": {
|
|
8881
8881
|
"filePath": "merging.main.runtime.ts",
|
|
8882
|
-
"line":
|
|
8882
|
+
"line": 82,
|
|
8883
8883
|
"character": 30
|
|
8884
8884
|
},
|
|
8885
8885
|
"name": "fileName",
|
|
@@ -8887,7 +8887,7 @@
|
|
|
8887
8887
|
"__schema": "KeywordTypeSchema",
|
|
8888
8888
|
"location": {
|
|
8889
8889
|
"filePath": "merging.main.runtime.ts",
|
|
8890
|
-
"line":
|
|
8890
|
+
"line": 82,
|
|
8891
8891
|
"character": 40
|
|
8892
8892
|
},
|
|
8893
8893
|
"name": "string"
|
|
@@ -8899,7 +8899,7 @@
|
|
|
8899
8899
|
"__schema": "TypeOperatorSchema",
|
|
8900
8900
|
"location": {
|
|
8901
8901
|
"filePath": "merging.main.runtime.ts",
|
|
8902
|
-
"line":
|
|
8902
|
+
"line": 82,
|
|
8903
8903
|
"character": 49
|
|
8904
8904
|
},
|
|
8905
8905
|
"name": "keyof",
|
|
@@ -8907,7 +8907,7 @@
|
|
|
8907
8907
|
"__schema": "TypeQuerySchema",
|
|
8908
8908
|
"location": {
|
|
8909
8909
|
"filePath": "merging.main.runtime.ts",
|
|
8910
|
-
"line":
|
|
8910
|
+
"line": 82,
|
|
8911
8911
|
"character": 55
|
|
8912
8912
|
},
|
|
8913
8913
|
"signature": "(alias) const FileStatus: {\n merged: string;\n manual: string;\n binaryConflict: string;\n updated: string;\n added: string;\n removed: string;\n overridden: string;\n unchanged: string;\n remainDeleted: string;\n deletedConflict: string;\n}\nimport FileStatus",
|
|
@@ -8915,7 +8915,7 @@
|
|
|
8915
8915
|
"__schema": "TypeRefSchema",
|
|
8916
8916
|
"location": {
|
|
8917
8917
|
"filePath": "merging.main.runtime.ts",
|
|
8918
|
-
"line":
|
|
8918
|
+
"line": 82,
|
|
8919
8919
|
"character": 62
|
|
8920
8920
|
},
|
|
8921
8921
|
"name": "FileStatus"
|
|
@@ -8930,7 +8930,7 @@
|
|
|
8930
8930
|
"__schema": "TypeSchema",
|
|
8931
8931
|
"location": {
|
|
8932
8932
|
"filePath": "merging.main.runtime.ts",
|
|
8933
|
-
"line":
|
|
8933
|
+
"line": 84,
|
|
8934
8934
|
"character": 1
|
|
8935
8935
|
},
|
|
8936
8936
|
"signature": "type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList | undefined;\n exportedIds?: ComponentID[] | undefined;\n} | null",
|
|
@@ -8939,7 +8939,7 @@
|
|
|
8939
8939
|
"__schema": "TypeUnionSchema",
|
|
8940
8940
|
"location": {
|
|
8941
8941
|
"filePath": "merging.main.runtime.ts",
|
|
8942
|
-
"line":
|
|
8942
|
+
"line": 84,
|
|
8943
8943
|
"character": 32
|
|
8944
8944
|
},
|
|
8945
8945
|
"types": [
|
|
@@ -8947,7 +8947,7 @@
|
|
|
8947
8947
|
"__schema": "TypeLiteralSchema",
|
|
8948
8948
|
"location": {
|
|
8949
8949
|
"filePath": "merging.main.runtime.ts",
|
|
8950
|
-
"line":
|
|
8950
|
+
"line": 84,
|
|
8951
8951
|
"character": 32
|
|
8952
8952
|
},
|
|
8953
8953
|
"members": [
|
|
@@ -8955,7 +8955,7 @@
|
|
|
8955
8955
|
"__schema": "VariableLikeSchema",
|
|
8956
8956
|
"location": {
|
|
8957
8957
|
"filePath": "merging.main.runtime.ts",
|
|
8958
|
-
"line":
|
|
8958
|
+
"line": 85,
|
|
8959
8959
|
"character": 3
|
|
8960
8960
|
},
|
|
8961
8961
|
"signature": "(property) snappedComponents: ConsumerComponent[]",
|
|
@@ -8964,14 +8964,14 @@
|
|
|
8964
8964
|
"__schema": "TypeArraySchema",
|
|
8965
8965
|
"location": {
|
|
8966
8966
|
"filePath": "merging.main.runtime.ts",
|
|
8967
|
-
"line":
|
|
8967
|
+
"line": 85,
|
|
8968
8968
|
"character": 22
|
|
8969
8969
|
},
|
|
8970
8970
|
"type": {
|
|
8971
8971
|
"__schema": "TypeRefSchema",
|
|
8972
8972
|
"location": {
|
|
8973
8973
|
"filePath": "merging.main.runtime.ts",
|
|
8974
|
-
"line":
|
|
8974
|
+
"line": 85,
|
|
8975
8975
|
"character": 22
|
|
8976
8976
|
},
|
|
8977
8977
|
"name": "ConsumerComponent",
|
|
@@ -8984,7 +8984,7 @@
|
|
|
8984
8984
|
"__schema": "VariableLikeSchema",
|
|
8985
8985
|
"location": {
|
|
8986
8986
|
"filePath": "merging.main.runtime.ts",
|
|
8987
|
-
"line":
|
|
8987
|
+
"line": 86,
|
|
8988
8988
|
"character": 3
|
|
8989
8989
|
},
|
|
8990
8990
|
"signature": "(property) autoSnappedResults: AutoTagResult[]",
|
|
@@ -8993,14 +8993,14 @@
|
|
|
8993
8993
|
"__schema": "TypeArraySchema",
|
|
8994
8994
|
"location": {
|
|
8995
8995
|
"filePath": "merging.main.runtime.ts",
|
|
8996
|
-
"line":
|
|
8996
|
+
"line": 86,
|
|
8997
8997
|
"character": 23
|
|
8998
8998
|
},
|
|
8999
8999
|
"type": {
|
|
9000
9000
|
"__schema": "TypeRefSchema",
|
|
9001
9001
|
"location": {
|
|
9002
9002
|
"filePath": "merging.main.runtime.ts",
|
|
9003
|
-
"line":
|
|
9003
|
+
"line": 86,
|
|
9004
9004
|
"character": 23
|
|
9005
9005
|
},
|
|
9006
9006
|
"name": "AutoTagResult",
|
|
@@ -9013,7 +9013,7 @@
|
|
|
9013
9013
|
"__schema": "VariableLikeSchema",
|
|
9014
9014
|
"location": {
|
|
9015
9015
|
"filePath": "merging.main.runtime.ts",
|
|
9016
|
-
"line":
|
|
9016
|
+
"line": 87,
|
|
9017
9017
|
"character": 3
|
|
9018
9018
|
},
|
|
9019
9019
|
"signature": "(property) removedComponents?: ComponentIdList | undefined",
|
|
@@ -9022,7 +9022,7 @@
|
|
|
9022
9022
|
"__schema": "TypeRefSchema",
|
|
9023
9023
|
"location": {
|
|
9024
9024
|
"filePath": "merging.main.runtime.ts",
|
|
9025
|
-
"line":
|
|
9025
|
+
"line": 87,
|
|
9026
9026
|
"character": 23
|
|
9027
9027
|
},
|
|
9028
9028
|
"name": "ComponentIdList",
|
|
@@ -9038,7 +9038,7 @@
|
|
|
9038
9038
|
"__schema": "VariableLikeSchema",
|
|
9039
9039
|
"location": {
|
|
9040
9040
|
"filePath": "merging.main.runtime.ts",
|
|
9041
|
-
"line":
|
|
9041
|
+
"line": 88,
|
|
9042
9042
|
"character": 3
|
|
9043
9043
|
},
|
|
9044
9044
|
"signature": "(property) exportedIds?: ComponentID[] | undefined",
|
|
@@ -9047,14 +9047,14 @@
|
|
|
9047
9047
|
"__schema": "TypeArraySchema",
|
|
9048
9048
|
"location": {
|
|
9049
9049
|
"filePath": "merging.main.runtime.ts",
|
|
9050
|
-
"line":
|
|
9050
|
+
"line": 88,
|
|
9051
9051
|
"character": 17
|
|
9052
9052
|
},
|
|
9053
9053
|
"type": {
|
|
9054
9054
|
"__schema": "TypeRefSchema",
|
|
9055
9055
|
"location": {
|
|
9056
9056
|
"filePath": "merging.main.runtime.ts",
|
|
9057
|
-
"line":
|
|
9057
|
+
"line": 88,
|
|
9058
9058
|
"character": 17
|
|
9059
9059
|
},
|
|
9060
9060
|
"name": "ComponentID",
|
|
@@ -9073,7 +9073,7 @@
|
|
|
9073
9073
|
"__schema": "LiteralTypeSchema",
|
|
9074
9074
|
"location": {
|
|
9075
9075
|
"filePath": "merging.main.runtime.ts",
|
|
9076
|
-
"line":
|
|
9076
|
+
"line": 89,
|
|
9077
9077
|
"character": 5
|
|
9078
9078
|
},
|
|
9079
9079
|
"name": "null"
|
|
@@ -9085,7 +9085,7 @@
|
|
|
9085
9085
|
"__schema": "TypeSchema",
|
|
9086
9086
|
"location": {
|
|
9087
9087
|
"filePath": "merging.main.runtime.ts",
|
|
9088
|
-
"line":
|
|
9088
|
+
"line": 91,
|
|
9089
9089
|
"character": 1
|
|
9090
9090
|
},
|
|
9091
9091
|
"signature": "type ApplyVersionResult = {\n id: ComponentID;\n filesStatus: FilesStatus;\n}",
|
|
@@ -9094,7 +9094,7 @@
|
|
|
9094
9094
|
"__schema": "TypeLiteralSchema",
|
|
9095
9095
|
"location": {
|
|
9096
9096
|
"filePath": "merging.main.runtime.ts",
|
|
9097
|
-
"line":
|
|
9097
|
+
"line": 91,
|
|
9098
9098
|
"character": 34
|
|
9099
9099
|
},
|
|
9100
9100
|
"members": [
|
|
@@ -9102,7 +9102,7 @@
|
|
|
9102
9102
|
"__schema": "VariableLikeSchema",
|
|
9103
9103
|
"location": {
|
|
9104
9104
|
"filePath": "merging.main.runtime.ts",
|
|
9105
|
-
"line":
|
|
9105
|
+
"line": 91,
|
|
9106
9106
|
"character": 36
|
|
9107
9107
|
},
|
|
9108
9108
|
"signature": "(property) id: ComponentID",
|
|
@@ -9111,7 +9111,7 @@
|
|
|
9111
9111
|
"__schema": "TypeRefSchema",
|
|
9112
9112
|
"location": {
|
|
9113
9113
|
"filePath": "merging.main.runtime.ts",
|
|
9114
|
-
"line":
|
|
9114
|
+
"line": 91,
|
|
9115
9115
|
"character": 36
|
|
9116
9116
|
},
|
|
9117
9117
|
"name": "ComponentID",
|
|
@@ -9127,7 +9127,7 @@
|
|
|
9127
9127
|
"__schema": "VariableLikeSchema",
|
|
9128
9128
|
"location": {
|
|
9129
9129
|
"filePath": "merging.main.runtime.ts",
|
|
9130
|
-
"line":
|
|
9130
|
+
"line": 91,
|
|
9131
9131
|
"character": 53
|
|
9132
9132
|
},
|
|
9133
9133
|
"signature": "(property) filesStatus: FilesStatus",
|
|
@@ -9136,7 +9136,7 @@
|
|
|
9136
9136
|
"__schema": "TypeRefSchema",
|
|
9137
9137
|
"location": {
|
|
9138
9138
|
"filePath": "merging.main.runtime.ts",
|
|
9139
|
-
"line":
|
|
9139
|
+
"line": 91,
|
|
9140
9140
|
"character": 53
|
|
9141
9141
|
},
|
|
9142
9142
|
"name": "FilesStatus"
|
|
@@ -9150,7 +9150,7 @@
|
|
|
9150
9150
|
"__schema": "TypeSchema",
|
|
9151
9151
|
"location": {
|
|
9152
9152
|
"filePath": "merging.main.runtime.ts",
|
|
9153
|
-
"line":
|
|
9153
|
+
"line": 93,
|
|
9154
9154
|
"character": 1
|
|
9155
9155
|
},
|
|
9156
9156
|
"signature": "type ApplyVersionResults = {\n components?: ApplyVersionResult[] | undefined;\n version?: string | undefined;\n failedComponents?: FailedComponents[] | undefined;\n removedComponents?: ComponentID[] | undefined;\n ... 11 more ...;\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined;\n}",
|
|
@@ -9159,7 +9159,7 @@
|
|
|
9159
9159
|
"__schema": "TypeLiteralSchema",
|
|
9160
9160
|
"location": {
|
|
9161
9161
|
"filePath": "merging.main.runtime.ts",
|
|
9162
|
-
"line":
|
|
9162
|
+
"line": 93,
|
|
9163
9163
|
"character": 35
|
|
9164
9164
|
},
|
|
9165
9165
|
"members": [
|
|
@@ -9167,7 +9167,7 @@
|
|
|
9167
9167
|
"__schema": "VariableLikeSchema",
|
|
9168
9168
|
"location": {
|
|
9169
9169
|
"filePath": "merging.main.runtime.ts",
|
|
9170
|
-
"line":
|
|
9170
|
+
"line": 94,
|
|
9171
9171
|
"character": 3
|
|
9172
9172
|
},
|
|
9173
9173
|
"signature": "(property) components?: ApplyVersionResult[] | undefined",
|
|
@@ -9176,14 +9176,14 @@
|
|
|
9176
9176
|
"__schema": "TypeArraySchema",
|
|
9177
9177
|
"location": {
|
|
9178
9178
|
"filePath": "merging.main.runtime.ts",
|
|
9179
|
-
"line":
|
|
9179
|
+
"line": 94,
|
|
9180
9180
|
"character": 16
|
|
9181
9181
|
},
|
|
9182
9182
|
"type": {
|
|
9183
9183
|
"__schema": "TypeRefSchema",
|
|
9184
9184
|
"location": {
|
|
9185
9185
|
"filePath": "merging.main.runtime.ts",
|
|
9186
|
-
"line":
|
|
9186
|
+
"line": 94,
|
|
9187
9187
|
"character": 16
|
|
9188
9188
|
},
|
|
9189
9189
|
"name": "ApplyVersionResult"
|
|
@@ -9195,7 +9195,7 @@
|
|
|
9195
9195
|
"__schema": "VariableLikeSchema",
|
|
9196
9196
|
"location": {
|
|
9197
9197
|
"filePath": "merging.main.runtime.ts",
|
|
9198
|
-
"line":
|
|
9198
|
+
"line": 95,
|
|
9199
9199
|
"character": 3
|
|
9200
9200
|
},
|
|
9201
9201
|
"signature": "(property) version?: string | undefined",
|
|
@@ -9204,7 +9204,7 @@
|
|
|
9204
9204
|
"__schema": "KeywordTypeSchema",
|
|
9205
9205
|
"location": {
|
|
9206
9206
|
"filePath": "merging.main.runtime.ts",
|
|
9207
|
-
"line":
|
|
9207
|
+
"line": 95,
|
|
9208
9208
|
"character": 13
|
|
9209
9209
|
},
|
|
9210
9210
|
"name": "string"
|
|
@@ -9215,7 +9215,7 @@
|
|
|
9215
9215
|
"__schema": "VariableLikeSchema",
|
|
9216
9216
|
"location": {
|
|
9217
9217
|
"filePath": "merging.main.runtime.ts",
|
|
9218
|
-
"line":
|
|
9218
|
+
"line": 96,
|
|
9219
9219
|
"character": 3
|
|
9220
9220
|
},
|
|
9221
9221
|
"signature": "(property) failedComponents?: FailedComponents[] | undefined",
|
|
@@ -9224,14 +9224,14 @@
|
|
|
9224
9224
|
"__schema": "TypeArraySchema",
|
|
9225
9225
|
"location": {
|
|
9226
9226
|
"filePath": "merging.main.runtime.ts",
|
|
9227
|
-
"line":
|
|
9227
|
+
"line": 96,
|
|
9228
9228
|
"character": 22
|
|
9229
9229
|
},
|
|
9230
9230
|
"type": {
|
|
9231
9231
|
"__schema": "TypeRefSchema",
|
|
9232
9232
|
"location": {
|
|
9233
9233
|
"filePath": "merging.main.runtime.ts",
|
|
9234
|
-
"line":
|
|
9234
|
+
"line": 96,
|
|
9235
9235
|
"character": 22
|
|
9236
9236
|
},
|
|
9237
9237
|
"name": "FailedComponents"
|
|
@@ -9243,7 +9243,7 @@
|
|
|
9243
9243
|
"__schema": "VariableLikeSchema",
|
|
9244
9244
|
"location": {
|
|
9245
9245
|
"filePath": "merging.main.runtime.ts",
|
|
9246
|
-
"line":
|
|
9246
|
+
"line": 97,
|
|
9247
9247
|
"character": 3
|
|
9248
9248
|
},
|
|
9249
9249
|
"signature": "(property) removedComponents?: ComponentID[] | undefined",
|
|
@@ -9252,14 +9252,14 @@
|
|
|
9252
9252
|
"__schema": "TypeArraySchema",
|
|
9253
9253
|
"location": {
|
|
9254
9254
|
"filePath": "merging.main.runtime.ts",
|
|
9255
|
-
"line":
|
|
9255
|
+
"line": 97,
|
|
9256
9256
|
"character": 23
|
|
9257
9257
|
},
|
|
9258
9258
|
"type": {
|
|
9259
9259
|
"__schema": "TypeRefSchema",
|
|
9260
9260
|
"location": {
|
|
9261
9261
|
"filePath": "merging.main.runtime.ts",
|
|
9262
|
-
"line":
|
|
9262
|
+
"line": 97,
|
|
9263
9263
|
"character": 23
|
|
9264
9264
|
},
|
|
9265
9265
|
"name": "ComponentID",
|
|
@@ -9276,7 +9276,7 @@
|
|
|
9276
9276
|
"__schema": "VariableLikeSchema",
|
|
9277
9277
|
"location": {
|
|
9278
9278
|
"filePath": "merging.main.runtime.ts",
|
|
9279
|
-
"line":
|
|
9279
|
+
"line": 98,
|
|
9280
9280
|
"character": 3
|
|
9281
9281
|
},
|
|
9282
9282
|
"signature": "(property) addedComponents?: ComponentID[] | undefined",
|
|
@@ -9285,14 +9285,14 @@
|
|
|
9285
9285
|
"__schema": "TypeArraySchema",
|
|
9286
9286
|
"location": {
|
|
9287
9287
|
"filePath": "merging.main.runtime.ts",
|
|
9288
|
-
"line":
|
|
9288
|
+
"line": 98,
|
|
9289
9289
|
"character": 21
|
|
9290
9290
|
},
|
|
9291
9291
|
"type": {
|
|
9292
9292
|
"__schema": "TypeRefSchema",
|
|
9293
9293
|
"location": {
|
|
9294
9294
|
"filePath": "merging.main.runtime.ts",
|
|
9295
|
-
"line":
|
|
9295
|
+
"line": 98,
|
|
9296
9296
|
"character": 21
|
|
9297
9297
|
},
|
|
9298
9298
|
"name": "ComponentID",
|
|
@@ -9309,7 +9309,7 @@
|
|
|
9309
9309
|
"__schema": "VariableLikeSchema",
|
|
9310
9310
|
"location": {
|
|
9311
9311
|
"filePath": "merging.main.runtime.ts",
|
|
9312
|
-
"line":
|
|
9312
|
+
"line": 99,
|
|
9313
9313
|
"character": 3
|
|
9314
9314
|
},
|
|
9315
9315
|
"signature": "(property) resolvedComponents?: ConsumerComponent[] | undefined",
|
|
@@ -9318,14 +9318,14 @@
|
|
|
9318
9318
|
"__schema": "TypeArraySchema",
|
|
9319
9319
|
"location": {
|
|
9320
9320
|
"filePath": "merging.main.runtime.ts",
|
|
9321
|
-
"line":
|
|
9321
|
+
"line": 99,
|
|
9322
9322
|
"character": 24
|
|
9323
9323
|
},
|
|
9324
9324
|
"type": {
|
|
9325
9325
|
"__schema": "TypeRefSchema",
|
|
9326
9326
|
"location": {
|
|
9327
9327
|
"filePath": "merging.main.runtime.ts",
|
|
9328
|
-
"line":
|
|
9328
|
+
"line": 99,
|
|
9329
9329
|
"character": 24
|
|
9330
9330
|
},
|
|
9331
9331
|
"name": "ConsumerComponent",
|
|
@@ -9338,7 +9338,7 @@
|
|
|
9338
9338
|
"__schema": "VariableLikeSchema",
|
|
9339
9339
|
"location": {
|
|
9340
9340
|
"filePath": "merging.main.runtime.ts",
|
|
9341
|
-
"line":
|
|
9341
|
+
"line": 100,
|
|
9342
9342
|
"character": 3
|
|
9343
9343
|
},
|
|
9344
9344
|
"signature": "(property) abortedComponents?: ApplyVersionResult[] | undefined",
|
|
@@ -9347,14 +9347,14 @@
|
|
|
9347
9347
|
"__schema": "TypeArraySchema",
|
|
9348
9348
|
"location": {
|
|
9349
9349
|
"filePath": "merging.main.runtime.ts",
|
|
9350
|
-
"line":
|
|
9350
|
+
"line": 100,
|
|
9351
9351
|
"character": 23
|
|
9352
9352
|
},
|
|
9353
9353
|
"type": {
|
|
9354
9354
|
"__schema": "TypeRefSchema",
|
|
9355
9355
|
"location": {
|
|
9356
9356
|
"filePath": "merging.main.runtime.ts",
|
|
9357
|
-
"line":
|
|
9357
|
+
"line": 100,
|
|
9358
9358
|
"character": 23
|
|
9359
9359
|
},
|
|
9360
9360
|
"name": "ApplyVersionResult"
|
|
@@ -9366,7 +9366,7 @@
|
|
|
9366
9366
|
"__schema": "VariableLikeSchema",
|
|
9367
9367
|
"location": {
|
|
9368
9368
|
"filePath": "merging.main.runtime.ts",
|
|
9369
|
-
"line":
|
|
9369
|
+
"line": 101,
|
|
9370
9370
|
"character": 3
|
|
9371
9371
|
},
|
|
9372
9372
|
"signature": "(property) mergeSnapResults?: MergeSnapResults | undefined",
|
|
@@ -9375,7 +9375,7 @@
|
|
|
9375
9375
|
"__schema": "TypeRefSchema",
|
|
9376
9376
|
"location": {
|
|
9377
9377
|
"filePath": "merging.main.runtime.ts",
|
|
9378
|
-
"line":
|
|
9378
|
+
"line": 101,
|
|
9379
9379
|
"character": 22
|
|
9380
9380
|
},
|
|
9381
9381
|
"name": "MergeSnapResults",
|
|
@@ -9387,7 +9387,7 @@
|
|
|
9387
9387
|
"__schema": "VariableLikeSchema",
|
|
9388
9388
|
"location": {
|
|
9389
9389
|
"filePath": "merging.main.runtime.ts",
|
|
9390
|
-
"line":
|
|
9390
|
+
"line": 102,
|
|
9391
9391
|
"character": 3
|
|
9392
9392
|
},
|
|
9393
9393
|
"signature": "(property) mergeSnapError?: Error | undefined",
|
|
@@ -9396,7 +9396,7 @@
|
|
|
9396
9396
|
"__schema": "TypeRefSchema",
|
|
9397
9397
|
"location": {
|
|
9398
9398
|
"filePath": "merging.main.runtime.ts",
|
|
9399
|
-
"line":
|
|
9399
|
+
"line": 102,
|
|
9400
9400
|
"character": 20
|
|
9401
9401
|
},
|
|
9402
9402
|
"name": "Error"
|
|
@@ -9407,7 +9407,7 @@
|
|
|
9407
9407
|
"__schema": "VariableLikeSchema",
|
|
9408
9408
|
"location": {
|
|
9409
9409
|
"filePath": "merging.main.runtime.ts",
|
|
9410
|
-
"line":
|
|
9410
|
+
"line": 103,
|
|
9411
9411
|
"character": 3
|
|
9412
9412
|
},
|
|
9413
9413
|
"signature": "(property) leftUnresolvedConflicts?: boolean | undefined",
|
|
@@ -9416,7 +9416,7 @@
|
|
|
9416
9416
|
"__schema": "KeywordTypeSchema",
|
|
9417
9417
|
"location": {
|
|
9418
9418
|
"filePath": "merging.main.runtime.ts",
|
|
9419
|
-
"line":
|
|
9419
|
+
"line": 103,
|
|
9420
9420
|
"character": 29
|
|
9421
9421
|
},
|
|
9422
9422
|
"name": "boolean"
|
|
@@ -9427,7 +9427,7 @@
|
|
|
9427
9427
|
"__schema": "VariableLikeSchema",
|
|
9428
9428
|
"location": {
|
|
9429
9429
|
"filePath": "merging.main.runtime.ts",
|
|
9430
|
-
"line":
|
|
9430
|
+
"line": 104,
|
|
9431
9431
|
"character": 3
|
|
9432
9432
|
},
|
|
9433
9433
|
"signature": "(property) verbose?: boolean | undefined",
|
|
@@ -9436,7 +9436,7 @@
|
|
|
9436
9436
|
"__schema": "KeywordTypeSchema",
|
|
9437
9437
|
"location": {
|
|
9438
9438
|
"filePath": "merging.main.runtime.ts",
|
|
9439
|
-
"line":
|
|
9439
|
+
"line": 104,
|
|
9440
9440
|
"character": 13
|
|
9441
9441
|
},
|
|
9442
9442
|
"name": "boolean"
|
|
@@ -9447,7 +9447,7 @@
|
|
|
9447
9447
|
"__schema": "VariableLikeSchema",
|
|
9448
9448
|
"location": {
|
|
9449
9449
|
"filePath": "merging.main.runtime.ts",
|
|
9450
|
-
"line":
|
|
9450
|
+
"line": 105,
|
|
9451
9451
|
"character": 3
|
|
9452
9452
|
},
|
|
9453
9453
|
"signature": "(property) newFromLane?: string[] | undefined",
|
|
@@ -9456,14 +9456,14 @@
|
|
|
9456
9456
|
"__schema": "TypeArraySchema",
|
|
9457
9457
|
"location": {
|
|
9458
9458
|
"filePath": "merging.main.runtime.ts",
|
|
9459
|
-
"line":
|
|
9459
|
+
"line": 105,
|
|
9460
9460
|
"character": 17
|
|
9461
9461
|
},
|
|
9462
9462
|
"type": {
|
|
9463
9463
|
"__schema": "KeywordTypeSchema",
|
|
9464
9464
|
"location": {
|
|
9465
9465
|
"filePath": "merging.main.runtime.ts",
|
|
9466
|
-
"line":
|
|
9466
|
+
"line": 105,
|
|
9467
9467
|
"character": 17
|
|
9468
9468
|
},
|
|
9469
9469
|
"name": "string"
|
|
@@ -9475,7 +9475,7 @@
|
|
|
9475
9475
|
"__schema": "VariableLikeSchema",
|
|
9476
9476
|
"location": {
|
|
9477
9477
|
"filePath": "merging.main.runtime.ts",
|
|
9478
|
-
"line":
|
|
9478
|
+
"line": 106,
|
|
9479
9479
|
"character": 3
|
|
9480
9480
|
},
|
|
9481
9481
|
"signature": "(property) newFromLaneAdded?: boolean | undefined",
|
|
@@ -9484,7 +9484,7 @@
|
|
|
9484
9484
|
"__schema": "KeywordTypeSchema",
|
|
9485
9485
|
"location": {
|
|
9486
9486
|
"filePath": "merging.main.runtime.ts",
|
|
9487
|
-
"line":
|
|
9487
|
+
"line": 106,
|
|
9488
9488
|
"character": 22
|
|
9489
9489
|
},
|
|
9490
9490
|
"name": "boolean"
|
|
@@ -9495,7 +9495,7 @@
|
|
|
9495
9495
|
"__schema": "VariableLikeSchema",
|
|
9496
9496
|
"location": {
|
|
9497
9497
|
"filePath": "merging.main.runtime.ts",
|
|
9498
|
-
"line":
|
|
9498
|
+
"line": 107,
|
|
9499
9499
|
"character": 3
|
|
9500
9500
|
},
|
|
9501
9501
|
"signature": "(property) installationError?: Error | undefined",
|
|
@@ -9504,7 +9504,7 @@
|
|
|
9504
9504
|
"__schema": "TypeRefSchema",
|
|
9505
9505
|
"location": {
|
|
9506
9506
|
"filePath": "merging.main.runtime.ts",
|
|
9507
|
-
"line":
|
|
9507
|
+
"line": 107,
|
|
9508
9508
|
"character": 23
|
|
9509
9509
|
},
|
|
9510
9510
|
"name": "Error"
|
|
@@ -9515,7 +9515,7 @@
|
|
|
9515
9515
|
"__schema": "VariableLikeSchema",
|
|
9516
9516
|
"location": {
|
|
9517
9517
|
"filePath": "merging.main.runtime.ts",
|
|
9518
|
-
"line":
|
|
9518
|
+
"line": 108,
|
|
9519
9519
|
"character": 3
|
|
9520
9520
|
},
|
|
9521
9521
|
"signature": "(property) compilationError?: Error | undefined",
|
|
@@ -9524,7 +9524,7 @@
|
|
|
9524
9524
|
"__schema": "TypeRefSchema",
|
|
9525
9525
|
"location": {
|
|
9526
9526
|
"filePath": "merging.main.runtime.ts",
|
|
9527
|
-
"line":
|
|
9527
|
+
"line": 108,
|
|
9528
9528
|
"character": 22
|
|
9529
9529
|
},
|
|
9530
9530
|
"name": "Error"
|
|
@@ -9535,7 +9535,7 @@
|
|
|
9535
9535
|
"__schema": "VariableLikeSchema",
|
|
9536
9536
|
"location": {
|
|
9537
9537
|
"filePath": "merging.main.runtime.ts",
|
|
9538
|
-
"line":
|
|
9538
|
+
"line": 109,
|
|
9539
9539
|
"character": 3
|
|
9540
9540
|
},
|
|
9541
9541
|
"signature": "(property) workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined",
|
|
@@ -9544,7 +9544,7 @@
|
|
|
9544
9544
|
"__schema": "TypeRefSchema",
|
|
9545
9545
|
"location": {
|
|
9546
9546
|
"filePath": "merging.main.runtime.ts",
|
|
9547
|
-
"line":
|
|
9547
|
+
"line": 109,
|
|
9548
9548
|
"character": 33
|
|
9549
9549
|
},
|
|
9550
9550
|
"name": "WorkspaceConfigUpdateResult",
|
|
@@ -9562,7 +9562,7 @@
|
|
|
9562
9562
|
"__schema": "ClassSchema",
|
|
9563
9563
|
"location": {
|
|
9564
9564
|
"filePath": "merging.main.runtime.ts",
|
|
9565
|
-
"line":
|
|
9565
|
+
"line": 112,
|
|
9566
9566
|
"character": 1
|
|
9567
9567
|
},
|
|
9568
9568
|
"signature": "class MergingMain",
|
|
@@ -9572,7 +9572,7 @@
|
|
|
9572
9572
|
"__schema": "ConstructorSchema",
|
|
9573
9573
|
"location": {
|
|
9574
9574
|
"filePath": "merging.main.runtime.ts",
|
|
9575
|
-
"line":
|
|
9575
|
+
"line": 113,
|
|
9576
9576
|
"character": 3
|
|
9577
9577
|
},
|
|
9578
9578
|
"signature": "constructor MergingMain(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain, depResolver: DependencyResolverMain): MergingMain",
|
|
@@ -9582,7 +9582,7 @@
|
|
|
9582
9582
|
"__schema": "ParameterSchema",
|
|
9583
9583
|
"location": {
|
|
9584
9584
|
"filePath": "merging.main.runtime.ts",
|
|
9585
|
-
"line":
|
|
9585
|
+
"line": 114,
|
|
9586
9586
|
"character": 5
|
|
9587
9587
|
},
|
|
9588
9588
|
"name": "workspace",
|
|
@@ -9590,7 +9590,7 @@
|
|
|
9590
9590
|
"__schema": "TypeRefSchema",
|
|
9591
9591
|
"location": {
|
|
9592
9592
|
"filePath": "merging.main.runtime.ts",
|
|
9593
|
-
"line":
|
|
9593
|
+
"line": 114,
|
|
9594
9594
|
"character": 24
|
|
9595
9595
|
},
|
|
9596
9596
|
"name": "Workspace",
|
|
@@ -9606,7 +9606,7 @@
|
|
|
9606
9606
|
"__schema": "ParameterSchema",
|
|
9607
9607
|
"location": {
|
|
9608
9608
|
"filePath": "merging.main.runtime.ts",
|
|
9609
|
-
"line":
|
|
9609
|
+
"line": 115,
|
|
9610
9610
|
"character": 5
|
|
9611
9611
|
},
|
|
9612
9612
|
"name": "scope",
|
|
@@ -9614,7 +9614,7 @@
|
|
|
9614
9614
|
"__schema": "TypeRefSchema",
|
|
9615
9615
|
"location": {
|
|
9616
9616
|
"filePath": "merging.main.runtime.ts",
|
|
9617
|
-
"line":
|
|
9617
|
+
"line": 115,
|
|
9618
9618
|
"character": 20
|
|
9619
9619
|
},
|
|
9620
9620
|
"name": "ScopeMain",
|
|
@@ -9630,7 +9630,7 @@
|
|
|
9630
9630
|
"__schema": "ParameterSchema",
|
|
9631
9631
|
"location": {
|
|
9632
9632
|
"filePath": "merging.main.runtime.ts",
|
|
9633
|
-
"line":
|
|
9633
|
+
"line": 116,
|
|
9634
9634
|
"character": 5
|
|
9635
9635
|
},
|
|
9636
9636
|
"name": "install",
|
|
@@ -9638,7 +9638,7 @@
|
|
|
9638
9638
|
"__schema": "TypeRefSchema",
|
|
9639
9639
|
"location": {
|
|
9640
9640
|
"filePath": "merging.main.runtime.ts",
|
|
9641
|
-
"line":
|
|
9641
|
+
"line": 116,
|
|
9642
9642
|
"character": 22
|
|
9643
9643
|
},
|
|
9644
9644
|
"name": "InstallMain",
|
|
@@ -9654,7 +9654,7 @@
|
|
|
9654
9654
|
"__schema": "ParameterSchema",
|
|
9655
9655
|
"location": {
|
|
9656
9656
|
"filePath": "merging.main.runtime.ts",
|
|
9657
|
-
"line":
|
|
9657
|
+
"line": 117,
|
|
9658
9658
|
"character": 5
|
|
9659
9659
|
},
|
|
9660
9660
|
"name": "snapping",
|
|
@@ -9662,7 +9662,7 @@
|
|
|
9662
9662
|
"__schema": "TypeRefSchema",
|
|
9663
9663
|
"location": {
|
|
9664
9664
|
"filePath": "merging.main.runtime.ts",
|
|
9665
|
-
"line":
|
|
9665
|
+
"line": 117,
|
|
9666
9666
|
"character": 23
|
|
9667
9667
|
},
|
|
9668
9668
|
"name": "SnappingMain",
|
|
@@ -9678,7 +9678,7 @@
|
|
|
9678
9678
|
"__schema": "ParameterSchema",
|
|
9679
9679
|
"location": {
|
|
9680
9680
|
"filePath": "merging.main.runtime.ts",
|
|
9681
|
-
"line":
|
|
9681
|
+
"line": 118,
|
|
9682
9682
|
"character": 5
|
|
9683
9683
|
},
|
|
9684
9684
|
"name": "checkout",
|
|
@@ -9686,7 +9686,7 @@
|
|
|
9686
9686
|
"__schema": "TypeRefSchema",
|
|
9687
9687
|
"location": {
|
|
9688
9688
|
"filePath": "merging.main.runtime.ts",
|
|
9689
|
-
"line":
|
|
9689
|
+
"line": 118,
|
|
9690
9690
|
"character": 23
|
|
9691
9691
|
},
|
|
9692
9692
|
"name": "CheckoutMain",
|
|
@@ -9702,7 +9702,7 @@
|
|
|
9702
9702
|
"__schema": "ParameterSchema",
|
|
9703
9703
|
"location": {
|
|
9704
9704
|
"filePath": "merging.main.runtime.ts",
|
|
9705
|
-
"line":
|
|
9705
|
+
"line": 119,
|
|
9706
9706
|
"character": 5
|
|
9707
9707
|
},
|
|
9708
9708
|
"name": "logger",
|
|
@@ -9710,7 +9710,7 @@
|
|
|
9710
9710
|
"__schema": "TypeRefSchema",
|
|
9711
9711
|
"location": {
|
|
9712
9712
|
"filePath": "merging.main.runtime.ts",
|
|
9713
|
-
"line":
|
|
9713
|
+
"line": 119,
|
|
9714
9714
|
"character": 21
|
|
9715
9715
|
},
|
|
9716
9716
|
"name": "Logger",
|
|
@@ -9726,7 +9726,7 @@
|
|
|
9726
9726
|
"__schema": "ParameterSchema",
|
|
9727
9727
|
"location": {
|
|
9728
9728
|
"filePath": "merging.main.runtime.ts",
|
|
9729
|
-
"line":
|
|
9729
|
+
"line": 120,
|
|
9730
9730
|
"character": 5
|
|
9731
9731
|
},
|
|
9732
9732
|
"name": "componentWriter",
|
|
@@ -9734,7 +9734,7 @@
|
|
|
9734
9734
|
"__schema": "TypeRefSchema",
|
|
9735
9735
|
"location": {
|
|
9736
9736
|
"filePath": "merging.main.runtime.ts",
|
|
9737
|
-
"line":
|
|
9737
|
+
"line": 120,
|
|
9738
9738
|
"character": 30
|
|
9739
9739
|
},
|
|
9740
9740
|
"name": "ComponentWriterMain",
|
|
@@ -9750,7 +9750,7 @@
|
|
|
9750
9750
|
"__schema": "ParameterSchema",
|
|
9751
9751
|
"location": {
|
|
9752
9752
|
"filePath": "merging.main.runtime.ts",
|
|
9753
|
-
"line":
|
|
9753
|
+
"line": 121,
|
|
9754
9754
|
"character": 5
|
|
9755
9755
|
},
|
|
9756
9756
|
"name": "importer",
|
|
@@ -9758,7 +9758,7 @@
|
|
|
9758
9758
|
"__schema": "TypeRefSchema",
|
|
9759
9759
|
"location": {
|
|
9760
9760
|
"filePath": "merging.main.runtime.ts",
|
|
9761
|
-
"line":
|
|
9761
|
+
"line": 121,
|
|
9762
9762
|
"character": 23
|
|
9763
9763
|
},
|
|
9764
9764
|
"name": "ImporterMain",
|
|
@@ -9774,7 +9774,7 @@
|
|
|
9774
9774
|
"__schema": "ParameterSchema",
|
|
9775
9775
|
"location": {
|
|
9776
9776
|
"filePath": "merging.main.runtime.ts",
|
|
9777
|
-
"line":
|
|
9777
|
+
"line": 122,
|
|
9778
9778
|
"character": 5
|
|
9779
9779
|
},
|
|
9780
9780
|
"name": "config",
|
|
@@ -9782,7 +9782,7 @@
|
|
|
9782
9782
|
"__schema": "TypeRefSchema",
|
|
9783
9783
|
"location": {
|
|
9784
9784
|
"filePath": "merging.main.runtime.ts",
|
|
9785
|
-
"line":
|
|
9785
|
+
"line": 122,
|
|
9786
9786
|
"character": 21
|
|
9787
9787
|
},
|
|
9788
9788
|
"name": "ConfigMain",
|
|
@@ -9798,7 +9798,7 @@
|
|
|
9798
9798
|
"__schema": "ParameterSchema",
|
|
9799
9799
|
"location": {
|
|
9800
9800
|
"filePath": "merging.main.runtime.ts",
|
|
9801
|
-
"line":
|
|
9801
|
+
"line": 123,
|
|
9802
9802
|
"character": 5
|
|
9803
9803
|
},
|
|
9804
9804
|
"name": "remove",
|
|
@@ -9806,7 +9806,7 @@
|
|
|
9806
9806
|
"__schema": "TypeRefSchema",
|
|
9807
9807
|
"location": {
|
|
9808
9808
|
"filePath": "merging.main.runtime.ts",
|
|
9809
|
-
"line":
|
|
9809
|
+
"line": 123,
|
|
9810
9810
|
"character": 21
|
|
9811
9811
|
},
|
|
9812
9812
|
"name": "RemoveMain",
|
|
@@ -9822,7 +9822,7 @@
|
|
|
9822
9822
|
"__schema": "ParameterSchema",
|
|
9823
9823
|
"location": {
|
|
9824
9824
|
"filePath": "merging.main.runtime.ts",
|
|
9825
|
-
"line":
|
|
9825
|
+
"line": 124,
|
|
9826
9826
|
"character": 5
|
|
9827
9827
|
},
|
|
9828
9828
|
"name": "configMerger",
|
|
@@ -9830,7 +9830,7 @@
|
|
|
9830
9830
|
"__schema": "TypeRefSchema",
|
|
9831
9831
|
"location": {
|
|
9832
9832
|
"filePath": "merging.main.runtime.ts",
|
|
9833
|
-
"line":
|
|
9833
|
+
"line": 124,
|
|
9834
9834
|
"character": 27
|
|
9835
9835
|
},
|
|
9836
9836
|
"name": "ConfigMergerMain",
|
|
@@ -9846,7 +9846,7 @@
|
|
|
9846
9846
|
"__schema": "ParameterSchema",
|
|
9847
9847
|
"location": {
|
|
9848
9848
|
"filePath": "merging.main.runtime.ts",
|
|
9849
|
-
"line":
|
|
9849
|
+
"line": 125,
|
|
9850
9850
|
"character": 5
|
|
9851
9851
|
},
|
|
9852
9852
|
"name": "depResolver",
|
|
@@ -9854,7 +9854,7 @@
|
|
|
9854
9854
|
"__schema": "TypeRefSchema",
|
|
9855
9855
|
"location": {
|
|
9856
9856
|
"filePath": "merging.main.runtime.ts",
|
|
9857
|
-
"line":
|
|
9857
|
+
"line": 125,
|
|
9858
9858
|
"character": 26
|
|
9859
9859
|
},
|
|
9860
9860
|
"name": "DependencyResolverMain",
|
|
@@ -9871,7 +9871,7 @@
|
|
|
9871
9871
|
"__schema": "ThisTypeSchema",
|
|
9872
9872
|
"location": {
|
|
9873
9873
|
"filePath": "merging.main.runtime.ts",
|
|
9874
|
-
"line":
|
|
9874
|
+
"line": 112,
|
|
9875
9875
|
"character": 1
|
|
9876
9876
|
},
|
|
9877
9877
|
"name": "MergingMain"
|
|
@@ -9882,7 +9882,7 @@
|
|
|
9882
9882
|
"__schema": "FunctionLikeSchema",
|
|
9883
9883
|
"location": {
|
|
9884
9884
|
"filePath": "merging.main.runtime.ts",
|
|
9885
|
-
"line":
|
|
9885
|
+
"line": 128,
|
|
9886
9886
|
"character": 3
|
|
9887
9887
|
},
|
|
9888
9888
|
"signature": "(method) MergingMain.merge(pattern: string, mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>",
|
|
@@ -9892,7 +9892,7 @@
|
|
|
9892
9892
|
"__schema": "ParameterSchema",
|
|
9893
9893
|
"location": {
|
|
9894
9894
|
"filePath": "merging.main.runtime.ts",
|
|
9895
|
-
"line":
|
|
9895
|
+
"line": 129,
|
|
9896
9896
|
"character": 5
|
|
9897
9897
|
},
|
|
9898
9898
|
"name": "pattern",
|
|
@@ -9900,7 +9900,7 @@
|
|
|
9900
9900
|
"__schema": "KeywordTypeSchema",
|
|
9901
9901
|
"location": {
|
|
9902
9902
|
"filePath": "merging.main.runtime.ts",
|
|
9903
|
-
"line":
|
|
9903
|
+
"line": 129,
|
|
9904
9904
|
"character": 14
|
|
9905
9905
|
},
|
|
9906
9906
|
"name": "string"
|
|
@@ -9912,7 +9912,7 @@
|
|
|
9912
9912
|
"__schema": "ParameterSchema",
|
|
9913
9913
|
"location": {
|
|
9914
9914
|
"filePath": "merging.main.runtime.ts",
|
|
9915
|
-
"line":
|
|
9915
|
+
"line": 130,
|
|
9916
9916
|
"character": 5
|
|
9917
9917
|
},
|
|
9918
9918
|
"name": "mergeStrategy",
|
|
@@ -9920,7 +9920,7 @@
|
|
|
9920
9920
|
"__schema": "TypeRefSchema",
|
|
9921
9921
|
"location": {
|
|
9922
9922
|
"filePath": "merging.main.runtime.ts",
|
|
9923
|
-
"line":
|
|
9923
|
+
"line": 130,
|
|
9924
9924
|
"character": 20
|
|
9925
9925
|
},
|
|
9926
9926
|
"name": "MergeStrategy"
|
|
@@ -9932,7 +9932,7 @@
|
|
|
9932
9932
|
"__schema": "ParameterSchema",
|
|
9933
9933
|
"location": {
|
|
9934
9934
|
"filePath": "merging.main.runtime.ts",
|
|
9935
|
-
"line":
|
|
9935
|
+
"line": 131,
|
|
9936
9936
|
"character": 5
|
|
9937
9937
|
},
|
|
9938
9938
|
"name": "abort",
|
|
@@ -9940,7 +9940,7 @@
|
|
|
9940
9940
|
"__schema": "KeywordTypeSchema",
|
|
9941
9941
|
"location": {
|
|
9942
9942
|
"filePath": "merging.main.runtime.ts",
|
|
9943
|
-
"line":
|
|
9943
|
+
"line": 131,
|
|
9944
9944
|
"character": 12
|
|
9945
9945
|
},
|
|
9946
9946
|
"name": "boolean"
|
|
@@ -9952,7 +9952,7 @@
|
|
|
9952
9952
|
"__schema": "ParameterSchema",
|
|
9953
9953
|
"location": {
|
|
9954
9954
|
"filePath": "merging.main.runtime.ts",
|
|
9955
|
-
"line":
|
|
9955
|
+
"line": 132,
|
|
9956
9956
|
"character": 5
|
|
9957
9957
|
},
|
|
9958
9958
|
"name": "resolve",
|
|
@@ -9960,7 +9960,7 @@
|
|
|
9960
9960
|
"__schema": "KeywordTypeSchema",
|
|
9961
9961
|
"location": {
|
|
9962
9962
|
"filePath": "merging.main.runtime.ts",
|
|
9963
|
-
"line":
|
|
9963
|
+
"line": 132,
|
|
9964
9964
|
"character": 14
|
|
9965
9965
|
},
|
|
9966
9966
|
"name": "boolean"
|
|
@@ -9972,7 +9972,7 @@
|
|
|
9972
9972
|
"__schema": "ParameterSchema",
|
|
9973
9973
|
"location": {
|
|
9974
9974
|
"filePath": "merging.main.runtime.ts",
|
|
9975
|
-
"line":
|
|
9975
|
+
"line": 133,
|
|
9976
9976
|
"character": 5
|
|
9977
9977
|
},
|
|
9978
9978
|
"name": "noSnap",
|
|
@@ -9980,7 +9980,7 @@
|
|
|
9980
9980
|
"__schema": "KeywordTypeSchema",
|
|
9981
9981
|
"location": {
|
|
9982
9982
|
"filePath": "merging.main.runtime.ts",
|
|
9983
|
-
"line":
|
|
9983
|
+
"line": 133,
|
|
9984
9984
|
"character": 13
|
|
9985
9985
|
},
|
|
9986
9986
|
"name": "boolean"
|
|
@@ -9992,7 +9992,7 @@
|
|
|
9992
9992
|
"__schema": "ParameterSchema",
|
|
9993
9993
|
"location": {
|
|
9994
9994
|
"filePath": "merging.main.runtime.ts",
|
|
9995
|
-
"line":
|
|
9995
|
+
"line": 134,
|
|
9996
9996
|
"character": 5
|
|
9997
9997
|
},
|
|
9998
9998
|
"name": "message",
|
|
@@ -10000,7 +10000,7 @@
|
|
|
10000
10000
|
"__schema": "KeywordTypeSchema",
|
|
10001
10001
|
"location": {
|
|
10002
10002
|
"filePath": "merging.main.runtime.ts",
|
|
10003
|
-
"line":
|
|
10003
|
+
"line": 134,
|
|
10004
10004
|
"character": 14
|
|
10005
10005
|
},
|
|
10006
10006
|
"name": "string"
|
|
@@ -10012,7 +10012,7 @@
|
|
|
10012
10012
|
"__schema": "ParameterSchema",
|
|
10013
10013
|
"location": {
|
|
10014
10014
|
"filePath": "merging.main.runtime.ts",
|
|
10015
|
-
"line":
|
|
10015
|
+
"line": 135,
|
|
10016
10016
|
"character": 5
|
|
10017
10017
|
},
|
|
10018
10018
|
"name": "build",
|
|
@@ -10020,7 +10020,7 @@
|
|
|
10020
10020
|
"__schema": "KeywordTypeSchema",
|
|
10021
10021
|
"location": {
|
|
10022
10022
|
"filePath": "merging.main.runtime.ts",
|
|
10023
|
-
"line":
|
|
10023
|
+
"line": 135,
|
|
10024
10024
|
"character": 12
|
|
10025
10025
|
},
|
|
10026
10026
|
"name": "boolean"
|
|
@@ -10032,7 +10032,7 @@
|
|
|
10032
10032
|
"__schema": "ParameterSchema",
|
|
10033
10033
|
"location": {
|
|
10034
10034
|
"filePath": "merging.main.runtime.ts",
|
|
10035
|
-
"line":
|
|
10035
|
+
"line": 136,
|
|
10036
10036
|
"character": 5
|
|
10037
10037
|
},
|
|
10038
10038
|
"name": "skipDependencyInstallation",
|
|
@@ -10040,7 +10040,7 @@
|
|
|
10040
10040
|
"__schema": "KeywordTypeSchema",
|
|
10041
10041
|
"location": {
|
|
10042
10042
|
"filePath": "merging.main.runtime.ts",
|
|
10043
|
-
"line":
|
|
10043
|
+
"line": 136,
|
|
10044
10044
|
"character": 33
|
|
10045
10045
|
},
|
|
10046
10046
|
"name": "boolean"
|
|
@@ -10053,7 +10053,7 @@
|
|
|
10053
10053
|
"__schema": "TypeRefSchema",
|
|
10054
10054
|
"location": {
|
|
10055
10055
|
"filePath": "merging.main.runtime.ts",
|
|
10056
|
-
"line":
|
|
10056
|
+
"line": 137,
|
|
10057
10057
|
"character": 6
|
|
10058
10058
|
},
|
|
10059
10059
|
"name": "Promise",
|
|
@@ -10062,7 +10062,7 @@
|
|
|
10062
10062
|
"__schema": "TypeRefSchema",
|
|
10063
10063
|
"location": {
|
|
10064
10064
|
"filePath": "merging.main.runtime.ts",
|
|
10065
|
-
"line":
|
|
10065
|
+
"line": 137,
|
|
10066
10066
|
"character": 14
|
|
10067
10067
|
},
|
|
10068
10068
|
"name": "ApplyVersionResults"
|
|
@@ -10077,14 +10077,14 @@
|
|
|
10077
10077
|
"__schema": "FunctionLikeSchema",
|
|
10078
10078
|
"location": {
|
|
10079
10079
|
"filePath": "merging.main.runtime.ts",
|
|
10080
|
-
"line":
|
|
10080
|
+
"line": 165,
|
|
10081
10081
|
"character": 3
|
|
10082
10082
|
},
|
|
10083
10083
|
"doc": {
|
|
10084
10084
|
"__schema": "DocSchema",
|
|
10085
10085
|
"location": {
|
|
10086
10086
|
"filePath": "merging.main.runtime.ts",
|
|
10087
|
-
"line":
|
|
10087
|
+
"line": 161,
|
|
10088
10088
|
"character": 3
|
|
10089
10089
|
},
|
|
10090
10090
|
"raw": "/**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */",
|
|
@@ -10098,7 +10098,7 @@
|
|
|
10098
10098
|
"__schema": "ParameterSchema",
|
|
10099
10099
|
"location": {
|
|
10100
10100
|
"filePath": "merging.main.runtime.ts",
|
|
10101
|
-
"line":
|
|
10101
|
+
"line": 166,
|
|
10102
10102
|
"character": 5
|
|
10103
10103
|
},
|
|
10104
10104
|
"name": "consumer",
|
|
@@ -10106,7 +10106,7 @@
|
|
|
10106
10106
|
"__schema": "TypeRefSchema",
|
|
10107
10107
|
"location": {
|
|
10108
10108
|
"filePath": "merging.main.runtime.ts",
|
|
10109
|
-
"line":
|
|
10109
|
+
"line": 166,
|
|
10110
10110
|
"character": 15
|
|
10111
10111
|
},
|
|
10112
10112
|
"name": "Consumer",
|
|
@@ -10119,7 +10119,7 @@
|
|
|
10119
10119
|
"__schema": "ParameterSchema",
|
|
10120
10120
|
"location": {
|
|
10121
10121
|
"filePath": "merging.main.runtime.ts",
|
|
10122
|
-
"line":
|
|
10122
|
+
"line": 167,
|
|
10123
10123
|
"character": 5
|
|
10124
10124
|
},
|
|
10125
10125
|
"name": "bitIds",
|
|
@@ -10127,14 +10127,14 @@
|
|
|
10127
10127
|
"__schema": "TypeArraySchema",
|
|
10128
10128
|
"location": {
|
|
10129
10129
|
"filePath": "merging.main.runtime.ts",
|
|
10130
|
-
"line":
|
|
10130
|
+
"line": 167,
|
|
10131
10131
|
"character": 13
|
|
10132
10132
|
},
|
|
10133
10133
|
"type": {
|
|
10134
10134
|
"__schema": "TypeRefSchema",
|
|
10135
10135
|
"location": {
|
|
10136
10136
|
"filePath": "merging.main.runtime.ts",
|
|
10137
|
-
"line":
|
|
10137
|
+
"line": 167,
|
|
10138
10138
|
"character": 13
|
|
10139
10139
|
},
|
|
10140
10140
|
"name": "ComponentID",
|
|
@@ -10152,7 +10152,7 @@
|
|
|
10152
10152
|
"__schema": "ParameterSchema",
|
|
10153
10153
|
"location": {
|
|
10154
10154
|
"filePath": "merging.main.runtime.ts",
|
|
10155
|
-
"line":
|
|
10155
|
+
"line": 168,
|
|
10156
10156
|
"character": 5
|
|
10157
10157
|
},
|
|
10158
10158
|
"name": "mergeStrategy",
|
|
@@ -10160,7 +10160,7 @@
|
|
|
10160
10160
|
"__schema": "TypeRefSchema",
|
|
10161
10161
|
"location": {
|
|
10162
10162
|
"filePath": "merging.main.runtime.ts",
|
|
10163
|
-
"line":
|
|
10163
|
+
"line": 168,
|
|
10164
10164
|
"character": 20
|
|
10165
10165
|
},
|
|
10166
10166
|
"name": "MergeStrategy"
|
|
@@ -10172,7 +10172,7 @@
|
|
|
10172
10172
|
"__schema": "ParameterSchema",
|
|
10173
10173
|
"location": {
|
|
10174
10174
|
"filePath": "merging.main.runtime.ts",
|
|
10175
|
-
"line":
|
|
10175
|
+
"line": 169,
|
|
10176
10176
|
"character": 5
|
|
10177
10177
|
},
|
|
10178
10178
|
"name": "noSnap",
|
|
@@ -10180,7 +10180,7 @@
|
|
|
10180
10180
|
"__schema": "KeywordTypeSchema",
|
|
10181
10181
|
"location": {
|
|
10182
10182
|
"filePath": "merging.main.runtime.ts",
|
|
10183
|
-
"line":
|
|
10183
|
+
"line": 169,
|
|
10184
10184
|
"character": 13
|
|
10185
10185
|
},
|
|
10186
10186
|
"name": "boolean"
|
|
@@ -10192,7 +10192,7 @@
|
|
|
10192
10192
|
"__schema": "ParameterSchema",
|
|
10193
10193
|
"location": {
|
|
10194
10194
|
"filePath": "merging.main.runtime.ts",
|
|
10195
|
-
"line":
|
|
10195
|
+
"line": 170,
|
|
10196
10196
|
"character": 5
|
|
10197
10197
|
},
|
|
10198
10198
|
"name": "snapMessage",
|
|
@@ -10200,7 +10200,7 @@
|
|
|
10200
10200
|
"__schema": "KeywordTypeSchema",
|
|
10201
10201
|
"location": {
|
|
10202
10202
|
"filePath": "merging.main.runtime.ts",
|
|
10203
|
-
"line":
|
|
10203
|
+
"line": 170,
|
|
10204
10204
|
"character": 18
|
|
10205
10205
|
},
|
|
10206
10206
|
"name": "string"
|
|
@@ -10212,7 +10212,7 @@
|
|
|
10212
10212
|
"__schema": "ParameterSchema",
|
|
10213
10213
|
"location": {
|
|
10214
10214
|
"filePath": "merging.main.runtime.ts",
|
|
10215
|
-
"line":
|
|
10215
|
+
"line": 171,
|
|
10216
10216
|
"character": 5
|
|
10217
10217
|
},
|
|
10218
10218
|
"name": "build",
|
|
@@ -10220,7 +10220,7 @@
|
|
|
10220
10220
|
"__schema": "KeywordTypeSchema",
|
|
10221
10221
|
"location": {
|
|
10222
10222
|
"filePath": "merging.main.runtime.ts",
|
|
10223
|
-
"line":
|
|
10223
|
+
"line": 171,
|
|
10224
10224
|
"character": 12
|
|
10225
10225
|
},
|
|
10226
10226
|
"name": "boolean"
|
|
@@ -10232,7 +10232,7 @@
|
|
|
10232
10232
|
"__schema": "ParameterSchema",
|
|
10233
10233
|
"location": {
|
|
10234
10234
|
"filePath": "merging.main.runtime.ts",
|
|
10235
|
-
"line":
|
|
10235
|
+
"line": 172,
|
|
10236
10236
|
"character": 5
|
|
10237
10237
|
},
|
|
10238
10238
|
"name": "skipDependencyInstallation",
|
|
@@ -10240,7 +10240,7 @@
|
|
|
10240
10240
|
"__schema": "KeywordTypeSchema",
|
|
10241
10241
|
"location": {
|
|
10242
10242
|
"filePath": "merging.main.runtime.ts",
|
|
10243
|
-
"line":
|
|
10243
|
+
"line": 172,
|
|
10244
10244
|
"character": 33
|
|
10245
10245
|
},
|
|
10246
10246
|
"name": "boolean"
|
|
@@ -10253,7 +10253,7 @@
|
|
|
10253
10253
|
"__schema": "TypeRefSchema",
|
|
10254
10254
|
"location": {
|
|
10255
10255
|
"filePath": "merging.main.runtime.ts",
|
|
10256
|
-
"line":
|
|
10256
|
+
"line": 173,
|
|
10257
10257
|
"character": 6
|
|
10258
10258
|
},
|
|
10259
10259
|
"name": "Promise",
|
|
@@ -10262,7 +10262,7 @@
|
|
|
10262
10262
|
"__schema": "TypeRefSchema",
|
|
10263
10263
|
"location": {
|
|
10264
10264
|
"filePath": "merging.main.runtime.ts",
|
|
10265
|
-
"line":
|
|
10265
|
+
"line": 173,
|
|
10266
10266
|
"character": 14
|
|
10267
10267
|
},
|
|
10268
10268
|
"name": "ApplyVersionResults"
|
|
@@ -10277,14 +10277,14 @@
|
|
|
10277
10277
|
"__schema": "FunctionLikeSchema",
|
|
10278
10278
|
"location": {
|
|
10279
10279
|
"filePath": "merging.main.runtime.ts",
|
|
10280
|
-
"line":
|
|
10280
|
+
"line": 208,
|
|
10281
10281
|
"character": 3
|
|
10282
10282
|
},
|
|
10283
10283
|
"doc": {
|
|
10284
10284
|
"__schema": "DocSchema",
|
|
10285
10285
|
"location": {
|
|
10286
10286
|
"filePath": "merging.main.runtime.ts",
|
|
10287
|
-
"line":
|
|
10287
|
+
"line": 205,
|
|
10288
10288
|
"character": 3
|
|
10289
10289
|
},
|
|
10290
10290
|
"raw": "/**\n * merge multiple components according to the \"allComponentsStatus\".\n */",
|
|
@@ -10298,7 +10298,7 @@
|
|
|
10298
10298
|
"__schema": "ParameterSchema",
|
|
10299
10299
|
"location": {
|
|
10300
10300
|
"filePath": "merging.main.runtime.ts",
|
|
10301
|
-
"line":
|
|
10301
|
+
"line": 208,
|
|
10302
10302
|
"character": 20
|
|
10303
10303
|
},
|
|
10304
10304
|
"name": "{ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noSnap, tag, snapMessage, build, skipDependencyInstallation }",
|
|
@@ -10306,7 +10306,7 @@
|
|
|
10306
10306
|
"__schema": "TypeLiteralSchema",
|
|
10307
10307
|
"location": {
|
|
10308
10308
|
"filePath": "merging.main.runtime.ts",
|
|
10309
|
-
"line":
|
|
10309
|
+
"line": 218,
|
|
10310
10310
|
"character": 6
|
|
10311
10311
|
},
|
|
10312
10312
|
"members": [
|
|
@@ -10314,7 +10314,7 @@
|
|
|
10314
10314
|
"__schema": "VariableLikeSchema",
|
|
10315
10315
|
"location": {
|
|
10316
10316
|
"filePath": "merging.main.runtime.ts",
|
|
10317
|
-
"line":
|
|
10317
|
+
"line": 219,
|
|
10318
10318
|
"character": 5
|
|
10319
10319
|
},
|
|
10320
10320
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -10323,7 +10323,7 @@
|
|
|
10323
10323
|
"__schema": "TypeRefSchema",
|
|
10324
10324
|
"location": {
|
|
10325
10325
|
"filePath": "merging.main.runtime.ts",
|
|
10326
|
-
"line":
|
|
10326
|
+
"line": 219,
|
|
10327
10327
|
"character": 20
|
|
10328
10328
|
},
|
|
10329
10329
|
"name": "MergeStrategy"
|
|
@@ -10334,7 +10334,7 @@
|
|
|
10334
10334
|
"__schema": "VariableLikeSchema",
|
|
10335
10335
|
"location": {
|
|
10336
10336
|
"filePath": "merging.main.runtime.ts",
|
|
10337
|
-
"line":
|
|
10337
|
+
"line": 220,
|
|
10338
10338
|
"character": 5
|
|
10339
10339
|
},
|
|
10340
10340
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -10343,14 +10343,14 @@
|
|
|
10343
10343
|
"__schema": "TypeArraySchema",
|
|
10344
10344
|
"location": {
|
|
10345
10345
|
"filePath": "merging.main.runtime.ts",
|
|
10346
|
-
"line":
|
|
10346
|
+
"line": 220,
|
|
10347
10347
|
"character": 26
|
|
10348
10348
|
},
|
|
10349
10349
|
"type": {
|
|
10350
10350
|
"__schema": "TypeRefSchema",
|
|
10351
10351
|
"location": {
|
|
10352
10352
|
"filePath": "merging.main.runtime.ts",
|
|
10353
|
-
"line":
|
|
10353
|
+
"line": 220,
|
|
10354
10354
|
"character": 26
|
|
10355
10355
|
},
|
|
10356
10356
|
"name": "ComponentMergeStatus"
|
|
@@ -10362,7 +10362,7 @@
|
|
|
10362
10362
|
"__schema": "VariableLikeSchema",
|
|
10363
10363
|
"location": {
|
|
10364
10364
|
"filePath": "merging.main.runtime.ts",
|
|
10365
|
-
"line":
|
|
10365
|
+
"line": 221,
|
|
10366
10366
|
"character": 5
|
|
10367
10367
|
},
|
|
10368
10368
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -10371,7 +10371,7 @@
|
|
|
10371
10371
|
"__schema": "TypeRefSchema",
|
|
10372
10372
|
"location": {
|
|
10373
10373
|
"filePath": "merging.main.runtime.ts",
|
|
10374
|
-
"line":
|
|
10374
|
+
"line": 221,
|
|
10375
10375
|
"character": 5
|
|
10376
10376
|
},
|
|
10377
10377
|
"name": "LaneId",
|
|
@@ -10387,7 +10387,7 @@
|
|
|
10387
10387
|
"__schema": "VariableLikeSchema",
|
|
10388
10388
|
"location": {
|
|
10389
10389
|
"filePath": "merging.main.runtime.ts",
|
|
10390
|
-
"line":
|
|
10390
|
+
"line": 222,
|
|
10391
10391
|
"character": 5
|
|
10392
10392
|
},
|
|
10393
10393
|
"signature": "(property) currentLane?: Lane | undefined",
|
|
@@ -10396,7 +10396,7 @@
|
|
|
10396
10396
|
"__schema": "TypeRefSchema",
|
|
10397
10397
|
"location": {
|
|
10398
10398
|
"filePath": "merging.main.runtime.ts",
|
|
10399
|
-
"line":
|
|
10399
|
+
"line": 222,
|
|
10400
10400
|
"character": 19
|
|
10401
10401
|
},
|
|
10402
10402
|
"name": "Lane",
|
|
@@ -10408,7 +10408,7 @@
|
|
|
10408
10408
|
"__schema": "VariableLikeSchema",
|
|
10409
10409
|
"location": {
|
|
10410
10410
|
"filePath": "merging.main.runtime.ts",
|
|
10411
|
-
"line":
|
|
10411
|
+
"line": 223,
|
|
10412
10412
|
"character": 5
|
|
10413
10413
|
},
|
|
10414
10414
|
"signature": "(property) noSnap?: boolean | undefined",
|
|
@@ -10417,7 +10417,7 @@
|
|
|
10417
10417
|
"__schema": "KeywordTypeSchema",
|
|
10418
10418
|
"location": {
|
|
10419
10419
|
"filePath": "merging.main.runtime.ts",
|
|
10420
|
-
"line":
|
|
10420
|
+
"line": 223,
|
|
10421
10421
|
"character": 14
|
|
10422
10422
|
},
|
|
10423
10423
|
"name": "boolean"
|
|
@@ -10428,7 +10428,7 @@
|
|
|
10428
10428
|
"__schema": "VariableLikeSchema",
|
|
10429
10429
|
"location": {
|
|
10430
10430
|
"filePath": "merging.main.runtime.ts",
|
|
10431
|
-
"line":
|
|
10431
|
+
"line": 224,
|
|
10432
10432
|
"character": 5
|
|
10433
10433
|
},
|
|
10434
10434
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -10437,7 +10437,7 @@
|
|
|
10437
10437
|
"__schema": "KeywordTypeSchema",
|
|
10438
10438
|
"location": {
|
|
10439
10439
|
"filePath": "merging.main.runtime.ts",
|
|
10440
|
-
"line":
|
|
10440
|
+
"line": 224,
|
|
10441
10441
|
"character": 11
|
|
10442
10442
|
},
|
|
10443
10443
|
"name": "boolean"
|
|
@@ -10448,7 +10448,7 @@
|
|
|
10448
10448
|
"__schema": "VariableLikeSchema",
|
|
10449
10449
|
"location": {
|
|
10450
10450
|
"filePath": "merging.main.runtime.ts",
|
|
10451
|
-
"line":
|
|
10451
|
+
"line": 225,
|
|
10452
10452
|
"character": 5
|
|
10453
10453
|
},
|
|
10454
10454
|
"signature": "(property) snapMessage?: string | undefined",
|
|
@@ -10457,7 +10457,7 @@
|
|
|
10457
10457
|
"__schema": "KeywordTypeSchema",
|
|
10458
10458
|
"location": {
|
|
10459
10459
|
"filePath": "merging.main.runtime.ts",
|
|
10460
|
-
"line":
|
|
10460
|
+
"line": 225,
|
|
10461
10461
|
"character": 19
|
|
10462
10462
|
},
|
|
10463
10463
|
"name": "string"
|
|
@@ -10468,7 +10468,7 @@
|
|
|
10468
10468
|
"__schema": "VariableLikeSchema",
|
|
10469
10469
|
"location": {
|
|
10470
10470
|
"filePath": "merging.main.runtime.ts",
|
|
10471
|
-
"line":
|
|
10471
|
+
"line": 226,
|
|
10472
10472
|
"character": 5
|
|
10473
10473
|
},
|
|
10474
10474
|
"signature": "(property) build?: boolean | undefined",
|
|
@@ -10477,7 +10477,7 @@
|
|
|
10477
10477
|
"__schema": "KeywordTypeSchema",
|
|
10478
10478
|
"location": {
|
|
10479
10479
|
"filePath": "merging.main.runtime.ts",
|
|
10480
|
-
"line":
|
|
10480
|
+
"line": 226,
|
|
10481
10481
|
"character": 13
|
|
10482
10482
|
},
|
|
10483
10483
|
"name": "boolean"
|
|
@@ -10488,7 +10488,7 @@
|
|
|
10488
10488
|
"__schema": "VariableLikeSchema",
|
|
10489
10489
|
"location": {
|
|
10490
10490
|
"filePath": "merging.main.runtime.ts",
|
|
10491
|
-
"line":
|
|
10491
|
+
"line": 227,
|
|
10492
10492
|
"character": 5
|
|
10493
10493
|
},
|
|
10494
10494
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -10497,7 +10497,7 @@
|
|
|
10497
10497
|
"__schema": "KeywordTypeSchema",
|
|
10498
10498
|
"location": {
|
|
10499
10499
|
"filePath": "merging.main.runtime.ts",
|
|
10500
|
-
"line":
|
|
10500
|
+
"line": 227,
|
|
10501
10501
|
"character": 34
|
|
10502
10502
|
},
|
|
10503
10503
|
"name": "boolean"
|
|
@@ -10512,7 +10512,7 @@
|
|
|
10512
10512
|
"__schema": "VariableLikeSchema",
|
|
10513
10513
|
"location": {
|
|
10514
10514
|
"filePath": "merging.main.runtime.ts",
|
|
10515
|
-
"line":
|
|
10515
|
+
"line": 219,
|
|
10516
10516
|
"character": 5
|
|
10517
10517
|
},
|
|
10518
10518
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -10521,7 +10521,7 @@
|
|
|
10521
10521
|
"__schema": "TypeRefSchema",
|
|
10522
10522
|
"location": {
|
|
10523
10523
|
"filePath": "merging.main.runtime.ts",
|
|
10524
|
-
"line":
|
|
10524
|
+
"line": 219,
|
|
10525
10525
|
"character": 20
|
|
10526
10526
|
},
|
|
10527
10527
|
"name": "MergeStrategy"
|
|
@@ -10532,7 +10532,7 @@
|
|
|
10532
10532
|
"__schema": "VariableLikeSchema",
|
|
10533
10533
|
"location": {
|
|
10534
10534
|
"filePath": "merging.main.runtime.ts",
|
|
10535
|
-
"line":
|
|
10535
|
+
"line": 220,
|
|
10536
10536
|
"character": 5
|
|
10537
10537
|
},
|
|
10538
10538
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -10541,14 +10541,14 @@
|
|
|
10541
10541
|
"__schema": "TypeArraySchema",
|
|
10542
10542
|
"location": {
|
|
10543
10543
|
"filePath": "merging.main.runtime.ts",
|
|
10544
|
-
"line":
|
|
10544
|
+
"line": 220,
|
|
10545
10545
|
"character": 26
|
|
10546
10546
|
},
|
|
10547
10547
|
"type": {
|
|
10548
10548
|
"__schema": "TypeRefSchema",
|
|
10549
10549
|
"location": {
|
|
10550
10550
|
"filePath": "merging.main.runtime.ts",
|
|
10551
|
-
"line":
|
|
10551
|
+
"line": 220,
|
|
10552
10552
|
"character": 26
|
|
10553
10553
|
},
|
|
10554
10554
|
"name": "ComponentMergeStatus"
|
|
@@ -10560,7 +10560,7 @@
|
|
|
10560
10560
|
"__schema": "VariableLikeSchema",
|
|
10561
10561
|
"location": {
|
|
10562
10562
|
"filePath": "merging.main.runtime.ts",
|
|
10563
|
-
"line":
|
|
10563
|
+
"line": 221,
|
|
10564
10564
|
"character": 5
|
|
10565
10565
|
},
|
|
10566
10566
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -10569,7 +10569,7 @@
|
|
|
10569
10569
|
"__schema": "TypeRefSchema",
|
|
10570
10570
|
"location": {
|
|
10571
10571
|
"filePath": "merging.main.runtime.ts",
|
|
10572
|
-
"line":
|
|
10572
|
+
"line": 221,
|
|
10573
10573
|
"character": 5
|
|
10574
10574
|
},
|
|
10575
10575
|
"name": "LaneId",
|
|
@@ -10585,7 +10585,7 @@
|
|
|
10585
10585
|
"__schema": "VariableLikeSchema",
|
|
10586
10586
|
"location": {
|
|
10587
10587
|
"filePath": "merging.main.runtime.ts",
|
|
10588
|
-
"line":
|
|
10588
|
+
"line": 222,
|
|
10589
10589
|
"character": 5
|
|
10590
10590
|
},
|
|
10591
10591
|
"signature": "(property) currentLane?: Lane | undefined",
|
|
@@ -10594,7 +10594,7 @@
|
|
|
10594
10594
|
"__schema": "TypeRefSchema",
|
|
10595
10595
|
"location": {
|
|
10596
10596
|
"filePath": "merging.main.runtime.ts",
|
|
10597
|
-
"line":
|
|
10597
|
+
"line": 222,
|
|
10598
10598
|
"character": 19
|
|
10599
10599
|
},
|
|
10600
10600
|
"name": "Lane",
|
|
@@ -10606,7 +10606,7 @@
|
|
|
10606
10606
|
"__schema": "VariableLikeSchema",
|
|
10607
10607
|
"location": {
|
|
10608
10608
|
"filePath": "merging.main.runtime.ts",
|
|
10609
|
-
"line":
|
|
10609
|
+
"line": 223,
|
|
10610
10610
|
"character": 5
|
|
10611
10611
|
},
|
|
10612
10612
|
"signature": "(property) noSnap?: boolean | undefined",
|
|
@@ -10615,7 +10615,7 @@
|
|
|
10615
10615
|
"__schema": "KeywordTypeSchema",
|
|
10616
10616
|
"location": {
|
|
10617
10617
|
"filePath": "merging.main.runtime.ts",
|
|
10618
|
-
"line":
|
|
10618
|
+
"line": 223,
|
|
10619
10619
|
"character": 14
|
|
10620
10620
|
},
|
|
10621
10621
|
"name": "boolean"
|
|
@@ -10626,7 +10626,7 @@
|
|
|
10626
10626
|
"__schema": "VariableLikeSchema",
|
|
10627
10627
|
"location": {
|
|
10628
10628
|
"filePath": "merging.main.runtime.ts",
|
|
10629
|
-
"line":
|
|
10629
|
+
"line": 224,
|
|
10630
10630
|
"character": 5
|
|
10631
10631
|
},
|
|
10632
10632
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -10635,7 +10635,7 @@
|
|
|
10635
10635
|
"__schema": "KeywordTypeSchema",
|
|
10636
10636
|
"location": {
|
|
10637
10637
|
"filePath": "merging.main.runtime.ts",
|
|
10638
|
-
"line":
|
|
10638
|
+
"line": 224,
|
|
10639
10639
|
"character": 11
|
|
10640
10640
|
},
|
|
10641
10641
|
"name": "boolean"
|
|
@@ -10646,7 +10646,7 @@
|
|
|
10646
10646
|
"__schema": "VariableLikeSchema",
|
|
10647
10647
|
"location": {
|
|
10648
10648
|
"filePath": "merging.main.runtime.ts",
|
|
10649
|
-
"line":
|
|
10649
|
+
"line": 225,
|
|
10650
10650
|
"character": 5
|
|
10651
10651
|
},
|
|
10652
10652
|
"signature": "(property) snapMessage?: string | undefined",
|
|
@@ -10655,7 +10655,7 @@
|
|
|
10655
10655
|
"__schema": "KeywordTypeSchema",
|
|
10656
10656
|
"location": {
|
|
10657
10657
|
"filePath": "merging.main.runtime.ts",
|
|
10658
|
-
"line":
|
|
10658
|
+
"line": 225,
|
|
10659
10659
|
"character": 19
|
|
10660
10660
|
},
|
|
10661
10661
|
"name": "string"
|
|
@@ -10666,7 +10666,7 @@
|
|
|
10666
10666
|
"__schema": "VariableLikeSchema",
|
|
10667
10667
|
"location": {
|
|
10668
10668
|
"filePath": "merging.main.runtime.ts",
|
|
10669
|
-
"line":
|
|
10669
|
+
"line": 226,
|
|
10670
10670
|
"character": 5
|
|
10671
10671
|
},
|
|
10672
10672
|
"signature": "(property) build?: boolean | undefined",
|
|
@@ -10675,7 +10675,7 @@
|
|
|
10675
10675
|
"__schema": "KeywordTypeSchema",
|
|
10676
10676
|
"location": {
|
|
10677
10677
|
"filePath": "merging.main.runtime.ts",
|
|
10678
|
-
"line":
|
|
10678
|
+
"line": 226,
|
|
10679
10679
|
"character": 13
|
|
10680
10680
|
},
|
|
10681
10681
|
"name": "boolean"
|
|
@@ -10686,7 +10686,7 @@
|
|
|
10686
10686
|
"__schema": "VariableLikeSchema",
|
|
10687
10687
|
"location": {
|
|
10688
10688
|
"filePath": "merging.main.runtime.ts",
|
|
10689
|
-
"line":
|
|
10689
|
+
"line": 227,
|
|
10690
10690
|
"character": 5
|
|
10691
10691
|
},
|
|
10692
10692
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -10695,7 +10695,7 @@
|
|
|
10695
10695
|
"__schema": "KeywordTypeSchema",
|
|
10696
10696
|
"location": {
|
|
10697
10697
|
"filePath": "merging.main.runtime.ts",
|
|
10698
|
-
"line":
|
|
10698
|
+
"line": 227,
|
|
10699
10699
|
"character": 34
|
|
10700
10700
|
},
|
|
10701
10701
|
"name": "boolean"
|
|
@@ -10710,7 +10710,7 @@
|
|
|
10710
10710
|
"__schema": "TypeRefSchema",
|
|
10711
10711
|
"location": {
|
|
10712
10712
|
"filePath": "merging.main.runtime.ts",
|
|
10713
|
-
"line":
|
|
10713
|
+
"line": 228,
|
|
10714
10714
|
"character": 7
|
|
10715
10715
|
},
|
|
10716
10716
|
"name": "Promise",
|
|
@@ -10719,7 +10719,7 @@
|
|
|
10719
10719
|
"__schema": "TypeRefSchema",
|
|
10720
10720
|
"location": {
|
|
10721
10721
|
"filePath": "merging.main.runtime.ts",
|
|
10722
|
-
"line":
|
|
10722
|
+
"line": 228,
|
|
10723
10723
|
"character": 15
|
|
10724
10724
|
},
|
|
10725
10725
|
"name": "ApplyVersionResults"
|
|
@@ -10734,7 +10734,7 @@
|
|
|
10734
10734
|
"__schema": "FunctionLikeSchema",
|
|
10735
10735
|
"location": {
|
|
10736
10736
|
"filePath": "merging.main.runtime.ts",
|
|
10737
|
-
"line":
|
|
10737
|
+
"line": 351,
|
|
10738
10738
|
"character": 3
|
|
10739
10739
|
},
|
|
10740
10740
|
"signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
|
|
@@ -10744,7 +10744,7 @@
|
|
|
10744
10744
|
"__schema": "ParameterSchema",
|
|
10745
10745
|
"location": {
|
|
10746
10746
|
"filePath": "merging.main.runtime.ts",
|
|
10747
|
-
"line":
|
|
10747
|
+
"line": 352,
|
|
10748
10748
|
"character": 5
|
|
10749
10749
|
},
|
|
10750
10750
|
"name": "componentsResults",
|
|
@@ -10752,14 +10752,14 @@
|
|
|
10752
10752
|
"__schema": "TypeArraySchema",
|
|
10753
10753
|
"location": {
|
|
10754
10754
|
"filePath": "merging.main.runtime.ts",
|
|
10755
|
-
"line":
|
|
10755
|
+
"line": 352,
|
|
10756
10756
|
"character": 24
|
|
10757
10757
|
},
|
|
10758
10758
|
"type": {
|
|
10759
10759
|
"__schema": "TypeRefSchema",
|
|
10760
10760
|
"location": {
|
|
10761
10761
|
"filePath": "merging.main.runtime.ts",
|
|
10762
|
-
"line":
|
|
10762
|
+
"line": 352,
|
|
10763
10763
|
"character": 24
|
|
10764
10764
|
},
|
|
10765
10765
|
"name": "ApplyVersionWithComps",
|
|
@@ -10776,7 +10776,7 @@
|
|
|
10776
10776
|
"__schema": "ParameterSchema",
|
|
10777
10777
|
"location": {
|
|
10778
10778
|
"filePath": "merging.main.runtime.ts",
|
|
10779
|
-
"line":
|
|
10779
|
+
"line": 353,
|
|
10780
10780
|
"character": 5
|
|
10781
10781
|
},
|
|
10782
10782
|
"name": "currentLane",
|
|
@@ -10784,7 +10784,7 @@
|
|
|
10784
10784
|
"__schema": "TypeRefSchema",
|
|
10785
10785
|
"location": {
|
|
10786
10786
|
"filePath": "merging.main.runtime.ts",
|
|
10787
|
-
"line":
|
|
10787
|
+
"line": 353,
|
|
10788
10788
|
"character": 19
|
|
10789
10789
|
},
|
|
10790
10790
|
"name": "Lane",
|
|
@@ -10797,7 +10797,7 @@
|
|
|
10797
10797
|
"__schema": "ParameterSchema",
|
|
10798
10798
|
"location": {
|
|
10799
10799
|
"filePath": "merging.main.runtime.ts",
|
|
10800
|
-
"line":
|
|
10800
|
+
"line": 354,
|
|
10801
10801
|
"character": 5
|
|
10802
10802
|
},
|
|
10803
10803
|
"name": "currentLaneIdsBeforeMerge",
|
|
@@ -10805,7 +10805,7 @@
|
|
|
10805
10805
|
"__schema": "TypeRefSchema",
|
|
10806
10806
|
"location": {
|
|
10807
10807
|
"filePath": "merging.main.runtime.ts",
|
|
10808
|
-
"line":
|
|
10808
|
+
"line": 354,
|
|
10809
10809
|
"character": 33
|
|
10810
10810
|
},
|
|
10811
10811
|
"name": "ComponentIdList",
|
|
@@ -10823,7 +10823,7 @@
|
|
|
10823
10823
|
"__schema": "InferenceTypeSchema",
|
|
10824
10824
|
"location": {
|
|
10825
10825
|
"filePath": "merging.main.runtime.ts",
|
|
10826
|
-
"line":
|
|
10826
|
+
"line": 351,
|
|
10827
10827
|
"character": 3
|
|
10828
10828
|
},
|
|
10829
10829
|
"type": "Promise<void>"
|
|
@@ -10836,14 +10836,14 @@
|
|
|
10836
10836
|
"__schema": "FunctionLikeSchema",
|
|
10837
10837
|
"location": {
|
|
10838
10838
|
"filePath": "merging.main.runtime.ts",
|
|
10839
|
-
"line":
|
|
10839
|
+
"line": 376,
|
|
10840
10840
|
"character": 3
|
|
10841
10841
|
},
|
|
10842
10842
|
"doc": {
|
|
10843
10843
|
"__schema": "DocSchema",
|
|
10844
10844
|
"location": {
|
|
10845
10845
|
"filePath": "merging.main.runtime.ts",
|
|
10846
|
-
"line":
|
|
10846
|
+
"line": 370,
|
|
10847
10847
|
"character": 3
|
|
10848
10848
|
},
|
|
10849
10849
|
"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 */",
|
|
@@ -10857,7 +10857,7 @@
|
|
|
10857
10857
|
"__schema": "ParameterSchema",
|
|
10858
10858
|
"location": {
|
|
10859
10859
|
"filePath": "merging.main.runtime.ts",
|
|
10860
|
-
"line":
|
|
10860
|
+
"line": 377,
|
|
10861
10861
|
"character": 5
|
|
10862
10862
|
},
|
|
10863
10863
|
"name": "bitIds",
|
|
@@ -10865,14 +10865,14 @@
|
|
|
10865
10865
|
"__schema": "TypeArraySchema",
|
|
10866
10866
|
"location": {
|
|
10867
10867
|
"filePath": "merging.main.runtime.ts",
|
|
10868
|
-
"line":
|
|
10868
|
+
"line": 377,
|
|
10869
10869
|
"character": 13
|
|
10870
10870
|
},
|
|
10871
10871
|
"type": {
|
|
10872
10872
|
"__schema": "TypeRefSchema",
|
|
10873
10873
|
"location": {
|
|
10874
10874
|
"filePath": "merging.main.runtime.ts",
|
|
10875
|
-
"line":
|
|
10875
|
+
"line": 377,
|
|
10876
10876
|
"character": 13
|
|
10877
10877
|
},
|
|
10878
10878
|
"name": "ComponentID",
|
|
@@ -10890,7 +10890,7 @@
|
|
|
10890
10890
|
"__schema": "ParameterSchema",
|
|
10891
10891
|
"location": {
|
|
10892
10892
|
"filePath": "merging.main.runtime.ts",
|
|
10893
|
-
"line":
|
|
10893
|
+
"line": 378,
|
|
10894
10894
|
"character": 5
|
|
10895
10895
|
},
|
|
10896
10896
|
"name": "options",
|
|
@@ -10898,7 +10898,7 @@
|
|
|
10898
10898
|
"__schema": "TypeRefSchema",
|
|
10899
10899
|
"location": {
|
|
10900
10900
|
"filePath": "merging.main.runtime.ts",
|
|
10901
|
-
"line":
|
|
10901
|
+
"line": 378,
|
|
10902
10902
|
"character": 14
|
|
10903
10903
|
},
|
|
10904
10904
|
"name": "MergeStatusProviderOptions",
|
|
@@ -10911,7 +10911,7 @@
|
|
|
10911
10911
|
"__schema": "ParameterSchema",
|
|
10912
10912
|
"location": {
|
|
10913
10913
|
"filePath": "merging.main.runtime.ts",
|
|
10914
|
-
"line":
|
|
10914
|
+
"line": 379,
|
|
10915
10915
|
"character": 5
|
|
10916
10916
|
},
|
|
10917
10917
|
"name": "currentLane",
|
|
@@ -10919,7 +10919,7 @@
|
|
|
10919
10919
|
"__schema": "TypeRefSchema",
|
|
10920
10920
|
"location": {
|
|
10921
10921
|
"filePath": "merging.main.runtime.ts",
|
|
10922
|
-
"line":
|
|
10922
|
+
"line": 379,
|
|
10923
10923
|
"character": 19
|
|
10924
10924
|
},
|
|
10925
10925
|
"name": "Lane",
|
|
@@ -10932,7 +10932,7 @@
|
|
|
10932
10932
|
"__schema": "ParameterSchema",
|
|
10933
10933
|
"location": {
|
|
10934
10934
|
"filePath": "merging.main.runtime.ts",
|
|
10935
|
-
"line":
|
|
10935
|
+
"line": 380,
|
|
10936
10936
|
"character": 5
|
|
10937
10937
|
},
|
|
10938
10938
|
"name": "otherLane",
|
|
@@ -10940,7 +10940,7 @@
|
|
|
10940
10940
|
"__schema": "TypeRefSchema",
|
|
10941
10941
|
"location": {
|
|
10942
10942
|
"filePath": "merging.main.runtime.ts",
|
|
10943
|
-
"line":
|
|
10943
|
+
"line": 380,
|
|
10944
10944
|
"character": 17
|
|
10945
10945
|
},
|
|
10946
10946
|
"name": "Lane",
|
|
@@ -10954,7 +10954,7 @@
|
|
|
10954
10954
|
"__schema": "TypeRefSchema",
|
|
10955
10955
|
"location": {
|
|
10956
10956
|
"filePath": "merging.main.runtime.ts",
|
|
10957
|
-
"line":
|
|
10957
|
+
"line": 381,
|
|
10958
10958
|
"character": 6
|
|
10959
10959
|
},
|
|
10960
10960
|
"name": "Promise",
|
|
@@ -10963,14 +10963,14 @@
|
|
|
10963
10963
|
"__schema": "TypeArraySchema",
|
|
10964
10964
|
"location": {
|
|
10965
10965
|
"filePath": "merging.main.runtime.ts",
|
|
10966
|
-
"line":
|
|
10966
|
+
"line": 381,
|
|
10967
10967
|
"character": 14
|
|
10968
10968
|
},
|
|
10969
10969
|
"type": {
|
|
10970
10970
|
"__schema": "TypeRefSchema",
|
|
10971
10971
|
"location": {
|
|
10972
10972
|
"filePath": "merging.main.runtime.ts",
|
|
10973
|
-
"line":
|
|
10973
|
+
"line": 381,
|
|
10974
10974
|
"character": 14
|
|
10975
10975
|
},
|
|
10976
10976
|
"name": "ComponentMergeStatus"
|
|
@@ -10986,7 +10986,7 @@
|
|
|
10986
10986
|
"__schema": "VariableLikeSchema",
|
|
10987
10987
|
"location": {
|
|
10988
10988
|
"filePath": "merging.main.runtime.ts",
|
|
10989
|
-
"line":
|
|
10989
|
+
"line": 674,
|
|
10990
10990
|
"character": 3
|
|
10991
10991
|
},
|
|
10992
10992
|
"signature": "(property) MergingMain.slots: never[]",
|
|
@@ -10995,7 +10995,7 @@
|
|
|
10995
10995
|
"__schema": "InferenceTypeSchema",
|
|
10996
10996
|
"location": {
|
|
10997
10997
|
"filePath": "merging.main.runtime.ts",
|
|
10998
|
-
"line":
|
|
10998
|
+
"line": 674,
|
|
10999
10999
|
"character": 3
|
|
11000
11000
|
},
|
|
11001
11001
|
"type": "never[]"
|
|
@@ -11007,7 +11007,7 @@
|
|
|
11007
11007
|
"__schema": "VariableLikeSchema",
|
|
11008
11008
|
"location": {
|
|
11009
11009
|
"filePath": "merging.main.runtime.ts",
|
|
11010
|
-
"line":
|
|
11010
|
+
"line": 675,
|
|
11011
11011
|
"character": 3
|
|
11012
11012
|
},
|
|
11013
11013
|
"signature": "(property) MergingMain.dependencies: Aspect[]",
|
|
@@ -11016,7 +11016,7 @@
|
|
|
11016
11016
|
"__schema": "InferenceTypeSchema",
|
|
11017
11017
|
"location": {
|
|
11018
11018
|
"filePath": "merging.main.runtime.ts",
|
|
11019
|
-
"line":
|
|
11019
|
+
"line": 675,
|
|
11020
11020
|
"character": 3
|
|
11021
11021
|
},
|
|
11022
11022
|
"type": "Aspect[]"
|
|
@@ -11028,7 +11028,7 @@
|
|
|
11028
11028
|
"__schema": "VariableLikeSchema",
|
|
11029
11029
|
"location": {
|
|
11030
11030
|
"filePath": "merging.main.runtime.ts",
|
|
11031
|
-
"line":
|
|
11031
|
+
"line": 691,
|
|
11032
11032
|
"character": 3
|
|
11033
11033
|
},
|
|
11034
11034
|
"signature": "(property) MergingMain.runtime: RuntimeDefinition",
|
|
@@ -11037,7 +11037,7 @@
|
|
|
11037
11037
|
"__schema": "InferenceTypeSchema",
|
|
11038
11038
|
"location": {
|
|
11039
11039
|
"filePath": "merging.main.runtime.ts",
|
|
11040
|
-
"line":
|
|
11040
|
+
"line": 691,
|
|
11041
11041
|
"character": 3
|
|
11042
11042
|
},
|
|
11043
11043
|
"type": "RuntimeDefinition"
|
|
@@ -11049,7 +11049,7 @@
|
|
|
11049
11049
|
"__schema": "FunctionLikeSchema",
|
|
11050
11050
|
"location": {
|
|
11051
11051
|
"filePath": "merging.main.runtime.ts",
|
|
11052
|
-
"line":
|
|
11052
|
+
"line": 692,
|
|
11053
11053
|
"character": 3
|
|
11054
11054
|
},
|
|
11055
11055
|
"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>",
|
|
@@ -11059,7 +11059,7 @@
|
|
|
11059
11059
|
"__schema": "ParameterSchema",
|
|
11060
11060
|
"location": {
|
|
11061
11061
|
"filePath": "merging.main.runtime.ts",
|
|
11062
|
-
"line":
|
|
11062
|
+
"line": 692,
|
|
11063
11063
|
"character": 25
|
|
11064
11064
|
},
|
|
11065
11065
|
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
|
|
@@ -11067,7 +11067,7 @@
|
|
|
11067
11067
|
"__schema": "TupleTypeSchema",
|
|
11068
11068
|
"location": {
|
|
11069
11069
|
"filePath": "merging.main.runtime.ts",
|
|
11070
|
-
"line":
|
|
11070
|
+
"line": 707,
|
|
11071
11071
|
"character": 6
|
|
11072
11072
|
},
|
|
11073
11073
|
"elements": [
|
|
@@ -11075,7 +11075,7 @@
|
|
|
11075
11075
|
"__schema": "TypeRefSchema",
|
|
11076
11076
|
"location": {
|
|
11077
11077
|
"filePath": "merging.main.runtime.ts",
|
|
11078
|
-
"line":
|
|
11078
|
+
"line": 708,
|
|
11079
11079
|
"character": 5
|
|
11080
11080
|
},
|
|
11081
11081
|
"name": "CLIMain",
|
|
@@ -11088,7 +11088,7 @@
|
|
|
11088
11088
|
"__schema": "TypeRefSchema",
|
|
11089
11089
|
"location": {
|
|
11090
11090
|
"filePath": "merging.main.runtime.ts",
|
|
11091
|
-
"line":
|
|
11091
|
+
"line": 709,
|
|
11092
11092
|
"character": 5
|
|
11093
11093
|
},
|
|
11094
11094
|
"name": "Workspace",
|
|
@@ -11101,7 +11101,7 @@
|
|
|
11101
11101
|
"__schema": "TypeRefSchema",
|
|
11102
11102
|
"location": {
|
|
11103
11103
|
"filePath": "merging.main.runtime.ts",
|
|
11104
|
-
"line":
|
|
11104
|
+
"line": 710,
|
|
11105
11105
|
"character": 5
|
|
11106
11106
|
},
|
|
11107
11107
|
"name": "ScopeMain",
|
|
@@ -11114,7 +11114,7 @@
|
|
|
11114
11114
|
"__schema": "TypeRefSchema",
|
|
11115
11115
|
"location": {
|
|
11116
11116
|
"filePath": "merging.main.runtime.ts",
|
|
11117
|
-
"line":
|
|
11117
|
+
"line": 711,
|
|
11118
11118
|
"character": 5
|
|
11119
11119
|
},
|
|
11120
11120
|
"name": "SnappingMain",
|
|
@@ -11127,7 +11127,7 @@
|
|
|
11127
11127
|
"__schema": "TypeRefSchema",
|
|
11128
11128
|
"location": {
|
|
11129
11129
|
"filePath": "merging.main.runtime.ts",
|
|
11130
|
-
"line":
|
|
11130
|
+
"line": 712,
|
|
11131
11131
|
"character": 5
|
|
11132
11132
|
},
|
|
11133
11133
|
"name": "CheckoutMain",
|
|
@@ -11140,7 +11140,7 @@
|
|
|
11140
11140
|
"__schema": "TypeRefSchema",
|
|
11141
11141
|
"location": {
|
|
11142
11142
|
"filePath": "merging.main.runtime.ts",
|
|
11143
|
-
"line":
|
|
11143
|
+
"line": 713,
|
|
11144
11144
|
"character": 5
|
|
11145
11145
|
},
|
|
11146
11146
|
"name": "InstallMain",
|
|
@@ -11153,7 +11153,7 @@
|
|
|
11153
11153
|
"__schema": "TypeRefSchema",
|
|
11154
11154
|
"location": {
|
|
11155
11155
|
"filePath": "merging.main.runtime.ts",
|
|
11156
|
-
"line":
|
|
11156
|
+
"line": 714,
|
|
11157
11157
|
"character": 5
|
|
11158
11158
|
},
|
|
11159
11159
|
"name": "LoggerMain",
|
|
@@ -11166,7 +11166,7 @@
|
|
|
11166
11166
|
"__schema": "TypeRefSchema",
|
|
11167
11167
|
"location": {
|
|
11168
11168
|
"filePath": "merging.main.runtime.ts",
|
|
11169
|
-
"line":
|
|
11169
|
+
"line": 715,
|
|
11170
11170
|
"character": 5
|
|
11171
11171
|
},
|
|
11172
11172
|
"name": "ComponentWriterMain",
|
|
@@ -11179,7 +11179,7 @@
|
|
|
11179
11179
|
"__schema": "TypeRefSchema",
|
|
11180
11180
|
"location": {
|
|
11181
11181
|
"filePath": "merging.main.runtime.ts",
|
|
11182
|
-
"line":
|
|
11182
|
+
"line": 716,
|
|
11183
11183
|
"character": 5
|
|
11184
11184
|
},
|
|
11185
11185
|
"name": "ImporterMain",
|
|
@@ -11192,7 +11192,7 @@
|
|
|
11192
11192
|
"__schema": "TypeRefSchema",
|
|
11193
11193
|
"location": {
|
|
11194
11194
|
"filePath": "merging.main.runtime.ts",
|
|
11195
|
-
"line":
|
|
11195
|
+
"line": 717,
|
|
11196
11196
|
"character": 5
|
|
11197
11197
|
},
|
|
11198
11198
|
"name": "ConfigMain",
|
|
@@ -11205,7 +11205,7 @@
|
|
|
11205
11205
|
"__schema": "TypeRefSchema",
|
|
11206
11206
|
"location": {
|
|
11207
11207
|
"filePath": "merging.main.runtime.ts",
|
|
11208
|
-
"line":
|
|
11208
|
+
"line": 718,
|
|
11209
11209
|
"character": 5
|
|
11210
11210
|
},
|
|
11211
11211
|
"name": "RemoveMain",
|
|
@@ -11218,7 +11218,7 @@
|
|
|
11218
11218
|
"__schema": "TypeRefSchema",
|
|
11219
11219
|
"location": {
|
|
11220
11220
|
"filePath": "merging.main.runtime.ts",
|
|
11221
|
-
"line":
|
|
11221
|
+
"line": 719,
|
|
11222
11222
|
"character": 5
|
|
11223
11223
|
},
|
|
11224
11224
|
"name": "GlobalConfigMain",
|
|
@@ -11231,7 +11231,7 @@
|
|
|
11231
11231
|
"__schema": "TypeRefSchema",
|
|
11232
11232
|
"location": {
|
|
11233
11233
|
"filePath": "merging.main.runtime.ts",
|
|
11234
|
-
"line":
|
|
11234
|
+
"line": 720,
|
|
11235
11235
|
"character": 5
|
|
11236
11236
|
},
|
|
11237
11237
|
"name": "ConfigMergerMain",
|
|
@@ -11244,7 +11244,7 @@
|
|
|
11244
11244
|
"__schema": "TypeRefSchema",
|
|
11245
11245
|
"location": {
|
|
11246
11246
|
"filePath": "merging.main.runtime.ts",
|
|
11247
|
-
"line":
|
|
11247
|
+
"line": 721,
|
|
11248
11248
|
"character": 5
|
|
11249
11249
|
},
|
|
11250
11250
|
"name": "DependencyResolverMain",
|
|
@@ -11263,7 +11263,7 @@
|
|
|
11263
11263
|
"__schema": "InferenceTypeSchema",
|
|
11264
11264
|
"location": {
|
|
11265
11265
|
"filePath": "merging.main.runtime.ts",
|
|
11266
|
-
"line":
|
|
11266
|
+
"line": 692,
|
|
11267
11267
|
"character": 3
|
|
11268
11268
|
},
|
|
11269
11269
|
"type": "Promise<MergingMain>"
|
|
@@ -11283,7 +11283,7 @@
|
|
|
11283
11283
|
"__schema": "TypeSchema",
|
|
11284
11284
|
"location": {
|
|
11285
11285
|
"filePath": "merging.main.runtime.ts",
|
|
11286
|
-
"line":
|
|
11286
|
+
"line": 55,
|
|
11287
11287
|
"character": 1
|
|
11288
11288
|
},
|
|
11289
11289
|
"signature": "type ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n}",
|
|
@@ -11292,7 +11292,7 @@
|
|
|
11292
11292
|
"__schema": "TypeLiteralSchema",
|
|
11293
11293
|
"location": {
|
|
11294
11294
|
"filePath": "merging.main.runtime.ts",
|
|
11295
|
-
"line":
|
|
11295
|
+
"line": 55,
|
|
11296
11296
|
"character": 29
|
|
11297
11297
|
},
|
|
11298
11298
|
"members": [
|
|
@@ -11300,7 +11300,7 @@
|
|
|
11300
11300
|
"__schema": "VariableLikeSchema",
|
|
11301
11301
|
"location": {
|
|
11302
11302
|
"filePath": "merging.main.runtime.ts",
|
|
11303
|
-
"line":
|
|
11303
|
+
"line": 56,
|
|
11304
11304
|
"character": 3
|
|
11305
11305
|
},
|
|
11306
11306
|
"signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
@@ -11309,7 +11309,7 @@
|
|
|
11309
11309
|
"__schema": "TypeRefSchema",
|
|
11310
11310
|
"location": {
|
|
11311
11311
|
"filePath": "merging.main.runtime.ts",
|
|
11312
|
-
"line":
|
|
11312
|
+
"line": 56,
|
|
11313
11313
|
"character": 13
|
|
11314
11314
|
},
|
|
11315
11315
|
"name": "MergeStrategy"
|
|
@@ -11320,7 +11320,7 @@
|
|
|
11320
11320
|
"__schema": "VariableLikeSchema",
|
|
11321
11321
|
"location": {
|
|
11322
11322
|
"filePath": "merging.main.runtime.ts",
|
|
11323
|
-
"line":
|
|
11323
|
+
"line": 57,
|
|
11324
11324
|
"character": 3
|
|
11325
11325
|
},
|
|
11326
11326
|
"signature": "(property) headOnCurrentLane: Ref",
|
|
@@ -11329,7 +11329,7 @@
|
|
|
11329
11329
|
"__schema": "TypeRefSchema",
|
|
11330
11330
|
"location": {
|
|
11331
11331
|
"filePath": "merging.main.runtime.ts",
|
|
11332
|
-
"line":
|
|
11332
|
+
"line": 57,
|
|
11333
11333
|
"character": 3
|
|
11334
11334
|
},
|
|
11335
11335
|
"name": "Ref",
|
|
@@ -11341,7 +11341,7 @@
|
|
|
11341
11341
|
"__schema": "VariableLikeSchema",
|
|
11342
11342
|
"location": {
|
|
11343
11343
|
"filePath": "merging.main.runtime.ts",
|
|
11344
|
-
"line":
|
|
11344
|
+
"line": 58,
|
|
11345
11345
|
"character": 3
|
|
11346
11346
|
},
|
|
11347
11347
|
"signature": "(property) unrelatedHead: Ref",
|
|
@@ -11350,7 +11350,7 @@
|
|
|
11350
11350
|
"__schema": "TypeRefSchema",
|
|
11351
11351
|
"location": {
|
|
11352
11352
|
"filePath": "merging.main.runtime.ts",
|
|
11353
|
-
"line":
|
|
11353
|
+
"line": 58,
|
|
11354
11354
|
"character": 3
|
|
11355
11355
|
},
|
|
11356
11356
|
"name": "Ref",
|
|
@@ -11362,7 +11362,7 @@
|
|
|
11362
11362
|
"__schema": "VariableLikeSchema",
|
|
11363
11363
|
"location": {
|
|
11364
11364
|
"filePath": "merging.main.runtime.ts",
|
|
11365
|
-
"line":
|
|
11365
|
+
"line": 59,
|
|
11366
11366
|
"character": 3
|
|
11367
11367
|
},
|
|
11368
11368
|
"signature": "(property) unrelatedLaneId: LaneId",
|
|
@@ -11371,7 +11371,7 @@
|
|
|
11371
11371
|
"__schema": "TypeRefSchema",
|
|
11372
11372
|
"location": {
|
|
11373
11373
|
"filePath": "merging.main.runtime.ts",
|
|
11374
|
-
"line":
|
|
11374
|
+
"line": 59,
|
|
11375
11375
|
"character": 3
|
|
11376
11376
|
},
|
|
11377
11377
|
"name": "LaneId",
|
|
@@ -11390,7 +11390,7 @@
|
|
|
11390
11390
|
"__schema": "UnImplementedSchema",
|
|
11391
11391
|
"location": {
|
|
11392
11392
|
"filePath": "merging.main.runtime.ts",
|
|
11393
|
-
"line":
|
|
11393
|
+
"line": 743,
|
|
11394
11394
|
"character": 1
|
|
11395
11395
|
},
|
|
11396
11396
|
"name": "MergingAspect.addRuntime(MergingMain);",
|
|
@@ -11439,7 +11439,7 @@
|
|
|
11439
11439
|
"componentId": {
|
|
11440
11440
|
"scope": "teambit.component",
|
|
11441
11441
|
"name": "merging",
|
|
11442
|
-
"version": "1.0.
|
|
11442
|
+
"version": "1.0.322"
|
|
11443
11443
|
},
|
|
11444
11444
|
"taggedModuleExports": []
|
|
11445
11445
|
}
|