popeye-cli 2.2.0 → 2.7.0

package/src/generators/all.ts

@@ -10,7 +10,7 @@ import type { GenerationResult } from './python.js';
 import { generateFullstackProject } from './fullstack.js';
 import { generateWebsiteProject } from './website.js';
 import type { WebsiteContentContext } from './website-context.js';
-import { buildWebsiteContext, validateWebsiteContext, resolveBrandAssets } from './website-context.js';
+import { buildWebsiteContext, validateWebsiteContext, resolveBrandAssets, extractDocPathsFromText } from './website-context.js';
 import { loadWebsiteStrategy } from '../workflow/website-strategy.js';
 import {
   generateDesignTokensPackage as generateDesignTokensPackageImpl,
@@ -393,7 +393,8 @@ export async function generateAllProject(
     let contextWarning: string | undefined;
     if (!contentContext) {
       try {
-        contentContext = await buildWebsiteContext(projectDir, projectName);
+        const extraDocPaths = spec.idea ? extractDocPathsFromText(spec.idea) : [];
+        contentContext = await buildWebsiteContext(projectDir, projectName, spec.idea, extraDocPaths);
       } catch (e) {
         contextWarning = e instanceof Error ? e.message : 'Unknown error building website context';
         // Proceed with defaults, but warning is logged below

package/src/generators/doc-parser.ts

@@ -281,22 +281,33 @@ function extractFeaturesFromSource(
   return features;
 }
 
-/**
- * Extract pricing tiers from docs
- * Parses markdown tables and "Plan Positioning" sections
- */
-export function extractPricing(
-  docs: string
-): Array<{
+/** Pricing tier as extracted from docs */
+export interface PricingTier {
   name: string; price: string; period?: string;
   description: string; features: string[];
   cta: string; featured?: boolean;
-}> | undefined {
-  const tiers: Array<{
-    name: string; price: string; period?: string;
-    description: string; features: string[];
-    cta: string; featured?: boolean;
-  }> = [];
+}
+
+/** Result of pricing extraction with provenance tracking */
+export interface PricingExtractionResult {
+  tiers: PricingTier[];
+  source: 'docs' | 'none';
+  evidence?: {
+    matchedSection?: string;
+    matchedRows: number;
+    extractionMethod: 'known_plan_names' | 'table_fallback';
+  };
+}
+
+/**
+ * Extract pricing tiers from docs with provenance tracking
+ * Parses markdown tables and "Plan Positioning" sections
+ *
+ * @param docs - Combined documentation text
+ * @returns Extraction result with tiers, source provenance, and evidence
+ */
+export function extractPricing(docs: string): PricingExtractionResult {
+  const tiers: PricingTier[] = [];
 
   // Find the pricing section to avoid matching design token tables
   // Reason: "Plan-Based Color Usage" matches "Plans?" - require "Pricing" keyword
@@ -307,8 +318,11 @@ export function extractPricing(
 
   // Look for pricing overview table rows with plan names and actual prices
   const priceMap = new Map<string, string>();
+  let extractionMethod: 'known_plan_names' | 'table_fallback' | undefined;
+
   const tableRows = searchArea.match(/^\|[^|]*(?:Free|Pro|Enterprise|Starter|Growth|Team|Business)[^|]*\|.+\|$/gm);
   if (tableRows) {
+    extractionMethod = 'known_plan_names';
     for (const row of tableRows) {
       const cells = row.split('|').map((c) => c.trim()).filter(Boolean);
       if (cells.length >= 2) {
@@ -325,7 +339,41 @@ export function extractPricing(
     }
   }
 
-  if (priceMap.size === 0) return undefined;
+  // Fallback: if no known plan names found, scan pricing section for any row with price-like cell
+  if (priceMap.size === 0 && pricingSection) {
+    const allRows = pricingSection[0].match(/^\|.+\|$/gm);
+    if (allRows && allRows.length >= 3) {
+      // Detect which column is the price column from the header row
+      const headerCells = allRows[0].split('|').map((c) => c.trim()).filter(Boolean);
+      let priceColIndex = headerCells.findIndex((h) => /price|cost|monthly|\$/i.test(h));
+      if (priceColIndex < 0) priceColIndex = 1; // default: 2nd column
+
+      for (const row of allRows.slice(2)) {
+        const cells = row.split('|').map((c) => c.trim()).filter(Boolean);
+        if (cells.length < 2) continue;
+        const planName = cells[0].replace(/[🟢🔵🟣⚪🟡🟠🔴]\s*/g, '').replace(/\*\*/g, '').trim();
+        // Skip separator rows and header-like rows
+        if (/^[-=\s]+$/.test(planName) || /^(Plan|Tier|Name|Feature)/i.test(planName)) continue;
+
+        // Check price column and adjacent column for price-like content
+        for (const idx of [priceColIndex, priceColIndex === 1 ? 2 : 1]) {
+          if (idx >= cells.length) continue;
+          const price = cells[idx].replace(/<br>/g, ' / ').replace(/\*\*/g, '').trim();
+          const looksLikePrice = /^free$/i.test(price) || /^\$/.test(price)
+            || /^custom/i.test(price) || /^contact/i.test(price);
+          if (looksLikePrice && !priceMap.has(planName)) {
+            priceMap.set(planName, price);
+            break;
+          }
+        }
+      }
+      if (priceMap.size > 0) extractionMethod = 'table_fallback';
+    }
+  }
+
+  if (priceMap.size === 0) {
+    return { tiers: [], source: 'none' };
+  }
 
   // Look for plan descriptions
   const descMap = new Map<string, string>();
@@ -410,7 +458,19 @@ export function extractPricing(
     tier.features = tier.features.slice(0, 6);
   }
 
-  return tiers.length > 0 ? tiers : undefined;
+  if (tiers.length === 0) {
+    return { tiers: [], source: 'none' };
+  }
+
+  return {
+    tiers,
+    source: 'docs',
+    evidence: {
+      matchedSection: pricingSection ? pricingSection[0].split('\n')[0] : undefined,
+      matchedRows: priceMap.size,
+      extractionMethod: extractionMethod!,
+    },
+  };
 }
 
 /**

package/src/generators/templates/fullstack.ts

@@ -765,7 +765,7 @@ export function generateFrontendPackageJson(projectName: string): string {
         '@vitest/coverage-v8': '^2.0.0',
         autoprefixer: '^10.4.0',
         eslint: '^9.0.0',
-        'eslint-plugin-react-hooks': '^4.6.0',
+        'eslint-plugin-react-hooks': '^5.0.0',
         'eslint-plugin-react-refresh': '^0.4.0',
         postcss: '^8.4.0',
         tailwindcss: '^3.4.0',

package/src/generators/templates/website-components.ts

@@ -15,7 +15,7 @@ function escapeJsx(str: string): string {
     .replace(/\\/g, '\\\\')
     .replace(/'/g, "\\'")
     .replace(/`/g, '\\`')
-    .replace(/\$/g, '\\$');
+    .replace(/\$(?=\{)/g, '\\$');
 }
 
 /**

package/src/generators/templates/website-config.ts

@@ -93,7 +93,24 @@ module.exports = nextConfig;
 /**
  * Generate website tsconfig.json
  */
-export function generateWebsiteTsconfig(): string {
+export function generateWebsiteTsconfig(options?: {
+  workspaceMode?: boolean;
+  projectName?: string;
+}): string {
+  const paths: Record<string, string[]> = {
+    '@/*': ['./src/*'],
+  };
+
+  // Add workspace package path aliases so tsc can resolve imports
+  if (options?.workspaceMode && options?.projectName) {
+    paths[`@${options.projectName}/design-tokens/*`] = ['../../packages/design-tokens/src/*'];
+    paths[`@${options.projectName}/design-tokens`] = ['../../packages/design-tokens/src/index.ts'];
+    paths[`@${options.projectName}/ui/*`] = ['../../packages/ui/src/*'];
+    paths[`@${options.projectName}/ui`] = ['../../packages/ui/src/index.ts'];
+  }
+
+  const pathsJson = JSON.stringify(paths, null, 6).replace(/\n/g, '\n    ');
+
   return `{
   "compilerOptions": {
     "target": "ES2017",
@@ -114,12 +131,10 @@ export function generateWebsiteTsconfig(): string {
         "name": "next"
       }
     ],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": ${pathsJson}
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
+  "include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx", ".next/types/**/*.ts"],
+  "exclude": ["node_modules", "tests"]
 }
 `;
 }
@@ -421,12 +436,9 @@ vi.mock('next/navigation', () => ({
   usePathname: () => '/',
 }));
 
-// Mock next/image
+// Mock next/image (plain object mock, no JSX in .ts files)
 vi.mock('next/image', () => ({
-  default: (props: Record<string, unknown>) => {
-    // eslint-disable-next-line @next/next/no-img-element, jsx-a11y/alt-text
-    return <img {...props} />;
-  },
+  default: (props: Record<string, unknown>) => props,
 }));
 `;
 }

package/src/generators/templates/website-conversion.ts

@@ -13,7 +13,7 @@ function escapeJsx(str: string): string {
     .replace(/\\/g, '\\\\')
     .replace(/'/g, "\\'")
     .replace(/`/g, '\\`')
-    .replace(/\$/g, '\\$');
+    .replace(/\$(?=\{)/g, '\\$');
 }
 
 /**

package/src/generators/templates/website-landing.ts

@@ -26,7 +26,7 @@ function escapeJsx(str: string): string {
     .replace(/\\/g, '\\\\')
     .replace(/'/g, "\\'")
     .replace(/`/g, '\\`')
-    .replace(/\$/g, '\\$');
+    .replace(/\$(?=\{)/g, '\\$');
 }
 
 /**