@sabzidev/eslint-rules 1.0.7 → 1.0.9

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.
Files changed (3) hide show
  1. package/README.md +1 -1
  2. package/dist/index.js +63 -42
  3. package/package.json +1 -1
package/README.md CHANGED
@@ -74,7 +74,7 @@ export default defineConfig([
74
74
  "@sabzidev/padding-before-jump-statement": "warn",
75
75
  "@sabzidev/sort-comments": "warn",
76
76
  "@sabzidev/sort-jsx-props": "warn",
77
- "@sabzidev/sort-object-props": "warn",
77
+ "@sabzidev/sort-props": "warn",
78
78
  },
79
79
  },
80
80
  ]);
package/dist/index.js CHANGED
@@ -17,7 +17,7 @@ var e = {
17
17
  },
18
18
  license: "MIT",
19
19
  author: "Abolfazl Sabzmohammadi <SabziDev@gmail.com> (https://Sabzi.Dev)",
20
- version: "1.0.7",
20
+ version: "1.0.9",
21
21
  type: "module",
22
22
  main: "./dist/index.js",
23
23
  exports: "./dist/index.js",
@@ -421,8 +421,10 @@ var e = {
421
421
  wrongOrder: "Object properties should be ordered!",
422
422
  wrongDestructure: "Destructured properties should be ordered!",
423
423
  wrongParams: "Function parameters should be ordered!",
424
+ wrongCallArguments: "Function call arguments should be ordered!",
424
425
  wrongTypeProperties: "Type properties should be ordered!"
425
- }
426
+ },
427
+ schema: []
426
428
  },
427
429
  create(e) {
428
430
  let { sourceCode: t } = e, n = new Set(l), r = (e) => /^on[A-Z]/.test(e), i = (e) => {
@@ -470,42 +472,60 @@ var e = {
470
472
  if (!r || r.length <= 1) return;
471
473
  let i = d(r);
472
474
  g(e, r, i, n, (e) => e.map((e) => t.getText(e)).join(", "));
473
- }, v = (n) => {
474
- let { params: a } = n;
475
- if (!a || a.length === 0) return;
476
- for (let e of a) e.type === "ObjectPattern" && _(e, "wrongParams");
477
- if (a.length <= 1 || a.some((e) => e.type !== "Identifier")) return;
478
- let o = (e) => {
479
- let t = l.indexOf(e);
480
- return t === -1 ? r(e) ? {
481
- category: 2,
482
- priority: i(e)
483
- } : e === "className" ? {
484
- category: 3,
485
- priority: 0
486
- } : {
487
- category: e === "style" ? 4 : 1,
488
- priority: 0
489
- } : {
490
- category: 0,
491
- priority: t
492
- };
493
- }, s = a.map((e, t) => ({
494
- param: e,
495
- index: t,
496
- ...o(e.name)
497
- })).sort((e, t) => e.category === t.category ? e.priority === t.priority ? e.index - t.index : e.priority - t.priority : e.category - t.category).map(({ param: e }) => e);
498
- if (!p(a, s)) return;
499
- let c = a[0], u = a.at(-1);
475
+ }, v = (e) => {
476
+ let t = l.indexOf(e);
477
+ return t === -1 ? r(e) ? {
478
+ category: 2,
479
+ priority: i(e)
480
+ } : e === "className" ? {
481
+ category: 3,
482
+ priority: 0
483
+ } : {
484
+ category: e === "style" ? 4 : 1,
485
+ priority: 0
486
+ } : {
487
+ category: 0,
488
+ priority: t
489
+ };
490
+ }, y = (e) => e.map((e, t) => ({
491
+ item: e,
492
+ index: t,
493
+ ...v(e.name)
494
+ })).sort((e, t) => e.category === t.category ? e.priority === t.priority ? e.index - t.index : e.priority - t.priority : e.category - t.category).map(({ item: e }) => e), b = (n) => {
495
+ let { params: r } = n;
496
+ if (!r || r.length === 0) return;
497
+ for (let e of r) e.type === "ObjectPattern" && _(e, "wrongParams");
498
+ if (r.length <= 1 || r.some((e) => e.type !== "Identifier")) return;
499
+ let i = y(r);
500
+ if (!p(r, i)) return;
501
+ let a = r[0], o = r.at(-1);
500
502
  e.report({
501
503
  node: n,
502
504
  messageId: "wrongParams",
503
505
  fix(e) {
504
- let n = s.map((e) => t.getText(e)).join(", ");
505
- return e.replaceTextRange([c.range[0], u.range[1]], n);
506
+ let n = i.map((e) => t.getText(e)).join(", ");
507
+ return e.replaceTextRange([a.range[0], o.range[1]], n);
508
+ }
509
+ });
510
+ }, x = (e) => e.type === "Identifier" ? e.name : e.type === "Literal" || e.type === "StringLiteral" || e.type === "NumericLiteral" ? String(e.value) : null, S = (n) => {
511
+ let { arguments: r } = n;
512
+ if (r.length <= 1 || r.some((e) => e.type === "SpreadElement" || x(e) === null)) return;
513
+ let i = r.map((e, t) => ({
514
+ argument: e,
515
+ index: t,
516
+ ...v(x(e))
517
+ })).sort((e, t) => e.category === t.category ? e.priority === t.priority ? e.index - t.index : e.priority - t.priority : e.category - t.category).map(({ argument: e }) => e);
518
+ if (!p(r, i)) return;
519
+ let a = r[0], o = r.at(-1);
520
+ e.report({
521
+ node: n,
522
+ messageId: "wrongCallArguments",
523
+ fix(e) {
524
+ let n = i.map((e) => t.getText(e)).join(", ");
525
+ return e.replaceTextRange([a.range[0], o.range[1]], n);
506
526
  }
507
527
  });
508
- }, y = (e) => {
528
+ }, C = (e) => {
509
529
  let t = e.body ?? e.members;
510
530
  if (!t || t.length <= 1) return;
511
531
  let n = f(t);
@@ -527,16 +547,17 @@ var e = {
527
547
  ObjectPattern(e) {
528
548
  _(e, "wrongDestructure");
529
549
  },
530
- TSTypeLiteral: y,
531
- TSInterfaceBody: y,
532
- FunctionDeclaration: v,
533
- FunctionExpression: v,
534
- ArrowFunctionExpression: v,
535
- TSDeclareFunction: v,
536
- TSFunctionType: v,
537
- TSCallSignatureDeclaration: v,
538
- TSConstructSignatureDeclaration: v,
539
- TSMethodSignature: v
550
+ TSTypeLiteral: C,
551
+ TSInterfaceBody: C,
552
+ FunctionDeclaration: b,
553
+ FunctionExpression: b,
554
+ ArrowFunctionExpression: b,
555
+ TSDeclareFunction: b,
556
+ TSFunctionType: b,
557
+ TSCallSignatureDeclaration: b,
558
+ TSConstructSignatureDeclaration: b,
559
+ TSMethodSignature: b,
560
+ CallExpression: S
540
561
  };
541
562
  }
542
563
  }
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  },
18
18
  "license": "MIT",
19
19
  "author": "Abolfazl Sabzmohammadi <SabziDev@gmail.com> (https://Sabzi.Dev)",
20
- "version": "1.0.7",
20
+ "version": "1.0.9",
21
21
  "type": "module",
22
22
  "main": "./dist/index.js",
23
23
  "exports": "./dist/index.js",