annil 1.0.1 → 1.0.5

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+### Bug Fixes
+
+* 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
+
+## [1.0.5](https://github.com/missannil/annil/compare/v1.0.4...v1.0.5) (2023-12-02)
+
+
+### Miscellaneous Chores
+
+* 更改SpecificType为DetailedType ([b56a920](https://github.com/missannil/annil/commit/b56a920780f7dee1cb49ee166c624b609cfd8431))
+
+## [1.0.4](https://github.com/missannil/annil/compare/v1.0.3...v1.0.4) (2023-11-30)
+
+
+### Bug Fixes
+
+* release.yml ([c8b68b6](https://github.com/missannil/annil/commit/c8b68b66a50f5834756ab9f0d926bc7f1be2f90e))
+* yml ([e51c002](https://github.com/missannil/annil/commit/e51c00290d24d9372766e66e9c807e0c3d65429f))
+
 ## [1.0.1](https://github.com/missannil/annil/compare/v1.0.0...v1.0.1) (2023-11-27)
 
 

package/README.md

@@ -1,10 +1,109 @@
-## Annil
+<h1 align="center">Annil</h1>
 
-[![](https://img.shields.io/npm/v/annil?style=flat)](https://www.npmjs.com/package/annil)
+<p align="center">
+<a href="https://www.npmjs.com/package/annil" >
+ <img src="https://img.shields.io/npm/v/annil?style=flat"/>
+</a>
+<a href="https://github.com/missannil/annil/blob/main/.github/workflows/test.yml" >
+ <img src="https://github.com/missannil/annil/actions/workflows/test.yml/badge.svg?branch=miss"/>
+ </a>
+<a href="https://github.com/missannil/annil/blob/main/.github/workflows/release-please.yml" >
+ <img src="https://github.com/missannil/annil/actions/workflows/release-please.yml/badge.svg?branch=main"/>
+ </a>
+<a href="https://github.com/missannil/annil/blob/main/LICENSE" >
+ <img src="https://img.shields.io/github/license/missannil/annil"/>
+ </a>
+<a href="https://codecov.io/gh/missannil/annil" >
+ <img src="https://codecov.io/gh/missannil/annil/graph/badge.svg?token=4CFCHGST79"/>
+ </a>
+<a href="https://www.npmjs.com/package/annil" >
+<img src="https://img.shields.io/npm/dependency-version/annil/dev/typescript"/>
+</a>
+</p>
 
-[![](https://github.com/missannil/annil/actions/workflows/release-please.yml/badge.svg?branch=main)](https://github.com/missannil/annil/blob/main/.github/workflows/release-please.yml)
+### 简介
 
-[![](https://img.shields.io/github/license/missannil/annil)](https://github.com/missannil/annil/blob/main/LICENSE)
+annil(安奈儿)是微信小程序原生开发插件,提供了新的组件构建API,旨在提高原生开发效率及代码质量。
 
-[![](https://codecov.io/github/vuejs/vue?branch=dev)]()
-annil(安奈儿)是为使用typescript原始开发微信小程序所写的插件,是您的小程序代码更易写、易读、易维护。
+### 特点
+
+- **API功能更全面**
+
+  新的组件API(相较原生Component/Page)加入了`computed`、`watch`、`store(全局响应式数据基于mobx)`等功能,使开发更便捷。
+
+  ```ts
+  ```
+- **复杂组件解决方案**
+
+  新的组件API把组件逻辑部分解耦为根组件逻辑和子组件逻辑,与wxml元素一一对应。彻底解决原生API书写复杂组件时代码逻辑耦合的问题。
+
+- **革命性的组件类型模型**
+
+  每个组件(页面)都是唯一的类型(文档描述->类型描述),在使用子组件构建新组件(页面)时,根组件和子组件类型相互关联(提供字段提示、类型约束),无论组件(页面)嵌套多少层,无论哪层数据类型发生改变,所有相关组件类型都会得到感知。当您修改、重构代码时,只要无类型报错就不会有运行时报错的心智负担。
+
+- **更合理的书写规范**
+
+  原生开发时,很容易写出不易维护的代码,比如任意`setData`一个未声明变量或通过`this.triggerEvent('name',unknown)`触发组件自定义事件。插件通过类型约束和提前声明变量等方式给出了可选方案。
+
+- **渐进式更新**
+
+  此插件提供的API都是原生API的语法糖,不具有强制性和全局性,来去自如。
+
+- **完美融合第三方库**
+
+  通过插件提供的泛型[GenerateDoc](./src/types/GenerateDoc.ts)即可根据组件文档生成组件类型,插件也内置了一些原生和第三方组件库类型,欢迎PR您写的第三方组件类型,我为人人，人人为我。
+
+### 安装
+
+1. 依赖安装
+
+- 必装
+
+  ```bash
+  npm i annil
+  ```
+
+- 可选
+
+  ```bash
+  # 推荐使用 ts开发
+  npm typescript  --save-dev
+  ```
+
+  ```bash
+  # 使用全局响应式数据
+  npm i mobx
+  ```
+
+2. 构建npm
+
+   开发者工具左上部工具栏——工具——构建npm
+   > 若使用mobx,在构建npm前需要手动更改`node_modules/mobx/dist/index.js`文件
+   > 避免使用时出现 `ReferenceError: process is not defined` 错误。
+   ```js
+   // 更改前
+   "use strict";
+
+   if (process.env.NODE_ENV === "production") {
+     module.exports = require("./mobx.cjs.production.min.js");
+   } else {
+     module.exports = require("./mobx.cjs.development.js");
+   }
+   ```
+   ```js
+   // 更改后
+   "use strict";
+   module.exports = require("./mobx.cjs.production.min.js");
+   ```
+
+   > 另外,构建时会出现`node_modules/miniprogram-api-typings/index.d.ts.js: Npm package entry file not found`错误,这是因为annil插件把官方类型库`miniprogram-api-typings`加入到生产依赖中,而npm构建时找不到生产目录所致,无视即可。还需删除`miniprogram_npm`下的`hry-types`目录(annil依赖的另一个类型库)。确保annil和mobx目录构建成功即可。
+
+### 使用文档
+
+### 更新日志
+
+[CHANGELOG](./CHANGELOG.md)
+
+### 协议
+
+[MIT](./LICENSE)

package/dist/api/DefineComponent/ReturnType/test/normalComponentDoc.test.js

@@ -19,27 +19,27 @@ const customEvents = {
     unionStr: String,
     list: [String, Number, null],
     bubbles: {
-        detailType: String,
+        detail: String,
         options: { bubbles: true },
     },
     capturePhase: {
-        detailType: null,
+        detail: null,
         options: { capturePhase: true },
     },
     bubbles_capturePhase: {
-        detailType: [String, Number],
+        detail: [String, Number],
         options: { bubbles: true, capturePhase: true },
     },
     bubbles_composed: {
-        detailType: String,
+        detail: String,
         options: { bubbles: true, composed: true },
     },
     capturePhase_composed: {
-        detailType: [String, Number, null],
+        detail: [String, Number, null],
         options: { capturePhase: true, composed: true },
     },
     bubbles_capturePhase_composed: {
-        detailType: Boolean,
+        detail: Boolean,
         options: { bubbles: true, capturePhase: true, composed: true },
     },
 };

package/dist/api/DefineComponent/ReturnType/test/normalComponentDoc.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalComponentDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalComponentDoc.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"normalComponentDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalComponentDoc.test.ts"],"names":[],"mappings":"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"}

package/dist/api/DefineComponent/ReturnType/test/normalPageDoc.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalPageDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,aAAa,EAAqB,MAAM,aAAa,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAiC;QACtC,WAAW,EAAE;YACX,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAe;SACvB;QACD,iBAAiB,EAAE;YACjB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IACD,YAAY,EAAE,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,eAAe,CAAC;IAC5C,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAaH,QAAgF,CAAC"}
+{"version":3,"file":"normalPageDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAiC;QACtC,WAAW,EAAE;YACX,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAe;SACvB;QACD,iBAAiB,EAAE;YACjB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IACD,YAAY,EAAE,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,eAAe,CAAC;IAC5C,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAaH,QAAgF,CAAC"}

package/dist/api/DefineComponent/collectOptionsForComponent.d.ts

@@ -0,0 +1,4 @@
+import type { RootComponentTrueOptions } from "../RootComponent";
+import type { SubComponentTrueOptions } from "../SubComponent";
+import type { FinalOptionsForComponent } from ".";
+export declare function collectOptionsForComponent(rootComponentOption: RootComponentTrueOptions | undefined, subComponentsList: SubComponentTrueOptions[] | undefined): FinalOptionsForComponent;

package/dist/api/DefineComponent/collectOptionsForComponent.js

@@ -0,0 +1,152 @@
+import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
+import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
+import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
+import { BStore } from "../../behaviors/BStore";
+import { deepClone } from "../../utils/deepClone";
+import { INNERMARKER } from "../../utils/InnerMarker";
+import { isEmptyObject } from "../../utils/isEmptyObject";
+function onLoadReceivedDataHandle(option) {
+    const innerData = option[INNERMARKER.url];
+    if (innerData === undefined)
+        return;
+    const optionData = JSON.parse(decodeURIComponent(innerData));
+    for (const key in optionData) {
+        option[key] = optionData[key];
+    }
+    this.setData(option);
+    delete option[INNERMARKER.url];
+    Reflect.deleteProperty(this.data, INNERMARKER.url);
+}
+function onLoadHijack(options, before, after = []) {
+    options.methods || (options.methods = {});
+    const cloneOpt = deepClone(options);
+    const originalOnLoad = options.methods.onLoad;
+    options.methods.onLoad = function (props) {
+        before.forEach((func) => {
+            func.call(this, props, cloneOpt);
+        });
+        originalOnLoad === null || originalOnLoad === void 0 ? void 0 : originalOnLoad.call(this, props);
+        after.forEach((func) => {
+            func.call(this, props, cloneOpt);
+        });
+    };
+}
+const INNERFIELDS = ["disposer"];
+function InternalFieldProtection(methodsConfig) {
+    const methodsConfigKeys = Object.keys(methodsConfig);
+    for (const key of INNERFIELDS) {
+        if (methodsConfigKeys.includes(key)) {
+            throw Error(`${key}已被内部字段占用`);
+        }
+    }
+}
+function _funcConfigHandle(methodsConfig, configList) {
+    for (const key in configList) {
+        methodsConfig[key] = function (...args) {
+            configList[key].forEach(ele => ele.call(this, ...args));
+        };
+    }
+}
+function funcConfigHandle(finalOptionsForComponent, isPage, funcOptions) {
+    if (isPage) {
+        funcOptions.pageLifetimes && _funcConfigHandle(finalOptionsForComponent.methods || (finalOptionsForComponent.methods = {}), funcOptions.pageLifetimes);
+    }
+    else {
+        funcOptions.pageLifetimes
+            && _funcConfigHandle(finalOptionsForComponent.pageLifetimes || (finalOptionsForComponent.pageLifetimes = {}), funcOptions.pageLifetimes);
+    }
+    funcOptions.lifetimes && _funcConfigHandle(finalOptionsForComponent.lifetimes || (finalOptionsForComponent.lifetimes = {}), funcOptions.lifetimes);
+    funcOptions.watch && _funcConfigHandle(finalOptionsForComponent.watch || (finalOptionsForComponent.watch = {}), funcOptions.watch);
+}
+function funcFieldsCollect(options, funcOptions) {
+    var _a;
+    for (const key in funcOptions) {
+        if (options[key]) {
+            for (const _key in options[key]) {
+                ((_a = funcOptions[key])[_key] || (_a[_key] = [])).push(options[key][_key]);
+            }
+        }
+        Reflect.deleteProperty(options, key);
+    }
+}
+function otherFieldsHandle(finalOptions, rootComponentOptions) {
+    for (const key in rootComponentOptions) {
+        const config = rootComponentOptions[key];
+        if (Array.isArray(config)) {
+            (finalOptions[key] || (finalOptions[key] = [])).push(...config);
+        }
+        else {
+            Object.assign(finalOptions[key] || (finalOptions[key] = {}), config);
+        }
+    }
+}
+function eventsHandle(componentOptions, eventsConfig) {
+    componentOptions.methods || (componentOptions.methods = {});
+    Object.assign(componentOptions.methods, eventsConfig);
+}
+function subComponentsHandle(componentOptions, subComponents, funcOptions) {
+    subComponents.forEach((subOption) => {
+        subOption.events && eventsHandle(componentOptions, subOption.events);
+        funcFieldsCollect(subOption, funcOptions);
+        otherFieldsHandle(componentOptions, subOption);
+    });
+}
+function IsFullCustomEvents(customEventOptions) {
+    return Object.prototype.toString.call(customEventOptions) === "[object Object]";
+}
+function customEventsHandle(componentOptions, customEventsConfig) {
+    componentOptions.methods || (componentOptions.methods = {});
+    for (const key in customEventsConfig) {
+        const customEventOptions = customEventsConfig[key];
+        if (IsFullCustomEvents(customEventOptions)) {
+            componentOptions.methods[key] = function (detail) {
+                this.triggerEvent(key, detail, customEventOptions.options);
+            };
+        }
+        else {
+            componentOptions.methods[key] = function (detail) {
+                this.triggerEvent(key, detail);
+            };
+        }
+    }
+}
+function collectRootComponentOption(finalOptions, funcOptions, rootComponentOptions) {
+    rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
+    delete rootComponentOptions.customEvents;
+    rootComponentOptions.events && eventsHandle(finalOptions, rootComponentOptions.events);
+    delete rootComponentOptions.events;
+    funcFieldsCollect(rootComponentOptions, funcOptions);
+    otherFieldsHandle(finalOptions, rootComponentOptions);
+}
+export function collectOptionsForComponent(rootComponentOption, subComponentsList) {
+    const finalOptionsForComponent = {
+        options: {
+            multipleSlots: true,
+            pureDataPattern: /^_/,
+            virtualHost: true,
+        },
+        behaviors: [BStore, BComputedAndWatch],
+    };
+    const funcOptions = {
+        pageLifetimes: {},
+        lifetimes: {},
+        watch: {},
+    };
+    if (rootComponentOption && !isEmptyObject(rootComponentOption)) {
+        collectRootComponentOption(finalOptionsForComponent, funcOptions, rootComponentOption);
+    }
+    if (subComponentsList && !isEmptyObject(subComponentsList)) {
+        subComponentsHandle(finalOptionsForComponent, subComponentsList, funcOptions);
+    }
+    if (!isEmptyObject(funcOptions)) {
+        funcConfigHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, funcOptions);
+    }
+    finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods);
+    finalOptionsForComponent.behaviors.push(BBeforeCreate);
+    onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], []);
+    if (finalOptionsForComponent.isPage) {
+        Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
+    }
+    return finalOptionsForComponent;
+}
+//# sourceMappingURL=collectOptionsForComponent.js.map

package/dist/api/DefineComponent/collectOptionsForComponent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"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"}

package/dist/api/DefineComponent/index.d.ts

@@ -9,19 +9,16 @@ import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
 import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
+type Path = `/${string}`;
 type RootOptions<TRootComponentDoc extends RootComponentDoc, TSubComponentTuple extends SubComponentDoc[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
 interface DefineComponentConstructor {
     <TRootComponentDoc extends RootComponentDoc = {}, TSubComponentTuple extends SubComponentDoc[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>): IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath, TSubComponentTuple>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
 }
-export type FuncConfig = {
-    pageLifetimes?: Record<string, Func[]>;
-    lifetimes?: Record<string, Func[]>;
-    watch?: Record<string, Func[]>;
-};
-export type ComponentOptions = {
+export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record<string, Func[]>>;
+export type FinalOptionsForComponent = {
     isPage?: boolean;
     options?: WMComponent.Options;
-    properties?: object;
+    properties?: Record<string, any>;
     data?: object;
     store?: object;
     computed?: Record<string, Func>;
@@ -36,26 +33,5 @@ export type ComponentOptions = {
         load: Func;
     } & WMPageLifetimes>;
 };
-export type Path = `/${string}`;
-export type DefineComponentOptions = {
-    path?: Path;
-    name?: string;
-    rootComponent?: RootComponentDoc;
-    subComponents?: SubComponentDoc[];
-};
 export declare const DefineComponent: DefineComponentConstructor;
-export type PageOptions = {
-    path: Path;
-    rootComponent: RootComponentDoc & {
-        isPage: true;
-    };
-    subComponents: SubComponentDoc[];
-};
-export type CompOptions = {
-    name: string;
-    rootComponent: RootComponentDoc & {
-        isPage: undefined;
-    };
-    subComponents: SubComponentDoc[];
-};
 export {};

package/dist/api/DefineComponent/index.js

@@ -1,40 +1,5 @@
-import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
-import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
-import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
-import { BStore } from "../../behaviors/BStore";
-import { funcConfigHandle } from "../../utils/funcConfigHandle";
-import { isEmptyObject } from "../../utils/isEmptyObject";
-import { onLoadReceivedDataHandle } from "../../utils/onLoadReceivedDataHandle";
-import { rootComponentFieldHandle } from "../../utils/rootComponentFieldHandle";
-import { subComponentsHandle } from "../../utils/subComponentsHandle";
-import { InternalFieldProtection } from "../../utils/InternalFieldProtection";
-import { onLoadHijack } from "../../utils/onLoadHijack";
+import { collectOptionsForComponent } from "./collectOptionsForComponent";
 export const DefineComponent = function (options) {
-    var _a;
-    const finalOptions = {
-        options: {
-            multipleSlots: true,
-            pureDataPattern: /^_/,
-            virtualHost: true,
-        },
-        behaviors: [BStore, BComputedAndWatch],
-    };
-    const allFuncConfig = {};
-    if (options.rootComponent && !isEmptyObject(options.rootComponent)) {
-        rootComponentFieldHandle(options.rootComponent, finalOptions, allFuncConfig);
-    }
-    if (options.subComponents && !isEmptyObject(options.subComponents)) {
-        subComponentsHandle(finalOptions, options.subComponents, allFuncConfig);
-    }
-    if (!isEmptyObject(allFuncConfig)) {
-        funcConfigHandle(finalOptions, (_a = options.rootComponent) === null || _a === void 0 ? void 0 : _a.isPage, allFuncConfig);
-    }
-    finalOptions.methods && InternalFieldProtection(finalOptions.methods);
-    finalOptions.behaviors.push(BBeforeCreate);
-    onLoadHijack(finalOptions, [onLoadReceivedDataHandle, initComputed], []);
-    if (finalOptions.isPage) {
-        Reflect.deleteProperty(finalOptions.options, "virtualHost");
-    }
-    Component(finalOptions);
+    Component(collectOptionsForComponent(options.rootComponent, options.subComponents));
 };
 //# sourceMappingURL=index.js.map

package/dist/api/DefineComponent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAUtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAoExD,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;;IAIzE,MAAM,YAAY,GAAqB;QAErC,OAAO,EAAE;YAEP,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI;YACrB,WAAW,EAAE,IAAI;SAClB;QAED,SAAS,EAAE,CAAC,MAAM,EAAE,iBAAiB,CAAC;KACvC,CAAC;IAIF,MAAM,aAAa,GAAe,EAAE,CAAC;IAErC,IAAI,OAAO,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACnE,wBAAwB,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACnE,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAC1E,CAAC;IAGD,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAClC,gBAAgB,CAAC,YAAY,EAAE,MAAA,OAAO,CAAC,aAAa,0CAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAC/E,CAAC;IAED,YAAY,CAAC,OAAO,IAAI,uBAAuB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAEtE,YAAY,CAAC,SAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE5C,YAAY,CAAC,YAAY,EAAE,CAAC,wBAAwB,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IAIzE,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,OAAQ,EAAE,aAAa,CAAC,CAAC;IAC/D,CAAC;IAED,SAAS,CAAC,YAAmB,CAAC,CAAC;AACjC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAyD1E,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CACP,0BAA0B,CAAC,OAAO,CAAC,aAAqD,EAAE,OAAO,CAAC,aAAa,CAAC,CACjH,CAAC;AACJ,CAAC,CAAC"}

package/dist/api/RootComponent/CustomEvents/CustomEventConstraint.d.ts

@@ -1,5 +1,5 @@
-import type { SpecificType } from "../../../types/SpecificType";
-type SimpleCustomeEvents = SpecificType | null;
+import type { DetailedType } from "../../../types/DetailedType";
+type SimpleCustomeEvents = DetailedType | null;
 export type SimpleCustomeEventsList = SimpleCustomeEvents[];
 export type ShortCustomeEvents = SimpleCustomeEvents | SimpleCustomeEventsList;
 type BubblesConfig = {
@@ -28,8 +28,9 @@ export type CaptureComposedOption = CaptureConfig & ComposedCongifg & NonBubbles
 export type BubblesCaptureComposedOption = BubblesConfig & ComposedCongifg & CaptureConfig;
 export type OptionsFieldsConfigOfCustomEvents = BubblesOption | CaptureOption | BubblesCaptureOption | BubblesComposedOption | CaptureComposedOption | BubblesCaptureComposedOption;
 export type FullCustomEvents = {
-    detailType: ShortCustomeEvents;
+    detail: ShortCustomeEvents;
     options: OptionsFieldsConfigOfCustomEvents;
 };
-export type CustomEventConstraint = Record<string, FullCustomEvents | ShortCustomeEvents>;
+export type CustomEvents = FullCustomEvents | ShortCustomeEvents;
+export type CustomEventConstraint = Record<string, CustomEvents>;
 export {};

package/dist/api/RootComponent/CustomEvents/GetCustomEventDoc.d.ts

@@ -1,9 +1,9 @@
-import type { InferSpecificType } from "../../../types/InferSpecificType";
-import type { SpecificType } from "../../../types/SpecificType";
+import type { DetailedType } from "../../../types/DetailedType";
+import type { InferDetailedType } from "../../../types/InferDetailedType";
 import type { CustomEventConstraint, FullCustomEvents, ShortCustomeEvents, SimpleCustomeEventsList } from "./CustomEventConstraint";
 import type { AddTagForCustomEventsDoc } from "./CustomEventsTag";
-export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends SpecificType ? InferSpecificType<T> : T extends null ? null : T extends SimpleCustomeEventsList ? GetShortCustomEventsDoc<T[number]> : never;
-export type GetFullCustomEventsDoc<T extends FullCustomEvents> = GetShortCustomEventsDoc<T["detailType"]> | AddTagForCustomEventsDoc<T["options"]>;
+export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType ? InferDetailedType<T> : T extends null ? null : T extends SimpleCustomeEventsList ? GetShortCustomEventsDoc<T[number]> : never;
+export type GetFullCustomEventsDoc<T extends FullCustomEvents> = GetShortCustomEventsDoc<T["detail"]> | AddTagForCustomEventsDoc<T["options"]>;
 export type GetCustomEventDoc<T extends CustomEventConstraint> = {
-    [k in keyof T]: T[k] extends ShortCustomeEvents ? GetShortCustomEventsDoc<T[k]> : GetShortCustomEventsDoc<T[k]["detailType"]> | AddTagForCustomEventsDoc<T[k]["options"]>;
+    [k in keyof T]: T[k] extends ShortCustomeEvents ? GetShortCustomEventsDoc<T[k]> : GetShortCustomEventsDoc<T[k]["detail"]> | AddTagForCustomEventsDoc<T[k]["options"]>;
 };

package/dist/api/RootComponent/CustomEvents/test/error.test.js

@@ -2,22 +2,22 @@ import { RootComponent } from "../..";
 RootComponent()({
     customEvents: {
         error1: {
-            detailType: Boolean,
+            detail: Boolean,
         },
         error2: {
-            detailType: Boolean,
+            detail: Boolean,
             options: {},
         },
         error3: {
-            detailType: Boolean,
+            detail: Boolean,
             options: { bubbles: false },
         },
         error4: {
-            detailType: Boolean,
+            detail: Boolean,
             options: { capturePhase: false },
         },
         error5: {
-            detailType: Boolean,
+            detail: Boolean,
             options: { composed: true },
         },
     },
@@ -35,7 +35,7 @@ RootComponent()({
 RootComponent()({
     customEvents: {
         error1: {
-            detailType: String,
+            detail: String,
             options: {
                 bubbles: true,
                 compose: true,
@@ -46,7 +46,7 @@ RootComponent()({
 RootComponent()({
     customEvents: {
         error2: {
-            detailType: String,
+            detail: String,
             options: {
                 bubbles: true,
                 capturePhases: true,
@@ -62,7 +62,7 @@ RootComponent()({
     },
     customEvents: {
         bbb: {
-            detailType: null,
+            detail: null,
             options: {
                 bubbleds: false,
             },

package/dist/api/RootComponent/CustomEvents/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/CustomEvents/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAKtC,aAAa,EAAE,CAAC;IACd,YAAY,EAAE;QAEZ,MAAM,EAAE;YACN,UAAU,EAAE,OAAO;SACpB;QAED,MAAM,EAAE;YACN,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,EAAE;SACZ;QAED,MAAM,EAAE;YACN,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;SAC5B;QAED,MAAM,EAAE;YACN,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE;SACjC;QAED,MAAM,EAAE;YACN,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;SAC5B;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QACN,GAAG;YACD,CAAC,CAAC;QACJ,CAAC;KACF;IACD,YAAY,EAAE;QAEZ,GAAG,EAAE,MAAM;KACZ;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,YAAY,EAAE;QACZ,MAAM,EAAE;YACN,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBAEb,OAAO,EAAE,IAAI;aACd;SACF;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,YAAY,EAAE;QACZ,MAAM,EAAE;YACN,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBAEb,aAAa,EAAE,IAAI;aACpB;SACF;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QACN,GAAG;YACD,CAAC,CAAC;QACJ,CAAC;KACF;IACD,YAAY,EAAE;QACZ,GAAG,EAAE;YACH,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE;gBAEP,QAAQ,EAAE,KAAK;aAChB;SACF;QACD,GAAG,EAAE,MAAM;KACZ;CACF,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/CustomEvents/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAKtC,aAAa,EAAE,CAAC;IACd,YAAY,EAAE;QAEZ,MAAM,EAAE;YACN,MAAM,EAAE,OAAO;SAChB;QAED,MAAM,EAAE;YACN,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,EAAE;SACZ;QAED,MAAM,EAAE;YACN,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;SAC5B;QAED,MAAM,EAAE;YACN,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE;SACjC;QAED,MAAM,EAAE;YACN,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;SAC5B;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QACN,GAAG;YACD,CAAC,CAAC;QACJ,CAAC;KACF;IACD,YAAY,EAAE;QAEZ,GAAG,EAAE,MAAM;KACZ;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,YAAY,EAAE;QACZ,MAAM,EAAE;YACN,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBAEb,OAAO,EAAE,IAAI;aACd;SACF;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,YAAY,EAAE;QACZ,MAAM,EAAE;YACN,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBAEb,aAAa,EAAE,IAAI;aACpB;SACF;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QACN,GAAG;YACD,CAAC,CAAC;QACJ,CAAC;KACF;IACD,YAAY,EAAE;QACZ,GAAG,EAAE;YACH,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE;gBAEP,QAAQ,EAAE,KAAK;aAChB;SACF;QACD,GAAG,EAAE,MAAM;KACZ;CACF,CAAC,CAAC"}