From 1d1068c5671fffa3d7204fdda3f1f4b4bb65fd79 Mon Sep 17 00:00:00 2001 From: Mateus Souza Date: Tue, 22 Mar 2022 00:42:57 -0300 Subject: [PATCH] Fixed types --- src/core/component.ts | 10 +++++----- src/core/selector.ts | 8 ++++---- src/extra/http.ts | 2 +- src/extra/route.ts | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/core/component.ts b/src/core/component.ts index da1ff11..72d85df 100644 --- a/src/core/component.ts +++ b/src/core/component.ts @@ -12,7 +12,7 @@ declare type State = any declare type Callback = (component: Component) => void | Promise declare type Component = { - element: Element, + element: HTMLElement, state: State, template: Template, render: (state?: State) => void | Promise @@ -28,7 +28,7 @@ declare type Definition = { onDestroy: Callback } -declare interface WithComponents extends Element { +declare interface WithComponents extends HTMLElement { __components?: Record } @@ -164,7 +164,7 @@ async function render(component: Component, callback: Callback) { * Mount components on given target element * @param target */ -async function mount(target: Element) { +async function mount(target: HTMLElement) { for (const definition of _definitions) { @@ -228,7 +228,7 @@ async function mount(target: Element) { * Destroy components on given target element * @param target */ -async function destroy(target: Element) { +async function destroy(target: HTMLElement) { for (const definition of _definitions) { @@ -259,5 +259,5 @@ async function destroy(target: Element) { } -export type { Selector, Template, State, Callback } +export type { Selector, Template, State, Component, Callback } export { register, unregister, render, mount, destroy } diff --git a/src/core/selector.ts b/src/core/selector.ts index 9aaf89b..70cb374 100644 --- a/src/core/selector.ts +++ b/src/core/selector.ts @@ -1,4 +1,4 @@ -declare type Selectable = HTMLElement | Element | Document +declare type Selectable = HTMLElement | Document declare type Context = string | Selectable /** @@ -6,10 +6,10 @@ declare type Context = string | Selectable * @param context * @returns */ -function getContext(context?: Context): Selectable { +function getContext(context?: Context) { context = (typeof context === 'string') ? $(context) : context context = (context instanceof Node) ? context : document - return context + return context as Selectable } /** @@ -19,7 +19,7 @@ function getContext(context?: Context): Selectable { * @returns */ function $(selector: string, context?: Context) { - return getContext(context).querySelector(selector) + return getContext(context).querySelector(selector) as Selectable } /** diff --git a/src/extra/http.ts b/src/extra/http.ts index 0f391bf..35f708e 100644 --- a/src/extra/http.ts +++ b/src/extra/http.ts @@ -39,7 +39,7 @@ function interceptAfter(callback: HTTPCallback) { * @param headers * @returns */ -async function request(method: string, url: string, data?: BodyInit, headers?: HeadersInit) { +async function request(method: string, url: string, data?: BodyInit, headers?: HeadersInit): Promise { const request: HTTPRequest = { method: method, diff --git a/src/extra/route.ts b/src/extra/route.ts index 298663d..8b9f97d 100644 --- a/src/extra/route.ts +++ b/src/extra/route.ts @@ -3,7 +3,7 @@ import { fire, watch } from "../core/observers" declare interface RoutePath { path: string - regex: RegExp + regex?: RegExp location?: string, [key: string]: any }