Pr/2

README.md

@@ -163,6 +163,18 @@ export interface IModuleTranslationOptions {
    * @param translations the resolved translation files
    */
   translateMerger?: (translations: Translation[]) => Translation;
+
+  /**
+   * Custom module path template for fetching translations.
+   * @default modulePathTemplate "{baseTranslateUrl}/{moduleName}/{language}{fileType}"
+   */
+  modulePathTemplate?: string;
+
+  /**
+   * Custom path template for fetching translations.
+   * @default pathTemplate "{baseTranslateUrl}/{language}{fileType}"
+   */
+  pathTemplate?: string;
 }
 ```
 

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

@@ -32,4 +32,16 @@ export interface IModuleTranslationOptions {
    * @param translations the resolved translation files
    */
   translateMerger?: (translations: Translation[]) => Translation;
+
+  /**
+   * Custom module path template for fetching translations.
+   * @default modulePathTemplate "{baseTranslateUrl}/{moduleName}/{language}{fileType}"
+   */
+  modulePathTemplate?: string;
+
+  /**
+   * Custom path template for fetching translations.
+   * @default pathTemplate "{baseTranslateUrl}/{language}{fileType}"
+   */
+  pathTemplate?: string;
 }

lib/src/module-translate-loader.ts

@@ -12,9 +12,13 @@ export class ModuleTranslateLoader implements TranslateLoader {
     enableNamespacing: true,
     nameSpaceUppercase: true,
     deepMerge: true,
+    modulePathTemplate: '{baseTranslateUrl}/{moduleName}/{language}{fileType}',
+    pathTemplate: '{baseTranslateUrl}/{language}{fileType}',
     ...this.options
   };
 
+  private pathTemplateRx: RegExp = /{([^}]+)}/gi;
+
   /**
    * The ModuleTranslateLoader for 'ngx-translate/core'
    *
@@ -37,20 +41,30 @@ export class ModuleTranslateLoader implements TranslateLoader {
       nameSpaceUppercase,
       modules,
       translateError,
-      translateMerger
+      translateMerger,
+      pathTemplate,
+      modulePathTemplate,
     } = this._defaultOptions;
 
     const moduleRequests = modules.map(
       ({ baseTranslateUrl, moduleName, fileType, nameSpace, translateMap }) => {
         if (!moduleName) {
-          const path = `${baseTranslateUrl}/${language}${fileType}`;
+          const pathOptions = { baseTranslateUrl, language, fileType };
+          const path = pathTemplate.replace(
+            this.pathTemplateRx,
+            (_, m1: string) => pathOptions[m1] || ''
+          );
           return this.http.get<Translation>(path).pipe(
             map(translation => (translateMap ? translateMap(translation) : translation)),
             this._catchError(path, translateError)
           );
         }
 
-        const modulePath = `${baseTranslateUrl}/${moduleName}/${language}${fileType}`;
+        const modulePathOptions = { baseTranslateUrl, moduleName, language, fileType };
+        const modulePath = modulePathTemplate.replace(
+          this.pathTemplateRx,
+          (_, m1: string) => modulePathOptions[m1] || ''
+        );
         return this.http.get<Translation>(modulePath).pipe(
           map(translation => {
             if (translateMap) {

lib/test/module-translate-loader.spec.ts

@@ -423,4 +423,40 @@ describe('ModuleTranslateLoader', () => {
       });
     });
   });
+
+  it('should load from custom path templates', done => {
+    const options: IModuleTranslationOptions = {
+      ...defaultOptions,
+      modulePathTemplate: '{baseTranslateUrl}/{language}/{moduleName}{fileType}',
+      pathTemplate: '{baseTranslateUrl}/{language}{fileType}',
+    };
+
+    const language = 'en';
+
+    const loader = new ModuleTranslateLoader(TestBed.get(HttpClient), options);
+
+    loader.getTranslation(language).subscribe(translation => {
+      const expected = {
+        key: 'value',
+        key1: 'value1',
+        parent: { child: { grandChild: 'value1' } },
+        FEATURE1: { key: 'value', key1: 'value1', parent: { child: { grandChild: 'value1' } } },
+        FEATURE2: { key: 'value', key1: 'value1', parent: { child: { grandChild: 'value1' } } }
+      };
+      expect(translation).toEqual(expected);
+      done();
+    });
+
+    options.modules.forEach(({ baseTranslateUrl, moduleName, fileType }) => {
+      const path =
+        moduleName == null
+        ? `${baseTranslateUrl}/${language}${fileType}`
+        : `${baseTranslateUrl}/${language}/${moduleName}${fileType}`;
+
+      const mock = httpMock.expectOne(path);
+      expect(mock.request.method).toEqual('GET');
+
+      mock.flush(mockTranslation);
+    });
+  });
 });

package.json

@@ -1,11 +1,12 @@
 {
-  "name": "@larscom/ngx-translate-module-loader",
+  "name": "ngx-translate-module-loader-2",
   "version": "1.2.1",
   "description": "Fetch multiple translation files (http) with ngx-translate. Each translations file gets it's own namespace out of the box",
   "main": "./dist/public_api.js",
   "typings": "./dist/public_api.d.ts",
   "scripts": {
     "build": "rimraf dist && tsc",
+    "postinstall": "npm run build",
     "lint": "tslint -p tslint.json -t stylish",
     "test": "jest",
     "test:update": "jest -u",
@@ -21,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/larscom/ngx-translate-module-loader"
+    "url": "git+https://github.com/aidenwallis/ngx-translate-module-loader"
   },
   "keywords": [
     "angular",