Merge pull request #922 from 3YOURMIND/place-rule-into-requiring-types

fix(eslint): put restrict-template-expressions into rules for which types are required
3YOURMIND · May 15, 2024 · 620e3ec · 620e3ec
2 parents c0407c7 + 8ea4714
commit 620e3ec
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 34 deletions.
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -61,5 +61,5 @@
 	},
 	"type": "module",
 	"types": "./dist/mjs/index.d.ts",
-	"version": "0.0.2"
+	"version": "0.0.3"
 }
diff --git a/packages/eslint-config/source/index.ts b/packages/eslint-config/source/index.ts
@@ -130,17 +130,6 @@ const baseConfig = tseslint.config({
 			{ argsIgnorePattern: '^_', destructuredArrayIgnorePattern: '^_' },
 		],
 		'@typescript-eslint/no-use-before-define': 'error',
-		'@typescript-eslint/restrict-template-expressions': [
-			'error',
-			{
-				allowAny: false,
-				allowBoolean: false,
-				allowNullish: false,
-				allowNumber: true,
-				allowRegExp: false,
-				allowNever: false,
-			},
-		],
 
 		// Eslint
 		'dot-notation': 'warn',
@@ -274,6 +263,17 @@ const rulesRequiringTypes = {
 	'@typescript-eslint/no-unnecessary-type-assertion': 'error',
 	'@typescript-eslint/prefer-nullish-coalescing': 'warn',
 	'@typescript-eslint/prefer-optional-chain': 'warn',
+	'@typescript-eslint/restrict-template-expressions': [
+		'error',
+		{
+			allowAny: false,
+			allowBoolean: false,
+			allowNullish: false,
+			allowNumber: true,
+			allowRegExp: false,
+			allowNever: false,
+		},
+	],
 	'@typescript-eslint/switch-exhaustiveness-check': 'error',
 } satisfies SharedConfig.RulesRecord
 
@@ -375,11 +375,6 @@ export default {
 			plugins: { vitest },
 			extends: [vitest.configs.recommended, ...baseConfig],
 			rules: {
-				'no-console': 'off',
-				'no-magic-numbers': 'off',
-				'vitest/no-disabled-tests': 'error',
-				'vitest/no-identical-title': 'error',
-				'vue/one-component-per-file': 'off',
 				'@typescript-eslint/ban-ts-comment': 'off',
 				'@typescript-eslint/explicit-module-boundary-types': 'off',
 				'@typescript-eslint/naming-convention': 'off',
@@ -388,9 +383,15 @@ export default {
 				'@typescript-eslint/no-explicit-any': 'off',
 				'@typescript-eslint/no-unsafe-assignment': 'off',
 				'@typescript-eslint/no-unsafe-call': 'off',
-				'@typescript-eslint/no-unsafe-return': 'off',
 				'@typescript-eslint/no-unsafe-member-access': 'off',
+				'@typescript-eslint/no-unsafe-return': 'off',
 				'@typescript-eslint/no-use-before-define': 'off',
+				'@typescript-eslint/restrict-template-expressions': 'off',
+				'no-console': 'off',
+				'no-magic-numbers': 'off',
+				'vitest/no-disabled-tests': 'error',
+				'vitest/no-identical-title': 'error',
+				'vue/one-component-per-file': 'off',
 			},
 		}),
 		/**
@@ -447,7 +448,7 @@ export default {
 				'vue/no-empty-component-block': 'error',
 				'vue/no-mutating-props': 'error',
 				'vue/no-ref-as-operand': 'error',
-				'vue/no-setup-props-destructure': 'error',
+				'vue/no-setup-props-reactivity-loss': 'error',
 				'vue/no-unused-properties': 'error',
 				'vue/no-unused-refs': 'error',
 				'vue/no-useless-mustaches': ['warn', { ignoreIncludesComment: true }],

diff --git a/packages/eslint-config/source/rules/vue-no-v-t-without-translation.ts b/packages/eslint-config/source/rules/vue-no-v-t-without-translation.ts
@@ -41,17 +41,17 @@ export default createRule({
 							},
 						],
 					},
-					definitions: {
-						nestedObject: {
-							type: 'object',
-							additionalProperties: {
-								anyOf: [
-									{ type: 'string' },
-									{
-										$ref: '#/definitions/nestedObject',
-									},
-								],
-							},
+				},
+				definitions: {
+					nestedObject: {
+						type: 'object',
+						additionalProperties: {
+							anyOf: [
+								{ type: 'string' },
+								{
+									$ref: '#/definitions/nestedObject',
+								},
+							],
 						},
 					},
 				},

diff --git a/packages/kotti-ui/source/kotti-comment/KtCommentInput.vue b/packages/kotti-ui/source/kotti-comment/KtCommentInput.vue
@@ -29,7 +29,7 @@ export default defineComponent({
 	},
 	props: makeProps(KottiCommentInput.propsSchema),
 	setup(props, { emit }) {
-		// eslint-disable-next-line vue/no-setup-props-destructure
+		// eslint-disable-next-line vue/no-setup-props-reactivity-loss
 		const localIsInternal = ref<KottiComment.PropsInternal['isInternal']>(
 			props.isInternal,
 		)

diff --git a/packages/kotti-ui/source/kotti-form-controller-list/components/FormControllerListItem.vue b/packages/kotti-ui/source/kotti-form-controller-list/components/FormControllerListItem.vue
@@ -25,7 +25,7 @@ export default defineComponent({
 		},
 	},
 	setup(props, { emit }) {
-		/* eslint-disable vue/no-setup-props-destructure */
+		/* eslint-disable vue/no-setup-props-reactivity-loss */
 		/**
 		 * FIXME: This is not reactive and will likely cause issues. Fixing this
 		 * would require adjusting types in KottiForm.Context to support computed
@@ -46,7 +46,6 @@ export default defineComponent({
 			validators: props.context.validators,
 			values: computed(() => props.values),
 		})
-		/* eslint-enable vue/no-setup-props-destructure */
 	},
 })
 </script>
diff --git a/packages/kotti-ui/source/make-props.test.ts b/packages/kotti-ui/source/make-props.test.ts
@@ -28,7 +28,6 @@ expect.extend({
 		return {
 			message: () => {
 				if (!passNoDefault)
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					return `Expected “prop.default” to be “undefined”. Was “${prop.default}”`
 				if (!passRequired)
 					return `Expected “prop.required” to be “true”. Was “${String(prop.required)}”`