embedded-react 0.20.0 → 0.22.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.
- package/NOTICE +5 -0
- package/README.md +3 -2
- package/aot/app-file-loader.mjs +116 -0
- package/aot/compile.mjs +17 -47
- package/aot/compiler/alerts.mjs +604 -0
- package/aot/compiler/animations.mjs +299 -57
- package/aot/compiler/boot.mjs +27 -2
- package/aot/compiler/check.mjs +62 -10
- package/aot/compiler/collect.mjs +517 -137
- package/aot/compiler/contexts.mjs +391 -0
- package/aot/compiler/control-flow.mjs +276 -117
- package/aot/compiler/custom-hooks.mjs +686 -0
- package/aot/compiler/elements/button.mjs +182 -0
- package/aot/compiler/elements/image-background.mjs +76 -0
- package/aot/compiler/elements/image.mjs +2 -1
- package/aot/compiler/elements/props.mjs +47 -8
- package/aot/compiler/elements/rewrite.mjs +118 -0
- package/aot/compiler/elements/section-list.mjs +370 -0
- package/aot/compiler/expressions.mjs +1378 -97
- package/aot/compiler/handlers.mjs +1807 -354
- package/aot/compiler/helper-values.mjs +312 -0
- package/aot/compiler/ir/nodes.mjs +40 -1
- package/aot/compiler/ir/reads.mjs +206 -5
- package/aot/compiler/ir/text.mjs +5 -1
- package/aot/compiler/ir/types.mjs +12 -0
- package/aot/compiler/kept-states.mjs +177 -0
- package/aot/compiler/keyboard-dismiss.mjs +99 -0
- package/aot/compiler/keyboard.mjs +1 -1
- package/aot/compiler/list-items.mjs +226 -0
- package/aot/compiler/list-order.mjs +586 -0
- package/aot/compiler/list-split.mjs +259 -0
- package/aot/compiler/loops.mjs +582 -0
- package/aot/compiler/lower.mjs +203 -53
- package/aot/compiler/native-files.mjs +439 -0
- package/aot/compiler/native-header.mjs +335 -0
- package/aot/compiler/native-modules.mjs +1173 -0
- package/aot/compiler/nodes.mjs +45 -31
- package/aot/compiler/options.mjs +3 -2
- package/aot/compiler/out.mjs +18 -1
- package/aot/compiler/package/animations.mjs +133 -23
- package/aot/compiler/package/assemble.mjs +2 -4
- package/aot/compiler/package/bytecode.mjs +37 -8
- package/aot/compiler/package/checks.mjs +4 -0
- package/aot/compiler/package/codegen.mjs +906 -33
- package/aot/compiler/package/enums.mjs +10 -0
- package/aot/compiler/package/format.mjs +16 -3
- package/aot/compiler/package/lower.mjs +707 -176
- package/aot/compiler/package/string-caps.mjs +515 -0
- package/aot/compiler/package/tables.mjs +24 -0
- package/aot/compiler/package/writer.mjs +22 -0
- package/aot/compiler/parse.mjs +3 -1
- package/aot/compiler/record-shapes.mjs +246 -0
- package/aot/compiler/records.mjs +654 -0
- package/aot/compiler/reducers.mjs +272 -0
- package/aot/compiler/scroll-to.mjs +112 -0
- package/aot/compiler/static-eval.mjs +315 -7
- package/aot/compiler/style-text.mjs +20 -5
- package/aot/compiler/svg.mjs +13 -7
- package/aot/compiler/switch-cases.mjs +198 -0
- package/aot/compiler/tagged-records.mjs +450 -0
- package/aot/compiler/typing.mjs +307 -0
- package/aot/compiler/updaters.mjs +321 -0
- package/aot/compiler/window-dimensions.mjs +94 -0
- package/aot/compiler/worked-values.mjs +319 -0
- package/aot/demo-file.mjs +30 -0
- package/aot/style-map.mjs +94 -3
- package/assets/bake-font.mjs +187 -244
- package/assets/bake-image.mjs +47 -71
- package/assets/bake-svg.mjs +465 -533
- package/assets/build-builtin-font.mjs +14 -27
- package/assets/emit-c.mjs +124 -204
- package/assets/emit-container.mjs +129 -197
- package/assets/emit-pack.mjs +92 -136
- package/assets/font-config.mjs +19 -27
- package/assets/font-sizes.mjs +432 -507
- package/assets/glyph-coverage.mjs +170 -214
- package/assets/index.mjs +52 -97
- package/assets/rasterize.mjs +173 -194
- package/assets/svg-loader.mjs +42 -48
- package/build.mjs +85 -94
- package/cli.mjs +490 -586
- package/compile-bin.mjs +24 -36
- package/flash.mjs +297 -401
- package/hotreload/dev-device.mjs +229 -270
- package/hotreload/pack-app.mjs +118 -159
- package/hotreload/pack-split.mjs +146 -213
- package/hotreload/package-transfer.mjs +128 -131
- package/hotreload/protocol.mjs +118 -118
- package/hotreload/uploader.mjs +132 -159
- package/hotreload/watch-tree.mjs +56 -65
- package/pack-container.mjs +94 -116
- package/package.json +19 -16
- package/persist-transform.mjs +89 -105
- package/qjsc-wasm.mjs +47 -72
- package/sim/embedded-react.wasm +0 -0
- package/sim/index.html +1 -1
- package/sim-server.mjs +260 -354
- package/src/embedded-react/Alert.mjs +112 -0
- package/src/embedded-react/Animated.mjs +412 -0
- package/src/embedded-react/{AppRegistry.js → AppRegistry.mjs} +26 -25
- package/src/embedded-react/{Button.js → Button.mjs} +29 -53
- package/src/embedded-react/Dimensions.mjs +32 -0
- package/src/embedded-react/Easing.mjs +34 -0
- package/src/embedded-react/{FlatList.js → FlatList.mjs} +25 -42
- package/src/embedded-react/{ImageBackground.js → ImageBackground.mjs} +11 -22
- package/src/embedded-react/Keyboard.mjs +82 -0
- package/src/embedded-react/{LayoutAnimation.js → LayoutAnimation.mjs} +17 -28
- package/src/embedded-react/PanResponder.mjs +256 -0
- package/src/embedded-react/{Platform.js → Platform.mjs} +8 -9
- package/src/embedded-react/{Pressable.js → Pressable.mjs} +12 -25
- package/src/embedded-react/SectionList.mjs +103 -0
- package/src/embedded-react/{StyleSheet.js → StyleSheet.mjs} +16 -20
- package/src/embedded-react/{TouchableOpacity.js → TouchableOpacity.mjs} +47 -83
- package/src/embedded-react/background-image.mjs +321 -0
- package/src/embedded-react/{components.js → components.mjs} +1 -3
- package/src/embedded-react/{imperative.js → imperative.mjs} +27 -38
- package/src/embedded-react/index.d.ts +238 -5
- package/src/embedded-react/index.js +26 -17
- package/src/embedded-react/layout-anim-config.mjs +85 -0
- package/src/embedded-react/{list-child.js → list-child.mjs} +11 -20
- package/src/embedded-react/{named-colors.js → named-colors.mjs} +2 -6
- package/src/embedded-react/nativeModule.mjs +371 -0
- package/src/embedded-react/split-style.mjs +57 -0
- package/src/embedded-react/svg-ops.mjs +1075 -0
- package/src/embedded-react/{useHostValue.js → useHostValue.mjs} +2 -4
- package/src/embedded-react/{usePersistentState.js → usePersistentState.mjs} +34 -38
- package/src/embedded-react/{warn-props.js → warn-props.mjs} +32 -39
- package/src/host-config.mjs +512 -0
- package/src/{native-ui.js → native-ui.mjs} +1 -8
- package/src/props.mjs +341 -0
- package/src/{renderer.js → renderer.mjs} +30 -44
- package/src/embedded-react/Animated.js +0 -440
- package/src/embedded-react/Easing.js +0 -39
- package/src/embedded-react/PanResponder.js +0 -330
- package/src/embedded-react/SectionList.js +0 -148
- package/src/embedded-react/layout-anim-config.js +0 -101
- package/src/embedded-react/split-style.js +0 -58
- package/src/embedded-react/svg-ops.js +0 -1295
- package/src/host-config.js +0 -548
- package/src/props.js +0 -306
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
- Imports
|
|
18
18
|
---------------------------------------------------------------------------------------------------------------------*/
|
|
19
19
|
import { BootReadError, BootValue, buildValueOf, containsBoot, foldBoot, isBoot, isContainer, } from './boot.mjs';
|
|
20
|
-
import { aotError } from './diagnostics.mjs';
|
|
20
|
+
import { ENGINE_STRING_MAX, aotError } from './diagnostics.mjs';
|
|
21
21
|
/*----------------------------------------------------------------------------------------------------------------------
|
|
22
22
|
- Constants
|
|
23
23
|
---------------------------------------------------------------------------------------------------------------------*/
|
|
@@ -31,9 +31,237 @@ const STATIC_MATH = {
|
|
|
31
31
|
trunc: Math.trunc,
|
|
32
32
|
abs: Math.abs,
|
|
33
33
|
};
|
|
34
|
+
/** What a fold sees for a global the code shadows with a runtime value: bound, so not the global, and not constant. */
|
|
35
|
+
const RUNTIME_BINDING = Symbol('runtime binding');
|
|
36
|
+
/**
|
|
37
|
+
* A value inside an array or object built in render that is worked out at run time. The array folds, so its length
|
|
38
|
+
* and constant fields do; a read of this value doesn't, and lowers to the local it holds.
|
|
39
|
+
*
|
|
40
|
+
* @class RuntimeLeaf
|
|
41
|
+
*/
|
|
42
|
+
export class RuntimeLeaf {
|
|
43
|
+
local;
|
|
44
|
+
/**
|
|
45
|
+
* @param local What a read of the value lowers to.
|
|
46
|
+
*/
|
|
47
|
+
constructor(local) {
|
|
48
|
+
this.local = local;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* A field of a tagged object that only some of its shapes have, where the shape isn't known: a test on the tag
|
|
53
|
+
* reveals it.
|
|
54
|
+
*
|
|
55
|
+
* @class HiddenField
|
|
56
|
+
*/
|
|
57
|
+
export class HiddenField {
|
|
58
|
+
/** The field's slot. */
|
|
59
|
+
field;
|
|
60
|
+
message;
|
|
61
|
+
hint;
|
|
62
|
+
/**
|
|
63
|
+
* @param field The field's slot.
|
|
64
|
+
* @param message Why a read of it is refused.
|
|
65
|
+
* @param hint How to read it.
|
|
66
|
+
*/
|
|
67
|
+
constructor(field, message, hint) {
|
|
68
|
+
this.field = field;
|
|
69
|
+
this.message = message;
|
|
70
|
+
this.hint = hint;
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* @returns The error a read of it raises.
|
|
74
|
+
*/
|
|
75
|
+
error() {
|
|
76
|
+
return aotError(this.message, this.hint);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
/** Globals a fold calls as JS does, unless the code shadows them. */
|
|
80
|
+
const FOLDED_GLOBALS = ['String'];
|
|
81
|
+
/** The most decimals toFixed prints in a package, as ERB_FIXED_DIGITS_MAX allows. */
|
|
82
|
+
export const MAX_FIXED_DIGITS = 20;
|
|
83
|
+
/** The hint for a helper's number that isn't a whole number. */
|
|
84
|
+
const WHOLE_NUMBER_HINT = 'the package bakes it into the instruction, so write a literal or a module constant.';
|
|
85
|
+
/**
|
|
86
|
+
* The string helpers a fold works out, as JS does, and the type each one is called on. A call past what the package
|
|
87
|
+
* could do at run time is refused, so a constant and a runtime value accept the same code.
|
|
88
|
+
*/
|
|
89
|
+
const STATIC_METHODS = {
|
|
90
|
+
toFixed: {
|
|
91
|
+
receiver: 'number',
|
|
92
|
+
problem: (_value, digits = 0) => fixedDigitsProblem(digits),
|
|
93
|
+
apply: (value, digits) => value.toFixed(digits),
|
|
94
|
+
},
|
|
95
|
+
padStart: {
|
|
96
|
+
receiver: 'string',
|
|
97
|
+
problem: (_value, width = 0, fill = ' ') => padWidthProblem(width) ?? padFillProblem(fill),
|
|
98
|
+
apply: (value, width, fill) => value.padStart(width, fill),
|
|
99
|
+
},
|
|
100
|
+
slice: {
|
|
101
|
+
receiver: 'string',
|
|
102
|
+
problem: (_value, ...positions) => slicePositionProblem(positions),
|
|
103
|
+
apply: (value, start, end) => value.slice(start, end),
|
|
104
|
+
},
|
|
105
|
+
toUpperCase: {
|
|
106
|
+
receiver: 'string',
|
|
107
|
+
problem: () => null,
|
|
108
|
+
apply: (value) => value.toUpperCase(),
|
|
109
|
+
},
|
|
110
|
+
includes: {
|
|
111
|
+
receiver: 'string',
|
|
112
|
+
problem: (_value, needle, ...rest) => includesProblem(needle, rest.length > 0),
|
|
113
|
+
apply: (value, needle) => value.includes(needle),
|
|
114
|
+
},
|
|
115
|
+
split: {
|
|
116
|
+
receiver: 'string',
|
|
117
|
+
problem: (_value, separator, limit, ...rest) => splitProblem(separator, limit, rest.length > 0),
|
|
118
|
+
apply: (value, separator, limit) => value.split(separator, limit),
|
|
119
|
+
},
|
|
120
|
+
};
|
|
34
121
|
/*----------------------------------------------------------------------------------------------------------------------
|
|
35
122
|
- Implementation
|
|
36
123
|
---------------------------------------------------------------------------------------------------------------------*/
|
|
124
|
+
/**
|
|
125
|
+
* Why toFixed can't take these digits in a package, or null when it can.
|
|
126
|
+
*
|
|
127
|
+
* @param digits The digits.
|
|
128
|
+
*
|
|
129
|
+
* @returns The error's message and hint.
|
|
130
|
+
*/
|
|
131
|
+
export function fixedDigitsProblem(digits) {
|
|
132
|
+
if (!Number.isInteger(digits)) {
|
|
133
|
+
return [
|
|
134
|
+
"AOT: toFixed's digits must be a compile-time whole number",
|
|
135
|
+
WHOLE_NUMBER_HINT,
|
|
136
|
+
];
|
|
137
|
+
}
|
|
138
|
+
if (digits < 0 || digits > MAX_FIXED_DIGITS) {
|
|
139
|
+
return [
|
|
140
|
+
`AOT: toFixed(${digits}) is out of range`,
|
|
141
|
+
`a package prints 0 to ${MAX_FIXED_DIGITS} decimals.`,
|
|
142
|
+
];
|
|
143
|
+
}
|
|
144
|
+
return null;
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* Why padStart can't take this length in a package, or null when it can.
|
|
148
|
+
*
|
|
149
|
+
* @param width The length.
|
|
150
|
+
*
|
|
151
|
+
* @returns The error's message and hint.
|
|
152
|
+
*/
|
|
153
|
+
export function padWidthProblem(width) {
|
|
154
|
+
if (!Number.isInteger(width)) {
|
|
155
|
+
return [
|
|
156
|
+
"AOT: padStart's length must be a compile-time whole number",
|
|
157
|
+
WHOLE_NUMBER_HINT,
|
|
158
|
+
];
|
|
159
|
+
}
|
|
160
|
+
if (width > ENGINE_STRING_MAX.ER_TEXT_MAX) {
|
|
161
|
+
return [
|
|
162
|
+
`AOT: padStart(${width}) is longer than any text`,
|
|
163
|
+
`a text holds at most ${ENGINE_STRING_MAX.ER_TEXT_MAX} bytes.`,
|
|
164
|
+
];
|
|
165
|
+
}
|
|
166
|
+
return null;
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* Why padStart can't take this fill in a package, or null when it can: one printable ASCII character, or none.
|
|
170
|
+
*
|
|
171
|
+
* @param fill The fill.
|
|
172
|
+
*
|
|
173
|
+
* @returns The error's message and hint.
|
|
174
|
+
*/
|
|
175
|
+
export function padFillProblem(fill) {
|
|
176
|
+
if (fill === '' || (typeof fill === 'string' && /^[ -~]$/.test(fill))) {
|
|
177
|
+
return null;
|
|
178
|
+
}
|
|
179
|
+
return [
|
|
180
|
+
"AOT: padStart's fill must be one printable ASCII character",
|
|
181
|
+
'write a constant such as "0" or " "; a longer fill is not supported.',
|
|
182
|
+
];
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* Why slice can't take these positions in a package, or null when it can: numbers, or left out.
|
|
186
|
+
*
|
|
187
|
+
* @param positions The start and end, as given.
|
|
188
|
+
*
|
|
189
|
+
* @returns The error's message and hint.
|
|
190
|
+
*/
|
|
191
|
+
export function slicePositionProblem(positions) {
|
|
192
|
+
if (positions.every(position => typeof position === 'number')) {
|
|
193
|
+
return null;
|
|
194
|
+
}
|
|
195
|
+
return [
|
|
196
|
+
"AOT: slice's start and end must be numbers",
|
|
197
|
+
'pass whole numbers, or leave the end out to cut to the end.',
|
|
198
|
+
];
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Why includes can't take this search in a package, or null when it can: a string, and no position.
|
|
202
|
+
*
|
|
203
|
+
* @param needle What it searches for.
|
|
204
|
+
* @param hasPosition Whether the call gives a position to search from.
|
|
205
|
+
*
|
|
206
|
+
* @returns The error's message and hint.
|
|
207
|
+
*/
|
|
208
|
+
export function includesProblem(needle, hasPosition) {
|
|
209
|
+
if (hasPosition) {
|
|
210
|
+
return [
|
|
211
|
+
"AOT: includes' position is not supported",
|
|
212
|
+
'slice the string into a local first: `const rest = name.slice(2);` then `rest.includes(x)`.',
|
|
213
|
+
];
|
|
214
|
+
}
|
|
215
|
+
if (typeof needle !== 'string') {
|
|
216
|
+
return [
|
|
217
|
+
'AOT: includes only searches for a string',
|
|
218
|
+
'JS converts anything else to a string first; convert it yourself: name.includes(String(n)).',
|
|
219
|
+
];
|
|
220
|
+
}
|
|
221
|
+
return null;
|
|
222
|
+
}
|
|
223
|
+
/**
|
|
224
|
+
* Why split can't take these arguments in a package, or null when it can: a string or no separator, and a whole
|
|
225
|
+
* number or no limit.
|
|
226
|
+
*
|
|
227
|
+
* @param separator What it splits at.
|
|
228
|
+
* @param limit The most pieces it keeps.
|
|
229
|
+
* @param hasMore Whether the call gives more arguments.
|
|
230
|
+
*
|
|
231
|
+
* @returns The error's message and hint.
|
|
232
|
+
*/
|
|
233
|
+
export function splitProblem(separator, limit, hasMore) {
|
|
234
|
+
if (hasMore) {
|
|
235
|
+
return [
|
|
236
|
+
'AOT: split takes a separator and a limit',
|
|
237
|
+
'pass at most two arguments: text.split(",", 3).',
|
|
238
|
+
];
|
|
239
|
+
}
|
|
240
|
+
if (separator !== undefined && typeof separator !== 'string') {
|
|
241
|
+
return [
|
|
242
|
+
'AOT: split only splits at a string',
|
|
243
|
+
'a regular expression is not supported; split at a string such as ",".',
|
|
244
|
+
];
|
|
245
|
+
}
|
|
246
|
+
if (limit !== undefined && !Number.isInteger(limit)) {
|
|
247
|
+
return [
|
|
248
|
+
"AOT: split's limit must be a whole number",
|
|
249
|
+
'pass a whole number, or leave it out to keep every piece.',
|
|
250
|
+
];
|
|
251
|
+
}
|
|
252
|
+
return null;
|
|
253
|
+
}
|
|
254
|
+
/**
|
|
255
|
+
* Rethrows an error that refuses a fold because a string helper is past what a package can run, so a caller that
|
|
256
|
+
* treats a fold that fails as a runtime value doesn't swallow it.
|
|
257
|
+
*
|
|
258
|
+
* @param error What a fold threw.
|
|
259
|
+
*/
|
|
260
|
+
export function rethrowFoldLimit(error) {
|
|
261
|
+
if (error?.isFoldLimit) {
|
|
262
|
+
throw error;
|
|
263
|
+
}
|
|
264
|
+
}
|
|
37
265
|
/**
|
|
38
266
|
* evalStatic at a boundary that REQUIRES a compile-time constant. On a fold failure it rethrows as a
|
|
39
267
|
* LOCATED aotError with a clear message (+ optional hint), instead of letting evalStatic's bare
|
|
@@ -50,7 +278,8 @@ export function evalStaticOrThrow(node, scope, message, hint) {
|
|
|
50
278
|
try {
|
|
51
279
|
return evalStatic(node, scope);
|
|
52
280
|
}
|
|
53
|
-
catch {
|
|
281
|
+
catch (foldError) {
|
|
282
|
+
rethrowFoldLimit(foldError);
|
|
54
283
|
const error = aotError(message, hint);
|
|
55
284
|
if (node && node.loc) {
|
|
56
285
|
error.aotLoc = node.loc.start;
|
|
@@ -276,8 +505,12 @@ function evaluate(node, scope, fold) {
|
|
|
276
505
|
: evaluate(node.alternate, scope, fold);
|
|
277
506
|
}
|
|
278
507
|
case 'Identifier':
|
|
279
|
-
if (hasBinding(scope, node.name)
|
|
508
|
+
if (hasBinding(scope, node.name) &&
|
|
509
|
+
scope[node.name] !== RUNTIME_BINDING &&
|
|
510
|
+
!(scope[node.name] instanceof RuntimeLeaf) &&
|
|
511
|
+
!(scope[node.name] instanceof HiddenField)) {
|
|
280
512
|
return scope[node.name];
|
|
513
|
+
}
|
|
281
514
|
throw new Error(`AOT: cannot statically resolve identifier "${node.name}"`);
|
|
282
515
|
case 'MemberExpression': {
|
|
283
516
|
const object = evaluate(node.object, scope, fold);
|
|
@@ -298,6 +531,10 @@ function evaluate(node, scope, fold) {
|
|
|
298
531
|
if (object == null) {
|
|
299
532
|
throw new Error(`AOT: member access on null/undefined ("${key}")`);
|
|
300
533
|
}
|
|
534
|
+
if (object[key] instanceof RuntimeLeaf ||
|
|
535
|
+
object[key] instanceof HiddenField) {
|
|
536
|
+
throw new Error(`AOT: "${key}" is worked out at run time`);
|
|
537
|
+
}
|
|
301
538
|
return object[key];
|
|
302
539
|
}
|
|
303
540
|
case 'ObjectExpression': {
|
|
@@ -347,8 +584,56 @@ function evaluate(node, scope, fold) {
|
|
|
347
584
|
? bootOf(node, result, fold)
|
|
348
585
|
: result;
|
|
349
586
|
}
|
|
587
|
+
// String(x), and the string helpers on a constant.
|
|
588
|
+
const isString = callee.type === 'Identifier' &&
|
|
589
|
+
callee.name === 'String' &&
|
|
590
|
+
!hasBinding(scope, 'String');
|
|
591
|
+
const methodName = callee.type === 'MemberExpression' && !callee.computed
|
|
592
|
+
? callee.property.name
|
|
593
|
+
: '';
|
|
594
|
+
const method = Object.hasOwn(STATIC_METHODS, methodName)
|
|
595
|
+
? STATIC_METHODS[methodName]
|
|
596
|
+
: undefined;
|
|
597
|
+
if (isString || method) {
|
|
598
|
+
const values = [
|
|
599
|
+
...(isString ? [] : [callee.object]),
|
|
600
|
+
...node.arguments,
|
|
601
|
+
].map(argument => {
|
|
602
|
+
if (argument.type === 'SpreadElement') {
|
|
603
|
+
throw new Error('AOT: cannot statically evaluate a spread');
|
|
604
|
+
}
|
|
605
|
+
return evaluate(argument, scope, fold);
|
|
606
|
+
});
|
|
607
|
+
const built = values.map(buildValueOf);
|
|
608
|
+
if (method && typeof built[0] !== method.receiver) {
|
|
609
|
+
throw new Error('AOT: a string helper on the wrong type');
|
|
610
|
+
}
|
|
611
|
+
const problem = method?.problem(...built);
|
|
612
|
+
if (problem) {
|
|
613
|
+
const error = aotError(...problem);
|
|
614
|
+
error.isFoldLimit = true;
|
|
615
|
+
if (node.loc) {
|
|
616
|
+
error.aotLoc = node.loc.start;
|
|
617
|
+
}
|
|
618
|
+
throw error;
|
|
619
|
+
}
|
|
620
|
+
const result = isString
|
|
621
|
+
? built.length === 0
|
|
622
|
+
? ''
|
|
623
|
+
: String(built[0])
|
|
624
|
+
: method.apply(...built);
|
|
625
|
+
return values.some(isBoot) ? bootOf(node, result, fold) : result;
|
|
626
|
+
}
|
|
350
627
|
throw new Error(`AOT: cannot statically evaluate call expression`);
|
|
351
628
|
}
|
|
629
|
+
case 'TemplateLiteral': {
|
|
630
|
+
const values = node.expressions.map(expression => evaluate(expression, scope, fold));
|
|
631
|
+
const result = node.quasis
|
|
632
|
+
.map((quasi, index) => quasi.value.cooked +
|
|
633
|
+
(index < values.length ? String(buildValueOf(values[index])) : ''))
|
|
634
|
+
.join('');
|
|
635
|
+
return values.some(isBoot) ? bootOf(node, result, fold) : result;
|
|
636
|
+
}
|
|
352
637
|
}
|
|
353
638
|
throw new Error(`AOT: unsupported expression "${node.type}" in static context`);
|
|
354
639
|
}
|
|
@@ -397,7 +682,8 @@ function binary(operator, left, right) {
|
|
|
397
682
|
* gesture params of the handler being compiled. lowerExpr resolves those before environment.constants, so a fold
|
|
398
683
|
* that consulted the raw scope would silently swap a module const in for the value the code actually
|
|
399
684
|
* uses. Every env-driven constant fold goes through this; the JSX-side folds keep the same rule by
|
|
400
|
-
* deleting a name from their scope copy when they bind it (see emitComponent / emitDynamicMap).
|
|
685
|
+
* deleting a name from their scope copy when they bind it (see emitComponent / emitDynamicMap). A runtime name that
|
|
686
|
+
* hides a global the fold calls, such as `String`, is kept as bound but not constant, so the global isn't called.
|
|
401
687
|
*
|
|
402
688
|
* @param environment The expression environment.
|
|
403
689
|
* @param scope The constants a fold would otherwise see.
|
|
@@ -425,9 +711,14 @@ export function foldScope(environment, scope) {
|
|
|
425
711
|
break;
|
|
426
712
|
}
|
|
427
713
|
}
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
714
|
+
const kept = hasShadowedName
|
|
715
|
+
? Object.fromEntries(Object.entries(scope).filter(([name]) => !runtimeNames.has(name)))
|
|
716
|
+
: scope;
|
|
717
|
+
// A runtime value named like a global the fold calls hides that global.
|
|
718
|
+
const shadowedGlobals = FOLDED_GLOBALS.filter(name => runtimeNames.has(name));
|
|
719
|
+
if (shadowedGlobals.length === 0)
|
|
720
|
+
return kept;
|
|
721
|
+
return Object.assign(Object.create(kept), Object.fromEntries(shadowedGlobals.map(name => [name, RUNTIME_BINDING])));
|
|
431
722
|
}
|
|
432
723
|
/**
|
|
433
724
|
* Whether `scope` binds `name`, through the scopes it reads through to but not Object.prototype.
|
|
@@ -444,6 +735,23 @@ export function hasBinding(scope, name) {
|
|
|
444
735
|
}
|
|
445
736
|
return false;
|
|
446
737
|
}
|
|
738
|
+
/**
|
|
739
|
+
* `scope` with names hidden, as a block that declares them hides what they name outside it, so a fold can't read a
|
|
740
|
+
* constant they shadow.
|
|
741
|
+
*
|
|
742
|
+
* @param scope Compile-time constants in reach.
|
|
743
|
+
* @param names The names.
|
|
744
|
+
*
|
|
745
|
+
* @returns The scope.
|
|
746
|
+
*/
|
|
747
|
+
export function withoutNames(scope, names) {
|
|
748
|
+
if (!names.length)
|
|
749
|
+
return scope;
|
|
750
|
+
const hidden = Object.create(scope);
|
|
751
|
+
for (const name of names)
|
|
752
|
+
setBinding(hidden, name, RUNTIME_BINDING);
|
|
753
|
+
return hidden;
|
|
754
|
+
}
|
|
447
755
|
/**
|
|
448
756
|
* Binds `name` in `scope` as its own property, so `__proto__` is a name rather than Object.prototype's setter.
|
|
449
757
|
*
|
|
@@ -17,9 +17,10 @@
|
|
|
17
17
|
- Imports
|
|
18
18
|
---------------------------------------------------------------------------------------------------------------------*/
|
|
19
19
|
import { attemptLowering, check } from './check.mjs';
|
|
20
|
+
import { shapeOf } from './typing.mjs';
|
|
20
21
|
import { BootReadError, bootEnvOf, bootSlotOf, foldBoot, isBoot, } from './boot.mjs';
|
|
21
22
|
import { lowerStyle, isStyleKey, STYLE_KEYS, DYN_FIELDS, parseColorValue, } from '../style-map.mjs';
|
|
22
|
-
import { parseColor } from '../../src/embedded-react/svg-ops.
|
|
23
|
+
import { parseColor } from '../../src/embedded-react/svg-ops.mjs';
|
|
23
24
|
import { aotError, checkEngineString } from './diagnostics.mjs';
|
|
24
25
|
import { at, checkAnimatedStyleKey, checkAttributes, checkStyleKey, inlineFragments, TEXT_SPAN, } from './elements/props.mjs';
|
|
25
26
|
import { evalStatic, foldScope, withUndefined } from './static-eval.mjs';
|
|
@@ -225,7 +226,7 @@ function lowerDynamicStyleValue(key, valueNode, environment) {
|
|
|
225
226
|
}
|
|
226
227
|
if (!dynamicField) {
|
|
227
228
|
throw aotError(`AOT: a state-driven value for style "${key}" is not supported (static only)`, `state-driven styles supported: colors, opacity, sizes/margins/padding, and the ` +
|
|
228
|
-
`layout enums (flexDirection, alignItems, alignSelf, justifyContent, position, ` +
|
|
229
|
+
`layout enums (flexDirection, flexWrap, alignItems, alignSelf, justifyContent, position, ` +
|
|
229
230
|
`display). Make "${key}" static, or drive the change another way.`);
|
|
230
231
|
}
|
|
231
232
|
// Colors and enums lower to a constant or a choice of constants.
|
|
@@ -247,7 +248,7 @@ function lowerDynamicStyleValue(key, valueNode, environment) {
|
|
|
247
248
|
}
|
|
248
249
|
// Opacity and every size are numbers.
|
|
249
250
|
const valueExpression = lowerExpr(valueNode, environment);
|
|
250
|
-
if (valueExpression
|
|
251
|
+
if (shapeOf(valueExpression) === 'string') {
|
|
251
252
|
const error = aotError(`AOT: style "${key}" needs a number, but the value is a string`, "JS would coerce the string; the AOT doesn't. Keep the state numeric — useState(10), not useState('10').");
|
|
252
253
|
if (valueNode.loc) {
|
|
253
254
|
error.aotLoc = valueNode.loc.start;
|
|
@@ -262,6 +263,15 @@ function lowerDynamicStyleValue(key, valueNode, environment) {
|
|
|
262
263
|
},
|
|
263
264
|
];
|
|
264
265
|
}
|
|
266
|
+
// A byte field takes a float with its fraction dropped, where a dimension would round it.
|
|
267
|
+
if (dynamicField.kind === 'byte') {
|
|
268
|
+
return [
|
|
269
|
+
{
|
|
270
|
+
field: dynamicField.field,
|
|
271
|
+
value: { kind: 'float', value: valueExpression },
|
|
272
|
+
},
|
|
273
|
+
];
|
|
274
|
+
}
|
|
265
275
|
return [
|
|
266
276
|
{
|
|
267
277
|
field: dynamicField.field,
|
|
@@ -320,6 +330,7 @@ export function bootStyleAssign(key, value) {
|
|
|
320
330
|
}
|
|
321
331
|
const isNumeric = pixelField ||
|
|
322
332
|
dynamicField?.kind === 'opacity' ||
|
|
333
|
+
dynamicField?.kind === 'byte' ||
|
|
323
334
|
dynamicField?.kind === 'num';
|
|
324
335
|
if (!isNumeric)
|
|
325
336
|
return null;
|
|
@@ -331,7 +342,11 @@ export function bootStyleAssign(key, value) {
|
|
|
331
342
|
return {
|
|
332
343
|
field: pixelField ?? dynamicField.field,
|
|
333
344
|
value: {
|
|
334
|
-
kind: dynamicField?.kind === 'opacity'
|
|
345
|
+
kind: dynamicField?.kind === 'opacity'
|
|
346
|
+
? 'opacity'
|
|
347
|
+
: dynamicField?.kind === 'byte'
|
|
348
|
+
? 'float'
|
|
349
|
+
: 'dimension',
|
|
335
350
|
value: { kind: 'boot', slot, type: slot.type },
|
|
336
351
|
},
|
|
337
352
|
};
|
|
@@ -351,7 +366,7 @@ function lowerBootStyleValue(key, valueNode, environment) {
|
|
|
351
366
|
return lowerDynamicStyleValue(key, valueNode, environment);
|
|
352
367
|
}
|
|
353
368
|
const value = lowerExpr(valueNode, environment);
|
|
354
|
-
if (value
|
|
369
|
+
if (shapeOf(value) !== 'number') {
|
|
355
370
|
throw new Error(`AOT: style "${key}" needs a number`);
|
|
356
371
|
}
|
|
357
372
|
return [{ field: BOOT_PIXEL_FIELDS[key], value: { kind: 'dimension', value } }];
|
package/aot/compiler/svg.mjs
CHANGED
|
@@ -16,9 +16,10 @@
|
|
|
16
16
|
/*----------------------------------------------------------------------------------------------------------------------
|
|
17
17
|
- Imports
|
|
18
18
|
---------------------------------------------------------------------------------------------------------------------*/
|
|
19
|
+
import { settledOf } from './typing.mjs';
|
|
19
20
|
import { check, checkNumber } from './check.mjs';
|
|
20
21
|
import { lowerStyle, NODE_TYPES } from '../style-map.mjs';
|
|
21
|
-
import { flattenSvg, parseColor, parsePath, KAPPA, PAINT_PROPS, PAINT_STRIDE, scaleVectorArtifact, VOP_ARC, VOP_CUBIC, VOP_LINE, VOP_MOVE, VOP_QUAD, VOP_SHAPE, } from '../../src/embedded-react/svg-ops.
|
|
22
|
+
import { flattenSvg, parseColor, parsePath, KAPPA, PAINT_PROPS, PAINT_STRIDE, scaleVectorArtifact, VOP_ARC, VOP_CUBIC, VOP_LINE, VOP_MOVE, VOP_QUAD, VOP_SHAPE, } from '../../src/embedded-react/svg-ops.mjs';
|
|
22
23
|
import { aotError, currentLoc } from './diagnostics.mjs';
|
|
23
24
|
import { bootSlotOf, bootSourceText, buildValueOf, containsBoot, foldBoot, isBoot, } from './boot.mjs';
|
|
24
25
|
import { evalStatic, withUndefined } from './static-eval.mjs';
|
|
@@ -367,7 +368,7 @@ function svgAttrs(openingElement, scope, environment) {
|
|
|
367
368
|
}
|
|
368
369
|
/**
|
|
369
370
|
* Lowers a `{ type, ax, ay, bx, by, r, stops: [{ color, offset }] }` gradient descriptor — the SAME shape
|
|
370
|
-
* Flow A's svg-ops.
|
|
371
|
+
* Flow A's svg-ops.mts takes. Every geometry field and every stop may be static or state-driven; `type` and the
|
|
371
372
|
* stop COUNT must be static, since they decide the emitted table's shape.
|
|
372
373
|
*
|
|
373
374
|
* Conic gradients carry the sweep's start angle in `r` (radians, clockwise from the top), so a dial whose
|
|
@@ -537,7 +538,10 @@ function lowerShapePaint(attributes, environment, scope) {
|
|
|
537
538
|
kind: 'state',
|
|
538
539
|
value: lowerColorValue(attributeValue.node, environment),
|
|
539
540
|
}
|
|
540
|
-
: {
|
|
541
|
+
: {
|
|
542
|
+
kind: 'static',
|
|
543
|
+
argb: parseColor((attributeValue ?? fallback)) >>> 0,
|
|
544
|
+
};
|
|
541
545
|
const strokeWidth = isDynamicAttr(attributes.strokeWidth)
|
|
542
546
|
? { kind: 'float', value: attributes.strokeWidth.value }
|
|
543
547
|
: checkedTapeNumber(svgNum(attributes.strokeWidth, 1));
|
|
@@ -617,9 +621,11 @@ const tapeChain = (first, ...rest) => ({
|
|
|
617
621
|
function tapeLiteral(value) {
|
|
618
622
|
if (value?.kind === 'number')
|
|
619
623
|
return value.value;
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
624
|
+
if (value?.kind !== 'float')
|
|
625
|
+
return null;
|
|
626
|
+
// A value not typed yet is no literal: lowering types a literal at once.
|
|
627
|
+
const settled = settledOf(value.value);
|
|
628
|
+
return settled?.kind === 'number' ? settled.value : null;
|
|
623
629
|
}
|
|
624
630
|
/**
|
|
625
631
|
* An arc's tape slots. The engine measures angles in radians clockwise from 3 o'clock, so each angle is
|
|
@@ -1006,7 +1012,7 @@ function lowerSvgBox(nodeId, type, width, height, openingElement, scope, environ
|
|
|
1006
1012
|
const { staticAssigns, dynamicAssigns, binds } = collectStyleAssigns(openingElement, scope, environment, elementSpec('Svg'));
|
|
1007
1013
|
// A value worked out at boot is set once, so only one state drives is refused.
|
|
1008
1014
|
const readsOnlyBoot = (assign) => (assign.value.kind === 'dimension' || assign.value.kind === 'opacity') &&
|
|
1009
|
-
assign.value.value
|
|
1015
|
+
settledOf(assign.value.value)?.kind === 'boot';
|
|
1010
1016
|
if (!dynamicAssigns.every(readsOnlyBoot)) {
|
|
1011
1017
|
throw aotError('AOT: a state-driven style on an <Svg> is not supported', 'put the changing style on a wrapping <View>: <View style={…}><Svg …/></View>.');
|
|
1012
1018
|
}
|