@ozdao/martyrs 0.2.602 → 0.2.603

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.602",
+  "version": "0.2.603",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -32,10 +32,12 @@
   ],
   "exports": {
     ".": {
+      "development": "./src/main.js",
       "import": "./dist/martyrs.es.js",
       "require": "./dist/martyrs.cjs.js"
     },
     "./builder": {
+      "development": "./src/builder/builder.js",
       "import": "./dist/builder.js",
       "require": "./dist/builder.cjs"
     },
@@ -48,13 +50,16 @@
       "import": "./dist/style.css"
     },
     "./modules/*/server": {
-      "require": "./dist/*.server.cjs",
-      "import": "./dist/*.server.js"
+      "development": "./src/modules/*/*.server.js",
+      "import": "./dist/*.server.js",
+      "require": "./dist/*.server.cjs"
     },
     "./modules/*/client": {
-      "require": "./dist/martyrs/src/modules/*/*.client.cjs",
-      "import": "./dist/martyrs/src/modules/*/*.client.js"
-    }
+      "development": "./src/modules/*/*.client.js",
+      "import": "./dist/martyrs/src/modules/*/*.client.js",
+      "require": "./dist/martyrs/src/modules/*/*.client.cjs"
+    },
+    "./src/*": "./src/*"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -109,6 +114,8 @@
     "webpack": "5.98.0",
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-dev-middleware": "7.4.2",
+    "webpack-hot-client": "^4.2.0",
+    "webpack-hot-middleware": "^2.26.1",
     "webpack-merge": "6.0.1",
     "webpack-node-externals": "3.0.0",
     "webpack-stats-plugin": "1.1.3"

package/src/builder/modes/ssr.rspack.dev.js

@@ -72,20 +72,26 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
       }
 
 
-      const { entrypoints, outputPath } = jsonStats;
-      const { main: { assets: [mainChunkPath] } } = entrypoints;
-      const mainModulePath = path.resolve(outputPath, mainChunkPath.name);
-
-      // Dynamic import for ESM compatibility with cache busting
-      // IMPORTANT: Add timestamp to force reimport after recompilation
-      const module = await import(`${mainModulePath}?t=${Date.now()}`);
-      renderApp = module._renderApp;
-
-      // [LOADING 3] SSR module successfully compiled
-      performance.mark('loading-3-end');
-      performance.measure('loading-3', 'loading-2-start', 'loading-3-end');
-      const measure3 = performance.getEntriesByName('loading-3')[0];
-      console.log(`[LOADING 3] SSR module compiled in ${measure3?.duration?.toFixed(2)}ms`);
+      try {
+        const { entrypoints, outputPath } = jsonStats;
+        const { main: { assets: [mainChunkPath] } } = entrypoints;
+        const mainModulePath = path.resolve(outputPath, mainChunkPath.name);
+
+        // Dynamic import for ESM compatibility with cache busting
+        // IMPORTANT: Add timestamp to force reimport after recompilation
+        const module = await import(`${mainModulePath}?t=${Date.now()}`);
+        renderApp = module._renderApp;
+
+        // [LOADING 3] SSR module successfully compiled
+        performance.mark('loading-3-end');
+        performance.measure('loading-3', 'loading-2-start', 'loading-3-end');
+        const measure3 = performance.getEntriesByName('loading-3')[0];
+        console.log(`[LOADING 3] SSR module compiled in ${measure3?.duration?.toFixed(2)}ms`);
+
+        await startServer();
+      } catch (err) {
+        console.error(chalk.red('[SSR] Failed to load SSR module:'), err);
+      }
     }
   );
 
@@ -114,7 +120,7 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
 
       let head = '';
       let body = '';
-      
+
       if (cachedStatsJson) {
         // Используем кэшированный stats - это в 1000 раз быстрее!
         const resolver = createAssetResolver(cachedStatsJson);
@@ -124,7 +130,7 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
       } else if (stats && stats.toJson) {
         // Fallback если кэш еще не готов (только первый запрос)
         const statsJson = stats.toJson();
-        
+
         const resolver = createAssetResolver(statsJson);
         const tags = resolver.collect(modulesToLoad);
         head = tags.head;
@@ -175,8 +181,8 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
       console.error(err);
       return;
     }
-    
-    
+
+
     try {
       // [LOADING 6] Loading server module
       performance.mark('loading-6-start');
@@ -206,9 +212,9 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
     }
   });
 
-  // Кэшируем stats после компиляции чтобы не вызывать toJson() на каждый запрос  
+  // Кэшируем stats после компиляции чтобы не вызывать toJson() на каждый запрос
   let cachedStatsJson = null;
-  
+
   clientCompiler.hooks.done.tap('cache-stats', (stats) => {
     cachedStatsJson = stats.toJson({
       assets: true,
@@ -253,6 +259,12 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
       return;
     }
 
+    // Проверяем, что SSR модуль загружен
+    if (!renderApp) {
+      console.error("SSR модуль еще не скомпилирован");
+      return;
+    }
+
 
     let { app, server, env } = await serverModule.createServer();
 

package/src/builder/rspack/rspack.config.api.js

@@ -30,6 +30,9 @@ export default projectRoot => {
       alias: {
         '@martyrs': path.resolve(projectRoot, 'martyrs'),
       },
+      conditionNames: process.env.NODE_ENV !== 'production'
+        ? ['development', 'import', 'module', 'node', 'default']
+        : ['import', 'module', 'node', 'default'],
       fallback: {
         path: false,
       },

package/src/builder/rspack/rspack.config.base.js

@@ -18,10 +18,18 @@ export default (projectRoot) => {
         'vue-router': path.resolve(projectRoot, 'node_modules/vue-router'),
         'vue-i18n': path.resolve(projectRoot, 'node_modules/vue-i18n'),
       },
+      conditionNames: process.env.NODE_ENV !== 'production'
+        ? ['development', 'import', 'module', 'webpack', 'default']
+        : ['import', 'module', 'webpack', 'default'],
     },
     module: {
       rules: [
-        
+        {
+          test: /\.m?js$/,
+          resolve: {
+            fullySpecified: false,
+          },
+        },
         {
           test: /\.m?js$/,
           exclude: /node_modules\/(?!(vue-meta)\/).*/,

package/src/builder/rspack/rspack.config.ssr.client.js

@@ -17,14 +17,17 @@ export default (projectRoot) => {
     mode: !isProd ? "development" : "production",
     devtool: !isProd ? "eval-cheap-module-source-map" : "source-map",
     entry: {
-      main: path.resolve(projectRoot, "src/client.js"),
+      main: [
+        ...(!isProd ? ['webpack-hot-middleware/client?reload=true&noInfo=true'] : []),
+        path.resolve(projectRoot, "src/client.js"),
+      ],
     },
     module: {
       rules: [],
     },
     output: {
-      filename: "[name].[contenthash:8].js",
-      chunkFilename: 'chunks/[name].[contenthash:8].js',
+      filename: isProd ? "[name].[contenthash:8].js" : "[name].js",
+      chunkFilename: isProd ? 'chunks/[name].[contenthash:8].js' : 'chunks/[name].js',
       path: path.resolve(projectRoot, "builds/web/client"),
       publicPath: "/",
       clean: true
@@ -40,7 +43,7 @@ export default (projectRoot) => {
     },
 
     plugins: [
-      // ...(!isProd ? [new rspack.HotModuleReplacementPlugin()] : []),
+      ...(!isProd ? [new rspack.HotModuleReplacementPlugin()] : []),
       new StatsWriterPlugin({
         filename: 'stats.json',
         stats: {
@@ -114,7 +117,7 @@ export default (projectRoot) => {
       ] : []),
     ],
     optimization: {
-      sideEffects: false,
+      sideEffects: true,
       usedExports: true,
       innerGraph: true,
       providedExports: true,

package/src/components/Block/Block.vue

@@ -3,7 +3,7 @@
     class="bg-light pd-medium radius-medium"
   >
   	<div v-if="title || actions" class="mn-b-small flex-v-center flex-nowrap flex">
-  		<h4 v-if="title" class="mn-r-thin fw-medium">{{title}}</h4>
+  		<h5 v-if="title" class="mn-r-thin fw-medium">{{title}}</h5>
   			
   		<button 
   			v-for="action in actions" 

package/src/components/Button/Button.vue

@@ -134,12 +134,12 @@ async function Submit() {
     
     <!-- Counter -->
     <div v-if="counter" class="button-counter font-second flex flex-center">
-      <span>{{ counter }}</span>
+      <span class="t-black dark:t-white">{{ counter }}</span>
     </div>
   </button>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 button[disabled] {
   opacity: 0.75 !important;
   pointer-events: none !important;
@@ -185,8 +185,8 @@ a.button {
 
   .button-counter {
     position: absolute;
-    right: -8px;
-    bottom: -8px;
+    right: 0px;
+    bottom: 0px;
     background: yellow;
     height: 16px;
     border-radius: 16px;

package/src/components/Table/StatusBadge.vue

@@ -1,27 +1,33 @@
 <script setup>
-defineProps({
+import { computed } from 'vue'
+
+const props = defineProps({
   value: {
-    type: Object,
-    required: true
+    type: String,
+    default: ''
   }
 })
+
+const statusColors = {
+  active: 'bg-green t-white',
+  completed: 'bg-green t-white',
+  confirmed: 'bg-green t-white',
+  in_progress: 'bg-orange t-white',
+  inactive: 'bg-orange t-white',
+  created: 'bg-main',
+  blocked: 'bg-red t-white',
+  cancelled: 'bg-red t-white',
+  lost: 'bg-red t-white',
+}
+
+const badgeClass = computed(() => statusColors[props.value] || 'bg-main')
 </script>
 
 <template>
-  <span 
-    class="status-badge"
-    :style="{ backgroundColor: value.color || '#ddd' }"
+  <span
+    class="capitalize w-max fw-medium radius-big pd-thin"
+    :class="badgeClass"
   >
-    {{ value }}
+    {{ value || '—' }}
   </span>
-</template>
-
-<style scoped>
-.status-badge {
-  padding: 4px 8px;
-  border-radius: 12px;
-  font-size: 0.875rem;
-  color: white;
-  display: inline-block;
-}
-</style>
+</template>

package/src/components/Text/Text.vue

@@ -1,7 +1,7 @@
 <template>
   <span @click="toggleShow" class="">
     {{ shownText }}
-    <span v-if="isTruncated && showToggleText" class="cursor-pointer t-grey">{{ showMoreText }}</span>
+    <span v-if="isTruncated && showToggleText" class="cursor-pointer t-dark">{{ showMoreText }}</span>
   </span>
 </template>
 

package/src/jit/core.js

@@ -7,6 +7,7 @@ export class MartyrsJIT {
     this.rules = options.rules || [];
     this.variants = options.variants || [];
     this.cache = new Map();
+    this.tokenMeta = new Map(); // token → {ruleIndex, altIndex}
     this.usedTokens = new Set();
   }
 
@@ -57,12 +58,17 @@ export class MartyrsJIT {
     }
 
     // Ищем подходящее правило для базового токена
-    for (const [pattern, handler] of this.rules) {
+    for (let ruleIdx = 0; ruleIdx < this.rules.length; ruleIdx++) {
+      const [pattern, handler] = this.rules[ruleIdx];
       const match = baseToken.match(pattern);
       if (match) {
         let css = handler(match, this);
         if (!css) continue;
 
+        // Сохраняем метаданные для сортировки: индекс правила + позиция в альтернации regex
+        const altIndex = this._getAlternationIndex(pattern, match);
+        this.tokenMeta.set(token, { ruleIndex: ruleIdx, altIndex });
+
         const selector = this.escapeSelector(token);
 
         if (appliedVariants.length === 0) {
@@ -203,45 +209,61 @@ export class MartyrsJIT {
 
       this.usedTokens.add(token);
 
+      const entry = { css, token };
+
       // Определяем группу по первому media-варианту или pseudo
-      if (token.includes('mobile:')) groups.mobile.push(css);
-      else if (token.includes('tablet:')) groups.tablet.push(css);
-      else if (token.includes('desktop:')) groups.desktop.push(css);
-      else if (token.includes('widescreen:')) groups.widescreen.push(css);
-      else if (token.includes('dark:')) groups.dark.push(css);
-      else if (token.includes('light:')) groups.light.push(css);
-      else if (token.includes('print:')) groups.print.push(css);
-      else if (token.includes('group-hover:')) groups.groupHover.push(css);
-      else if (token.includes('hover:')) groups.hover.push(css);
-      else if (token.includes('focus:')) groups.focus.push(css);
-      else if (token.includes('active:')) groups.active.push(css);
-      else if (token.includes('disabled:')) groups.disabled.push(css);
-      else if (token.includes('first:')) groups.first.push(css);
-      else if (token.includes('last:')) groups.last.push(css);
-      else if (token.includes('odd:')) groups.odd.push(css);
-      else if (token.includes('even:')) groups.even.push(css);
-      else groups.base.push(css);
+      if (token.includes('mobile:')) groups.mobile.push(entry);
+      else if (token.includes('tablet:')) groups.tablet.push(entry);
+      else if (token.includes('desktop:')) groups.desktop.push(entry);
+      else if (token.includes('widescreen:')) groups.widescreen.push(entry);
+      else if (token.includes('dark:')) groups.dark.push(entry);
+      else if (token.includes('light:')) groups.light.push(entry);
+      else if (token.includes('print:')) groups.print.push(entry);
+      else if (token.includes('group-hover:')) groups.groupHover.push(entry);
+      else if (token.includes('hover:')) groups.hover.push(entry);
+      else if (token.includes('focus:')) groups.focus.push(entry);
+      else if (token.includes('active:')) groups.active.push(entry);
+      else if (token.includes('disabled:')) groups.disabled.push(entry);
+      else if (token.includes('first:')) groups.first.push(entry);
+      else if (token.includes('last:')) groups.last.push(entry);
+      else if (token.includes('odd:')) groups.odd.push(entry);
+      else if (token.includes('even:')) groups.even.push(entry);
+      else groups.base.push(entry);
+    }
+
+    // Сортируем каждую группу по порядку правил из rules.js
+    const sortByRule = (a, b) => {
+      const metaA = this.tokenMeta.get(a.token) || { ruleIndex: 0, altIndex: 0 };
+      const metaB = this.tokenMeta.get(b.token) || { ruleIndex: 0, altIndex: 0 };
+      if (metaA.ruleIndex !== metaB.ruleIndex) return metaA.ruleIndex - metaB.ruleIndex;
+      return metaA.altIndex - metaB.altIndex;
+    };
+
+    for (const key in groups) {
+      groups[key].sort(sortByRule);
     }
 
+    const toCSS = (arr) => arr.map(e => e.css);
+
     // Вывод в строгом порядке
     return [
-      ...groups.base,
-      ...groups.hover,
-      ...groups.focus,
-      ...groups.active,
-      ...groups.disabled,
-      ...groups.first,
-      ...groups.last,
-      ...groups.odd,
-      ...groups.even,
-      ...groups.groupHover,
-      ...groups.widescreen,
-      ...groups.desktop,
-      ...groups.tablet,
-      ...groups.mobile,
-      ...groups.dark,
-      ...groups.light,
-      ...groups.print
+      ...toCSS(groups.base),
+      ...toCSS(groups.hover),
+      ...toCSS(groups.focus),
+      ...toCSS(groups.active),
+      ...toCSS(groups.disabled),
+      ...toCSS(groups.first),
+      ...toCSS(groups.last),
+      ...toCSS(groups.odd),
+      ...toCSS(groups.even),
+      ...toCSS(groups.groupHover),
+      ...toCSS(groups.widescreen),
+      ...toCSS(groups.desktop),
+      ...toCSS(groups.tablet),
+      ...toCSS(groups.mobile),
+      ...toCSS(groups.dark),
+      ...toCSS(groups.light),
+      ...toCSS(groups.print)
     ].join('\n');
   }
 
@@ -273,11 +295,26 @@ export class MartyrsJIT {
     return Array.from(this.cache.values()).join('\n');
   }
 
+  /**
+   * Определяет позицию совпавшего значения в альтернации regex
+   * pos-(relative|absolute|fixed) + match "absolute" → 1
+   */
+  _getAlternationIndex(pattern, match) {
+    if (!match[1]) return 0;
+    const src = pattern.source;
+    const groupMatch = src.match(/\(([^()]+)\)/);
+    if (!groupMatch || !groupMatch[1].includes('|')) return 0;
+    const alts = groupMatch[1].split('|');
+    const idx = alts.indexOf(match[1]);
+    return idx >= 0 ? idx : 0;
+  }
+
   /**
    * Очистить кэш (для watch mode)
    */
   reset() {
     this.cache.clear();
+    this.tokenMeta.clear();
     this.usedTokens.clear();
   }
 }

package/src/jit/plugin.js

@@ -177,10 +177,11 @@ export class MartyrsJitPlugin {
       filename.includes(`/${dir}/`) || filename.includes(`\\${dir}\\`) || filename.includes(dir)
     );
 
-    // Don't exclude @ozdao/martyrs even if it's in node_modules
-    const isMartyrsPackage = filename.includes('@ozdao/martyrs') || filename.includes('@ozdao\\martyrs');
+    // Don't exclude @ozdao/martyrs even if it's in node_modules or dist
+    const isMartyrs = filename.includes('@ozdao/martyrs') || filename.includes('@ozdao\\martyrs')
+      || filename.includes('/martyrs/') || filename.includes('\\martyrs\\');
 
-    const isExcluded = !isMartyrsPackage && this.options.exclude.some(dir =>
+    const isExcluded = !isMartyrs && this.options.exclude.some(dir =>
       filename.includes(dir)
     );
 

package/src/jit/rules.js

@@ -145,39 +145,39 @@ export const rules = [
     return null;
   }],
 
-  // Gap (специфичные перед общими)
+  // Gap (общие перед специфичными — для правильного каскада CSS)
+  [/^gap-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `gap: ${v};` : null; }],
   [/^gap-x-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `column-gap: ${v};` : null; }],
   [/^gap-y-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `row-gap: ${v};` : null; }],
-  [/^gap-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `gap: ${v};` : null; }],
 
-  // Size (специфичные перед общими)
+  // Size (общие перед специфичными — для правильного каскада CSS)
+  [/^w-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `width: ${v};` : null; }],
+  [/^h-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `height: ${v};` : null; }],
   [/^w-min-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `min-width: ${v};` : null; }],
   [/^w-max-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `max-width: ${v};` : null; }],
   [/^h-min-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `min-height: ${v};` : null; }],
   [/^h-max-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `max-height: ${v};` : null; }],
-  [/^w-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `width: ${v};` : null; }],
-  [/^h-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `height: ${v};` : null; }],
 
-  // Padding (специфичные перед общими)
+  // Padding (общие перед специфичными — для правильного каскада CSS)
+  [/^pd-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `padding: ${v};` : null; }],
   [/^pd-(t|r|b|l)-(.+)$/, (m, jit) => {
     const v = handleNegative(m[2], jit);
     return v ? `padding-${dir[m[1]]}: ${v};` : null;
   }],
-  [/^pd-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `padding: ${v};` : null; }],
 
-  // Margin (специфичные перед общими)
+  // Margin (общие перед специфичными — для правильного каскада CSS)
+  [/^mn-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `margin: ${v};` : null; }],
   [/^mn-(t|r|b|l)-(.+)$/, (m, jit) => {
     const v = handleNegative(m[2], jit);
     return v ? `margin-${dir[m[1]]}: ${v};` : null;
   }],
-  [/^mn-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `margin: ${v};` : null; }],
 
-  // Border radius (специфичные перед общими)
+  // Border radius (общие перед специфичными — для правильного каскада CSS)
+  [/^radius-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `border-radius: ${v};` : null; }],
   [/^radius-tl-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `border-top-left-radius: ${v};` : null; }],
   [/^radius-tr-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `border-top-right-radius: ${v};` : null; }],
   [/^radius-bl-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `border-bottom-left-radius: ${v};` : null; }],
   [/^radius-br-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `border-bottom-right-radius: ${v};` : null; }],
-  [/^radius-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `border-radius: ${v};` : null; }],
 
   // Inset
   [/^top-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `top: ${v};` : null; }],
@@ -455,13 +455,13 @@ export const rules = [
   // Scroll behavior (scroll-smooth, scroll-auto)
   [/^scroll-(auto|smooth)$/, (m) => `scroll-behavior: ${m[1]};`],
 
-  // Scroll padding (scroll-pd-medium, scroll-pd-t-small) - через resolveValue
-  [/^scroll-pd-(t|r|b|l)-(.+)$/, (m, jit) => { const v = resolveValue(m[2], jit); return v ? `scroll-padding-${dir[m[1]]}: ${v};` : null; }],
+  // Scroll padding (общие перед специфичными — для правильного каскада CSS)
   [/^scroll-pd-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `scroll-padding: ${v};` : null; }],
+  [/^scroll-pd-(t|r|b|l)-(.+)$/, (m, jit) => { const v = resolveValue(m[2], jit); return v ? `scroll-padding-${dir[m[1]]}: ${v};` : null; }],
 
-  // Scroll margin (scroll-mn-medium, scroll-mn-t-small) - через resolveValue
-  [/^scroll-mn-(t|r|b|l)-(.+)$/, (m, jit) => { const v = resolveValue(m[2], jit); return v ? `scroll-margin-${dir[m[1]]}: ${v};` : null; }],
+  // Scroll margin (общие перед специфичными — для правильного каскада CSS)
   [/^scroll-mn-(.+)$/, (m, jit) => { const v = resolveValue(m[1], jit); return v ? `scroll-margin: ${v};` : null; }],
+  [/^scroll-mn-(t|r|b|l)-(.+)$/, (m, jit) => { const v = resolveValue(m[2], jit); return v ? `scroll-margin-${dir[m[1]]}: ${v};` : null; }],
 
   // Overscroll (overscroll-x-contain, overscroll-none)
   [/^overscroll-(x|y)-(auto|contain|none)$/, (m) => `overscroll-behavior-${m[1]}: ${m[2]};`],

package/src/modules/TASKS.MD

@@ -72,6 +72,36 @@ export default {
 
 ---
 
+### i18nManager.register() перезаписывает overrides при ленивой загрузке
+
+**Проблема**: `register()` при динамической регистрации модуля вызывает `mergeLocaleMessage()` безусловно, перезаписывая ключи которые уже были установлены через `override()`.
+
+**Пример**: Проект ставит `override('auth', { en: { auth: { signIn: { title: "Welcome to NMS" } } } })`. При `getAllMessages()` overrides корректно применяются поверх base. Но когда auth модуль грузится лениво и вызывает `register('auth', defaultLocales)` — `mergeLocaleMessage` перезаписывает "Welcome to NMS" обратно на "Welcome to OZ DAO".
+
+**Текущий костыль**: В `register()` после мержа base переводов переприменяются extensions и overrides этого модуля:
+```javascript
+if (this.i18nInstance) {
+  const localeKeys = Object.keys(locales);
+  const ext = this.extensions.get(moduleName);
+  const ovr = this.overrides.get(moduleName);
+
+  localeKeys.forEach(locale => {
+    if (locales[locale]) this.i18nInstance.global.mergeLocaleMessage(locale, locales[locale]);
+    if (ext?.[locale]) this.i18nInstance.global.mergeLocaleMessage(locale, ext[locale]);
+    if (ovr?.[locale]) this.i18nInstance.global.mergeLocaleMessage(locale, ovr[locale]);
+  });
+}
+```
+
+**Правильное решение**: `register()` должен собирать финальный результат (base + extensions + overrides) ДО вызова `mergeLocaleMessage` и вызывать его один раз с готовым результатом — вместо трёх последовательных вызовов `mergeLocaleMessage` (загрузил → перезаписал → загрузил поверх → перезаписал поверх).
+
+**Затронутые файлы**:
+- `src/modules/core/views/classes/i18n.manager.js`
+
+**Приоритет**: Высокий — overrides не работают для лениво загружаемых модулей
+
+---
+
 ### Архитектура permissions/accesses (отвязка от organizations)
 
 **Проблема**: auth напрямую вызывает `/api/organizations/check-accesses`. Это создаёт жёсткую связь auth → organizations.