@amateras/widget 0.1.0 → 0.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@amateras/widget",
   "peerDependencies": {
-    "@amateras/core": "0.17.0",
+    "@amateras/core": "0.18.0",
     "@amateras/utils": "0.1.0"
   },
   "imports": {
@@ -11,5 +11,5 @@
   "exports": {
     ".": "./src/index.ts"
   },
-  "version": "0.1.0"
+  "version": "0.2.0"
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-import { WidgetConstructor } from '#structure/Widget';
+import { WidgetConstructor, type WidgetBuilder } from '#structure/Widget';
 import { symbol_ProtoType, type Proto } from '@amateras/core';
 import { Utils } from '@amateras/utils';
 
@@ -16,11 +16,8 @@ declare global {
             ]
         }
     }
-
-    // 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 WidgetConstructorArguments<Props, Parent extends Proto> = 
     RequiredKeys<Props> extends never

package/src/structure/Widget.ts

@@ -1,18 +1,26 @@
 import { Proto, ProxyProto, symbol_ProtoType } from "@amateras/core";
-import type { WidgetBuilder } from "..";
+import { Utils } from "@amateras/utils";
 
 export const WidgetConstructor = (builder: WidgetBuilder) => {
     const Widget = class extends ProxyProto {
         static override readonly [symbol_ProtoType] = 'Widget' as any;
         static override name = 'Widget';
         static builder = builder;
+        props = {};
+        place: $.Layout | null = Utils.Null;
         constructor(props: $.Props, layout?: $.Layout) {
-            super(() => Widget.builder(props, (proto) => layout?.(proto)));
+            super(() => {
+                this.props = props;
+                this.place = layout ?? Utils.Null;
+                Widget.builder(this as unknown as Widget)
+            });
         }
     } as unknown as WidgetConstructor
     return Widget;
 }
 
+export type WidgetBuilder<Props = any, Parent extends Proto = any> = ($$: Widget<Props, Parent>) => void;
+
 export interface WidgetConstructor<Props = {}, Parent extends Proto = any> {
     [symbol_ProtoType]: 'Widget';
     builder: WidgetBuilder;
@@ -20,6 +28,7 @@ export interface WidgetConstructor<Props = {}, Parent extends Proto = any> {
 }
 
 export interface Widget<Props = {}, Parent extends Proto = any> extends Proto {
-    props: Props;
+    props: $.Props<Props>;
     parent: Parent;
-}
+    place: $.Layout | null
+}