@wix/origami-lint 1.34.27 → 1.34.28

package/dist/rules/site-app/slot-attributes.js

@@ -30,7 +30,7 @@ function rootHasNoSlot({ node, rulesApi, report }) {
     const slot = rulesApi.getSlot(node);
     if (slot === null || !isRoot(node, rulesApi))
         return;
-    report({ check: 'root_has_slot', loc: getLoc(node, rulesApi), message: `The root ${describe(node, rulesApi)} can't have a slot attribute. Remove slot="${slot}" (tracker CONV-fromBundle.ts:1312).` });
+    report({ check: 'root_has_slot', loc: getLoc(node, rulesApi), message: `The root ${describe(node, rulesApi)} can't have a slot attribute. Remove slot="${slot}".` });
 }
 /** The root element: the top of Structure, or the element a <Remove> / <Interaction> at the top holds (the page model makes that wrapper the root). */
 function isRoot(node, rulesApi) {
@@ -48,7 +48,7 @@ function attributeElementHasNoSlot(element, attribute, { rulesApi, report }) {
     const name = getAttributeName(attribute);
     if (LAYER_ATTRIBUTES.includes(name) || rulesApi.getSlot(element) === null)
         return;
-    report({ check: 'attribute_child_has_slot', loc: getLoc(element, rulesApi), message: `${describe(element, rulesApi)} is placed in the attribute '${name}' and also has slot="${rulesApi.getSlot(element)}". Remove slot=: its place is the attribute (tracker CONV-parseJsx.ts:1507).` });
+    report({ check: 'attribute_child_has_slot', loc: getLoc(element, rulesApi), message: `${describe(element, rulesApi)} is placed in the attribute '${name}' and also has slot="${rulesApi.getSlot(element)}". Remove slot=: its place is the attribute.` });
 }
 /** Reports an owner that holds elements in its attributes and also has a child with slot=, or an elementProps entry with slots: {…} (CONV-parseJsx.ts:1693). */
 function usesSlotsOnlyOneWay({ node, rulesApi, report }) {
@@ -56,7 +56,7 @@ function usesSlotsOnlyOneWay({ node, rulesApi, report }) {
         return;
     if (!getSlottedChildren(node, rulesApi).length && !hasEntrySlots(node))
         return;
-    report({ check: 'mixed_slot_forms', loc: getLoc(node, rulesApi), message: `${describe(node, rulesApi)} places slotted children both in attributes and with slot= (or slots: {…}). Use one way: elements in attributes, or children with slot= (tracker CONV-parseJsx.ts:1693).` });
+    report({ check: 'mixed_slot_forms', loc: getLoc(node, rulesApi), message: `${describe(node, rulesApi)} places slotted children both in attributes and with slot= (or slots: {…}). Use one way: elements in attributes, or children with slot=.` });
 }
 /** Reports a slot key that two children of the owner share (CONV-slots.ts:555), at the later one in the owner's list: children first, then layer elements. */
 function usesEachSlotKeyOnce({ node, rulesApi, report }) {
@@ -67,7 +67,7 @@ function usesEachSlotKeyOnce({ node, rulesApi, report }) {
         if (!other)
             first.set(slot, child);
         else
-            report({ check: 'duplicate_slot', loc: getLoc(child, rulesApi), message: `Slot "${slot}" of ${describe(node, rulesApi)} is used by both ${describe(other, rulesApi)} and ${describe(child, rulesApi)}. Give each slotted child its own slot key (tracker CONV-slots.ts:555).` });
+            report({ check: 'duplicate_slot', loc: getLoc(child, rulesApi), message: `Slot "${slot}" of ${describe(node, rulesApi)} is used by both ${describe(other, rulesApi)} and ${describe(child, rulesApi)}. Give each slotted child its own slot key.` });
     }
 }
 // ── reading the owner ──

package/dist/rules/site-app/slot-placement.js

@@ -29,8 +29,8 @@ function checkSlotPlaces(slots, { node, rulesApi, report }) {
             continue;
         const check = name === ELEMENT_PROPS ? 'element_props_slot_place' : 'attribute_slot_place';
         const message = name === ELEMENT_PROPS
-            ? `${describe(node, rulesApi)} holds an element in elementProps at a place the import can't write back: put it at a plain data key of the inner part (${place.parts.at(-1) ?? 'partName'}: {content: <…/>}) (tracker CONV-parseJsx.ts:1571).`
-            : `${describe(node, rulesApi)} holds an element in '${name}' at a place the import can't write back: put it under plain-name keys, give each array item on the way its own string _id, and no . [ ] in keys (tracker CONV-parseJsx.ts:1532).`;
+            ? `${describe(node, rulesApi)} holds an element in elementProps at a place the import can't write back: put it at a plain data key of the inner part (${place.parts.at(-1) ?? 'partName'}: {content: <…/>}).`
+            : `${describe(node, rulesApi)} holds an element in '${name}' at a place the import can't write back: put it under plain-name keys, give each array item on the way its own string _id, and no . [ ] in keys.`;
         report({ check, loc: getLoc(element, rulesApi), message });
     }
 }
@@ -86,7 +86,7 @@ function checkSlotOwnerData(slots, { node, rulesApi, report }) {
     const data = rulesApi.getAttributeValue(node, 'data');
     if (!first || data === undefined || isRecord(data))
         return;
-    report({ check: 'slot_owner_data_object', loc: getLoc(node, rulesApi), message: `${describe(node, rulesApi)} holds a slot element (in '${first.name}'), so its data must be an object: write data={{…}} or leave data out, not data={${JSON.stringify(data)}} (tracker CONV-fromBundle.ts:127).` });
+    report({ check: 'slot_owner_data_object', loc: getLoc(node, rulesApi), message: `${describe(node, rulesApi)} holds a slot element (in '${first.name}'), so its data must be an object: write data={{…}} or leave data out, not data={${JSON.stringify(data)}}.` });
 }
 const isPartName = (name) => PART_NAME.test(name) && !UNSAFE_PART_NAMES.has(name);
 const isPlainKey = (key) => DATA_KEY.test(key) && !RESERVED_KEYS.has(key);

package/dist/rules/site-app/theme-root.js

@@ -34,13 +34,12 @@ export default defineRule({
 function isAlone(file, rule, { report }) {
     if (rule.selector === ':root')
         return true;
-    reportCssProblem(report, file, rule.line, 'root_selector_suffix', `\`${rule.selector}\` puts a part after :root. Write \`:root { … }\` alone; style elements by their own class (\`.comp-a { … }\`) (tracker CONV-cssSelectors.ts:388).`);
+    reportCssProblem(report, file, rule.line, 'root_selector_suffix', `\`${rule.selector}\` puts a part after :root. Write \`:root { … }\` alone; style elements by their own class (\`.comp-a { … }\`).`);
     return false;
 }
 /** Reports a `:root` rule in a page's own CSS: in style.css (CONV-styleParser.ts:443); in layout.css too, which the import refuses as well (seen live, no tracker row yet). */
 function isNotInPage(file, rule, { report }) {
-    const source = file === 'style' ? 'tracker CONV-styleParser.ts:443' : 'the import refuses it: seen live';
-    reportCssProblem(report, `${file}.css`, rule.line, 'root_in_page_css', `\`:root\` can't be used in a page's ${file}.css: set site variables in global/themes/theme.css (${source}).`);
+    reportCssProblem(report, `${file}.css`, rule.line, 'root_in_page_css', `\`:root\` can't be used in a page's ${file}.css: set site variables in global/themes/theme.css.`);
 }
 /** A theme `:root` rule: a preset (step 4), then only tokens or only the spx context (step 1); an spx context's values (step 2) and place (step 3). A `:root` inside a `@mixin` is the global-styles rows' (its selector must start with `&` there). */
 function checkThemeRoot(root, input) {
@@ -60,14 +59,14 @@ function hasNoPreset(root, { report }) {
     const preset = root.declarations.find(({ prop }) => isPresetProperty(prop));
     if (!preset)
         return true;
-    reportCssProblem(report, 'theme.css', root.line, 'preset_on_root', `\`:root\` can't set ${preset.prop}; theme.css holds only :root tokens, the spx context and @mixin global styles. Set a preset on the element's rule in its page's style.css (tracker CONV-parseTheme.ts:224).`);
+    reportCssProblem(report, 'theme.css', root.line, 'preset_on_root', `\`:root\` can't set ${preset.prop}; theme.css holds only :root tokens, the spx context and @mixin global styles. Set a preset on the element's rule in its page's style.css.`);
     return false;
 }
 /** Reports a plain property, or tokens mixed with the spx context (CONV-parseTheme.ts:170). 'tokens' / 'spx' when the rule is one of the two. */
 function holdsTokensOrSpx(root, { report }) {
     const plain = root.declarations.find(({ prop }) => !prop.startsWith('--'));
     if (plain) {
-        reportCssProblem(report, 'theme.css', root.line, 'non_token_root_property', `this :root rule has \`${plain.prop}\`; a :root rule holds only tokens (--…), or only --spx-ref-width and --spx-resolver-type. Move other properties to an element's rule in style.css (tracker CONV-parseTheme.ts:170).`);
+        reportCssProblem(report, 'theme.css', root.line, 'non_token_root_property', `this :root rule has \`${plain.prop}\`; a :root rule holds only tokens (--…), or only --spx-ref-width and --spx-resolver-type. Move other properties to an element's rule in style.css.`);
         return null;
     }
     const spx = root.declarations.filter(isSpx);
@@ -75,7 +74,7 @@ function holdsTokensOrSpx(root, { report }) {
         return 'tokens';
     if (spx.length === root.declarations.length)
         return 'spx';
-    reportCssProblem(report, 'theme.css', root.line, 'mixed_spx_context', `this :root rule mixes the spx context (--spx-ref-width, --spx-resolver-type) with other lines; write the spx context as its own :root rule (tracker CONV-parseTheme.ts:170).`);
+    reportCssProblem(report, 'theme.css', root.line, 'mixed_spx_context', `this :root rule mixes the spx context (--spx-ref-width, --spx-resolver-type) with other lines; write the spx context as its own :root rule.`);
     return null;
 }
 /** Reports an spx context missing one of its two properties, with a width that isn't a positive plain number, or a resolver that isn't scale / fixed (CONV-parseTheme.ts:177). */
@@ -84,7 +83,7 @@ function isValidSpxContext(root, { report }) {
     const resolver = lastValue(root, '--spx-resolver-type');
     if (width !== undefined && Number.isFinite(Number(width)) && Number(width) > 0 && resolver !== undefined && SPX_RESOLVERS.includes(resolver))
         return true;
-    reportCssProblem(report, 'theme.css', root.line, 'invalid_spx_context', `this :root spx rule must set both --spx-ref-width (a positive number, like 1280) and --spx-resolver-type (scale or fixed) (tracker CONV-parseTheme.ts:177).`);
+    reportCssProblem(report, 'theme.css', root.line, 'invalid_spx_context', `this :root spx rule must set both --spx-ref-width (a positive number, like 1280) and --spx-resolver-type (scale or fixed).`);
     return false;
 }
 /** Reports an spx context under anything but one `@media (--name)` the theme declares: two conditions, a plain range, another at-rule (CONV-parseTheme.ts:82). At the top level it is the default range's. */
@@ -94,7 +93,7 @@ function isSpxContextInPlace(root, { rulesApi, report }) {
     const name = root.enclosing.length === 1 && root.enclosing[0].startsWith('@media ') ? rulesApi.getBreakpointName(root.enclosing[0].slice('@media '.length)) : null;
     if (name && rulesApi.getCustomMedia('theme').some((breakpoint) => breakpoint.name === name))
         return;
-    reportCssProblem(report, 'theme.css', root.line, 'invalid_spx_scope', `set the spx context at the top level or under \`@media (--<named range>)\`, one of the theme's @custom-media names; not under ${root.enclosing.map((atRule) => `\`${atRule}\``).join(', ')} (tracker CONV-parseTheme.ts:82).`);
+    reportCssProblem(report, 'theme.css', root.line, 'invalid_spx_scope', `set the spx context at the top level or under \`@media (--<named range>)\`, one of the theme's @custom-media names; not under ${root.enclosing.map((atRule) => `\`${atRule}\``).join(', ')}.`);
 }
 // ── reading the CSS ──
 /** Every rule whose selector starts with `:root` in a parsed file, in order, with what's around it and its declarations. No file → none. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-lint",
-  "version": "1.34.27",
+  "version": "1.34.28",
   "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": "b4ea23b3bf64c300ff406d11fcb377f370fb48f7fdf2e92f3a66f7c9"
+  "falconPackageHash": "97fa36a3eb31cb9ae9a81f66fff2679fde030431f3b1767dcaf5154a"
 }