@transifex/native 1.0.4 → 2.0.0-rc3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transifex/native",
-  "version": "1.0.4",
+  "version": "2.0.0-rc3",
   "description": "Transifex Native for Javascript",
   "keywords": [
     "transifex",
@@ -14,6 +14,7 @@
   "main": "dist/node.native.js",
   "browser": "dist/browser.native.js",
   "module": "src/index.js",
+  "types": "dist/node.native.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -28,7 +29,7 @@
     "url": "https://github.com/transifex/transifex-javascript/issues"
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.14.5",
@@ -43,7 +44,7 @@
     "eslint-loader": "^4.0.2",
     "eslint-plugin-import": "^2.23.4",
     "glob": "^7.1.7",
-    "mocha": "^8.4.0",
+    "mocha": "^9.1.3",
     "nock": "^13.1.0",
     "nyc": "^15.1.0",
     "source-map-support": "^0.5.19",
@@ -52,7 +53,7 @@
   },
   "dependencies": {
     "@messageformat/core": "^3.0.0",
-    "axios": "^0.21.1",
+    "axios": "^0.24.0",
     "md5": "^2.3.0"
   }
 }

package/src/TxNative.js

@@ -6,7 +6,7 @@ import SourceErrorPolicy from './policies/SourceErrorPolicy';
 import SourceStringPolicy from './policies/SourceStringPolicy';
 import MessageFormatRenderer from './renderers/MessageFormatRenderer';
 import {
-  generateKey, isString, isPluralized, escape,
+  generateKey, isString, isPluralized, escape, generateHashedKey,
 } from './utils';
 import {
   sendEvent,
@@ -97,11 +97,24 @@ export default class TxNative {
    */
   translateLocale(locale, sourceString, params) {
     try {
-      const pluralized = isPluralized(sourceString);
-      const key = generateKey(sourceString, params);
-      let translation = this.cache.get(key, locale);
+      // get translation from source based key (2.x.x)
+      let translation = this.cache.get(
+        generateKey(sourceString, params),
+        locale,
+      );
 
-      if (translation && pluralized && translation.startsWith('{???')) {
+      // fall back to hash based key (1.x.x)
+      if (!translation) {
+        translation = this.cache.get(
+          generateHashedKey(sourceString, params),
+          locale,
+        );
+      }
+
+      if (translation
+        && translation.startsWith('{???')
+        && isPluralized(sourceString)
+      ) {
         const variableName = sourceString
           .substring(1, sourceString.indexOf(','))
           .trim();

package/src/index.d.ts

@@ -1,8 +1,9 @@
-import Native = require('@transifex/native');
-export const tx : Native.tx;
-export const t : Native.t;
-export const PseudoTranslationPolicy: Native.PseudoTranslationPolicy;
-export const SourceStringPolicy: Native.SourceStringPolicy;
-export const SourceErrorPolicy: Native.SourceErrorPolicy;
-export const ThrowErrorPolicy: Native.ThrowErrorPolicy;
-export const MessageFormatRenderer: Native.MessageFormatRenderer;
+declare module '@transifex/native' {
+  export const tx: any;
+  export const t: any;
+  export const PseudoTranslationPolicy: any;
+  export const SourceStringPolicy: any;
+  export const SourceErrorPolicy: any;
+  export const ThrowErrorPolicy: any;
+  export const MessageFormatRenderer: any;
+}

package/src/utils.js

@@ -11,6 +11,25 @@ import md5 from 'md5';
 export function generateKey(string, options = {}) {
   if (options._key) return options._key;
 
+  if (options._context) {
+    return `${string}::${options._context}`;
+  }
+
+  // ensure string is returned
+  return `${string}`;
+}
+
+/**
+ * Generate a hashed based string key
+ *
+ * @export
+ * @param {String} string
+ * @param {Object} options
+ * @returns {String} key
+ */
+export function generateHashedKey(string, options = {}) {
+  if (options._key) return options._key;
+
   let context = '';
   if (options._context) {
     context = options._context;

package/webpack.config.js

@@ -1,5 +1,5 @@
-const nodeConfig = require('./webpack.node.js');
-const browserConfig = require('./webpack.browser.js');
+const nodeConfig = require('./webpack.node');
+const browserConfig = require('./webpack.browser');
 
 module.exports = [
   nodeConfig,