@nutin/cli 1.2.3 → 1.3.1

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

@@ -1,5 +1,5 @@
 import { DEFAULT_LANGUAGE, LANGUAGES, Language, Translations } from './languages.js';
-import { Service } from '../../index.js';
+import { AppEventBus, Service } from '../../index.js';
 
 export class I18n extends Service<I18n> {
   private readonly _DEFAULT_LANGUAGE: Language = DEFAULT_LANGUAGE;
@@ -7,41 +7,35 @@ export class I18n extends Service<I18n> {
   private _currentLanguage: Language = this._DEFAULT_LANGUAGE;
   private _translations: Translations = {};
   private _defaultTranslations: Translations = {};
+  private readonly _localStorageKey = 'nutin-fav-lang';
 
   constructor() {
     super();
     this.registerCleanup(this.resetTranslations);
-    this._currentLanguage = this.getBrowserLanguage();
+    this._currentLanguage = this.getPreferredLanguage();
   }
 
-  private getBrowserLanguage() {
-    return navigator.language.split('-')[0] as Language;
-  };
+  public get currentLanguage(): Language {
+    return this._currentLanguage;
+  }
 
-  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 defaultLanguage(): Language {
+    return this._DEFAULT_LANGUAGE;
   }
 
-  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 languages(): Language[] {
+    return this._LANGUAGES;
   }
 
-  protected onDestroy(): void | Promise<void> {
-    this.resetTranslations();
-    this.dispose();
+  public get localStorageKey(): string {
+    return this._localStorageKey;
+  }
+
+  public async setCurrentLanguage(lang: Language): Promise<void> {
+    this._currentLanguage = lang;
+    this.savePreferences();
+    await this.loadTranslations(lang);
+    AppEventBus.emit('language-changed');
   }
 
   public async loadTranslations(lang: Language): Promise<void> {
@@ -57,13 +51,14 @@ export class I18n extends Service<I18n> {
         await this.loadDefaultTranslations();
       }
       
-      document.documentElement.lang = lang;    
+      document.documentElement.lang = lang;   
+      this.savePreferences();
     } catch (error) {
       console.error('Translation load error:', error);
-    } 
+    }
   }
 
-  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,33 +69,12 @@ 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> {
-    const browserLang = this.getBrowserLanguage();
-    const lang = this._LANGUAGES.includes(browserLang) ? browserLang : this._DEFAULT_LANGUAGE;
+    const preferredLang = this.getPreferredLanguage();
+    const lang = this._LANGUAGES.includes(preferredLang) ? preferredLang : this._DEFAULT_LANGUAGE;
 
     // Always load default translations first
     if (lang !== this._DEFAULT_LANGUAGE) {
@@ -110,11 +84,61 @@ export class I18n extends Service<I18n> {
     await this.loadTranslations(lang);
   }
 
+  public getTranslationObject<T = any>(key: string): T | null {
+    const keys = key.split('.');
+    
+    let value = this.getNestedValue(this._translations, keys);
+
+    if (!value && this._currentLanguage !== this._DEFAULT_LANGUAGE) {
+      value = this.getNestedValue(this._defaultTranslations, keys);
+    }
+    
+    return value || null;
+  }
+
   public resetTranslations(): void {
     this._translations = {};
     this._defaultTranslations = {};
     this._currentLanguage = this._DEFAULT_LANGUAGE;
   }
+
+  protected onDestroy(): void | Promise<void> {
+    this.resetTranslations();
+    this.dispose();
+  }
+
+  private getPreferredLanguage() {
+    return this.getPreferences() || 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;
+  }
+
+  private savePreferences(): void {
+    localStorage.setItem(this._localStorageKey, this._currentLanguage);
+  }
+
+  private getPreferences(): string | null {
+    return localStorage.getItem(this._localStorageKey);
+  }
 }
 
 export const I18nService = I18n.getInstance();

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

@@ -60,6 +60,16 @@
   }
 }
 
+.u-hide-on-small {
+  @include mixins.respond-to(medium) {
+    display: none;
+  }
+}
+
+.u-hide {
+    display: none;
+}
+
 // color
 .u-color-base {
   color: $text-color;
@@ -73,6 +83,10 @@
   color: $secondary-color;
 }
 
+.u-color-acc {
+  color: $accent-color;
+}
+
 .u-color-bg {
   color: $background-color;
 }
@@ -90,6 +104,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/src/styles/core/_libs.scss.hbs

@@ -1,132 +0,0 @@
-@use "sass:map";
-@use "variables" as *;
-
-// snackbar
-.app-snackbar {
-  position: fixed;
-  left: 50%;
-  transform: translateX(-50%);
-  background: $snack-default;
-  color: white;
-  padding: 0.75rem 1.5rem;
-  border-radius: 0.5rem;
-  box-shadow: 0 2px 6px rgba(0,0,0,0.3);
-  display: flex;
-  gap: 1rem;
-  align-items: center;
-  // z-index: 1000;
-  animation: fade-in 0.3s ease;
-}
-
-.app-snackbar--bottom { bottom: 1rem; }
-.app-snackbar--top { top: 1rem; }
-
-.app-snackbar--success { background: $snack-success; }
-.app-snackbar--error { background: $snack-error; }
-.app-snackbar--info { background: $snack-info; }
-
-.app-snackbar button {
-  background: transparent;
-  border: none;
-  color: #fff;
-  font-weight: bold;
-  cursor: pointer;
-}
-
-@keyframes fade-in {
-  from { opacity: 0; transform: translateX(-50%) translateY(10px); }
-  to { opacity: 1; transform: translateX(-50%) translateY(0); }
-}
-
-// popover
-/* Prevent scroll when popover is active */
-.no-scroll {
-  overflow: hidden;
-}
-
-.popover-overlay {
-  background: linear-gradient(to right, rgba($primary-color, .7), rgba($secondary-color, .7));
-  position: fixed;
-  inset: 0;
-  backdrop-filter: blur(5px);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  // z-index: 9999;
-  opacity: 0;
-  transition: opacity 0.25s ease;
-    &.show {
-    opacity: 1;
-  }
-}
-
-.popover-wrapper {
-  position: relative;
-  background-color: $background-color;
-  border-radius: 10px transparent;
-  max-width: 600px;
-  width: 90%;
-  max-height: 90%;
-  overflow: auto;
-  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.3);
-  transform: scale(0.95);
-  opacity: 0;
-  transition: opacity 1s ease, transform 1s ease;
-    &.show {
-    transform: scale(1);
-    opacity: 1;
-  }
-}
-
-.popover-content {
-  position: relative;
-}
-
-.popover-close-button {
-  position: absolute;
-  top: 0.5rem;
-  right: 0.75rem;
-  background: none;
-  border: none;
-  font-size: 1.5rem;
-  cursor: pointer;
-}
-
-.popover-buttons {
-  display: flex;
-  justify-content: flex-end;
-  gap: 1rem;
-  margin-top: 1.5rem;
-}
-
-.popover-buttons button {
-  background-color: inherit;
-  transition: ease-in-out 0.3s;
-  padding: 0.5rem 1rem;
-  font-size: 1rem;
-  cursor: pointer;
-  &:hover {
-    background-color: rgba($secondary-color, .7);
-    color: $background-color;
-  }
- }
-
-{{#if transition}}
-// view transition
-.app-view-transition {
-  opacity: 0;
-  transform: scale(0.95);
-  transition: all 300ms ease;
-
-  &.enter-active {
-    opacity: 1;
-    transform: scale(1);
-  }
-
-  &.exit-active {
-    opacity: 0;
-    transform: scale(0.98);
-  }
-}
-
-{{/if}}

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 🎉"
-}