@expressive/react 0.55.0 → 0.57.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,7 +9,15 @@ function Provider(props) {
9
9
  const ambient = useContext(Lookup);
10
10
  const context = useMemo(() => ambient.push(), [ambient]);
11
11
  useEffect(() => () => context.pop(), [ambient]);
12
- context.include(props.for, props.set);
12
+ context.include(props.for, (model) => {
13
+ if ("set" in props)
14
+ throw new Error(`The \`set\` prop is deprecated. Use \`forEach\` or <${model.constructor} {...props} /> instead.`);
15
+ if (props.forEach) {
16
+ const cleanup = props.forEach(model);
17
+ if (cleanup)
18
+ model.set(null, cleanup);
19
+ }
20
+ });
13
21
  return createElement(Lookup.Provider, {
14
22
  key: context.id,
15
23
  value: context
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/context.ts"],"sourcesContent":["import Model, { Context } from '@expressive/mvc';\nimport { ReactNode, createContext, createElement, useContext, useEffect, useMemo } from 'react';\n\nconst Lookup = createContext(new Context());\n\ndeclare namespace Consumer {\n type Props<T extends Model> = {\n /** Type of controller to fetch from context. */\n for: Model.Type<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `Model.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => ReactNode | void;\n }\n}\n\nfunction Consumer<T extends Model>(props: Consumer.Props<T>){\n return props.for.get(i => props.children(i));\n}\n\ndeclare namespace Provider {\n interface Props<T extends Model> {\n for: Context.Accept<T>;\n set?: Model.Assign<T>;\n children?: ReactNode;\n }\n}\n\nfunction Provider<T extends Model>(props: Provider.Props<T>){\n const ambient = useContext(Lookup);\n const context = useMemo(() => ambient.push(), [ambient]);\n\n useEffect(() => () => context.pop(), [ambient]);\n \n context.include(props.for, props.set);\n\n return createElement(Lookup.Provider, {\n key: context.id,\n value: context\n }, props.children);\n}\n\nexport { Consumer, Provider, Lookup as Context }"],"mappings":";AAAA,SAAgB,eAAe;AAC/B,SAAoB,eAAe,eAAe,YAAY,WAAW,eAAe;AAExF,IAAM,SAAS,cAAc,IAAI,QAAQ,CAAC;AAkB1C,SAAS,SAA0B,OAAyB;AAC1D,SAAO,MAAM,IAAI,IAAI,OAAK,MAAM,SAAS,CAAC,CAAC;AAC7C;AAUA,SAAS,SAA0B,OAAyB;AAC1D,QAAM,UAAU,WAAW,MAAM;AACjC,QAAM,UAAU,QAAQ,MAAM,QAAQ,KAAK,GAAG,CAAC,OAAO,CAAC;AAEvD,YAAU,MAAM,MAAM,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC;AAE9C,UAAQ,QAAQ,MAAM,KAAK,MAAM,GAAG;AAEpC,SAAO,cAAc,OAAO,UAAU;AAAA,IACpC,KAAK,QAAQ;AAAA,IACb,OAAO;AAAA,EACT,GAAG,MAAM,QAAQ;AACnB;","names":[]}
1
+ {"version":3,"sources":["../../src/context.ts"],"sourcesContent":["import Model, { Context } from '@expressive/mvc';\nimport { ReactNode, createContext, createElement, useContext, useEffect, useMemo } from 'react';\n\nconst Lookup = createContext(new Context());\n\ndeclare namespace Consumer {\n type Props<T extends Model> = {\n /** Type of controller to fetch from context. */\n for: Model.Type<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `Model.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => ReactNode | void;\n }\n}\n\nfunction Consumer<T extends Model>(props: Consumer.Props<T>){\n return props.for.get(i => props.children(i));\n}\n\ndeclare namespace Provider {\n interface Props<T extends Model> {\n for: Context.Accept<T>;\n forEach?: Context.Expect<T>;\n children?: ReactNode;\n }\n}\n\nfunction Provider<T extends Model>(props: Provider.Props<T>){\n const ambient = useContext(Lookup);\n const context = useMemo(() => ambient.push(), [ambient]);\n\n useEffect(() => () => context.pop(), [ambient]);\n \n context.include(props.for, (model) => {\n // TODO: remove next minor release\n if(\"set\" in props)\n throw new Error(`The \\`set\\` prop is deprecated. Use \\`forEach\\` or <${model.constructor} {...props} /> instead.`);\n\n if(props.forEach){\n const cleanup = props.forEach(model);\n\n if(cleanup)\n model.set(null, cleanup);\n }\n });\n\n return createElement(Lookup.Provider, {\n key: context.id,\n value: context\n }, props.children);\n}\n\nexport { Consumer, Provider, Lookup as Context }"],"mappings":";AAAA,SAAgB,eAAe;AAC/B,SAAoB,eAAe,eAAe,YAAY,WAAW,eAAe;AAExF,IAAM,SAAS,cAAc,IAAI,QAAQ,CAAC;AAkB1C,SAAS,SAA0B,OAAyB;AAC1D,SAAO,MAAM,IAAI,IAAI,OAAK,MAAM,SAAS,CAAC,CAAC;AAC7C;AAUA,SAAS,SAA0B,OAAyB;AAC1D,QAAM,UAAU,WAAW,MAAM;AACjC,QAAM,UAAU,QAAQ,MAAM,QAAQ,KAAK,GAAG,CAAC,OAAO,CAAC;AAEvD,YAAU,MAAM,MAAM,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC;AAE9C,UAAQ,QAAQ,MAAM,KAAK,CAAC,UAAU;AAEpC,QAAG,SAAS;AACV,YAAM,IAAI,MAAM,uDAAuD,MAAM,WAAW,yBAAyB;AAEnH,QAAG,MAAM,SAAQ;AACf,YAAM,UAAU,MAAM,QAAQ,KAAK;AAEnC,UAAG;AACD,cAAM,IAAI,MAAM,OAAO;AAAA,IAC3B;AAAA,EACF,CAAC;AAED,SAAO,cAAc,OAAO,UAAU;AAAA,IACpC,KAAK,QAAQ;AAAA,IACb,OAAO;AAAA,EACT,GAAG,MAAM,QAAQ;AACnB;","names":[]}
@@ -1,8 +1,8 @@
1
1
  // src/jsx-dev-runtime.ts
2
2
  import * as Runtime from "react/jsx-dev-runtime";
3
- import { createElement } from "./jsx-runtime";
3
+ import { create } from "./jsx-runtime";
4
4
  import { Fragment } from "react";
5
- var jsxDEV2 = createElement.bind(Runtime.jsxDEV);
5
+ var jsxDEV2 = create.bind(Runtime.jsxDEV);
6
6
  export {
7
7
  Fragment,
8
8
  jsxDEV2 as jsxDEV
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/jsx-dev-runtime.ts"],"sourcesContent":["import * as Runtime from 'react/jsx-dev-runtime';\nimport { createElement } from './jsx-runtime';\n\nexport const jsxDEV = createElement.bind(Runtime.jsxDEV);\n\nexport { type JSX } from './jsx-runtime';\nexport { Fragment } from \"react\";"],"mappings":";AAAA,YAAY,aAAa;AACzB,SAAS,qBAAqB;AAK9B,SAAS,gBAAgB;AAHlB,IAAMA,UAAS,cAAc,KAAa,cAAM;","names":["jsxDEV"]}
1
+ {"version":3,"sources":["../../src/jsx-dev-runtime.ts"],"sourcesContent":["import * as Runtime from 'react/jsx-dev-runtime';\nimport { create } from './jsx-runtime';\n\nexport const jsxDEV = create.bind(Runtime.jsxDEV);\n\nexport { type JSX } from './jsx-runtime';\nexport { Fragment } from \"react\";"],"mappings":";AAAA,YAAY,aAAa;AACzB,SAAS,cAAc;AAKvB,SAAS,gBAAgB;AAHlB,IAAMA,UAAS,OAAO,KAAa,cAAM;","names":["jsxDEV"]}
@@ -1,33 +1,53 @@
1
1
  // src/jsx-runtime.ts
2
2
  import { Model } from "@expressive/mvc";
3
- import * as React from "react";
4
- import * as Runtime from "react/jsx-runtime";
3
+ import { jsx, jsxs } from "react/jsx-runtime";
5
4
  import { Provider } from "./context";
6
5
  import { Fragment } from "react";
7
- function component(child, key) {
8
- if (typeof child == "function")
9
- return React.createElement(() => {
6
+ function Render(props) {
7
+ const { is, ...rest } = props;
8
+ return jsx(Provider, {
9
+ for: this,
10
+ forEach: is,
11
+ children: jsx(() => {
10
12
  const self = this.get();
11
- return child.call(self, self);
12
- }, { key });
13
- return child;
13
+ const { render } = self;
14
+ for (const key in rest)
15
+ if (key in self)
16
+ self[key] = rest[key];
17
+ if (render)
18
+ return jsx(() => {
19
+ const self2 = this.get();
20
+ return render.call(self2, props, self2);
21
+ }, {});
22
+ const { children } = self;
23
+ if (children)
24
+ return children;
25
+ const fn = props.children;
26
+ if (typeof fn != "function")
27
+ return fn;
28
+ return jsx(() => {
29
+ const self2 = this.get();
30
+ return fn.call(self2, self2);
31
+ }, {});
32
+ }, {})
33
+ });
14
34
  }
15
- function createElement2(type, props, key, ...args) {
35
+ var RENDER = /* @__PURE__ */ new WeakMap();
36
+ function create(type, props, key, ...args) {
16
37
  if (Model.is(type)) {
17
- const { children, ...rest } = props;
18
- return this(Provider, {
19
- for: type,
20
- set: rest,
21
- children: Array.isArray(children) ? children.map(component, type) : component.call(type, children, 0)
22
- }, key, ...args);
38
+ const bound = RENDER.get(type);
39
+ if (bound)
40
+ type = bound;
41
+ else
42
+ RENDER.set(type, type = Render.bind(type));
23
43
  }
24
44
  return this(type, props, key, ...args);
25
45
  }
26
- var jsx2 = createElement2.bind(Runtime.jsx);
27
- var jsxs2 = createElement2.bind(Runtime.jsxs);
46
+ var jsx2 = create.bind(jsx);
47
+ var jsxs2 = create.bind(jsxs);
28
48
  export {
29
49
  Fragment,
30
- createElement2 as createElement,
50
+ create,
31
51
  jsx2 as jsx,
32
52
  jsxs2 as jsxs
33
53
  };
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/jsx-runtime.ts"],"sourcesContent":["import { Model } from '@expressive/mvc';\nimport * as React from 'react';\nimport * as Runtime from 'react/jsx-runtime';\n\nimport { Provider } from './context';\n\ntype MaybeArray<T> = T | T[];\n\ndeclare module '@expressive/mvc' {\n namespace Model {\n type Render<T extends Model> = (this: T, self: T) => React.ReactNode | null;\n\n type Props<T extends Model> = Partial<Pick<T, Exclude<keyof T, keyof Model>>> & {\n children?: MaybeArray<React.ReactNode | Render<T>>;\n }\n }\n}\n\nexport declare namespace JSX {\n type ElementType = Model.Type | React.JSX.ElementType;\n\n type LibraryManagedAttributes<C, P> =\n // For normal class components, pull from props property explicitly because we dorked up ElementAttributesProperty.\n C extends new (...args: any[]) => { props: infer U } ? U :\n C extends Model.Type<infer U> ? Model.Props<U> :\n React.JSX.LibraryManagedAttributes<C, P>;\n\n interface Element extends React.JSX.Element {}\n interface ElementClass extends React.JSX.ElementClass {}\n // This is a hack to make TypeScript happy - React one insists on `props` property existing.\n // I await the \"Find Out\" phase in git issues.\n interface ElementAttributesProperty {}\n interface ElementChildrenAttribute extends React.JSX.ElementChildrenAttribute {}\n\n interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {}\n interface IntrinsicClassAttributes<T> extends React.JSX.IntrinsicClassAttributes<T> {}\n interface IntrinsicElements extends React.JSX.IntrinsicElements {}\n}\n\nfunction component<T extends Model>(\n this: Model.Type<T>,\n child: React.ReactNode | Model.Render<T>,\n key: number){\n\n if(typeof child == 'function')\n return React.createElement(() => {\n const self = this.get();\n return child.call(self, self);\n }, { key });\n\n return child;\n}\n\nexport function createElement(\n this: (\n type: React.ElementType,\n props: Record<string, any>,\n key?: React.Key,\n ...rest: any[]\n ) => React.ReactElement,\n type: React.ElementType,\n props: Record<string, any>,\n key?: React.Key,\n ...args: any[]){\n\n if(Model.is(type)){\n const { children, ...rest } = props;\n\n return this(Provider, {\n for: type,\n set: rest,\n children: Array.isArray(children) ?\n children.map(component, type) :\n component.call(type, children, 0)\n }, key, ...args);\n }\n\n return this(type, props, key, ...args);\n}\n\nexport const jsx = createElement.bind(Runtime.jsx);\nexport const jsxs = createElement.bind(Runtime.jsxs);\n\nexport { Fragment } from \"react\";"],"mappings":";AAAA,SAAS,aAAa;AACtB,YAAY,WAAW;AACvB,YAAY,aAAa;AAEzB,SAAS,gBAAgB;AA+EzB,SAAS,gBAAgB;AA5CzB,SAAS,UAEP,OACA,KAAY;AAEZ,MAAG,OAAO,SAAS;AACjB,WAAa,oBAAc,MAAM;AAC/B,YAAM,OAAO,KAAK,IAAI;AACtB,aAAO,MAAM,KAAK,MAAM,IAAI;AAAA,IAC9B,GAAG,EAAE,IAAI,CAAC;AAEZ,SAAO;AACT;AAEO,SAASA,eAOd,MACA,OACA,QACG,MAAY;AAEf,MAAG,MAAM,GAAG,IAAI,GAAE;AAChB,UAAM,EAAE,UAAU,GAAG,KAAK,IAAI;AAE9B,WAAO,KAAK,UAAU;AAAA,MACpB,KAAK;AAAA,MACL,KAAK;AAAA,MACL,UAAU,MAAM,QAAQ,QAAQ,IAC9B,SAAS,IAAI,WAAW,IAAI,IAC5B,UAAU,KAAK,MAAM,UAAU,CAAC;AAAA,IACpC,GAAG,KAAK,GAAG,IAAI;AAAA,EACjB;AAEA,SAAO,KAAK,MAAM,OAAO,KAAK,GAAG,IAAI;AACvC;AAEO,IAAMC,OAAMD,eAAc,KAAa,WAAG;AAC1C,IAAME,QAAOF,eAAc,KAAa,YAAI;","names":["createElement","jsx","jsxs"]}
1
+ {"version":3,"sources":["../../src/jsx-runtime.ts"],"sourcesContent":["import { Model } from '@expressive/mvc';\nimport { jsx, jsxs } from 'react/jsx-runtime';\n\nimport { Provider } from './context';\n\ndeclare module '@expressive/mvc' {\n namespace Model {\n type Render<T extends Model> = (this: T, self: T) => React.ReactNode;\n\n /** Model which is not incompatable as Component in React. */\n interface Compat extends Model {\n render?(props: Model.Assign<this>, self: this): React.ReactNode;\n children?: React.ReactNode;\n }\n\n type Props<T extends Model> = \n & T extends { render(props: infer P): any }\n ? Partial<Pick<T, Exclude<keyof T, keyof Model | \"render\">>> & P\n : Partial<Pick<T, Exclude<keyof T, keyof Model>>> & {\n children?: React.ReactNode | Render<T>;\n }\n & {\n /**\n * Callback for newly created instance. Only called once.\n * @returns Callback to run when instance is destroyed.\n */\n is?: (instance: T) => void | (() => void);\n };\n }\n}\n\nexport declare namespace JSX {\n type ElementType = Model.Type<Model.Compat> | React.JSX.ElementType;\n\n type LibraryManagedAttributes<C, P> =\n // For normal class components, pull from props property explicitly because we dorked up ElementAttributesProperty.\n C extends new (...args: any[]) => { props: infer U } ? U :\n C extends Model.Type<infer U> ? Model.Props<U> :\n React.JSX.LibraryManagedAttributes<C, P>;\n\n interface Element extends React.JSX.Element {}\n interface ElementClass extends React.JSX.ElementClass {}\n // This is a hack to make TypeScript happy - React one insists on `props` property existing.\n // I await the \"Find Out\" phase of this experiment in git issues.\n interface ElementAttributesProperty {}\n interface ElementChildrenAttribute extends React.JSX.ElementChildrenAttribute {}\n\n interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {}\n interface IntrinsicClassAttributes<T> extends React.JSX.IntrinsicClassAttributes<T> {}\n interface IntrinsicElements extends React.JSX.IntrinsicElements {}\n}\n\nfunction Render<T extends Model.Compat>(\n this: Model.Init<T>,\n props: Model.Assign<T>\n){\n const { is, ...rest } = props;\n\n return jsx(Provider, {\n for: this,\n forEach: is,\n children: jsx(() => {\n const self = this.get();\n const { render } = self;\n \n for(const key in rest)\n if(key in self)\n (self as any)[key] = rest[key];\n\n if(render)\n return jsx(() => {\n const self = this.get();\n return render.call(self, props, self);\n }, {});\n\n const { children } = self;\n\n if(children)\n return children;\n\n const fn = props.children as React.ReactNode | Model.Render<T>;\n\n if(typeof fn != \"function\")\n return fn;\n\n return jsx(() => {\n const self = this.get();\n return fn.call(self, self);\n }, {});\n }, {})\n });\n}\n\nconst RENDER = new WeakMap<typeof Model, React.FC>();\n\nexport function create(\n this: (\n type: React.ElementType,\n props: Record<string, any>,\n key?: React.Key,\n ...rest: any[]\n ) => React.ReactElement,\n type: React.ElementType,\n props: Record<string, any>,\n key?: React.Key,\n ...args: any[]){\n\n if(Model.is(type)){\n const bound = RENDER.get(type);\n\n if(bound)\n type = bound;\n else\n RENDER.set(type, type = Render.bind(type as Model.Init));\n }\n \n return this(type, props, key, ...args);\n}\n\nconst jsx2 = create.bind(jsx);\nconst jsxs2 = create.bind(jsxs);\n\nexport { Fragment } from \"react\";\nexport {\n jsx2 as jsx,\n jsxs2 as jsxs\n}"],"mappings":";AAAA,SAAS,aAAa;AACtB,SAAS,KAAK,YAAY;AAE1B,SAAS,gBAAgB;AAuHzB,SAAS,gBAAgB;AAtEzB,SAAS,OAEP,OACD;AACC,QAAM,EAAE,IAAI,GAAG,KAAK,IAAI;AAExB,SAAO,IAAI,UAAU;AAAA,IACnB,KAAK;AAAA,IACL,SAAS;AAAA,IACT,UAAU,IAAI,MAAM;AAClB,YAAM,OAAO,KAAK,IAAI;AACtB,YAAM,EAAE,OAAO,IAAI;AAEnB,iBAAU,OAAO;AACf,YAAG,OAAO;AACR,UAAC,KAAa,GAAG,IAAI,KAAK,GAAG;AAEjC,UAAG;AACD,eAAO,IAAI,MAAM;AACf,gBAAMA,QAAO,KAAK,IAAI;AACtB,iBAAO,OAAO,KAAKA,OAAM,OAAOA,KAAI;AAAA,QACtC,GAAG,CAAC,CAAC;AAEP,YAAM,EAAE,SAAS,IAAI;AAErB,UAAG;AACD,eAAO;AAET,YAAM,KAAK,MAAM;AAEjB,UAAG,OAAO,MAAM;AACd,eAAO;AAET,aAAO,IAAI,MAAM;AACf,cAAMA,QAAO,KAAK,IAAI;AACtB,eAAO,GAAG,KAAKA,OAAMA,KAAI;AAAA,MAC3B,GAAG,CAAC,CAAC;AAAA,IACP,GAAG,CAAC,CAAC;AAAA,EACP,CAAC;AACH;AAEA,IAAM,SAAS,oBAAI,QAAgC;AAE5C,SAAS,OAOd,MACA,OACA,QACG,MAAY;AAEf,MAAG,MAAM,GAAG,IAAI,GAAE;AAChB,UAAM,QAAQ,OAAO,IAAI,IAAI;AAE7B,QAAG;AACD,aAAO;AAAA;AAEP,aAAO,IAAI,MAAM,OAAO,OAAO,KAAK,IAAkB,CAAC;AAAA,EAC3D;AAEA,SAAO,KAAK,MAAM,OAAO,KAAK,GAAG,IAAI;AACvC;AAEA,IAAM,OAAO,OAAO,KAAK,GAAG;AAC5B,IAAM,QAAQ,OAAO,KAAK,IAAI;","names":["self"]}
package/dist/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  export { Pragma } from './adapter';
2
2
  import Model, { Context } from '@expressive/mvc';
3
3
  export { Model, Model as default, get, has, ref, set, use } from '@expressive/mvc';
4
- import * as React from 'react';
4
+ import * as react from 'react';
5
5
  import { ReactNode } from 'react';
6
6
 
7
7
  declare namespace Consumer {
@@ -18,14 +18,14 @@ declare namespace Consumer {
18
18
  children: (value: T) => ReactNode | void;
19
19
  };
20
20
  }
21
- declare function Consumer<T extends Model>(props: Consumer.Props<T>): string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<ReactNode> | React.ReactPortal | null;
21
+ declare function Consumer<T extends Model>(props: Consumer.Props<T>): string | number | boolean | react.ReactElement<any, string | react.JSXElementConstructor<any>> | Iterable<ReactNode> | react.ReactPortal | null;
22
22
  declare namespace Provider {
23
23
  interface Props<T extends Model> {
24
24
  for: Context.Accept<T>;
25
- set?: Model.Assign<T>;
25
+ forEach?: Context.Expect<T>;
26
26
  children?: ReactNode;
27
27
  }
28
28
  }
29
- declare function Provider<T extends Model>(props: Provider.Props<T>): React.FunctionComponentElement<React.ProviderProps<Context>>;
29
+ declare function Provider<T extends Model>(props: Provider.Props<T>): react.FunctionComponentElement<react.ProviderProps<Context>>;
30
30
 
31
31
  export { Consumer, Provider };
package/dist/index.js CHANGED
@@ -45,7 +45,15 @@ function Provider(props) {
45
45
  const ambient = (0, import_react.useContext)(Lookup);
46
46
  const context = (0, import_react.useMemo)(() => ambient.push(), [ambient]);
47
47
  (0, import_react.useEffect)(() => () => context.pop(), [ambient]);
48
- context.include(props.for, props.set);
48
+ context.include(props.for, (model) => {
49
+ if ("set" in props)
50
+ throw new Error(`The \`set\` prop is deprecated. Use \`forEach\` or <${model.constructor} {...props} /> instead.`);
51
+ if (props.forEach) {
52
+ const cleanup = props.forEach(model);
53
+ if (cleanup)
54
+ model.set(null, cleanup);
55
+ }
56
+ });
49
57
  return (0, import_react.createElement)(Lookup.Provider, {
50
58
  key: context.id,
51
59
  value: context
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts","../src/context.ts"],"sourcesContent":["import { useContext, useEffect, useState } from 'react';\n\nimport { Pragma } from './adapter';\nimport { Context } from './context';\n\nPragma.useContext = () => useContext(Context);\n\nPragma.useLifecycle = (callback) => useEffect(() => callback(), []);\n\nPragma.useFactory = (factory) => {\n const state = useState(() => factory(() => {\n state[1](x => x.bind(null) as any);\n }));\n\n return state[0];\n}\n\nexport {\n Model, Model as default,\n get, use, ref, set, has\n} from '@expressive/mvc';\n\nexport { Consumer, Provider } from './context';\nexport { type Pragma };\n","import Model, { Context } from '@expressive/mvc';\nimport { ReactNode, createContext, createElement, useContext, useEffect, useMemo } from 'react';\n\nconst Lookup = createContext(new Context());\n\ndeclare namespace Consumer {\n type Props<T extends Model> = {\n /** Type of controller to fetch from context. */\n for: Model.Type<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `Model.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => ReactNode | void;\n }\n}\n\nfunction Consumer<T extends Model>(props: Consumer.Props<T>){\n return props.for.get(i => props.children(i));\n}\n\ndeclare namespace Provider {\n interface Props<T extends Model> {\n for: Context.Accept<T>;\n set?: Model.Assign<T>;\n children?: ReactNode;\n }\n}\n\nfunction Provider<T extends Model>(props: Provider.Props<T>){\n const ambient = useContext(Lookup);\n const context = useMemo(() => ambient.push(), [ambient]);\n\n useEffect(() => () => context.pop(), [ambient]);\n \n context.include(props.for, props.set);\n\n return createElement(Lookup.Provider, {\n key: context.id,\n value: context\n }, props.children);\n}\n\nexport { Consumer, Provider, Lookup as Context }"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAAAA,gBAAgD;AAEhD,qBAAuB;;;ACFvB,iBAA+B;AAC/B,mBAAwF;AAExF,IAAM,aAAS,4BAAc,IAAI,mBAAQ,CAAC;AAkB1C,SAAS,SAA0B,OAAyB;AAC1D,SAAO,MAAM,IAAI,IAAI,OAAK,MAAM,SAAS,CAAC,CAAC;AAC7C;AAUA,SAAS,SAA0B,OAAyB;AAC1D,QAAM,cAAU,yBAAW,MAAM;AACjC,QAAM,cAAU,sBAAQ,MAAM,QAAQ,KAAK,GAAG,CAAC,OAAO,CAAC;AAEvD,8BAAU,MAAM,MAAM,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC;AAE9C,UAAQ,QAAQ,MAAM,KAAK,MAAM,GAAG;AAEpC,aAAO,4BAAc,OAAO,UAAU;AAAA,IACpC,KAAK,QAAQ;AAAA,IACb,OAAO;AAAA,EACT,GAAG,MAAM,QAAQ;AACnB;;;AD5BA,IAAAC,cAGO;AAfP,sBAAO,aAAa,UAAM,0BAAW,MAAO;AAE5C,sBAAO,eAAe,CAAC,iBAAa,yBAAU,MAAM,SAAS,GAAG,CAAC,CAAC;AAElE,sBAAO,aAAa,CAAC,YAAY;AAC/B,QAAM,YAAQ,wBAAS,MAAM,QAAQ,MAAM;AACzC,UAAM,CAAC,EAAE,OAAK,EAAE,KAAK,IAAI,CAAQ;AAAA,EACnC,CAAC,CAAC;AAEF,SAAO,MAAM,CAAC;AAChB;","names":["import_react","import_mvc"]}
1
+ {"version":3,"sources":["../src/index.ts","../src/context.ts"],"sourcesContent":["import { useContext, useEffect, useState } from 'react';\n\nimport { Pragma } from './adapter';\nimport { Context } from './context';\n\nPragma.useContext = () => useContext(Context);\n\nPragma.useLifecycle = (callback) => useEffect(() => callback(), []);\n\nPragma.useFactory = (factory) => {\n const state = useState(() => factory(() => {\n state[1](x => x.bind(null) as any);\n }));\n\n return state[0];\n}\n\nexport {\n Model, Model as default,\n get, use, ref, set, has\n} from '@expressive/mvc';\n\nexport { Consumer, Provider } from './context';\nexport { type Pragma };\n","import Model, { Context } from '@expressive/mvc';\nimport { ReactNode, createContext, createElement, useContext, useEffect, useMemo } from 'react';\n\nconst Lookup = createContext(new Context());\n\ndeclare namespace Consumer {\n type Props<T extends Model> = {\n /** Type of controller to fetch from context. */\n for: Model.Type<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `Model.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => ReactNode | void;\n }\n}\n\nfunction Consumer<T extends Model>(props: Consumer.Props<T>){\n return props.for.get(i => props.children(i));\n}\n\ndeclare namespace Provider {\n interface Props<T extends Model> {\n for: Context.Accept<T>;\n forEach?: Context.Expect<T>;\n children?: ReactNode;\n }\n}\n\nfunction Provider<T extends Model>(props: Provider.Props<T>){\n const ambient = useContext(Lookup);\n const context = useMemo(() => ambient.push(), [ambient]);\n\n useEffect(() => () => context.pop(), [ambient]);\n \n context.include(props.for, (model) => {\n // TODO: remove next minor release\n if(\"set\" in props)\n throw new Error(`The \\`set\\` prop is deprecated. Use \\`forEach\\` or <${model.constructor} {...props} /> instead.`);\n\n if(props.forEach){\n const cleanup = props.forEach(model);\n\n if(cleanup)\n model.set(null, cleanup);\n }\n });\n\n return createElement(Lookup.Provider, {\n key: context.id,\n value: context\n }, props.children);\n}\n\nexport { Consumer, Provider, Lookup as Context }"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAAAA,gBAAgD;AAEhD,qBAAuB;;;ACFvB,iBAA+B;AAC/B,mBAAwF;AAExF,IAAM,aAAS,4BAAc,IAAI,mBAAQ,CAAC;AAkB1C,SAAS,SAA0B,OAAyB;AAC1D,SAAO,MAAM,IAAI,IAAI,OAAK,MAAM,SAAS,CAAC,CAAC;AAC7C;AAUA,SAAS,SAA0B,OAAyB;AAC1D,QAAM,cAAU,yBAAW,MAAM;AACjC,QAAM,cAAU,sBAAQ,MAAM,QAAQ,KAAK,GAAG,CAAC,OAAO,CAAC;AAEvD,8BAAU,MAAM,MAAM,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC;AAE9C,UAAQ,QAAQ,MAAM,KAAK,CAAC,UAAU;AAEpC,QAAG,SAAS;AACV,YAAM,IAAI,MAAM,uDAAuD,MAAM,WAAW,yBAAyB;AAEnH,QAAG,MAAM,SAAQ;AACf,YAAM,UAAU,MAAM,QAAQ,KAAK;AAEnC,UAAG;AACD,cAAM,IAAI,MAAM,OAAO;AAAA,IAC3B;AAAA,EACF,CAAC;AAED,aAAO,4BAAc,OAAO,UAAU;AAAA,IACpC,KAAK,QAAQ;AAAA,IACb,OAAO;AAAA,EACT,GAAG,MAAM,QAAQ;AACnB;;;ADvCA,IAAAC,cAGO;AAfP,sBAAO,aAAa,UAAM,0BAAW,MAAO;AAE5C,sBAAO,eAAe,CAAC,iBAAa,yBAAU,MAAM,SAAS,GAAG,CAAC,CAAC;AAElE,sBAAO,aAAa,CAAC,YAAY;AAC/B,QAAM,YAAQ,wBAAS,MAAM,QAAQ,MAAM;AACzC,UAAM,CAAC,EAAE,OAAK,EAAE,KAAK,IAAI,CAAQ;AAAA,EACnC,CAAC,CAAC;AAEF,SAAO,MAAM,CAAC;AAChB;","names":["import_react","import_mvc"]}
@@ -1,7 +1,7 @@
1
- import * as React from 'react';
1
+ import * as react from 'react';
2
2
  export { Fragment } from 'react';
3
3
  export { JSX } from './jsx-runtime';
4
4
 
5
- declare const jsxDEV: (type: React.ElementType<any, keyof React.JSX.IntrinsicElements>, props: Record<string, any>, key?: React.Key | undefined, ...args: any[]) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;
5
+ declare const jsxDEV: (type: react.ElementType<any, keyof react.JSX.IntrinsicElements>, props: Record<string, any>, key?: react.Key | undefined, ...args: any[]) => react.ReactElement<any, string | react.JSXElementConstructor<any>>;
6
6
 
7
7
  export { jsxDEV };
@@ -37,7 +37,7 @@ module.exports = __toCommonJS(jsx_dev_runtime_exports);
37
37
  var Runtime = __toESM(require("react/jsx-dev-runtime"));
38
38
  var import_jsx_runtime = require("./jsx-runtime");
39
39
  var import_react = require("react");
40
- var jsxDEV2 = import_jsx_runtime.createElement.bind(Runtime.jsxDEV);
40
+ var jsxDEV2 = import_jsx_runtime.create.bind(Runtime.jsxDEV);
41
41
  // Annotate the CommonJS export names for ESM import in node:
42
42
  0 && (module.exports = {
43
43
  Fragment,
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/jsx-dev-runtime.ts"],"sourcesContent":["import * as Runtime from 'react/jsx-dev-runtime';\nimport { createElement } from './jsx-runtime';\n\nexport const jsxDEV = createElement.bind(Runtime.jsxDEV);\n\nexport { type JSX } from './jsx-runtime';\nexport { Fragment } from \"react\";"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA,gBAAAA;AAAA;AAAA;AAAA,cAAyB;AACzB,yBAA8B;AAK9B,mBAAyB;AAHlB,IAAMA,UAAS,iCAAc,KAAa,cAAM;","names":["jsxDEV"]}
1
+ {"version":3,"sources":["../src/jsx-dev-runtime.ts"],"sourcesContent":["import * as Runtime from 'react/jsx-dev-runtime';\nimport { create } from './jsx-runtime';\n\nexport const jsxDEV = create.bind(Runtime.jsxDEV);\n\nexport { type JSX } from './jsx-runtime';\nexport { Fragment } from \"react\";"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA,gBAAAA;AAAA;AAAA;AAAA,cAAyB;AACzB,yBAAuB;AAKvB,mBAAyB;AAHlB,IAAMA,UAAS,0BAAO,KAAa,cAAM;","names":["jsxDEV"]}
@@ -1,18 +1,30 @@
1
- import { Model } from '@expressive/mvc';
2
- import * as React from 'react';
1
+ import * as react from 'react';
3
2
  export { Fragment } from 'react';
3
+ import { Model } from '@expressive/mvc';
4
4
 
5
- type MaybeArray<T> = T | T[];
6
5
  declare module '@expressive/mvc' {
7
6
  namespace Model {
8
- type Render<T extends Model> = (this: T, self: T) => React.ReactNode | null;
9
- type Props<T extends Model> = Partial<Pick<T, Exclude<keyof T, keyof Model>>> & {
10
- children?: MaybeArray<React.ReactNode | Render<T>>;
7
+ type Render<T extends Model> = (this: T, self: T) => React.ReactNode;
8
+ /** Model which is not incompatable as Component in React. */
9
+ interface Compat extends Model {
10
+ render?(props: Model.Assign<this>, self: this): React.ReactNode;
11
+ children?: React.ReactNode;
12
+ }
13
+ type Props<T extends Model> = T extends {
14
+ render(props: infer P): any;
15
+ } ? Partial<Pick<T, Exclude<keyof T, keyof Model | "render">>> & P : Partial<Pick<T, Exclude<keyof T, keyof Model>>> & {
16
+ children?: React.ReactNode | Render<T>;
17
+ } & {
18
+ /**
19
+ * Callback for newly created instance. Only called once.
20
+ * @returns Callback to run when instance is destroyed.
21
+ */
22
+ is?: (instance: T) => void | (() => void);
11
23
  };
12
24
  }
13
25
  }
14
26
  declare namespace JSX {
15
- type ElementType = Model.Type | React.JSX.ElementType;
27
+ type ElementType = Model.Type<Model.Compat> | React.JSX.ElementType;
16
28
  type LibraryManagedAttributes<C, P> = C extends new (...args: any[]) => {
17
29
  props: infer U;
18
30
  } ? U : C extends Model.Type<infer U> ? Model.Props<U> : React.JSX.LibraryManagedAttributes<C, P>;
@@ -31,8 +43,8 @@ declare namespace JSX {
31
43
  interface IntrinsicElements extends React.JSX.IntrinsicElements {
32
44
  }
33
45
  }
34
- declare function createElement(this: (type: React.ElementType, props: Record<string, any>, key?: React.Key, ...rest: any[]) => React.ReactElement, type: React.ElementType, props: Record<string, any>, key?: React.Key, ...args: any[]): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
35
- declare const jsx: (type: React.ElementType<any, keyof React.JSX.IntrinsicElements>, props: Record<string, any>, key?: React.Key | undefined, ...args: any[]) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;
36
- declare const jsxs: (type: React.ElementType<any, keyof React.JSX.IntrinsicElements>, props: Record<string, any>, key?: React.Key | undefined, ...args: any[]) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;
46
+ declare function create(this: (type: React.ElementType, props: Record<string, any>, key?: React.Key, ...rest: any[]) => React.ReactElement, type: React.ElementType, props: Record<string, any>, key?: React.Key, ...args: any[]): react.ReactElement<any, string | react.JSXElementConstructor<any>>;
47
+ declare const jsx2: (type: react.ElementType<any, keyof react.JSX.IntrinsicElements>, props: Record<string, any>, key?: react.Key | undefined, ...args: any[]) => react.ReactElement<any, string | react.JSXElementConstructor<any>>;
48
+ declare const jsxs2: (type: react.ElementType<any, keyof react.JSX.IntrinsicElements>, props: Record<string, any>, key?: react.Key | undefined, ...args: any[]) => react.ReactElement<any, string | react.JSXElementConstructor<any>>;
37
49
 
38
- export { JSX, createElement, jsx, jsxs };
50
+ export { JSX, create, jsx2 as jsx, jsxs2 as jsxs };
@@ -1,9 +1,7 @@
1
1
  "use strict";
2
- var __create = Object.create;
3
2
  var __defProp = Object.defineProperty;
4
3
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
4
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
- var __getProtoOf = Object.getPrototypeOf;
7
5
  var __hasOwnProp = Object.prototype.hasOwnProperty;
8
6
  var __export = (target, all) => {
9
7
  for (var name in all)
@@ -17,28 +15,19 @@ var __copyProps = (to, from, except, desc) => {
17
15
  }
18
16
  return to;
19
17
  };
20
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
- // If the importer is in node compatibility mode or this is not an ESM
22
- // file that has been converted to a CommonJS file using a Babel-
23
- // compatible transform (i.e. "__esModule" has not been set), then set
24
- // "default" to the CommonJS "module.exports" for node compatibility.
25
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
26
- mod
27
- ));
28
18
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
29
19
 
30
20
  // src/jsx-runtime.ts
31
21
  var jsx_runtime_exports = {};
32
22
  __export(jsx_runtime_exports, {
33
23
  Fragment: () => import_react2.Fragment,
34
- createElement: () => createElement3,
24
+ create: () => create,
35
25
  jsx: () => jsx2,
36
26
  jsxs: () => jsxs2
37
27
  });
38
28
  module.exports = __toCommonJS(jsx_runtime_exports);
39
29
  var import_mvc2 = require("@expressive/mvc");
40
- var React = __toESM(require("react"));
41
- var Runtime = __toESM(require("react/jsx-runtime"));
30
+ var import_jsx_runtime = require("react/jsx-runtime");
42
31
 
43
32
  // src/context.ts
44
33
  var import_mvc = require("@expressive/mvc");
@@ -48,7 +37,15 @@ function Provider(props) {
48
37
  const ambient = (0, import_react.useContext)(Lookup);
49
38
  const context = (0, import_react.useMemo)(() => ambient.push(), [ambient]);
50
39
  (0, import_react.useEffect)(() => () => context.pop(), [ambient]);
51
- context.include(props.for, props.set);
40
+ context.include(props.for, (model) => {
41
+ if ("set" in props)
42
+ throw new Error(`The \`set\` prop is deprecated. Use \`forEach\` or <${model.constructor} {...props} /> instead.`);
43
+ if (props.forEach) {
44
+ const cleanup = props.forEach(model);
45
+ if (cleanup)
46
+ model.set(null, cleanup);
47
+ }
48
+ });
52
49
  return (0, import_react.createElement)(Lookup.Provider, {
53
50
  key: context.id,
54
51
  value: context
@@ -57,31 +54,52 @@ function Provider(props) {
57
54
 
58
55
  // src/jsx-runtime.ts
59
56
  var import_react2 = require("react");
60
- function component(child, key) {
61
- if (typeof child == "function")
62
- return React.createElement(() => {
57
+ function Render(props) {
58
+ const { is, ...rest } = props;
59
+ return (0, import_jsx_runtime.jsx)(Provider, {
60
+ for: this,
61
+ forEach: is,
62
+ children: (0, import_jsx_runtime.jsx)(() => {
63
63
  const self = this.get();
64
- return child.call(self, self);
65
- }, { key });
66
- return child;
64
+ const { render } = self;
65
+ for (const key in rest)
66
+ if (key in self)
67
+ self[key] = rest[key];
68
+ if (render)
69
+ return (0, import_jsx_runtime.jsx)(() => {
70
+ const self2 = this.get();
71
+ return render.call(self2, props, self2);
72
+ }, {});
73
+ const { children } = self;
74
+ if (children)
75
+ return children;
76
+ const fn = props.children;
77
+ if (typeof fn != "function")
78
+ return fn;
79
+ return (0, import_jsx_runtime.jsx)(() => {
80
+ const self2 = this.get();
81
+ return fn.call(self2, self2);
82
+ }, {});
83
+ }, {})
84
+ });
67
85
  }
68
- function createElement3(type, props, key, ...args) {
86
+ var RENDER = /* @__PURE__ */ new WeakMap();
87
+ function create(type, props, key, ...args) {
69
88
  if (import_mvc2.Model.is(type)) {
70
- const { children, ...rest } = props;
71
- return this(Provider, {
72
- for: type,
73
- set: rest,
74
- children: Array.isArray(children) ? children.map(component, type) : component.call(type, children, 0)
75
- }, key, ...args);
89
+ const bound = RENDER.get(type);
90
+ if (bound)
91
+ type = bound;
92
+ else
93
+ RENDER.set(type, type = Render.bind(type));
76
94
  }
77
95
  return this(type, props, key, ...args);
78
96
  }
79
- var jsx2 = createElement3.bind(Runtime.jsx);
80
- var jsxs2 = createElement3.bind(Runtime.jsxs);
97
+ var jsx2 = create.bind(import_jsx_runtime.jsx);
98
+ var jsxs2 = create.bind(import_jsx_runtime.jsxs);
81
99
  // Annotate the CommonJS export names for ESM import in node:
82
100
  0 && (module.exports = {
83
101
  Fragment,
84
- createElement,
102
+ create,
85
103
  jsx,
86
104
  jsxs
87
105
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/jsx-runtime.ts","../src/context.ts"],"sourcesContent":["import { Model } from '@expressive/mvc';\nimport * as React from 'react';\nimport * as Runtime from 'react/jsx-runtime';\n\nimport { Provider } from './context';\n\ntype MaybeArray<T> = T | T[];\n\ndeclare module '@expressive/mvc' {\n namespace Model {\n type Render<T extends Model> = (this: T, self: T) => React.ReactNode | null;\n\n type Props<T extends Model> = Partial<Pick<T, Exclude<keyof T, keyof Model>>> & {\n children?: MaybeArray<React.ReactNode | Render<T>>;\n }\n }\n}\n\nexport declare namespace JSX {\n type ElementType = Model.Type | React.JSX.ElementType;\n\n type LibraryManagedAttributes<C, P> =\n // For normal class components, pull from props property explicitly because we dorked up ElementAttributesProperty.\n C extends new (...args: any[]) => { props: infer U } ? U :\n C extends Model.Type<infer U> ? Model.Props<U> :\n React.JSX.LibraryManagedAttributes<C, P>;\n\n interface Element extends React.JSX.Element {}\n interface ElementClass extends React.JSX.ElementClass {}\n // This is a hack to make TypeScript happy - React one insists on `props` property existing.\n // I await the \"Find Out\" phase in git issues.\n interface ElementAttributesProperty {}\n interface ElementChildrenAttribute extends React.JSX.ElementChildrenAttribute {}\n\n interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {}\n interface IntrinsicClassAttributes<T> extends React.JSX.IntrinsicClassAttributes<T> {}\n interface IntrinsicElements extends React.JSX.IntrinsicElements {}\n}\n\nfunction component<T extends Model>(\n this: Model.Type<T>,\n child: React.ReactNode | Model.Render<T>,\n key: number){\n\n if(typeof child == 'function')\n return React.createElement(() => {\n const self = this.get();\n return child.call(self, self);\n }, { key });\n\n return child;\n}\n\nexport function createElement(\n this: (\n type: React.ElementType,\n props: Record<string, any>,\n key?: React.Key,\n ...rest: any[]\n ) => React.ReactElement,\n type: React.ElementType,\n props: Record<string, any>,\n key?: React.Key,\n ...args: any[]){\n\n if(Model.is(type)){\n const { children, ...rest } = props;\n\n return this(Provider, {\n for: type,\n set: rest,\n children: Array.isArray(children) ?\n children.map(component, type) :\n component.call(type, children, 0)\n }, key, ...args);\n }\n\n return this(type, props, key, ...args);\n}\n\nexport const jsx = createElement.bind(Runtime.jsx);\nexport const jsxs = createElement.bind(Runtime.jsxs);\n\nexport { Fragment } from \"react\";","import Model, { Context } from '@expressive/mvc';\nimport { ReactNode, createContext, createElement, useContext, useEffect, useMemo } from 'react';\n\nconst Lookup = createContext(new Context());\n\ndeclare namespace Consumer {\n type Props<T extends Model> = {\n /** Type of controller to fetch from context. */\n for: Model.Type<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `Model.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => ReactNode | void;\n }\n}\n\nfunction Consumer<T extends Model>(props: Consumer.Props<T>){\n return props.for.get(i => props.children(i));\n}\n\ndeclare namespace Provider {\n interface Props<T extends Model> {\n for: Context.Accept<T>;\n set?: Model.Assign<T>;\n children?: ReactNode;\n }\n}\n\nfunction Provider<T extends Model>(props: Provider.Props<T>){\n const ambient = useContext(Lookup);\n const context = useMemo(() => ambient.push(), [ambient]);\n\n useEffect(() => () => context.pop(), [ambient]);\n \n context.include(props.for, props.set);\n\n return createElement(Lookup.Provider, {\n key: context.id,\n value: context\n }, props.children);\n}\n\nexport { Consumer, Provider, Lookup as Context }"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA,uBAAAA;AAAA,EAAA,WAAAC;AAAA,EAAA,YAAAC;AAAA;AAAA;AAAA,IAAAC,cAAsB;AACtB,YAAuB;AACvB,cAAyB;;;ACFzB,iBAA+B;AAC/B,mBAAwF;AAExF,IAAM,aAAS,4BAAc,IAAI,mBAAQ,CAAC;AA8B1C,SAAS,SAA0B,OAAyB;AAC1D,QAAM,cAAU,yBAAW,MAAM;AACjC,QAAM,cAAU,sBAAQ,MAAM,QAAQ,KAAK,GAAG,CAAC,OAAO,CAAC;AAEvD,8BAAU,MAAM,MAAM,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC;AAE9C,UAAQ,QAAQ,MAAM,KAAK,MAAM,GAAG;AAEpC,aAAO,4BAAc,OAAO,UAAU;AAAA,IACpC,KAAK,QAAQ;AAAA,IACb,OAAO;AAAA,EACT,GAAG,MAAM,QAAQ;AACnB;;;ADsCA,IAAAC,gBAAyB;AA5CzB,SAAS,UAEP,OACA,KAAY;AAEZ,MAAG,OAAO,SAAS;AACjB,WAAa,oBAAc,MAAM;AAC/B,YAAM,OAAO,KAAK,IAAI;AACtB,aAAO,MAAM,KAAK,MAAM,IAAI;AAAA,IAC9B,GAAG,EAAE,IAAI,CAAC;AAEZ,SAAO;AACT;AAEO,SAASC,eAOd,MACA,OACA,QACG,MAAY;AAEf,MAAG,kBAAM,GAAG,IAAI,GAAE;AAChB,UAAM,EAAE,UAAU,GAAG,KAAK,IAAI;AAE9B,WAAO,KAAK,UAAU;AAAA,MACpB,KAAK;AAAA,MACL,KAAK;AAAA,MACL,UAAU,MAAM,QAAQ,QAAQ,IAC9B,SAAS,IAAI,WAAW,IAAI,IAC5B,UAAU,KAAK,MAAM,UAAU,CAAC;AAAA,IACpC,GAAG,KAAK,GAAG,IAAI;AAAA,EACjB;AAEA,SAAO,KAAK,MAAM,OAAO,KAAK,GAAG,IAAI;AACvC;AAEO,IAAMC,OAAMD,eAAc,KAAa,WAAG;AAC1C,IAAME,QAAOF,eAAc,KAAa,YAAI;","names":["createElement","jsx","jsxs","import_mvc","import_react","createElement","jsx","jsxs"]}
1
+ {"version":3,"sources":["../src/jsx-runtime.ts","../src/context.ts"],"sourcesContent":["import { Model } from '@expressive/mvc';\nimport { jsx, jsxs } from 'react/jsx-runtime';\n\nimport { Provider } from './context';\n\ndeclare module '@expressive/mvc' {\n namespace Model {\n type Render<T extends Model> = (this: T, self: T) => React.ReactNode;\n\n /** Model which is not incompatable as Component in React. */\n interface Compat extends Model {\n render?(props: Model.Assign<this>, self: this): React.ReactNode;\n children?: React.ReactNode;\n }\n\n type Props<T extends Model> = \n & T extends { render(props: infer P): any }\n ? Partial<Pick<T, Exclude<keyof T, keyof Model | \"render\">>> & P\n : Partial<Pick<T, Exclude<keyof T, keyof Model>>> & {\n children?: React.ReactNode | Render<T>;\n }\n & {\n /**\n * Callback for newly created instance. Only called once.\n * @returns Callback to run when instance is destroyed.\n */\n is?: (instance: T) => void | (() => void);\n };\n }\n}\n\nexport declare namespace JSX {\n type ElementType = Model.Type<Model.Compat> | React.JSX.ElementType;\n\n type LibraryManagedAttributes<C, P> =\n // For normal class components, pull from props property explicitly because we dorked up ElementAttributesProperty.\n C extends new (...args: any[]) => { props: infer U } ? U :\n C extends Model.Type<infer U> ? Model.Props<U> :\n React.JSX.LibraryManagedAttributes<C, P>;\n\n interface Element extends React.JSX.Element {}\n interface ElementClass extends React.JSX.ElementClass {}\n // This is a hack to make TypeScript happy - React one insists on `props` property existing.\n // I await the \"Find Out\" phase of this experiment in git issues.\n interface ElementAttributesProperty {}\n interface ElementChildrenAttribute extends React.JSX.ElementChildrenAttribute {}\n\n interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {}\n interface IntrinsicClassAttributes<T> extends React.JSX.IntrinsicClassAttributes<T> {}\n interface IntrinsicElements extends React.JSX.IntrinsicElements {}\n}\n\nfunction Render<T extends Model.Compat>(\n this: Model.Init<T>,\n props: Model.Assign<T>\n){\n const { is, ...rest } = props;\n\n return jsx(Provider, {\n for: this,\n forEach: is,\n children: jsx(() => {\n const self = this.get();\n const { render } = self;\n \n for(const key in rest)\n if(key in self)\n (self as any)[key] = rest[key];\n\n if(render)\n return jsx(() => {\n const self = this.get();\n return render.call(self, props, self);\n }, {});\n\n const { children } = self;\n\n if(children)\n return children;\n\n const fn = props.children as React.ReactNode | Model.Render<T>;\n\n if(typeof fn != \"function\")\n return fn;\n\n return jsx(() => {\n const self = this.get();\n return fn.call(self, self);\n }, {});\n }, {})\n });\n}\n\nconst RENDER = new WeakMap<typeof Model, React.FC>();\n\nexport function create(\n this: (\n type: React.ElementType,\n props: Record<string, any>,\n key?: React.Key,\n ...rest: any[]\n ) => React.ReactElement,\n type: React.ElementType,\n props: Record<string, any>,\n key?: React.Key,\n ...args: any[]){\n\n if(Model.is(type)){\n const bound = RENDER.get(type);\n\n if(bound)\n type = bound;\n else\n RENDER.set(type, type = Render.bind(type as Model.Init));\n }\n \n return this(type, props, key, ...args);\n}\n\nconst jsx2 = create.bind(jsx);\nconst jsxs2 = create.bind(jsxs);\n\nexport { Fragment } from \"react\";\nexport {\n jsx2 as jsx,\n jsxs2 as jsxs\n}","import Model, { Context } from '@expressive/mvc';\nimport { ReactNode, createContext, createElement, useContext, useEffect, useMemo } from 'react';\n\nconst Lookup = createContext(new Context());\n\ndeclare namespace Consumer {\n type Props<T extends Model> = {\n /** Type of controller to fetch from context. */\n for: Model.Type<T>;\n\n /**\n * Render function, will receive instance of desired controller.\n *\n * Called every render of parent component.\n * Similar to `Model.get()`, updates to properties accessed in\n * this function will cause a refresh when they change.\n */\n children: (value: T) => ReactNode | void;\n }\n}\n\nfunction Consumer<T extends Model>(props: Consumer.Props<T>){\n return props.for.get(i => props.children(i));\n}\n\ndeclare namespace Provider {\n interface Props<T extends Model> {\n for: Context.Accept<T>;\n forEach?: Context.Expect<T>;\n children?: ReactNode;\n }\n}\n\nfunction Provider<T extends Model>(props: Provider.Props<T>){\n const ambient = useContext(Lookup);\n const context = useMemo(() => ambient.push(), [ambient]);\n\n useEffect(() => () => context.pop(), [ambient]);\n \n context.include(props.for, (model) => {\n // TODO: remove next minor release\n if(\"set\" in props)\n throw new Error(`The \\`set\\` prop is deprecated. Use \\`forEach\\` or <${model.constructor} {...props} /> instead.`);\n\n if(props.forEach){\n const cleanup = props.forEach(model);\n\n if(cleanup)\n model.set(null, cleanup);\n }\n });\n\n return createElement(Lookup.Provider, {\n key: context.id,\n value: context\n }, props.children);\n}\n\nexport { Consumer, Provider, Lookup as Context }"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAAAA,cAAsB;AACtB,yBAA0B;;;ACD1B,iBAA+B;AAC/B,mBAAwF;AAExF,IAAM,aAAS,4BAAc,IAAI,mBAAQ,CAAC;AA8B1C,SAAS,SAA0B,OAAyB;AAC1D,QAAM,cAAU,yBAAW,MAAM;AACjC,QAAM,cAAU,sBAAQ,MAAM,QAAQ,KAAK,GAAG,CAAC,OAAO,CAAC;AAEvD,8BAAU,MAAM,MAAM,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC;AAE9C,UAAQ,QAAQ,MAAM,KAAK,CAAC,UAAU;AAEpC,QAAG,SAAS;AACV,YAAM,IAAI,MAAM,uDAAuD,MAAM,WAAW,yBAAyB;AAEnH,QAAG,MAAM,SAAQ;AACf,YAAM,UAAU,MAAM,QAAQ,KAAK;AAEnC,UAAG;AACD,cAAM,IAAI,MAAM,OAAO;AAAA,IAC3B;AAAA,EACF,CAAC;AAED,aAAO,4BAAc,OAAO,UAAU;AAAA,IACpC,KAAK,QAAQ;AAAA,IACb,OAAO;AAAA,EACT,GAAG,MAAM,QAAQ;AACnB;;;ADkEA,IAAAC,gBAAyB;AAtEzB,SAAS,OAEP,OACD;AACC,QAAM,EAAE,IAAI,GAAG,KAAK,IAAI;AAExB,aAAO,wBAAI,UAAU;AAAA,IACnB,KAAK;AAAA,IACL,SAAS;AAAA,IACT,cAAU,wBAAI,MAAM;AAClB,YAAM,OAAO,KAAK,IAAI;AACtB,YAAM,EAAE,OAAO,IAAI;AAEnB,iBAAU,OAAO;AACf,YAAG,OAAO;AACR,UAAC,KAAa,GAAG,IAAI,KAAK,GAAG;AAEjC,UAAG;AACD,mBAAO,wBAAI,MAAM;AACf,gBAAMC,QAAO,KAAK,IAAI;AACtB,iBAAO,OAAO,KAAKA,OAAM,OAAOA,KAAI;AAAA,QACtC,GAAG,CAAC,CAAC;AAEP,YAAM,EAAE,SAAS,IAAI;AAErB,UAAG;AACD,eAAO;AAET,YAAM,KAAK,MAAM;AAEjB,UAAG,OAAO,MAAM;AACd,eAAO;AAET,iBAAO,wBAAI,MAAM;AACf,cAAMA,QAAO,KAAK,IAAI;AACtB,eAAO,GAAG,KAAKA,OAAMA,KAAI;AAAA,MAC3B,GAAG,CAAC,CAAC;AAAA,IACP,GAAG,CAAC,CAAC;AAAA,EACP,CAAC;AACH;AAEA,IAAM,SAAS,oBAAI,QAAgC;AAE5C,SAAS,OAOd,MACA,OACA,QACG,MAAY;AAEf,MAAG,kBAAM,GAAG,IAAI,GAAE;AAChB,UAAM,QAAQ,OAAO,IAAI,IAAI;AAE7B,QAAG;AACD,aAAO;AAAA;AAEP,aAAO,IAAI,MAAM,OAAO,OAAO,KAAK,IAAkB,CAAC;AAAA,EAC3D;AAEA,SAAO,KAAK,MAAM,OAAO,KAAK,GAAG,IAAI;AACvC;AAEA,IAAM,OAAO,OAAO,KAAK,sBAAG;AAC5B,IAAM,QAAQ,OAAO,KAAK,uBAAI;","names":["import_mvc","import_react","self"]}
package/package.json CHANGED
@@ -49,7 +49,7 @@
49
49
  "preversion": "npm run test && npm run build"
50
50
  },
51
51
  "dependencies": {
52
- "@expressive/mvc": "^0.55.0"
52
+ "@expressive/mvc": "^0.57.0"
53
53
  },
54
54
  "peerDependencies": {
55
55
  "react": ">=16.8.0 <19.0.0"
@@ -67,6 +67,6 @@
67
67
  "react-test-renderer": "^18.2.0",
68
68
  "tsup": "^8.0.2"
69
69
  },
70
- "version": "0.55.0",
71
- "gitHead": "286c709fc8238f010f5e5ac32b4dbd709bdc79dc"
70
+ "version": "0.57.0",
71
+ "gitHead": "1a68cd686c923066b93fee0a1cb1caac398bff59"
72
72
  }