create-contractor-site 2.1.2 → 2.2.0

package/src/copy-template.mjs

@@ -27,7 +27,7 @@ export const DEFAULT_TEMPLATE_REPO =
   'https://github.com/glacayo/website-multipages.git';
 
 export const DEFAULT_TEMPLATE_REF =
-  process.env.CREATE_CONTRACTOR_TEMPLATE_REF || 'v2.1.2';
+  process.env.CREATE_CONTRACTOR_TEMPLATE_REF || 'v2.2.0';
 
 /**
  * @param {string} name basename

package/src/prompts.mjs

@@ -1,7 +1,44 @@
 import * as readline from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
 
+/** Default free-estimate CTA when blank/omitted. */
+export const DEFAULT_FREE_ESTIMATE = 'Free On-Site Estimate';
+/** Default years-of-experience text when blank/omitted. */
+export const DEFAULT_YEARS_EXPERIENCE = '10+';
+/** Default license statement when blank/omitted. */
+export const DEFAULT_LICENSE = 'Licensed & Insured';
+/** Default insurance statement when blank/omitted. */
+export const DEFAULT_INSURANCE =
+  "Fully insured with general liability and workers' compensation.";
+/** Default payment methods when blank/omitted/empty. */
+export const DEFAULT_PAYMENT_METHODS = [
+  'Cash',
+  'Check',
+  'Credit Card',
+  'Financing Available',
+];
+/** Default 3-row business hours (Mon–Fri / Sat / Sun). */
+export const DEFAULT_HOURS = [
+  { days: 'Monday - Friday', time: '7:00 AM - 6:00 PM' },
+  { days: 'Saturday', time: '8:00 AM - 2:00 PM' },
+  { days: 'Sunday', time: 'Closed' },
+];
+
+/** Canonical `site.json.site_type` values written by new scaffolds. */
+export const SITE_TYPES = /** @type {const} */ (['one-page', 'multipage', 'seo']);
+/** Default website type for NEW CLI scaffolds (all answer paths). */
+export const DEFAULT_SITE_TYPE = /** @type {const} */ ('multipage');
+
+/** Allowed `business.social` keys (blank values omitted, never empty strings). */
+export const SOCIAL_NETWORK_KEYS = [
+  'facebook', 'instagram', 'youtube', 'tiktok', 'google_business', 'linkedin', 'x',
+];
+
 /**
+ * @typedef {'one-page' | 'multipage' | 'seo'} SiteType
+ * @typedef {{ days: string, time: string }} BusinessHourRow
+ * @typedef {{ name: string, url: string, initials?: string, icon?: string, badge_image?: string }} DirectoryRow
+ *
  * @typedef {object} ScaffoldAnswers
  * @property {string} businessName
  * @property {string} legalName
@@ -13,11 +50,205 @@ import { stdin as input, stdout as output } from 'node:process';
  * @property {string} state
  * @property {string} zip
  * @property {string} serviceArea
- * @property {string} foundedYear
+ * @property {string} foundedYear empty string when skipped/blank
+ * @property {string} freeEstimate
+ * @property {string} yearsExperience
+ * @property {string} license
+ * @property {string} insurance
+ * @property {string[]} paymentMethods
+ * @property {BusinessHourRow[]} hours always length 3
+ * @property {Record<string, string>} social non-blank network keys only
+ * @property {DirectoryRow[]} directories empty = none (keep template row + disable)
+ * @property {boolean} enableDirectories true iff directories.length > 0
+ * @property {SiteType} siteType written to site.json.site_type
  * @property {string[]} primaryServices
  * @property {string} [siteUrl]
  */
 
+/**
+ * Trim and fall back when the value is blank-looking.
+ * @param {unknown} value
+ * @param {string} fallback
+ * @returns {string}
+ */
+export function requiredText(value, fallback) {
+  const text = value == null ? '' : String(value).trim();
+  return text || fallback;
+}
+
+/**
+ * Optional text field: trim; blank/whitespace → "".
+ * @param {unknown} value
+ * @returns {string}
+ */
+export function optionalText(value) {
+  if (value == null) return '';
+  return String(value).trim();
+}
+
+/**
+ * CSV string or string[] → trimmed non-empty list; blank/empty → defaults (never []).
+ * @param {unknown} value
+ * @returns {string[]}
+ */
+export function normalizePaymentMethods(value) {
+  /** @type {string[]} */
+  let items = [];
+  if (typeof value === 'string') {
+    items = value
+      .split(',')
+      .map((s) => s.trim())
+      .filter(Boolean);
+  } else if (Array.isArray(value)) {
+    items = value.map((s) => String(s ?? '').trim()).filter(Boolean);
+  }
+  return items.length > 0 ? items : [...DEFAULT_PAYMENT_METHODS];
+}
+
+/**
+ * Normalize hours to the fixed 3-row `{ days, time }` shape.
+ * Accepts full rows, time-only strings, or compact weekday/sat/sun fields via buildAnswers.
+ * Blank/missing rows fall back to defaults — never empty array or partial shape.
+ * @param {unknown} value
+ * @returns {BusinessHourRow[]}
+ */
+export function normalizeHours(value) {
+  const defaults = DEFAULT_HOURS.map((row) => ({ days: row.days, time: row.time }));
+  if (!Array.isArray(value) || value.length === 0) {
+    return defaults;
+  }
+
+  return defaults.map((def, index) => {
+    const raw = value[index];
+    if (raw == null || raw === '') {
+      return { ...def };
+    }
+    if (typeof raw === 'string') {
+      const time = raw.trim();
+      return { days: def.days, time: time || def.time };
+    }
+    if (typeof raw === 'object') {
+      const days =
+        /** @type {{ days?: unknown, time?: unknown }} */ (raw).days != null
+          ? String(/** @type {{ days?: unknown }} */ (raw).days).trim()
+          : '';
+      const time =
+        /** @type {{ time?: unknown }} */ (raw).time != null
+          ? String(/** @type {{ time?: unknown }} */ (raw).time).trim()
+          : '';
+      return {
+        days: days || def.days,
+        time: time || def.time,
+      };
+    }
+    return { ...def };
+  });
+}
+
+/** @param {string} name @returns {string} */
+export function initialsFromName(name) {
+  const parts = String(name || '').trim().split(/\s+/).filter(Boolean);
+  if (parts.length === 0) return '?';
+  if (parts.length === 1) return parts[0].slice(0, 3).toUpperCase();
+  return parts.map((p) => p[0]).join('').slice(0, 3).toUpperCase();
+}
+
+/** Object map or `network=url` CSV → non-blank keys only. @param {unknown} value */
+export function normalizeSocial(value) {
+  /** @type {Record<string, string>} */
+  const out = {};
+  const allowed = new Set(SOCIAL_NETWORK_KEYS);
+  if (value == null || value === '') return out;
+  if (typeof value === 'string') {
+    for (const part of value.split(',')) {
+      const piece = part.trim();
+      const eq = piece.indexOf('=');
+      if (eq <= 0) continue;
+      const key = piece.slice(0, eq).trim().toLowerCase().replace(/-/g, '_');
+      const url = piece.slice(eq + 1).trim();
+      if (allowed.has(key) && url) out[key] = url;
+    }
+    return out;
+  }
+  if (typeof value === 'object' && !Array.isArray(value)) {
+    for (const key of SOCIAL_NETWORK_KEYS) {
+      const raw = /** @type {Record<string, unknown>} */ (value)[key];
+      if (raw == null) continue;
+      const url = String(raw).trim();
+      if (url) out[key] = url;
+    }
+  }
+  return out;
+}
+
+/** Rows or `Name|url` CSV. Empty → [] (replace keeps ≥1 template row). @param {unknown} value */
+export function normalizeDirectories(value) {
+  /** @type {DirectoryRow[]} */
+  const rows = [];
+  if (value == null || value === '') return rows;
+  if (typeof value === 'string') {
+    for (const part of value.split(',')) {
+      const piece = part.trim();
+      const pipe = piece.indexOf('|');
+      if (pipe <= 0) continue;
+      const name = piece.slice(0, pipe).trim();
+      const url = piece.slice(pipe + 1).trim();
+      if (name && url) rows.push({ name, url, initials: initialsFromName(name) });
+    }
+    return rows;
+  }
+  if (!Array.isArray(value)) return rows;
+  for (const item of value) {
+    if (!item || typeof item !== 'object') continue;
+    const rowIn = /** @type {Record<string, unknown>} */ (item);
+    const name = String(rowIn.name ?? '').trim();
+    const url = String(rowIn.url ?? '').trim();
+    if (!name || !url) continue;
+    /** @type {DirectoryRow} */
+    const row = { name, url };
+    const initials = rowIn.initials != null ? String(rowIn.initials).trim() : '';
+    row.initials = initials || initialsFromName(name);
+    if (rowIn.icon != null && String(rowIn.icon).trim()) row.icon = String(rowIn.icon).trim();
+    if (rowIn.badge_image != null && String(rowIn.badge_image).trim()) {
+      row.badge_image = String(rowIn.badge_image).trim();
+    }
+    rows.push(row);
+  }
+  return rows;
+}
+
+/**
+ * Normalize website type to a canonical `site.json.site_type` value.
+ * Accepts canonical values and common human-ish aliases; blank/invalid → multipage.
+ * Always returns only: one-page | multipage | seo (never weakens validate:data).
+ * @param {unknown} value
+ * @returns {SiteType}
+ */
+export function normalizeSiteType(value) {
+  if (value == null) return DEFAULT_SITE_TYPE;
+  const raw = String(value)
+    .trim()
+    .toLowerCase()
+    .replace(/[_]+/g, '-')
+    .replace(/\s+/g, '-');
+  if (!raw) return DEFAULT_SITE_TYPE;
+
+  /** @type {Record<string, SiteType>} */
+  const aliases = {
+    'one-page': 'one-page',
+    onepage: 'one-page',
+    one: 'one-page',
+    single: 'one-page',
+    'single-page': 'one-page',
+    singlepage: 'one-page',
+    multipage: 'multipage',
+    'multi-page': 'multipage',
+    multi: 'multipage',
+    seo: 'seo',
+  };
+  return aliases[raw] || DEFAULT_SITE_TYPE;
+}
+
 /**
  * @param {string} label
  * @param {{ required?: boolean, defaultValue?: string }} [opts]
@@ -31,7 +262,8 @@ async function ask(rl, label, opts = {}) {
     const raw = await rl.question(`${label}${hint}: `);
     const answer = raw.trim();
     if (answer) return answer;
-    if (!required) return defaultValue;
+    if (defaultValue) return defaultValue;
+    if (!required) return '';
     console.log('  This field is required. Please enter a value (or Ctrl+C to abort).');
   }
 }
@@ -59,7 +291,45 @@ export async function collectClientAnswers() {
     const state = await ask(rl, 'State');
     const zip = await ask(rl, 'ZIP');
     const serviceArea = await ask(rl, 'Service area description');
-    const foundedYear = await ask(rl, 'Founded year');
+    const freeEstimate = await ask(rl, 'Free-estimate wording', {
+      defaultValue: DEFAULT_FREE_ESTIMATE,
+    });
+    const yearsExperience = await ask(rl, 'Years of experience', {
+      defaultValue: DEFAULT_YEARS_EXPERIENCE,
+    });
+    const license = await ask(rl, 'License text', {
+      defaultValue: DEFAULT_LICENSE,
+    });
+    const insurance = await ask(rl, 'Insurance statement', {
+      defaultValue: DEFAULT_INSURANCE,
+    });
+    const foundedYear = await ask(rl, 'Founded year (optional)', {
+      required: false,
+      defaultValue: '',
+    });
+    const paymentMethodsRaw = await ask(rl, 'Payment methods (comma-separated)', {
+      defaultValue: DEFAULT_PAYMENT_METHODS.join(', '),
+    });
+    const hoursWeekday = await ask(rl, 'Weekday hours (Mon–Fri)', {
+      defaultValue: DEFAULT_HOURS[0].time,
+    });
+    const hoursSaturday = await ask(rl, 'Saturday hours', {
+      defaultValue: DEFAULT_HOURS[1].time,
+    });
+    const hoursSunday = await ask(rl, 'Sunday hours', {
+      defaultValue: DEFAULT_HOURS[2].time,
+    });
+    const socialRaw = await ask(rl, 'Social links (network=url,…; Enter to skip)', {
+      required: false,
+      defaultValue: '',
+    });
+    const directoriesRaw = await ask(rl, 'Directories (Name|url,…; Enter to skip)', {
+      required: false,
+      defaultValue: '',
+    });
+    const siteTypeRaw = await ask(rl, 'Website type (one-page | multipage | seo)', {
+      defaultValue: DEFAULT_SITE_TYPE,
+    });
     const servicesRaw = await ask(rl, 'Primary services (comma-separated)');
     const siteUrl = await ask(rl, 'Site URL (optional)', {
       required: false,
@@ -75,7 +345,7 @@ export async function collectClientAnswers() {
       throw new Error('At least one primary service is required.');
     }
 
-    return {
+    return buildAnswers({
       businessName,
       legalName,
       tagline,
@@ -86,36 +356,106 @@ export async function collectClientAnswers() {
       state,
       zip,
       serviceArea,
+      freeEstimate,
+      yearsExperience,
+      license,
+      insurance,
       foundedYear,
+      paymentMethods: paymentMethodsRaw,
+      hoursWeekday,
+      hoursSaturday,
+      hoursSunday,
+      social: socialRaw,
+      directories: directoriesRaw,
+      siteType: siteTypeRaw,
       primaryServices,
       siteUrl: siteUrl || undefined,
-    };
+    });
   } finally {
     rl.close();
   }
 }
 
 /**
- * Non-interactive answers helper for scripted verification.
+ * All answer paths funnel here. Hours: full rows or compact weekday/sat/sun.
+ * Social: object or `network=url` CSV. Directories: rows or `Name|url` CSV.
+ * siteType: canonical or human-ish → one-page | multipage | seo (default multipage).
  *
- * @param {Partial<ScaffoldAnswers> & { businessName: string, primaryServices: string[] }} overrides
+ * @param {Partial<ScaffoldAnswers> & {
+ *   businessName: string,
+ *   primaryServices: string[],
+ *   paymentMethods?: string | string[],
+ *   hoursWeekday?: string,
+ *   hoursSaturday?: string,
+ *   hoursSunday?: string,
+ *   social?: string | Record<string, string>,
+ *   directories?: string | DirectoryRow[],
+ *   siteType?: string,
+ * }} overrides
  * @returns {ScaffoldAnswers}
  */
 export function buildAnswers(overrides) {
-  const businessName = overrides.businessName;
+  const businessName = requiredText(overrides.businessName, '');
+  if (!businessName) throw new Error('businessName is required');
+
+  const primaryServices = (overrides.primaryServices || [])
+    .map((s) => String(s || '').trim())
+    .filter(Boolean);
+  if (primaryServices.length === 0) {
+    throw new Error('primaryServices must include at least one service');
+  }
+
+  const hasCompactHours =
+    overrides.hoursWeekday != null ||
+    overrides.hoursSaturday != null ||
+    overrides.hoursSunday != null;
+  /** @type {unknown} */
+  let hoursInput = overrides.hours;
+  if (
+    hasCompactHours &&
+    (hoursInput == null || (Array.isArray(hoursInput) && hoursInput.length === 0))
+  ) {
+    hoursInput = [overrides.hoursWeekday, overrides.hoursSaturday, overrides.hoursSunday];
+  }
+
+  const social = normalizeSocial(/** @type {{ social?: unknown }} */ (overrides).social);
+  const directories = normalizeDirectories(
+    /** @type {{ directories?: unknown }} */ (overrides).directories,
+  );
+  // Derived from rows only: directories:[] + enableDirectories:true → false.
+  const enableDirectories = directories.length > 0;
+  const siteType = normalizeSiteType(
+    /** @type {{ siteType?: unknown }} */ (overrides).siteType,
+  );
+
   return {
     businessName,
-    legalName: overrides.legalName ?? `${businessName} LLC`,
-    tagline: overrides.tagline ?? `Quality work from ${businessName}.`,
-    phone: overrides.phone ?? '(555) 555-0100',
-    email: overrides.email ?? 'hello@example.com',
-    street: overrides.street ?? '123 Main St',
-    city: overrides.city ?? 'Example City',
-    state: overrides.state ?? 'VA',
-    zip: overrides.zip ?? '00000',
-    serviceArea: overrides.serviceArea ?? `${overrides.city ?? 'Example City'} and surrounding areas`,
-    foundedYear: overrides.foundedYear ?? '2020',
-    primaryServices: overrides.primaryServices,
-    siteUrl: overrides.siteUrl,
+    legalName: requiredText(overrides.legalName, `${businessName} LLC`),
+    tagline: requiredText(overrides.tagline, `Quality work from ${businessName}.`),
+    phone: requiredText(overrides.phone, '(555) 555-0100'),
+    email: requiredText(overrides.email, 'hello@example.com'),
+    street: requiredText(overrides.street, '123 Main St'),
+    city: requiredText(overrides.city, 'Example City'),
+    state: requiredText(overrides.state, 'VA'),
+    zip: requiredText(overrides.zip, '00000'),
+    serviceArea: requiredText(
+      overrides.serviceArea,
+      `${requiredText(overrides.city, 'Example City')} and surrounding areas`,
+    ),
+    freeEstimate: requiredText(overrides.freeEstimate, DEFAULT_FREE_ESTIMATE),
+    yearsExperience: requiredText(overrides.yearsExperience, DEFAULT_YEARS_EXPERIENCE),
+    license: requiredText(overrides.license, DEFAULT_LICENSE),
+    insurance: requiredText(overrides.insurance, DEFAULT_INSURANCE),
+    foundedYear: optionalText(overrides.foundedYear),
+    paymentMethods: normalizePaymentMethods(
+      /** @type {{ paymentMethods?: unknown }} */ (overrides).paymentMethods,
+    ),
+    hours: normalizeHours(hoursInput),
+    social,
+    directories,
+    enableDirectories,
+    siteType,
+    primaryServices,
+    siteUrl: overrides.siteUrl ? String(overrides.siteUrl).trim() || undefined : undefined,
   };
 }

package/src/replace-data.mjs

@@ -373,7 +373,19 @@ export function replaceTargetData(targetDir, answers) {
       full: fullAddress,
     };
     business.service_area = answers.serviceArea;
+    business.free_estimate = answers.freeEstimate;
+    business.years_experience = answers.yearsExperience;
+    business.license = answers.license;
+    business.insurance = answers.insurance;
+    // Optional: always preserve key; skipped/blank → ""
     business.founded_year = answers.foundedYear;
+    // Always write non-empty arrays from buildAnswers (never [] / never skip).
+    business.payment_methods = answers.paymentMethods.map((m) => String(m));
+    business.hours = answers.hours.map((row) => ({
+      days: String(row.days),
+      time: String(row.time),
+    }));
+    business.social = { ...(answers.social || {}) }; // non-blank keys only
     business.type_of_services = typeOfServices;
 
     if (aligned) {
@@ -385,15 +397,42 @@ export function replaceTargetData(targetDir, answers) {
     if (answers.siteUrl) {
       site.url = answers.siteUrl.replace(/\/$/, '');
     }
-    site.logo = {
-      ...site.logo,
-      alt: answers.businessName,
-    };
+    // New scaffolds always write canonical site_type (default multipage via buildAnswers).
+    site.site_type = answers.siteType;
+    site.logo = { ...site.logo, alt: answers.businessName };
     site.seo = {
       ...site.seo,
       default_title: `${answers.businessName} | ${answers.city}, ${answers.state}`,
       default_description: `${answers.tagline} Serving ${answers.serviceArea}.`,
     };
+    site.features = {
+      ...site.features,
+      enable_directories: Boolean(answers.enableDirectories),
+    };
+  });
+
+  updateJsonFile(path.join(dataDir, 'directories.json'), (directoriesData) => {
+    const provided = Array.isArray(answers.directories) ? answers.directories : [];
+    if (provided.length > 0) {
+      directoriesData.directories = provided.map((row) => {
+        /** @type {Record<string, unknown>} */
+        const out = { name: String(row.name), url: String(row.url) };
+        if (row.initials) out.initials = String(row.initials);
+        if (row.icon) out.icon = String(row.icon);
+        if (row.badge_image) out.badge_image = String(row.badge_image);
+        return out;
+      });
+      return;
+    }
+    // none: keep existing rows; never write directories: []
+    const existing = Array.isArray(directoriesData.directories)
+      ? directoriesData.directories
+      : [];
+    if (existing.length === 0) {
+      directoriesData.directories = [
+        { name: 'Google Business', url: 'https://example.com/business', initials: 'G' },
+      ];
+    }
   });
 
   updateJsonFile(path.join(dataDir, 'areas.json'), (areas) => {