@quenk/wml 2.11.2 → 2.12.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/lib/cli.js +24 -29
- package/lib/cli.js.map +1 -1
- package/lib/cli.ts +20 -13
- package/lib/compile/codegen.d.ts +6 -10
- package/lib/compile/codegen.js +556 -633
- package/lib/compile/codegen.js.map +1 -1
- package/lib/compile/codegen.ts +58 -25
- package/lib/compile/index.js +6 -11
- package/lib/compile/index.js.map +1 -1
- package/lib/compile/transform.js +19 -25
- package/lib/compile/transform.js.map +1 -1
- package/lib/compile/transform.ts +12 -6
- package/lib/dom.js +118 -167
- package/lib/dom.js.map +1 -1
- package/lib/index.js +7 -10
- package/lib/index.js.map +1 -1
- package/lib/main.js +31 -56
- package/lib/main.js.map +1 -1
- package/lib/parse/ast.d.ts +25 -5
- package/lib/parse/ast.js +186 -214
- package/lib/parse/ast.js.map +1 -1
- package/lib/parse/ast.ts +33 -5
- package/lib/parse/generated.js +2527 -2454
- package/lib/parse/index.js +7 -10
- package/lib/parse/index.js.map +1 -1
- package/lib/parse/test.js +279 -53
- package/lib/parse/test.js.map +1 -1
- package/lib/parse/test.ts +20 -1
- package/lib/parse/wml.y +60 -50
- package/lib/tsconfig.json +1 -1
- package/package.json +1 -2
package/lib/parse/index.js
CHANGED
|
@@ -2,18 +2,15 @@
|
|
|
2
2
|
/// <reference path='generated.d.ts' />
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.parse = void 0;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
const parser = require("./generated");
|
|
6
|
+
const nodes = require("./ast");
|
|
7
|
+
const error_1 = require("@quenk/noni/lib/control/error");
|
|
8
8
|
/**
|
|
9
9
|
* parse a string containing WML returning the resulting AST.
|
|
10
10
|
*/
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
return
|
|
14
|
-
|
|
15
|
-
return parser.parser.parse(str);
|
|
16
|
-
});
|
|
17
|
-
};
|
|
11
|
+
const parse = (str, ast = nodes) => (0, error_1.attempt)(() => {
|
|
12
|
+
parser.parser.yy = { ast };
|
|
13
|
+
return parser.parser.parse(str);
|
|
14
|
+
});
|
|
18
15
|
exports.parse = parse;
|
|
19
16
|
//# sourceMappingURL=index.js.map
|
package/lib/parse/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA,uCAAuC;;;AAEvC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA,uCAAuC;;;AAEvC,sCAAsC;AACtC,+BAA+B;AAE/B,yDAAgE;AAEhE;;GAEG;AACI,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,MAAW,KAAK,EAAwB,EAAE,CACzE,IAAA,eAAO,EAAC,GAAG,EAAE;IAET,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAE3B,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAEpC,CAAC,CAAC,CAAC;AAPM,QAAA,KAAK,SAOX"}
|
package/lib/parse/test.js
CHANGED
|
@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.tests = void 0;
|
|
4
4
|
exports.tests = {
|
|
5
5
|
'should parse qualified import': {
|
|
6
|
-
input:
|
|
6
|
+
input: `{% import * as lib from "path/to/libs" %}`
|
|
7
7
|
},
|
|
8
8
|
'should parse named import': {
|
|
9
|
-
input:
|
|
9
|
+
input: `{% import (B) from "path/to/a/b" %}`
|
|
10
10
|
},
|
|
11
11
|
'should detect exact duplicate imports': {
|
|
12
|
-
input:
|
|
12
|
+
input: `{% import (A) from "b" %} {% import (A) from "b" %}`
|
|
13
13
|
},
|
|
14
14
|
'should parse a self closing tag': {
|
|
15
15
|
input: '<simple/>'
|
|
@@ -70,6 +70,15 @@ exports.tests = {
|
|
|
70
70
|
'{% endfor %}' +
|
|
71
71
|
'</root>'
|
|
72
72
|
},
|
|
73
|
+
'should parse for from statements': {
|
|
74
|
+
input: `
|
|
75
|
+
<root>
|
|
76
|
+
{% for value=1 to 30 %}
|
|
77
|
+
<b>{{value}}</b>
|
|
78
|
+
{% endfor %}
|
|
79
|
+
</root>
|
|
80
|
+
`
|
|
81
|
+
},
|
|
73
82
|
'should parse if then expressions': {
|
|
74
83
|
input: '<Html id={{@id}}>{{ if @check() then a else b }}</Html>'
|
|
75
84
|
},
|
|
@@ -92,7 +101,16 @@ exports.tests = {
|
|
|
92
101
|
input: '<Tag>{% if value %}<text>Text</text>{% else %}<text>else</text>{% endif %}</Tag>'
|
|
93
102
|
},
|
|
94
103
|
'should parse if else if statements': {
|
|
95
|
-
input:
|
|
104
|
+
input: `
|
|
105
|
+
<Tag>
|
|
106
|
+
{% if value %}
|
|
107
|
+
<text>Text</text>
|
|
108
|
+
{% else if value %}
|
|
109
|
+
<text>else</text>
|
|
110
|
+
{% else %}
|
|
111
|
+
no
|
|
112
|
+
{% endif %}
|
|
113
|
+
</Tag>`
|
|
96
114
|
},
|
|
97
115
|
'should parse short fun statements': {
|
|
98
116
|
input: '{% fun vue () = <View/> %}'
|
|
@@ -143,7 +161,11 @@ exports.tests = {
|
|
|
143
161
|
'[view] should parse typed views with type parameters': {
|
|
144
162
|
input: '{% view Main [A,B] (Context[A,B]) %} <p>{{@values}}</p>'
|
|
145
163
|
},
|
|
146
|
-
'[view] should allow the where syntax':
|
|
164
|
+
'[view] should allow the where syntax': `
|
|
165
|
+
|
|
166
|
+
{% view HeadView where title: String %}
|
|
167
|
+
<title>{{@title}}</title>
|
|
168
|
+
`,
|
|
147
169
|
'should parse context variables': {
|
|
148
170
|
input: '<Input name={{@level.name}}/>'
|
|
149
171
|
},
|
|
@@ -151,7 +173,10 @@ exports.tests = {
|
|
|
151
173
|
input: '{% view MyView (Context from "./") %} <div>{{@text}}</div>'
|
|
152
174
|
},
|
|
153
175
|
'[view] should allow multiple inline context imports': {
|
|
154
|
-
input:
|
|
176
|
+
input: `
|
|
177
|
+
{% view MyView (Context from "./") %} <div>{{@text}}</div>
|
|
178
|
+
{% view YourView (Context from "./") %} <div/>
|
|
179
|
+
`
|
|
155
180
|
},
|
|
156
181
|
'should allow construct expression': {
|
|
157
182
|
input: '<TextView android:thing={value=1}>{{Person(@value)}}</TextView>'
|
|
@@ -172,10 +197,78 @@ exports.tests = {
|
|
|
172
197
|
input: '<div>{{ <@action()> }}</div>'
|
|
173
198
|
},
|
|
174
199
|
'should allow view statements after short fun': {
|
|
175
|
-
input:
|
|
200
|
+
input: `
|
|
201
|
+
|
|
202
|
+
{% fun template [A] (d: Date[A], o:A, _:String, __:A[]) = {{String(o)}} %}
|
|
203
|
+
|
|
204
|
+
{% view Results [A](Date[A]) %}
|
|
205
|
+
|
|
206
|
+
<ul>
|
|
207
|
+
|
|
208
|
+
{% for option,index in [1,3,4] %}
|
|
209
|
+
|
|
210
|
+
<li>{{option}}and{{index}}</li>
|
|
211
|
+
|
|
212
|
+
{% else %}
|
|
213
|
+
|
|
214
|
+
<p>De nada!</p>
|
|
215
|
+
|
|
216
|
+
{% endfor %}
|
|
217
|
+
|
|
218
|
+
</ul>`
|
|
176
219
|
},
|
|
177
220
|
'should allow actual code': {
|
|
178
|
-
input:
|
|
221
|
+
input: `
|
|
222
|
+
{% import (Table) from "@quenk/wml-widgets/lib/data/table" %}
|
|
223
|
+
{% import (TextField) from "@quenk/wml-widgets/lib/control/text-field" %}
|
|
224
|
+
{% import (Panel) from "@quenk/wml-widgets/lib/layout/panel" %}
|
|
225
|
+
{% import (PanelHeader) from "@quenk/wml-widgets/lib/layout/panel" %}
|
|
226
|
+
{% import (Tab) from "@quenk/wml-widgets/lib/control/tab-bar" %}
|
|
227
|
+
{% import (TabBar) from "@quenk/wml-widgets/lib/control/tab-bar" %}
|
|
228
|
+
{% import (TabSpec) from ".." %}
|
|
229
|
+
{% import (TabbedPanel) from ".." %}
|
|
230
|
+
|
|
231
|
+
{% view Main (TabbedPanel) %}
|
|
232
|
+
|
|
233
|
+
<Panel ww:class={{@values.root.class}}>
|
|
234
|
+
|
|
235
|
+
{% if (@values.header.tabs.length > 0) || (@values.header.additionalTabs) %}
|
|
236
|
+
|
|
237
|
+
<PanelHeader>
|
|
238
|
+
|
|
239
|
+
<TabBar>
|
|
240
|
+
|
|
241
|
+
{% for tab in @values.header.tabs %}
|
|
242
|
+
|
|
243
|
+
<Tab
|
|
244
|
+
ww:name={{tab.name}}
|
|
245
|
+
ww:onClick={{tab.onClick}} />
|
|
246
|
+
|
|
247
|
+
{% endfor %}
|
|
248
|
+
|
|
249
|
+
{% if @values.header.additionalTabs %}
|
|
250
|
+
|
|
251
|
+
{{<(@values.header.additionalTabs)(@)>}}
|
|
252
|
+
|
|
253
|
+
{% else %}
|
|
254
|
+
|
|
255
|
+
{{''}}
|
|
256
|
+
|
|
257
|
+
{% endif %}
|
|
258
|
+
|
|
259
|
+
</TabBar>
|
|
260
|
+
|
|
261
|
+
</PanelHeader>
|
|
262
|
+
|
|
263
|
+
{% else %}
|
|
264
|
+
|
|
265
|
+
{{''}}
|
|
266
|
+
|
|
267
|
+
{% endif %}
|
|
268
|
+
|
|
269
|
+
{{@children}}
|
|
270
|
+
|
|
271
|
+
</Panel>`
|
|
179
272
|
},
|
|
180
273
|
'should recognize type parameters': {
|
|
181
274
|
input: '{% fun test[A:String] (a:A) %} {{a}} {% endfun %}'
|
|
@@ -191,57 +284,190 @@ exports.tests = {
|
|
|
191
284
|
},
|
|
192
285
|
'[context] should parse constructors': '{% context Test where name: String %}',
|
|
193
286
|
'[context] should parse generic constructors': '{% context Test where table.name: Text[A] %}',
|
|
194
|
-
'[context] should parse record types':
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
'[context] should parse
|
|
204
|
-
'[context] should parse
|
|
205
|
-
'[context] should parse
|
|
206
|
-
'[context] should parse func with
|
|
207
|
-
'[context] should parse func with
|
|
208
|
-
'[context] should parse func with
|
|
209
|
-
'[context] should parse func with
|
|
210
|
-
'[context] should parse func with record arg':
|
|
211
|
-
'[context] should parse func with
|
|
212
|
-
'[context] should parse func with
|
|
213
|
-
'[context] should parse func with
|
|
214
|
-
'[context] should parse func with
|
|
215
|
-
'[context] should parse func with
|
|
216
|
-
'[context] should parse func with
|
|
217
|
-
'[context] should parse func with
|
|
218
|
-
'[context] should parse func with
|
|
219
|
-
'[context] should parse func
|
|
220
|
-
'[context] should parse
|
|
287
|
+
'[context] should parse record types': `{% context Test[A] where
|
|
288
|
+
|
|
289
|
+
table.data.record: {
|
|
290
|
+
|
|
291
|
+
name: String,
|
|
292
|
+
table.name: Text[A],
|
|
293
|
+
table.data.list: A[]
|
|
294
|
+
}
|
|
295
|
+
%}`,
|
|
296
|
+
'[context] should parse list types': `{% context Test[A] where table.data.list: A[] %}`,
|
|
297
|
+
'[context] should parse 2d list types': `{% context Test[A,B] where table.data.list2: A[][] %}`,
|
|
298
|
+
'[context] should parse 3d list types': `{% context Test[A, B, C] where table.data.list3: A[][][] %}`,
|
|
299
|
+
'[context] should parse func with no args or parens': `{% context Test where value: Test -> Number %}`,
|
|
300
|
+
'[context] should parse func with no args': `{% context Test where value: () -> Number %}`,
|
|
301
|
+
'[context] should parse no-parens func with constructor': `{% context Test where value: String -> String %}`,
|
|
302
|
+
'[context] should parse no-parens func with generic constructor': `{% context Test where value: Text[A] -> Text[A] %}`,
|
|
303
|
+
'[context] should parse no-parens func with record arg': `{% context Test where value: {} -> { } %}`,
|
|
304
|
+
'[context] should parse no-parens func with list arg': `{% context Test where value: String[] -> String[] %}`,
|
|
305
|
+
'[context] should parse func with cons arg': `{% context Test where value: (String) -> String %}`,
|
|
306
|
+
'[context] should parse func with 2 cons args': `{% context Test where value: (String, String) -> String %}`,
|
|
307
|
+
'[context] should parse func with 3 cons args': `{% context Test where value: (String, String, String) -> String %}`,
|
|
308
|
+
'[context] should parse func with generic cons arg': `{% context Test[A] where value: (Text[A]) -> Text[A] %}`,
|
|
309
|
+
'[context] should parse func with 2 generic cons args': `{% context Test[A] where value: (Text[A], Text[A]) -> Text[A] %}`,
|
|
310
|
+
'[context] should parse func with 3 generic cons args': `{% context Test[A] where value: (Text[A], Text[A], Text[A]) -> Text[A] %}`,
|
|
311
|
+
'[context] should parse func with record arg': `{% context Test where value: ({ }) -> { } %}`,
|
|
312
|
+
'[context] should parse func with 2 record args': `{% context Test where value: ({ }, { name: String }) -> { } %}`,
|
|
313
|
+
'[context] should parse func with 3 record args': `{% context Test where value: ({ }, { name: String }, { value: A[]}) -> { } %}`,
|
|
314
|
+
'[context] should parse func with list arg': `{% context Test where value: (String[]) -> String[] %}`,
|
|
315
|
+
'[context] should parse func with 2 list args': `{% context Test where value: (String[], String[]) -> String[] %}`,
|
|
316
|
+
'[context] should parse func with 3 list args': `{% context Test where value: (String[], String[], String[]) -> String[] %}`,
|
|
317
|
+
'[context] should parse func with func arg': `{% context Test where value: (String -> String) -> String %}`,
|
|
318
|
+
'[context] should parse func with 2 func args': `{% context Test where value: ((String -> String), (String -> String)) -> String %}`,
|
|
319
|
+
'[context] should parse func with 3 func args': `{% context Test where
|
|
320
|
+
value: ((String -> String), (String -> String), (String -> String)) -> String
|
|
321
|
+
%}`,
|
|
322
|
+
'[context] should parse func that return array of generic type': `{% context Test[A] where value: Number -> Text[A][] %}`,
|
|
323
|
+
'[context] should parse funct that return array of array': `{% context Test where value: String -> Number[][] %}`,
|
|
221
324
|
'[context] should parse context definitions': {
|
|
222
|
-
input:
|
|
325
|
+
input: `{% context Manager[A] where
|
|
326
|
+
|
|
327
|
+
name: String,
|
|
328
|
+
|
|
329
|
+
table.name: Text[A],
|
|
330
|
+
|
|
331
|
+
table.data.record: { name: String, table.name: Text[A], table.data.list: A[] },
|
|
332
|
+
|
|
333
|
+
table.data.list: A[],
|
|
334
|
+
|
|
335
|
+
table.data.list2: A[][],
|
|
336
|
+
|
|
337
|
+
table.data.list3: A[][][],
|
|
338
|
+
|
|
339
|
+
noArgsFunc1: -> Number,
|
|
340
|
+
|
|
341
|
+
noArgsFunc0: () -> Number,
|
|
342
|
+
|
|
343
|
+
noParensConsArgFunc: String -> String,
|
|
344
|
+
|
|
345
|
+
noParensConsGenericArgFunc: Text[A] -> Text[A],
|
|
346
|
+
|
|
347
|
+
noParensRecordArgFunc: { } -> { },
|
|
348
|
+
|
|
349
|
+
noParensListArgFunc: String[] -> String[],
|
|
350
|
+
|
|
351
|
+
parensConsArgFunc: (String) -> String,
|
|
352
|
+
|
|
353
|
+
parensConsArg2Func: (String, String) -> String,
|
|
354
|
+
|
|
355
|
+
parensConsArg3Func: (String, String, String) -> String,
|
|
356
|
+
|
|
357
|
+
parensConsGenericArgFunc: (Text[A]) -> Text[A],
|
|
358
|
+
|
|
359
|
+
parensConsGenericArg2Func: (Text[A], Text[A]) -> Text[A],
|
|
360
|
+
|
|
361
|
+
parensConsGenericArg3Func: (Text[A], Text[A], Text[A]) -> Text[A],
|
|
362
|
+
|
|
363
|
+
parensRecordArgFunc: ({ }) -> { },
|
|
364
|
+
|
|
365
|
+
parensRecordArg2Func: ({ }, { name: String }) -> { },
|
|
366
|
+
|
|
367
|
+
parensRecordArgFunc: ({ }, { name: String }, { value: A[]}) -> { },
|
|
368
|
+
|
|
369
|
+
parensListArgFunc: (String[]) -> String[],
|
|
370
|
+
|
|
371
|
+
parensListArg2Func: (String[], String[]) -> String[],
|
|
372
|
+
|
|
373
|
+
parensListArg3Func: (String[], String[], String[]) -> String[],
|
|
374
|
+
|
|
375
|
+
funcArgFunc1: (String -> String) -> String,
|
|
376
|
+
|
|
377
|
+
funcArgFunc2: (String -> String -> String) -> String,
|
|
378
|
+
|
|
379
|
+
funcArg2Func: ((String -> String), (String -> String)) -> String,
|
|
380
|
+
|
|
381
|
+
funcArg3Func: ((String -> String), (String -> String), (String -> String)) -> String,
|
|
382
|
+
|
|
383
|
+
funcRetGenArray: Number -> Text[A][],
|
|
384
|
+
|
|
385
|
+
funcRetMultiArray: String -> Number[][]
|
|
386
|
+
|
|
387
|
+
|
|
388
|
+
%} `
|
|
223
389
|
},
|
|
224
390
|
'[context] should allow optional properties': {
|
|
225
|
-
input:
|
|
391
|
+
input: `{% context AContract where
|
|
392
|
+
|
|
393
|
+
id?: Number,
|
|
394
|
+
|
|
395
|
+
name.first: String,
|
|
396
|
+
|
|
397
|
+
name.middle?: String,
|
|
398
|
+
|
|
399
|
+
name.last?: String
|
|
400
|
+
|
|
401
|
+
%}`
|
|
226
402
|
},
|
|
227
403
|
'[context] should allow extending': {
|
|
228
|
-
input:
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
404
|
+
input: `{% context AContract where :BContract %}
|
|
405
|
+
{% context CContract where :AContract, :BContract %}
|
|
406
|
+
{% context DContract[Type] where :CContract, member: Type %}
|
|
407
|
+
{% context EContract[A,B,C,D] where
|
|
408
|
+
:BContract,
|
|
409
|
+
:CContract,
|
|
410
|
+
:DContract[D],
|
|
411
|
+
member0: A,
|
|
412
|
+
member1: B,
|
|
413
|
+
member2: C
|
|
414
|
+
%}
|
|
415
|
+
{% context DContract where :AContract, member: DType %}`
|
|
416
|
+
},
|
|
417
|
+
'[context] should mark nested properties as optional if all are': `{% context Paper where object."type"?: String %}`,
|
|
418
|
+
'should parse type statements': `{% type Type = String | Number | Boolean | Type[] | Type -> Type %}`,
|
|
419
|
+
'should parse tupe types': `{% type Tuple = [Number, String, Number] %}`,
|
|
233
420
|
'should parse type assertion': '<Panel onClick={{ \e -> [*User]foo(e) }} />',
|
|
234
421
|
'should parse partial application in expression': '<Link ww:text={{truncate(50)(@text)}} />',
|
|
235
|
-
'should transform special primitives':
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
422
|
+
'should transform special primitives': `<div>
|
|
423
|
+
{% for kind in [
|
|
424
|
+
String,
|
|
425
|
+
Boolean,
|
|
426
|
+
Number,
|
|
427
|
+
Object,
|
|
428
|
+
Undefined,
|
|
429
|
+
Null,
|
|
430
|
+
Void,
|
|
431
|
+
Never,
|
|
432
|
+
Any] %}
|
|
433
|
+
{{ kind | text }}
|
|
434
|
+
{% endfor %}
|
|
435
|
+
</div>`,
|
|
436
|
+
'should allow casting': `
|
|
437
|
+
{% view Test (Object) %}
|
|
438
|
+
<Widget
|
|
439
|
+
val1={{String(@value)}}
|
|
440
|
+
val2={{Number(@value)}}
|
|
441
|
+
val3={{Boolean(@value)}} />
|
|
442
|
+
`,
|
|
443
|
+
'should parse null query operator': `<div>{% if value ?? %}<b>True</b>{% else %}<b>False</b>{% endif %}</div>`,
|
|
444
|
+
'[let] should parse let statements': `{% let head:HeadCtx = {title = "Foo"} %}
|
|
445
|
+
{% let head2:HeadCtx = {title = "My Title"} %}
|
|
446
|
+
`,
|
|
447
|
+
'[let] should be usable in a view': `
|
|
448
|
+
{% view MyView(Object) %}
|
|
449
|
+
{% let head:HeadViewContext = {title = "My Title"} %}
|
|
450
|
+
<h1>{{<HeadView(head)>}}</h1>
|
|
451
|
+
`,
|
|
452
|
+
'[comment] should parse html comments': `<!-- This is an html comment. -->`,
|
|
453
|
+
'[comment] should parse wml comments': `{# This is a wml comment #}`,
|
|
454
|
+
'[comment] should parse wml comments in statements': `{% view Name {# This is a comment! #} (Object) %} <div/> %}`,
|
|
455
|
+
'[fun] should parse multi dimensional array parameters': `
|
|
456
|
+
{% fun test (value:List[][]) %}<p/>{% endfun %}`,
|
|
457
|
+
'should allow index access on context properties': `{% view Test (Object) %}
|
|
458
|
+
<div>
|
|
459
|
+
{% if @["type"]?? %}
|
|
460
|
+
<div/>
|
|
461
|
+
{% endif %}
|
|
462
|
+
</div>`,
|
|
463
|
+
'should allow paths to use brackets': `
|
|
464
|
+
{% view Test (Object) %}
|
|
465
|
+
<div>
|
|
466
|
+
{% if @values.controls["@type"] %} value {% endif %}
|
|
467
|
+
{% if @values.controls["@type"].value %} value {% endif %}
|
|
468
|
+
</div>`,
|
|
469
|
+
'should allow 2nd level bracket access': `<div>{% for item in our."items" %} <div/>{% endfor %}</div> `,
|
|
470
|
+
'should allow type to be used in if statement expression': `<div>{% if item."type" == 1 %}<p/>{% endif %}</div>`,
|
|
471
|
+
'should support the special wml:attrs attribute': `<Panel wml:attrs={{@panelAttrs}}><div wml:attrs={{divAttrs}}/></Panel>`
|
|
246
472
|
};
|
|
247
473
|
//# sourceMappingURL=test.js.map
|
package/lib/parse/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;AAAa,QAAA,KAAK,GAA2B;IAEzC,+BAA+B,EAAE;QAC7B,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"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"}
|
package/lib/parse/test.ts
CHANGED
|
@@ -74,6 +74,16 @@ export const tests: { [key: string]: any } = {
|
|
|
74
74
|
'</root>'
|
|
75
75
|
|
|
76
76
|
},
|
|
77
|
+
'should parse for from statements': {
|
|
78
|
+
|
|
79
|
+
input: `
|
|
80
|
+
<root>
|
|
81
|
+
{% for value=1 to 30 %}
|
|
82
|
+
<b>{{value}}</b>
|
|
83
|
+
{% endfor %}
|
|
84
|
+
</root>
|
|
85
|
+
`
|
|
86
|
+
},
|
|
77
87
|
'should parse if then expressions': {
|
|
78
88
|
|
|
79
89
|
input: '<Html id={{@id}}>{{ if @check() then a else b }}</Html>'
|
|
@@ -638,6 +648,15 @@ export const tests: { [key: string]: any } = {
|
|
|
638
648
|
<div>
|
|
639
649
|
{% if @values.controls["@type"] %} value {% endif %}
|
|
640
650
|
{% if @values.controls["@type"].value %} value {% endif %}
|
|
641
|
-
</div
|
|
651
|
+
</div>`,
|
|
652
|
+
|
|
653
|
+
'should allow 2nd level bracket access':
|
|
654
|
+
`<div>{% for item in our."items" %} <div/>{% endfor %}</div> `,
|
|
655
|
+
|
|
656
|
+
'should allow type to be used in if statement expression':
|
|
657
|
+
`<div>{% if item."type" == 1 %}<p/>{% endif %}</div>`,
|
|
658
|
+
|
|
659
|
+
'should support the special wml:attrs attribute':
|
|
660
|
+
`<Panel wml:attrs={{@panelAttrs}}><div wml:attrs={{divAttrs}}/></Panel>`
|
|
642
661
|
|
|
643
662
|
}
|