multisite-cms-mcp 1.3.0 → 1.5.0

package/dist/tools/get-example.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-example.d.ts","sourceRoot":"","sources":["../../src/tools/get-example.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GACZ,gBAAgB,GAChB,uBAAuB,GACvB,0BAA0B,GAC1B,qBAAqB,GACrB,oBAAoB,GACpB,eAAe,GACf,oBAAoB,GACpB,kBAAkB,GAClB,wBAAwB,GACxB,4BAA4B,GAC5B,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,gBAAgB,GAChB,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,qBAAqB,GACrB,eAAe,CAAC;AAmgCpB;;GAEG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAE1E"}
+{"version":3,"file":"get-example.d.ts","sourceRoot":"","sources":["../../src/tools/get-example.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GACZ,gBAAgB,GAChB,uBAAuB,GACvB,0BAA0B,GAC1B,qBAAqB,GACrB,oBAAoB,GACpB,eAAe,GACf,oBAAoB,GACpB,kBAAkB,GAClB,wBAAwB,GACxB,4BAA4B,GAC5B,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,gBAAgB,GAChB,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,qBAAqB,GACrB,eAAe,CAAC;AAiiCpB;;GAEG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAE1E"}

package/dist/tools/get-example.js

@@ -458,10 +458,10 @@ For any user-defined collection. All collections have built-in \`name\`, \`slug\
 \`\`\``,
     form_handling: `# Form Handling
 
-Forms are automatically captured by the CMS:
+Forms are automatically captured by the CMS using the \`data-form\` attribute:
 
 \`\`\`html
-<form data-form-name="contact" class="contact-form">
+<form data-form="contact" class="contact-form">
   <div class="form-group">
     <label for="name">Name</label>
     <input type="text" name="name" id="name" required>
@@ -483,34 +483,64 @@ Forms are automatically captured by the CMS:
 
 ## Form Handler Script
 
+Add this script to handle form submissions:
+
 \`\`\`javascript
-document.querySelectorAll('form[data-form-name]').forEach(form => {
+// Handle all forms with data-form attribute
+document.querySelectorAll('form[data-form]').forEach(form => {
   form.addEventListener('submit', async (e) => {
     e.preventDefault();
     
-    const formName = form.dataset.formName || 'general';
-    const formData = new FormData(form);
-    const data = Object.fromEntries(formData);
+    const submitBtn = form.querySelector('button[type="submit"]');
+    const originalText = submitBtn?.textContent || 'Submit';
     
-    // IMPORTANT: Endpoint is /_forms/{formName}
-    const response = await fetch('/_forms/' + formName, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(data)
-    });
+    if (submitBtn) {
+      submitBtn.disabled = true;
+      submitBtn.textContent = 'Sending...';
+    }
     
-    if (response.ok) {
-      form.reset();
-      alert(form.dataset.successMessage || 'Thank you!');
+    try {
+      const formName = form.dataset.form || 'general';
+      const formData = new FormData(form);
+      const data = Object.fromEntries(formData);
+      
+      // Endpoint is /_forms/{formName}
+      const response = await fetch('/_forms/' + formName, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(data)
+      });
+      
+      if (response.ok) {
+        // Option 1: Redirect to thank you page
+        // window.location.href = '/thank-you';
+        
+        // Option 2: Show success message
+        form.reset();
+        alert(form.dataset.successMessage || 'Thank you! Your message has been sent.');
+      } else {
+        throw new Error('Form submission failed');
+      }
+    } catch (error) {
+      console.error('Form error:', error);
+      alert('There was an error. Please try again.');
+    } finally {
+      if (submitBtn) {
+        submitBtn.disabled = false;
+        submitBtn.textContent = originalText;
+      }
     }
   });
 });
 \`\`\`
 
 **Key points:**
-- Add \`data-form-name="xxx"\` to identify the form
-- Endpoint is \`/_forms/{formName}\` (NOT \`/api/forms/submit\`)
-- All \`name\` attributes are captured as fields`,
+- Add \`data-form="formname"\` to identify the form (e.g., \`data-form="contact"\`)
+- Endpoint is \`/_forms/{formName}\` (e.g., \`/_forms/contact\`)
+- All inputs must have \`name\` attributes to be captured
+- Add a submit button for the form to work
+
+**Note:** The legacy \`data-form-name\` attribute is deprecated. Use \`data-form\` instead.`,
     asset_paths: `# Asset Path Rules
 
 **ALL asset paths must use /public/ prefix:**

package/dist/tools/validate-manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-manifest.d.ts","sourceRoot":"","sources":["../../src/tools/validate-manifest.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkO5E"}
+{"version":3,"file":"validate-manifest.d.ts","sourceRoot":"","sources":["../../src/tools/validate-manifest.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA2N5E"}

package/dist/tools/validate-manifest.js

@@ -116,37 +116,34 @@ Tip: Use a JSON validator (like jsonlint.com) to find the exact error location.`
             }
         }
     }
-    // Check cmsTemplates
+    // Check cmsTemplates - enforce strict pattern-based validation
     const templates = m.cmsTemplates;
     const customCollections = new Set();
     if (templates) {
-        // Detect and validate collection templates (flat format)
-        // Pattern: {slug}Index, {slug}Detail, {slug}IndexPath, {slug}DetailPath
-        const allKeys = Object.keys(templates);
-        for (const key of allKeys) {
-            // Skip deprecated keys
-            if (['collectionPaths', 'collectionTemplates'].includes(key)) {
+        // All keys must match the unified format: {slug}Index, {slug}Detail, {slug}IndexPath, {slug}DetailPath
+        const VALID_KEY_PATTERN = /^[a-z][a-zA-Z0-9]*(Index|Detail|IndexPath|DetailPath)$/;
+        const KEY_PARTS_PATTERN = /^([a-z][a-zA-Z0-9]*)(Index|Detail|IndexPath|DetailPath)$/;
+        for (const key of Object.keys(templates)) {
+            if (!VALID_KEY_PATTERN.test(key)) {
+                // Provide helpful error message with suggestion
+                let suggestion = '';
+                if (key.toLowerCase().includes('post')) {
+                    suggestion = ` Did you mean "${key.replace(/[Pp]ost/g, 'Detail')}"?`;
+                }
+                else if (!key.includes('Index') && !key.includes('Detail')) {
+                    suggestion = ` Did you mean "${key}Index" or "${key}Detail"?`;
+                }
+                errors.push(`- Invalid cmsTemplates key "${key}". ` +
+                    `All keys must use format: {slug}Index, {slug}Detail, {slug}IndexPath, or {slug}DetailPath.${suggestion}`);
                 continue;
             }
-            // Extract collection slug from key pattern
-            let slug = null;
-            if (key.endsWith('Index') && !key.endsWith('IndexPath')) {
-                slug = key.slice(0, -5); // Remove 'Index'
-            }
-            else if (key.endsWith('Detail') && !key.endsWith('DetailPath')) {
-                slug = key.slice(0, -6); // Remove 'Detail'
-            }
-            else if (key.endsWith('IndexPath')) {
-                slug = key.slice(0, -9); // Remove 'IndexPath'
-            }
-            else if (key.endsWith('DetailPath')) {
-                slug = key.slice(0, -10); // Remove 'DetailPath'
-            }
-            if (slug && slug.length > 0) {
-                customCollections.add(slug);
+            // Extract collection slug from valid keys
+            const match = key.match(KEY_PARTS_PATTERN);
+            if (match) {
+                customCollections.add(match[1]);
             }
         }
-        // Validate each collection
+        // Validate each detected collection
         for (const slug of customCollections) {
             const indexTemplate = templates[`${slug}Index`];
             const detailTemplate = templates[`${slug}Detail`];
@@ -183,12 +180,6 @@ Tip: Use a JSON validator (like jsonlint.com) to find the exact error location.`
             if (detailPath && !detailTemplate) {
                 warnings.push(`- Collection "${slug}": has ${slug}DetailPath but no ${slug}Detail template`);
             }
-            // Note: indexPath and detailPath can be the same (e.g., both "/videos")
-            // The system distinguishes by whether a slug segment exists after the path
-        }
-        // Warn about deprecated collectionTemplates format
-        if (templates.collectionTemplates) {
-            warnings.push('- cmsTemplates.collectionTemplates: This nested format is deprecated. Use flat format instead: {slug}Index, {slug}Detail, {slug}IndexPath, {slug}DetailPath');
         }
     }
     // Build result

package/dist/tools/validate-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-template.d.ts","sourceRoot":"","sources":["../../src/tools/validate-template.ts"],"names":[],"mappings":"AAMA,KAAK,YAAY,GAAG,cAAc,GAAG,eAAe,GAAG,aAAa,CAAC;AAmJrE;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAoXjB"}
+{"version":3,"file":"validate-template.d.ts","sourceRoot":"","sources":["../../src/tools/validate-template.ts"],"names":[],"mappings":"AAMA,KAAK,YAAY,GAAG,cAAc,GAAG,eAAe,GAAG,aAAa,CAAC;AAgRrE;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAqbjB"}

package/dist/tools/validate-template.js

@@ -97,6 +97,111 @@ function getRichTextFields(collectionSlug, schema) {
         return [];
     return collection.fields.filter(f => f.type === 'richText').map(f => f.slug);
 }
+/**
+ * Validate forms in HTML templates
+ * Checks for proper data-form attribute, input names, and submit buttons
+ */
+function validateForms(html) {
+    const errors = [];
+    const warnings = [];
+    const suggestions = [];
+    // Find all form elements
+    const formPattern = /<form[^>]*>/gi;
+    const forms = html.match(formPattern) || [];
+    if (forms.length === 0) {
+        return { errors, warnings, suggestions };
+    }
+    // Track forms for validation
+    let formsWithDataForm = 0;
+    let formsWithLegacyAttr = 0;
+    for (const formTag of forms) {
+        // Check for data-form attribute (correct format)
+        const hasDataForm = /data-form=["'][^"']+["']/i.test(formTag);
+        // Check for legacy data-form-name attribute
+        const hasLegacyDataFormName = /data-form-name=["'][^"']+["']/i.test(formTag);
+        if (hasDataForm) {
+            formsWithDataForm++;
+        }
+        else if (hasLegacyDataFormName) {
+            formsWithLegacyAttr++;
+            warnings.push(`- Form uses deprecated data-form-name attribute. Migrate to data-form="formname" for consistency.`);
+        }
+        else {
+            // Form without any data-form attribute - check if it looks like a CMS form
+            // Don't error on forms that might be external (like search forms)
+            if (!formTag.includes('action=')) {
+                errors.push(`- Form is missing data-form attribute. Add data-form="formname" to identify the form for CMS submission.`);
+            }
+        }
+    }
+    // Extract form content for deeper validation
+    // Find each form block
+    const formBlocks = html.match(/<form[^>]*data-form[^>]*>[\s\S]*?<\/form>/gi) || [];
+    for (const formBlock of formBlocks) {
+        // Check for inputs with name attributes
+        const inputs = formBlock.match(/<input[^>]*>/gi) || [];
+        const textareas = formBlock.match(/<textarea[^>]*>/gi) || [];
+        const selects = formBlock.match(/<select[^>]*>/gi) || [];
+        const allInputElements = [...inputs, ...textareas, ...selects];
+        let inputsWithName = 0;
+        let inputsWithoutName = 0;
+        for (const input of allInputElements) {
+            // Skip hidden inputs and submit buttons
+            if (/type=["'](?:submit|button|hidden)["']/i.test(input)) {
+                continue;
+            }
+            if (/name=["'][^"']+["']/i.test(input)) {
+                inputsWithName++;
+            }
+            else {
+                inputsWithoutName++;
+            }
+        }
+        if (inputsWithoutName > 0) {
+            errors.push(`- Found ${inputsWithoutName} form input(s) without name attribute. All inputs must have name="fieldname" to be captured.`);
+        }
+        if (inputsWithName === 0 && allInputElements.length > 0) {
+            errors.push(`- Form has no inputs with name attributes - no data will be captured.`);
+        }
+        // Check for submit button
+        const hasSubmitButton = /<button[^>]*type=["']submit["'][^>]*>/i.test(formBlock) ||
+            /<input[^>]*type=["']submit["'][^>]*>/i.test(formBlock) ||
+            /<button[^>]*>(?!.*type=["']button["'])/i.test(formBlock); // button without type defaults to submit
+        if (!hasSubmitButton) {
+            warnings.push(`- Form may be missing a submit button. Add <button type="submit">Submit</button> for the form to work.`);
+        }
+        // Check for form handler script
+        const hasFormHandlerScript = html.includes("form[data-form]") || html.includes("form[data-form-name]");
+        if (!hasFormHandlerScript) {
+            suggestions.push(`- No form handler script detected. Make sure to include JavaScript that handles form submission to /_forms/{formName}`);
+        }
+    }
+    // Summary suggestion
+    if (formsWithDataForm > 0) {
+        suggestions.push(`- Found ${formsWithDataForm} form(s) with data-form attribute - forms will submit to /_forms/{formName}`);
+    }
+    // Check for thank-you page redirect pattern
+    const hasThankYouRedirect = /window\.location\.href\s*=\s*['"]\/thank-you['"]/i.test(html) ||
+        /window\.location\s*=\s*['"]\/thank-you['"]/i.test(html);
+    if (formsWithDataForm > 0 && !hasThankYouRedirect) {
+        suggestions.push(`- Consider adding a /thank-you page and redirecting there on successful submission for better UX`);
+    }
+    return { errors, warnings, suggestions };
+}
+/**
+ * Extract collection slugs referenced in {{#each}} loops on static pages
+ */
+function extractCollectionReferences(html) {
+    const collections = [];
+    const eachLoops = html.match(/\{\{#each\s+(\w+)[^}]*\}\}/g) || [];
+    for (const loop of eachLoops) {
+        const match = loop.match(/\{\{#each\s+(\w+)/);
+        if (match) {
+            collections.push(match[1]);
+        }
+    }
+    return [...new Set(collections)]; // Unique collections
+}
 /**
  * Validates an HTML template for correct CMS token usage
  *
@@ -204,6 +309,11 @@ async function validateTemplate(html, templateType, collectionSlug, projectId) {
             }
         }
     }
+    // ============ Form Validation ============
+    const formValidation = validateForms(html);
+    errors.push(...formValidation.errors);
+    warnings.push(...formValidation.warnings);
+    suggestions.push(...formValidation.suggestions);
     // Validate site tokens
     const siteTokens = html.match(/\{\{site\.(\w+)\}\}/g) || [];
     for (const token of siteTokens) {
@@ -253,6 +363,60 @@ async function validateTemplate(html, templateType, collectionSlug, projectId) {
         if (resolved) {
             const schema = await fetchTenantSchema(resolved.tenantId);
             if (schema) {
+                // For static pages, validate any collection references in {{#each}} loops
+                if (templateType === 'static_page') {
+                    const referencedCollections = extractCollectionReferences(html);
+                    if (referencedCollections.length > 0) {
+                        suggestions.push(`- Found ${referencedCollections.length} collection reference(s) in static page: ${referencedCollections.join(', ')}`);
+                        // Check each referenced collection exists
+                        const missingCollections = [];
+                        const existingCollections = [];
+                        for (const collSlug of referencedCollections) {
+                            const exists = schema.collections.some(c => c.slug === collSlug);
+                            if (exists) {
+                                existingCollections.push(collSlug);
+                            }
+                            else {
+                                missingCollections.push(collSlug);
+                            }
+                        }
+                        if (missingCollections.length > 0) {
+                            schemaValidation += `
+
+## ACTION REQUIRED: Missing Collections
+
+The following collections are referenced in this static page but **do not exist**:
+
+${missingCollections.map(c => `- \`${c}\``).join('\n')}
+
+You must create these collections using \`sync_schema\` before deployment.
+
+**Example:**
+\`\`\`json
+{
+  "projectId": "${resolved.tenantId}",
+  "collections": [
+${missingCollections.map(c => `    {
+      "slug": "${c}",
+      "name": "${c.charAt(0).toUpperCase() + c.slice(1)}",
+      "nameSingular": "${c.endsWith('s') ? c.slice(0, -1).charAt(0).toUpperCase() + c.slice(0, -1).slice(1) : c}",
+      "fields": []
+    }`).join(',\n')}
+  ]
+}
+\`\`\`
+`;
+                        }
+                        if (existingCollections.length > 0) {
+                            schemaValidation += `
+
+## Static Page Collection References Validated
+
+The following collections exist and can be used: ${existingCollections.map(c => `\`${c}\``).join(', ')}
+`;
+                        }
+                    }
+                }
                 const targetCollection = collectionSlug || '';
                 if (targetCollection && templateType !== 'static_page') {
                     // Get richText fields for triple brace validation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multisite-cms-mcp",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "MCP server for Fast Mode CMS. Convert websites, validate packages, and deploy directly to Fast Mode. Includes authentication, project creation, schema sync, and one-click deployment.",
   "main": "dist/index.js",
   "bin": {