split into slot.ts

ruojianll · ruojianll · commit 3f0410af7739 · 2024-03-18T16:40:47.000+08:00
diff --git a/src/component.ts b/src/component.ts
@@ -1,5 +1,6 @@
 import { defineComponent, type ComponentCustomOptions, type MethodOptions } from 'vue';
-import { obtainSlot, getSuperSlot, getProviderFunction, optionNullableClassDecorator } from './utils'
+import { obtainSlot } from './slot'
+import { getSuperSlot, getProviderFunction, optionNullableClassDecorator } from './utils'
 import { build as optionSetup } from './option/setup'
 import { build as optionComputed } from './option/computed'
 import { build as optionData } from './option/data'
diff --git a/src/custom/custom.ts b/src/custom/custom.ts
@@ -1,4 +1,4 @@
-import { obtainSlot } from '../utils'
+import { obtainSlot } from '../slot'
 import { compatibleMemberDecorator } from '../deco3/utils'
 type Creator = { (options: any, key: string): void }
 export interface Record {
diff --git a/src/deco3/utils.ts b/src/deco3/utils.ts
@@ -1,5 +1,5 @@
 import { VueCons } from '../class'
-import { obtainSlot } from '../utils'
+import { obtainSlot } from '../slot'
 export const Compatible: {
     fakePrototype?: any,
 
diff --git a/src/mixins.ts b/src/mixins.ts
@@ -1,5 +1,5 @@
 import { ComponentBase } from './component'
-import { obtainSlot } from './utils'
+import { obtainSlot } from './slot'
 import type { VueCons } from './class'
 import { Vue } from './index'
 
diff --git a/src/option/accessor.ts b/src/option/accessor.ts
@@ -1,7 +1,7 @@
 import type { VueCons } from '../class'
 import { type OptionBuilder, applyAccessors } from '../optionBuilder'
-import { toComponentReverse, obtainSlot } from '../utils'
-
+import { toComponentReverse } from '../utils'
+import { obtainSlot } from '../slot'
 export function build(cons: VueCons, optionBuilder: OptionBuilder) {
     const slot = obtainSlot(cons.prototype)
     const vanillaMap = slot.getMap('vanilla')
diff --git a/src/option/computed.ts b/src/option/computed.ts
@@ -1,7 +1,7 @@
 import type { VueCons } from '../class'
-import { obtainSlot, toComponentReverse, getValidOwnPropertyNames } from '../utils'
+import { toComponentReverse, getValidOwnPropertyNames } from '../utils'
 import type { OptionBuilder } from '../optionBuilder'
-
+import { obtainSlot } from '../slot'
 export function build(cons: VueCons, optionBuilder: OptionBuilder) {
     optionBuilder.computed ??= {}
     const slot = obtainSlot(cons.prototype)
diff --git a/src/option/data.ts b/src/option/data.ts
@@ -1,7 +1,7 @@
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { makeObject, obtainSlot, filterNames, getValidOwnPropertyNames } from '../utils'
-
+import { makeObject, filterNames, getValidOwnPropertyNames } from '../utils'
+import { obtainSlot } from '../slot'
 export function build(cons: VueCons, optionBuilder: OptionBuilder, vueInstance: any) {
     optionBuilder.data ??= {}
     const sample = new cons(optionBuilder, vueInstance) as any
diff --git a/src/option/emit.ts b/src/option/emit.ts
@@ -1,8 +1,8 @@
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, optionNullableMemberDecorator } from '../utils'
+import { optionNullableMemberDecorator } from '../utils'
 export type EmitConfig = null | string
-
+import { obtainSlot } from '../slot'
 export const decorator = optionNullableMemberDecorator(function (proto: any, name: string, key?: string) {
     const slot = obtainSlot(proto)
     const map = slot.obtainMap('emit');
diff --git a/src/option/inject.ts b/src/option/inject.ts
@@ -1,8 +1,8 @@
 import type { InjectionKey } from 'vue'
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, optionNullableMemberDecorator } from '../utils'
-
+import { optionNullableMemberDecorator } from '../utils'
+import { obtainSlot } from '../slot'
 export interface InjectConfig {
     from?: string | symbol | Symbol | InjectionKey<any>
     default?: any
diff --git a/src/option/methodsAndHooks.ts b/src/option/methodsAndHooks.ts
@@ -1,7 +1,7 @@
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, toComponentReverse, filterNames, getValidOwnPropertyNames, optionNullableMemberDecorator } from '../utils'
-
+import { toComponentReverse, filterNames, getValidOwnPropertyNames, optionNullableMemberDecorator } from '../utils'
+import { obtainSlot } from '../slot'
 export const HookNames: ReadonlyArray<string> = [
     "beforeCreate",
     "created",
diff --git a/src/option/props.ts b/src/option/props.ts
@@ -1,7 +1,7 @@
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, optionNullableMemberDecorator } from '../utils'
-
+import { optionNullableMemberDecorator } from '../utils'
+import { obtainSlot } from '../slot'
 export interface PropsConfig {
     type?: any
     required?: boolean
diff --git a/src/option/provide.ts b/src/option/provide.ts
@@ -1,8 +1,8 @@
 import { computed } from 'vue';
 import type { VueCons } from '../class';
 import type { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, optionNullableMemberDecorator } from '../utils'
-
+import { optionNullableMemberDecorator } from '../utils'
+import { obtainSlot } from '../slot'
 export type ProvideConfig = null | string
 
 export const decorator = optionNullableMemberDecorator(function (proto: any, name: string, key?: ProvideConfig) {
diff --git a/src/option/ref.ts b/src/option/ref.ts
@@ -1,7 +1,7 @@
 import type { VueCons } from '../class'
 import { type OptionBuilder, applyAccessors } from '../optionBuilder'
-import { obtainSlot, optionNullableMemberDecorator } from '../utils'
-
+import { optionNullableMemberDecorator } from '../utils'
+import { obtainSlot } from '../slot'
 export type RefConfig = null | string
 
 export const decorator = optionNullableMemberDecorator(function (proto: any, name: string, key?: string) {
diff --git a/src/option/setup.ts b/src/option/setup.ts
@@ -2,7 +2,7 @@ import { compatibleMemberDecorator } from '../deco3/utils'
 import type { OptionSetupFunction } from '../component'
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { obtainSlot } from '../utils'
+import { obtainSlot } from '../slot'
 
 export type SetupConfig = {
     setupFunction: OptionSetupFunction
diff --git a/src/option/vanilla.ts b/src/option/vanilla.ts
@@ -1,5 +1,5 @@
-import { obtainSlot, optionNullableMemberDecorator } from '../utils'
-
+import { optionNullableMemberDecorator } from '../utils'
+import { obtainSlot } from '../slot'
 export const decorator = optionNullableMemberDecorator(function (proto: any, name: string) {
     const slot = obtainSlot(proto)
     const map = slot.obtainMap('vanilla')
diff --git a/src/option/vmodel.ts b/src/option/vmodel.ts
@@ -1,8 +1,8 @@
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, optionNullableMemberDecorator } from '../utils'
+import {  optionNullableMemberDecorator } from '../utils'
 import { decorator as PropsDecorator, type PropsConfig } from './props'
-
+import { obtainSlot } from '../slot'
 export type VModelConfig = PropsConfig & {
     name?: string
 }
diff --git a/src/option/watch.ts b/src/option/watch.ts
@@ -1,6 +1,6 @@
 import type { VueCons } from '../class'
 import type { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, } from '../utils'
+import { obtainSlot } from '../slot'
 import type { WatchCallback } from 'vue'
 import { compatibleMemberDecorator } from '../deco3/utils'
 export interface WatchConfig {
diff --git a/src/slot.ts b/src/slot.ts
@@ -0,0 +1,81 @@
+import { Metadata } from 'facing-metadata'
+import type { InjectConfig } from "./option/inject";
+import type { EmitConfig } from "./option/emit";
+import type { PropsConfig } from "./option/props";
+import type { HookConfig } from "./option/methodsAndHooks";
+import type { VModelConfig } from "./option/vmodel";
+import type { WatchConfig } from "./option/watch";
+import type { SetupConfig } from './option/setup'
+import type { Record as CustomDecoratorRecord } from './custom/custom'
+import type { RefConfig } from './option/ref';
+import type { ProvideConfig } from './option/provide';
+
+const SlotSymbol: unique symbol = Symbol('vue-facing-decorator-slot')
+
+export type SlotMapTypes = {
+    vanilla: Map<string, boolean>
+    computed: Map<string, boolean>
+    provide: Map<string, ProvideConfig>
+    inject: Map<string, InjectConfig>
+    emit: Map<string, EmitConfig>
+    emits: Map<string, boolean>
+    props: Map<string, PropsConfig>
+    hooks: Map<string, HookConfig>
+    'v-model': Map<string, VModelConfig>
+    watch: Map<string, WatchConfig | WatchConfig[]>
+    ref: Map<string, RefConfig>
+    setup: Map<string, SetupConfig>
+    customDecorator: Map<string, CustomDecoratorRecord[]>
+}
+
+export type SlotMapNames = keyof SlotMapTypes
+
+export class Slot {
+    master: any
+    constructor(master: any) {
+        this.master = master
+    }
+    names: Map<keyof SlotMapTypes, SlotMapTypes[keyof SlotMapTypes]> = new Map()
+    obtainMap<T extends keyof SlotMapTypes>(name: T): SlotMapTypes[T] {
+        let map = this.getMap(name)
+        if (!map) {
+            map = new Map()
+            this.names.set(name, map)
+        }
+        return map as SlotMapTypes[T]
+    }
+    getMap<T extends keyof SlotMapTypes>(name: T) {
+        const map = this.names.get(name)
+        return map as SlotMapTypes[T] | undefined
+    }
+    inComponent = false
+    cachedVueComponent: any = null
+}
+
+const metadata = new Metadata<Slot>(SlotSymbol)
+
+export function makeSlot(obj: any, defaultSlot?: Slot): Slot {
+    if (getSlot(obj)) {
+        throw ''
+    }
+    if (defaultSlot) {
+        defaultSlot.master = obj
+    }
+    const slot = defaultSlot ?? new Slot(obj)
+    metadata.create(obj, slot)
+    return slot
+}
+
+export function getSlot(obj: any): Slot | undefined {
+    return metadata.getOwn(obj)
+}
+
+export function obtainSlot(obj: any, defaultSlot?: Slot): Slot {
+
+    const slot = getSlot(obj)
+    if (slot) {
+        return slot
+    }
+
+    return makeSlot(obj, defaultSlot)
+}
diff --git a/src/utils.ts b/src/utils.ts
@@ -1,86 +1,7 @@
-import { Metadata } from 'facing-metadata'
 import type { Identity } from './identity'
-import type { InjectConfig } from "./option/inject";
-import type { EmitConfig } from "./option/emit";
-import type { PropsConfig } from "./option/props";
-import type { HookConfig } from "./option/methodsAndHooks";
-import type { VModelConfig } from "./option/vmodel";
-import type { WatchConfig } from "./option/watch";
-import type { SetupConfig } from './option/setup'
-import type { Record as CustomDecoratorRecord } from './custom/custom'
-import type { RefConfig } from './option/ref';
-import type { ProvideConfig } from './option/provide';
 import { compatibleMemberDecorator, compatibleClassDecorator } from './deco3/utils';
 import { type VueCons, Base } from './class';
-
-
-const SlotSymbol = Symbol('vue-facing-decorator-slot')
-
-export type SlotMapTypes = {
-    vanilla: Map<string, boolean>
-    computed: Map<string, boolean>
-    provide: Map<string, ProvideConfig>
-    inject: Map<string, InjectConfig>
-    emit: Map<string, EmitConfig>
-    emits: Map<string, boolean>
-    props: Map<string, PropsConfig>
-    hooks: Map<string, HookConfig>
-    'v-model': Map<string, VModelConfig>
-    watch: Map<string, WatchConfig | WatchConfig[]>
-    ref: Map<string, RefConfig>
-    setup: Map<string, SetupConfig>
-    customDecorator: Map<string, CustomDecoratorRecord[]>
-}
-type SlotMapNames = keyof SlotMapTypes
-class Slot {
-    master: any
-    constructor(master: any) {
-        this.master = master
-    }
-    names: Map<keyof SlotMapTypes, SlotMapTypes[keyof SlotMapTypes]> = new Map()
-    obtainMap<T extends keyof SlotMapTypes>(name: T): SlotMapTypes[T] {
-        let map = this.getMap(name)
-        if (!map) {
-            map = new Map()
-            this.names.set(name, map)
-        }
-        return map as SlotMapTypes[T]
-    }
-    getMap<T extends keyof SlotMapTypes>(name: T) {
-        const map = this.names.get(name)
-        return map as SlotMapTypes[T] | undefined
-    }
-    inComponent = false
-    cachedVueComponent: any = null
-}
-
-const metadata = new Metadata<Slot>(SlotSymbol)
-
-export function makeSlot(obj: any, defaultSlot?: Slot): Slot {
-    if (getSlot(obj)) {
-        throw ''
-    }
-    if (defaultSlot) {
-        defaultSlot.master = obj
-    }
-    const slot = defaultSlot ?? new Slot(obj)
-    metadata.create(obj, slot)
-    return slot
-}
-
-export function getSlot(obj: any): Slot | undefined {
-    return metadata.getOwn(obj)
-}
-
-export function obtainSlot(obj: any, defaultSlot?: Slot): Slot {
-
-    const slot = getSlot(obj)
-    if (slot) {
-        return slot
-    }
-
-    return makeSlot(obj, defaultSlot)
-}
+import { getSlot, type Slot, type SlotMapNames } from './slot'
 
 export function makeObject(names: string[], obj: any) {
     return names.reduce<Record<string, any>>((pv, cv) => {
@@ -131,7 +52,7 @@ export function filterNames(names: string[], slot: Slot, mapNames?: SlotMapNames
                 if (mapNames && mapNames.includes(mapName)) {
                     continue
                 }
-                
+
                 const map = currSlot.names.get(mapName)!
                 if (map.has(name)) {
                     return false
diff --git a/test/internal/utils.ts b/test/internal/utils.ts
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import 'mocha';
 import { Base } from '../../dist/esm'
 import * as Utils from '../../dist/esm/utils'
-
+import { obtainSlot } from '../../dist/esm/slot'
 
 class Comp1Sup extends Base {
     method1Sup() {
@@ -46,11 +46,11 @@ class Comp3 extends Comp3Sup {
 describe('internal utils',
     () => {
         it('slot', () => {
-            expect(true).to.equal(Utils.obtainSlot(Comp3.prototype).names instanceof Map)
+            expect(true).to.equal(obtainSlot(Comp3.prototype).names instanceof Map)
         })
         it('toComponentReverse', () => {
-            Utils.obtainSlot(Comp2.prototype)
-            Utils.obtainSlot(Comp1.prototype)
+            obtainSlot(Comp2.prototype)
+            obtainSlot(Comp1.prototype)
 
             const path3 = Utils.toComponentReverse(Comp3.prototype)
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { obtainSlot } from '../utils'`
	`1`	`+import { obtainSlot } from '../slot'`
`2`	`2`	`import { compatibleMemberDecorator } from '../deco3/utils'`
`3`	`3`	`type Creator = { (options: any, key: string): void }`
`4`	`4`	`export interface Record {`