diff --git a/Source/Context/Connection.tsx b/Source/Context/Connection.tsx index 691c888..27c00c4 100644 --- a/Source/Context/Connection.tsx +++ b/Source/Context/Connection.tsx @@ -1,10 +1,4 @@ -export default async ({ children }: { children?: JSX.Element }) => { - const { createEffect, on } = await import("solid-js"); - - const { default: Connection, _Function } = await import( - "@Context/Connection/Context.js" - ); - +export default ({ children }: { children?: JSX.Element }) => { createEffect( on( Connection.State, @@ -43,3 +37,9 @@ export default async ({ children }: { children?: JSX.Element }) => { }; import type { JSX } from "solid-js"; + +export const { createEffect, on } = await import("solid-js"); + +export const { default: Connection, _Function } = await import( + "@Context/Connection/Context.js" +); diff --git a/Source/Element/Button.tsx b/Source/Element/Button.tsx index 6843793..4b5a80b 100644 --- a/Source/Element/Button.tsx +++ b/Source/Element/Button.tsx @@ -1,6 +1,6 @@ import "@Stylesheet/Element/Button.scss"; -export type Fn = HTMLButtonElement | ((Button: HTMLButtonElement) => void); +export type Fn = HTMLButtonElement; export interface Property { // biome-ignore lint/suspicious/noExplicitAny: @@ -21,13 +21,12 @@ export type Concrete = { [Key in keyof Type]-?: Type[Key]; }; -export default async (Property: Property) => { - const { Action, Type, children, Class, Label } = ( - await import("@Function/Merge.js") - ).default( +export default (Property: Property) => { + const { Action, Type, children, Class, Label } = Merge( { children: "", Type: "button", + // biome-ignore lint/suspicious/noEmptyBlockStatements: Action: () => {}, Class: "", Label: "", @@ -42,12 +41,18 @@ export default async (Property: Property) => { }`.trim()} onClick={() => { Action(Property.Fn); + Property.Fn?.blur(); }} - ref={Property.Fn} + // TODO: FIX THIS + // ref={Property.Fn} type={Type} aria-label={Label}> - {(await import("solid-js")).children(() => children)()} + {children(() => children)()} ); }; + +export const { children } = await import("solid-js"); + +export const { default: Merge } = await import("@Function/Merge.js"); diff --git a/Source/Interface/Create.ts b/Source/Interface/Create.ts index a922c5c..d78086e 100644 --- a/Source/Interface/Create.ts +++ b/Source/Interface/Create.ts @@ -18,7 +18,7 @@ export default interface Interface { [Store, [Item, _Item]]: Property, // biome-ignore lint/suspicious/noExplicitAny: Value: any, - ): Promise>; + ): Return; } export type Property = [string, Signal]; diff --git a/Source/Library/Create.ts b/Source/Library/Create.ts index 73ab6ef..a74f9c8 100644 --- a/Source/Library/Create.ts +++ b/Source/Library/Create.ts @@ -2,15 +2,13 @@ * @module Create * */ -export default (async ( +export default (( ...[[Store, [Item, _Item]], Value = null]: Parameters ) => { let Existing = get(Store); try { - Existing = ( - await import("@codeeditorland/common/Target/Function/Get.js") - ).default(JSON.parse(get(Store))); + Existing = Get(JSON.parse(get(Store))); } catch (_Error) { console.log(_Error); } @@ -23,3 +21,7 @@ export default (async ( import type Interface from "../Interface/Create.js"; export const { get } = await import("store"); + +export const { default: Get } = await import( + "@codeeditorland/common/Target/Function/Get.js" +); diff --git a/Source/Library/Persist.ts b/Source/Library/Persist.ts index 701ea90..595cb39 100644 --- a/Source/Library/Persist.ts +++ b/Source/Library/Persist.ts @@ -2,7 +2,7 @@ * @module Persist * */ -export default async ([[Item, _Item], Store]: Property): Promise< +export default ([[Item, _Item], Store]: Property): Promise< Return > => { (await import("solid-js")).createEffect( diff --git a/Target/Context/Connection.d.ts b/Target/Context/Connection.d.ts index 5ec29c1..cd64e61 100644 --- a/Target/Context/Connection.d.ts +++ b/Target/Context/Connection.d.ts @@ -1,5 +1,23 @@ declare const _default: ({ children }: { children?: JSX.Element; -}) => Promise; +}) => JSX.Element; export default _default; import type { JSX } from "solid-js"; +export declare const createEffect: typeof import("solid-js").createEffect, on: typeof import("solid-js").on; +export declare const Connection: { + Messages: import("solid-js").Signal; + Socket: import("solid-js").Signal void; + }>; + State: import("solid-js").Accessor<0 | 2 | 1 | 3>; + Status: import("solid-js").Signal; + States: Type; +}, _Function: import("solid-js").Context<{ + Messages: import("solid-js").Signal; + Socket: import("solid-js").Signal void; + }>; + State: import("solid-js").Accessor<0 | 2 | 1 | 3>; + Status: import("solid-js").Signal; + States: Type; +}>; diff --git a/Target/Context/Connection.js b/Target/Context/Connection.js index 83db715..32eaeab 100644 --- a/Target/Context/Connection.js +++ b/Target/Context/Connection.js @@ -1 +1 @@ -var n=async({children:i})=>{const{createEffect:a,on:s}=await import("solid-js"),{default:e,_Function:r}=await import("./Connection/Context.js");return a(s(e.State,t=>e.Status[1](e.States[t]),{defer:!1})),a(s(e.Socket[0],t=>t?.addEventListener("message",async o=>e.Messages[1]((await import("../Function/Merge.js")).default(e.Messages[0](),await(await import("@codeeditorland/common/Target/Function/Get.js")).default(JSON.parse(o.data))))),{defer:!1})),React.createElement(r.Provider,{value:r.defaultValue},i)};export{n as default}; +var n=({children:s})=>(a(r(e.State,t=>e.Status[1](e.States[t]),{defer:!1})),a(r(e.Socket[0],t=>t?.addEventListener("message",async i=>e.Messages[1]((await import("../Function/Merge.js")).default(e.Messages[0](),await(await import("@codeeditorland/common/Target/Function/Get.js")).default(JSON.parse(i.data))))),{defer:!1})),React.createElement(o.Provider,{value:o.defaultValue},s));const{createEffect:a,on:r}=await import("solid-js"),{default:e,_Function:o}=await import("./Connection/Context.js");export{e as Connection,o as _Function,a as createEffect,n as default,r as on}; diff --git a/Target/Context/Environment/Context.d.ts b/Target/Context/Environment/Context.d.ts index b5f6536..1a15c26 100644 --- a/Target/Context/Environment/Context.d.ts +++ b/Target/Context/Environment/Context.d.ts @@ -4,9 +4,9 @@ export type Type = Context<{ Data: Data; }>; export declare const _Function: Context<{ - Data: Promise<[import("solid-js").Accessor, import("solid-js").Setter]>; + Data: [import("solid-js").Accessor, import("solid-js").Setter]; }>; declare const _default: { - Data: Promise<[import("solid-js").Accessor, import("solid-js").Setter]>; + Data: [import("solid-js").Accessor, import("solid-js").Setter]; }; export default _default; diff --git a/Target/Context/Environment/Data.d.ts b/Target/Context/Environment/Data.d.ts index f1fb40d..7bbb158 100644 --- a/Target/Context/Environment/Data.d.ts +++ b/Target/Context/Environment/Data.d.ts @@ -2,5 +2,5 @@ import type { _Function } from "@Library/Environment"; import type { Signal } from "solid-js"; import type { z } from "zod"; export type Type = Signal>>; -declare const _default: Promise<[import("solid-js").Accessor, import("solid-js").Setter]>; +declare const _default: [import("solid-js").Accessor, import("solid-js").Setter]; export default _default; diff --git a/Target/Context/Session/Context.d.ts b/Target/Context/Session/Context.d.ts index 1a0fda2..0d43c6f 100644 --- a/Target/Context/Session/Context.d.ts +++ b/Target/Context/Session/Context.d.ts @@ -4,9 +4,9 @@ export type Type = Context<{ Data: Data; }>; export declare const _Function: Context<{ - Data: Promise<[import("solid-js").Accessor, import("solid-js").Setter]>; + Data: [import("solid-js").Accessor, import("solid-js").Setter]; }>; declare const _default: { - Data: Promise<[import("solid-js").Accessor, import("solid-js").Setter]>; + Data: [import("solid-js").Accessor, import("solid-js").Setter]; }; export default _default; diff --git a/Target/Context/Session/Data.d.ts b/Target/Context/Session/Data.d.ts index 877b1f7..b672e79 100644 --- a/Target/Context/Session/Data.d.ts +++ b/Target/Context/Session/Data.d.ts @@ -1,2 +1,2 @@ -declare const _default: Promise<[import("solid-js").Accessor, import("solid-js").Setter]>; +declare const _default: [import("solid-js").Accessor, import("solid-js").Setter]; export default _default; diff --git a/Target/Element/Button.d.ts b/Target/Element/Button.d.ts index 3df7e58..234855c 100644 --- a/Target/Element/Button.d.ts +++ b/Target/Element/Button.d.ts @@ -1,5 +1,5 @@ import "@Stylesheet/Element/Button.scss"; -export type Fn = HTMLButtonElement | ((Button: HTMLButtonElement) => void); +export type Fn = HTMLButtonElement; export interface Property { children?: any; Type?: "submit" | "reset" | "button"; @@ -11,5 +11,7 @@ export interface Property { export type Concrete = { [Key in keyof Type]-?: Type[Key]; }; -declare const _default: (Property: Property) => Promise; +declare const _default: (Property: Property) => import("solid-js").JSX.Element; export default _default; +export declare const children: typeof import("solid-js").children; +export declare const Merge: (...objects: Ts) => import("deepmerge-ts").DeepMergeHKT, import("deepmerge-ts").DeepMergeBuiltInMetaData>; diff --git a/Target/Element/Button.js b/Target/Element/Button.js index 25ad17e..e7a731c 100644 --- a/Target/Element/Button.js +++ b/Target/Element/Button.js @@ -1 +1 @@ -import"../Stylesheet/Element/Button.scss";var s=async t=>{const{Action:n,Type:o,children:i,Class:e,Label:r}=(await import("../Function/Merge.js")).default({children:"",Type:"button",Action:()=>{},Class:"",Label:""},t);return React.createElement("button",{class:`Button ${typeof e=="function"?e(t.Fn):e}`.trim(),onClick:()=>{n(t.Fn),t.Fn?.blur()},ref:t.Fn,type:o,"aria-label":r},(await import("solid-js")).children(()=>i)())};export{s as default}; +import"../Stylesheet/Element/Button.scss";var a=t=>{const{Action:r,Type:o,children:n,Class:e,Label:i}=s({children:"",Type:"button",Action:()=>{},Class:"",Label:""},t);return React.createElement("button",{class:`Button ${typeof e=="function"?e(t.Fn):e}`.trim(),onClick:()=>{r(t.Fn),t.Fn?.blur()},type:o,"aria-label":i},n(()=>n)())};const{children:l}=await import("solid-js"),{default:s}=await import("../Function/Merge.js");export{s as Merge,l as children,a as default}; diff --git a/Target/Element/Editor.d.ts b/Target/Element/Editor.d.ts index b9f556b..1e55b7e 100644 --- a/Target/Element/Editor.d.ts +++ b/Target/Element/Editor.d.ts @@ -25,13 +25,13 @@ export declare const Connection: { States: Type; }; export declare const Session: { - Data: Promise<[import("solid-js").Accessor, import("solid-js").Setter]>; + Data: [import("solid-js").Accessor, import("solid-js").Setter]; }; export declare const Store: { Items: import("solid-js").Signal>; }; export declare const Anchor: (Property: import("@Element/Anchor").Property) => import("solid-js").JSX.Element; -export declare const Button: (Property: import("@Element/Button").Property) => Promise; +export declare const Button: (Property: import("@Element/Button").Property) => import("solid-js").JSX.Element; export declare const Tip: ({ children, }: { children?: any; }) => Promise, Copy: (Event: MouseEvent & { diff --git a/Target/Interface/Create.d.ts b/Target/Interface/Create.d.ts index 61bb962..79f421c 100644 --- a/Target/Interface/Create.d.ts +++ b/Target/Interface/Create.d.ts @@ -14,7 +14,7 @@ export default interface Interface { * defaults to `null`. * */ - ([Store, [Item, _Item]]: Property, Value: any): Promise>; + ([Store, [Item, _Item]]: Property, Value: any): Return; } export type Property = [string, Signal]; export type Return = Signal; diff --git a/Target/Library/Create.d.ts b/Target/Library/Create.d.ts index 1d3dadb..78b508a 100644 --- a/Target/Library/Create.d.ts +++ b/Target/Library/Create.d.ts @@ -2,6 +2,7 @@ * @module Create * */ -declare const _default: (__0_0: import("../Interface/Create.js").Property, Value: any) => Promise<[import("solid-js").Accessor, import("solid-js").Setter]>; +declare const _default: (__0_0: import("../Interface/Create.js").Property, Value: any) => [import("solid-js").Accessor, import("solid-js").Setter]; export default _default; export declare const get: (key: string, optionalDefaultValue?: any) => any; +export declare const Get: import("@codeeditorland/common/Target/Interface/Get.js").default; diff --git a/Target/Library/Create.js b/Target/Library/Create.js index 9400827..d6ea96b 100644 --- a/Target/Library/Create.js +++ b/Target/Library/Create.js @@ -1 +1 @@ -var c=async(...[[t,[n,e]],o=null])=>{let r=a(t);try{r=(await import("@codeeditorland/common/Target/Function/Get.js")).default(JSON.parse(a(t)))}catch(s){console.log(s)}return e(o??r),[n,e]};const{get:a}=await import("store");export{c as default,a as get}; +var i=(...[[t,[o,e]],n=null])=>{let r=a(t);try{r=c(JSON.parse(a(t)))}catch(s){console.log(s)}return e(n??r),[o,e]};const{get:a}=await import("store"),{default:c}=await import("@codeeditorland/common/Target/Function/Get.js");export{c as Get,i as default,a as get};