fimo 0.9.0-experimental.1 → 0.9.0-experimental.11

package/dist/scripts/scan-wrappable.js

@@ -118,6 +118,36 @@ const WRAPPABLE_ATTRIBUTES = new Set(['placeholder', 'title', 'aria-label']);
 const FILE_LINK_PATTERN = /\.(pdf|zip|docx?|xlsx?|pptx?|csv|mp4|mov|webm)$/i;
 const SKIP_DIRS = new Set(['node_modules', '.next', '.git', 'dist', 'build', '.fimo']);
 const MIN_TEXT_LENGTH = 3;
+/**
+ * Prose containers whose children mix raw text with inline elements or
+ * expressions. Wrapping such text node-by-node produces FRAGMENT labels
+ * (", and agencies building…") that nobody can find or edit as a sentence —
+ * the whole block merges into ONE `formatted-text` item instead (agent work:
+ * the fimo`` tagged template or RichText, never the auto-wrap codemod).
+ */
+const PROSE_TAGS = new Set([
+    'p',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'li',
+    'blockquote',
+    'figcaption',
+    'dt',
+    'dd',
+    'label',
+    'legend',
+    'td',
+    'th',
+    'caption',
+    'summary',
+]);
+function meaningfulLength(text) {
+    return text.replace(/[^\p{L}\p{N}]/gu, '').length;
+}
 const PREVIEW_LENGTH = 60;
 function toPreview(value) {
     const collapsed = value.replace(/\s+/g, ' ').trim();
@@ -212,7 +242,7 @@ function extractTemplate(ext, code) {
 }
 function scanTemplateFile(ext, code, relPath) {
     const items = [];
-    const wrappedIds = { labels: [], media: [], richText: [], files: [] };
+    const wrappedIds = { labels: [], media: [], richText: [], files: [], ordered: [] };
     let wrapped = 0;
     const { template, offset, frontmatter } = extractTemplate(ext, code);
     // t('key', ...) in frontmatter/script and in template expressions = wrapped.
@@ -220,6 +250,7 @@ function scanTemplateFile(ext, code, relPath) {
         for (const match of source.matchAll(/\bt\(\s*['"]([^'"]+)['"]/g)) {
             wrapped += 1;
             wrappedIds.labels.push(match[1]);
+            wrappedIds.ordered.push(match[1]);
         }
     }
     // data-fimo-source attributes = wrapped media/labels rendered via attrs.
@@ -444,7 +475,7 @@ export function scanWrappableFile(filePath, code, relPath, opts = {}) {
     const items = [];
     let wrapped = 0;
     let foreignI18n = 0;
-    const wrappedIds = { labels: [], media: [], richText: [], files: [] };
+    const wrappedIds = { labels: [], media: [], richText: [], files: [], ordered: [] };
     const collections = [];
     const templateExt = filePath.match(/\.(astro|vue|svelte)$/)?.[1];
     if (templateExt) {
@@ -465,6 +496,50 @@ export function scanWrappableFile(filePath, code, relPath, opts = {}) {
     function detectCollection(declarator) {
         detectCollectionFromDeclarator(declarator, code, 0, relPath, collections);
     }
+    // Text nodes absorbed into a merged formatted-text item (keyed by offset) —
+    // the JSXText visitor skips them so fragments never become labels.
+    const mergedText = new Set();
+    function containsWrappedContent(node) {
+        if (!node || typeof node !== 'object') {
+            return false;
+        }
+        if (node.type === 'CallExpression' && node.callee?.type === 'Identifier' && node.callee.name === 't') {
+            return true;
+        }
+        if (node.type === 'TaggedTemplateExpression' && node.tag?.type === 'Identifier' && node.tag.name === 'fimo') {
+            return true;
+        }
+        if (node.type === 'JSXElement') {
+            const name = jsxElementName(node);
+            if (name && WRAPPING_COMPONENTS.has(name)) {
+                return true;
+            }
+        }
+        for (const key of Object.keys(node)) {
+            const child = node[key];
+            if (Array.isArray(child)) {
+                if (child.some((item) => containsWrappedContent(item))) {
+                    return true;
+                }
+            }
+            else if (typeof child === 'object' && child !== null && containsWrappedContent(child)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /** Every JSXText inside a prose element, recursing through inline children
+     *  (inside a `<p>`, nested elements are inline by HTML rules). */
+    function collectProseTextNodes(node, out) {
+        for (const child of node.children ?? []) {
+            if (child.type === 'JSXText') {
+                out.push(child);
+            }
+            else if (child.type === 'JSXElement') {
+                collectProseTextNodes(child, out);
+            }
+        }
+    }
     function visit(node, insideWrapped, parentTag, scopes) {
         if (!node || typeof node !== 'object') {
             return;
@@ -486,6 +561,7 @@ export function scanWrappableFile(filePath, code, relPath, opts = {}) {
                 const id = attributeValue(node, 'id');
                 if (kind && id) {
                     wrappedIds[kind].push(id.value);
+                    wrappedIds.ordered.push(id.value);
                 }
             }
             if (!insideWrapped && name) {
@@ -548,7 +624,43 @@ export function scanWrappableFile(filePath, code, relPath, opts = {}) {
                 }
             }
         }
-        if (node.type === 'JSXText' && !insideWrapped) {
+        // Mixed prose detection runs on the ELEMENT (before its children are
+        // visited): a prose tag whose direct children interleave raw text with
+        // inline elements/expressions becomes ONE formatted-text item, and its
+        // text nodes are recorded so the JSXText visitor below skips them.
+        if (node.type === 'JSXElement' && !insideWrapped) {
+            const proseName = jsxElementName(node);
+            if (proseName && PROSE_TAGS.has(proseName)) {
+                const children = node.children ?? [];
+                const directText = children.filter((child) => child.type === 'JSXText' && meaningfulLength(String(child.value ?? '')) > 0);
+                const inline = children.filter((child) => child.type === 'JSXElement' ||
+                    (child.type === 'JSXExpressionContainer' && child.expression?.type !== 'JSXEmptyExpression'));
+                if (directText.length > 0 &&
+                    inline.length > 0 &&
+                    !directText.some((child) => mergedText.has(child.start)) &&
+                    !children.some((child) => containsWrappedContent(child))) {
+                    const textNodes = [];
+                    collectProseTextNodes(node, textNodes);
+                    const combined = textNodes.map((textNode) => String(textNode.value ?? '')).join(' ');
+                    if (meaningfulLength(combined) >= MIN_TEXT_LENGTH) {
+                        for (const textNode of textNodes) {
+                            if (typeof textNode.start === 'number') {
+                                mergedText.add(textNode.start);
+                            }
+                        }
+                        const inner = code.slice(node.openingElement?.end ?? node.start ?? 0, node.closingElement?.start ?? node.end ?? 0);
+                        items.push({
+                            kind: 'formatted-text',
+                            file: relPath,
+                            line: lineOf(code, node.start ?? 0),
+                            preview: toPreview(inner),
+                            span: { start: node.start, end: node.end, parentTag: proseName },
+                        });
+                    }
+                }
+            }
+        }
+        if (node.type === 'JSXText' && !insideWrapped && !mergedText.has(node.start)) {
             const text = String(node.value ?? '');
             const meaningful = text.replace(/[^\p{L}\p{N}]/gu, '');
             if (meaningful.length >= MIN_TEXT_LENGTH) {
@@ -584,6 +696,7 @@ export function scanWrappableFile(filePath, code, relPath, opts = {}) {
                     const resolved = resolveScopedKey(node.callee.name, firstArg.value, childScopes);
                     if (!resolved.unresolvable) {
                         wrappedIds.labels.push(resolved.key);
+                        wrappedIds.ordered.push(resolved.key);
                     }
                 }
             }
@@ -1066,6 +1179,8 @@ export function scanWrappable(rootDir, opts = {}) {
         richText: new Set(),
         files: new Set(),
     };
+    const orderedIds = [];
+    const orderedSeen = new Set();
     for (const file of files) {
         let code;
         try {
@@ -1086,6 +1201,12 @@ export function scanWrappable(rootDir, opts = {}) {
                 idSets[kind].add(id);
             }
         }
+        for (const id of result.wrappedIds.ordered) {
+            if (!orderedSeen.has(id)) {
+                orderedSeen.add(id);
+                orderedIds.push(id);
+            }
+        }
     }
     const dataFiles = [];
     // Markdown/MDX documents: group per directory so a 40-post blog is ONE
@@ -1227,6 +1348,8 @@ export function scanWrappable(rootDir, opts = {}) {
             media: [...idSets.media].sort(),
             richText: [...idSets.richText].sort(),
             files: [...idSets.files].sort(),
+            // Encounter order, never sorted — the on-page reading order.
+            ordered: orderedIds,
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo",
-  "version": "0.9.0-experimental.1",
+  "version": "0.9.0-experimental.11",
   "description": "Fimo CLI - create, deploy, and manage Fimo projects",
   "bin": {
     "fimo": "dist/cli/index.js"
@@ -58,6 +58,10 @@
       "types": "./dist/runtime/strapi/index.d.ts",
       "import": "./dist/runtime/strapi/index.js"
     },
+    "./seo": {
+      "types": "./dist/runtime/seo/neutral.d.ts",
+      "import": "./dist/runtime/seo/neutral.js"
+    },
     "./remix": {
       "types": "./dist/runtime/remix/index.d.ts",
       "import": "./dist/runtime/remix/index.js"

package/templates/react-router/package.json

@@ -21,7 +21,7 @@
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "embla-carousel-react": "^8.6.0",
-    "fimo": "0.9.0-experimental.1",
+    "fimo": "0.9.0-experimental.11",
     "input-otp": "^1.4.2",
     "isbot": "^5",
     "lucide-react": "^0.577.0",

package/templates/react-router/translations/en.json

@@ -0,0 +1 @@
+{}