@navneet_25/tempjs 2.0.0 → 3.0.0

package/README.md

@@ -17,6 +17,8 @@ git add .
 git commit -m "Initial project"
 ```
 
+**Documentation site:** [`docsite/`](docsite/) — JSON-driven docs for developers and maintainers. Run `pnpm docs:dev` from repo root.
+
 ## Available templates
 
 | ID            | Name                 | Description                                      |
@@ -202,6 +204,15 @@ tempjs info hotel    # shows full version in details
 
 When maintainers bump `"version"` in `templates.json` and push, clients can pull fixes safely.
 
+**Two version numbers (don’t confuse them):**
+
+| Version | Where | Meaning |
+|---------|--------|---------|
+| **CLI** (`@navneet_25/tempjs`) | npm / `package.json` in templates repo | The `tempjs` tool itself |
+| **Template** (`hotel`, `real-estate`) | `templates.json` → your `.tempjs.json` | The website template snapshot |
+
+Maintainers: see **[VERSIONING.md](./VERSIONING.md)** for `tempjs version check` / `tempjs version inc`.
+
 ---
 
 ### Update an existing project (`tempjs update`)
@@ -462,9 +473,9 @@ npm install -g @navneet_25/tempjs
 npm install -g @navneet_25/tempjs@latest
 ```
 
-Current version: **1.4.0** (update, versioning, fetch progress, info, non-interactive flags).
+Current version: **2.1.0** (doctor, version tracking, copy-once core starter kit, optional sync propagate, update merge).
 
-See also: [guide.md](./guide.md) for CLI architecture and update algorithm details.
+See also: [guide.md](./guide.md) for CLI architecture, [VERSIONING.md](./VERSIONING.md) for release workflow.
 
 Verify:
 
@@ -485,9 +496,42 @@ tempjs theme --theme theme3 --yes
 tempjs brand --yes --name "Mi Plaza" --base-url "https://miplaza.com"
 tempjs init-db --yes --db-host localhost --db-name my_db --skip-db-push
 tempjs real-estate --force   # overwrite existing files
+tempjs doctor                # readiness check (generated projects)
+tempjs add-module list       # optional core modules available
+tempjs add-module seo,gallery,reviews  # add modules to existing project
 tempjs --help                # show help
 ```
 
+### Optional core modules (client projects)
+
+After `tempjs hotel`, add cross-vertical features without re-copying the template:
+
+```bash
+tempjs add-module list
+tempjs add-module seo,gallery,reviews
+pnpm prisma db push && pnpm dev
+```
+
+Modules: `enquiry-modal`, `footer`, `hero-simple`, `seo`, `gallery`, `reviews`, `legal-pages`. See `packages/core/modules.json` and docsite → Developers → Optional modules.
+
+Shipped **hotel** and **real-estate** templates already include vertical features and adopted core modules where they overlapped bespoke code.
+
+### Maintainer commands (monorepo root)
+
+```bash
+pnpm new-template bakery --name "Bakery" --modules enquiry-modal,footer,hero-simple,seo
+pnpm template:add-module hotel gallery,reviews
+pnpm template:assemble hotel          # vertical modules → template root
+pnpm template:extract-modules hotel   # template root → modules/
+pnpm sync-templates
+pnpm dev:hotel
+tempjs version check         # unreleased CLI/template changes?
+tempjs version inc patch cli
+tempjs version inc minor hotel
+```
+
+See [VERSIONING.md](./VERSIONING.md).
+
 ### Options (summary)
 
 | Option | Description |
@@ -613,36 +657,40 @@ The archive contains the whole templates repo on the wire, but only the requeste
 
 ```
 templates/                          # this repository root
-├── ARCHITECTURE.md                 # core + overlay design
+├── ARCHITECTURE.md                 # copy-once core + standalone templates
+├── MAINTAINERS.md                  # maintainer handbook
+├── ROADMAP.md                      # planned improvements
 ├── packages/
-│   └── core/                       # shared source (synced into templates)
+│   └── core/                       # starter kit (copied once via new-template)
 ├── templates/
-│   ├── overlays/                   # template-specific source only
-│   │   ├── hotel-website-template/
-│   │   └── real-estate-website-template/
-│   ├── hotel-website-template/     # merged output (what tempjs copies)
+│   ├── hotel-website-template/     # full hotel project (what tempjs copies)
 │   └── real-estate-website-template/
 ├── scripts/
-│   └── sync-templates.mjs
-├── package.json                    # CLI package + sync scripts
+│   ├── new-template.mjs
+│   └── sync-templates.mjs          # optional: propagate core fixes
+├── package.json                    # CLI package + maintainer scripts
 ├── templates.json
 ├── cli/
 │   └── ...
 ```
 
-## Shared core package (Option 1 — implemented)
+## Shared core starter kit (copy-once)
 
-This repo uses **pre-merge sync**: shared code lives in `packages/core/`, template-specific code in `templates/overlays/`, and `pnpm sync-templates` produces the full template folders that `tempjs` copies to users.
+`packages/core/` is **generic boilerplate** copied once when you run `pnpm new-template`. After that, each template under `templates/<name>/` is a **standalone** Next.js project — edit it directly. Use `pnpm sync-templates` only when you intentionally propagate a fix from core into existing templates.
 
-**Full design doc:** [ARCHITECTURE.md](./ARCHITECTURE.md)
+**Full design doc:** [ARCHITECTURE.md](./ARCHITECTURE.md) · **Maintainer guide:** [MAINTAINERS.md](./MAINTAINERS.md)
 
 ### Quick maintainer commands
 
 ```bash
-# After editing packages/core or templates/overlays/*
-pnpm sync-templates
+# Create a new template (copies core + scaffold once)
+pnpm new-template bakery bakery-website-template --name "Bakery Website"
 
-# CI / pre-PR check
+# Daily dev (no sync)
+pnpm dev:hotel
+
+# Optional: after fixing packages/core, propagate to existing templates
+pnpm sync-templates
 pnpm sync-templates:check
 ```
 
@@ -653,7 +701,7 @@ A normal Next.js project with organized `lib/`:
 - `lib/database/` — Prisma client
 - `lib/features/leads/` — shared lead module
 - `lib/storage/` — FTP uploads
-- `lib/features/<domain>/` — template-specific modules (rooms, projects, …) in overlay
+- `lib/features/<domain>/` — template-specific modules (rooms, projects, …)
 - `app/` — routes and UI
 
 All source is on disk; no submodule, no `@tempjs/core` npm dependency in client projects.
@@ -662,7 +710,7 @@ All source is on disk; no submodule, no `@tempjs/core` npm dependency in client
 
 | Approach | User gets full source? | Maintained in this repo |
 |----------|------------------------|-------------------------|
-| **Option 1 — pre-merge sync** (current) | Yes | `packages/core` + overlays |
+| **Copy-once core** (current) | Yes | `packages/core` starter + `templates/<name>/` |
 | CLI merge at copy time | Yes | `packages/core` only in git |
 | npm `@tempjs/core` package | Partial (core in node_modules) | Published package |
 

package/cli/brand-manager.js

@@ -2,6 +2,12 @@ import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
 import { readFile, writeFile } from "node:fs/promises";
 import { findSiteTs } from "./theme-manager.js";
+import {
+  INIT_FIELD_REGISTRY,
+  getTemplateBrandFields,
+  pickBrandOptionsForTemplate,
+} from "./init-options.js";
+import { loadManifest } from "./config.js";
 
 /**
  * @typedef {{
@@ -13,7 +19,14 @@ import { findSiteTs } from "./theme-manager.js";
  *   phoneDisplay?: string,
  *   countryCode?: string,
  *   email?: string,
- *   address?: string
+ *   address?: string,
+ *   tagline?: string,
+ *   developerName?: string,
+ *   channelPartner?: string,
+ *   agentRera?: string,
+ *   templeDistance?: string,
+ *   company?: string,
+ *   location?: string
  * }} BrandOptions
  */
 
@@ -21,15 +34,26 @@ import { findSiteTs } from "./theme-manager.js";
  * @param {string} siteContent
  */
 function parseCurrentBrandValues(siteContent) {
+  const match = (pattern, fallback = "") => {
+    const result = siteContent.match(pattern);
+    return result?.[1] ?? fallback;
+  };
+
   return {
-    brandName: (siteContent.match(/name:\s*"([^"]+)"/) || [])[1] || "Chanakya Resort",
-    shortName: (siteContent.match(/shortName:\s*"([^"]+)"/) || [])[1] || "Chanakya",
-    baseUrl: (siteContent.match(/baseUrl:\s*"([^"]+)"/) || [])[1] || "https://chanakyaresort.com",
-    phone: (siteContent.match(/phone:\s*"([^"]+)"/) || [])[1] || "9876543210",
-    phoneDisplay: (siteContent.match(/phoneDisplay:\s*"([^"]+)"/) || [])[1] || "+91 98765 43210",
-    countryCode: (siteContent.match(/countryCode:\s*"([^"]+)"/) || [])[1] || "91",
-    email: (siteContent.match(/email:\s*"([^"]+)"/) || [])[1] || "reservations@chanakyaresort.com",
-    address: (siteContent.match(/full:\s*"([^"]+)"/) || [])[1] || "Lonavala, Maharashtra, India",
+    brandName: match(/name:\s*"([^"]+)"/, "Demo Client Site"),
+    shortName: match(/shortName:\s*"([^"]+)"/, "Demo"),
+    baseUrl: match(/baseUrl:\s*"([^"]+)"/, "https://example.com"),
+    phone: match(/phone:\s*"([^"]+)"/, "9876543210"),
+    phoneDisplay: match(/phoneDisplay:\s*"([^"]+)"/, "+91 98765 43210"),
+    countryCode: match(/countryCode:\s*"([^"]+)"/, "91"),
+    email: match(/email:\s*"([^"]+)"/, "hello@example.com"),
+    address: match(/full:\s*"([^"]+)"/, "Lonavala, Maharashtra, India"),
+    tagline: match(/tagline:\s*"([^"]+)"/, ""),
+    developerName: match(/developerName:\s*"([^"]+)"/, ""),
+    channelPartner: match(/channelPartner:\s*"([^"]+)"/, ""),
+    agentRera: match(/agentRera:\s*"([^"]*)"/, ""),
+    templeDistance: match(/templeDistance:\s*"([^"]*)"/, ""),
+    locality: match(/locality:\s*"([^"]+)"/, "Lonavala"),
   };
 }
 
@@ -47,72 +71,103 @@ function deriveWwwHost(baseUrl) {
   }
 }
 
+/**
+ * @param {string} value
+ */
+function escapeForTsString(value) {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+
 /**
  * @param {string} siteContent
- * @param {{
- *   brandName: string,
- *   shortName: string,
- *   baseUrl: string,
- *   phone: string,
- *   phoneDisplay: string,
- *   countryCode: string,
- *   email: string,
- *   address: string
- * }} values
+ * @param {ReturnType<typeof parseCurrentBrandValues>} current
+ * @param {BrandOptions} options
  */
-function applyBrandToSiteContent(siteContent, values) {
-  const {
+function buildBrandValues(current, options) {
+  const brandName = options.name?.trim() || current.brandName;
+  const developerName =
+    options.developerName?.trim() || options.company?.trim() || current.developerName || brandName;
+
+  let address = options.address?.trim() || current.address;
+  let locality = current.locality;
+
+  if (options.location?.trim() && !options.address?.trim()) {
+    locality = options.location.trim();
+    const parts = address.split(",");
+    if (parts.length >= 2) {
+      address = `${locality}, ${parts.slice(1).join(",").trim()}`;
+    } else {
+      address = locality;
+    }
+  }
+
+  const addressParts = address.split(",");
+  if (addressParts.length >= 2) {
+    locality = addressParts[0].trim();
+  }
+
+  return {
     brandName,
-    shortName,
-    baseUrl,
-    phone,
-    phoneDisplay,
-    countryCode,
-    email,
+    shortName: options.shortName?.trim() || current.shortName,
+    baseUrl: options.baseUrl?.trim() || current.baseUrl,
+    phone: options.phone?.trim() || current.phone,
+    phoneDisplay: options.phoneDisplay?.trim() || current.phoneDisplay,
+    countryCode: options.countryCode?.trim() || current.countryCode,
+    email: options.email?.trim() || current.email,
     address,
-  } = values;
+    locality,
+    region: addressParts.length >= 2 ? addressParts[1].trim() : "MH",
+    tagline: options.tagline?.trim() || current.tagline,
+    developerName,
+    channelPartner: options.channelPartner?.trim() || current.channelPartner || `${brandName} Partner`,
+    agentRera: options.agentRera?.trim() ?? current.agentRera,
+    templeDistance: options.templeDistance?.trim() ?? current.templeDistance,
+  };
+}
 
-  const wwwHost = deriveWwwHost(baseUrl);
+/**
+ * @param {string} siteContent
+ * @param {ReturnType<typeof buildBrandValues>} values
+ */
+function applyBrandToSiteContent(siteContent, values) {
+  const wwwHost = deriveWwwHost(values.baseUrl);
 
   const newBrandBlock = `brand: {
-    name: "${brandName}",
-    shortName: "${shortName}",
-    tagline: "Where Nature Meets Refined Comfort",
-    developerName: "${brandName}",
-    channelPartner: "${brandName} Partner",
-    copyright: "${brandName}. All Rights Reserved.",
-    managedBy: "Managed by ${brandName}.",
+    name: "${escapeForTsString(values.brandName)}",
+    shortName: "${escapeForTsString(values.shortName)}",
+    tagline: "${escapeForTsString(values.tagline)}",
+    developerName: "${escapeForTsString(values.developerName)}",
+    channelPartner: "${escapeForTsString(values.channelPartner)}",
+    copyright: "${escapeForTsString(values.brandName)}. All Rights Reserved.",
+    managedBy: "Managed by ${escapeForTsString(values.developerName)}.",
   }`;
 
   const newDomainBlock = `domain: {
-    baseUrl: "${baseUrl}",
-    wwwHost: "${wwwHost}",
+    baseUrl: "${escapeForTsString(values.baseUrl)}",
+    wwwHost: "${escapeForTsString(wwwHost)}",
   }`;
 
-  let locality = "Lonavala";
-  let region = "MH";
-  const addressParts = address.split(",");
-  if (addressParts.length >= 2) {
-    locality = addressParts[0].trim();
-    region = addressParts[1].trim();
-  }
+  const templeLine = values.templeDistance
+    ? `\n    templeDistance: "${escapeForTsString(values.templeDistance)}",`
+    : "";
 
   const newContactBlock = `contact: {
-    phone: "${phone}",
-    phoneDisplay: "${phoneDisplay}",
-    countryCode: "${countryCode}",
-    email: "${email}",
+    phone: "${escapeForTsString(values.phone)}",
+    phoneDisplay: "${escapeForTsString(values.phoneDisplay)}",
+    countryCode: "${escapeForTsString(values.countryCode)}",
+    email: "${escapeForTsString(values.email)}",
     address: {
-      locality: "${locality}",
-      region: "${region}",
+      locality: "${escapeForTsString(values.locality)}",
+      region: "${escapeForTsString(values.region)}",
       country: "IN",
-      full: "${address}",
-    },
+      full: "${escapeForTsString(values.address)}",
+    },${templeLine}
   }`;
 
   const brandRegex = /brand:\s*\{[\s\S]*?\n\s*\},/;
   const domainRegex = /domain:\s*\{[\s\S]*?\n\s*\},/;
   const contactRegex = /contact:\s*\{[\s\S]*?address:\s*\{[\s\S]*?\}[\s\S]*?\n\s*\},/;
+  const agentReraRegex = /agentRera:\s*"[^"]*"/;
 
   if (brandRegex.test(siteContent)) {
     siteContent = siteContent.replace(brandRegex, newBrandBlock + ",");
@@ -123,15 +178,65 @@ function applyBrandToSiteContent(siteContent, values) {
   if (contactRegex.test(siteContent)) {
     siteContent = siteContent.replace(contactRegex, newContactBlock + ",");
   }
+  if (agentReraRegex.test(siteContent)) {
+    siteContent = siteContent.replace(
+      agentReraRegex,
+      `agentRera: "${escapeForTsString(values.agentRera)}"`
+    );
+  }
 
   return siteContent;
 }
 
+/**
+ * @param {ReturnType<typeof parseCurrentBrandValues>} current
+ * @param {string} fieldKey
+ */
+function currentValueForField(current, fieldKey) {
+  const def = INIT_FIELD_REGISTRY[fieldKey];
+  if (!def) return "";
+
+  switch (fieldKey) {
+    case "name":
+      return current.brandName;
+    case "shortName":
+      return current.shortName;
+    case "baseUrl":
+      return current.baseUrl;
+    case "phone":
+      return current.phone;
+    case "phoneDisplay":
+      return current.phoneDisplay;
+    case "countryCode":
+      return current.countryCode;
+    case "email":
+      return current.email;
+    case "address":
+      return current.address;
+    case "tagline":
+      return current.tagline;
+    case "developerName":
+    case "company":
+      return current.developerName;
+    case "channelPartner":
+      return current.channelPartner;
+    case "agentRera":
+      return current.agentRera;
+    case "templeDistance":
+      return current.templeDistance;
+    case "location":
+      return current.locality;
+    default:
+      return "";
+  }
+}
+
 /**
  * @param {string} targetDir
  * @param {BrandOptions} options
+ * @param {string} [templateId]
  */
-export async function applyBrand(targetDir, options = {}) {
+export async function applyBrand(targetDir, options = {}, templateId) {
   const siteTsPath = await findSiteTs(targetDir);
   if (!siteTsPath) {
     throw new Error(
@@ -141,18 +246,7 @@ export async function applyBrand(targetDir, options = {}) {
 
   let siteContent = await readFile(siteTsPath, "utf8");
   const current = parseCurrentBrandValues(siteContent);
-
-  const values = {
-    brandName: options.name?.trim() || current.brandName,
-    shortName: options.shortName?.trim() || current.shortName,
-    baseUrl: options.baseUrl?.trim() || current.baseUrl,
-    phone: options.phone?.trim() || current.phone,
-    phoneDisplay: options.phoneDisplay?.trim() || current.phoneDisplay,
-    countryCode: options.countryCode?.trim() || current.countryCode,
-    email: options.email?.trim() || current.email,
-    address: options.address?.trim() || current.address,
-  };
-
+  const values = buildBrandValues(current, options);
   siteContent = applyBrandToSiteContent(siteContent, values);
   await writeFile(siteTsPath, siteContent, "utf8");
   console.log("Successfully updated brand and contact configurations in constants/site.ts.");
@@ -161,10 +255,18 @@ export async function applyBrand(targetDir, options = {}) {
 /**
  * @param {string} targetDir
  * @param {BrandOptions} options
+ * @param {string} [templateId]
  */
-export async function promptAndApplyBrand(targetDir, options = {}) {
+export async function promptAndApplyBrand(targetDir, options = {}, templateId) {
+  const manifest = loadManifest();
+  const entry = templateId ? manifest.templates[templateId] : undefined;
+  const fieldKeys = entry?.init?.brandFields ?? Object.keys(INIT_FIELD_REGISTRY);
+
   if (options.yes) {
-    await applyBrand(targetDir, options);
+    const picked = entry
+      ? pickBrandOptionsForTemplate(templateId, entry, options)
+      : options;
+    await applyBrand(targetDir, picked, templateId);
     return;
   }
 
@@ -178,40 +280,25 @@ export async function promptAndApplyBrand(targetDir, options = {}) {
 
   let siteContent = await readFile(siteTsPath, "utf8");
   const current = parseCurrentBrandValues(siteContent);
+  const collected = { ...options };
 
   const rl = createInterface({ input, output });
   try {
     console.log("\n--- Configure Brand & Contact Details ---");
 
-    const brandName =
-      (await rl.question(`Brand Name [${current.brandName}]: `)).trim() || current.brandName;
-    const shortName =
-      (await rl.question(`Short/Display Name [${current.shortName}]: `)).trim() || current.shortName;
-    const baseUrl =
-      (await rl.question(`Base URL [${current.baseUrl}]: `)).trim() || current.baseUrl;
-    const phone =
-      (await rl.question(`Contact Phone Number [${current.phone}]: `)).trim() || current.phone;
-    const phoneDisplay =
-      (await rl.question(`Display Phone Number [${current.phoneDisplay}]: `)).trim() ||
-      current.phoneDisplay;
-    const countryCode =
-      (await rl.question(`Country Code [${current.countryCode}]: `)).trim() || current.countryCode;
-    const email =
-      (await rl.question(`Contact Email [${current.email}]: `)).trim() || current.email;
-    const address =
-      (await rl.question(`Full Address [${current.address}]: `)).trim() || current.address;
-
-    siteContent = applyBrandToSiteContent(siteContent, {
-      brandName,
-      shortName,
-      baseUrl,
-      phone,
-      phoneDisplay,
-      countryCode,
-      email,
-      address,
-    });
+    for (const fieldKey of fieldKeys) {
+      const field = INIT_FIELD_REGISTRY[fieldKey];
+      if (!field) continue;
+
+      const currentVal = currentValueForField(current, fieldKey);
+      const answer = (await rl.question(`${field.prompt} [${currentVal}]: `)).trim();
+      if (answer) {
+        collected[field.cliKey] = answer;
+      }
+    }
 
+    const values = buildBrandValues(current, collected);
+    siteContent = applyBrandToSiteContent(siteContent, values);
     await writeFile(siteTsPath, siteContent, "utf8");
     console.log("Successfully updated brand and contact configurations in constants/site.ts.");
   } finally {

package/cli/config.js

@@ -17,7 +17,15 @@ const packageRoot = join(dirname(fileURLToPath(import.meta.url)), "..");
  *   docker?: boolean,
  *   tags?: string[],
  *   features?: string[],
- *   docs?: string
+ *   docs?: string,
+ *   coreModules?: string[],
+ *   templateModules?: string[],
+ *   init?: {
+ *     flagGroups?: string[],
+ *     brandFields?: string[],
+ *     skipBrand?: boolean,
+ *     skipDatabase?: boolean
+ *   }
  * }} TemplateEntry */
 /** @typedef {{ repository: RepositoryConfig, templates: Record<string, TemplateEntry> }} Manifest */