vue-facing-decorator - npm Package Compare versions

Comparing version 2.1.14 to 2.1.15

dist/component.d.ts

@@ -1,2 +0,2 @@
-import { ComponentCustomOptions } from 'vue';
+import { type ComponentCustomOptions } from 'vue';
 import type { VueCons } from './index';
@@ -3,0 +3,0 @@ export declare type Cons = VueCons;

dist/component.js

@@ -37,3 +37,3 @@ "use strict";
 function buildComponent(cons, arg, extend) {
-    let option = ComponentOption(cons, extend);
+    const option = ComponentOption(cons, extend);
     const slot = (0, utils_1.obtainSlot)(cons.prototype);
@@ -40,0 +40,0 @@ Object.keys(arg).reduce((option, name) => {

dist/esm/component.d.ts

@@ -1,2 +0,2 @@
-import { ComponentCustomOptions } from 'vue';
+import { type ComponentCustomOptions } from 'vue';
 import type { VueCons } from './index';
@@ -3,0 +3,0 @@ export declare type Cons = VueCons;

dist/esm/component.js

@@ -34,3 +34,3 @@ import { defineComponent } from 'vue';
 function buildComponent(cons, arg, extend) {
-    let option = ComponentOption(cons, extend);
+    const option = ComponentOption(cons, extend);
     const slot = obtainSlot(cons.prototype);
@@ -37,0 +37,0 @@ Object.keys(arg).reduce((option, name) => {

dist/esm/option/accessor.d.ts

@@ -1,4 +0,4 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import { type OptionBuilder } from '../optionBuilder';
 export declare function build(cons: Cons, optionBuilder: OptionBuilder): void;
 //# sourceMappingURL=accessor.d.ts.map

dist/esm/option/accessor.js

@@ -5,3 +5,3 @@ import { applyAccessors } from '../optionBuilder';
     const slot = obtainSlot(cons.prototype);
-    let vanillaMap = slot.obtainMap('vanilla');
+    const vanillaMap = slot.obtainMap('vanilla');
     const protoArr = toComponentReverse(cons.prototype);
@@ -8,0 +8,0 @@ const map = new Map;

dist/esm/option/computed.d.ts

@@ -1,4 +0,4 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export declare function build(cons: Cons, optionBuilder: OptionBuilder): void;
 //# sourceMappingURL=computed.d.ts.map

dist/esm/option/computed.js

@@ -6,4 +6,4 @@ import { obtainSlot, toComponentReverse, getValidNames } from '../utils';
     const slot = obtainSlot(cons.prototype);
-    let map = slot.obtainMap('computed');
-    let vanillaMap = slot.obtainMap('vanilla');
+    const map = slot.obtainMap('computed');
+    const vanillaMap = slot.obtainMap('vanilla');
     const protoArr = toComponentReverse(cons.prototype);
@@ -10,0 +10,0 @@ protoArr.forEach(proto => {

dist/esm/option/data.d.ts

@@ -1,4 +0,4 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
-export declare function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any, propNames?: string[]): void;
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
+export declare function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any, _propNames?: string[]): void;
 //# sourceMappingURL=data.d.ts.map

dist/esm/option/data.js

@@ -1,4 +0,3 @@
-import { makeObject } from '../utils';
-import { obtainSlot, excludeNames, getValidNames } from '../utils';
-export function build(cons, optionBuilder, vueInstance, propNames) {
+import { makeObject, obtainSlot, excludeNames, getValidNames } from '../utils';
+export function build(cons, optionBuilder, vueInstance, _propNames) {
     var _a;
@@ -5,0 +4,0 @@ (_a = optionBuilder.data) !== null && _a !== void 0 ? _a : (optionBuilder.data = {});

dist/esm/option/emit.d.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export declare type EmitConfig = null | string;
@@ -4,0 +4,0 @@ export declare const decorator: {

dist/esm/option/emit.js

@@ -13,3 +13,3 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     const slot = obtainSlot(proto);
-    let map = slot.obtainMap('emit');
+    const map = slot.obtainMap('emit');
     map.set(name, typeof key === 'undefined' ? null : key);
@@ -16,0 +16,0 @@ });

dist/esm/option/inject.d.ts

@@ -1,5 +0,5 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export interface InjectConfig {
-    from?: string | Symbol;
+    from?: string | symbol;
     default?: any;
@@ -6,0 +6,0 @@ }

dist/esm/option/inject.js

 import { obtainSlot, optoinNullableMemberDecorator } from '../utils';
 export const decorator = optoinNullableMemberDecorator(function (proto, name, option) {
     const slot = obtainSlot(proto);
-    let map = slot.obtainMap('inject');
+    const map = slot.obtainMap('inject');
     const opt = Object.assign({}, option !== null && option !== void 0 ? option : {});
@@ -6,0 +6,0 @@ map.set(name, opt);

dist/esm/option/methodsAndHooks.d.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export declare const HookNames: readonly ["beforeCreate", "created", "beforeMount", "mounted", "beforeUpdate", "updated", "activated", "deactivated", "beforeDestroy", "beforeUnmount", "destroyed", "unmounted", "renderTracked", "renderTriggered", "errorCaptured", "serverPrefetch", "render"];
@@ -4,0 +4,0 @@ export declare type HookConfig = null;

dist/esm/option/methodsAndHooks.js

@@ -23,3 +23,3 @@ import { obtainSlot, toComponentReverse, excludeNames, getValidNames, optoinNullableMemberDecorator } from '../utils';
     const slot = obtainSlot(proto);
-    let map = slot.obtainMap('hooks');
+    const map = slot.obtainMap('hooks');
     map.set(name, null);
@@ -26,0 +26,0 @@ });

dist/esm/option/props.d.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export interface PropsConfig {
@@ -4,0 +4,0 @@ type?: any;

dist/esm/option/props.js

 import { obtainSlot, optoinNullableMemberDecorator } from '../utils';
 export const decorator = optoinNullableMemberDecorator(function (proto, name, option) {
     const slot = obtainSlot(proto);
-    let map = slot.obtainMap('props');
+    const map = slot.obtainMap('props');
     const opt = Object.assign({}, option !== null && option !== void 0 ? option : {});
@@ -6,0 +6,0 @@ map.set(name, opt);

dist/esm/option/ref.d.ts

@@ -1,5 +0,5 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import { type OptionBuilder } from '../optionBuilder';
 export declare const decorator: {
-    (option?: {} | undefined): any;
+    (option?: unknown): any;
     (proto: import("..").BaseTypeIdentify, name: any): any;
@@ -6,0 +6,0 @@ };

dist/esm/option/ref.js

 import { applyAccessors } from '../optionBuilder';
 import { obtainSlot, optoinNullableMemberDecorator } from '../utils';
-export const decorator = optoinNullableMemberDecorator(function (proto, name, option) {
+export const decorator = optoinNullableMemberDecorator(function (proto, name) {
     const slot = obtainSlot(proto);
-    let map = slot.obtainMap('ref');
+    const map = slot.obtainMap('ref');
     map.set(name, true);
@@ -7,0 +7,0 @@ });

dist/esm/option/vanilla.d.ts

 export declare const decorator: {
-    (option?: {} | undefined): any;
+    (option?: unknown): any;
     (proto: import("..").BaseTypeIdentify, name: any): any;
 };
 //# sourceMappingURL=vanilla.d.ts.map

dist/esm/option/vanilla.js

 import { obtainSlot, optoinNullableMemberDecorator } from '../utils';
-export const decorator = optoinNullableMemberDecorator(function (proto, name, option) {
+export const decorator = optoinNullableMemberDecorator(function (proto, name) {
     const slot = obtainSlot(proto);
-    let map = slot.obtainMap('vanilla');
+    const map = slot.obtainMap('vanilla');
     map.set(name, true);
 });
 //# sourceMappingURL=vanilla.js.map

dist/esm/option/vmodel.d.ts

@@ -1,4 +0,4 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
-import { PropsConfig } from './props';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
+import { type PropsConfig } from './props';
 export declare type VModelConfig = PropsConfig & {
@@ -5,0 +5,0 @@ name?: string;

dist/esm/option/vmodel.js

@@ -14,3 +14,3 @@ import { obtainSlot, optoinNullableMemberDecorator } from '../utils';
     PropsDecorator(propsConfig)(proto, vmodelName);
-    let map = slot.obtainMap('v-model');
+    const map = slot.obtainMap('v-model');
     map.set(name, option);
@@ -26,3 +26,3 @@ });
             var _a;
-            let vmodelName = (_a = (value && value.name)) !== null && _a !== void 0 ? _a : 'modelValue';
+            const vmodelName = (_a = (value && value.name)) !== null && _a !== void 0 ? _a : 'modelValue';
             optionBuilder.computed[name] = {
@@ -29,0 +29,0 @@ get: function () {

dist/esm/option/watch.d.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 import type { WatchCallback } from 'vue';
@@ -4,0 +4,0 @@ export interface WatchConfig {

dist/esm/option/watch.js

@@ -5,3 +5,3 @@ import { obtainSlot, } from '../utils';
         const slot = obtainSlot(proto);
-        let map = slot.obtainMap('watch');
+        const map = slot.obtainMap('watch');
         const opt = Object.assign({}, option !== null && option !== void 0 ? option : {}, {
@@ -31,3 +31,3 @@ key: key,
     if (names) {
-        names.forEach((value, name) => {
+        names.forEach((value, _name) => {
             const values = Array.isArray(value) ? value : [value];
@@ -34,0 +34,0 @@ values.forEach(v => {

dist/esm/optionBuilder.d.ts

@@ -1,4 +0,4 @@
-import { WatchConfig } from './option/watch';
-import { PropsConfig } from './option/props';
-import { InjectConfig } from './option/inject';
+import type { WatchConfig } from './option/watch';
+import type { PropsConfig } from './option/props';
+import type { InjectConfig } from './option/inject';
 export interface OptionBuilder {
@@ -5,0 +5,0 @@ name?: string;

dist/esm/utils.d.ts

 import type { BaseTypeIdentify } from './index';
+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";
+export declare type SlotMapTypes = {
+    vanilla: Map<string, boolean>;
+    computed: Map<string, boolean>;
+    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, boolean>;
+};
 declare class Slot {
     master: any;
     constructor(master: any);
-    names: Map<string, Map<string, any>>;
-    obtainMap<T extends Map<string, any>>(name: string): T;
+    names: Map<string, SlotMapTypes[keyof SlotMapTypes]>;
+    obtainMap<T extends keyof SlotMapTypes>(name: T): SlotMapTypes[T];
     inComponent: boolean;
@@ -8,0 +26,0 @@ cachedVueComponent: any;

dist/esm/utils.js

@@ -5,3 +5,3 @@ import { Base } from './index';
     constructor(master) {
-        this.names = new Map;
+        this.names = new Map();
         this.inComponent = false;
@@ -14,7 +14,5 @@ this.cachedVueComponent = null;
         if (!map) {
-            map = new Map;
+            map = new Map();
             this.names.set(name, map);
         }
-        else {
-        }
         return map;
@@ -95,10 +93,14 @@ }
     return names.filter(name => {
-        for (const mapName of slot.names.keys()) {
-            if (['watch', 'hooks'].includes(mapName)) {
-                continue;
+        let currSlot = slot;
+        while (currSlot != null) {
+            for (const mapName of currSlot.names.keys()) {
+                if (['watch', 'hooks'].includes(mapName)) {
+                    continue;
+                }
+                const map = currSlot.names.get(mapName);
+                if (map.has(name)) {
+                    return false;
+                }
             }
-            const map = slot.names.get(mapName);
-            if (map.has(name)) {
-                return false;
-            }
+            currSlot = getSuperSlot(currSlot.master);
         }
@@ -105,0 +107,0 @@ return true;

dist/option/accessor.d.ts

@@ -1,4 +0,4 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import { type OptionBuilder } from '../optionBuilder';
 export declare function build(cons: Cons, optionBuilder: OptionBuilder): void;
 //# sourceMappingURL=accessor.d.ts.map

dist/option/accessor.js

@@ -8,3 +8,3 @@ "use strict";
     const slot = (0, utils_1.obtainSlot)(cons.prototype);
-    let vanillaMap = slot.obtainMap('vanilla');
+    const vanillaMap = slot.obtainMap('vanilla');
     const protoArr = (0, utils_1.toComponentReverse)(cons.prototype);
@@ -11,0 +11,0 @@ const map = new Map;

dist/option/computed.d.ts

@@ -1,4 +0,4 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export declare function build(cons: Cons, optionBuilder: OptionBuilder): void;
 //# sourceMappingURL=computed.d.ts.map

dist/option/computed.js

@@ -9,4 +9,4 @@ "use strict";
     const slot = (0, utils_1.obtainSlot)(cons.prototype);
-    let map = slot.obtainMap('computed');
-    let vanillaMap = slot.obtainMap('vanilla');
+    const map = slot.obtainMap('computed');
+    const vanillaMap = slot.obtainMap('vanilla');
     const protoArr = (0, utils_1.toComponentReverse)(cons.prototype);
@@ -13,0 +13,0 @@ protoArr.forEach(proto => {

dist/option/data.d.ts

@@ -1,4 +0,4 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
-export declare function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any, propNames?: string[]): void;
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
+export declare function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any, _propNames?: string[]): void;
 //# sourceMappingURL=data.d.ts.map

dist/option/data.js

@@ -5,12 +5,11 @@ "use strict";
 const utils_1 = require("../utils");
-const utils_2 = require("../utils");
-function build(cons, optionBuilder, vueInstance, propNames) {
+function build(cons, optionBuilder, vueInstance, _propNames) {
     var _a;
     (_a = optionBuilder.data) !== null && _a !== void 0 ? _a : (optionBuilder.data = {});
     const sample = new cons(optionBuilder, vueInstance);
-    let names = (0, utils_2.getValidNames)(sample, (des) => {
+    let names = (0, utils_1.getValidNames)(sample, (des) => {
         return !!des.enumerable;
     });
-    const slot = (0, utils_2.obtainSlot)(cons.prototype);
-    names = (0, utils_2.excludeNames)(names, slot);
+    const slot = (0, utils_1.obtainSlot)(cons.prototype);
+    names = (0, utils_1.excludeNames)(names, slot);
     Object.assign(optionBuilder.data, (0, utils_1.makeObject)(names, sample));
@@ -17,0 +16,0 @@ }

dist/option/emit.d.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export declare type EmitConfig = null | string;
@@ -4,0 +4,0 @@ export declare const decorator: {

dist/option/emit.js

@@ -16,3 +16,3 @@ "use strict";
     const slot = (0, utils_1.obtainSlot)(proto);
-    let map = slot.obtainMap('emit');
+    const map = slot.obtainMap('emit');
     map.set(name, typeof key === 'undefined' ? null : key);
@@ -19,0 +19,0 @@ });

dist/option/inject.d.ts

@@ -1,5 +0,5 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export interface InjectConfig {
-    from?: string | Symbol;
+    from?: string | symbol;
     default?: any;
@@ -6,0 +6,0 @@ }

dist/option/inject.js

@@ -7,3 +7,3 @@ "use strict";
     const slot = (0, utils_1.obtainSlot)(proto);
-    let map = slot.obtainMap('inject');
+    const map = slot.obtainMap('inject');
     const opt = Object.assign({}, option !== null && option !== void 0 ? option : {});
@@ -10,0 +10,0 @@ map.set(name, opt);

dist/option/methodsAndHooks.d.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export declare const HookNames: readonly ["beforeCreate", "created", "beforeMount", "mounted", "beforeUpdate", "updated", "activated", "deactivated", "beforeDestroy", "beforeUnmount", "destroyed", "unmounted", "renderTracked", "renderTriggered", "errorCaptured", "serverPrefetch", "render"];
@@ -4,0 +4,0 @@ export declare type HookConfig = null;

dist/option/methodsAndHooks.js

@@ -26,3 +26,3 @@ "use strict";
     const slot = (0, utils_1.obtainSlot)(proto);
-    let map = slot.obtainMap('hooks');
+    const map = slot.obtainMap('hooks');
     map.set(name, null);
@@ -29,0 +29,0 @@ });

dist/option/props.d.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 export interface PropsConfig {
@@ -4,0 +4,0 @@ type?: any;

dist/option/props.js

@@ -7,3 +7,3 @@ "use strict";
     const slot = (0, utils_1.obtainSlot)(proto);
-    let map = slot.obtainMap('props');
+    const map = slot.obtainMap('props');
     const opt = Object.assign({}, option !== null && option !== void 0 ? option : {});
@@ -10,0 +10,0 @@ map.set(name, opt);

dist/option/ref.d.ts

@@ -1,5 +0,5 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import { type OptionBuilder } from '../optionBuilder';
 export declare const decorator: {
-    (option?: {} | undefined): any;
+    (option?: unknown): any;
     (proto: import("..").BaseTypeIdentify, name: any): any;
@@ -6,0 +6,0 @@ };

dist/option/ref.js

@@ -6,5 +6,5 @@ "use strict";
 const utils_1 = require("../utils");
-exports.decorator = (0, utils_1.optoinNullableMemberDecorator)(function (proto, name, option) {
+exports.decorator = (0, utils_1.optoinNullableMemberDecorator)(function (proto, name) {
     const slot = (0, utils_1.obtainSlot)(proto);
-    let map = slot.obtainMap('ref');
+    const map = slot.obtainMap('ref');
     map.set(name, true);
@@ -11,0 +11,0 @@ });

dist/option/vanilla.d.ts

 export declare const decorator: {
-    (option?: {} | undefined): any;
+    (option?: unknown): any;
     (proto: import("..").BaseTypeIdentify, name: any): any;
 };
 //# sourceMappingURL=vanilla.d.ts.map

dist/option/vanilla.js

@@ -5,7 +5,7 @@ "use strict";
 const utils_1 = require("../utils");
-exports.decorator = (0, utils_1.optoinNullableMemberDecorator)(function (proto, name, option) {
+exports.decorator = (0, utils_1.optoinNullableMemberDecorator)(function (proto, name) {
     const slot = (0, utils_1.obtainSlot)(proto);
-    let map = slot.obtainMap('vanilla');
+    const map = slot.obtainMap('vanilla');
     map.set(name, true);
 });
 //# sourceMappingURL=vanilla.js.map

dist/option/vmodel.d.ts

@@ -1,4 +0,4 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
-import { PropsConfig } from './props';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
+import { type PropsConfig } from './props';
 export declare type VModelConfig = PropsConfig & {
@@ -5,0 +5,0 @@ name?: string;

dist/option/vmodel.js

@@ -17,3 +17,3 @@ "use strict";
     (0, props_1.decorator)(propsConfig)(proto, vmodelName);
-    let map = slot.obtainMap('v-model');
+    const map = slot.obtainMap('v-model');
     map.set(name, option);
@@ -29,3 +29,3 @@ });
             var _a;
-            let vmodelName = (_a = (value && value.name)) !== null && _a !== void 0 ? _a : 'modelValue';
+            const vmodelName = (_a = (value && value.name)) !== null && _a !== void 0 ? _a : 'modelValue';
             optionBuilder.computed[name] = {
@@ -32,0 +32,0 @@ get: function () {

dist/option/watch.d.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component';
-import { OptionBuilder } from '../optionBuilder';
+import type { Cons } from '../component';
+import type { OptionBuilder } from '../optionBuilder';
 import type { WatchCallback } from 'vue';
@@ -4,0 +4,0 @@ export interface WatchConfig {

dist/option/watch.js

@@ -8,3 +8,3 @@ "use strict";
         const slot = (0, utils_1.obtainSlot)(proto);
-        let map = slot.obtainMap('watch');
+        const map = slot.obtainMap('watch');
         const opt = Object.assign({}, option !== null && option !== void 0 ? option : {}, {
@@ -35,3 +35,3 @@ key: key,
     if (names) {
-        names.forEach((value, name) => {
+        names.forEach((value, _name) => {
             const values = Array.isArray(value) ? value : [value];
@@ -38,0 +38,0 @@ values.forEach(v => {

dist/optionBuilder.d.ts

@@ -1,4 +0,4 @@
-import { WatchConfig } from './option/watch';
-import { PropsConfig } from './option/props';
-import { InjectConfig } from './option/inject';
+import type { WatchConfig } from './option/watch';
+import type { PropsConfig } from './option/props';
+import type { InjectConfig } from './option/inject';
 export interface OptionBuilder {
@@ -5,0 +5,0 @@ name?: string;

dist/utils.d.ts

 import type { BaseTypeIdentify } from './index';
+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";
+export declare type SlotMapTypes = {
+    vanilla: Map<string, boolean>;
+    computed: Map<string, boolean>;
+    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, boolean>;
+};
 declare class Slot {
     master: any;
     constructor(master: any);
-    names: Map<string, Map<string, any>>;
-    obtainMap<T extends Map<string, any>>(name: string): T;
+    names: Map<string, SlotMapTypes[keyof SlotMapTypes]>;
+    obtainMap<T extends keyof SlotMapTypes>(name: T): SlotMapTypes[T];
     inComponent: boolean;
@@ -8,0 +26,0 @@ cachedVueComponent: any;

dist/utils.js

@@ -8,3 +8,3 @@ "use strict";
     constructor(master) {
-        this.names = new Map;
+        this.names = new Map();
         this.inComponent = false;
@@ -17,7 +17,5 @@ this.cachedVueComponent = null;
         if (!map) {
-            map = new Map;
+            map = new Map();
             this.names.set(name, map);
         }
-        else {
-        }
         return map;
@@ -104,10 +102,14 @@ }
     return names.filter(name => {
-        for (const mapName of slot.names.keys()) {
-            if (['watch', 'hooks'].includes(mapName)) {
-                continue;
+        let currSlot = slot;
+        while (currSlot != null) {
+            for (const mapName of currSlot.names.keys()) {
+                if (['watch', 'hooks'].includes(mapName)) {
+                    continue;
+                }
+                const map = currSlot.names.get(mapName);
+                if (map.has(name)) {
+                    return false;
+                }
             }
-            const map = slot.names.get(mapName);
-            if (map.has(name)) {
-                return false;
-            }
+            currSlot = getSuperSlot(currSlot.master);
         }
@@ -114,0 +116,0 @@ return true;

package.json

 {
   "name": "vue-facing-decorator",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "Vue typescript class and decorator based component.",
   "main": "dist/index.js",
+  "module": "dist/esm/index.js",
   "keywords": [
@@ -18,5 +19,9 @@ "vue",
   "scripts": {
-    "test-build": "npm run build && npm run test",
-    "test": "./node_modules/.bin/mocha -r ts-node/register test/test.ts",
-    "build": "./node_modules/.bin/tsc"
+    "test-build": "npm run test && npm run build",
+    "test": "mocha -r ts-node/register test/test.ts",
+    "build": "npm run build:cjs && npm run build:esm",
+    "build:cjs": "./node_modules/.bin/tsc",
+    "build:esm": "./node_modules/.bin/tsc -outDir dist/esm -module ES6",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   },
@@ -33,4 +38,7 @@ "author": "",
     "@types/node": "^17.0.41",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
     "@vue/test-utils": "^2.0.2",
     "chai": "^4.3.6",
+    "eslint": "^8.35.0",
     "jsdom": "^20.0.0",
@@ -37,0 +45,0 @@ "jsdom-global": "^3.0.2",

readme.md

 # Read me
 
-![GitHub](https://img.shields.io/github/license/facing-dev/vue-facing-decorator) ![npm](https://img.shields.io/npm/v/vue-facing-decorator) ![npm peer dependency version (scoped)](https://img.shields.io/npm/dependency-version/vue-facing-decorator/peer/vue)
+![GitHub](https://img.shields.io/github/license/facing-dev/vue-facing-decorator) ![npm](https://img.shields.io/npm/v/vue-facing-decorator) ![npm peer dependency version (scoped)](https://img.shields.io/npm/dependency-version/vue-facing-decorator/peer/vue) ![lts](https://img.shields.io/badge/LTS-prepared-blue)
 
@@ -26,2 +26,6 @@ Designed for vue 3, do the same work like [vue-class-component](https://github.com/vuejs/vue-class-component) and [vue-property-decorator](https://github.com/kaorun343/vue-property-decorator).
 
+# Donate
+
+[DONATE 捐献](https://facing-dev.github.io/vue-facing-decorator/donate/donate.html)
+
 # Document
@@ -28,0 +32,0 @@

src/component.ts

@@ -1,3 +0,3 @@
-import { defineComponent, ComponentCustomOptions } from 'vue';
-import { obtainSlot, getSuperSlot, getSlot } from './utils'
+import { defineComponent, type ComponentCustomOptions } from 'vue';
+import { obtainSlot, getSuperSlot } from './utils'
 import { build as optionComputed } from './option/computed'
@@ -7,13 +7,15 @@ import { build as optionData } from './option/data'
 import { build as optionRef } from './option/ref'
-import { build as optionWatch, WatchConfig } from './option/watch'
-import { build as optionProps, PropsConfig } from './option/props'
-import { build as optionInject, InjectConfig } from './option/inject'
+import { build as optionWatch } from './option/watch'
+import { build as optionProps } from './option/props'
+import { build as optionInject } from './option/inject'
 import { build as optionEmit } from './option/emit'
-import { build as optionVModel, VModelConfig } from './option/vmodel'
+import { build as optionVModel } from './option/vmodel'
 import { build as optionAccessor } from './option/accessor'
-import { OptionBuilder } from './optionBuilder'
+import type { OptionBuilder } from './optionBuilder'
 import type { VueCons } from './index'
 export type Cons = VueCons
+
 // export interface Cons { new(): any, prototype: any }
 function ComponentOption(cons: Cons, extend?: any) {
+    
     const optionBuilder: OptionBuilder = {}
@@ -62,3 +64,3 @@ optionVModel(cons, optionBuilder)
 function buildComponent(cons: Cons, arg: ComponentOption, extend?: any): any {
-    let option = ComponentOption(cons, extend)
+    const option = ComponentOption(cons, extend)
     const slot = obtainSlot(cons.prototype)
@@ -129,2 +131,2 @@ Object.keys(arg).reduce<Record<string, any>>((option, name: string) => {
     })
-}
+}

src/index-return-cons.ts

 export * from './index'
 import { Component as ComponentOld } from './index'
+
 export function Component(this: any,...args:Parameters<typeof ComponentOld>) {
@@ -18,2 +19,2 @@ const res = ComponentOld.apply(this, args)
     }
-}
+}

src/index.ts

@@ -1,2 +0,1 @@
-
 export { Component, ComponentBase } from './component'
@@ -11,6 +10,5 @@ export { decorator as Ref } from './option/ref'
 export { decorator as Hook } from './option/methodsAndHooks'
-import type {
-    ComponentPublicInstance
-} from 'vue'
+import type { ComponentPublicInstance } from 'vue'
 import type { OptionBuilder } from './optionBuilder'
+
 const IdentifySymbol = Symbol('vue-facing-decorator-identify')
@@ -21,4 +19,2 @@ export interface BaseTypeIdentify {
 export function TSX<Properties extends {} = {}, Events extends {} = {}>() {
-
-
     type Bundle = Properties & { [index in keyof Events as `on${Capitalize<index & string>}`]: Events[index] extends Function ? Events[index] : { (param: Events[index]): any } }
@@ -32,3 +28,3 @@ return function <C extends VueCons>(cons: C) {
 
-export type VueCons  = {
+export type VueCons = {
     new(optionBuilder: OptionBuilder, vueInstance: any): ComponentPublicInstance & BaseTypeIdentify
@@ -47,2 +43,3 @@ }
 } as VueCons
+
 export const Vue = Base

src/option/accessor.ts

@@ -1,3 +0,3 @@
-import { Cons } from '../component'
-import { OptionBuilder,applyAccessors} from '../optionBuilder'
+import type { Cons } from '../component'
+import { type OptionBuilder, applyAccessors} from '../optionBuilder'
 import { toComponentReverse, obtainSlot } from '../utils'
@@ -7,6 +7,6 @@
     const slot = obtainSlot(cons.prototype)
-    let vanillaMap = slot.obtainMap('vanilla')
+    const vanillaMap = slot.obtainMap('vanilla')
     const protoArr = toComponentReverse(cons.prototype)
     const map: Map<string, { get: (() => any) | undefined, set: ((v: any) => any) | undefined }> = new Map
- 
+
     applyAccessors(optionBuilder,(ctx:any)=>{
@@ -29,2 +29,2 @@ protoArr.forEach(proto => {
     })
-}
+}

src/option/computed.ts

@@ -1,11 +0,10 @@
-import { makeObject } from '../utils'
+import type { Cons } from '../component'
+import { obtainSlot, toComponentReverse, getValidNames } from '../utils'
+import type { OptionBuilder } from '../optionBuilder'
 
-import { Cons } from '../component'
-import { obtainSlot, toComponentReverse, getValidNames } from '../utils'
-import { OptionBuilder } from '../optionBuilder'
 export function build(cons: Cons, optionBuilder: OptionBuilder) {
     optionBuilder.computed ??= {}
     const slot = obtainSlot(cons.prototype)
-    let map = slot.obtainMap<Map<string, any>>('computed')
-    let vanillaMap = slot.obtainMap<Map<string, any>>('vanilla')
+    const map = slot.obtainMap('computed')
+    const vanillaMap = slot.obtainMap('vanilla')
     const protoArr = toComponentReverse(cons.prototype)
@@ -25,2 +24,2 @@ protoArr.forEach(proto => {
     })
-}
+}

src/option/data.ts

@@ -1,6 +0,6 @@
-import { makeObject } from '../utils'
-import { Cons } from '../component'
-import { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, excludeNames, getValidNames } from '../utils'
-export function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any, propNames?: string[]) {
+import type { Cons } from '../component'
+import type { OptionBuilder } from '../optionBuilder'
+import { makeObject, obtainSlot, excludeNames, getValidNames } from '../utils'
+
+export function build(cons: Cons, optionBuilder: OptionBuilder, vueInstance: any, _propNames?: string[]) {
     optionBuilder.data ??= {}
@@ -14,2 +14,2 @@ const sample = new cons(optionBuilder, vueInstance)
     Object.assign(optionBuilder.data, makeObject(names, sample))
-}
+}

src/option/emit.ts

@@ -1,12 +0,12 @@
-import { Cons } from '../component'
-import { OptionBuilder } from '../optionBuilder'
+import type { Cons } from '../component'
+import type { OptionBuilder } from '../optionBuilder'
 import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
 export type EmitConfig = null | string
+
 export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, key?: string) {
     const slot = obtainSlot(proto)
-    let map = slot.obtainMap<Map<string, EmitConfig>>('emit');
+    const map = slot.obtainMap('emit');
     map.set(name, typeof key === 'undefined' ? null : key)
 })
 
-
 export function build(cons: Cons, optionBuilder: OptionBuilder) {
@@ -37,2 +37,2 @@ optionBuilder.methods ??= {}
 
-}
+}

src/option/inject.ts

@@ -0,7 +1,7 @@
+import type { Cons } from '../component'
+import type { OptionBuilder } from '../optionBuilder'
+import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
 
-import { Cons } from '../component'
-import { OptionBuilder } from '../optionBuilder'
-import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
 export interface InjectConfig {
-    from?: string | Symbol
+    from?: string | symbol
     default?: any
@@ -12,3 +12,3 @@ }
     const slot = obtainSlot(proto)
-    let map = slot.obtainMap<Map<string, InjectConfig>>('inject')
+    const map = slot.obtainMap('inject')
     const opt = Object.assign({}, option ?? {})
@@ -22,3 +22,3 @@ map.set(name, opt)
     const slot = obtainSlot(cons.prototype)
-    const names = slot.obtainMap<Map<string, InjectConfig>>('inject')
+    const names = slot.obtainMap('inject')
     if (names) {
@@ -25,0 +25,0 @@ names.forEach((value, name) => {

src/option/methodsAndHooks.ts

@@ -1,4 +0,3 @@
-
-import { Cons } from '../component'
-import { OptionBuilder } from '../optionBuilder'
+import type { Cons } from '../component'
+import type { OptionBuilder } from '../optionBuilder'
 import { obtainSlot, toComponentReverse, excludeNames, getValidNames, optoinNullableMemberDecorator } from '../utils'
@@ -29,3 +28,3 @@
     const slot = obtainSlot(proto)
-    let map = slot.obtainMap<Map<string, HookConfig>>('hooks');
+    const map = slot.obtainMap('hooks');
     map.set(name, null)
@@ -81,2 +80,2 @@ })
 
-}
+}

src/option/props.ts

@@ -1,4 +0,5 @@
-import { Cons } from '../component'
-import { OptionBuilder } from '../optionBuilder'
+import type { Cons } from '../component'
+import type { OptionBuilder } from '../optionBuilder'
 import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
+
 export interface PropsConfig {
@@ -13,3 +14,3 @@ type?: any
     const slot = obtainSlot(proto)
-    let map = slot.obtainMap<Map<string, PropsConfig>>('props')
+    const map = slot.obtainMap('props')
     const opt = Object.assign({}, option ?? {})
@@ -22,3 +23,3 @@ map.set(name, opt as PropsConfig)
     const slot = obtainSlot(cons.prototype)
-    const names = slot.obtainMap<Map<string, PropsConfig>>('props')
+    const names = slot.obtainMap('props')
 
@@ -25,0 +26,0 @@ if (names) {

src/option/ref.ts

@@ -1,8 +0,8 @@
-import { Cons } from '../component'
-import { OptionBuilder, applyAccessors } from '../optionBuilder'
+import type { Cons } from '../component'
+import { type OptionBuilder, applyAccessors } from '../optionBuilder'
 import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
 
-export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, option?: {}) {
+export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string) {
     const slot = obtainSlot(proto)
-    let map = slot.obtainMap<Map<string, any>>('ref')
+    const map = slot.obtainMap('ref')
     map.set(name, true)
@@ -14,3 +14,3 @@ })
     const slot = obtainSlot(cons.prototype)
-    const names = slot.obtainMap<Map<string, any>>('ref')!
+    const names = slot.obtainMap('ref')!
     if (names) {
@@ -30,2 +30,2 @@ applyAccessors(optionBuilder, (ctx: any) => {
     }
-}
+}

src/option/vanilla.ts

 import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
 
-export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, option?: {}) {
+export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string) {
     const slot = obtainSlot(proto)
-    let map = slot.obtainMap<Map<string, any>>('vanilla')
+    const map = slot.obtainMap('vanilla')
     map.set(name, true)
 })

src/option/vmodel.ts

@@ -1,8 +0,10 @@
-import { Cons } from '../component'
-import { OptionBuilder } from '../optionBuilder'
+import type { Cons } from '../component'
+import type { OptionBuilder } from '../optionBuilder'
 import { obtainSlot, optoinNullableMemberDecorator } from '../utils'
-import { decorator as PropsDecorator, PropsConfig } from './props'
+import { decorator as PropsDecorator, type PropsConfig } from './props'
+
 export type VModelConfig = PropsConfig & {
     name?: string
 }
+
 export const decorator = optoinNullableMemberDecorator(function (proto: any, name: string, option?: VModelConfig) {
@@ -18,3 +20,3 @@ option ??= {}
     PropsDecorator(propsConfig)(proto, vmodelName)
-    let map = slot.obtainMap<Map<string, VModelConfig>>('v-model')
+    const map = slot.obtainMap('v-model')
     map.set(name, option)
@@ -27,6 +29,6 @@ })
     const slot = obtainSlot(cons.prototype)
-    const names = slot.obtainMap<Map<string, VModelConfig>>('v-model')!
+    const names = slot.obtainMap('v-model')!
     if (names && names.size > 0) {
         names.forEach((value, name) => {
-            let vmodelName = (value && value.name) ?? 'modelValue'
+            const vmodelName = (value && value.name) ?? 'modelValue'
             optionBuilder.computed![name] = {
@@ -42,2 +44,2 @@ get: function (this: any) {
     }
-}
+}

src/option/watch.ts

@@ -1,5 +0,6 @@
-import { Cons } from '../component'
-import { OptionBuilder } from '../optionBuilder'
+import type { Cons } from '../component'
+import type { OptionBuilder } from '../optionBuilder'
 import { obtainSlot, } from '../utils'
 import type { WatchCallback } from 'vue'
+
 export interface WatchConfig {
@@ -16,3 +17,3 @@ key: string
         const slot = obtainSlot(proto)
-        let map = slot.obtainMap<Map<string, WatchConfig | WatchConfig[]>>('watch');
+        const map = slot.obtainMap('watch');
         const opt = Object.assign({}, option ?? {}, {
@@ -39,5 +40,5 @@ key: key,
     const slot = obtainSlot(cons.prototype)
-    const names = slot.obtainMap<Map<string, WatchConfig | WatchConfig[]>>('watch')
+    const names = slot.obtainMap('watch')
     if (names) {
-        names.forEach((value, name) => {
+        names.forEach((value, _name) => {
             const values = Array.isArray(value) ? value : [value]
@@ -59,2 +60,2 @@ values.forEach(v => {
 
-}
+}

src/optionBuilder.ts

@@ -1,4 +0,4 @@
-import { WatchConfig } from './option/watch'
-import { PropsConfig } from './option/props'
-import { InjectConfig } from './option/inject'
+import type { WatchConfig } from './option/watch'
+import type { PropsConfig } from './option/props'
+import type { InjectConfig } from './option/inject'
 export interface OptionBuilder {
@@ -14,3 +14,2 @@ name?: string
     beforeCreateCallbacks?: Function[]
-
 }
@@ -28,2 +27,3 @@
 }
+
 // export function applyGetters(optionBuilder: OptionBuilder, dataFunc: (ctx: any) => Map<string, () => any>) {
@@ -54,2 +54,2 @@ //     optionBuilder.beforeCreateCallbacks ??= []
 //     })
-// }
+// }

src/utils.ts

 import { Base } from './index'
 import type { BaseTypeIdentify } from './index'
+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";
+
 const SlotSymbol = Symbol('vue-facing-decorator-slot')
+
+export type SlotMapTypes = {
+    vanilla: Map<string, boolean>
+    computed: Map<string, boolean>
+    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, boolean>
+}
+
 class Slot {
@@ -9,13 +30,10 @@ master: any
     }
-    names: Map<string, Map<string, any>> = new Map
-    obtainMap<T extends Map<string, any>>(name: string): T {
+    names: Map<string, SlotMapTypes[keyof SlotMapTypes]> = new Map()
+    obtainMap<T extends keyof SlotMapTypes>(name: T): SlotMapTypes[T] {
         let map = this.names.get(name)
         if (!map) {
-
-            map = new Map
+            map = new Map()
             this.names.set(name, map)
-        } else {
-
         }
-        return map as any
+        return map as SlotMapTypes[T]
     }
@@ -37,2 +55,3 @@ inComponent = false
 }
+
 export function getSlot(obj: any): Slot | undefined {
@@ -111,11 +130,16 @@
     return names.filter(name => {
-        for (const mapName of slot.names.keys()) {
-            if (['watch', 'hooks'].includes(mapName)) {
-                continue
+        let currSlot: Slot | null = slot
+        while (currSlot != null) {
+            for (const mapName of currSlot.names.keys()) {
+                if (['watch', 'hooks'].includes(mapName)) {
+                    continue
+                }
+                const map = currSlot.names.get(mapName)!
+                if (map.has(name)) {
+                    return false
+                }
             }
-            const map = slot.names.get(mapName)!
-            if (map.has(name)) {
-                return false
-            }
+            currSlot = getSuperSlot(currSlot.master)
         }
+    
         return true
@@ -145,2 +169,2 @@ })
     return decorator
-}
+}

No alert changes

Improved metrics

Total package byte prevSize

163629

3.17%

Lines of code

2449

2.81%

Number of lines in readme file

59

7.27%

Worsened metrics

Dev dependency count

14

27.27%

Number of package files

148

-0.67%

No dependency changes