diff --git a/eslint.config.mts b/eslint.config.mts index 494d492e..6f9e521c 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, diff --git a/src/prop-types/any.ts b/src/prop-types/any.ts index f356a7a3..8adef992 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 7ee6a7c9..73403887 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 bec7807b..85e80a3a 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 f69e7ad2..886708dd 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 dba870d6..32e0aeed 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 d2a5aecd..fdefcb77 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 b3e137d3..81f00415 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 ae839bbf..8004b1f1 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 8998d06b..9ff39dc8 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 ee17b07c..541a0476 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 636b0793..dcdbb63c 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 e696c2bf..ffa4c86f 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 de80ea39..34f6ad49 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 24a6da8b..65d86c8a 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 eabb95da..2f080bfe 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 72d03539..1f02fc0d 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 a2f18cf5..5bfa887e 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 2016f6ea..35ea7191 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 1b88fb63..71290758 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 34cd321e..8ea0e171 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 e8ec4a45..453b03fa 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 a5f8736e..f1276062 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 cde75409..5dc7f633 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 d9185730..a659e5ac 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 edf97882..4ab376b0 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 7ceaa3c9..23f03eee 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 6b1b11a8..ce2e5b97 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 f2c0f92c..6b415f48 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