@wix/origami-lint 1.34.26 → 1.34.28

package/dist/rules/project/home-page-folder.js

@@ -6,9 +6,9 @@ import { PAGES_FOLDER, POPUPS_FOLDER } from "../../shared/site-files-tree-mappin
 import { defineProjectRule } from "./define-project-rule.js";
 const CHECKS = ['missing_home', 'multiple_home_folders', 'nested_home_folder', 'popup_in_parentheses'];
 const EXPECTED_ONE_HOME = `Expected exactly one home page folder "pages/(<slug>)" in ${PAGES_FOLDER}`;
-export const NO_HOME = `${EXPECTED_ONE_HOME}; found 0. Name the home page's folder in parentheses, directly under ${PAGES_FOLDER}, like ${PAGES_FOLDER}/(home) (rule P2-R01; tracker OUR-035). The import stops without it.`;
-export const moreHomes = (count, folder) => `${EXPECTED_ONE_HOME}; found ${count}. Keep the parentheses on the home page's folder only: rename ${folder} to ${withoutParentheses(folder)} (rule P2-R01; tracker OUR-035).`;
-export const onlyHomeInParentheses = (folder) => `Only the home page is written in parentheses, directly under ${PAGES_FOLDER}/. Rename ${folder} to ${withoutParentheses(folder)} (rule P2-R23; tracker CONV-unitPath.ts:89).`;
+export const NO_HOME = `${EXPECTED_ONE_HOME}; found 0. Name the home page's folder in parentheses, directly under ${PAGES_FOLDER}, like ${PAGES_FOLDER}/(home). The import stops without it.`;
+export const moreHomes = (count, folder) => `${EXPECTED_ONE_HOME}; found ${count}. Keep the parentheses on the home page's folder only: rename ${folder} to ${withoutParentheses(folder)}.`;
+export const onlyHomeInParentheses = (folder) => `Only the home page is written in parentheses, directly under ${PAGES_FOLDER}/. Rename ${folder} to ${withoutParentheses(folder)}.`;
 /** A home page's folder: its name in parentheses, `(home)`. */
 const HOME_FOLDER = /^\(.+\)$/;
 export default defineProjectRule({

package/dist/rules/site-app/apply-and-presets.js

@@ -59,7 +59,7 @@ function checkElementRule(node, breakpoint, media, reportInFile) {
     const declarations = children.filter((child) => child.type === 'decl');
     const values = declarations.filter((declaration) => !isPresetProperty(declaration.prop));
     if (apply && values.length > 0) {
-        reportInFile(values[0], 'apply_with_declarations', `${where}: \`${describeAtRule(apply)}\` can't share a rule with style declarations (${describeProperties(values)}). Put them in the global style (\`@mixin ${apply.params.trim()}\` in theme.css), or under another breakpoint or state; only \`--preset…\` may stay beside the \`@apply\` (tracker CONV-astParser.ts:117).`);
+        reportInFile(values[0], 'apply_with_declarations', `${where}: \`${describeAtRule(apply)}\` can't share a rule with style declarations (${describeProperties(values)}). Put them in the global style (\`@mixin ${apply.params.trim()}\` in theme.css), or under another breakpoint or state; only \`--preset…\` may stay beside the \`@apply\`.`);
         return null;
     }
     return { node, selector: node.selector, breakpoint, media, apply, presets: declarations.filter((declaration) => isPresetProperty(declaration.prop)), values };
@@ -83,7 +83,7 @@ function checkMixinRule(node, mixin, reportInFile) {
         return;
     const declarations = children.filter((child) => child.type === 'decl');
     if (declarations.length > 0)
-        return reportInFile(declarations[0], 'apply_with_declarations', `${where}: \`${describeAtRule(apply)}\` can't share a rule with declarations (${describeProperties(declarations)}). Move them into \`@mixin ${apply.params.trim()}\` (tracker CONV-astParser.ts:117).`);
+        return reportInFile(declarations[0], 'apply_with_declarations', `${where}: \`${describeAtRule(apply)}\` can't share a rule with declarations (${describeProperties(declarations)}). Move them into \`@mixin ${apply.params.trim()}\`.`);
     if (!isApplyWritten(apply))
         reportApplyForm(apply, where, reportInFile);
 }
@@ -93,7 +93,7 @@ function checkSelectorRules(group, componentClasses, reportInFile) {
     const picks = group.flatMap((rule) => rule.presets.flatMap((declaration) => checkPresetName(declaration, where, reportInFile)));
     if (isInnerPartRule(group[0].selector, componentClasses)) {
         for (const { declaration } of picks.filter(({ path }) => path.length > 0)) {
-            reportInFile(declaration, 'nested_part_preset', `${where}: \`${declaration.prop}\` can't be set on an inner part's rule, which picks only the part's own preset (\`--preset\`). Write it on the component's own rule, with the part's whole path: \`--preset-<part>-${declaration.prop.slice('--preset-'.length)}\` (tracker CONV-styleParser.ts:583).`);
+            reportInFile(declaration, 'nested_part_preset', `${where}: \`${declaration.prop}\` can't be set on an inner part's rule, which picks only the part's own preset (\`--preset\`). Write it on the component's own rule, with the part's whole path: \`--preset-<part>-${declaration.prop.slice('--preset-'.length)}\`.`);
         }
     }
     for (const rules of groupByBreakpoint(group)) {
@@ -102,12 +102,12 @@ function checkSelectorRules(group, componentClasses, reportInFile) {
         const breakpointDescription = rules[0].media ? `in \`${describeAtRule(rules[0].media)}\`` : 'outside any @media';
         const applies = rules.filter((rule) => rule.apply);
         for (const rule of applies.slice(1)) {
-            reportInFile(rule.apply, 'duplicate_apply', `${where}: two \`@apply\` for this selector ${breakpointDescription} (\`${describeAtRule(applies[0].apply)}\` on line ${getLine(applies[0].apply)}, \`${describeAtRule(rule.apply)}\`): keep one (tracker CONV-styleParser.ts:179).`);
+            reportInFile(rule.apply, 'duplicate_apply', `${where}: two \`@apply\` for this selector ${breakpointDescription} (\`${describeAtRule(applies[0].apply)}\` on line ${getLine(applies[0].apply)}, \`${describeAtRule(rule.apply)}\`): keep one.`);
         }
         const ruleWithValues = rules.find((rule) => rule.values.length > 0);
         if (applies.length > 0 && ruleWithValues) {
             const { apply } = applies[0];
-            reportInFile(ruleWithValues.values[0], 'apply_with_declarations', `${where} has both \`${describeAtRule(apply)}\` (line ${getLine(apply)}) and style declarations ${breakpointDescription}: keep one, or move the declarations into the global style (\`@mixin ${apply.params.trim()}\` in theme.css) (tracker CONV-styleParser.ts:204).`);
+            reportInFile(ruleWithValues.values[0], 'apply_with_declarations', `${where} has both \`${describeAtRule(apply)}\` (line ${getLine(apply)}) and style declarations ${breakpointDescription}: keep one, or move the declarations into the global style (\`@mixin ${apply.params.trim()}\` in theme.css).`);
         }
     }
 }
@@ -123,12 +123,12 @@ function checkApplyTargets(elementRules, declaredIds, kind, reportInFile) {
         // the build strips a trailing `()`; the import doesn't, and reads `btn()` as the id (astParser.ts MIXIN_ID_PATTERN)
         const called = id.endsWith('()') ? id.slice(0, -2) : null;
         if (called !== null && declaredIds.has(called)) {
-            reportInFile(apply, 'invalid_apply_target', `rule \`${selector.trim()}\`: \`@apply --${id}\` reads as the global style \`${id}\`, which the site doesn't have: write \`@apply --${called}\`, without the parentheses (tracker OUR-006).`);
+            reportInFile(apply, 'invalid_apply_target', `rule \`${selector.trim()}\`: \`@apply --${id}\` reads as the global style \`${id}\`, which the site doesn't have: write \`@apply --${called}\`, without the parentheses.`);
             continue;
         }
         const nearMiss = [...declaredIds].find((declared) => isOneEditAway(id, declared));
         const fix = nearMiss ? `Did you mean \`@apply --${nearMiss}\`? Otherwise apply` : 'Apply';
-        reportInFile(apply, 'missing_apply_target', `rule \`${selector.trim()}\`: \`@apply --${id}\` names no global style: no \`@mixin --${id}\` in theme.css${kind === 'style' ? ' or style.css' : ''}. ${fix} one theme.css declares, or declare \`@mixin --${id}\` in theme.css (tracker OUR-006).`);
+        reportInFile(apply, 'missing_apply_target', `rule \`${selector.trim()}\`: \`@apply --${id}\` names no global style: no \`@mixin --${id}\` in theme.css${kind === 'style' ? ' or style.css' : ''}. ${fix} one theme.css declares, or declare \`@mixin --${id}\` in theme.css.`);
     }
 }
 /** A `--preset-<path>` names each part as a CSS identifier (CONV-styleParser.ts:62); returns the pick, or none after reporting. */
@@ -138,7 +138,7 @@ function checkPresetName(declaration, where, reportInFile) {
     const path = decodePresetPath(declaration.prop.slice('--preset-'.length));
     if (path.every(isSafeCssIdentifier))
         return [{ declaration, path }];
-    reportInFile(declaration, 'invalid_preset_name', `${where}: \`${declaration.prop}\` doesn't name an inner part: write \`--preset-<part>\`, each part a CSS identifier, parts joined by \`-\` and a \`-\` inside a part's name written \`--\` (\`close-button\` → \`--preset-close--button\`) (tracker CONV-styleParser.ts:62).`);
+    reportInFile(declaration, 'invalid_preset_name', `${where}: \`${declaration.prop}\` doesn't name an inner part: write \`--preset-<part>\`, each part a CSS identifier, parts joined by \`-\` and a \`-\` inside a part's name written \`--\` (\`close-button\` → \`--preset-close--button\`).`);
     return [];
 }
 /** The last pick of each path at one breakpoint is the one the import reads: it has a value (CONV-styleParser.ts:88). */
@@ -150,7 +150,7 @@ function checkPresetValues(picks, where, reportInFile) {
             continue;
         seen.add(key);
         if (!declaration.value.trim())
-            reportInFile(declaration, 'missing_preset_value', `${where}: \`${declaration.prop}\` has no value. Write a preset name, or remove the declaration to use no preset (tracker CONV-styleParser.ts:88).`);
+            reportInFile(declaration, 'missing_preset_value', `${where}: \`${declaration.prop}\` has no value. Write a preset name, or remove the declaration to use no preset.`);
     }
 }
 /**
@@ -170,7 +170,7 @@ function checkOneSelectorPerElement(groups, reportInFile) {
         if (stylingRule) {
             const first = firstStylingRules.get(target.join(' '));
             if (first && first.selector !== stylingRule.selector) {
-                reportInFile(stylingRule.node, 'duplicate_default_style', `\`${stylingRule.selector.trim()}\` and \`${first.selector.trim()}\` (line ${getLine(first.node)}) are one element, and both set its default style: write it under one selector (tracker CONV-styleParser.ts:109).`);
+                reportInFile(stylingRule.node, 'duplicate_default_style', `\`${stylingRule.selector.trim()}\` and \`${first.selector.trim()}\` (line ${getLine(first.node)}) are one element, and both set its default style: write it under one selector.`);
             }
             else if (!first)
                 firstStylingRules.set(target.join(' '), stylingRule);
@@ -187,7 +187,7 @@ function checkOneSelectorPerElement(groups, reportInFile) {
             if (!first)
                 firstPicks.set(key, { selector: group[0].selector, declaration });
             else
-                reportInFile(declaration, 'duplicate_preset', `${describePresetOwner(key)}'s preset is picked twice: \`${first.declaration.prop}\` on \`${first.selector.trim()}\` (line ${getLine(first.declaration)}) and \`${declaration.prop}\` on \`${group[0].selector.trim()}\`. Keep one (tracker CONV-styleParser.ts:109).`);
+                reportInFile(declaration, 'duplicate_preset', `${describePresetOwner(key)}'s preset is picked twice: \`${first.declaration.prop}\` on \`${first.selector.trim()}\` (line ${getLine(first.declaration)}) and \`${declaration.prop}\` on \`${group[0].selector.trim()}\`. Keep one.`);
         }
     }
 }
@@ -319,12 +319,12 @@ function groupByBreakpoint(rules) {
 // ── reporting ──
 /** Reports the second `@apply` of one rule (CONV-astParser.ts:99); returns null, as the rule isn't read further. */
 function reportTwoApplies(applies, where, why, reportInFile) {
-    reportInFile(applies[1], 'duplicate_apply', `${where}: ${applies.length} \`@apply\` in one rule (${applies.map((apply) => `\`${describeAtRule(apply)}\``).join(', ')}). Keep one: ${why} (tracker CONV-astParser.ts:99).`);
+    reportInFile(applies[1], 'duplicate_apply', `${where}: ${applies.length} \`@apply\` in one rule (${applies.map((apply) => `\`${describeAtRule(apply)}\``).join(', ')}). Keep one: ${why}.`);
     return null;
 }
 /** Reports an `@apply` that isn't one dashed id with no block (CONV-astParser.ts:41); returns null, as the rule isn't read further. */
 function reportApplyForm(apply, where, reportInFile) {
-    reportInFile(apply, 'invalid_apply_form', `${where}: \`${describeAtRule(apply)}\` must name one global style by its dashed id. Write \`@apply --<global-style-id>;\`, with no block after it (tracker CONV-astParser.ts:41).`);
+    reportInFile(apply, 'invalid_apply_form', `${where}: \`${describeAtRule(apply)}\` must name one global style by its dashed id. Write \`@apply --<global-style-id>;\`, with no block after it.`);
     return null;
 }
 /** A pick's key → the element it picks the preset of: '.comp-x|label' → '`label` of `.comp-x`'; '.comp-x' → '`.comp-x`'. */