ripple 0.2.86 → 0.2.88
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/package.json +3 -1
- package/src/compiler/phases/1-parse/index.js +30 -1
- package/src/compiler/phases/2-analyze/index.js +3 -1
- package/src/compiler/phases/3-transform/client/index.js +23 -10
- package/src/compiler/scope.js +2 -0
- package/src/compiler/types/index.d.ts +5 -0
- package/src/runtime/array.js +12 -5
- package/src/runtime/index-client.js +0 -1
- package/src/runtime/index-server.js +18 -3
- package/src/runtime/internal/client/blocks.js +209 -205
- package/src/runtime/internal/client/composite.js +9 -0
- package/src/runtime/internal/client/events.js +219 -189
- package/src/runtime/internal/client/for.js +467 -383
- package/src/runtime/internal/client/if.js +36 -25
- package/src/runtime/internal/client/index.js +2 -0
- package/src/runtime/internal/client/operations.js +7 -2
- package/src/runtime/internal/client/portal.js +15 -4
- package/src/runtime/internal/client/render.js +48 -6
- package/src/runtime/internal/client/runtime.js +98 -83
- package/src/runtime/internal/client/script.js +16 -0
- package/src/runtime/internal/client/template.js +8 -5
- package/src/runtime/internal/client/try.js +42 -4
- package/src/runtime/internal/client/utils.js +18 -3
- package/src/runtime/internal/server/context.js +2 -0
- package/src/runtime/internal/server/index.js +39 -3
- package/src/runtime/internal/server/types.d.ts +21 -0
- package/src/runtime/map.js +37 -2
- package/src/runtime/set.js +22 -9
- package/src/utils/builders.js +1 -0
- package/tests/client/__snapshots__/basic.test.ripple.snap +13 -0
- package/tests/client/basic.test.ripple +15 -0
- package/tests/client/ref.test.ripple +33 -2
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { is_passive_event } from '../../../utils/events.js';
|
|
2
2
|
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
3
|
+
active_block,
|
|
4
|
+
active_reaction,
|
|
5
|
+
set_active_block,
|
|
6
|
+
set_active_reaction,
|
|
7
|
+
set_tracking,
|
|
8
|
+
tracking,
|
|
9
9
|
} from './runtime.js';
|
|
10
10
|
import { array_from, define_property, is_array } from './utils.js';
|
|
11
11
|
|
|
@@ -35,136 +35,136 @@ export function on(element, type, handler, options = {}) {
|
|
|
35
35
|
* @returns {void}
|
|
36
36
|
*/
|
|
37
37
|
export function handle_event_propagation(event) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
38
|
+
var handler_element = this;
|
|
39
|
+
var owner_document = /** @type {Node} */ (handler_element).ownerDocument;
|
|
40
|
+
var event_name = event.type;
|
|
41
|
+
var path = event.composedPath?.() || [];
|
|
42
|
+
var current_target = /** @type {null | Element} */ (path[0] || event.target);
|
|
43
|
+
|
|
44
|
+
// composedPath contains list of nodes the event has propagated through.
|
|
45
|
+
// We check __root to skip all nodes below it in case this is a
|
|
46
|
+
// parent of the __root node, which indicates that there's nested
|
|
47
|
+
// mounted apps. In this case we don't want to trigger events multiple times.
|
|
48
|
+
var path_idx = 0;
|
|
49
|
+
|
|
50
|
+
// @ts-expect-error is added below
|
|
51
|
+
var handled_at = event.__root;
|
|
52
|
+
|
|
53
|
+
if (handled_at) {
|
|
54
|
+
var at_idx = path.indexOf(handled_at);
|
|
55
|
+
if (
|
|
56
|
+
at_idx !== -1 &&
|
|
57
|
+
(handler_element === document || handler_element === /** @type {any} */ (window))
|
|
58
|
+
) {
|
|
59
|
+
// This is the fallback document listener or a window listener, but the event was already handled
|
|
60
|
+
// -> ignore, but set handle_at to document/window so that we're resetting the event
|
|
61
|
+
// chain in case someone manually dispatches the same event object again.
|
|
62
|
+
// @ts-expect-error
|
|
63
|
+
event.__root = handler_element;
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
// We're deliberately not skipping if the index is higher, because
|
|
68
|
+
// someone could create an event programmatically and emit it multiple times,
|
|
69
|
+
// in which case we want to handle the whole propagation chain properly each time.
|
|
70
|
+
// (this will only be a false negative if the event is dispatched multiple times and
|
|
71
|
+
// the fallback document listener isn't reached in between, but that's super rare)
|
|
72
|
+
var handler_idx = path.indexOf(handler_element);
|
|
73
|
+
if (handler_idx === -1) {
|
|
74
|
+
// handle_idx can theoretically be -1 (happened in some JSDOM testing scenarios with an event listener on the window object)
|
|
75
|
+
// so guard against that, too, and assume that everything was handled at this point.
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
if (at_idx <= handler_idx) {
|
|
80
|
+
path_idx = at_idx;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
current_target = /** @type {Element} */ (path[path_idx] || event.target);
|
|
85
|
+
// there can only be one delegated event per element, and we either already handled the current target,
|
|
86
|
+
// or this is the very first target in the chain which has a non-delegated listener, in which case it's safe
|
|
87
|
+
// to handle a possible delegated event on it later (through the root delegation listener for example).
|
|
88
|
+
if (current_target === handler_element) return;
|
|
89
|
+
|
|
90
|
+
// Proxy currentTarget to correct target
|
|
91
|
+
define_property(event, 'currentTarget', {
|
|
92
|
+
configurable: true,
|
|
93
|
+
get() {
|
|
94
|
+
return current_target || owner_document;
|
|
95
|
+
},
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
var previous_block = active_block;
|
|
99
|
+
var previous_reaction = active_reaction;
|
|
100
|
+
var previous_tracking = tracking;
|
|
101
|
+
|
|
102
|
+
set_active_block(null);
|
|
103
|
+
set_active_reaction(null);
|
|
104
|
+
set_tracking(false);
|
|
105
|
+
|
|
106
|
+
try {
|
|
107
|
+
/**
|
|
108
|
+
* @type {unknown}
|
|
109
|
+
*/
|
|
110
|
+
var throw_error;
|
|
111
|
+
/**
|
|
112
|
+
* @type {unknown[]}
|
|
113
|
+
*/
|
|
114
|
+
var other_errors = [];
|
|
115
|
+
|
|
116
|
+
while (current_target !== null) {
|
|
117
|
+
/** @type {null | Element} */
|
|
118
|
+
var parent_element =
|
|
119
|
+
current_target.assignedSlot ||
|
|
120
|
+
current_target.parentNode ||
|
|
121
|
+
/** @type {any} */ (current_target).host ||
|
|
122
|
+
null;
|
|
123
|
+
|
|
124
|
+
try {
|
|
125
|
+
// @ts-expect-error
|
|
126
|
+
var delegated = current_target['__' + event_name];
|
|
127
|
+
|
|
128
|
+
if (delegated !== undefined && !(/** @type {any} */ (current_target).disabled)) {
|
|
129
|
+
if (is_array(delegated)) {
|
|
130
|
+
var [fn, block, ...data] = delegated;
|
|
131
|
+
fn.apply(current_target, [event, ...data, block]);
|
|
132
|
+
} else {
|
|
133
|
+
delegated.call(current_target, event);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
} catch (error) {
|
|
137
|
+
if (throw_error) {
|
|
138
|
+
other_errors.push(error);
|
|
139
|
+
} else {
|
|
140
|
+
throw_error = error;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
if (event.cancelBubble || parent_element === handler_element || parent_element === null) {
|
|
144
|
+
break;
|
|
145
|
+
}
|
|
146
|
+
current_target = parent_element;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
if (throw_error) {
|
|
150
|
+
for (let error of other_errors) {
|
|
151
|
+
// Throw the rest of the errors, one-by-one on a microtask
|
|
152
|
+
queueMicrotask(() => {
|
|
153
|
+
throw error;
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
throw throw_error;
|
|
157
|
+
}
|
|
158
|
+
} finally {
|
|
159
|
+
set_active_block(previous_block);
|
|
160
|
+
// @ts-expect-error is used above
|
|
161
|
+
event.__root = handler_element;
|
|
162
|
+
// @ts-ignore remove proxy on currentTarget
|
|
163
|
+
delete event.currentTarget;
|
|
164
|
+
set_active_block(previous_block);
|
|
165
|
+
set_active_reaction(previous_reaction);
|
|
166
|
+
set_tracking(previous_tracking);
|
|
167
|
+
}
|
|
168
168
|
}
|
|
169
169
|
|
|
170
170
|
/**
|
|
@@ -174,73 +174,103 @@ export function handle_event_propagation(event) {
|
|
|
174
174
|
* @param {AddEventListenerOptions} [options]
|
|
175
175
|
*/
|
|
176
176
|
function create_event(event_name, dom, handler, options = {}) {
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
177
|
+
/** @this {any} */
|
|
178
|
+
function target_handler(/** @type {Event} */ event) {
|
|
179
|
+
var previous_block = active_block;
|
|
180
|
+
var previous_reaction = active_reaction;
|
|
181
|
+
var previous_tracking = tracking;
|
|
182
|
+
|
|
183
|
+
try {
|
|
184
|
+
set_active_block(null);
|
|
185
|
+
set_active_reaction(null);
|
|
186
|
+
set_tracking(false);
|
|
187
|
+
|
|
188
|
+
if (!options.capture) {
|
|
189
|
+
// Only call in the bubble phase, else delegated events would be called before the capturing events
|
|
190
|
+
handle_event_propagation.call(dom, event);
|
|
191
|
+
}
|
|
192
|
+
if (!event.cancelBubble) {
|
|
193
|
+
return handler?.call(this, event);
|
|
194
|
+
}
|
|
195
|
+
} finally {
|
|
196
|
+
set_active_block(previous_block);
|
|
197
|
+
set_active_reaction(previous_reaction);
|
|
198
|
+
set_tracking(previous_tracking);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
dom.addEventListener(event_name, target_handler, options);
|
|
203
|
+
|
|
204
|
+
return target_handler;
|
|
204
205
|
}
|
|
205
206
|
|
|
207
|
+
/**
|
|
208
|
+
* @param {string} event_name
|
|
209
|
+
* @param {Element} dom
|
|
210
|
+
* @param {EventListener} [handler]
|
|
211
|
+
* @param {boolean} [capture]
|
|
212
|
+
* @param {boolean} [passive]
|
|
213
|
+
* @returns {void}
|
|
214
|
+
*/
|
|
206
215
|
export function event(event_name, dom, handler, capture, passive) {
|
|
207
|
-
|
|
208
|
-
|
|
216
|
+
var options = { capture, passive };
|
|
217
|
+
create_event(event_name, dom, handler, options);
|
|
209
218
|
}
|
|
210
219
|
|
|
220
|
+
/**
|
|
221
|
+
* @param {Array<string>} events
|
|
222
|
+
* @returns {void}
|
|
223
|
+
*/
|
|
211
224
|
export function delegate(events) {
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
225
|
+
for (var i = 0; i < events.length; i++) {
|
|
226
|
+
all_registered_events.add(events[i]);
|
|
227
|
+
}
|
|
215
228
|
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
229
|
+
for (var fn of root_event_handles) {
|
|
230
|
+
fn(events);
|
|
231
|
+
}
|
|
219
232
|
}
|
|
220
233
|
|
|
234
|
+
/** @param {Element} target */
|
|
221
235
|
export function handle_root_events(target) {
|
|
222
|
-
|
|
236
|
+
var registered_events = new Set();
|
|
237
|
+
|
|
238
|
+
/**
|
|
239
|
+
* @typedef {Object} EventHandleOptions
|
|
240
|
+
* @property {boolean} [passive]
|
|
241
|
+
*/
|
|
223
242
|
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
243
|
+
/**
|
|
244
|
+
* @typedef {(
|
|
245
|
+
* events: Array<string>
|
|
246
|
+
* ) => void} EventHandle
|
|
247
|
+
*/
|
|
227
248
|
|
|
228
|
-
|
|
229
|
-
|
|
249
|
+
/** @type {EventHandle} */
|
|
250
|
+
var event_handle = (/** @type {Array<string>} */ events) => {
|
|
251
|
+
for (var i = 0; i < events.length; i++) {
|
|
252
|
+
var event_name = events[i];
|
|
230
253
|
|
|
231
|
-
|
|
254
|
+
if (registered_events.has(event_name)) continue;
|
|
255
|
+
registered_events.add(event_name);
|
|
232
256
|
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
};
|
|
257
|
+
/** @type {boolean} */
|
|
258
|
+
var passive = is_passive_event(event_name);
|
|
236
259
|
|
|
237
|
-
|
|
238
|
-
|
|
260
|
+
/** @type {EventHandleOptions} */
|
|
261
|
+
var options = { passive };
|
|
262
|
+
|
|
263
|
+
target.addEventListener(event_name, handle_event_propagation, options);
|
|
264
|
+
}
|
|
265
|
+
};
|
|
239
266
|
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
267
|
+
event_handle(array_from(all_registered_events));
|
|
268
|
+
root_event_handles.add(event_handle);
|
|
269
|
+
|
|
270
|
+
return () => {
|
|
271
|
+
for (var event_name of registered_events) {
|
|
272
|
+
target.removeEventListener(event_name, handle_event_propagation);
|
|
273
|
+
}
|
|
274
|
+
root_event_handles.delete(event_handle);
|
|
275
|
+
};
|
|
246
276
|
}
|