jsf.js_next_gen 4.0.0-RC.2 → 4.0.0-RC.5
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/docs/functions/myfaces.ab.html +2 -2
- package/dist/window/faces-development.js +2749 -2039
- 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 +2754 -2044
- 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 +7 -7
- package/src/main/typescript/@types/definitions/index.d.ts +16 -1
- package/src/main/typescript/api/_api.ts +1 -1
- package/src/main/typescript/impl/AjaxImpl.ts +22 -2
- package/src/main/typescript/impl/core/Const.ts +2 -0
- package/src/main/typescript/impl/util/AsyncQueue.ts +1 -1
- package/src/main/typescript/impl/xhrCore/RequestDataResolver.ts +2 -2
- package/src/main/typescript/myfaces/OamSubmit.ts +11 -10
- package/src/main/typescript/test/xhrCore/OamSubmitTest.spec.ts +117 -0
- package/src/main/typescript/test/xhrCore/RequestTest.spec.ts +166 -8
- package/src/main/typescript/tsconfig.json +1 -1
- package/target/api/_api.js +25 -11
- 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 +79 -53
- package/target/impl/AjaxImpl.js.map +1 -1
- package/target/impl/PushImpl.js +48 -45
- package/target/impl/PushImpl.js.map +1 -1
- package/target/impl/core/Const.js +5 -4
- package/target/impl/core/Const.js.map +1 -1
- package/target/impl/core/ImplTypes.js +14 -9
- package/target/impl/core/ImplTypes.js.map +1 -1
- package/target/impl/i18n/Messages.js +4 -3
- package/target/impl/i18n/Messages.js.map +1 -1
- package/target/impl/util/Assertions.js +18 -9
- package/target/impl/util/Assertions.js.map +1 -1
- package/target/impl/util/AsyncQueue.js +36 -28
- package/target/impl/util/AsyncQueue.js.map +1 -1
- package/target/impl/util/ExtDomQuery.js +219 -144
- package/target/impl/util/ExtDomQuery.js.map +1 -1
- package/target/impl/util/Lang.js +28 -21
- package/target/impl/util/Lang.js.map +1 -1
- package/target/impl/xhrCore/ErrorData.js +61 -36
- package/target/impl/xhrCore/ErrorData.js.map +1 -1
- package/target/impl/xhrCore/EventData.js +13 -10
- package/target/impl/xhrCore/EventData.js.map +1 -1
- package/target/impl/xhrCore/RequestDataResolver.js +18 -16
- 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 +133 -119
- package/target/impl/xhrCore/ResponseProcessor.js.map +1 -1
- package/target/impl/xhrCore/XhrFormData.js +106 -72
- package/target/impl/xhrCore/XhrFormData.js.map +1 -1
- package/target/impl/xhrCore/XhrRequest.js +95 -85
- package/target/impl/xhrCore/XhrRequest.js.map +1 -1
- package/target/myfaces/OamSubmit.js +24 -20
- package/target/myfaces/OamSubmit.js.map +1 -1
- package/target/test/frameworkBase/LangTest.spec.js +32 -46
- package/target/test/frameworkBase/LangTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/DomQueryTest.spec.js +228 -238
- package/target/test/frameworkBase/_ext/monadish/DomQueryTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/LangTest.spec.js +31 -45
- package/target/test/frameworkBase/_ext/monadish/LangTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/monadish/MappingProbes.js +33 -24
- 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 +48 -50
- package/target/test/frameworkBase/_ext/monadish/StreamTest.spec.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/StandardInits.js +132 -247
- package/target/test/frameworkBase/_ext/shared/StandardInits.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/XmlResponses.js +22 -199
- package/target/test/frameworkBase/_ext/shared/XmlResponses.js.map +1 -1
- package/target/test/impl/ImplTest.spec.js +59 -32
- package/target/test/impl/ImplTest.spec.js.map +1 -1
- package/target/test/impl/ImplTest_23.spec.js +59 -32
- 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 +29 -23
- package/target/test/queue/AsynchronousProbe.js.map +1 -1
- package/target/test/queue/AsynchronousQueueTest.spec.js +70 -39
- package/target/test/queue/AsynchronousQueueTest.spec.js.map +1 -1
- package/target/test/xhrCore/EventTests.spec.js +73 -42
- package/target/test/xhrCore/EventTests.spec.js.map +1 -1
- package/target/test/xhrCore/FakeWebsocket.js +16 -14
- package/target/test/xhrCore/FakeWebsocket.js.map +1 -1
- package/target/test/xhrCore/FileUploadTest.spec.js +77 -46
- package/target/test/xhrCore/FileUploadTest.spec.js.map +1 -1
- package/target/test/xhrCore/OamSubmitTest.spec.js +154 -0
- package/target/test/xhrCore/OamSubmitTest.spec.js.map +1 -0
- package/target/test/xhrCore/RequestParamsTest.spec.js +68 -37
- package/target/test/xhrCore/RequestParamsTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest.spec.js +264 -85
- package/target/test/xhrCore/RequestTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestTest_23.spec.js +140 -93
- package/target/test/xhrCore/RequestTest_23.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest.spec.js +91 -122
- package/target/test/xhrCore/ResponseTest.spec.js.map +1 -1
- package/target/test/xhrCore/ResponseTest23.spec.js +83 -114
- package/target/test/xhrCore/ResponseTest23.spec.js.map +1 -1
- package/target/test/xhrCore/ShadowDomTest.spec.js +61 -30
- package/target/test/xhrCore/ShadowDomTest.spec.js.map +1 -1
- package/target/test/xhrCore/WebsocketTest.js +93 -60
- package/target/test/xhrCore/WebsocketTest.js.map +1 -1
- package/target/test/xhrCore/XhrFormDataTest.spec.js +15 -41
- package/target/test/xhrCore/XhrFormDataTest.spec.js.map +1 -1
- package/target/classes/com/example/jsfs_js_ts/DecoratedFacesJS.class +0 -0
- package/target/classes/com/example/jsfs_js_ts/DecoratingResourceHandlerWrapper.class +0 -0
- package/target/classes/com/example/jsfs_js_ts/FacesJSMapFileResourceWrapper.class +0 -0
- package/target/classes/com/example/jsfs_js_ts/FacesJSMappingDecorator.class +0 -0
- package/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +0 -4
- package/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +0 -4
- package/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +0 -1
- package/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +0 -1
- package/target/surefire-reports/TEST-com.example.jsfs_js_ts.JsfsJsTsApplicationTests.xml +0 -78
- package/target/surefire-reports/com.example.jsfs_js_ts.JsfsJsTsApplicationTests.txt +0 -7
- package/target/test-classes/.gz +0 -0
- package/target/test-classes/com/example/jsfs_js_ts/JsfsJsTsApplicationTests.class +0 -0
- package/target/test-classes/fileuploadtest.html +0 -24
- package/target/test-classes/jsf-development.js +0 -3559
- package/target/test-classes/jsf-development.js.br +0 -0
- package/target/test-classes/jsf-development.js.gz +0 -0
- package/target/test-classes/jsf-development.js.map +0 -1
- package/target/test-classes/jsf.js +0 -3
- package/target/test-classes/jsf.js.br +0 -0
- package/target/test-classes/jsf.js.gz +0 -0
|
@@ -1,4 +1,28 @@
|
|
|
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
|
+
};
|
|
2
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
27
|
exports.ExtConfig = exports.ExtDQ = exports.ExtDomQuery = void 0;
|
|
4
28
|
/*! Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@@ -16,8 +40,8 @@ exports.ExtConfig = exports.ExtDQ = exports.ExtDomQuery = void 0;
|
|
|
16
40
|
* See the License for the specific language governing permissions and
|
|
17
41
|
* limitations under the License.
|
|
18
42
|
*/
|
|
19
|
-
|
|
20
|
-
|
|
43
|
+
var mona_dish_1 = require("mona-dish");
|
|
44
|
+
var Const_1 = require("../core/Const");
|
|
21
45
|
/**
|
|
22
46
|
* detects whether a source is a faces.js request
|
|
23
47
|
*
|
|
@@ -25,7 +49,7 @@ const Const_1 = require("../core/Const");
|
|
|
25
49
|
* @return true if a faces.js loading pattern is detected
|
|
26
50
|
* @constructor
|
|
27
51
|
*/
|
|
28
|
-
|
|
52
|
+
var IS_FACES_SOURCE = function (source) {
|
|
29
53
|
//spec version smaller 4 we have to deal with the jsf namespace
|
|
30
54
|
return source && !!((source === null || source === void 0 ? void 0 : source.search(/\/jakarta\.faces\.resource.*\/faces\.js.*/)) != -1 ||
|
|
31
55
|
(source === null || source === void 0 ? void 0 : source.search(/\/faces-development\.js.*/)) != -1 ||
|
|
@@ -48,10 +72,10 @@ const IS_FACES_SOURCE = (source) => {
|
|
|
48
72
|
* @param source the source to check
|
|
49
73
|
* @constructor
|
|
50
74
|
*/
|
|
51
|
-
|
|
75
|
+
var IS_INTERNAL_SOURCE = function (source) {
|
|
52
76
|
return source.search(/\/faces[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1 || source.search(/\/jsf[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
|
|
53
77
|
};
|
|
54
|
-
|
|
78
|
+
var ATTR_SRC = 'src';
|
|
55
79
|
/**
|
|
56
80
|
* Extension which adds implementation specific
|
|
57
81
|
* meta-data to our dom query
|
|
@@ -61,114 +85,137 @@ const ATTR_SRC = 'src';
|
|
|
61
85
|
* nonce = el.nonce
|
|
62
86
|
* windowId = el.getWindowId
|
|
63
87
|
*/
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
88
|
+
var ExtDomQuery = /** @class */ (function (_super) {
|
|
89
|
+
__extends(ExtDomQuery, _super);
|
|
90
|
+
function ExtDomQuery() {
|
|
91
|
+
return _super !== null && _super.apply(this, arguments) || this;
|
|
67
92
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
93
|
+
Object.defineProperty(ExtDomQuery, "windowId", {
|
|
94
|
+
get: function () {
|
|
95
|
+
return new ExtDomQuery(document.body).windowId;
|
|
96
|
+
},
|
|
97
|
+
enumerable: false,
|
|
98
|
+
configurable: true
|
|
99
|
+
});
|
|
100
|
+
Object.defineProperty(ExtDomQuery, "nonce", {
|
|
101
|
+
get: function () {
|
|
102
|
+
return new ExtDomQuery(document.body).nonce;
|
|
103
|
+
},
|
|
104
|
+
enumerable: false,
|
|
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();
|
|
87
126
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
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
|
+
}
|
|
164
|
+
return null;
|
|
165
|
+
},
|
|
166
|
+
enumerable: false,
|
|
167
|
+
configurable: true
|
|
168
|
+
});
|
|
169
|
+
ExtDomQuery.searchJsfJsFor = function (item) {
|
|
125
170
|
return new ExtDomQuery(document).searchJsfJsFor(item);
|
|
126
|
-
}
|
|
171
|
+
};
|
|
127
172
|
/**
|
|
128
173
|
* searches the embedded faces.js for items like separator char etc.
|
|
129
174
|
* expects a match as variable under position 1 in the result match
|
|
130
175
|
* @param regExp
|
|
131
176
|
*/
|
|
132
|
-
searchJsfJsFor(regExp) {
|
|
177
|
+
ExtDomQuery.prototype.searchJsfJsFor = function (regExp) {
|
|
133
178
|
//perfect application for lazy stream
|
|
134
179
|
return mona_dish_1.DQ.querySelectorAll("script[src], link[src]").lazyStream
|
|
135
|
-
.filter(item
|
|
136
|
-
.map(item
|
|
137
|
-
.filter(item
|
|
138
|
-
.map((result)
|
|
180
|
+
.filter(function (item) { return IS_FACES_SOURCE(item.attr(ATTR_SRC).value); })
|
|
181
|
+
.map(function (item) { return item.attr(ATTR_SRC).value.match(regExp); })
|
|
182
|
+
.filter(function (item) { return item != null && item.length > 1; })
|
|
183
|
+
.map(function (result) {
|
|
139
184
|
return decodeURIComponent(result[1]);
|
|
140
185
|
}).first();
|
|
141
|
-
}
|
|
142
|
-
globalEval(code, nonce) {
|
|
143
|
-
return new ExtDomQuery(
|
|
144
|
-
}
|
|
186
|
+
};
|
|
187
|
+
ExtDomQuery.prototype.globalEval = function (code, nonce) {
|
|
188
|
+
return new ExtDomQuery(_super.prototype.globalEval.call(this, code, nonce !== null && nonce !== void 0 ? nonce : this.nonce));
|
|
189
|
+
};
|
|
145
190
|
// called from base class runScripts, do not delete
|
|
146
191
|
// noinspection JSUnusedGlobalSymbols
|
|
147
|
-
globalEvalSticky(code, nonce) {
|
|
148
|
-
return new ExtDomQuery(
|
|
149
|
-
}
|
|
192
|
+
ExtDomQuery.prototype.globalEvalSticky = function (code, nonce) {
|
|
193
|
+
return new ExtDomQuery(_super.prototype.globalEvalSticky.call(this, code, nonce !== null && nonce !== void 0 ? nonce : this.nonce));
|
|
194
|
+
};
|
|
150
195
|
/**
|
|
151
196
|
* decorated run scripts which takes our jsf extensions into consideration
|
|
152
197
|
* (standard DomQuery will let you pass anything)
|
|
153
198
|
* @param sticky if set to true the internally generated element for the script is left in the dom
|
|
154
199
|
* @param whiteListed
|
|
155
200
|
*/
|
|
156
|
-
runScripts
|
|
157
|
-
|
|
201
|
+
ExtDomQuery.prototype.runScripts = function (sticky, whiteListed) {
|
|
202
|
+
if (sticky === void 0) { sticky = false; }
|
|
203
|
+
var whitelistFunc = function (src) {
|
|
158
204
|
var _a;
|
|
159
205
|
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);
|
|
160
206
|
};
|
|
161
|
-
return
|
|
162
|
-
}
|
|
207
|
+
return _super.prototype.runScripts.call(this, sticky, whitelistFunc);
|
|
208
|
+
};
|
|
163
209
|
/**
|
|
164
210
|
* adds the elements in this ExtDomQuery to the head
|
|
165
211
|
*
|
|
166
212
|
* @param suppressDoubleIncludes checks for existing elements in the head before running the insert
|
|
167
213
|
*/
|
|
168
|
-
runHeadInserts
|
|
169
|
-
|
|
214
|
+
ExtDomQuery.prototype.runHeadInserts = function (suppressDoubleIncludes) {
|
|
215
|
+
if (suppressDoubleIncludes === void 0) { suppressDoubleIncludes = true; }
|
|
216
|
+
var head = ExtDomQuery.byId(document.head);
|
|
170
217
|
//automated nonce handling
|
|
171
|
-
|
|
218
|
+
var processedScripts = [];
|
|
172
219
|
// the idea is only to run head inserts on resources
|
|
173
220
|
// which do not exist already, that way
|
|
174
221
|
// we can avoid double includes on subsequent resource
|
|
@@ -177,28 +224,28 @@ class ExtDomQuery extends mona_dish_1.DQ {
|
|
|
177
224
|
if (!suppressDoubleIncludes) {
|
|
178
225
|
return true;
|
|
179
226
|
}
|
|
180
|
-
|
|
227
|
+
var tagName = element.tagName.value;
|
|
181
228
|
if (!tagName) {
|
|
182
229
|
// text node they do not have tag names, so we can process them as they are without
|
|
183
230
|
// any further ado
|
|
184
231
|
return true;
|
|
185
232
|
}
|
|
186
|
-
|
|
233
|
+
var reference = element.attr("href")
|
|
187
234
|
.orElse(element.attr("src").value)
|
|
188
235
|
.orElse(element.attr("rel").value);
|
|
189
236
|
if (!reference.isPresent()) {
|
|
190
237
|
return true;
|
|
191
238
|
}
|
|
192
|
-
return !head.querySelectorAll(
|
|
193
|
-
!head.querySelectorAll(
|
|
194
|
-
!head.querySelectorAll(
|
|
239
|
+
return !head.querySelectorAll("".concat(tagName, "[href='").concat(reference.value, "']")).length &&
|
|
240
|
+
!head.querySelectorAll("".concat(tagName, "[src='").concat(reference.value, "']")).length &&
|
|
241
|
+
!head.querySelectorAll("".concat(tagName, "[rel='").concat(reference.value, "']")).length;
|
|
195
242
|
}
|
|
196
243
|
this
|
|
197
244
|
.filter(resourceIsNew)
|
|
198
|
-
.each(element
|
|
245
|
+
.each(function (element) {
|
|
199
246
|
if (element.tagName.value != "SCRIPT") {
|
|
200
247
|
//we need to run runScripts properly to deal with the rest
|
|
201
|
-
new ExtDomQuery(
|
|
248
|
+
new (ExtDomQuery.bind.apply(ExtDomQuery, __spreadArray([void 0], processedScripts, false)))().runScripts(true);
|
|
202
249
|
processedScripts = [];
|
|
203
250
|
head.append(element);
|
|
204
251
|
}
|
|
@@ -206,8 +253,8 @@ class ExtDomQuery extends mona_dish_1.DQ {
|
|
|
206
253
|
processedScripts.push(element);
|
|
207
254
|
}
|
|
208
255
|
});
|
|
209
|
-
new ExtDomQuery(
|
|
210
|
-
}
|
|
256
|
+
new (ExtDomQuery.bind.apply(ExtDomQuery, __spreadArray([void 0], processedScripts, false)))().runScripts(true);
|
|
257
|
+
};
|
|
211
258
|
/**
|
|
212
259
|
* byId producer
|
|
213
260
|
*
|
|
@@ -215,82 +262,110 @@ class ExtDomQuery extends mona_dish_1.DQ {
|
|
|
215
262
|
* @param deep whether the search should go into embedded shadow dom elements
|
|
216
263
|
* @return a DomQuery containing the found elements
|
|
217
264
|
*/
|
|
218
|
-
|
|
219
|
-
|
|
265
|
+
ExtDomQuery.byId = function (selector, deep) {
|
|
266
|
+
if (deep === void 0) { deep = false; }
|
|
267
|
+
var ret = mona_dish_1.DomQuery.byId(selector, deep);
|
|
220
268
|
return new ExtDomQuery(ret);
|
|
221
|
-
}
|
|
222
|
-
extractNonce(curScript) {
|
|
269
|
+
};
|
|
270
|
+
ExtDomQuery.prototype.extractNonce = function (curScript) {
|
|
223
271
|
var _a, _b;
|
|
224
272
|
return (_b = (_a = curScript.getAsElem(0).value) === null || _a === void 0 ? void 0 : _a.nonce) !== null && _b !== void 0 ? _b : curScript.attr("nonce").value;
|
|
225
|
-
}
|
|
226
|
-
|
|
273
|
+
};
|
|
274
|
+
return ExtDomQuery;
|
|
275
|
+
}(mona_dish_1.DQ));
|
|
227
276
|
exports.ExtDomQuery = ExtDomQuery;
|
|
228
277
|
exports.ExtDQ = ExtDomQuery;
|
|
229
278
|
/**
|
|
230
279
|
* in order to reduce the number of interception points for the fallbacks we add
|
|
231
280
|
* the namespace remapping straight to our config accessors
|
|
232
281
|
*/
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
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));
|
|
282
|
+
var ExtConfig = /** @class */ (function (_super) {
|
|
283
|
+
__extends(ExtConfig, _super);
|
|
284
|
+
function ExtConfig(root) {
|
|
285
|
+
return _super.call(this, root) || this;
|
|
261
286
|
}
|
|
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
|
+
};
|
|
262
332
|
/**
|
|
263
333
|
* creates a config from an initial value or null
|
|
264
334
|
* @param value
|
|
265
335
|
*/
|
|
266
|
-
|
|
336
|
+
ExtConfig.fromNullable = function (value) {
|
|
267
337
|
return new ExtConfig(value);
|
|
268
|
-
}
|
|
269
|
-
getClass() {
|
|
338
|
+
};
|
|
339
|
+
ExtConfig.prototype.getClass = function () {
|
|
270
340
|
return ExtConfig;
|
|
271
|
-
}
|
|
341
|
+
};
|
|
272
342
|
/**
|
|
273
343
|
* shallow copy getter, copies only the first level, references the deeper nodes
|
|
274
344
|
* in a shared manner
|
|
275
345
|
*/
|
|
276
|
-
shallowCopy$() {
|
|
277
|
-
|
|
346
|
+
ExtConfig.prototype.shallowCopy$ = function () {
|
|
347
|
+
var ret = _super.prototype.shallowCopy$.call(this);
|
|
278
348
|
return new ExtConfig(ret);
|
|
279
|
-
}
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
349
|
+
};
|
|
350
|
+
Object.defineProperty(ExtConfig.prototype, "deepCopy", {
|
|
351
|
+
/**
|
|
352
|
+
* deep copy, copies all config nodes
|
|
353
|
+
*/
|
|
354
|
+
get: function () {
|
|
355
|
+
return new ExtConfig(_super.prototype.deepCopy$.call(this));
|
|
356
|
+
},
|
|
357
|
+
enumerable: false,
|
|
358
|
+
configurable: true
|
|
359
|
+
});
|
|
286
360
|
/**
|
|
287
361
|
* helper to remap the namespaces of an array of access paths
|
|
288
362
|
* @param accessPath the access paths to be remapped
|
|
289
363
|
* @private returns an array of access paths with version remapped namespaces
|
|
290
364
|
*/
|
|
291
|
-
remap(accessPath) {
|
|
292
|
-
return mona_dish_1.Stream.of(
|
|
293
|
-
}
|
|
294
|
-
|
|
365
|
+
ExtConfig.prototype.remap = function (accessPath) {
|
|
366
|
+
return mona_dish_1.Stream.of.apply(mona_dish_1.Stream, accessPath).map(function (key) { return (0, Const_1.$nsp)(key); }).collect(new mona_dish_1.ArrayCollector());
|
|
367
|
+
};
|
|
368
|
+
return ExtConfig;
|
|
369
|
+
}(mona_dish_1.Config));
|
|
295
370
|
exports.ExtConfig = ExtConfig;
|
|
296
371
|
//# 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":"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"}
|
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
|
+
var mona_dish_1 = require("mona-dish");
|
|
23
|
+
var Messages_1 = require("../i18n/Messages");
|
|
24
|
+
var Const_1 = require("../core/Const");
|
|
25
|
+
var RequestDataResolver_1 = require("../xhrCore/RequestDataResolver");
|
|
26
26
|
var ExtLang;
|
|
27
27
|
(function (ExtLang) {
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
var installedLocale;
|
|
29
|
+
var nameSpace = "impl/util/Lang/";
|
|
30
30
|
function getLanguage() {
|
|
31
31
|
//TODO global config override
|
|
32
32
|
var _a, _b;
|
|
33
|
-
|
|
33
|
+
var 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,7 +53,8 @@ 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
|
|
56
|
+
function failSaveResolve(resolverProducer, defaultValue) {
|
|
57
|
+
if (defaultValue === void 0) { defaultValue = null; }
|
|
57
58
|
return mona_dish_1.Lang.saveResolve(resolverProducer, defaultValue);
|
|
58
59
|
}
|
|
59
60
|
ExtLang.failSaveResolve = failSaveResolve;
|
|
@@ -66,7 +67,8 @@ var ExtLang;
|
|
|
66
67
|
* @param resolverProducer a producer function which produces a value in the non error case
|
|
67
68
|
* @param defaultValue the default value in case of a fail of the function
|
|
68
69
|
*/
|
|
69
|
-
function failSaveExecute(resolverProducer, defaultValue
|
|
70
|
+
function failSaveExecute(resolverProducer, defaultValue) {
|
|
71
|
+
if (defaultValue === void 0) { defaultValue = null; }
|
|
70
72
|
mona_dish_1.Lang.saveResolve(resolverProducer, defaultValue);
|
|
71
73
|
}
|
|
72
74
|
ExtLang.failSaveExecute = failSaveExecute;
|
|
@@ -82,11 +84,15 @@ var ExtLang;
|
|
|
82
84
|
*
|
|
83
85
|
* @param templateParams the param list to be filled in
|
|
84
86
|
*/
|
|
85
|
-
function getMessage(key, defaultMessage
|
|
87
|
+
function getMessage(key, defaultMessage) {
|
|
86
88
|
var _a, _b;
|
|
89
|
+
var templateParams = [];
|
|
90
|
+
for (var _i = 2; _i < arguments.length; _i++) {
|
|
91
|
+
templateParams[_i - 2] = arguments[_i];
|
|
92
|
+
}
|
|
87
93
|
installedLocale = installedLocale !== null && installedLocale !== void 0 ? installedLocale : new Messages_1.Messages();
|
|
88
|
-
|
|
89
|
-
mona_dish_1.Stream.of(
|
|
94
|
+
var msg = (_b = (_a = installedLocale[key]) !== null && _a !== void 0 ? _a : defaultMessage) !== null && _b !== void 0 ? _b : key;
|
|
95
|
+
mona_dish_1.Stream.of.apply(mona_dish_1.Stream, templateParams).each(function (param, cnt) {
|
|
90
96
|
msg = msg.replace(new RegExp(["\\{", cnt, "\\}"].join(Const_1.EMPTY_STR), "g"), param);
|
|
91
97
|
});
|
|
92
98
|
return msg;
|
|
@@ -98,7 +104,8 @@ var ExtLang;
|
|
|
98
104
|
* @param val the value
|
|
99
105
|
* @param delimiter the delimiter
|
|
100
106
|
*/
|
|
101
|
-
function keyValToStr(key, val, delimiter
|
|
107
|
+
function keyValToStr(key, val, delimiter) {
|
|
108
|
+
if (delimiter === void 0) { delimiter = "\n"; }
|
|
102
109
|
return [key, val].join(delimiter);
|
|
103
110
|
}
|
|
104
111
|
ExtLang.keyValToStr = keyValToStr;
|
|
@@ -155,23 +162,23 @@ var ExtLang;
|
|
|
155
162
|
* @param event
|
|
156
163
|
*/
|
|
157
164
|
function getForm(elem, event) {
|
|
158
|
-
|
|
159
|
-
|
|
165
|
+
var queryElem = new mona_dish_1.DQ(elem);
|
|
166
|
+
var eventTarget = new mona_dish_1.DQ((0, RequestDataResolver_1.getEventTarget)(event));
|
|
160
167
|
if (queryElem.isTag(Const_1.TAG_FORM)) {
|
|
161
168
|
return queryElem;
|
|
162
169
|
}
|
|
163
170
|
//html 5 for handling
|
|
164
171
|
if (queryElem.attr(Const_1.TAG_FORM).isPresent()) {
|
|
165
|
-
|
|
166
|
-
|
|
172
|
+
var formId = queryElem.attr(Const_1.TAG_FORM).value;
|
|
173
|
+
var foundForm = mona_dish_1.DQ.byId(formId, true);
|
|
167
174
|
if (foundForm.isPresent()) {
|
|
168
175
|
return foundForm;
|
|
169
176
|
}
|
|
170
177
|
}
|
|
171
|
-
|
|
172
|
-
.orElseLazy(()
|
|
173
|
-
.orElseLazy(()
|
|
174
|
-
.orElseLazy(()
|
|
178
|
+
var form = queryElem.parents(Const_1.TAG_FORM)
|
|
179
|
+
.orElseLazy(function () { return queryElem.byTagName(Const_1.TAG_FORM, true); })
|
|
180
|
+
.orElseLazy(function () { return eventTarget.parents(Const_1.TAG_FORM); })
|
|
181
|
+
.orElseLazy(function () { return eventTarget.byTagName(Const_1.TAG_FORM); })
|
|
175
182
|
.first();
|
|
176
183
|
assertFormExists(form);
|
|
177
184
|
return form;
|