@things-factory/i18n-base 4.0.4 → 4.0.9

package/dist-server/middlewares/index.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initMiddlewares = void 0;
-const i18next_1 = __importDefault(require("i18next"));
 const translations_1 = require("./translations");
 const fs_1 = __importDefault(require("fs"));
-const koaI18next = require('koa-i18next');
+const i18next_1 = __importDefault(require("i18next"));
+const koa_i18next_1 = __importDefault(require("./koa-i18next"));
 const debug = require('debug')('things-factory:i18n-base:middlewares');
 i18next_1.default.init({
     debug: false,
@@ -29,7 +29,7 @@ process.on('client-rebuilt', (app, fs) => {
     (0, translations_1.build)(fs);
 });
 function initMiddlewares(app) {
-    app.use(koaI18next(i18next_1.default, {
+    app.use((0, koa_i18next_1.default)(i18next_1.default, {
         lookupCookie: 'i18next',
         order: ['cookie', 'header'],
         next: true // if koa is version 2

package/dist-server/middlewares/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/middlewares/index.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,iDAAsC;AACtC,4CAAmB;AAEnB,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAEzC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,sCAAsC,CAAC,CAAA;AAEtE,iBAAO,CAAC,IAAI,CAAC;IACX,KAAK,EAAE,KAAK;IACZ,EAAE,EAAE,CAAC,cAAc,CAAC;IACpB,SAAS,EAAE,cAAc;IACzB,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IACjC,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE;QACb,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,GAAG;KACZ;IACD,IAAI,EAAE,cAAc;IACpB,YAAY,EAAE,KAAK;CACpB,CAAC,CAAA;AAEF,IAAA,oBAAK,EAAC,YAAE,CAAC,CAAA;AAET,OAAO,CAAC,EAAE,CAAC,gBAAuB,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;IAC9C,qEAAqE;IACrE,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAA;IAC9C,IAAA,oBAAK,EAAC,EAAE,CAAC,CAAA;AACX,CAAC,CAAC,CAAA;AAEF,SAAgB,eAAe,CAAC,GAAQ;IACtC,GAAG,CAAC,GAAG,CACL,UAAU,CAAC,iBAAO,EAAE;QAClB,YAAY,EAAE,SAAS;QACvB,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAC3B,IAAI,EAAE,IAAI,CAAC,sBAAsB;KAClC,CAAC,CACH,CAAA;AACH,CAAC;AARD,0CAQC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/middlewares/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAsC;AACtC,4CAAmB;AACnB,sDAA6B;AAC7B,gEAAsC;AAEtC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,sCAAsC,CAAC,CAAA;AAEtE,iBAAO,CAAC,IAAI,CAAC;IACX,KAAK,EAAE,KAAK;IACZ,EAAE,EAAE,CAAC,cAAc,CAAC;IACpB,SAAS,EAAE,cAAc;IACzB,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IACjC,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE;QACb,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,GAAG;KACZ;IACD,IAAI,EAAE,cAAc;IACpB,YAAY,EAAE,KAAK;CACpB,CAAC,CAAA;AAEF,IAAA,oBAAK,EAAC,YAAE,CAAC,CAAA;AAET,OAAO,CAAC,EAAE,CAAC,gBAAuB,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;IAC9C,qEAAqE;IACrE,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAA;IAC9C,IAAA,oBAAK,EAAC,EAAE,CAAC,CAAA;AACX,CAAC,CAAC,CAAA;AAEF,SAAgB,eAAe,CAAC,GAAQ;IACtC,GAAG,CAAC,GAAG,CACL,IAAA,qBAAU,EAAC,iBAAO,EAAE;QAClB,YAAY,EAAE,SAAS;QACvB,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAC3B,IAAI,EAAE,IAAI,CAAC,sBAAsB;KAClC,CAAC,CACH,CAAA;AACH,CAAC;AARD,0CAQC"}

package/dist-server/middlewares/koa-i18next/detect.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const debug = require('debug')('things-factory:i18n-base:middlewares:koa:i18next');
+const DEFAULT_ORDER = ['querystring', 'cookie', 'header'];
+const detectors = {
+    cookie: function (context, options) {
+        let cookie = options.lookupCookie || 'i18next';
+        return context.cookies.get(cookie);
+    },
+    // fork from i18next-express-middleware
+    header: function (context) {
+        let acceptLanguage = context.get('accept-language');
+        let found;
+        let locales = [];
+        if (acceptLanguage) {
+            let lngs = [];
+            // associate language tags by their 'q' value (between 1 and 0)
+            acceptLanguage.split(',').forEach(function (l) {
+                let parts = l.split(';'); // 'en-GB;q=0.8' -> ['en-GB', 'q=0.8']
+                // get the language tag qvalue: 'q=0.8' -> 0.8
+                let qvalue = 1; // default qvalue
+                for (let i = 0; i < parts.length; i++) {
+                    let part = parts[i].split('=');
+                    if (part[0] === 'q' && !isNaN(part[1])) {
+                        qvalue = Number(part[1]);
+                        break;
+                    }
+                }
+                // add the tag and primary subtag to the qvalue associations
+                lngs.push({
+                    lng: parts[0],
+                    q: qvalue
+                });
+            });
+            lngs.sort(function (a, b) {
+                return b.q - a.q;
+            });
+            for (let i = 0; i < lngs.length; i++) {
+                locales.push(lngs[i].lng);
+            }
+            if (locales.length)
+                found = locales;
+        }
+        return found;
+    },
+    path: function (context, options) {
+        let found;
+        if (options.lookupPath !== undefined && context.params) {
+            found = context.params[options.lookupPath];
+        }
+        if (!found && options.lookupFromPathIndex !== undefined) {
+            let parts = context.path.split('/');
+            if (parts[0] === '') {
+                // Handle paths that start with a slash, i.e., '/foo' -> ['', 'foo']
+                parts.shift();
+            }
+            if (parts.length > options.lookupFromPathIndex) {
+                found = parts[options.lookupFromPathIndex];
+            }
+        }
+        return found;
+    },
+    querystring: function (context, options) {
+        let name = options.lookupQuerystring || 'lng';
+        return context.query[name];
+    },
+    session: function (context, options) {
+        let name = options.lookupSession || 'lng';
+        return context.session && context.session[name];
+    }
+};
+function default_1(context, options = {}) {
+    let { order, fallback } = options;
+    order = order && Array.isArray(order) ? order : DEFAULT_ORDER;
+    let lngs = [];
+    for (let i = 0, len = order.length; i < len; i++) {
+        let detector = detectors[order[i]];
+        let lng;
+        if (detector) {
+            lng = detector(context, options);
+        }
+        if (lng && typeof lng === 'string') {
+            lngs.push(lng);
+        }
+        else {
+            lngs = lngs.concat(lng);
+        }
+    }
+    let found;
+    for (let i = 0, len = lngs.length; i < len; i++) {
+        let cleanedLng = context.i18next.services.languageUtils.formatLanguageCode(lngs[i]);
+        if (context.i18next.services.languageUtils.isSupportedCode(cleanedLng))
+            found = cleanedLng;
+        if (found)
+            break;
+    }
+    return found || fallback;
+}
+exports.default = default_1;
+//# sourceMappingURL=detect.js.map

package/dist-server/middlewares/koa-i18next/detect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../../server/middlewares/koa-i18next/detect.ts"],"names":[],"mappings":"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"}

package/dist-server/middlewares/koa-i18next/index.js

@@ -0,0 +1,131 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const detect_1 = __importDefault(require("./detect"));
+const debug = require('debug')('things-factory:i18n-base:middlewares:koa:i18next');
+function koaI18next(i18next, options = {}) {
+    return async function i18nextMiddleware(ctx, next) {
+        ctx.i18next = i18next;
+        let { lookupCookie, lookupSession } = options;
+        let lng = (0, detect_1.default)(ctx, options);
+        lng && setLanguage(ctx, lng, options);
+        debug('language is', lng);
+        ctx.t = function (...args) {
+            let key;
+            let opts;
+            // do detect path
+            if (!lng && isDetectPath(options.order)) {
+                lng = (0, detect_1.default)(ctx, Object.assign(options, { order: ['path'] }));
+                lng && setLanguage(ctx, lng, options);
+            }
+            if (args.length === 1) {
+                args.push({});
+            }
+            for (let i = 0, len = args.length; i < len; i++) {
+                let arg = args[i];
+                if (typeof arg === 'object' && !Array.isArray(arg)) {
+                    arg.lng = lng;
+                }
+            }
+            return i18next.t.apply(i18next, args);
+        };
+        await next();
+    };
+}
+exports.default = koaI18next;
+function setPath(object, path, newValue) {
+    let stack;
+    if (typeof path !== 'string')
+        stack = [].concat(path);
+    if (typeof path === 'string')
+        stack = path.split('.');
+    while (stack.length > 1) {
+        let key = stack.shift();
+        if (key.indexOf('###') > -1)
+            key = key.replace(/###/g, '.');
+        if (!object[key])
+            object[key] = {};
+        object = object[key];
+    }
+    let key = stack.shift();
+    if (key.indexOf('###') > -1)
+        key = key.replace(/###/g, '.');
+    object[key] = newValue;
+}
+koaI18next.getResourcesHandler = function (i18next, options) {
+    options = options || {};
+    let maxAge = options.maxAge || 60 * 60 * 24 * 30;
+    const propertyParam = options.propertyParam || 'query';
+    return async function (ctx, next) {
+        if (options.path && ctx.path !== options.path) {
+            return await next();
+        }
+        if (!i18next.services.backendConnector)
+            return ctx.throw(404, 'koa-i18next-middleware:: no backend configured');
+        let resources = {};
+        ctx.type = 'json';
+        if (options.cache !== undefined ? options.cache : process.env.NODE_ENV === 'production') {
+            ctx.set('Cache-Control', 'public, max-age=' + maxAge);
+            ctx.set('Expires', new Date(new Date().getTime() + maxAge * 1000).toUTCString());
+        }
+        else {
+            ctx.set('Pragma', 'no-cache');
+            ctx.set('Cache-Control', 'no-cache');
+        }
+        let languages = ctx[propertyParam][options.lngParam || 'lng']
+            ? ctx[propertyParam][options.lngParam || 'lng'].split(' ')
+            : [];
+        let namespaces = ctx[propertyParam][options.nsParam || 'ns']
+            ? ctx[propertyParam][options.nsParam || 'ns'].split(' ')
+            : [];
+        // extend ns
+        namespaces.forEach(ns => {
+            if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0)
+                i18next.options.ns.push(ns);
+        });
+        i18next.services.backendConnector.load(languages, namespaces, function () {
+            languages.forEach(lng => {
+                namespaces.forEach(ns => {
+                    setPath(resources, [lng, ns], i18next.getResourceBundle(lng, ns));
+                });
+            });
+            ctx.body = resources;
+        });
+    };
+};
+koaI18next.getMissingKeyHandler = function (i18next, options) {
+    options = options || {};
+    const propertyParam = options.propertyParam || 'query';
+    return async function (ctx, next) {
+        if (options.path && ctx.path !== options.path) {
+            return await next();
+        }
+        let lng = ctx[propertyParam][options.lngParam || 'lng'];
+        let ns = ctx[propertyParam][options.nsParam || 'ns'];
+        if (!i18next.services.backendConnector)
+            return ctx.throw(404, 'koa-i18next-middleware:: no backend configured');
+        for (var m in ctx.request.body) {
+            i18next.services.backendConnector.saveMissing([lng], ns, m, ctx.request.body[m]);
+        }
+        ctx.body = 'ok';
+    };
+};
+function isDetectPath(order = []) {
+    return order.indexOf('path') !== -1;
+}
+function setLanguage(context, lng, options = {}) {
+    const { lookupCookie, lookupPath, lookupSession } = options;
+    context.locals = Object.assign(context.locals || {}, { lng });
+    context.state = Object.assign(context.state || {}, { lng });
+    context.language = context.lng = lng;
+    context.set('content-language', lng);
+    if (lookupCookie) {
+        context.cookies.set(lookupCookie, lng, { httpOnly: false, signed: false });
+    }
+    if (lookupSession && context.session) {
+        context.session[lookupSession] = lng;
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist-server/middlewares/koa-i18next/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/middlewares/koa-i18next/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/i18n-base",
-  "version": "4.0.4",
+  "version": "4.0.9",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,11 +24,10 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/shell": "^4.0.4",
-    "i18next": "^19.8.3",
-    "i18next-browser-languagedetector": "^6.0.1",
-    "i18next-http-backend": "^1.0.21",
-    "koa-i18next": "^1.1.1"
+    "@things-factory/shell": "^4.0.9",
+    "i18next": "^21.5.4",
+    "i18next-browser-languagedetector": "^6.1.2",
+    "i18next-http-backend": "^1.3.1"
   },
-  "gitHead": "292d7c4e2675d228d6be474ea6a0525d26ac1657"
+  "gitHead": "81c8ae24487cfe79da62717f12bb6752761911ae"
 }

package/server/middlewares/index.ts

@@ -1,8 +1,7 @@
-import i18next from 'i18next'
 import { build } from './translations'
 import fs from 'fs'
-
-const koaI18next = require('koa-i18next')
+import i18next from 'i18next'
+import koaI18next from './koa-i18next'
 
 const debug = require('debug')('things-factory:i18n-base:middlewares')
 

package/server/middlewares/koa-i18next/detect.ts

@@ -0,0 +1,110 @@
+const debug = require('debug')('things-factory:i18n-base:middlewares:koa:i18next')
+
+const DEFAULT_ORDER = ['querystring', 'cookie', 'header']
+
+const detectors = {
+  cookie: function (context, options) {
+    let cookie = options.lookupCookie || 'i18next'
+    return context.cookies.get(cookie)
+  },
+
+  // fork from i18next-express-middleware
+  header: function (context) {
+    let acceptLanguage = context.get('accept-language')
+    let found
+    let locales = []
+    if (acceptLanguage) {
+      let lngs = []
+
+      // associate language tags by their 'q' value (between 1 and 0)
+      acceptLanguage.split(',').forEach(function (l) {
+        let parts = l.split(';') // 'en-GB;q=0.8' -> ['en-GB', 'q=0.8']
+
+        // get the language tag qvalue: 'q=0.8' -> 0.8
+        let qvalue = 1 // default qvalue
+
+        for (let i = 0; i < parts.length; i++) {
+          let part = parts[i].split('=')
+          if (part[0] === 'q' && !isNaN(part[1])) {
+            qvalue = Number(part[1])
+            break
+          }
+        }
+        // add the tag and primary subtag to the qvalue associations
+        lngs.push({
+          lng: parts[0],
+          q: qvalue
+        })
+      })
+
+      lngs.sort(function (a, b) {
+        return b.q - a.q
+      })
+
+      for (let i = 0; i < lngs.length; i++) {
+        locales.push(lngs[i].lng)
+      }
+
+      if (locales.length) found = locales
+    }
+
+    return found
+  },
+  path: function (context, options) {
+    let found
+
+    if (options.lookupPath !== undefined && context.params) {
+      found = context.params[options.lookupPath]
+    }
+
+    if (!found && options.lookupFromPathIndex !== undefined) {
+      let parts = context.path.split('/')
+      if (parts[0] === '') {
+        // Handle paths that start with a slash, i.e., '/foo' -> ['', 'foo']
+        parts.shift()
+      }
+
+      if (parts.length > options.lookupFromPathIndex) {
+        found = parts[options.lookupFromPathIndex]
+      }
+    }
+    return found
+  },
+  querystring: function (context, options) {
+    let name = options.lookupQuerystring || 'lng'
+    return context.query[name]
+  },
+
+  session: function (context, options) {
+    let name = options.lookupSession || 'lng'
+    return context.session && context.session[name]
+  }
+}
+
+export default function (context, options = {}) {
+  let { order, fallback } = options as any
+  order = order && Array.isArray(order) ? order : DEFAULT_ORDER
+
+  let lngs = []
+
+  for (let i = 0, len = order.length; i < len; i++) {
+    let detector = detectors[order[i]]
+    let lng
+    if (detector) {
+      lng = detector(context, options)
+    }
+    if (lng && typeof lng === 'string') {
+      lngs.push(lng)
+    } else {
+      lngs = lngs.concat(lng)
+    }
+  }
+  let found
+  for (let i = 0, len = lngs.length; i < len; i++) {
+    let cleanedLng = context.i18next.services.languageUtils.formatLanguageCode(lngs[i])
+    if (context.i18next.services.languageUtils.isSupportedCode(cleanedLng)) found = cleanedLng
+    if (found) break
+  }
+
+  return found || fallback
+}

package/server/middlewares/koa-i18next/index.ts

@@ -0,0 +1,139 @@
+import detect from './detect'
+
+const debug = require('debug')('things-factory:i18n-base:middlewares:koa:i18next')
+
+export default function koaI18next(i18next, options = {} as any) {
+  return async function i18nextMiddleware(ctx, next) {
+    ctx.i18next = i18next
+    let { lookupCookie, lookupSession } = options
+
+    let lng = detect(ctx, options)
+    lng && setLanguage(ctx, lng, options)
+
+    debug('language is', lng)
+
+    ctx.t = function (...args) {
+      let key
+      let opts
+      // do detect path
+      if (!lng && isDetectPath(options.order)) {
+        lng = detect(ctx, Object.assign(options, { order: ['path'] }))
+        lng && setLanguage(ctx, lng, options)
+      }
+
+      if (args.length === 1) {
+        args.push({})
+      }
+
+      for (let i = 0, len = args.length; i < len; i++) {
+        let arg = args[i]
+        if (typeof arg === 'object' && !Array.isArray(arg)) {
+          arg.lng = lng
+        }
+      }
+      return i18next.t.apply(i18next, args)
+    }
+
+    await next()
+  }
+}
+
+function setPath(object, path, newValue) {
+  let stack
+  if (typeof path !== 'string') stack = [].concat(path)
+  if (typeof path === 'string') stack = path.split('.')
+
+  while (stack.length > 1) {
+    let key = stack.shift()
+    if (key.indexOf('###') > -1) key = key.replace(/###/g, '.')
+    if (!object[key]) object[key] = {}
+    object = object[key]
+  }
+
+  let key = stack.shift()
+  if (key.indexOf('###') > -1) key = key.replace(/###/g, '.')
+  object[key] = newValue
+}
+
+koaI18next.getResourcesHandler = function (i18next, options) {
+  options = options || {}
+  let maxAge = options.maxAge || 60 * 60 * 24 * 30
+  const propertyParam = options.propertyParam || 'query'
+
+  return async function (ctx, next) {
+    if (options.path && ctx.path !== options.path) {
+      return await next()
+    }
+    if (!i18next.services.backendConnector) return ctx.throw(404, 'koa-i18next-middleware:: no backend configured')
+
+    let resources = {}
+
+    ctx.type = 'json'
+    if (options.cache !== undefined ? options.cache : process.env.NODE_ENV === 'production') {
+      ctx.set('Cache-Control', 'public, max-age=' + maxAge)
+      ctx.set('Expires', new Date(new Date().getTime() + maxAge * 1000).toUTCString())
+    } else {
+      ctx.set('Pragma', 'no-cache')
+      ctx.set('Cache-Control', 'no-cache')
+    }
+
+    let languages = ctx[propertyParam][options.lngParam || 'lng']
+      ? ctx[propertyParam][options.lngParam || 'lng'].split(' ')
+      : []
+    let namespaces = ctx[propertyParam][options.nsParam || 'ns']
+      ? ctx[propertyParam][options.nsParam || 'ns'].split(' ')
+      : []
+
+    // extend ns
+    namespaces.forEach(ns => {
+      if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) i18next.options.ns.push(ns)
+    })
+
+    i18next.services.backendConnector.load(languages, namespaces, function () {
+      languages.forEach(lng => {
+        namespaces.forEach(ns => {
+          setPath(resources, [lng, ns], i18next.getResourceBundle(lng, ns))
+        })
+      })
+      ctx.body = resources
+    })
+  }
+}
+
+koaI18next.getMissingKeyHandler = function (i18next, options) {
+  options = options || {}
+  const propertyParam = options.propertyParam || 'query'
+
+  return async function (ctx, next) {
+    if (options.path && ctx.path !== options.path) {
+      return await next()
+    }
+    let lng = ctx[propertyParam][options.lngParam || 'lng']
+    let ns = ctx[propertyParam][options.nsParam || 'ns']
+
+    if (!i18next.services.backendConnector) return ctx.throw(404, 'koa-i18next-middleware:: no backend configured')
+
+    for (var m in ctx.request.body) {
+      i18next.services.backendConnector.saveMissing([lng], ns, m, ctx.request.body[m])
+    }
+    ctx.body = 'ok'
+  }
+}
+
+function isDetectPath(order = []) {
+  return order.indexOf('path') !== -1
+}
+
+function setLanguage(context, lng, options = {} as any) {
+  const { lookupCookie, lookupPath, lookupSession } = options
+  context.locals = Object.assign(context.locals || {}, { lng })
+  context.state = Object.assign(context.state || {}, { lng })
+  context.language = context.lng = lng
+  context.set('content-language', lng)
+  if (lookupCookie) {
+    context.cookies.set(lookupCookie, lng, { httpOnly: false, signed: false })
+  }
+  if (lookupSession && context.session) {
+    context.session[lookupSession] = lng
+  }
+}