@wix/origami-lint 1.34.8 → 1.34.10

package/dist/rules/bindings.js

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-lint",
-  "version": "1.34.8",
+  "version": "1.34.10",
   "description": "Offline lint for an exported Origami site: lints the pages that changed since the last passing run",
   "type": "module",
   "bin": {
@@ -21,7 +21,7 @@
     "test": "node --test 'test/*.test.ts'"
   },
   "dependencies": {
-    "@wix/origami-fonts": "1.0.2",
+    "@wix/origami-fonts": "1.0.3",
     "oxc-parser": "^0.151.0",
     "oxlint": "^1.39.0",
     "postcss": "^8.5.3",
@@ -52,5 +52,5 @@
       ]
     }
   },
-  "falconPackageHash": "e568b814f70d3d18688209f5f49e3d9ab28d65fae5881beef484717f"
+  "falconPackageHash": "df5ca3b838244854a52ae4013469c645c6bd6d3e1651ee3702545903"
 }