ace-linters 1.0.3 → 1.1.0
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/build/ace-language-client.js +9 -1
- package/build/ace-linters.js +9 -1
- package/build/base-service.js +9 -1
- package/build/css-service.js +9 -2
- package/build/html-service.js +9 -1
- package/build/javascript-service.js +9 -1
- package/build/json-service.js +9 -1
- package/build/language-client.js +19 -3
- package/build/lua-service.js +9 -1
- package/build/php-service.js +9 -1
- package/build/python-service.js +9 -1
- package/build/service-manager.js +9 -1
- package/build/typescript-service.js +57652 -40474
- package/build/xml-service.js +9 -1
- package/build/yaml-service.js +9 -1
- package/package.json +3 -2
- package/types/ace/hover-tooltip.d.ts +25 -25
- package/types/ace/marker_group.d.ts +26 -26
- package/types/ace/popupManager.d.ts +8 -8
- package/types/ace/range-singleton.d.ts +4 -4
- package/types/ace/tooltip.d.ts +48 -48
- package/types/ace-language-client.d.ts +10 -10
- package/types/cdn-worker.d.ts +10 -10
- package/types/components/base-tooltip.d.ts +28 -28
- package/types/components/signature-tooltip.d.ts +8 -8
- package/types/index.d.ts +2 -2
- package/types/language-provider.d.ts +52 -52
- package/types/message-controller.d.ts +27 -27
- package/types/message-types.d.ts +119 -119
- package/types/misc/mock-worker.d.ts +16 -16
- package/types/services/base-service.d.ts +35 -35
- package/types/services/css/css-service.d.ts +33 -33
- package/types/services/html/html-converters.d.ts +3 -3
- package/types/services/html/html-service.d.ts +47 -47
- package/types/services/javascript/eslint-converters.d.ts +4 -4
- package/types/services/javascript/javascript-service.d.ts +127 -79
- package/types/services/json/json-service.d.ts +35 -35
- package/types/services/language-client.d.ts +34 -34
- package/types/services/lua/lua-service.d.ts +14 -14
- package/types/services/php/php-service.d.ts +14 -14
- package/types/services/python/python-converters.d.ts +11 -11
- package/types/services/python/python-service.d.ts +16 -16
- package/types/services/service-manager.d.ts +34 -34
- package/types/services/typescript/lib/lib.d.ts +2 -2
- package/types/services/typescript/lib/typescriptServices.d.ts +5266 -669
- package/types/services/typescript/typescript-converters.d.ts +64 -64
- package/types/services/typescript/typescript-service.d.ts +67 -67
- package/types/services/xml/xml-converters.d.ts +6 -6
- package/types/services/xml/xml-service.d.ts +22 -22
- package/types/services/yaml/yaml-service.d.ts +34 -34
- package/types/type-converters/common-converters.d.ts +13 -13
- package/types/type-converters/lsp-converters.d.ts +25 -25
- package/types/types/converters.d.ts +3 -3
- package/types/types/language-service.d.ts +232 -232
- package/types/types/message-controller-interface.d.ts +21 -21
- package/types/utils.d.ts +4 -4
- package/types/services/typescript/lib/lib.index.d.ts +0 -2
- package/types/services/typescript/lib/typescriptServicesMetadata.d.ts +0 -1
|
@@ -10052,9 +10052,13 @@ class ServiceManager {
|
|
|
10052
10052
|
/* harmony export */ PM: () => (/* binding */ mergeObjects),
|
|
10053
10053
|
/* harmony export */ lr: () => (/* binding */ mergeRanges)
|
|
10054
10054
|
/* harmony export */ });
|
|
10055
|
-
function mergeObjects(obj1, obj2) {
|
|
10055
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
10056
10056
|
if (!obj1) return obj2;
|
|
10057
10057
|
if (!obj2) return obj1;
|
|
10058
|
+
if (excludeUndefined) {
|
|
10059
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
10060
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
10061
|
+
}
|
|
10058
10062
|
const mergedObjects = {
|
|
10059
10063
|
...obj2,
|
|
10060
10064
|
...obj1
|
|
@@ -10072,6 +10076,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
10072
10076
|
}
|
|
10073
10077
|
return mergedObjects;
|
|
10074
10078
|
}
|
|
10079
|
+
function excludeUndefinedValues(obj) {
|
|
10080
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
10081
|
+
return Object.fromEntries(filteredEntries);
|
|
10082
|
+
}
|
|
10075
10083
|
function notEmpty(value) {
|
|
10076
10084
|
return value !== null && value !== undefined;
|
|
10077
10085
|
}
|
package/build/ace-linters.js
CHANGED
|
@@ -18654,9 +18654,13 @@ __webpack_require__.d(__webpack_exports__, {
|
|
|
18654
18654
|
// EXTERNAL MODULE: ../../node_modules/vscode-languageserver-protocol/lib/browser/main.js
|
|
18655
18655
|
var main = __webpack_require__(294);
|
|
18656
18656
|
;// CONCATENATED MODULE: ./src/utils.ts
|
|
18657
|
-
function mergeObjects(obj1, obj2) {
|
|
18657
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
18658
18658
|
if (!obj1) return obj2;
|
|
18659
18659
|
if (!obj2) return obj1;
|
|
18660
|
+
if (excludeUndefined) {
|
|
18661
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
18662
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
18663
|
+
}
|
|
18660
18664
|
const mergedObjects = {
|
|
18661
18665
|
...obj2,
|
|
18662
18666
|
...obj1
|
|
@@ -18674,6 +18678,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
18674
18678
|
}
|
|
18675
18679
|
return mergedObjects;
|
|
18676
18680
|
}
|
|
18681
|
+
function excludeUndefinedValues(obj) {
|
|
18682
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
18683
|
+
return Object.fromEntries(filteredEntries);
|
|
18684
|
+
}
|
|
18677
18685
|
function notEmpty(value) {
|
|
18678
18686
|
return value !== null && value !== undefined;
|
|
18679
18687
|
}
|
package/build/base-service.js
CHANGED
|
@@ -19,9 +19,13 @@ return /******/ (() => { // webpackBootstrap
|
|
|
19
19
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
20
20
|
/* harmony export */ });
|
|
21
21
|
/* unused harmony exports notEmpty, mergeRanges, checkValueAgainstRegexpArray */
|
|
22
|
-
function mergeObjects(obj1, obj2) {
|
|
22
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
23
23
|
if (!obj1) return obj2;
|
|
24
24
|
if (!obj2) return obj1;
|
|
25
|
+
if (excludeUndefined) {
|
|
26
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
27
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
28
|
+
}
|
|
25
29
|
const mergedObjects = {
|
|
26
30
|
...obj2,
|
|
27
31
|
...obj1
|
|
@@ -39,6 +43,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
39
43
|
}
|
|
40
44
|
return mergedObjects;
|
|
41
45
|
}
|
|
46
|
+
function excludeUndefinedValues(obj) {
|
|
47
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
48
|
+
return Object.fromEntries(filteredEntries);
|
|
49
|
+
}
|
|
42
50
|
function notEmpty(value) {
|
|
43
51
|
return value !== null && value !== undefined;
|
|
44
52
|
}
|
package/build/css-service.js
CHANGED
|
@@ -3960,9 +3960,13 @@ class BaseService {
|
|
|
3960
3960
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
3961
3961
|
/* harmony export */ });
|
|
3962
3962
|
/* unused harmony exports notEmpty, mergeRanges */
|
|
3963
|
-
function mergeObjects(obj1, obj2) {
|
|
3963
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
3964
3964
|
if (!obj1) return obj2;
|
|
3965
3965
|
if (!obj2) return obj1;
|
|
3966
|
+
if (excludeUndefined) {
|
|
3967
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
3968
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
3969
|
+
}
|
|
3966
3970
|
const mergedObjects = {
|
|
3967
3971
|
...obj2,
|
|
3968
3972
|
...obj1
|
|
@@ -3980,6 +3984,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
3980
3984
|
}
|
|
3981
3985
|
return mergedObjects;
|
|
3982
3986
|
}
|
|
3987
|
+
function excludeUndefinedValues(obj) {
|
|
3988
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
3989
|
+
return Object.fromEntries(filteredEntries);
|
|
3990
|
+
}
|
|
3983
3991
|
function notEmpty(value) {
|
|
3984
3992
|
return value !== null && value !== undefined;
|
|
3985
3993
|
}
|
|
@@ -52691,7 +52699,6 @@ class CssService extends base_service.BaseService {
|
|
|
52691
52699
|
completionProvider: {
|
|
52692
52700
|
triggerCharacters: [
|
|
52693
52701
|
":",
|
|
52694
|
-
" ",
|
|
52695
52702
|
"-",
|
|
52696
52703
|
"/"
|
|
52697
52704
|
],
|
package/build/html-service.js
CHANGED
|
@@ -5788,9 +5788,13 @@ class BaseService {
|
|
|
5788
5788
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
5789
5789
|
/* harmony export */ });
|
|
5790
5790
|
/* unused harmony exports notEmpty, mergeRanges */
|
|
5791
|
-
function mergeObjects(obj1, obj2) {
|
|
5791
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
5792
5792
|
if (!obj1) return obj2;
|
|
5793
5793
|
if (!obj2) return obj1;
|
|
5794
|
+
if (excludeUndefined) {
|
|
5795
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
5796
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
5797
|
+
}
|
|
5794
5798
|
const mergedObjects = {
|
|
5795
5799
|
...obj2,
|
|
5796
5800
|
...obj1
|
|
@@ -5808,6 +5812,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
5808
5812
|
}
|
|
5809
5813
|
return mergedObjects;
|
|
5810
5814
|
}
|
|
5815
|
+
function excludeUndefinedValues(obj) {
|
|
5816
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
5817
|
+
return Object.fromEntries(filteredEntries);
|
|
5818
|
+
}
|
|
5811
5819
|
function notEmpty(value) {
|
|
5812
5820
|
return value !== null && value !== undefined;
|
|
5813
5821
|
}
|
|
@@ -3960,9 +3960,13 @@ class BaseService {
|
|
|
3960
3960
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
3961
3961
|
/* harmony export */ });
|
|
3962
3962
|
/* unused harmony exports notEmpty, mergeRanges */
|
|
3963
|
-
function mergeObjects(obj1, obj2) {
|
|
3963
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
3964
3964
|
if (!obj1) return obj2;
|
|
3965
3965
|
if (!obj2) return obj1;
|
|
3966
|
+
if (excludeUndefined) {
|
|
3967
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
3968
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
3969
|
+
}
|
|
3966
3970
|
const mergedObjects = {
|
|
3967
3971
|
...obj2,
|
|
3968
3972
|
...obj1
|
|
@@ -3980,6 +3984,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
3980
3984
|
}
|
|
3981
3985
|
return mergedObjects;
|
|
3982
3986
|
}
|
|
3987
|
+
function excludeUndefinedValues(obj) {
|
|
3988
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
3989
|
+
return Object.fromEntries(filteredEntries);
|
|
3990
|
+
}
|
|
3983
3991
|
function notEmpty(value) {
|
|
3984
3992
|
return value !== null && value !== undefined;
|
|
3985
3993
|
}
|
package/build/json-service.js
CHANGED
|
@@ -3960,9 +3960,13 @@ class BaseService {
|
|
|
3960
3960
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
3961
3961
|
/* harmony export */ });
|
|
3962
3962
|
/* unused harmony exports notEmpty, mergeRanges */
|
|
3963
|
-
function mergeObjects(obj1, obj2) {
|
|
3963
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
3964
3964
|
if (!obj1) return obj2;
|
|
3965
3965
|
if (!obj2) return obj1;
|
|
3966
|
+
if (excludeUndefined) {
|
|
3967
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
3968
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
3969
|
+
}
|
|
3966
3970
|
const mergedObjects = {
|
|
3967
3971
|
...obj2,
|
|
3968
3972
|
...obj1
|
|
@@ -3980,6 +3984,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
3980
3984
|
}
|
|
3981
3985
|
return mergedObjects;
|
|
3982
3986
|
}
|
|
3987
|
+
function excludeUndefinedValues(obj) {
|
|
3988
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
3989
|
+
return Object.fromEntries(filteredEntries);
|
|
3990
|
+
}
|
|
3983
3991
|
function notEmpty(value) {
|
|
3984
3992
|
return value !== null && value !== undefined;
|
|
3985
3993
|
}
|
package/build/language-client.js
CHANGED
|
@@ -3959,9 +3959,13 @@ class BaseService {
|
|
|
3959
3959
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
3960
3960
|
/* harmony export */ });
|
|
3961
3961
|
/* unused harmony exports notEmpty, mergeRanges, checkValueAgainstRegexpArray */
|
|
3962
|
-
function mergeObjects(obj1, obj2) {
|
|
3962
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
3963
3963
|
if (!obj1) return obj2;
|
|
3964
3964
|
if (!obj2) return obj1;
|
|
3965
|
+
if (excludeUndefined) {
|
|
3966
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
3967
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
3968
|
+
}
|
|
3965
3969
|
const mergedObjects = {
|
|
3966
3970
|
...obj2,
|
|
3967
3971
|
...obj1
|
|
@@ -3979,6 +3983,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
3979
3983
|
}
|
|
3980
3984
|
return mergedObjects;
|
|
3981
3985
|
}
|
|
3986
|
+
function excludeUndefinedValues(obj) {
|
|
3987
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
3988
|
+
return Object.fromEntries(filteredEntries);
|
|
3989
|
+
}
|
|
3982
3990
|
function notEmpty(value) {
|
|
3983
3991
|
return value !== null && value !== undefined;
|
|
3984
3992
|
}
|
|
@@ -17188,11 +17196,15 @@ class LanguageClient extends base_service.BaseService {
|
|
|
17188
17196
|
});
|
|
17189
17197
|
}
|
|
17190
17198
|
applyDeltas(identifier, deltas) {
|
|
17199
|
+
var _this_serviceCapabilities, _this_serviceCapabilities1;
|
|
17191
17200
|
super.applyDeltas(identifier, deltas);
|
|
17192
|
-
if (!this.isConnected) {
|
|
17201
|
+
if (!this.isConnected || !this.serviceCapabilities) {
|
|
17202
|
+
return;
|
|
17203
|
+
}
|
|
17204
|
+
if (((_this_serviceCapabilities = this.serviceCapabilities) === null || _this_serviceCapabilities === void 0 ? void 0 : _this_serviceCapabilities.textDocumentSync) === browser_main.TextDocumentSyncKind.None) {
|
|
17193
17205
|
return;
|
|
17194
17206
|
}
|
|
17195
|
-
if (
|
|
17207
|
+
if (((_this_serviceCapabilities1 = this.serviceCapabilities) === null || _this_serviceCapabilities1 === void 0 ? void 0 : _this_serviceCapabilities1.textDocumentSync) !== browser_main.TextDocumentSyncKind.Incremental) {
|
|
17196
17208
|
return this.setValue(identifier, this.getDocument(identifier.uri).getText());
|
|
17197
17209
|
}
|
|
17198
17210
|
const textDocumentChange = {
|
|
@@ -17205,10 +17217,14 @@ class LanguageClient extends base_service.BaseService {
|
|
|
17205
17217
|
this.connection.sendNotification('textDocument/didChange', textDocumentChange);
|
|
17206
17218
|
}
|
|
17207
17219
|
setValue(identifier, value) {
|
|
17220
|
+
var _this_serviceCapabilities;
|
|
17208
17221
|
super.setValue(identifier, value);
|
|
17209
17222
|
if (!this.isConnected) {
|
|
17210
17223
|
return;
|
|
17211
17224
|
}
|
|
17225
|
+
if (((_this_serviceCapabilities = this.serviceCapabilities) === null || _this_serviceCapabilities === void 0 ? void 0 : _this_serviceCapabilities.textDocumentSync) === browser_main.TextDocumentSyncKind.None) {
|
|
17226
|
+
return;
|
|
17227
|
+
}
|
|
17212
17228
|
const textDocumentChange = {
|
|
17213
17229
|
textDocument: {
|
|
17214
17230
|
uri: identifier.uri,
|
package/build/lua-service.js
CHANGED
|
@@ -6701,9 +6701,13 @@ class BaseService {
|
|
|
6701
6701
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
6702
6702
|
/* harmony export */ });
|
|
6703
6703
|
/* unused harmony exports notEmpty, mergeRanges */
|
|
6704
|
-
function mergeObjects(obj1, obj2) {
|
|
6704
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
6705
6705
|
if (!obj1) return obj2;
|
|
6706
6706
|
if (!obj2) return obj1;
|
|
6707
|
+
if (excludeUndefined) {
|
|
6708
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
6709
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
6710
|
+
}
|
|
6707
6711
|
const mergedObjects = {
|
|
6708
6712
|
...obj2,
|
|
6709
6713
|
...obj1
|
|
@@ -6721,6 +6725,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
6721
6725
|
}
|
|
6722
6726
|
return mergedObjects;
|
|
6723
6727
|
}
|
|
6728
|
+
function excludeUndefinedValues(obj) {
|
|
6729
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
6730
|
+
return Object.fromEntries(filteredEntries);
|
|
6731
|
+
}
|
|
6724
6732
|
function notEmpty(value) {
|
|
6725
6733
|
return value !== null && value !== undefined;
|
|
6726
6734
|
}
|
package/build/php-service.js
CHANGED
|
@@ -13036,9 +13036,13 @@ exports.t = PHP;
|
|
|
13036
13036
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
13037
13037
|
/* harmony export */ });
|
|
13038
13038
|
/* unused harmony exports notEmpty, mergeRanges */
|
|
13039
|
-
function mergeObjects(obj1, obj2) {
|
|
13039
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
13040
13040
|
if (!obj1) return obj2;
|
|
13041
13041
|
if (!obj2) return obj1;
|
|
13042
|
+
if (excludeUndefined) {
|
|
13043
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
13044
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
13045
|
+
}
|
|
13042
13046
|
const mergedObjects = {
|
|
13043
13047
|
...obj2,
|
|
13044
13048
|
...obj1
|
|
@@ -13056,6 +13060,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
13056
13060
|
}
|
|
13057
13061
|
return mergedObjects;
|
|
13058
13062
|
}
|
|
13063
|
+
function excludeUndefinedValues(obj) {
|
|
13064
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
13065
|
+
return Object.fromEntries(filteredEntries);
|
|
13066
|
+
}
|
|
13059
13067
|
function notEmpty(value) {
|
|
13060
13068
|
return value !== null && value !== undefined;
|
|
13061
13069
|
}
|
package/build/python-service.js
CHANGED
|
@@ -3959,9 +3959,13 @@ class BaseService {
|
|
|
3959
3959
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
3960
3960
|
/* harmony export */ });
|
|
3961
3961
|
/* unused harmony exports notEmpty, mergeRanges, checkValueAgainstRegexpArray */
|
|
3962
|
-
function mergeObjects(obj1, obj2) {
|
|
3962
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
3963
3963
|
if (!obj1) return obj2;
|
|
3964
3964
|
if (!obj2) return obj1;
|
|
3965
|
+
if (excludeUndefined) {
|
|
3966
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
3967
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
3968
|
+
}
|
|
3965
3969
|
const mergedObjects = {
|
|
3966
3970
|
...obj2,
|
|
3967
3971
|
...obj1
|
|
@@ -3979,6 +3983,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
3979
3983
|
}
|
|
3980
3984
|
return mergedObjects;
|
|
3981
3985
|
}
|
|
3986
|
+
function excludeUndefinedValues(obj) {
|
|
3987
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
3988
|
+
return Object.fromEntries(filteredEntries);
|
|
3989
|
+
}
|
|
3982
3990
|
function notEmpty(value) {
|
|
3983
3991
|
return value !== null && value !== undefined;
|
|
3984
3992
|
}
|
package/build/service-manager.js
CHANGED
|
@@ -211,9 +211,13 @@ var MessageType;
|
|
|
211
211
|
/* harmony export */ PM: () => (/* binding */ mergeObjects)
|
|
212
212
|
/* harmony export */ });
|
|
213
213
|
/* unused harmony exports mergeRanges, checkValueAgainstRegexpArray */
|
|
214
|
-
function mergeObjects(obj1, obj2) {
|
|
214
|
+
function mergeObjects(obj1, obj2, excludeUndefined = false) {
|
|
215
215
|
if (!obj1) return obj2;
|
|
216
216
|
if (!obj2) return obj1;
|
|
217
|
+
if (excludeUndefined) {
|
|
218
|
+
obj1 = excludeUndefinedValues(obj1);
|
|
219
|
+
obj2 = excludeUndefinedValues(obj2);
|
|
220
|
+
}
|
|
217
221
|
const mergedObjects = {
|
|
218
222
|
...obj2,
|
|
219
223
|
...obj1
|
|
@@ -231,6 +235,10 @@ function mergeObjects(obj1, obj2) {
|
|
|
231
235
|
}
|
|
232
236
|
return mergedObjects;
|
|
233
237
|
}
|
|
238
|
+
function excludeUndefinedValues(obj) {
|
|
239
|
+
const filteredEntries = Object.entries(obj).filter(([_, value])=>value !== undefined);
|
|
240
|
+
return Object.fromEntries(filteredEntries);
|
|
241
|
+
}
|
|
234
242
|
function notEmpty(value) {
|
|
235
243
|
return value !== null && value !== undefined;
|
|
236
244
|
}
|