@companieshouse/ch-node-utils 1.1.1 → 1.1.2
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/lib/middleware/manageLocales.middleware.js +4 -5
- package/lib/middleware/manageLocales.middleware.js.map +1 -1
- package/lib/services/locales/locales.service.js +3 -2
- package/lib/services/locales/locales.service.js.map +1 -1
- package/lib/utils/i18nCh.js +5 -4
- package/lib/utils/i18nCh.js.map +1 -1
- package/lib/utils/log.d.ts +1 -0
- package/lib/utils/log.js +18 -0
- package/lib/utils/log.js.map +1 -0
- package/package.json +1 -1
|
@@ -5,20 +5,19 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const constants_1 = require("../constants/constants");
|
|
6
6
|
const locales_service_1 = tslib_1.__importDefault(require("../services/locales/locales.service"));
|
|
7
7
|
const languageNames_1 = tslib_1.__importDefault(require("../utils/languageNames"));
|
|
8
|
+
const log_1 = tslib_1.__importDefault(require("../utils/log"));
|
|
8
9
|
function LocalesMiddleware() {
|
|
9
10
|
return (req, res, next) => {
|
|
10
11
|
var _a;
|
|
11
|
-
|
|
12
|
+
(0, log_1.default)("---------- LocalesMiddleware ------------");
|
|
12
13
|
let lang = (req.query[constants_1.QUERY_PAR_LANG] ||
|
|
13
14
|
req.body.lang ||
|
|
14
15
|
((_a = req.session) === null || _a === void 0 ? void 0 : _a.getExtraData(constants_1.QUERY_PAR_LANG)));
|
|
15
|
-
|
|
16
|
-
console.log("body:");
|
|
17
|
-
console.log(req.body);
|
|
18
|
-
console.log("=====2=====Mng Loc");
|
|
16
|
+
(0, log_1.default)(`LocalesMiddleware ....(init with received values: lang=${lang}) - body:${req.body.lang})`);
|
|
19
17
|
if (lang === undefined || !languageNames_1.default.isSupportedLocale(locales_service_1.default.getInstance().localesFolder, lang)) {
|
|
20
18
|
lang = "en";
|
|
21
19
|
}
|
|
20
|
+
(0, log_1.default)(`LocalesMiddleware ....(setting lang=${lang})`);
|
|
22
21
|
if (req.session) {
|
|
23
22
|
req.session.setExtraData(constants_1.QUERY_PAR_LANG, lang);
|
|
24
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manageLocales.middleware.js","sourceRoot":"","sources":["../../src/middleware/manageLocales.middleware.ts"],"names":[],"mappings":";;;;AACA,sDAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"manageLocales.middleware.js","sourceRoot":"","sources":["../../src/middleware/manageLocales.middleware.ts"],"names":[],"mappings":";;;;AACA,sDAAuD;AACvD,kGAAiE;AACjE,mFAAoD;AACpD,+DAA+B;AAE/B,SAAgB,iBAAiB;IAC9B,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;;QAExD,IAAA,aAAG,EAAC,2CAA2C,CAAC,CAAA;QAChD,IAAI,IAAI,GAAuB,CAAS,GAAG,CAAC,KAAK,CAAC,0BAAc,CAAC;YAChC,GAAG,CAAC,IAAI,CAAC,IAAI;aACb,MAAA,GAAG,CAAC,OAAO,0CAAE,YAAY,CAAS,0BAAc,CAAC,CAAA,CAAC,CAAA;QACnF,IAAA,aAAG,EAAC,0DAA0D,IAAI,YAAY,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QAC/F,IAAI,IAAI,KAAK,SAAS,IAAI,CAAE,uBAAa,CAAC,iBAAiB,CAAE,yBAAc,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE;YAC1G,IAAI,GAAG,IAAI,CAAA;SAChB;QACD,IAAA,aAAG,EAAC,uCAAuC,IAAI,GAAG,CAAC,CAAA;QACnD,IAAI,GAAG,CAAC,OAAO,EAAE;YACd,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,0BAAc,EAAE,IAAI,CAAC,CAAA;SAChD;QACD,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;QACf,MAAM,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC7C,GAAG,CAAC,GAAG,GAAG,gBAAgB,CAAA;QAE1B,MAAM,UAAU,GAAG,GAAG,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,gBAAgB,EAAE,CAAA;QAC5E,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,UAAU,CAAA;QAGlC,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAA;QAC1B,GAAG,CAAC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAA;QAC/B,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAA;QAE1B,OAAO,IAAI,EAAE,CAAA;IAChB,CAAC,CAAA;AACJ,CAAC;AA7BD,8CA6BC"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const i18nCh_1 = tslib_1.__importDefault(require("../../utils/i18nCh"));
|
|
5
|
+
const log_1 = tslib_1.__importDefault(require("../../utils/log"));
|
|
5
6
|
class LocalesService {
|
|
6
7
|
constructor(localesFolder, enabled) {
|
|
7
|
-
|
|
8
|
+
(0, log_1.default)("---------- LocalesService: constructor ------------");
|
|
8
9
|
this.enabled = enabled;
|
|
9
10
|
this.localesFolder = localesFolder;
|
|
10
11
|
this.i18nCh = i18nCh_1.default.getInstance(localesFolder);
|
|
@@ -12,7 +13,7 @@ class LocalesService {
|
|
|
12
13
|
console.log(`enabled: ${this.enabled} / path: ${this.localesFolder} / i18nCh: ${this.i18nCh}`);
|
|
13
14
|
}
|
|
14
15
|
static getInstance(localesFolder = "locales", enabled = false) {
|
|
15
|
-
|
|
16
|
+
(0, log_1.default)("---------- LocalesService: getInstance ------------");
|
|
16
17
|
if (!LocalesService.instance) {
|
|
17
18
|
LocalesService.instance = new LocalesService(localesFolder, enabled);
|
|
18
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locales.service.js","sourceRoot":"","sources":["../../../src/services/locales/locales.service.ts"],"names":[],"mappings":";;;AAAA,wEAAwC;
|
|
1
|
+
{"version":3,"file":"locales.service.js","sourceRoot":"","sources":["../../../src/services/locales/locales.service.ts"],"names":[],"mappings":";;;AAAA,wEAAwC;AACxC,kEAAkC;AAGlC,MAAqB,cAAc;IAQhC,YAAoB,aAAqB,EAAE,OAAgB;QACxD,IAAA,aAAG,EAAC,qDAAqD,CAAC,CAAA;QAC1D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,MAAM,GAAG,gBAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,OAAO,YAAY,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;QACrE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,OAAO,YAAY,IAAI,CAAC,aAAa,cAAc,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;IACjG,CAAC;IAIM,MAAM,CAAC,WAAW,CAAC,gBAAwB,SAAS,EAAE,UAAmB,KAAK;QAClF,IAAA,aAAG,EAAC,qDAAqD,CAAC,CAAA;QAC1D,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;YAC3B,cAAc,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;SACtE;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC;IAClC,CAAC;CACH;AA1BD,iCA0BC"}
|
package/lib/utils/i18nCh.js
CHANGED
|
@@ -5,6 +5,7 @@ const i18next_1 = tslib_1.__importDefault(require("i18next"));
|
|
|
5
5
|
const i18next_fs_backend_1 = tslib_1.__importDefault(require("i18next-fs-backend"));
|
|
6
6
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
7
|
const fs_1 = tslib_1.__importStar(require("fs"));
|
|
8
|
+
const log_1 = tslib_1.__importDefault(require("./log"));
|
|
8
9
|
class i18nCh {
|
|
9
10
|
constructor(localesFolder = "", nameSpaces = [], lang = "en") {
|
|
10
11
|
this.nameSpaces = [];
|
|
@@ -70,11 +71,11 @@ class i18nCh {
|
|
|
70
71
|
const keysValuesList = this.i18nInst.getDataByLanguage("en");
|
|
71
72
|
if (keysValuesList !== undefined) {
|
|
72
73
|
for (const [ns, value] of Object.entries(keysValuesList)) {
|
|
73
|
-
|
|
74
|
+
(0, log_1.default)(`${ns}: ${this.nameSpaces}`);
|
|
74
75
|
if (this.nameSpaces.includes(ns)) {
|
|
75
|
-
|
|
76
|
+
(0, log_1.default)(`${ns}`);
|
|
76
77
|
for (const [key] of Object.entries(value)) {
|
|
77
|
-
|
|
78
|
+
(0, log_1.default)(`${key}`);
|
|
78
79
|
data[key] = this.i18nInst.t(key, { lng: lang, ns: ns, vars });
|
|
79
80
|
}
|
|
80
81
|
}
|
|
@@ -93,7 +94,7 @@ class i18nCh {
|
|
|
93
94
|
try {
|
|
94
95
|
this.changeLanguage(lang);
|
|
95
96
|
t = this.i18nInst.t(key, { lng: lang, ns: this.nameSpaces, vars });
|
|
96
|
-
|
|
97
|
+
(0, log_1.default)(`searched for key:${key} lang:${lang} and got: ${t}`);
|
|
97
98
|
}
|
|
98
99
|
catch (err) {
|
|
99
100
|
throw err;
|
package/lib/utils/i18nCh.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18nCh.js","sourceRoot":"","sources":["../../src/utils/i18nCh.ts"],"names":[],"mappings":";;;AAAA,8DAA6B;AAC7B,oFAAwC;AACxC,wDAA2B;AAC3B,iDAA+C;
|
|
1
|
+
{"version":3,"file":"i18nCh.js","sourceRoot":"","sources":["../../src/utils/i18nCh.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default function log(str: string): void;
|
package/lib/utils/log.js
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
function log(str) {
|
|
4
|
+
let logLevel = process.env.CH_NODE_UTILS_LOG_LVL;
|
|
5
|
+
if (logLevel) {
|
|
6
|
+
logLevel = logLevel.toUpperCase();
|
|
7
|
+
switch (logLevel) {
|
|
8
|
+
case "TRACE":
|
|
9
|
+
case "DEBUG":
|
|
10
|
+
console.log(`ch-node-utils - ${logLevel}: ${str}`);
|
|
11
|
+
break;
|
|
12
|
+
default:
|
|
13
|
+
break;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
exports.default = log;
|
|
18
|
+
//# sourceMappingURL=log.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":";;AAAA,SAAwB,GAAG,CAAE,GAAW;IACrC,IAAI,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IACjD,IAAI,QAAQ,EAAE;QACX,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAA;QACjC,QAAQ,QAAQ,EAAE;YACf,KAAK,OAAO,CAAC;YACb,KAAK,OAAO;gBACT,OAAO,CAAC,GAAG,CAAC,mBAAmB,QAAQ,KAAK,GAAG,EAAE,CAAC,CAAA;gBAClD,MAAK;YACR;gBACG,MAAK;SACV;KACH;AACJ,CAAC;AAbD,sBAaC"}
|