@atlaskit/eslint-plugin-ui-styling-standard 2.1.2 → 2.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/dist/cjs/rules/no-nested-selectors/index.js +3 -5
- package/dist/cjs/rules/no-unsafe-selectors/index.js +2 -4
- package/dist/cjs/rules/utils/parse-selector.js +31 -0
- package/dist/es2019/rules/no-nested-selectors/index.js +3 -3
- package/dist/es2019/rules/no-unsafe-selectors/index.js +2 -3
- package/dist/es2019/rules/utils/parse-selector.js +24 -0
- package/dist/esm/rules/no-nested-selectors/index.js +3 -3
- package/dist/esm/rules/no-unsafe-selectors/index.js +2 -3
- package/dist/esm/rules/utils/parse-selector.js +24 -0
- package/dist/types/rules/no-unsafe-selectors/constants.d.ts +1 -1
- package/dist/types/rules/utils/create-rule-with-typed-config.d.ts +1 -1
- package/dist/types/rules/utils/parse-selector.d.ts +10 -0
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/eslint-plugin-ui-styling-standard
|
|
2
2
|
|
|
3
|
+
## 2.1.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`153f1b982bd5c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/153f1b982bd5c) -
|
|
8
|
+
Improve selector parsing and style-import resolution performance
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
3
11
|
## 2.1.2
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.default = void 0;
|
|
9
8
|
var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
|
|
10
|
-
var _postcssSelectorParser =
|
|
9
|
+
var _postcssSelectorParser = require("postcss-selector-parser");
|
|
11
10
|
var _contextCompat = require("@atlaskit/eslint-utils/context-compat");
|
|
12
11
|
var _schema = require("@atlaskit/eslint-utils/schema");
|
|
13
12
|
var _walkStyleProperties = require("@atlaskit/eslint-utils/walk-style-properties");
|
|
14
13
|
var _createRuleWithTypedConfig = require("../utils/create-rule-with-typed-config");
|
|
15
|
-
|
|
14
|
+
var _parseSelector = require("../utils/parse-selector");
|
|
16
15
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
17
16
|
var getCssSelector = function getCssSelector(key) {
|
|
18
17
|
if (key.type === 'Literal' && typeof key.value === 'string') {
|
|
@@ -40,7 +39,6 @@ function isAllowedSelector(selector) {
|
|
|
40
39
|
var isTailAllowed = tail.every(_postcssSelectorParser.isPseudo);
|
|
41
40
|
return isHeadAllowed && isTailAllowed;
|
|
42
41
|
}
|
|
43
|
-
var cssSelectorProcessor = (0, _postcssSelectorParser.default)();
|
|
44
42
|
var rule = (0, _createRuleWithTypedConfig.createLintRuleWithTypedConfig)({
|
|
45
43
|
meta: {
|
|
46
44
|
name: 'no-nested-selectors',
|
|
@@ -83,7 +81,7 @@ var rule = (0, _createRuleWithTypedConfig.createLintRuleWithTypedConfig)({
|
|
|
83
81
|
return;
|
|
84
82
|
}
|
|
85
83
|
try {
|
|
86
|
-
var selectorList =
|
|
84
|
+
var selectorList = (0, _parseSelector.parseSelector)(context, selectorText);
|
|
87
85
|
if (!selectorList.nodes.every(isAllowedSelector)) {
|
|
88
86
|
context.report({
|
|
89
87
|
messageId: 'no-nested-selectors',
|
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
6
|
exports.default = void 0;
|
|
8
|
-
var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
|
|
9
7
|
var _contextCompat = require("@atlaskit/eslint-utils/context-compat");
|
|
10
8
|
var _isSupportedImport = require("@atlaskit/eslint-utils/is-supported-import");
|
|
11
9
|
var _schema = require("@atlaskit/eslint-utils/schema");
|
|
12
10
|
var _walkStyleProperties = require("@atlaskit/eslint-utils/walk-style-properties");
|
|
13
11
|
var _createRuleWithTypedConfig = require("../utils/create-rule-with-typed-config");
|
|
12
|
+
var _parseSelector = require("../utils/parse-selector");
|
|
14
13
|
var _lintSelector = require("./lint-selector");
|
|
15
14
|
var _walkCssMap = require("./walk-css-map");
|
|
16
15
|
var ignoredAtRules = new Set(['@container',
|
|
@@ -18,7 +17,6 @@ var ignoredAtRules = new Set(['@container',
|
|
|
18
17
|
'@media',
|
|
19
18
|
// ignored because it's covered by `no-nested-styles`
|
|
20
19
|
'@supports', '@property', '@starting-style']);
|
|
21
|
-
var cssSelectorProcessor = (0, _postcssSelectorParser.default)();
|
|
22
20
|
var rule = (0, _createRuleWithTypedConfig.createLintRuleWithTypedConfig)({
|
|
23
21
|
meta: {
|
|
24
22
|
name: 'no-unsafe-selectors',
|
|
@@ -131,7 +129,7 @@ var rule = (0, _createRuleWithTypedConfig.createLintRuleWithTypedConfig)({
|
|
|
131
129
|
return;
|
|
132
130
|
}
|
|
133
131
|
try {
|
|
134
|
-
var selectorList =
|
|
132
|
+
var selectorList = (0, _parseSelector.parseSelector)(context, selectorText);
|
|
135
133
|
selectorList.nodes.forEach(function (selector) {
|
|
136
134
|
return (0, _lintSelector.lintSelector)({
|
|
137
135
|
context: context,
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.parseSelector = parseSelector;
|
|
8
|
+
var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
|
|
9
|
+
var _contextCompat = require("@atlaskit/eslint-utils/context-compat");
|
|
10
|
+
var cssSelectorProcessor = (0, _postcssSelectorParser.default)();
|
|
11
|
+
var selectorCache = new WeakMap();
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Parse each selector once per linted source file. Return a clone so selector traversal state is
|
|
15
|
+
* not shared between rules.
|
|
16
|
+
*/
|
|
17
|
+
function parseSelector(context, selectorText) {
|
|
18
|
+
var sourceCode = (0, _contextCompat.getSourceCode)(context);
|
|
19
|
+
var sourceFileCache = selectorCache.get(sourceCode);
|
|
20
|
+
if (!sourceFileCache) {
|
|
21
|
+
sourceFileCache = new Map();
|
|
22
|
+
selectorCache.set(sourceCode, sourceFileCache);
|
|
23
|
+
}
|
|
24
|
+
var cachedSelector = sourceFileCache.get(selectorText);
|
|
25
|
+
if (cachedSelector) {
|
|
26
|
+
return cachedSelector.clone();
|
|
27
|
+
}
|
|
28
|
+
var selector = cssSelectorProcessor.astSync(selectorText);
|
|
29
|
+
sourceFileCache.set(selectorText, selector);
|
|
30
|
+
return selector.clone();
|
|
31
|
+
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { isNesting, isPseudo } from 'postcss-selector-parser';
|
|
2
2
|
import { getScope } from '@atlaskit/eslint-utils/context-compat';
|
|
3
3
|
import { importSources } from '@atlaskit/eslint-utils/schema';
|
|
4
4
|
import { walkStyleProperties } from '@atlaskit/eslint-utils/walk-style-properties';
|
|
5
5
|
import { createLintRuleWithTypedConfig } from '../utils/create-rule-with-typed-config';
|
|
6
|
+
import { parseSelector } from '../utils/parse-selector';
|
|
6
7
|
const getCssSelector = key => {
|
|
7
8
|
if (key.type === 'Literal' && typeof key.value === 'string') {
|
|
8
9
|
return key.value;
|
|
@@ -25,7 +26,6 @@ function isAllowedSelector(selector) {
|
|
|
25
26
|
const isTailAllowed = tail.every(isPseudo);
|
|
26
27
|
return isHeadAllowed && isTailAllowed;
|
|
27
28
|
}
|
|
28
|
-
const cssSelectorProcessor = cssSelectorParser();
|
|
29
29
|
const rule = createLintRuleWithTypedConfig({
|
|
30
30
|
meta: {
|
|
31
31
|
name: 'no-nested-selectors',
|
|
@@ -71,7 +71,7 @@ const rule = createLintRuleWithTypedConfig({
|
|
|
71
71
|
return;
|
|
72
72
|
}
|
|
73
73
|
try {
|
|
74
|
-
const selectorList =
|
|
74
|
+
const selectorList = parseSelector(context, selectorText);
|
|
75
75
|
if (!selectorList.nodes.every(isAllowedSelector)) {
|
|
76
76
|
context.report({
|
|
77
77
|
messageId: 'no-nested-selectors',
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import cssSelectorParser from 'postcss-selector-parser';
|
|
2
1
|
import { getScope } from '@atlaskit/eslint-utils/context-compat';
|
|
3
2
|
import { isXcss } from '@atlaskit/eslint-utils/is-supported-import';
|
|
4
3
|
import { importSources } from '@atlaskit/eslint-utils/schema';
|
|
5
4
|
import { walkStyleProperties } from '@atlaskit/eslint-utils/walk-style-properties';
|
|
6
5
|
import { createLintRuleWithTypedConfig } from '../utils/create-rule-with-typed-config';
|
|
6
|
+
import { parseSelector } from '../utils/parse-selector';
|
|
7
7
|
import { lintSelector } from './lint-selector';
|
|
8
8
|
import { walkCssMap } from './walk-css-map';
|
|
9
9
|
const ignoredAtRules = new Set(['@container',
|
|
@@ -11,7 +11,6 @@ const ignoredAtRules = new Set(['@container',
|
|
|
11
11
|
'@media',
|
|
12
12
|
// ignored because it's covered by `no-nested-styles`
|
|
13
13
|
'@supports', '@property', '@starting-style']);
|
|
14
|
-
const cssSelectorProcessor = cssSelectorParser();
|
|
15
14
|
const rule = createLintRuleWithTypedConfig({
|
|
16
15
|
meta: {
|
|
17
16
|
name: 'no-unsafe-selectors',
|
|
@@ -128,7 +127,7 @@ const rule = createLintRuleWithTypedConfig({
|
|
|
128
127
|
return;
|
|
129
128
|
}
|
|
130
129
|
try {
|
|
131
|
-
const selectorList =
|
|
130
|
+
const selectorList = parseSelector(context, selectorText);
|
|
132
131
|
selectorList.nodes.forEach(selector => lintSelector({
|
|
133
132
|
context,
|
|
134
133
|
sourceNode: key,
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import cssSelectorParser from 'postcss-selector-parser';
|
|
2
|
+
import { getSourceCode } from '@atlaskit/eslint-utils/context-compat';
|
|
3
|
+
const cssSelectorProcessor = cssSelectorParser();
|
|
4
|
+
const selectorCache = new WeakMap();
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Parse each selector once per linted source file. Return a clone so selector traversal state is
|
|
8
|
+
* not shared between rules.
|
|
9
|
+
*/
|
|
10
|
+
export function parseSelector(context, selectorText) {
|
|
11
|
+
const sourceCode = getSourceCode(context);
|
|
12
|
+
let sourceFileCache = selectorCache.get(sourceCode);
|
|
13
|
+
if (!sourceFileCache) {
|
|
14
|
+
sourceFileCache = new Map();
|
|
15
|
+
selectorCache.set(sourceCode, sourceFileCache);
|
|
16
|
+
}
|
|
17
|
+
const cachedSelector = sourceFileCache.get(selectorText);
|
|
18
|
+
if (cachedSelector) {
|
|
19
|
+
return cachedSelector.clone();
|
|
20
|
+
}
|
|
21
|
+
const selector = cssSelectorProcessor.astSync(selectorText);
|
|
22
|
+
sourceFileCache.set(selectorText, selector);
|
|
23
|
+
return selector.clone();
|
|
24
|
+
}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import _toArray from "@babel/runtime/helpers/toArray";
|
|
2
2
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
3
|
-
import
|
|
3
|
+
import { isNesting, isPseudo } from 'postcss-selector-parser';
|
|
4
4
|
import { getScope } from '@atlaskit/eslint-utils/context-compat';
|
|
5
5
|
import { importSources } from '@atlaskit/eslint-utils/schema';
|
|
6
6
|
import { walkStyleProperties } from '@atlaskit/eslint-utils/walk-style-properties';
|
|
7
7
|
import { createLintRuleWithTypedConfig } from '../utils/create-rule-with-typed-config';
|
|
8
|
+
import { parseSelector } from '../utils/parse-selector';
|
|
8
9
|
var getCssSelector = function getCssSelector(key) {
|
|
9
10
|
if (key.type === 'Literal' && typeof key.value === 'string') {
|
|
10
11
|
return key.value;
|
|
@@ -31,7 +32,6 @@ function isAllowedSelector(selector) {
|
|
|
31
32
|
var isTailAllowed = tail.every(isPseudo);
|
|
32
33
|
return isHeadAllowed && isTailAllowed;
|
|
33
34
|
}
|
|
34
|
-
var cssSelectorProcessor = cssSelectorParser();
|
|
35
35
|
var rule = createLintRuleWithTypedConfig({
|
|
36
36
|
meta: {
|
|
37
37
|
name: 'no-nested-selectors',
|
|
@@ -74,7 +74,7 @@ var rule = createLintRuleWithTypedConfig({
|
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
try {
|
|
77
|
-
var selectorList =
|
|
77
|
+
var selectorList = parseSelector(context, selectorText);
|
|
78
78
|
if (!selectorList.nodes.every(isAllowedSelector)) {
|
|
79
79
|
context.report({
|
|
80
80
|
messageId: 'no-nested-selectors',
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import cssSelectorParser from 'postcss-selector-parser';
|
|
2
1
|
import { getScope } from '@atlaskit/eslint-utils/context-compat';
|
|
3
2
|
import { isXcss } from '@atlaskit/eslint-utils/is-supported-import';
|
|
4
3
|
import { importSources } from '@atlaskit/eslint-utils/schema';
|
|
5
4
|
import { walkStyleProperties } from '@atlaskit/eslint-utils/walk-style-properties';
|
|
6
5
|
import { createLintRuleWithTypedConfig } from '../utils/create-rule-with-typed-config';
|
|
6
|
+
import { parseSelector } from '../utils/parse-selector';
|
|
7
7
|
import { lintSelector } from './lint-selector';
|
|
8
8
|
import { walkCssMap } from './walk-css-map';
|
|
9
9
|
var ignoredAtRules = new Set(['@container',
|
|
@@ -11,7 +11,6 @@ var ignoredAtRules = new Set(['@container',
|
|
|
11
11
|
'@media',
|
|
12
12
|
// ignored because it's covered by `no-nested-styles`
|
|
13
13
|
'@supports', '@property', '@starting-style']);
|
|
14
|
-
var cssSelectorProcessor = cssSelectorParser();
|
|
15
14
|
var rule = createLintRuleWithTypedConfig({
|
|
16
15
|
meta: {
|
|
17
16
|
name: 'no-unsafe-selectors',
|
|
@@ -124,7 +123,7 @@ var rule = createLintRuleWithTypedConfig({
|
|
|
124
123
|
return;
|
|
125
124
|
}
|
|
126
125
|
try {
|
|
127
|
-
var selectorList =
|
|
126
|
+
var selectorList = parseSelector(context, selectorText);
|
|
128
127
|
selectorList.nodes.forEach(function (selector) {
|
|
129
128
|
return lintSelector({
|
|
130
129
|
context: context,
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import cssSelectorParser from 'postcss-selector-parser';
|
|
2
|
+
import { getSourceCode } from '@atlaskit/eslint-utils/context-compat';
|
|
3
|
+
var cssSelectorProcessor = cssSelectorParser();
|
|
4
|
+
var selectorCache = new WeakMap();
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Parse each selector once per linted source file. Return a clone so selector traversal state is
|
|
8
|
+
* not shared between rules.
|
|
9
|
+
*/
|
|
10
|
+
export function parseSelector(context, selectorText) {
|
|
11
|
+
var sourceCode = getSourceCode(context);
|
|
12
|
+
var sourceFileCache = selectorCache.get(sourceCode);
|
|
13
|
+
if (!sourceFileCache) {
|
|
14
|
+
sourceFileCache = new Map();
|
|
15
|
+
selectorCache.set(sourceCode, sourceFileCache);
|
|
16
|
+
}
|
|
17
|
+
var cachedSelector = sourceFileCache.get(selectorText);
|
|
18
|
+
if (cachedSelector) {
|
|
19
|
+
return cachedSelector.clone();
|
|
20
|
+
}
|
|
21
|
+
var selector = cssSelectorProcessor.astSync(selectorText);
|
|
22
|
+
sourceFileCache.set(selectorText, selector);
|
|
23
|
+
return selector.clone();
|
|
24
|
+
}
|
|
@@ -13,6 +13,6 @@ type HasAllUnique<Tuple, Union, Seen = never> = Tuple extends readonly [infer He
|
|
|
13
13
|
* Exporting this so it isn't considered unused.
|
|
14
14
|
*/
|
|
15
15
|
export type _ = Validate<HasAllUnique<typeof cssPseudos, CSSPseudos>>;
|
|
16
|
-
declare const cssPseudos: readonly [
|
|
16
|
+
declare const cssPseudos: readonly ['&:active', '&:autofill', '&:blank', '&:checked', '&:default', '&:defined', '&:disabled', '&:empty', '&:enabled', '&:first', '&:focus', '&:focus-visible', '&:focus-within', '&:fullscreen', '&:hover', '&:in-range', '&:indeterminate', '&:invalid', '&:left', '&:link', '&:local-link', '&:optional', '&:out-of-range', '&:paused', '&:picture-in-picture', '&:placeholder-shown', '&:playing', '&:popover-open', '&:read-only', '&:read-write', '&:required', '&:right', '&:target', '&:user-invalid', '&:user-valid', '&:valid', '&:visited', '&::after', '&::backdrop', '&::before', '&::cue', '&::cue-region', '&::first-letter', '&::first-line', '&::grammar-error', '&::marker', '&::placeholder', '&::selection', '&::spelling-error', '&::target-text', '&::view-transition', '&::-webkit-details-marker', '&:active:visited', '&:focus:not(:focus-visible)', '&:focus::after', '&:focus::before', '&:focus-visible::after', '&:focus-visible::before', '&:focus-within::after', '&:focus-within::before', '&:hover::after', '&:hover::before', '&:visited:active', '&:visited:hover', '&:visited:focus', '&:visited:focus-visible', '&:visited:focus-within'];
|
|
17
17
|
export declare const allowedPseudos: Set<string>;
|
|
18
18
|
export {};
|
|
@@ -14,5 +14,5 @@ export interface LintRuleMeta<Schema extends JSONSchema> extends Omit<BaseLintRu
|
|
|
14
14
|
schema: Schema;
|
|
15
15
|
}
|
|
16
16
|
export declare const createLintRuleWithTypedConfig: <Schema extends JSONSchema & {
|
|
17
|
-
type:
|
|
17
|
+
type: 'object';
|
|
18
18
|
}, Config = FromSchema<Schema>>(rule: LintRule<Schema, Config>) => Rule.RuleModule;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { Rule } from 'eslint';
|
|
2
|
+
import cssSelectorParser from 'postcss-selector-parser';
|
|
3
|
+
declare const cssSelectorProcessor: ReturnType<typeof cssSelectorParser>;
|
|
4
|
+
type ParsedSelector = ReturnType<typeof cssSelectorProcessor.astSync>;
|
|
5
|
+
/**
|
|
6
|
+
* Parse each selector once per linted source file. Return a clone so selector traversal state is
|
|
7
|
+
* not shared between rules.
|
|
8
|
+
*/
|
|
9
|
+
export declare function parseSelector(context: Rule.RuleContext, selectorText: string): ParsedSelector;
|
|
10
|
+
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/eslint-plugin-ui-styling-standard",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.3",
|
|
4
4
|
"author": "Atlassian Pty Ltd",
|
|
5
5
|
"description": "The eslint plugin to enforce and educate on Atlassian's UI Styling Standard",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
],
|
|
29
29
|
"atlaskit:src": "src/index.tsx",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@atlaskit/eslint-plugin-design-system": "^16.
|
|
32
|
-
"@atlaskit/eslint-utils": "^3.
|
|
31
|
+
"@atlaskit/eslint-plugin-design-system": "^16.11.0",
|
|
32
|
+
"@atlaskit/eslint-utils": "^3.1.0",
|
|
33
33
|
"@babel/runtime": "^7.0.0",
|
|
34
34
|
"@typescript-eslint/utils": "^7.1.0",
|
|
35
35
|
"ajv": "^6.12.6",
|