@cleanweb/react 1.0.8 → 1.0.10

package/build/base/methods.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useMethods = exports.ComponentMethods = void 0;
 var react_1 = require("react");
@@ -21,13 +10,16 @@ var ComponentMethods = /** @class */ (function () {
 exports.ComponentMethods = ComponentMethods;
 ;
 var useMethods = function (Methods, state, props) {
+    // @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.useMemo)(function () {
         // See useLogic implementation for a discussion of this type assertion.
         return new Methods();
     }, []);
     methods.state = state;
     methods.props = props;
-    // Return a gate object to "passthrough" all methods but filter out properties that should be private.
-    return __assign(__assign({}, methods), { props: undefined, state: undefined });
+    return methods;
 };
 exports.useMethods = useMethods;

package/build/base/state.d.ts

@@ -12,9 +12,10 @@ declare class CleanStateBase<TState extends object> {
 }
 type TCleanStateInstance<TState extends object> = TState & CleanStateBase<TState>;
 export type TCleanState<TState extends object> = TCleanStateInstance<TState>;
-type Func = (...params: any[]) => any;
-type UseCleanState = <TState extends object, TProps extends object = object>(_initialState: ((props?: TProps) => TState) | TState, // TStateObjOrFactory,
-props?: typeof _initialState extends Func ? TProps : undefined) => TCleanState<TState>;
+type StateInitFunction = (props?: object) => object;
+type TInitialState<StateParamType> = StateParamType extends StateInitFunction ? ReturnType<StateParamType> : StateParamType;
+type StateInitParameters<StateInitializer> = StateInitializer extends StateInitFunction ? Parameters<StateInitializer> : [];
+type UseCleanState = <StateInitializer extends StateInitFunction | object>(_initialState: StateInitializer, ...props: StateInitParameters<StateInitializer>) => TCleanState<TInitialState<StateInitializer>>;
 export declare const useCleanState: UseCleanState;
 /**
  * Returns a value that is false before the component has been mounted,

package/build/base/state.js

@@ -93,6 +93,7 @@ var CleanStateBase = /** @class */ (function () {
 ;
 var CleanState = CleanStateBase;
 var useCleanState = function (_initialState, props) {
+    if (props === void 0) { props = {}; }
     var initialState = typeof _initialState === 'function' ? (0, react_1.useMemo)(function () { return _initialState(props); }, []) : _initialState;
     var cleanState = (0, react_1.useMemo)(function () { return new CleanState(initialState); }, []);
     CleanState.update.call(cleanState);

package/build/classy/logic.d.ts

@@ -8,6 +8,6 @@ export declare class ComponentLogic<TState extends object, TProps extends object
 export interface ComponentLogicConstructor<TState extends object, TProps extends object, THooks extends object> extends Constructor<ComponentLogic<TState, TProps, THooks>> {
     getInitialState: (props?: TProps) => TState;
 }
-type UseLogic = <TState extends object, LogicClass extends ComponentLogicConstructor<TState, any, any>>(Methods: LogicClass, props: InstanceType<LogicClass>['props']) => InstanceType<LogicClass>;
+type UseLogic = <LogicClass extends ComponentLogicConstructor<{}, object, any>>(Methods: LogicClass, props?: InstanceType<LogicClass>['props']) => InstanceType<LogicClass>;
 export declare const useLogic: UseLogic;
 export {};

package/build/classy/logic.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLogic = exports.ComponentLogic = void 0;
 var react_1 = require("react");
@@ -23,6 +12,7 @@ exports.ComponentLogic = ComponentLogic;
 ;
 var useLogic = function (Methods, props) {
     var _a;
+    if (props === void 0) { props = {}; }
     var state = (0, state_1.useCleanState)(Methods.getInitialState, props);
     // There's apparently a bug? with Typescript that pegs the return type of "new Methods()" to "ComponentLogic<{}, {}, {}>",
     // completely ignoring the type specified for Methods in the function's type definition.
@@ -36,7 +26,6 @@ var useLogic = function (Methods, props) {
     methods.state = state;
     methods.props = props;
     methods.hooks = ((_a = methods.useHooks) === null || _a === void 0 ? void 0 : _a.call(methods)) || {};
-    // Return a gate object to "passthrough" all methods but filter out properties that should be private.
-    return __assign(__assign({}, methods), { useHooks: undefined });
+    return methods;
 };
 exports.useLogic = useLogic;

package/build/globals.d.ts

@@ -39,6 +39,9 @@ declare interface IVoidFunction<AsyncType extends 'async' | 'sync' | 'both' = 'b
 		: Promise<void> | void
 }
 
+declare type FunctionType = (...args: any[]) => any;
+
+
 declare interface Window {
 }
 

package/package.json

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