From aa01fd2efb55a7d76762a0d0f70cc928d518f2d4 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Fri, 11 Apr 2025 15:39:20 +0200 Subject: [PATCH 1/2] Increase `unicorn/prevent-abbreviations` ESLint rule severity --- eslint.config.mts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslint.config.mts b/eslint.config.mts index 494d492..6f9e521 100644 --- a/eslint.config.mts +++ b/eslint.config.mts @@ -94,7 +94,7 @@ export default typescriptEslint.config( 'unicorn/no-null': 'off', 'unicorn/no-useless-undefined': 'off', // conflicts with consistent-return 'unicorn/prevent-abbreviations': [ - 'warn', + 'error', { replacements: { prop: false, From 0838032c06f3885efd5ce96c52b4d51041e80640 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Fri, 11 Apr 2025 15:40:10 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Rename=20`util.ts`=20=E2=86=92=20`utilities?= =?UTF-8?q?.ts`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/prop-types/any.ts | 2 +- src/prop-types/array.ts | 2 +- src/prop-types/boolean.ts | 2 +- src/prop-types/date.ts | 2 +- src/prop-types/instanceOf.ts | 2 +- src/prop-types/integer.ts | 2 +- src/prop-types/number.ts | 2 +- src/prop-types/object.ts | 2 +- src/prop-types/oneOf.ts | 2 +- src/prop-types/oneOfTypes.ts | 2 +- src/prop-types/string.ts | 2 +- src/prop-types/symbol.ts | 2 +- src/prop-types/vueComponent.ts | 2 +- src/{util.ts => utilities.ts} | 0 type-tests/prop-types/any.type.spec.ts | 4 ++-- type-tests/prop-types/array.type.spec.ts | 4 ++-- type-tests/prop-types/boolean.type.spec.ts | 4 ++-- type-tests/prop-types/date.type.spec.ts | 4 ++-- type-tests/prop-types/function.type.spec.ts | 4 ++-- type-tests/prop-types/instanceOf.type.spec.ts | 4 ++-- type-tests/prop-types/integer.type.spec.ts | 4 ++-- type-tests/prop-types/number.type.spec.ts | 4 ++-- type-tests/prop-types/object.type.spec.ts | 4 ++-- type-tests/prop-types/oneOf.type.spec.ts | 4 ++-- type-tests/prop-types/oneOfObjectKeys.type.spec.ts | 4 ++-- type-tests/prop-types/oneOfTypes.type.spec.ts | 4 ++-- type-tests/prop-types/string.type.spec.ts | 4 ++-- type-tests/prop-types/symbol.type.spec.ts | 4 ++-- type-tests/prop-types/vueComponent.type.spec.ts | 4 ++-- type-tests/{utils.ts => utilities.ts} | 0 30 files changed, 43 insertions(+), 43 deletions(-) rename src/{util.ts => utilities.ts} (100%) rename type-tests/{utils.ts => utilities.ts} (100%) diff --git a/src/prop-types/any.ts b/src/prop-types/any.ts index f356a7a..8adef99 100644 --- a/src/prop-types/any.ts +++ b/src/prop-types/any.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** diff --git a/src/prop-types/array.ts b/src/prop-types/array.ts index 7ee6a7c..7340388 100644 --- a/src/prop-types/array.ts +++ b/src/prop-types/array.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** diff --git a/src/prop-types/boolean.ts b/src/prop-types/boolean.ts index bec7807..85e80a3 100644 --- a/src/prop-types/boolean.ts +++ b/src/prop-types/boolean.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** diff --git a/src/prop-types/date.ts b/src/prop-types/date.ts index f69e7ad..886708d 100644 --- a/src/prop-types/date.ts +++ b/src/prop-types/date.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator, PropType } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** diff --git a/src/prop-types/instanceOf.ts b/src/prop-types/instanceOf.ts index dba870d..32e0aee 100644 --- a/src/prop-types/instanceOf.ts +++ b/src/prop-types/instanceOf.ts @@ -1,5 +1,5 @@ import type { Constructor, PropOptionsGenerator } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; import { isInstanceOf } from '../validators'; diff --git a/src/prop-types/integer.ts b/src/prop-types/integer.ts index d2a5aec..fdefcb7 100644 --- a/src/prop-types/integer.ts +++ b/src/prop-types/integer.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; import { isInteger } from '../validators'; diff --git a/src/prop-types/number.ts b/src/prop-types/number.ts index b3e137d..81f0041 100644 --- a/src/prop-types/number.ts +++ b/src/prop-types/number.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator, PropType } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** diff --git a/src/prop-types/object.ts b/src/prop-types/object.ts index ae839bb..8004b1f 100644 --- a/src/prop-types/object.ts +++ b/src/prop-types/object.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** diff --git a/src/prop-types/oneOf.ts b/src/prop-types/oneOf.ts index 8998d06..9ff39dc 100644 --- a/src/prop-types/oneOf.ts +++ b/src/prop-types/oneOf.ts @@ -1,5 +1,5 @@ import type { PropConstructor, PropOptionsGenerator, PropType } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; import { isOneOf } from '../validators'; diff --git a/src/prop-types/oneOfTypes.ts b/src/prop-types/oneOfTypes.ts index ee17b07..541a047 100644 --- a/src/prop-types/oneOfTypes.ts +++ b/src/prop-types/oneOfTypes.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator, PropType } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** diff --git a/src/prop-types/string.ts b/src/prop-types/string.ts index 636b079..dcdbb63 100644 --- a/src/prop-types/string.ts +++ b/src/prop-types/string.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator, PropType } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** diff --git a/src/prop-types/symbol.ts b/src/prop-types/symbol.ts index e696c2b..ffa4c86 100644 --- a/src/prop-types/symbol.ts +++ b/src/prop-types/symbol.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; import { isSymbol } from '../validators'; diff --git a/src/prop-types/vueComponent.ts b/src/prop-types/vueComponent.ts index de80ea3..34f6ad4 100644 --- a/src/prop-types/vueComponent.ts +++ b/src/prop-types/vueComponent.ts @@ -1,5 +1,5 @@ import type { PropOptionsGenerator } from '../types'; -import { propOptionsGenerator } from '../util'; +import { propOptionsGenerator } from '../utilities'; import type { Validator } from '../validators'; /** Has to be so broad to allow Vue 2 and Vue 3 component options or instances. */ diff --git a/src/util.ts b/src/utilities.ts similarity index 100% rename from src/util.ts rename to src/utilities.ts diff --git a/type-tests/prop-types/any.type.spec.ts b/type-tests/prop-types/any.type.spec.ts index 24a6da8..65d86c8 100644 --- a/type-tests/prop-types/any.type.spec.ts +++ b/type-tests/prop-types/any.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { anyProp } from '../../src/prop-types/any'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; describe('anyProp().optional', () => { test('Vue 2.6', () => { diff --git a/type-tests/prop-types/array.type.spec.ts b/type-tests/prop-types/array.type.spec.ts index eabb95d..2f080bf 100644 --- a/type-tests/prop-types/array.type.spec.ts +++ b/type-tests/prop-types/array.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { arrayProp } from '../../src/prop-types/array'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; describe('arrayProp().optional', () => { test('Vue 2.6', () => { diff --git a/type-tests/prop-types/boolean.type.spec.ts b/type-tests/prop-types/boolean.type.spec.ts index 72d0353..1f02fc0 100644 --- a/type-tests/prop-types/boolean.type.spec.ts +++ b/type-tests/prop-types/boolean.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { booleanProp } from '../../src/prop-types/boolean'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; describe('booleanProp().optional', () => { test('Vue 2.6', () => { diff --git a/type-tests/prop-types/date.type.spec.ts b/type-tests/prop-types/date.type.spec.ts index a2f18cf..5bfa887 100644 --- a/type-tests/prop-types/date.type.spec.ts +++ b/type-tests/prop-types/date.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { dateProp } from '../../src/prop-types/date'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; describe('dateProp().optional', () => { test('Vue 2.6', () => { diff --git a/type-tests/prop-types/function.type.spec.ts b/type-tests/prop-types/function.type.spec.ts index 2016f6e..35ea719 100644 --- a/type-tests/prop-types/function.type.spec.ts +++ b/type-tests/prop-types/function.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { functionProp } from '../../src/prop-types/function'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; /* eslint-disable @typescript-eslint/no-unsafe-function-type */ diff --git a/type-tests/prop-types/instanceOf.type.spec.ts b/type-tests/prop-types/instanceOf.type.spec.ts index 1b88fb6..7129075 100644 --- a/type-tests/prop-types/instanceOf.type.spec.ts +++ b/type-tests/prop-types/instanceOf.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { instanceOfProp } from '../../src/prop-types/instanceOf'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; class User { name = ''; diff --git a/type-tests/prop-types/integer.type.spec.ts b/type-tests/prop-types/integer.type.spec.ts index 34cd321..8ea0e17 100644 --- a/type-tests/prop-types/integer.type.spec.ts +++ b/type-tests/prop-types/integer.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { integerProp } from '../../src/prop-types/integer'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; describe('integerProp().optional', () => { test('Vue 2.6', () => { diff --git a/type-tests/prop-types/number.type.spec.ts b/type-tests/prop-types/number.type.spec.ts index e8ec4a4..453b03f 100644 --- a/type-tests/prop-types/number.type.spec.ts +++ b/type-tests/prop-types/number.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { numberProp } from '../../src/prop-types/number'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; type Foo = 1 | 2 | 3; diff --git a/type-tests/prop-types/object.type.spec.ts b/type-tests/prop-types/object.type.spec.ts index a5f8736..f127606 100644 --- a/type-tests/prop-types/object.type.spec.ts +++ b/type-tests/prop-types/object.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { objectProp } from '../../src/prop-types/object'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; interface User { name: string; diff --git a/type-tests/prop-types/oneOf.type.spec.ts b/type-tests/prop-types/oneOf.type.spec.ts index cde7540..5dc7f63 100644 --- a/type-tests/prop-types/oneOf.type.spec.ts +++ b/type-tests/prop-types/oneOf.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { oneOfProp } from '../../src/prop-types/oneOf'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; const options = ['a', 'b', 'c'] as const; type Options = 'a' | 'b' | 'c'; diff --git a/type-tests/prop-types/oneOfObjectKeys.type.spec.ts b/type-tests/prop-types/oneOfObjectKeys.type.spec.ts index d918573..a659e5a 100644 --- a/type-tests/prop-types/oneOfObjectKeys.type.spec.ts +++ b/type-tests/prop-types/oneOfObjectKeys.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { oneOfObjectKeysProp } from '../../src/prop-types/oneOfObjectKeys'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; const options = { a: 'a', b: 'b', c: 'c' }; type Options = 'a' | 'b' | 'c'; diff --git a/type-tests/prop-types/oneOfTypes.type.spec.ts b/type-tests/prop-types/oneOfTypes.type.spec.ts index edf9788..4ab376b 100644 --- a/type-tests/prop-types/oneOfTypes.type.spec.ts +++ b/type-tests/prop-types/oneOfTypes.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { oneOfTypesProp } from '../../src/prop-types/oneOfTypes'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; const options = [Number, String]; type Options = number | string; diff --git a/type-tests/prop-types/string.type.spec.ts b/type-tests/prop-types/string.type.spec.ts index 7ceaa3c..23f03ee 100644 --- a/type-tests/prop-types/string.type.spec.ts +++ b/type-tests/prop-types/string.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { stringProp } from '../../src/prop-types/string'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; type Foo = 'a' | 'b' | 'c'; diff --git a/type-tests/prop-types/symbol.type.spec.ts b/type-tests/prop-types/symbol.type.spec.ts index 6b1b11a..ce2e5b9 100644 --- a/type-tests/prop-types/symbol.type.spec.ts +++ b/type-tests/prop-types/symbol.type.spec.ts @@ -3,8 +3,8 @@ import type * as Vue2_6 from 'vue2-6/types/options'; import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { symbolProp } from '../../src/prop-types/symbol'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; describe('symbolProp().optional', () => { test('Vue 2.6', () => { diff --git a/type-tests/prop-types/vueComponent.type.spec.ts b/type-tests/prop-types/vueComponent.type.spec.ts index f2c0f92..6b415f4 100644 --- a/type-tests/prop-types/vueComponent.type.spec.ts +++ b/type-tests/prop-types/vueComponent.type.spec.ts @@ -4,8 +4,8 @@ import type * as Vue2_7 from 'vue2-7/types/options'; import type * as Vue3 from '@vue/runtime-core'; import { vueComponentProp } from '../../src/prop-types/vueComponent'; import type { VueComponent } from '../../src/prop-types/vueComponent'; -import { createVue2Component } from '../utils'; -import type { Vue2ComponentWithProp } from '../utils'; +import { createVue2Component } from '../utilities'; +import type { Vue2ComponentWithProp } from '../utilities'; describe('vueComponentProp().optional', () => { test('Vue 2.6', () => { diff --git a/type-tests/utils.ts b/type-tests/utilities.ts similarity index 100% rename from type-tests/utils.ts rename to type-tests/utilities.ts