fimo-vite 2.4.1 → 2.5.0-staging.2

package/dist/plugins/data-id.js

@@ -1,4 +1,5 @@
 import { createFilter } from '@rollup/pluginutils';
+import { FIMO_EDITING_ATTRIBUTES, resolveFimoEditingMetadata } from 'fimo/preview';
 import { getLineColumn } from 'fimo/vite/data-id';
 import { parseSync } from 'oxc-parser';
 export default function dataIdPlugin() {
@@ -10,7 +11,11 @@ export default function dataIdPlugin() {
             config = resolvedConfig;
         },
         async transform(code, id) {
-            if (config?.command === 'build') {
+            const configured = config?.define?.['process.env.FIMO_EDITING_METADATA'];
+            const editing = configured === undefined
+                ? resolveFimoEditingMetadata(config?.command === 'serve' && !config.isProduction ? 'development' : undefined, process.env.FIMO_EDITING_METADATA)
+                : configured === JSON.stringify('true');
+            if (!editing && !code.includes('data-fimo-')) {
                 return null;
             }
             const filter = createFilter(/\.(jsx|tsx)$/);
@@ -28,12 +33,22 @@ export default function dataIdPlugin() {
                     if (!node || typeof node !== 'object') {
                         return;
                     }
+                    if (!editing && node.type === 'JSXAttribute' && FIMO_EDITING_ATTRIBUTES.has(node.name?.name)) {
+                        return;
+                    }
                     if (node.type === 'JSXOpeningElement') {
                         const attributes = node.attributes || [];
+                        if (!editing) {
+                            for (const attr of attributes) {
+                                if (attr.type === 'JSXAttribute' && FIMO_EDITING_ATTRIBUTES.has(attr.name?.name)) {
+                                    insertions.push({ offset: attr.start, end: attr.end, value: '' });
+                                }
+                            }
+                        }
                         const hasId = attributes.some((attr) => attr.type === 'JSXAttribute' &&
                             attr.name?.type === 'JSXIdentifier' &&
                             attr.name?.name === 'data-fimo-id');
-                        if (!hasId && node.start != null) {
+                        if (editing && !hasId && node.start != null) {
                             const line = getLineColumn(code, node.start);
                             const relativePath = id.replace(process.cwd() + '/', '');
                             const fimoId = `${relativePath}#${line.line}-${line.column}`;
@@ -66,7 +81,10 @@ export default function dataIdPlugin() {
                 insertions.sort((a, b) => b.offset - a.offset);
                 let transformed = code;
                 for (const insertion of insertions) {
-                    transformed = transformed.slice(0, insertion.offset) + insertion.value + transformed.slice(insertion.offset);
+                    transformed =
+                        transformed.slice(0, insertion.offset) +
+                            insertion.value +
+                            transformed.slice(insertion.end ?? insertion.offset);
                 }
                 return {
                     code: transformed,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo-vite",
-  "version": "2.4.1",
+  "version": "2.5.0-staging.2",
   "description": "Framework-neutral Fimo Vite plugin. Pairs with the fimo package at the same version.",
   "files": [
     "dist/",
@@ -31,15 +31,15 @@
     "oxc-parser": "^0.118.0"
   },
   "devDependencies": {
-    "@fimo/tsconfig": "2.4.1",
+    "@fimo/tsconfig": "2.5.0-staging.2",
     "@types/node": "22.18.6",
-    "fimo": "2.4.1",
+    "fimo": "2.5.0-staging.2",
     "typescript": "7.0.2",
     "vite": "8.2.2",
     "vitest": "5.0.0"
   },
   "peerDependencies": {
-    "fimo": ">=2.0.1",
+    "fimo": "2.5.0-staging.2",
     "vite": "^7.0.0 || ^8.0.0"
   },
   "engines": {