@beinformed/ui 1.23.4 → 1.23.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/CHANGELOG.md +2 -4
- package/esm/react-server/requestInformation.js +25 -5
- package/esm/react-server/requestInformation.js.map +1 -1
- package/lib/react-server/requestInformation.js +26 -6
- package/lib/react-server/requestInformation.js.flow +18 -1
- package/lib/react-server/requestInformation.js.map +1 -1
- package/package.json +1 -1
- package/src/react-server/requestInformation.js +18 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,13 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
-
### [1.23.
|
|
6
|
-
|
|
7
|
-
### [1.23.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.23.2...v1.23.3) (2025-07-01)
|
|
5
|
+
### [1.23.5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.23.2...v1.23.5) (2025-07-04)
|
|
8
6
|
|
|
9
7
|
### Bug Fixes
|
|
10
8
|
|
|
11
|
-
- **server-request:** escape
|
|
9
|
+
- **server-request:** escape querystring ([ee24771](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/ee24771680fb0037e856037843267777b8436886))
|
|
12
10
|
|
|
13
11
|
### [1.23.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.23.1...v1.23.2) (2022-11-16)
|
|
14
12
|
|
|
@@ -1,20 +1,40 @@
|
|
|
1
|
-
import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
|
|
2
1
|
import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
|
|
2
|
+
import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
|
|
3
3
|
import Href from "../models/href/Href";
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
*/
|
|
7
|
+
const encodeQueryString = queryString => {
|
|
8
|
+
if (!queryString) return "";
|
|
9
|
+
const params = [];
|
|
10
|
+
queryString.split("&").forEach(part => {
|
|
11
|
+
const [key, value] = part.split("=");
|
|
12
|
+
|
|
13
|
+
if (key && value) {
|
|
14
|
+
var _context;
|
|
15
|
+
|
|
16
|
+
params.push(_concatInstanceProperty(_context = "".concat(encodeURIComponent(key), "=")).call(_context, encodeURIComponent(value)));
|
|
17
|
+
} else if (key) {
|
|
18
|
+
params.push(encodeURIComponent(key));
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
return params.join("&");
|
|
22
|
+
};
|
|
23
|
+
/**
|
|
24
|
+
*/
|
|
25
|
+
|
|
26
|
+
|
|
7
27
|
export const getFullRequestUrl = request => {
|
|
8
|
-
var
|
|
28
|
+
var _context2;
|
|
9
29
|
|
|
10
30
|
let pathInfo = request.getPathInfo() || "/";
|
|
11
31
|
let queryString = request.getQueryString();
|
|
12
|
-
pathInfo = _mapInstanceProperty(
|
|
32
|
+
pathInfo = _mapInstanceProperty(_context2 = pathInfo.split("/")).call(_context2, segment => encodeURIComponent(segment)).join("/");
|
|
13
33
|
|
|
14
34
|
if (queryString) {
|
|
15
|
-
var
|
|
35
|
+
var _context3;
|
|
16
36
|
|
|
17
|
-
return _concatInstanceProperty(
|
|
37
|
+
return _concatInstanceProperty(_context3 = "".concat(pathInfo, "?")).call(_context3, encodeQueryString(queryString));
|
|
18
38
|
}
|
|
19
39
|
|
|
20
40
|
return pathInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestInformation.js","names":["Href","
|
|
1
|
+
{"version":3,"file":"requestInformation.js","names":["Href","encodeQueryString","queryString","params","split","forEach","part","key","value","push","encodeURIComponent","join","getFullRequestUrl","request","pathInfo","getPathInfo","getQueryString","segment","getFullRequestHref","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n if (!queryString) return \"\";\n\n const params = [];\n queryString.split(\"&\").forEach((part) => {\n const [key, value] = part.split(\"=\");\n if (key && value) {\n params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);\n } else if (key) {\n params.push(encodeURIComponent(key));\n }\n });\n return params.join(\"&\");\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n let pathInfo = request.getPathInfo() || \"/\";\n let queryString = request.getQueryString();\n\n pathInfo = pathInfo\n .split(\"/\")\n .map((segment) => encodeURIComponent(segment))\n .join(\"/\");\n\n if (queryString) {\n return `${pathInfo}?${encodeQueryString(queryString)}`;\n }\n\n return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n request: HttpServletRequestJava,\n cookieName: string\n): null | string => {\n return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n request: HttpServletRequestJava,\n locales: Locales\n): void | string => {\n const languageFromCookie = getCookieFromRequest(request, \"locale\");\n const acceptLanguageHeader =\n languageFromCookie || request.getHeader(\"Accept-Language\");\n\n // when no accept language header or cookie present, get first locale code\n if (acceptLanguageHeader === null) {\n return locales.availableLocaleCodes[0];\n }\n\n return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;AACA,OAAOA,IAAP,MAAiB,qBAAjB;;AAIA;AACA;AACA,MAAMC,iBAAiB,GAAIC,WAAD,IAAyB;EACjD,IAAI,CAACA,WAAL,EAAkB,OAAO,EAAP;EAElB,MAAMC,MAAM,GAAG,EAAf;EACAD,WAAW,CAACE,KAAZ,CAAkB,GAAlB,EAAuBC,OAAvB,CAAgCC,IAAD,IAAU;IACvC,MAAM,CAACC,GAAD,EAAMC,KAAN,IAAeF,IAAI,CAACF,KAAL,CAAW,GAAX,CAArB;;IACA,IAAIG,GAAG,IAAIC,KAAX,EAAkB;MAAA;;MAChBL,MAAM,CAACM,IAAP,8CAAeC,kBAAkB,CAACH,GAAD,CAAjC,uBAA0CG,kBAAkB,CAACF,KAAD,CAA5D;IACD,CAFD,MAEO,IAAID,GAAJ,EAAS;MACdJ,MAAM,CAACM,IAAP,CAAYC,kBAAkB,CAACH,GAAD,CAA9B;IACD;EACF,CAPD;EAQA,OAAOJ,MAAM,CAACQ,IAAP,CAAY,GAAZ,CAAP;AACD,CAbD;AAeA;AACA;;;AACA,OAAO,MAAMC,iBAAiB,GAAIC,OAAD,IAA6C;EAAA;;EAC5E,IAAIC,QAAQ,GAAGD,OAAO,CAACE,WAAR,MAAyB,GAAxC;EACA,IAAIb,WAAW,GAAGW,OAAO,CAACG,cAAR,EAAlB;EAEAF,QAAQ,GAAG,iCAAAA,QAAQ,CAChBV,KADQ,CACF,GADE,mBAEHa,OAAD,IAAaP,kBAAkB,CAACO,OAAD,CAF3B,EAGRN,IAHQ,CAGH,GAHG,CAAX;;EAKA,IAAIT,WAAJ,EAAiB;IAAA;;IACf,qDAAUY,QAAV,wBAAsBb,iBAAiB,CAACC,WAAD,CAAvC;EACD;;EAED,OAAOY,QAAP;AACD,CAdM;AAgBP;AACA;;AACA,OAAO,MAAMI,kBAAkB,GAAIL,OAAD,IAChC,IAAIb,IAAJ,CAASY,iBAAiB,CAACC,OAAD,CAA1B,CADK;AAGP;AACA;;AACA,OAAO,MAAMM,oBAAoB,GAAG,CAClCN,OADkC,EAElCO,UAFkC,KAGhB;EAClB,OAAOP,OAAO,CAACQ,eAAR,CAAwBD,UAAxB,CAAP;AACD,CALM;AAOP;AACA;;AACA,OAAO,MAAME,kBAAkB,GAAG,CAChCT,OADgC,EAEhCU,OAFgC,KAGd;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACN,OAAD,EAAU,QAAV,CAA/C;EACA,MAAMY,oBAAoB,GACxBD,kBAAkB,IAAIX,OAAO,CAACa,SAAR,CAAkB,iBAAlB,CADxB,CAFkB,CAKlB;;EACA,IAAID,oBAAoB,KAAK,IAA7B,EAAmC;IACjC,OAAOF,OAAO,CAACI,oBAAR,CAA6B,CAA7B,CAAP;EACD;;EAED,OAAOJ,OAAO,CAACD,kBAAR,CAA2BG,oBAA3B,CAAP;AACD,CAdM"}
|
|
@@ -7,25 +7,45 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.getPreferredLocale = exports.getFullRequestUrl = exports.getFullRequestHref = exports.getCookieFromRequest = void 0;
|
|
9
9
|
|
|
10
|
-
var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
|
|
11
|
-
|
|
12
10
|
var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
|
|
13
11
|
|
|
12
|
+
var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
|
|
13
|
+
|
|
14
14
|
var _Href = _interopRequireDefault(require("../models/href/Href"));
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
17
|
*/
|
|
18
|
+
const encodeQueryString = queryString => {
|
|
19
|
+
if (!queryString) return "";
|
|
20
|
+
const params = [];
|
|
21
|
+
queryString.split("&").forEach(part => {
|
|
22
|
+
const [key, value] = part.split("=");
|
|
23
|
+
|
|
24
|
+
if (key && value) {
|
|
25
|
+
var _context;
|
|
26
|
+
|
|
27
|
+
params.push((0, _concat.default)(_context = "".concat(encodeURIComponent(key), "=")).call(_context, encodeURIComponent(value)));
|
|
28
|
+
} else if (key) {
|
|
29
|
+
params.push(encodeURIComponent(key));
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
return params.join("&");
|
|
33
|
+
};
|
|
34
|
+
/**
|
|
35
|
+
*/
|
|
36
|
+
|
|
37
|
+
|
|
18
38
|
const getFullRequestUrl = request => {
|
|
19
|
-
var
|
|
39
|
+
var _context2;
|
|
20
40
|
|
|
21
41
|
let pathInfo = request.getPathInfo() || "/";
|
|
22
42
|
let queryString = request.getQueryString();
|
|
23
|
-
pathInfo = (0, _map.default)(
|
|
43
|
+
pathInfo = (0, _map.default)(_context2 = pathInfo.split("/")).call(_context2, segment => encodeURIComponent(segment)).join("/");
|
|
24
44
|
|
|
25
45
|
if (queryString) {
|
|
26
|
-
var
|
|
46
|
+
var _context3;
|
|
27
47
|
|
|
28
|
-
return (0, _concat.default)(
|
|
48
|
+
return (0, _concat.default)(_context3 = "".concat(pathInfo, "?")).call(_context3, encodeQueryString(queryString));
|
|
29
49
|
}
|
|
30
50
|
|
|
31
51
|
return pathInfo;
|
|
@@ -3,6 +3,23 @@ import Href from "../models/href/Href";
|
|
|
3
3
|
|
|
4
4
|
import type Locales from "../i18n/Locales";
|
|
5
5
|
|
|
6
|
+
/**
|
|
7
|
+
*/
|
|
8
|
+
const encodeQueryString = (queryString: string) => {
|
|
9
|
+
if (!queryString) return "";
|
|
10
|
+
|
|
11
|
+
const params = [];
|
|
12
|
+
queryString.split("&").forEach((part) => {
|
|
13
|
+
const [key, value] = part.split("=");
|
|
14
|
+
if (key && value) {
|
|
15
|
+
params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
|
|
16
|
+
} else if (key) {
|
|
17
|
+
params.push(encodeURIComponent(key));
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
return params.join("&");
|
|
21
|
+
};
|
|
22
|
+
|
|
6
23
|
/**
|
|
7
24
|
*/
|
|
8
25
|
export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
|
|
@@ -15,7 +32,7 @@ export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
|
|
|
15
32
|
.join("/");
|
|
16
33
|
|
|
17
34
|
if (queryString) {
|
|
18
|
-
return `${pathInfo}?${
|
|
35
|
+
return `${pathInfo}?${encodeQueryString(queryString)}`;
|
|
19
36
|
}
|
|
20
37
|
|
|
21
38
|
return pathInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestInformation.js","names":["
|
|
1
|
+
{"version":3,"file":"requestInformation.js","names":["encodeQueryString","queryString","params","split","forEach","part","key","value","push","encodeURIComponent","join","getFullRequestUrl","request","pathInfo","getPathInfo","getQueryString","segment","getFullRequestHref","Href","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n if (!queryString) return \"\";\n\n const params = [];\n queryString.split(\"&\").forEach((part) => {\n const [key, value] = part.split(\"=\");\n if (key && value) {\n params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);\n } else if (key) {\n params.push(encodeURIComponent(key));\n }\n });\n return params.join(\"&\");\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n let pathInfo = request.getPathInfo() || \"/\";\n let queryString = request.getQueryString();\n\n pathInfo = pathInfo\n .split(\"/\")\n .map((segment) => encodeURIComponent(segment))\n .join(\"/\");\n\n if (queryString) {\n return `${pathInfo}?${encodeQueryString(queryString)}`;\n }\n\n return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n request: HttpServletRequestJava,\n cookieName: string\n): null | string => {\n return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n request: HttpServletRequestJava,\n locales: Locales\n): void | string => {\n const languageFromCookie = getCookieFromRequest(request, \"locale\");\n const acceptLanguageHeader =\n languageFromCookie || request.getHeader(\"Accept-Language\");\n\n // when no accept language header or cookie present, get first locale code\n if (acceptLanguageHeader === null) {\n return locales.availableLocaleCodes[0];\n }\n\n return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;;;;;;;;;;;;AACA;;AAIA;AACA;AACA,MAAMA,iBAAiB,GAAIC,WAAD,IAAyB;EACjD,IAAI,CAACA,WAAL,EAAkB,OAAO,EAAP;EAElB,MAAMC,MAAM,GAAG,EAAf;EACAD,WAAW,CAACE,KAAZ,CAAkB,GAAlB,EAAuBC,OAAvB,CAAgCC,IAAD,IAAU;IACvC,MAAM,CAACC,GAAD,EAAMC,KAAN,IAAeF,IAAI,CAACF,KAAL,CAAW,GAAX,CAArB;;IACA,IAAIG,GAAG,IAAIC,KAAX,EAAkB;MAAA;;MAChBL,MAAM,CAACM,IAAP,2CAAeC,kBAAkB,CAACH,GAAD,CAAjC,uBAA0CG,kBAAkB,CAACF,KAAD,CAA5D;IACD,CAFD,MAEO,IAAID,GAAJ,EAAS;MACdJ,MAAM,CAACM,IAAP,CAAYC,kBAAkB,CAACH,GAAD,CAA9B;IACD;EACF,CAPD;EAQA,OAAOJ,MAAM,CAACQ,IAAP,CAAY,GAAZ,CAAP;AACD,CAbD;AAeA;AACA;;;AACO,MAAMC,iBAAiB,GAAIC,OAAD,IAA6C;EAAA;;EAC5E,IAAIC,QAAQ,GAAGD,OAAO,CAACE,WAAR,MAAyB,GAAxC;EACA,IAAIb,WAAW,GAAGW,OAAO,CAACG,cAAR,EAAlB;EAEAF,QAAQ,GAAG,8BAAAA,QAAQ,CAChBV,KADQ,CACF,GADE,mBAEHa,OAAD,IAAaP,kBAAkB,CAACO,OAAD,CAF3B,EAGRN,IAHQ,CAGH,GAHG,CAAX;;EAKA,IAAIT,WAAJ,EAAiB;IAAA;;IACf,kDAAUY,QAAV,wBAAsBb,iBAAiB,CAACC,WAAD,CAAvC;EACD;;EAED,OAAOY,QAAP;AACD,CAdM;AAgBP;AACA;;;;;AACO,MAAMI,kBAAkB,GAAIL,OAAD,IAChC,IAAIM,aAAJ,CAASP,iBAAiB,CAACC,OAAD,CAA1B,CADK;AAGP;AACA;;;;;AACO,MAAMO,oBAAoB,GAAG,CAClCP,OADkC,EAElCQ,UAFkC,KAGhB;EAClB,OAAOR,OAAO,CAACS,eAAR,CAAwBD,UAAxB,CAAP;AACD,CALM;AAOP;AACA;;;;;AACO,MAAME,kBAAkB,GAAG,CAChCV,OADgC,EAEhCW,OAFgC,KAGd;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACP,OAAD,EAAU,QAAV,CAA/C;EACA,MAAMa,oBAAoB,GACxBD,kBAAkB,IAAIZ,OAAO,CAACc,SAAR,CAAkB,iBAAlB,CADxB,CAFkB,CAKlB;;EACA,IAAID,oBAAoB,KAAK,IAA7B,EAAmC;IACjC,OAAOF,OAAO,CAACI,oBAAR,CAA6B,CAA7B,CAAP;EACD;;EAED,OAAOJ,OAAO,CAACD,kBAAR,CAA2BG,oBAA3B,CAAP;AACD,CAdM"}
|
package/package.json
CHANGED
|
@@ -3,6 +3,23 @@ import Href from "../models/href/Href";
|
|
|
3
3
|
|
|
4
4
|
import type Locales from "../i18n/Locales";
|
|
5
5
|
|
|
6
|
+
/**
|
|
7
|
+
*/
|
|
8
|
+
const encodeQueryString = (queryString: string) => {
|
|
9
|
+
if (!queryString) return "";
|
|
10
|
+
|
|
11
|
+
const params = [];
|
|
12
|
+
queryString.split("&").forEach((part) => {
|
|
13
|
+
const [key, value] = part.split("=");
|
|
14
|
+
if (key && value) {
|
|
15
|
+
params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
|
|
16
|
+
} else if (key) {
|
|
17
|
+
params.push(encodeURIComponent(key));
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
return params.join("&");
|
|
21
|
+
};
|
|
22
|
+
|
|
6
23
|
/**
|
|
7
24
|
*/
|
|
8
25
|
export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
|
|
@@ -15,7 +32,7 @@ export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
|
|
|
15
32
|
.join("/");
|
|
16
33
|
|
|
17
34
|
if (queryString) {
|
|
18
|
-
return `${pathInfo}?${
|
|
35
|
+
return `${pathInfo}?${encodeQueryString(queryString)}`;
|
|
19
36
|
}
|
|
20
37
|
|
|
21
38
|
return pathInfo;
|