@cleanweb/react 1.1.1-beta.6 → 1.1.1-beta.8

package/build/classy/class.d.ts

@@ -6,7 +6,7 @@ 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<TProps extends o = EmptyObject, TState extends o = EmptyObject, THooks extends o = EmptyObject> extends ComponentInstance<TState, TProps, THooks> {
+export declare class ClassComponent<TProps extends o = EmptyObject, TState extends o = EmptyObject, THooks extends o = EmptyObject> extends ComponentInstance<TProps, TState, THooks> {
     Render: VoidFunctionComponent<{}>;
     readonly forceUpdate: VoidFunction;
     static renderAs: 'component' | 'template';

package/build/classy/class.js

@@ -110,8 +110,9 @@ testing: {
         function MyComponentLogic() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        MyComponentLogic.getInitialState = function () { return ({}); };
+        MyComponentLogic.getInitialState = function () { return ({ a: '' }); };
         return MyComponentLogic;
     }(ClassComponent));
     ;
+    var Template = MyComponentLogic.FC();
 }

package/build/classy/instance.d.ts

@@ -3,7 +3,7 @@ type AsyncAllowedEffectCallback = () => Awaitable<IVoidFunction>;
 type UseMountCallbacks = <TInstance extends ComponentInstance<any, any, any>>(instance: TInstance) => void;
 export declare const useMountCallbacks: UseMountCallbacks;
 export declare const noOp: () => void;
-export declare class ComponentInstance<TProps extends o = EmptyObject, TState extends o = EmptyObject, THooks extends o = EmptyObject> extends ComponentLogic<TState, TProps, THooks> {
+export declare class ComponentInstance<TProps extends o = EmptyObject, TState extends o = EmptyObject, THooks extends o = EmptyObject> 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.
@@ -52,6 +52,9 @@ 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 UseInstance2 = {
+    <Class extends typeof ComponentInstance<EmptyObject, o, o>>(Methods: Class & IComponentInstanceClass<InstanceType<Class>>, ...props: ([] | [EmptyObject])): InstanceType<Class>;
+    <Class extends typeof ComponentInstance<o, o, o>>(Methods: Class & IComponentInstanceClass<InstanceType<Class>>, ...props: [InstanceType<Class>['props']]): InstanceType<Class>;
+};
+export declare const useInstance: UseInstance2;
 export {};

package/build/classy/instance.js

@@ -14,15 +14,6 @@ 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.useInstance = exports.ComponentInstance = exports.noOp = exports.useMountCallbacks = void 0;
 var react_1 = require("react");
@@ -118,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 '
         * [

package/build/classy/logic.d.ts

@@ -12,6 +12,9 @@ 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']>;
 }
-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 {};
+type UseLogic2 = {
+    <Class extends typeof ComponentLogic<Empty, o, o>>(Methods: Class & IComponentLogicClass<InstanceType<Class>>, ...props: ([] | [EmptyObject])): InstanceType<Class>;
+    <Class extends typeof ComponentLogic<o, o, o>>(Methods: Class & IComponentLogicClass<InstanceType<Class>>, ...props: [InstanceType<Class>['props']]): InstanceType<Class>;
+};
+declare const useLogic: UseLogic2;
+export { useLogic };

package/build/classy/logic.js

@@ -26,9 +26,13 @@ var ComponentLogic = /** @class */ (function () {
 }());
 exports.ComponentLogic = ComponentLogic;
 ;
-var useLogic = function (Methods, props) {
+var useLogic = function () {
     var _a, _b;
-    if (props === void 0) { props = {}; }
+    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();
@@ -53,21 +57,18 @@ testing: {
     }(ComponentLogic));
     ;
     MyComponentLogic.getInitialState;
-    var self_1 = (0, exports.useLogic)(MyComponentLogic, {});
+    var self_1 = useLogic(MyComponentLogic);
 }
 testing: {
     var A = /** @class */ (function (_super) {
         __extends(C, _super);
         function C() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            // static getInitialState = () => ({a: 'l'});
-            _this.b = _this.state.a;
-            return _this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         return C;
     }(ComponentLogic));
     A.getInitialState();
-    var self_2 = (0, exports.useLogic)(A);
+    var self_2 = useLogic(A, { a: 'boo' });
 }
 // export type ComponentClassStatics<Instance extends ComponentLogic<object, object, object>> = {
 // 	getInitialState: (props?: Instance['props']) => TState<Instance['state']>;

package/build/globals.d.ts

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

package/package.json

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