vite-plugin-fenom 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vite-plugin-fenom",
-    "version": "1.0.4",
+    "version": "1.0.6",
     "type": "module",
     "main": "./vite-plugin-fenom.cjs",
     "exports": {

package/vite-plugin-fenom.cjs

@@ -46,11 +46,58 @@ function fenomPlugin(options = {}) {
     const { pages = 'src/pages', data = 'src/data/**/*.json', root = 'src', minifyHtml = true, debug = false, } = options;
     let config;
     let templateLoader;
-    if (debug)
-        console.log('\x1b[36m[Fenom Plugin]\x1b[0m Plugin initialized', { pages, data, root });
+    let globalData = {}; // ← храним глобальные данные
+    // === Функция загрузки глобальных JSON-данных ===
+    async function loadGlobalData(rootDir) {
+        const { default: fastGlob } = await Promise.resolve().then(function () { return require('./index-CDmV2arq.js'); }).then(function (n) { return n.index; });
+        const dataGlob = data;
+        let baseDir = dataGlob;
+        if (baseDir.includes('**')) {
+            baseDir = baseDir.substring(0, baseDir.indexOf('**')).replace(/[/\\]+$/, '');
+        }
+        const fullPath = require$$0.resolve(rootDir, baseDir);
+        const globPattern = dataGlob.replace(baseDir, '').replace(/^\//, ''); // → **/*.json
+        if (debug) {
+            console.log('[Fenom Plugin] Base dir:', fullPath);
+            console.log('[Fenom Plugin] Glob pattern:', globPattern);
+        }
+        try {
+            await fs__namespace.access(fullPath);
+        }
+        catch (_a) {
+            console.warn(`[Fenom Plugin] Data directory not found: ${fullPath}`);
+            return {};
+        }
+        const files = await fastGlob(globPattern, {
+            cwd: fullPath,
+            absolute: true,
+            onlyFiles: true,
+            dot: true,
+        });
+        if (debug) {
+            console.log('Found JSON files:', files);
+        }
+        const jsonData = {};
+        for (const file of files) {
+            try {
+                const content = await fs__namespace.readFile(file, 'utf-8');
+                const parsed = JSON.parse(content);
+                const fileName = require$$0.basename(file, '.json');
+                jsonData[fileName] = parsed;
+            }
+            catch (err) {
+                console.warn(`[Fenom Plugin] Failed to load: ${file}`, err);
+            }
+        }
+        if (debug)
+            console.log('\x1b[36m[Fenom Plugin]\x1b[0m Loaded data keys:', Object.keys(jsonData));
+        if (debug)
+            console.log(jsonData);
+        return jsonData;
+    }
     return {
         name: 'vite-plugin-fenom',
-        configResolved(resolvedConfig) {
+        async configResolved(resolvedConfig) {
             config = resolvedConfig;
             if (debug)
                 console.log('\x1b[36m[Fenom Plugin]\x1b[0m Config resolved', {
@@ -58,28 +105,60 @@ function fenomPlugin(options = {}) {
                     command: config.command,
                     root: config.root,
                 });
+            // === Загружаем глобальные данные при старте ===
+            try {
+                globalData = await loadGlobalData(config.root);
+            }
+            catch (err) {
+                console.error('\x1b[31m[Fenom Plugin]\x1b[0m Failed to load global data:', err);
+            }
         },
         configureServer(server) {
             if (debug)
                 console.log('\x1b[36m[Fenom Plugin]\x1b[0m Dev server setup started...');
-            // Создаём загрузчик шаблонов
             templateLoader = fenomJsExports.createAsyncLoader(root);
             if (debug)
                 console.log('\x1b[36m[Fenom Plugin]\x1b[0m Template loader created for root:', root);
-            // Наблюдаем за .tpl файлами
-            server.watcher.on('change', (filePath) => {
+            // === Добавляем отслеживание ===
+            const tplDir = require$$0.resolve(config.root, pages);
+            const dataDir = require$$0.resolve(config.root, data.split('**')[0]);
+            server.watcher.add(tplDir);
+            server.watcher.add(dataDir);
+            if (debug) {
+                console.log('[Fenom Plugin] 📂 Watching TPL:', tplDir);
+                console.log('[Fenom Plugin] 📂 Watching DATA:', dataDir);
+            }
+            // === ЕДИНСТВЕННЫЙ обработчик ===
+            server.watcher.on('change', async (filePath) => {
+                const normalizedPath = filePath.replace(/\\/g, '/');
                 if (filePath.endsWith('.tpl')) {
                     if (debug)
-                        console.log('[Fenom Plugin] 🔄 Full reload triggered:', filePath);
+                        console.log('[Fenom Plugin] 🔄 TPL changed:', filePath);
                     server.ws.send({ type: 'full-reload' });
+                    return;
+                }
+                if (normalizedPath.endsWith('.json') && normalizedPath.includes(dataDir.replace(/\\/g, '/'))) {
+                    if (debug)
+                        console.log('[Fenom Plugin] 📄 JSON changed:', filePath);
+                    try {
+                        const newData = await loadGlobalData(config.root);
+                        globalData = newData;
+                        if (debug)
+                            console.log('\x1b[33m[Fenom Plugin]\x1b[0m Global data reloaded:', Object.keys(newData));
+                    }
+                    catch (err) {
+                        console.warn('[Fenom Plugin] Failed to reload JSON data:', err);
+                    }
+                    finally {
+                        server.ws.send({ type: 'full-reload' });
+                    }
                 }
             });
-            // Обработчик запросов
+            // === handlePageRequest ===
             const handlePageRequest = async (req, res, next) => {
                 const url = req.url;
                 if (debug)
                     console.log('\x1b[36m[Fenom Plugin]\x1b[0m Incoming request:', url);
-                // Пропускаем статику, API, системные пути
                 if (!url ||
                     url.startsWith('/assets/') ||
                     url.startsWith('/@') ||
@@ -90,7 +169,6 @@ function fenomPlugin(options = {}) {
                     (url.includes('?') && url.includes('.'))) {
                     return next();
                 }
-                // Определяем имя страницы
                 let pageName = 'index';
                 if (url !== '/') {
                     pageName = url.split('?')[0].split('#')[0].replace(/^\/|\/$/g, '');
@@ -98,15 +176,13 @@ function fenomPlugin(options = {}) {
                 const templatePath = require$$0.join(pages, `${pageName}.tpl`);
                 const relativePath = require$$0.relative(root, templatePath);
                 try {
-                    if (debug)
-                        console.log('\x1b[36m[Fenom Plugin]\x1b[0m Rendering page:', { pageName, templatePath });
                     const source = await templateLoader(relativePath);
                     const context = {
                         title: `${pageName.charAt(0).toUpperCase() + pageName.slice(1)} Page`,
                         debug,
                         url,
+                        ...globalData,
                     };
-                    // Рендерим через FenomJs
                     let html = await fenomJsExports.FenomJs(source, context, {
                         loader: templateLoader,
                         root,
@@ -114,9 +190,9 @@ function fenomPlugin(options = {}) {
                     });
                     if (config.mode === 'development') {
                         const hmrScript = `
-                            <script type="module">
-                            import "/@vite/client";
-                            </script>`;
+                    <script type="module">
+                    import "/@vite/client";
+                    </script>`;
                         if (html.includes('</head>')) {
                             html = html.replace('</head>', hmrScript + '\n</head>');
                         }
@@ -127,7 +203,6 @@ function fenomPlugin(options = {}) {
                             html = hmrScript + html;
                         }
                     }
-                    // Отправляем ответ
                     res.statusCode = 200;
                     res.setHeader('Content-Type', 'text/html; charset=utf-8');
                     res.end(html);
@@ -139,31 +214,26 @@ function fenomPlugin(options = {}) {
                         return next();
                     }
                     console.error('\x1b[36m[Fenom Plugin]\x1b[0m Rendering error:', err.message);
-                    console.error(err);
                     res.statusCode = 500;
-                    res.setHeader('Content-Type', 'text/html; charset=utf-8');
-                    res.end(`
-                        <h1>🔧 Ошибка рендеринга</h1>
-                        <p><strong>${err.message}</strong></p>
-                        <pre>${err.stack}</pre>
-                    `);
+                    res.end(`<h1>🔧 Ошибка</h1><pre>${err.stack}</pre>`);
                 }
             };
-            // Вставляем middleware в начало стека
-            server.middlewares.stack.unshift({
-                route: '',
-                handle: handlePageRequest,
-            });
+            server.middlewares.stack.unshift({ route: '', handle: handlePageRequest });
             if (debug)
                 console.log('\x1b[36m[Fenom Plugin]\x1b[0m Middleware inserted at top of stack');
-            if (debug)
-                console.log('\x1b[36m[Fenom Plugin]\x1b[0m Watching .tpl files for HMR');
         },
         async buildStart() {
             if (config.command !== 'build')
                 return;
             if (debug)
                 console.log('\x1b[36m[Fenom Plugin]\x1b[0m Build started');
+            // === Загружаем данные перед сборкой ===
+            try {
+                globalData = await loadGlobalData(config.root);
+            }
+            catch (err) {
+                console.error('\x1b[31m[Fenom Plugin]\x1b[0m Failed to load data on build start:', err);
+            }
         },
         async generateBundle(_options, bundle) {
             if (config.command !== 'build')
@@ -178,7 +248,7 @@ function fenomPlugin(options = {}) {
                 const files = await fastGlob(pattern);
                 if (debug)
                     console.log('\x1b[36m[Fenom Plugin]\x1b[0m Found templates:', files);
-                // === Собираем входы ===
+                // === Анализ входов и ассетов — как было ===
                 const inputEntries = config.build.rollupOptions.input;
                 let inputFiles = [];
                 if (Array.isArray(inputEntries)) {
@@ -190,10 +260,6 @@ function fenomPlugin(options = {}) {
                 else if (typeof inputEntries === 'string') {
                     inputFiles = [inputEntries];
                 }
-                if (debug) {
-                    console.log('inputFiles:', inputFiles);
-                }
-                // === Находим настоящие ассеты по расширению ===
                 let jsChunk = '';
                 const cssAssets = [];
                 for (const [fileName, file] of Object.entries(bundle)) {
@@ -204,65 +270,42 @@ function fenomPlugin(options = {}) {
                         cssAssets.push(`/${fileName}`);
                     }
                 }
-                // === Создаём карту замен ===
                 const replacementMap = new Map();
                 for (const input of inputFiles) {
                     if (/\.(ts|js)$/.test(input) && jsChunk) {
                         replacementMap.set(input, jsChunk);
                     }
                     if (/\.css$/.test(input) && cssAssets.length > 0) {
-                        // Берём первый CSS (или можно выбрать по имени)
                         replacementMap.set(input, cssAssets[0]);
                     }
                 }
-                if (debug) {
-                    console.log('JS chunk found:', jsChunk);
-                    console.log('CSS assets found:', cssAssets);
-                    console.log('replacementMap:', Object.fromEntries(replacementMap));
-                }
-                // === Генерируем HTML ===
+                // === Генерация HTML ===
                 for (const file of files) {
                     const fileName = require$$0.basename(file, '.tpl');
                     const outputFileName = fileName === 'index' ? 'index.html' : `${fileName}.html`;
                     try {
                         const source = await fs__namespace.readFile(file, 'utf-8');
-                        const jsonDataPath = file.replace(/\.tpl$/, '.json');
-                        let extraContext = {};
-                        try {
-                            const data = await fs__namespace.readFile(jsonDataPath, 'utf-8');
-                            extraContext = JSON.parse(data);
-                        }
-                        catch (_a) { }
                         const context = {
                             title: `${fileName.charAt(0).toUpperCase() + fileName.slice(1)} Page`,
                             debug: false,
                             url: '/' + (fileName === 'index' ? '' : fileName),
-                            ...extraContext,
+                            ...globalData, // ← все данные из data/**/*.json
                         };
                         let html = await fenomJsExports.FenomJs(source, context, {
                             loader: templateLoader,
                             root,
                             minify: minifyHtml,
                         });
-                        // === Замена путей ===
                         for (const [devPath, prodPath] of replacementMap) {
                             const fullDevPath = '/' + devPath;
                             const escaped = fullDevPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-                            // <script src="...">
                             const scriptRegex = new RegExp(`<script[^>]+src=["']${escaped}["'][^>]*>`, 'gi');
                             if (scriptRegex.test(html)) {
                                 html = html.replace(scriptRegex, `<script type="module" src="${prodPath}"></script>`);
-                                if (debug) {
-                                    console.log(`[Fenom Plugin] Replaced script: ${fullDevPath} → ${prodPath}`);
-                                }
                             }
-                            // <link href="...">
                             const linkRegex = new RegExp(`<link[^>]+href=["']${escaped}["'][^>]*>`, 'gi');
                             if (linkRegex.test(html)) {
                                 html = html.replace(linkRegex, `<link rel="stylesheet" href="${prodPath}">`);
-                                if (debug) {
-                                    console.log(`[Fenom Plugin] Replaced link: ${fullDevPath} → ${prodPath}`);
-                                }
                             }
                         }
                         this.emitFile({