@master/eslint-plugin-css 2.0.0-rc.38 → 2.0.0-rc.39

package/dist/utils/find-loc.cjs

@@ -1,5 +1,7 @@
 'use strict';
 
+var indexOfAll = require('./index-of-all.cjs');
+
 function findLoc(text, lines, startLine, endLine) {
     const targetLines = text.match(/.+(?:\r\n|\n)?/g);
     let checkingTargetLine = 0;
@@ -8,16 +10,19 @@ function findLoc(text, lines, startLine, endLine) {
     for(let i = startLine; i <= endLine; i++){
         const sourceCodeLine = lines[i - 1];
         const content = targetLines[checkingTargetLine].replace(/\r\n|\n/, '');
-        const index = sourceCodeLine.indexOf(content);
-        if (index !== -1) {
-            if (index === 0 || sourceCodeLine[index - 1].match(/^|[\s"'']/)) {
+        const indexes = indexOfAll.indexOfAll(sourceCodeLine, content);
+        if (indexes.length > 0) {
+            for (const index of indexes){
+                if (index !== 0 && sourceCodeLine[index - 1].match(/\w/) || index + content.length < sourceCodeLine.length && sourceCodeLine[index + content.length].match(/\w/)) {
+                    continue;
+                }
                 if (checkingTargetLine === 0) {
                     resultStart = {
                         line: i,
                         column: index
                     };
                 }
-                if (checkingTargetLine === targetLines.length - 1 && (sourceCodeLine[index + content.length - 1].match(/$|[\s"'']/) || sourceCodeLine[index + content.length].match(/[\s"'']/))) {
+                if (checkingTargetLine === targetLines.length - 1) {
                     return {
                         start: resultStart,
                         end: {

package/dist/utils/find-loc.mjs

@@ -1,3 +1,5 @@
+import { indexOfAll } from './index-of-all.mjs';
+
 function findLoc(text, lines, startLine, endLine) {
     const targetLines = text.match(/.+(?:\r\n|\n)?/g);
     let checkingTargetLine = 0;
@@ -6,16 +8,19 @@ function findLoc(text, lines, startLine, endLine) {
     for(let i = startLine; i <= endLine; i++){
         const sourceCodeLine = lines[i - 1];
         const content = targetLines[checkingTargetLine].replace(/\r\n|\n/, '');
-        const index = sourceCodeLine.indexOf(content);
-        if (index !== -1) {
-            if (index === 0 || sourceCodeLine[index - 1].match(/^|[\s"'']/)) {
+        const indexes = indexOfAll(sourceCodeLine, content);
+        if (indexes.length > 0) {
+            for (const index of indexes){
+                if (index !== 0 && sourceCodeLine[index - 1].match(/\w/) || index + content.length < sourceCodeLine.length && sourceCodeLine[index + content.length].match(/\w/)) {
+                    continue;
+                }
                 if (checkingTargetLine === 0) {
                     resultStart = {
                         line: i,
                         column: index
                     };
                 }
-                if (checkingTargetLine === targetLines.length - 1 && (sourceCodeLine[index + content.length - 1].match(/$|[\s"'']/) || sourceCodeLine[index + content.length].match(/[\s"'']/))) {
+                if (checkingTargetLine === targetLines.length - 1) {
                     return {
                         start: resultStart,
                         end: {

package/dist/utils/index-of-all.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+function indexOfAll(arr, value) {
+    const result = [];
+    let i = -1;
+    while((i = arr.indexOf(value, i + 1)) !== -1){
+        result.push(i);
+    }
+    return result;
+}
+
+exports.indexOfAll = indexOfAll;

package/dist/utils/index-of-all.d.ts

@@ -0,0 +1 @@
+export declare function indexOfAll(arr: any[] | string, value: any): number[];

package/dist/utils/index-of-all.mjs

@@ -0,0 +1,10 @@
+function indexOfAll(arr, value) {
+    const result = [];
+    let i = -1;
+    while((i = arr.indexOf(value, i + 1)) !== -1){
+        result.push(i);
+    }
+    return result;
+}
+
+export { indexOfAll };

package/package.json

@@ -1 +1 @@
-{"name":"@master/eslint-plugin-css","type":"module","scripts":{"build":"techor build \"src/**/*.{js,ts}\"","dev":"pnpm build --watch","test":"jest","type-check":"tsc --noEmit","lint":"eslint src"},"keywords":["mastercss","eslint","eslintplugin"],"license":"MIT","description":"Master CSS ESLint Plugin","author":"Aoyue Design LLC.","funding":"https://css.master.co/docs/donate","homepage":"https://css.master.co","bugs":{"url":"https://github.com/master-co/css/issues"},"repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/eslint-plugin"},"sideEffects":false,"main":"./dist/index.cjs","module":"./dist/index.mjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"import":"./dist/index.mjs","require":"./dist/index.cjs","types":"./dist/index.d.ts"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"dependencies":{"@master/css":"^2.0.0-rc.38","@master/css-explore-config":"^2.0.0-rc.38","@master/css-validator":"^2.0.0-rc.38","@typescript-eslint/utils":"^7.7.0","synckit":"^0.9.0","typescript-eslint":"^7.7.0"},"devDependencies":{"@angular-eslint/template-parser":"^17.3.0","@master/css-explore-config":"^2.0.0-rc.38","@master/css-shared":"^2.0.0-rc.38","@types/node":"^20.12.7","@typescript-eslint/rule-tester":"^7.7.0","eslint":"^8.57.0","eslint-plugin-markdown":"^4.0.1","eslint-plugin-mdx":"^3.1.5","svelte-eslint-parser":"^0.34.1","ts-node":"^10.9.2","vue-eslint-parser":"^9.4.2"},"version":"2.0.0-rc.38"}
+{"name":"@master/eslint-plugin-css","type":"module","scripts":{"build":"techor build \"src/**/*.{js,ts}\"","dev":"pnpm build --watch","test":"vitest","type-check":"tsc --noEmit","lint":"eslint src"},"keywords":["mastercss","eslint","eslintplugin"],"license":"MIT","description":"Master CSS ESLint Plugin","author":"Aoyue Design LLC.","funding":"https://css.master.co/docs/donate","homepage":"https://css.master.co","bugs":{"url":"https://github.com/master-co/css/issues"},"repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/eslint-plugin"},"sideEffects":false,"main":"./dist/index.cjs","module":"./dist/index.mjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"import":"./dist/index.mjs","require":"./dist/index.cjs","types":"./dist/index.d.ts"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"dependencies":{"@master/css":"^2.0.0-rc.39","@master/css-explore-config":"^2.0.0-rc.39","@master/css-validator":"^2.0.0-rc.39","@typescript-eslint/utils":"^7.7.0","synckit":"^0.9.0","typescript-eslint":"^7.7.0"},"devDependencies":{"@angular-eslint/template-parser":"^17.3.0","@master/css-explore-config":"^2.0.0-rc.39","@master/css-shared":"^2.0.0-rc.39","@types/node":"^20.12.7","@typescript-eslint/rule-tester":"^7.7.0","eslint":"^8.57.0","eslint-plugin-markdown":"^4.0.1","eslint-plugin-mdx":"^3.1.5","svelte-eslint-parser":"^0.34.1","ts-node":"^10.9.2","vue-eslint-parser":"^9.4.2"},"version":"2.0.0-rc.39"}