@cleanweb/react 1.1.1-beta.1 → 1.1.1-beta.11

package/build/base/merged-state.js

@@ -70,7 +70,9 @@ var MergedState = /** @class */ (function () {
     return MergedState;
 }());
 var useMergedState = function (initialState) {
-    var cleanState = (0, react_1.useMemo)(function () { return new MergedState(initialState); }, []);
+    var cleanState = (0, react_1.useMemo)(function () {
+        return new MergedState(initialState);
+    }, []);
     MergedState.useRefresh.call(cleanState);
     return cleanState;
 };

package/build/base/methods.d.ts

@@ -1,8 +1,8 @@
-import type { TCleanState } from './state';
-export declare class ComponentMethods<TState extends object, TProps extends object> {
-    state: TCleanState<TState>;
+import type { TCleanState, TStateData } from './state';
+export declare class ComponentMethods<TProps extends object, TState extends TStateData> {
     props: TProps;
+    state: TCleanState<TState>;
 }
-type UseMethods = <TMethods extends ComponentMethods<any, any>>(Methods: Constructor<TMethods>, state: TMethods['state'], props: TMethods['props']) => TMethods;
+type UseMethods = <Class extends typeof ComponentMethods<object, object>>(Methods: Class & Constructor<InstanceType<Class>>, props: InstanceType<Class>['props'], state: InstanceType<Class>['state']) => InstanceType<Class>;
 export declare const useMethods: UseMethods;
 export {};

package/build/base/methods.js

@@ -1,4 +1,55 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useMethods = exports.ComponentMethods = void 0;
 var react_1 = require("react");
@@ -9,17 +60,40 @@ var ComponentMethods = /** @class */ (function () {
 }());
 exports.ComponentMethods = ComponentMethods;
 ;
-var useMethods = function (Methods, state, props) {
+var useMethods = function (Methods, props, state) {
     // @todo Switch to useRef. Vite HMR seems to sometimes reinitialize useMemo calls after a hot update,
     // causing the instance to be unexpectedly recreated in the middle of the components lifecycle.
     // But useRef and useState values appear to always be preserved whenever this happens.
     // So those two are the only cross-render-persistence methods we can consider safe.
     var methods = (0, react_1.useRef)((0, react_1.useMemo)(function () {
-        // See useLogic implementation for a discussion of this type assertion.
         return new Methods();
     }, [])).current;
-    methods.state = state;
     methods.props = props;
+    methods.state = state;
     return methods;
 };
 exports.useMethods = useMethods;
+testing: {
+    var a = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var a, MyMethods, useCleanState, self;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    a = { b: '' };
+                    MyMethods = /** @class */ (function (_super) {
+                        __extends(MyMethods, _super);
+                        function MyMethods() {
+                            return _super !== null && _super.apply(this, arguments) || this;
+                        }
+                        return MyMethods;
+                    }(ComponentMethods));
+                    ;
+                    return [4 /*yield*/, import('./state.js')];
+                case 1:
+                    useCleanState = (_a.sent()).useCleanState;
+                    self = (0, exports.useMethods)(MyMethods, {}, useCleanState({}));
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+}

package/build/base/state.d.ts

@@ -7,8 +7,8 @@ type PutState<TState extends object> = {
     [Key in keyof TState]: React.Dispatch<React.SetStateAction<TState[Key]>>;
 };
 declare class CleanStateBase<TState extends Record<string, any>> {
-    reservedKeys: string[];
-    valueKeys: string[];
+    readonly reservedKeys: string[];
+    readonly valueKeys: string[];
     private _values_;
     private _initialValues_;
     private _setters_;
@@ -16,14 +16,16 @@ declare class CleanStateBase<TState extends Record<string, any>> {
     static update: <TState_1 extends object>(this: CleanStateBase<TState_1>) => void;
     get put(): PutState<TState>;
     get initialState(): TState;
-    putMany: (newValues: Partial<TState>) => void;
+    readonly putMany: (newValues: Partial<TState>) => void;
 }
-type TCleanStateInstance<TState extends object> = TState & CleanStateBase<TState>;
-export type TCleanState<TState extends object> = TCleanStateInstance<TState>;
-export type TState<YourCleanState extends CleanStateBase<{}>> = Omit<YourCleanState, keyof CleanStateBase<{}>>;
+export type TStateData = object & {
+    [Key in keyof CleanStateBase<{}>]?: never;
+};
+export type TCleanState<TState extends TStateData> = (CleanStateBase<TState> & Omit<TState, keyof CleanStateBase<{}>>);
+export type ExtractCleanStateData<YourCleanState extends CleanStateBase<{}>> = Omit<YourCleanState, keyof CleanStateBase<{}>>;
 type StateInitFunction = (...args: any[]) => object;
 type StateInit = object | StateInitFunction;
 type TInitialState<Initializer extends StateInit> = Initializer extends (...args: any[]) => (infer TState extends object) ? TState : Initializer;
-type TUseCleanState = <TInit extends StateInit>(_initialState: TInit, ...props: TInit extends (...args: infer TProps extends any[]) => (infer TState extends object) ? TProps : []) => TCleanStateInstance<TInitialState<TInit>>;
+type TUseCleanState = <TInit extends StateInit>(_initialState: TInit, ...props: TInit extends (...args: infer TProps extends any[]) => (infer TState extends object) ? TProps : []) => TCleanState<TInitialState<TInit>>;
 export declare const useCleanState: TUseCleanState;
 export {};

package/build/base/state.js

@@ -122,17 +122,13 @@ var useCleanState = function (_initialState) {
     for (var _i = 1; _i < arguments.length; _i++) {
         props[_i - 1] = arguments[_i];
     }
-    var mounted = (0, exports.useMountState)();
     var initialState = typeof _initialState === 'function'
         ? (0, react_1.useMemo)(function () { return _initialState.apply(void 0, props); }, [])
         : _initialState;
     ;
-    var freshInstance = {};
-    if (!mounted)
-        freshInstance = new CleanState(initialState);
-    if (!freshInstance.put)
-        throw new Error('useCleanState failed to initialized a state instance.');
-    var cleanState = (0, react_1.useRef)(freshInstance).current;
+    var cleanState = (0, react_1.useRef)((0, react_1.useMemo)(function () {
+        return new CleanState(initialState);
+    }, [])).current;
     CleanState.update.call(cleanState);
     return cleanState;
 };

package/build/classy/class.d.ts

@@ -1,11 +1,19 @@
 import type { VoidFunctionComponent } from 'react';
-import type { TComponentClass } from './logic';
+import type { IComponentInstanceClass } from './instance';
+import type { TStateData } from '../base';
 import { ComponentInstance } from './instance';
-type Extractor = <TComponent extends ClassComponent<object, object, object>>(this: TComponentClass<TComponent, typeof ClassComponent>, _Component?: TComponentClass<TComponent, typeof ClassComponent>) => VoidFunctionComponent<TComponent['props']>;
-export declare class ClassComponent<TState extends object = EmptyObject, TProps extends object = EmptyObject, THooks extends object = EmptyObject> extends ComponentInstance<TState, TProps, THooks> {
-    Render: VoidFunctionComponent<{}>;
-    static renderAs: 'component' | 'template';
-    static FC: Extractor;
+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> {
+}
+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> {
+    Render?: VoidFunctionComponent<{}>;
+    template?: ReactTemplate | (() => ReactTemplate);
+    readonly forceUpdate: VoidFunction;
+    static readonly FC: Extractor;
 }
 interface HookWrapperProps<THookFunction extends AnyFunction> {
     hook: THookFunction;

package/build/classy/class.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Use = exports.ClassComponent = void 0;
+exports.Use = exports.ClassComponent = exports.useRerender = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var instance_1 = require("./instance");
@@ -32,22 +32,41 @@ var setFunctionName = function (func, newName) {
         console.warn(error);
     }
 };
-// eslint-enable no-use-before-define
+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 ClassComponent = /** @class */ (function (_super) {
     __extends(ClassComponent, _super);
     function ClassComponent() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    ClassComponent.renderAs = 'component';
     ClassComponent.FC = function FC(_Component) {
         var Component = _Component !== null && _Component !== void 0 ? _Component : this;
         var isClassComponentType = Component.prototype instanceof ClassComponent;
         if (!Component.getInitialState || !isClassComponentType)
             throw new Error('Attempted to initialize ClassComponent with invalid Class type. Either pass a class that extends ClassComponent to FC (e.g `export FC(MyComponent);`), or ensure it is called as a method on a ClassComponent constructor type (e.g `export MyComponent.FC()`).');
-        var Wrapper = function (props, context) {
-            var Render = (0, instance_1.useInstance)(Component, props).Render;
+        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`.
+            );
             // Add calling component name to Render function name in stack traces.
-            (0, react_1.useMemo)(function () { return setFunctionName(Render, "".concat(Component.name, ".Render")); }, [Render]);
+            (0, react_1.useMemo)(function () {
+                if (typeof template === 'function')
+                    setFunctionName(template, "".concat(Component.name, ".template"));
+                else if (typeof Render === 'function')
+                    setFunctionName(Render, "".concat(Component.name, ".Render"));
+            }, [Render, template]);
             /**
              * Normally a component can update it's own state in the "before-render" stage to
              * skip DOM updates and trigger and immediate rerun of the rendering with the new state.
@@ -58,23 +77,37 @@ var ClassComponent = /** @class */ (function (_super) {
              * state in the "before-render" stage of `Render`, since it will be attempting to update it's parent's
              * state (i.e `Wrapper` component) rather than it's own state.
              *
-             * Consider using this as a function call instead of JSX to avoid that. This way, we avoid
+             * Users should favor using the `template()` method instead. This way, we avoid
              * establishing a component boundary between `Wrapper` and `Render`.
              *
              * Although, since beforeRender() is called earlier from a hook, this is probably
              * a non-issue. It will only force users to move their logic into `beforeRender` instead
-             * of doing it directly in `Render`. This might mean cleaner Render functions,
-             * so there's probably no real value lost if we keep the component boundary.
+             * of doing it directly in `Render`. Even if `template` is being used, the `beforeRender` method
+             * is the preferred location for such logic to maintain a high level of separation of concerns,
+             * which is what this library exists to provide.
+             *
+             * So there's probably no real value lost with the component boundary. Users should just use
+             * `beforeRender` + `template`.
             **/
-            if (Component.renderAs === 'template')
-                return Render({}, context);
-            // With the existence of useContext(),
-            // what exactly does the context argument to FunctionComponent represent?
-            // Do we need to find a way to pass that context value to <Render /> here?
-            return (0, jsx_runtime_1.jsx)(Render, {});
+            switch (typeof template) {
+                case 'undefined':
+                    if (typeof Render === 'function')
+                        return (0, jsx_runtime_1.jsx)(Render, {});
+                    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.',
+                            '\n\n',
+                            'Expected `Render` to be a Function Component because `template` was `undefined`.',
+                            "Instead got the following '".concat(typeof Render, "': $o"),
+                        ].join(' '), Render);
+                case 'function': return template();
+                default: return template;
+            }
         };
         // Include calling component name in wrapper function name on stack traces.
-        setFunctionName(Wrapper, "".concat(Component.name, " < Wrapper")); // ${Wrapper.name}
+        setFunctionName(Wrapper, "$".concat(Component.name, "$"));
         return Wrapper;
     };
     return ClassComponent;
@@ -89,3 +122,16 @@ var Use = function (params) {
     return null;
 };
 exports.Use = Use;
+testing: {
+    var a = { b: '' };
+    var MyComponentLogic = /** @class */ (function (_super) {
+        __extends(MyComponentLogic, _super);
+        function MyComponentLogic() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        MyComponentLogic.getInitialState = function () { return ({ a: '' }); };
+        return MyComponentLogic;
+    }(ClassComponent));
+    ;
+    var Template = MyComponentLogic.FC();
+}

package/build/classy/instance.d.ts

@@ -1,8 +1,10 @@
-import type { TComponentClass } from './logic';
-import { ComponentLogic } from './logic';
+import { TStateData } from '../base/state';
+import { ComponentLogic, IComponentLogicClass } 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<TState extends object = EmptyObject, TProps extends object = EmptyObject, THooks extends object = EmptyObject> extends ComponentLogic<TState, TProps, THooks> {
+export declare class ComponentInstance<TProps extends o = WeakEmptyObject, TState extends TStateData = WeakEmptyObject, THooks extends o = WeakEmptyObject> 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.
@@ -47,17 +49,13 @@ export declare class ComponentInstance<TState extends object = EmptyObject, TPro
      */
     cleanUp: IVoidFunction;
 }
-type UseInstance = <TClass extends ComponentInstance<object, object, object>>(Class: TComponentClass<TClass>, ...props: valueof<TClass['props']> extends never ? ([] | [EmptyObject] | [TClass['props']]) : [TClass['props']]) => TClass;
-/**
- * To ensure successful type checking, the second parameter must be written with spread syntax.
- * Likely because of the `exactOptionalPropertyTypes` config option turned on,
- * and `UseInstance` using an empty tuple in its rest parameter type, attempting to simply
- * retrieve the second argument directly causes an error when that argument is passed on to `useLogic`.
- * But directly working with the rest array bypasses the problem. Also note that the issue persists even when
- * the second param is given `{}` as a default follow to account for the empty tuple case. TypeScript
- * just wants us to use the rest parameter explicitly by force.
- */
+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> {
+}
+type UseInstance = {
+    <Class extends typeof ComponentInstance<HardEmptyObject, o, o>>(Methods: Class & IComponentInstanceClass<InstanceType<Class>>, props?: HardEmptyObject): InstanceType<Class>;
+    <Class extends typeof ComponentInstance<o, o, o>>(Methods: Class & IComponentInstanceClass<InstanceType<Class>>, props: InstanceType<Class>['props']): InstanceType<Class>;
+};
 export declare const useInstance: UseInstance;
-type UseMountCallbacks = <TInstance extends ComponentInstance<any, any, any>>(instance: TInstance) => void;
-export declare const useMountCallbacks: UseMountCallbacks;
 export {};

package/build/classy/instance.js

@@ -14,20 +14,36 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useMountCallbacks = exports.useInstance = exports.ComponentInstance = exports.noOp = void 0;
+exports.useInstance = exports.ComponentInstance = exports.noOp = exports.useMountCallbacks = 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);
+            }
+        };
+    }, []);
+};
+exports.useMountCallbacks = useMountCallbacks;
 var noOp = function () { };
 exports.noOp = noOp;
 var ComponentInstance = /** @class */ (function (_super) {
@@ -83,7 +99,8 @@ var ComponentInstance = /** @class */ (function (_super) {
 }(logic_1.ComponentLogic));
 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,
  * and `UseInstance` using an empty tuple in its rest parameter type, attempting to simply
@@ -92,14 +109,15 @@ exports.ComponentInstance = ComponentInstance;
  * the second param is given `{}` as a default follow to account for the empty tuple case. TypeScript
  * just wants us to use the rest parameter explicitly by force.
  */
-var useInstance = function (Component) {
+var useInstance = function () {
     var _a;
     var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
     }
+    var Component = args[0], _b = args[1], props = _b === void 0 ? {} : _b;
     // useHooks.
-    var instance = logic_1.useLogic.apply(void 0, __spreadArray([Component], args, false)); // Must spread rest parameter, rather than passing a single `props` argument directly.
+    var instance = (0, logic_1.useLogic)(Component, props); // Must spread rest parameter, rather than passing a single `props` argument directly.
     /**
      * Argument of type '
         * [
@@ -115,7 +133,6 @@ var useInstance = function (Component) {
         '
      */
     // beforeMount, onMount, cleanUp.
-    // eslint-disable-next-line no-use-before-define
     (0, exports.useMountCallbacks)(instance);
     // beforeRender.
     (_a = instance.beforeRender) === null || _a === void 0 ? void 0 : _a.call(instance);
@@ -133,28 +150,12 @@ var useInstance = function (Component) {
     return instance;
 };
 exports.useInstance = useInstance;
-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;
+testing: {
+    var A = /** @class */ (function (_super) {
+        __extends(A, _super);
+        function A() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return A;
+    }(ComponentInstance));
+}

package/build/classy/logic.d.ts

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

package/build/classy/logic.js

@@ -22,33 +22,25 @@ var state_1 = require("../base/state");
 var ComponentLogic = /** @class */ (function () {
     function ComponentLogic() {
     }
+    ComponentLogic.getInitialState = function (p) { return ({}); };
     return ComponentLogic;
 }());
 exports.ComponentLogic = ComponentLogic;
 ;
-testing: {
-    var A = (_a = /** @class */ (function (_super) {
-            __extends(C, _super);
-            function C() {
-                return _super !== null && _super.apply(this, arguments) || this;
-            }
-            return C;
-        }(ComponentLogic)),
-        _a.getInitialState = function () { return ({}); },
-        _a);
-    A.getInitialState();
-}
-;
-var useLogic = function (Methods, props) {
-    var _b;
-    if (props === void 0) { props = {}; }
+var useLogic = function () {
+    var _a, _b;
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var Methods = args[0], _c = args[1], props = _c === void 0 ? {} : _c;
     var state = (0, state_1.useCleanState)(Methods.getInitialState, props);
     var methods = (0, react_1.useRef)((0, react_1.useMemo)(function () {
         return new Methods();
     }, [])).current;
     methods.state = state;
     methods.props = props;
-    methods.hooks = ((_b = methods.useHooks) === null || _b === void 0 ? void 0 : _b.call(methods)) || {};
+    methods.hooks = (_b = (_a = methods.useHooks) === null || _a === void 0 ? void 0 : _a.call(methods)) !== null && _b !== void 0 ? _b : {};
     return methods;
 };
 exports.useLogic = useLogic;
@@ -59,9 +51,30 @@ testing: {
         function MyComponentLogic() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        MyComponentLogic.getInitialState = function () { return ({}); };
+        MyComponentLogic.getInitialState = function () { return ({ a: '' }); };
         return MyComponentLogic;
     }(ComponentLogic));
     ;
-    (0, exports.useLogic)(MyComponentLogic);
+    MyComponentLogic.getInitialState;
+    // const self = useLogic(MyComponentLogic);
+}
+testing: {
+    var A = /** @class */ (function (_super) {
+        __extends(C, _super);
+        function C() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return C;
+    }(ComponentLogic));
+    A.getInitialState();
+    // const oa = {['a' as unknown as symbol]: 'boo'};
+    var oa = (_a = {}, _a['a'] = 'boo', _a);
+    // const self = useLogic(A, oa);
 }
+// export type ComponentClassStatics<Instance extends ComponentLogic<object, object, object>> = {
+// 	getInitialState: (props?: Instance['props']) => TState<Instance['state']>;
+// }
+// export type TComponentClass<
+// 	Instance extends ComponentLogic<object, object, object>,
+// 	Params extends CnstPrm = CnstPrm
+// > = ComponentClassStatics<Instance> & Constructor<Instance, Params>;

package/build/globals.d.ts

@@ -1,24 +1,4 @@
-/**
- * @file
- * This file is an "Ambient declarations file". The types defined here are available globally.
- * More info here: https://stackoverflow.com/a/73389225/985454
- *
- * Don't use `import` and `export` in this file directly! It breaks ambience.
- * To import external types in an ambient declarations file (this file) use the following:
- *
- * @example
- * declare type React = typeof import('react');
- *
- * To contribute ambient declarations from any file, even non-ambient ones, use this:
- *
- * @example
- * declare global {
- *   interface Window {
- *     ethereum: any
- *   }
- * }
-**/
-/** */
+declare const UniqueSecretSymbolKey: unique symbol;
 declare global {
     type Optional<BaseType, AllowNull extends boolean = true> = (AllowNull extends true ? BaseType | undefined | null : BaseType | undefined);
     type Awaitable<Type> = Type | Promise<Type>;
@@ -42,6 +22,15 @@ declare global {
     type AnyFunction = (...args: any) => any;
     type FunctionType = AnyFunction;
     type TFunction = AnyFunction;
+    type NotNullish = {};
+    type NonPrimitive = object;
+    interface WeakEmptyObject {
+        [UniqueSecretSymbolKey]?: never;
+    }
+    interface HardEmptyObject {
+        [key: keyof any]: never;
+    }
+    type valueof<TObject> = TObject[keyof TObject];
     interface Window {
     }
     namespace JSX {
@@ -52,16 +41,5 @@ declare global {
         interface ProcessEnv {
         }
     }
-    type __FromPrivateHelpers = typeof import('./globals.private');
-    type TEmptyObject1 = {
-        ''?: never;
-    };
-    type TEmptyObject2 = Record<symbol, never>;
-    type EmptyObject = __FromPrivateHelpers['EmptyObject'];
-    type EmptyObject2 = __FromPrivateHelpers['EmptyObject2'];
-    type EmptyObject3 = __FromPrivateHelpers['EmptyObject3'];
-    type valueof<TObject> = TObject[keyof TObject];
-    interface T extends __FromPrivateHelpers {
-    }
 }
 export {};

package/build/globals.js

@@ -1,22 +1,14 @@
 "use strict";
-/**
- * @file
- * This file is an "Ambient declarations file". The types defined here are available globally.
- * More info here: https://stackoverflow.com/a/73389225/985454
- *
- * Don't use `import` and `export` in this file directly! It breaks ambience.
- * To import external types in an ambient declarations file (this file) use the following:
- *
- * @example
- * declare type React = typeof import('react');
- *
- * To contribute ambient declarations from any file, even non-ambient ones, use this:
- *
- * @example
- * declare global {
- *   interface Window {
- *     ethereum: any
- *   }
- * }
-**/
 Object.defineProperty(exports, "__esModule", { value: true });
+/////////////
+var UniqueSecretSymbolKey = Symbol('asdfghjkliuytrewqaxcvb,nb');
+testing: {
+    var mySymbol = Symbol('asdfgh');
+    var tt = {
+    // [mySymbol]: '' as never,
+    // [UniqueSecretSymbolKey]: '',
+    // '': '',
+    };
+    var TT = {};
+    TT = tt;
+}

package/build/tsconfig.json

@@ -32,7 +32,7 @@
 		"noImplicitAny": true,
 		"noUncheckedIndexedAccess": true,
 		"strictBindCallApply": true,
-		// "exactOptionalPropertyTypes": true
+		"exactOptionalPropertyTypes": true,
 	},
 	"include": [
 		"**/*.ts",

package/package.json

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

package/build/globals.private.d.ts

@@ -1,48 +0,0 @@
-/**
- * @file
- * This file is created specifically to augment the declarations in
- * [globals.d.ts]({@link ./globals.d.ts}).
- *
- * **You should not import this file directly.**
- */
-/** */
-declare const UniqueSecretSymbolKey: unique symbol;
-declare class CEmptyObject {
-    [key: keyof any]: never;
-}
-declare class CEmptyObject2 {
-    [UniqueSecretSymbolKey]?: never;
-}
-declare class CEmptyObject3 {
-    /**
-     * It appears keys of the base `symbol` type are excluded from
-     * excess property checks. This is likely a bug in TypeScript.
-     * Even the "has no properties in common" error disappears if the
-     * value being placed into a variable has a key typed as `symbol`.
-     * This only applies to the base `symbol` type. Specifc `'unique symbol'`
-     * types are unaffected.
-     *
-     * @example
-     * // Consider the following object:
-     * const myUniqueSymbol = Symbol('lkjhgfc');
-     * let myObj = { [myUniqueSymbol]?: 'a string value' };
-     *
-     * // We can attempt to reassign `myObj` with the expectation that TS will
-     * // warn if any key other than `myUniqueSymbol` is used in the new object.
-     * // But this breaks in one specific scenario.
-     *
-     * // No excess property check when this is used as a key.
-     * // Error "no properties in common" also suppressed when this is used as a key.
-     * const differentBasicSymbol = Symbol('qwertiop[') as symbol;
-     * myObj = { [differentBasicSymbol]: 5 };
-     *
-     * // Errors emitted as expected when this is used as a key.
-     * const differentUniqueSymbol = Symbol('zxcvbnm');
-     * myObj = { [differentUniqueSymbol]: 5 };
-     */
-    [key: symbol]: never;
-}
-export declare const EmptyObject: CEmptyObject;
-export declare const EmptyObject2: CEmptyObject2;
-export declare const EmptyObject3: CEmptyObject3;
-export {};

package/build/globals.private.js

@@ -1,40 +0,0 @@
-"use strict";
-/**
- * @file
- * This file is created specifically to augment the declarations in
- * [globals.d.ts]({@link ./globals.d.ts}).
- *
- * **You should not import this file directly.**
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmptyObject3 = exports.EmptyObject2 = exports.EmptyObject = void 0;
-/** */
-var UniqueSecretSymbolKey = Symbol('asdfghjkliuytrewqaxcvb,nb');
-var CEmptyObject = /** @class */ (function () {
-    function CEmptyObject() {
-    }
-    return CEmptyObject;
-}());
-var CEmptyObject2 = /** @class */ (function () {
-    function CEmptyObject2() {
-    }
-    return CEmptyObject2;
-}());
-var CEmptyObject3 = /** @class */ (function () {
-    function CEmptyObject3() {
-    }
-    return CEmptyObject3;
-}());
-exports.EmptyObject = new CEmptyObject();
-exports.EmptyObject2 = new CEmptyObject2();
-exports.EmptyObject3 = new CEmptyObject3();
-testing: {
-    var mySymbol = Symbol('asdfgh');
-    var tt = {
-    // [mySymbol]: '' as never,
-    // [UniqueSecretSymbolKey]: '',
-    // '': '',
-    };
-    var TT = new CEmptyObject();
-    TT = tt;
-}