@teambit/merging 1.0.160 → 1.0.162
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/__bit_junit.xml +1 -1
- package/artifacts/schema.json +731 -701
- package/dist/index.d.ts +1 -0
- package/dist/index.js +13 -0
- package/dist/index.js.map +1 -1
- package/dist/merge-status-provider.d.ts +5 -2
- package/dist/merge-status-provider.js +26 -21
- package/dist/merge-status-provider.js.map +1 -1
- package/dist/merging.main.runtime.d.ts +12 -7
- package/dist/merging.main.runtime.js +63 -37
- package/dist/merging.main.runtime.js.map +1 -1
- package/package.json +12 -11
- /package/dist/{preview-1707275702806.js → preview-1707535034490.js} +0 -0
package/artifacts/schema.json
CHANGED
|
@@ -142,7 +142,7 @@
|
|
|
142
142
|
"character": 3
|
|
143
143
|
},
|
|
144
144
|
"name": "mergeSnapResults",
|
|
145
|
-
"type": "
|
|
145
|
+
"type": "MergeSnapResults | undefined",
|
|
146
146
|
"isSpread": false
|
|
147
147
|
},
|
|
148
148
|
{
|
|
@@ -687,11 +687,32 @@
|
|
|
687
687
|
"export"
|
|
688
688
|
]
|
|
689
689
|
},
|
|
690
|
+
{
|
|
691
|
+
"__schema": "VariableLikeSchema",
|
|
692
|
+
"location": {
|
|
693
|
+
"filePath": "merge-status-provider.ts",
|
|
694
|
+
"line": 28,
|
|
695
|
+
"character": 14
|
|
696
|
+
},
|
|
697
|
+
"signature": "const compIsAlreadyMergedMsg: \"component is already merged\"",
|
|
698
|
+
"name": "compIsAlreadyMergedMsg",
|
|
699
|
+
"type": {
|
|
700
|
+
"__schema": "InferenceTypeSchema",
|
|
701
|
+
"location": {
|
|
702
|
+
"filePath": "merge-status-provider.ts",
|
|
703
|
+
"line": 28,
|
|
704
|
+
"character": 14
|
|
705
|
+
},
|
|
706
|
+
"type": "\"component is already merged\""
|
|
707
|
+
},
|
|
708
|
+
"isOptional": false,
|
|
709
|
+
"defaultValue": "'component is already merged'"
|
|
710
|
+
},
|
|
690
711
|
{
|
|
691
712
|
"__schema": "ClassSchema",
|
|
692
713
|
"location": {
|
|
693
714
|
"filePath": "merging.main.runtime.ts",
|
|
694
|
-
"line":
|
|
715
|
+
"line": 112,
|
|
695
716
|
"character": 1
|
|
696
717
|
},
|
|
697
718
|
"signature": "class MergingMain",
|
|
@@ -701,17 +722,17 @@
|
|
|
701
722
|
"__schema": "ConstructorSchema",
|
|
702
723
|
"location": {
|
|
703
724
|
"filePath": "merging.main.runtime.ts",
|
|
704
|
-
"line":
|
|
725
|
+
"line": 113,
|
|
705
726
|
"character": 3
|
|
706
727
|
},
|
|
707
|
-
"signature": "constructor MergingMain(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain): MergingMain",
|
|
728
|
+
"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): MergingMain",
|
|
708
729
|
"name": "constructor",
|
|
709
730
|
"params": [
|
|
710
731
|
{
|
|
711
732
|
"__schema": "ParameterSchema",
|
|
712
733
|
"location": {
|
|
713
734
|
"filePath": "merging.main.runtime.ts",
|
|
714
|
-
"line":
|
|
735
|
+
"line": 114,
|
|
715
736
|
"character": 5
|
|
716
737
|
},
|
|
717
738
|
"name": "workspace",
|
|
@@ -719,7 +740,7 @@
|
|
|
719
740
|
"__schema": "TypeRefSchema",
|
|
720
741
|
"location": {
|
|
721
742
|
"filePath": "merging.main.runtime.ts",
|
|
722
|
-
"line":
|
|
743
|
+
"line": 114,
|
|
723
744
|
"character": 24
|
|
724
745
|
},
|
|
725
746
|
"name": "Workspace"
|
|
@@ -731,7 +752,27 @@
|
|
|
731
752
|
"__schema": "ParameterSchema",
|
|
732
753
|
"location": {
|
|
733
754
|
"filePath": "merging.main.runtime.ts",
|
|
734
|
-
"line":
|
|
755
|
+
"line": 115,
|
|
756
|
+
"character": 5
|
|
757
|
+
},
|
|
758
|
+
"name": "scope",
|
|
759
|
+
"type": {
|
|
760
|
+
"__schema": "TypeRefSchema",
|
|
761
|
+
"location": {
|
|
762
|
+
"filePath": "merging.main.runtime.ts",
|
|
763
|
+
"line": 115,
|
|
764
|
+
"character": 20
|
|
765
|
+
},
|
|
766
|
+
"name": "ScopeMain"
|
|
767
|
+
},
|
|
768
|
+
"isOptional": false,
|
|
769
|
+
"isSpread": false
|
|
770
|
+
},
|
|
771
|
+
{
|
|
772
|
+
"__schema": "ParameterSchema",
|
|
773
|
+
"location": {
|
|
774
|
+
"filePath": "merging.main.runtime.ts",
|
|
775
|
+
"line": 116,
|
|
735
776
|
"character": 5
|
|
736
777
|
},
|
|
737
778
|
"name": "install",
|
|
@@ -739,7 +780,7 @@
|
|
|
739
780
|
"__schema": "TypeRefSchema",
|
|
740
781
|
"location": {
|
|
741
782
|
"filePath": "merging.main.runtime.ts",
|
|
742
|
-
"line":
|
|
783
|
+
"line": 116,
|
|
743
784
|
"character": 22
|
|
744
785
|
},
|
|
745
786
|
"name": "InstallMain"
|
|
@@ -751,7 +792,7 @@
|
|
|
751
792
|
"__schema": "ParameterSchema",
|
|
752
793
|
"location": {
|
|
753
794
|
"filePath": "merging.main.runtime.ts",
|
|
754
|
-
"line":
|
|
795
|
+
"line": 117,
|
|
755
796
|
"character": 5
|
|
756
797
|
},
|
|
757
798
|
"name": "snapping",
|
|
@@ -759,7 +800,7 @@
|
|
|
759
800
|
"__schema": "TypeRefSchema",
|
|
760
801
|
"location": {
|
|
761
802
|
"filePath": "merging.main.runtime.ts",
|
|
762
|
-
"line":
|
|
803
|
+
"line": 117,
|
|
763
804
|
"character": 23
|
|
764
805
|
},
|
|
765
806
|
"name": "SnappingMain"
|
|
@@ -771,7 +812,7 @@
|
|
|
771
812
|
"__schema": "ParameterSchema",
|
|
772
813
|
"location": {
|
|
773
814
|
"filePath": "merging.main.runtime.ts",
|
|
774
|
-
"line":
|
|
815
|
+
"line": 118,
|
|
775
816
|
"character": 5
|
|
776
817
|
},
|
|
777
818
|
"name": "checkout",
|
|
@@ -779,7 +820,7 @@
|
|
|
779
820
|
"__schema": "TypeRefSchema",
|
|
780
821
|
"location": {
|
|
781
822
|
"filePath": "merging.main.runtime.ts",
|
|
782
|
-
"line":
|
|
823
|
+
"line": 118,
|
|
783
824
|
"character": 23
|
|
784
825
|
},
|
|
785
826
|
"name": "CheckoutMain"
|
|
@@ -791,7 +832,7 @@
|
|
|
791
832
|
"__schema": "ParameterSchema",
|
|
792
833
|
"location": {
|
|
793
834
|
"filePath": "merging.main.runtime.ts",
|
|
794
|
-
"line":
|
|
835
|
+
"line": 119,
|
|
795
836
|
"character": 5
|
|
796
837
|
},
|
|
797
838
|
"name": "logger",
|
|
@@ -799,7 +840,7 @@
|
|
|
799
840
|
"__schema": "TypeRefSchema",
|
|
800
841
|
"location": {
|
|
801
842
|
"filePath": "merging.main.runtime.ts",
|
|
802
|
-
"line":
|
|
843
|
+
"line": 119,
|
|
803
844
|
"character": 21
|
|
804
845
|
},
|
|
805
846
|
"name": "Logger"
|
|
@@ -811,7 +852,7 @@
|
|
|
811
852
|
"__schema": "ParameterSchema",
|
|
812
853
|
"location": {
|
|
813
854
|
"filePath": "merging.main.runtime.ts",
|
|
814
|
-
"line":
|
|
855
|
+
"line": 120,
|
|
815
856
|
"character": 5
|
|
816
857
|
},
|
|
817
858
|
"name": "componentWriter",
|
|
@@ -819,7 +860,7 @@
|
|
|
819
860
|
"__schema": "TypeRefSchema",
|
|
820
861
|
"location": {
|
|
821
862
|
"filePath": "merging.main.runtime.ts",
|
|
822
|
-
"line":
|
|
863
|
+
"line": 120,
|
|
823
864
|
"character": 30
|
|
824
865
|
},
|
|
825
866
|
"name": "ComponentWriterMain"
|
|
@@ -831,7 +872,7 @@
|
|
|
831
872
|
"__schema": "ParameterSchema",
|
|
832
873
|
"location": {
|
|
833
874
|
"filePath": "merging.main.runtime.ts",
|
|
834
|
-
"line":
|
|
875
|
+
"line": 121,
|
|
835
876
|
"character": 5
|
|
836
877
|
},
|
|
837
878
|
"name": "importer",
|
|
@@ -839,7 +880,7 @@
|
|
|
839
880
|
"__schema": "TypeRefSchema",
|
|
840
881
|
"location": {
|
|
841
882
|
"filePath": "merging.main.runtime.ts",
|
|
842
|
-
"line":
|
|
883
|
+
"line": 121,
|
|
843
884
|
"character": 23
|
|
844
885
|
},
|
|
845
886
|
"name": "ImporterMain"
|
|
@@ -851,7 +892,7 @@
|
|
|
851
892
|
"__schema": "ParameterSchema",
|
|
852
893
|
"location": {
|
|
853
894
|
"filePath": "merging.main.runtime.ts",
|
|
854
|
-
"line":
|
|
895
|
+
"line": 122,
|
|
855
896
|
"character": 5
|
|
856
897
|
},
|
|
857
898
|
"name": "config",
|
|
@@ -859,7 +900,7 @@
|
|
|
859
900
|
"__schema": "TypeRefSchema",
|
|
860
901
|
"location": {
|
|
861
902
|
"filePath": "merging.main.runtime.ts",
|
|
862
|
-
"line":
|
|
903
|
+
"line": 122,
|
|
863
904
|
"character": 21
|
|
864
905
|
},
|
|
865
906
|
"name": "ConfigMain"
|
|
@@ -871,7 +912,7 @@
|
|
|
871
912
|
"__schema": "ParameterSchema",
|
|
872
913
|
"location": {
|
|
873
914
|
"filePath": "merging.main.runtime.ts",
|
|
874
|
-
"line":
|
|
915
|
+
"line": 123,
|
|
875
916
|
"character": 5
|
|
876
917
|
},
|
|
877
918
|
"name": "remove",
|
|
@@ -879,7 +920,7 @@
|
|
|
879
920
|
"__schema": "TypeRefSchema",
|
|
880
921
|
"location": {
|
|
881
922
|
"filePath": "merging.main.runtime.ts",
|
|
882
|
-
"line":
|
|
923
|
+
"line": 123,
|
|
883
924
|
"character": 21
|
|
884
925
|
},
|
|
885
926
|
"name": "RemoveMain"
|
|
@@ -891,7 +932,7 @@
|
|
|
891
932
|
"__schema": "ParameterSchema",
|
|
892
933
|
"location": {
|
|
893
934
|
"filePath": "merging.main.runtime.ts",
|
|
894
|
-
"line":
|
|
935
|
+
"line": 124,
|
|
895
936
|
"character": 5
|
|
896
937
|
},
|
|
897
938
|
"name": "configMerger",
|
|
@@ -899,7 +940,7 @@
|
|
|
899
940
|
"__schema": "TypeRefSchema",
|
|
900
941
|
"location": {
|
|
901
942
|
"filePath": "merging.main.runtime.ts",
|
|
902
|
-
"line":
|
|
943
|
+
"line": 124,
|
|
903
944
|
"character": 27
|
|
904
945
|
},
|
|
905
946
|
"name": "ConfigMergerMain"
|
|
@@ -912,7 +953,7 @@
|
|
|
912
953
|
"__schema": "ThisTypeSchema",
|
|
913
954
|
"location": {
|
|
914
955
|
"filePath": "merging.main.runtime.ts",
|
|
915
|
-
"line":
|
|
956
|
+
"line": 112,
|
|
916
957
|
"character": 1
|
|
917
958
|
},
|
|
918
959
|
"name": "MergingMain"
|
|
@@ -923,7 +964,7 @@
|
|
|
923
964
|
"__schema": "FunctionLikeSchema",
|
|
924
965
|
"location": {
|
|
925
966
|
"filePath": "merging.main.runtime.ts",
|
|
926
|
-
"line":
|
|
967
|
+
"line": 127,
|
|
927
968
|
"character": 3
|
|
928
969
|
},
|
|
929
970
|
"signature": "(method) MergingMain.merge(ids: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>",
|
|
@@ -933,7 +974,7 @@
|
|
|
933
974
|
"__schema": "ParameterSchema",
|
|
934
975
|
"location": {
|
|
935
976
|
"filePath": "merging.main.runtime.ts",
|
|
936
|
-
"line":
|
|
977
|
+
"line": 128,
|
|
937
978
|
"character": 5
|
|
938
979
|
},
|
|
939
980
|
"name": "ids",
|
|
@@ -941,14 +982,14 @@
|
|
|
941
982
|
"__schema": "TypeArraySchema",
|
|
942
983
|
"location": {
|
|
943
984
|
"filePath": "merging.main.runtime.ts",
|
|
944
|
-
"line":
|
|
985
|
+
"line": 128,
|
|
945
986
|
"character": 10
|
|
946
987
|
},
|
|
947
988
|
"type": {
|
|
948
989
|
"__schema": "KeywordTypeSchema",
|
|
949
990
|
"location": {
|
|
950
991
|
"filePath": "merging.main.runtime.ts",
|
|
951
|
-
"line":
|
|
992
|
+
"line": 128,
|
|
952
993
|
"character": 10
|
|
953
994
|
},
|
|
954
995
|
"name": "string"
|
|
@@ -961,7 +1002,7 @@
|
|
|
961
1002
|
"__schema": "ParameterSchema",
|
|
962
1003
|
"location": {
|
|
963
1004
|
"filePath": "merging.main.runtime.ts",
|
|
964
|
-
"line":
|
|
1005
|
+
"line": 129,
|
|
965
1006
|
"character": 5
|
|
966
1007
|
},
|
|
967
1008
|
"name": "mergeStrategy",
|
|
@@ -969,7 +1010,7 @@
|
|
|
969
1010
|
"__schema": "TypeRefSchema",
|
|
970
1011
|
"location": {
|
|
971
1012
|
"filePath": "merging.main.runtime.ts",
|
|
972
|
-
"line":
|
|
1013
|
+
"line": 129,
|
|
973
1014
|
"character": 20
|
|
974
1015
|
},
|
|
975
1016
|
"name": "MergeStrategy"
|
|
@@ -981,7 +1022,7 @@
|
|
|
981
1022
|
"__schema": "ParameterSchema",
|
|
982
1023
|
"location": {
|
|
983
1024
|
"filePath": "merging.main.runtime.ts",
|
|
984
|
-
"line":
|
|
1025
|
+
"line": 130,
|
|
985
1026
|
"character": 5
|
|
986
1027
|
},
|
|
987
1028
|
"name": "abort",
|
|
@@ -989,7 +1030,7 @@
|
|
|
989
1030
|
"__schema": "KeywordTypeSchema",
|
|
990
1031
|
"location": {
|
|
991
1032
|
"filePath": "merging.main.runtime.ts",
|
|
992
|
-
"line":
|
|
1033
|
+
"line": 130,
|
|
993
1034
|
"character": 12
|
|
994
1035
|
},
|
|
995
1036
|
"name": "boolean"
|
|
@@ -1001,7 +1042,7 @@
|
|
|
1001
1042
|
"__schema": "ParameterSchema",
|
|
1002
1043
|
"location": {
|
|
1003
1044
|
"filePath": "merging.main.runtime.ts",
|
|
1004
|
-
"line":
|
|
1045
|
+
"line": 131,
|
|
1005
1046
|
"character": 5
|
|
1006
1047
|
},
|
|
1007
1048
|
"name": "resolve",
|
|
@@ -1009,7 +1050,7 @@
|
|
|
1009
1050
|
"__schema": "KeywordTypeSchema",
|
|
1010
1051
|
"location": {
|
|
1011
1052
|
"filePath": "merging.main.runtime.ts",
|
|
1012
|
-
"line":
|
|
1053
|
+
"line": 131,
|
|
1013
1054
|
"character": 14
|
|
1014
1055
|
},
|
|
1015
1056
|
"name": "boolean"
|
|
@@ -1021,7 +1062,7 @@
|
|
|
1021
1062
|
"__schema": "ParameterSchema",
|
|
1022
1063
|
"location": {
|
|
1023
1064
|
"filePath": "merging.main.runtime.ts",
|
|
1024
|
-
"line":
|
|
1065
|
+
"line": 132,
|
|
1025
1066
|
"character": 5
|
|
1026
1067
|
},
|
|
1027
1068
|
"name": "noSnap",
|
|
@@ -1029,7 +1070,7 @@
|
|
|
1029
1070
|
"__schema": "KeywordTypeSchema",
|
|
1030
1071
|
"location": {
|
|
1031
1072
|
"filePath": "merging.main.runtime.ts",
|
|
1032
|
-
"line":
|
|
1073
|
+
"line": 132,
|
|
1033
1074
|
"character": 13
|
|
1034
1075
|
},
|
|
1035
1076
|
"name": "boolean"
|
|
@@ -1041,7 +1082,7 @@
|
|
|
1041
1082
|
"__schema": "ParameterSchema",
|
|
1042
1083
|
"location": {
|
|
1043
1084
|
"filePath": "merging.main.runtime.ts",
|
|
1044
|
-
"line":
|
|
1085
|
+
"line": 133,
|
|
1045
1086
|
"character": 5
|
|
1046
1087
|
},
|
|
1047
1088
|
"name": "message",
|
|
@@ -1049,7 +1090,7 @@
|
|
|
1049
1090
|
"__schema": "KeywordTypeSchema",
|
|
1050
1091
|
"location": {
|
|
1051
1092
|
"filePath": "merging.main.runtime.ts",
|
|
1052
|
-
"line":
|
|
1093
|
+
"line": 133,
|
|
1053
1094
|
"character": 14
|
|
1054
1095
|
},
|
|
1055
1096
|
"name": "string"
|
|
@@ -1061,7 +1102,7 @@
|
|
|
1061
1102
|
"__schema": "ParameterSchema",
|
|
1062
1103
|
"location": {
|
|
1063
1104
|
"filePath": "merging.main.runtime.ts",
|
|
1064
|
-
"line":
|
|
1105
|
+
"line": 134,
|
|
1065
1106
|
"character": 5
|
|
1066
1107
|
},
|
|
1067
1108
|
"name": "build",
|
|
@@ -1069,7 +1110,7 @@
|
|
|
1069
1110
|
"__schema": "KeywordTypeSchema",
|
|
1070
1111
|
"location": {
|
|
1071
1112
|
"filePath": "merging.main.runtime.ts",
|
|
1072
|
-
"line":
|
|
1113
|
+
"line": 134,
|
|
1073
1114
|
"character": 12
|
|
1074
1115
|
},
|
|
1075
1116
|
"name": "boolean"
|
|
@@ -1081,7 +1122,7 @@
|
|
|
1081
1122
|
"__schema": "ParameterSchema",
|
|
1082
1123
|
"location": {
|
|
1083
1124
|
"filePath": "merging.main.runtime.ts",
|
|
1084
|
-
"line":
|
|
1125
|
+
"line": 135,
|
|
1085
1126
|
"character": 5
|
|
1086
1127
|
},
|
|
1087
1128
|
"name": "skipDependencyInstallation",
|
|
@@ -1089,7 +1130,7 @@
|
|
|
1089
1130
|
"__schema": "KeywordTypeSchema",
|
|
1090
1131
|
"location": {
|
|
1091
1132
|
"filePath": "merging.main.runtime.ts",
|
|
1092
|
-
"line":
|
|
1133
|
+
"line": 135,
|
|
1093
1134
|
"character": 33
|
|
1094
1135
|
},
|
|
1095
1136
|
"name": "boolean"
|
|
@@ -1102,7 +1143,7 @@
|
|
|
1102
1143
|
"__schema": "TypeRefSchema",
|
|
1103
1144
|
"location": {
|
|
1104
1145
|
"filePath": "merging.main.runtime.ts",
|
|
1105
|
-
"line":
|
|
1146
|
+
"line": 136,
|
|
1106
1147
|
"character": 6
|
|
1107
1148
|
},
|
|
1108
1149
|
"name": "Promise",
|
|
@@ -1111,7 +1152,7 @@
|
|
|
1111
1152
|
"__schema": "TypeRefSchema",
|
|
1112
1153
|
"location": {
|
|
1113
1154
|
"filePath": "merging.main.runtime.ts",
|
|
1114
|
-
"line":
|
|
1155
|
+
"line": 136,
|
|
1115
1156
|
"character": 14
|
|
1116
1157
|
},
|
|
1117
1158
|
"name": "ApplyVersionResults"
|
|
@@ -1126,14 +1167,14 @@
|
|
|
1126
1167
|
"__schema": "FunctionLikeSchema",
|
|
1127
1168
|
"location": {
|
|
1128
1169
|
"filePath": "merging.main.runtime.ts",
|
|
1129
|
-
"line":
|
|
1170
|
+
"line": 164,
|
|
1130
1171
|
"character": 3
|
|
1131
1172
|
},
|
|
1132
1173
|
"doc": {
|
|
1133
1174
|
"__schema": "DocSchema",
|
|
1134
1175
|
"location": {
|
|
1135
1176
|
"filePath": "merging.main.runtime.ts",
|
|
1136
|
-
"line":
|
|
1177
|
+
"line": 160,
|
|
1137
1178
|
"character": 3
|
|
1138
1179
|
},
|
|
1139
1180
|
"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 */",
|
|
@@ -1146,7 +1187,7 @@
|
|
|
1146
1187
|
"__schema": "ParameterSchema",
|
|
1147
1188
|
"location": {
|
|
1148
1189
|
"filePath": "merging.main.runtime.ts",
|
|
1149
|
-
"line":
|
|
1190
|
+
"line": 165,
|
|
1150
1191
|
"character": 5
|
|
1151
1192
|
},
|
|
1152
1193
|
"name": "consumer",
|
|
@@ -1154,7 +1195,7 @@
|
|
|
1154
1195
|
"__schema": "TypeRefSchema",
|
|
1155
1196
|
"location": {
|
|
1156
1197
|
"filePath": "merging.main.runtime.ts",
|
|
1157
|
-
"line":
|
|
1198
|
+
"line": 165,
|
|
1158
1199
|
"character": 15
|
|
1159
1200
|
},
|
|
1160
1201
|
"name": "Consumer"
|
|
@@ -1166,7 +1207,7 @@
|
|
|
1166
1207
|
"__schema": "ParameterSchema",
|
|
1167
1208
|
"location": {
|
|
1168
1209
|
"filePath": "merging.main.runtime.ts",
|
|
1169
|
-
"line":
|
|
1210
|
+
"line": 166,
|
|
1170
1211
|
"character": 5
|
|
1171
1212
|
},
|
|
1172
1213
|
"name": "bitIds",
|
|
@@ -1174,14 +1215,14 @@
|
|
|
1174
1215
|
"__schema": "TypeArraySchema",
|
|
1175
1216
|
"location": {
|
|
1176
1217
|
"filePath": "merging.main.runtime.ts",
|
|
1177
|
-
"line":
|
|
1218
|
+
"line": 166,
|
|
1178
1219
|
"character": 13
|
|
1179
1220
|
},
|
|
1180
1221
|
"type": {
|
|
1181
1222
|
"__schema": "TypeRefSchema",
|
|
1182
1223
|
"location": {
|
|
1183
1224
|
"filePath": "merging.main.runtime.ts",
|
|
1184
|
-
"line":
|
|
1225
|
+
"line": 166,
|
|
1185
1226
|
"character": 13
|
|
1186
1227
|
},
|
|
1187
1228
|
"name": "ComponentID"
|
|
@@ -1194,7 +1235,7 @@
|
|
|
1194
1235
|
"__schema": "ParameterSchema",
|
|
1195
1236
|
"location": {
|
|
1196
1237
|
"filePath": "merging.main.runtime.ts",
|
|
1197
|
-
"line":
|
|
1238
|
+
"line": 167,
|
|
1198
1239
|
"character": 5
|
|
1199
1240
|
},
|
|
1200
1241
|
"name": "mergeStrategy",
|
|
@@ -1202,7 +1243,7 @@
|
|
|
1202
1243
|
"__schema": "TypeRefSchema",
|
|
1203
1244
|
"location": {
|
|
1204
1245
|
"filePath": "merging.main.runtime.ts",
|
|
1205
|
-
"line":
|
|
1246
|
+
"line": 167,
|
|
1206
1247
|
"character": 20
|
|
1207
1248
|
},
|
|
1208
1249
|
"name": "MergeStrategy"
|
|
@@ -1214,7 +1255,7 @@
|
|
|
1214
1255
|
"__schema": "ParameterSchema",
|
|
1215
1256
|
"location": {
|
|
1216
1257
|
"filePath": "merging.main.runtime.ts",
|
|
1217
|
-
"line":
|
|
1258
|
+
"line": 168,
|
|
1218
1259
|
"character": 5
|
|
1219
1260
|
},
|
|
1220
1261
|
"name": "noSnap",
|
|
@@ -1222,7 +1263,7 @@
|
|
|
1222
1263
|
"__schema": "KeywordTypeSchema",
|
|
1223
1264
|
"location": {
|
|
1224
1265
|
"filePath": "merging.main.runtime.ts",
|
|
1225
|
-
"line":
|
|
1266
|
+
"line": 168,
|
|
1226
1267
|
"character": 13
|
|
1227
1268
|
},
|
|
1228
1269
|
"name": "boolean"
|
|
@@ -1234,7 +1275,7 @@
|
|
|
1234
1275
|
"__schema": "ParameterSchema",
|
|
1235
1276
|
"location": {
|
|
1236
1277
|
"filePath": "merging.main.runtime.ts",
|
|
1237
|
-
"line":
|
|
1278
|
+
"line": 169,
|
|
1238
1279
|
"character": 5
|
|
1239
1280
|
},
|
|
1240
1281
|
"name": "snapMessage",
|
|
@@ -1242,7 +1283,7 @@
|
|
|
1242
1283
|
"__schema": "KeywordTypeSchema",
|
|
1243
1284
|
"location": {
|
|
1244
1285
|
"filePath": "merging.main.runtime.ts",
|
|
1245
|
-
"line":
|
|
1286
|
+
"line": 169,
|
|
1246
1287
|
"character": 18
|
|
1247
1288
|
},
|
|
1248
1289
|
"name": "string"
|
|
@@ -1254,7 +1295,7 @@
|
|
|
1254
1295
|
"__schema": "ParameterSchema",
|
|
1255
1296
|
"location": {
|
|
1256
1297
|
"filePath": "merging.main.runtime.ts",
|
|
1257
|
-
"line":
|
|
1298
|
+
"line": 170,
|
|
1258
1299
|
"character": 5
|
|
1259
1300
|
},
|
|
1260
1301
|
"name": "build",
|
|
@@ -1262,7 +1303,7 @@
|
|
|
1262
1303
|
"__schema": "KeywordTypeSchema",
|
|
1263
1304
|
"location": {
|
|
1264
1305
|
"filePath": "merging.main.runtime.ts",
|
|
1265
|
-
"line":
|
|
1306
|
+
"line": 170,
|
|
1266
1307
|
"character": 12
|
|
1267
1308
|
},
|
|
1268
1309
|
"name": "boolean"
|
|
@@ -1274,7 +1315,7 @@
|
|
|
1274
1315
|
"__schema": "ParameterSchema",
|
|
1275
1316
|
"location": {
|
|
1276
1317
|
"filePath": "merging.main.runtime.ts",
|
|
1277
|
-
"line":
|
|
1318
|
+
"line": 171,
|
|
1278
1319
|
"character": 5
|
|
1279
1320
|
},
|
|
1280
1321
|
"name": "skipDependencyInstallation",
|
|
@@ -1282,7 +1323,7 @@
|
|
|
1282
1323
|
"__schema": "KeywordTypeSchema",
|
|
1283
1324
|
"location": {
|
|
1284
1325
|
"filePath": "merging.main.runtime.ts",
|
|
1285
|
-
"line":
|
|
1326
|
+
"line": 171,
|
|
1286
1327
|
"character": 33
|
|
1287
1328
|
},
|
|
1288
1329
|
"name": "boolean"
|
|
@@ -1295,7 +1336,7 @@
|
|
|
1295
1336
|
"__schema": "TypeRefSchema",
|
|
1296
1337
|
"location": {
|
|
1297
1338
|
"filePath": "merging.main.runtime.ts",
|
|
1298
|
-
"line":
|
|
1339
|
+
"line": 172,
|
|
1299
1340
|
"character": 6
|
|
1300
1341
|
},
|
|
1301
1342
|
"name": "Promise",
|
|
@@ -1304,7 +1345,7 @@
|
|
|
1304
1345
|
"__schema": "TypeRefSchema",
|
|
1305
1346
|
"location": {
|
|
1306
1347
|
"filePath": "merging.main.runtime.ts",
|
|
1307
|
-
"line":
|
|
1348
|
+
"line": 172,
|
|
1308
1349
|
"character": 14
|
|
1309
1350
|
},
|
|
1310
1351
|
"name": "ApplyVersionResults"
|
|
@@ -1319,14 +1360,14 @@
|
|
|
1319
1360
|
"__schema": "FunctionLikeSchema",
|
|
1320
1361
|
"location": {
|
|
1321
1362
|
"filePath": "merging.main.runtime.ts",
|
|
1322
|
-
"line":
|
|
1363
|
+
"line": 207,
|
|
1323
1364
|
"character": 3
|
|
1324
1365
|
},
|
|
1325
1366
|
"doc": {
|
|
1326
1367
|
"__schema": "DocSchema",
|
|
1327
1368
|
"location": {
|
|
1328
1369
|
"filePath": "merging.main.runtime.ts",
|
|
1329
|
-
"line":
|
|
1370
|
+
"line": 204,
|
|
1330
1371
|
"character": 3
|
|
1331
1372
|
},
|
|
1332
1373
|
"raw": "/**\n * merge multiple components according to the \"allComponentsStatus\".\n */",
|
|
@@ -1339,7 +1380,7 @@
|
|
|
1339
1380
|
"__schema": "ParameterSchema",
|
|
1340
1381
|
"location": {
|
|
1341
1382
|
"filePath": "merging.main.runtime.ts",
|
|
1342
|
-
"line":
|
|
1383
|
+
"line": 207,
|
|
1343
1384
|
"character": 20
|
|
1344
1385
|
},
|
|
1345
1386
|
"name": "{ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noSnap, tag, snapMessage, build, skipDependencyInstallation }",
|
|
@@ -1347,7 +1388,7 @@
|
|
|
1347
1388
|
"__schema": "TypeLiteralSchema",
|
|
1348
1389
|
"location": {
|
|
1349
1390
|
"filePath": "merging.main.runtime.ts",
|
|
1350
|
-
"line":
|
|
1391
|
+
"line": 217,
|
|
1351
1392
|
"character": 6
|
|
1352
1393
|
},
|
|
1353
1394
|
"members": [
|
|
@@ -1355,16 +1396,16 @@
|
|
|
1355
1396
|
"__schema": "VariableLikeSchema",
|
|
1356
1397
|
"location": {
|
|
1357
1398
|
"filePath": "merging.main.runtime.ts",
|
|
1358
|
-
"line":
|
|
1399
|
+
"line": 218,
|
|
1359
1400
|
"character": 5
|
|
1360
1401
|
},
|
|
1361
|
-
"signature": "(property) mergeStrategy: \"
|
|
1402
|
+
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
1362
1403
|
"name": "mergeStrategy",
|
|
1363
1404
|
"type": {
|
|
1364
1405
|
"__schema": "TypeRefSchema",
|
|
1365
1406
|
"location": {
|
|
1366
1407
|
"filePath": "merging.main.runtime.ts",
|
|
1367
|
-
"line":
|
|
1408
|
+
"line": 218,
|
|
1368
1409
|
"character": 20
|
|
1369
1410
|
},
|
|
1370
1411
|
"name": "MergeStrategy"
|
|
@@ -1375,7 +1416,7 @@
|
|
|
1375
1416
|
"__schema": "VariableLikeSchema",
|
|
1376
1417
|
"location": {
|
|
1377
1418
|
"filePath": "merging.main.runtime.ts",
|
|
1378
|
-
"line":
|
|
1419
|
+
"line": 219,
|
|
1379
1420
|
"character": 5
|
|
1380
1421
|
},
|
|
1381
1422
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -1384,14 +1425,14 @@
|
|
|
1384
1425
|
"__schema": "TypeArraySchema",
|
|
1385
1426
|
"location": {
|
|
1386
1427
|
"filePath": "merging.main.runtime.ts",
|
|
1387
|
-
"line":
|
|
1428
|
+
"line": 219,
|
|
1388
1429
|
"character": 26
|
|
1389
1430
|
},
|
|
1390
1431
|
"type": {
|
|
1391
1432
|
"__schema": "TypeRefSchema",
|
|
1392
1433
|
"location": {
|
|
1393
1434
|
"filePath": "merging.main.runtime.ts",
|
|
1394
|
-
"line":
|
|
1435
|
+
"line": 219,
|
|
1395
1436
|
"character": 26
|
|
1396
1437
|
},
|
|
1397
1438
|
"name": "ComponentMergeStatus"
|
|
@@ -1403,7 +1444,7 @@
|
|
|
1403
1444
|
"__schema": "VariableLikeSchema",
|
|
1404
1445
|
"location": {
|
|
1405
1446
|
"filePath": "merging.main.runtime.ts",
|
|
1406
|
-
"line":
|
|
1447
|
+
"line": 220,
|
|
1407
1448
|
"character": 5
|
|
1408
1449
|
},
|
|
1409
1450
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -1412,7 +1453,7 @@
|
|
|
1412
1453
|
"__schema": "TypeRefSchema",
|
|
1413
1454
|
"location": {
|
|
1414
1455
|
"filePath": "merging.main.runtime.ts",
|
|
1415
|
-
"line":
|
|
1456
|
+
"line": 220,
|
|
1416
1457
|
"character": 5
|
|
1417
1458
|
},
|
|
1418
1459
|
"name": "LaneId",
|
|
@@ -1428,7 +1469,7 @@
|
|
|
1428
1469
|
"__schema": "VariableLikeSchema",
|
|
1429
1470
|
"location": {
|
|
1430
1471
|
"filePath": "merging.main.runtime.ts",
|
|
1431
|
-
"line":
|
|
1472
|
+
"line": 221,
|
|
1432
1473
|
"character": 5
|
|
1433
1474
|
},
|
|
1434
1475
|
"signature": "(property) currentLane: Lane | null",
|
|
@@ -1437,7 +1478,7 @@
|
|
|
1437
1478
|
"__schema": "TypeUnionSchema",
|
|
1438
1479
|
"location": {
|
|
1439
1480
|
"filePath": "merging.main.runtime.ts",
|
|
1440
|
-
"line":
|
|
1481
|
+
"line": 221,
|
|
1441
1482
|
"character": 18
|
|
1442
1483
|
},
|
|
1443
1484
|
"types": [
|
|
@@ -1445,7 +1486,7 @@
|
|
|
1445
1486
|
"__schema": "TypeRefSchema",
|
|
1446
1487
|
"location": {
|
|
1447
1488
|
"filePath": "merging.main.runtime.ts",
|
|
1448
|
-
"line":
|
|
1489
|
+
"line": 221,
|
|
1449
1490
|
"character": 18
|
|
1450
1491
|
},
|
|
1451
1492
|
"name": "Lane"
|
|
@@ -1454,7 +1495,7 @@
|
|
|
1454
1495
|
"__schema": "LiteralTypeSchema",
|
|
1455
1496
|
"location": {
|
|
1456
1497
|
"filePath": "merging.main.runtime.ts",
|
|
1457
|
-
"line":
|
|
1498
|
+
"line": 221,
|
|
1458
1499
|
"character": 25
|
|
1459
1500
|
},
|
|
1460
1501
|
"name": "null"
|
|
@@ -1467,7 +1508,7 @@
|
|
|
1467
1508
|
"__schema": "VariableLikeSchema",
|
|
1468
1509
|
"location": {
|
|
1469
1510
|
"filePath": "merging.main.runtime.ts",
|
|
1470
|
-
"line":
|
|
1511
|
+
"line": 222,
|
|
1471
1512
|
"character": 5
|
|
1472
1513
|
},
|
|
1473
1514
|
"signature": "(property) noSnap: boolean",
|
|
@@ -1476,7 +1517,7 @@
|
|
|
1476
1517
|
"__schema": "KeywordTypeSchema",
|
|
1477
1518
|
"location": {
|
|
1478
1519
|
"filePath": "merging.main.runtime.ts",
|
|
1479
|
-
"line":
|
|
1520
|
+
"line": 222,
|
|
1480
1521
|
"character": 13
|
|
1481
1522
|
},
|
|
1482
1523
|
"name": "boolean"
|
|
@@ -1487,7 +1528,7 @@
|
|
|
1487
1528
|
"__schema": "VariableLikeSchema",
|
|
1488
1529
|
"location": {
|
|
1489
1530
|
"filePath": "merging.main.runtime.ts",
|
|
1490
|
-
"line":
|
|
1531
|
+
"line": 223,
|
|
1491
1532
|
"character": 5
|
|
1492
1533
|
},
|
|
1493
1534
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -1496,7 +1537,7 @@
|
|
|
1496
1537
|
"__schema": "KeywordTypeSchema",
|
|
1497
1538
|
"location": {
|
|
1498
1539
|
"filePath": "merging.main.runtime.ts",
|
|
1499
|
-
"line":
|
|
1540
|
+
"line": 223,
|
|
1500
1541
|
"character": 11
|
|
1501
1542
|
},
|
|
1502
1543
|
"name": "boolean"
|
|
@@ -1507,7 +1548,7 @@
|
|
|
1507
1548
|
"__schema": "VariableLikeSchema",
|
|
1508
1549
|
"location": {
|
|
1509
1550
|
"filePath": "merging.main.runtime.ts",
|
|
1510
|
-
"line":
|
|
1551
|
+
"line": 224,
|
|
1511
1552
|
"character": 5
|
|
1512
1553
|
},
|
|
1513
1554
|
"signature": "(property) snapMessage: string",
|
|
@@ -1516,7 +1557,7 @@
|
|
|
1516
1557
|
"__schema": "KeywordTypeSchema",
|
|
1517
1558
|
"location": {
|
|
1518
1559
|
"filePath": "merging.main.runtime.ts",
|
|
1519
|
-
"line":
|
|
1560
|
+
"line": 224,
|
|
1520
1561
|
"character": 18
|
|
1521
1562
|
},
|
|
1522
1563
|
"name": "string"
|
|
@@ -1527,7 +1568,7 @@
|
|
|
1527
1568
|
"__schema": "VariableLikeSchema",
|
|
1528
1569
|
"location": {
|
|
1529
1570
|
"filePath": "merging.main.runtime.ts",
|
|
1530
|
-
"line":
|
|
1571
|
+
"line": 225,
|
|
1531
1572
|
"character": 5
|
|
1532
1573
|
},
|
|
1533
1574
|
"signature": "(property) build: boolean",
|
|
@@ -1536,7 +1577,7 @@
|
|
|
1536
1577
|
"__schema": "KeywordTypeSchema",
|
|
1537
1578
|
"location": {
|
|
1538
1579
|
"filePath": "merging.main.runtime.ts",
|
|
1539
|
-
"line":
|
|
1580
|
+
"line": 225,
|
|
1540
1581
|
"character": 12
|
|
1541
1582
|
},
|
|
1542
1583
|
"name": "boolean"
|
|
@@ -1547,7 +1588,7 @@
|
|
|
1547
1588
|
"__schema": "VariableLikeSchema",
|
|
1548
1589
|
"location": {
|
|
1549
1590
|
"filePath": "merging.main.runtime.ts",
|
|
1550
|
-
"line":
|
|
1591
|
+
"line": 226,
|
|
1551
1592
|
"character": 5
|
|
1552
1593
|
},
|
|
1553
1594
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -1556,7 +1597,7 @@
|
|
|
1556
1597
|
"__schema": "KeywordTypeSchema",
|
|
1557
1598
|
"location": {
|
|
1558
1599
|
"filePath": "merging.main.runtime.ts",
|
|
1559
|
-
"line":
|
|
1600
|
+
"line": 226,
|
|
1560
1601
|
"character": 34
|
|
1561
1602
|
},
|
|
1562
1603
|
"name": "boolean"
|
|
@@ -1571,16 +1612,16 @@
|
|
|
1571
1612
|
"__schema": "VariableLikeSchema",
|
|
1572
1613
|
"location": {
|
|
1573
1614
|
"filePath": "merging.main.runtime.ts",
|
|
1574
|
-
"line":
|
|
1615
|
+
"line": 218,
|
|
1575
1616
|
"character": 5
|
|
1576
1617
|
},
|
|
1577
|
-
"signature": "(property) mergeStrategy: \"
|
|
1618
|
+
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
1578
1619
|
"name": "mergeStrategy",
|
|
1579
1620
|
"type": {
|
|
1580
1621
|
"__schema": "TypeRefSchema",
|
|
1581
1622
|
"location": {
|
|
1582
1623
|
"filePath": "merging.main.runtime.ts",
|
|
1583
|
-
"line":
|
|
1624
|
+
"line": 218,
|
|
1584
1625
|
"character": 20
|
|
1585
1626
|
},
|
|
1586
1627
|
"name": "MergeStrategy"
|
|
@@ -1591,7 +1632,7 @@
|
|
|
1591
1632
|
"__schema": "VariableLikeSchema",
|
|
1592
1633
|
"location": {
|
|
1593
1634
|
"filePath": "merging.main.runtime.ts",
|
|
1594
|
-
"line":
|
|
1635
|
+
"line": 219,
|
|
1595
1636
|
"character": 5
|
|
1596
1637
|
},
|
|
1597
1638
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -1600,14 +1641,14 @@
|
|
|
1600
1641
|
"__schema": "TypeArraySchema",
|
|
1601
1642
|
"location": {
|
|
1602
1643
|
"filePath": "merging.main.runtime.ts",
|
|
1603
|
-
"line":
|
|
1644
|
+
"line": 219,
|
|
1604
1645
|
"character": 26
|
|
1605
1646
|
},
|
|
1606
1647
|
"type": {
|
|
1607
1648
|
"__schema": "TypeRefSchema",
|
|
1608
1649
|
"location": {
|
|
1609
1650
|
"filePath": "merging.main.runtime.ts",
|
|
1610
|
-
"line":
|
|
1651
|
+
"line": 219,
|
|
1611
1652
|
"character": 26
|
|
1612
1653
|
},
|
|
1613
1654
|
"name": "ComponentMergeStatus"
|
|
@@ -1619,7 +1660,7 @@
|
|
|
1619
1660
|
"__schema": "VariableLikeSchema",
|
|
1620
1661
|
"location": {
|
|
1621
1662
|
"filePath": "merging.main.runtime.ts",
|
|
1622
|
-
"line":
|
|
1663
|
+
"line": 220,
|
|
1623
1664
|
"character": 5
|
|
1624
1665
|
},
|
|
1625
1666
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -1628,7 +1669,7 @@
|
|
|
1628
1669
|
"__schema": "TypeRefSchema",
|
|
1629
1670
|
"location": {
|
|
1630
1671
|
"filePath": "merging.main.runtime.ts",
|
|
1631
|
-
"line":
|
|
1672
|
+
"line": 220,
|
|
1632
1673
|
"character": 5
|
|
1633
1674
|
},
|
|
1634
1675
|
"name": "LaneId",
|
|
@@ -1644,7 +1685,7 @@
|
|
|
1644
1685
|
"__schema": "VariableLikeSchema",
|
|
1645
1686
|
"location": {
|
|
1646
1687
|
"filePath": "merging.main.runtime.ts",
|
|
1647
|
-
"line":
|
|
1688
|
+
"line": 221,
|
|
1648
1689
|
"character": 5
|
|
1649
1690
|
},
|
|
1650
1691
|
"signature": "(property) currentLane: Lane | null",
|
|
@@ -1653,7 +1694,7 @@
|
|
|
1653
1694
|
"__schema": "TypeUnionSchema",
|
|
1654
1695
|
"location": {
|
|
1655
1696
|
"filePath": "merging.main.runtime.ts",
|
|
1656
|
-
"line":
|
|
1697
|
+
"line": 221,
|
|
1657
1698
|
"character": 18
|
|
1658
1699
|
},
|
|
1659
1700
|
"types": [
|
|
@@ -1661,7 +1702,7 @@
|
|
|
1661
1702
|
"__schema": "TypeRefSchema",
|
|
1662
1703
|
"location": {
|
|
1663
1704
|
"filePath": "merging.main.runtime.ts",
|
|
1664
|
-
"line":
|
|
1705
|
+
"line": 221,
|
|
1665
1706
|
"character": 18
|
|
1666
1707
|
},
|
|
1667
1708
|
"name": "Lane"
|
|
@@ -1670,7 +1711,7 @@
|
|
|
1670
1711
|
"__schema": "LiteralTypeSchema",
|
|
1671
1712
|
"location": {
|
|
1672
1713
|
"filePath": "merging.main.runtime.ts",
|
|
1673
|
-
"line":
|
|
1714
|
+
"line": 221,
|
|
1674
1715
|
"character": 25
|
|
1675
1716
|
},
|
|
1676
1717
|
"name": "null"
|
|
@@ -1683,7 +1724,7 @@
|
|
|
1683
1724
|
"__schema": "VariableLikeSchema",
|
|
1684
1725
|
"location": {
|
|
1685
1726
|
"filePath": "merging.main.runtime.ts",
|
|
1686
|
-
"line":
|
|
1727
|
+
"line": 222,
|
|
1687
1728
|
"character": 5
|
|
1688
1729
|
},
|
|
1689
1730
|
"signature": "(property) noSnap: boolean",
|
|
@@ -1692,7 +1733,7 @@
|
|
|
1692
1733
|
"__schema": "KeywordTypeSchema",
|
|
1693
1734
|
"location": {
|
|
1694
1735
|
"filePath": "merging.main.runtime.ts",
|
|
1695
|
-
"line":
|
|
1736
|
+
"line": 222,
|
|
1696
1737
|
"character": 13
|
|
1697
1738
|
},
|
|
1698
1739
|
"name": "boolean"
|
|
@@ -1703,7 +1744,7 @@
|
|
|
1703
1744
|
"__schema": "VariableLikeSchema",
|
|
1704
1745
|
"location": {
|
|
1705
1746
|
"filePath": "merging.main.runtime.ts",
|
|
1706
|
-
"line":
|
|
1747
|
+
"line": 223,
|
|
1707
1748
|
"character": 5
|
|
1708
1749
|
},
|
|
1709
1750
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -1712,7 +1753,7 @@
|
|
|
1712
1753
|
"__schema": "KeywordTypeSchema",
|
|
1713
1754
|
"location": {
|
|
1714
1755
|
"filePath": "merging.main.runtime.ts",
|
|
1715
|
-
"line":
|
|
1756
|
+
"line": 223,
|
|
1716
1757
|
"character": 11
|
|
1717
1758
|
},
|
|
1718
1759
|
"name": "boolean"
|
|
@@ -1723,7 +1764,7 @@
|
|
|
1723
1764
|
"__schema": "VariableLikeSchema",
|
|
1724
1765
|
"location": {
|
|
1725
1766
|
"filePath": "merging.main.runtime.ts",
|
|
1726
|
-
"line":
|
|
1767
|
+
"line": 224,
|
|
1727
1768
|
"character": 5
|
|
1728
1769
|
},
|
|
1729
1770
|
"signature": "(property) snapMessage: string",
|
|
@@ -1732,7 +1773,7 @@
|
|
|
1732
1773
|
"__schema": "KeywordTypeSchema",
|
|
1733
1774
|
"location": {
|
|
1734
1775
|
"filePath": "merging.main.runtime.ts",
|
|
1735
|
-
"line":
|
|
1776
|
+
"line": 224,
|
|
1736
1777
|
"character": 18
|
|
1737
1778
|
},
|
|
1738
1779
|
"name": "string"
|
|
@@ -1743,7 +1784,7 @@
|
|
|
1743
1784
|
"__schema": "VariableLikeSchema",
|
|
1744
1785
|
"location": {
|
|
1745
1786
|
"filePath": "merging.main.runtime.ts",
|
|
1746
|
-
"line":
|
|
1787
|
+
"line": 225,
|
|
1747
1788
|
"character": 5
|
|
1748
1789
|
},
|
|
1749
1790
|
"signature": "(property) build: boolean",
|
|
@@ -1752,7 +1793,7 @@
|
|
|
1752
1793
|
"__schema": "KeywordTypeSchema",
|
|
1753
1794
|
"location": {
|
|
1754
1795
|
"filePath": "merging.main.runtime.ts",
|
|
1755
|
-
"line":
|
|
1796
|
+
"line": 225,
|
|
1756
1797
|
"character": 12
|
|
1757
1798
|
},
|
|
1758
1799
|
"name": "boolean"
|
|
@@ -1763,7 +1804,7 @@
|
|
|
1763
1804
|
"__schema": "VariableLikeSchema",
|
|
1764
1805
|
"location": {
|
|
1765
1806
|
"filePath": "merging.main.runtime.ts",
|
|
1766
|
-
"line":
|
|
1807
|
+
"line": 226,
|
|
1767
1808
|
"character": 5
|
|
1768
1809
|
},
|
|
1769
1810
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -1772,7 +1813,7 @@
|
|
|
1772
1813
|
"__schema": "KeywordTypeSchema",
|
|
1773
1814
|
"location": {
|
|
1774
1815
|
"filePath": "merging.main.runtime.ts",
|
|
1775
|
-
"line":
|
|
1816
|
+
"line": 226,
|
|
1776
1817
|
"character": 34
|
|
1777
1818
|
},
|
|
1778
1819
|
"name": "boolean"
|
|
@@ -1787,7 +1828,7 @@
|
|
|
1787
1828
|
"__schema": "TypeRefSchema",
|
|
1788
1829
|
"location": {
|
|
1789
1830
|
"filePath": "merging.main.runtime.ts",
|
|
1790
|
-
"line":
|
|
1831
|
+
"line": 227,
|
|
1791
1832
|
"character": 7
|
|
1792
1833
|
},
|
|
1793
1834
|
"name": "Promise",
|
|
@@ -1796,7 +1837,7 @@
|
|
|
1796
1837
|
"__schema": "TypeRefSchema",
|
|
1797
1838
|
"location": {
|
|
1798
1839
|
"filePath": "merging.main.runtime.ts",
|
|
1799
|
-
"line":
|
|
1840
|
+
"line": 227,
|
|
1800
1841
|
"character": 15
|
|
1801
1842
|
},
|
|
1802
1843
|
"name": "ApplyVersionResults"
|
|
@@ -1811,14 +1852,14 @@
|
|
|
1811
1852
|
"__schema": "FunctionLikeSchema",
|
|
1812
1853
|
"location": {
|
|
1813
1854
|
"filePath": "merging.main.runtime.ts",
|
|
1814
|
-
"line":
|
|
1855
|
+
"line": 347,
|
|
1815
1856
|
"character": 3
|
|
1816
1857
|
},
|
|
1817
1858
|
"doc": {
|
|
1818
1859
|
"__schema": "DocSchema",
|
|
1819
1860
|
"location": {
|
|
1820
1861
|
"filePath": "merging.main.runtime.ts",
|
|
1821
|
-
"line":
|
|
1862
|
+
"line": 341,
|
|
1822
1863
|
"character": 3
|
|
1823
1864
|
},
|
|
1824
1865
|
"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 */",
|
|
@@ -1831,7 +1872,7 @@
|
|
|
1831
1872
|
"__schema": "ParameterSchema",
|
|
1832
1873
|
"location": {
|
|
1833
1874
|
"filePath": "merging.main.runtime.ts",
|
|
1834
|
-
"line":
|
|
1875
|
+
"line": 348,
|
|
1835
1876
|
"character": 5
|
|
1836
1877
|
},
|
|
1837
1878
|
"name": "bitIds",
|
|
@@ -1839,14 +1880,14 @@
|
|
|
1839
1880
|
"__schema": "TypeArraySchema",
|
|
1840
1881
|
"location": {
|
|
1841
1882
|
"filePath": "merging.main.runtime.ts",
|
|
1842
|
-
"line":
|
|
1883
|
+
"line": 348,
|
|
1843
1884
|
"character": 13
|
|
1844
1885
|
},
|
|
1845
1886
|
"type": {
|
|
1846
1887
|
"__schema": "TypeRefSchema",
|
|
1847
1888
|
"location": {
|
|
1848
1889
|
"filePath": "merging.main.runtime.ts",
|
|
1849
|
-
"line":
|
|
1890
|
+
"line": 348,
|
|
1850
1891
|
"character": 13
|
|
1851
1892
|
},
|
|
1852
1893
|
"name": "ComponentID"
|
|
@@ -1859,7 +1900,7 @@
|
|
|
1859
1900
|
"__schema": "ParameterSchema",
|
|
1860
1901
|
"location": {
|
|
1861
1902
|
"filePath": "merging.main.runtime.ts",
|
|
1862
|
-
"line":
|
|
1903
|
+
"line": 349,
|
|
1863
1904
|
"character": 5
|
|
1864
1905
|
},
|
|
1865
1906
|
"name": "options",
|
|
@@ -1867,7 +1908,7 @@
|
|
|
1867
1908
|
"__schema": "TypeRefSchema",
|
|
1868
1909
|
"location": {
|
|
1869
1910
|
"filePath": "merging.main.runtime.ts",
|
|
1870
|
-
"line":
|
|
1911
|
+
"line": 349,
|
|
1871
1912
|
"character": 14
|
|
1872
1913
|
},
|
|
1873
1914
|
"name": "MergeStatusProviderOptions"
|
|
@@ -1879,7 +1920,7 @@
|
|
|
1879
1920
|
"__schema": "ParameterSchema",
|
|
1880
1921
|
"location": {
|
|
1881
1922
|
"filePath": "merging.main.runtime.ts",
|
|
1882
|
-
"line":
|
|
1923
|
+
"line": 350,
|
|
1883
1924
|
"character": 5
|
|
1884
1925
|
},
|
|
1885
1926
|
"name": "currentLane",
|
|
@@ -1887,7 +1928,7 @@
|
|
|
1887
1928
|
"__schema": "TypeUnionSchema",
|
|
1888
1929
|
"location": {
|
|
1889
1930
|
"filePath": "merging.main.runtime.ts",
|
|
1890
|
-
"line":
|
|
1931
|
+
"line": 350,
|
|
1891
1932
|
"character": 18
|
|
1892
1933
|
},
|
|
1893
1934
|
"types": [
|
|
@@ -1895,7 +1936,7 @@
|
|
|
1895
1936
|
"__schema": "TypeRefSchema",
|
|
1896
1937
|
"location": {
|
|
1897
1938
|
"filePath": "merging.main.runtime.ts",
|
|
1898
|
-
"line":
|
|
1939
|
+
"line": 350,
|
|
1899
1940
|
"character": 18
|
|
1900
1941
|
},
|
|
1901
1942
|
"name": "Lane"
|
|
@@ -1904,7 +1945,7 @@
|
|
|
1904
1945
|
"__schema": "LiteralTypeSchema",
|
|
1905
1946
|
"location": {
|
|
1906
1947
|
"filePath": "merging.main.runtime.ts",
|
|
1907
|
-
"line":
|
|
1948
|
+
"line": 350,
|
|
1908
1949
|
"character": 25
|
|
1909
1950
|
},
|
|
1910
1951
|
"name": "null"
|
|
@@ -1918,7 +1959,7 @@
|
|
|
1918
1959
|
"__schema": "ParameterSchema",
|
|
1919
1960
|
"location": {
|
|
1920
1961
|
"filePath": "merging.main.runtime.ts",
|
|
1921
|
-
"line":
|
|
1962
|
+
"line": 351,
|
|
1922
1963
|
"character": 5
|
|
1923
1964
|
},
|
|
1924
1965
|
"name": "otherLane",
|
|
@@ -1926,7 +1967,7 @@
|
|
|
1926
1967
|
"__schema": "TypeUnionSchema",
|
|
1927
1968
|
"location": {
|
|
1928
1969
|
"filePath": "merging.main.runtime.ts",
|
|
1929
|
-
"line":
|
|
1970
|
+
"line": 351,
|
|
1930
1971
|
"character": 17
|
|
1931
1972
|
},
|
|
1932
1973
|
"types": [
|
|
@@ -1934,7 +1975,7 @@
|
|
|
1934
1975
|
"__schema": "TypeRefSchema",
|
|
1935
1976
|
"location": {
|
|
1936
1977
|
"filePath": "merging.main.runtime.ts",
|
|
1937
|
-
"line":
|
|
1978
|
+
"line": 351,
|
|
1938
1979
|
"character": 17
|
|
1939
1980
|
},
|
|
1940
1981
|
"name": "Lane"
|
|
@@ -1943,7 +1984,7 @@
|
|
|
1943
1984
|
"__schema": "LiteralTypeSchema",
|
|
1944
1985
|
"location": {
|
|
1945
1986
|
"filePath": "merging.main.runtime.ts",
|
|
1946
|
-
"line":
|
|
1987
|
+
"line": 351,
|
|
1947
1988
|
"character": 24
|
|
1948
1989
|
},
|
|
1949
1990
|
"name": "null"
|
|
@@ -1958,7 +1999,7 @@
|
|
|
1958
1999
|
"__schema": "TypeRefSchema",
|
|
1959
2000
|
"location": {
|
|
1960
2001
|
"filePath": "merging.main.runtime.ts",
|
|
1961
|
-
"line":
|
|
2002
|
+
"line": 352,
|
|
1962
2003
|
"character": 6
|
|
1963
2004
|
},
|
|
1964
2005
|
"name": "Promise",
|
|
@@ -1967,14 +2008,14 @@
|
|
|
1967
2008
|
"__schema": "TypeArraySchema",
|
|
1968
2009
|
"location": {
|
|
1969
2010
|
"filePath": "merging.main.runtime.ts",
|
|
1970
|
-
"line":
|
|
2011
|
+
"line": 352,
|
|
1971
2012
|
"character": 14
|
|
1972
2013
|
},
|
|
1973
2014
|
"type": {
|
|
1974
2015
|
"__schema": "TypeRefSchema",
|
|
1975
2016
|
"location": {
|
|
1976
2017
|
"filePath": "merging.main.runtime.ts",
|
|
1977
|
-
"line":
|
|
2018
|
+
"line": 352,
|
|
1978
2019
|
"character": 14
|
|
1979
2020
|
},
|
|
1980
2021
|
"name": "ComponentMergeStatus"
|
|
@@ -1990,7 +2031,7 @@
|
|
|
1990
2031
|
"__schema": "VariableLikeSchema",
|
|
1991
2032
|
"location": {
|
|
1992
2033
|
"filePath": "merging.main.runtime.ts",
|
|
1993
|
-
"line":
|
|
2034
|
+
"line": 649,
|
|
1994
2035
|
"character": 3
|
|
1995
2036
|
},
|
|
1996
2037
|
"signature": "(property) MergingMain.slots: never[]",
|
|
@@ -1999,7 +2040,7 @@
|
|
|
1999
2040
|
"__schema": "InferenceTypeSchema",
|
|
2000
2041
|
"location": {
|
|
2001
2042
|
"filePath": "merging.main.runtime.ts",
|
|
2002
|
-
"line":
|
|
2043
|
+
"line": 649,
|
|
2003
2044
|
"character": 3
|
|
2004
2045
|
},
|
|
2005
2046
|
"type": "never[]"
|
|
@@ -2011,7 +2052,7 @@
|
|
|
2011
2052
|
"__schema": "VariableLikeSchema",
|
|
2012
2053
|
"location": {
|
|
2013
2054
|
"filePath": "merging.main.runtime.ts",
|
|
2014
|
-
"line":
|
|
2055
|
+
"line": 650,
|
|
2015
2056
|
"character": 3
|
|
2016
2057
|
},
|
|
2017
2058
|
"signature": "(property) MergingMain.dependencies: Aspect[]",
|
|
@@ -2020,19 +2061,19 @@
|
|
|
2020
2061
|
"__schema": "InferenceTypeSchema",
|
|
2021
2062
|
"location": {
|
|
2022
2063
|
"filePath": "merging.main.runtime.ts",
|
|
2023
|
-
"line":
|
|
2064
|
+
"line": 650,
|
|
2024
2065
|
"character": 3
|
|
2025
2066
|
},
|
|
2026
2067
|
"type": "Aspect[]"
|
|
2027
2068
|
},
|
|
2028
2069
|
"isOptional": true,
|
|
2029
|
-
"defaultValue": "[\n CLIAspect,\n WorkspaceAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n ]"
|
|
2070
|
+
"defaultValue": "[\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n ]"
|
|
2030
2071
|
},
|
|
2031
2072
|
{
|
|
2032
2073
|
"__schema": "VariableLikeSchema",
|
|
2033
2074
|
"location": {
|
|
2034
2075
|
"filePath": "merging.main.runtime.ts",
|
|
2035
|
-
"line":
|
|
2076
|
+
"line": 665,
|
|
2036
2077
|
"character": 3
|
|
2037
2078
|
},
|
|
2038
2079
|
"signature": "(property) MergingMain.runtime: RuntimeDefinition",
|
|
@@ -2041,7 +2082,7 @@
|
|
|
2041
2082
|
"__schema": "InferenceTypeSchema",
|
|
2042
2083
|
"location": {
|
|
2043
2084
|
"filePath": "merging.main.runtime.ts",
|
|
2044
|
-
"line":
|
|
2085
|
+
"line": 665,
|
|
2045
2086
|
"character": 3
|
|
2046
2087
|
},
|
|
2047
2088
|
"type": "RuntimeDefinition"
|
|
@@ -2053,25 +2094,25 @@
|
|
|
2053
2094
|
"__schema": "FunctionLikeSchema",
|
|
2054
2095
|
"location": {
|
|
2055
2096
|
"filePath": "merging.main.runtime.ts",
|
|
2056
|
-
"line":
|
|
2097
|
+
"line": 666,
|
|
2057
2098
|
"character": 3
|
|
2058
2099
|
},
|
|
2059
|
-
"signature": "(method) MergingMain.provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain\n]): Promise<MergingMain>",
|
|
2100
|
+
"signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [\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]): Promise<MergingMain>",
|
|
2060
2101
|
"name": "provider",
|
|
2061
2102
|
"params": [
|
|
2062
2103
|
{
|
|
2063
2104
|
"__schema": "ParameterSchema",
|
|
2064
2105
|
"location": {
|
|
2065
2106
|
"filePath": "merging.main.runtime.ts",
|
|
2066
|
-
"line":
|
|
2107
|
+
"line": 666,
|
|
2067
2108
|
"character": 25
|
|
2068
2109
|
},
|
|
2069
|
-
"name": "[ cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
|
|
2110
|
+
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
|
|
2070
2111
|
"type": {
|
|
2071
2112
|
"__schema": "TupleTypeSchema",
|
|
2072
2113
|
"location": {
|
|
2073
2114
|
"filePath": "merging.main.runtime.ts",
|
|
2074
|
-
"line":
|
|
2115
|
+
"line": 680,
|
|
2075
2116
|
"character": 6
|
|
2076
2117
|
},
|
|
2077
2118
|
"elements": [
|
|
@@ -2079,7 +2120,7 @@
|
|
|
2079
2120
|
"__schema": "TypeRefSchema",
|
|
2080
2121
|
"location": {
|
|
2081
2122
|
"filePath": "merging.main.runtime.ts",
|
|
2082
|
-
"line":
|
|
2123
|
+
"line": 681,
|
|
2083
2124
|
"character": 5
|
|
2084
2125
|
},
|
|
2085
2126
|
"name": "CLIMain"
|
|
@@ -2088,7 +2129,7 @@
|
|
|
2088
2129
|
"__schema": "TypeRefSchema",
|
|
2089
2130
|
"location": {
|
|
2090
2131
|
"filePath": "merging.main.runtime.ts",
|
|
2091
|
-
"line":
|
|
2132
|
+
"line": 682,
|
|
2092
2133
|
"character": 5
|
|
2093
2134
|
},
|
|
2094
2135
|
"name": "Workspace"
|
|
@@ -2097,7 +2138,16 @@
|
|
|
2097
2138
|
"__schema": "TypeRefSchema",
|
|
2098
2139
|
"location": {
|
|
2099
2140
|
"filePath": "merging.main.runtime.ts",
|
|
2100
|
-
"line":
|
|
2141
|
+
"line": 683,
|
|
2142
|
+
"character": 5
|
|
2143
|
+
},
|
|
2144
|
+
"name": "ScopeMain"
|
|
2145
|
+
},
|
|
2146
|
+
{
|
|
2147
|
+
"__schema": "TypeRefSchema",
|
|
2148
|
+
"location": {
|
|
2149
|
+
"filePath": "merging.main.runtime.ts",
|
|
2150
|
+
"line": 684,
|
|
2101
2151
|
"character": 5
|
|
2102
2152
|
},
|
|
2103
2153
|
"name": "SnappingMain"
|
|
@@ -2106,7 +2156,7 @@
|
|
|
2106
2156
|
"__schema": "TypeRefSchema",
|
|
2107
2157
|
"location": {
|
|
2108
2158
|
"filePath": "merging.main.runtime.ts",
|
|
2109
|
-
"line":
|
|
2159
|
+
"line": 685,
|
|
2110
2160
|
"character": 5
|
|
2111
2161
|
},
|
|
2112
2162
|
"name": "CheckoutMain"
|
|
@@ -2115,7 +2165,7 @@
|
|
|
2115
2165
|
"__schema": "TypeRefSchema",
|
|
2116
2166
|
"location": {
|
|
2117
2167
|
"filePath": "merging.main.runtime.ts",
|
|
2118
|
-
"line":
|
|
2168
|
+
"line": 686,
|
|
2119
2169
|
"character": 5
|
|
2120
2170
|
},
|
|
2121
2171
|
"name": "InstallMain"
|
|
@@ -2124,7 +2174,7 @@
|
|
|
2124
2174
|
"__schema": "TypeRefSchema",
|
|
2125
2175
|
"location": {
|
|
2126
2176
|
"filePath": "merging.main.runtime.ts",
|
|
2127
|
-
"line":
|
|
2177
|
+
"line": 687,
|
|
2128
2178
|
"character": 5
|
|
2129
2179
|
},
|
|
2130
2180
|
"name": "LoggerMain"
|
|
@@ -2133,7 +2183,7 @@
|
|
|
2133
2183
|
"__schema": "TypeRefSchema",
|
|
2134
2184
|
"location": {
|
|
2135
2185
|
"filePath": "merging.main.runtime.ts",
|
|
2136
|
-
"line":
|
|
2186
|
+
"line": 688,
|
|
2137
2187
|
"character": 5
|
|
2138
2188
|
},
|
|
2139
2189
|
"name": "ComponentWriterMain"
|
|
@@ -2142,7 +2192,7 @@
|
|
|
2142
2192
|
"__schema": "TypeRefSchema",
|
|
2143
2193
|
"location": {
|
|
2144
2194
|
"filePath": "merging.main.runtime.ts",
|
|
2145
|
-
"line":
|
|
2195
|
+
"line": 689,
|
|
2146
2196
|
"character": 5
|
|
2147
2197
|
},
|
|
2148
2198
|
"name": "ImporterMain"
|
|
@@ -2151,7 +2201,7 @@
|
|
|
2151
2201
|
"__schema": "TypeRefSchema",
|
|
2152
2202
|
"location": {
|
|
2153
2203
|
"filePath": "merging.main.runtime.ts",
|
|
2154
|
-
"line":
|
|
2204
|
+
"line": 690,
|
|
2155
2205
|
"character": 5
|
|
2156
2206
|
},
|
|
2157
2207
|
"name": "ConfigMain"
|
|
@@ -2160,7 +2210,7 @@
|
|
|
2160
2210
|
"__schema": "TypeRefSchema",
|
|
2161
2211
|
"location": {
|
|
2162
2212
|
"filePath": "merging.main.runtime.ts",
|
|
2163
|
-
"line":
|
|
2213
|
+
"line": 691,
|
|
2164
2214
|
"character": 5
|
|
2165
2215
|
},
|
|
2166
2216
|
"name": "RemoveMain"
|
|
@@ -2169,7 +2219,7 @@
|
|
|
2169
2219
|
"__schema": "TypeRefSchema",
|
|
2170
2220
|
"location": {
|
|
2171
2221
|
"filePath": "merging.main.runtime.ts",
|
|
2172
|
-
"line":
|
|
2222
|
+
"line": 692,
|
|
2173
2223
|
"character": 5
|
|
2174
2224
|
},
|
|
2175
2225
|
"name": "GlobalConfigMain"
|
|
@@ -2178,7 +2228,7 @@
|
|
|
2178
2228
|
"__schema": "TypeRefSchema",
|
|
2179
2229
|
"location": {
|
|
2180
2230
|
"filePath": "merging.main.runtime.ts",
|
|
2181
|
-
"line":
|
|
2231
|
+
"line": 693,
|
|
2182
2232
|
"character": 5
|
|
2183
2233
|
},
|
|
2184
2234
|
"name": "ConfigMergerMain"
|
|
@@ -2193,7 +2243,7 @@
|
|
|
2193
2243
|
"__schema": "InferenceTypeSchema",
|
|
2194
2244
|
"location": {
|
|
2195
2245
|
"filePath": "merging.main.runtime.ts",
|
|
2196
|
-
"line":
|
|
2246
|
+
"line": 666,
|
|
2197
2247
|
"character": 3
|
|
2198
2248
|
},
|
|
2199
2249
|
"type": "Promise<MergingMain>"
|
|
@@ -2211,7 +2261,7 @@
|
|
|
2211
2261
|
"__schema": "TypeSchema",
|
|
2212
2262
|
"location": {
|
|
2213
2263
|
"filePath": "merging.main.runtime.ts",
|
|
2214
|
-
"line":
|
|
2264
|
+
"line": 62,
|
|
2215
2265
|
"character": 1
|
|
2216
2266
|
},
|
|
2217
2267
|
"signature": "type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null | undefined;\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n configMergeResult?: ConfigMergeResult | undefined;\n}",
|
|
@@ -2220,7 +2270,7 @@
|
|
|
2220
2270
|
"__schema": "TypeIntersectionSchema",
|
|
2221
2271
|
"location": {
|
|
2222
2272
|
"filePath": "merging.main.runtime.ts",
|
|
2223
|
-
"line":
|
|
2273
|
+
"line": 62,
|
|
2224
2274
|
"character": 36
|
|
2225
2275
|
},
|
|
2226
2276
|
"types": [
|
|
@@ -2228,7 +2278,7 @@
|
|
|
2228
2278
|
"__schema": "TypeRefSchema",
|
|
2229
2279
|
"location": {
|
|
2230
2280
|
"filePath": "merging.main.runtime.ts",
|
|
2231
|
-
"line":
|
|
2281
|
+
"line": 62,
|
|
2232
2282
|
"character": 36
|
|
2233
2283
|
},
|
|
2234
2284
|
"name": "ComponentStatusBase"
|
|
@@ -2237,7 +2287,7 @@
|
|
|
2237
2287
|
"__schema": "TypeLiteralSchema",
|
|
2238
2288
|
"location": {
|
|
2239
2289
|
"filePath": "merging.main.runtime.ts",
|
|
2240
|
-
"line":
|
|
2290
|
+
"line": 62,
|
|
2241
2291
|
"character": 58
|
|
2242
2292
|
},
|
|
2243
2293
|
"members": [
|
|
@@ -2245,7 +2295,7 @@
|
|
|
2245
2295
|
"__schema": "VariableLikeSchema",
|
|
2246
2296
|
"location": {
|
|
2247
2297
|
"filePath": "merging.main.runtime.ts",
|
|
2248
|
-
"line":
|
|
2298
|
+
"line": 63,
|
|
2249
2299
|
"character": 3
|
|
2250
2300
|
},
|
|
2251
2301
|
"signature": "(property) mergeResults?: MergeResultsThreeWay | null | undefined",
|
|
@@ -2254,7 +2304,7 @@
|
|
|
2254
2304
|
"__schema": "TypeUnionSchema",
|
|
2255
2305
|
"location": {
|
|
2256
2306
|
"filePath": "merging.main.runtime.ts",
|
|
2257
|
-
"line":
|
|
2307
|
+
"line": 63,
|
|
2258
2308
|
"character": 18
|
|
2259
2309
|
},
|
|
2260
2310
|
"types": [
|
|
@@ -2262,7 +2312,7 @@
|
|
|
2262
2312
|
"__schema": "TypeRefSchema",
|
|
2263
2313
|
"location": {
|
|
2264
2314
|
"filePath": "merging.main.runtime.ts",
|
|
2265
|
-
"line":
|
|
2315
|
+
"line": 63,
|
|
2266
2316
|
"character": 18
|
|
2267
2317
|
},
|
|
2268
2318
|
"name": "MergeResultsThreeWay"
|
|
@@ -2271,7 +2321,7 @@
|
|
|
2271
2321
|
"__schema": "LiteralTypeSchema",
|
|
2272
2322
|
"location": {
|
|
2273
2323
|
"filePath": "merging.main.runtime.ts",
|
|
2274
|
-
"line":
|
|
2324
|
+
"line": 63,
|
|
2275
2325
|
"character": 41
|
|
2276
2326
|
},
|
|
2277
2327
|
"name": "null"
|
|
@@ -2284,7 +2334,7 @@
|
|
|
2284
2334
|
"__schema": "VariableLikeSchema",
|
|
2285
2335
|
"location": {
|
|
2286
2336
|
"filePath": "merging.main.runtime.ts",
|
|
2287
|
-
"line":
|
|
2337
|
+
"line": 64,
|
|
2288
2338
|
"character": 3
|
|
2289
2339
|
},
|
|
2290
2340
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -2293,7 +2343,7 @@
|
|
|
2293
2343
|
"__schema": "TypeRefSchema",
|
|
2294
2344
|
"location": {
|
|
2295
2345
|
"filePath": "merging.main.runtime.ts",
|
|
2296
|
-
"line":
|
|
2346
|
+
"line": 64,
|
|
2297
2347
|
"character": 17
|
|
2298
2348
|
},
|
|
2299
2349
|
"name": "SnapsDistance"
|
|
@@ -2304,7 +2354,7 @@
|
|
|
2304
2354
|
"__schema": "VariableLikeSchema",
|
|
2305
2355
|
"location": {
|
|
2306
2356
|
"filePath": "merging.main.runtime.ts",
|
|
2307
|
-
"line":
|
|
2357
|
+
"line": 65,
|
|
2308
2358
|
"character": 3
|
|
2309
2359
|
},
|
|
2310
2360
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -2313,7 +2363,7 @@
|
|
|
2313
2363
|
"__schema": "TypeRefSchema",
|
|
2314
2364
|
"location": {
|
|
2315
2365
|
"filePath": "merging.main.runtime.ts",
|
|
2316
|
-
"line":
|
|
2366
|
+
"line": 65,
|
|
2317
2367
|
"character": 23
|
|
2318
2368
|
},
|
|
2319
2369
|
"name": "ResolveUnrelatedData"
|
|
@@ -2324,7 +2374,7 @@
|
|
|
2324
2374
|
"__schema": "VariableLikeSchema",
|
|
2325
2375
|
"location": {
|
|
2326
2376
|
"filePath": "merging.main.runtime.ts",
|
|
2327
|
-
"line":
|
|
2377
|
+
"line": 66,
|
|
2328
2378
|
"character": 3
|
|
2329
2379
|
},
|
|
2330
2380
|
"signature": "(property) configMergeResult?: ConfigMergeResult | undefined",
|
|
@@ -2333,7 +2383,7 @@
|
|
|
2333
2383
|
"__schema": "TypeRefSchema",
|
|
2334
2384
|
"location": {
|
|
2335
2385
|
"filePath": "merging.main.runtime.ts",
|
|
2336
|
-
"line":
|
|
2386
|
+
"line": 66,
|
|
2337
2387
|
"character": 23
|
|
2338
2388
|
},
|
|
2339
2389
|
"name": "ConfigMergeResult"
|
|
@@ -2349,7 +2399,7 @@
|
|
|
2349
2399
|
"__schema": "TypeSchema",
|
|
2350
2400
|
"location": {
|
|
2351
2401
|
"filePath": "merging.main.runtime.ts",
|
|
2352
|
-
"line":
|
|
2402
|
+
"line": 93,
|
|
2353
2403
|
"character": 1
|
|
2354
2404
|
},
|
|
2355
2405
|
"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}",
|
|
@@ -2358,7 +2408,7 @@
|
|
|
2358
2408
|
"__schema": "TypeLiteralSchema",
|
|
2359
2409
|
"location": {
|
|
2360
2410
|
"filePath": "merging.main.runtime.ts",
|
|
2361
|
-
"line":
|
|
2411
|
+
"line": 93,
|
|
2362
2412
|
"character": 35
|
|
2363
2413
|
},
|
|
2364
2414
|
"members": [
|
|
@@ -2366,7 +2416,7 @@
|
|
|
2366
2416
|
"__schema": "VariableLikeSchema",
|
|
2367
2417
|
"location": {
|
|
2368
2418
|
"filePath": "merging.main.runtime.ts",
|
|
2369
|
-
"line":
|
|
2419
|
+
"line": 94,
|
|
2370
2420
|
"character": 3
|
|
2371
2421
|
},
|
|
2372
2422
|
"signature": "(property) components?: ApplyVersionResult[] | undefined",
|
|
@@ -2375,14 +2425,14 @@
|
|
|
2375
2425
|
"__schema": "TypeArraySchema",
|
|
2376
2426
|
"location": {
|
|
2377
2427
|
"filePath": "merging.main.runtime.ts",
|
|
2378
|
-
"line":
|
|
2428
|
+
"line": 94,
|
|
2379
2429
|
"character": 16
|
|
2380
2430
|
},
|
|
2381
2431
|
"type": {
|
|
2382
2432
|
"__schema": "TypeRefSchema",
|
|
2383
2433
|
"location": {
|
|
2384
2434
|
"filePath": "merging.main.runtime.ts",
|
|
2385
|
-
"line":
|
|
2435
|
+
"line": 94,
|
|
2386
2436
|
"character": 16
|
|
2387
2437
|
},
|
|
2388
2438
|
"name": "ApplyVersionResult"
|
|
@@ -2394,7 +2444,7 @@
|
|
|
2394
2444
|
"__schema": "VariableLikeSchema",
|
|
2395
2445
|
"location": {
|
|
2396
2446
|
"filePath": "merging.main.runtime.ts",
|
|
2397
|
-
"line":
|
|
2447
|
+
"line": 95,
|
|
2398
2448
|
"character": 3
|
|
2399
2449
|
},
|
|
2400
2450
|
"signature": "(property) version?: string | undefined",
|
|
@@ -2403,7 +2453,7 @@
|
|
|
2403
2453
|
"__schema": "KeywordTypeSchema",
|
|
2404
2454
|
"location": {
|
|
2405
2455
|
"filePath": "merging.main.runtime.ts",
|
|
2406
|
-
"line":
|
|
2456
|
+
"line": 95,
|
|
2407
2457
|
"character": 13
|
|
2408
2458
|
},
|
|
2409
2459
|
"name": "string"
|
|
@@ -2414,7 +2464,7 @@
|
|
|
2414
2464
|
"__schema": "VariableLikeSchema",
|
|
2415
2465
|
"location": {
|
|
2416
2466
|
"filePath": "merging.main.runtime.ts",
|
|
2417
|
-
"line":
|
|
2467
|
+
"line": 96,
|
|
2418
2468
|
"character": 3
|
|
2419
2469
|
},
|
|
2420
2470
|
"signature": "(property) failedComponents?: FailedComponents[] | undefined",
|
|
@@ -2423,14 +2473,14 @@
|
|
|
2423
2473
|
"__schema": "TypeArraySchema",
|
|
2424
2474
|
"location": {
|
|
2425
2475
|
"filePath": "merging.main.runtime.ts",
|
|
2426
|
-
"line":
|
|
2476
|
+
"line": 96,
|
|
2427
2477
|
"character": 22
|
|
2428
2478
|
},
|
|
2429
2479
|
"type": {
|
|
2430
2480
|
"__schema": "TypeRefSchema",
|
|
2431
2481
|
"location": {
|
|
2432
2482
|
"filePath": "merging.main.runtime.ts",
|
|
2433
|
-
"line":
|
|
2483
|
+
"line": 96,
|
|
2434
2484
|
"character": 22
|
|
2435
2485
|
},
|
|
2436
2486
|
"name": "FailedComponents"
|
|
@@ -2442,7 +2492,7 @@
|
|
|
2442
2492
|
"__schema": "VariableLikeSchema",
|
|
2443
2493
|
"location": {
|
|
2444
2494
|
"filePath": "merging.main.runtime.ts",
|
|
2445
|
-
"line":
|
|
2495
|
+
"line": 97,
|
|
2446
2496
|
"character": 3
|
|
2447
2497
|
},
|
|
2448
2498
|
"signature": "(property) removedComponents?: ComponentID[] | undefined",
|
|
@@ -2451,14 +2501,14 @@
|
|
|
2451
2501
|
"__schema": "TypeArraySchema",
|
|
2452
2502
|
"location": {
|
|
2453
2503
|
"filePath": "merging.main.runtime.ts",
|
|
2454
|
-
"line":
|
|
2504
|
+
"line": 97,
|
|
2455
2505
|
"character": 23
|
|
2456
2506
|
},
|
|
2457
2507
|
"type": {
|
|
2458
2508
|
"__schema": "TypeRefSchema",
|
|
2459
2509
|
"location": {
|
|
2460
2510
|
"filePath": "merging.main.runtime.ts",
|
|
2461
|
-
"line":
|
|
2511
|
+
"line": 97,
|
|
2462
2512
|
"character": 23
|
|
2463
2513
|
},
|
|
2464
2514
|
"name": "ComponentID"
|
|
@@ -2470,7 +2520,7 @@
|
|
|
2470
2520
|
"__schema": "VariableLikeSchema",
|
|
2471
2521
|
"location": {
|
|
2472
2522
|
"filePath": "merging.main.runtime.ts",
|
|
2473
|
-
"line":
|
|
2523
|
+
"line": 98,
|
|
2474
2524
|
"character": 3
|
|
2475
2525
|
},
|
|
2476
2526
|
"signature": "(property) addedComponents?: ComponentID[] | undefined",
|
|
@@ -2479,14 +2529,14 @@
|
|
|
2479
2529
|
"__schema": "TypeArraySchema",
|
|
2480
2530
|
"location": {
|
|
2481
2531
|
"filePath": "merging.main.runtime.ts",
|
|
2482
|
-
"line":
|
|
2532
|
+
"line": 98,
|
|
2483
2533
|
"character": 21
|
|
2484
2534
|
},
|
|
2485
2535
|
"type": {
|
|
2486
2536
|
"__schema": "TypeRefSchema",
|
|
2487
2537
|
"location": {
|
|
2488
2538
|
"filePath": "merging.main.runtime.ts",
|
|
2489
|
-
"line":
|
|
2539
|
+
"line": 98,
|
|
2490
2540
|
"character": 21
|
|
2491
2541
|
},
|
|
2492
2542
|
"name": "ComponentID"
|
|
@@ -2498,7 +2548,7 @@
|
|
|
2498
2548
|
"__schema": "VariableLikeSchema",
|
|
2499
2549
|
"location": {
|
|
2500
2550
|
"filePath": "merging.main.runtime.ts",
|
|
2501
|
-
"line":
|
|
2551
|
+
"line": 99,
|
|
2502
2552
|
"character": 3
|
|
2503
2553
|
},
|
|
2504
2554
|
"signature": "(property) resolvedComponents?: ConsumerComponent[] | undefined",
|
|
@@ -2507,14 +2557,14 @@
|
|
|
2507
2557
|
"__schema": "TypeArraySchema",
|
|
2508
2558
|
"location": {
|
|
2509
2559
|
"filePath": "merging.main.runtime.ts",
|
|
2510
|
-
"line":
|
|
2560
|
+
"line": 99,
|
|
2511
2561
|
"character": 24
|
|
2512
2562
|
},
|
|
2513
2563
|
"type": {
|
|
2514
2564
|
"__schema": "TypeRefSchema",
|
|
2515
2565
|
"location": {
|
|
2516
2566
|
"filePath": "merging.main.runtime.ts",
|
|
2517
|
-
"line":
|
|
2567
|
+
"line": 99,
|
|
2518
2568
|
"character": 24
|
|
2519
2569
|
},
|
|
2520
2570
|
"name": "ConsumerComponent"
|
|
@@ -2526,7 +2576,7 @@
|
|
|
2526
2576
|
"__schema": "VariableLikeSchema",
|
|
2527
2577
|
"location": {
|
|
2528
2578
|
"filePath": "merging.main.runtime.ts",
|
|
2529
|
-
"line":
|
|
2579
|
+
"line": 100,
|
|
2530
2580
|
"character": 3
|
|
2531
2581
|
},
|
|
2532
2582
|
"signature": "(property) abortedComponents?: ApplyVersionResult[] | undefined",
|
|
@@ -2535,14 +2585,14 @@
|
|
|
2535
2585
|
"__schema": "TypeArraySchema",
|
|
2536
2586
|
"location": {
|
|
2537
2587
|
"filePath": "merging.main.runtime.ts",
|
|
2538
|
-
"line":
|
|
2588
|
+
"line": 100,
|
|
2539
2589
|
"character": 23
|
|
2540
2590
|
},
|
|
2541
2591
|
"type": {
|
|
2542
2592
|
"__schema": "TypeRefSchema",
|
|
2543
2593
|
"location": {
|
|
2544
2594
|
"filePath": "merging.main.runtime.ts",
|
|
2545
|
-
"line":
|
|
2595
|
+
"line": 100,
|
|
2546
2596
|
"character": 23
|
|
2547
2597
|
},
|
|
2548
2598
|
"name": "ApplyVersionResult"
|
|
@@ -2554,115 +2604,19 @@
|
|
|
2554
2604
|
"__schema": "VariableLikeSchema",
|
|
2555
2605
|
"location": {
|
|
2556
2606
|
"filePath": "merging.main.runtime.ts",
|
|
2557
|
-
"line":
|
|
2607
|
+
"line": 101,
|
|
2558
2608
|
"character": 3
|
|
2559
2609
|
},
|
|
2560
|
-
"signature": "(property) mergeSnapResults?:
|
|
2610
|
+
"signature": "(property) mergeSnapResults?: MergeSnapResults | undefined",
|
|
2561
2611
|
"name": "mergeSnapResults",
|
|
2562
2612
|
"type": {
|
|
2563
|
-
"__schema": "
|
|
2613
|
+
"__schema": "TypeRefSchema",
|
|
2564
2614
|
"location": {
|
|
2565
2615
|
"filePath": "merging.main.runtime.ts",
|
|
2566
|
-
"line":
|
|
2616
|
+
"line": 101,
|
|
2567
2617
|
"character": 22
|
|
2568
2618
|
},
|
|
2569
|
-
"
|
|
2570
|
-
{
|
|
2571
|
-
"__schema": "TypeLiteralSchema",
|
|
2572
|
-
"location": {
|
|
2573
|
-
"filePath": "merging.main.runtime.ts",
|
|
2574
|
-
"line": 93,
|
|
2575
|
-
"character": 22
|
|
2576
|
-
},
|
|
2577
|
-
"members": [
|
|
2578
|
-
{
|
|
2579
|
-
"__schema": "VariableLikeSchema",
|
|
2580
|
-
"location": {
|
|
2581
|
-
"filePath": "merging.main.runtime.ts",
|
|
2582
|
-
"line": 94,
|
|
2583
|
-
"character": 5
|
|
2584
|
-
},
|
|
2585
|
-
"signature": "(property) snappedComponents: ConsumerComponent[]",
|
|
2586
|
-
"name": "snappedComponents",
|
|
2587
|
-
"type": {
|
|
2588
|
-
"__schema": "TypeArraySchema",
|
|
2589
|
-
"location": {
|
|
2590
|
-
"filePath": "merging.main.runtime.ts",
|
|
2591
|
-
"line": 94,
|
|
2592
|
-
"character": 24
|
|
2593
|
-
},
|
|
2594
|
-
"type": {
|
|
2595
|
-
"__schema": "TypeRefSchema",
|
|
2596
|
-
"location": {
|
|
2597
|
-
"filePath": "merging.main.runtime.ts",
|
|
2598
|
-
"line": 94,
|
|
2599
|
-
"character": 24
|
|
2600
|
-
},
|
|
2601
|
-
"name": "ConsumerComponent"
|
|
2602
|
-
}
|
|
2603
|
-
},
|
|
2604
|
-
"isOptional": false
|
|
2605
|
-
},
|
|
2606
|
-
{
|
|
2607
|
-
"__schema": "VariableLikeSchema",
|
|
2608
|
-
"location": {
|
|
2609
|
-
"filePath": "merging.main.runtime.ts",
|
|
2610
|
-
"line": 95,
|
|
2611
|
-
"character": 5
|
|
2612
|
-
},
|
|
2613
|
-
"signature": "(property) autoSnappedResults: AutoTagResult[]",
|
|
2614
|
-
"name": "autoSnappedResults",
|
|
2615
|
-
"type": {
|
|
2616
|
-
"__schema": "TypeArraySchema",
|
|
2617
|
-
"location": {
|
|
2618
|
-
"filePath": "merging.main.runtime.ts",
|
|
2619
|
-
"line": 95,
|
|
2620
|
-
"character": 25
|
|
2621
|
-
},
|
|
2622
|
-
"type": {
|
|
2623
|
-
"__schema": "TypeRefSchema",
|
|
2624
|
-
"location": {
|
|
2625
|
-
"filePath": "merging.main.runtime.ts",
|
|
2626
|
-
"line": 95,
|
|
2627
|
-
"character": 25
|
|
2628
|
-
},
|
|
2629
|
-
"name": "AutoTagResult"
|
|
2630
|
-
}
|
|
2631
|
-
},
|
|
2632
|
-
"isOptional": false
|
|
2633
|
-
},
|
|
2634
|
-
{
|
|
2635
|
-
"__schema": "VariableLikeSchema",
|
|
2636
|
-
"location": {
|
|
2637
|
-
"filePath": "merging.main.runtime.ts",
|
|
2638
|
-
"line": 96,
|
|
2639
|
-
"character": 5
|
|
2640
|
-
},
|
|
2641
|
-
"signature": "(property) removedComponents?: ComponentIdList | undefined",
|
|
2642
|
-
"name": "removedComponents",
|
|
2643
|
-
"type": {
|
|
2644
|
-
"__schema": "TypeRefSchema",
|
|
2645
|
-
"location": {
|
|
2646
|
-
"filePath": "merging.main.runtime.ts",
|
|
2647
|
-
"line": 96,
|
|
2648
|
-
"character": 25
|
|
2649
|
-
},
|
|
2650
|
-
"name": "ComponentIdList"
|
|
2651
|
-
},
|
|
2652
|
-
"isOptional": true
|
|
2653
|
-
}
|
|
2654
|
-
]
|
|
2655
|
-
},
|
|
2656
|
-
{
|
|
2657
|
-
"__schema": "LiteralTypeSchema",
|
|
2658
|
-
"location": {
|
|
2659
|
-
"filePath": "merging.main.runtime.ts",
|
|
2660
|
-
"line": 97,
|
|
2661
|
-
"character": 7
|
|
2662
|
-
},
|
|
2663
|
-
"name": "null"
|
|
2664
|
-
}
|
|
2665
|
-
]
|
|
2619
|
+
"name": "MergeSnapResults"
|
|
2666
2620
|
},
|
|
2667
2621
|
"isOptional": true
|
|
2668
2622
|
},
|
|
@@ -2670,7 +2624,7 @@
|
|
|
2670
2624
|
"__schema": "VariableLikeSchema",
|
|
2671
2625
|
"location": {
|
|
2672
2626
|
"filePath": "merging.main.runtime.ts",
|
|
2673
|
-
"line":
|
|
2627
|
+
"line": 102,
|
|
2674
2628
|
"character": 3
|
|
2675
2629
|
},
|
|
2676
2630
|
"signature": "(property) mergeSnapError?: Error | undefined",
|
|
@@ -2679,7 +2633,7 @@
|
|
|
2679
2633
|
"__schema": "TypeRefSchema",
|
|
2680
2634
|
"location": {
|
|
2681
2635
|
"filePath": "merging.main.runtime.ts",
|
|
2682
|
-
"line":
|
|
2636
|
+
"line": 102,
|
|
2683
2637
|
"character": 20
|
|
2684
2638
|
},
|
|
2685
2639
|
"name": "Error"
|
|
@@ -2690,7 +2644,7 @@
|
|
|
2690
2644
|
"__schema": "VariableLikeSchema",
|
|
2691
2645
|
"location": {
|
|
2692
2646
|
"filePath": "merging.main.runtime.ts",
|
|
2693
|
-
"line":
|
|
2647
|
+
"line": 103,
|
|
2694
2648
|
"character": 3
|
|
2695
2649
|
},
|
|
2696
2650
|
"signature": "(property) leftUnresolvedConflicts?: boolean | undefined",
|
|
@@ -2699,7 +2653,7 @@
|
|
|
2699
2653
|
"__schema": "KeywordTypeSchema",
|
|
2700
2654
|
"location": {
|
|
2701
2655
|
"filePath": "merging.main.runtime.ts",
|
|
2702
|
-
"line":
|
|
2656
|
+
"line": 103,
|
|
2703
2657
|
"character": 29
|
|
2704
2658
|
},
|
|
2705
2659
|
"name": "boolean"
|
|
@@ -2710,7 +2664,7 @@
|
|
|
2710
2664
|
"__schema": "VariableLikeSchema",
|
|
2711
2665
|
"location": {
|
|
2712
2666
|
"filePath": "merging.main.runtime.ts",
|
|
2713
|
-
"line":
|
|
2667
|
+
"line": 104,
|
|
2714
2668
|
"character": 3
|
|
2715
2669
|
},
|
|
2716
2670
|
"signature": "(property) verbose?: boolean | undefined",
|
|
@@ -2719,7 +2673,7 @@
|
|
|
2719
2673
|
"__schema": "KeywordTypeSchema",
|
|
2720
2674
|
"location": {
|
|
2721
2675
|
"filePath": "merging.main.runtime.ts",
|
|
2722
|
-
"line":
|
|
2676
|
+
"line": 104,
|
|
2723
2677
|
"character": 13
|
|
2724
2678
|
},
|
|
2725
2679
|
"name": "boolean"
|
|
@@ -2730,7 +2684,7 @@
|
|
|
2730
2684
|
"__schema": "VariableLikeSchema",
|
|
2731
2685
|
"location": {
|
|
2732
2686
|
"filePath": "merging.main.runtime.ts",
|
|
2733
|
-
"line":
|
|
2687
|
+
"line": 105,
|
|
2734
2688
|
"character": 3
|
|
2735
2689
|
},
|
|
2736
2690
|
"signature": "(property) newFromLane?: string[] | undefined",
|
|
@@ -2739,14 +2693,14 @@
|
|
|
2739
2693
|
"__schema": "TypeArraySchema",
|
|
2740
2694
|
"location": {
|
|
2741
2695
|
"filePath": "merging.main.runtime.ts",
|
|
2742
|
-
"line":
|
|
2696
|
+
"line": 105,
|
|
2743
2697
|
"character": 17
|
|
2744
2698
|
},
|
|
2745
2699
|
"type": {
|
|
2746
2700
|
"__schema": "KeywordTypeSchema",
|
|
2747
2701
|
"location": {
|
|
2748
2702
|
"filePath": "merging.main.runtime.ts",
|
|
2749
|
-
"line":
|
|
2703
|
+
"line": 105,
|
|
2750
2704
|
"character": 17
|
|
2751
2705
|
},
|
|
2752
2706
|
"name": "string"
|
|
@@ -2758,7 +2712,7 @@
|
|
|
2758
2712
|
"__schema": "VariableLikeSchema",
|
|
2759
2713
|
"location": {
|
|
2760
2714
|
"filePath": "merging.main.runtime.ts",
|
|
2761
|
-
"line":
|
|
2715
|
+
"line": 106,
|
|
2762
2716
|
"character": 3
|
|
2763
2717
|
},
|
|
2764
2718
|
"signature": "(property) newFromLaneAdded?: boolean | undefined",
|
|
@@ -2767,7 +2721,7 @@
|
|
|
2767
2721
|
"__schema": "KeywordTypeSchema",
|
|
2768
2722
|
"location": {
|
|
2769
2723
|
"filePath": "merging.main.runtime.ts",
|
|
2770
|
-
"line":
|
|
2724
|
+
"line": 106,
|
|
2771
2725
|
"character": 22
|
|
2772
2726
|
},
|
|
2773
2727
|
"name": "boolean"
|
|
@@ -2778,7 +2732,7 @@
|
|
|
2778
2732
|
"__schema": "VariableLikeSchema",
|
|
2779
2733
|
"location": {
|
|
2780
2734
|
"filePath": "merging.main.runtime.ts",
|
|
2781
|
-
"line":
|
|
2735
|
+
"line": 107,
|
|
2782
2736
|
"character": 3
|
|
2783
2737
|
},
|
|
2784
2738
|
"signature": "(property) installationError?: Error | undefined",
|
|
@@ -2787,7 +2741,7 @@
|
|
|
2787
2741
|
"__schema": "TypeRefSchema",
|
|
2788
2742
|
"location": {
|
|
2789
2743
|
"filePath": "merging.main.runtime.ts",
|
|
2790
|
-
"line":
|
|
2744
|
+
"line": 107,
|
|
2791
2745
|
"character": 23
|
|
2792
2746
|
},
|
|
2793
2747
|
"name": "Error"
|
|
@@ -2798,7 +2752,7 @@
|
|
|
2798
2752
|
"__schema": "VariableLikeSchema",
|
|
2799
2753
|
"location": {
|
|
2800
2754
|
"filePath": "merging.main.runtime.ts",
|
|
2801
|
-
"line":
|
|
2755
|
+
"line": 108,
|
|
2802
2756
|
"character": 3
|
|
2803
2757
|
},
|
|
2804
2758
|
"signature": "(property) compilationError?: Error | undefined",
|
|
@@ -2807,7 +2761,7 @@
|
|
|
2807
2761
|
"__schema": "TypeRefSchema",
|
|
2808
2762
|
"location": {
|
|
2809
2763
|
"filePath": "merging.main.runtime.ts",
|
|
2810
|
-
"line":
|
|
2764
|
+
"line": 108,
|
|
2811
2765
|
"character": 22
|
|
2812
2766
|
},
|
|
2813
2767
|
"name": "Error"
|
|
@@ -2818,7 +2772,7 @@
|
|
|
2818
2772
|
"__schema": "VariableLikeSchema",
|
|
2819
2773
|
"location": {
|
|
2820
2774
|
"filePath": "merging.main.runtime.ts",
|
|
2821
|
-
"line":
|
|
2775
|
+
"line": 109,
|
|
2822
2776
|
"character": 3
|
|
2823
2777
|
},
|
|
2824
2778
|
"signature": "(property) workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined",
|
|
@@ -2827,7 +2781,7 @@
|
|
|
2827
2781
|
"__schema": "TypeRefSchema",
|
|
2828
2782
|
"location": {
|
|
2829
2783
|
"filePath": "merging.main.runtime.ts",
|
|
2830
|
-
"line":
|
|
2784
|
+
"line": 109,
|
|
2831
2785
|
"character": 33
|
|
2832
2786
|
},
|
|
2833
2787
|
"name": "WorkspaceConfigUpdateResult"
|
|
@@ -2841,7 +2795,7 @@
|
|
|
2841
2795
|
"__schema": "TypeSchema",
|
|
2842
2796
|
"location": {
|
|
2843
2797
|
"filePath": "merging.main.runtime.ts",
|
|
2844
|
-
"line":
|
|
2798
|
+
"line": 91,
|
|
2845
2799
|
"character": 1
|
|
2846
2800
|
},
|
|
2847
2801
|
"signature": "type ApplyVersionResult = {\n id: ComponentID;\n filesStatus: FilesStatus;\n}",
|
|
@@ -2850,7 +2804,7 @@
|
|
|
2850
2804
|
"__schema": "TypeLiteralSchema",
|
|
2851
2805
|
"location": {
|
|
2852
2806
|
"filePath": "merging.main.runtime.ts",
|
|
2853
|
-
"line":
|
|
2807
|
+
"line": 91,
|
|
2854
2808
|
"character": 34
|
|
2855
2809
|
},
|
|
2856
2810
|
"members": [
|
|
@@ -2858,7 +2812,7 @@
|
|
|
2858
2812
|
"__schema": "VariableLikeSchema",
|
|
2859
2813
|
"location": {
|
|
2860
2814
|
"filePath": "merging.main.runtime.ts",
|
|
2861
|
-
"line":
|
|
2815
|
+
"line": 91,
|
|
2862
2816
|
"character": 36
|
|
2863
2817
|
},
|
|
2864
2818
|
"signature": "(property) id: ComponentID",
|
|
@@ -2867,7 +2821,7 @@
|
|
|
2867
2821
|
"__schema": "TypeRefSchema",
|
|
2868
2822
|
"location": {
|
|
2869
2823
|
"filePath": "merging.main.runtime.ts",
|
|
2870
|
-
"line":
|
|
2824
|
+
"line": 91,
|
|
2871
2825
|
"character": 36
|
|
2872
2826
|
},
|
|
2873
2827
|
"name": "ComponentID",
|
|
@@ -2883,7 +2837,7 @@
|
|
|
2883
2837
|
"__schema": "VariableLikeSchema",
|
|
2884
2838
|
"location": {
|
|
2885
2839
|
"filePath": "merging.main.runtime.ts",
|
|
2886
|
-
"line":
|
|
2840
|
+
"line": 91,
|
|
2887
2841
|
"character": 53
|
|
2888
2842
|
},
|
|
2889
2843
|
"signature": "(property) filesStatus: FilesStatus",
|
|
@@ -2892,7 +2846,7 @@
|
|
|
2892
2846
|
"__schema": "TypeRefSchema",
|
|
2893
2847
|
"location": {
|
|
2894
2848
|
"filePath": "merging.main.runtime.ts",
|
|
2895
|
-
"line":
|
|
2849
|
+
"line": 91,
|
|
2896
2850
|
"character": 53
|
|
2897
2851
|
},
|
|
2898
2852
|
"name": "FilesStatus"
|
|
@@ -2906,16 +2860,16 @@
|
|
|
2906
2860
|
"__schema": "TypeSchema",
|
|
2907
2861
|
"location": {
|
|
2908
2862
|
"filePath": "merging.main.runtime.ts",
|
|
2909
|
-
"line":
|
|
2863
|
+
"line": 82,
|
|
2910
2864
|
"character": 1
|
|
2911
2865
|
},
|
|
2912
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"
|
|
2866
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
2913
2867
|
"name": "FilesStatus",
|
|
2914
2868
|
"type": {
|
|
2915
2869
|
"__schema": "TypeLiteralSchema",
|
|
2916
2870
|
"location": {
|
|
2917
2871
|
"filePath": "merging.main.runtime.ts",
|
|
2918
|
-
"line":
|
|
2872
|
+
"line": 82,
|
|
2919
2873
|
"character": 27
|
|
2920
2874
|
},
|
|
2921
2875
|
"members": [
|
|
@@ -2923,14 +2877,14 @@
|
|
|
2923
2877
|
"__schema": "IndexSignatureSchema",
|
|
2924
2878
|
"location": {
|
|
2925
2879
|
"filePath": "merging.main.runtime.ts",
|
|
2926
|
-
"line":
|
|
2880
|
+
"line": 82,
|
|
2927
2881
|
"character": 29
|
|
2928
2882
|
},
|
|
2929
2883
|
"keyType": {
|
|
2930
2884
|
"__schema": "ParameterSchema",
|
|
2931
2885
|
"location": {
|
|
2932
2886
|
"filePath": "merging.main.runtime.ts",
|
|
2933
|
-
"line":
|
|
2887
|
+
"line": 82,
|
|
2934
2888
|
"character": 30
|
|
2935
2889
|
},
|
|
2936
2890
|
"name": "fileName",
|
|
@@ -2938,7 +2892,7 @@
|
|
|
2938
2892
|
"__schema": "KeywordTypeSchema",
|
|
2939
2893
|
"location": {
|
|
2940
2894
|
"filePath": "merging.main.runtime.ts",
|
|
2941
|
-
"line":
|
|
2895
|
+
"line": 82,
|
|
2942
2896
|
"character": 40
|
|
2943
2897
|
},
|
|
2944
2898
|
"name": "string"
|
|
@@ -2950,7 +2904,7 @@
|
|
|
2950
2904
|
"__schema": "TypeOperatorSchema",
|
|
2951
2905
|
"location": {
|
|
2952
2906
|
"filePath": "merging.main.runtime.ts",
|
|
2953
|
-
"line":
|
|
2907
|
+
"line": 82,
|
|
2954
2908
|
"character": 49
|
|
2955
2909
|
},
|
|
2956
2910
|
"name": "keyof",
|
|
@@ -2958,7 +2912,7 @@
|
|
|
2958
2912
|
"__schema": "TypeQuerySchema",
|
|
2959
2913
|
"location": {
|
|
2960
2914
|
"filePath": "merging.main.runtime.ts",
|
|
2961
|
-
"line":
|
|
2915
|
+
"line": 82,
|
|
2962
2916
|
"character": 55
|
|
2963
2917
|
},
|
|
2964
2918
|
"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",
|
|
@@ -2966,7 +2920,7 @@
|
|
|
2966
2920
|
"__schema": "TypeRefSchema",
|
|
2967
2921
|
"location": {
|
|
2968
2922
|
"filePath": "merging.main.runtime.ts",
|
|
2969
|
-
"line":
|
|
2923
|
+
"line": 82,
|
|
2970
2924
|
"character": 62
|
|
2971
2925
|
},
|
|
2972
2926
|
"name": "FileStatus",
|
|
@@ -2982,7 +2936,7 @@
|
|
|
2982
2936
|
"__schema": "TypeSchema",
|
|
2983
2937
|
"location": {
|
|
2984
2938
|
"filePath": "merging.main.runtime.ts",
|
|
2985
|
-
"line":
|
|
2939
|
+
"line": 79,
|
|
2986
2940
|
"character": 1
|
|
2987
2941
|
},
|
|
2988
2942
|
"signature": "type FailedComponents = {\n id: ComponentID;\n unchangedMessage: string;\n unchangedLegitimately?: boolean | undefined;\n}",
|
|
@@ -2991,7 +2945,7 @@
|
|
|
2991
2945
|
"__schema": "TypeLiteralSchema",
|
|
2992
2946
|
"location": {
|
|
2993
2947
|
"filePath": "merging.main.runtime.ts",
|
|
2994
|
-
"line":
|
|
2948
|
+
"line": 79,
|
|
2995
2949
|
"character": 32
|
|
2996
2950
|
},
|
|
2997
2951
|
"members": [
|
|
@@ -2999,7 +2953,7 @@
|
|
|
2999
2953
|
"__schema": "VariableLikeSchema",
|
|
3000
2954
|
"location": {
|
|
3001
2955
|
"filePath": "merging.main.runtime.ts",
|
|
3002
|
-
"line":
|
|
2956
|
+
"line": 79,
|
|
3003
2957
|
"character": 34
|
|
3004
2958
|
},
|
|
3005
2959
|
"signature": "(property) id: ComponentID",
|
|
@@ -3008,7 +2962,7 @@
|
|
|
3008
2962
|
"__schema": "TypeRefSchema",
|
|
3009
2963
|
"location": {
|
|
3010
2964
|
"filePath": "merging.main.runtime.ts",
|
|
3011
|
-
"line":
|
|
2965
|
+
"line": 79,
|
|
3012
2966
|
"character": 34
|
|
3013
2967
|
},
|
|
3014
2968
|
"name": "ComponentID",
|
|
@@ -3024,7 +2978,7 @@
|
|
|
3024
2978
|
"__schema": "VariableLikeSchema",
|
|
3025
2979
|
"location": {
|
|
3026
2980
|
"filePath": "merging.main.runtime.ts",
|
|
3027
|
-
"line":
|
|
2981
|
+
"line": 79,
|
|
3028
2982
|
"character": 51
|
|
3029
2983
|
},
|
|
3030
2984
|
"signature": "(property) unchangedMessage: string",
|
|
@@ -3033,7 +2987,7 @@
|
|
|
3033
2987
|
"__schema": "KeywordTypeSchema",
|
|
3034
2988
|
"location": {
|
|
3035
2989
|
"filePath": "merging.main.runtime.ts",
|
|
3036
|
-
"line":
|
|
2990
|
+
"line": 79,
|
|
3037
2991
|
"character": 69
|
|
3038
2992
|
},
|
|
3039
2993
|
"name": "string"
|
|
@@ -3044,7 +2998,7 @@
|
|
|
3044
2998
|
"__schema": "VariableLikeSchema",
|
|
3045
2999
|
"location": {
|
|
3046
3000
|
"filePath": "merging.main.runtime.ts",
|
|
3047
|
-
"line":
|
|
3001
|
+
"line": 79,
|
|
3048
3002
|
"character": 77
|
|
3049
3003
|
},
|
|
3050
3004
|
"signature": "(property) unchangedLegitimately?: boolean | undefined",
|
|
@@ -3053,7 +3007,7 @@
|
|
|
3053
3007
|
"__schema": "KeywordTypeSchema",
|
|
3054
3008
|
"location": {
|
|
3055
3009
|
"filePath": "merging.main.runtime.ts",
|
|
3056
|
-
"line":
|
|
3010
|
+
"line": 79,
|
|
3057
3011
|
"character": 101
|
|
3058
3012
|
},
|
|
3059
3013
|
"name": "boolean"
|
|
@@ -3067,7 +3021,7 @@
|
|
|
3067
3021
|
"__schema": "UnImplementedSchema",
|
|
3068
3022
|
"location": {
|
|
3069
3023
|
"filePath": "index.ts",
|
|
3070
|
-
"line":
|
|
3024
|
+
"line": 22,
|
|
3071
3025
|
"character": 16
|
|
3072
3026
|
},
|
|
3073
3027
|
"name": "MergingAspect",
|
|
@@ -3486,7 +3440,7 @@
|
|
|
3486
3440
|
"line": 76,
|
|
3487
3441
|
"character": 7
|
|
3488
3442
|
},
|
|
3489
|
-
"signature": "(property) autoMergeResolve?: \"
|
|
3443
|
+
"signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
|
|
3490
3444
|
"name": "autoMergeResolve",
|
|
3491
3445
|
"type": {
|
|
3492
3446
|
"__schema": "TypeRefSchema",
|
|
@@ -3710,7 +3664,7 @@
|
|
|
3710
3664
|
"line": 76,
|
|
3711
3665
|
"character": 7
|
|
3712
3666
|
},
|
|
3713
|
-
"signature": "(property) autoMergeResolve?: \"
|
|
3667
|
+
"signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
|
|
3714
3668
|
"name": "autoMergeResolve",
|
|
3715
3669
|
"type": {
|
|
3716
3670
|
"__schema": "TypeRefSchema",
|
|
@@ -3904,7 +3858,7 @@
|
|
|
3904
3858
|
"_legacy": {
|
|
3905
3859
|
"scope": "teambit.component",
|
|
3906
3860
|
"name": "merging",
|
|
3907
|
-
"version": "1.0.
|
|
3861
|
+
"version": "1.0.162"
|
|
3908
3862
|
},
|
|
3909
3863
|
"_scope": "teambit.component"
|
|
3910
3864
|
}
|
|
@@ -4041,7 +3995,7 @@
|
|
|
4041
3995
|
"character": 3
|
|
4042
3996
|
},
|
|
4043
3997
|
"name": "mergeSnapResults",
|
|
4044
|
-
"type": "
|
|
3998
|
+
"type": "MergeSnapResults | undefined",
|
|
4045
3999
|
"isSpread": false
|
|
4046
4000
|
},
|
|
4047
4001
|
{
|
|
@@ -4644,7 +4598,7 @@
|
|
|
4644
4598
|
"__schema": "TypeSchema",
|
|
4645
4599
|
"location": {
|
|
4646
4600
|
"filePath": "merging.main.runtime.ts",
|
|
4647
|
-
"line":
|
|
4601
|
+
"line": 62,
|
|
4648
4602
|
"character": 1
|
|
4649
4603
|
},
|
|
4650
4604
|
"signature": "type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null | undefined;\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n configMergeResult?: ConfigMergeResult | undefined;\n}",
|
|
@@ -4653,7 +4607,7 @@
|
|
|
4653
4607
|
"__schema": "TypeIntersectionSchema",
|
|
4654
4608
|
"location": {
|
|
4655
4609
|
"filePath": "merging.main.runtime.ts",
|
|
4656
|
-
"line":
|
|
4610
|
+
"line": 62,
|
|
4657
4611
|
"character": 36
|
|
4658
4612
|
},
|
|
4659
4613
|
"types": [
|
|
@@ -4661,7 +4615,7 @@
|
|
|
4661
4615
|
"__schema": "TypeRefSchema",
|
|
4662
4616
|
"location": {
|
|
4663
4617
|
"filePath": "merging.main.runtime.ts",
|
|
4664
|
-
"line":
|
|
4618
|
+
"line": 62,
|
|
4665
4619
|
"character": 36
|
|
4666
4620
|
},
|
|
4667
4621
|
"name": "ComponentStatusBase"
|
|
@@ -4670,7 +4624,7 @@
|
|
|
4670
4624
|
"__schema": "TypeLiteralSchema",
|
|
4671
4625
|
"location": {
|
|
4672
4626
|
"filePath": "merging.main.runtime.ts",
|
|
4673
|
-
"line":
|
|
4627
|
+
"line": 62,
|
|
4674
4628
|
"character": 58
|
|
4675
4629
|
},
|
|
4676
4630
|
"members": [
|
|
@@ -4678,7 +4632,7 @@
|
|
|
4678
4632
|
"__schema": "VariableLikeSchema",
|
|
4679
4633
|
"location": {
|
|
4680
4634
|
"filePath": "merging.main.runtime.ts",
|
|
4681
|
-
"line":
|
|
4635
|
+
"line": 63,
|
|
4682
4636
|
"character": 3
|
|
4683
4637
|
},
|
|
4684
4638
|
"signature": "(property) mergeResults?: MergeResultsThreeWay | null | undefined",
|
|
@@ -4687,7 +4641,7 @@
|
|
|
4687
4641
|
"__schema": "TypeUnionSchema",
|
|
4688
4642
|
"location": {
|
|
4689
4643
|
"filePath": "merging.main.runtime.ts",
|
|
4690
|
-
"line":
|
|
4644
|
+
"line": 63,
|
|
4691
4645
|
"character": 18
|
|
4692
4646
|
},
|
|
4693
4647
|
"types": [
|
|
@@ -4695,7 +4649,7 @@
|
|
|
4695
4649
|
"__schema": "TypeRefSchema",
|
|
4696
4650
|
"location": {
|
|
4697
4651
|
"filePath": "merging.main.runtime.ts",
|
|
4698
|
-
"line":
|
|
4652
|
+
"line": 63,
|
|
4699
4653
|
"character": 18
|
|
4700
4654
|
},
|
|
4701
4655
|
"name": "MergeResultsThreeWay"
|
|
@@ -4704,7 +4658,7 @@
|
|
|
4704
4658
|
"__schema": "LiteralTypeSchema",
|
|
4705
4659
|
"location": {
|
|
4706
4660
|
"filePath": "merging.main.runtime.ts",
|
|
4707
|
-
"line":
|
|
4661
|
+
"line": 63,
|
|
4708
4662
|
"character": 41
|
|
4709
4663
|
},
|
|
4710
4664
|
"name": "null"
|
|
@@ -4717,7 +4671,7 @@
|
|
|
4717
4671
|
"__schema": "VariableLikeSchema",
|
|
4718
4672
|
"location": {
|
|
4719
4673
|
"filePath": "merging.main.runtime.ts",
|
|
4720
|
-
"line":
|
|
4674
|
+
"line": 64,
|
|
4721
4675
|
"character": 3
|
|
4722
4676
|
},
|
|
4723
4677
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -4726,7 +4680,7 @@
|
|
|
4726
4680
|
"__schema": "TypeRefSchema",
|
|
4727
4681
|
"location": {
|
|
4728
4682
|
"filePath": "merging.main.runtime.ts",
|
|
4729
|
-
"line":
|
|
4683
|
+
"line": 64,
|
|
4730
4684
|
"character": 17
|
|
4731
4685
|
},
|
|
4732
4686
|
"name": "SnapsDistance"
|
|
@@ -4737,7 +4691,7 @@
|
|
|
4737
4691
|
"__schema": "VariableLikeSchema",
|
|
4738
4692
|
"location": {
|
|
4739
4693
|
"filePath": "merging.main.runtime.ts",
|
|
4740
|
-
"line":
|
|
4694
|
+
"line": 65,
|
|
4741
4695
|
"character": 3
|
|
4742
4696
|
},
|
|
4743
4697
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -4746,7 +4700,7 @@
|
|
|
4746
4700
|
"__schema": "TypeRefSchema",
|
|
4747
4701
|
"location": {
|
|
4748
4702
|
"filePath": "merging.main.runtime.ts",
|
|
4749
|
-
"line":
|
|
4703
|
+
"line": 65,
|
|
4750
4704
|
"character": 23
|
|
4751
4705
|
},
|
|
4752
4706
|
"name": "ResolveUnrelatedData"
|
|
@@ -4757,7 +4711,7 @@
|
|
|
4757
4711
|
"__schema": "VariableLikeSchema",
|
|
4758
4712
|
"location": {
|
|
4759
4713
|
"filePath": "merging.main.runtime.ts",
|
|
4760
|
-
"line":
|
|
4714
|
+
"line": 66,
|
|
4761
4715
|
"character": 3
|
|
4762
4716
|
},
|
|
4763
4717
|
"signature": "(property) configMergeResult?: ConfigMergeResult | undefined",
|
|
@@ -4766,7 +4720,7 @@
|
|
|
4766
4720
|
"__schema": "TypeRefSchema",
|
|
4767
4721
|
"location": {
|
|
4768
4722
|
"filePath": "merging.main.runtime.ts",
|
|
4769
|
-
"line":
|
|
4723
|
+
"line": 66,
|
|
4770
4724
|
"character": 23
|
|
4771
4725
|
},
|
|
4772
4726
|
"name": "ConfigMergeResult"
|
|
@@ -4782,7 +4736,7 @@
|
|
|
4782
4736
|
"__schema": "TypeSchema",
|
|
4783
4737
|
"location": {
|
|
4784
4738
|
"filePath": "merging.main.runtime.ts",
|
|
4785
|
-
"line":
|
|
4739
|
+
"line": 69,
|
|
4786
4740
|
"character": 1
|
|
4787
4741
|
},
|
|
4788
4742
|
"signature": "type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance | undefined;\n resolvedUnrelated?: ResolveUnrelatedData | undefined;\n mergeProps?: {\n ...;\n } | undefined;\n}",
|
|
@@ -4791,7 +4745,7 @@
|
|
|
4791
4745
|
"__schema": "TypeIntersectionSchema",
|
|
4792
4746
|
"location": {
|
|
4793
4747
|
"filePath": "merging.main.runtime.ts",
|
|
4794
|
-
"line":
|
|
4748
|
+
"line": 69,
|
|
4795
4749
|
"character": 54
|
|
4796
4750
|
},
|
|
4797
4751
|
"types": [
|
|
@@ -4799,7 +4753,7 @@
|
|
|
4799
4753
|
"__schema": "TypeRefSchema",
|
|
4800
4754
|
"location": {
|
|
4801
4755
|
"filePath": "merging.main.runtime.ts",
|
|
4802
|
-
"line":
|
|
4756
|
+
"line": 69,
|
|
4803
4757
|
"character": 54
|
|
4804
4758
|
},
|
|
4805
4759
|
"name": "ComponentStatusBase"
|
|
@@ -4808,7 +4762,7 @@
|
|
|
4808
4762
|
"__schema": "TypeLiteralSchema",
|
|
4809
4763
|
"location": {
|
|
4810
4764
|
"filePath": "merging.main.runtime.ts",
|
|
4811
|
-
"line":
|
|
4765
|
+
"line": 69,
|
|
4812
4766
|
"character": 76
|
|
4813
4767
|
},
|
|
4814
4768
|
"members": [
|
|
@@ -4816,7 +4770,7 @@
|
|
|
4816
4770
|
"__schema": "VariableLikeSchema",
|
|
4817
4771
|
"location": {
|
|
4818
4772
|
"filePath": "merging.main.runtime.ts",
|
|
4819
|
-
"line":
|
|
4773
|
+
"line": 70,
|
|
4820
4774
|
"character": 3
|
|
4821
4775
|
},
|
|
4822
4776
|
"signature": "(property) divergeData?: SnapsDistance | undefined",
|
|
@@ -4825,7 +4779,7 @@
|
|
|
4825
4779
|
"__schema": "TypeRefSchema",
|
|
4826
4780
|
"location": {
|
|
4827
4781
|
"filePath": "merging.main.runtime.ts",
|
|
4828
|
-
"line":
|
|
4782
|
+
"line": 70,
|
|
4829
4783
|
"character": 17
|
|
4830
4784
|
},
|
|
4831
4785
|
"name": "SnapsDistance"
|
|
@@ -4836,7 +4790,7 @@
|
|
|
4836
4790
|
"__schema": "VariableLikeSchema",
|
|
4837
4791
|
"location": {
|
|
4838
4792
|
"filePath": "merging.main.runtime.ts",
|
|
4839
|
-
"line":
|
|
4793
|
+
"line": 71,
|
|
4840
4794
|
"character": 3
|
|
4841
4795
|
},
|
|
4842
4796
|
"signature": "(property) resolvedUnrelated?: ResolveUnrelatedData | undefined",
|
|
@@ -4845,7 +4799,7 @@
|
|
|
4845
4799
|
"__schema": "TypeRefSchema",
|
|
4846
4800
|
"location": {
|
|
4847
4801
|
"filePath": "merging.main.runtime.ts",
|
|
4848
|
-
"line":
|
|
4802
|
+
"line": 71,
|
|
4849
4803
|
"character": 23
|
|
4850
4804
|
},
|
|
4851
4805
|
"name": "ResolveUnrelatedData"
|
|
@@ -4856,7 +4810,7 @@
|
|
|
4856
4810
|
"__schema": "VariableLikeSchema",
|
|
4857
4811
|
"location": {
|
|
4858
4812
|
"filePath": "merging.main.runtime.ts",
|
|
4859
|
-
"line":
|
|
4813
|
+
"line": 72,
|
|
4860
4814
|
"character": 3
|
|
4861
4815
|
},
|
|
4862
4816
|
"signature": "(property) mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n} | undefined",
|
|
@@ -4865,7 +4819,7 @@
|
|
|
4865
4819
|
"__schema": "TypeLiteralSchema",
|
|
4866
4820
|
"location": {
|
|
4867
4821
|
"filePath": "merging.main.runtime.ts",
|
|
4868
|
-
"line":
|
|
4822
|
+
"line": 72,
|
|
4869
4823
|
"character": 16
|
|
4870
4824
|
},
|
|
4871
4825
|
"members": [
|
|
@@ -4873,7 +4827,7 @@
|
|
|
4873
4827
|
"__schema": "VariableLikeSchema",
|
|
4874
4828
|
"location": {
|
|
4875
4829
|
"filePath": "merging.main.runtime.ts",
|
|
4876
|
-
"line":
|
|
4830
|
+
"line": 73,
|
|
4877
4831
|
"character": 5
|
|
4878
4832
|
},
|
|
4879
4833
|
"signature": "(property) otherLaneHead: Ref",
|
|
@@ -4882,7 +4836,7 @@
|
|
|
4882
4836
|
"__schema": "TypeRefSchema",
|
|
4883
4837
|
"location": {
|
|
4884
4838
|
"filePath": "merging.main.runtime.ts",
|
|
4885
|
-
"line":
|
|
4839
|
+
"line": 73,
|
|
4886
4840
|
"character": 5
|
|
4887
4841
|
},
|
|
4888
4842
|
"name": "Ref",
|
|
@@ -4894,7 +4848,7 @@
|
|
|
4894
4848
|
"__schema": "VariableLikeSchema",
|
|
4895
4849
|
"location": {
|
|
4896
4850
|
"filePath": "merging.main.runtime.ts",
|
|
4897
|
-
"line":
|
|
4851
|
+
"line": 74,
|
|
4898
4852
|
"character": 5
|
|
4899
4853
|
},
|
|
4900
4854
|
"signature": "(property) currentId: ComponentID",
|
|
@@ -4903,7 +4857,7 @@
|
|
|
4903
4857
|
"__schema": "TypeRefSchema",
|
|
4904
4858
|
"location": {
|
|
4905
4859
|
"filePath": "merging.main.runtime.ts",
|
|
4906
|
-
"line":
|
|
4860
|
+
"line": 74,
|
|
4907
4861
|
"character": 5
|
|
4908
4862
|
},
|
|
4909
4863
|
"name": "ComponentID",
|
|
@@ -4919,7 +4873,7 @@
|
|
|
4919
4873
|
"__schema": "VariableLikeSchema",
|
|
4920
4874
|
"location": {
|
|
4921
4875
|
"filePath": "merging.main.runtime.ts",
|
|
4922
|
-
"line":
|
|
4876
|
+
"line": 75,
|
|
4923
4877
|
"character": 5
|
|
4924
4878
|
},
|
|
4925
4879
|
"signature": "(property) modelComponent: ModelComponent",
|
|
@@ -4928,7 +4882,7 @@
|
|
|
4928
4882
|
"__schema": "TypeRefSchema",
|
|
4929
4883
|
"location": {
|
|
4930
4884
|
"filePath": "merging.main.runtime.ts",
|
|
4931
|
-
"line":
|
|
4885
|
+
"line": 75,
|
|
4932
4886
|
"character": 5
|
|
4933
4887
|
},
|
|
4934
4888
|
"name": "ModelComponent",
|
|
@@ -4949,7 +4903,7 @@
|
|
|
4949
4903
|
"__schema": "TypeSchema",
|
|
4950
4904
|
"location": {
|
|
4951
4905
|
"filePath": "merging.main.runtime.ts",
|
|
4952
|
-
"line":
|
|
4906
|
+
"line": 79,
|
|
4953
4907
|
"character": 1
|
|
4954
4908
|
},
|
|
4955
4909
|
"signature": "type FailedComponents = {\n id: ComponentID;\n unchangedMessage: string;\n unchangedLegitimately?: boolean | undefined;\n}",
|
|
@@ -4958,7 +4912,7 @@
|
|
|
4958
4912
|
"__schema": "TypeLiteralSchema",
|
|
4959
4913
|
"location": {
|
|
4960
4914
|
"filePath": "merging.main.runtime.ts",
|
|
4961
|
-
"line":
|
|
4915
|
+
"line": 79,
|
|
4962
4916
|
"character": 32
|
|
4963
4917
|
},
|
|
4964
4918
|
"members": [
|
|
@@ -4966,7 +4920,7 @@
|
|
|
4966
4920
|
"__schema": "VariableLikeSchema",
|
|
4967
4921
|
"location": {
|
|
4968
4922
|
"filePath": "merging.main.runtime.ts",
|
|
4969
|
-
"line":
|
|
4923
|
+
"line": 79,
|
|
4970
4924
|
"character": 34
|
|
4971
4925
|
},
|
|
4972
4926
|
"signature": "(property) id: ComponentID",
|
|
@@ -4975,7 +4929,7 @@
|
|
|
4975
4929
|
"__schema": "TypeRefSchema",
|
|
4976
4930
|
"location": {
|
|
4977
4931
|
"filePath": "merging.main.runtime.ts",
|
|
4978
|
-
"line":
|
|
4932
|
+
"line": 79,
|
|
4979
4933
|
"character": 34
|
|
4980
4934
|
},
|
|
4981
4935
|
"name": "ComponentID",
|
|
@@ -4991,7 +4945,7 @@
|
|
|
4991
4945
|
"__schema": "VariableLikeSchema",
|
|
4992
4946
|
"location": {
|
|
4993
4947
|
"filePath": "merging.main.runtime.ts",
|
|
4994
|
-
"line":
|
|
4948
|
+
"line": 79,
|
|
4995
4949
|
"character": 51
|
|
4996
4950
|
},
|
|
4997
4951
|
"signature": "(property) unchangedMessage: string",
|
|
@@ -5000,7 +4954,7 @@
|
|
|
5000
4954
|
"__schema": "KeywordTypeSchema",
|
|
5001
4955
|
"location": {
|
|
5002
4956
|
"filePath": "merging.main.runtime.ts",
|
|
5003
|
-
"line":
|
|
4957
|
+
"line": 79,
|
|
5004
4958
|
"character": 69
|
|
5005
4959
|
},
|
|
5006
4960
|
"name": "string"
|
|
@@ -5011,7 +4965,7 @@
|
|
|
5011
4965
|
"__schema": "VariableLikeSchema",
|
|
5012
4966
|
"location": {
|
|
5013
4967
|
"filePath": "merging.main.runtime.ts",
|
|
5014
|
-
"line":
|
|
4968
|
+
"line": 79,
|
|
5015
4969
|
"character": 77
|
|
5016
4970
|
},
|
|
5017
4971
|
"signature": "(property) unchangedLegitimately?: boolean | undefined",
|
|
@@ -5020,7 +4974,7 @@
|
|
|
5020
4974
|
"__schema": "KeywordTypeSchema",
|
|
5021
4975
|
"location": {
|
|
5022
4976
|
"filePath": "merging.main.runtime.ts",
|
|
5023
|
-
"line":
|
|
4977
|
+
"line": 79,
|
|
5024
4978
|
"character": 101
|
|
5025
4979
|
},
|
|
5026
4980
|
"name": "boolean"
|
|
@@ -5034,16 +4988,16 @@
|
|
|
5034
4988
|
"__schema": "TypeSchema",
|
|
5035
4989
|
"location": {
|
|
5036
4990
|
"filePath": "merging.main.runtime.ts",
|
|
5037
|
-
"line":
|
|
4991
|
+
"line": 82,
|
|
5038
4992
|
"character": 1
|
|
5039
4993
|
},
|
|
5040
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"
|
|
4994
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
5041
4995
|
"name": "FilesStatus",
|
|
5042
4996
|
"type": {
|
|
5043
4997
|
"__schema": "TypeLiteralSchema",
|
|
5044
4998
|
"location": {
|
|
5045
4999
|
"filePath": "merging.main.runtime.ts",
|
|
5046
|
-
"line":
|
|
5000
|
+
"line": 82,
|
|
5047
5001
|
"character": 27
|
|
5048
5002
|
},
|
|
5049
5003
|
"members": [
|
|
@@ -5051,14 +5005,14 @@
|
|
|
5051
5005
|
"__schema": "IndexSignatureSchema",
|
|
5052
5006
|
"location": {
|
|
5053
5007
|
"filePath": "merging.main.runtime.ts",
|
|
5054
|
-
"line":
|
|
5008
|
+
"line": 82,
|
|
5055
5009
|
"character": 29
|
|
5056
5010
|
},
|
|
5057
5011
|
"keyType": {
|
|
5058
5012
|
"__schema": "ParameterSchema",
|
|
5059
5013
|
"location": {
|
|
5060
5014
|
"filePath": "merging.main.runtime.ts",
|
|
5061
|
-
"line":
|
|
5015
|
+
"line": 82,
|
|
5062
5016
|
"character": 30
|
|
5063
5017
|
},
|
|
5064
5018
|
"name": "fileName",
|
|
@@ -5066,7 +5020,7 @@
|
|
|
5066
5020
|
"__schema": "KeywordTypeSchema",
|
|
5067
5021
|
"location": {
|
|
5068
5022
|
"filePath": "merging.main.runtime.ts",
|
|
5069
|
-
"line":
|
|
5023
|
+
"line": 82,
|
|
5070
5024
|
"character": 40
|
|
5071
5025
|
},
|
|
5072
5026
|
"name": "string"
|
|
@@ -5078,7 +5032,7 @@
|
|
|
5078
5032
|
"__schema": "TypeOperatorSchema",
|
|
5079
5033
|
"location": {
|
|
5080
5034
|
"filePath": "merging.main.runtime.ts",
|
|
5081
|
-
"line":
|
|
5035
|
+
"line": 82,
|
|
5082
5036
|
"character": 49
|
|
5083
5037
|
},
|
|
5084
5038
|
"name": "keyof",
|
|
@@ -5086,7 +5040,7 @@
|
|
|
5086
5040
|
"__schema": "TypeQuerySchema",
|
|
5087
5041
|
"location": {
|
|
5088
5042
|
"filePath": "merging.main.runtime.ts",
|
|
5089
|
-
"line":
|
|
5043
|
+
"line": 82,
|
|
5090
5044
|
"character": 55
|
|
5091
5045
|
},
|
|
5092
5046
|
"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",
|
|
@@ -5094,7 +5048,7 @@
|
|
|
5094
5048
|
"__schema": "TypeRefSchema",
|
|
5095
5049
|
"location": {
|
|
5096
5050
|
"filePath": "merging.main.runtime.ts",
|
|
5097
|
-
"line":
|
|
5051
|
+
"line": 82,
|
|
5098
5052
|
"character": 62
|
|
5099
5053
|
},
|
|
5100
5054
|
"name": "FileStatus",
|
|
@@ -5110,7 +5064,150 @@
|
|
|
5110
5064
|
"__schema": "TypeSchema",
|
|
5111
5065
|
"location": {
|
|
5112
5066
|
"filePath": "merging.main.runtime.ts",
|
|
5113
|
-
"line":
|
|
5067
|
+
"line": 84,
|
|
5068
|
+
"character": 1
|
|
5069
|
+
},
|
|
5070
|
+
"signature": "type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList | undefined;\n exportedIds?: ComponentID[] | undefined;\n} | null",
|
|
5071
|
+
"name": "MergeSnapResults",
|
|
5072
|
+
"type": {
|
|
5073
|
+
"__schema": "TypeUnionSchema",
|
|
5074
|
+
"location": {
|
|
5075
|
+
"filePath": "merging.main.runtime.ts",
|
|
5076
|
+
"line": 84,
|
|
5077
|
+
"character": 32
|
|
5078
|
+
},
|
|
5079
|
+
"types": [
|
|
5080
|
+
{
|
|
5081
|
+
"__schema": "TypeLiteralSchema",
|
|
5082
|
+
"location": {
|
|
5083
|
+
"filePath": "merging.main.runtime.ts",
|
|
5084
|
+
"line": 84,
|
|
5085
|
+
"character": 32
|
|
5086
|
+
},
|
|
5087
|
+
"members": [
|
|
5088
|
+
{
|
|
5089
|
+
"__schema": "VariableLikeSchema",
|
|
5090
|
+
"location": {
|
|
5091
|
+
"filePath": "merging.main.runtime.ts",
|
|
5092
|
+
"line": 85,
|
|
5093
|
+
"character": 3
|
|
5094
|
+
},
|
|
5095
|
+
"signature": "(property) snappedComponents: ConsumerComponent[]",
|
|
5096
|
+
"name": "snappedComponents",
|
|
5097
|
+
"type": {
|
|
5098
|
+
"__schema": "TypeArraySchema",
|
|
5099
|
+
"location": {
|
|
5100
|
+
"filePath": "merging.main.runtime.ts",
|
|
5101
|
+
"line": 85,
|
|
5102
|
+
"character": 22
|
|
5103
|
+
},
|
|
5104
|
+
"type": {
|
|
5105
|
+
"__schema": "TypeRefSchema",
|
|
5106
|
+
"location": {
|
|
5107
|
+
"filePath": "merging.main.runtime.ts",
|
|
5108
|
+
"line": 85,
|
|
5109
|
+
"character": 22
|
|
5110
|
+
},
|
|
5111
|
+
"name": "ConsumerComponent"
|
|
5112
|
+
}
|
|
5113
|
+
},
|
|
5114
|
+
"isOptional": false
|
|
5115
|
+
},
|
|
5116
|
+
{
|
|
5117
|
+
"__schema": "VariableLikeSchema",
|
|
5118
|
+
"location": {
|
|
5119
|
+
"filePath": "merging.main.runtime.ts",
|
|
5120
|
+
"line": 86,
|
|
5121
|
+
"character": 3
|
|
5122
|
+
},
|
|
5123
|
+
"signature": "(property) autoSnappedResults: AutoTagResult[]",
|
|
5124
|
+
"name": "autoSnappedResults",
|
|
5125
|
+
"type": {
|
|
5126
|
+
"__schema": "TypeArraySchema",
|
|
5127
|
+
"location": {
|
|
5128
|
+
"filePath": "merging.main.runtime.ts",
|
|
5129
|
+
"line": 86,
|
|
5130
|
+
"character": 23
|
|
5131
|
+
},
|
|
5132
|
+
"type": {
|
|
5133
|
+
"__schema": "TypeRefSchema",
|
|
5134
|
+
"location": {
|
|
5135
|
+
"filePath": "merging.main.runtime.ts",
|
|
5136
|
+
"line": 86,
|
|
5137
|
+
"character": 23
|
|
5138
|
+
},
|
|
5139
|
+
"name": "AutoTagResult"
|
|
5140
|
+
}
|
|
5141
|
+
},
|
|
5142
|
+
"isOptional": false
|
|
5143
|
+
},
|
|
5144
|
+
{
|
|
5145
|
+
"__schema": "VariableLikeSchema",
|
|
5146
|
+
"location": {
|
|
5147
|
+
"filePath": "merging.main.runtime.ts",
|
|
5148
|
+
"line": 87,
|
|
5149
|
+
"character": 3
|
|
5150
|
+
},
|
|
5151
|
+
"signature": "(property) removedComponents?: ComponentIdList | undefined",
|
|
5152
|
+
"name": "removedComponents",
|
|
5153
|
+
"type": {
|
|
5154
|
+
"__schema": "TypeRefSchema",
|
|
5155
|
+
"location": {
|
|
5156
|
+
"filePath": "merging.main.runtime.ts",
|
|
5157
|
+
"line": 87,
|
|
5158
|
+
"character": 23
|
|
5159
|
+
},
|
|
5160
|
+
"name": "ComponentIdList"
|
|
5161
|
+
},
|
|
5162
|
+
"isOptional": true
|
|
5163
|
+
},
|
|
5164
|
+
{
|
|
5165
|
+
"__schema": "VariableLikeSchema",
|
|
5166
|
+
"location": {
|
|
5167
|
+
"filePath": "merging.main.runtime.ts",
|
|
5168
|
+
"line": 88,
|
|
5169
|
+
"character": 3
|
|
5170
|
+
},
|
|
5171
|
+
"signature": "(property) exportedIds?: ComponentID[] | undefined",
|
|
5172
|
+
"name": "exportedIds",
|
|
5173
|
+
"type": {
|
|
5174
|
+
"__schema": "TypeArraySchema",
|
|
5175
|
+
"location": {
|
|
5176
|
+
"filePath": "merging.main.runtime.ts",
|
|
5177
|
+
"line": 88,
|
|
5178
|
+
"character": 17
|
|
5179
|
+
},
|
|
5180
|
+
"type": {
|
|
5181
|
+
"__schema": "TypeRefSchema",
|
|
5182
|
+
"location": {
|
|
5183
|
+
"filePath": "merging.main.runtime.ts",
|
|
5184
|
+
"line": 88,
|
|
5185
|
+
"character": 17
|
|
5186
|
+
},
|
|
5187
|
+
"name": "ComponentID"
|
|
5188
|
+
}
|
|
5189
|
+
},
|
|
5190
|
+
"isOptional": true
|
|
5191
|
+
}
|
|
5192
|
+
]
|
|
5193
|
+
},
|
|
5194
|
+
{
|
|
5195
|
+
"__schema": "LiteralTypeSchema",
|
|
5196
|
+
"location": {
|
|
5197
|
+
"filePath": "merging.main.runtime.ts",
|
|
5198
|
+
"line": 89,
|
|
5199
|
+
"character": 5
|
|
5200
|
+
},
|
|
5201
|
+
"name": "null"
|
|
5202
|
+
}
|
|
5203
|
+
]
|
|
5204
|
+
}
|
|
5205
|
+
},
|
|
5206
|
+
{
|
|
5207
|
+
"__schema": "TypeSchema",
|
|
5208
|
+
"location": {
|
|
5209
|
+
"filePath": "merging.main.runtime.ts",
|
|
5210
|
+
"line": 91,
|
|
5114
5211
|
"character": 1
|
|
5115
5212
|
},
|
|
5116
5213
|
"signature": "type ApplyVersionResult = {\n id: ComponentID;\n filesStatus: FilesStatus;\n}",
|
|
@@ -5119,7 +5216,7 @@
|
|
|
5119
5216
|
"__schema": "TypeLiteralSchema",
|
|
5120
5217
|
"location": {
|
|
5121
5218
|
"filePath": "merging.main.runtime.ts",
|
|
5122
|
-
"line":
|
|
5219
|
+
"line": 91,
|
|
5123
5220
|
"character": 34
|
|
5124
5221
|
},
|
|
5125
5222
|
"members": [
|
|
@@ -5127,7 +5224,7 @@
|
|
|
5127
5224
|
"__schema": "VariableLikeSchema",
|
|
5128
5225
|
"location": {
|
|
5129
5226
|
"filePath": "merging.main.runtime.ts",
|
|
5130
|
-
"line":
|
|
5227
|
+
"line": 91,
|
|
5131
5228
|
"character": 36
|
|
5132
5229
|
},
|
|
5133
5230
|
"signature": "(property) id: ComponentID",
|
|
@@ -5136,7 +5233,7 @@
|
|
|
5136
5233
|
"__schema": "TypeRefSchema",
|
|
5137
5234
|
"location": {
|
|
5138
5235
|
"filePath": "merging.main.runtime.ts",
|
|
5139
|
-
"line":
|
|
5236
|
+
"line": 91,
|
|
5140
5237
|
"character": 36
|
|
5141
5238
|
},
|
|
5142
5239
|
"name": "ComponentID",
|
|
@@ -5152,7 +5249,7 @@
|
|
|
5152
5249
|
"__schema": "VariableLikeSchema",
|
|
5153
5250
|
"location": {
|
|
5154
5251
|
"filePath": "merging.main.runtime.ts",
|
|
5155
|
-
"line":
|
|
5252
|
+
"line": 91,
|
|
5156
5253
|
"character": 53
|
|
5157
5254
|
},
|
|
5158
5255
|
"signature": "(property) filesStatus: FilesStatus",
|
|
@@ -5161,7 +5258,7 @@
|
|
|
5161
5258
|
"__schema": "TypeRefSchema",
|
|
5162
5259
|
"location": {
|
|
5163
5260
|
"filePath": "merging.main.runtime.ts",
|
|
5164
|
-
"line":
|
|
5261
|
+
"line": 91,
|
|
5165
5262
|
"character": 53
|
|
5166
5263
|
},
|
|
5167
5264
|
"name": "FilesStatus"
|
|
@@ -5175,7 +5272,7 @@
|
|
|
5175
5272
|
"__schema": "TypeSchema",
|
|
5176
5273
|
"location": {
|
|
5177
5274
|
"filePath": "merging.main.runtime.ts",
|
|
5178
|
-
"line":
|
|
5275
|
+
"line": 93,
|
|
5179
5276
|
"character": 1
|
|
5180
5277
|
},
|
|
5181
5278
|
"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}",
|
|
@@ -5184,7 +5281,7 @@
|
|
|
5184
5281
|
"__schema": "TypeLiteralSchema",
|
|
5185
5282
|
"location": {
|
|
5186
5283
|
"filePath": "merging.main.runtime.ts",
|
|
5187
|
-
"line":
|
|
5284
|
+
"line": 93,
|
|
5188
5285
|
"character": 35
|
|
5189
5286
|
},
|
|
5190
5287
|
"members": [
|
|
@@ -5192,7 +5289,7 @@
|
|
|
5192
5289
|
"__schema": "VariableLikeSchema",
|
|
5193
5290
|
"location": {
|
|
5194
5291
|
"filePath": "merging.main.runtime.ts",
|
|
5195
|
-
"line":
|
|
5292
|
+
"line": 94,
|
|
5196
5293
|
"character": 3
|
|
5197
5294
|
},
|
|
5198
5295
|
"signature": "(property) components?: ApplyVersionResult[] | undefined",
|
|
@@ -5201,14 +5298,14 @@
|
|
|
5201
5298
|
"__schema": "TypeArraySchema",
|
|
5202
5299
|
"location": {
|
|
5203
5300
|
"filePath": "merging.main.runtime.ts",
|
|
5204
|
-
"line":
|
|
5301
|
+
"line": 94,
|
|
5205
5302
|
"character": 16
|
|
5206
5303
|
},
|
|
5207
5304
|
"type": {
|
|
5208
5305
|
"__schema": "TypeRefSchema",
|
|
5209
5306
|
"location": {
|
|
5210
5307
|
"filePath": "merging.main.runtime.ts",
|
|
5211
|
-
"line":
|
|
5308
|
+
"line": 94,
|
|
5212
5309
|
"character": 16
|
|
5213
5310
|
},
|
|
5214
5311
|
"name": "ApplyVersionResult"
|
|
@@ -5220,7 +5317,7 @@
|
|
|
5220
5317
|
"__schema": "VariableLikeSchema",
|
|
5221
5318
|
"location": {
|
|
5222
5319
|
"filePath": "merging.main.runtime.ts",
|
|
5223
|
-
"line":
|
|
5320
|
+
"line": 95,
|
|
5224
5321
|
"character": 3
|
|
5225
5322
|
},
|
|
5226
5323
|
"signature": "(property) version?: string | undefined",
|
|
@@ -5229,7 +5326,7 @@
|
|
|
5229
5326
|
"__schema": "KeywordTypeSchema",
|
|
5230
5327
|
"location": {
|
|
5231
5328
|
"filePath": "merging.main.runtime.ts",
|
|
5232
|
-
"line":
|
|
5329
|
+
"line": 95,
|
|
5233
5330
|
"character": 13
|
|
5234
5331
|
},
|
|
5235
5332
|
"name": "string"
|
|
@@ -5240,7 +5337,7 @@
|
|
|
5240
5337
|
"__schema": "VariableLikeSchema",
|
|
5241
5338
|
"location": {
|
|
5242
5339
|
"filePath": "merging.main.runtime.ts",
|
|
5243
|
-
"line":
|
|
5340
|
+
"line": 96,
|
|
5244
5341
|
"character": 3
|
|
5245
5342
|
},
|
|
5246
5343
|
"signature": "(property) failedComponents?: FailedComponents[] | undefined",
|
|
@@ -5249,14 +5346,14 @@
|
|
|
5249
5346
|
"__schema": "TypeArraySchema",
|
|
5250
5347
|
"location": {
|
|
5251
5348
|
"filePath": "merging.main.runtime.ts",
|
|
5252
|
-
"line":
|
|
5349
|
+
"line": 96,
|
|
5253
5350
|
"character": 22
|
|
5254
5351
|
},
|
|
5255
5352
|
"type": {
|
|
5256
5353
|
"__schema": "TypeRefSchema",
|
|
5257
5354
|
"location": {
|
|
5258
5355
|
"filePath": "merging.main.runtime.ts",
|
|
5259
|
-
"line":
|
|
5356
|
+
"line": 96,
|
|
5260
5357
|
"character": 22
|
|
5261
5358
|
},
|
|
5262
5359
|
"name": "FailedComponents"
|
|
@@ -5268,7 +5365,7 @@
|
|
|
5268
5365
|
"__schema": "VariableLikeSchema",
|
|
5269
5366
|
"location": {
|
|
5270
5367
|
"filePath": "merging.main.runtime.ts",
|
|
5271
|
-
"line":
|
|
5368
|
+
"line": 97,
|
|
5272
5369
|
"character": 3
|
|
5273
5370
|
},
|
|
5274
5371
|
"signature": "(property) removedComponents?: ComponentID[] | undefined",
|
|
@@ -5277,14 +5374,14 @@
|
|
|
5277
5374
|
"__schema": "TypeArraySchema",
|
|
5278
5375
|
"location": {
|
|
5279
5376
|
"filePath": "merging.main.runtime.ts",
|
|
5280
|
-
"line":
|
|
5377
|
+
"line": 97,
|
|
5281
5378
|
"character": 23
|
|
5282
5379
|
},
|
|
5283
5380
|
"type": {
|
|
5284
5381
|
"__schema": "TypeRefSchema",
|
|
5285
5382
|
"location": {
|
|
5286
5383
|
"filePath": "merging.main.runtime.ts",
|
|
5287
|
-
"line":
|
|
5384
|
+
"line": 97,
|
|
5288
5385
|
"character": 23
|
|
5289
5386
|
},
|
|
5290
5387
|
"name": "ComponentID"
|
|
@@ -5296,7 +5393,7 @@
|
|
|
5296
5393
|
"__schema": "VariableLikeSchema",
|
|
5297
5394
|
"location": {
|
|
5298
5395
|
"filePath": "merging.main.runtime.ts",
|
|
5299
|
-
"line":
|
|
5396
|
+
"line": 98,
|
|
5300
5397
|
"character": 3
|
|
5301
5398
|
},
|
|
5302
5399
|
"signature": "(property) addedComponents?: ComponentID[] | undefined",
|
|
@@ -5305,14 +5402,14 @@
|
|
|
5305
5402
|
"__schema": "TypeArraySchema",
|
|
5306
5403
|
"location": {
|
|
5307
5404
|
"filePath": "merging.main.runtime.ts",
|
|
5308
|
-
"line":
|
|
5405
|
+
"line": 98,
|
|
5309
5406
|
"character": 21
|
|
5310
5407
|
},
|
|
5311
5408
|
"type": {
|
|
5312
5409
|
"__schema": "TypeRefSchema",
|
|
5313
5410
|
"location": {
|
|
5314
5411
|
"filePath": "merging.main.runtime.ts",
|
|
5315
|
-
"line":
|
|
5412
|
+
"line": 98,
|
|
5316
5413
|
"character": 21
|
|
5317
5414
|
},
|
|
5318
5415
|
"name": "ComponentID"
|
|
@@ -5324,7 +5421,7 @@
|
|
|
5324
5421
|
"__schema": "VariableLikeSchema",
|
|
5325
5422
|
"location": {
|
|
5326
5423
|
"filePath": "merging.main.runtime.ts",
|
|
5327
|
-
"line":
|
|
5424
|
+
"line": 99,
|
|
5328
5425
|
"character": 3
|
|
5329
5426
|
},
|
|
5330
5427
|
"signature": "(property) resolvedComponents?: ConsumerComponent[] | undefined",
|
|
@@ -5333,14 +5430,14 @@
|
|
|
5333
5430
|
"__schema": "TypeArraySchema",
|
|
5334
5431
|
"location": {
|
|
5335
5432
|
"filePath": "merging.main.runtime.ts",
|
|
5336
|
-
"line":
|
|
5433
|
+
"line": 99,
|
|
5337
5434
|
"character": 24
|
|
5338
5435
|
},
|
|
5339
5436
|
"type": {
|
|
5340
5437
|
"__schema": "TypeRefSchema",
|
|
5341
5438
|
"location": {
|
|
5342
5439
|
"filePath": "merging.main.runtime.ts",
|
|
5343
|
-
"line":
|
|
5440
|
+
"line": 99,
|
|
5344
5441
|
"character": 24
|
|
5345
5442
|
},
|
|
5346
5443
|
"name": "ConsumerComponent"
|
|
@@ -5352,7 +5449,7 @@
|
|
|
5352
5449
|
"__schema": "VariableLikeSchema",
|
|
5353
5450
|
"location": {
|
|
5354
5451
|
"filePath": "merging.main.runtime.ts",
|
|
5355
|
-
"line":
|
|
5452
|
+
"line": 100,
|
|
5356
5453
|
"character": 3
|
|
5357
5454
|
},
|
|
5358
5455
|
"signature": "(property) abortedComponents?: ApplyVersionResult[] | undefined",
|
|
@@ -5361,14 +5458,14 @@
|
|
|
5361
5458
|
"__schema": "TypeArraySchema",
|
|
5362
5459
|
"location": {
|
|
5363
5460
|
"filePath": "merging.main.runtime.ts",
|
|
5364
|
-
"line":
|
|
5461
|
+
"line": 100,
|
|
5365
5462
|
"character": 23
|
|
5366
5463
|
},
|
|
5367
5464
|
"type": {
|
|
5368
5465
|
"__schema": "TypeRefSchema",
|
|
5369
5466
|
"location": {
|
|
5370
5467
|
"filePath": "merging.main.runtime.ts",
|
|
5371
|
-
"line":
|
|
5468
|
+
"line": 100,
|
|
5372
5469
|
"character": 23
|
|
5373
5470
|
},
|
|
5374
5471
|
"name": "ApplyVersionResult"
|
|
@@ -5380,115 +5477,19 @@
|
|
|
5380
5477
|
"__schema": "VariableLikeSchema",
|
|
5381
5478
|
"location": {
|
|
5382
5479
|
"filePath": "merging.main.runtime.ts",
|
|
5383
|
-
"line":
|
|
5480
|
+
"line": 101,
|
|
5384
5481
|
"character": 3
|
|
5385
5482
|
},
|
|
5386
|
-
"signature": "(property) mergeSnapResults?:
|
|
5483
|
+
"signature": "(property) mergeSnapResults?: MergeSnapResults | undefined",
|
|
5387
5484
|
"name": "mergeSnapResults",
|
|
5388
5485
|
"type": {
|
|
5389
|
-
"__schema": "
|
|
5486
|
+
"__schema": "TypeRefSchema",
|
|
5390
5487
|
"location": {
|
|
5391
5488
|
"filePath": "merging.main.runtime.ts",
|
|
5392
|
-
"line":
|
|
5489
|
+
"line": 101,
|
|
5393
5490
|
"character": 22
|
|
5394
5491
|
},
|
|
5395
|
-
"
|
|
5396
|
-
{
|
|
5397
|
-
"__schema": "TypeLiteralSchema",
|
|
5398
|
-
"location": {
|
|
5399
|
-
"filePath": "merging.main.runtime.ts",
|
|
5400
|
-
"line": 93,
|
|
5401
|
-
"character": 22
|
|
5402
|
-
},
|
|
5403
|
-
"members": [
|
|
5404
|
-
{
|
|
5405
|
-
"__schema": "VariableLikeSchema",
|
|
5406
|
-
"location": {
|
|
5407
|
-
"filePath": "merging.main.runtime.ts",
|
|
5408
|
-
"line": 94,
|
|
5409
|
-
"character": 5
|
|
5410
|
-
},
|
|
5411
|
-
"signature": "(property) snappedComponents: ConsumerComponent[]",
|
|
5412
|
-
"name": "snappedComponents",
|
|
5413
|
-
"type": {
|
|
5414
|
-
"__schema": "TypeArraySchema",
|
|
5415
|
-
"location": {
|
|
5416
|
-
"filePath": "merging.main.runtime.ts",
|
|
5417
|
-
"line": 94,
|
|
5418
|
-
"character": 24
|
|
5419
|
-
},
|
|
5420
|
-
"type": {
|
|
5421
|
-
"__schema": "TypeRefSchema",
|
|
5422
|
-
"location": {
|
|
5423
|
-
"filePath": "merging.main.runtime.ts",
|
|
5424
|
-
"line": 94,
|
|
5425
|
-
"character": 24
|
|
5426
|
-
},
|
|
5427
|
-
"name": "ConsumerComponent"
|
|
5428
|
-
}
|
|
5429
|
-
},
|
|
5430
|
-
"isOptional": false
|
|
5431
|
-
},
|
|
5432
|
-
{
|
|
5433
|
-
"__schema": "VariableLikeSchema",
|
|
5434
|
-
"location": {
|
|
5435
|
-
"filePath": "merging.main.runtime.ts",
|
|
5436
|
-
"line": 95,
|
|
5437
|
-
"character": 5
|
|
5438
|
-
},
|
|
5439
|
-
"signature": "(property) autoSnappedResults: AutoTagResult[]",
|
|
5440
|
-
"name": "autoSnappedResults",
|
|
5441
|
-
"type": {
|
|
5442
|
-
"__schema": "TypeArraySchema",
|
|
5443
|
-
"location": {
|
|
5444
|
-
"filePath": "merging.main.runtime.ts",
|
|
5445
|
-
"line": 95,
|
|
5446
|
-
"character": 25
|
|
5447
|
-
},
|
|
5448
|
-
"type": {
|
|
5449
|
-
"__schema": "TypeRefSchema",
|
|
5450
|
-
"location": {
|
|
5451
|
-
"filePath": "merging.main.runtime.ts",
|
|
5452
|
-
"line": 95,
|
|
5453
|
-
"character": 25
|
|
5454
|
-
},
|
|
5455
|
-
"name": "AutoTagResult"
|
|
5456
|
-
}
|
|
5457
|
-
},
|
|
5458
|
-
"isOptional": false
|
|
5459
|
-
},
|
|
5460
|
-
{
|
|
5461
|
-
"__schema": "VariableLikeSchema",
|
|
5462
|
-
"location": {
|
|
5463
|
-
"filePath": "merging.main.runtime.ts",
|
|
5464
|
-
"line": 96,
|
|
5465
|
-
"character": 5
|
|
5466
|
-
},
|
|
5467
|
-
"signature": "(property) removedComponents?: ComponentIdList | undefined",
|
|
5468
|
-
"name": "removedComponents",
|
|
5469
|
-
"type": {
|
|
5470
|
-
"__schema": "TypeRefSchema",
|
|
5471
|
-
"location": {
|
|
5472
|
-
"filePath": "merging.main.runtime.ts",
|
|
5473
|
-
"line": 96,
|
|
5474
|
-
"character": 25
|
|
5475
|
-
},
|
|
5476
|
-
"name": "ComponentIdList"
|
|
5477
|
-
},
|
|
5478
|
-
"isOptional": true
|
|
5479
|
-
}
|
|
5480
|
-
]
|
|
5481
|
-
},
|
|
5482
|
-
{
|
|
5483
|
-
"__schema": "LiteralTypeSchema",
|
|
5484
|
-
"location": {
|
|
5485
|
-
"filePath": "merging.main.runtime.ts",
|
|
5486
|
-
"line": 97,
|
|
5487
|
-
"character": 7
|
|
5488
|
-
},
|
|
5489
|
-
"name": "null"
|
|
5490
|
-
}
|
|
5491
|
-
]
|
|
5492
|
+
"name": "MergeSnapResults"
|
|
5492
5493
|
},
|
|
5493
5494
|
"isOptional": true
|
|
5494
5495
|
},
|
|
@@ -5496,7 +5497,7 @@
|
|
|
5496
5497
|
"__schema": "VariableLikeSchema",
|
|
5497
5498
|
"location": {
|
|
5498
5499
|
"filePath": "merging.main.runtime.ts",
|
|
5499
|
-
"line":
|
|
5500
|
+
"line": 102,
|
|
5500
5501
|
"character": 3
|
|
5501
5502
|
},
|
|
5502
5503
|
"signature": "(property) mergeSnapError?: Error | undefined",
|
|
@@ -5505,7 +5506,7 @@
|
|
|
5505
5506
|
"__schema": "TypeRefSchema",
|
|
5506
5507
|
"location": {
|
|
5507
5508
|
"filePath": "merging.main.runtime.ts",
|
|
5508
|
-
"line":
|
|
5509
|
+
"line": 102,
|
|
5509
5510
|
"character": 20
|
|
5510
5511
|
},
|
|
5511
5512
|
"name": "Error"
|
|
@@ -5516,7 +5517,7 @@
|
|
|
5516
5517
|
"__schema": "VariableLikeSchema",
|
|
5517
5518
|
"location": {
|
|
5518
5519
|
"filePath": "merging.main.runtime.ts",
|
|
5519
|
-
"line":
|
|
5520
|
+
"line": 103,
|
|
5520
5521
|
"character": 3
|
|
5521
5522
|
},
|
|
5522
5523
|
"signature": "(property) leftUnresolvedConflicts?: boolean | undefined",
|
|
@@ -5525,7 +5526,7 @@
|
|
|
5525
5526
|
"__schema": "KeywordTypeSchema",
|
|
5526
5527
|
"location": {
|
|
5527
5528
|
"filePath": "merging.main.runtime.ts",
|
|
5528
|
-
"line":
|
|
5529
|
+
"line": 103,
|
|
5529
5530
|
"character": 29
|
|
5530
5531
|
},
|
|
5531
5532
|
"name": "boolean"
|
|
@@ -5536,7 +5537,7 @@
|
|
|
5536
5537
|
"__schema": "VariableLikeSchema",
|
|
5537
5538
|
"location": {
|
|
5538
5539
|
"filePath": "merging.main.runtime.ts",
|
|
5539
|
-
"line":
|
|
5540
|
+
"line": 104,
|
|
5540
5541
|
"character": 3
|
|
5541
5542
|
},
|
|
5542
5543
|
"signature": "(property) verbose?: boolean | undefined",
|
|
@@ -5545,7 +5546,7 @@
|
|
|
5545
5546
|
"__schema": "KeywordTypeSchema",
|
|
5546
5547
|
"location": {
|
|
5547
5548
|
"filePath": "merging.main.runtime.ts",
|
|
5548
|
-
"line":
|
|
5549
|
+
"line": 104,
|
|
5549
5550
|
"character": 13
|
|
5550
5551
|
},
|
|
5551
5552
|
"name": "boolean"
|
|
@@ -5556,7 +5557,7 @@
|
|
|
5556
5557
|
"__schema": "VariableLikeSchema",
|
|
5557
5558
|
"location": {
|
|
5558
5559
|
"filePath": "merging.main.runtime.ts",
|
|
5559
|
-
"line":
|
|
5560
|
+
"line": 105,
|
|
5560
5561
|
"character": 3
|
|
5561
5562
|
},
|
|
5562
5563
|
"signature": "(property) newFromLane?: string[] | undefined",
|
|
@@ -5565,14 +5566,14 @@
|
|
|
5565
5566
|
"__schema": "TypeArraySchema",
|
|
5566
5567
|
"location": {
|
|
5567
5568
|
"filePath": "merging.main.runtime.ts",
|
|
5568
|
-
"line":
|
|
5569
|
+
"line": 105,
|
|
5569
5570
|
"character": 17
|
|
5570
5571
|
},
|
|
5571
5572
|
"type": {
|
|
5572
5573
|
"__schema": "KeywordTypeSchema",
|
|
5573
5574
|
"location": {
|
|
5574
5575
|
"filePath": "merging.main.runtime.ts",
|
|
5575
|
-
"line":
|
|
5576
|
+
"line": 105,
|
|
5576
5577
|
"character": 17
|
|
5577
5578
|
},
|
|
5578
5579
|
"name": "string"
|
|
@@ -5584,7 +5585,7 @@
|
|
|
5584
5585
|
"__schema": "VariableLikeSchema",
|
|
5585
5586
|
"location": {
|
|
5586
5587
|
"filePath": "merging.main.runtime.ts",
|
|
5587
|
-
"line":
|
|
5588
|
+
"line": 106,
|
|
5588
5589
|
"character": 3
|
|
5589
5590
|
},
|
|
5590
5591
|
"signature": "(property) newFromLaneAdded?: boolean | undefined",
|
|
@@ -5593,7 +5594,7 @@
|
|
|
5593
5594
|
"__schema": "KeywordTypeSchema",
|
|
5594
5595
|
"location": {
|
|
5595
5596
|
"filePath": "merging.main.runtime.ts",
|
|
5596
|
-
"line":
|
|
5597
|
+
"line": 106,
|
|
5597
5598
|
"character": 22
|
|
5598
5599
|
},
|
|
5599
5600
|
"name": "boolean"
|
|
@@ -5604,7 +5605,7 @@
|
|
|
5604
5605
|
"__schema": "VariableLikeSchema",
|
|
5605
5606
|
"location": {
|
|
5606
5607
|
"filePath": "merging.main.runtime.ts",
|
|
5607
|
-
"line":
|
|
5608
|
+
"line": 107,
|
|
5608
5609
|
"character": 3
|
|
5609
5610
|
},
|
|
5610
5611
|
"signature": "(property) installationError?: Error | undefined",
|
|
@@ -5613,7 +5614,7 @@
|
|
|
5613
5614
|
"__schema": "TypeRefSchema",
|
|
5614
5615
|
"location": {
|
|
5615
5616
|
"filePath": "merging.main.runtime.ts",
|
|
5616
|
-
"line":
|
|
5617
|
+
"line": 107,
|
|
5617
5618
|
"character": 23
|
|
5618
5619
|
},
|
|
5619
5620
|
"name": "Error"
|
|
@@ -5624,7 +5625,7 @@
|
|
|
5624
5625
|
"__schema": "VariableLikeSchema",
|
|
5625
5626
|
"location": {
|
|
5626
5627
|
"filePath": "merging.main.runtime.ts",
|
|
5627
|
-
"line":
|
|
5628
|
+
"line": 108,
|
|
5628
5629
|
"character": 3
|
|
5629
5630
|
},
|
|
5630
5631
|
"signature": "(property) compilationError?: Error | undefined",
|
|
@@ -5633,7 +5634,7 @@
|
|
|
5633
5634
|
"__schema": "TypeRefSchema",
|
|
5634
5635
|
"location": {
|
|
5635
5636
|
"filePath": "merging.main.runtime.ts",
|
|
5636
|
-
"line":
|
|
5637
|
+
"line": 108,
|
|
5637
5638
|
"character": 22
|
|
5638
5639
|
},
|
|
5639
5640
|
"name": "Error"
|
|
@@ -5644,7 +5645,7 @@
|
|
|
5644
5645
|
"__schema": "VariableLikeSchema",
|
|
5645
5646
|
"location": {
|
|
5646
5647
|
"filePath": "merging.main.runtime.ts",
|
|
5647
|
-
"line":
|
|
5648
|
+
"line": 109,
|
|
5648
5649
|
"character": 3
|
|
5649
5650
|
},
|
|
5650
5651
|
"signature": "(property) workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined",
|
|
@@ -5653,7 +5654,7 @@
|
|
|
5653
5654
|
"__schema": "TypeRefSchema",
|
|
5654
5655
|
"location": {
|
|
5655
5656
|
"filePath": "merging.main.runtime.ts",
|
|
5656
|
-
"line":
|
|
5657
|
+
"line": 109,
|
|
5657
5658
|
"character": 33
|
|
5658
5659
|
},
|
|
5659
5660
|
"name": "WorkspaceConfigUpdateResult"
|
|
@@ -5667,7 +5668,7 @@
|
|
|
5667
5668
|
"__schema": "ClassSchema",
|
|
5668
5669
|
"location": {
|
|
5669
5670
|
"filePath": "merging.main.runtime.ts",
|
|
5670
|
-
"line":
|
|
5671
|
+
"line": 112,
|
|
5671
5672
|
"character": 1
|
|
5672
5673
|
},
|
|
5673
5674
|
"signature": "class MergingMain",
|
|
@@ -5677,17 +5678,17 @@
|
|
|
5677
5678
|
"__schema": "ConstructorSchema",
|
|
5678
5679
|
"location": {
|
|
5679
5680
|
"filePath": "merging.main.runtime.ts",
|
|
5680
|
-
"line":
|
|
5681
|
+
"line": 113,
|
|
5681
5682
|
"character": 3
|
|
5682
5683
|
},
|
|
5683
|
-
"signature": "constructor MergingMain(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain): MergingMain",
|
|
5684
|
+
"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): MergingMain",
|
|
5684
5685
|
"name": "constructor",
|
|
5685
5686
|
"params": [
|
|
5686
5687
|
{
|
|
5687
5688
|
"__schema": "ParameterSchema",
|
|
5688
5689
|
"location": {
|
|
5689
5690
|
"filePath": "merging.main.runtime.ts",
|
|
5690
|
-
"line":
|
|
5691
|
+
"line": 114,
|
|
5691
5692
|
"character": 5
|
|
5692
5693
|
},
|
|
5693
5694
|
"name": "workspace",
|
|
@@ -5695,7 +5696,7 @@
|
|
|
5695
5696
|
"__schema": "TypeRefSchema",
|
|
5696
5697
|
"location": {
|
|
5697
5698
|
"filePath": "merging.main.runtime.ts",
|
|
5698
|
-
"line":
|
|
5699
|
+
"line": 114,
|
|
5699
5700
|
"character": 24
|
|
5700
5701
|
},
|
|
5701
5702
|
"name": "Workspace"
|
|
@@ -5707,7 +5708,27 @@
|
|
|
5707
5708
|
"__schema": "ParameterSchema",
|
|
5708
5709
|
"location": {
|
|
5709
5710
|
"filePath": "merging.main.runtime.ts",
|
|
5710
|
-
"line":
|
|
5711
|
+
"line": 115,
|
|
5712
|
+
"character": 5
|
|
5713
|
+
},
|
|
5714
|
+
"name": "scope",
|
|
5715
|
+
"type": {
|
|
5716
|
+
"__schema": "TypeRefSchema",
|
|
5717
|
+
"location": {
|
|
5718
|
+
"filePath": "merging.main.runtime.ts",
|
|
5719
|
+
"line": 115,
|
|
5720
|
+
"character": 20
|
|
5721
|
+
},
|
|
5722
|
+
"name": "ScopeMain"
|
|
5723
|
+
},
|
|
5724
|
+
"isOptional": false,
|
|
5725
|
+
"isSpread": false
|
|
5726
|
+
},
|
|
5727
|
+
{
|
|
5728
|
+
"__schema": "ParameterSchema",
|
|
5729
|
+
"location": {
|
|
5730
|
+
"filePath": "merging.main.runtime.ts",
|
|
5731
|
+
"line": 116,
|
|
5711
5732
|
"character": 5
|
|
5712
5733
|
},
|
|
5713
5734
|
"name": "install",
|
|
@@ -5715,7 +5736,7 @@
|
|
|
5715
5736
|
"__schema": "TypeRefSchema",
|
|
5716
5737
|
"location": {
|
|
5717
5738
|
"filePath": "merging.main.runtime.ts",
|
|
5718
|
-
"line":
|
|
5739
|
+
"line": 116,
|
|
5719
5740
|
"character": 22
|
|
5720
5741
|
},
|
|
5721
5742
|
"name": "InstallMain"
|
|
@@ -5727,7 +5748,7 @@
|
|
|
5727
5748
|
"__schema": "ParameterSchema",
|
|
5728
5749
|
"location": {
|
|
5729
5750
|
"filePath": "merging.main.runtime.ts",
|
|
5730
|
-
"line":
|
|
5751
|
+
"line": 117,
|
|
5731
5752
|
"character": 5
|
|
5732
5753
|
},
|
|
5733
5754
|
"name": "snapping",
|
|
@@ -5735,7 +5756,7 @@
|
|
|
5735
5756
|
"__schema": "TypeRefSchema",
|
|
5736
5757
|
"location": {
|
|
5737
5758
|
"filePath": "merging.main.runtime.ts",
|
|
5738
|
-
"line":
|
|
5759
|
+
"line": 117,
|
|
5739
5760
|
"character": 23
|
|
5740
5761
|
},
|
|
5741
5762
|
"name": "SnappingMain"
|
|
@@ -5747,7 +5768,7 @@
|
|
|
5747
5768
|
"__schema": "ParameterSchema",
|
|
5748
5769
|
"location": {
|
|
5749
5770
|
"filePath": "merging.main.runtime.ts",
|
|
5750
|
-
"line":
|
|
5771
|
+
"line": 118,
|
|
5751
5772
|
"character": 5
|
|
5752
5773
|
},
|
|
5753
5774
|
"name": "checkout",
|
|
@@ -5755,7 +5776,7 @@
|
|
|
5755
5776
|
"__schema": "TypeRefSchema",
|
|
5756
5777
|
"location": {
|
|
5757
5778
|
"filePath": "merging.main.runtime.ts",
|
|
5758
|
-
"line":
|
|
5779
|
+
"line": 118,
|
|
5759
5780
|
"character": 23
|
|
5760
5781
|
},
|
|
5761
5782
|
"name": "CheckoutMain"
|
|
@@ -5767,7 +5788,7 @@
|
|
|
5767
5788
|
"__schema": "ParameterSchema",
|
|
5768
5789
|
"location": {
|
|
5769
5790
|
"filePath": "merging.main.runtime.ts",
|
|
5770
|
-
"line":
|
|
5791
|
+
"line": 119,
|
|
5771
5792
|
"character": 5
|
|
5772
5793
|
},
|
|
5773
5794
|
"name": "logger",
|
|
@@ -5775,7 +5796,7 @@
|
|
|
5775
5796
|
"__schema": "TypeRefSchema",
|
|
5776
5797
|
"location": {
|
|
5777
5798
|
"filePath": "merging.main.runtime.ts",
|
|
5778
|
-
"line":
|
|
5799
|
+
"line": 119,
|
|
5779
5800
|
"character": 21
|
|
5780
5801
|
},
|
|
5781
5802
|
"name": "Logger"
|
|
@@ -5787,7 +5808,7 @@
|
|
|
5787
5808
|
"__schema": "ParameterSchema",
|
|
5788
5809
|
"location": {
|
|
5789
5810
|
"filePath": "merging.main.runtime.ts",
|
|
5790
|
-
"line":
|
|
5811
|
+
"line": 120,
|
|
5791
5812
|
"character": 5
|
|
5792
5813
|
},
|
|
5793
5814
|
"name": "componentWriter",
|
|
@@ -5795,7 +5816,7 @@
|
|
|
5795
5816
|
"__schema": "TypeRefSchema",
|
|
5796
5817
|
"location": {
|
|
5797
5818
|
"filePath": "merging.main.runtime.ts",
|
|
5798
|
-
"line":
|
|
5819
|
+
"line": 120,
|
|
5799
5820
|
"character": 30
|
|
5800
5821
|
},
|
|
5801
5822
|
"name": "ComponentWriterMain"
|
|
@@ -5807,7 +5828,7 @@
|
|
|
5807
5828
|
"__schema": "ParameterSchema",
|
|
5808
5829
|
"location": {
|
|
5809
5830
|
"filePath": "merging.main.runtime.ts",
|
|
5810
|
-
"line":
|
|
5831
|
+
"line": 121,
|
|
5811
5832
|
"character": 5
|
|
5812
5833
|
},
|
|
5813
5834
|
"name": "importer",
|
|
@@ -5815,7 +5836,7 @@
|
|
|
5815
5836
|
"__schema": "TypeRefSchema",
|
|
5816
5837
|
"location": {
|
|
5817
5838
|
"filePath": "merging.main.runtime.ts",
|
|
5818
|
-
"line":
|
|
5839
|
+
"line": 121,
|
|
5819
5840
|
"character": 23
|
|
5820
5841
|
},
|
|
5821
5842
|
"name": "ImporterMain"
|
|
@@ -5827,7 +5848,7 @@
|
|
|
5827
5848
|
"__schema": "ParameterSchema",
|
|
5828
5849
|
"location": {
|
|
5829
5850
|
"filePath": "merging.main.runtime.ts",
|
|
5830
|
-
"line":
|
|
5851
|
+
"line": 122,
|
|
5831
5852
|
"character": 5
|
|
5832
5853
|
},
|
|
5833
5854
|
"name": "config",
|
|
@@ -5835,7 +5856,7 @@
|
|
|
5835
5856
|
"__schema": "TypeRefSchema",
|
|
5836
5857
|
"location": {
|
|
5837
5858
|
"filePath": "merging.main.runtime.ts",
|
|
5838
|
-
"line":
|
|
5859
|
+
"line": 122,
|
|
5839
5860
|
"character": 21
|
|
5840
5861
|
},
|
|
5841
5862
|
"name": "ConfigMain"
|
|
@@ -5847,7 +5868,7 @@
|
|
|
5847
5868
|
"__schema": "ParameterSchema",
|
|
5848
5869
|
"location": {
|
|
5849
5870
|
"filePath": "merging.main.runtime.ts",
|
|
5850
|
-
"line":
|
|
5871
|
+
"line": 123,
|
|
5851
5872
|
"character": 5
|
|
5852
5873
|
},
|
|
5853
5874
|
"name": "remove",
|
|
@@ -5855,7 +5876,7 @@
|
|
|
5855
5876
|
"__schema": "TypeRefSchema",
|
|
5856
5877
|
"location": {
|
|
5857
5878
|
"filePath": "merging.main.runtime.ts",
|
|
5858
|
-
"line":
|
|
5879
|
+
"line": 123,
|
|
5859
5880
|
"character": 21
|
|
5860
5881
|
},
|
|
5861
5882
|
"name": "RemoveMain"
|
|
@@ -5867,7 +5888,7 @@
|
|
|
5867
5888
|
"__schema": "ParameterSchema",
|
|
5868
5889
|
"location": {
|
|
5869
5890
|
"filePath": "merging.main.runtime.ts",
|
|
5870
|
-
"line":
|
|
5891
|
+
"line": 124,
|
|
5871
5892
|
"character": 5
|
|
5872
5893
|
},
|
|
5873
5894
|
"name": "configMerger",
|
|
@@ -5875,7 +5896,7 @@
|
|
|
5875
5896
|
"__schema": "TypeRefSchema",
|
|
5876
5897
|
"location": {
|
|
5877
5898
|
"filePath": "merging.main.runtime.ts",
|
|
5878
|
-
"line":
|
|
5899
|
+
"line": 124,
|
|
5879
5900
|
"character": 27
|
|
5880
5901
|
},
|
|
5881
5902
|
"name": "ConfigMergerMain"
|
|
@@ -5888,7 +5909,7 @@
|
|
|
5888
5909
|
"__schema": "ThisTypeSchema",
|
|
5889
5910
|
"location": {
|
|
5890
5911
|
"filePath": "merging.main.runtime.ts",
|
|
5891
|
-
"line":
|
|
5912
|
+
"line": 112,
|
|
5892
5913
|
"character": 1
|
|
5893
5914
|
},
|
|
5894
5915
|
"name": "MergingMain"
|
|
@@ -5899,7 +5920,7 @@
|
|
|
5899
5920
|
"__schema": "FunctionLikeSchema",
|
|
5900
5921
|
"location": {
|
|
5901
5922
|
"filePath": "merging.main.runtime.ts",
|
|
5902
|
-
"line":
|
|
5923
|
+
"line": 127,
|
|
5903
5924
|
"character": 3
|
|
5904
5925
|
},
|
|
5905
5926
|
"signature": "(method) MergingMain.merge(ids: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>",
|
|
@@ -5909,7 +5930,7 @@
|
|
|
5909
5930
|
"__schema": "ParameterSchema",
|
|
5910
5931
|
"location": {
|
|
5911
5932
|
"filePath": "merging.main.runtime.ts",
|
|
5912
|
-
"line":
|
|
5933
|
+
"line": 128,
|
|
5913
5934
|
"character": 5
|
|
5914
5935
|
},
|
|
5915
5936
|
"name": "ids",
|
|
@@ -5917,14 +5938,14 @@
|
|
|
5917
5938
|
"__schema": "TypeArraySchema",
|
|
5918
5939
|
"location": {
|
|
5919
5940
|
"filePath": "merging.main.runtime.ts",
|
|
5920
|
-
"line":
|
|
5941
|
+
"line": 128,
|
|
5921
5942
|
"character": 10
|
|
5922
5943
|
},
|
|
5923
5944
|
"type": {
|
|
5924
5945
|
"__schema": "KeywordTypeSchema",
|
|
5925
5946
|
"location": {
|
|
5926
5947
|
"filePath": "merging.main.runtime.ts",
|
|
5927
|
-
"line":
|
|
5948
|
+
"line": 128,
|
|
5928
5949
|
"character": 10
|
|
5929
5950
|
},
|
|
5930
5951
|
"name": "string"
|
|
@@ -5937,7 +5958,7 @@
|
|
|
5937
5958
|
"__schema": "ParameterSchema",
|
|
5938
5959
|
"location": {
|
|
5939
5960
|
"filePath": "merging.main.runtime.ts",
|
|
5940
|
-
"line":
|
|
5961
|
+
"line": 129,
|
|
5941
5962
|
"character": 5
|
|
5942
5963
|
},
|
|
5943
5964
|
"name": "mergeStrategy",
|
|
@@ -5945,7 +5966,7 @@
|
|
|
5945
5966
|
"__schema": "TypeRefSchema",
|
|
5946
5967
|
"location": {
|
|
5947
5968
|
"filePath": "merging.main.runtime.ts",
|
|
5948
|
-
"line":
|
|
5969
|
+
"line": 129,
|
|
5949
5970
|
"character": 20
|
|
5950
5971
|
},
|
|
5951
5972
|
"name": "MergeStrategy"
|
|
@@ -5957,7 +5978,7 @@
|
|
|
5957
5978
|
"__schema": "ParameterSchema",
|
|
5958
5979
|
"location": {
|
|
5959
5980
|
"filePath": "merging.main.runtime.ts",
|
|
5960
|
-
"line":
|
|
5981
|
+
"line": 130,
|
|
5961
5982
|
"character": 5
|
|
5962
5983
|
},
|
|
5963
5984
|
"name": "abort",
|
|
@@ -5965,7 +5986,7 @@
|
|
|
5965
5986
|
"__schema": "KeywordTypeSchema",
|
|
5966
5987
|
"location": {
|
|
5967
5988
|
"filePath": "merging.main.runtime.ts",
|
|
5968
|
-
"line":
|
|
5989
|
+
"line": 130,
|
|
5969
5990
|
"character": 12
|
|
5970
5991
|
},
|
|
5971
5992
|
"name": "boolean"
|
|
@@ -5977,7 +5998,7 @@
|
|
|
5977
5998
|
"__schema": "ParameterSchema",
|
|
5978
5999
|
"location": {
|
|
5979
6000
|
"filePath": "merging.main.runtime.ts",
|
|
5980
|
-
"line":
|
|
6001
|
+
"line": 131,
|
|
5981
6002
|
"character": 5
|
|
5982
6003
|
},
|
|
5983
6004
|
"name": "resolve",
|
|
@@ -5985,7 +6006,7 @@
|
|
|
5985
6006
|
"__schema": "KeywordTypeSchema",
|
|
5986
6007
|
"location": {
|
|
5987
6008
|
"filePath": "merging.main.runtime.ts",
|
|
5988
|
-
"line":
|
|
6009
|
+
"line": 131,
|
|
5989
6010
|
"character": 14
|
|
5990
6011
|
},
|
|
5991
6012
|
"name": "boolean"
|
|
@@ -5997,7 +6018,7 @@
|
|
|
5997
6018
|
"__schema": "ParameterSchema",
|
|
5998
6019
|
"location": {
|
|
5999
6020
|
"filePath": "merging.main.runtime.ts",
|
|
6000
|
-
"line":
|
|
6021
|
+
"line": 132,
|
|
6001
6022
|
"character": 5
|
|
6002
6023
|
},
|
|
6003
6024
|
"name": "noSnap",
|
|
@@ -6005,7 +6026,7 @@
|
|
|
6005
6026
|
"__schema": "KeywordTypeSchema",
|
|
6006
6027
|
"location": {
|
|
6007
6028
|
"filePath": "merging.main.runtime.ts",
|
|
6008
|
-
"line":
|
|
6029
|
+
"line": 132,
|
|
6009
6030
|
"character": 13
|
|
6010
6031
|
},
|
|
6011
6032
|
"name": "boolean"
|
|
@@ -6017,7 +6038,7 @@
|
|
|
6017
6038
|
"__schema": "ParameterSchema",
|
|
6018
6039
|
"location": {
|
|
6019
6040
|
"filePath": "merging.main.runtime.ts",
|
|
6020
|
-
"line":
|
|
6041
|
+
"line": 133,
|
|
6021
6042
|
"character": 5
|
|
6022
6043
|
},
|
|
6023
6044
|
"name": "message",
|
|
@@ -6025,7 +6046,7 @@
|
|
|
6025
6046
|
"__schema": "KeywordTypeSchema",
|
|
6026
6047
|
"location": {
|
|
6027
6048
|
"filePath": "merging.main.runtime.ts",
|
|
6028
|
-
"line":
|
|
6049
|
+
"line": 133,
|
|
6029
6050
|
"character": 14
|
|
6030
6051
|
},
|
|
6031
6052
|
"name": "string"
|
|
@@ -6037,7 +6058,7 @@
|
|
|
6037
6058
|
"__schema": "ParameterSchema",
|
|
6038
6059
|
"location": {
|
|
6039
6060
|
"filePath": "merging.main.runtime.ts",
|
|
6040
|
-
"line":
|
|
6061
|
+
"line": 134,
|
|
6041
6062
|
"character": 5
|
|
6042
6063
|
},
|
|
6043
6064
|
"name": "build",
|
|
@@ -6045,7 +6066,7 @@
|
|
|
6045
6066
|
"__schema": "KeywordTypeSchema",
|
|
6046
6067
|
"location": {
|
|
6047
6068
|
"filePath": "merging.main.runtime.ts",
|
|
6048
|
-
"line":
|
|
6069
|
+
"line": 134,
|
|
6049
6070
|
"character": 12
|
|
6050
6071
|
},
|
|
6051
6072
|
"name": "boolean"
|
|
@@ -6057,7 +6078,7 @@
|
|
|
6057
6078
|
"__schema": "ParameterSchema",
|
|
6058
6079
|
"location": {
|
|
6059
6080
|
"filePath": "merging.main.runtime.ts",
|
|
6060
|
-
"line":
|
|
6081
|
+
"line": 135,
|
|
6061
6082
|
"character": 5
|
|
6062
6083
|
},
|
|
6063
6084
|
"name": "skipDependencyInstallation",
|
|
@@ -6065,7 +6086,7 @@
|
|
|
6065
6086
|
"__schema": "KeywordTypeSchema",
|
|
6066
6087
|
"location": {
|
|
6067
6088
|
"filePath": "merging.main.runtime.ts",
|
|
6068
|
-
"line":
|
|
6089
|
+
"line": 135,
|
|
6069
6090
|
"character": 33
|
|
6070
6091
|
},
|
|
6071
6092
|
"name": "boolean"
|
|
@@ -6078,7 +6099,7 @@
|
|
|
6078
6099
|
"__schema": "TypeRefSchema",
|
|
6079
6100
|
"location": {
|
|
6080
6101
|
"filePath": "merging.main.runtime.ts",
|
|
6081
|
-
"line":
|
|
6102
|
+
"line": 136,
|
|
6082
6103
|
"character": 6
|
|
6083
6104
|
},
|
|
6084
6105
|
"name": "Promise",
|
|
@@ -6087,7 +6108,7 @@
|
|
|
6087
6108
|
"__schema": "TypeRefSchema",
|
|
6088
6109
|
"location": {
|
|
6089
6110
|
"filePath": "merging.main.runtime.ts",
|
|
6090
|
-
"line":
|
|
6111
|
+
"line": 136,
|
|
6091
6112
|
"character": 14
|
|
6092
6113
|
},
|
|
6093
6114
|
"name": "ApplyVersionResults"
|
|
@@ -6102,14 +6123,14 @@
|
|
|
6102
6123
|
"__schema": "FunctionLikeSchema",
|
|
6103
6124
|
"location": {
|
|
6104
6125
|
"filePath": "merging.main.runtime.ts",
|
|
6105
|
-
"line":
|
|
6126
|
+
"line": 164,
|
|
6106
6127
|
"character": 3
|
|
6107
6128
|
},
|
|
6108
6129
|
"doc": {
|
|
6109
6130
|
"__schema": "DocSchema",
|
|
6110
6131
|
"location": {
|
|
6111
6132
|
"filePath": "merging.main.runtime.ts",
|
|
6112
|
-
"line":
|
|
6133
|
+
"line": 160,
|
|
6113
6134
|
"character": 3
|
|
6114
6135
|
},
|
|
6115
6136
|
"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 */",
|
|
@@ -6122,7 +6143,7 @@
|
|
|
6122
6143
|
"__schema": "ParameterSchema",
|
|
6123
6144
|
"location": {
|
|
6124
6145
|
"filePath": "merging.main.runtime.ts",
|
|
6125
|
-
"line":
|
|
6146
|
+
"line": 165,
|
|
6126
6147
|
"character": 5
|
|
6127
6148
|
},
|
|
6128
6149
|
"name": "consumer",
|
|
@@ -6130,7 +6151,7 @@
|
|
|
6130
6151
|
"__schema": "TypeRefSchema",
|
|
6131
6152
|
"location": {
|
|
6132
6153
|
"filePath": "merging.main.runtime.ts",
|
|
6133
|
-
"line":
|
|
6154
|
+
"line": 165,
|
|
6134
6155
|
"character": 15
|
|
6135
6156
|
},
|
|
6136
6157
|
"name": "Consumer"
|
|
@@ -6142,7 +6163,7 @@
|
|
|
6142
6163
|
"__schema": "ParameterSchema",
|
|
6143
6164
|
"location": {
|
|
6144
6165
|
"filePath": "merging.main.runtime.ts",
|
|
6145
|
-
"line":
|
|
6166
|
+
"line": 166,
|
|
6146
6167
|
"character": 5
|
|
6147
6168
|
},
|
|
6148
6169
|
"name": "bitIds",
|
|
@@ -6150,14 +6171,14 @@
|
|
|
6150
6171
|
"__schema": "TypeArraySchema",
|
|
6151
6172
|
"location": {
|
|
6152
6173
|
"filePath": "merging.main.runtime.ts",
|
|
6153
|
-
"line":
|
|
6174
|
+
"line": 166,
|
|
6154
6175
|
"character": 13
|
|
6155
6176
|
},
|
|
6156
6177
|
"type": {
|
|
6157
6178
|
"__schema": "TypeRefSchema",
|
|
6158
6179
|
"location": {
|
|
6159
6180
|
"filePath": "merging.main.runtime.ts",
|
|
6160
|
-
"line":
|
|
6181
|
+
"line": 166,
|
|
6161
6182
|
"character": 13
|
|
6162
6183
|
},
|
|
6163
6184
|
"name": "ComponentID"
|
|
@@ -6170,7 +6191,7 @@
|
|
|
6170
6191
|
"__schema": "ParameterSchema",
|
|
6171
6192
|
"location": {
|
|
6172
6193
|
"filePath": "merging.main.runtime.ts",
|
|
6173
|
-
"line":
|
|
6194
|
+
"line": 167,
|
|
6174
6195
|
"character": 5
|
|
6175
6196
|
},
|
|
6176
6197
|
"name": "mergeStrategy",
|
|
@@ -6178,7 +6199,7 @@
|
|
|
6178
6199
|
"__schema": "TypeRefSchema",
|
|
6179
6200
|
"location": {
|
|
6180
6201
|
"filePath": "merging.main.runtime.ts",
|
|
6181
|
-
"line":
|
|
6202
|
+
"line": 167,
|
|
6182
6203
|
"character": 20
|
|
6183
6204
|
},
|
|
6184
6205
|
"name": "MergeStrategy"
|
|
@@ -6190,7 +6211,7 @@
|
|
|
6190
6211
|
"__schema": "ParameterSchema",
|
|
6191
6212
|
"location": {
|
|
6192
6213
|
"filePath": "merging.main.runtime.ts",
|
|
6193
|
-
"line":
|
|
6214
|
+
"line": 168,
|
|
6194
6215
|
"character": 5
|
|
6195
6216
|
},
|
|
6196
6217
|
"name": "noSnap",
|
|
@@ -6198,7 +6219,7 @@
|
|
|
6198
6219
|
"__schema": "KeywordTypeSchema",
|
|
6199
6220
|
"location": {
|
|
6200
6221
|
"filePath": "merging.main.runtime.ts",
|
|
6201
|
-
"line":
|
|
6222
|
+
"line": 168,
|
|
6202
6223
|
"character": 13
|
|
6203
6224
|
},
|
|
6204
6225
|
"name": "boolean"
|
|
@@ -6210,7 +6231,7 @@
|
|
|
6210
6231
|
"__schema": "ParameterSchema",
|
|
6211
6232
|
"location": {
|
|
6212
6233
|
"filePath": "merging.main.runtime.ts",
|
|
6213
|
-
"line":
|
|
6234
|
+
"line": 169,
|
|
6214
6235
|
"character": 5
|
|
6215
6236
|
},
|
|
6216
6237
|
"name": "snapMessage",
|
|
@@ -6218,7 +6239,7 @@
|
|
|
6218
6239
|
"__schema": "KeywordTypeSchema",
|
|
6219
6240
|
"location": {
|
|
6220
6241
|
"filePath": "merging.main.runtime.ts",
|
|
6221
|
-
"line":
|
|
6242
|
+
"line": 169,
|
|
6222
6243
|
"character": 18
|
|
6223
6244
|
},
|
|
6224
6245
|
"name": "string"
|
|
@@ -6230,7 +6251,7 @@
|
|
|
6230
6251
|
"__schema": "ParameterSchema",
|
|
6231
6252
|
"location": {
|
|
6232
6253
|
"filePath": "merging.main.runtime.ts",
|
|
6233
|
-
"line":
|
|
6254
|
+
"line": 170,
|
|
6234
6255
|
"character": 5
|
|
6235
6256
|
},
|
|
6236
6257
|
"name": "build",
|
|
@@ -6238,7 +6259,7 @@
|
|
|
6238
6259
|
"__schema": "KeywordTypeSchema",
|
|
6239
6260
|
"location": {
|
|
6240
6261
|
"filePath": "merging.main.runtime.ts",
|
|
6241
|
-
"line":
|
|
6262
|
+
"line": 170,
|
|
6242
6263
|
"character": 12
|
|
6243
6264
|
},
|
|
6244
6265
|
"name": "boolean"
|
|
@@ -6250,7 +6271,7 @@
|
|
|
6250
6271
|
"__schema": "ParameterSchema",
|
|
6251
6272
|
"location": {
|
|
6252
6273
|
"filePath": "merging.main.runtime.ts",
|
|
6253
|
-
"line":
|
|
6274
|
+
"line": 171,
|
|
6254
6275
|
"character": 5
|
|
6255
6276
|
},
|
|
6256
6277
|
"name": "skipDependencyInstallation",
|
|
@@ -6258,7 +6279,7 @@
|
|
|
6258
6279
|
"__schema": "KeywordTypeSchema",
|
|
6259
6280
|
"location": {
|
|
6260
6281
|
"filePath": "merging.main.runtime.ts",
|
|
6261
|
-
"line":
|
|
6282
|
+
"line": 171,
|
|
6262
6283
|
"character": 33
|
|
6263
6284
|
},
|
|
6264
6285
|
"name": "boolean"
|
|
@@ -6271,7 +6292,7 @@
|
|
|
6271
6292
|
"__schema": "TypeRefSchema",
|
|
6272
6293
|
"location": {
|
|
6273
6294
|
"filePath": "merging.main.runtime.ts",
|
|
6274
|
-
"line":
|
|
6295
|
+
"line": 172,
|
|
6275
6296
|
"character": 6
|
|
6276
6297
|
},
|
|
6277
6298
|
"name": "Promise",
|
|
@@ -6280,7 +6301,7 @@
|
|
|
6280
6301
|
"__schema": "TypeRefSchema",
|
|
6281
6302
|
"location": {
|
|
6282
6303
|
"filePath": "merging.main.runtime.ts",
|
|
6283
|
-
"line":
|
|
6304
|
+
"line": 172,
|
|
6284
6305
|
"character": 14
|
|
6285
6306
|
},
|
|
6286
6307
|
"name": "ApplyVersionResults"
|
|
@@ -6295,14 +6316,14 @@
|
|
|
6295
6316
|
"__schema": "FunctionLikeSchema",
|
|
6296
6317
|
"location": {
|
|
6297
6318
|
"filePath": "merging.main.runtime.ts",
|
|
6298
|
-
"line":
|
|
6319
|
+
"line": 207,
|
|
6299
6320
|
"character": 3
|
|
6300
6321
|
},
|
|
6301
6322
|
"doc": {
|
|
6302
6323
|
"__schema": "DocSchema",
|
|
6303
6324
|
"location": {
|
|
6304
6325
|
"filePath": "merging.main.runtime.ts",
|
|
6305
|
-
"line":
|
|
6326
|
+
"line": 204,
|
|
6306
6327
|
"character": 3
|
|
6307
6328
|
},
|
|
6308
6329
|
"raw": "/**\n * merge multiple components according to the \"allComponentsStatus\".\n */",
|
|
@@ -6315,7 +6336,7 @@
|
|
|
6315
6336
|
"__schema": "ParameterSchema",
|
|
6316
6337
|
"location": {
|
|
6317
6338
|
"filePath": "merging.main.runtime.ts",
|
|
6318
|
-
"line":
|
|
6339
|
+
"line": 207,
|
|
6319
6340
|
"character": 20
|
|
6320
6341
|
},
|
|
6321
6342
|
"name": "{ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noSnap, tag, snapMessage, build, skipDependencyInstallation }",
|
|
@@ -6323,7 +6344,7 @@
|
|
|
6323
6344
|
"__schema": "TypeLiteralSchema",
|
|
6324
6345
|
"location": {
|
|
6325
6346
|
"filePath": "merging.main.runtime.ts",
|
|
6326
|
-
"line":
|
|
6347
|
+
"line": 217,
|
|
6327
6348
|
"character": 6
|
|
6328
6349
|
},
|
|
6329
6350
|
"members": [
|
|
@@ -6331,16 +6352,16 @@
|
|
|
6331
6352
|
"__schema": "VariableLikeSchema",
|
|
6332
6353
|
"location": {
|
|
6333
6354
|
"filePath": "merging.main.runtime.ts",
|
|
6334
|
-
"line":
|
|
6355
|
+
"line": 218,
|
|
6335
6356
|
"character": 5
|
|
6336
6357
|
},
|
|
6337
|
-
"signature": "(property) mergeStrategy: \"
|
|
6358
|
+
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
6338
6359
|
"name": "mergeStrategy",
|
|
6339
6360
|
"type": {
|
|
6340
6361
|
"__schema": "TypeRefSchema",
|
|
6341
6362
|
"location": {
|
|
6342
6363
|
"filePath": "merging.main.runtime.ts",
|
|
6343
|
-
"line":
|
|
6364
|
+
"line": 218,
|
|
6344
6365
|
"character": 20
|
|
6345
6366
|
},
|
|
6346
6367
|
"name": "MergeStrategy"
|
|
@@ -6351,7 +6372,7 @@
|
|
|
6351
6372
|
"__schema": "VariableLikeSchema",
|
|
6352
6373
|
"location": {
|
|
6353
6374
|
"filePath": "merging.main.runtime.ts",
|
|
6354
|
-
"line":
|
|
6375
|
+
"line": 219,
|
|
6355
6376
|
"character": 5
|
|
6356
6377
|
},
|
|
6357
6378
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -6360,14 +6381,14 @@
|
|
|
6360
6381
|
"__schema": "TypeArraySchema",
|
|
6361
6382
|
"location": {
|
|
6362
6383
|
"filePath": "merging.main.runtime.ts",
|
|
6363
|
-
"line":
|
|
6384
|
+
"line": 219,
|
|
6364
6385
|
"character": 26
|
|
6365
6386
|
},
|
|
6366
6387
|
"type": {
|
|
6367
6388
|
"__schema": "TypeRefSchema",
|
|
6368
6389
|
"location": {
|
|
6369
6390
|
"filePath": "merging.main.runtime.ts",
|
|
6370
|
-
"line":
|
|
6391
|
+
"line": 219,
|
|
6371
6392
|
"character": 26
|
|
6372
6393
|
},
|
|
6373
6394
|
"name": "ComponentMergeStatus"
|
|
@@ -6379,7 +6400,7 @@
|
|
|
6379
6400
|
"__schema": "VariableLikeSchema",
|
|
6380
6401
|
"location": {
|
|
6381
6402
|
"filePath": "merging.main.runtime.ts",
|
|
6382
|
-
"line":
|
|
6403
|
+
"line": 220,
|
|
6383
6404
|
"character": 5
|
|
6384
6405
|
},
|
|
6385
6406
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -6388,7 +6409,7 @@
|
|
|
6388
6409
|
"__schema": "TypeRefSchema",
|
|
6389
6410
|
"location": {
|
|
6390
6411
|
"filePath": "merging.main.runtime.ts",
|
|
6391
|
-
"line":
|
|
6412
|
+
"line": 220,
|
|
6392
6413
|
"character": 5
|
|
6393
6414
|
},
|
|
6394
6415
|
"name": "LaneId",
|
|
@@ -6404,7 +6425,7 @@
|
|
|
6404
6425
|
"__schema": "VariableLikeSchema",
|
|
6405
6426
|
"location": {
|
|
6406
6427
|
"filePath": "merging.main.runtime.ts",
|
|
6407
|
-
"line":
|
|
6428
|
+
"line": 221,
|
|
6408
6429
|
"character": 5
|
|
6409
6430
|
},
|
|
6410
6431
|
"signature": "(property) currentLane: Lane | null",
|
|
@@ -6413,7 +6434,7 @@
|
|
|
6413
6434
|
"__schema": "TypeUnionSchema",
|
|
6414
6435
|
"location": {
|
|
6415
6436
|
"filePath": "merging.main.runtime.ts",
|
|
6416
|
-
"line":
|
|
6437
|
+
"line": 221,
|
|
6417
6438
|
"character": 18
|
|
6418
6439
|
},
|
|
6419
6440
|
"types": [
|
|
@@ -6421,7 +6442,7 @@
|
|
|
6421
6442
|
"__schema": "TypeRefSchema",
|
|
6422
6443
|
"location": {
|
|
6423
6444
|
"filePath": "merging.main.runtime.ts",
|
|
6424
|
-
"line":
|
|
6445
|
+
"line": 221,
|
|
6425
6446
|
"character": 18
|
|
6426
6447
|
},
|
|
6427
6448
|
"name": "Lane"
|
|
@@ -6430,7 +6451,7 @@
|
|
|
6430
6451
|
"__schema": "LiteralTypeSchema",
|
|
6431
6452
|
"location": {
|
|
6432
6453
|
"filePath": "merging.main.runtime.ts",
|
|
6433
|
-
"line":
|
|
6454
|
+
"line": 221,
|
|
6434
6455
|
"character": 25
|
|
6435
6456
|
},
|
|
6436
6457
|
"name": "null"
|
|
@@ -6443,7 +6464,7 @@
|
|
|
6443
6464
|
"__schema": "VariableLikeSchema",
|
|
6444
6465
|
"location": {
|
|
6445
6466
|
"filePath": "merging.main.runtime.ts",
|
|
6446
|
-
"line":
|
|
6467
|
+
"line": 222,
|
|
6447
6468
|
"character": 5
|
|
6448
6469
|
},
|
|
6449
6470
|
"signature": "(property) noSnap: boolean",
|
|
@@ -6452,7 +6473,7 @@
|
|
|
6452
6473
|
"__schema": "KeywordTypeSchema",
|
|
6453
6474
|
"location": {
|
|
6454
6475
|
"filePath": "merging.main.runtime.ts",
|
|
6455
|
-
"line":
|
|
6476
|
+
"line": 222,
|
|
6456
6477
|
"character": 13
|
|
6457
6478
|
},
|
|
6458
6479
|
"name": "boolean"
|
|
@@ -6463,7 +6484,7 @@
|
|
|
6463
6484
|
"__schema": "VariableLikeSchema",
|
|
6464
6485
|
"location": {
|
|
6465
6486
|
"filePath": "merging.main.runtime.ts",
|
|
6466
|
-
"line":
|
|
6487
|
+
"line": 223,
|
|
6467
6488
|
"character": 5
|
|
6468
6489
|
},
|
|
6469
6490
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -6472,7 +6493,7 @@
|
|
|
6472
6493
|
"__schema": "KeywordTypeSchema",
|
|
6473
6494
|
"location": {
|
|
6474
6495
|
"filePath": "merging.main.runtime.ts",
|
|
6475
|
-
"line":
|
|
6496
|
+
"line": 223,
|
|
6476
6497
|
"character": 11
|
|
6477
6498
|
},
|
|
6478
6499
|
"name": "boolean"
|
|
@@ -6483,7 +6504,7 @@
|
|
|
6483
6504
|
"__schema": "VariableLikeSchema",
|
|
6484
6505
|
"location": {
|
|
6485
6506
|
"filePath": "merging.main.runtime.ts",
|
|
6486
|
-
"line":
|
|
6507
|
+
"line": 224,
|
|
6487
6508
|
"character": 5
|
|
6488
6509
|
},
|
|
6489
6510
|
"signature": "(property) snapMessage: string",
|
|
@@ -6492,7 +6513,7 @@
|
|
|
6492
6513
|
"__schema": "KeywordTypeSchema",
|
|
6493
6514
|
"location": {
|
|
6494
6515
|
"filePath": "merging.main.runtime.ts",
|
|
6495
|
-
"line":
|
|
6516
|
+
"line": 224,
|
|
6496
6517
|
"character": 18
|
|
6497
6518
|
},
|
|
6498
6519
|
"name": "string"
|
|
@@ -6503,7 +6524,7 @@
|
|
|
6503
6524
|
"__schema": "VariableLikeSchema",
|
|
6504
6525
|
"location": {
|
|
6505
6526
|
"filePath": "merging.main.runtime.ts",
|
|
6506
|
-
"line":
|
|
6527
|
+
"line": 225,
|
|
6507
6528
|
"character": 5
|
|
6508
6529
|
},
|
|
6509
6530
|
"signature": "(property) build: boolean",
|
|
@@ -6512,7 +6533,7 @@
|
|
|
6512
6533
|
"__schema": "KeywordTypeSchema",
|
|
6513
6534
|
"location": {
|
|
6514
6535
|
"filePath": "merging.main.runtime.ts",
|
|
6515
|
-
"line":
|
|
6536
|
+
"line": 225,
|
|
6516
6537
|
"character": 12
|
|
6517
6538
|
},
|
|
6518
6539
|
"name": "boolean"
|
|
@@ -6523,7 +6544,7 @@
|
|
|
6523
6544
|
"__schema": "VariableLikeSchema",
|
|
6524
6545
|
"location": {
|
|
6525
6546
|
"filePath": "merging.main.runtime.ts",
|
|
6526
|
-
"line":
|
|
6547
|
+
"line": 226,
|
|
6527
6548
|
"character": 5
|
|
6528
6549
|
},
|
|
6529
6550
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -6532,7 +6553,7 @@
|
|
|
6532
6553
|
"__schema": "KeywordTypeSchema",
|
|
6533
6554
|
"location": {
|
|
6534
6555
|
"filePath": "merging.main.runtime.ts",
|
|
6535
|
-
"line":
|
|
6556
|
+
"line": 226,
|
|
6536
6557
|
"character": 34
|
|
6537
6558
|
},
|
|
6538
6559
|
"name": "boolean"
|
|
@@ -6547,16 +6568,16 @@
|
|
|
6547
6568
|
"__schema": "VariableLikeSchema",
|
|
6548
6569
|
"location": {
|
|
6549
6570
|
"filePath": "merging.main.runtime.ts",
|
|
6550
|
-
"line":
|
|
6571
|
+
"line": 218,
|
|
6551
6572
|
"character": 5
|
|
6552
6573
|
},
|
|
6553
|
-
"signature": "(property) mergeStrategy: \"
|
|
6574
|
+
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
6554
6575
|
"name": "mergeStrategy",
|
|
6555
6576
|
"type": {
|
|
6556
6577
|
"__schema": "TypeRefSchema",
|
|
6557
6578
|
"location": {
|
|
6558
6579
|
"filePath": "merging.main.runtime.ts",
|
|
6559
|
-
"line":
|
|
6580
|
+
"line": 218,
|
|
6560
6581
|
"character": 20
|
|
6561
6582
|
},
|
|
6562
6583
|
"name": "MergeStrategy"
|
|
@@ -6567,7 +6588,7 @@
|
|
|
6567
6588
|
"__schema": "VariableLikeSchema",
|
|
6568
6589
|
"location": {
|
|
6569
6590
|
"filePath": "merging.main.runtime.ts",
|
|
6570
|
-
"line":
|
|
6591
|
+
"line": 219,
|
|
6571
6592
|
"character": 5
|
|
6572
6593
|
},
|
|
6573
6594
|
"signature": "(property) allComponentsStatus: ComponentMergeStatus[]",
|
|
@@ -6576,14 +6597,14 @@
|
|
|
6576
6597
|
"__schema": "TypeArraySchema",
|
|
6577
6598
|
"location": {
|
|
6578
6599
|
"filePath": "merging.main.runtime.ts",
|
|
6579
|
-
"line":
|
|
6600
|
+
"line": 219,
|
|
6580
6601
|
"character": 26
|
|
6581
6602
|
},
|
|
6582
6603
|
"type": {
|
|
6583
6604
|
"__schema": "TypeRefSchema",
|
|
6584
6605
|
"location": {
|
|
6585
6606
|
"filePath": "merging.main.runtime.ts",
|
|
6586
|
-
"line":
|
|
6607
|
+
"line": 219,
|
|
6587
6608
|
"character": 26
|
|
6588
6609
|
},
|
|
6589
6610
|
"name": "ComponentMergeStatus"
|
|
@@ -6595,7 +6616,7 @@
|
|
|
6595
6616
|
"__schema": "VariableLikeSchema",
|
|
6596
6617
|
"location": {
|
|
6597
6618
|
"filePath": "merging.main.runtime.ts",
|
|
6598
|
-
"line":
|
|
6619
|
+
"line": 220,
|
|
6599
6620
|
"character": 5
|
|
6600
6621
|
},
|
|
6601
6622
|
"signature": "(property) otherLaneId: LaneId",
|
|
@@ -6604,7 +6625,7 @@
|
|
|
6604
6625
|
"__schema": "TypeRefSchema",
|
|
6605
6626
|
"location": {
|
|
6606
6627
|
"filePath": "merging.main.runtime.ts",
|
|
6607
|
-
"line":
|
|
6628
|
+
"line": 220,
|
|
6608
6629
|
"character": 5
|
|
6609
6630
|
},
|
|
6610
6631
|
"name": "LaneId",
|
|
@@ -6620,7 +6641,7 @@
|
|
|
6620
6641
|
"__schema": "VariableLikeSchema",
|
|
6621
6642
|
"location": {
|
|
6622
6643
|
"filePath": "merging.main.runtime.ts",
|
|
6623
|
-
"line":
|
|
6644
|
+
"line": 221,
|
|
6624
6645
|
"character": 5
|
|
6625
6646
|
},
|
|
6626
6647
|
"signature": "(property) currentLane: Lane | null",
|
|
@@ -6629,7 +6650,7 @@
|
|
|
6629
6650
|
"__schema": "TypeUnionSchema",
|
|
6630
6651
|
"location": {
|
|
6631
6652
|
"filePath": "merging.main.runtime.ts",
|
|
6632
|
-
"line":
|
|
6653
|
+
"line": 221,
|
|
6633
6654
|
"character": 18
|
|
6634
6655
|
},
|
|
6635
6656
|
"types": [
|
|
@@ -6637,7 +6658,7 @@
|
|
|
6637
6658
|
"__schema": "TypeRefSchema",
|
|
6638
6659
|
"location": {
|
|
6639
6660
|
"filePath": "merging.main.runtime.ts",
|
|
6640
|
-
"line":
|
|
6661
|
+
"line": 221,
|
|
6641
6662
|
"character": 18
|
|
6642
6663
|
},
|
|
6643
6664
|
"name": "Lane"
|
|
@@ -6646,7 +6667,7 @@
|
|
|
6646
6667
|
"__schema": "LiteralTypeSchema",
|
|
6647
6668
|
"location": {
|
|
6648
6669
|
"filePath": "merging.main.runtime.ts",
|
|
6649
|
-
"line":
|
|
6670
|
+
"line": 221,
|
|
6650
6671
|
"character": 25
|
|
6651
6672
|
},
|
|
6652
6673
|
"name": "null"
|
|
@@ -6659,7 +6680,7 @@
|
|
|
6659
6680
|
"__schema": "VariableLikeSchema",
|
|
6660
6681
|
"location": {
|
|
6661
6682
|
"filePath": "merging.main.runtime.ts",
|
|
6662
|
-
"line":
|
|
6683
|
+
"line": 222,
|
|
6663
6684
|
"character": 5
|
|
6664
6685
|
},
|
|
6665
6686
|
"signature": "(property) noSnap: boolean",
|
|
@@ -6668,7 +6689,7 @@
|
|
|
6668
6689
|
"__schema": "KeywordTypeSchema",
|
|
6669
6690
|
"location": {
|
|
6670
6691
|
"filePath": "merging.main.runtime.ts",
|
|
6671
|
-
"line":
|
|
6692
|
+
"line": 222,
|
|
6672
6693
|
"character": 13
|
|
6673
6694
|
},
|
|
6674
6695
|
"name": "boolean"
|
|
@@ -6679,7 +6700,7 @@
|
|
|
6679
6700
|
"__schema": "VariableLikeSchema",
|
|
6680
6701
|
"location": {
|
|
6681
6702
|
"filePath": "merging.main.runtime.ts",
|
|
6682
|
-
"line":
|
|
6703
|
+
"line": 223,
|
|
6683
6704
|
"character": 5
|
|
6684
6705
|
},
|
|
6685
6706
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -6688,7 +6709,7 @@
|
|
|
6688
6709
|
"__schema": "KeywordTypeSchema",
|
|
6689
6710
|
"location": {
|
|
6690
6711
|
"filePath": "merging.main.runtime.ts",
|
|
6691
|
-
"line":
|
|
6712
|
+
"line": 223,
|
|
6692
6713
|
"character": 11
|
|
6693
6714
|
},
|
|
6694
6715
|
"name": "boolean"
|
|
@@ -6699,7 +6720,7 @@
|
|
|
6699
6720
|
"__schema": "VariableLikeSchema",
|
|
6700
6721
|
"location": {
|
|
6701
6722
|
"filePath": "merging.main.runtime.ts",
|
|
6702
|
-
"line":
|
|
6723
|
+
"line": 224,
|
|
6703
6724
|
"character": 5
|
|
6704
6725
|
},
|
|
6705
6726
|
"signature": "(property) snapMessage: string",
|
|
@@ -6708,7 +6729,7 @@
|
|
|
6708
6729
|
"__schema": "KeywordTypeSchema",
|
|
6709
6730
|
"location": {
|
|
6710
6731
|
"filePath": "merging.main.runtime.ts",
|
|
6711
|
-
"line":
|
|
6732
|
+
"line": 224,
|
|
6712
6733
|
"character": 18
|
|
6713
6734
|
},
|
|
6714
6735
|
"name": "string"
|
|
@@ -6719,7 +6740,7 @@
|
|
|
6719
6740
|
"__schema": "VariableLikeSchema",
|
|
6720
6741
|
"location": {
|
|
6721
6742
|
"filePath": "merging.main.runtime.ts",
|
|
6722
|
-
"line":
|
|
6743
|
+
"line": 225,
|
|
6723
6744
|
"character": 5
|
|
6724
6745
|
},
|
|
6725
6746
|
"signature": "(property) build: boolean",
|
|
@@ -6728,7 +6749,7 @@
|
|
|
6728
6749
|
"__schema": "KeywordTypeSchema",
|
|
6729
6750
|
"location": {
|
|
6730
6751
|
"filePath": "merging.main.runtime.ts",
|
|
6731
|
-
"line":
|
|
6752
|
+
"line": 225,
|
|
6732
6753
|
"character": 12
|
|
6733
6754
|
},
|
|
6734
6755
|
"name": "boolean"
|
|
@@ -6739,7 +6760,7 @@
|
|
|
6739
6760
|
"__schema": "VariableLikeSchema",
|
|
6740
6761
|
"location": {
|
|
6741
6762
|
"filePath": "merging.main.runtime.ts",
|
|
6742
|
-
"line":
|
|
6763
|
+
"line": 226,
|
|
6743
6764
|
"character": 5
|
|
6744
6765
|
},
|
|
6745
6766
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -6748,7 +6769,7 @@
|
|
|
6748
6769
|
"__schema": "KeywordTypeSchema",
|
|
6749
6770
|
"location": {
|
|
6750
6771
|
"filePath": "merging.main.runtime.ts",
|
|
6751
|
-
"line":
|
|
6772
|
+
"line": 226,
|
|
6752
6773
|
"character": 34
|
|
6753
6774
|
},
|
|
6754
6775
|
"name": "boolean"
|
|
@@ -6763,7 +6784,7 @@
|
|
|
6763
6784
|
"__schema": "TypeRefSchema",
|
|
6764
6785
|
"location": {
|
|
6765
6786
|
"filePath": "merging.main.runtime.ts",
|
|
6766
|
-
"line":
|
|
6787
|
+
"line": 227,
|
|
6767
6788
|
"character": 7
|
|
6768
6789
|
},
|
|
6769
6790
|
"name": "Promise",
|
|
@@ -6772,7 +6793,7 @@
|
|
|
6772
6793
|
"__schema": "TypeRefSchema",
|
|
6773
6794
|
"location": {
|
|
6774
6795
|
"filePath": "merging.main.runtime.ts",
|
|
6775
|
-
"line":
|
|
6796
|
+
"line": 227,
|
|
6776
6797
|
"character": 15
|
|
6777
6798
|
},
|
|
6778
6799
|
"name": "ApplyVersionResults"
|
|
@@ -6787,14 +6808,14 @@
|
|
|
6787
6808
|
"__schema": "FunctionLikeSchema",
|
|
6788
6809
|
"location": {
|
|
6789
6810
|
"filePath": "merging.main.runtime.ts",
|
|
6790
|
-
"line":
|
|
6811
|
+
"line": 347,
|
|
6791
6812
|
"character": 3
|
|
6792
6813
|
},
|
|
6793
6814
|
"doc": {
|
|
6794
6815
|
"__schema": "DocSchema",
|
|
6795
6816
|
"location": {
|
|
6796
6817
|
"filePath": "merging.main.runtime.ts",
|
|
6797
|
-
"line":
|
|
6818
|
+
"line": 341,
|
|
6798
6819
|
"character": 3
|
|
6799
6820
|
},
|
|
6800
6821
|
"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 */",
|
|
@@ -6807,7 +6828,7 @@
|
|
|
6807
6828
|
"__schema": "ParameterSchema",
|
|
6808
6829
|
"location": {
|
|
6809
6830
|
"filePath": "merging.main.runtime.ts",
|
|
6810
|
-
"line":
|
|
6831
|
+
"line": 348,
|
|
6811
6832
|
"character": 5
|
|
6812
6833
|
},
|
|
6813
6834
|
"name": "bitIds",
|
|
@@ -6815,14 +6836,14 @@
|
|
|
6815
6836
|
"__schema": "TypeArraySchema",
|
|
6816
6837
|
"location": {
|
|
6817
6838
|
"filePath": "merging.main.runtime.ts",
|
|
6818
|
-
"line":
|
|
6839
|
+
"line": 348,
|
|
6819
6840
|
"character": 13
|
|
6820
6841
|
},
|
|
6821
6842
|
"type": {
|
|
6822
6843
|
"__schema": "TypeRefSchema",
|
|
6823
6844
|
"location": {
|
|
6824
6845
|
"filePath": "merging.main.runtime.ts",
|
|
6825
|
-
"line":
|
|
6846
|
+
"line": 348,
|
|
6826
6847
|
"character": 13
|
|
6827
6848
|
},
|
|
6828
6849
|
"name": "ComponentID"
|
|
@@ -6835,7 +6856,7 @@
|
|
|
6835
6856
|
"__schema": "ParameterSchema",
|
|
6836
6857
|
"location": {
|
|
6837
6858
|
"filePath": "merging.main.runtime.ts",
|
|
6838
|
-
"line":
|
|
6859
|
+
"line": 349,
|
|
6839
6860
|
"character": 5
|
|
6840
6861
|
},
|
|
6841
6862
|
"name": "options",
|
|
@@ -6843,7 +6864,7 @@
|
|
|
6843
6864
|
"__schema": "TypeRefSchema",
|
|
6844
6865
|
"location": {
|
|
6845
6866
|
"filePath": "merging.main.runtime.ts",
|
|
6846
|
-
"line":
|
|
6867
|
+
"line": 349,
|
|
6847
6868
|
"character": 14
|
|
6848
6869
|
},
|
|
6849
6870
|
"name": "MergeStatusProviderOptions"
|
|
@@ -6855,7 +6876,7 @@
|
|
|
6855
6876
|
"__schema": "ParameterSchema",
|
|
6856
6877
|
"location": {
|
|
6857
6878
|
"filePath": "merging.main.runtime.ts",
|
|
6858
|
-
"line":
|
|
6879
|
+
"line": 350,
|
|
6859
6880
|
"character": 5
|
|
6860
6881
|
},
|
|
6861
6882
|
"name": "currentLane",
|
|
@@ -6863,7 +6884,7 @@
|
|
|
6863
6884
|
"__schema": "TypeUnionSchema",
|
|
6864
6885
|
"location": {
|
|
6865
6886
|
"filePath": "merging.main.runtime.ts",
|
|
6866
|
-
"line":
|
|
6887
|
+
"line": 350,
|
|
6867
6888
|
"character": 18
|
|
6868
6889
|
},
|
|
6869
6890
|
"types": [
|
|
@@ -6871,7 +6892,7 @@
|
|
|
6871
6892
|
"__schema": "TypeRefSchema",
|
|
6872
6893
|
"location": {
|
|
6873
6894
|
"filePath": "merging.main.runtime.ts",
|
|
6874
|
-
"line":
|
|
6895
|
+
"line": 350,
|
|
6875
6896
|
"character": 18
|
|
6876
6897
|
},
|
|
6877
6898
|
"name": "Lane"
|
|
@@ -6880,7 +6901,7 @@
|
|
|
6880
6901
|
"__schema": "LiteralTypeSchema",
|
|
6881
6902
|
"location": {
|
|
6882
6903
|
"filePath": "merging.main.runtime.ts",
|
|
6883
|
-
"line":
|
|
6904
|
+
"line": 350,
|
|
6884
6905
|
"character": 25
|
|
6885
6906
|
},
|
|
6886
6907
|
"name": "null"
|
|
@@ -6894,7 +6915,7 @@
|
|
|
6894
6915
|
"__schema": "ParameterSchema",
|
|
6895
6916
|
"location": {
|
|
6896
6917
|
"filePath": "merging.main.runtime.ts",
|
|
6897
|
-
"line":
|
|
6918
|
+
"line": 351,
|
|
6898
6919
|
"character": 5
|
|
6899
6920
|
},
|
|
6900
6921
|
"name": "otherLane",
|
|
@@ -6902,7 +6923,7 @@
|
|
|
6902
6923
|
"__schema": "TypeUnionSchema",
|
|
6903
6924
|
"location": {
|
|
6904
6925
|
"filePath": "merging.main.runtime.ts",
|
|
6905
|
-
"line":
|
|
6926
|
+
"line": 351,
|
|
6906
6927
|
"character": 17
|
|
6907
6928
|
},
|
|
6908
6929
|
"types": [
|
|
@@ -6910,7 +6931,7 @@
|
|
|
6910
6931
|
"__schema": "TypeRefSchema",
|
|
6911
6932
|
"location": {
|
|
6912
6933
|
"filePath": "merging.main.runtime.ts",
|
|
6913
|
-
"line":
|
|
6934
|
+
"line": 351,
|
|
6914
6935
|
"character": 17
|
|
6915
6936
|
},
|
|
6916
6937
|
"name": "Lane"
|
|
@@ -6919,7 +6940,7 @@
|
|
|
6919
6940
|
"__schema": "LiteralTypeSchema",
|
|
6920
6941
|
"location": {
|
|
6921
6942
|
"filePath": "merging.main.runtime.ts",
|
|
6922
|
-
"line":
|
|
6943
|
+
"line": 351,
|
|
6923
6944
|
"character": 24
|
|
6924
6945
|
},
|
|
6925
6946
|
"name": "null"
|
|
@@ -6934,7 +6955,7 @@
|
|
|
6934
6955
|
"__schema": "TypeRefSchema",
|
|
6935
6956
|
"location": {
|
|
6936
6957
|
"filePath": "merging.main.runtime.ts",
|
|
6937
|
-
"line":
|
|
6958
|
+
"line": 352,
|
|
6938
6959
|
"character": 6
|
|
6939
6960
|
},
|
|
6940
6961
|
"name": "Promise",
|
|
@@ -6943,14 +6964,14 @@
|
|
|
6943
6964
|
"__schema": "TypeArraySchema",
|
|
6944
6965
|
"location": {
|
|
6945
6966
|
"filePath": "merging.main.runtime.ts",
|
|
6946
|
-
"line":
|
|
6967
|
+
"line": 352,
|
|
6947
6968
|
"character": 14
|
|
6948
6969
|
},
|
|
6949
6970
|
"type": {
|
|
6950
6971
|
"__schema": "TypeRefSchema",
|
|
6951
6972
|
"location": {
|
|
6952
6973
|
"filePath": "merging.main.runtime.ts",
|
|
6953
|
-
"line":
|
|
6974
|
+
"line": 352,
|
|
6954
6975
|
"character": 14
|
|
6955
6976
|
},
|
|
6956
6977
|
"name": "ComponentMergeStatus"
|
|
@@ -6966,7 +6987,7 @@
|
|
|
6966
6987
|
"__schema": "VariableLikeSchema",
|
|
6967
6988
|
"location": {
|
|
6968
6989
|
"filePath": "merging.main.runtime.ts",
|
|
6969
|
-
"line":
|
|
6990
|
+
"line": 649,
|
|
6970
6991
|
"character": 3
|
|
6971
6992
|
},
|
|
6972
6993
|
"signature": "(property) MergingMain.slots: never[]",
|
|
@@ -6975,7 +6996,7 @@
|
|
|
6975
6996
|
"__schema": "InferenceTypeSchema",
|
|
6976
6997
|
"location": {
|
|
6977
6998
|
"filePath": "merging.main.runtime.ts",
|
|
6978
|
-
"line":
|
|
6999
|
+
"line": 649,
|
|
6979
7000
|
"character": 3
|
|
6980
7001
|
},
|
|
6981
7002
|
"type": "never[]"
|
|
@@ -6987,7 +7008,7 @@
|
|
|
6987
7008
|
"__schema": "VariableLikeSchema",
|
|
6988
7009
|
"location": {
|
|
6989
7010
|
"filePath": "merging.main.runtime.ts",
|
|
6990
|
-
"line":
|
|
7011
|
+
"line": 650,
|
|
6991
7012
|
"character": 3
|
|
6992
7013
|
},
|
|
6993
7014
|
"signature": "(property) MergingMain.dependencies: Aspect[]",
|
|
@@ -6996,19 +7017,19 @@
|
|
|
6996
7017
|
"__schema": "InferenceTypeSchema",
|
|
6997
7018
|
"location": {
|
|
6998
7019
|
"filePath": "merging.main.runtime.ts",
|
|
6999
|
-
"line":
|
|
7020
|
+
"line": 650,
|
|
7000
7021
|
"character": 3
|
|
7001
7022
|
},
|
|
7002
7023
|
"type": "Aspect[]"
|
|
7003
7024
|
},
|
|
7004
7025
|
"isOptional": true,
|
|
7005
|
-
"defaultValue": "[\n CLIAspect,\n WorkspaceAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n ]"
|
|
7026
|
+
"defaultValue": "[\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n ]"
|
|
7006
7027
|
},
|
|
7007
7028
|
{
|
|
7008
7029
|
"__schema": "VariableLikeSchema",
|
|
7009
7030
|
"location": {
|
|
7010
7031
|
"filePath": "merging.main.runtime.ts",
|
|
7011
|
-
"line":
|
|
7032
|
+
"line": 665,
|
|
7012
7033
|
"character": 3
|
|
7013
7034
|
},
|
|
7014
7035
|
"signature": "(property) MergingMain.runtime: RuntimeDefinition",
|
|
@@ -7017,7 +7038,7 @@
|
|
|
7017
7038
|
"__schema": "InferenceTypeSchema",
|
|
7018
7039
|
"location": {
|
|
7019
7040
|
"filePath": "merging.main.runtime.ts",
|
|
7020
|
-
"line":
|
|
7041
|
+
"line": 665,
|
|
7021
7042
|
"character": 3
|
|
7022
7043
|
},
|
|
7023
7044
|
"type": "RuntimeDefinition"
|
|
@@ -7029,25 +7050,25 @@
|
|
|
7029
7050
|
"__schema": "FunctionLikeSchema",
|
|
7030
7051
|
"location": {
|
|
7031
7052
|
"filePath": "merging.main.runtime.ts",
|
|
7032
|
-
"line":
|
|
7053
|
+
"line": 666,
|
|
7033
7054
|
"character": 3
|
|
7034
7055
|
},
|
|
7035
|
-
"signature": "(method) MergingMain.provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain\n]): Promise<MergingMain>",
|
|
7056
|
+
"signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [\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]): Promise<MergingMain>",
|
|
7036
7057
|
"name": "provider",
|
|
7037
7058
|
"params": [
|
|
7038
7059
|
{
|
|
7039
7060
|
"__schema": "ParameterSchema",
|
|
7040
7061
|
"location": {
|
|
7041
7062
|
"filePath": "merging.main.runtime.ts",
|
|
7042
|
-
"line":
|
|
7063
|
+
"line": 666,
|
|
7043
7064
|
"character": 25
|
|
7044
7065
|
},
|
|
7045
|
-
"name": "[ cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
|
|
7066
|
+
"name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
|
|
7046
7067
|
"type": {
|
|
7047
7068
|
"__schema": "TupleTypeSchema",
|
|
7048
7069
|
"location": {
|
|
7049
7070
|
"filePath": "merging.main.runtime.ts",
|
|
7050
|
-
"line":
|
|
7071
|
+
"line": 680,
|
|
7051
7072
|
"character": 6
|
|
7052
7073
|
},
|
|
7053
7074
|
"elements": [
|
|
@@ -7055,7 +7076,7 @@
|
|
|
7055
7076
|
"__schema": "TypeRefSchema",
|
|
7056
7077
|
"location": {
|
|
7057
7078
|
"filePath": "merging.main.runtime.ts",
|
|
7058
|
-
"line":
|
|
7079
|
+
"line": 681,
|
|
7059
7080
|
"character": 5
|
|
7060
7081
|
},
|
|
7061
7082
|
"name": "CLIMain"
|
|
@@ -7064,7 +7085,7 @@
|
|
|
7064
7085
|
"__schema": "TypeRefSchema",
|
|
7065
7086
|
"location": {
|
|
7066
7087
|
"filePath": "merging.main.runtime.ts",
|
|
7067
|
-
"line":
|
|
7088
|
+
"line": 682,
|
|
7068
7089
|
"character": 5
|
|
7069
7090
|
},
|
|
7070
7091
|
"name": "Workspace"
|
|
@@ -7073,7 +7094,16 @@
|
|
|
7073
7094
|
"__schema": "TypeRefSchema",
|
|
7074
7095
|
"location": {
|
|
7075
7096
|
"filePath": "merging.main.runtime.ts",
|
|
7076
|
-
"line":
|
|
7097
|
+
"line": 683,
|
|
7098
|
+
"character": 5
|
|
7099
|
+
},
|
|
7100
|
+
"name": "ScopeMain"
|
|
7101
|
+
},
|
|
7102
|
+
{
|
|
7103
|
+
"__schema": "TypeRefSchema",
|
|
7104
|
+
"location": {
|
|
7105
|
+
"filePath": "merging.main.runtime.ts",
|
|
7106
|
+
"line": 684,
|
|
7077
7107
|
"character": 5
|
|
7078
7108
|
},
|
|
7079
7109
|
"name": "SnappingMain"
|
|
@@ -7082,7 +7112,7 @@
|
|
|
7082
7112
|
"__schema": "TypeRefSchema",
|
|
7083
7113
|
"location": {
|
|
7084
7114
|
"filePath": "merging.main.runtime.ts",
|
|
7085
|
-
"line":
|
|
7115
|
+
"line": 685,
|
|
7086
7116
|
"character": 5
|
|
7087
7117
|
},
|
|
7088
7118
|
"name": "CheckoutMain"
|
|
@@ -7091,7 +7121,7 @@
|
|
|
7091
7121
|
"__schema": "TypeRefSchema",
|
|
7092
7122
|
"location": {
|
|
7093
7123
|
"filePath": "merging.main.runtime.ts",
|
|
7094
|
-
"line":
|
|
7124
|
+
"line": 686,
|
|
7095
7125
|
"character": 5
|
|
7096
7126
|
},
|
|
7097
7127
|
"name": "InstallMain"
|
|
@@ -7100,7 +7130,7 @@
|
|
|
7100
7130
|
"__schema": "TypeRefSchema",
|
|
7101
7131
|
"location": {
|
|
7102
7132
|
"filePath": "merging.main.runtime.ts",
|
|
7103
|
-
"line":
|
|
7133
|
+
"line": 687,
|
|
7104
7134
|
"character": 5
|
|
7105
7135
|
},
|
|
7106
7136
|
"name": "LoggerMain"
|
|
@@ -7109,7 +7139,7 @@
|
|
|
7109
7139
|
"__schema": "TypeRefSchema",
|
|
7110
7140
|
"location": {
|
|
7111
7141
|
"filePath": "merging.main.runtime.ts",
|
|
7112
|
-
"line":
|
|
7142
|
+
"line": 688,
|
|
7113
7143
|
"character": 5
|
|
7114
7144
|
},
|
|
7115
7145
|
"name": "ComponentWriterMain"
|
|
@@ -7118,7 +7148,7 @@
|
|
|
7118
7148
|
"__schema": "TypeRefSchema",
|
|
7119
7149
|
"location": {
|
|
7120
7150
|
"filePath": "merging.main.runtime.ts",
|
|
7121
|
-
"line":
|
|
7151
|
+
"line": 689,
|
|
7122
7152
|
"character": 5
|
|
7123
7153
|
},
|
|
7124
7154
|
"name": "ImporterMain"
|
|
@@ -7127,7 +7157,7 @@
|
|
|
7127
7157
|
"__schema": "TypeRefSchema",
|
|
7128
7158
|
"location": {
|
|
7129
7159
|
"filePath": "merging.main.runtime.ts",
|
|
7130
|
-
"line":
|
|
7160
|
+
"line": 690,
|
|
7131
7161
|
"character": 5
|
|
7132
7162
|
},
|
|
7133
7163
|
"name": "ConfigMain"
|
|
@@ -7136,7 +7166,7 @@
|
|
|
7136
7166
|
"__schema": "TypeRefSchema",
|
|
7137
7167
|
"location": {
|
|
7138
7168
|
"filePath": "merging.main.runtime.ts",
|
|
7139
|
-
"line":
|
|
7169
|
+
"line": 691,
|
|
7140
7170
|
"character": 5
|
|
7141
7171
|
},
|
|
7142
7172
|
"name": "RemoveMain"
|
|
@@ -7145,7 +7175,7 @@
|
|
|
7145
7175
|
"__schema": "TypeRefSchema",
|
|
7146
7176
|
"location": {
|
|
7147
7177
|
"filePath": "merging.main.runtime.ts",
|
|
7148
|
-
"line":
|
|
7178
|
+
"line": 692,
|
|
7149
7179
|
"character": 5
|
|
7150
7180
|
},
|
|
7151
7181
|
"name": "GlobalConfigMain"
|
|
@@ -7154,7 +7184,7 @@
|
|
|
7154
7184
|
"__schema": "TypeRefSchema",
|
|
7155
7185
|
"location": {
|
|
7156
7186
|
"filePath": "merging.main.runtime.ts",
|
|
7157
|
-
"line":
|
|
7187
|
+
"line": 693,
|
|
7158
7188
|
"character": 5
|
|
7159
7189
|
},
|
|
7160
7190
|
"name": "ConfigMergerMain"
|
|
@@ -7169,7 +7199,7 @@
|
|
|
7169
7199
|
"__schema": "InferenceTypeSchema",
|
|
7170
7200
|
"location": {
|
|
7171
7201
|
"filePath": "merging.main.runtime.ts",
|
|
7172
|
-
"line":
|
|
7202
|
+
"line": 666,
|
|
7173
7203
|
"character": 3
|
|
7174
7204
|
},
|
|
7175
7205
|
"type": "Promise<MergingMain>"
|
|
@@ -7189,7 +7219,7 @@
|
|
|
7189
7219
|
"__schema": "TypeSchema",
|
|
7190
7220
|
"location": {
|
|
7191
7221
|
"filePath": "merging.main.runtime.ts",
|
|
7192
|
-
"line":
|
|
7222
|
+
"line": 55,
|
|
7193
7223
|
"character": 1
|
|
7194
7224
|
},
|
|
7195
7225
|
"signature": "type ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n}",
|
|
@@ -7198,7 +7228,7 @@
|
|
|
7198
7228
|
"__schema": "TypeLiteralSchema",
|
|
7199
7229
|
"location": {
|
|
7200
7230
|
"filePath": "merging.main.runtime.ts",
|
|
7201
|
-
"line":
|
|
7231
|
+
"line": 55,
|
|
7202
7232
|
"character": 29
|
|
7203
7233
|
},
|
|
7204
7234
|
"members": [
|
|
@@ -7206,16 +7236,16 @@
|
|
|
7206
7236
|
"__schema": "VariableLikeSchema",
|
|
7207
7237
|
"location": {
|
|
7208
7238
|
"filePath": "merging.main.runtime.ts",
|
|
7209
|
-
"line":
|
|
7239
|
+
"line": 56,
|
|
7210
7240
|
"character": 3
|
|
7211
7241
|
},
|
|
7212
|
-
"signature": "(property) strategy: \"
|
|
7242
|
+
"signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
|
|
7213
7243
|
"name": "strategy",
|
|
7214
7244
|
"type": {
|
|
7215
7245
|
"__schema": "TypeRefSchema",
|
|
7216
7246
|
"location": {
|
|
7217
7247
|
"filePath": "merging.main.runtime.ts",
|
|
7218
|
-
"line":
|
|
7248
|
+
"line": 56,
|
|
7219
7249
|
"character": 13
|
|
7220
7250
|
},
|
|
7221
7251
|
"name": "MergeStrategy"
|
|
@@ -7226,7 +7256,7 @@
|
|
|
7226
7256
|
"__schema": "VariableLikeSchema",
|
|
7227
7257
|
"location": {
|
|
7228
7258
|
"filePath": "merging.main.runtime.ts",
|
|
7229
|
-
"line":
|
|
7259
|
+
"line": 57,
|
|
7230
7260
|
"character": 3
|
|
7231
7261
|
},
|
|
7232
7262
|
"signature": "(property) headOnCurrentLane: Ref",
|
|
@@ -7235,7 +7265,7 @@
|
|
|
7235
7265
|
"__schema": "TypeRefSchema",
|
|
7236
7266
|
"location": {
|
|
7237
7267
|
"filePath": "merging.main.runtime.ts",
|
|
7238
|
-
"line":
|
|
7268
|
+
"line": 57,
|
|
7239
7269
|
"character": 3
|
|
7240
7270
|
},
|
|
7241
7271
|
"name": "Ref",
|
|
@@ -7247,7 +7277,7 @@
|
|
|
7247
7277
|
"__schema": "VariableLikeSchema",
|
|
7248
7278
|
"location": {
|
|
7249
7279
|
"filePath": "merging.main.runtime.ts",
|
|
7250
|
-
"line":
|
|
7280
|
+
"line": 58,
|
|
7251
7281
|
"character": 3
|
|
7252
7282
|
},
|
|
7253
7283
|
"signature": "(property) unrelatedHead: Ref",
|
|
@@ -7256,7 +7286,7 @@
|
|
|
7256
7286
|
"__schema": "TypeRefSchema",
|
|
7257
7287
|
"location": {
|
|
7258
7288
|
"filePath": "merging.main.runtime.ts",
|
|
7259
|
-
"line":
|
|
7289
|
+
"line": 58,
|
|
7260
7290
|
"character": 3
|
|
7261
7291
|
},
|
|
7262
7292
|
"name": "Ref",
|
|
@@ -7268,7 +7298,7 @@
|
|
|
7268
7298
|
"__schema": "VariableLikeSchema",
|
|
7269
7299
|
"location": {
|
|
7270
7300
|
"filePath": "merging.main.runtime.ts",
|
|
7271
|
-
"line":
|
|
7301
|
+
"line": 59,
|
|
7272
7302
|
"character": 3
|
|
7273
7303
|
},
|
|
7274
7304
|
"signature": "(property) unrelatedLaneId: LaneId",
|
|
@@ -7277,7 +7307,7 @@
|
|
|
7277
7307
|
"__schema": "TypeRefSchema",
|
|
7278
7308
|
"location": {
|
|
7279
7309
|
"filePath": "merging.main.runtime.ts",
|
|
7280
|
-
"line":
|
|
7310
|
+
"line": 59,
|
|
7281
7311
|
"character": 3
|
|
7282
7312
|
},
|
|
7283
7313
|
"name": "LaneId",
|
|
@@ -7296,7 +7326,7 @@
|
|
|
7296
7326
|
"__schema": "UnImplementedSchema",
|
|
7297
7327
|
"location": {
|
|
7298
7328
|
"filePath": "merging.main.runtime.ts",
|
|
7299
|
-
"line":
|
|
7329
|
+
"line": 714,
|
|
7300
7330
|
"character": 1
|
|
7301
7331
|
},
|
|
7302
7332
|
"name": "MergingAspect.addRuntime(MergingMain);",
|
|
@@ -7345,7 +7375,7 @@
|
|
|
7345
7375
|
"componentId": {
|
|
7346
7376
|
"scope": "teambit.component",
|
|
7347
7377
|
"name": "merging",
|
|
7348
|
-
"version": "1.0.
|
|
7378
|
+
"version": "1.0.162"
|
|
7349
7379
|
},
|
|
7350
7380
|
"taggedModuleExports": []
|
|
7351
7381
|
}
|