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

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 ComponentMethods<any, any>>(Methods: Constructor<TMethods>, state: TMethods['state'], props: TMethods['props']) => TMethods;
+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>;
 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");
@@ -23,3 +74,27 @@ var useMethods = function (Methods, state, props) {
     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/classy/class.d.ts

@@ -1,7 +1,6 @@
 import type { VoidFunctionComponent } from 'react';
-import type { TComponentClass } from './logic';
 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']>;
+type Extractor = <TComponent extends typeof ClassComponent<object, object, object>>(this: TComponent & Constructor<InstanceType<TComponent>>, _Component?: TComponent & Constructor<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';

package/build/classy/instance.d.ts

@@ -1,4 +1,3 @@
-import type { TComponentClass } from './logic';
 import { ComponentLogic } from './logic';
 type AsyncAllowedEffectCallback = () => Awaitable<IVoidFunction>;
 export declare const noOp: () => void;
@@ -47,7 +46,7 @@ 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;
+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,

package/build/classy/logic.d.ts

@@ -1,9 +1,10 @@
 import type { TCleanState, TState } from '../base/state';
-export declare class ComponentLogic<TState extends object = EmptyObject, TProps extends object = EmptyObject, THooks extends object = EmptyObject> {
-    state: TCleanState<TState>;
+type o = object;
+export declare class ComponentLogic<TState_ extends object = EmptyObject, TProps extends object = EmptyObject, THooks extends object = EmptyObject> {
+    state: TCleanState<TState_>;
     props: TProps;
     hooks: THooks;
-    static getInitialState: IComponentClass['getInitialState'];
+    static getInitialState: <ThisT extends typeof ComponentLogic<o, o, o>>(this: ThisT, props?: InstanceType<ThisT>['props']) => TState<InstanceType<ThisT>['state']> & any;
     useHooks?: () => THooks;
 }
 type CnstPrm = ConstructorParameters<typeof ComponentLogic>;
@@ -17,6 +18,6 @@ export type ComponentClassStatics<Instance extends ComponentLogic<object, object
 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;
+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 declare const useLogic: UseLogic;
 export {};

package/build/classy/logic.js

@@ -63,5 +63,5 @@ testing: {
         return MyComponentLogic;
     }(ComponentLogic));
     ;
-    (0, exports.useLogic)(MyComponentLogic);
+    var self_1 = (0, exports.useLogic)(MyComponentLogic);
 }

package/package.json

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