@wix/origami-lint 1.34.9 → 1.34.11

package/dist/rules/index.js

@@ -1,17 +1,17 @@
-import allowedImports from "./allowed-imports.js";
-import applyAndPresets from "./apply-and-presets.js";
-import bindings from "./bindings.js";
-import breakpoints from "./breakpoints.js";
-import cssFileNesting from "./css-file-nesting.js";
-import cssLayoutProperties from "./css-layout-properties.js";
-import cssSelectors from "./css-selectors.js";
-import dataValues from "./data-values.js";
-import globalStyles from "./global-styles.js";
-import noAbsoluteSection from "./no-absolute-section.js";
-import pageStructure from "./page-structure.js";
-import slotAttributes from "./slot-attributes.js";
-import themeFontIds from "./theme-font-ids.js";
-import themeRoot from "./theme-root.js";
-import noFreeCode from "./no-free-code.js";
+import allowedImports from "./site-app/allowed-imports.js";
+import applyAndPresets from "./site-app/apply-and-presets.js";
+import bindings from "./site-app/bindings.js";
+import breakpoints from "./site-app/breakpoints.js";
+import cssFileNesting from "./site-app/css-file-nesting.js";
+import cssLayoutProperties from "./site-app/css-layout-properties.js";
+import cssSelectors from "./site-app/css-selectors.js";
+import dataValues from "./site-app/data-values.js";
+import globalStyles from "./site-app/global-styles.js";
+import noAbsoluteSection from "./site-app/no-absolute-section.js";
+import pageStructure from "./site-app/page-structure.js";
+import slotAttributes from "./site-app/slot-attributes.js";
+import themeFontIds from "./site-app/theme-font-ids.js";
+import themeRoot from "./site-app/theme-root.js";
+import noFreeCode from "./site-app/no-free-code.js";
 export const ruleRegistry = [allowedImports, noFreeCode, pageStructure, noAbsoluteSection, themeFontIds, slotAttributes, themeRoot, breakpoints, cssFileNesting, globalStyles, applyAndPresets, bindings, dataValues, cssLayoutProperties, cssSelectors];
-export { defineRule } from "./define-rule.js";
+export { defineRule } from "./site-app/define-rule.js";

package/dist/rules/rule-base.js

@@ -0,0 +1,2 @@
+// What every rule has, whatever it runs on: a page rule (`Rule`, in site-app/) or a project rule (`ProjectRule`, in project/).
+export {};

package/dist/rules/{allowed-imports.js → site-app/allowed-imports.js}

@@ -2,9 +2,9 @@
 // converter 0.80 a page's interactions live in servicesConfigs/interactions.ts, and structure.jsx can't use these packages (0.86
 // refuses a tag from them, parseJsx.ts:471, identity.ts:80; a call is free code, and fn() / ctx() refuse them as a source).
 import path from 'node:path';
-import { CSS_FILES, JSX_FILES } from "../page-model/index.js";
-import { BUILDERS, RUNTIME_ONLY_BUILDERS, RUNTIME_PACKAGE } from "../rules-api/index.js";
-import { GLOBAL_COMPONENTS, GLOBAL_COMPONENTS_FOLDER, GLOBAL_FOLDER, SITE_SRC } from "../shared/site-files-tree-mapping.js";
+import { CSS_FILES, JSX_FILES } from "../../page-model/index.js";
+import { BUILDERS, RUNTIME_ONLY_BUILDERS, RUNTIME_PACKAGE } from "../../rules-api/index.js";
+import { GLOBAL_COMPONENTS, GLOBAL_COMPONENTS_FOLDER, GLOBAL_FOLDER, SITE_SRC } from "../../shared/site-files-tree-mapping.js";
 import { defineRule } from "./define-rule.js";
 /** The interactions packages, which the import reserves: structure.jsx imports nothing from them. Matched by source, not by name: `Interact` from @site/site-code is the site's own. */
 const INTERACTIONS_PACKAGES = ['interactReact', 'interact', 'motionPresets'];

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

@@ -1,4 +1,4 @@
-import { createCssFileReporter, describeAtRule, getCssChildren, getDashedId, getSegmentClass, getSelectorSegments, isPresetProperty, isSafeCssIdentifier } from "../rules-api/index.js";
+import { createCssFileReporter, describeAtRule, getCssChildren, getDashedId, getSegmentClass, getSelectorSegments, isPresetProperty, isSafeCssIdentifier } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'apply-and-presets',

package/dist/rules/{bindings.js → site-app/bindings.js}

@@ -1,4 +1,4 @@
-import { BUILDERS, CALLBACK_PROP, EVENT_ATTRIBUTE, RESERVED_ENTRY_KEYS, RUNTIME_PACKAGE, TRANSFORM_BUILDERS, TYPED_BUILDERS, bare, getAttribute, getExpression, getKey, getCallbackKind, getName, getObject, getParamReadKind, getProperties, getProperty, isBound, isReservedAttribute, isStructure, ownerOf, } from "../rules-api/index.js";
+import { BUILDERS, CALLBACK_PROP, EVENT_ATTRIBUTE, RESERVED_ENTRY_KEYS, RUNTIME_PACKAGE, TRANSFORM_BUILDERS, TYPED_BUILDERS, bare, getAttribute, getExpression, getKey, getCallbackKind, getName, getObject, getParamReadKind, getProperties, getProperty, isBound, isReservedAttribute, isStructure, ownerOf, } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The converter's reserved sources (identity.ts `isReservedRegistry`) and the DM's own `document`: no fn()/ctx() names. */
 const RESERVED_FOR_BINDINGS = ['runtime', 'interactReact', 'interact', 'motionPresets', 'menu', 'document', 'core'];
@@ -63,7 +63,7 @@ function checkComponentBindings(at) {
     if (!rulesApi.hasDataAttributes(node))
         return;
     boundPropOnce(at);
-    for (const [name, , value] of boundAttributes(node))
+    for (const [name, , value] of boundAttributes(node, at.input.rulesApi))
         prop(at, name, value, true);
 }
 /** One elementProps entry: its `bindings`, and the keys it binds. */
@@ -80,19 +80,48 @@ function checkEntryBindings(at, entry) {
     if (className)
         classNameConditions(entryAt, className, '`className`');
     entryPropBoundOnce(entryAt, object);
-    for (const [key, property] of boundEntryKeys(object))
+    for (const [key, property] of boundEntryKeys(object, at.input.rulesApi))
         prop(entryAt, key, property.value, true);
 }
 /** A builder call in a structure attribute: it is imported, and so are the names it uses. */
 function checkCallExpressionImports(input) {
     if (input.node.callee.type !== 'Identifier' || !isInStructureAttribute(input.node))
         return;
+    if (isSvgCall(input.node, input.rulesApi))
+        return checkSvgArguments(input);
     if (!isBuilderImported(input, input.node.callee))
         return;
     const ctxHook = bindingNameImported(input, input.node.callee.name);
     if (ctxHook)
         ctxSourceHasName(input, ctxHook);
 }
+function isSvgCall(node, rulesApi) {
+    if (node.callee.type !== 'Identifier')
+        return false;
+    const found = rulesApi.getImport(node.callee);
+    return found?.kind === 'runtime' && found.imported === 'svg';
+}
+function checkSvgArguments({ node, rulesApi, report }) {
+    const [url, uri] = node.arguments;
+    if (node.arguments.length === 2 && uri.type === 'Literal' && typeof uri.value === 'string' &&
+        url.type === 'MemberExpression' && !url.computed && url.property.type === 'Identifier' && url.property.name === 'url') {
+        const call = url.object;
+        if (call.type === 'CallExpression' && call.arguments.length === 1 &&
+            call.callee.type === 'MemberExpression' && !call.callee.computed &&
+            call.callee.property.type === 'Identifier' && call.callee.property.name === 'getShapeUrl' &&
+            call.callee.object.type === 'Identifier') {
+            const media = rulesApi.getImport(call.callee.object);
+            const [identifier] = call.arguments;
+            if (media?.kind === 'sdk' && media.imported === 'media' &&
+                identifier.type === 'Literal' && identifier.value === `wix:image://v1/${uri.value}`)
+                return;
+        }
+    }
+    report({
+        loc: node.loc,
+        message: tracked("An SVG media expression must be `svg(media.getShapeUrl('wix:image://v1/<uri>').url, '<uri>')`, with matching URI strings, svg imported from '@wix/origami-runtime' and media from '@wix/sdk'.", 'CONV-vectorArtExpression.ts:44'),
+    });
+}
 /** Each builder's own row: the shape of its call, a key written twice in it. */
 const ROW_OF_BUILDER = { all: 'CONV-decode.ts:196', callback: 'CONV-astValue.ts:287', ctx: 'CONV-astValue.ts:276', fn: 'CONV-astValue.ts:287', is: 'CONV-decode.ts:172', raw: 'CONV-decode.ts:28' };
 const tracked = (message, row) => `${message.slice(0, -1)} (tracker ${row}).`;
@@ -152,7 +181,7 @@ function boundPropOnce(at) {
     const props = getBindingsProps(bindings && getExpression(bindings), rulesApi);
     if (!props)
         return;
-    for (const [name, attribute] of boundAttributes(node)) {
+    for (const [name, attribute] of boundAttributes(node, rulesApi)) {
         const where = props.raw ? `bindings={raw({ properties: { ${name} } })}` : `bindings={{ props: { ${name} } }}`;
         if (props.names.has(name))
             say(at, attribute, `${at.owner} binds \`${name}\` twice: in \`${name}={…}\` and in \`${where}\`. Keep one.`, 'CONV-parseJsx.ts:753');
@@ -162,7 +191,7 @@ function entryPropBoundOnce(at, entry) {
     const props = getBindingsProps(getProperty(entry, 'bindings')?.value, at.input.rulesApi);
     if (!props)
         return;
-    for (const [key, property] of boundEntryKeys(entry)) {
+    for (const [key, property] of boundEntryKeys(entry, at.input.rulesApi)) {
         const where = props.raw ? `bindings: raw({ properties: { ${key} } })` : `bindings.props.${key}`;
         if (props.names.has(key))
             say(at, property, `${at.owner} binds \`${key}\` twice: in \`${key}: …\` and in its \`${where}\`. Keep one.`, 'CONV-parseJsx.ts:753');
@@ -646,19 +675,19 @@ function runsAtRender(at, node) {
     return isInvoke(node) || getParamReadKind(node) ? describeIn(at, node) : null;
 }
 /** The data attributes bound to a value the import reads as a binding; not an `on…` attribute, which it doesn't read at all (OUR-031 reports it). */
-function boundAttributes(element) {
+function boundAttributes(element, rulesApi) {
     return element.openingElement.attributes.flatMap((attribute) => {
         if (attribute.type !== 'JSXAttribute' || isReservedAttribute(getName(attribute)) || EVENT_ATTRIBUTE.test(getName(attribute)))
             return [];
         const value = getExpression(attribute);
-        return isBound(value) ? [[getName(attribute), attribute, value]] : [];
+        return isBound(value) && !(value.type === 'CallExpression' && isSvgCall(value, rulesApi)) ? [[getName(attribute), attribute, value]] : [];
     });
 }
-function boundEntryKeys(entry) {
+function boundEntryKeys(entry, rulesApi) {
     return getProperties(entry).flatMap((property) => {
         const key = getKey(property);
         const value = bare(property.value);
-        return key !== null && !RESERVED_ENTRY_KEYS.includes(key) && isBound(value) ? [[key, property]] : [];
+        return key !== null && !RESERVED_ENTRY_KEYS.includes(key) && isBound(value) && !(value.type === 'CallExpression' && isSvgCall(value, rulesApi)) ? [[key, property]] : [];
     });
 }
 function getBindingsProps(node, rulesApi) {

package/dist/rules/{breakpoints.js → site-app/breakpoints.js}

@@ -1,4 +1,4 @@
-import { describeAtRule, reportCssProblem } from "../rules-api/index.js";
+import { describeAtRule, reportCssProblem } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The converter's shape for a declaration's name: a dashed identifier. */
 const DASHED_NAME = /^--[A-Za-z0-9_-]+$/;

package/dist/rules/{css-file-nesting.js → site-app/css-file-nesting.js}

@@ -1,4 +1,4 @@
-import { BREAKPOINT_AT_RULES, createCssFileReporter, describeAtRule, getCssChildren, ORIGAMI_TARGETS, PREAMBLE_LAYER } from "../rules-api/index.js";
+import { BREAKPOINT_AT_RULES, createCssFileReporter, describeAtRule, getCssChildren, ORIGAMI_TARGETS, PREAMBLE_LAYER } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The import's leading-import line (cssFileParser.ts `IMPORT_LINE_PATTERN`). */
 const IMPORT_LINE = /^@import '([^']+)';$/;

package/dist/rules/{css-layout-properties.js → site-app/css-layout-properties.js}

@@ -1,4 +1,4 @@
-import { CONTENT_TARGET, createCssFileReporter, getName, LAYER_ATTRIBUTES, OVERFLOW_TARGET } from "../rules-api/index.js";
+import { CONTENT_TARGET, createCssFileReporter, getName, LAYER_ATTRIBUTES, OVERFLOW_TARGET } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 // ── the tables (propSpecs.ts) ──
 const keywords = (...values) => ({ values, allowed: values.join(', ') });

package/dist/rules/{css-selectors.js → site-app/css-selectors.js}

@@ -1,4 +1,4 @@
-import { BREAKPOINT_AT_RULES, createCssFileReporter, getSelectorSegments, isCssIdentifier, isSafeCssIdentifier, PREAMBLE_LAYER, readSegment } from "../rules-api/index.js";
+import { BREAKPOINT_AT_RULES, createCssFileReporter, getSelectorSegments, isCssIdentifier, isSafeCssIdentifier, PREAMBLE_LAYER, readSegment } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The at-rules whose rules the import reads: breakpoint blocks, and a `@mixin`'s `@result`. */
 const READ_AT_RULES = [...BREAKPOINT_AT_RULES, 'result'];

package/dist/rules/{data-values.js → site-app/data-values.js}

@@ -2,7 +2,7 @@
 // 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.
 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, isReservedAttribute, isStructure, ownerOf, } from "../rules-api/index.js";
+import { DATA_KEY, EVENT_ATTRIBUTE, RESERVED_ATTRIBUTES, RESERVED_ENTRY_KEYS, bare, getAttribute, getExpression, getKey, getName, getObject, getProperties, getCallbackKind, getProperty, isBound, isOneEditAway, isReservedAttribute, isStructure, ownerOf, } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** 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 = [

package/dist/rules/{global-styles.js → site-app/global-styles.js}

@@ -1,4 +1,4 @@
-import { BREAKPOINT_AT_RULES, createCssFileReporter, describeAtRule, getCssChildren, getDashedId, getSegmentClass, getSelectorSegments, isCssIdentifier, isSafeCssIdentifier } from "../rules-api/index.js";
+import { BREAKPOINT_AT_RULES, createCssFileReporter, describeAtRule, getCssChildren, getDashedId, getSegmentClass, getSelectorSegments, isCssIdentifier, isSafeCssIdentifier } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'global-styles',

package/dist/rules/{no-absolute-section.js → site-app/no-absolute-section.js}

@@ -1,4 +1,4 @@
-import { SECTIONS } from "../rules-api/index.js";
+import { SECTIONS } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'no-absolute-section',

package/dist/rules/{no-free-code.js → site-app/no-free-code.js}

@@ -1,4 +1,4 @@
-import { STRUCTURE } from "../rules-api/index.js";
+import { STRUCTURE } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 const FREE_CODE = 'The import refuses this statement: a structure file holds only imports, `const` / `let` / `var` declarations and `export const Structure = () => …` (tracker CONV-parseJsx.ts:287).';
 const STRUCTURE_SHAPE = 'Declare Structure once, as `export const Structure = () => ( <Page …/> )`: an exported const arrow that returns the root element directly, with no `{ return … }`, fragment or condition around it (tracker CONV-parseJsx.ts:335).';

package/dist/rules/{page-structure.js → site-app/page-structure.js}

@@ -19,8 +19,8 @@
 // <Interaction> is no wrapper since converter 0.80 (interactions live in servicesConfigs/interactions.ts): allowed-imports
 // reports the tag, and it stays transparent here so the elements inside it aren't reported too. Context-provider wrappers join
 // once the page model lists the providers.
-import { FILE_START } from "../page-model/index.js";
-import { LAYER_ATTRIBUTES, SECTIONS, WRAPPERS } from "../rules-api/index.js";
+import { FILE_START } from "../../page-model/index.js";
+import { LAYER_ATTRIBUTES, SECTIONS, WRAPPERS } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'page-structure',

package/dist/rules/{slot-attributes.js → site-app/slot-attributes.js}

@@ -5,7 +5,7 @@
 // - the root element has no `slot=`: it has no owner to be a slot of (CONV-fromBundle.ts:1312);
 // - two children of one owner don't share a slot key (CONV-slots.ts:555).
 // Children are the element children and the layer elements (backgroundLayer, pinnedLayer); <Remove> and <Interaction> are transparent.
-import { LAYER_ATTRIBUTES, WRAPPERS } from "../rules-api/index.js";
+import { LAYER_ATTRIBUTES, WRAPPERS } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'slot-attributes',

package/dist/rules/{theme-font-ids.js → site-app/theme-font-ids.js}

@@ -5,7 +5,7 @@
 // theme.css isn't a file oxlint lints, so the rule runs on each linted page (a theme change lints every page) and
 // marks the page's start; the message names the token's line in theme.css.
 import { fonts } from '@wix/origami-fonts';
-import { reportCssProblem } from "../rules-api/index.js";
+import { reportCssProblem } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 const FONT_TOKEN = /^--wst-[\w-]+-font$/;
 // The size in a `font` shorthand, with its optional line height: the family follows it. The number's quantifiers

package/dist/rules/{theme-root.js → site-app/theme-root.js}

@@ -1,4 +1,4 @@
-import { describeAtRule, isPresetProperty, PREAMBLE_LAYER, reportCssProblem } from "../rules-api/index.js";
+import { describeAtRule, isPresetProperty, PREAMBLE_LAYER, reportCssProblem } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 const SPX_PROPS = ['--spx-ref-width', '--spx-resolver-type'];
 const SPX_RESOLVERS = ['scale', 'fixed'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-lint",
-  "version": "1.34.9",
+  "version": "1.34.11",
   "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": "e6f85d6cff1c44bc12c185e0e668b0a6918157b33ebab5a72193f8e7"
+  "falconPackageHash": "6105be6143086aff6e6d4d5ab523a01350826d77e8c206618d240ec2"
 }