core-maugli 1.2.15 → 1.2.17

package/bin/init.js

@@ -0,0 +1,201 @@
+#!/usr/bin/env node
+
+import { execSync } from 'child_process';
+import { cpSync, existsSync, readFileSync, writeFileSync } from 'fs';
+import path from 'path';
+import readline from 'readline';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const templateRoot = path.join(__dirname, '..');
+
+function getLanguageCodes() {
+  const file = readFileSync(path.join(templateRoot, 'src/i18n/languages.ts'), 'utf8');
+  const codes = [];
+  const regex = /{\s*code:\s*'([^']+)'/g;
+  let match;
+  while ((match = regex.exec(file)) !== null) {
+    codes.push(match[1]);
+  }
+  return codes;
+}
+
+function promptLang(codes) {
+  return new Promise(resolve => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(`Choose language (${codes.join(', ')}): `, answer => {
+      rl.close();
+      resolve(codes.includes(answer) ? answer : codes[0]);
+    });
+  });
+}
+
+function promptRepo() {
+  return new Promise(resolve => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question('Repository URL: ', answer => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+
+async function getRepoUrl(targetDir, repoOption) {
+  if (repoOption) return repoOption;
+  try {
+    const url = execSync('git remote get-url origin', {
+      cwd: targetDir,
+      stdio: ['ignore', 'pipe', 'ignore']
+    })
+      .toString()
+      .trim();
+    if (url) return url;
+  } catch {
+    // ignore
+  }
+  return await promptRepo();
+}
+
+function updateReadme(targetDir, repoUrl) {
+  if (!repoUrl) return;
+  const readmePath = path.join(targetDir, 'README.md');
+  if (!existsSync(readmePath)) return;
+  let content = readFileSync(readmePath, 'utf8');
+  const pattern = /https:\/\/app\.netlify\.com\/start\/deploy\?repository=[^\)\s]+/;
+  content = content.replace(
+    pattern,
+    `https://app.netlify.com/start/deploy?repository=${repoUrl}`
+  );
+  writeFileSync(readmePath, content);
+  console.log('Updated Netlify link in README.md');
+}
+
+function updateConfig(targetDir, lang, repoUrl) {
+  const configPath = path.join(targetDir, 'src', 'config', 'maugli.config.ts');
+  if (!existsSync(configPath)) return;
+  let content = readFileSync(configPath, 'utf8');
+  content = content.replace(/defaultLang:\s*'[^']*'/, `defaultLang: '${lang}'`);
+  const multiMatch = content.match(/enableMultiLang:\s*(true|false)/);
+  const multi = multiMatch ? multiMatch[1] === 'true' : false;
+  content = content.replace(/showLangSwitcher:\s*(true|false)/, `showLangSwitcher: ${multi}`);
+  
+  // Update repository URL if provided
+  if (repoUrl) {
+    content = content.replace(
+      /repository:\s*{[^}]*url:\s*'[^']*'/,
+      `repository: {\n    url: '${repoUrl}'`
+    );
+  }
+  
+  writeFileSync(configPath, content);
+  console.log(`Configured default language to ${lang}`);
+  if (repoUrl) {
+    console.log(`Configured repository URL to ${repoUrl}`);
+  }
+}
+
+export default async function init(targetName, langOption, repoOption) {
+  const targetDir = targetName ? path.resolve(targetName) : process.cwd();
+  const codes = getLanguageCodes();
+  const lang = langOption && codes.includes(langOption) ? langOption : await promptLang(codes);
+
+  function copyItem(item) {
+    const src = path.join(templateRoot, item);
+    const dest = path.join(targetDir, item);
+    
+    if (!existsSync(src)) {
+      console.log(`Skipped ${item} (not found)`);
+      return;
+    }
+    
+    cpSync(src, dest, { recursive: true });
+    console.log(`Copied ${item}`);
+  }
+
+  // Copy package files first so npm install works correctly
+  ['package.json', 'package-lock.json'].forEach(file => {
+    if (existsSync(path.join(templateRoot, file))) {
+      copyItem(file);
+    }
+  });
+
+  const items = [
+    'astro.config.mjs',
+    'tsconfig.json',
+    'vite.config.js',
+    'public',
+    'src',
+    'scripts',
+    'typograf-batch.js',
+    'resize-all.cjs',
+    'README.md',
+    'LICENSE'
+  ];
+  items.forEach(copyItem);
+
+  const repoUrl = await getRepoUrl(targetDir, repoOption);
+  updateReadme(targetDir, repoUrl);
+
+  // Create essential config files
+  const gitignoreContent = `
+# Dependencies
+node_modules/
+.pnpm-debug.log*
+
+# Environment
+.env
+.env.local
+.env.production
+
+# Build outputs
+dist/
+.astro/
+
+# Generated files
+.DS_Store
+.vscode/settings.json
+
+# Cache
+.typograf-cache.json
+`;
+
+  const prettierrcContent = `{
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "printWidth": 100,
+  "plugins": ["prettier-plugin-tailwindcss"]
+}
+`;
+
+  writeFileSync(path.join(targetDir, '.gitignore'), gitignoreContent.trim());
+  console.log('Created .gitignore');
+  
+  writeFileSync(path.join(targetDir, '.prettierrc'), prettierrcContent);
+  console.log('Created .prettierrc');
+
+  execSync('npm install', { cwd: targetDir, stdio: 'inherit' });
+  updateConfig(targetDir, lang, repoUrl);
+}
+
+// Если скрипт запускается напрямую
+if (import.meta.url === `file://${process.argv[1]}`) {
+  const args = process.argv.slice(2);
+  let targetName;
+  let lang;
+  let repo;
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === '--lang' && i + 1 < args.length) {
+      lang = args[i + 1];
+      i++;
+    } else if (args[i] === '--repo' && i + 1 < args.length) {
+      repo = args[i + 1];
+      i++;
+    } else {
+      targetName = args[i];
+    }
+  }
+  await init(targetName, lang, repo);
+}

package/package.json

@@ -2,7 +2,7 @@
     "name": "core-maugli",
     "description": "Astro & Tailwind CSS blog theme for Maugli.",
     "type": "module",
-    "version": "1.2.15",
+    "version": "1.2.17",
     "license": "GPL-3.0-or-later OR Commercial",
     "repository": {
         "type": "git",
@@ -64,7 +64,8 @@
     "files": [
         "src",
         "public",
-        "scripts"
+        "scripts",
+        "bin"
     ],
     "bin": {
         "core-maugli": "bin/index.js"

package/src/components/Card.astro

@@ -52,8 +52,8 @@ const cardImageAlt = seo?.image?.alt || image?.alt || title || 'Изображе
 
 // Используем уменьшенное превью, если оно существует
 let previewImage;
-if (cardImage) {
-    previewImage = cardImage.replace(/\/([^\/]+)$/, '/previews/$1');
+if (cardImage.src) {
+    previewImage = cardImage.src.replace(/\/([^\/]+)$/, '/previews/$1');
 
     const __filename = fileURLToPath(import.meta.url);
     const projectRoot = path.resolve(path.dirname(__filename), '../..');
@@ -64,7 +64,7 @@ if (cardImage) {
     }
 }
 
-const finalImage = previewImage || cardImage;
+const finalImage = previewImage || cardImage.src;
 
 // Определяем контент для отображения
 const content = excerpt || description;

package/src/components/RubricCard.astro

@@ -194,23 +194,18 @@ if (import.meta.env.DEV) {
         class={`w-full h-[195px] border border-[var(--border-main)] rounded-custom card-bg hover:card-shadow hover:-translate-y-1 transition-all duration-300 p-6 flex flex-row gap-4 items-start ${className}`}
     >
         <!-- Левая часть: картинка и дата -->
-        <<<<<<< HEAD
-        <div class="flex flex-col items-end gap-2 w-[105px] h-[147px]">
-            <img src={previewImageSrc} alt={image?.alt || title} class="w-[105px] h-[107px] object-cover rounded-custom" loading="lazy" decoding="async" />
-            =======
-            <div class="flex flex-col items-end gap-2 w-[105px] h-[147px] relative">
-                <img src={previewImageSrc} alt={title} class="w-[105px] h-[107px] object-cover rounded-custom" loading="lazy" />
-                {
-                    rubricInitials && (
-                        <span style="position:absolute;left:0;top:0;width:105px;height:107px;display:flex;align-items:center;justify-content:center;pointer-events:none;z-index:2;">
-                            <span style="position:absolute;left:0;top:0;width:105px;height:107px;background:rgba(0,0,0,0.10);border-radius:inherit;z-index:1;" />
-                            <span style="position:relative;z-index:2;font-size:48px;font-weight:700;font-family:inherit;color:var(--brand-color);letter-spacing:2px;">
-                                {rubricInitials}
-                            </span>
+        <div class="flex flex-col items-end gap-2 w-[105px] h-[147px] relative">
+            <img src={previewImageSrc} alt={title} class="w-[105px] h-[107px] object-cover rounded-custom" loading="lazy" />
+            {
+                rubricInitials && (
+                    <span style="position:absolute;left:0;top:0;width:105px;height:107px;display:flex;align-items:center;justify-content:center;pointer-events:none;z-index:2;">
+                        <span style="position:absolute;left:0;top:0;width:105px;height:107px;background:rgba(0,0,0,0.10);border-radius:inherit;z-index:1;" />
+                        <span style="position:relative;z-index:2;font-size:48px;font-weight:700;font-family:inherit;color:var(--brand-color);letter-spacing:2px;">
+                            {rubricInitials}
                         </span>
-                    )
-                }
-                >>>>>>> 41e6ca2 (fix: always use default rubric image from config, initials overlay, preview logic)
+                    </span>
+                )
+            }
                 <div class="flex flex-col items-end gap-1 w-[74px] h-[32px]">
                     <span class={`flex items-center gap-1 text-[12px] text-right ${isBrandDate ? 'text-[var(--brand-color)]' : 'text-[var(--text-muted)]'}`}>
                         <svg