@deneb-ui/cli 2.0.29 → 2.0.31

package/bin/index.js

@@ -732,12 +732,12 @@ function initProject(targetInput, options = {}) {
   // 6. Install DENEB packages if missing
   const skipInstall = process.argv.includes('--skip-install');
   const hasUi = Boolean(
-    (pkg.dependencies && (pkg.dependencies['@deneb-ui/ui'] || pkg.dependencies['@deneb/ui'] || pkg.dependencies['@fivora/editable-components'])) ||
-    (pkg.devDependencies && (pkg.devDependencies['@deneb-ui/ui'] || pkg.devDependencies['@deneb/ui'] || pkg.devDependencies['@fivora/editable-components']))
+    (pkg.dependencies && (pkg.dependencies['@deneb-ui/ui'] || pkg.dependencies['@deneb/ui'])) ||
+    (pkg.devDependencies && (pkg.devDependencies['@deneb-ui/ui'] || pkg.devDependencies['@deneb/ui']))
   );
   const hasCli = Boolean(
-    (pkg.devDependencies && (pkg.devDependencies['@deneb-ui/cli'] || pkg.devDependencies['@fivora/cli'])) ||
-    (pkg.dependencies && (pkg.dependencies['@deneb-ui/cli'] || pkg.dependencies['@fivora/cli']))
+    (pkg.devDependencies && (pkg.devDependencies['@deneb-ui/cli'] || pkg.devDependencies['@deneb/cli'])) ||
+    (pkg.dependencies && (pkg.dependencies['@deneb-ui/cli'] || pkg.dependencies['@deneb/cli']))
   );
 
   if (!skipInstall && (!hasUi || !hasCli)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deneb-ui/cli",
-  "version": "2.0.29",
+  "version": "2.0.31",
   "description": "Official DENEB CLI — scaffold, convert, validate, and package Fivora-ready storefront templates.",
   "bin": {
     "deneb": "bin/index.js",
@@ -49,7 +49,7 @@
   "license": "MIT",
   "dependencies": {
     "@babel/parser": "^7.28.0",
-    "@deneb-ui/core": "^2.0.29",
+    "@deneb-ui/core": "^2.0.31",
     "adm-zip": "^0.6.0",
     "recast": "^0.23.11"
   },

package/src/arc/__tests__/arc.test.cjs

@@ -496,3 +496,26 @@ test('schema sections only claim a pageKey when reachability proves it', () => {
   assert.equal(sections.find((s) => s.id === 'home').pageKey, 'home');
   assert.equal(sections.find((s) => s.id === 'about').pageKey, 'about');
 });
+
+test('conflicting data-preview-static is stripped when element has editable markers', () => {
+  const dir = copyOf(STOREFRONT_FIXTURE);
+  // Introduce a conflicting static marker on an element with an editable marker
+  const heroPath = path.join(dir, 'src', 'components', 'Hero.tsx');
+  let heroCode = fs.readFileSync(heroPath, 'utf8');
+  heroCode = heroCode.replace(
+    '<p className="mt-4',
+    '<p data-preview-static="legacy static description" className="mt-4'
+  );
+  fs.writeFileSync(heroPath, heroCode, 'utf8');
+
+  silence(() => runDenebArc(dir, 'acme-store', { telemetry: 'off' }));
+  const updatedHero = fs.readFileSync(heroPath, 'utf8');
+
+  // data-preview-static must be stripped since the paragraph has data-preview-field-path
+  assert.ok(!updatedHero.includes('data-preview-static="legacy static description"'));
+  assert.ok(updatedHero.includes('data-preview-field-path'));
+
+  const { errors } = auditFivora(dir);
+  const placementErrors = errors.filter((e) => e.includes('cannot share an element with data-preview-static'));
+  assert.equal(placementErrors.length, 0);
+});

package/src/arc/ast.cjs

@@ -267,22 +267,30 @@ function hasDirective(ast, value) {
 function ensureImport(ast, source, names) {
   const program = ast.program || ast;
   const body = program.body || [];
+
+  // Deduplicate against any import in the entire module so we never import the same identifier twice
+  const alreadyImported = new Set();
+  for (const node of body) {
+    if (node.type === 'ImportDeclaration' && Array.isArray(node.specifiers)) {
+      for (const spec of node.specifiers) {
+        const local = spec.local?.name || spec.imported?.name;
+        if (local) alreadyImported.add(local);
+      }
+    }
+  }
+
+  const namesToImport = names.filter((name) => !alreadyImported.has(name));
+  if (namesToImport.length === 0) return;
+
   const existing = body.find((node) => node.type === 'ImportDeclaration' && node.source && node.source.value === source);
   if (existing) {
-    const already = new Set(
-      (existing.specifiers || [])
-        .filter((s) => s.type === 'ImportSpecifier')
-        .map((s) => s.imported?.name || s.local?.name)
-    );
-    for (const name of names) {
-      if (!already.has(name)) {
-        existing.specifiers.push(b.importSpecifier(b.identifier(name), b.identifier(name)));
-      }
+    for (const name of namesToImport) {
+      existing.specifiers.push(b.importSpecifier(b.identifier(name), b.identifier(name)));
     }
     return;
   }
 
-  const specifiers = names.map((name) => b.importSpecifier(b.identifier(name), b.identifier(name)));
+  const specifiers = namesToImport.map((name) => b.importSpecifier(b.identifier(name), b.identifier(name)));
   const decl = b.importDeclaration(specifiers, b.stringLiteral(source));
   let insertAt = 0;
   if (body[0] && body[0].type === 'ExpressionStatement') insertAt = 1;

package/src/arc/fivora-contract.cjs

@@ -490,6 +490,7 @@ function findUncoveredVisibleText(code, filePath) {
     // A `<` preceded by an identifier character is a TypeScript generic
     // (forwardRef<HTMLButtonElement, Props>), never a JSX element.
     if (/[\w$)\]]/.test(source[offset - 1] || '')) continue;
+    if (tag.toLowerCase() === 'option') continue;
     if (!text || text.length <= 2 || !/\p{L}/u.test(text)) continue;
     if (!/^[\p{L}\p{N}"'(¡¿#$€£]/u.test(text)) continue;
     if (/^(?:true|false|null|undefined)$/i.test(text)) continue;

package/src/arc/index.cjs

@@ -17,7 +17,7 @@ const { walkFiles, isJsxFile, rel, copyFilePreserve, writeJson, readJsonSafe, fi
 const { scanProject, buildDependencyGraph, inferOwnerScope } = require('./scanner.cjs');
 const { analyzeFile, collectDesignSnapshot } = require('./semantic.cjs');
 const { planTransformations } = require('./planner.cjs');
-const { applyFilePlan, instrumentLayoutSource, instrumentPageKey, resolveSiteDataSpecifier, ensureJsonModule } = require('./transformer.cjs');
+const { applyFilePlan, instrumentLayoutSource, instrumentPageKey, resolveSiteDataSpecifier, ensureJsonModule, sanitizeContradictoryMarkersInSource } = require('./transformer.cjs');
 const { parseSource } = require('./ast.cjs');
 const { buildSiteDataAndManifest, writeDataBank, loadExistingData, countSchemaFields } = require('./manifest.cjs');
 const { validateAstFiles, validateContracts, designPreservationScore, coverageMetrics } = require('./validator.cjs');
@@ -355,6 +355,19 @@ function runDenebArc(projectDir, projectName, options = {}) {
     }
   }
 
+  // Remove any conflicting data-preview-static from elements carrying editable markers
+  for (const relativeFile of profile.jsxFiles || []) {
+    const abs = path.join(projectDir, relativeFile);
+    if (!fs.existsSync(abs)) continue;
+    const original = fs.readFileSync(abs, 'utf8');
+    const sanitized = sanitizeContradictoryMarkersInSource(original, relativeFile);
+    if (sanitized.updated && sanitized.code !== original) {
+      backupFile(projectDir, backupDir, abs);
+      fs.writeFileSync(abs, sanitized.code, 'utf8');
+      if (!changedFiles.includes(relativeFile)) changedFiles.push(relativeFile);
+    }
+  }
+
   if (profile.framework === 'nextjs') {
     const before = findNextConfig(projectDir);
     if (before) backupFile(projectDir, backupDir, before.abs);

package/src/arc/transformer.cjs

@@ -48,7 +48,16 @@ function replaceAttrValue(node, attrName, expression) {
   attr.value = b.jsxExpressionContainer(expression);
 }
 
+function stripStaticAttribute(node) {
+  if (node && node.openingElement && Array.isArray(node.openingElement.attributes)) {
+    node.openingElement.attributes = node.openingElement.attributes.filter(
+      (attr) => !(attr.type === 'JSXAttribute' && attr.name && attr.name.name === 'data-preview-static')
+    );
+  }
+}
+
 function ensurePreviewPath(node, fieldPath) {
+  stripStaticAttribute(node);
   if (hasJsxAttribute(node, 'data-preview-field-path')) return;
   node.openingElement.attributes.push(jsxPreviewAttr(fieldPath));
 }
@@ -505,6 +514,9 @@ function applyFilePlan(filePlan, profile) {
     ensureDefaultImport(ast, siteDataImport, 'siteData');
   }
 
+  // Sanitize any conflicting data-preview-static on elements with editable markers
+  sanitizeContradictoryMarkers(ast);
+
   // Page keys are stamped in a separate route-driven pass so App Router and
   // Pages Router projects are handled by the same logic.
   const code = printSource(ast, filePlan.originalCode);
@@ -692,6 +704,49 @@ function ensureJsonModule(tsconfig) {
   };
 }
 
+function sanitizeContradictoryMarkers(ast) {
+  let cleaned = 0;
+  recast.types.visit(ast, {
+    visitJSXOpeningElement(pathNode) {
+      const attrs = pathNode.node.attributes || [];
+      const hasEditable = attrs.some(
+        (a) => a.type === 'JSXAttribute' && a.name && (
+          a.name.name === 'data-preview-field-path' ||
+          a.name.name === 'data-preview-list-path' ||
+          a.name.name === 'data-preview-item-path'
+        )
+      );
+      const hasStatic = attrs.some(
+        (a) => a.type === 'JSXAttribute' && a.name && a.name.name === 'data-preview-static'
+      );
+      if (hasEditable && hasStatic) {
+        pathNode.node.attributes = attrs.filter(
+          (a) => !(a.type === 'JSXAttribute' && a.name && a.name.name === 'data-preview-static')
+        );
+        cleaned++;
+      }
+      this.traverse(pathNode);
+    },
+  });
+  return cleaned;
+}
+
+function sanitizeContradictoryMarkersInSource(code, relativeFile) {
+  if (!code.includes('data-preview-static')) return { code, updated: false };
+  if (!code.includes('data-preview-field-path') && !code.includes('data-preview-list-path') && !code.includes('data-preview-item-path')) {
+    return { code, updated: false };
+  }
+  let ast;
+  try {
+    ast = parseSource(code, relativeFile);
+  } catch {
+    return { code, updated: false };
+  }
+  const count = sanitizeContradictoryMarkers(ast);
+  if (count === 0) return { code, updated: false };
+  return { code: printSource(ast, code), updated: true, count };
+}
+
 module.exports = {
   applyFilePlan,
   instrumentLayoutSource,
@@ -699,4 +754,6 @@ module.exports = {
   resolveSiteDataSpecifier,
   ensureJsonModule,
   inferPageKey,
+  sanitizeContradictoryMarkers,
+  sanitizeContradictoryMarkersInSource,
 };