@cleanweb/react 1.1.1-beta.2 → 1.1.1-beta.3

package/build/base/methods.d.ts

@@ -3,6 +3,6 @@ export declare class ComponentMethods<TState extends object, TProps extends obje
     state: TCleanState<TState>;
     props: TProps;
 }
-type UseMethods = <TMethods extends typeof ComponentMethods<any, any>, Instance extends InstanceType<TMethods> = InstanceType<TMethods>>(Methods: TMethods & Constructor<InstanceType<TMethods>>, state: InstanceType<TMethods>['state'], props: InstanceType<TMethods>['props']) => InstanceType<TMethods>;
+type UseMethods = <TMethods extends typeof ComponentMethods<any, any>>(Methods: TMethods & Constructor<InstanceType<TMethods>>, state: InstanceType<TMethods>['state'], props: InstanceType<TMethods>['props']) => InstanceType<TMethods>;
 export declare const useMethods: UseMethods;
 export {};

package/build/classy/class.d.ts

@@ -1,10 +1,15 @@
 import type { VoidFunctionComponent } from 'react';
+import type { IComponentInstanceClass } from './instance';
 import { ComponentInstance } from './instance';
-type Extractor = <TComponent extends typeof ClassComponent<object, object, object>>(this: TComponent & Constructor<InstanceType<TComponent>>, _Component?: TComponent & Constructor<InstanceType<TComponent>>) => VoidFunctionComponent<InstanceType<TComponent>['props']>;
+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']>;
 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;
+    static readonly FC: Extractor;
 }
 interface HookWrapperProps<THookFunction extends AnyFunction> {
     hook: THookFunction;

package/build/classy/class.js

@@ -32,7 +32,7 @@ var setFunctionName = function (func, newName) {
         console.warn(error);
     }
 };
-// eslint-enable no-use-before-define
+;
 var ClassComponent = /** @class */ (function (_super) {
     __extends(ClassComponent, _super);
     function ClassComponent() {
@@ -89,3 +89,15 @@ 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 ({}); };
+        return MyComponentLogic;
+    }(ClassComponent));
+    ;
+}

package/build/classy/instance.d.ts

@@ -1,5 +1,7 @@
-import { ComponentLogic } from './logic';
+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> {
     /**
@@ -46,17 +48,10 @@ export declare class ComponentInstance<TState extends object = EmptyObject, TPro
      */
     cleanUp: IVoidFunction;
 }
-type UseInstance = <TClass extends typeof ComponentInstance<object, object, object>>(Class: TClass & Constructor<InstanceType<TClass>>, ...props: valueof<InstanceType<TClass>['props']> extends never ? ([] | [EmptyObject] | [InstanceType<TClass>['props']]) : [InstanceType<TClass>['props']]) => InstanceType<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 = <TClass extends typeof ComponentInstance<object, object, object>>(Class: TClass & IComponentInstanceClass<InstanceType<TClass>>, ...props: valueof<InstanceType<TClass>['props']> extends never ? ([] | [EmptyObject] | [InstanceType<TClass>['props']]) : [InstanceType<TClass>['props']]) => InstanceType<TClass>;
 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

@@ -24,10 +24,35 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     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 +108,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
@@ -115,7 +141,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 +158,3 @@ 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;

package/build/classy/logic.d.ts

@@ -1,23 +1,18 @@
 import type { TCleanState, TState } from '../base/state';
+export type Empty = EmptyObject;
 type o = object;
-export declare class ComponentLogic<TState_ extends object = EmptyObject, TProps extends object = EmptyObject, THooks extends object = EmptyObject> {
-    state: TCleanState<TState_>;
+export declare class ComponentLogic<TState extends o = Empty, TProps extends o = Empty, THooks extends o = Empty> {
+    state: TCleanState<TState>;
     props: TProps;
     hooks: THooks;
-    static getInitialState: <ThisT extends typeof ComponentLogic<o, o, o>>(this: ThisT, props?: InstanceType<ThisT>['props']) => TState<InstanceType<ThisT>['state']> & any;
+    static getInitialState: TBaseComponentLogic['getInitialState'];
     useHooks?: () => THooks;
 }
-type CnstPrm = ConstructorParameters<typeof ComponentLogic>;
-export interface IComponentClass<Instance extends ComponentLogic = ComponentLogic> {
-    new (...params: CnstPrm): Instance;
+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']) => TState<Instance['state']>;
 }
-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>, Statics extends ComponentClassStatics<Instance> = ComponentClassStatics<Instance>, Params extends CnstPrm = CnstPrm> = Statics & Constructor<Instance, Params>;
-export interface IEmpty extends EmptyObject {
-}
-type UseLogic = <Class extends typeof ComponentLogic<object, object, object>, Instance extends InstanceType<Class> = InstanceType<Class>>(Methods: Class & Constructor<Instance>, ...props: valueof<Instance['props']> extends never ? ([] | [EmptyObject] | [Instance['props']]) : [Instance['props']]) => Instance;
+export type TBaseComponentLogic = IComponentLogicClass<ComponentLogic<o, o, o>>;
+type UseLogic = <Class extends typeof ComponentLogic<o, o, o>>(Methods: Class & IComponentLogicClass<InstanceType<Class>>, ...props: valueof<InstanceType<Class>['props']> extends never ? ([] | [EmptyObject] | [InstanceType<Class>['props']]) : [InstanceType<Class>['props']]) => InstanceType<Class>;
 export declare const useLogic: UseLogic;
 export {};

package/build/classy/logic.js

@@ -19,6 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLogic = exports.ComponentLogic = void 0;
 var react_1 = require("react");
 var state_1 = require("../base/state");
+// React.Component
 var ComponentLogic = /** @class */ (function () {
     function ComponentLogic() {
     }
@@ -26,21 +27,8 @@ var ComponentLogic = /** @class */ (function () {
 }());
 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;
+    var _b, _c;
     if (props === void 0) { props = {}; }
     var state = (0, state_1.useCleanState)(Methods.getInitialState, props);
     var methods = (0, react_1.useRef)((0, react_1.useMemo)(function () {
@@ -48,7 +36,7 @@ var useLogic = function (Methods, props) {
     }, [])).current;
     methods.state = state;
     methods.props = props;
-    methods.hooks = ((_b = methods.useHooks) === null || _b === void 0 ? void 0 : _b.call(methods)) || {};
+    methods.hooks = (_c = (_b = methods.useHooks) === null || _b === void 0 ? void 0 : _b.call(methods)) !== null && _c !== void 0 ? _c : {};
     return methods;
 };
 exports.useLogic = useLogic;
@@ -65,3 +53,25 @@ testing: {
     ;
     var self_1 = (0, exports.useLogic)(MyComponentLogic);
 }
+testing: {
+    var A = (_a = /** @class */ (function (_super) {
+            __extends(C, _super);
+            function C() {
+                var _this = _super !== null && _super.apply(this, arguments) || this;
+                _this.b = _this.state.a;
+                return _this;
+            }
+            return C;
+        }(ComponentLogic)),
+        _a.getInitialState = function () { return ({ a: 'l' }); },
+        _a);
+    A.getInitialState();
+    // const self = useLogic(A);
+}
+// 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

@@ -57,7 +57,9 @@ declare global {
         ''?: never;
     };
     type TEmptyObject2 = Record<symbol, never>;
-    type EmptyObject = __FromPrivateHelpers['EmptyObject'];
+    type EmptyObject = {
+        [key: keyof any]: never;
+    };
     type EmptyObject2 = __FromPrivateHelpers['EmptyObject2'];
     type EmptyObject3 = __FromPrivateHelpers['EmptyObject3'];
     type valueof<TObject> = TObject[keyof TObject];

package/build/globals.private.d.ts

@@ -7,9 +7,6 @@
  */
 /** */
 declare const UniqueSecretSymbolKey: unique symbol;
-declare class CEmptyObject {
-    [key: keyof any]: never;
-}
 declare class CEmptyObject2 {
     [UniqueSecretSymbolKey]?: never;
 }
@@ -42,7 +39,6 @@ declare class CEmptyObject3 {
      */
     [key: symbol]: never;
 }
-export declare const EmptyObject: CEmptyObject;
 export declare const EmptyObject2: CEmptyObject2;
 export declare const EmptyObject3: CEmptyObject3;
 export {};

package/build/globals.private.js

@@ -7,14 +7,9 @@
  * **You should not import this file directly.**
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmptyObject3 = exports.EmptyObject2 = exports.EmptyObject = void 0;
+exports.EmptyObject3 = exports.EmptyObject2 = void 0;
 /** */
 var UniqueSecretSymbolKey = Symbol('asdfghjkliuytrewqaxcvb,nb');
-var CEmptyObject = /** @class */ (function () {
-    function CEmptyObject() {
-    }
-    return CEmptyObject;
-}());
 var CEmptyObject2 = /** @class */ (function () {
     function CEmptyObject2() {
     }
@@ -25,7 +20,6 @@ var CEmptyObject3 = /** @class */ (function () {
     }
     return CEmptyObject3;
 }());
-exports.EmptyObject = new CEmptyObject();
 exports.EmptyObject2 = new CEmptyObject2();
 exports.EmptyObject3 = new CEmptyObject3();
 testing: {
@@ -35,6 +29,6 @@ testing: {
     // [UniqueSecretSymbolKey]: '',
     // '': '',
     };
-    var TT = new CEmptyObject();
+    var TT = new CEmptyObject2();
     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.2",
+  "version": "1.1.1-beta.3",
   "description": "A suite of helpers for writing cleaner React function components.",
   "engines": {
     "node": ">=18"