@cleanweb/react 1.1.1-beta.15 → 1.1.1-beta.16

package/build/classy/class.d.ts

@@ -1,15 +1,16 @@
 import type { VoidFunctionComponent } from 'react';
-import type { IComponentInstanceClass } from './instance';
 import type { TStateData } from '../base';
+import type { IComponentInstanceClass } from './instance';
 import { ComponentInstance } from './instance';
+import { THooksBase } from './logic';
 export declare const useRerender: () => () => void;
 type ComponentClassParams = ConstructorParameters<typeof ClassComponent>;
 type o = object;
-export interface IComponentClass<Instance extends ClassComponent<o, o, o> = ClassComponent, Params extends ComponentClassParams = ComponentClassParams> extends IComponentInstanceClass<Instance, Params> {
+export interface IComponentClass<Instance extends ClassComponent<o, o, THooksBase> = ClassComponent, Params extends ComponentClassParams = ComponentClassParams> extends IComponentInstanceClass<Instance, Params> {
 }
 type Extractor = <TComponent extends typeof ClassComponent<o, o, o>>(this: NonNullable<typeof _Component>, _Component?: TComponent & IComponentClass<InstanceType<TComponent>>) => VoidFunctionComponent<InstanceType<TComponent>['props']>;
 type ReactTemplate = React.JSX.Element | null;
-export declare class ClassComponent<TProps extends o = WeakEmptyObject, TState extends TStateData = WeakEmptyObject, THooks extends o = WeakEmptyObject> extends ComponentInstance<TProps, TState, THooks> {
+export declare class ClassComponent<TProps extends o = WeakEmptyObject, TState extends TStateData = WeakEmptyObject, THooks extends THooksBase = void> extends ComponentInstance<TProps, TState, THooks> {
     Render?: VoidFunctionComponent<{}>;
     template?: ReactTemplate | (() => ReactTemplate);
     readonly forceUpdate: VoidFunction;

package/build/classy/class.js

@@ -96,8 +96,8 @@ var ClassComponent = /** @class */ (function (_super) {
                     else
                         throw new Error([
                             'A ClassComponent must have either a `template` or a `Render` property. But neither was found.',
-                            'Add a `template` member to your class and assign a valid (JSX.Element | null) to it. (or a function that returns that).',
-                            'Alternatively, add a `Render` method and assign a FunctionComponent to it.',
+                            'Add a `template: (JSX.Element | null);` member to your class, (or a `template` method that returns the same type).',
+                            'Alternatively, add a `Render: FunctionComponent;` method.',
                             '\n\n',
                             'Expected `Render` to be a Function Component because `template` was `undefined`.',
                             "Instead got the following '".concat(typeof Render, "': $o"),

package/build/classy/instance.d.ts

@@ -1,10 +1,11 @@
-import { TStateData } from '../base/state';
-import { ComponentLogic, IComponentLogicClass } from './logic';
+import type { TStateData } from '../base/state';
+import type { THooksBase, IComponentLogicClass } from './logic';
+import { ComponentLogic } from './logic';
 type AsyncAllowedEffectCallback = () => Awaitable<IVoidFunction>;
 type UseMountCallbacks = <TInstance extends ComponentInstance<any, any, any>>(instance: TInstance) => void;
 export declare const useMountCallbacks: UseMountCallbacks;
 export declare const noOp: () => void;
-export declare class ComponentInstance<TProps extends o = {}, TState extends TStateData = WeakEmptyObject, THooks extends o = WeakEmptyObject> extends ComponentLogic<TProps, TState, THooks> {
+export declare class ComponentInstance<TProps extends o = {}, TState extends TStateData = WeakEmptyObject, THooks extends THooksBase = void> extends ComponentLogic<TProps, TState, THooks> {
     /**
      * Runs only _before_ first render, i.e before the component instance is mounted.
      * Useful for logic that is involved in determining what to render.
@@ -51,11 +52,11 @@ export declare class ComponentInstance<TProps extends o = {}, TState extends TSt
 }
 type o = object;
 type InstanceClassParams = ConstructorParameters<typeof ComponentInstance<o, o, o>>;
-export interface IComponentInstanceClass<Instance extends ComponentInstance<o, o, o> = ComponentInstance, Params extends InstanceClassParams = InstanceClassParams> extends IComponentLogicClass<Instance, Params> {
+export interface IComponentInstanceClass<Instance extends ComponentInstance<o, o, THooksBase> = ComponentInstance, Params extends InstanceClassParams = InstanceClassParams> extends IComponentLogicClass<Instance, Params> {
 }
 type UseInstance = {
-    <Class extends typeof ComponentInstance<HardEmptyObject, o, o>>(Methods: Class & IComponentInstanceClass<InstanceType<Class>>): InstanceType<Class>;
-    <Class extends typeof ComponentInstance<o, o, o>>(Methods: Class & IComponentInstanceClass<InstanceType<Class>>, props: InstanceType<Class>['props']): InstanceType<Class>;
+    <Class extends typeof ComponentInstance<HardEmptyObject, o, THooksBase>>(Methods: Class & IComponentInstanceClass<InstanceType<Class>>): InstanceType<Class>;
+    <Class extends typeof ComponentInstance<o, o, THooksBase>>(Methods: Class & IComponentInstanceClass<InstanceType<Class>>, props: InstanceType<Class>['props']): InstanceType<Class>;
 };
 export declare const useInstance: UseInstance;
 export {};

package/build/classy/instance.js

@@ -46,6 +46,7 @@ var useMountCallbacks = function (instance) {
 exports.useMountCallbacks = useMountCallbacks;
 var noOp = function () { };
 exports.noOp = noOp;
+// @todo Use rollup. Insert globals.ts reference tag to all d.ts output files.
 var ComponentInstance = /** @class */ (function (_super) {
     __extends(ComponentInstance, _super);
     function ComponentInstance() {

package/build/classy/logic.d.ts

@@ -1,21 +1,22 @@
 import type { TCleanState, ExtractCleanStateData, TStateData } from '../base/state';
 export type HardEmpty = HardEmptyObject;
 export type WeakEmpty = WeakEmptyObject;
+export type THooksBase = o | void;
 type o = object;
-export declare class ComponentLogic<TProps extends object = {}, TState extends TStateData = WeakEmpty, THooks extends object = {}> {
+export declare class ComponentLogic<TProps extends object = {}, TState extends TStateData = WeakEmpty, THooks extends THooksBase = void> {
     state: TCleanState<TState>;
     readonly props: TProps;
-    readonly hooks: THooks;
+    readonly hooks: THooks extends object ? THooks : WeakEmptyObject;
     static getInitialState: (p?: object) => object;
-    useHooks: THooks extends HardEmptyObject ? undefined | (() => THooks | void) : () => THooks;
+    useHooks: THooks extends void ? undefined | (() => void | HardEmptyObject) : () => THooks;
 }
 type LogicClassParams = ConstructorParameters<typeof ComponentLogic>;
-export interface IComponentLogicClass<Instance extends ComponentLogic<o, o, o> = ComponentLogic, Params extends LogicClassParams = LogicClassParams> extends Constructor<Instance, Params> {
+export interface IComponentLogicClass<Instance extends ComponentLogic<o, o, THooksBase> = ComponentLogic, Params extends LogicClassParams = LogicClassParams> extends Constructor<Instance, Params> {
     getInitialState: (props?: Instance['props']) => ExtractCleanStateData<Instance['state']>;
 }
 type UseLogic = {
-    <Class extends typeof ComponentLogic<HardEmptyObject, o, o>>(Methods: Class & IComponentLogicClass<InstanceType<Class>>): InstanceType<Class>;
-    <Class extends typeof ComponentLogic<o, o, o>>(Methods: Class & IComponentLogicClass<InstanceType<Class>>, props: InstanceType<Class>['props']): InstanceType<Class>;
+    <Class extends typeof ComponentLogic<HardEmptyObject, o, THooksBase>>(Methods: Class & IComponentLogicClass<InstanceType<Class>>): InstanceType<Class>;
+    <Class extends typeof ComponentLogic<o, o, THooksBase>>(Methods: Class & IComponentLogicClass<InstanceType<Class>>, props: InstanceType<Class>['props']): InstanceType<Class>;
 };
 declare const useLogic: UseLogic;
 export { useLogic };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cleanweb/react",
-  "version": "1.1.1-beta.15",
+  "version": "1.1.1-beta.16",
   "description": "A suite of helpers for writing cleaner React function components.",
   "engines": {
     "node": ">=18"