@atom.io/spa 0.0.8 → 0.0.10
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.
- package/README.md +194 -30
- package/README.mdx +78 -20
- package/dist/BrandMarkScene-CBYk-RJ2.js +140 -0
- package/dist/BrandMarkScene-CBYk-RJ2.js.map +1 -0
- package/dist/astro-application.d.ts +1 -1
- package/dist/astro-client.d.ts +1 -1
- package/dist/astro-client.d.ts.map +1 -1
- package/dist/astro-client.js +5 -4
- package/dist/astro-client.js.map +1 -1
- package/dist/astro-resumability-client.d.ts +1 -1
- package/dist/astro-server.js +4 -4
- package/dist/astro-server.js.map +1 -1
- package/dist/{astro-shared-83hxw7-M.js → astro-shared-DBwINQav.js} +2 -2
- package/dist/{astro-shared-83hxw7-M.js.map → astro-shared-DBwINQav.js.map} +1 -1
- package/dist/{astro-shared-DZp1x8RQ.d.ts → astro-shared-KxK9OUSj.d.ts} +2 -2
- package/dist/{astro-shared-DZp1x8RQ.d.ts.map → astro-shared-KxK9OUSj.d.ts.map} +1 -1
- package/dist/astro.d.ts +1 -1
- package/dist/astro.js +1 -1
- package/dist/brand-css.d.ts +2 -0
- package/dist/brand-model.d.ts +32 -0
- package/dist/brand-model.d.ts.map +1 -0
- package/dist/brand-model.js +120 -0
- package/dist/brand-model.js.map +1 -0
- package/dist/brand.css +37 -0
- package/dist/brand.d.ts +13 -0
- package/dist/brand.d.ts.map +1 -0
- package/dist/brand.js +94 -0
- package/dist/brand.js.map +1 -0
- package/dist/{capabilities-DNcnGRv_.d.ts → capabilities-ChgSs6bp.d.ts} +34 -6
- package/dist/capabilities-ChgSs6bp.d.ts.map +1 -0
- package/dist/client.min.js +1 -1
- package/dist/core-DD2giR6E.js +451 -0
- package/dist/core-DD2giR6E.js.map +1 -0
- package/dist/development/BrandMarkScene-BDdC7K5M.js +140 -0
- package/dist/development/BrandMarkScene-BDdC7K5M.js.map +1 -0
- package/dist/development/astro-client.js +5 -4
- package/dist/development/astro-client.js.map +1 -1
- package/dist/development/astro-server.js +4 -4
- package/dist/development/astro-server.js.map +1 -1
- package/dist/development/{astro-shared-83hxw7-M.js → astro-shared-DBwINQav.js} +2 -2
- package/dist/development/{astro-shared-83hxw7-M.js.map → astro-shared-DBwINQav.js.map} +1 -1
- package/dist/development/astro.js +1 -1
- package/dist/development/brand-model.js +120 -0
- package/dist/development/brand-model.js.map +1 -0
- package/dist/development/brand.css +37 -0
- package/dist/development/brand.js +94 -0
- package/dist/development/brand.js.map +1 -0
- package/dist/development/core-DrUd8x25.js +465 -0
- package/dist/development/core-DrUd8x25.js.map +1 -0
- package/dist/development/{dom-DQ0M3rLL.js → dom-CEVtlaav.js} +152 -36
- package/dist/development/dom-CEVtlaav.js.map +1 -0
- package/dist/development/floating.js +2 -6
- package/dist/development/floating.js.map +1 -1
- package/dist/development/hot.js +164 -0
- package/dist/development/hot.js.map +1 -0
- package/dist/development/identity-B8wTFkyW.js +121 -0
- package/dist/development/identity-B8wTFkyW.js.map +1 -0
- package/dist/development/index.js +5 -5
- package/dist/development/jsx-runtime-BGDPK50B.js +49 -0
- package/dist/development/jsx-runtime-BGDPK50B.js.map +1 -0
- package/dist/development/jsx-runtime.js +1 -25
- package/dist/development/konva.js +12 -5
- package/dist/development/konva.js.map +1 -1
- package/dist/development/motion.js +41 -39
- package/dist/development/motion.js.map +1 -1
- package/dist/development/renderer.js +41 -40
- package/dist/development/renderer.js.map +1 -1
- package/dist/development/{server-renderer-DCLoMdOX.js → server-renderer-zAqEL1g1.js} +8 -18
- package/dist/development/server-renderer-zAqEL1g1.js.map +1 -0
- package/dist/development/server.js +1 -1
- package/dist/{src-Bme1kz2b.js → development/src-CB7ruwRs.js} +3 -3
- package/dist/development/src-CB7ruwRs.js.map +1 -0
- package/dist/development/three-CsZ6Od1C.js +527 -0
- package/dist/development/three-CsZ6Od1C.js.map +1 -0
- package/dist/development/three.js +1 -508
- package/dist/development/vite-WUiz1ju6.js +545 -0
- package/dist/development/vite-WUiz1ju6.js.map +1 -0
- package/dist/development/vite.js +1 -1
- package/dist/{dom-D8g3roX9.js → dom-DUpa3Sj2.js} +141 -33
- package/dist/dom-DUpa3Sj2.js.map +1 -0
- package/dist/floating.d.ts +1 -1
- package/dist/floating.d.ts.map +1 -1
- package/dist/floating.js +2 -6
- package/dist/floating.js.map +1 -1
- package/dist/hot.d.ts +15 -0
- package/dist/hot.d.ts.map +1 -0
- package/dist/hot.js +19 -0
- package/dist/hot.js.map +1 -0
- package/dist/identity-ByJswZtF.js +121 -0
- package/dist/identity-ByJswZtF.js.map +1 -0
- package/dist/{index-BFnXIfOj.d.ts → index-DdA39aMv.d.ts} +4 -4
- package/dist/{index-BFnXIfOj.d.ts.map → index-DdA39aMv.d.ts.map} +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.js +5 -5
- package/dist/jsx-runtime-BGDPK50B.js +49 -0
- package/dist/jsx-runtime-BGDPK50B.js.map +1 -0
- package/dist/{jsx-runtime-DQnpyT_g.d.ts → jsx-runtime-CCvcEosg.d.ts} +14 -9
- package/dist/jsx-runtime-CCvcEosg.d.ts.map +1 -0
- package/dist/jsx-runtime.d.ts +1 -1
- package/dist/jsx-runtime.js +1 -25
- package/dist/konva.d.ts +46 -9
- package/dist/konva.d.ts.map +1 -1
- package/dist/konva.js +12 -5
- package/dist/konva.js.map +1 -1
- package/dist/motion.d.ts +3 -1
- package/dist/motion.d.ts.map +1 -1
- package/dist/motion.js +41 -39
- package/dist/motion.js.map +1 -1
- package/dist/renderer.d.ts +1 -1
- package/dist/renderer.d.ts.map +1 -1
- package/dist/renderer.js +39 -40
- package/dist/renderer.js.map +1 -1
- package/dist/{server-renderer-D0rsFL_-.js → server-renderer-D7CdyOMo.js} +8 -18
- package/dist/server-renderer-D7CdyOMo.js.map +1 -0
- package/dist/server.d.ts +1 -1
- package/dist/server.js +1 -1
- package/dist/size.json +12 -12
- package/dist/{development/src-DoQgCX-O.js → src-B2W_TA_X.js} +3 -3
- package/dist/src-B2W_TA_X.js.map +1 -0
- package/dist/three-DcYxRXPW.js +527 -0
- package/dist/three-DcYxRXPW.js.map +1 -0
- package/dist/three.d.ts +24 -3
- package/dist/three.d.ts.map +1 -1
- package/dist/three.js +1 -508
- package/dist/vite-WUiz1ju6.js +545 -0
- package/dist/vite-WUiz1ju6.js.map +1 -0
- package/dist/vite.d.ts.map +1 -1
- package/dist/vite.js +1 -1
- package/package.json +45 -18
- package/src/BrandMark.module.css +25 -0
- package/src/BrandMark.tsx +106 -0
- package/src/BrandMarkScene.module.css +10 -0
- package/src/BrandMarkScene.tsx +116 -0
- package/src/astro-client.ts +3 -2
- package/src/astro-server.ts +2 -2
- package/src/brand-css.d.ts +2 -0
- package/src/brand-model.ts +177 -0
- package/src/brand.ts +3 -0
- package/src/capabilities.ts +48 -21
- package/src/compiler-hmr.ts +297 -0
- package/src/compiler.ts +127 -25
- package/src/core.ts +282 -33
- package/src/dom-forms.ts +127 -0
- package/src/dom.ts +124 -53
- package/src/floating.ts +2 -6
- package/src/hot.ts +191 -0
- package/src/identity.ts +39 -0
- package/src/index.ts +2 -0
- package/src/jsx-runtime.ts +6 -26
- package/src/jsx-types.d.ts +8 -3
- package/src/konva.ts +66 -10
- package/src/lasertag.d.ts +1 -0
- package/src/motion-layout.ts +55 -26
- package/src/motion.ts +3 -0
- package/src/presence.ts +11 -23
- package/src/props.ts +55 -0
- package/src/renderer.ts +91 -71
- package/src/server-renderer.ts +18 -13
- package/src/three.ts +92 -46
- package/src/use-loadable.ts +2 -2
- package/src/vite.ts +44 -4
- package/dist/capabilities-DNcnGRv_.d.ts.map +0 -1
- package/dist/capabilities-nOIitQ-_.js +0 -65
- package/dist/capabilities-nOIitQ-_.js.map +0 -1
- package/dist/core-B4rJ0xdc.js +0 -268
- package/dist/core-B4rJ0xdc.js.map +0 -1
- package/dist/development/capabilities-nOIitQ-_.js +0 -65
- package/dist/development/capabilities-nOIitQ-_.js.map +0 -1
- package/dist/development/core-BHA7I1nf.js +0 -271
- package/dist/development/core-BHA7I1nf.js.map +0 -1
- package/dist/development/dom-DQ0M3rLL.js.map +0 -1
- package/dist/development/jsx-runtime.js.map +0 -1
- package/dist/development/server-renderer-DCLoMdOX.js.map +0 -1
- package/dist/development/src-DoQgCX-O.js.map +0 -1
- package/dist/development/three.js.map +0 -1
- package/dist/development/vite-Bmyb6P5w.js +0 -265
- package/dist/development/vite-Bmyb6P5w.js.map +0 -1
- package/dist/dom-D8g3roX9.js.map +0 -1
- package/dist/jsx-runtime-DQnpyT_g.d.ts.map +0 -1
- package/dist/jsx-runtime.js.map +0 -1
- package/dist/server-renderer-D0rsFL_-.js.map +0 -1
- package/dist/src-Bme1kz2b.js.map +0 -1
- package/dist/three.js.map +0 -1
- package/dist/vite-Bmyb6P5w.js +0 -265
- package/dist/vite-Bmyb6P5w.js.map +0 -1
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import * as THREE from "three"
|
|
2
|
+
|
|
3
|
+
export const DZ2_ORBITAL_FINAL_SPIN_RADIANS = 1.1
|
|
4
|
+
const DZ2_ORBITAL_SETTLED_ROTATION_X = 1.4
|
|
5
|
+
const DZ2_ORBITAL_SETTLED_ROTATION_Z = -1.4
|
|
6
|
+
export const DZ2_ORBITAL_Y_ROTATION_RADIANS_PER_SECOND = Math.PI / 128
|
|
7
|
+
const DZ2_ORBITAL_LOBE_CENTER_OFFSET = 0.05
|
|
8
|
+
|
|
9
|
+
const DZ2_ORBITAL_CAMERA = {
|
|
10
|
+
fov: 34,
|
|
11
|
+
near: 0.1,
|
|
12
|
+
far: 100,
|
|
13
|
+
position: [4.2, 2.4, 6.6],
|
|
14
|
+
lookAt: [0, 0, 0],
|
|
15
|
+
} satisfies {
|
|
16
|
+
fov: number
|
|
17
|
+
near: number
|
|
18
|
+
far: number
|
|
19
|
+
position: [number, number, number]
|
|
20
|
+
lookAt: [number, number, number]
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** @internal Used by contributor tools or implementation tests. */
|
|
24
|
+
export const DZ2_ORBITAL_LIGHTS = {
|
|
25
|
+
core: {
|
|
26
|
+
color: 0xffffff,
|
|
27
|
+
intensity: 28,
|
|
28
|
+
distance: 9,
|
|
29
|
+
position: [1.8, 1.7, 3.5],
|
|
30
|
+
},
|
|
31
|
+
ambient: {
|
|
32
|
+
color: 0x9fd6ff,
|
|
33
|
+
intensity: 1.4,
|
|
34
|
+
},
|
|
35
|
+
} satisfies {
|
|
36
|
+
core: {
|
|
37
|
+
color: number
|
|
38
|
+
intensity: number
|
|
39
|
+
distance: number
|
|
40
|
+
position: [number, number, number]
|
|
41
|
+
}
|
|
42
|
+
ambient: {
|
|
43
|
+
color: number
|
|
44
|
+
intensity: number
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
type Dz2OrbitalMesh = THREE.Mesh<THREE.BufferGeometry, THREE.MeshToonMaterial>
|
|
49
|
+
|
|
50
|
+
export type Dz2OrbitalModel = {
|
|
51
|
+
orbital: THREE.Group
|
|
52
|
+
meshes: Dz2OrbitalMesh[]
|
|
53
|
+
materials: {
|
|
54
|
+
lobe: THREE.MeshToonMaterial
|
|
55
|
+
torus: THREE.MeshToonMaterial
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
function makeLobeGeometry(direction: 1 | -1): THREE.LatheGeometry {
|
|
60
|
+
const points: THREE.Vector2[] = []
|
|
61
|
+
const height = 1.5
|
|
62
|
+
const radius = 0.75
|
|
63
|
+
for (let index = 0; index <= 44; index++) {
|
|
64
|
+
const progress = index / 45
|
|
65
|
+
const easedRadius =
|
|
66
|
+
radius * Math.sin(Math.PI * progress) ** 0.58 * (0.5 + progress * 0.6)
|
|
67
|
+
|
|
68
|
+
points.push(new THREE.Vector2(easedRadius, direction * progress * height))
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
for (let index = 440; index <= 450; index++) {
|
|
72
|
+
const progress = index / 450
|
|
73
|
+
const easedRadius =
|
|
74
|
+
radius * Math.sin(Math.PI * progress) ** 0.58 * (0.5 + progress * 0.6)
|
|
75
|
+
points.push(new THREE.Vector2(easedRadius, direction * progress * height))
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
const lastPoint = points[points.length - 1]
|
|
79
|
+
const nextToLastPoint = points[points.length - 2]
|
|
80
|
+
lastPoint.setY(nextToLastPoint.y)
|
|
81
|
+
points[0].setY(points[1].y)
|
|
82
|
+
return new THREE.LatheGeometry(points, 96)
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
export function createDz2OrbitalCamera(aspect = 1): THREE.PerspectiveCamera {
|
|
86
|
+
const camera = new THREE.PerspectiveCamera(
|
|
87
|
+
DZ2_ORBITAL_CAMERA.fov,
|
|
88
|
+
aspect,
|
|
89
|
+
DZ2_ORBITAL_CAMERA.near,
|
|
90
|
+
DZ2_ORBITAL_CAMERA.far,
|
|
91
|
+
)
|
|
92
|
+
camera.position.set(...DZ2_ORBITAL_CAMERA.position)
|
|
93
|
+
camera.lookAt(...DZ2_ORBITAL_CAMERA.lookAt)
|
|
94
|
+
return camera
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
export function addDz2OrbitalLights(scene: THREE.Scene): void {
|
|
98
|
+
const coreLight = new THREE.PointLight(
|
|
99
|
+
DZ2_ORBITAL_LIGHTS.core.color,
|
|
100
|
+
DZ2_ORBITAL_LIGHTS.core.intensity,
|
|
101
|
+
DZ2_ORBITAL_LIGHTS.core.distance,
|
|
102
|
+
)
|
|
103
|
+
coreLight.position.set(...DZ2_ORBITAL_LIGHTS.core.position)
|
|
104
|
+
scene.add(coreLight)
|
|
105
|
+
scene.add(
|
|
106
|
+
new THREE.AmbientLight(
|
|
107
|
+
DZ2_ORBITAL_LIGHTS.ambient.color,
|
|
108
|
+
DZ2_ORBITAL_LIGHTS.ambient.intensity,
|
|
109
|
+
),
|
|
110
|
+
)
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
export function setDz2OrbitalRotation(
|
|
114
|
+
orbital: THREE.Object3D,
|
|
115
|
+
y = DZ2_ORBITAL_FINAL_SPIN_RADIANS,
|
|
116
|
+
): void {
|
|
117
|
+
orbital.rotation.set(
|
|
118
|
+
DZ2_ORBITAL_SETTLED_ROTATION_X,
|
|
119
|
+
y,
|
|
120
|
+
DZ2_ORBITAL_SETTLED_ROTATION_Z,
|
|
121
|
+
)
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
export function createDz2OrbitalModel(): Dz2OrbitalModel {
|
|
125
|
+
const orbital = new THREE.Group()
|
|
126
|
+
setDz2OrbitalRotation(orbital)
|
|
127
|
+
|
|
128
|
+
const lobeMaterial = new THREE.MeshToonMaterial({
|
|
129
|
+
color: 0xff3366,
|
|
130
|
+
emissive: 0xff3366,
|
|
131
|
+
emissiveIntensity: 0.22,
|
|
132
|
+
opacity: 0.82,
|
|
133
|
+
side: THREE.DoubleSide,
|
|
134
|
+
})
|
|
135
|
+
const torusMaterial = new THREE.MeshToonMaterial({
|
|
136
|
+
color: 0x0099ff,
|
|
137
|
+
emissive: 0x0099ff,
|
|
138
|
+
emissiveIntensity: 0.17,
|
|
139
|
+
opacity: 0.72,
|
|
140
|
+
side: THREE.DoubleSide,
|
|
141
|
+
})
|
|
142
|
+
|
|
143
|
+
const topLobe: Dz2OrbitalMesh = new THREE.Mesh(
|
|
144
|
+
makeLobeGeometry(1),
|
|
145
|
+
lobeMaterial,
|
|
146
|
+
)
|
|
147
|
+
const bottomLobe: Dz2OrbitalMesh = new THREE.Mesh(
|
|
148
|
+
makeLobeGeometry(-1),
|
|
149
|
+
lobeMaterial,
|
|
150
|
+
)
|
|
151
|
+
topLobe.position.y = DZ2_ORBITAL_LOBE_CENTER_OFFSET
|
|
152
|
+
bottomLobe.position.y = -DZ2_ORBITAL_LOBE_CENTER_OFFSET
|
|
153
|
+
const torus: Dz2OrbitalMesh = new THREE.Mesh(
|
|
154
|
+
new THREE.TorusGeometry(1.2, 0.3, 36, 144),
|
|
155
|
+
torusMaterial,
|
|
156
|
+
)
|
|
157
|
+
torus.rotation.x = Math.PI / 2
|
|
158
|
+
const meshes = [topLobe, bottomLobe, torus]
|
|
159
|
+
orbital.add(...meshes)
|
|
160
|
+
|
|
161
|
+
return {
|
|
162
|
+
orbital,
|
|
163
|
+
meshes,
|
|
164
|
+
materials: {
|
|
165
|
+
lobe: lobeMaterial,
|
|
166
|
+
torus: torusMaterial,
|
|
167
|
+
},
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
export function disposeDz2OrbitalModel(model: Dz2OrbitalModel): void {
|
|
172
|
+
for (const mesh of model.meshes) {
|
|
173
|
+
mesh.geometry.dispose()
|
|
174
|
+
}
|
|
175
|
+
model.materials.lobe.dispose()
|
|
176
|
+
model.materials.torus.dispose()
|
|
177
|
+
}
|
package/src/brand.ts
ADDED
package/src/capabilities.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Cleanup, Root, Scope } from "./core.ts"
|
|
2
|
+
import { isPresent, scopeCapabilities } from "./core.ts"
|
|
2
3
|
import type { ExitHandle, PresenceCoordinator } from "./presence.ts"
|
|
3
4
|
|
|
4
5
|
/** Native renderers expose property access without importing capability engines. */
|
|
@@ -26,6 +27,7 @@ export interface Capability {
|
|
|
26
27
|
/** SPA supplies ownership for integrations that measure after mount or report async errors. */
|
|
27
28
|
attach(target: CapabilityTarget, scope?: Scope): CapabilityBinding
|
|
28
29
|
}
|
|
30
|
+
type EventHandler = (this: unknown, ...args: unknown[]) => unknown
|
|
29
31
|
|
|
30
32
|
export function capabilityNamespace(key: string): string | undefined {
|
|
31
33
|
const colon = key.indexOf(`:`)
|
|
@@ -33,16 +35,25 @@ export function capabilityNamespace(key: string): string | undefined {
|
|
|
33
35
|
const namespace = key.slice(0, colon)
|
|
34
36
|
return /^(xml|xmlns|xlink)$/.test(namespace) ? undefined : namespace
|
|
35
37
|
}
|
|
38
|
+
function requireCapability(
|
|
39
|
+
capabilities: Map<string, Capability>,
|
|
40
|
+
namespace: string,
|
|
41
|
+
) {
|
|
42
|
+
const capability = capabilities.get(namespace)
|
|
43
|
+
if (!capability)
|
|
44
|
+
throw new Error(
|
|
45
|
+
`spa: capability "${namespace}" is not registered for this root`,
|
|
46
|
+
)
|
|
47
|
+
return capability
|
|
48
|
+
}
|
|
36
49
|
export function validateCapabilities(
|
|
37
50
|
scope: Scope,
|
|
38
51
|
props: Record<string, unknown>,
|
|
39
52
|
): void {
|
|
53
|
+
const capabilities = scopeCapabilities(scope)
|
|
40
54
|
for (const key of Object.keys(props)) {
|
|
41
55
|
const namespace = capabilityNamespace(key)
|
|
42
|
-
if (namespace
|
|
43
|
-
throw new Error(
|
|
44
|
-
`spa: capability "${namespace}" is not registered for this root`,
|
|
45
|
-
)
|
|
56
|
+
if (namespace) requireCapability(capabilities, namespace)
|
|
46
57
|
}
|
|
47
58
|
}
|
|
48
59
|
|
|
@@ -53,9 +64,24 @@ export function capabilityProps(
|
|
|
53
64
|
read?: () => Record<string, any>,
|
|
54
65
|
applyNative?: (props: Record<string, any>) => string | undefined,
|
|
55
66
|
): (props: Record<string, any>) => Record<string, any> {
|
|
56
|
-
const
|
|
67
|
+
const root = scope._root
|
|
68
|
+
const bindings = new Map<Capability, CapabilityBinding>()
|
|
69
|
+
let handlers: WeakMap<EventHandler, EventHandler> | undefined
|
|
70
|
+
const event = (handler: EventHandler) => {
|
|
71
|
+
const cache = (handlers ??= new WeakMap())
|
|
72
|
+
let wrapped = cache.get(handler)
|
|
73
|
+
if (!wrapped) {
|
|
74
|
+
wrapped = function (this: unknown, ...args: unknown[]) {
|
|
75
|
+
// Presence may activate after this listener mounts.
|
|
76
|
+
if (!root._presence || isPresent(scope)) return handler.apply(this, args)
|
|
77
|
+
}
|
|
78
|
+
cache.set(handler, wrapped)
|
|
79
|
+
}
|
|
80
|
+
return wrapped
|
|
81
|
+
}
|
|
57
82
|
|
|
58
|
-
|
|
83
|
+
if (root._presence) root._presence.target(scope, target)
|
|
84
|
+
else (scope._targets ??= new Set()).add(target)
|
|
59
85
|
const cleanup: Cleanup = () => {
|
|
60
86
|
const errors: unknown[] = []
|
|
61
87
|
for (const binding of [...bindings.values()].reverse()) {
|
|
@@ -70,43 +96,44 @@ export function capabilityProps(
|
|
|
70
96
|
}
|
|
71
97
|
scope._cleanups.add(cleanup)
|
|
72
98
|
return (props) => {
|
|
73
|
-
|
|
99
|
+
const capabilities = scopeCapabilities(scope)
|
|
74
100
|
const native: Record<string, any> = {}
|
|
75
|
-
const groups = new Map<
|
|
101
|
+
const groups = new Map<Capability, Record<string, unknown>>()
|
|
76
102
|
for (const key of Object.keys(props)) {
|
|
77
103
|
const namespace = capabilityNamespace(key)
|
|
78
104
|
if (!namespace) {
|
|
79
105
|
const value = props[key]
|
|
80
106
|
native[key] =
|
|
81
107
|
key.startsWith(`on`) && typeof value === `function`
|
|
82
|
-
?
|
|
108
|
+
? event(value)
|
|
83
109
|
: value
|
|
84
110
|
continue
|
|
85
111
|
}
|
|
86
|
-
const
|
|
112
|
+
const capability = requireCapability(capabilities, namespace)
|
|
113
|
+
const group = groups.get(capability) ?? {}
|
|
87
114
|
group[key.slice(namespace.length + 1)] = props[key]
|
|
88
|
-
groups.set(
|
|
115
|
+
groups.set(capability, group)
|
|
89
116
|
}
|
|
90
117
|
const previousStyle = applyNative?.(native)
|
|
91
|
-
for (const [
|
|
92
|
-
let binding = bindings.get(
|
|
118
|
+
for (const [capability, values] of groups) {
|
|
119
|
+
let binding = bindings.get(capability)
|
|
93
120
|
if (!binding) {
|
|
94
|
-
binding =
|
|
95
|
-
bindings.set(
|
|
96
|
-
|
|
121
|
+
binding = capability.attach(target, scope)
|
|
122
|
+
bindings.set(capability, binding)
|
|
123
|
+
root._presence?.bind(
|
|
97
124
|
scope,
|
|
98
125
|
binding,
|
|
99
126
|
read ?? (() => props),
|
|
100
|
-
namespace,
|
|
127
|
+
capability.namespace,
|
|
101
128
|
)
|
|
102
129
|
}
|
|
103
130
|
if (previousStyle !== undefined) binding.update(values, previousStyle)
|
|
104
131
|
else binding.update(values)
|
|
105
132
|
}
|
|
106
|
-
for (const [
|
|
107
|
-
if (!groups.has(
|
|
108
|
-
bindings.delete(
|
|
109
|
-
|
|
133
|
+
for (const [capability, binding] of bindings)
|
|
134
|
+
if (!groups.has(capability)) {
|
|
135
|
+
bindings.delete(capability)
|
|
136
|
+
root._presence?.unbind(binding)
|
|
110
137
|
binding.dispose()
|
|
111
138
|
}
|
|
112
139
|
return native
|
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
import remapping from "@jridgewell/remapping"
|
|
2
|
+
import type { SourceMap } from "magic-string"
|
|
3
|
+
import MagicString from "magic-string"
|
|
4
|
+
import type { Node } from "oxc-parser"
|
|
5
|
+
import { parseSync, visitorKeys } from "oxc-parser"
|
|
6
|
+
|
|
7
|
+
function walk(node: Node, visit: (node: Node) => void): void {
|
|
8
|
+
visit(node)
|
|
9
|
+
for (const key of visitorKeys[node.type]) {
|
|
10
|
+
const value = (node as unknown as Record<string, unknown>)[key]
|
|
11
|
+
if (Array.isArray(value)) {
|
|
12
|
+
for (const child of value) if (child) walk(child, visit)
|
|
13
|
+
} else if (value) walk(value as Node, visit)
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
const factories = new Set([
|
|
17
|
+
`atom`,
|
|
18
|
+
`atomFamily`,
|
|
19
|
+
`selector`,
|
|
20
|
+
`selectorFamily`,
|
|
21
|
+
`transaction`,
|
|
22
|
+
`timeline`,
|
|
23
|
+
`timelineFamily`,
|
|
24
|
+
`Silo`,
|
|
25
|
+
])
|
|
26
|
+
function stateIn(program: Node): boolean {
|
|
27
|
+
const names = new Set(factories)
|
|
28
|
+
walk(program, (node) => {
|
|
29
|
+
if (
|
|
30
|
+
node.type === `ImportDeclaration` &&
|
|
31
|
+
node.source.value.startsWith(`atom.io`)
|
|
32
|
+
) {
|
|
33
|
+
for (const specifier of node.specifiers) {
|
|
34
|
+
if (
|
|
35
|
+
specifier.type === `ImportSpecifier` &&
|
|
36
|
+
specifier.imported.type === `Identifier` &&
|
|
37
|
+
factories.has(specifier.imported.name)
|
|
38
|
+
)
|
|
39
|
+
names.add(specifier.local.name)
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
})
|
|
43
|
+
let found = false
|
|
44
|
+
walk(program, (node) => {
|
|
45
|
+
if (node.type === `CallExpression` || node.type === `NewExpression`) {
|
|
46
|
+
const callee = node.callee
|
|
47
|
+
if (
|
|
48
|
+
(callee.type === `Identifier` && names.has(callee.name)) ||
|
|
49
|
+
(callee.type === `MemberExpression` &&
|
|
50
|
+
!callee.computed &&
|
|
51
|
+
callee.property.type === `Identifier` &&
|
|
52
|
+
factories.has(callee.property.name))
|
|
53
|
+
)
|
|
54
|
+
found = true
|
|
55
|
+
}
|
|
56
|
+
})
|
|
57
|
+
return found
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export function requiresModuleReload(code: string, filename: string): boolean {
|
|
61
|
+
const program = parseSync(filename, code, { lang: `tsx` }).program
|
|
62
|
+
return (
|
|
63
|
+
stateIn(program) ||
|
|
64
|
+
program.body.some((node) => {
|
|
65
|
+
if (node.type === `ExportDefaultDeclaration`) return true
|
|
66
|
+
if (node.type === `ExportAllDeclaration`) return node.exportKind !== `type`
|
|
67
|
+
if (node.type !== `ExportNamedDeclaration` || node.exportKind === `type`)
|
|
68
|
+
return false
|
|
69
|
+
if (node.declaration)
|
|
70
|
+
return ![
|
|
71
|
+
`TSInterfaceDeclaration`,
|
|
72
|
+
`TSTypeAliasDeclaration`,
|
|
73
|
+
`TSDeclareFunction`,
|
|
74
|
+
].includes(node.declaration.type)
|
|
75
|
+
return node.specifiers.some((specifier) => specifier.exportKind !== `type`)
|
|
76
|
+
})
|
|
77
|
+
)
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/** Instrument only local component exports, composing both edits back to authored JSX. */
|
|
81
|
+
export function hotModule(
|
|
82
|
+
code: string,
|
|
83
|
+
filename: string,
|
|
84
|
+
originalMap: SourceMap,
|
|
85
|
+
):
|
|
86
|
+
| {
|
|
87
|
+
code: string
|
|
88
|
+
map: string
|
|
89
|
+
exports: string[]
|
|
90
|
+
}
|
|
91
|
+
| undefined {
|
|
92
|
+
const program = parseSync(filename, code, {
|
|
93
|
+
lang: `tsx`,
|
|
94
|
+
preserveParens: true,
|
|
95
|
+
}).program
|
|
96
|
+
if (stateIn(program)) return
|
|
97
|
+
const components = new Set<string>()
|
|
98
|
+
const declarations = new Map<string, Node>()
|
|
99
|
+
const exports = new Map<string, string[]>()
|
|
100
|
+
const defaults: Extract<Node, { type: `ExportDefaultDeclaration` }>[] = []
|
|
101
|
+
const identifiers = new Set<string>()
|
|
102
|
+
walk(program, (node) => {
|
|
103
|
+
if (node.type === `Identifier`) identifiers.add(node.name)
|
|
104
|
+
})
|
|
105
|
+
const branded = (node: Node): boolean => {
|
|
106
|
+
if (
|
|
107
|
+
node.type !== `ExpressionStatement` ||
|
|
108
|
+
node.expression.type !== `AssignmentExpression`
|
|
109
|
+
)
|
|
110
|
+
return false
|
|
111
|
+
const { left, right } = node.expression
|
|
112
|
+
if (
|
|
113
|
+
left.type !== `MemberExpression` ||
|
|
114
|
+
left.computed ||
|
|
115
|
+
left.object.type !== `Identifier` ||
|
|
116
|
+
left.property.type !== `Identifier` ||
|
|
117
|
+
left.property.name !== `spa` ||
|
|
118
|
+
right.type !== `Literal` ||
|
|
119
|
+
right.value !== true
|
|
120
|
+
)
|
|
121
|
+
return false
|
|
122
|
+
components.add(left.object.name)
|
|
123
|
+
return true
|
|
124
|
+
}
|
|
125
|
+
const declaration = (node: Node): boolean => {
|
|
126
|
+
if (node.type === `FunctionDeclaration` && node.id) {
|
|
127
|
+
declarations.set(node.id.name, node)
|
|
128
|
+
return true
|
|
129
|
+
}
|
|
130
|
+
if (node.type === `VariableDeclaration`) {
|
|
131
|
+
for (const entry of node.declarations) {
|
|
132
|
+
if (entry.id.type === `Identifier`) declarations.set(entry.id.name, node)
|
|
133
|
+
let unsafe = false
|
|
134
|
+
let init = entry.init
|
|
135
|
+
while (init?.type === `ParenthesizedExpression`) init = init.expression
|
|
136
|
+
if (
|
|
137
|
+
init &&
|
|
138
|
+
init.type !== `ArrowFunctionExpression` &&
|
|
139
|
+
init.type !== `FunctionExpression`
|
|
140
|
+
)
|
|
141
|
+
walk(init, (child) => {
|
|
142
|
+
if (
|
|
143
|
+
[
|
|
144
|
+
`CallExpression`,
|
|
145
|
+
`NewExpression`,
|
|
146
|
+
`TaggedTemplateExpression`,
|
|
147
|
+
].includes(child.type)
|
|
148
|
+
)
|
|
149
|
+
unsafe = true
|
|
150
|
+
})
|
|
151
|
+
if (unsafe) return false
|
|
152
|
+
}
|
|
153
|
+
return true
|
|
154
|
+
}
|
|
155
|
+
return [
|
|
156
|
+
`TSInterfaceDeclaration`,
|
|
157
|
+
`TSTypeAliasDeclaration`,
|
|
158
|
+
`TSDeclareFunction`,
|
|
159
|
+
].includes(node.type)
|
|
160
|
+
}
|
|
161
|
+
const add = (local: string, exported: string) => {
|
|
162
|
+
exports.set(local, [...(exports.get(local) ?? []), exported])
|
|
163
|
+
}
|
|
164
|
+
for (const statement of program.body) {
|
|
165
|
+
if (
|
|
166
|
+
statement.type === `ExportAllDeclaration` &&
|
|
167
|
+
statement.exportKind === `type`
|
|
168
|
+
)
|
|
169
|
+
continue
|
|
170
|
+
if (
|
|
171
|
+
statement.type === `ImportDeclaration` ||
|
|
172
|
+
statement.type === `EmptyStatement`
|
|
173
|
+
)
|
|
174
|
+
continue
|
|
175
|
+
if (
|
|
176
|
+
statement.type === `ExpressionStatement` &&
|
|
177
|
+
(statement.directive || branded(statement))
|
|
178
|
+
)
|
|
179
|
+
continue
|
|
180
|
+
if (statement.type === `ExportNamedDeclaration`) {
|
|
181
|
+
if (statement.exportKind === `type`) continue
|
|
182
|
+
if (statement.source) return
|
|
183
|
+
if (statement.declaration) {
|
|
184
|
+
const node = statement.declaration
|
|
185
|
+
if (!declaration(node)) return
|
|
186
|
+
if (node.type === `FunctionDeclaration` && node.id)
|
|
187
|
+
add(node.id.name, node.id.name)
|
|
188
|
+
if (node.type === `VariableDeclaration`)
|
|
189
|
+
for (const entry of node.declarations) {
|
|
190
|
+
if (entry.id.type !== `Identifier`) return
|
|
191
|
+
add(entry.id.name, entry.id.name)
|
|
192
|
+
}
|
|
193
|
+
} else
|
|
194
|
+
for (const specifier of statement.specifiers) {
|
|
195
|
+
if (specifier.exportKind === `type`) continue
|
|
196
|
+
add(
|
|
197
|
+
// Local export names are identifiers; string names require a source above.
|
|
198
|
+
(specifier.local as { name: string }).name,
|
|
199
|
+
specifier.exported.type === `Identifier`
|
|
200
|
+
? specifier.exported.name
|
|
201
|
+
: specifier.exported.value,
|
|
202
|
+
)
|
|
203
|
+
}
|
|
204
|
+
} else if (statement.type === `ExportDefaultDeclaration`) {
|
|
205
|
+
const node = statement.declaration
|
|
206
|
+
if (node.type === `Identifier`) add(node.name, `default`)
|
|
207
|
+
else if (node.type === `FunctionDeclaration` && node.id) {
|
|
208
|
+
declaration(node)
|
|
209
|
+
add(node.id.name, `default`)
|
|
210
|
+
} else return
|
|
211
|
+
defaults.push(statement)
|
|
212
|
+
} else if (!declaration(statement)) return
|
|
213
|
+
}
|
|
214
|
+
if (
|
|
215
|
+
!exports.size ||
|
|
216
|
+
[...exports.keys()].some(
|
|
217
|
+
(name) => !components.has(name) || !declarations.has(name),
|
|
218
|
+
)
|
|
219
|
+
)
|
|
220
|
+
return
|
|
221
|
+
const output = new MagicString(code)
|
|
222
|
+
const mutable = new Set<Node>()
|
|
223
|
+
for (const name of exports.keys()) {
|
|
224
|
+
const node = declarations.get(name)!
|
|
225
|
+
if (
|
|
226
|
+
node.type === `VariableDeclaration` &&
|
|
227
|
+
node.kind === `const` &&
|
|
228
|
+
!mutable.has(node)
|
|
229
|
+
) {
|
|
230
|
+
output.update(node.start, node.start + 5, `let`)
|
|
231
|
+
mutable.add(node)
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
for (const node of defaults) {
|
|
235
|
+
const value = node.declaration
|
|
236
|
+
const name =
|
|
237
|
+
value.type === `Identifier`
|
|
238
|
+
? value.name
|
|
239
|
+
: (value as { id: { name: string } }).id.name
|
|
240
|
+
const prefix = code.slice(node.start, value.start)
|
|
241
|
+
for (const token of prefix.matchAll(
|
|
242
|
+
/\/\*[\s\S]*?\*\/|\/\/[^\r\n]*|\b(?:export|default)\b/g,
|
|
243
|
+
)) {
|
|
244
|
+
if (token[0] === `export` || token[0] === `default`)
|
|
245
|
+
output.update(
|
|
246
|
+
node.start + token.index,
|
|
247
|
+
node.start + token.index + token[0].length,
|
|
248
|
+
value.type === `Identifier` && token[0] === `export` ? `export {` : ``,
|
|
249
|
+
)
|
|
250
|
+
}
|
|
251
|
+
if (value.type === `Identifier`)
|
|
252
|
+
output.appendLeft(value.end, ` as default }`)
|
|
253
|
+
else output.appendLeft(node.end, `;\nexport { ${name} as default };`)
|
|
254
|
+
}
|
|
255
|
+
const uid = (base: string) => {
|
|
256
|
+
let name = base
|
|
257
|
+
while (identifiers.has(name)) name += `_`
|
|
258
|
+
identifiers.add(name)
|
|
259
|
+
return name
|
|
260
|
+
}
|
|
261
|
+
const register = uid(`__spaHotRegister`),
|
|
262
|
+
refresh = uid(`__spaHotRefresh`)
|
|
263
|
+
let position = program.hashbang?.end ?? 0
|
|
264
|
+
for (const statement of program.body) {
|
|
265
|
+
if (statement.type !== `ExpressionStatement` || !statement.directive) break
|
|
266
|
+
position = statement.end
|
|
267
|
+
}
|
|
268
|
+
output.appendLeft(
|
|
269
|
+
position,
|
|
270
|
+
`\nimport { registerComponent as ${register}, refresh as ${refresh} } from "@atom.io/spa/hot";\n`,
|
|
271
|
+
)
|
|
272
|
+
output.append(`\nif (import.meta.hot) {\n`)
|
|
273
|
+
for (const [name, aliases] of exports)
|
|
274
|
+
output.append(
|
|
275
|
+
`${name} = ${register}(${JSON.stringify(filename)}, ${JSON.stringify(aliases.sort()[0])}, ${name});\n`,
|
|
276
|
+
)
|
|
277
|
+
output.append(
|
|
278
|
+
`import.meta.hot.accept(() => ${refresh}(${JSON.stringify(filename)}));\n}\n`,
|
|
279
|
+
)
|
|
280
|
+
return {
|
|
281
|
+
code: output.toString(),
|
|
282
|
+
map: remapping(
|
|
283
|
+
[
|
|
284
|
+
output
|
|
285
|
+
.generateMap({
|
|
286
|
+
source: filename,
|
|
287
|
+
includeContent: true,
|
|
288
|
+
hires: true,
|
|
289
|
+
})
|
|
290
|
+
.toString(),
|
|
291
|
+
originalMap.toString(),
|
|
292
|
+
],
|
|
293
|
+
() => null,
|
|
294
|
+
).toString(),
|
|
295
|
+
exports: [...exports.values()].flat().sort(),
|
|
296
|
+
}
|
|
297
|
+
}
|