rasti 4.1.3-alpha.1 → 4.1.3

package/README.md

@@ -1,7 +1,7 @@
 <p align="center">
     <picture>
-        <source media="(prefers-color-scheme: dark)" srcset="https://cdn.jsdelivr.net/gh/8tentaculos/rasti@v4.1.3-alpha.1/docs/logo-dark.svg">
-        <img alt="Rasti.js" src="https://cdn.jsdelivr.net/gh/8tentaculos/rasti@v4.1.3-alpha.1/docs/logo.svg" height="120">
+        <source media="(prefers-color-scheme: dark)" srcset="https://cdn.jsdelivr.net/gh/8tentaculos/rasti@v4.1.3/docs/logo-dark.svg">
+        <img alt="Rasti.js" src="https://cdn.jsdelivr.net/gh/8tentaculos/rasti@v4.1.3/docs/logo.svg" height="120">
     </picture>
 </p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rasti",
-    "version": "4.1.3-alpha.1",
+    "version": "4.1.3",
     "description": "Modern MVC for building user interfaces",
     "type": "module",
     "main": "lib/index.cjs",

package/types/Component.d.ts

@@ -1,7 +1,12 @@
 import View, { ViewOptions, Resolvable } from './View.js';
 import Model from './Model.js';
 
-export interface ComponentReservedOptions<S = any, M = any> extends ViewOptions<M, Component<any, S, M>> {
+/** `P` types `this` in the hooks. It goes last so `ComponentReservedOptions<S, M>` keeps state and model first. */
+export interface ComponentReservedOptions<
+    S = any,
+    M = any,
+    P = Record<string, any>,
+> extends ViewOptions<M, Component<P, S, M>> {
     /**
      * A unique key to identify the component.
      * Components with keys are recycled when the same key is found in the previous render.
@@ -14,22 +19,22 @@ export interface ComponentReservedOptions<S = any, M = any> extends ViewOptions<
      */
     state?: S;
     /** Lifecycle hook called at the end of the constructor. */
-    onCreate?: (this: Component<any, S, M>, ...args: any[]) => void;
+    onCreate?: (this: Component<P, S, M>, ...args: any[]) => void;
     /** Lifecycle hook called when `model`, `state` or `props` emits `change`. */
-    onChange?: (this: Component<any, S, M>, ...args: any[]) => void;
+    onChange?: (this: Component<P, S, M>, ...args: any[]) => void;
     /** Lifecycle hook called after the first render (client only). */
-    onHydrate?: (this: Component<any, S, M>) => void;
+    onHydrate?: (this: Component<P, S, M>) => void;
     /** Lifecycle hook called at the start of `recycle`, before any recycling happens. */
-    onBeforeRecycle?: (this: Component<any, S, M>) => void;
+    onBeforeRecycle?: (this: Component<P, S, M>) => void;
     /** Lifecycle hook called after the component is recycled and props are updated. */
-    onRecycle?: (this: Component<any, S, M>) => void;
+    onRecycle?: (this: Component<P, S, M>) => void;
     /** Lifecycle hook called at the start of `render` on update. */
-    onBeforeUpdate?: (this: Component<any, S, M>) => void;
+    onBeforeUpdate?: (this: Component<P, S, M>) => void;
     /** Lifecycle hook called at the end of `render` on update. */
-    onUpdate?: (this: Component<any, S, M>) => void;
+    onUpdate?: (this: Component<P, S, M>) => void;
 }
 
-export type ComponentOptions<P = Record<string, any>, S = any, M = any> = P & ComponentReservedOptions<S, M>;
+export type ComponentOptions<P = Record<string, any>, S = any, M = any> = P & ComponentReservedOptions<S, M, P>;
 
 /** Marker type for strings that are safe to inject as HTML without sanitization. */
 export interface SafeHTML {
@@ -185,7 +190,10 @@ declare class Component<P = Record<string, any>, S = any, M = any> extends View<
      * - DOM event handlers via camelCased attributes (`onClick=${handler}`), delegated to the root.
      * - Returning a component instance (or array of them) adds it as a child.
      * - Use `<${Sub}>…</${Sub}>` syntax for child component tags.
-     * - Called on a subclass, the new component extends it, so the template can use its methods.
+     * - Called on a subclass, the new component extends it and the result is that subclass,
+     *   so the template can use its methods. `P`, `S` and `M` type the result when `create`
+     *   is called on `Component`. A subclass does not take them: declare the arguments on
+     *   the class (`class X extends Component<P, S, M>`) and call `X.create`.
      *
      * @example
      * const Button = Component.create`
@@ -200,11 +208,9 @@ declare class Component<P = Record<string, any>, S = any, M = any> extends View<
         strings: string | TemplateStringsArray | ((...args: any[]) => any),
         ...expressions: any[]
     ): T;
-    /**
-     * Creates a component from a template, typing its props, state and model explicitly.
-     * See the overload above for the template syntax.
-     */
+    /** Types props, state and model. Only `Component.create` takes these arguments; see above. */
     static create<P = Record<string, any>, S = any, M = any>(
+        this: typeof Component,
         strings: string | TemplateStringsArray | ((...args: any[]) => any),
         ...expressions: any[]
     ): typeof Component<P, S, M>;