@larscom/ngx-translate-module-loader - npm Package Compare versions

Comparing version 2.0.1 to 2.1.0

bundles/larscom-ngx-translate-module-loader.umd.js

@@ -10,3 +10,5 @@ (function (global, factory) {
     var toJsonPath = function (path) { return path.concat('.json'); };
-    var PATH_TEMPLATE_MATCH = /{([^}]+)}/gi;
+    var PATH_TEMPLATE_REGEX = /{([^}]+)}/gi;
+    var PATH_CLEAN_REGEX = /([^:]\/)\/+/gi;
+    var DEFAULT_PATH_TEMPLATE = '{baseTranslateUrl}/{moduleName}/{language}';
     var ModuleTranslateLoader = /** @class */ (function () {
@@ -26,3 +28,3 @@ /**
             this.options = options;
-            this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options);
+            this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true }, this.options);
         }
@@ -54,21 +56,23 @@ ModuleTranslateLoader.prototype.getTranslation = function (language) {
         ModuleTranslateLoader.prototype.fetchTranslation = function (language, _a, _b) {
-            var pathTemplate = _a.pathTemplate, translateError = _a.translateError;
-            var baseTranslateUrl = _b.baseTranslateUrl, translateMap = _b.translateMap;
+            var translateError = _a.translateError;
+            var pathTemplate = _b.pathTemplate, baseTranslateUrl = _b.baseTranslateUrl, translateMap = _b.translateMap;
             var pathOptions = { baseTranslateUrl: baseTranslateUrl, language: language };
-            var path = toJsonPath(pathTemplate.replace(PATH_TEMPLATE_MATCH, function (_, m1) { return pathOptions[m1] || ''; }));
-            return this.http.get(path).pipe(operators.map(function (translation) { return (translateMap ? translateMap(translation) : translation); }), this.catchError(path, translateError));
+            var template = pathTemplate || DEFAULT_PATH_TEMPLATE;
+            var path = toJsonPath(template.replace(PATH_TEMPLATE_REGEX, function (a, m1) { return pathOptions[m1] || ''; }));
+            var cleanedPath = path.replace(PATH_CLEAN_REGEX, '$1');
+            return this.http.get(cleanedPath).pipe(operators.map(function (translation) { return (translateMap ? translateMap(translation) : translation); }), this.catchError(cleanedPath, translateError));
         };
         ModuleTranslateLoader.prototype.fetchTranslationForModule = function (language, _a, _b) {
-            var modulePathTemplate = _a.modulePathTemplate, disableNamespace = _a.disableNamespace, lowercaseNamespace = _a.lowercaseNamespace, translateError = _a.translateError;
-            var baseTranslateUrl = _b.baseTranslateUrl, moduleName = _b.moduleName, namespace = _b.namespace, translateMap = _b.translateMap;
-            var modulePathOptions = { baseTranslateUrl: baseTranslateUrl, moduleName: moduleName, language: language };
-            var modulePath = toJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, function (_, m1) { return modulePathOptions[m1] || ''; }));
+            var disableNamespace = _a.disableNamespace, lowercaseNamespace = _a.lowercaseNamespace, translateError = _a.translateError;
+            var pathTemplate = _b.pathTemplate, baseTranslateUrl = _b.baseTranslateUrl, moduleName = _b.moduleName, namespace = _b.namespace, translateMap = _b.translateMap;
+            var pathOptions = { baseTranslateUrl: baseTranslateUrl, moduleName: moduleName, language: language };
+            var template = pathTemplate || DEFAULT_PATH_TEMPLATE;
+            var path = toJsonPath(template.replace(PATH_TEMPLATE_REGEX, function (_, m1) { return pathOptions[m1] || ''; }));
+            var cleanedPath = path.replace(PATH_CLEAN_REGEX, '$1');
             var namespaceKey = namespace
-                ? lowercaseNamespace
-                    ? namespace.toLowerCase()
-                    : namespace.toUpperCase()
+                ? namespace
                 : lowercaseNamespace
                     ? moduleName.toLowerCase()
                     : moduleName.toUpperCase();
-            return this.http.get(modulePath).pipe(operators.map(function (translation) {
+            return this.http.get(cleanedPath).pipe(operators.map(function (translation) {
                 var _a;
@@ -80,3 +84,3 @@ return translateMap
                         : Object((_a = {}, _a[namespaceKey] = translation, _a));
-            }), this.catchError(modulePath, translateError));
+            }), this.catchError(cleanedPath, translateError));
         };
@@ -83,0 +87,0 @@ ModuleTranslateLoader.prototype.catchError = function (path, translateError) {

bundles/larscom-ngx-translate-module-loader.umd.min.js

@@ -1,2 +0,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("deepmerge"),require("rxjs"),require("rxjs/operators")):"function"==typeof define&&define.amd?define("@larscom/ngx-translate-module-loader",["exports","deepmerge","rxjs","rxjs/operators"],t):t(((e=e||self).larscom=e.larscom||{},e.larscom["ngx-translate-module-loader"]={}),e.merge,e.rxjs,e.rxjs.operators)}(this,(function(e,t,r,a){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var n=function(e){return e.concat(".json")},o=/{([^}]+)}/gi,s=function(){function e(e,t){this.http=e,this.options=t,this.defaultOptions=Object.assign({disableNamespace:!1,lowercaseNamespace:!1,deepMerge:!0,modulePathTemplate:"{baseTranslateUrl}/{moduleName}/{language}",pathTemplate:"{baseTranslateUrl}/{language}"},this.options)}return e.prototype.getTranslation=function(e){var t=this.defaultOptions;return this.mergeTranslations(this.getModuleTranslations(e,t),t)},e.prototype.mergeTranslations=function(e,n){var o=n.deepMerge,s=n.translateMerger;return r.forkJoin(e).pipe(a.map((function(e){return s?s(e):o?t.all(e):e.reduce((function(e,t){return Object.assign(Object.assign({},e),t)}),Object())})))},e.prototype.getModuleTranslations=function(e,t){var r=this;return t.modules.map((function(a){return a.moduleName?r.fetchTranslationForModule(e,t,a):r.fetchTranslation(e,t,a)}))},e.prototype.fetchTranslation=function(e,t,r){var s=t.pathTemplate,l=t.translateError,i=r.baseTranslateUrl,u=r.translateMap,p={baseTranslateUrl:i,language:e},c=n(s.replace(o,(function(e,t){return p[t]||""})));return this.http.get(c).pipe(a.map((function(e){return u?u(e):e})),this.catchError(c,l))},e.prototype.fetchTranslationForModule=function(e,t,r){var s=t.modulePathTemplate,l=t.disableNamespace,i=t.lowercaseNamespace,u=t.translateError,p=r.baseTranslateUrl,c=r.moduleName,f=r.namespace,d=r.translateMap,m={baseTranslateUrl:p,moduleName:c,language:e},h=n(s.replace(o,(function(e,t){return m[t]||""}))),g=f?i?f.toLowerCase():f.toUpperCase():i?c.toLowerCase():c.toUpperCase();return this.http.get(h).pipe(a.map((function(e){var t;return d?d(e):l?e:Object(((t={})[g]=e,t))})),this.catchError(h,u))},e.prototype.catchError=function(e,t){return a.catchError((function(a){return t&&t(a,e),console.error("Unable to load translation file:",e),r.of(Object())}))},e}();e.ModuleTranslateLoader=s,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("deepmerge"),require("rxjs"),require("rxjs/operators")):"function"==typeof define&&define.amd?define("@larscom/ngx-translate-module-loader",["exports","deepmerge","rxjs","rxjs/operators"],t):t(((e=e||self).larscom=e.larscom||{},e.larscom["ngx-translate-module-loader"]={}),e.merge,e.rxjs,e.rxjs.operators)}(this,(function(e,t,r,a){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var n=function(e){return e.concat(".json")},o=/{([^}]+)}/gi,s=/([^:]\/)\/+/gi,l=function(){function e(e,t){this.http=e,this.options=t,this.defaultOptions=Object.assign({disableNamespace:!1,lowercaseNamespace:!1,deepMerge:!0},this.options)}return e.prototype.getTranslation=function(e){var t=this.defaultOptions;return this.mergeTranslations(this.getModuleTranslations(e,t),t)},e.prototype.mergeTranslations=function(e,n){var o=n.deepMerge,s=n.translateMerger;return r.forkJoin(e).pipe(a.map((function(e){return s?s(e):o?t.all(e):e.reduce((function(e,t){return Object.assign(Object.assign({},e),t)}),Object())})))},e.prototype.getModuleTranslations=function(e,t){var r=this;return t.modules.map((function(a){return a.moduleName?r.fetchTranslationForModule(e,t,a):r.fetchTranslation(e,t,a)}))},e.prototype.fetchTranslation=function(e,t,r){var l=t.translateError,i=r.pathTemplate,u=r.baseTranslateUrl,p=r.translateMap,c={baseTranslateUrl:u,language:e},f=n((i||"{baseTranslateUrl}/{moduleName}/{language}").replace(o,(function(e,t){return c[t]||""}))).replace(s,"$1");return this.http.get(f).pipe(a.map((function(e){return p?p(e):e})),this.catchError(f,l))},e.prototype.fetchTranslationForModule=function(e,t,r){var l=t.disableNamespace,i=t.lowercaseNamespace,u=t.translateError,p=r.pathTemplate,c=r.baseTranslateUrl,f=r.moduleName,d=r.namespace,m=r.translateMap,g={baseTranslateUrl:c,moduleName:f,language:e},h=n((p||"{baseTranslateUrl}/{moduleName}/{language}").replace(o,(function(e,t){return g[t]||""}))).replace(s,"$1"),b=d||(i?f.toLowerCase():f.toUpperCase());return this.http.get(h).pipe(a.map((function(e){var t;return m?m(e):l?e:Object(((t={})[b]=e,t))})),this.catchError(h,u))},e.prototype.catchError=function(e,t){return a.catchError((function(a){return t&&t(a,e),console.error("Unable to load translation file:",e),r.of(Object())}))},e}();e.ModuleTranslateLoader=l,Object.defineProperty(e,"__esModule",{value:!0})}));
 //# sourceMappingURL=larscom-ngx-translate-module-loader.umd.min.js.map

esm2015/lib/models/module-translation-options.js

@@ -1,1 +0,1 @@
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLXRyYW5zbGF0aW9uLW9wdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZ3gtdHJhbnNsYXRlLW1vZHVsZS1sb2FkZXIvc3JjL2xpYi9tb2RlbHMvbW9kdWxlLXRyYW5zbGF0aW9uLW9wdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElNb2R1bGVUcmFuc2xhdGlvbiB9IGZyb20gJy4vbW9kdWxlLXRyYW5zbGF0aW9uJztcbmltcG9ydCB7IFRyYW5zbGF0aW9uIH0gZnJvbSAnLi90cmFuc2xhdGlvbic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSU1vZHVsZVRyYW5zbGF0aW9uT3B0aW9ucyB7XG4gIC8qKlxuICAgKiBUaGUgdHJhbnNsYXRpb24gbW9kdWxlIGNvbmZpZ3VyYXRpb25zXG4gICAqL1xuICBtb2R1bGVzOiBJTW9kdWxlVHJhbnNsYXRpb25bXTtcbiAgLyoqXG4gICAqIEJ5IGRlZmF1bHQsIGVhY2ggbW9kdWxlIGdldHMgaXRzIG93biBuYW1lc3BhY2Ugc28gaXQgZG9lc24ndCBjb25mbGljdCB3aXRoIG90aGVyIG1vZHVsZXNcbiAgICovXG4gIGRpc2FibGVOYW1lc3BhY2U/OiBib29sZWFuO1xuICAvKipcbiAgICogQnkgZGVmYXVsdCwgbmFtZXNwYWNlcyBhcmUgdXBwZXJjYXNlXG4gICAqL1xuICBsb3dlcmNhc2VOYW1lc3BhY2U/OiBib29sZWFuO1xuICAvKipcbiAgICogQnkgZGVmYXVsdCwgaXQnbGwgcGVyZm9ybSBhIGRlZXBtZXJnZSB3aGVuIG1lcmdpbmcgdHJhbnNsYXRpb24gZmlsZXNcbiAgICovXG4gIGRlZXBNZXJnZT86IGJvb2xlYW47XG4gIC8qKlxuICAgKiBGdW5jdGlvbiB0aGF0IGdldHMgZXhlY3V0ZWQgaWYgYW4gZXJyb3Igb2NjdXJyZWQgd2hpbGUgcmV0cmlldmluZyBhIHRyYW5zbGF0aW9uIGZpbGVcbiAgICogQHBhcmFtIGVycm9yIHRoZSBlcnJvciB0aGF0IG9jY3VycmVkXG4gICAqIEBwYXJhbSBwYXRoIHRoZSBwYXRoIHRvIHRoZSBsb2NhdGlvbiBmaWxlXG4gICAqL1xuICB0cmFuc2xhdGVFcnJvcj86IChlcnJvcjogYW55LCBwYXRoOiBzdHJpbmcpID0+IHZvaWQ7XG4gIC8qKlxuICAgKiBDdXN0b20gdHJhbnNsYXRlIG1lcmdlIGZ1bmN0aW9uIGFmdGVyIHJldHJpZXZpbmcgYWxsIHRyYW5zbGF0aW9uIGZpbGVzXG4gICAqIEBwYXJhbSB0cmFuc2xhdGlvbnMgdGhlIHJlc29sdmVkIHRyYW5zbGF0aW9uIGZpbGVzXG4gICAqL1xuICB0cmFuc2xhdGVNZXJnZXI/OiAodHJhbnNsYXRpb25zOiBUcmFuc2xhdGlvbltdKSA9PiBUcmFuc2xhdGlvbjtcbiAgLyoqXG4gICAqIEN1c3RvbSBtb2R1bGUgcGF0aCB0ZW1wbGF0ZSBmb3IgZmV0Y2hpbmcgdHJhbnNsYXRpb25zXG4gICAqIEBleGFtcGxlXG4gICAqICd7YmFzZVRyYW5zbGF0ZVVybH0ve21vZHVsZU5hbWV9L3tsYW5ndWFnZX0nXG4gICAqL1xuICBtb2R1bGVQYXRoVGVtcGxhdGU/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBDdXN0b20gcGF0aCB0ZW1wbGF0ZSBmb3IgZmV0Y2hpbmcgdHJhbnNsYXRpb25zXG4gICAqIEBleGFtcGxlXG4gICAqICd7YmFzZVRyYW5zbGF0ZVVybH0ve2xhbmd1YWdlfSdcbiAgICovXG4gIHBhdGhUZW1wbGF0ZT86IHN0cmluZztcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLXRyYW5zbGF0aW9uLW9wdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZ3gtdHJhbnNsYXRlLW1vZHVsZS1sb2FkZXIvc3JjL2xpYi9tb2RlbHMvbW9kdWxlLXRyYW5zbGF0aW9uLW9wdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElNb2R1bGVUcmFuc2xhdGlvbiB9IGZyb20gJy4vbW9kdWxlLXRyYW5zbGF0aW9uJztcbmltcG9ydCB7IFRyYW5zbGF0aW9uIH0gZnJvbSAnLi90cmFuc2xhdGlvbic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSU1vZHVsZVRyYW5zbGF0aW9uT3B0aW9ucyB7XG4gIC8qKlxuICAgKiBUaGUgdHJhbnNsYXRpb24gbW9kdWxlIGNvbmZpZ3VyYXRpb25zXG4gICAqL1xuICBtb2R1bGVzOiBJTW9kdWxlVHJhbnNsYXRpb25bXTtcbiAgLyoqXG4gICAqIEJ5IGRlZmF1bHQsIGVhY2ggbW9kdWxlIGdldHMgaXRzIG93biBuYW1lc3BhY2Ugc28gaXQgZG9lc24ndCBjb25mbGljdCB3aXRoIG90aGVyIG1vZHVsZXNcbiAgICovXG4gIGRpc2FibGVOYW1lc3BhY2U/OiBib29sZWFuO1xuICAvKipcbiAgICogQnkgZGVmYXVsdCwgbmFtZXNwYWNlcyBhcmUgdXBwZXJjYXNlXG4gICAqL1xuICBsb3dlcmNhc2VOYW1lc3BhY2U/OiBib29sZWFuO1xuICAvKipcbiAgICogQnkgZGVmYXVsdCwgaXQnbGwgcGVyZm9ybSBhIGRlZXBtZXJnZSB3aGVuIG1lcmdpbmcgdHJhbnNsYXRpb24gZmlsZXNcbiAgICovXG4gIGRlZXBNZXJnZT86IGJvb2xlYW47XG4gIC8qKlxuICAgKiBGdW5jdGlvbiB0aGF0IGdldHMgZXhlY3V0ZWQgaWYgYW4gZXJyb3Igb2NjdXJyZWQgd2hpbGUgcmV0cmlldmluZyBhIHRyYW5zbGF0aW9uIGZpbGVcbiAgICogQHBhcmFtIGVycm9yIHRoZSBlcnJvciB0aGF0IG9jY3VycmVkXG4gICAqIEBwYXJhbSBwYXRoIHRoZSBwYXRoIHRvIHRoZSBsb2NhdGlvbiBmaWxlXG4gICAqL1xuICB0cmFuc2xhdGVFcnJvcj86IChlcnJvcjogYW55LCBwYXRoOiBzdHJpbmcpID0+IHZvaWQ7XG4gIC8qKlxuICAgKiBDdXN0b20gdHJhbnNsYXRlIG1lcmdlIGZ1bmN0aW9uIGFmdGVyIHJldHJpZXZpbmcgYWxsIHRyYW5zbGF0aW9uIGZpbGVzXG4gICAqIEBwYXJhbSB0cmFuc2xhdGlvbnMgdGhlIHJlc29sdmVkIHRyYW5zbGF0aW9uIGZpbGVzXG4gICAqL1xuICB0cmFuc2xhdGVNZXJnZXI/OiAodHJhbnNsYXRpb25zOiBUcmFuc2xhdGlvbltdKSA9PiBUcmFuc2xhdGlvbjtcbn1cbiJdfQ==

esm2015/lib/models/module-translation.js

@@ -1,1 +0,1 @@
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLXRyYW5zbGF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmd4LXRyYW5zbGF0ZS1tb2R1bGUtbG9hZGVyL3NyYy9saWIvbW9kZWxzL21vZHVsZS10cmFuc2xhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJhbnNsYXRpb24gfSBmcm9tICcuL3RyYW5zbGF0aW9uJztcblxuZXhwb3J0IGludGVyZmFjZSBJTW9kdWxlVHJhbnNsYXRpb24ge1xuICAvKipcbiAgICogVGhlIG1vZHVsZSBuYW1lXG4gICAqXG4gICAqIEZvciBleGFtcGxlOiBzaGFyZWRcbiAgICogQGRlc2NyaXB0aW9uIG9taXQgbW9kdWxlTmFtZSBpZiB5b3UgaGF2ZSBhIHRyYW5zbGF0ZSBmaWxlIGF0IGJhc2VUcmFuc2xhdGVVcmwgbGV2ZWxcbiAgICogQHNlZSBiYXNlVHJhbnNsYXRlVXJsXG4gICAqL1xuICBtb2R1bGVOYW1lPzogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIGJhc2UgdHJhbnNsYXRlIFVSTFxuICAgKlxuICAgKiBGb3IgZXhhbXBsZTogLi9hc3NldHMvaTE4blxuICAgKiBAZGVzY3JpcHRpb24gdGhlIGZpbmFsIHVybCB3aWxsIHRoZW4gYmU6IC4vYXNzZXRzL2kxOG4vc2hhcmVkIGlmIHRoZSBtb2R1bGVOYW1lIGlzIHNoYXJlZFxuICAgKiBAc2VlIG1vZHVsZU5hbWVcbiAgICovXG4gIGJhc2VUcmFuc2xhdGVVcmw6IHN0cmluZztcbiAgLyoqXG4gICAqIEJ5IGRlZmF1bHQsIGl0IHVzZXMgdGhlIG1vZHVsZU5hbWUgYXMgbmFtZXNwYWNlXG4gICAqIEBzZWUgbW9kdWxlTmFtZVxuICAgKlxuICAgKiBVc2UgdGhpcyBwcm9wZXJ0eSBpZiB5b3Ugd2FudCB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCBuYW1lU3BhY2VcbiAgICovXG4gIG5hbWVzcGFjZT86IHN0cmluZztcbiAgLyoqXG4gICAqIEN1c3RvbSB0cmFuc2xhdGlvbiBtYXAgZnVuY3Rpb24gYWZ0ZXIgcmV0cmlldmluZyBhIHRyYW5zbGF0aW9uIGZpbGVcbiAgICogQHBhcmFtIHRyYW5zbGF0aW9uIHRoZSByZXNvbHZlZCB0cmFuc2xhdGlvbiBmaWxlXG4gICAqL1xuICB0cmFuc2xhdGVNYXA/OiAodHJhbnNsYXRpb246IFRyYW5zbGF0aW9uKSA9PiBUcmFuc2xhdGlvbjtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLXRyYW5zbGF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmd4LXRyYW5zbGF0ZS1tb2R1bGUtbG9hZGVyL3NyYy9saWIvbW9kZWxzL21vZHVsZS10cmFuc2xhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJhbnNsYXRpb24gfSBmcm9tICcuL3RyYW5zbGF0aW9uJztcblxuZXhwb3J0IGludGVyZmFjZSBJTW9kdWxlVHJhbnNsYXRpb24ge1xuICAvKipcbiAgICogVGhlIG1vZHVsZSBuYW1lXG4gICAqXG4gICAqIEZvciBleGFtcGxlOiBzaGFyZWRcbiAgICogQGRlc2NyaXB0aW9uIG9taXQgbW9kdWxlTmFtZSBpZiB5b3UgaGF2ZSBhIHRyYW5zbGF0ZSBmaWxlIGF0IGJhc2VUcmFuc2xhdGVVcmwgbGV2ZWxcbiAgICogQHNlZSBiYXNlVHJhbnNsYXRlVXJsXG4gICAqL1xuICBtb2R1bGVOYW1lPzogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIGJhc2UgdHJhbnNsYXRlIFVSTFxuICAgKlxuICAgKiBGb3IgZXhhbXBsZTogLi9hc3NldHMvaTE4blxuICAgKiBAZGVzY3JpcHRpb24gdGhlIGZpbmFsIHVybCB3aWxsIHRoZW4gYmU6IC4vYXNzZXRzL2kxOG4vc2hhcmVkIGlmIHRoZSBtb2R1bGVOYW1lIGlzIHNoYXJlZFxuICAgKiBAc2VlIG1vZHVsZU5hbWVcbiAgICovXG4gIGJhc2VUcmFuc2xhdGVVcmw6IHN0cmluZztcbiAgLyoqXG4gICAqIEJ5IGRlZmF1bHQsIGl0IHVzZXMgdGhlIG1vZHVsZU5hbWUgYXMgbmFtZXNwYWNlXG4gICAqIEBzZWUgbW9kdWxlTmFtZVxuICAgKlxuICAgKiBVc2UgdGhpcyBwcm9wZXJ0eSBpZiB5b3Ugd2FudCB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCBuYW1lc3BhY2VcbiAgICovXG4gIG5hbWVzcGFjZT86IHN0cmluZztcbiAgLyoqXG4gICAqIEN1c3RvbSB0cmFuc2xhdGlvbiBtYXAgZnVuY3Rpb24gYWZ0ZXIgcmV0cmlldmluZyBhIHRyYW5zbGF0aW9uIGZpbGVcbiAgICogQHBhcmFtIHRyYW5zbGF0aW9uIHRoZSByZXNvbHZlZCB0cmFuc2xhdGlvbiBmaWxlXG4gICAqL1xuICB0cmFuc2xhdGVNYXA/OiAodHJhbnNsYXRpb246IFRyYW5zbGF0aW9uKSA9PiBUcmFuc2xhdGlvbjtcbiAgLyoqXG4gICAqIEN1c3RvbSBwYXRoIHRlbXBsYXRlIGZvciBmZXRjaGluZyB0cmFuc2xhdGlvbnNcbiAgICogQGV4YW1wbGVcbiAgICogJ3tiYXNlVHJhbnNsYXRlVXJsfS97bW9kdWxlTmFtZX0ve2xhbmd1YWdlfSdcbiAgICogb3JcbiAgICogQGV4YW1wbGVcbiAgICogJ3tiYXNlVHJhbnNsYXRlVXJsfS97bGFuZ3VhZ2V9J1xuICAgKlxuICAgKiBJdCBkZXBlbmRzIHdoZXRoZXIgeW91IGhhdmUgYSBtb2R1bGVOYW1lIGRlZmluZWRcbiAgICogQHNlZSBtb2R1bGVOYW1lXG4gICAqL1xuICBwYXRoVGVtcGxhdGU/OiBzdHJpbmc7XG59XG4iXX0=

esm2015/lib/module-translate-loader.js

@@ -5,3 +5,5 @@ import merge from 'deepmerge';
 export const toJsonPath = (path) => path.concat('.json');
-const PATH_TEMPLATE_MATCH = /{([^}]+)}/gi;
+const PATH_TEMPLATE_REGEX = /{([^}]+)}/gi;
+const PATH_CLEAN_REGEX = /([^:]\/)\/+/gi;
+const DEFAULT_PATH_TEMPLATE = '{baseTranslateUrl}/{moduleName}/{language}';
 export class ModuleTranslateLoader {
@@ -21,3 +23,3 @@ /**
         this.options = options;
-        this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options);
+        this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true }, this.options);
     }
@@ -46,18 +48,20 @@ getTranslation(language) {
     }
-    fetchTranslation(language, { pathTemplate, translateError }, { baseTranslateUrl, translateMap }) {
+    fetchTranslation(language, { translateError }, { pathTemplate, baseTranslateUrl, translateMap }) {
         const pathOptions = { baseTranslateUrl, language };
-        const path = toJsonPath(pathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => pathOptions[m1] || ''));
-        return this.http.get(path).pipe(map((translation) => (translateMap ? translateMap(translation) : translation)), this.catchError(path, translateError));
+        const template = pathTemplate || DEFAULT_PATH_TEMPLATE;
+        const path = toJsonPath(template.replace(PATH_TEMPLATE_REGEX, (a, m1) => pathOptions[m1] || ''));
+        const cleanedPath = path.replace(PATH_CLEAN_REGEX, '$1');
+        return this.http.get(cleanedPath).pipe(map((translation) => (translateMap ? translateMap(translation) : translation)), this.catchError(cleanedPath, translateError));
     }
-    fetchTranslationForModule(language, { modulePathTemplate, disableNamespace, lowercaseNamespace, translateError }, { baseTranslateUrl, moduleName, namespace, translateMap }) {
-        const modulePathOptions = { baseTranslateUrl, moduleName, language };
-        const modulePath = toJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => modulePathOptions[m1] || ''));
+    fetchTranslationForModule(language, { disableNamespace, lowercaseNamespace, translateError }, { pathTemplate, baseTranslateUrl, moduleName, namespace, translateMap }) {
+        const pathOptions = { baseTranslateUrl, moduleName, language };
+        const template = pathTemplate || DEFAULT_PATH_TEMPLATE;
+        const path = toJsonPath(template.replace(PATH_TEMPLATE_REGEX, (_, m1) => pathOptions[m1] || ''));
+        const cleanedPath = path.replace(PATH_CLEAN_REGEX, '$1');
         const namespaceKey = namespace
-            ? lowercaseNamespace
-                ? namespace.toLowerCase()
-                : namespace.toUpperCase()
+            ? namespace
             : lowercaseNamespace
                 ? moduleName.toLowerCase()
                 : moduleName.toUpperCase();
-        return this.http.get(modulePath).pipe(map((translation) => {
+        return this.http.get(cleanedPath).pipe(map((translation) => {
             return translateMap
@@ -68,3 +72,3 @@ ? translateMap(translation)
                     : Object({ [namespaceKey]: translation });
-        }), this.catchError(modulePath, translateError));
+        }), this.catchError(cleanedPath, translateError));
     }
@@ -81,2 +85,2 @@ catchError(path, translateError) {
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module-translate-loader.js","sourceRoot":"","sources":["../../../../projects/ngx-translate-module-loader/src/lib/module-translate-loader.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\nimport { TranslateLoader } from '@ngx-translate/core';\nimport merge from 'deepmerge';\nimport { forkJoin as ForkJoin, MonoTypeOperatorFunction, Observable, of } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { IModuleTranslation } from './models/module-translation';\nimport { IModuleTranslationOptions } from './models/module-translation-options';\nimport { Translation } from './models/translation';\n\nexport const toJsonPath = (path: string) => path.concat('.json');\n\nconst PATH_TEMPLATE_MATCH = /{([^}]+)}/gi;\n\nexport class ModuleTranslateLoader implements TranslateLoader {\n  private readonly defaultOptions: IModuleTranslationOptions = {\n    disableNamespace: false,\n    lowercaseNamespace: false,\n    deepMerge: true,\n    modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}',\n    pathTemplate: '{baseTranslateUrl}/{language}',\n    ...this.options\n  };\n\n  /**\n   * The ModuleTranslateLoader for 'ngx-translate/core'\n   *\n   * @description Fetch multiple translation files (http).\n   *\n   * @param http the HttpClient from 'angular/common'\n   * @param options the configurable options for ModuleTranslateLoader\n   *\n   * @see https://github.com/larscom/ngx-translate-module-loader\n   */\n  constructor(private readonly http: HttpClient, private readonly options: IModuleTranslationOptions) {}\n\n  public getTranslation(language: string): Observable<Translation> {\n    const { defaultOptions: options } = this;\n    return this.mergeTranslations(this.getModuleTranslations(language, options), options);\n  }\n\n  private mergeTranslations(\n    moduleTranslations: Observable<Translation>[],\n    { deepMerge, translateMerger }: IModuleTranslationOptions\n  ): Observable<Translation> {\n    return ForkJoin(moduleTranslations).pipe(\n      map((translations) => {\n        return translateMerger\n          ? translateMerger(translations)\n          : deepMerge\n          ? merge.all<Translation>(translations)\n          : translations.reduce((acc, curr) => ({ ...acc, ...curr }), Object());\n      })\n    );\n  }\n\n  private getModuleTranslations(language: string, options: IModuleTranslationOptions): Observable<Translation>[] {\n    const { modules } = options;\n\n    return modules.map((module) => {\n      const { moduleName } = module;\n      return moduleName\n        ? this.fetchTranslationForModule(language, options, module)\n        : this.fetchTranslation(language, options, module);\n    });\n  }\n\n  private fetchTranslation(\n    language: string,\n    { pathTemplate, translateError }: IModuleTranslationOptions,\n    { baseTranslateUrl, translateMap }: IModuleTranslation\n  ): Observable<Translation> {\n    const pathOptions = { baseTranslateUrl, language };\n    const path = toJsonPath(pathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1: string) => pathOptions[m1] || ''));\n\n    return this.http.get<Translation>(path).pipe(\n      map((translation) => (translateMap ? translateMap(translation) : translation)),\n      this.catchError(path, translateError)\n    );\n  }\n\n  private fetchTranslationForModule(\n    language: string,\n    { modulePathTemplate, disableNamespace, lowercaseNamespace, translateError }: IModuleTranslationOptions,\n    { baseTranslateUrl, moduleName, namespace, translateMap }: IModuleTranslation\n  ): Observable<Translation> {\n    const modulePathOptions = { baseTranslateUrl, moduleName, language };\n    const modulePath = toJsonPath(\n      modulePathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1: string) => modulePathOptions[m1] || '')\n    );\n    const namespaceKey = namespace\n      ? lowercaseNamespace\n        ? namespace.toLowerCase()\n        : namespace.toUpperCase()\n      : lowercaseNamespace\n      ? moduleName.toLowerCase()\n      : moduleName.toUpperCase();\n\n    return this.http.get<Translation>(modulePath).pipe(\n      map((translation) => {\n        return translateMap\n          ? translateMap(translation)\n          : disableNamespace\n          ? translation\n          : Object({ [namespaceKey]: translation });\n      }),\n      this.catchError(modulePath, translateError)\n    );\n  }\n\n  private catchError<T>(\n    path: string,\n    translateError?: (error: any, path: string) => void\n  ): MonoTypeOperatorFunction<T> {\n    return catchError((e) => {\n      if (translateError) {\n        translateError(e, path);\n      }\n\n      console.error('Unable to load translation file:', path);\n      return of(Object());\n    });\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"module-translate-loader.js","sourceRoot":"","sources":["../../../../projects/ngx-translate-module-loader/src/lib/module-translate-loader.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\nimport { TranslateLoader } from '@ngx-translate/core';\nimport merge from 'deepmerge';\nimport { forkJoin as ForkJoin, MonoTypeOperatorFunction, Observable, of } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { IModuleTranslation } from './models/module-translation';\nimport { IModuleTranslationOptions } from './models/module-translation-options';\nimport { Translation } from './models/translation';\n\nexport const toJsonPath = (path: string) => path.concat('.json');\n\nconst PATH_TEMPLATE_REGEX = /{([^}]+)}/gi;\nconst PATH_CLEAN_REGEX = /([^:]\\/)\\/+/gi;\nconst DEFAULT_PATH_TEMPLATE = '{baseTranslateUrl}/{moduleName}/{language}';\n\nexport class ModuleTranslateLoader implements TranslateLoader {\n  private readonly defaultOptions: IModuleTranslationOptions = {\n    disableNamespace: false,\n    lowercaseNamespace: false,\n    deepMerge: true,\n    ...this.options\n  };\n\n  /**\n   * The ModuleTranslateLoader for 'ngx-translate/core'\n   *\n   * @description Fetch multiple translation files (http).\n   *\n   * @param http the HttpClient from 'angular/common'\n   * @param options the configurable options for ModuleTranslateLoader\n   *\n   * @see https://github.com/larscom/ngx-translate-module-loader\n   */\n  constructor(private readonly http: HttpClient, private readonly options: IModuleTranslationOptions) {}\n\n  public getTranslation(language: string): Observable<Translation> {\n    const { defaultOptions: options } = this;\n    return this.mergeTranslations(this.getModuleTranslations(language, options), options);\n  }\n\n  private mergeTranslations(\n    moduleTranslations: Observable<Translation>[],\n    { deepMerge, translateMerger }: IModuleTranslationOptions\n  ): Observable<Translation> {\n    return ForkJoin(moduleTranslations).pipe(\n      map((translations) => {\n        return translateMerger\n          ? translateMerger(translations)\n          : deepMerge\n          ? merge.all<Translation>(translations)\n          : translations.reduce((acc, curr) => ({ ...acc, ...curr }), Object());\n      })\n    );\n  }\n\n  private getModuleTranslations(language: string, options: IModuleTranslationOptions): Observable<Translation>[] {\n    const { modules } = options;\n\n    return modules.map((module) => {\n      const { moduleName } = module;\n      return moduleName\n        ? this.fetchTranslationForModule(language, options, module)\n        : this.fetchTranslation(language, options, module);\n    });\n  }\n\n  private fetchTranslation(\n    language: string,\n    { translateError }: IModuleTranslationOptions,\n    { pathTemplate, baseTranslateUrl, translateMap }: IModuleTranslation\n  ): Observable<Translation> {\n    const pathOptions = { baseTranslateUrl, language };\n    const template = pathTemplate || DEFAULT_PATH_TEMPLATE;\n    const path = toJsonPath(template.replace(PATH_TEMPLATE_REGEX, (a, m1: string) => pathOptions[m1] || ''));\n    const cleanedPath = path.replace(PATH_CLEAN_REGEX, '$1');\n\n    return this.http.get<Translation>(cleanedPath).pipe(\n      map((translation) => (translateMap ? translateMap(translation) : translation)),\n      this.catchError(cleanedPath, translateError)\n    );\n  }\n\n  private fetchTranslationForModule(\n    language: string,\n    { disableNamespace, lowercaseNamespace, translateError }: IModuleTranslationOptions,\n    { pathTemplate, baseTranslateUrl, moduleName, namespace, translateMap }: IModuleTranslation\n  ): Observable<Translation> {\n    const pathOptions = { baseTranslateUrl, moduleName, language };\n    const template = pathTemplate || DEFAULT_PATH_TEMPLATE;\n    const path = toJsonPath(template.replace(PATH_TEMPLATE_REGEX, (_, m1: string) => pathOptions[m1] || ''));\n    const cleanedPath = path.replace(PATH_CLEAN_REGEX, '$1');\n\n    const namespaceKey = namespace\n      ? namespace\n      : lowercaseNamespace\n      ? moduleName.toLowerCase()\n      : moduleName.toUpperCase();\n\n    return this.http.get<Translation>(cleanedPath).pipe(\n      map((translation) => {\n        return translateMap\n          ? translateMap(translation)\n          : disableNamespace\n          ? translation\n          : Object({ [namespaceKey]: translation });\n      }),\n      this.catchError(cleanedPath, translateError)\n    );\n  }\n\n  private catchError<T>(\n    path: string,\n    translateError?: (error: any, path: string) => void\n  ): MonoTypeOperatorFunction<T> {\n    return catchError((e) => {\n      if (translateError) {\n        translateError(e, path);\n      }\n\n      console.error('Unable to load translation file:', path);\n      return of(Object());\n    });\n  }\n}\n"]}

fesm2015/larscom-ngx-translate-module-loader.js

@@ -6,3 +6,5 @@ import merge from 'deepmerge';
 const toJsonPath = (path) => path.concat('.json');
-const PATH_TEMPLATE_MATCH = /{([^}]+)}/gi;
+const PATH_TEMPLATE_REGEX = /{([^}]+)}/gi;
+const PATH_CLEAN_REGEX = /([^:]\/)\/+/gi;
+const DEFAULT_PATH_TEMPLATE = '{baseTranslateUrl}/{moduleName}/{language}';
 class ModuleTranslateLoader {
@@ -22,3 +24,3 @@ /**
         this.options = options;
-        this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options);
+        this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true }, this.options);
     }
@@ -47,18 +49,20 @@ getTranslation(language) {
     }
-    fetchTranslation(language, { pathTemplate, translateError }, { baseTranslateUrl, translateMap }) {
+    fetchTranslation(language, { translateError }, { pathTemplate, baseTranslateUrl, translateMap }) {
         const pathOptions = { baseTranslateUrl, language };
-        const path = toJsonPath(pathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => pathOptions[m1] || ''));
-        return this.http.get(path).pipe(map((translation) => (translateMap ? translateMap(translation) : translation)), this.catchError(path, translateError));
+        const template = pathTemplate || DEFAULT_PATH_TEMPLATE;
+        const path = toJsonPath(template.replace(PATH_TEMPLATE_REGEX, (a, m1) => pathOptions[m1] || ''));
+        const cleanedPath = path.replace(PATH_CLEAN_REGEX, '$1');
+        return this.http.get(cleanedPath).pipe(map((translation) => (translateMap ? translateMap(translation) : translation)), this.catchError(cleanedPath, translateError));
     }
-    fetchTranslationForModule(language, { modulePathTemplate, disableNamespace, lowercaseNamespace, translateError }, { baseTranslateUrl, moduleName, namespace, translateMap }) {
-        const modulePathOptions = { baseTranslateUrl, moduleName, language };
-        const modulePath = toJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => modulePathOptions[m1] || ''));
+    fetchTranslationForModule(language, { disableNamespace, lowercaseNamespace, translateError }, { pathTemplate, baseTranslateUrl, moduleName, namespace, translateMap }) {
+        const pathOptions = { baseTranslateUrl, moduleName, language };
+        const template = pathTemplate || DEFAULT_PATH_TEMPLATE;
+        const path = toJsonPath(template.replace(PATH_TEMPLATE_REGEX, (_, m1) => pathOptions[m1] || ''));
+        const cleanedPath = path.replace(PATH_CLEAN_REGEX, '$1');
         const namespaceKey = namespace
-            ? lowercaseNamespace
-                ? namespace.toLowerCase()
-                : namespace.toUpperCase()
+            ? namespace
             : lowercaseNamespace
                 ? moduleName.toLowerCase()
                 : moduleName.toUpperCase();
-        return this.http.get(modulePath).pipe(map((translation) => {
+        return this.http.get(cleanedPath).pipe(map((translation) => {
             return translateMap
@@ -69,3 +73,3 @@ ? translateMap(translation)
                     : Object({ [namespaceKey]: translation });
-        }), this.catchError(modulePath, translateError));
+        }), this.catchError(cleanedPath, translateError));
     }
@@ -72,0 +76,0 @@ catchError(path, translateError) {

lib/models/module-translation-options.d.ts

@@ -31,14 +31,2 @@ import { IModuleTranslation } from './module-translation';
     translateMerger?: (translations: Translation[]) => Translation;
-    /**
-     * Custom module path template for fetching translations
-     * @example
-     * '{baseTranslateUrl}/{moduleName}/{language}'
-     */
-    modulePathTemplate?: string;
-    /**
-     * Custom path template for fetching translations
-     * @example
-     * '{baseTranslateUrl}/{language}'
-     */
-    pathTemplate?: string;
 }

lib/models/module-translation.d.ts

@@ -23,3 +23,3 @@ import { Translation } from './translation';
      *
-     * Use this property if you want to override the default nameSpace
+     * Use this property if you want to override the default namespace
      */
@@ -32,2 +32,14 @@ namespace?: string;
     translateMap?: (translation: Translation) => Translation;
+    /**
+     * Custom path template for fetching translations
+     * @example
+     * '{baseTranslateUrl}/{moduleName}/{language}'
+     * or
+     * @example
+     * '{baseTranslateUrl}/{language}'
+     *
+     * It depends whether you have a moduleName defined
+     * @see moduleName
+     */
+    pathTemplate?: string;
 }

package.json

 {
   "name": "@larscom/ngx-translate-module-loader",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Highly configurable and flexible translations loader for ngx-translate. Fetch multiple translations, each translation file gets it's own namespace by default",
@@ -5,0 +5,0 @@ "repository": {

README.md

@@ -90,5 +90,5 @@ # @larscom/ngx-translate-module-loader
       // namespace: FEATURE1
-      { moduleName: 'feature1', baseTranslateUrl },
+      { baseTranslateUrl, moduleName: 'feature1' },
       // namespace: FEATURE2
-      { moduleName: 'feature2', baseTranslateUrl }
+      { baseTranslateUrl, moduleName: 'feature2' }
     ]
@@ -158,14 +158,2 @@ };
   translateMerger?: (translations: Translation[]) => Translation;
-  /**
-   * Custom module path template for fetching translations
-   * @example
-   * '{baseTranslateUrl}/{moduleName}/{language}'
-   */
-  modulePathTemplate?: string;
-  /**
-   * Custom path template for fetching translations
-   * @example
-   * '{baseTranslateUrl}/{language}'
-   */
-  pathTemplate?: string;
 }
@@ -196,3 +184,3 @@ ```
    *
-   * Use this property if you want to override the default nameSpace
+   * Use this property if you want to override the default namespace
    */
@@ -205,2 +193,14 @@ namespace?: string;
   translateMap?: (translation: Translation) => Translation;
+  /**
+   * Custom path template for fetching translations
+   * @example
+   * '{baseTranslateUrl}/{moduleName}/{language}'
+   * or
+   * @example
+   * '{baseTranslateUrl}/{language}'
+   *
+   * It depends whether you have a moduleName defined
+   * @see moduleName
+   */
+  pathTemplate?: string;
 }
@@ -213,5 +213,5 @@ ```
 
-By default, module translations gets fetched by using the following template:
+By default, translations gets fetched by using the following template:
 
-`'{baseTranslateUrl}/{moduleName}/{language}'` e.g.: ./assets/feature1/en.json
+`'{baseTranslateUrl}/{moduleName}/{language}'` e.g.: **./assets/feature1/en.json**
 
@@ -221,7 +221,12 @@ You can override this option if you wish to do so:
 ```ts
-    const options: IModuleTranslationOptions = {
-      ...
-      // translates to: ./assets/en/feature1.json
-      modulePathTemplate: '{baseTranslateUrl}/{language}/{moduleName}'
-    };
+const options: IModuleTranslationOptions = {
+  modules: [
+    // resolves to: ./assets/my-path/en.json
+    { baseTranslateUrl, pathTemplate: '{baseTranslateUrl}/my-path/{language}' },
+    // resolves to: ./assets/my-path/en/feature1.json
+    { baseTranslateUrl, moduleName: 'feature1', pathTemplate: '{baseTranslateUrl}/my-path/{language}/{moduleName}' },
+    // resolves to: ./assets/my-path/en/feature2.json
+    { baseTranslateUrl, moduleName: 'feature2', pathTemplate: '{baseTranslateUrl}/my-path/{language}/{moduleName}' }
+  ]
+};
 ```

No alert changes

Improved metrics

Total package byte prevSize

69592

increased by2.75%

Lines of code

391

increased by3.17%

Number of lines in readme file

227

increased by2.25%

No dependency changes