@cleanweb/react 1.1.1-beta.24 → 1.1.1-beta.27

package/build/classy/{class.d.ts → class/index.d.ts}

@@ -1,18 +1,9 @@
 import type { VoidFunctionComponent } from 'react';
-import type { TStateData } from '../base';
-import type { IComponentInstanceClass } from './instance';
-import { ComponentInstance } from './instance';
-import { THooksBase } from './logic';
-export declare const useRerender: () => () => void;
+import type { TStateData } from '../../base';
+import type { THooksBase } from '../logic';
+import type { Extractor } from './types/extractor';
+import { ComponentInstance } from '../instance';
 type o = object;
-type ComponentClassOwnStaticKeys = Exclude<keyof typeof ClassComponent, keyof IComponentInstanceClass>;
-type ComponentClassOwnStatics = {
-    [Key in ComponentClassOwnStaticKeys]: (typeof ClassComponent)[Key];
-};
-export interface IComponentClass<Instance extends ClassComponent<o, o, THooksBase> = ClassComponent> extends Constructor<Instance>, ComponentClassOwnStatics, IComponentInstanceClass<Instance> {
-}
-type BaseClassComponent = ClassComponent<o, o, THooksBase>;
-type Extractor = <TComponent extends IComponentClass<BaseClassComponent>>(this: NonNullable<typeof _Component>, _Component?: TComponent) => VoidFunctionComponent<InstanceType<TComponent>['props']>;
 /**
  * A superset of {@link ComponentInstance} that allows defining your
  * component's JSX template directly inside the class.
@@ -71,7 +62,7 @@ export declare class ClassComponent<TProps extends o = WeakEmptyObject, TState e
      * Manually trigger a rerender of your component.
      * You should rarely ever need this. But if you are migrating
      * an older React.Component class, this should provide similar functionality
-     * to the {@link Component.forceUpdate | `forceUpdate`} method provided there.
+     * to the {@link React.Component.forceUpdate | `forceUpdate`} method provided there.
      *
      * Note that the callback argument is currently not supported.
      */
@@ -106,33 +97,7 @@ export declare class ClassComponent<TProps extends o = WeakEmptyObject, TState e
     /** @see {@link ClassComponent.FC} */
     static readonly extract: Extractor;
 }
-interface HookWrapperProps<THookFunction extends AnyFunction> {
-    /**
-     * The React hook you which to consume.
-     * Render a separate instance of the `<Use />` component for each hook.
-     * You can also create a custom hook that combines multiple hooks,
-     * then use that wrapper hook with a single `<Use />` instance.
-     */
-    hook: THookFunction;
-    /**
-     * An array containing the list of arguments
-     * to be passed to your hook, in the right order.
-     */
-    argumentsList: Parameters<THookFunction>;
-    /**
-     * A callback that will be called with whatever value your hook returns.
-     * Use this to update your component's state with the value.
-     * This will allow your component to rerender whenever the hook returns a new value.
-     */
-    onUpdate: (output: ReturnType<THookFunction>) => void;
-}
-type ClassComponentHookWrapper = <Hook extends AnyFunction>(props: HookWrapperProps<Hook>) => null;
-/**
- * A component you can use to consume hooks
- * in a {@link Component | React.Component} class component.
- */
-export declare const Use: ClassComponentHookWrapper;
-export {};
+export { ClassComponent as Component };
 /** /testing: {
     const a: object = {b: ''};
 

package/build/classy/{class.js → class/index.js}

@@ -15,34 +15,12 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Use = exports.ClassComponent = exports.useRerender = void 0;
+exports.Component = exports.ClassComponent = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
-var instance_1 = require("./instance");
-/** Provide more useful stack traces for otherwise non-specific function names. */
-var setFunctionName = function (func, newName) {
-    try {
-        // Must use try block, as `name` is not configurable on older browsers, and may yield a TypeError.
-        Object.defineProperty(func, 'name', {
-            writable: true,
-            value: newName,
-        });
-    }
-    catch (error) {
-        console.warn(error);
-    }
-};
-var useRerender = function () {
-    /*
-     * Skip the value, we don't need it.
-     * Grab just the setter function.
-     */
-    var _a = (0, react_1.useState)(Date.now()), _forceRerender = _a[1];
-    var rerender = function () { return _forceRerender(Date.now()); };
-    return rerender;
-};
-exports.useRerender = useRerender;
-;
+var instance_1 = require("../instance");
+var function_name_1 = require("./utils/function-name");
+var rerender_1 = require("./utils/rerender");
 /**
  * A superset of {@link ComponentInstance} that allows defining your
  * component's JSX template directly inside the class.
@@ -92,20 +70,20 @@ var ClassComponent = /** @class */ (function (_super) {
         /*************************************
          *    Begin Function Component       *
         **************************************/
-        /** A class-based React function component created with (@cleanweb/react).ClassComponent */
+        /** A class-based React function component created with (@cleanweb/react).{@link ClassComponent} */
         var Wrapper = function (props) {
             var instance = (0, instance_1.useInstance)(Component, props);
             var Render = instance.Render, template = instance.template;
             var _forceUpdate;
             // @ts-expect-error (Cannot assign to 'forceUpdate' because it is a read-only property.ts(2540))
-            instance.forceUpdate = (_forceUpdate = (0, exports.useRerender)() // Moved this to separate line to allow TS errors. Use proxy local variable to regain some type checking for the assignment to `instance.forceUpdate`.
+            instance.forceUpdate = (_forceUpdate = (0, rerender_1.useRerender)() // Moved this to separate line to allow TS errors. Use proxy local variable to regain some type checking for the assignment to `instance.forceUpdate`.
             );
             // Add calling component name to Render function name in stack traces.
             (0, react_1.useMemo)(function () {
                 if (typeof template === 'function')
-                    setFunctionName(template, "".concat(Component.name, ".template"));
+                    (0, function_name_1.setFunctionName)(template, "".concat(Component.name, ".template"));
                 else if (typeof Render === 'function')
-                    setFunctionName(Render, "".concat(Component.name, ".Render"));
+                    (0, function_name_1.setFunctionName)(Render, "".concat(Component.name, ".Render"));
             }, [Render, template]);
             /**
              * Normally a component can update it's own state in the "before-render" stage to
@@ -146,10 +124,10 @@ var ClassComponent = /** @class */ (function (_super) {
                 default: return template;
             }
         };
-        /*************************************
-         *     End Function Component        *
+        /**************************************
+        *     End Function Component          *
         **************************************/
-        setFunctionName(Wrapper, "$".concat(Component.name, "$"));
+        (0, function_name_1.setFunctionName)(Wrapper, "$".concat(Component.name, "$"));
         return Wrapper;
     };
     /** @see {@link ClassComponent.FC} */
@@ -157,16 +135,4 @@ var ClassComponent = /** @class */ (function (_super) {
     return ClassComponent;
 }(instance_1.ComponentInstance));
 exports.ClassComponent = ClassComponent;
-/**
- * A component you can use to consume hooks
- * in a {@link Component | React.Component} class component.
- */
-var Use = function (params) {
-    var useGenericHook = params.hook, argumentsList = params.argumentsList, onUpdate = params.onUpdate;
-    var output = useGenericHook.apply(void 0, argumentsList);
-    (0, react_1.useEffect)(function () {
-        onUpdate(output);
-    }, [output]);
-    return null;
-};
-exports.Use = Use;
+exports.Component = ClassComponent;

package/build/classy/class/types/class/instance.d.ts

@@ -0,0 +1,13 @@
+import type { THooksBase } from '../../../../classy/logic';
+import type { ExtractCleanStateData } from '../../../../base';
+import type { InstanceOverrides as CIInstanceOverrides } from '../../../../classy/instance/types/instance';
+import { ClassComponent } from '../../../../classy/class';
+export type BaseClassComponent = ClassComponent<object, object, THooksBase>;
+export type CCBaseType = ClassComponent<object, object, THooksBase>;
+type CCFromSubType<SubType extends CCBaseType> = ClassComponent<SubType['props'], ExtractCleanStateData<SubType['state']>, SubType['_thooks']>;
+export interface InstanceOverrides<Instance extends CCBaseType = ClassComponent> extends CIInstanceOverrides<Instance> {
+}
+type BaseInstance<Instance extends CCBaseType = ClassComponent> = Omit<CCFromSubType<Instance>, keyof InstanceOverrides>;
+export interface IClassComponent<Instance extends CCBaseType = ClassComponent> extends BaseInstance<Instance>, InstanceOverrides<Instance> {
+}
+export {};

package/build/classy/class/types/class/static.d.ts

@@ -0,0 +1,9 @@
+import type { StaticOverrides as CIStaticOverrides } from '../../../../classy/instance/types/static';
+import type { CCBaseType } from './instance';
+import { ClassComponent } from '../..';
+export interface StaticOverrides<Instance extends CCBaseType = ClassComponent> extends CIStaticOverrides<Instance> {
+}
+type BaseStatics = Omit<typeof ClassComponent, 'prototype' | keyof StaticOverrides>;
+export interface IClassComponentConstructor<Instance extends CCBaseType = ClassComponent> extends BaseStatics, StaticOverrides<Instance> {
+}
+export {};

package/build/classy/class/types/class/static.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// type ComponentClassOwnStaticKeys = Exclude<
+// 	keyof typeof ClassComponent,
+// 	keyof IComponentInstanceClass
+// >;
+// type ComponentClassOwnStatics = {
+// 	[Key in ComponentClassOwnStaticKeys]: (typeof ClassComponent)[Key];
+// }
+// export interface ClassComponentConstructor<
+// 	Instance extends BaseClassComponent = ClassComponent
+// > extends Constructor<Instance>, ComponentClassOwnStatics, IComponentInstanceClass<Instance> {};

package/build/classy/class/types/extractor.d.ts

@@ -0,0 +1,6 @@
+import type { VoidFunctionComponent } from 'react';
+import type { BaseClassComponent, IClassComponent } from './class/instance';
+import type { IClassComponentConstructor } from './class/static';
+type BaseCCConstructor = IClassComponentConstructor<BaseClassComponent>;
+export type Extractor = <TComponent extends BaseCCConstructor>(this: TComponent & Constructor<IClassComponent<InstanceType<TComponent>>>, Component?: TComponent & Constructor<IClassComponent<InstanceType<TComponent>>>) => VoidFunctionComponent<InstanceType<TComponent>['props']>;
+export {};

package/build/classy/class/utils/function-name.d.ts

@@ -0,0 +1,2 @@
+/** Provide more useful stack traces for otherwise non-specific function names. */
+export declare const setFunctionName: (func: FunctionType, newName: string) => void;

package/build/classy/class/utils/function-name.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setFunctionName = void 0;
+/** Provide more useful stack traces for otherwise non-specific function names. */
+var setFunctionName = function (func, newName) {
+    try {
+        // Must use try block, as `name` is not configurable on older browsers, and may yield a TypeError.
+        Object.defineProperty(func, 'name', {
+            writable: true,
+            value: newName,
+        });
+    }
+    catch (error) {
+        console.warn(error);
+    }
+};
+exports.setFunctionName = setFunctionName;

package/build/classy/class/utils/rerender.d.ts

@@ -0,0 +1 @@
+export declare const useRerender: () => () => void;

package/build/classy/class/utils/rerender.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useRerender = void 0;
+var react_1 = require("react");
+var useRerender = function () {
+    // Skip the value, we don't need it. Grab just the setter function.
+    var _a = (0, react_1.useState)(Date.now()), _forceRerender = _a[1];
+    var rerender = function () { return _forceRerender(Date.now()); };
+    return rerender;
+};
+exports.useRerender = useRerender;

package/build/classy/class/utils/use-component/index.d.ts

@@ -0,0 +1,6 @@
+import type { ClassComponentHookWrapper } from './types';
+/**
+ * A component you can use to consume hooks
+ * in a {@link Component | React.Component} class component.
+ */
+export declare const Use: ClassComponentHookWrapper;

package/build/classy/class/utils/use-component/index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Use = void 0;
+var react_1 = require("react");
+/**
+ * A component you can use to consume hooks
+ * in a {@link Component | React.Component} class component.
+ */
+var Use = function (params) {
+    var useGenericHook = params.hook, argumentsList = params.argumentsList, onUpdate = params.onUpdate;
+    var output = useGenericHook.apply(void 0, argumentsList);
+    (0, react_1.useEffect)(function () {
+        onUpdate(output);
+    }, [output]);
+    return null;
+};
+exports.Use = Use;

package/build/classy/class/utils/use-component/types.d.ts

@@ -0,0 +1,22 @@
+interface HookWrapperProps<THookFunction extends AnyFunction> {
+    /**
+     * The React hook you which to consume.
+     * Render a separate instance of the `<Use />` component for each hook.
+     * You can also create a custom hook that combines multiple hooks,
+     * then use that wrapper hook with a single `<Use />` instance.
+     */
+    hook: THookFunction;
+    /**
+     * An array containing the list of arguments
+     * to be passed to your hook, in the right order.
+     */
+    argumentsList: Parameters<THookFunction>;
+    /**
+     * A callback that will be called with whatever value your hook returns.
+     * Use this to update your component's state with the value.
+     * This will allow your component to rerender whenever the hook returns a new value.
+     */
+    onUpdate: (output: ReturnType<THookFunction>) => void;
+}
+export type ClassComponentHookWrapper = <Hook extends AnyFunction>(props: HookWrapperProps<Hook>) => null;
+export {};

package/build/classy/{instance.d.ts → instance/index.d.ts}

@@ -1,11 +1,15 @@
-import type { ExtractCleanStateData, TStateData } from '../base/state';
-import type { THooksBase } from './logic';
-import { ComponentLogic } from './logic';
+import type { TStateData } from '../../base/state';
+import type { THooksBase } from '../../classy/logic';
+import type { UseInstance } from './types/hook';
+import type { CIBaseType, IComponentInstance } from './types/instance';
+import type { IComponentInstanceClass } from './types/static';
+import { ComponentLogic } from '../../classy/logic';
 type AsyncAllowedEffectCallback = () => Awaitable<IVoidFunction>;
+type o = object;
 /** An empty function. It returns (void) without performing any operations. */
 export declare const noOp: () => void;
 /**
- * A superset of {@link ComponentLogic} that adds support for special lifecycle methods.
+ * A superset of {@link ComponentLogic} that adds support for lifecycle methods.
  * This provides a declarative API for working with your React function component's lifecycle,
  * a simpler alternative to the imperative approach with `useEffect` and/or `useMemo`.
  */
@@ -54,20 +58,13 @@ export declare class ComponentInstance<TProps extends o = {}, TState extends TSt
      */
     cleanUp: IVoidFunction;
 }
-type o = object;
-type ComponentInstanceOwnStaticKeys = Exclude<keyof typeof ComponentInstance, keyof ComponentLogic.ClassType>;
-type ComponentInstanceOwnStatics = {
-    [Key in ComponentInstanceOwnStaticKeys]: (typeof ComponentInstance)[Key];
-};
-export interface IComponentInstance<Instance extends ComponentInstance<o, o, THooksBase>> extends ComponentLogic.Instance<Instance>, Omit<ComponentInstance<Instance['props'], ExtractCleanStateData<Instance['state']>, Instance['_thooks']>, 'useHooks'> {
-}
-export interface IComponentInstanceClass<Instance extends ComponentInstance<o, o, THooksBase> = ComponentInstance> extends Constructor<IComponentInstance<Instance>>, ComponentInstanceOwnStatics, ComponentLogic.ClassType<Instance> {
-}
-type UseInstance = {
-    <Class extends IComponentInstanceClass<ComponentInstance<o, o, THooksBase>>>(Methods: Class): InstanceType<Class>;
-    <Class extends IComponentInstanceClass<ComponentInstance<o, o, THooksBase>>>(Methods: Class, props: InstanceType<Class>['props']): InstanceType<Class>;
-};
 export declare const useInstance: UseInstance;
+export declare namespace ComponentInstance {
+    class Class<TProps extends object = {}, TState extends TStateData = WeakEmptyObject, THooks extends THooksBase = void> extends ComponentInstance<TProps, TState, THooks> {
+    }
+    type Instance<Instance extends CIBaseType = Class> = IComponentInstance<Instance>;
+    type ClassType<Instance extends CIBaseType = Class> = IComponentInstanceClass<Instance>;
+}
 export {};
 /** /testing: {
     class A extends ComponentInstance<{}, {}, object> {

package/build/classy/{instance.js → instance/index.js}

@@ -17,38 +17,13 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useInstance = exports.ComponentInstance = exports.noOp = void 0;
 var react_1 = require("react");
-var state_1 = require("../base/state");
-var logic_1 = require("./logic");
-var useMountCallbacks = function (instance) {
-    var _a;
-    var mounted = (0, state_1.useMountState)();
-    if (!mounted)
-        (_a = instance.beforeMount) === null || _a === void 0 ? void 0 : _a.call(instance);
-    (0, react_1.useEffect)(function () {
-        var _a;
-        var mountHandlerCleanUp = (_a = instance.onMount) === null || _a === void 0 ? void 0 : _a.call(instance);
-        return function () {
-            var doCleanUp = function (runMountCleaners) {
-                var _a;
-                runMountCleaners === null || runMountCleaners === void 0 ? void 0 : runMountCleaners();
-                // onDismount? willUnmount?
-                (_a = instance.cleanUp) === null || _a === void 0 ? void 0 : _a.call(instance);
-            };
-            if (typeof mountHandlerCleanUp === 'function') {
-                doCleanUp(mountHandlerCleanUp);
-            }
-            else {
-                mountHandlerCleanUp === null || mountHandlerCleanUp === void 0 ? void 0 : mountHandlerCleanUp.then(doCleanUp);
-            }
-        };
-    }, []);
-};
+var logic_1 = require("../../classy/logic");
+var mount_callbacks_1 = require("./mount-callbacks");
 /** An empty function. It returns (void) without performing any operations. */
 var noOp = function () { };
 exports.noOp = noOp;
-// @todo Use rollup. Insert globals.ts reference tag to all d.ts output files.
 /**
- * A superset of {@link ComponentLogic} that adds support for special lifecycle methods.
+ * A superset of {@link ComponentLogic} that adds support for lifecycle methods.
  * This provides a declarative API for working with your React function component's lifecycle,
  * a simpler alternative to the imperative approach with `useEffect` and/or `useMemo`.
  */
@@ -105,7 +80,6 @@ var ComponentInstance = /** @class */ (function (_super) {
 }(logic_1.ComponentLogic.Class));
 exports.ComponentInstance = ComponentInstance;
 ;
-;
 /*
  * To ensure successful type checking, the second parameter must be written with spread syntax.
  * Likely because of the `exactOptionalPropertyTypes` config option turned on,
@@ -139,7 +113,7 @@ var useInstance = function () {
         '
      */
     // beforeMount, onMount, cleanUp.
-    useMountCallbacks(instance);
+    (0, mount_callbacks_1.useMountCallbacks)(instance);
     // beforeRender.
     (_a = instance.beforeRender) === null || _a === void 0 ? void 0 : _a.call(instance);
     // onRender.
@@ -156,6 +130,17 @@ var useInstance = function () {
     return instance;
 };
 exports.useInstance = useInstance;
+(function (ComponentInstance) {
+    var Class = /** @class */ (function (_super) {
+        __extends(Class, _super);
+        function Class() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return Class;
+    }(ComponentInstance));
+    ComponentInstance.Class = Class;
+    ;
+})(ComponentInstance || (exports.ComponentInstance = ComponentInstance = {}));
 /** /testing: {
     class A extends ComponentInstance<{}, {}, object> {
         static getInitialState: (p?: object) => ({putan: ''});

package/build/classy/instance/mount-callbacks.d.ts

@@ -0,0 +1,4 @@
+import { ComponentInstance } from '.';
+type UseMountCallbacks = <TInstance extends ComponentInstance<any, any, any>>(instance: TInstance) => void;
+export declare const useMountCallbacks: UseMountCallbacks;
+export {};

package/build/classy/instance/mount-callbacks.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useMountCallbacks = void 0;
+var react_1 = require("react");
+var state_1 = require("../../base/state");
+var useMountCallbacks = function (instance) {
+    var _a;
+    var mounted = (0, state_1.useMountState)();
+    if (!mounted)
+        (_a = instance.beforeMount) === null || _a === void 0 ? void 0 : _a.call(instance);
+    (0, react_1.useEffect)(function () {
+        var _a;
+        var mountHandlerCleanUp = (_a = instance.onMount) === null || _a === void 0 ? void 0 : _a.call(instance);
+        return function () {
+            var doCleanUp = function (runMountCleaners) {
+                var _a;
+                runMountCleaners === null || runMountCleaners === void 0 ? void 0 : runMountCleaners();
+                // onDismount? willUnmount?
+                (_a = instance.cleanUp) === null || _a === void 0 ? void 0 : _a.call(instance);
+            };
+            if (typeof mountHandlerCleanUp === 'function') {
+                doCleanUp(mountHandlerCleanUp);
+            }
+            else {
+                mountHandlerCleanUp === null || mountHandlerCleanUp === void 0 ? void 0 : mountHandlerCleanUp.then(doCleanUp);
+            }
+        };
+    }, []);
+};
+exports.useMountCallbacks = useMountCallbacks;

package/build/classy/instance/types/hook.d.ts

@@ -0,0 +1,17 @@
+import type { THooksBase } from '../../../classy/logic';
+import type { CIBaseType, IComponentInstance } from './instance';
+import type { IComponentInstanceClass } from './static';
+import { ComponentInstance } from '..';
+type o = object;
+type UIClassParam = IComponentInstanceClass<IComponentInstance<CIBaseType>>;
+type UIProplessClassParam = IComponentInstanceClass<IComponentInstance<ComponentInstance<HardEmptyObject, o, THooksBase>>>;
+export type UseInstance = {
+    <Class extends UIProplessClassParam>(Methods: Class & Constructor<IComponentInstance<InstanceType<Class>>>): InstanceType<Class>;
+    <Class extends UIClassParam>(Methods: Class & Constructor<IComponentInstance<InstanceType<Class>>>, props: InstanceType<Class>['props']): InstanceType<Class>;
+};
+export type UIParams = [
+    Class: IComponentInstanceClass<IComponentInstance<CIBaseType>>,
+    props?: object
+];
+export type UIReturn = CIBaseType;
+export {};

package/build/classy/instance/types/hook.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/classy/instance/types/instance.d.ts

@@ -0,0 +1,12 @@
+import type { InstanceOverrides as CLInstanceOverrides } from '../../../classy/logic/types/instance';
+import type { ExtractCleanStateData } from '../../../base';
+import type { THooksBase } from '../../../classy/logic';
+import { ComponentInstance } from '../../../classy/instance';
+export type CIBaseType = ComponentInstance<object, object, THooksBase>;
+type CIFromSubType<SubType extends CIBaseType> = ComponentInstance<SubType['props'], ExtractCleanStateData<SubType['state']>, SubType['_thooks']>;
+export interface InstanceOverrides<Instance extends CIBaseType = ComponentInstance> extends CLInstanceOverrides<Instance> {
+}
+type BaseInstance<Instance extends CIBaseType = ComponentInstance> = Omit<CIFromSubType<Instance>, keyof InstanceOverrides>;
+export interface IComponentInstance<Instance extends CIBaseType = ComponentInstance> extends BaseInstance<Instance>, InstanceOverrides<Instance> {
+}
+export {};

package/build/classy/instance/types/instance.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/classy/instance/types/static.d.ts

@@ -0,0 +1,11 @@
+import type { StaticOverrides as CLStaticOverrides } from '../../../classy/logic/types/static';
+import type { CIBaseType } from './instance';
+import { ComponentInstance } from '../../../classy/instance';
+/** */
+export interface StaticOverrides<Instance extends CIBaseType = ComponentInstance> extends CLStaticOverrides<Instance> {
+}
+type BaseStatics = Omit<typeof ComponentInstance, 'prototype' | keyof StaticOverrides>;
+export interface IComponentInstanceClass<Instance extends CIBaseType = ComponentInstance> extends BaseStatics, StaticOverrides<Instance> {
+}
+export {};
+/** */

package/build/classy/instance/types/static.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/** */
+// type ComponentInstanceOwnStaticKeys = Exclude<
+// 	keyof typeof ComponentInstance,
+// 	keyof ComponentLogic.ClassType
+// >;
+// type ComponentInstanceOwnStatics = {
+// 	[Key in ComponentInstanceOwnStaticKeys]: (typeof ComponentInstance)[Key];
+// }
+// export interface IComponentInstanceClass<
+// 	Instance extends ComponentInstance<o, o, THooksBase> = ComponentInstance,
+// > extends
+// 	Constructor<IComponentInstance<Instance>>,
+// 	ComponentInstanceOwnStatics,
+// 	ComponentLogic.ClassType<Instance>
+// {};

package/build/classy/logic/index.d.ts

@@ -1,7 +1,7 @@
 import type { TCleanState, TStateData } from '../../base/state';
-import type { IComponentLogicClass } from './static-types';
-import type { CLBaseType, IComponentLogic } from './instance-types';
-import type { UseLogic } from './hook-types';
+import type { IComponentLogicClass } from './types/static';
+import type { CLBaseType, IComponentLogic } from './types/instance';
+import type { UseLogic } from './types/hook';
 export type HardEmpty = HardEmptyObject;
 export type WeakEmpty = WeakEmptyObject;
 export type THooksBase = object | void;

package/build/classy/logic/{hook-types.d.ts → types/hook.d.ts}

@@ -1,6 +1,6 @@
-import type { ComponentLogic, THooksBase } from '.';
-import type { CLBaseType, IComponentLogic } from './instance-types';
-import type { IComponentLogicClass } from './static-types';
+import type { ComponentLogic, THooksBase } from '..';
+import type { CLBaseType, IComponentLogic } from './instance';
+import type { IComponentLogicClass } from './static';
 /*************************************
  *        # Utils                    *
 **************************************/

package/build/classy/logic/types/hook.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/classy/logic/{instance-types.d.ts → types/instance.d.ts}

@@ -1,5 +1,5 @@
-import type { ExtractCleanStateData } from '../../base';
-import type { ComponentLogic, THooksBase } from '.';
+import type { ExtractCleanStateData } from '../../../base';
+import type { ComponentLogic, THooksBase } from '../../../classy/logic';
 /*************************************
  *        # Utils                    *
 **************************************/
@@ -10,7 +10,7 @@ type CLFromSubType<SubType extends CLBaseType> = ComponentLogic<SubType['props']
  *        # Instance Type            *
 **************************************/
 /** */
-interface InstanceOverrides<Instance extends CLBaseType = ComponentLogic> {
+export interface InstanceOverrides<Instance extends CLBaseType = ComponentLogic> {
     useHooks: Instance['_thooks'] extends void ? () => (void | HardEmptyObject) : () => Instance['_thooks'];
 }
 type BaseInstance<Instance extends CLBaseType = ComponentLogic> = Omit<CLFromSubType<Instance>, keyof InstanceOverrides>;

package/build/classy/logic/types/instance.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/classy/logic/{static-types.d.ts → types/static.d.ts}

@@ -1,6 +1,6 @@
-import type { ExtractCleanStateData } from '../../base';
-import type { ComponentLogic, THooksBase } from '.';
-import type { CLBaseType } from './instance-types';
+import type { ExtractCleanStateData } from '../../../base';
+import type { ComponentLogic, THooksBase } from '../../../classy/logic';
+import type { CLBaseType } from './instance';
 /*************************************
  *        # Utils                    *
 **************************************/
@@ -8,7 +8,7 @@ type o = object;
 /*************************************
  *        # Class Static Side        *
 **************************************/
-interface StaticOverrides<Instance extends CLBaseType = ComponentLogic> extends Constructor<Instance> {
+export interface StaticOverrides<Instance extends CLBaseType = ComponentLogic> extends Constructor<Instance> {
     getInitialState: (props?: Instance['props']) => ExtractCleanStateData<Instance['state']>;
 }
 type BaseStatics = Omit<typeof ComponentLogic, 'prototype' | keyof StaticOverrides>;

package/build/classy/logic/types/static.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/globals.d.ts

@@ -29,7 +29,7 @@ declare global {
      * Pass a type argument to set whether `async` and/or `sync` functions are allowed.
      */
     interface IVoidFunction<AsyncType extends 'async' | 'sync' | 'both' = 'both'> {
-        (): AsyncType extends 'async' ? Promise<void> : AsyncType extends 'sync' ? void : Promise<void> | void;
+        (): AsyncType extends 'async' ? Promise<void> : AsyncType extends 'sync' ? void : void | Promise<void>;
     }
     type AnyFunction = (...args: any) => any;
     type FunctionType = AnyFunction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cleanweb/react",
-  "version": "1.1.1-beta.24",
+  "version": "1.1.1-beta.27",
   "description": "A suite of helpers for writing cleaner React function components.",
   "engines": {
     "node": ">=18"
@@ -22,10 +22,12 @@
     "./state": "./build/base/state.js",
     "./state/merged": "./build/base/merged-state.js",
     "./methods": "./build/base/methods.js",
-    "./logic": "./build/classy/logic.js",
-    "./instance": "./build/classy/instance.js",
-    "./class-component": "./build/classy/class.js",
-    "./full-class": "./build/classy/class.js"
+    "./logic": "./build/classy/logic/index.js",
+    "./logic/*": "./build/classy/logic/*.js",
+    "./instance": "./build/classy/instance/index.js",
+    "./instance/*": "./build/classy/instance/*.js",
+    "./class": "./build/classy/class/index.js",
+    "./class/*": "./build/classy/class/*.js"
   },
   "scripts": {
     "prebuild": "rimraf ./build",