@wix/origami-lint 1.34.31 → 1.34.32

package/dist/rules/site-app/data-values.js

@@ -1,15 +1,18 @@
 // The "data-values" subject of the converter rules (converter 0.80 at c8ed79b): astValue.ts 99, 123, 133; parseJsx.ts 915, 1223,
 // 1227, 1231, 1235, 1255, 1268, 1289, 1697; projectData.ts 214, 225, 281, 435, 443; enrichImage.ts 94, 105.
 // Converter 0.81 (checked at 0.84, 2c0e21c): the tag's import, not a `type` attr, decides if a component takes data attributes; `type` is data.
+// Tracker KIT-richText (converter 0.87): a rich text's type is Builder.RichText.
+// Tracker OUR-003 (origami-transforms mediaValidation): an <Image>'s literal image uri is a Wix media id.
+// Converter 0.87 (68c71e4): `children` is a data key.
 import { isDeepStrictEqual } from 'node:util';
 import { DATA_KEY, EVENT_ATTRIBUTE, RESERVED_ATTRIBUTES, RESERVED_ENTRY_KEYS, bare, getAttribute, getExpression, getKey, getName, getObject, getProperties, getCallbackKind, getProperty, isBound, isOneEditAway, isReadByImport, isReservedAttribute, ownerOf, } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
-const CHECKS = ['attribute_without_braces', 'non_literal_data', 'duplicate_element_prop', 'invalid_element_props_object', 'invalid_element_props_entry', 'invalid_data_object', 'invalid_element_props_key', 'unsupported_element_props_key', 'mixed_data_wrapper', 'duplicate_data_key', 'bare_document_href', 'missing_document_id', 'inconsistent_image_url', 'misplaced_image_url_call'];
+const CHECKS = ['attribute_without_braces', 'non_literal_data', 'duplicate_element_prop', 'invalid_element_props_object', 'invalid_element_props_entry', 'invalid_data_object', 'invalid_element_props_key', 'unsupported_element_props_key', 'mixed_data_wrapper', 'duplicate_data_key', 'bare_document_href', 'missing_document_id', 'inconsistent_image_url', 'misplaced_image_url_call', 'invalid_rich_text_type', 'invalid_image_media_id'];
 /** The names the import never reads as data (dataKeys.ts). The React name is joined as the converter does: Wix Standards fails the build on it in any file. */
 const EXCLUDED_DATA_KEYS = [
     '_slotsId', '_mapId', 'hidden', 'class', 'title', 'role', 'tabindex', 'draggable', 'lang', 'dir', 'accesskey', 'contenteditable', 'spellcheck',
     'translate', 'autofocus', 'inputmode', 'enterkeyhint', 'popover', 'inert', 'part', 'nonce', 'is', 'itemscope', 'itemtype', 'itemprop', 'itemid',
-    'itemref', 'tabIndex', 'contentEditable', 'accessKey', 'autoFocus', 'inputMode', 'enterKeyHint', 'spellCheck', 'children', 'styleRef', 'key',
+    'itemref', 'tabIndex', 'contentEditable', 'accessKey', 'autoFocus', 'inputMode', 'enterKeyHint', 'spellCheck', 'styleRef', 'key',
     'ref', ['dangerouslySet', 'InnerHTML'].join(''), '__proto__', 'constructor', 'prototype',
 ];
 /** An elementProps entry's name is a CSS identifier (parseJsx.ts 1231): it becomes a class. */
@@ -18,9 +21,14 @@ const CSS_IDENTIFIER = /^-?[_a-zA-Z]+[_a-zA-Z0-9-]*$/;
 const RESERVED_OBJECT_KEYS = ['__proto__', 'constructor', 'prototype'];
 /** An image object's `type` (enrichImage.ts). */
 const IMAGE_TYPE = 'Builder.Image';
+/** A rich text's `type`, and the key the export writes it under (projectData.ts rebuildRichText reads `html` only on this type). */
+const RICH_TEXT_TYPE = 'Builder.RichText';
+const RICH_TEXT_KEY = 'richText';
 /** The media identifiers the export writes: an image's (`wix:image://v1/<uri>/<name>#originWidth=…`), a document's (`wix:document://v1/ugd/<file>/<name>`). */
 const IMAGE_PREFIX = 'wix:image://v1/';
 const DOCUMENT_PREFIX = 'wix:document://v1/';
+/** A Wix media id, `117a96_1cff23187eeb4050a2a691bcdcad6502~mv2.jpg`: an account prefix, an underscore and a file name (mediaValidation/index.js). */
+const WIX_MEDIA_ID = /^[A-Za-z0-9]+_[A-Za-z0-9_~.-]+\.[A-Za-z0-9]+$/;
 /** The reserved attributes this rule reads as data. The strings are component-attributes', `className` and `bindings` the bindings rule's. */
 const READ_AS_DATA = ['data', 'props', 'elementProps'];
 const FULL = { menus: true, media: true, jsx: true };
@@ -41,8 +49,9 @@ export default defineRule({
     },
 });
 // ── the callback's steps ──
-/** A component written out under Structure: its data values, then what the import builds from the ones it read. */
+/** Any <Image> in the file: its media id, as the build checks it. Then a component written out under Structure: its data values, then what the import builds from the ones it read. */
 function checkJSXElementDataValues(input) {
+    checkImageMediaId(input);
     if (!input.rulesApi.getComponent(input.node) || !isReadByImport(input.node))
         return;
     const elementProps = getAttribute(input.node, 'elementProps');
@@ -54,6 +63,7 @@ function checkJSXElementDataValues(input) {
     checkDataKeyOnce(input, read.has('data') ? checkDataCarrier(input) : null);
     checkDocumentLinks(input, read);
     checkImageUrls(input, read);
+    checkRichTextTypes(input, read);
 }
 // ── the steps ──
 const say = ({ report }, node, check, message) => report({ check, loc: node.loc, message });
@@ -253,8 +263,8 @@ function hasDocumentId(identifier) {
 function checkImageUrls(input, read) {
     const urls = new Set();
     const values = dataValues(input).filter(([, path]) => read.has(attributeOf(path)));
-    for (const [value, path] of values) {
-        for (const { node, path: at } of objectsIn(value, path)) {
+    for (const [value, path, key] of values) {
+        for (const { node, path: at } of objectsIn(value, path, key)) {
             if (valueOf(getProperty(node, 'type')?.value ?? null) !== IMAGE_TYPE)
                 continue;
             const url = getProperty(node, 'url');
@@ -274,6 +284,32 @@ function checkImageUrls(input, read) {
     if (stray)
         say(input, stray, 'misplaced_image_url_call', `${owner(input)} has \`media.getCroppedImageUrl(…)\` outside an image's url. Write it only as the \`url\` of a \`{ type: 'Builder.Image', … }\` object.`);
 }
+/** KIT-richText: with another `type`, or none, the import takes the rich text but keeps its text empty (live import, 2026-10-26). */
+function checkRichTextTypes(input, read) {
+    const values = dataValues(input).filter(([, path]) => read.has(attributeOf(path)));
+    for (const [value, path, valueKey] of values) {
+        for (const { node, path: at, key } of objectsIn(value, path, valueKey)) {
+            if (key !== RICH_TEXT_KEY)
+                continue;
+            const type = getProperty(node, 'type');
+            if (type && valueOf(type.value) === RICH_TEXT_TYPE)
+                continue;
+            const written = type ? `has \`type: ${textOf(input)(type.value)}\`` : 'has no `type`';
+            say(input, type ?? node, 'invalid_rich_text_type', `${owner(input)}'s \`${at}\` ${written}. Write \`type: '${RICH_TEXT_TYPE}'\`: with another type, or none, the import keeps its text empty (tracker KIT-richText).`);
+        }
+    }
+}
+/** OUR-003: `yarn build` fails on an <Image> (by tag name, anywhere in the file) whose literal `image.uri` isn't a Wix media id; the import takes it, but the image is broken. */
+function checkImageMediaId(input) {
+    const image = getObject(getExpression(getAttribute(input.node, 'image')));
+    if (input.rulesApi.getTagName(input.node) !== 'Image' || !image)
+        return;
+    const uri = getProperty(image, 'uri');
+    const value = uri && bare(uri.value);
+    if (value?.type !== 'Literal' || typeof value.value !== 'string' || WIX_MEDIA_ID.test(value.value))
+        return;
+    say(input, value, 'invalid_image_media_id', `${owner(input)}'s \`image.uri\` '${value.value}' isn't a Wix media id, and \`yarn build\` fails on it. Run \`wix origami upload-media\` to upload it (tracker OUR-003).`);
+}
 function imageCallsIn(input, dataValuesRead, read) {
     const values = dataValuesRead.map(([value]) => value);
     const props = read.has('props') ? getExpression(getAttribute(input.node, 'props')) : null;
@@ -465,29 +501,30 @@ function derivedImageArguments(image) {
     ];
 }
 const sameArguments = (call, expected) => isDeepStrictEqual(call.arguments.map(valueOf), expected);
-function objectsIn(node, path) {
+function objectsIn(node, path, key) {
     if (node === null)
         return [];
     const value = bare(node);
     if (value.type === 'ArrayExpression')
-        return value.elements.flatMap((element, index) => (element && element.type !== 'SpreadElement' ? objectsIn(element, `${path}[${index}]`) : []));
+        return value.elements.flatMap((element, index) => (element && element.type !== 'SpreadElement' ? objectsIn(element, `${path}[${index}]`, null) : []));
     if (value.type !== 'ObjectExpression')
         return [];
-    return [{ node: value, path }, ...getProperties(value).flatMap((property) => objectsIn(property.value, `${path}.${getKey(property)}`))];
+    return [{ node: value, path, key }, ...getProperties(value).flatMap((property) => objectsIn(property.value, `${path}.${getKey(property)}`, getKey(property)))];
 }
+/** Each data value: the value, its path as a message writes it, and the key that holds it. */
 function dataValues(input) {
     const element = input.node;
-    const values = dataAttributes(input).map((attribute) => [getExpression(attribute), getName(attribute)]).filter(([value]) => value);
+    const values = dataAttributes(input).map((attribute) => [getExpression(attribute), getName(attribute), getName(attribute)]).filter(([value]) => value);
     const data = getExpression(getAttribute(element, 'data'));
     if (data)
-        values.push([data, 'data']);
+        values.push([data, 'data', 'data']);
     for (const { entry, path } of getEntries(getObject(getExpression(getAttribute(element, 'elementProps'))))) {
         const at = `elementProps.${path.join('.')}`;
         for (const property of entryDataKeys(entry))
-            values.push([property.value, `${at}.${getKey(property)}`]);
+            values.push([property.value, `${at}.${getKey(property)}`, getKey(property)]);
         const entryData = getProperty(entry, 'data');
         if (entryData)
-            values.push([entryData.value, `${at}.data`]);
+            values.push([entryData.value, `${at}.data`, 'data']);
     }
     return values;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-lint",
-  "version": "1.34.31",
+  "version": "1.34.32",
   "description": "Offline lint for an exported Origami site: lints the pages that changed since the last passing run",
   "type": "module",
   "bin": {
@@ -52,5 +52,5 @@
       ]
     }
   },
-  "falconPackageHash": "686d35f346108816f50b0d95576cb023e273a903c797136d43187f3e"
+  "falconPackageHash": "85567c0c24100afc6ec763f714be471d941b2f00b00ec2182eb63324"
 }