@lastbrain/app 2.0.11 → 2.0.15

package/src/scripts/module-create.ts

@@ -23,6 +23,7 @@ export interface ModuleConfig {
   moduleName: string;
   pages: PageConfig[];
   tables: TableConfig[];
+  isPro?: boolean;
 }
 
 // Noms réservés pour éviter les collisions avec le routeur/app
@@ -116,57 +117,84 @@ function getLastBrainPackageVersions(rootDir: string): {
 function generatePackageJson(
   moduleName: string,
   slug: string,
-  rootDir: string
+  rootDir: string,
+  isPro: boolean = false
 ): string {
   const versions = getLastBrainPackageVersions(rootDir);
-  const moduleNameOnly = slug.replace("module-", "");
+  const moduleNameOnly = slug.replace("module-", "").replace("-pro", "");
   const buildConfigExport = `./${moduleNameOnly}.build.config`;
-  return JSON.stringify(
-    {
-      name: moduleName,
-      version: "0.1.0",
-      private: false,
-      type: "module",
-      main: "dist/index.js",
-      types: "dist/index.d.ts",
-      files: ["dist", "src", "supabase"],
-      scripts: {
-        build: "tsc -p tsconfig.json",
-        dev: "tsc -p tsconfig.json --watch",
+  const packageJson: Record<string, unknown> = {
+    name: moduleName,
+    version: "0.1.0",
+    private: false,
+    type: "module",
+    main: "dist/index.js",
+    types: "dist/index.d.ts",
+    files: ["dist", "src", "supabase"],
+    scripts: {
+      build: "tsc -p tsconfig.json",
+      dev: "tsc -p tsconfig.json --watch",
+    },
+    dependencies: {
+      "@lastbrain/core": versions.core,
+      "@lastbrain/ui": versions.ui,
+      react: "^19.0.0",
+      "lucide-react": "^0.554.0",
+      "react-dom": "^19.0.0",
+    },
+    devDependencies: {
+      typescript: "^5.4.0",
+    },
+    exports: {
+      ".": {
+        types: "./dist/index.d.ts",
+        default: "./dist/index.js",
       },
-      dependencies: {
-        "@lastbrain/core": versions.core,
-        "@lastbrain/ui": versions.ui,
-        react: "^19.0.0",
-        "lucide-react": "^0.554.0",
-        "react-dom": "^19.0.0",
+      "./server": {
+        types: "./dist/server.d.ts",
+        default: "./dist/server.js",
       },
-      devDependencies: {
-        typescript: "^5.4.0",
+      [buildConfigExport]: {
+        types: `./dist/${moduleNameOnly}.build.config.d.ts`,
+        default: `./dist/${moduleNameOnly}.build.config.js`,
       },
-      exports: {
-        ".": {
-          types: "./dist/index.d.ts",
-          default: "./dist/index.js",
-        },
-        "./server": {
-          types: "./dist/server.d.ts",
-          default: "./dist/server.js",
-        },
-        [buildConfigExport]: {
-          types: `./dist/${moduleNameOnly}.build.config.d.ts`,
-          default: `./dist/${moduleNameOnly}.build.config.js`,
-        },
-        "./api/*": {
-          types: "./dist/api/*.d.ts",
-          default: "./dist/api/*.js",
-        },
+      "./api/*": {
+        types: "./dist/api/*.d.ts",
+        default: "./dist/api/*.js",
       },
-      sideEffects: false,
     },
-    null,
-    2
-  );
+    sideEffects: false,
+  };
+
+  // Ajouter les champs spécifiques selon le type (Pro ou Public)
+  if (isPro) {
+    packageJson.publishConfig = {
+      registry: "https://npm.pkg.github.com",
+    };
+    packageJson.release = {
+      type: "pro",
+      registry: "https://npm.pkg.github.com",
+    };
+    packageJson.repository = {
+      type: "git",
+      url: "https://github.com/Lastbrain-labs/starter",
+      directory: `packages/${slug}`,
+    };
+  } else {
+    packageJson.publishConfig = {
+      access: "public",
+    };
+    packageJson.release = {
+      type: "public",
+    };
+    packageJson.repository = {
+      type: "git",
+      url: "https://github.com/Lastbrain-labs/lb-starter",
+      directory: `packages/${slug}`,
+    };
+  }
+
+  return JSON.stringify(packageJson, null, 2);
 }
 
 /**
@@ -376,13 +404,31 @@ function toPascalCase(value: string): string {
 }
 
 function generateIndexTs(pages: PageConfig[], moduleNameOnly: string): string {
+  // Grouper les pages par nom pour détecter les doublons
+  const pagesByName = new Map<string, PageConfig[]>();
+  for (const page of pages) {
+    const key = page.name;
+    const existing = pagesByName.get(key) || [];
+    existing.push(page);
+    pagesByName.set(key, existing);
+  }
+
   const exports = pages.map((page) => {
     const componentName = toPascalCase(page.name);
-    const fileName = toPascalCase(page.name);
-    return `export { ${componentName}Page } from "./web/${page.section}/${fileName}Page";`;
+
+    // Si le même nom de page existe dans plusieurs sections, ajouter la section au nom du composant ET du fichier
+    const duplicates = pagesByName.get(page.name) || [];
+    const hasDuplicates = duplicates.length > 1;
+    const componentNameWithSection = hasDuplicates
+      ? `${componentName}${toPascalCase(page.section)}`
+      : componentName;
+
+    return `export { ${componentNameWithSection}Page } from "./web/${page.section}/${componentNameWithSection}Page";`;
   });
 
-  const moduleAlias = toPascalCase(moduleNameOnly);
+  // Nettoyer le nom pour l'alias d'export (enlever -pro si présent)
+  const cleanedNameOnly = moduleNameOnly.replace(/-pro$/, "");
+  const moduleAlias = toPascalCase(cleanedNameOnly);
 
   return `// Client Components
 ${exports.join("\n")}
@@ -418,22 +464,28 @@ ${exports.join("\n")}
 /**
  * Génère le contenu d'une page
  */
-function generatePageComponent(pageName: string, section: string): string {
-  const componentName = pageName
-    .split("-")
-    .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
-    .join("");
+function generatePageComponent(
+  pageName: string,
+  section: string,
+  componentName?: string
+): string {
+  const finalComponentName =
+    componentName ||
+    pageName
+      .split("-")
+      .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
+      .join("");
 
   return `"use client";
 
 import { Card, CardBody, CardHeader } from "@lastbrain/ui";
 
-export function ${componentName}Page() {
+export function ${finalComponentName}Page() {
   return (
     <div className="container mx-auto p-6">
       <Card>
         <CardHeader>
-          <h1 className="text-2xl font-bold">${componentName}</h1>
+          <h1 className="text-2xl font-bold">${finalComponentName}</h1>
         </CardHeader>
         <CardBody>
           <p className="text-default-600">
@@ -1207,6 +1259,25 @@ async function updateModuleRegistry(config: ModuleConfig, rootDir: string) {
       chalk.yellow("  ⚠️  Fichier de registre non trouvé, création...")
     );
     // Si le fichier n'existe pas, on le crée avec le module actuel
+    const moduleName = config.slug.replace("module-", "").replace("-pro", "");
+    const moduleNameWithSuffix = config.isPro
+      ? `${moduleName}-pro`
+      : moduleName;
+    const moduleEntry = config.isPro
+      ? `  {
+    name: "${moduleNameWithSuffix}",
+    package: "${config.moduleName}",
+    description: "Module ${config.moduleName}",
+    emoji: "📦",
+    isPro: true,
+  },`
+      : `  {
+    name: "${moduleNameWithSuffix}",
+    package: "${config.moduleName}",
+    description: "Module ${config.moduleName}",
+    emoji: "📦",
+  },`;
+
     const content = `/**
  * Configuration centralisée des modules LastBrain
  * Ce fichier est auto-généré et maintenu par les scripts de gestion des modules
@@ -1218,15 +1289,11 @@ export interface ModuleMetadata {
   description: string;
   emoji: string;
   version?: string;
+  isPro?: boolean;
 }
 
 export const AVAILABLE_MODULES: ModuleMetadata[] = [
-  {
-    name: "${config.slug.replace("module-", "")}",
-    package: "@lastbrain/${config.slug}",
-    description: "Module ${config.moduleName}",
-    emoji: "📦",
-  },
+${moduleEntry}
 ];
 
 /**
@@ -1258,22 +1325,43 @@ export function getAvailableModuleNames(): string[] {
   try {
     let content = await fs.readFile(moduleRegistryPath, "utf-8");
 
-    const moduleName = config.slug.replace("module-", "");
-    const moduleEntry = `  {
-    name: "${moduleName}",
-    package: "@lastbrain/${config.slug}",
+    const moduleName = config.slug.replace("module-", "").replace("-pro", "");
+    const moduleNameWithSuffix = config.isPro
+      ? `${moduleName}-pro`
+      : moduleName;
+    const moduleEntry = config.isPro
+      ? `  {
+    name: "${moduleNameWithSuffix}",
+    package: "${config.moduleName}",
+    description: "Module ${config.moduleName}",
+    emoji: "📦",
+    isPro: true,
+  },`
+      : `  {
+    name: "${moduleNameWithSuffix}",
+    package: "${config.moduleName}",
     description: "Module ${config.moduleName}",
     emoji: "📦",
   },`;
 
     // Vérifier si le module existe déjà
-    if (content.includes(`name: "${moduleName}"`)) {
+    if (content.includes(`name: "${moduleNameWithSuffix}"`)) {
       console.log(
-        chalk.yellow(`  ⚠️  Module ${moduleName} déjà présent dans le registre`)
+        chalk.yellow(
+          `  ⚠️  Module ${moduleNameWithSuffix} déjà présent dans le registre`
+        )
       );
       return;
     }
 
+    // Vérifier si l'interface a le champ isPro
+    if (!content.includes("isPro?: boolean;")) {
+      content = content.replace(
+        /version\?: string;\s*\}/,
+        "version?: string;\n  isPro?: boolean;\n}"
+      );
+    }
+
     // Trouver le tableau AVAILABLE_MODULES et ajouter le module
     const arrayMatch = content.match(
       /export const AVAILABLE_MODULES: ModuleMetadata\[\] = \[([\s\S]*?)\];/
@@ -1355,7 +1443,12 @@ export async function createModuleStructure(
   console.log(chalk.yellow("  📄 package.json"));
   await fs.writeFile(
     path.join(moduleDir, "package.json"),
-    generatePackageJson(config.moduleName, config.slug, rootDir)
+    generatePackageJson(
+      config.moduleName,
+      config.slug,
+      rootDir,
+      config.isPro || false
+    )
   );
 
   // Créer tsconfig.json
@@ -1390,20 +1483,38 @@ export async function createModuleStructure(
 
   // Créer les pages
   console.log(chalk.blue("\n📄 Création des pages..."));
+
+  // Grouper les pages par nom pour détecter les doublons
+  const pagesByName = new Map<string, PageConfig[]>();
+  for (const page of config.pages) {
+    const key = page.name;
+    const existing = pagesByName.get(key) || [];
+    existing.push(page);
+    pagesByName.set(key, existing);
+  }
+
   for (const page of config.pages) {
     const pagePath = path.join(moduleDir, "src", "web", page.section);
     await fs.ensureDir(pagePath);
 
-    const componentName = page.name
+    const baseName = page.name
       .split("-")
       .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
       .join("");
-    const fileName = `${componentName}Page.tsx`;
+
+    // Si le même nom de page existe dans plusieurs sections, ajouter la section au nom du fichier
+    const duplicates = pagesByName.get(page.name) || [];
+    const hasDuplicates = duplicates.length > 1;
+    const componentNameWithSection = hasDuplicates
+      ? `${baseName}${toPascalCase(page.section)}`
+      : baseName;
+
+    const fileName = `${componentNameWithSection}Page.tsx`;
 
     console.log(chalk.yellow(`  📄 src/web/${page.section}/${fileName}`));
     await fs.writeFile(
       path.join(pagePath, fileName),
-      generatePageComponent(page.name, page.section)
+      generatePageComponent(page.name, page.section, componentNameWithSection)
     );
   }
 
@@ -1684,10 +1795,59 @@ export async function createModule() {
     });
   }
 
+  // 🛡️ VALIDATION : Détecter et corriger les collisions de noms de pages
+  const pagesByName = new Map<string, PageConfig[]>();
+  for (const page of pages) {
+    const existing = pagesByName.get(page.name) || [];
+    existing.push(page);
+    pagesByName.set(page.name, existing);
+  }
+
+  const correctedPages: PageConfig[] = [];
+  const collisionsDetected = new Set<string>();
+
+  for (const page of pages) {
+    const duplicates = pagesByName.get(page.name) || [];
+    if (duplicates.length > 1) {
+      // Collision détectée ! Ajouter un suffixe pour différencier
+      const correctedPage: PageConfig = {
+        ...page,
+        name: `${page.name}-${page.section}`,
+        path: `${page.path}-${page.section}`,
+      };
+
+      // Afficher l'avertissement une fois par groupe de doublons
+      if (!collisionsDetected.has(page.name)) {
+        collisionsDetected.add(page.name);
+        console.log(
+          chalk.yellow(
+            `\n⚠️  Collision détectée pour la page "${page.name}" (existe dans plusieurs sections)`
+          )
+        );
+        console.log(
+          chalk.gray(
+            `   Les pages seront renommées automatiquement pour éviter les conflits:`
+          )
+        );
+        duplicates.forEach((dup) => {
+          console.log(
+            chalk.gray(
+              `   - [${dup.section}] ${dup.name} → ${dup.name}-${dup.section}`
+            )
+          );
+        });
+      }
+
+      correctedPages.push(correctedPage);
+    } else {
+      correctedPages.push(page);
+    }
+  }
+
   const config: ModuleConfig & { description?: string } = {
     slug,
     moduleName,
-    pages,
+    pages: correctedPages,
     tables,
     description,
   };

package/src/templates/DefaultDoc.tsx

@@ -1619,7 +1619,7 @@ export function DocUsageCustom() {
                     Module LastBrain
                   </p>
                   <p className="text-xs text-slate-500 dark:text-slate-500">
-                    <strong>Pages:</strong> 1 auth, 1 admin
+                    <strong>Pages:</strong> 1 auth, 2 admin
                   </p>
 
                   <Snippet symbol="💻" hideSymbol className="text-sm">
@@ -1686,6 +1686,29 @@ export function DocUsageCustom() {
                   </span>
                 </CardBody>
               </Card>
+              <Card className="hover:shadow-lg transition-shadow border-l-4 border-l-purple-500">
+                <CardBody className="space-y-3">
+                  <div className="flex items-start justify-between">
+                    <h3 className="text-lg font-semibold">Cj Analyzer Pro</h3>
+                    <span className="text-xs bg-purple-100 dark:bg-purple-900 text-purple-800 dark:text-purple-200 px-2 py-1 rounded">
+                      PRO
+                    </span>
+                  </div>
+                  <p className="text-sm text-slate-600 dark:text-slate-400">
+                    Module LastBrain
+                  </p>
+                  <p className="text-xs text-slate-500 dark:text-slate-500">
+                    <strong>Pages:</strong> 4 admin
+                  </p>
+
+                  <Snippet symbol="💻" hideSymbol className="text-sm">
+                    {`pnpm lastbrain add-module cj-analyzer-pro`}
+                  </Snippet>
+                  <span className="text-xs text-slate-500 dark:text-slate-400 inline-flex items-center gap-1">
+                    🔒 Documentation privée
+                  </span>
+                </CardBody>
+              </Card>
               <Card className="hover:shadow-lg transition-shadow border-l-4 border-l-purple-500">
                 <CardBody className="space-y-3">
                   <div className="flex items-start justify-between">
@@ -1698,7 +1721,7 @@ export function DocUsageCustom() {
                     Module LastBrain
                   </p>
                   <p className="text-xs text-slate-500 dark:text-slate-500">
-                    <strong>Pages:</strong> 2 auth, 1 admin
+                    <strong>Pages:</strong> 2 publique(s), 2 auth, 1 admin
                   </p>
 
                   <Snippet symbol="💻" hideSymbol className="text-sm">
@@ -1877,6 +1900,29 @@ export function DocUsageCustom() {
                   </span>
                 </CardBody>
               </Card>
+              <Card className="hover:shadow-lg transition-shadow border-l-4 border-l-purple-500">
+                <CardBody className="space-y-3">
+                  <div className="flex items-start justify-between">
+                    <h3 className="text-lg font-semibold">Shop Pro</h3>
+                    <span className="text-xs bg-purple-100 dark:bg-purple-900 text-purple-800 dark:text-purple-200 px-2 py-1 rounded">
+                      PRO
+                    </span>
+                  </div>
+                  <p className="text-sm text-slate-600 dark:text-slate-400">
+                    Module LastBrain
+                  </p>
+                  <p className="text-xs text-slate-500 dark:text-slate-500">
+                    <strong>Pages:</strong> 3 admin
+                  </p>
+
+                  <Snippet symbol="💻" hideSymbol className="text-sm">
+                    {`pnpm lastbrain add-module shop-pro`}
+                  </Snippet>
+                  <span className="text-xs text-slate-500 dark:text-slate-400 inline-flex items-center gap-1">
+                    🔒 Documentation privée
+                  </span>
+                </CardBody>
+              </Card>
               <Card className="hover:shadow-lg transition-shadow border-l-4 border-l-blue-500">
                 <CardBody className="space-y-3">
                   <div className="flex items-start justify-between">