@oss-ma/tpl 1.0.29 → 1.0.31

package/dist/engine/prompt.js

@@ -1,67 +1,38 @@
 // cli/src/engine/prompt.ts
-import prompts from "prompts";
+import { input, select } from "@inquirer/prompts";
 export async function askQuestions(questions, opts = {}) {
     if (!questions?.length)
         return {};
-    // --yes : aucune interaction, on prend les defaults
+    // --yes : no interaction, use defaults
     if (opts.yes) {
         const answers = {};
         for (const q of questions)
             answers[q.name] = String(q.default ?? "");
         return answers;
     }
-    const defs = questions.map((q) => {
-        const base = {
-            name: q.name,
-            message: q.message,
-            initial: q.default
-        };
-        if (q.choices?.length) {
-            return { type: "select", ...base, choices: q.choices.map((c) => ({ title: c, value: c })) };
-        }
-        return { type: "text", ...base };
-    });
-    // Sur certains terminaux Windows, prompts peut déclencher onCancel inopinément.
-    // Stratégie: si cancel -> fallback sur defaults au lieu de crash.
-    const res = (await prompts(defs, {
-        onCancel: () => true
-    }));
     const out = {};
     for (const q of questions) {
-        const v = res[q.name];
-        out[q.name] = v !== undefined && v !== null && String(v).length > 0 ? String(v) : String(q.default ?? "");
+        try {
+            if (q.choices?.length) {
+                const answer = await select({
+                    message: q.message,
+                    default: q.default,
+                    choices: q.choices.map((c) => ({ name: c, value: c })),
+                });
+                out[q.name] = String(answer);
+            }
+            else {
+                const answer = await input({
+                    message: q.message,
+                    default: String(q.default ?? ""),
+                });
+                out[q.name] = answer.trim() || String(q.default ?? "");
+            }
+        }
+        catch {
+            // User cancelled (Ctrl+C) → fallback to default
+            out[q.name] = String(q.default ?? "");
+        }
     }
     return out;
 }
-// import prompts from "prompts";
-// import type { TemplateQuestion } from "./loadTemplate.js";
-// export async function askQuestions(
-//   questions: TemplateQuestion[] | undefined,
-//   opts: { yes?: boolean } = {}
-// ): Promise<Record<string, string>> {
-//   if (!questions?.length) return {};
-//   if (opts.yes) {
-//     const answers: Record<string, string> = {};
-//     for (const q of questions) {
-//       answers[q.name] = String(q.default ?? "");
-//     }
-//     return answers;
-//   }
-//   const defs = questions.map((q) => {
-//     const base: any = {
-//       name: q.name,
-//       message: q.message,
-//       initial: q.default
-//     };
-//     if (q.choices?.length) {
-//       return { type: "select", ...base, choices: q.choices.map((c) => ({ title: c, value: c })) };
-//     }
-//     return { type: "text", ...base };
-//   });
-//   const res = await prompts(defs, {
-//     onCancel: () => {
-//       throw new Error("Cancelled by user.");
-//     }
-//   });
-//   return res as Record<string, string>;
-// }

package/dist/engine/render.js

@@ -1,7 +1,38 @@
 // cli/src/engine/render.ts
+/**
+ * Render a template string with variable substitution and conditional blocks.
+ *
+ * Supported syntax:
+ *   {{variableName}}              — replaced by vars[variableName]
+ *   {{#if variableName}}...{{/if}} — block included only if vars[variableName] is truthy and !== "none"
+ *   {{#unless variableName}}...{{/unless}} — block included only if vars[variableName] is falsy or === "none"
+ *
+ * Blocks can span multiple lines.
+ * Nested blocks are not supported.
+ */
 export function renderString(input, vars) {
-    return input.replace(/\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g, (_, key) => {
+    // 1) Process {{#if var}}...{{/if}} blocks
+    let output = input.replace(/\{\{#if\s+([a-zA-Z0-9_]+)\s*\}\}([\s\S]*?)\{\{\/if\}\}/g, (_, key, content) => {
+        const val = vars[key];
+        return isActive(val) ? content : "";
+    });
+    // 2) Process {{#unless var}}...{{/unless}} blocks
+    output = output.replace(/\{\{#unless\s+([a-zA-Z0-9_]+)\s*\}\}([\s\S]*?)\{\{\/unless\}\}/g, (_, key, content) => {
+        const val = vars[key];
+        return isActive(val) ? "" : content;
+    });
+    // 3) Replace {{variable}} placeholders
+    output = output.replace(/\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g, (_, key) => {
         const v = vars[key];
-        return v !== undefined ? String(v) : `{{${key}}}`; // keep unresolved visible
+        return v !== undefined ? String(v) : `{{${key}}}`;
     });
+    // 4) Clean up blank lines left by removed blocks (max 1 consecutive blank line)
+    output = output.replace(/\n{3,}/g, "\n\n");
+    return output;
+}
+/**
+ * A variable is "active" if it exists, is not empty, and is not "none".
+ */
+function isActive(val) {
+    return val !== undefined && val !== "" && val !== "none";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oss-ma/tpl",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Generate, enforce and maintain clean project architectures",
   "type": "module",
   "repository": {
@@ -27,18 +27,17 @@
     "test:smoke": "node --test dist/tests/smoke.test.js"
   },
   "dependencies": {
+    "@inquirer/prompts": "^8.2.1",
     "commander": "^12.1.0",
     "execa": "^9.3.0",
     "fs-extra": "^11.2.0",
     "picocolors": "^1.0.0",
-    "prompts": "^2.4.2",
     "yaml": "^2.5.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.7.0",
-    "@types/prompts": "^2.4.9",
     "tsx": "^4.16.2",
     "typescript": "^5.5.4"
   }
-}
+}

package/resources/templates/react-ts/files/package.json

@@ -18,17 +18,17 @@
     "audit": "npm audit --audit-level=high"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.56.0",
     "react": "^18.3.0",
-    "react-dom": "^18.3.0",
-    "react-router-dom": "^6.26.0",
-    "zustand": "^4.5.0"
+    "react-dom": "^18.3.0"{{#if routing}},
+    "react-router-dom": "^6.26.0"{{/if}}{{#if state}},
+    "zustand": "^4.5.0"{{/if}}{{#if fetching}},
+    "@tanstack/react-query": "^5.56.0"{{/if}}
   },
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.0",
-    "@eslint/js": "^9.0.0",
-    "@tanstack/react-query-devtools": "^5.56.0",
+    "@eslint/js": "^9.0.0",{{#if fetching}}
+    "@tanstack/react-query-devtools": "^5.56.0",{{/if}}
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.0",

package/resources/templates/react-ts/files/src/app/App.tsx

@@ -1,3 +1,4 @@
+{{#if routing}}
 import { Routes, Route } from "react-router-dom";
 import { HomePage } from "@/pages/HomePage";
 import { NotFoundPage } from "@/pages/NotFoundPage";
@@ -9,4 +10,12 @@ export function App() {
       <Route path="*" element={<NotFoundPage />} />
     </Routes>
   );
-}
+}
+{{/if}}
+{{#unless routing}}
+import { HomePage } from "@/pages/HomePage";
+
+export function App() {
+  return <HomePage />;
+}
+{{/unless}}

package/resources/templates/react-ts/files/src/app/main.tsx

@@ -1,27 +1,41 @@
 import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
+{{#if routing}}
 import { BrowserRouter } from "react-router-dom";
+{{/if}}
+{{#if fetching}}
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+{{/if}}
 import { App } from "@/app/App";
 import "@/app/index.css";
+{{#if fetching}}
 
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
-      staleTime: 1000 * 60 * 5, // 5 minutes
+      staleTime: 1000 * 60 * 5,
       retry: 1,
     },
   },
 });
+{{/if}}
 
 createRoot(document.getElementById("root")!).render(
   <StrictMode>
+    {{#if fetching}}
     <QueryClientProvider client={queryClient}>
+    {{/if}}
+      {{#if routing}}
       <BrowserRouter>
+      {{/if}}
         <App />
+      {{#if routing}}
       </BrowserRouter>
+      {{/if}}
+    {{#if fetching}}
       <ReactQueryDevtools initialIsOpen={false} />
     </QueryClientProvider>
+    {{/if}}
   </StrictMode>
 );

package/resources/templates/react-ts/files/src/features/example/ExampleFeature.tsx

@@ -1,6 +1,11 @@
+{{#if fetching}}
 import { useQuery } from "@tanstack/react-query";
+{{/if}}
+{{#if state}}
 import { useCounterStore } from "./store";
+{{/if}}
 import { Button } from "@/shared/ui/Button";
+{{#if fetching}}
 
 interface Post {
   id: number;
@@ -12,18 +17,23 @@ async function fetchPosts(): Promise<Post[]> {
   if (!res.ok) throw new Error("Failed to fetch posts");
   return res.json();
 }
+{{/if}}
 
 export function ExampleFeature() {
+  {{#if state}}
   const { count, increment, decrement, reset } = useCounterStore();
+  {{/if}}
+  {{#if fetching}}
 
   const { data: posts, isLoading, isError } = useQuery({
     queryKey: ["posts"],
     queryFn: fetchPosts,
   });
+  {{/if}}
 
   return (
     <section style={{ marginTop: "2rem" }}>
-      {/* Zustand counter */}
+      {{#if state}}
       <div style={{ marginBottom: "2rem" }}>
         <h2>Counter (Zustand)</h2>
         <p style={{ fontSize: "2rem", margin: "0.5rem 0" }}>{count}</p>
@@ -33,8 +43,8 @@ export function ExampleFeature() {
           <Button onClick={reset} variant="secondary">Reset</Button>
         </div>
       </div>
-
-      {/* React Query fetch */}
+      {{/if}}
+      {{#if fetching}}
       <div>
         <h2>Posts (TanStack Query)</h2>
         {isLoading && <p>Loading...</p>}
@@ -49,6 +59,12 @@ export function ExampleFeature() {
           </ul>
         )}
       </div>
+      {{/if}}
+      {{#unless state}}
+      {{#unless fetching}}
+      <p>Feature module — add your components here.</p>
+      {{/unless}}
+      {{/unless}}
     </section>
   );
 }

package/resources/templates/react-ts/files/src/pages/HomePage.tsx

@@ -1,13 +1,37 @@
+{{#if state}}
 import { ExampleFeature } from "@/features/example/ExampleFeature";
+{{/if}}
+{{#unless state}}
+{{#unless fetching}}
+import { Button } from "@/shared/ui/Button";
+import { useState } from "react";
+{{/unless}}
+{{/unless}}
 
 export function HomePage() {
+  {{#unless state}}
+  {{#unless fetching}}
+  const [msg, setMsg] = useState<string | null>(null);
+  {{/unless}}
+  {{/unless}}
+
   return (
     <main style={{ padding: "2rem", maxWidth: 800, margin: "0 auto" }}>
       <h1>{{appName}}</h1>
       <p style={{ marginTop: "0.5rem", opacity: 0.7 }}>
         React + TypeScript + Vite
       </p>
+      {{#if state}}
       <ExampleFeature />
+      {{/if}}
+      {{#unless state}}
+      {{#unless fetching}}
+      <section style={{ marginTop: "2rem" }}>
+        <Button onClick={() => setMsg("Hello!")}>Click me</Button>
+        {msg && <p style={{ marginTop: "0.5rem" }}>{msg}</p>}
+      </section>
+      {{/unless}}
+      {{/unless}}
     </main>
   );
 }

package/resources/templates/react-ts/template.yaml

@@ -1,6 +1,6 @@
 name: react-ts
-version: 1.0.0
-description: "Template React + TypeScript (Vite) with lint/format/test/build + CI + ADR"
+version: 2.0.0
+description: "Template React + TypeScript (Vite) with optional routing, state and fetching"
 engine: "v1"
 
 questions:
@@ -13,6 +13,21 @@ questions:
     choices: ["npm", "pnpm", "yarn"]
     default: "npm"
 
+  - name: routing
+    message: "Routing ?"
+    choices: ["react-router", "none"]
+    default: "react-router"
+
+  - name: state
+    message: "State management ?"
+    choices: ["zustand", "none"]
+    default: "zustand"
+
+  - name: fetching
+    message: "Data fetching ?"
+    choices: ["tanstack-query", "none"]
+    default: "tanstack-query"
+
 hooks:
   postGenerate:
     - run: "git init"