chore: wip

chrisbbreuer · chrisbbreuer · commit 1f5871314680 · 2023-11-04T18:11:55.000-07:00
diff --git a/.stacks/core/eslint-config/src/configs/index.ts b/.stacks/core/eslint-config/src/configs/index.ts
@@ -13,4 +13,4 @@ export * from './unicorn'
 export * from './vue'
 export * from './yaml'
 export * from './test'
-export * from './sort-keys'
+export * from './perfectionist'
diff --git a/.stacks/core/eslint-config/src/configs/javascript.ts b/.stacks/core/eslint-config/src/configs/javascript.ts
@@ -42,7 +42,6 @@ export function javascript(options: OptionsIsInEditor & OptionsOverrides = {}):
         'accessor-pairs': ['error', { enforceForClassMembers: true, setWithoutGet: true }],
 
         'array-callback-return': 'error',
-        'arrow-parens': ['error', 'as-needed', { requireForBlockBody: true }],
         'block-scoped-var': 'error',
         'constructor-super': 'error',
         'default-case-last': 'error',
@@ -158,7 +157,6 @@ export function javascript(options: OptionsIsInEditor & OptionsOverrides = {}):
         'no-useless-rename': 'error',
         'no-useless-return': 'error',
         'no-var': 'error',
-        'no-void': 'error',
         'no-with': 'error',
         'object-shorthand': [
           'error',
diff --git a/.stacks/core/eslint-config/src/configs/jsonc.ts b/.stacks/core/eslint-config/src/configs/jsonc.ts
@@ -4,8 +4,8 @@ import { parserJsonc, pluginJsonc } from '../plugins'
 
 export function jsonc(options: OptionsStylistic & OptionsOverrides = {}): ConfigItem[] {
   const {
-    stylistic = true,
     overrides = {},
+    stylistic = true,
   } = options
 
   const {
diff --git a/.stacks/core/eslint-config/src/configs/markdown.ts b/.stacks/core/eslint-config/src/configs/markdown.ts
@@ -37,17 +37,19 @@ export function markdown(options: OptionsComponentExts & OptionsOverrides = {}):
         'antfu/no-cjs-exports': 'off',
         'antfu/no-ts-export-equal': 'off',
 
+        'import/newline-after-import': 'off',
+
         'no-alert': 'off',
         'no-console': 'off',
         'no-undef': 'off',
         'no-unused-expressions': 'off',
+
         'no-unused-vars': 'off',
 
         'node/prefer-global/process': 'off',
-
         'style/comma-dangle': 'off',
-        'style/eol-last': 'off',
 
+        'style/eol-last': 'off',
         'ts/consistent-type-imports': 'off',
         'ts/no-namespace': 'off',
         'ts/no-redeclare': 'off',
diff --git a/.stacks/core/eslint-config/src/configs/perfectionist.ts b/.stacks/core/eslint-config/src/configs/perfectionist.ts
@@ -0,0 +1,18 @@
+import type { ConfigItem } from '../types'
+import { pluginPerfectionist } from '../plugins'
+
+/**
+ * Optional perfectionist plugin for props and items sorting.
+ *
+ * @see https://github.com/azat-io/eslint-plugin-perfectionist
+ */
+export function perfectionist(): ConfigItem[] {
+  return [
+    {
+      name: 'antfu:perfectionist',
+      plugins: {
+        perfectionist: pluginPerfectionist,
+      },
+    },
+  ]
+}
diff --git a/.stacks/core/eslint-config/src/configs/sort-keys.ts b/.stacks/core/eslint-config/src/configs/sort-keys.ts
diff --git a/.stacks/core/eslint-config/src/configs/stylistic.ts b/.stacks/core/eslint-config/src/configs/stylistic.ts
@@ -4,8 +4,8 @@ import { pluginAntfu, pluginStylistic } from '../plugins'
 export function stylistic(options: StylisticConfig = {}): ConfigItem[] {
   const {
     indent = 2,
-    quotes = 'single',
     jsx = true,
+    quotes = 'single',
   } = options
 
   return [
@@ -23,6 +23,7 @@ export function stylistic(options: StylisticConfig = {}): ConfigItem[] {
         'curly': ['error', 'multi-or-nest', 'consistent'],
 
         'style/array-bracket-spacing': ['error', 'never'],
+        'style/arrow-parens': ['error', 'as-needed', { requireForBlockBody: true }],
         'style/arrow-spacing': ['error', { after: true, before: true }],
         'style/block-spacing': ['error', 'always'],
         'style/brace-style': ['error', 'stroustrup', { allowSingleLine: true }],
@@ -35,14 +36,9 @@ export function stylistic(options: StylisticConfig = {}): ConfigItem[] {
         'style/indent': ['error', indent, {
           ArrayExpression: 1,
           CallExpression: { arguments: 1 },
+          flatTernaryExpressions: false,
           FunctionDeclaration: { body: 1, parameters: 1 },
           FunctionExpression: { body: 1, parameters: 1 },
-          ImportDeclaration: 1,
-          MemberExpression: 1,
-          ObjectExpression: 1,
-          SwitchCase: 1,
-          VariableDeclarator: 1,
-          flatTernaryExpressions: false,
           ignoreComments: false,
           ignoredNodes: [
             'TemplateLiteral *',
@@ -67,10 +63,14 @@ export function stylistic(options: StylisticConfig = {}): ConfigItem[] {
             'FunctionExpression > .params > :matches(Decorator, :not(:first-child))',
             'ClassBody.body > PropertyDefinition[decorators.length > 0] > .key',
           ],
+          ImportDeclaration: 1,
+          MemberExpression: 1,
+          ObjectExpression: 1,
           offsetTernaryExpressions: true,
           outerIIFEBody: 1,
+          SwitchCase: 1,
+          VariableDeclarator: 1,
         }],
-
         'style/key-spacing': ['error', { afterColon: true, beforeColon: false }],
         'style/keyword-spacing': ['error', { after: true, before: true }],
         'style/lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }],
@@ -95,7 +95,6 @@ export function stylistic(options: StylisticConfig = {}): ConfigItem[] {
         'style/no-trailing-spaces': 'error',
         'style/no-whitespace-before-property': 'error',
         'style/object-curly-spacing': ['error', 'always'],
-        'style/object-property-newline': ['error', { allowMultiplePropertiesPerLine: true }],
         'style/operator-linebreak': ['error', 'before'],
         'style/padded-blocks': ['error', { blocks: 'never', classes: 'never', switches: 'never' }],
         'style/quote-props': ['error', 'consistent-as-needed'],
diff --git a/.stacks/core/eslint-config/src/configs/typescript.ts b/.stacks/core/eslint-config/src/configs/typescript.ts
@@ -1,8 +1,8 @@
 import process from 'node:process'
+import type { ConfigItem, OptionsComponentExts, OptionsOverrides, OptionsTypeScriptParserOptions, OptionsTypeScriptWithTypes } from '../types'
 import { GLOB_SRC } from '../globs'
 import { parserTs, pluginAntfu, pluginImport, pluginTs } from '../plugins'
-import type { ConfigItem, OptionsComponentExts, OptionsOverrides, OptionsTypeScriptParserOptions, OptionsTypeScriptWithTypes } from '../types'
-import { renameRules } from '../utils'
+import { renameRules, toArray } from '../utils'
 
 export function typescript(
   options?: OptionsComponentExts & OptionsOverrides & OptionsTypeScriptWithTypes & OptionsTypeScriptParserOptions,
@@ -11,7 +11,6 @@ export function typescript(
     componentExts = [],
     overrides = {},
     parserOptions = {},
-    tsconfigPath,
   } = options ?? {}
 
   const typeAwareRules: ConfigItem['rules'] = {
@@ -36,6 +35,10 @@ export function typescript(
     'ts/unbound-method': 'error',
   }
 
+  const tsconfigPath = options?.tsconfigPath
+    ? toArray(options.tsconfigPath)
+    : undefined
+
   return [
     {
       // Install the plugins without globs, so they can be configured separately.
@@ -54,10 +57,11 @@ export function typescript(
       languageOptions: {
         parser: parserTs,
         parserOptions: {
+          extraFileExtensions: componentExts.map(ext => `.${ext}`),
           sourceType: 'module',
           ...tsconfigPath
             ? {
-                project: [tsconfigPath],
+                project: tsconfigPath,
                 tsconfigRootDir: process.cwd(),
               }
             : {},
diff --git a/.stacks/core/eslint-config/src/configs/vue.ts b/.stacks/core/eslint-config/src/configs/vue.ts
@@ -47,9 +47,7 @@ export function vue(
         'vue/block-order': ['error', {
           order: ['script', 'template', 'style'],
         }],
-        'vue/component-name-in-template-casing': ['error', 'PascalCase', {
-          registeredComponentsOnly: false,
-        }],
+        'vue/component-name-in-template-casing': ['error', 'PascalCase'],
         'vue/component-options-name-casing': ['error', 'PascalCase'],
         'vue/custom-event-name-casing': ['error', 'camelCase'],
         'vue/define-macros-order': ['error', {
@@ -89,6 +87,7 @@ export function vue(
         ],
         'vue/prefer-separate-static-class': 'error',
         'vue/prefer-template': 'error',
+        'vue/prop-name-casing': ['error', 'camelCase'],
         'vue/require-default-prop': 'off',
         'vue/require-prop-types': 'off',
         'vue/space-infix-ops': 'error',
diff --git a/.stacks/core/eslint-config/src/factory.ts b/.stacks/core/eslint-config/src/factory.ts
@@ -12,7 +12,7 @@ import {
   jsonc,
   markdown,
   node,
-  sortKeys,
+  perfectionist,
   sortPackageJson,
   sortTsconfig,
   stylistic,
@@ -47,12 +47,12 @@ const VuePackages = [
  */
 export function antfu(options: OptionsConfig & ConfigItem = {}, ...userConfigs: (ConfigItem | ConfigItem[])[]) {
   const {
-    isInEditor = !!((process.env.VSCODE_PID || process.env.JETBRAINS_IDE) && !process.env.CI),
-    vue: enableVue = VuePackages.some(i => isPackageExists(i)),
-    typescript: enableTypeScript = isPackageExists('typescript'),
+    componentExts = [],
     gitignore: enableGitignore = true,
+    isInEditor = !!((process.env.VSCODE_PID || process.env.JETBRAINS_IDE) && !process.env.CI),
     overrides = {},
-    componentExts = [],
+    typescript: enableTypeScript = isPackageExists('typescript'),
+    vue: enableVue = VuePackages.some(i => isPackageExists(i)),
   } = options
 
   const stylisticOptions = options.stylistic === false
@@ -92,8 +92,8 @@ export function antfu(options: OptionsConfig & ConfigItem = {}, ...userConfigs:
     }),
     unicorn(),
 
-    // Optional plugins (not enabled by default)
-    sortKeys(),
+    // Optional plugins (installed but not enabled by default)
+    perfectionist(),
   )
 
   if (enableVue)
diff --git a/.stacks/core/eslint-config/src/index.ts b/.stacks/core/eslint-config/src/index.ts
@@ -1,10 +1,10 @@
 import { antfu as stacks } from './factory'
 
-export * from './configs'
+export * from './types'
 export * from './factory'
-export * from './globs'
+export * from './configs'
 export * from './plugins'
-export * from './types'
 export * from './utils'
+export * from './globs'
 
 export default stacks
diff --git a/.stacks/core/eslint-config/src/plugins.ts b/.stacks/core/eslint-config/src/plugins.ts
@@ -1,22 +1,24 @@
+// eslint-disable-next-line ts/ban-ts-comment
 // @ts-nocheck
 
-export { default as pluginStylistic } from '@stylistic/eslint-plugin'
-export { default as pluginTs } from '@typescript-eslint/eslint-plugin'
-export * as parserTs from '@typescript-eslint/parser'
 export { default as pluginAntfu } from 'eslint-plugin-antfu'
 export { default as pluginComments } from 'eslint-plugin-eslint-comments'
 export * as pluginImport from 'eslint-plugin-i'
 export { default as pluginJsdoc } from 'eslint-plugin-jsdoc'
 export * as pluginJsonc from 'eslint-plugin-jsonc'
 export { default as pluginMarkdown } from 'eslint-plugin-markdown'
 export { default as pluginNode } from 'eslint-plugin-n'
-export { default as pluginNoOnlyTests } from 'eslint-plugin-no-only-tests'
-export { default as pluginSortKeys } from 'eslint-plugin-sort-keys'
+export { default as pluginStylistic } from '@stylistic/eslint-plugin'
+export { default as pluginTs } from '@typescript-eslint/eslint-plugin'
 export { default as pluginUnicorn } from 'eslint-plugin-unicorn'
 export { default as pluginUnusedImports } from 'eslint-plugin-unused-imports'
-export { default as pluginVitest } from 'eslint-plugin-vitest'
 export { default as pluginVue } from 'eslint-plugin-vue'
 export * as pluginYaml from 'eslint-plugin-yml'
-export { default as parserJsonc } from 'jsonc-eslint-parser'
+export { default as pluginNoOnlyTests } from 'eslint-plugin-no-only-tests'
+export { default as pluginVitest } from 'eslint-plugin-vitest'
+export { default as pluginPerfectionist } from 'eslint-plugin-perfectionist'
+
+export * as parserTs from '@typescript-eslint/parser'
 export { default as parserVue } from 'vue-eslint-parser'
 export { default as parserYaml } from 'yaml-eslint-parser'
+export { default as parserJsonc } from 'jsonc-eslint-parser'
diff --git a/.stacks/core/eslint-config/src/types.ts b/.stacks/core/eslint-config/src/types.ts
@@ -1,3 +1,5 @@
+import type { FlatGitignoreOptions } from 'eslint-config-flat-gitignore'
+import type { ParserOptions } from '@typescript-eslint/parser'
 import type {
   EslintCommentsRules,
   EslintRules,
@@ -17,25 +19,20 @@ import type {
   VueRules,
   YmlRules,
 } from '@antfu/eslint-define-config'
-import type { UnprefixedRuleOptions } from '@stylistic/eslint-plugin'
-import type { ParserOptions } from '@typescript-eslint/parser'
-import type { FlatGitignoreOptions } from 'eslint-config-flat-gitignore'
 import type { Rules as AntfuRules } from 'eslint-plugin-antfu'
+import type { UnprefixedRuleOptions } from '@stylistic/eslint-plugin'
 
 type StylisticMergedRules = MergeIntersection<
   EslintRules &
   Unprefix<ReactRules, 'react/'> &
-  Unprefix<TypeScriptRules, 'ts/'>
+  Unprefix<TypeScriptRules, '@typescript-eslint/'>
+  & { 'jsx-self-closing-comp': ReactRules['react/self-closing-comp'] }
 >
 
-type CommonKeys<T1, T2> = Extract<keyof T1, keyof T2>
-
-type StylisticRules = Pick<StylisticMergedRules, CommonKeys<StylisticMergedRules, UnprefixedRuleOptions>>
-// below throws an error atm
-// type StylisticRules = Pick<StylisticMergedRules, keyof UnprefixedRuleOptions>
+type StylisticRules = Pick<StylisticMergedRules, keyof UnprefixedRuleOptions>
 
 export type Rules = MergeIntersection<
-  RenamePrefix<TypeScriptRules, 'ts/', 'ts/'> &
+  RenamePrefix<TypeScriptRules, '@typescript-eslint/', 'ts/'> &
   RenamePrefix<VitestRules, 'vitest/', 'test/'> &
   RenamePrefix<YmlRules, 'yml/', 'yaml/'> &
   RenamePrefix<NRules, 'n/', 'node/'> &
@@ -89,7 +86,7 @@ export interface OptionsTypeScriptWithTypes {
    * When this options is provided, type aware rules will be enabled.
    * @see https://typescript-eslint.io/linting/typed-linting/
    */
-  tsconfigPath?: string
+  tsconfigPath?: string | string[]
 }
 
 export interface OptionsHasTypeScript {
@@ -132,7 +129,7 @@ export interface OptionsConfig extends OptionsComponentExts {
    *
    * @default auto-detect based on the dependencies
    */
-  typescript?: boolean | OptionsTypeScriptWithTypes
+  typescript?: boolean | OptionsTypeScriptWithTypes | OptionsTypeScriptParserOptions
 
   /**
    * Enable JSX related rules.
diff --git a/.stacks/core/eslint-config/src/utils.ts b/.stacks/core/eslint-config/src/utils.ts
@@ -4,7 +4,7 @@ import type { ConfigItem } from './types'
  * Combine array and non-array configs into a single array.
  */
 export function combine(...configs: (ConfigItem | ConfigItem[])[]): ConfigItem[] {
-  return configs.flatMap(config => Array.isArray(config) ? config : [config])
+  return configs.flat()
 }
 
 export function renameRules(rules: Record<string, any>, from: string, to: string) {
@@ -17,3 +17,7 @@ export function renameRules(rules: Record<string, any>, from: string, to: string
       }),
   )
 }
+
+export function toArray<T>(value: T | T[]): T[] {
+  return Array.isArray(value) ? value : [value]
+}
diff --git a/.stacks/core/path/src/index.ts b/.stacks/core/path/src/index.ts
@@ -92,7 +92,7 @@ export function buildEnginePath(path?: string) {
 }
 
 export function libsPath(path?: string) {
-  return frameworkPath(`libs/${path || ''}`)
+  return frameworkStoragePath(`libs/${path || ''}`)
 }
 
 export function libsEntriesPath(path?: string) {
