amateras 0.13.2 → 0.14.0

package/packages/widget/src/index.ts

@@ -1,19 +1,31 @@
-import { WidgetConstructor, type Widget } from '#structure/Widget';
-import { type Proto } from '@amateras/core';
-import { _Object_assign } from '@amateras/utils';
+import { WidgetConstructor } from '#structure/Widget';
+import { symbol_ProtoType, type Proto } from '@amateras/core';
+import { _Object_assign, isFunction } from '@amateras/utils';
 
 declare global {
     export namespace $ {
-        export function widget<Props = {}, Parent extends Proto = never>(builder: WidgetBuilder<Props, Parent>): Widget<Props, Parent>;
+        export function widget<Props = {}, Parent extends Proto = never>(builder: WidgetBuilder<Props, Parent>): WidgetConstructor<Props, Parent>;
+
+        export interface Overload<I> {
+            widget: [
+                input: [WidgetConstructor<any, any>],
+                output: I[0] extends WidgetConstructor ? InstanceType<I[0]> : never,
+                args: I[0] extends WidgetConstructor<infer Props, infer Parent> 
+                    ?   WidgetConstructorArguments<Props, Parent>
+                    :   never
+            ]
+        }
     }
 
-    export function $<Props, Parent extends Proto>(block: Widget<Props, Parent>, ...args: BlockCraftArguments<Props, Parent>): Widget<Props, Parent>;
+    // export function $<Props, Parent extends Proto>(widget: WidgetConstructor<Props, Parent>, ...args: WidgetConstructorArguments<Props, Parent>): Widget<Props, Parent>;
 }
+
 export type WidgetBuilder<Props = any, Parent extends Proto = any> = (props: $.Props<Props>, children: $.Layout<Parent>) => void;
-type BlockCraftArguments<Props, Parent extends Proto> = 
-        RequiredKeys<Props> extends never
-        ?   [children?: $.Layout<Parent>] | [props?: $.Props<Props>, children?: $.Layout<Parent>]
-        :   [props: $.Props<Props>, children?: $.Layout<Parent>];
+
+type WidgetConstructorArguments<Props, Parent extends Proto> = 
+    RequiredKeys<Props> extends never
+    ? [props?: $.Props<Props>, children?: $.Layout<Parent>] | [children?: $.Layout<Parent>]
+    : [props: $.Props<Props>, children?: $.Layout<Parent>];
 
 _Object_assign($, {
     widget(builder: WidgetBuilder) {
@@ -21,4 +33,12 @@ _Object_assign($, {
     }
 })
 
+$.process.craft.add((widget, ...args) => {
+    if (widget[symbol_ProtoType] === 'Widget') {
+        let [arg1] = args;
+        args = isFunction(arg1) ? [{}, arg1] : args;
+        return new widget(...args)
+    }
+})
+
 export * from '#structure/Widget';

package/packages/widget/src/structure/Widget.ts

@@ -4,15 +4,19 @@ import type { WidgetBuilder } from "..";
 export const WidgetConstructor = (builder: WidgetBuilder) => {
     return class extends Proto {
         static override [symbol_ProtoType] = 'Widget';
-        static override name = 'Block';
+        static override name = 'Widget';
         constructor(props: $.Props, layout?: $.Layout) {
             super(() => builder(props, (proto) => layout?.(proto)));
         }
-    }
+    } as unknown as WidgetConstructor
+}
+
+export interface WidgetConstructor<Props = {}, Parent extends Proto = any> extends Constructor<Proto> {
+    [symbol_ProtoType]: 'Widget';
+    new (builder: WidgetBuilder): Widget<Props, Parent>;
 }
 
 export interface Widget<Props = {}, Parent extends Proto = any> extends Proto {
-    new (builder: WidgetBuilder): Widget<Props, Parent>
     props: Props;
     parent: Parent;
 }

package/packages/ui/src/structure/TextBlock.ts

@@ -1,11 +0,0 @@
-import { ElementProto } from "@amateras/core";
-
-export class TextBlock extends ElementProto {
-    constructor(props: $.Props, layout?: $.Layout<TextBlock>) {
-        super('text-block', props, layout);
-    }
-    
-    static {
-        $.style(TextBlock, 'text-block{display:block}')
-    }
-}