@modular-component/core 0.2.3 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @modular-component/core
 
+## 0.3.0
+
+### Minor Changes
+
+- 1784a2b: Add a clean way to extend the ModularComponent API with new dedicated stage functions
+
+### Patch Changes
+
+- @modular-component/stages@0.3.0
+
 ## 0.2.3
 
 ### Patch Changes

package/README.md

@@ -1,7 +1,7 @@
 # @modular-component/core
 
-Core system for creating a `ModularComponent` factory. Exports the `modularFactory`
-builder, and necessary types for creating extensions.
+Core system for creating Modular components. Exports the `ModularComponent` factory function, as well as
+helpers for creating stages.
 
 ## Installation and usage
 
@@ -19,14 +19,28 @@ const MyComponent = ModularComponent().with(
 ```
 
 ```tsx
-// Usage in extensions
-import { ModularStage } from '@modular-component/core'
+// Or by extending the factory
+import { ModularComponent } from '@modular-component/core'
+import '@modular-component/core/register'
+
+const MyComponent = ModularComponent().withRender(() => (
+  <div>Hello Modular!</div>
+))
+```
 
-export function extension(): ModularStage<'field', () => void> {
-  return { field: 'field', useStage: () => {} }
+```tsx
+// Usage in extensions
+import { ModularContext, addTo } from '@modular-component/core/extend'
+
+export function extension<Context extends ModularContext>() {
+  return addTo<Context>()
+    .on('field')
+    .provide((args) => {
+      // Compute value for argument 'field' from previous stage arguments
+    })
 }
 ```
 
 ## Learn more
 
-Read the [`ModularComponent` ReadMe](https://github.com/jvdsande/modular-component/blob/master/README.md) for more information about the `ModularComponent` system.
+Read the [`ModularComponent` ReadMe](https://github.com/modular-component/modular-component/blob/master/README.md) for more information about the `ModularComponent` system.

package/dist/extend.d.ts

@@ -0,0 +1,52 @@
+import type { FunctionComponent } from 'react';
+import type { ModularContext } from '@modular-component/stages';
+import type { ModularComponent } from './index';
+export type { ModularContext } from '@modular-component/stages';
+export type GetArgsFor<Context extends ModularContext, Field extends string> = Field extends keyof Context['stages'] ? Pick<Context['arguments'], Context['stages'][Field]> : Context['arguments'];
+export type GetConstraintFor<Context extends ModularContext, Field extends string, Default = any> = Field extends 'render' ? ReturnType<FunctionComponent> : Field extends keyof Context['constraints'] ? Context['constraints'][Field] : Default;
+export type GetValueGetterFor<Context extends ModularContext, Field extends string, Type> = Type | ((args: GetArgsFor<Context, Field>) => Type);
+type AppendArguments<Arguments, Field extends string, Type> = {
+    [key in Exclude<keyof Arguments, Field>]: Arguments[key];
+} & {
+    [key in Field]: Type;
+} extends infer U ? {
+    [key in keyof U]: U[key];
+} : never;
+type AppendConstraints<Constraints, Backup, Field extends string, Type> = {
+    [key in Exclude<keyof Constraints, Field>]: Constraints[key];
+} & {
+    [key in Exclude<keyof Backup, Field>]: Backup[key];
+} & {
+    [key in Field]: Type;
+} extends infer U ? {
+    [key in keyof U]: U[key];
+} : never;
+type AppendStages<Stages, Arguments, Field extends string, Type> = {
+    [key in Exclude<keyof Stages, Field>]: Stages[key];
+} & {
+    [key in Field]: key extends keyof Stages ? Stages[key] : keyof Arguments;
+} extends infer U ? {
+    [key in keyof U]: U[key];
+} : never;
+export type AppendStage<Context extends ModularContext, Field extends string, Type> = Pick<Context, 'props' | 'ref'> & {
+    arguments: AppendArguments<Context['arguments'], Field, Type>;
+    constraints: AppendConstraints<Context['constraints'], Context['_constraints'], Field, Type>;
+    stages: AppendStages<Context['stages'], Context['arguments'], Field, Type>;
+} extends infer U ? {
+    [key in keyof U]: U[key];
+} : never;
+export type StageParams<Fn extends (...args: any[]) => any> = Parameters<Fn>;
+export type StageReturn<Fn extends (...args: any[]) => (ctx?: any) => {
+    field: string;
+    provide: (args: any) => any;
+}> = ModularComponent<AppendStage<NonNullable<Parameters<ReturnType<Fn>>[0]>, ReturnType<ReturnType<Fn>>['field'], ReturnType<ReturnType<ReturnType<Fn>>['provide']>>> extends ModularComponent<infer U> ? ModularComponent<U> : never;
+export declare function addTo<Context extends ModularContext>(): {
+    on<Field extends string>(field: Field): {
+        provide<Stage extends (args: GetArgsFor<Context, Field>) => any>(stage: Stage): (_?: Context) => {
+            field: Field;
+            provide: Stage;
+        };
+    };
+};
+export declare function wrap<Args, Type>(useFn: Type | ((args: Args) => Type)): (args: Args) => Type;
+//# sourceMappingURL=extend.d.ts.map

package/dist/extend.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extend.d.ts","sourceRoot":"","sources":["../src/extend.ts"],"names":[],"mappings":"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"}

package/dist/extend.js

@@ -0,0 +1,22 @@
+export function addTo() {
+    return {
+        on(field) {
+            return {
+                provide(stage) {
+                    return (_) => ({
+                        field,
+                        provide: stage,
+                    });
+                },
+            };
+        },
+    };
+}
+export function wrap(useFn) {
+    return (args) => {
+        return typeof useFn === 'function'
+            ? useFn(args)
+            : useFn;
+    };
+}
+//# sourceMappingURL=extend.js.map

package/dist/extend.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extend.js","sourceRoot":"","sources":["../src/extend.ts"],"names":[],"mappings":"AAuFA,MAAM,UAAU,KAAK;IACnB,OAAO;QACL,EAAE,CAAuB,KAAY;YACnC,OAAO;gBACL,OAAO,CACL,KAAY;oBAEZ,OAAO,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC;wBACvB,KAAK;wBACL,OAAO,EAAE,KAAK;qBACf,CAAC,CAAA;gBACJ,CAAC;aACF,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,IAAI,CAAa,KAAoC;IACnE,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,OAAO,OAAO,KAAK,KAAK,UAAU;YAChC,CAAC,CAAE,KAA8B,CAAC,IAAI,CAAC;YACvC,CAAC,CAAC,KAAK,CAAA;IACX,CAAC,CAAA;AACH,CAAC"}

package/dist/index.d.ts

@@ -1,34 +1,55 @@
-import React, { ForwardRefRenderFunction, FunctionComponent, PropsWithChildren } from 'react';
-export interface ModularStage<Field extends string, Stage extends (args: any, ref?: any) => any> {
-    field: Field;
-    useStage: Stage;
-}
-export type FunctionComponentOrRefRenderFunction<Props, Ref> = [Ref] extends [
-    never
-] ? FunctionComponent<PropsWithChildren<Props>> : ForwardRefRenderFunction<Ref, Props>;
-export type ModularComponent<Props extends {}, Ref, Args extends {
-    render: ReturnType<FunctionComponent>;
-}> = FunctionComponentOrRefRenderFunction<Props, Ref> & {
-    with<Field extends string, Type>(stage: {
+import { ForwardRefRenderFunction, FunctionComponent, PropsWithChildren } from 'react';
+import { ModularComponentStages, ModularContext } from '@modular-component/stages';
+import { AppendStage, GetArgsFor, GetConstraintFor } from './extend';
+type FunctionComponentOrRefRenderFunction<Props, Ref> = [Ref] extends [never] ? FunctionComponent<PropsWithChildren<Props>> : ForwardRefRenderFunction<Ref, PropsWithChildren<Props>>;
+export type { ModularContext } from '@modular-component/stages';
+type MapToForce<Stages> = {
+    [key in keyof Stages as key extends `with${infer K}` ? `force${K}` : never]: Stages[key];
+};
+type MapToStage<Stages> = Pick<Stages, {
+    [key in keyof Stages]: key extends `with${string}` ? key : never;
+}[keyof Stages]>;
+type MapToRaw<Stages> = {
+    [key in keyof Stages as key extends `with${infer K}` ? Uncapitalize<K> : never]: Stages[key];
+};
+type Force<Context extends ModularContext> = Omit<Context, 'constraints'> & {
+    constraints: {};
+    _constraints: Context['constraints'];
+};
+export type ModularComponent<Context extends ModularContext> = FunctionComponentOrRefRenderFunction<Context['props'], Context['ref']> & MapToStage<ModularComponentStages<Context>> & MapToForce<ModularComponentStages<Force<Context>>> & {
+    with<Field extends string, Type extends GetConstraintFor<Context, Field>>(stage: (context?: Context) => {
         field: Field;
-        useStage: (args: Args, ref: React.ForwardedRef<Ref>) => Field extends keyof Args ? Args[Field] : Type;
-    }): ModularComponent<Props, Ref, {
-        [key in keyof Args | Field]: key extends 'render' ? ReturnType<FunctionComponent> : key extends Field ? Type : key extends keyof Args ? Args[key] : never;
-    }>;
-    force<Field extends string, Type>(stage: {
+        provide: (args: GetArgsFor<Context, Field>) => Type;
+    }): ModularComponent<AppendStage<Context, Field, Type>>;
+    force<Field extends string, Type>(stage: (context?: Force<Context>) => {
         field: Field;
-        useStage: (args: Args, ref: React.ForwardedRef<Ref>) => Field extends 'render' ? Args['render'] : Type;
-    }): ModularComponent<Props, Ref, {
-        [key in keyof Args | Field]: key extends 'render' ? ReturnType<FunctionComponent> : key extends Field ? Type : key extends keyof Args ? Args[key] : never;
-    }>;
-    use<Field extends keyof Args>(key: Field): {} extends Props ? () => Args[Field] : (props: PropsWithChildren<Props>) => Args[Field];
-    use(): {} extends Props ? () => Args : (props: PropsWithChildren<Props>) => Args;
-    stage<Field extends keyof Args>(key: Field): (args: Partial<Args>) => Args[Field];
-    withDisplayName(displayName: string): ModularComponent<Props, Ref, Args>;
+        provide: (args: GetArgsFor<Context, Field>) => Type;
+    }): ModularComponent<AppendStage<Context, Field, Type>>;
+    use<Field extends keyof Context['arguments']>(key: Field): {} extends Context['arguments']['props'] ? () => Context['arguments'][Field] : (props: PropsWithChildren<Context['arguments']['props']>) => Context['arguments'][Field];
+    use(): {} extends Context['props'] ? () => Context['arguments'] : (props: PropsWithChildren<Context['props']>) => Context['arguments'];
+    stage<Field extends keyof Context['arguments'] & string>(key: Field): (args: Partial<GetArgsFor<Context, Field>>) => Context['arguments'][Field];
+    withDisplayName(displayName: string): ModularComponent<Context>;
 };
-export declare function ModularComponent<Props extends {} = {}, Ref = never>(displayName?: string): ModularComponent<Props, Ref, {
+export declare function ModularComponent<Props extends {} = {}, Ref = never>(displayName?: string): ModularComponent<{
     props: Props;
-    render: ReturnType<FunctionComponent>;
+    ref: Ref;
+    stages: {};
+    arguments: {
+        props: Props;
+        ref: Ref;
+        render: ReturnType<FunctionComponent>;
+    };
+    constraints: {
+        props: Props;
+        ref: Ref;
+        render: ReturnType<FunctionComponent>;
+    };
 }>;
-export declare function render<Args extends {}, Ref>(render: (args: Args, ref: React.ForwardedRef<Ref>) => React.ReactElement<any, any> | null): ModularStage<'render', (args: Args, ref: React.ForwardedRef<Ref>) => React.ReactElement<any, any> | null>;
+export declare namespace ModularComponent {
+    var register: (functions: Partial<Record<keyof MapToRaw<ModularComponentStages<any>>, (...args: any[]) => (ctx?: ModularContext) => {
+        field: string;
+        provide: (args: any) => any;
+    }>>) => void;
+}
+export * from './render';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,12 +1,11 @@
+let customFunctions = {};
 function InternalFactory(stages, displayName) {
     const UseComponent = function (props, ref) {
-        if (!stages.some((stage) => stage.field === 'render')) {
-            stages = [...stages, render(() => null)];
-        }
         return UseComponent.use('render')(props, ref);
     };
     UseComponent.displayName = displayName;
-    UseComponent.with = (stage) => {
+    UseComponent.with = (_stage) => {
+        const stage = _stage();
         const index = stages.findIndex((s) => s.field === stage.field);
         if (index !== -1) {
             const next = [...stages];
@@ -17,29 +16,30 @@ function InternalFactory(stages, displayName) {
     };
     UseComponent.force = UseComponent.with;
     UseComponent.use = (field) => {
-        if (!field) {
-            return (props = {}, ref = null) => {
-                const args = { props };
-                for (let stage of stages) {
-                    args[stage.field] = stage.useStage(args, ref);
-                }
-                return args;
-            };
-        }
-        const index = stages.findIndex((stage) => stage.field === field);
+        const index = field
+            ? stages.findIndex((stage) => stage.field === field)
+            : -1;
         const argStages = index === -1 ? stages.slice(0) : stages.slice(0, index + 1);
         return (props = {}, ref = null) => {
-            const args = { props };
+            const args = { props, ref };
+            if (field === 'render') {
+                args.render = null;
+            }
             for (let stage of argStages) {
-                args[stage.field] = stage.useStage(args, ref);
+                args[stage.field] = stage.provide(args);
             }
-            return args[field];
+            return field ? args[field] : args;
         };
     };
     UseComponent.stage = (field) => {
         const stage = stages.find((stage) => stage.field === field);
-        return stage?.useStage ?? (() => null);
+        return stage?.provide ?? (() => null);
     };
+    Object.entries(customFunctions).forEach(([name, fn]) => {
+        ;
+        UseComponent[`with${name[0].toUpperCase()}${name.slice(1)}`] = (...args) => UseComponent.with(fn(...args));
+        UseComponent[`force${name[0].toUpperCase()}${name.slice(1)}`] = (...args) => UseComponent.with(fn(...args));
+    });
     UseComponent.withDisplayName = (displayName) => {
         return InternalFactory([...stages], displayName);
     };
@@ -48,10 +48,8 @@ function InternalFactory(stages, displayName) {
 export function ModularComponent(displayName) {
     return InternalFactory([], displayName);
 }
-export function render(render) {
-    return {
-        field: 'render',
-        useStage: render,
-    };
-}
+ModularComponent.register = (functions) => {
+    customFunctions = { ...customFunctions, ...functions };
+};
+export * from './render';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAyEA,SAAS,eAAe,CAKtB,MAGG,EACH,WAA+B;IAE/B,MAAM,YAAY,GAAG,UAAU,KAAY,EAAE,GAA4B;QACvE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,EAAE;YACrD,MAAM,GAAG,CAAC,GAAG,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;SACzC;QACD,OAAO,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAC/C,CAAC,CAAA;IACD,YAAY,CAAC,WAAW,GAAG,WAAW,CAAA;IAEtC,YAAY,CAAC,IAAI,GAAG,CAAC,KAAgD,EAAE,EAAE;QACvE,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,CAAA;QAE9D,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,MAAM,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,CAAA;YACxB,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,CAAA;YACnB,OAAO,eAAe,CAAmB,IAAI,EAAE,WAAW,CAAC,CAAA;SAC5D;QAED,OAAO,eAAe,CAAmB,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,WAAW,CAAC,CAAA;IAC3E,CAAC,CAAA;IACD,YAAY,CAAC,KAAK,GAAG,YAAY,CAAC,IAAI,CAAA;IAEtC,YAAY,CAAC,GAAG,GAAG,CAAC,KAAiB,EAAE,EAAE;QACvC,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,CACL,QAAe,EAAW,EAC1B,MAA+B,IAAI,EACnC,EAAE;gBACF,MAAM,IAAI,GAAwB,EAAE,KAAK,EAAE,CAAA;gBAC3C,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;oBACxB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,GAAG,CAAC,CAAA;iBACtD;gBACD,OAAO,IAAI,CAAA;YACb,CAAC,CAAA;SACF;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;QAChE,MAAM,SAAS,GACb,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;QAE7D,OAAO,CACL,QAAe,EAAW,EAC1B,MAA+B,IAAI,EACnC,EAAE;YACF,MAAM,IAAI,GAAwB,EAAE,KAAK,EAAE,CAAA;YAC3C,KAAK,IAAI,KAAK,IAAI,SAAS,EAAE;gBAC3B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,GAAG,CAAC,CAAA;aACtD;YACD,OAAO,IAAI,CAAC,KAAe,CAAC,CAAA;QAC9B,CAAC,CAAA;IACH,CAAC,CAAA;IAED,YAAY,CAAC,KAAK,GAAG,CAAC,KAAiB,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;QAC3D,OAAO,KAAK,EAAE,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;IACxC,CAAC,CAAA;IAED,YAAY,CAAC,eAAe,GAAG,CAAC,WAAmB,EAAE,EAAE;QACrD,OAAO,eAAe,CAAmB,CAAC,GAAG,MAAM,CAAC,EAAE,WAAW,CAAC,CAAA;IACpE,CAAC,CAAA;IAED,OAAO,YAA6D,CAAA;AACtE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,WAAoB;IAMpB,OAAO,eAAe,CAIpB,EAAE,EAAE,WAAW,CAAC,CAAA;AACpB,CAAC;AAED,MAAM,UAAU,MAAM,CACpB,MAGwC;IAQxC,OAAO;QACL,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE,MAAM;KACjB,CAAA;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/render.d.ts

@@ -0,0 +1,8 @@
+import { FunctionComponent } from 'react';
+import { ModularContext, GetValueGetterFor, StageParams, StageReturn } from './extend';
+export declare function render<Context extends ModularContext>(useRender: GetValueGetterFor<Context, 'render', ReturnType<FunctionComponent>>): (_?: Context | undefined) => {
+    field: "render";
+    provide: (args: import("./extend").GetArgsFor<Context, "render">) => import("react").ReactElement<any, any> | null;
+};
+export type WithRender<Context extends ModularContext> = (...args: StageParams<typeof render<Context>>) => StageReturn<typeof render<Context>>;
+//# sourceMappingURL=render.d.ts.map

package/dist/render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAGL,cAAc,EACd,iBAAiB,EACjB,WAAW,EACX,WAAW,EACZ,MAAM,UAAU,CAAA;AAEjB,wBAAgB,MAAM,CAAC,OAAO,SAAS,cAAc,EACnD,SAAS,EAAE,iBAAiB,CAC1B,OAAO,EACP,QAAQ,EACR,UAAU,CAAC,iBAAiB,CAAC,CAC9B;;;EAGF;AAED,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,cAAc,IAAI,CACvD,GAAG,IAAI,EAAE,WAAW,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,KACzC,WAAW,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA"}

package/dist/render.js

@@ -0,0 +1,5 @@
+import { addTo, wrap, } from './extend';
+export function render(useRender) {
+    return addTo().on('render').provide(wrap(useRender));
+}
+//# sourceMappingURL=render.js.map

package/dist/render.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EACL,IAAI,GAKL,MAAM,UAAU,CAAA;AAEjB,MAAM,UAAU,MAAM,CACpB,SAIC;IAED,OAAO,KAAK,EAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA;AAC/D,CAAC"}

package/extend.d.ts

@@ -0,0 +1 @@
+export * from './dist/extend'

package/extend.js

@@ -0,0 +1 @@
+export * from './dist/extend.js'

package/package.json

@@ -7,7 +7,7 @@
     "Factory",
     "Test"
   ],
-  "version": "0.2.3",
+  "version": "0.3.0",
   "type": "module",
   "license": "MIT",
   "publishConfig": {
@@ -16,19 +16,26 @@
   "files": [
     "src",
     "dist",
+    "extend.js",
+    "extend.d.ts",
+    "register.js",
+    "register.d.ts",
     "CHANGELOG.md"
   ],
   "scripts": {
     "build": "yarn build:self",
-    "build:self": "tsc",
+    "build:self": "tsc && tsc --noEmit extend register",
     "license": "cp ../../LICENSE ./LICENSE"
   },
+  "dependencies": {
+    "@modular-component/stages": "0.3.0"
+  },
   "peerDependencies": {
-    "react": ">=17 <19"
+    "react": ">=17"
   },
   "devDependencies": {
     "@types/react": "^18.0.17",
-    "typescript": "^5.2.2"
+    "typescript": "^5.9.3"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts"

package/register.d.ts

@@ -0,0 +1,7 @@
+import { WithRender, ModularContext } from '@modular-component/core'
+
+declare module '@modular-component/stages' {
+  export interface ModularComponentStages<Context extends ModularContext> {
+    withRender: WithRender<Context>
+  }
+}

package/register.js

@@ -0,0 +1,3 @@
+import { ModularComponent, render } from '@modular-component/core'
+
+ModularComponent.register({ render })

package/src/extend.ts

@@ -0,0 +1,111 @@
+import type { FunctionComponent } from 'react'
+import type { ModularContext } from '@modular-component/stages'
+import type { ModularComponent } from './index'
+
+export type { ModularContext } from '@modular-component/stages'
+
+export type GetArgsFor<
+  Context extends ModularContext,
+  Field extends string,
+> = Field extends keyof Context['stages']
+  ? Pick<Context['arguments'], Context['stages'][Field]>
+  : Context['arguments']
+
+export type GetConstraintFor<
+  Context extends ModularContext,
+  Field extends string,
+  Default = any,
+> = Field extends 'render'
+  ? ReturnType<FunctionComponent>
+  : Field extends keyof Context['constraints']
+  ? Context['constraints'][Field]
+  : Default
+
+export type GetValueGetterFor<
+  Context extends ModularContext,
+  Field extends string,
+  Type,
+> = Type | ((args: GetArgsFor<Context, Field>) => Type)
+
+type AppendArguments<Arguments, Field extends string, Type> = {
+  [key in Exclude<keyof Arguments, Field>]: Arguments[key]
+} & {
+  [key in Field]: Type
+} extends infer U
+  ? { [key in keyof U]: U[key] }
+  : never
+
+type AppendConstraints<Constraints, Backup, Field extends string, Type> = {
+  [key in Exclude<keyof Constraints, Field>]: Constraints[key]
+} & {
+  [key in Exclude<keyof Backup, Field>]: Backup[key]
+} & {
+  [key in Field]: Type
+} extends infer U
+  ? { [key in keyof U]: U[key] }
+  : never
+
+type AppendStages<Stages, Arguments, Field extends string, Type> = {
+  [key in Exclude<keyof Stages, Field>]: Stages[key]
+} & {
+  [key in Field]: key extends keyof Stages ? Stages[key] : keyof Arguments
+} extends infer U
+  ? { [key in keyof U]: U[key] }
+  : never
+
+export type AppendStage<
+  Context extends ModularContext,
+  Field extends string,
+  Type,
+> = Pick<Context, 'props' | 'ref'> & {
+  arguments: AppendArguments<Context['arguments'], Field, Type>
+  constraints: AppendConstraints<
+    Context['constraints'],
+    Context['_constraints'],
+    Field,
+    Type
+  >
+  stages: AppendStages<Context['stages'], Context['arguments'], Field, Type>
+} extends infer U
+  ? { [key in keyof U]: U[key] }
+  : never
+
+export type StageParams<Fn extends (...args: any[]) => any> = Parameters<Fn>
+export type StageReturn<
+  Fn extends (
+    ...args: any[]
+  ) => (ctx?: any) => { field: string; provide: (args: any) => any },
+> = ModularComponent<
+  AppendStage<
+    NonNullable<Parameters<ReturnType<Fn>>[0]>,
+    ReturnType<ReturnType<Fn>>['field'],
+    ReturnType<ReturnType<ReturnType<Fn>>['provide']>
+  >
+> extends ModularComponent<infer U>
+  ? ModularComponent<U>
+  : never
+
+export function addTo<Context extends ModularContext>() {
+  return {
+    on<Field extends string>(field: Field) {
+      return {
+        provide<Stage extends (args: GetArgsFor<Context, Field>) => any>(
+          stage: Stage,
+        ) {
+          return (_?: Context) => ({
+            field,
+            provide: stage,
+          })
+        },
+      }
+    },
+  }
+}
+
+export function wrap<Args, Type>(useFn: Type | ((args: Args) => Type)) {
+  return (args: Args) => {
+    return typeof useFn === 'function'
+      ? (useFn as (args: Args) => Type)(args)
+      : useFn
+  }
+}

package/src/index.ts

@@ -1,178 +1,184 @@
-import React, { ForwardRefRenderFunction, FunctionComponent, PropsWithChildren } from 'react'
-
-export interface ModularStage<
-  Field extends string,
-  Stage extends (args: any, ref?: any) => any,
-> {
-  field: Field
-  useStage: Stage
-}
+import {
+  ForwardRefRenderFunction,
+  FunctionComponent,
+  PropsWithChildren,
+} from 'react'
+import {
+  ModularComponentStages,
+  ModularContext,
+} from '@modular-component/stages'
+import { AppendStage, GetArgsFor, GetConstraintFor } from './extend'
 
-export type FunctionComponentOrRefRenderFunction<Props, Ref> = [Ref] extends [
-  never,
-]
+type FunctionComponentOrRefRenderFunction<Props, Ref> = [Ref] extends [never]
   ? FunctionComponent<PropsWithChildren<Props>>
-  : ForwardRefRenderFunction<Ref, Props>
-
-export type ModularComponent<
-  Props extends {},
-  Ref,
-  Args extends { render: ReturnType<FunctionComponent> },
-> = FunctionComponentOrRefRenderFunction<Props, Ref> & {
-  with<Field extends string, Type>(stage: {
-    field: Field
-    useStage: (
-      args: Args,
-      ref: React.ForwardedRef<Ref>,
-    ) => Field extends keyof Args ? Args[Field] : Type
-  }): ModularComponent<
-    Props,
-    Ref,
-    {
-      [key in keyof Args | Field]: key extends 'render'
-        ? ReturnType<FunctionComponent>
-        : key extends Field
-        ? Type
-        : key extends keyof Args
-        ? Args[key]
-        : never
-    }
-  >
-  force<Field extends string, Type>(stage: {
-    field: Field
-    useStage: (
-      args: Args,
-      ref: React.ForwardedRef<Ref>,
-    ) => Field extends 'render' ? Args['render'] : Type
-  }): ModularComponent<
-    Props,
-    Ref,
-    {
-      [key in keyof Args | Field]: key extends 'render'
-        ? ReturnType<FunctionComponent>
-        : key extends Field
-        ? Type
-        : key extends keyof Args
-        ? Args[key]
-        : never
-    }
-  >
-  use<Field extends keyof Args>(
-    key: Field,
-  ): {} extends Props
-    ? () => Args[Field]
-    : (props: PropsWithChildren<Props>) => Args[Field]
-  use(): {} extends Props
-    ? () => Args
-    : (props: PropsWithChildren<Props>) => Args
-  stage<Field extends keyof Args>(
-    key: Field,
-  ): (args: Partial<Args>) => Args[Field]
-  withDisplayName(displayName: string): ModularComponent<Props, Ref, Args>
+  : ForwardRefRenderFunction<Ref, PropsWithChildren<Props>>
+
+export type { ModularContext } from '@modular-component/stages'
+
+type MapToForce<Stages> = {
+  [key in keyof Stages as key extends `with${infer K}`
+    ? `force${K}`
+    : never]: Stages[key]
+}
+
+type MapToStage<Stages> = Pick<
+  Stages,
+  {
+    [key in keyof Stages]: key extends `with${string}` ? key : never
+  }[keyof Stages]
+>
+
+type MapToRaw<Stages> = {
+  [key in keyof Stages as key extends `with${infer K}`
+    ? Uncapitalize<K>
+    : never]: Stages[key]
+}
+
+type Force<Context extends ModularContext> = Omit<Context, 'constraints'> & {
+  constraints: {}
+  _constraints: Context['constraints']
 }
 
-function InternalFactory<
-  Props extends {},
-  Ref,
-  Args extends { render: ReturnType<FunctionComponent> },
->(
-  stages: ModularStage<
-    string,
-    (args: Args, ref: React.ForwardedRef<Ref>) => any
-  >[],
-  displayName: string | undefined
-): ModularComponent<Props, Ref, Args> {
-  const UseComponent = function (props: Props, ref: React.ForwardedRef<Ref>) {
-    if (!stages.some((stage) => stage.field === 'render')) {
-      stages = [...stages, render(() => null)]
+export type ModularComponent<Context extends ModularContext> =
+  FunctionComponentOrRefRenderFunction<Context['props'], Context['ref']> &
+    MapToStage<ModularComponentStages<Context>> &
+    MapToForce<ModularComponentStages<Force<Context>>> & {
+      with<Field extends string, Type extends GetConstraintFor<Context, Field>>(
+        stage: (context?: Context) => {
+          field: Field
+          provide: (args: GetArgsFor<Context, Field>) => Type
+        },
+      ): ModularComponent<AppendStage<Context, Field, Type>>
+      force<Field extends string, Type>(
+        stage: (context?: Force<Context>) => {
+          field: Field
+          provide: (args: GetArgsFor<Context, Field>) => Type
+        },
+      ): ModularComponent<AppendStage<Context, Field, Type>>
+
+      use<Field extends keyof Context['arguments']>(
+        key: Field,
+      ): {} extends Context['arguments']['props']
+        ? () => Context['arguments'][Field]
+        : (
+            props: PropsWithChildren<Context['arguments']['props']>,
+          ) => Context['arguments'][Field]
+      use(): {} extends Context['props']
+        ? () => Context['arguments']
+        : (props: PropsWithChildren<Context['props']>) => Context['arguments']
+      stage<Field extends keyof Context['arguments'] & string>(
+        key: Field,
+      ): (
+        args: Partial<GetArgsFor<Context, Field>>,
+      ) => Context['arguments'][Field]
+      withDisplayName(displayName: string): ModularComponent<Context>
     }
+
+let customFunctions: Record<
+  string,
+  (...args: any[]) => (ctx?: ModularContext) => {
+    field: string
+    provide: (args: any) => any
+  }
+> = {}
+
+function InternalFactory<Context extends ModularContext>(
+  stages: { field: string; provide: (args: any) => any }[],
+  displayName: string | undefined,
+): ModularComponent<Context> {
+  const UseComponent = function (props: Context['props'], ref: Context['ref']) {
     return UseComponent.use('render')(props, ref)
   }
   UseComponent.displayName = displayName
 
-  UseComponent.with = (stage: ModularStage<string, (args: Args) => any>) => {
+  UseComponent.with = (
+    _stage: (ctx?: Context) => { field: string; provide: (args: any) => any },
+  ) => {
+    const stage = _stage()
     const index = stages.findIndex((s) => s.field === stage.field)
 
     if (index !== -1) {
       const next = [...stages]
       next[index] = stage
-      return InternalFactory<Props, Ref, Args>(next, displayName)
+      return InternalFactory<Context>(next, displayName)
     }
 
-    return InternalFactory<Props, Ref, Args>([...stages, stage], displayName)
+    return InternalFactory<Context>([...stages, stage], displayName)
   }
   UseComponent.force = UseComponent.with
 
-  UseComponent.use = (field: keyof Args) => {
-    if (!field) {
-      return (
-        props: Props = {} as Props,
-        ref: React.ForwardedRef<Ref> = null,
-      ) => {
-        const args: Record<string, any> = { props }
-        for (let stage of stages) {
-          args[stage.field] = stage.useStage(args as Args, ref)
-        }
-        return args
-      }
-    }
-
-    const index = stages.findIndex((stage) => stage.field === field)
+  UseComponent.use = (field?: string) => {
+    const index = field
+      ? stages.findIndex((stage) => stage.field === field)
+      : -1
     const argStages =
       index === -1 ? stages.slice(0) : stages.slice(0, index + 1)
 
-    return (
-      props: Props = {} as Props,
-      ref: React.ForwardedRef<Ref> = null,
-    ) => {
-      const args: Record<string, any> = { props }
+    return (props = {}, ref = null) => {
+      const args: Record<string, any> = { props, ref }
+      if (field === 'render') {
+        args.render = null
+      }
       for (let stage of argStages) {
-        args[stage.field] = stage.useStage(args as Args, ref)
+        args[stage.field] = stage.provide(args)
       }
-      return args[field as string]
+      return field ? args[field] : args
     }
   }
 
-  UseComponent.stage = (field: keyof Args) => {
+  UseComponent.stage = (field: string) => {
     const stage = stages.find((stage) => stage.field === field)
-    return stage?.useStage ?? (() => null)
+    return stage?.provide ?? (() => null)
   }
 
+  Object.entries(customFunctions).forEach(([name, fn]) => {
+    ;(UseComponent as any)[`with${name[0].toUpperCase()}${name.slice(1)}`] = (
+      ...args: any
+    ) => UseComponent.with(fn(...args))
+    ;(UseComponent as any)[
+      `force${name[0].toUpperCase()}${name.slice(1)}`
+    ] = (...args: any) => UseComponent.with(fn(...args))
+  })
+
   UseComponent.withDisplayName = (displayName: string) => {
-    return InternalFactory<Props, Ref, Args>([...stages], displayName)
+    return InternalFactory<Context>([...stages], displayName)
   }
 
-  return UseComponent as unknown as ModularComponent<Props, Ref, Args>
+  return UseComponent as unknown as ModularComponent<Context>
 }
 
 export function ModularComponent<Props extends {} = {}, Ref = never>(
   displayName?: string,
-): ModularComponent<
-  Props,
-  Ref,
-  { props: Props; render: ReturnType<FunctionComponent> }
-> {
-  return InternalFactory<
-    Props,
-    Ref,
-    { props: Props; render: ReturnType<FunctionComponent> }
-  >([], displayName)
+) {
+  return InternalFactory<{
+    props: Props
+    ref: Ref
+    stages: {}
+    arguments: {
+      props: Props
+      ref: Ref
+      render: ReturnType<FunctionComponent>
+    }
+    constraints: {
+      props: Props
+      ref: Ref
+      render: ReturnType<FunctionComponent>
+    }
+  }>([], displayName)
 }
 
-export function render<Args extends {}, Ref>(
-  render: (
-    args: Args,
-    ref: React.ForwardedRef<Ref>,
-  ) => React.ReactElement<any, any> | null,
-): ModularStage<
-  'render',
-  (
-    args: Args,
-    ref: React.ForwardedRef<Ref>,
-  ) => React.ReactElement<any, any> | null
-> {
-  return {
-    field: 'render',
-    useStage: render,
-  }
+ModularComponent.register = (
+  functions: Partial<
+    Record<
+      keyof MapToRaw<ModularComponentStages<any>>,
+      (...args: any[]) => (ctx?: ModularContext) => {
+        field: string
+        provide: (args: any) => any
+      }
+    >
+  >,
+) => {
+  customFunctions = { ...customFunctions, ...functions }
 }
+
+export * from './render'

package/src/render.ts

@@ -0,0 +1,23 @@
+import { FunctionComponent } from 'react'
+import {
+  addTo,
+  wrap,
+  ModularContext,
+  GetValueGetterFor,
+  StageParams,
+  StageReturn,
+} from './extend'
+
+export function render<Context extends ModularContext>(
+  useRender: GetValueGetterFor<
+    Context,
+    'render',
+    ReturnType<FunctionComponent>
+  >,
+) {
+  return addTo<Context>().on('render').provide(wrap(useRender))
+}
+
+export type WithRender<Context extends ModularContext> = (
+  ...args: StageParams<typeof render<Context>>
+) => StageReturn<typeof render<Context>>