Compare commits
19 Commits
extension-
...
form
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db7608f7c3 | ||
|
|
b78f99e808 | ||
|
|
86dde2d286 | ||
|
|
596e0942c5 | ||
|
|
cb61713cce | ||
|
|
1b2b68fbae | ||
|
|
35a8037f5a | ||
|
|
7aef7ae796 | ||
|
|
1bfbeba934 | ||
|
|
fc4295894f | ||
|
|
ab0dce107d | ||
|
|
9436602443 | ||
|
|
66de31706c | ||
|
|
8925fe6336 | ||
|
|
fe8ca23d37 | ||
|
|
d48f20a59d | ||
|
|
b7b4abcbe2 | ||
|
|
129ab04ea7 | ||
|
|
870fe479c3 |
24
bun.lock
24
bun.lock
@@ -46,9 +46,21 @@
|
|||||||
"vite": "^6.2.6",
|
"vite": "^6.2.6",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"packages/extension-form": {
|
||||||
|
"name": "@reffuse/extension-form",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"devDependencies": {
|
||||||
|
"reffuse": "workspace:*",
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"effect": "^3.13.0",
|
||||||
|
"react": "^19.0.0",
|
||||||
|
"reffuse": "^0.1.6",
|
||||||
|
},
|
||||||
|
},
|
||||||
"packages/extension-lazyref": {
|
"packages/extension-lazyref": {
|
||||||
"name": "@reffuse/extension-lazyref",
|
"name": "@reffuse/extension-lazyref",
|
||||||
"version": "0.1.1",
|
"version": "0.1.2",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"reffuse": "workspace:*",
|
"reffuse": "workspace:*",
|
||||||
},
|
},
|
||||||
@@ -57,12 +69,12 @@
|
|||||||
"@types/react": "^19.0.0",
|
"@types/react": "^19.0.0",
|
||||||
"effect": "^3.13.0",
|
"effect": "^3.13.0",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"reffuse": "^0.1.4",
|
"reffuse": "^0.1.6",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"packages/extension-query": {
|
"packages/extension-query": {
|
||||||
"name": "@reffuse/extension-query",
|
"name": "@reffuse/extension-query",
|
||||||
"version": "0.1.2",
|
"version": "0.1.3",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"reffuse": "workspace:*",
|
"reffuse": "workspace:*",
|
||||||
},
|
},
|
||||||
@@ -73,12 +85,12 @@
|
|||||||
"@types/react": "^19.0.0",
|
"@types/react": "^19.0.0",
|
||||||
"effect": "^3.13.0",
|
"effect": "^3.13.0",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"reffuse": "^0.1.4",
|
"reffuse": "^0.1.6",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"packages/reffuse": {
|
"packages/reffuse": {
|
||||||
"name": "reffuse",
|
"name": "reffuse",
|
||||||
"version": "0.1.5",
|
"version": "0.1.6",
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@types/react": "^19.0.0",
|
"@types/react": "^19.0.0",
|
||||||
"effect": "^3.13.0",
|
"effect": "^3.13.0",
|
||||||
@@ -363,6 +375,8 @@
|
|||||||
|
|
||||||
"@reffuse/example": ["@reffuse/example@workspace:packages/example"],
|
"@reffuse/example": ["@reffuse/example@workspace:packages/example"],
|
||||||
|
|
||||||
|
"@reffuse/extension-form": ["@reffuse/extension-form@workspace:packages/extension-form"],
|
||||||
|
|
||||||
"@reffuse/extension-lazyref": ["@reffuse/extension-lazyref@workspace:packages/extension-lazyref"],
|
"@reffuse/extension-lazyref": ["@reffuse/extension-lazyref@workspace:packages/extension-lazyref"],
|
||||||
|
|
||||||
"@reffuse/extension-query": ["@reffuse/extension-query@workspace:packages/extension-query"],
|
"@reffuse/extension-query": ["@reffuse/extension-query@workspace:packages/extension-query"],
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ export const Route = createFileRoute("/tests")({
|
|||||||
})
|
})
|
||||||
|
|
||||||
function RouteComponent() {
|
function RouteComponent() {
|
||||||
const deepRef = R.useRef({ value: "poulet" })
|
|
||||||
const deepValueRef = R.useSubRef(deepRef, ["value"])
|
|
||||||
|
|
||||||
// const value = R.useMemoScoped(Effect.addFinalizer(() => Console.log("cleanup")).pipe(
|
// const value = R.useMemoScoped(Effect.addFinalizer(() => Console.log("cleanup")).pipe(
|
||||||
// Effect.andThen(makeUuid4),
|
// Effect.andThen(makeUuid4),
|
||||||
// Effect.provide(GetRandomValues.CryptoRandom),
|
// Effect.provide(GetRandomValues.CryptoRandom),
|
||||||
@@ -35,8 +32,7 @@ function RouteComponent() {
|
|||||||
|
|
||||||
const generateUuid = R.useCallbackSync(() => makeUuid4.pipe(
|
const generateUuid = R.useCallbackSync(() => makeUuid4.pipe(
|
||||||
Effect.provide(GetRandomValues.CryptoRandom),
|
Effect.provide(GetRandomValues.CryptoRandom),
|
||||||
Effect.tap(v => Ref.set(uuidRef, v)),
|
Effect.flatMap(v => Ref.set(uuidRef, v)),
|
||||||
Effect.tap(v => Ref.set(deepValueRef, v)),
|
|
||||||
), [])
|
), [])
|
||||||
|
|
||||||
|
|
||||||
@@ -46,10 +42,6 @@ function RouteComponent() {
|
|||||||
{(uuid, anotherRef) => <Text>{uuid} / {anotherRef}</Text>}
|
{(uuid, anotherRef) => <Text>{uuid} / {anotherRef}</Text>}
|
||||||
</R.SubscribeRefs>
|
</R.SubscribeRefs>
|
||||||
|
|
||||||
<R.SubscribeRefs refs={[deepRef, deepValueRef]}>
|
|
||||||
{(deep, deepValue) => <Text>{JSON.stringify(deep)} / {deepValue}</Text>}
|
|
||||||
</R.SubscribeRefs>
|
|
||||||
|
|
||||||
<Button onClick={() => logValue("test")}>Log value</Button>
|
<Button onClick={() => logValue("test")}>Log value</Button>
|
||||||
<Button onClick={() => generateUuid()}>Generate UUID</Button>
|
<Button onClick={() => generateUuid()}>Generate UUID</Button>
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|||||||
9
packages/extension-form/README.md
Normal file
9
packages/extension-form/README.md
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# LazyRef extension for Reffuse
|
||||||
|
|
||||||
|
Extension to integrate `@typed/lazy-ref` with Reffuse.
|
||||||
|
|
||||||
|
## Peer dependencies
|
||||||
|
- `@typed/lazy-ref`
|
||||||
|
- `reffuse` 0.1.3+
|
||||||
|
- `effect` 3.13+
|
||||||
|
- `react` & `@types/react` 19+
|
||||||
40
packages/extension-form/package.json
Normal file
40
packages/extension-form/package.json
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
"name": "@reffuse/extension-form",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"type": "module",
|
||||||
|
"files": [
|
||||||
|
"./README.md",
|
||||||
|
"./dist"
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"repository": {
|
||||||
|
"url": "git+https://github.com/Thiladev/reffuse.git"
|
||||||
|
},
|
||||||
|
"types": "./dist/index.d.ts",
|
||||||
|
"exports": {
|
||||||
|
".": {
|
||||||
|
"types": "./dist/index.d.ts",
|
||||||
|
"default": "./dist/index.js"
|
||||||
|
},
|
||||||
|
"./*": {
|
||||||
|
"types": "./dist/*.d.ts",
|
||||||
|
"default": "./dist/*.js"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"build": "tsc",
|
||||||
|
"lint:tsc": "tsc --noEmit",
|
||||||
|
"pack": "npm pack",
|
||||||
|
"clean:cache": "rm -f tsconfig.tsbuildinfo",
|
||||||
|
"clean:dist": "rm -rf dist",
|
||||||
|
"clean:node": "rm -rf node_modules"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"reffuse": "workspace:*"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"effect": "^3.13.0",
|
||||||
|
"react": "^19.0.0",
|
||||||
|
"reffuse": "^0.1.7"
|
||||||
|
}
|
||||||
|
}
|
||||||
9
packages/extension-form/src/FormExtension.ts
Normal file
9
packages/extension-form/src/FormExtension.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { ReffuseExtension, type ReffuseNamespace } from "reffuse"
|
||||||
|
|
||||||
|
|
||||||
|
export const FormExtension = ReffuseExtension.make(() => ({
|
||||||
|
useForm<A, E, R>(
|
||||||
|
this: ReffuseNamespace.ReffuseNamespace<R>,
|
||||||
|
) {
|
||||||
|
},
|
||||||
|
}))
|
||||||
1
packages/extension-form/src/index.ts
Normal file
1
packages/extension-form/src/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export * from "./FormExtension.js"
|
||||||
6
packages/extension-form/src/internal/Form.ts
Normal file
6
packages/extension-form/src/internal/Form.ts
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import { Schema } from "effect"
|
||||||
|
|
||||||
|
|
||||||
|
export interface Form<A, I, R> {
|
||||||
|
readonly schema: Schema.Schema<A, I, R>
|
||||||
|
}
|
||||||
69
packages/extension-form/src/internal/FormField.ts
Normal file
69
packages/extension-form/src/internal/FormField.ts
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
import type { Effect, Schema } from "effect"
|
||||||
|
import type * as Formify from "./Formify.js"
|
||||||
|
|
||||||
|
|
||||||
|
export interface FormField<S extends Schema.Schema.Any> {
|
||||||
|
readonly schema: S
|
||||||
|
}
|
||||||
|
|
||||||
|
export const makeFormField = <S extends Schema.Schema.Any>(
|
||||||
|
schema: S,
|
||||||
|
get: Effect.Effect<S["Type"]>,
|
||||||
|
set: (value: S["Type"]) => Effect.Effect<void>,
|
||||||
|
): FormField<S> => {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UnionFormField<
|
||||||
|
S extends Schema.Union<Members>,
|
||||||
|
Members extends ReadonlyArray<Schema.Schema.All>,
|
||||||
|
> extends FormField<S> {
|
||||||
|
readonly member: Formify.Formify<Members[number]>
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TupleFormField<
|
||||||
|
S extends Schema.TupleType<Elements, Rest>,
|
||||||
|
Elements extends Schema.TupleType.Elements,
|
||||||
|
Rest extends Schema.TupleType.Rest,
|
||||||
|
> extends FormField<S> {
|
||||||
|
readonly elements: [...{ readonly [K in keyof Elements]: Formify.Formify<Elements[K]> }]
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ArrayFormField<
|
||||||
|
S extends Schema.Array$<Value>,
|
||||||
|
Value extends Schema.Schema.Any,
|
||||||
|
> extends FormField<S> {
|
||||||
|
readonly elements: readonly Formify.Formify<Value>[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export type StructFormField<
|
||||||
|
S extends Schema.Struct<Fields>,
|
||||||
|
Fields extends Schema.Struct.Fields,
|
||||||
|
> = (
|
||||||
|
& FormField<S>
|
||||||
|
& { readonly fields: { readonly [K in keyof Fields]: Formify.Formify<Fields[K]> } }
|
||||||
|
& {
|
||||||
|
[K in keyof Fields as Fields[K] extends
|
||||||
|
Schema.tag<infer _> ? K : never
|
||||||
|
]: Fields[K] extends
|
||||||
|
Schema.tag<infer Tag> ? Tag : never
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
export interface GenericFormField<S extends Schema.Schema.Any> extends FormField<S> {
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export interface PropertySignatureFormField<
|
||||||
|
S extends Schema.PropertySignature<TypeToken, Type, Key, EncodedToken, Encoded, HasDefault, R>,
|
||||||
|
TypeToken extends Schema.PropertySignature.Token,
|
||||||
|
Type,
|
||||||
|
Key extends PropertyKey,
|
||||||
|
EncodedToken extends Schema.PropertySignature.Token,
|
||||||
|
Encoded,
|
||||||
|
HasDefault extends boolean = false,
|
||||||
|
R = never,
|
||||||
|
> {
|
||||||
|
readonly propertySignature: S
|
||||||
|
readonly value: Type
|
||||||
|
}
|
||||||
51
packages/extension-form/src/internal/Formify.ts
Normal file
51
packages/extension-form/src/internal/Formify.ts
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
import { Schema } from "effect"
|
||||||
|
import type * as FormField from "./FormField.js"
|
||||||
|
|
||||||
|
|
||||||
|
export type Formify<S> = (
|
||||||
|
S extends Schema.Union<infer Members> ? FormField.UnionFormField<S, Members> :
|
||||||
|
S extends Schema.TupleType<infer Elements, infer Rest> ? FormField.TupleFormField<S, Elements, Rest> :
|
||||||
|
S extends Schema.Array$<infer Value> ? FormField.ArrayFormField<S, Value> :
|
||||||
|
S extends Schema.Struct<infer Fields> ? FormField.StructFormField<S, Fields> :
|
||||||
|
S extends Schema.Schema.Any ? FormField.GenericFormField<S> :
|
||||||
|
S extends Schema.PropertySignature<
|
||||||
|
infer TypeToken,
|
||||||
|
infer Type,
|
||||||
|
infer Key,
|
||||||
|
infer EncodedToken,
|
||||||
|
infer Encoded,
|
||||||
|
infer HasDefault,
|
||||||
|
infer R
|
||||||
|
> ? FormField.PropertySignatureFormField<S, TypeToken, Type, Key, EncodedToken, Encoded, HasDefault, R> :
|
||||||
|
never
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
const Login = Schema.Union(
|
||||||
|
Schema.Struct({
|
||||||
|
_tag: Schema.tag("ByEmail"),
|
||||||
|
email: Schema.String,
|
||||||
|
password: Schema.RedactedFromSelf(Schema.String),
|
||||||
|
}),
|
||||||
|
|
||||||
|
Schema.Struct({
|
||||||
|
_tag: Schema.tag("ByPhone"),
|
||||||
|
phone: Schema.String,
|
||||||
|
password: Schema.RedactedFromSelf(Schema.String),
|
||||||
|
}),
|
||||||
|
|
||||||
|
Schema.TaggedStruct("ByKey", {
|
||||||
|
id: Schema.String,
|
||||||
|
password: Schema.RedactedFromSelf(Schema.String),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
type LoginForm = Formify<typeof Login>
|
||||||
|
declare const loginForm: LoginForm
|
||||||
|
|
||||||
|
switch (loginForm.member._tag) {
|
||||||
|
case "ByEmail":
|
||||||
|
loginForm.member
|
||||||
|
break
|
||||||
|
case "ByPhone":
|
||||||
|
break
|
||||||
|
}
|
||||||
37
packages/extension-form/src/internal/guards.ts
Normal file
37
packages/extension-form/src/internal/guards.ts
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import { Array, Predicate, Record, Schema, Tuple } from "effect"
|
||||||
|
|
||||||
|
|
||||||
|
export const isTupleSchema = (u: unknown): u is Schema.Tuple<any> => (
|
||||||
|
Schema.isSchema(u) &&
|
||||||
|
Predicate.hasProperty(u, "elements") && Array.isArray(u.elements) &&
|
||||||
|
Predicate.hasProperty(u, "rest") && Array.isArray(u.rest)
|
||||||
|
)
|
||||||
|
|
||||||
|
export const isArraySchema = (u: unknown): u is Schema.Array$<any> => (
|
||||||
|
Schema.isSchema(u) &&
|
||||||
|
Predicate.hasProperty(u, "elements") && Array.isArray(u.elements) && Array.isEmptyArray(u.elements) &&
|
||||||
|
Predicate.hasProperty(u, "rest") && Array.isArray(u.rest) && Tuple.isTupleOf(u.rest, 1) &&
|
||||||
|
Predicate.hasProperty(u, "value")
|
||||||
|
)
|
||||||
|
|
||||||
|
export const isStructSchema = (u: unknown): u is Schema.Struct<any> => (
|
||||||
|
Schema.isSchema(u) &&
|
||||||
|
Predicate.hasProperty(u, "fields") && Predicate.isObject(u.fields) &&
|
||||||
|
Predicate.hasProperty(u, "records") && Array.isArray(u.records) && Array.isEmptyArray(u.records)
|
||||||
|
)
|
||||||
|
|
||||||
|
export const isRecordSchema = (u: unknown): u is Schema.Record$<any, any> => (
|
||||||
|
Schema.isSchema(u) &&
|
||||||
|
Predicate.hasProperty(u, "fields") && Predicate.isObject(u.fields) && Record.isEmptyRecord(u.fields) &&
|
||||||
|
Predicate.hasProperty(u, "records") && Array.isArray(u.records) &&
|
||||||
|
Predicate.hasProperty(u, "key") &&
|
||||||
|
Predicate.hasProperty(u, "value")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
const myTuple = Schema.Tuple(Schema.String)
|
||||||
|
const myArray = Schema.Array(Schema.String)
|
||||||
|
const myStruct = Schema.Struct({})
|
||||||
|
const myRecord = Schema.Record({ key: Schema.String, value: Schema.String })
|
||||||
|
|
||||||
|
console.log(isArraySchema(myTuple))
|
||||||
1
packages/extension-form/src/internal/index.ts
Normal file
1
packages/extension-form/src/internal/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export * as Form from "./Form.js"
|
||||||
33
packages/extension-form/tsconfig.json
Normal file
33
packages/extension-form/tsconfig.json
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
// Enable latest features
|
||||||
|
"lib": ["ESNext", "DOM"],
|
||||||
|
"target": "ESNext",
|
||||||
|
"module": "NodeNext",
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"jsx": "react-jsx",
|
||||||
|
// "allowJs": true,
|
||||||
|
|
||||||
|
// Bundler mode
|
||||||
|
"moduleResolution": "NodeNext",
|
||||||
|
// "allowImportingTsExtensions": true,
|
||||||
|
"verbatimModuleSyntax": true,
|
||||||
|
// "noEmit": true,
|
||||||
|
|
||||||
|
// Best practices
|
||||||
|
"strict": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
|
||||||
|
// Some stricter flags (disabled by default)
|
||||||
|
"noUnusedLocals": false,
|
||||||
|
"noUnusedParameters": false,
|
||||||
|
"noPropertyAccessFromIndexSignature": false,
|
||||||
|
|
||||||
|
// Build
|
||||||
|
"outDir": "./dist",
|
||||||
|
"declaration": true
|
||||||
|
},
|
||||||
|
|
||||||
|
"include": ["./src"]
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@reffuse/extension-lazyref",
|
"name": "@reffuse/extension-lazyref",
|
||||||
"version": "0.1.4",
|
"version": "0.1.3",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"files": [
|
"files": [
|
||||||
"./README.md",
|
"./README.md",
|
||||||
@@ -37,6 +37,6 @@
|
|||||||
"@types/react": "^19.0.0",
|
"@types/react": "^19.0.0",
|
||||||
"effect": "^3.13.0",
|
"effect": "^3.13.0",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"reffuse": "^0.1.8"
|
"reffuse": "^0.1.7"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import * as LazyRef from "@typed/lazy-ref"
|
import * as LazyRef from "@typed/lazy-ref"
|
||||||
import { Effect, pipe, Stream } from "effect"
|
import { Effect, pipe, Stream } from "effect"
|
||||||
import * as React from "react"
|
import * as React from "react"
|
||||||
import { ReffuseExtension, type ReffuseNamespace } from "reffuse"
|
import { ReffuseExtension, type ReffuseNamespace, SetStateAction } from "reffuse"
|
||||||
import { SetStateAction } from "reffuse/types"
|
|
||||||
|
|
||||||
|
|
||||||
export const LazyRefExtension = ReffuseExtension.make(() => ({
|
export const LazyRefExtension = ReffuseExtension.make(() => ({
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "reffuse",
|
"name": "reffuse",
|
||||||
"version": "0.1.9",
|
"version": "0.1.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"files": [
|
"files": [
|
||||||
"./README.md",
|
"./README.md",
|
||||||
@@ -16,10 +16,6 @@
|
|||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
"default": "./dist/index.js"
|
"default": "./dist/index.js"
|
||||||
},
|
},
|
||||||
"./types": {
|
|
||||||
"types": "./dist/types/index.d.ts",
|
|
||||||
"default": "./dist/types/index.js"
|
|
||||||
},
|
|
||||||
"./*": {
|
"./*": {
|
||||||
"types": "./dist/*.d.ts",
|
"types": "./dist/*.d.ts",
|
||||||
"default": "./dist/*.js"
|
"default": "./dist/*.js"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import type * as ReffuseContext from "./ReffuseContext.js"
|
import type * as ReffuseContext from "./ReffuseContext.js"
|
||||||
import type * as ReffuseExtension from "./ReffuseExtension.js"
|
import type * as ReffuseExtension from "./ReffuseExtension.js"
|
||||||
import * as ReffuseNamespace from "./ReffuseNamespace.js"
|
import * as ReffuseNamespace from "./ReffuseNamespace.js"
|
||||||
import type { Merge, StaticType } from "./utils.js"
|
import type { Merge, StaticType } from "./types.js"
|
||||||
|
|
||||||
|
|
||||||
export class Reffuse extends ReffuseNamespace.makeClass() {}
|
export class Reffuse extends ReffuseNamespace.makeClass() {}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { type Context, Effect, ExecutionStrategy, Exit, type Fiber, type Layer,
|
|||||||
import * as React from "react"
|
import * as React from "react"
|
||||||
import * as ReffuseContext from "./ReffuseContext.js"
|
import * as ReffuseContext from "./ReffuseContext.js"
|
||||||
import * as ReffuseRuntime from "./ReffuseRuntime.js"
|
import * as ReffuseRuntime from "./ReffuseRuntime.js"
|
||||||
import { type PropertyPath, SetStateAction, SubscriptionSubRef } from "./types/index.js"
|
import * as SetStateAction from "./SetStateAction.js"
|
||||||
|
|
||||||
|
|
||||||
export interface RenderOptions {
|
export interface RenderOptions {
|
||||||
@@ -14,16 +14,11 @@ export interface ScopeOptions {
|
|||||||
readonly finalizerExecutionStrategy?: ExecutionStrategy.ExecutionStrategy
|
readonly finalizerExecutionStrategy?: ExecutionStrategy.ExecutionStrategy
|
||||||
}
|
}
|
||||||
|
|
||||||
export type RefsA<T extends readonly SubscriptionRef.SubscriptionRef<any>[]> = {
|
|
||||||
[K in keyof T]: Effect.Effect.Success<T[K]>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export abstract class ReffuseNamespace<R> {
|
export abstract class ReffuseNamespace<R> {
|
||||||
declare ["constructor"]: ReffuseNamespaceClass<R>
|
declare ["constructor"]: ReffuseNamespaceClass<R>
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.SubRef = this.SubRef.bind(this as any) as any
|
|
||||||
this.SubscribeRefs = this.SubscribeRefs.bind(this as any) as any
|
this.SubscribeRefs = this.SubscribeRefs.bind(this as any) as any
|
||||||
this.RefState = this.RefState.bind(this as any) as any
|
this.RefState = this.RefState.bind(this as any) as any
|
||||||
this.SubscribeStream = this.SubscribeStream.bind(this as any) as any
|
this.SubscribeStream = this.SubscribeStream.bind(this as any) as any
|
||||||
@@ -389,35 +384,24 @@ export abstract class ReffuseNamespace<R> {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
useSubRef<B, const P extends PropertyPath.Paths<B>, R>(
|
|
||||||
this: ReffuseNamespace<R>,
|
|
||||||
parent: SubscriptionRef.SubscriptionRef<B>,
|
|
||||||
path: P,
|
|
||||||
): SubscriptionSubRef.SubscriptionSubRef<PropertyPath.ValueFromPath<B, P>, B> {
|
|
||||||
return React.useMemo(
|
|
||||||
() => SubscriptionSubRef.makeFromPath(parent, path),
|
|
||||||
[parent],
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
useSubscribeRefs<
|
useSubscribeRefs<
|
||||||
const Refs extends readonly SubscriptionRef.SubscriptionRef<any>[],
|
const Refs extends readonly SubscriptionRef.SubscriptionRef<any>[],
|
||||||
R,
|
R,
|
||||||
>(
|
>(
|
||||||
this: ReffuseNamespace<R>,
|
this: ReffuseNamespace<R>,
|
||||||
...refs: Refs
|
...refs: Refs
|
||||||
): RefsA<Refs> {
|
): [...{ [K in keyof Refs]: Effect.Effect.Success<Refs[K]> }] {
|
||||||
const [reactStateValue, setReactStateValue] = React.useState(this.useMemo(
|
const [reactStateValue, setReactStateValue] = React.useState(this.useMemo(
|
||||||
() => Effect.all(refs as readonly SubscriptionRef.SubscriptionRef<any>[]),
|
() => Effect.all(refs as readonly SubscriptionRef.SubscriptionRef<any>[]),
|
||||||
[],
|
[],
|
||||||
{ doNotReExecuteOnRuntimeOrContextChange: true },
|
{ doNotReExecuteOnRuntimeOrContextChange: true },
|
||||||
) as RefsA<Refs>)
|
) as [...{ [K in keyof Refs]: Effect.Effect.Success<Refs[K]> }])
|
||||||
|
|
||||||
this.useFork(() => pipe(
|
this.useFork(() => pipe(
|
||||||
refs.map(ref => Stream.changesWith(ref.changes, (x, y) => x === y)),
|
refs.map(ref => Stream.changesWith(ref.changes, (x, y) => x === y)),
|
||||||
streams => Stream.zipLatestAll(...streams),
|
streams => Stream.zipLatestAll(...streams),
|
||||||
Stream.runForEach(v =>
|
Stream.runForEach(v =>
|
||||||
Effect.sync(() => setReactStateValue(v as RefsA<Refs>))
|
Effect.sync(() => setReactStateValue(v as [...{ [K in keyof Refs]: Effect.Effect.Success<Refs[K]> }]))
|
||||||
),
|
),
|
||||||
), refs)
|
), refs)
|
||||||
|
|
||||||
@@ -484,17 +468,6 @@ export abstract class ReffuseNamespace<R> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SubRef<B, const P extends PropertyPath.Paths<B>, R>(
|
|
||||||
this: ReffuseNamespace<R>,
|
|
||||||
props: {
|
|
||||||
readonly parent: SubscriptionRef.SubscriptionRef<B>,
|
|
||||||
readonly path: P,
|
|
||||||
readonly children: (subRef: SubscriptionSubRef.SubscriptionSubRef<PropertyPath.ValueFromPath<B, P>, B>) => React.ReactNode
|
|
||||||
},
|
|
||||||
): React.ReactNode {
|
|
||||||
return props.children(this.useSubRef(props.parent, props.path))
|
|
||||||
}
|
|
||||||
|
|
||||||
SubscribeRefs<
|
SubscribeRefs<
|
||||||
const Refs extends readonly SubscriptionRef.SubscriptionRef<any>[],
|
const Refs extends readonly SubscriptionRef.SubscriptionRef<any>[],
|
||||||
R,
|
R,
|
||||||
@@ -502,7 +475,7 @@ export abstract class ReffuseNamespace<R> {
|
|||||||
this: ReffuseNamespace<R>,
|
this: ReffuseNamespace<R>,
|
||||||
props: {
|
props: {
|
||||||
readonly refs: Refs
|
readonly refs: Refs
|
||||||
readonly children: (...args: RefsA<Refs>) => React.ReactNode
|
readonly children: (...args: [...{ [K in keyof Refs]: Effect.Effect.Success<Refs[K]> }]) => React.ReactNode
|
||||||
},
|
},
|
||||||
): React.ReactNode {
|
): React.ReactNode {
|
||||||
return props.children(...this.useSubscribeRefs(...props.refs))
|
return props.children(...this.useSubscribeRefs(...props.refs))
|
||||||
|
|||||||
@@ -3,3 +3,4 @@ export * as ReffuseContext from "./ReffuseContext.js"
|
|||||||
export * as ReffuseExtension from "./ReffuseExtension.js"
|
export * as ReffuseExtension from "./ReffuseExtension.js"
|
||||||
export * as ReffuseNamespace from "./ReffuseNamespace.js"
|
export * as ReffuseNamespace from "./ReffuseNamespace.js"
|
||||||
export * as ReffuseRuntime from "./ReffuseRuntime.js"
|
export * as ReffuseRuntime from "./ReffuseRuntime.js"
|
||||||
|
export * as SetStateAction from "./SetStateAction.js"
|
||||||
|
|||||||
@@ -1,94 +0,0 @@
|
|||||||
import { Array, Function, Option, Predicate } from "effect"
|
|
||||||
|
|
||||||
|
|
||||||
export type Paths<T> = [] | (
|
|
||||||
T extends readonly any[] ? ArrayPaths<T> :
|
|
||||||
T extends object ? ObjectPaths<T> :
|
|
||||||
never
|
|
||||||
)
|
|
||||||
|
|
||||||
export type ArrayPaths<T extends readonly any[]> = {
|
|
||||||
[K in keyof T as K extends number ? K : never]:
|
|
||||||
| [K]
|
|
||||||
| [K, ...Paths<T[K]>]
|
|
||||||
} extends infer O
|
|
||||||
? O[keyof O]
|
|
||||||
: never
|
|
||||||
|
|
||||||
export type ObjectPaths<T extends object> = {
|
|
||||||
[K in keyof T as K extends string | number | symbol ? K : never]:
|
|
||||||
| [K]
|
|
||||||
| [K, ...Paths<T[K]>]
|
|
||||||
} extends infer O
|
|
||||||
? O[keyof O]
|
|
||||||
: never
|
|
||||||
|
|
||||||
export type ValueFromPath<T, P extends any[]> = P extends [infer Head, ...infer Tail]
|
|
||||||
? Head extends keyof T
|
|
||||||
? ValueFromPath<T[Head], Tail>
|
|
||||||
: T extends readonly any[]
|
|
||||||
? Head extends number
|
|
||||||
? ValueFromPath<T[number], Tail>
|
|
||||||
: never
|
|
||||||
: never
|
|
||||||
: T
|
|
||||||
|
|
||||||
export type AnyKey = string | number | symbol
|
|
||||||
export type AnyPath = readonly AnyKey[]
|
|
||||||
|
|
||||||
|
|
||||||
export const unsafeGet: {
|
|
||||||
<T, const P extends Paths<T>>(path: P): (self: T) => ValueFromPath<T, P>
|
|
||||||
<T, const P extends Paths<T>>(self: T, path: P): ValueFromPath<T, P>
|
|
||||||
} = Function.dual(2, <T, const P extends Paths<T>>(self: T, path: P): ValueFromPath<T, P> =>
|
|
||||||
path.reduce((acc: any, key: any) => acc?.[key], self)
|
|
||||||
)
|
|
||||||
|
|
||||||
export const get: {
|
|
||||||
<T, const P extends Paths<T>>(path: P): (self: T) => Option.Option<ValueFromPath<T, P>>
|
|
||||||
<T, const P extends Paths<T>>(self: T, path: P): Option.Option<ValueFromPath<T, P>>
|
|
||||||
} = Function.dual(2, <T, const P extends Paths<T>>(self: T, path: P): Option.Option<ValueFromPath<T, P>> =>
|
|
||||||
path.reduce(
|
|
||||||
(acc: Option.Option<any>, key: any): Option.Option<any> => Option.isSome(acc)
|
|
||||||
? Predicate.hasProperty(acc.value, key)
|
|
||||||
? Option.some(acc.value[key])
|
|
||||||
: Option.none()
|
|
||||||
: acc,
|
|
||||||
|
|
||||||
Option.some(self),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
export const immutableSet: {
|
|
||||||
<T, const P extends Paths<T>>(path: P, value: ValueFromPath<T, P>): (self: T) => ValueFromPath<T, P>
|
|
||||||
<T, const P extends Paths<T>>(self: T, path: P, value: ValueFromPath<T, P>): Option.Option<T>
|
|
||||||
} = Function.dual(3, <T, const P extends Paths<T>>(self: T, path: P, value: ValueFromPath<T, P>): Option.Option<T> => {
|
|
||||||
const key = Array.head(path as AnyPath)
|
|
||||||
if (Option.isNone(key))
|
|
||||||
return Option.some(value as T)
|
|
||||||
if (!Predicate.hasProperty(self, key.value))
|
|
||||||
return Option.none()
|
|
||||||
|
|
||||||
const child = immutableSet<any, any>(self[key.value], Option.getOrThrow(Array.tail(path as AnyPath)), value)
|
|
||||||
if (Option.isNone(child))
|
|
||||||
return child
|
|
||||||
|
|
||||||
if (Array.isArray(self))
|
|
||||||
return typeof key.value === "number"
|
|
||||||
? Option.some([
|
|
||||||
...self.slice(0, key.value),
|
|
||||||
child.value,
|
|
||||||
...self.slice(key.value + 1),
|
|
||||||
] as T)
|
|
||||||
: Option.none()
|
|
||||||
|
|
||||||
if (typeof self === "object")
|
|
||||||
return Option.some(
|
|
||||||
Object.assign(
|
|
||||||
Object.create(Object.getPrototypeOf(self)),
|
|
||||||
{ ...self, [key.value]: child.value },
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return Option.none()
|
|
||||||
})
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
import { Effect, Effectable, Option, Readable, Ref, Stream, Subscribable, SubscriptionRef, SynchronizedRef, type Types, type Unify } from "effect"
|
|
||||||
import * as PropertyPath from "./PropertyPath.js"
|
|
||||||
|
|
||||||
|
|
||||||
export const SubscriptionSubRefTypeId: unique symbol = Symbol.for("reffuse/types/SubscriptionSubRef")
|
|
||||||
export type SubscriptionSubRefTypeId = typeof SubscriptionSubRefTypeId
|
|
||||||
|
|
||||||
export interface SubscriptionSubRef<in out A, in out B> extends SubscriptionSubRef.Variance<A, B>, SubscriptionRef.SubscriptionRef<A> {
|
|
||||||
readonly parent: SubscriptionRef.SubscriptionRef<B>
|
|
||||||
|
|
||||||
readonly [Unify.typeSymbol]?: unknown
|
|
||||||
readonly [Unify.unifySymbol]?: SubscriptionSubRefUnify<this>
|
|
||||||
readonly [Unify.ignoreSymbol]?: SubscriptionSubRefUnifyIgnore
|
|
||||||
}
|
|
||||||
|
|
||||||
export declare namespace SubscriptionSubRef {
|
|
||||||
export interface Variance<in out A, in out B> {
|
|
||||||
readonly [SubscriptionSubRefTypeId]: {
|
|
||||||
readonly _A: Types.Invariant<A>
|
|
||||||
readonly _B: Types.Invariant<B>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SubscriptionSubRefUnify<A extends { [Unify.typeSymbol]?: any }> extends SubscriptionRef.SubscriptionRefUnify<A> {
|
|
||||||
SubscriptionSubRef?: () => Extract<A[Unify.typeSymbol], SubscriptionSubRef<any, any>>
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SubscriptionSubRefUnifyIgnore extends SubscriptionRef.SubscriptionRefUnifyIgnore {
|
|
||||||
SubscriptionRef?: true
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const refVariance = { _A: (_: any) => _ }
|
|
||||||
const synchronizedRefVariance = { _A: (_: any) => _ }
|
|
||||||
const subscriptionRefVariance = { _A: (_: any) => _ }
|
|
||||||
const subscriptionSubRefVariance = { _A: (_: any) => _, _B: (_: any) => _ }
|
|
||||||
|
|
||||||
class SubscriptionSubRefImpl<in out A, in out B> extends Effectable.Class<A> implements SubscriptionSubRef<A, B> {
|
|
||||||
readonly [Readable.TypeId]: Readable.TypeId = Readable.TypeId
|
|
||||||
readonly [Subscribable.TypeId]: Subscribable.TypeId = Subscribable.TypeId
|
|
||||||
readonly [Ref.RefTypeId] = refVariance
|
|
||||||
readonly [SynchronizedRef.SynchronizedRefTypeId] = synchronizedRefVariance
|
|
||||||
readonly [SubscriptionRef.SubscriptionRefTypeId] = subscriptionRefVariance
|
|
||||||
readonly [SubscriptionSubRefTypeId] = subscriptionSubRefVariance
|
|
||||||
|
|
||||||
readonly get: Effect.Effect<A>
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
readonly parent: SubscriptionRef.SubscriptionRef<B>,
|
|
||||||
readonly getter: (parentValue: B) => A,
|
|
||||||
readonly setter: (parentValue: B, value: A) => B,
|
|
||||||
) {
|
|
||||||
super()
|
|
||||||
this.get = Ref.get(this.parent).pipe(Effect.map(this.getter))
|
|
||||||
}
|
|
||||||
|
|
||||||
commit() {
|
|
||||||
return this.get
|
|
||||||
}
|
|
||||||
|
|
||||||
get changes(): Stream.Stream<A> {
|
|
||||||
return this.get.pipe(
|
|
||||||
Effect.map(a => this.parent.changes.pipe(
|
|
||||||
Stream.map(this.getter),
|
|
||||||
s => Stream.concat(Stream.make(a), s),
|
|
||||||
)),
|
|
||||||
Stream.unwrap,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
modify<C>(f: (a: A) => readonly [C, A]): Effect.Effect<C> {
|
|
||||||
return this.modifyEffect(a => Effect.succeed(f(a)))
|
|
||||||
}
|
|
||||||
|
|
||||||
modifyEffect<C, E, R>(f: (a: A) => Effect.Effect<readonly [C, A], E, R>): Effect.Effect<C, E, R> {
|
|
||||||
return Effect.Do.pipe(
|
|
||||||
Effect.bind("b", () => Ref.get(this.parent)),
|
|
||||||
Effect.bind("ca", ({ b }) => f(this.getter(b))),
|
|
||||||
Effect.tap(({ b, ca: [, a] }) => Ref.set(this.parent, this.setter(b, a))),
|
|
||||||
Effect.map(({ ca: [c] }) => c),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const makeFromGetSet = <A, B>(
|
|
||||||
parent: SubscriptionRef.SubscriptionRef<B>,
|
|
||||||
getter: (parentValue: B) => A,
|
|
||||||
setter: (parentValue: B, value: A) => B,
|
|
||||||
): SubscriptionSubRef<A, B> => new SubscriptionSubRefImpl(parent, getter, setter)
|
|
||||||
|
|
||||||
export const makeFromPath = <B, const P extends PropertyPath.Paths<B>>(
|
|
||||||
parent: SubscriptionRef.SubscriptionRef<B>,
|
|
||||||
path: P,
|
|
||||||
): SubscriptionSubRef<PropertyPath.ValueFromPath<B, P>, B> => new SubscriptionSubRefImpl(
|
|
||||||
parent,
|
|
||||||
parentValue => Option.getOrThrow(PropertyPath.get(parentValue, path)),
|
|
||||||
(parentValue, value) => Option.getOrThrow(PropertyPath.immutableSet(parentValue, path, value)),
|
|
||||||
)
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export * as PropertyPath from "./PropertyPath.js"
|
|
||||||
export * as SetStateAction from "./SetStateAction.js"
|
|
||||||
export * as SubscriptionSubRef from "./SubscriptionSubRef.js"
|
|
||||||
Reference in New Issue
Block a user