Skip to content

Commit 0a75884

Browse files
authored
Merge pull request #41 from armano2/fix/remove-redundant-imports
fix: remove redundant imports
2 parents 5960255 + 15632b5 commit 0a75884

15 files changed

+53
-53
lines changed

src/component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { defineComponent, ComponentCustomOptions } from 'vue';
2-
import { obtainSlot, getSuperSlot, getSlot } from './utils'
2+
import { obtainSlot, getSuperSlot } from './utils'
33
import { build as optionComputed } from './option/computed'
44
import { build as optionData } from './option/data'
55
import { build as optionMethodsAndHooks } from './option/methodsAndHooks'
66
import { build as optionRef } from './option/ref'
7-
import { build as optionWatch, WatchConfig } from './option/watch'
8-
import { build as optionProps, PropsConfig } from './option/props'
9-
import { build as optionInject, InjectConfig } from './option/inject'
7+
import { build as optionWatch } from './option/watch'
8+
import { build as optionProps } from './option/props'
9+
import { build as optionInject } from './option/inject'
1010
import { build as optionEmit } from './option/emit'
11-
import { build as optionVModel, VModelConfig } from './option/vmodel'
11+
import { build as optionVModel } from './option/vmodel'
1212
import { build as optionAccessor } from './option/accessor'
1313
import { OptionBuilder } from './optionBuilder'
1414
import type { VueCons } from './index'
@@ -124,4 +124,4 @@ export function Component(arg: ComponentConsOption): any {
124124
// return cons
125125
return obtainSlot(cons.prototype).cachedVueComponent
126126
})
127-
}
127+
}

src/index-return-cons.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export * from './index'
22
import { Component as ComponentOld } from './index'
3+
34
export function Component(this: any,...args:Parameters<typeof ComponentOld>) {
45
const res = ComponentOld.apply(this, args)
56
function process(res: any) {
@@ -15,4 +16,4 @@ export function Component(this: any,...args:Parameters<typeof ComponentOld>) {
1516
} else {
1617
return process(res)
1718
}
18-
}
19+
}

src/index.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
export { Component, ComponentBase } from './component'
32
export { decorator as Ref } from './option/ref'
43
export { decorator as Watch } from './option/watch'
@@ -8,17 +7,14 @@ export { decorator as Emit } from './option/emit'
87
export { decorator as VModel, decorator as Model } from './option/vmodel'
98
export { decorator as Vanilla } from './option/vanilla'
109
export { decorator as Hook } from './option/methodsAndHooks'
11-
import type {
12-
ComponentPublicInstance
13-
} from 'vue'
10+
import type { ComponentPublicInstance } from 'vue'
1411
import type { OptionBuilder } from './optionBuilder'
12+
1513
const IdentifySymbol = Symbol('vue-facing-decorator-identify')
1614
export interface BaseTypeIdentify {
1715
[IdentifySymbol]: undefined
1816
}
1917
export function TSX<Properties extends {} = {}, Events extends {} = {}>() {
20-
21-
2218
type Bundle = Properties & { [index in keyof Events as `on${Capitalize<index & string>}`]: Events[index] extends Function ? Events[index] : { (param: Events[index]): any } }
2319
return function <C extends VueCons>(cons: C) {
2420
return cons as unknown as {
@@ -27,7 +23,7 @@ export function TSX<Properties extends {} = {}, Events extends {} = {}>() {
2723
}
2824
}
2925

30-
export type VueCons = {
26+
export type VueCons = {
3127
new(optionBuilder: OptionBuilder, vueInstance: any): ComponentPublicInstance & BaseTypeIdentify
3228
}
3329

@@ -41,4 +37,5 @@ export const Base = class {
4137
}
4238
}
4339
} as VueCons
40+
4441
export const Vue = Base

src/option/accessor.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { Cons } from '../component'
2-
import { OptionBuilder,applyAccessors} from '../optionBuilder'
1+
import type { Cons } from '../component'
2+
import { OptionBuilder, applyAccessors} from '../optionBuilder'
33
import { toComponentReverse, obtainSlot } from '../utils'
44

55
export function build(cons: Cons, optionBuilder: OptionBuilder) {
66
const slot = obtainSlot(cons.prototype)
77
let vanillaMap = slot.obtainMap('vanilla')
88
const protoArr = toComponentReverse(cons.prototype)
99
const map: Map<string, { get: (() => any) | undefined, set: ((v: any) => any) | undefined }> = new Map
10-
10+
1111
applyAccessors(optionBuilder,(ctx:any)=>{
1212
protoArr.forEach(proto => {
1313
const deses = Object.getOwnPropertyDescriptors(proto)
@@ -25,4 +25,4 @@ export function build(cons: Cons, optionBuilder: OptionBuilder) {
2525
})
2626
return map
2727
})
28-
}
28+
}

src/option/computed.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { makeObject } from '../utils'
2-
31
import { Cons } from '../component'
42
import { obtainSlot, toComponentReverse, getValidNames } from '../utils'
53
import { OptionBuilder } from '../optionBuilder'
4+
65
export function build(cons: Cons, optionBuilder: OptionBuilder) {
76
optionBuilder.computed ??= {}
87
const slot = obtainSlot(cons.prototype)
@@ -22,4 +21,4 @@ export function build(cons: Cons, optionBuilder: OptionBuilder) {
2221
}
2322
})
2423
})
25-
}
24+
}

src/option/data.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { makeObject } from '../utils'
2-
import { Cons } from '../component'
3-
import { OptionBuilder } from '../optionBuilder'
4-
import { obtainSlot, excludeNames, getValidNames } from '../utils'
1+
import type { Cons } from '../component'
2+
import type { OptionBuilder } from '../optionBuilder'
3+
import { makeObject, obtainSlot, excludeNames, getValidNames } from '../utils'
4+
55
export function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any, propNames?: string[]) {
66
optionBuilder.data ??= {}
77
const sample = new cons(optionBuilder, vueInstance)
@@ -11,4 +11,4 @@ export function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any
1111
const slot = obtainSlot(cons.prototype)
1212
names = excludeNames(names, slot)
1313
Object.assign(optionBuilder.data, makeObject(names, sample))
14-
}
14+
}

src/option/emit.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { Cons } from '../component'
2-
import { OptionBuilder } from '../optionBuilder'
1+
import type { Cons } from '../component'
2+
import type { OptionBuilder } from '../optionBuilder'
33
import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
44
export type EmitConfig = null | string
5+
56
export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, key?: string) {
67
const slot = obtainSlot(proto)
78
let map = slot.obtainMap('emit');
89
map.set(name, typeof key === 'undefined' ? null : key)
910
})
1011

11-
1212
export function build(cons: Cons, optionBuilder: OptionBuilder) {
1313
optionBuilder.methods ??= {}
1414
const proto = cons.prototype
@@ -34,4 +34,4 @@ export function build(cons: Cons, optionBuilder: OptionBuilder) {
3434
})
3535
}
3636

37-
}
37+
}

src/option/inject.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
2-
import { Cons } from '../component'
3-
import { OptionBuilder } from '../optionBuilder'
1+
import type { Cons } from '../component'
2+
import type { OptionBuilder } from '../optionBuilder'
43
import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
4+
55
export interface InjectConfig {
66
from?: string | Symbol
77
default?: any

src/option/methodsAndHooks.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
2-
import { Cons } from '../component'
3-
import { OptionBuilder } from '../optionBuilder'
1+
import type { Cons } from '../component'
2+
import type { OptionBuilder } from '../optionBuilder'
43
import { obtainSlot, toComponentReverse, excludeNames, getValidNames, optoinNullableMemberDecorator } from '../utils'
54

65
export const HookNames = [
@@ -77,4 +76,4 @@ export function build(cons: Cons, optionBuilder: OptionBuilder) {
7776
}
7877
Object.assign(optionBuilder.hooks, HookFunctions)
7978

80-
}
79+
}

src/option/props.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { Cons } from '../component'
2-
import { OptionBuilder } from '../optionBuilder'
1+
import type { Cons } from '../component'
2+
import type { OptionBuilder } from '../optionBuilder'
33
import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
4+
45
export interface PropsConfig {
56
type?: any
67
required?: boolean

0 commit comments

Comments
 (0)