jsf.js_next_gen 4.0.0-RC.5 → 4.0.0-RC.7
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/dist/window/faces-development.js +2036 -2717
- package/dist/window/faces-development.js.br +0 -0
- package/dist/window/faces-development.js.gz +0 -0
- package/dist/window/faces-development.js.map +1 -1
- package/dist/window/faces.js +1 -1
- package/dist/window/faces.js.br +0 -0
- package/dist/window/faces.js.gz +0 -0
- package/dist/window/faces.js.map +1 -1
- package/dist/window/jsf-development.js +2041 -2722
- package/dist/window/jsf-development.js.br +0 -0
- package/dist/window/jsf-development.js.gz +0 -0
- package/dist/window/jsf-development.js.map +1 -1
- package/dist/window/jsf.js +1 -1
- package/dist/window/jsf.js.br +0 -0
- package/dist/window/jsf.js.gz +0 -0
- package/dist/window/jsf.js.map +1 -1
- package/package.json +1 -1
- package/src/main/typescript/@types/definitions/index.d.ts +1 -1
- package/src/main/typescript/myfaces/OamSubmit.ts +5 -1
- package/src/main/typescript/test/xhrCore/OamSubmitTest.spec.ts +62 -2
- package/src/main/typescript/tsconfig.json +1 -1
- package/target/api/_api.js +11 -25
- package/target/api/_api.js.map +1 -1
- package/target/api/faces.js +4 -4
- package/target/api/faces.js.map +1 -1
- package/target/api/jsf.js +9 -9
- package/target/api/jsf.js.map +1 -1
- package/target/impl/AjaxImpl.js +55 -63
- package/target/impl/AjaxImpl.js.map +1 -1
- package/target/impl/PushImpl.js +45 -48
- package/target/impl/PushImpl.js.map +1 -1
- package/target/impl/core/Const.js +1 -1
- package/target/impl/core/Const.js.map +1 -1
- package/target/impl/core/ImplTypes.js +9 -14
- package/target/impl/core/ImplTypes.js.map +1 -1
- package/target/impl/i18n/Messages.js +3 -4
- package/target/impl/i18n/Messages.js.map +1 -1
- package/target/impl/util/Assertions.js +9 -18
- package/target/impl/util/Assertions.js.map +1 -1
- package/target/impl/util/AsyncQueue.js +28 -36
- package/target/impl/util/AsyncQueue.js.map +1 -1
- package/target/impl/util/ExtDomQuery.js +144 -219
- package/target/impl/util/ExtDomQuery.js.map +1 -1
- package/target/impl/util/Lang.js +21 -28
- package/target/impl/util/Lang.js.map +1 -1
- package/target/impl/xhrCore/ErrorData.js +36 -61
- package/target/impl/xhrCore/ErrorData.js.map +1 -1
- package/target/impl/xhrCore/EventData.js +10 -13
- package/target/impl/xhrCore/EventData.js.map +1 -1
- package/target/impl/xhrCore/RequestDataResolver.js +16 -18
- package/target/impl/xhrCore/RequestDataResolver.js.map +1 -1
- package/target/impl/xhrCore/ResonseDataResolver.js +16 -16
- package/target/impl/xhrCore/ResonseDataResolver.js.map +1 -1
- package/target/impl/xhrCore/Response.js +16 -16
- package/target/impl/xhrCore/Response.js.map +1 -1
- package/target/impl/xhrCore/ResponseProcessor.js +119 -133
- package/target/impl/xhrCore/ResponseProcessor.js.map +1 -1
- package/target/impl/xhrCore/XhrFormData.js +72 -106
- package/target/impl/xhrCore/XhrFormData.js.map +1 -1
- package/target/impl/xhrCore/XhrRequest.js +85 -95
- package/target/impl/xhrCore/XhrRequest.js.map +1 -1
- package/target/myfaces/OamSubmit.js +19 -21
- package/target/myfaces/OamSubmit.js.map +1 -1
- package/target/test/frameworkBase/LangTest.spec.js +46 -32
- package/target/test/frameworkBase/LangTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/DomQueryTest.spec.js +238 -228
- package/target/test/frameworkBase/_ext/monadish/DomQueryTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/LangTest.spec.js +45 -31
- package/target/test/frameworkBase/_ext/monadish/LangTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/MappingProbes.js +24 -33
- package/target/test/frameworkBase/_ext/monadish/MappingProbes.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/MappingTest.spec.js +8 -8
- package/target/test/frameworkBase/_ext/monadish/MappingTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/MonadTest.spec.js +31 -31
- package/target/test/frameworkBase/_ext/monadish/MonadTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/StreamTest.spec.js +50 -48
- package/target/test/frameworkBase/_ext/monadish/StreamTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/StandardInits.js +247 -132
- package/target/test/frameworkBase/_ext/shared/StandardInits.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/XmlResponses.js +199 -22
- package/target/test/frameworkBase/_ext/shared/XmlResponses.js.map +1 -1
- package/target/test/impl/ImplTest.spec.js +32 -59
- package/target/test/impl/ImplTest.spec.js.map +1 -1
- package/target/test/impl/ImplTest_23.spec.js +32 -59
- package/target/test/impl/ImplTest_23.spec.js.map +1 -1
- package/target/test/impl/SeparatorCharsTest.spec.js +17 -17
- package/target/test/impl/SeparatorCharsTest.spec.js.map +1 -1
- package/target/test/myfaces/OamSubmit.spec.js +25 -25
- package/target/test/myfaces/OamSubmit.spec.js.map +1 -1
- package/target/test/queue/AsynchronousProbe.js +23 -29
- package/target/test/queue/AsynchronousProbe.js.map +1 -1
- package/target/test/queue/AsynchronousQueueTest.spec.js +39 -70
- package/target/test/queue/AsynchronousQueueTest.spec.js.map +1 -1
- package/target/test/xhrCore/EventTests.spec.js +42 -73
- package/target/test/xhrCore/EventTests.spec.js.map +1 -1
- package/target/test/xhrCore/FakeWebsocket.js +14 -16
- package/target/test/xhrCore/FakeWebsocket.js.map +1 -1
- package/target/test/xhrCore/FileUploadTest.spec.js +46 -77
- package/target/test/xhrCore/FileUploadTest.spec.js.map +1 -1
- package/target/test/xhrCore/OamSubmitTest.spec.js +97 -71
- package/target/test/xhrCore/OamSubmitTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestParamsTest.spec.js +37 -68
- package/target/test/xhrCore/RequestParamsTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest.spec.js +107 -147
- package/target/test/xhrCore/RequestTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest_23.spec.js +93 -140
- package/target/test/xhrCore/RequestTest_23.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest.spec.js +122 -91
- package/target/test/xhrCore/ResponseTest.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest23.spec.js +114 -83
- package/target/test/xhrCore/ResponseTest23.spec.js.map +1 -1
- package/target/test/xhrCore/ShadowDomTest.spec.js +30 -61
- package/target/test/xhrCore/ShadowDomTest.spec.js.map +1 -1
- package/target/test/xhrCore/WebsocketTest.js +60 -93
- package/target/test/xhrCore/WebsocketTest.js.map +1 -1
- package/target/test/xhrCore/XhrFormDataTest.spec.js +41 -15
- package/target/test/xhrCore/XhrFormDataTest.spec.js.map +1 -1
|
@@ -1,28 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __extends = (this && this.__extends) || (function () {
|
|
3
|
-
var extendStatics = function (d, b) {
|
|
4
|
-
extendStatics = Object.setPrototypeOf ||
|
|
5
|
-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
-
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
7
|
-
return extendStatics(d, b);
|
|
8
|
-
};
|
|
9
|
-
return function (d, b) {
|
|
10
|
-
if (typeof b !== "function" && b !== null)
|
|
11
|
-
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
|
12
|
-
extendStatics(d, b);
|
|
13
|
-
function __() { this.constructor = d; }
|
|
14
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
|
-
};
|
|
16
|
-
})();
|
|
17
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
18
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
19
|
-
if (ar || !(i in from)) {
|
|
20
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
21
|
-
ar[i] = from[i];
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
25
|
-
};
|
|
26
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
3
|
exports.ExtConfig = exports.ExtDQ = exports.ExtDomQuery = void 0;
|
|
28
4
|
/*! Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@@ -40,8 +16,8 @@ exports.ExtConfig = exports.ExtDQ = exports.ExtDomQuery = void 0;
|
|
|
40
16
|
* See the License for the specific language governing permissions and
|
|
41
17
|
* limitations under the License.
|
|
42
18
|
*/
|
|
43
|
-
|
|
44
|
-
|
|
19
|
+
const mona_dish_1 = require("mona-dish");
|
|
20
|
+
const Const_1 = require("../core/Const");
|
|
45
21
|
/**
|
|
46
22
|
* detects whether a source is a faces.js request
|
|
47
23
|
*
|
|
@@ -49,7 +25,7 @@ var Const_1 = require("../core/Const");
|
|
|
49
25
|
* @return true if a faces.js loading pattern is detected
|
|
50
26
|
* @constructor
|
|
51
27
|
*/
|
|
52
|
-
|
|
28
|
+
const IS_FACES_SOURCE = (source) => {
|
|
53
29
|
//spec version smaller 4 we have to deal with the jsf namespace
|
|
54
30
|
return source && !!((source === null || source === void 0 ? void 0 : source.search(/\/jakarta\.faces\.resource.*\/faces\.js.*/)) != -1 ||
|
|
55
31
|
(source === null || source === void 0 ? void 0 : source.search(/\/faces-development\.js.*/)) != -1 ||
|
|
@@ -72,10 +48,10 @@ var IS_FACES_SOURCE = function (source) {
|
|
|
72
48
|
* @param source the source to check
|
|
73
49
|
* @constructor
|
|
74
50
|
*/
|
|
75
|
-
|
|
51
|
+
const IS_INTERNAL_SOURCE = (source) => {
|
|
76
52
|
return source.search(/\/faces[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1 || source.search(/\/jsf[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
|
|
77
53
|
};
|
|
78
|
-
|
|
54
|
+
const ATTR_SRC = 'src';
|
|
79
55
|
/**
|
|
80
56
|
* Extension which adds implementation specific
|
|
81
57
|
* meta-data to our dom query
|
|
@@ -85,137 +61,114 @@ var ATTR_SRC = 'src';
|
|
|
85
61
|
* nonce = el.nonce
|
|
86
62
|
* windowId = el.getWindowId
|
|
87
63
|
*/
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
return _super !== null && _super.apply(this, arguments) || this;
|
|
64
|
+
class ExtDomQuery extends mona_dish_1.DQ {
|
|
65
|
+
static get windowId() {
|
|
66
|
+
return new ExtDomQuery(document.body).windowId;
|
|
92
67
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
configurable: true
|
|
106
|
-
});
|
|
107
|
-
Object.defineProperty(ExtDomQuery.prototype, "windowId", {
|
|
108
|
-
get: function () {
|
|
109
|
-
var fetchWindowIdFromURL = function () {
|
|
110
|
-
var href = window.location.href;
|
|
111
|
-
var windowId = "windowId";
|
|
112
|
-
var regex = new RegExp("[\\?&]" + windowId + "=([^&#\\;]*)");
|
|
113
|
-
var results = regex.exec(href);
|
|
114
|
-
//initial trial over the url and a regexp
|
|
115
|
-
if (results != null)
|
|
116
|
-
return results[1];
|
|
117
|
-
return null;
|
|
118
|
-
};
|
|
119
|
-
//byId ($)
|
|
120
|
-
if (this.value.isPresent()) {
|
|
121
|
-
var result = this.querySelectorAll("form input[name='" + Const_1.P_WINDOW_ID + "']");
|
|
122
|
-
if (result.length > 1) {
|
|
123
|
-
throw Error("Multiple different windowIds found in document");
|
|
124
|
-
}
|
|
125
|
-
return (result.isPresent()) ? result.getAsElem(0).value.value : fetchWindowIdFromURL();
|
|
126
|
-
}
|
|
127
|
-
else {
|
|
128
|
-
return fetchWindowIdFromURL();
|
|
129
|
-
}
|
|
130
|
-
},
|
|
131
|
-
enumerable: false,
|
|
132
|
-
configurable: true
|
|
133
|
-
});
|
|
134
|
-
Object.defineProperty(ExtDomQuery.prototype, "nonce", {
|
|
135
|
-
/*
|
|
136
|
-
* determines the faces.js nonce and adds them to the namespace
|
|
137
|
-
* this is done once and only lazily
|
|
138
|
-
*/
|
|
139
|
-
get: function () {
|
|
140
|
-
var _this = this;
|
|
141
|
-
//already processed
|
|
142
|
-
var myfacesConfig = new ExtConfig(window.myfaces);
|
|
143
|
-
var nonce = myfacesConfig.getIf("config", "cspMeta", "nonce");
|
|
144
|
-
if (nonce.value) {
|
|
145
|
-
return nonce.value;
|
|
146
|
-
}
|
|
147
|
-
var curScript = new mona_dish_1.DQ(document.currentScript);
|
|
148
|
-
//since our baseline atm is ie11 we cannot use document.currentScript globally
|
|
149
|
-
if (!!this.extractNonce(curScript)) {
|
|
150
|
-
// fast-path for modern browsers
|
|
151
|
-
return this.extractNonce(curScript);
|
|
152
|
-
}
|
|
153
|
-
// fallback if the currentScript method fails, we just search the jsf tags for nonce, this is
|
|
154
|
-
// the last possibility
|
|
155
|
-
var nonceScript = mona_dish_1.DQ
|
|
156
|
-
.querySelectorAll("script[src], link[src]")
|
|
157
|
-
.lazyStream
|
|
158
|
-
.filter(function (item) { return _this.extractNonce(item) && item.attr(ATTR_SRC) != null; })
|
|
159
|
-
.filter(function (item) { return IS_FACES_SOURCE(item.attr(ATTR_SRC).value); })
|
|
160
|
-
.first();
|
|
161
|
-
if (nonceScript.isPresent()) {
|
|
162
|
-
return this.extractNonce(nonceScript.value);
|
|
163
|
-
}
|
|
68
|
+
static get nonce() {
|
|
69
|
+
return new ExtDomQuery(document.body).nonce;
|
|
70
|
+
}
|
|
71
|
+
get windowId() {
|
|
72
|
+
const fetchWindowIdFromURL = function () {
|
|
73
|
+
let href = window.location.href;
|
|
74
|
+
let windowId = "windowId";
|
|
75
|
+
let regex = new RegExp("[\\?&]" + windowId + "=([^&#\\;]*)");
|
|
76
|
+
let results = regex.exec(href);
|
|
77
|
+
//initial trial over the url and a regexp
|
|
78
|
+
if (results != null)
|
|
79
|
+
return results[1];
|
|
164
80
|
return null;
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
81
|
+
};
|
|
82
|
+
//byId ($)
|
|
83
|
+
if (this.value.isPresent()) {
|
|
84
|
+
let result = this.querySelectorAll("form input[name='" + Const_1.P_WINDOW_ID + "']");
|
|
85
|
+
if (result.length > 1) {
|
|
86
|
+
throw Error("Multiple different windowIds found in document");
|
|
87
|
+
}
|
|
88
|
+
return (result.isPresent()) ? result.getAsElem(0).value.value : fetchWindowIdFromURL();
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
return fetchWindowIdFromURL();
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
/*
|
|
95
|
+
* determines the faces.js nonce and adds them to the namespace
|
|
96
|
+
* this is done once and only lazily
|
|
97
|
+
*/
|
|
98
|
+
get nonce() {
|
|
99
|
+
//already processed
|
|
100
|
+
let myfacesConfig = new ExtConfig(window.myfaces);
|
|
101
|
+
let nonce = myfacesConfig.getIf("config", "cspMeta", "nonce");
|
|
102
|
+
if (nonce.value) {
|
|
103
|
+
return nonce.value;
|
|
104
|
+
}
|
|
105
|
+
let curScript = new mona_dish_1.DQ(document.currentScript);
|
|
106
|
+
//since our baseline atm is ie11 we cannot use document.currentScript globally
|
|
107
|
+
if (!!this.extractNonce(curScript)) {
|
|
108
|
+
// fast-path for modern browsers
|
|
109
|
+
return this.extractNonce(curScript);
|
|
110
|
+
}
|
|
111
|
+
// fallback if the currentScript method fails, we just search the jsf tags for nonce, this is
|
|
112
|
+
// the last possibility
|
|
113
|
+
let nonceScript = mona_dish_1.DQ
|
|
114
|
+
.querySelectorAll("script[src], link[src]")
|
|
115
|
+
.lazyStream
|
|
116
|
+
.filter((item) => this.extractNonce(item) && item.attr(ATTR_SRC) != null)
|
|
117
|
+
.filter(item => IS_FACES_SOURCE(item.attr(ATTR_SRC).value))
|
|
118
|
+
.first();
|
|
119
|
+
if (nonceScript.isPresent()) {
|
|
120
|
+
return this.extractNonce(nonceScript.value);
|
|
121
|
+
}
|
|
122
|
+
return null;
|
|
123
|
+
}
|
|
124
|
+
static searchJsfJsFor(item) {
|
|
170
125
|
return new ExtDomQuery(document).searchJsfJsFor(item);
|
|
171
|
-
}
|
|
126
|
+
}
|
|
172
127
|
/**
|
|
173
128
|
* searches the embedded faces.js for items like separator char etc.
|
|
174
129
|
* expects a match as variable under position 1 in the result match
|
|
175
130
|
* @param regExp
|
|
176
131
|
*/
|
|
177
|
-
|
|
132
|
+
searchJsfJsFor(regExp) {
|
|
178
133
|
//perfect application for lazy stream
|
|
179
134
|
return mona_dish_1.DQ.querySelectorAll("script[src], link[src]").lazyStream
|
|
180
|
-
.filter(
|
|
181
|
-
.map(
|
|
182
|
-
.filter(
|
|
183
|
-
.map(
|
|
135
|
+
.filter(item => IS_FACES_SOURCE(item.attr(ATTR_SRC).value))
|
|
136
|
+
.map(item => item.attr(ATTR_SRC).value.match(regExp))
|
|
137
|
+
.filter(item => item != null && item.length > 1)
|
|
138
|
+
.map((result) => {
|
|
184
139
|
return decodeURIComponent(result[1]);
|
|
185
140
|
}).first();
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
return new ExtDomQuery(
|
|
189
|
-
}
|
|
141
|
+
}
|
|
142
|
+
globalEval(code, nonce) {
|
|
143
|
+
return new ExtDomQuery(super.globalEval(code, nonce !== null && nonce !== void 0 ? nonce : this.nonce));
|
|
144
|
+
}
|
|
190
145
|
// called from base class runScripts, do not delete
|
|
191
146
|
// noinspection JSUnusedGlobalSymbols
|
|
192
|
-
|
|
193
|
-
return new ExtDomQuery(
|
|
194
|
-
}
|
|
147
|
+
globalEvalSticky(code, nonce) {
|
|
148
|
+
return new ExtDomQuery(super.globalEvalSticky(code, nonce !== null && nonce !== void 0 ? nonce : this.nonce));
|
|
149
|
+
}
|
|
195
150
|
/**
|
|
196
151
|
* decorated run scripts which takes our jsf extensions into consideration
|
|
197
152
|
* (standard DomQuery will let you pass anything)
|
|
198
153
|
* @param sticky if set to true the internally generated element for the script is left in the dom
|
|
199
154
|
* @param whiteListed
|
|
200
155
|
*/
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
var whitelistFunc = function (src) {
|
|
156
|
+
runScripts(sticky = false, whiteListed) {
|
|
157
|
+
const whitelistFunc = (src) => {
|
|
204
158
|
var _a;
|
|
205
159
|
return ((_a = whiteListed === null || whiteListed === void 0 ? void 0 : whiteListed(src)) !== null && _a !== void 0 ? _a : true) && !IS_FACES_SOURCE(src) && !IS_INTERNAL_SOURCE(src);
|
|
206
160
|
};
|
|
207
|
-
return
|
|
208
|
-
}
|
|
161
|
+
return super.runScripts(sticky, whitelistFunc);
|
|
162
|
+
}
|
|
209
163
|
/**
|
|
210
164
|
* adds the elements in this ExtDomQuery to the head
|
|
211
165
|
*
|
|
212
166
|
* @param suppressDoubleIncludes checks for existing elements in the head before running the insert
|
|
213
167
|
*/
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
var head = ExtDomQuery.byId(document.head);
|
|
168
|
+
runHeadInserts(suppressDoubleIncludes = true) {
|
|
169
|
+
let head = ExtDomQuery.byId(document.head);
|
|
217
170
|
//automated nonce handling
|
|
218
|
-
|
|
171
|
+
let processedScripts = [];
|
|
219
172
|
// the idea is only to run head inserts on resources
|
|
220
173
|
// which do not exist already, that way
|
|
221
174
|
// we can avoid double includes on subsequent resource
|
|
@@ -224,28 +177,28 @@ var ExtDomQuery = /** @class */ (function (_super) {
|
|
|
224
177
|
if (!suppressDoubleIncludes) {
|
|
225
178
|
return true;
|
|
226
179
|
}
|
|
227
|
-
|
|
180
|
+
const tagName = element.tagName.value;
|
|
228
181
|
if (!tagName) {
|
|
229
182
|
// text node they do not have tag names, so we can process them as they are without
|
|
230
183
|
// any further ado
|
|
231
184
|
return true;
|
|
232
185
|
}
|
|
233
|
-
|
|
186
|
+
let reference = element.attr("href")
|
|
234
187
|
.orElse(element.attr("src").value)
|
|
235
188
|
.orElse(element.attr("rel").value);
|
|
236
189
|
if (!reference.isPresent()) {
|
|
237
190
|
return true;
|
|
238
191
|
}
|
|
239
|
-
return !head.querySelectorAll(
|
|
240
|
-
!head.querySelectorAll(
|
|
241
|
-
!head.querySelectorAll(
|
|
192
|
+
return !head.querySelectorAll(`${tagName}[href='${reference.value}']`).length &&
|
|
193
|
+
!head.querySelectorAll(`${tagName}[src='${reference.value}']`).length &&
|
|
194
|
+
!head.querySelectorAll(`${tagName}[rel='${reference.value}']`).length;
|
|
242
195
|
}
|
|
243
196
|
this
|
|
244
197
|
.filter(resourceIsNew)
|
|
245
|
-
.each(
|
|
198
|
+
.each(element => {
|
|
246
199
|
if (element.tagName.value != "SCRIPT") {
|
|
247
200
|
//we need to run runScripts properly to deal with the rest
|
|
248
|
-
new
|
|
201
|
+
new ExtDomQuery(...processedScripts).runScripts(true);
|
|
249
202
|
processedScripts = [];
|
|
250
203
|
head.append(element);
|
|
251
204
|
}
|
|
@@ -253,8 +206,8 @@ var ExtDomQuery = /** @class */ (function (_super) {
|
|
|
253
206
|
processedScripts.push(element);
|
|
254
207
|
}
|
|
255
208
|
});
|
|
256
|
-
new
|
|
257
|
-
}
|
|
209
|
+
new ExtDomQuery(...processedScripts).runScripts(true);
|
|
210
|
+
}
|
|
258
211
|
/**
|
|
259
212
|
* byId producer
|
|
260
213
|
*
|
|
@@ -262,110 +215,82 @@ var ExtDomQuery = /** @class */ (function (_super) {
|
|
|
262
215
|
* @param deep whether the search should go into embedded shadow dom elements
|
|
263
216
|
* @return a DomQuery containing the found elements
|
|
264
217
|
*/
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
var ret = mona_dish_1.DomQuery.byId(selector, deep);
|
|
218
|
+
static byId(selector, deep = false) {
|
|
219
|
+
const ret = mona_dish_1.DomQuery.byId(selector, deep);
|
|
268
220
|
return new ExtDomQuery(ret);
|
|
269
|
-
}
|
|
270
|
-
|
|
221
|
+
}
|
|
222
|
+
extractNonce(curScript) {
|
|
271
223
|
var _a, _b;
|
|
272
224
|
return (_b = (_a = curScript.getAsElem(0).value) === null || _a === void 0 ? void 0 : _a.nonce) !== null && _b !== void 0 ? _b : curScript.attr("nonce").value;
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
}(mona_dish_1.DQ));
|
|
225
|
+
}
|
|
226
|
+
}
|
|
276
227
|
exports.ExtDomQuery = ExtDomQuery;
|
|
277
228
|
exports.ExtDQ = ExtDomQuery;
|
|
278
229
|
/**
|
|
279
230
|
* in order to reduce the number of interception points for the fallbacks we add
|
|
280
231
|
* the namespace remapping straight to our config accessors
|
|
281
232
|
*/
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
233
|
+
class ExtConfig extends mona_dish_1.Config {
|
|
234
|
+
constructor(root) {
|
|
235
|
+
super(root);
|
|
236
|
+
}
|
|
237
|
+
assignIf(condition, ...accessPath) {
|
|
238
|
+
const accessPathMapped = this.remap(accessPath);
|
|
239
|
+
return super.assignIf(condition, ...accessPathMapped);
|
|
240
|
+
}
|
|
241
|
+
assign(...accessPath) {
|
|
242
|
+
const accessPathMapped = this.remap(accessPath);
|
|
243
|
+
return super.assign(...accessPathMapped);
|
|
244
|
+
}
|
|
245
|
+
append(...accessPath) {
|
|
246
|
+
return super.append(...accessPath);
|
|
247
|
+
}
|
|
248
|
+
appendIf(condition, ...accessPath) {
|
|
249
|
+
const accessPathMapped = this.remap(accessPath);
|
|
250
|
+
return super.appendIf(condition, ...accessPathMapped);
|
|
251
|
+
}
|
|
252
|
+
getIf(...accessPath) {
|
|
253
|
+
const accessPathMapped = this.remap(accessPath);
|
|
254
|
+
return super.getIf(...accessPathMapped);
|
|
255
|
+
}
|
|
256
|
+
get(defaultVal) {
|
|
257
|
+
return super.get((0, Const_1.$nsp)(defaultVal));
|
|
258
|
+
}
|
|
259
|
+
delete(key) {
|
|
260
|
+
return super.delete((0, Const_1.$nsp)(key));
|
|
286
261
|
}
|
|
287
|
-
ExtConfig.prototype.assignIf = function (condition) {
|
|
288
|
-
var accessPath = [];
|
|
289
|
-
for (var _i = 1; _i < arguments.length; _i++) {
|
|
290
|
-
accessPath[_i - 1] = arguments[_i];
|
|
291
|
-
}
|
|
292
|
-
var accessPathMapped = this.remap(accessPath);
|
|
293
|
-
return _super.prototype.assignIf.apply(this, __spreadArray([condition], accessPathMapped, false));
|
|
294
|
-
};
|
|
295
|
-
ExtConfig.prototype.assign = function () {
|
|
296
|
-
var accessPath = [];
|
|
297
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
298
|
-
accessPath[_i] = arguments[_i];
|
|
299
|
-
}
|
|
300
|
-
var accessPathMapped = this.remap(accessPath);
|
|
301
|
-
return _super.prototype.assign.apply(this, accessPathMapped);
|
|
302
|
-
};
|
|
303
|
-
ExtConfig.prototype.append = function () {
|
|
304
|
-
var accessPath = [];
|
|
305
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
306
|
-
accessPath[_i] = arguments[_i];
|
|
307
|
-
}
|
|
308
|
-
return _super.prototype.append.apply(this, accessPath);
|
|
309
|
-
};
|
|
310
|
-
ExtConfig.prototype.appendIf = function (condition) {
|
|
311
|
-
var accessPath = [];
|
|
312
|
-
for (var _i = 1; _i < arguments.length; _i++) {
|
|
313
|
-
accessPath[_i - 1] = arguments[_i];
|
|
314
|
-
}
|
|
315
|
-
var accessPathMapped = this.remap(accessPath);
|
|
316
|
-
return _super.prototype.appendIf.apply(this, __spreadArray([condition], accessPathMapped, false));
|
|
317
|
-
};
|
|
318
|
-
ExtConfig.prototype.getIf = function () {
|
|
319
|
-
var accessPath = [];
|
|
320
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
321
|
-
accessPath[_i] = arguments[_i];
|
|
322
|
-
}
|
|
323
|
-
var accessPathMapped = this.remap(accessPath);
|
|
324
|
-
return _super.prototype.getIf.apply(this, accessPathMapped);
|
|
325
|
-
};
|
|
326
|
-
ExtConfig.prototype.get = function (defaultVal) {
|
|
327
|
-
return _super.prototype.get.call(this, (0, Const_1.$nsp)(defaultVal));
|
|
328
|
-
};
|
|
329
|
-
ExtConfig.prototype.delete = function (key) {
|
|
330
|
-
return _super.prototype.delete.call(this, (0, Const_1.$nsp)(key));
|
|
331
|
-
};
|
|
332
262
|
/**
|
|
333
263
|
* creates a config from an initial value or null
|
|
334
264
|
* @param value
|
|
335
265
|
*/
|
|
336
|
-
|
|
266
|
+
static fromNullable(value) {
|
|
337
267
|
return new ExtConfig(value);
|
|
338
|
-
}
|
|
339
|
-
|
|
268
|
+
}
|
|
269
|
+
getClass() {
|
|
340
270
|
return ExtConfig;
|
|
341
|
-
}
|
|
271
|
+
}
|
|
342
272
|
/**
|
|
343
273
|
* shallow copy getter, copies only the first level, references the deeper nodes
|
|
344
274
|
* in a shared manner
|
|
345
275
|
*/
|
|
346
|
-
|
|
347
|
-
|
|
276
|
+
shallowCopy$() {
|
|
277
|
+
const ret = super.shallowCopy$();
|
|
348
278
|
return new ExtConfig(ret);
|
|
349
|
-
}
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
},
|
|
357
|
-
enumerable: false,
|
|
358
|
-
configurable: true
|
|
359
|
-
});
|
|
279
|
+
}
|
|
280
|
+
/**
|
|
281
|
+
* deep copy, copies all config nodes
|
|
282
|
+
*/
|
|
283
|
+
get deepCopy() {
|
|
284
|
+
return new ExtConfig(super.deepCopy$());
|
|
285
|
+
}
|
|
360
286
|
/**
|
|
361
287
|
* helper to remap the namespaces of an array of access paths
|
|
362
288
|
* @param accessPath the access paths to be remapped
|
|
363
289
|
* @private returns an array of access paths with version remapped namespaces
|
|
364
290
|
*/
|
|
365
|
-
|
|
366
|
-
return mona_dish_1.Stream.of
|
|
367
|
-
}
|
|
368
|
-
|
|
369
|
-
}(mona_dish_1.Config));
|
|
291
|
+
remap(accessPath) {
|
|
292
|
+
return mona_dish_1.Stream.of(...accessPath).map(key => (0, Const_1.$nsp)(key)).collect(new mona_dish_1.ArrayCollector());
|
|
293
|
+
}
|
|
294
|
+
}
|
|
370
295
|
exports.ExtConfig = ExtConfig;
|
|
371
296
|
//# sourceMappingURL=ExtDomQuery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtDomQuery.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/ExtDomQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ExtDomQuery.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/ExtDomQuery.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yCAA+F;AAC/F,yCAAgD;AAGhD;;;;;;GAMG;AACH,MAAM,eAAe,GAAG,CAAC,MAAe,EAAW,EAAE;IACjD,+DAA+D;IAE/D,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,2CAA2C,CAAC,KAAI,CAAC,CAAC;QACjF,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,2BAA2B,CAAC,KAAI,CAAC,CAAC;QACjD,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,4BAA4B,CAAC,KAAI,CAAC,CAAC;QAClD,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,wCAAwC,CAAC,KAAI,CAAC,CAAC;QAC9D,kEAAkE;QAClE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,uCAAuC,CAAC,KAAI,CAAC,CAAC;QACzD,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,yBAAyB,CAAC,KAAI,CAAC,CAAC;QAC/C,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,0BAA0B,CAAC,KAAI,CAAC,CAAC;QAChD,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,oCAAoC,CAAC,KAAI,CAAC,CAAC,CAAC,CAAC;AACxE,CAAC,CAAA;AAED;;;;;;;;;;GAUG;AACH,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAW,EAAE;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,8CAA8C,CAAC,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,4CAA4C,CAAC,IAAI,CAAC,CAAC,CAAC;AACpJ,CAAC,CAAA;AAGD,MAAM,QAAQ,GAAG,KAAK,CAAC;AAEvB;;;;;;;;GAQG;AACH,MAAa,WAAY,SAAQ,cAAE;IAE/B,MAAM,KAAK,QAAQ;QACf,OAAO,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IACnD,CAAC;IAED,MAAM,KAAK,KAAK;QACZ,OAAO,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAChD,CAAC;IAED,IAAI,QAAQ;QAER,MAAM,oBAAoB,GAAG;YACzB,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YAChC,IAAI,QAAQ,GAAG,UAAU,CAAC;YAC1B,IAAI,KAAK,GAAG,IAAI,MAAM,CAAC,QAAQ,GAAG,QAAQ,GAAG,cAAc,CAAC,CAAC;YAC7D,IAAI,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,yCAAyC;YACzC,IAAI,OAAO,IAAI,IAAI;gBAAE,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;QAEF,UAAU;QACV,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE;YACxB,IAAI,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,GAAG,mBAAW,GAAG,IAAI,CAAC,CAAC;YAC7E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnB,MAAM,KAAK,CAAC,gDAAgD,CAAC,CAAC;aACjE;YAED,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAoB,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC;SAC9G;aAAM;YACH,OAAO,oBAAoB,EAAE,CAAC;SACjC;IACL,CAAC;IAED;;;MAGE;IACF,IAAI,KAAK;QACL,mBAAmB;QACnB,IAAI,aAAa,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,KAAK,GAAyB,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACpF,IAAI,KAAK,CAAC,KAAK,EAAE;YACb,OAAe,KAAK,CAAC,KAAK,CAAC;SAC9B;QAED,IAAI,SAAS,GAAG,IAAI,cAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC/C,8EAA8E;QAC9E,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;YAChC,gCAAgC;YAChC,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;SACvC;QACD,6FAA6F;QAC7F,uBAAuB;QACvB,IAAI,WAAW,GAAG,cAAE;aACf,gBAAgB,CAAC,wBAAwB,CAAC;aAC1C,UAAU;aACV,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;aACzE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;aAC1D,KAAK,EAAE,CAAC;QAEb,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC/C;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,IAAY;QAC9B,OAAO,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,MAAc;QACzB,qCAAqC;QACrC,OAAO,cAAE,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,UAAU;aAC1D,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;aAC1D,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;aACpD,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aAC/C,GAAG,CAAC,CAAC,MAAgB,EAAE,EAAE;YACtB,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IACnB,CAAC;IAED,UAAU,CAAC,IAAY,EAAE,KAAe;QACpC,OAAO,IAAI,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,mDAAmD;IACnD,qCAAqC;IACrC,gBAAgB,CAAC,IAAY,EAAE,KAAe;QAC1C,OAAO,IAAI,WAAW,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAC,MAAM,GAAG,KAAK,EAAE,WAAsC;QAC7D,MAAM,aAAa,GAAG,CAAC,GAAW,EAAW,EAAE;;YAC3C,OAAO,CAAC,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,GAAG,CAAC,mCAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC7F,CAAC,CAAC;QACF,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACnD,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,sBAAsB,GAAG,IAAI;QACxC,IAAI,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3C,0BAA0B;QAC1B,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAE1B,oDAAoD;QACpD,uCAAuC;QACvC,sDAAsD;QACtD,YAAY;QACZ,SAAS,aAAa,CAAC,OAAiB;YACpC,IAAG,CAAC,sBAAsB,EAAE;gBACxB,OAAO,IAAI,CAAC;aACf;YACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;YACtC,IAAG,CAAC,OAAO,EAAE;gBACT,mFAAmF;gBACnF,kBAAkB;gBAClB,OAAO,IAAI,CAAC;aACf;YACD,IAAI,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;iBAC/B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;iBACjC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;YAEvC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE;gBACxB,OAAO,IAAI,CAAC;aACf;YACD,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,OAAO,UAAU,SAAS,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM;gBACzE,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,OAAO,SAAS,SAAS,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM;gBACrE,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,OAAO,SAAS,SAAS,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC;QAC9E,CAAC;QAED,IAAI;aACC,MAAM,CAAC,aAAa,CAAC;aACrB,IAAI,CAAC,OAAO,CAAC,EAAE;YACZ,IAAG,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,EAAE;gBAClC,0DAA0D;gBAC1D,IAAI,WAAW,CAAC,GAAG,gBAAgB,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACtD,gBAAgB,GAAG,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACxB;iBAAM;gBACH,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAClC;QACL,CAAC,CAAC,CAAC;QACP,IAAI,WAAW,CAAC,GAAG,gBAAgB,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IAGD;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CAAC,QAAqC,EAAE,IAAI,GAAG,KAAK;QAC3D,MAAM,GAAG,GAAG,oBAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1C,OAAO,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAEO,YAAY,CAAC,SAAmB;;QACpC,OAAO,MAAA,MAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAqB,0CAAE,KAAK,mCAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;IACjG,CAAC;CAEJ;AAnLD,kCAmLC;AAEY,QAAA,KAAK,GAAG,WAAW,CAAC;AAEjC;;;GAGG;AACH,MAAa,SAAU,SAAS,kBAAM;IAElC,YAAY,IAAS;QACjB,KAAK,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,SAAkB,EAAE,GAAG,UAAU;QACtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,CAAC,GAAG,UAAU;QAChB,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,GAAG,UAAU;QAChB,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC;IACvC,CAAC;IAED,QAAQ,CAAC,SAAkB,EAAE,GAAG,UAAU;QACtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,GAAG,UAAU;QACf,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,GAAG,CAAC,UAAe;QACf,OAAO,KAAK,CAAC,GAAG,CAAC,IAAA,YAAI,EAAC,UAAU,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,GAAW;QACd,OAAO,KAAK,CAAC,MAAM,CAAC,IAAA,YAAI,EAAC,GAAG,CAAC,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAI,KAAgB;QACnC,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAES,QAAQ;QACd,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;OAGG;IACO,YAAY;QAClB,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QACjC,OAAO,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ;QACR,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,UAAiB;QAC3B,OAAO,kBAAM,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAA,YAAI,EAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,0BAAc,EAAE,CAAC,CAAC;IACxF,CAAC;CACJ;AA1ED,8BA0EC"}
|
package/target/impl/util/Lang.js
CHANGED
|
@@ -19,18 +19,18 @@
|
|
|
19
19
|
*/
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.ExtLang = void 0;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
const mona_dish_1 = require("mona-dish");
|
|
23
|
+
const Messages_1 = require("../i18n/Messages");
|
|
24
|
+
const Const_1 = require("../core/Const");
|
|
25
|
+
const RequestDataResolver_1 = require("../xhrCore/RequestDataResolver");
|
|
26
26
|
var ExtLang;
|
|
27
27
|
(function (ExtLang) {
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
let installedLocale;
|
|
29
|
+
let nameSpace = "impl/util/Lang/";
|
|
30
30
|
function getLanguage() {
|
|
31
31
|
//TODO global config override
|
|
32
32
|
var _a, _b;
|
|
33
|
-
|
|
33
|
+
let language = (_b = (_a = navigator.languages) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : navigator === null || navigator === void 0 ? void 0 : navigator.language;
|
|
34
34
|
language = language.split("-")[0];
|
|
35
35
|
return language;
|
|
36
36
|
}
|
|
@@ -53,8 +53,7 @@ var ExtLang;
|
|
|
53
53
|
* @param defaultValue an optional default value if the producer fails to produce anything
|
|
54
54
|
* @returns an Optional of the produced value
|
|
55
55
|
*/
|
|
56
|
-
function failSaveResolve(resolverProducer, defaultValue) {
|
|
57
|
-
if (defaultValue === void 0) { defaultValue = null; }
|
|
56
|
+
function failSaveResolve(resolverProducer, defaultValue = null) {
|
|
58
57
|
return mona_dish_1.Lang.saveResolve(resolverProducer, defaultValue);
|
|
59
58
|
}
|
|
60
59
|
ExtLang.failSaveResolve = failSaveResolve;
|
|
@@ -67,8 +66,7 @@ var ExtLang;
|
|
|
67
66
|
* @param resolverProducer a producer function which produces a value in the non error case
|
|
68
67
|
* @param defaultValue the default value in case of a fail of the function
|
|
69
68
|
*/
|
|
70
|
-
function failSaveExecute(resolverProducer, defaultValue) {
|
|
71
|
-
if (defaultValue === void 0) { defaultValue = null; }
|
|
69
|
+
function failSaveExecute(resolverProducer, defaultValue = null) {
|
|
72
70
|
mona_dish_1.Lang.saveResolve(resolverProducer, defaultValue);
|
|
73
71
|
}
|
|
74
72
|
ExtLang.failSaveExecute = failSaveExecute;
|
|
@@ -84,15 +82,11 @@ var ExtLang;
|
|
|
84
82
|
*
|
|
85
83
|
* @param templateParams the param list to be filled in
|
|
86
84
|
*/
|
|
87
|
-
function getMessage(key, defaultMessage) {
|
|
85
|
+
function getMessage(key, defaultMessage, ...templateParams) {
|
|
88
86
|
var _a, _b;
|
|
89
|
-
var templateParams = [];
|
|
90
|
-
for (var _i = 2; _i < arguments.length; _i++) {
|
|
91
|
-
templateParams[_i - 2] = arguments[_i];
|
|
92
|
-
}
|
|
93
87
|
installedLocale = installedLocale !== null && installedLocale !== void 0 ? installedLocale : new Messages_1.Messages();
|
|
94
|
-
|
|
95
|
-
mona_dish_1.Stream.of
|
|
88
|
+
let msg = (_b = (_a = installedLocale[key]) !== null && _a !== void 0 ? _a : defaultMessage) !== null && _b !== void 0 ? _b : key;
|
|
89
|
+
mona_dish_1.Stream.of(...templateParams).each((param, cnt) => {
|
|
96
90
|
msg = msg.replace(new RegExp(["\\{", cnt, "\\}"].join(Const_1.EMPTY_STR), "g"), param);
|
|
97
91
|
});
|
|
98
92
|
return msg;
|
|
@@ -104,8 +98,7 @@ var ExtLang;
|
|
|
104
98
|
* @param val the value
|
|
105
99
|
* @param delimiter the delimiter
|
|
106
100
|
*/
|
|
107
|
-
function keyValToStr(key, val, delimiter) {
|
|
108
|
-
if (delimiter === void 0) { delimiter = "\n"; }
|
|
101
|
+
function keyValToStr(key, val, delimiter = "\n") {
|
|
109
102
|
return [key, val].join(delimiter);
|
|
110
103
|
}
|
|
111
104
|
ExtLang.keyValToStr = keyValToStr;
|
|
@@ -162,23 +155,23 @@ var ExtLang;
|
|
|
162
155
|
* @param event
|
|
163
156
|
*/
|
|
164
157
|
function getForm(elem, event) {
|
|
165
|
-
|
|
166
|
-
|
|
158
|
+
let queryElem = new mona_dish_1.DQ(elem);
|
|
159
|
+
let eventTarget = new mona_dish_1.DQ((0, RequestDataResolver_1.getEventTarget)(event));
|
|
167
160
|
if (queryElem.isTag(Const_1.TAG_FORM)) {
|
|
168
161
|
return queryElem;
|
|
169
162
|
}
|
|
170
163
|
//html 5 for handling
|
|
171
164
|
if (queryElem.attr(Const_1.TAG_FORM).isPresent()) {
|
|
172
|
-
|
|
173
|
-
|
|
165
|
+
let formId = queryElem.attr(Const_1.TAG_FORM).value;
|
|
166
|
+
let foundForm = mona_dish_1.DQ.byId(formId, true);
|
|
174
167
|
if (foundForm.isPresent()) {
|
|
175
168
|
return foundForm;
|
|
176
169
|
}
|
|
177
170
|
}
|
|
178
|
-
|
|
179
|
-
.orElseLazy(
|
|
180
|
-
.orElseLazy(
|
|
181
|
-
.orElseLazy(
|
|
171
|
+
let form = queryElem.parents(Const_1.TAG_FORM)
|
|
172
|
+
.orElseLazy(() => queryElem.byTagName(Const_1.TAG_FORM, true))
|
|
173
|
+
.orElseLazy(() => eventTarget.parents(Const_1.TAG_FORM))
|
|
174
|
+
.orElseLazy(() => eventTarget.byTagName(Const_1.TAG_FORM))
|
|
182
175
|
.first();
|
|
183
176
|
assertFormExists(form);
|
|
184
177
|
return form;
|