@ladjs/i18n - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

lib/index.js

@@ -1,20 +0,32 @@
-'use strict';
+"use strict";
 
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
-var _require = require('path');
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-const extname = _require.extname,
+const _require = require('path'),
+      extname = _require.extname,
       resolve = _require.resolve;
 
-var _require2 = require('qs');
+const Boom = require('@hapi/boom');
 
-const stringify = _require2.stringify;
+const autoBind = require('auto-bind');
 
-const Boom = require('boom');
-const s = require('underscore.string');
+const boolean = require('boolean');
 
-var _require3 = require('lodash');
+const debug = require('debug')('ladjs:i18n');
 
-const isEmpty = _require3.isEmpty,
+const i18n = require('i18n');
+
+const locales = require('i18n-locales');
+
+const moment = require('moment');
+
+const titleize = require('titleize');
+
+const _require2 = require('country-language'),
+      getLanguage = _require2.getLanguage;
+
+const _require3 = require('lodash'),
+      isEmpty = _require3.isEmpty,
       sortBy = _require3.sortBy,
@@ -24,14 +36,6 @@ every = _require3.every,
 
-var _require4 = require('country-language');
+const _require4 = require('qs'),
+      stringify = _require4.stringify; // expose global
 
-const getLanguage = _require4.getLanguage;
 
-const moment = require('moment');
-const i18n = require('i18n');
-const locales = require('i18n-locales');
-const autoBind = require('auto-bind');
-const debug = require('debug')('ladjs:i18n');
-const boolean = require('boolean');
-
-// expose global
 i18n.api = {};
@@ -61,19 +65,12 @@
     }, config);
-
     const logger = this.config.logger;
-
-
     this.config.logDebugFn = logger.debug;
     this.config.logWarnFn = logger.warn;
-    this.config.logErrorFn = logger.error;
+    this.config.logErrorFn = logger.error; // validate locales against available ones
 
-    // validate locales against available ones
-    if (!every(this.config.locales, l => locales.includes(l))) throw new Error(`Invalid locales: ${this.config.locales.filter(str => !locales.includes(str)).join(', ')}`);
+    if (!every(this.config.locales, l => locales.includes(l))) throw new Error(`Invalid locales: ${this.config.locales.filter(str => !locales.includes(str)).join(', ')}`); // inherit i18n object
 
-    // inherit i18n object
-    Object.assign(this, i18n);
+    Object.assign(this, i18n); // configure i18n
 
-    // configure i18n
     this.configure(this.config);
-
     autoBind(this);
@@ -83,7 +80,5 @@ }
   translate(key, locale) {
-    const phrases = this.config.phrases;
-    // eslint-disable-next-line prefer-rest-params
+    const phrases = this.config.phrases; // eslint-disable-next-line prefer-rest-params
 
-    let args = Object.keys(arguments)
-    // eslint-disable-next-line prefer-rest-params
+    let args = Object.keys(arguments) // eslint-disable-next-line prefer-rest-params
     .map(key => arguments[key]).slice(2);
@@ -93,3 +88,6 @@ if (typeof args === 'undefined') args = [];
     if (typeof phrase !== 'string') throw new Error(`translation key missing: ${key}`);
-    args = [{ phrase, locale }, ...args];
+    args = [{
+      phrase,
+      locale
+    }, ...args];
     return i18n.api.t(...args);
@@ -99,19 +97,14 @@ }
   middleware(ctx, next) {
-    var _config = this.config;
-    const locales = _config.locales,
-          defaultLocale = _config.defaultLocale,
-          phrases = _config.phrases,
-          cookie = _config.cookie;
+    const _this$config = this.config,
+          locales = _this$config.locales,
+          defaultLocale = _this$config.defaultLocale,
+          phrases = _this$config.phrases,
+          cookie = _this$config.cookie; // expose api methods to `ctx.request` and `ctx.state`
 
-    // expose api methods to `ctx.request` and `ctx.state`
+    i18n.init(ctx.request, ctx.state); // expose a helper function to `ctx.state.l`
+    // which prefixes a link/path with the locale
 
-    i18n.init(ctx.request, ctx.state);
-
-    // expose a helper function to `ctx.state.l`
-    // which prefixes a link/path with the locale
     ctx.state.l = (path = '') => {
       return `/${ctx.state.locale}${path}`;
-    };
-
-    // override the existing locale detection with our own
+    }; // override the existing locale detection with our own
     // in order of priority:
@@ -126,6 +119,6 @@ //
 
+
     let locale = locales.find(l => {
       return `/${l}` === ctx.path || ctx.path.indexOf(`/${l}/`) === 0;
     });
-
     ctx.pathWithoutLocale = locale ? ctx.path.substring(`/${locale}`.length) : ctx.path;
@@ -136,2 +129,3 @@ if (ctx.pathWithoutLocale === '') ctx.pathWithoutLocale = '/';
       locale = defaultLocale;
+
       if (ctx.cookies.get(cookie) && locales.includes(ctx.cookies.get(cookie))) {
@@ -146,15 +140,14 @@ locale = ctx.cookies.get(cookie);
       }
-    }
+    } // set the locale properly
 
-    // set the locale properly
+
     i18n.setLocale([ctx.request, ctx.state], locale);
-    ctx.locale = ctx.request.locale;
+    ctx.locale = ctx.request.locale; // if the locale was not available then redirect user
 
-    // if the locale was not available then redirect user
     if (locale !== ctx.state.locale) {
       debug('locale was not available redirecting user');
       return ctx.redirect(`/${ctx.state.locale}${ctx.pathWithoutLocale}${isEmpty(ctx.query) ? '' : `?${stringify(ctx.query)}`}`);
-    }
+    } // available languages for a dropdown menu to change language
 
-    // available languages for a dropdown menu to change language
+
     ctx.state.availableLanguages = sortBy(locales.map(locale => {
@@ -166,11 +159,9 @@ return {
       };
-    }), 'name');
+    }), 'name'); // get the name of the current locale's language in native language
 
-    // get the name of the current locale's language in native language
-    ctx.state.currentLanguage = s.titleize(getLanguage(ctx.request.locale).nativeName[0]);
-
-    // bind `ctx.translate` as a helper func
+    ctx.state.currentLanguage = titleize(getLanguage(ctx.request.locale).nativeName[0]); // bind `ctx.translate` as a helper func
     // so you can pass `ctx.translate('SOME_KEY_IN_CONFIG');` and it will lookup
     // `phrases['SOMETHING']` to get a specific and constant message
     // and then it will call `t` to translate it to the user's locale
+
     ctx.translate = function (...args) {
@@ -189,13 +180,13 @@ if (typeof args[0] !== 'string' || typeof phrases[args[0]] !== 'string') return ctx.throw(Boom.badRequest('Translation for your locale failed, try again'));
     return _asyncToGenerator(function* () {
-      debug('attempting to redirect');
-      // do not redirect static paths
-      if (extname(ctx.path) !== '') return next();
+      debug('attempting to redirect'); // do not redirect static paths
 
-      // inspired by nodejs.org language support
+      if (extname(ctx.path) !== '') return next(); // inspired by nodejs.org language support
       // <https://github.com/nodejs/nodejs.org/commit/d6cdd942a8fc0fffcf6879eca124295e95991bbc#diff-78c12f5adc1848d13b1c6f07055d996eR59>
+
       const locale = ctx.url.split('/')[1].split('?')[0];
-      const hasLang = _this.config.locales.includes(locale);
 
-      // if the URL did not have a valid language found
+      const hasLang = _this.config.locales.includes(locale); // if the URL did not have a valid language found
       // then redirect the user to their detected locale
+
+
       if (!hasLang) {
@@ -210,5 +201,4 @@ ctx.status = 302;
 
-      debug('found valid language "%s"', locale);
+      debug('found valid language "%s"', locale); // set the cookie for future requests
 
-      // set the cookie for future requests
       ctx.cookies.set(_this.config.cookie, locale, {
@@ -219,8 +209,8 @@ // Disable signed cookies in NODE_ENV=test
       });
-      debug('set cookies for locale "%s"', locale);
+      debug('set cookies for locale "%s"', locale); // if the user is logged in and ctx.isAuthenticated() exists,
+      // then save it as `last_locale`
 
-      // if the user is logged in and ctx.isAuthenticated() exists,
-      // then save it as `last_locale`
       if (isFunction(ctx.isAuthenticated) && ctx.isAuthenticated()) {
         ctx.state.user.last_locale = locale;
+
         try {
@@ -236,5 +226,5 @@ yield ctx.state.user.save();
   }
+
 }
 
-module.exports = I18N;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/index.js"],"names":["require","extname","resolve","stringify","Boom","s","isEmpty","sortBy","every","isFunction","getLanguage","moment","i18n","locales","autoBind","debug","boolean","api","I18N","constructor","config","Object","assign","phrases","logger","console","directory","cookie","indent","defaultLocale","syncFiles","process","env","I18N_SYNC_FILES","autoReload","I18N_AUTO_RELOAD","updateFiles","I18N_UPDATE_FILES","__","__n","__l","__h","__mf","register","logDebugFn","logWarnFn","warn","logErrorFn","error","l","includes","Error","filter","str","join","configure","translate","key","locale","args","keys","arguments","map","slice","phrase","t","middleware","ctx","next","init","request","state","path","find","indexOf","pathWithoutLocale","substring","length","cookies","get","acceptsLanguages","setLocale","redirect","query","availableLanguages","url","name","currentLanguage","titleize","nativeName","throw","badRequest","split","hasLang","status","set","signed","NODE_ENV","expires","add","toDate","isAuthenticated","user","last_locale","save","err","module","exports"],"mappings":"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","file":"index.js","sourcesContent":["const {extname, resolve} = require('path');\nconst {stringify} = require('qs');\nconst Boom = require('boom');\nconst s = require('underscore.string');\nconst {isEmpty, sortBy, every, isFunction} = require('lodash');\nconst {getLanguage} = require('country-language');\nconst moment = require('moment');\nconst i18n = require('i18n');\nconst locales = require('i18n-locales');\nconst autoBind = require('auto-bind');\nconst debug = require('debug')('ladjs:i18n');\nconst boolean = require('boolean');\n\n// expose global\ni18n.api = {};\n\nclass I18N {\n  constructor(config = {}) {\n    this.config = Object.assign(\n      {\n        phrases: {},\n        logger: console,\n        directory: resolve('locales'),\n        locales: ['en', 'es', 'zh'],\n        cookie: 'locale',\n        indent: '  ',\n        defaultLocale: 'en',\n        syncFiles: boolean(process.env.I18N_SYNC_FILES || true),\n        autoReload: boolean(process.env.I18N_AUTO_RELOAD || false),\n        updateFiles: boolean(process.env.I18N_UPDATE_FILES || true),\n        api: {\n          __: 't',\n          __n: 'tn',\n          __l: 'tl',\n          __h: 'th',\n          __mf: 'tmf'\n        },\n        register: i18n.api\n      },\n      config\n    );\n\n    const {logger} = this.config;\n\n    this.config.logDebugFn = logger.debug;\n    this.config.logWarnFn = logger.warn;\n    this.config.logErrorFn = logger.error;\n\n    // validate locales against available ones\n    if (!every(this.config.locales, l => locales.includes(l)))\n      throw new Error(\n        `Invalid locales: ${this.config.locales\n          .filter(str => !locales.includes(str))\n          .join(', ')}`\n      );\n\n    // inherit i18n object\n    Object.assign(this, i18n);\n\n    // configure i18n\n    this.configure(this.config);\n\n    autoBind(this);\n  }\n\n  translate(key, locale) {\n    const {phrases} = this.config;\n    // eslint-disable-next-line prefer-rest-params\n    let args = Object.keys(arguments)\n      // eslint-disable-next-line prefer-rest-params\n      .map(key => arguments[key])\n      .slice(2);\n    if (typeof args === 'undefined') args = [];\n    const phrase = phrases[key];\n    if (typeof phrase !== 'string')\n      throw new Error(`translation key missing: ${key}`);\n    args = [{phrase, locale}, ...args];\n    return i18n.api.t(...args);\n  }\n\n  middleware(ctx, next) {\n    const {locales, defaultLocale, phrases, cookie} = this.config;\n\n    // expose api methods to `ctx.request` and `ctx.state`\n    i18n.init(ctx.request, ctx.state);\n\n    // expose a helper function to `ctx.state.l`\n    // which prefixes a link/path with the locale\n    ctx.state.l = (path = '') => {\n      return `/${ctx.state.locale}${path}`;\n    };\n\n    // override the existing locale detection with our own\n    // in order of priority:\n    //\n    // 1. check the URL, if === `/de` or starts with `/de/` then locale is `de`\n    // 2. check the cookie\n    // 3. check Accept-Language last\n    //\n    // also we need to expose `ctx.pathWithoutLocale`\n    // as the path without locale\n\n    let locale = locales.find(l => {\n      return `/${l}` === ctx.path || ctx.path.indexOf(`/${l}/`) === 0;\n    });\n\n    ctx.pathWithoutLocale = locale\n      ? ctx.path.substring(`/${locale}`.length)\n      : ctx.path;\n    if (ctx.pathWithoutLocale === '') ctx.pathWithoutLocale = '/';\n\n    if (!locale) {\n      locale = defaultLocale;\n      if (\n        ctx.cookies.get(cookie) &&\n        locales.includes(ctx.cookies.get(cookie))\n      ) {\n        locale = ctx.cookies.get(cookie);\n        debug('found locale via cookie using %s', locale);\n      } else if (ctx.request.acceptsLanguages(locales)) {\n        locale = ctx.request.acceptsLanguages(locales);\n        debug('found locale via Accept-Language header using %s', locale);\n      } else {\n        debug('using default locale');\n      }\n    }\n\n    // set the locale properly\n    i18n.setLocale([ctx.request, ctx.state], locale);\n    ctx.locale = ctx.request.locale;\n\n    // if the locale was not available then redirect user\n    if (locale !== ctx.state.locale) {\n      debug('locale was not available redirecting user');\n      return ctx.redirect(\n        `/${ctx.state.locale}${ctx.pathWithoutLocale}${\n          isEmpty(ctx.query) ? '' : `?${stringify(ctx.query)}`\n        }`\n      );\n    }\n\n    // available languages for a dropdown menu to change language\n    ctx.state.availableLanguages = sortBy(\n      locales.map(locale => {\n        return {\n          locale,\n          url: `/${locale}${ctx.pathWithoutLocale}${\n            isEmpty(ctx.query) ? '' : `?${stringify(ctx.query)}`\n          }`,\n          name: getLanguage(locale).name[0]\n        };\n      }),\n      'name'\n    );\n\n    // get the name of the current locale's language in native language\n    ctx.state.currentLanguage = s.titleize(\n      getLanguage(ctx.request.locale).nativeName[0]\n    );\n\n    // bind `ctx.translate` as a helper func\n    // so you can pass `ctx.translate('SOME_KEY_IN_CONFIG');` and it will lookup\n    // `phrases['SOMETHING']` to get a specific and constant message\n    // and then it will call `t` to translate it to the user's locale\n    ctx.translate = function(...args) {\n      if (typeof args[0] !== 'string' || typeof phrases[args[0]] !== 'string')\n        return ctx.throw(\n          Boom.badRequest('Translation for your locale failed, try again')\n        );\n      args[0] = phrases[args[0]];\n      return ctx.request.t(...args);\n    };\n\n    return next();\n  }\n\n  async redirect(ctx, next) {\n    debug('attempting to redirect');\n    // do not redirect static paths\n    if (extname(ctx.path) !== '') return next();\n\n    // inspired by nodejs.org language support\n    // <https://github.com/nodejs/nodejs.org/commit/d6cdd942a8fc0fffcf6879eca124295e95991bbc#diff-78c12f5adc1848d13b1c6f07055d996eR59>\n    const locale = ctx.url.split('/')[1].split('?')[0];\n    const hasLang = this.config.locales.includes(locale);\n\n    // if the URL did not have a valid language found\n    // then redirect the user to their detected locale\n    if (!hasLang) {\n      ctx.status = 302;\n      let redirect = `/${ctx.request.locale}${ctx.url}`;\n      if (redirect === `/${ctx.request.locale}/`)\n        redirect = `/${ctx.request.locale}`;\n      if (!isEmpty(ctx.query)) redirect += `?${stringify(ctx.query)}`;\n      debug('no valid locale found in URL, redirecting to %s', redirect);\n      return ctx.redirect(redirect);\n    }\n\n    debug('found valid language \"%s\"', locale);\n\n    // set the cookie for future requests\n    ctx.cookies.set(this.config.cookie, locale, {\n      // Disable signed cookies in NODE_ENV=test\n      signed: process.env.NODE_ENV !== 'test',\n      expires: moment()\n        .add(1, 'year')\n        .toDate()\n    });\n    debug('set cookies for locale \"%s\"', locale);\n\n    // if the user is logged in and ctx.isAuthenticated() exists,\n    // then save it as `last_locale`\n    if (isFunction(ctx.isAuthenticated) && ctx.isAuthenticated()) {\n      ctx.state.user.last_locale = locale;\n      try {\n        await ctx.state.user.save();\n      } catch (err) {\n        this.config.logger.error(err);\n      }\n    }\n\n    return next();\n  }\n}\n\nmodule.exports = I18N;\n"]}
+module.exports = I18N;

package.json

 {
   "name": "@ladjs/i18n",
   "description": "i18n wrapper and Koa middleware for Lad",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Nick Baugh <[e-mail]> (http://niftylettuce.com/)",
@@ -23,35 +23,37 @@ "ava": {
   "dependencies": {
-    "auto-bind": "^2.0.0",
-    "boolean": "^0.2.0",
-    "boom": "7.3.0",
+    "@hapi/boom": "^7.4.3",
+    "auto-bind": "^2.1.0",
+    "boolean": "^1.0.0",
     "country-language": "^0.1.7",
+    "debug": "^4.1.1",
     "i18n": "^0.8.3",
     "i18n-locales": "^0.0.2",
-    "lodash": "^4.17.11",
-    "moment": "^2.23.0",
-    "qs": "^6.6.0",
-    "underscore.string": "^3.3.5"
+    "lodash": "^4.17.15",
+    "moment": "^2.24.0",
+    "qs": "^6.8.0",
+    "titleize": "^2.1.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^7.3.1",
-    "@commitlint/config-conventional": "^7.3.1",
-    "ava": "^1.1.0",
-    "babel-cli": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "codecov": "^3.1.0",
-    "cross-env": "^5.2.0",
-    "debug": "^4.1.1",
-    "eslint": "^5.12.0",
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@commitlint/cli": "^8.1.0",
+    "@commitlint/config-conventional": "^8.1.0",
+    "ava": "^2.3.0",
+    "codecov": "^3.5.0",
+    "cross-env": "^5.2.1",
+    "eslint": "^6.3.0",
     "eslint-config-xo-lass": "^1.0.3",
+    "eslint-plugin-node": "^10.0.0",
     "fixpack": "^2.3.1",
-    "husky": "^1.3.1",
-    "koa": "^2.6.2",
+    "husky": "^3.0.5",
+    "koa": "^2.8.1",
     "koa-generic-session": "^2.0.1",
-    "lint-staged": "^8.1.0",
-    "nyc": "^13.1.0",
-    "remark-cli": "^6.0.1",
-    "remark-preset-github": "^0.0.13",
-    "sinon": "^7.2.2",
-    "supertest": "^3.3.0",
-    "xo": "^0.23.0"
+    "lint-staged": "^9.2.5",
+    "nyc": "^14.1.1",
+    "remark-cli": "^7.0.0",
+    "remark-preset-github": "^0.0.16",
+    "sinon": "^7.4.2",
+    "supertest": "^4.0.2",
+    "xo": "^0.24.0"
   },
@@ -68,3 +70,3 @@ "engines": {
     "hooks": {
-      "pre-commit": "npm test",
+      "pre-commit": "lint-staged && npm test",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
@@ -79,18 +81,21 @@ }
   "lint-staged": {
-    "linters": {
-      "*.js": [
-        "xo --fix",
-        "git add"
-      ],
-      "*.md": [
-        "remark . -qfo",
-        "git add"
-      ],
-      "package.json": [
-        "fixpack",
-        "git add"
-      ]
-    }
+    "*.js": [
+      "xo --fix",
+      "git add"
+    ],
+    "*.md": [
+      "remark . -qfo",
+      "git add"
+    ],
+    "package.json": [
+      "fixpack",
+      "git add"
+    ]
   },
   "main": "lib/index.js",
+  "prettier": {
+    "singleQuote": true,
+    "bracketSpacing": true,
+    "trailingComma": "none"
+  },
   "remarkConfig": {
@@ -108,3 +113,3 @@ "plugins": [
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
-    "lint": "xo && remark . -qfo",
+    "lint": "xo && remark . -qfo && eslint --no-inline-config -c .lib.eslintrc lib",
     "test": "npm run build && npm run lint && npm run test-coverage",
@@ -111,0 +116,0 @@ "test-coverage": "cross-env NODE_ENV=test nyc ava",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

16967

decreased by-52.79%

Dependency count

11

increased by10%

Dev dependency count

22

increased by4.76%

Lines of code

172

decreased by-8.51%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Added@hapi/boom@^7.4.3

• + Addeddebug@^4.1.1

• + Addedtitleize@^2.1.0

• + Added@hapi/boom@7.4.11(transitive)

• + Added@hapi/hoek@8.5.1(transitive)

• + Addedboolean@1.0.0(transitive)

• + Addedtitleize@2.1.0(transitive)

• - Removedboom@7.3.0

• - Removedunderscore.string@^3.3.5

• - Removedboolean@0.2.0(transitive)

• - Removedboom@7.3.0(transitive)

• - Removedhoek@6.1.3(transitive)

• - Removedunderscore.string@3.3.6(transitive)

• - Removedutil-deprecate@1.0.2(transitive)

• Updatedauto-bind@^2.1.0

• Updatedboolean@^1.0.0

• Updatedlodash@^4.17.15

• Updatedmoment@^2.24.0

• Updatedqs@^6.8.0