@larscom/ngx-translate-module-loader
Advanced tools
Comparing version 1.5.1 to 2.0.0
@@ -9,3 +9,3 @@ (function (global, factory) { | ||
var createJsonPath = function (path) { return path.concat('.json'); }; | ||
var toJsonPath = function (path) { return path.concat('.json'); }; | ||
var PATH_TEMPLATE_MATCH = /{([^}]+)}/gi; | ||
@@ -26,3 +26,3 @@ var ModuleTranslateLoader = /** @class */ (function () { | ||
this.options = options; | ||
this.defaultOptions = Object.assign({ enableNamespacing: true, nameSpaceUppercase: true, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options); | ||
this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options); | ||
} | ||
@@ -34,3 +34,3 @@ ModuleTranslateLoader.prototype.getTranslation = function (language) { | ||
ModuleTranslateLoader.prototype.mergeTranslations = function (moduleTranslations, _a) { | ||
var translateMerger = _a.translateMerger, deepMerge = _a.deepMerge; | ||
var deepMerge = _a.deepMerge, translateMerger = _a.translateMerger; | ||
return rxjs.forkJoin(moduleTranslations).pipe(operators.map(function (translations) { | ||
@@ -58,17 +58,17 @@ return translateMerger | ||
var pathOptions = { baseTranslateUrl: baseTranslateUrl, language: language }; | ||
var path = createJsonPath(pathTemplate.replace(PATH_TEMPLATE_MATCH, function (_, m1) { return pathOptions[m1] || ''; })); | ||
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)); | ||
}; | ||
ModuleTranslateLoader.prototype.fetchTranslationForModule = function (language, _a, _b) { | ||
var modulePathTemplate = _a.modulePathTemplate, enableNamespacing = _a.enableNamespacing, nameSpaceUppercase = _a.nameSpaceUppercase, translateError = _a.translateError; | ||
var baseTranslateUrl = _b.baseTranslateUrl, translateMap = _b.translateMap, moduleName = _b.moduleName, nameSpace = _b.nameSpace; | ||
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 = createJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, function (_, m1) { return modulePathOptions[m1] || ''; })); | ||
var namespaceKey = nameSpace | ||
? nameSpaceUppercase | ||
? nameSpace.toUpperCase() | ||
: nameSpace.toLowerCase() | ||
: nameSpaceUppercase | ||
? moduleName.toUpperCase() | ||
: moduleName.toLowerCase(); | ||
var modulePath = toJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, function (_, m1) { return modulePathOptions[m1] || ''; })); | ||
var namespaceKey = namespace | ||
? lowercaseNamespace | ||
? namespace.toLowerCase() | ||
: namespace.toUpperCase() | ||
: lowercaseNamespace | ||
? moduleName.toLowerCase() | ||
: moduleName.toUpperCase(); | ||
return this.http.get(modulePath).pipe(operators.map(function (translation) { | ||
@@ -78,5 +78,5 @@ var _a; | ||
? translateMap(translation) | ||
: enableNamespacing | ||
? Object((_a = {}, _a[namespaceKey] = translation, _a)) | ||
: translation; | ||
: disableNamespace | ||
? translation | ||
: Object((_a = {}, _a[namespaceKey] = translation, _a)); | ||
}), this.catchError(modulePath, translateError)); | ||
@@ -83,0 +83,0 @@ }; |
@@ -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({enableNamespacing:!0,nameSpaceUppercase:!0,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.translateMerger,s=n.deepMerge;return r.forkJoin(e).pipe(a.map((function(e){return o?o(e):s?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,p=r.baseTranslateUrl,i=r.translateMap,u={baseTranslateUrl:p,language:e},c=n(s.replace(o,(function(e,t){return u[t]||""})));return this.http.get(c).pipe(a.map((function(e){return i?i(e):e})),this.catchError(c,l))},e.prototype.fetchTranslationForModule=function(e,t,r){var s=t.modulePathTemplate,l=t.enableNamespacing,p=t.nameSpaceUppercase,i=t.translateError,u=r.baseTranslateUrl,c=r.translateMap,f=r.moduleName,m=r.nameSpace,d={baseTranslateUrl:u,moduleName:f,language:e},g=n(s.replace(o,(function(e,t){return d[t]||""}))),h=m?p?m.toUpperCase():m.toLowerCase():p?f.toUpperCase():f.toLowerCase();return this.http.get(g).pipe(a.map((function(e){var t;return c?c(e):l?Object(((t={})[h]=e,t)):e})),this.catchError(g,i))},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=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})})); | ||
//# sourceMappingURL=larscom-ngx-translate-module-loader.umd.min.js.map |
@@ -1,1 +0,1 @@ | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLXRyYW5zbGF0aW9uLW9wdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZ3gtdHJhbnNsYXRlLW1vZHVsZS1sb2FkZXIvc3JjL2xpYi9tb2RlbHMvbW9kdWxlLXRyYW5zbGF0aW9uLW9wdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElNb2R1bGVUcmFuc2xhdGlvbiB9IGZyb20gJy4vbW9kdWxlLXRyYW5zbGF0aW9uJztcbmltcG9ydCB7IFRyYW5zbGF0aW9uIH0gZnJvbSAnLi90cmFuc2xhdGlvbic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSU1vZHVsZVRyYW5zbGF0aW9uT3B0aW9ucyB7XG4gIC8qKlxuICAgKiBUaGUgdHJhbnNsYXRpb24gbW9kdWxlIGNvbmZpZ3VyYXRpb25zXG4gICAqL1xuICBtb2R1bGVzOiBJTW9kdWxlVHJhbnNsYXRpb25bXTtcbiAgLyoqXG4gICAqIEVhY2ggbW9kdWxlIGdldHMgaXRzIG93biBuYW1lc3BhY2Ugc28gaXQgZG9lc24ndCBjb25mbGljdCB3aXRoIG90aGVyIG1vZHVsZXNcbiAgICovXG4gIGVuYWJsZU5hbWVzcGFjaW5nPzogYm9vbGVhbjtcbiAgLyoqXG4gICAqIENyZWF0ZSBuYW1lc3BhY2VzIGluIFVwcGVyY2FzZSBpZiBuYW1lc3BhY2luZyBpcyBlbmFibGVkXG4gICAqL1xuICBuYW1lU3BhY2VVcHBlcmNhc2U/OiBib29sZWFuO1xuICAvKipcbiAgICogUGVyZm9ybSBhIGRlZXBtZXJnZSB3aGVuIG1lcmdpbmcgdHJhbnNsYXRpb24gZmlsZXNcbiAgICovXG4gIGRlZXBNZXJnZT86IGJvb2xlYW47XG4gIC8qKlxuICAgKiBGdW5jdGlvbiB0aGF0IGdldHMgZXhlY3V0ZWQgaWYgYW4gZXJyb3Igb2NjdXJyZWQgd2hpbGUgcmV0cmlldmluZyBhIHRyYW5zbGF0aW9uIGZpbGVcbiAgICogQHBhcmFtIGVycm9yIHRoZSBlcnJvciB0aGF0IG9jY3VycmVkXG4gICAqIEBwYXJhbSBwYXRoIHRoZSBwYXRoIHRvIHRoZSBsb2NhdGlvbiBmaWxlXG4gICAqL1xuICB0cmFuc2xhdGVFcnJvcj86IChlcnJvcjogYW55LCBwYXRoOiBzdHJpbmcpID0+IHZvaWQ7XG4gIC8qKlxuICAgKiBDdXN0b20gdHJhbnNsYXRlIG1lcmdlIGZ1bmN0aW9uIGFmdGVyIHJldHJpZXZpbmcgYWxsIHRyYW5zbGF0aW9uIGZpbGVzXG4gICAqIEBwYXJhbSB0cmFuc2xhdGlvbnMgdGhlIHJlc29sdmVkIHRyYW5zbGF0aW9uIGZpbGVzXG4gICAqL1xuICB0cmFuc2xhdGVNZXJnZXI/OiAodHJhbnNsYXRpb25zOiBUcmFuc2xhdGlvbltdKSA9PiBUcmFuc2xhdGlvbjtcbiAgLyoqXG4gICAqIEN1c3RvbSBtb2R1bGUgcGF0aCB0ZW1wbGF0ZSBmb3IgZmV0Y2hpbmcgdHJhbnNsYXRpb25zXG4gICAqIEBleGFtcGxlXG4gICAqICd7YmFzZVRyYW5zbGF0ZVVybH0ve21vZHVsZU5hbWV9L3tsYW5ndWFnZX0nXG4gICAqL1xuICBtb2R1bGVQYXRoVGVtcGxhdGU/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBDdXN0b20gcGF0aCB0ZW1wbGF0ZSBmb3IgZmV0Y2hpbmcgdHJhbnNsYXRpb25zXG4gICAqIEBleGFtcGxlXG4gICAqICd7YmFzZVRyYW5zbGF0ZVVybH0ve2xhbmd1YWdlfSdcbiAgICovXG4gIHBhdGhUZW1wbGF0ZT86IHN0cmluZztcbn1cbiJdfQ== | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLXRyYW5zbGF0aW9uLW9wdGlvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZ3gtdHJhbnNsYXRlLW1vZHVsZS1sb2FkZXIvc3JjL2xpYi9tb2RlbHMvbW9kdWxlLXRyYW5zbGF0aW9uLW9wdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElNb2R1bGVUcmFuc2xhdGlvbiB9IGZyb20gJy4vbW9kdWxlLXRyYW5zbGF0aW9uJztcbmltcG9ydCB7IFRyYW5zbGF0aW9uIH0gZnJvbSAnLi90cmFuc2xhdGlvbic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSU1vZHVsZVRyYW5zbGF0aW9uT3B0aW9ucyB7XG4gIC8qKlxuICAgKiBUaGUgdHJhbnNsYXRpb24gbW9kdWxlIGNvbmZpZ3VyYXRpb25zXG4gICAqL1xuICBtb2R1bGVzOiBJTW9kdWxlVHJhbnNsYXRpb25bXTtcbiAgLyoqXG4gICAqIEJ5IGRlZmF1bHQsIGVhY2ggbW9kdWxlIGdldHMgaXRzIG93biBuYW1lc3BhY2Ugc28gaXQgZG9lc24ndCBjb25mbGljdCB3aXRoIG90aGVyIG1vZHVsZXNcbiAgICovXG4gIGRpc2FibGVOYW1lc3BhY2U/OiBib29sZWFuO1xuICAvKipcbiAgICogQnkgZGVmYXVsdCwgbmFtZXNwYWNlcyBhcmUgdXBwZXJjYXNlXG4gICAqL1xuICBsb3dlcmNhc2VOYW1lc3BhY2U/OiBib29sZWFuO1xuICAvKipcbiAgICogQnkgZGVmYXVsdCwgaXQnbGwgcGVyZm9ybSBhIGRlZXBtZXJnZSB3aGVuIG1lcmdpbmcgdHJhbnNsYXRpb24gZmlsZXNcbiAgICovXG4gIGRlZXBNZXJnZT86IGJvb2xlYW47XG4gIC8qKlxuICAgKiBGdW5jdGlvbiB0aGF0IGdldHMgZXhlY3V0ZWQgaWYgYW4gZXJyb3Igb2NjdXJyZWQgd2hpbGUgcmV0cmlldmluZyBhIHRyYW5zbGF0aW9uIGZpbGVcbiAgICogQHBhcmFtIGVycm9yIHRoZSBlcnJvciB0aGF0IG9jY3VycmVkXG4gICAqIEBwYXJhbSBwYXRoIHRoZSBwYXRoIHRvIHRoZSBsb2NhdGlvbiBmaWxlXG4gICAqL1xuICB0cmFuc2xhdGVFcnJvcj86IChlcnJvcjogYW55LCBwYXRoOiBzdHJpbmcpID0+IHZvaWQ7XG4gIC8qKlxuICAgKiBDdXN0b20gdHJhbnNsYXRlIG1lcmdlIGZ1bmN0aW9uIGFmdGVyIHJldHJpZXZpbmcgYWxsIHRyYW5zbGF0aW9uIGZpbGVzXG4gICAqIEBwYXJhbSB0cmFuc2xhdGlvbnMgdGhlIHJlc29sdmVkIHRyYW5zbGF0aW9uIGZpbGVzXG4gICAqL1xuICB0cmFuc2xhdGVNZXJnZXI/OiAodHJhbnNsYXRpb25zOiBUcmFuc2xhdGlvbltdKSA9PiBUcmFuc2xhdGlvbjtcbiAgLyoqXG4gICAqIEN1c3RvbSBtb2R1bGUgcGF0aCB0ZW1wbGF0ZSBmb3IgZmV0Y2hpbmcgdHJhbnNsYXRpb25zXG4gICAqIEBleGFtcGxlXG4gICAqICd7YmFzZVRyYW5zbGF0ZVVybH0ve21vZHVsZU5hbWV9L3tsYW5ndWFnZX0nXG4gICAqL1xuICBtb2R1bGVQYXRoVGVtcGxhdGU/OiBzdHJpbmc7XG4gIC8qKlxuICAgKiBDdXN0b20gcGF0aCB0ZW1wbGF0ZSBmb3IgZmV0Y2hpbmcgdHJhbnNsYXRpb25zXG4gICAqIEBleGFtcGxlXG4gICAqICd7YmFzZVRyYW5zbGF0ZVVybH0ve2xhbmd1YWdlfSdcbiAgICovXG4gIHBhdGhUZW1wbGF0ZT86IHN0cmluZztcbn1cbiJdfQ== |
@@ -1,1 +0,1 @@ | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLXRyYW5zbGF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmd4LXRyYW5zbGF0ZS1tb2R1bGUtbG9hZGVyL3NyYy9saWIvbW9kZWxzL21vZHVsZS10cmFuc2xhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJhbnNsYXRpb24gfSBmcm9tICcuL3RyYW5zbGF0aW9uJztcblxuZXhwb3J0IGludGVyZmFjZSBJTW9kdWxlVHJhbnNsYXRpb24ge1xuICAvKipcbiAgICogVGhlIG1vZHVsZSBuYW1lXG4gICAqXG4gICAqIEZvciBleGFtcGxlOiBzaGFyZWRcbiAgICogQGRlc2NyaXB0aW9uIG9taXQgbW9kdWxlTmFtZSBpZiB5b3UgaGF2ZSBhIHRyYW5zbGF0ZSBmaWxlIGF0IGJhc2VUcmFuc2xhdGVVcmwgbGV2ZWxcbiAgICogQHNlZSBiYXNlVHJhbnNsYXRlVXJsXG4gICAqL1xuICBtb2R1bGVOYW1lPzogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIGJhc2UgdHJhbnNsYXRlIFVSTFxuICAgKlxuICAgKiBGb3IgZXhhbXBsZTogLi9hc3NldHMvaTE4blxuICAgKiBAZGVzY3JpcHRpb24gdGhlIGZpbmFsIHVybCB3aWxsIHRoZW4gYmU6IC4vYXNzZXRzL2kxOG4vc2hhcmVkIGlmIHRoZSBtb2R1bGVOYW1lIGlzIHNoYXJlZFxuICAgKiBAc2VlIG1vZHVsZU5hbWVcbiAgICovXG4gIGJhc2VUcmFuc2xhdGVVcmw6IHN0cmluZztcbiAgLyoqXG4gICAqIEJ5IGRlZmF1bHQsIGl0IHVzZXMgdGhlIG1vZHVsZU5hbWUgYXMgbmFtZVNwYWNlXG4gICAqIEBzZWUgbW9kdWxlTmFtZVxuICAgKlxuICAgKiBVc2UgdGhpcyBwcm9wZXJ0eSBpZiB5b3Ugd2FudCB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCBuYW1lU3BhY2VcbiAgICovXG4gIG5hbWVTcGFjZT86IHN0cmluZztcbiAgLyoqXG4gICAqIEN1c3RvbSB0cmFuc2xhdGlvbiBtYXAgZnVuY3Rpb24gYWZ0ZXIgcmV0cmlldmluZyBhIHRyYW5zbGF0aW9uIGZpbGVcbiAgICogQHBhcmFtIHRyYW5zbGF0aW9uIHRoZSByZXNvbHZlZCB0cmFuc2xhdGlvbiBmaWxlXG4gICAqL1xuICB0cmFuc2xhdGVNYXA/OiAodHJhbnNsYXRpb246IFRyYW5zbGF0aW9uKSA9PiBUcmFuc2xhdGlvbjtcbn1cbiJdfQ== | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLXRyYW5zbGF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmd4LXRyYW5zbGF0ZS1tb2R1bGUtbG9hZGVyL3NyYy9saWIvbW9kZWxzL21vZHVsZS10cmFuc2xhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJhbnNsYXRpb24gfSBmcm9tICcuL3RyYW5zbGF0aW9uJztcblxuZXhwb3J0IGludGVyZmFjZSBJTW9kdWxlVHJhbnNsYXRpb24ge1xuICAvKipcbiAgICogVGhlIG1vZHVsZSBuYW1lXG4gICAqXG4gICAqIEZvciBleGFtcGxlOiBzaGFyZWRcbiAgICogQGRlc2NyaXB0aW9uIG9taXQgbW9kdWxlTmFtZSBpZiB5b3UgaGF2ZSBhIHRyYW5zbGF0ZSBmaWxlIGF0IGJhc2VUcmFuc2xhdGVVcmwgbGV2ZWxcbiAgICogQHNlZSBiYXNlVHJhbnNsYXRlVXJsXG4gICAqL1xuICBtb2R1bGVOYW1lPzogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIGJhc2UgdHJhbnNsYXRlIFVSTFxuICAgKlxuICAgKiBGb3IgZXhhbXBsZTogLi9hc3NldHMvaTE4blxuICAgKiBAZGVzY3JpcHRpb24gdGhlIGZpbmFsIHVybCB3aWxsIHRoZW4gYmU6IC4vYXNzZXRzL2kxOG4vc2hhcmVkIGlmIHRoZSBtb2R1bGVOYW1lIGlzIHNoYXJlZFxuICAgKiBAc2VlIG1vZHVsZU5hbWVcbiAgICovXG4gIGJhc2VUcmFuc2xhdGVVcmw6IHN0cmluZztcbiAgLyoqXG4gICAqIEJ5IGRlZmF1bHQsIGl0IHVzZXMgdGhlIG1vZHVsZU5hbWUgYXMgbmFtZXNwYWNlXG4gICAqIEBzZWUgbW9kdWxlTmFtZVxuICAgKlxuICAgKiBVc2UgdGhpcyBwcm9wZXJ0eSBpZiB5b3Ugd2FudCB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCBuYW1lU3BhY2VcbiAgICovXG4gIG5hbWVzcGFjZT86IHN0cmluZztcbiAgLyoqXG4gICAqIEN1c3RvbSB0cmFuc2xhdGlvbiBtYXAgZnVuY3Rpb24gYWZ0ZXIgcmV0cmlldmluZyBhIHRyYW5zbGF0aW9uIGZpbGVcbiAgICogQHBhcmFtIHRyYW5zbGF0aW9uIHRoZSByZXNvbHZlZCB0cmFuc2xhdGlvbiBmaWxlXG4gICAqL1xuICB0cmFuc2xhdGVNYXA/OiAodHJhbnNsYXRpb246IFRyYW5zbGF0aW9uKSA9PiBUcmFuc2xhdGlvbjtcbn1cbiJdfQ== |
import merge from 'deepmerge'; | ||
import { forkJoin as ForkJoin, of } from 'rxjs'; | ||
import { catchError, map } from 'rxjs/operators'; | ||
export const createJsonPath = (path) => path.concat('.json'); | ||
export const toJsonPath = (path) => path.concat('.json'); | ||
const PATH_TEMPLATE_MATCH = /{([^}]+)}/gi; | ||
@@ -20,3 +20,3 @@ export class ModuleTranslateLoader { | ||
this.options = options; | ||
this.defaultOptions = Object.assign({ enableNamespacing: true, nameSpaceUppercase: true, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options); | ||
this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options); | ||
} | ||
@@ -27,3 +27,3 @@ getTranslation(language) { | ||
} | ||
mergeTranslations(moduleTranslations, { translateMerger, deepMerge }) { | ||
mergeTranslations(moduleTranslations, { deepMerge, translateMerger }) { | ||
return ForkJoin(moduleTranslations).pipe(map((translations) => { | ||
@@ -48,21 +48,21 @@ return translateMerger | ||
const pathOptions = { baseTranslateUrl, language }; | ||
const path = createJsonPath(pathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => pathOptions[m1] || '')); | ||
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)); | ||
} | ||
fetchTranslationForModule(language, { modulePathTemplate, enableNamespacing, nameSpaceUppercase, translateError }, { baseTranslateUrl, translateMap, moduleName, nameSpace }) { | ||
fetchTranslationForModule(language, { modulePathTemplate, disableNamespace, lowercaseNamespace, translateError }, { baseTranslateUrl, moduleName, namespace, translateMap }) { | ||
const modulePathOptions = { baseTranslateUrl, moduleName, language }; | ||
const modulePath = createJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => modulePathOptions[m1] || '')); | ||
const namespaceKey = nameSpace | ||
? nameSpaceUppercase | ||
? nameSpace.toUpperCase() | ||
: nameSpace.toLowerCase() | ||
: nameSpaceUppercase | ||
? moduleName.toUpperCase() | ||
: moduleName.toLowerCase(); | ||
const modulePath = toJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => modulePathOptions[m1] || '')); | ||
const namespaceKey = namespace | ||
? lowercaseNamespace | ||
? namespace.toLowerCase() | ||
: namespace.toUpperCase() | ||
: lowercaseNamespace | ||
? moduleName.toLowerCase() | ||
: moduleName.toUpperCase(); | ||
return this.http.get(modulePath).pipe(map((translation) => { | ||
return translateMap | ||
? translateMap(translation) | ||
: enableNamespacing | ||
? Object({ [namespaceKey]: translation }) | ||
: translation; | ||
: disableNamespace | ||
? translation | ||
: Object({ [namespaceKey]: translation }); | ||
}), this.catchError(modulePath, translateError)); | ||
@@ -80,2 +80,2 @@ } | ||
} | ||
//# 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 createJsonPath = (path: string) => path.concat('.json');\n\nconst PATH_TEMPLATE_MATCH = /{([^}]+)}/gi;\n\nexport class ModuleTranslateLoader implements TranslateLoader {\n  private readonly defaultOptions: IModuleTranslationOptions = {\n    enableNamespacing: true,\n    nameSpaceUppercase: true,\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    { translateMerger, deepMerge }: 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 = createJsonPath(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, enableNamespacing, nameSpaceUppercase, translateError }: IModuleTranslationOptions,\n    { baseTranslateUrl, translateMap, moduleName, nameSpace }: IModuleTranslation\n  ): Observable<Translation> {\n    const modulePathOptions = { baseTranslateUrl, moduleName, language };\n    const modulePath = createJsonPath(\n      modulePathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1: string) => modulePathOptions[m1] || '')\n    );\n    const namespaceKey = nameSpace\n      ? nameSpaceUppercase\n        ? nameSpace.toUpperCase()\n        : nameSpace.toLowerCase()\n      : nameSpaceUppercase\n      ? moduleName.toUpperCase()\n      : moduleName.toLowerCase();\n\n    return this.http.get<Translation>(modulePath).pipe(\n      map((translation) => {\n        return translateMap\n          ? translateMap(translation)\n          : enableNamespacing\n          ? Object({ [namespaceKey]: translation })\n          : 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_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"]} |
@@ -5,3 +5,3 @@ import merge from 'deepmerge'; | ||
const createJsonPath = (path) => path.concat('.json'); | ||
const toJsonPath = (path) => path.concat('.json'); | ||
const PATH_TEMPLATE_MATCH = /{([^}]+)}/gi; | ||
@@ -22,3 +22,3 @@ class ModuleTranslateLoader { | ||
this.options = options; | ||
this.defaultOptions = Object.assign({ enableNamespacing: true, nameSpaceUppercase: true, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options); | ||
this.defaultOptions = Object.assign({ disableNamespace: false, lowercaseNamespace: false, deepMerge: true, modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}', pathTemplate: '{baseTranslateUrl}/{language}' }, this.options); | ||
} | ||
@@ -29,3 +29,3 @@ getTranslation(language) { | ||
} | ||
mergeTranslations(moduleTranslations, { translateMerger, deepMerge }) { | ||
mergeTranslations(moduleTranslations, { deepMerge, translateMerger }) { | ||
return forkJoin(moduleTranslations).pipe(map((translations) => { | ||
@@ -50,21 +50,21 @@ return translateMerger | ||
const pathOptions = { baseTranslateUrl, language }; | ||
const path = createJsonPath(pathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => pathOptions[m1] || '')); | ||
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)); | ||
} | ||
fetchTranslationForModule(language, { modulePathTemplate, enableNamespacing, nameSpaceUppercase, translateError }, { baseTranslateUrl, translateMap, moduleName, nameSpace }) { | ||
fetchTranslationForModule(language, { modulePathTemplate, disableNamespace, lowercaseNamespace, translateError }, { baseTranslateUrl, moduleName, namespace, translateMap }) { | ||
const modulePathOptions = { baseTranslateUrl, moduleName, language }; | ||
const modulePath = createJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => modulePathOptions[m1] || '')); | ||
const namespaceKey = nameSpace | ||
? nameSpaceUppercase | ||
? nameSpace.toUpperCase() | ||
: nameSpace.toLowerCase() | ||
: nameSpaceUppercase | ||
? moduleName.toUpperCase() | ||
: moduleName.toLowerCase(); | ||
const modulePath = toJsonPath(modulePathTemplate.replace(PATH_TEMPLATE_MATCH, (_, m1) => modulePathOptions[m1] || '')); | ||
const namespaceKey = namespace | ||
? lowercaseNamespace | ||
? namespace.toLowerCase() | ||
: namespace.toUpperCase() | ||
: lowercaseNamespace | ||
? moduleName.toLowerCase() | ||
: moduleName.toUpperCase(); | ||
return this.http.get(modulePath).pipe(map((translation) => { | ||
return translateMap | ||
? translateMap(translation) | ||
: enableNamespacing | ||
? Object({ [namespaceKey]: translation }) | ||
: translation; | ||
: disableNamespace | ||
? translation | ||
: Object({ [namespaceKey]: translation }); | ||
}), this.catchError(modulePath, translateError)); | ||
@@ -71,0 +71,0 @@ } |
@@ -9,11 +9,11 @@ import { IModuleTranslation } from './module-translation'; | ||
/** | ||
* Each module gets its own namespace so it doesn't conflict with other modules | ||
* By default, each module gets its own namespace so it doesn't conflict with other modules | ||
*/ | ||
enableNamespacing?: boolean; | ||
disableNamespace?: boolean; | ||
/** | ||
* Create namespaces in Uppercase if namespacing is enabled | ||
* By default, namespaces are uppercase | ||
*/ | ||
nameSpaceUppercase?: boolean; | ||
lowercaseNamespace?: boolean; | ||
/** | ||
* Perform a deepmerge when merging translation files | ||
* By default, it'll perform a deepmerge when merging translation files | ||
*/ | ||
@@ -20,0 +20,0 @@ deepMerge?: boolean; |
@@ -20,3 +20,3 @@ import { Translation } from './translation'; | ||
/** | ||
* By default, it uses the moduleName as nameSpace | ||
* By default, it uses the moduleName as namespace | ||
* @see moduleName | ||
@@ -26,3 +26,3 @@ * | ||
*/ | ||
nameSpace?: string; | ||
namespace?: string; | ||
/** | ||
@@ -29,0 +29,0 @@ * Custom translation map function after retrieving a translation file |
@@ -6,3 +6,3 @@ import { HttpClient } from '@angular/common/http'; | ||
import { Translation } from './models/translation'; | ||
export declare const createJsonPath: (path: string) => string; | ||
export declare const toJsonPath: (path: string) => string; | ||
export declare class ModuleTranslateLoader implements TranslateLoader { | ||
@@ -9,0 +9,0 @@ private readonly http; |
{ | ||
"name": "@larscom/ngx-translate-module-loader", | ||
"version": "1.5.1", | ||
"version": "2.0.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": { |
@@ -7,6 +7,8 @@ # @larscom/ngx-translate-module-loader | ||
Highly configurable and flexible translations loader for [@ngx-translate/core](https://github.com/ngx-translate/core). Fetch multiple translations (http only) | ||
Highly configurable and flexible translations loader for [@ngx-translate/core](https://github.com/ngx-translate/core). | ||
Each translation file has it's own **namespace** out of the box so the key/value pairs do not conflict with each other. Namespacing can be disabled or you can provide your own value. | ||
Fetch multiple translations (http only) and configure them to your needs. | ||
Each translation file has it's own **namespace** out of the box so the key/value pairs do not conflict with each other. You can disable namespaces or provide your own value as well. | ||
## Demo | ||
@@ -118,6 +120,6 @@ | ||
If you don't need upper case keys, set `nameSpaceUppercase` to false in the options because it's upper case by default. | ||
If you don't want to enable namespaces at all, set `enableNamespacing` to false. | ||
If you don't want uppercase keys, set `lowercaseNamespace` to true in the options because it's uppercase by default. | ||
If you don't want namespaces at all, set `disableNamespace` to true. | ||
You can override the default name space by setting the `nameSpace` property in the options. | ||
You can override the default name space by setting the `namespace` property in the options. | ||
@@ -133,11 +135,11 @@ ## Configuration | ||
/** | ||
* Each module gets its own namespace so it doesn't conflict with other modules | ||
* By default, each module gets its own namespace so it doesn't conflict with other modules | ||
*/ | ||
enableNamespacing?: boolean; | ||
disableNamespace?: boolean; | ||
/** | ||
* Create namespaces in Uppercase if namespacing is enabled | ||
* By default, namespaces are uppercase | ||
*/ | ||
nameSpaceUppercase?: boolean; | ||
lowercaseNamespace?: boolean; | ||
/** | ||
* Perform a deepmerge when merging translation files | ||
* By default, it'll perform a deepmerge when merging translation files | ||
*/ | ||
@@ -190,3 +192,3 @@ deepMerge?: boolean; | ||
/** | ||
* By default, it uses the moduleName as nameSpace | ||
* By default, it uses the moduleName as namespace | ||
* @see moduleName | ||
@@ -196,3 +198,3 @@ * | ||
*/ | ||
nameSpace?: string; | ||
namespace?: string; | ||
/** | ||
@@ -199,0 +201,0 @@ * Custom translation map function after retrieving a translation file |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Major refactor
Supply chain riskPackage 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
220
0
67653