@nutin/cli 1.2.3 → 1.3.0

package/templates/features/i18n/src/core/services/i18n/i18n.ts.hbs

@@ -14,34 +14,16 @@ export class I18n extends Service<I18n> {
     this._currentLanguage = this.getBrowserLanguage();
   }
 
-  private getBrowserLanguage() {
-    return navigator.language.split('-')[0] as Language;
-  };
-
-  private async loadDefaultTranslations(): Promise<void> {
-    try {
-      const response = await fetch(`/locales/${this._DEFAULT_LANGUAGE}.json`);
-      
-      if (!response.ok) throw new Error(`HTTP ${response.status}`);
-      
-      this._defaultTranslations = await response.json();
-    } catch (error) {
-      console.error('Default translation load error:', error);
-    }
+  public get currentLanguage(): Language {
+    return this._currentLanguage;
   }
 
-  private getNestedValue(obj: any, keys: string[]): any {
-    let value = obj;
-    for (const key of keys) {
-      value = value?.[key];
-      if (!value) break;
-    }
-    return value;
+  public get defaultLanguage(): Language {
+    return this._DEFAULT_LANGUAGE;
   }
 
-  protected onDestroy(): void | Promise<void> {
-    this.resetTranslations();
-    this.dispose();
+  public get languages(): Language[] {
+    return this._LANGUAGES;
   }
 
   public async loadTranslations(lang: Language): Promise<void> {
@@ -63,7 +45,7 @@ export class I18n extends Service<I18n> {
     } 
   }
 
-  public translate(key: string, params?: Record<string, string>): string {
+  public translate(key: string, textContent?: string | null): string {
     const keys = key.split('.');
     
     // Try to get value from current language translations
@@ -74,28 +56,7 @@ export class I18n extends Service<I18n> {
       value = this.getNestedValue(this._defaultTranslations, keys);
     }
     
-    // If still not found, return the key as fallback
-    let result = value || key;
-    
-    if (params) {
-      Object.entries(params).forEach(([k, v]) => {
-        result = result.replace(`{${k}}`, v);
-      });
-    }
-    
-    return result;
-  }
-
-  public get currentLanguage(): Language {
-    return this._currentLanguage;
-  }
-
-  public get defaultLanguage(): Language {
-    return this._DEFAULT_LANGUAGE;
-  }
-
-  public get languages(): Language[] {
-    return this._LANGUAGES;
+    return value || textContent || key;
   }
 
   public async initTranslations(): Promise<void> {
@@ -115,6 +76,36 @@ export class I18n extends Service<I18n> {
     this._defaultTranslations = {};
     this._currentLanguage = this._DEFAULT_LANGUAGE;
   }
+
+  protected onDestroy(): void | Promise<void> {
+    this.resetTranslations();
+    this.dispose();
+  }
+
+  private getBrowserLanguage() {
+    return navigator.language.split('-')[0] as Language;
+  };
+
+  private async loadDefaultTranslations(): Promise<void> {
+    try {
+      const response = await fetch(`/locales/${this._DEFAULT_LANGUAGE}.json`);
+      
+      if (!response.ok) throw new Error(`HTTP ${response.status}`);
+      
+      this._defaultTranslations = await response.json();
+    } catch (error) {
+      console.error('Default translation load error:', error);
+    }
+  }
+
+  private getNestedValue(obj: any, keys: string[]): any {
+    let value = obj;
+    for (const key of keys) {
+      value = value?.[key];
+      if (!value) break;
+    }
+    return value;
+  }
 }
 
 export const I18nService = I18n.getInstance();

package/templates/features/stylinNutin/src/styles/core/_utilities.scss.hbs

@@ -90,6 +90,23 @@
   font-family: $secondary-font;
 }
 
+.u-font-primary {
+  font-family: $primary-font;
+}
+
+// text
+.u-text-center {
+  text-align: center;
+}
+
+.u-text-right {
+  text-align: right;
+}
+
+.u-text-left {
+  text-align: left;
+}
+
 // flex
 .u-flex-center {
   @include mixins.flex-center;

package/templates/features/template/src/app/views/home/home.view.html.hbs

@@ -2,7 +2,7 @@
 {{#if stylinNutin}}
   class="u-flex-center u-flex-column u-padd-y-large"
 {{else}}
-  style="display:flex;justify-content:center;align-items:center;flex-direction:column"
+  style="display:flex;justify-content:center;align-items:center;flex-direction:column;padding-top:1rem;padding-bottom:1rem;"
 {{/if}}>
   <h1 
   {{#if i18n}}

package/templates/features/template/tools/builder/core/merge-templates.js.hbs

@@ -19,7 +19,7 @@ async function mergeTemplates() {
     try {
       const htmlContent = await fs.readFile(htmlPath, 'utf-8');
       const minifiedHtml = await minifyHTML(htmlContent);
-      if (isVerbose) print.info(`Minified HTML: ${file}`);
+      if (isVerbose) print.info(`Minified HTML: ${htmlPath}`);
 
       try {
         let jsContent = await fs.readFile(jsPath, 'utf-8');
@@ -32,7 +32,7 @@ async function mergeTemplates() {
         jsContent = jsContent.replace(PLACEHOLDER, minifiedHtml);
         await fs.writeFile(jsPath, jsContent);
         await fs.unlink(htmlPath);
-        if (isVerbose) print.info(`✅ Updated ${jsFilename} with template from ${htmlFilename}.`);
+        if (isVerbose) print.info(`Updated ${jsFilename} with template from ${htmlFilename}.`);
       } catch (err) {
         print.boldError(`ERROR: Cannot update ${jsFilename}. ${err.message}`);
       }

package/templates/features/testinNutin/testin-nutin/core/src/utils/test-queue.js.hbs

@@ -24,9 +24,11 @@ export async function runQueuedTests() {
       test = testQueue.deque();
 
       if (test.suiteName !== previousSuite) {
+        teardownJsdom();
         if (previousSuiteAfterAll) {
           await previousSuiteAfterAll();
         }
+        setupJsdom();
         if (test.beforeAll) {
           await test.beforeAll();
         }
@@ -34,11 +36,9 @@ export async function runQueuedTests() {
         previousSuiteAfterAll = test.afterAll;
       }
 
-      setupJsdom();
       if (test.beforeEach) await test.beforeEach();
       await test.testFn();
       if (test.afterEach) await test.afterEach();
-      teardownJsdom();
 
       passed++;
       results.push({ 

package/templates/features/testinNutin/testin-nutin/runner.js.hbs

@@ -1,4 +1,5 @@
 import { registerTestGlobals, getTestFiles, runQueuedTests, print } from './core/index.js';
+import path from 'path';
 import config from '#root/testin-nutin.config.js';
 
 registerTestGlobals();

package/templates/features/testinNutin/testin-nutin.config.js.hbs

@@ -4,11 +4,11 @@ export default {
 		// 'src/core', // toolkit core logic
 		// 'testin-nutin/core/tests', // test globals
 	],
-	verbose: false,
 	jsdomOptions: {
     runScripts: false,     // or true ("dangerously") if needed
     resources: false,      // or true ("usable") if needed
     freezeGlobals: false,
     pretendToBeVisual: true,
-  }
+  },
+	verbose: false,
 }

package/templates/base/tools/deployment/gzip.conf.hbs

@@ -1,19 +0,0 @@
-gzip on;
-gzip_vary on;
-gzip_proxied any;
-gzip_comp_level 6;
-gzip_min_length 1000;
-
-gzip_types
-    text/plain
-    text/css
-    text/xml
-    text/javascript
-    application/json
-    application/javascript
-    application/xml+rss
-    application/rss+xml
-    font/truetype
-    font/opentype
-    application/vnd.ms-fontobject
-    image/svg+xml;

package/templates/features/i18n/src/app/views/home/locales/fr.json.hbs

@@ -1,9 +0,0 @@
-{
-  "meta" : {
-    "title": "Accueil",
-    "description": "Page d'accueil"
-  },
-  "title": "{{projectName}}",
-  "ready": "Tout est prêt !",
-  "enjoy": "Happy Coding 🎉"
-}