@e280/sly 0.2.0-22 → 0.2.0-24

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@e280/sly",
-	"version": "0.2.0-22",
+	"version": "0.2.0-24",
 	"description": "web shadow views",
 	"license": "MIT",
 	"type": "module",

package/s/view/types.ts

@@ -1,11 +1,11 @@
 
 import {TemplateResult} from "lit"
-import {Constructor, DropFirst} from "@e280/stz"
+import {Constructor} from "@e280/stz"
 import {DirectiveResult} from "lit/directive.js"
 
 import {Use} from "../base/use.js"
-import {ViewChain} from "./utils/parts/chain.js"
 import {BaseElement} from "../base/element.js"
+import {ViewChain} from "./utils/parts/chain.js"
 
 export type Content = TemplateResult | DirectiveResult | HTMLElement | string | null | undefined | void | Content[]
 export type AttrValue = string | boolean | number | undefined | null | void

package/s/view/utils/contextualize.ts

@@ -2,14 +2,14 @@
 import {DropFirst, ob} from "@e280/stz"
 import {ComponentClass, View, ViewProps} from "../types.js"
 
-export function contextualizeView<C, V extends View<any[]>>(
+export function contextualizeView<C, V extends View<any>>(
 		context: C,
 		view: V,
 	): View<DropFirst<ViewProps<V>>> {
 	return view.transmute((...p: any[]) => [context, ...p]) as any
 }
 
-export function contextualizeViews<C, Vs extends Record<string, View<any[]>>>(
+export function contextualizeViews<C, Vs extends Record<string, View<any>>>(
 		context: C,
 		views: Vs,
 	): {[K in keyof Vs]: View<DropFirst<ViewProps<Vs[K]>>>} {
@@ -36,10 +36,10 @@ export function contextualizeComponents<
 		context = context
 		static view = contextualizeView(context, super.view) as any
 	}) as any as {
-		[K in keyof Cs]: ComponentClass<
-			Cs[K],
-			DropFirst<ViewProps<Cs[K]["view"]>>
-		>
+		[K in keyof Cs]: {
+			view: View<DropFirst<ViewProps<Cs[K]["view"]>>>
+			new(): InstanceType<{context: C} & Cs[K]>
+		} & Cs[K]
 	}
 }
 

package/x/index.html

@@ -131,7 +131,7 @@ body {
 	<img class=icon alt="" src="/assets/favicon.png"/>
 	<h1>sly testing page</h1>
 	<p><a href="https://github.com/e280/sly">github.com/e280/sly</a></p>
-	<p class=lil>v0.2.0-22</p>
+	<p class=lil>v0.2.0-24</p>
 
 	<fastcount-element></fastcount-element>
 	<counter-component start=280 step=2>component</counter-component>

package/x/view/types.d.ts

@@ -2,8 +2,8 @@ import { TemplateResult } from "lit";
 import { Constructor } from "@e280/stz";
 import { DirectiveResult } from "lit/directive.js";
 import { Use } from "../base/use.js";
-import { ViewChain } from "./utils/parts/chain.js";
 import { BaseElement } from "../base/element.js";
+import { ViewChain } from "./utils/parts/chain.js";
 export type Content = TemplateResult | DirectiveResult | HTMLElement | string | null | undefined | void | Content[];
 export type AttrValue = string | boolean | number | undefined | null | void;
 export type ViewFn<Props extends any[]> = ((use: Use) => (...props: Props) => Content);

package/x/view/utils/contextualize.d.ts

@@ -1,8 +1,13 @@
 import { DropFirst } from "@e280/stz";
 import { ComponentClass, View, ViewProps } from "../types.js";
-export declare function contextualizeView<C, V extends View<any[]>>(context: C, view: V): View<DropFirst<ViewProps<V>>>;
-export declare function contextualizeViews<C, Vs extends Record<string, View<any[]>>>(context: C, views: Vs): {
+export declare function contextualizeView<C, V extends View<any>>(context: C, view: V): View<DropFirst<ViewProps<V>>>;
+export declare function contextualizeViews<C, Vs extends Record<string, View<any>>>(context: C, views: Vs): {
     [K in keyof Vs]: View<DropFirst<ViewProps<Vs[K]>>>;
 };
 export declare function getViews<Cs extends Record<string, ComponentClass<any, any>>>(components: Cs): { [K in keyof Cs]: View<DropFirst<ViewProps<Cs[K]["view"]>>>; };
-export declare function contextualizeComponents<C, Cs extends Record<string, ComponentClass<any, any>>>(context: C, originalComponents: Cs): { [K in keyof Cs]: ComponentClass<Cs[K], DropFirst<ViewProps<Cs[K]["view"]>>>; };
+export declare function contextualizeComponents<C, Cs extends Record<string, ComponentClass<any, any>>>(context: C, originalComponents: Cs): { [K in keyof Cs]: {
+    view: View<DropFirst<ViewProps<Cs[K]["view"]>>>;
+    new (): InstanceType<{
+        context: C;
+    } & Cs[K]>;
+} & Cs[K]; };