Skip to content

Commit 013e307

Browse files
epoberezkinepoberezkin
committed
fix schema
1 parent f1b028c commit 013e307

File tree

4 files changed

+62
-55
lines changed

4 files changed

+62
-55
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsonscript",
3-
"version": "0.4.1",
3+
"version": "0.4.2",
44
"description": "Platform independent asynchronous and concurrent scripting language using JSON format",
55
"main": "index.js",
66
"scripts": {

‎schema/schema.json‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -200,61 +200,65 @@
200200
"id": "#macro_exec_0",
201201
"description": "short syntax for executor call",
202202
"type": "object",
203-
"patternGroups": {
203+
"patternProperties": {
204204
"^\\$\\$([^\\.]+)\\.([^\\.]+)$": {
205-
"schema": {
206-
"$ref": "#"
207-
},
208-
"minimum": 1
205+
"$ref": "#"
209206
}
210207
},
211208
"maxProperties": 1,
212-
"additionalProperties": false
209+
"minProperties": 1,
210+
"additionalProperties": false,
211+
"patternRequired": [
212+
"^\\$\\$([^\\.]+)\\.([^\\.]+)$"
213+
]
213214
},
214215
"_macro_exec_1": {
215216
"id": "#macro_exec_1",
216217
"description": "short syntax for executor call",
217218
"type": "object",
218-
"patternGroups": {
219+
"patternProperties": {
219220
"^\\$\\$([^\\.]+)$": {
220-
"schema": {
221-
"$ref": "#"
222-
},
223-
"minimum": 1
221+
"$ref": "#"
224222
}
225223
},
226224
"maxProperties": 1,
227-
"additionalProperties": false
225+
"minProperties": 1,
226+
"additionalProperties": false,
227+
"patternRequired": [
228+
"^\\$\\$([^\\.]+)$"
229+
]
228230
},
229231
"_macro_call_0": {
230232
"id": "#macro_call_0",
231233
"description": "short syntax for function call",
232234
"type": "object",
233-
"patternGroups": {
235+
"patternProperties": {
234236
"^\\$\\#(.+)$": {
235-
"schema": {
236-
"$ref": "#"
237-
},
238-
"minimum": 1
237+
"$ref": "#"
239238
}
240239
},
241240
"maxProperties": 1,
242-
"additionalProperties": false
241+
"minProperties": 1,
242+
"additionalProperties": false,
243+
"patternRequired": [
244+
"^\\$\\#(.+)$"
245+
]
243246
},
244247
"_macro_calc_0": {
245248
"id": "#macro_calc_0",
246249
"description": "short calculations syntax",
247250
"type": "object",
248-
"patternGroups": {
251+
"patternProperties": {
249252
"\\$([+\\-*/=!<>&\\|^]{1,2})": {
250-
"schema": {
251-
"$ref": "#"
252-
},
253-
"minimum": 1
253+
"$ref": "#"
254254
}
255255
},
256256
"maxProperties": 1,
257-
"additionalProperties": false
257+
"minProperties": 1,
258+
"additionalProperties": false,
259+
"patternRequired": [
260+
"\\$([+\\-*/=!<>&\\|^]{1,2})"
261+
]
258262
},
259263
"parallel": {
260264
"id": "#parallel",

‎schema/schema.json.dot‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@
5959
"id": "#macro_{{=macro.name}}_{{=i}}",
6060
"description": "{{=macro.description}}",
6161
"type": "object",
62-
"patternGroups": {
63-
"{{= patternKey }}": {
64-
"schema": { "$ref": "#" },
65-
"minimum": 1
66-
}
62+
"patternProperties": {
63+
"{{= patternKey }}": { "$ref": "#" }
6764
},
6865
"maxProperties": 1,
69-
"additionalProperties": false
66+
"minProperties": 1,
67+
"additionalProperties": false,
68+
"patternRequired": [ "{{= patternKey }}" ]
7069
},
7170
{{~}}
7271
{{~}}

‎schema/schema_strict.json‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -346,61 +346,65 @@
346346
"id": "#macro_exec_0",
347347
"description": "short syntax for executor call",
348348
"type": "object",
349-
"patternGroups": {
349+
"patternProperties": {
350350
"^\\$\\$([^\\.]+)\\.([^\\.]+)$": {
351-
"schema": {
352-
"$ref": "#"
353-
},
354-
"minimum": 1
351+
"$ref": "#"
355352
}
356353
},
357354
"maxProperties": 1,
358-
"additionalProperties": false
355+
"minProperties": 1,
356+
"additionalProperties": false,
357+
"patternRequired": [
358+
"^\\$\\$([^\\.]+)\\.([^\\.]+)$"
359+
]
359360
},
360361
"_macro_exec_1": {
361362
"id": "#macro_exec_1",
362363
"description": "short syntax for executor call",
363364
"type": "object",
364-
"patternGroups": {
365+
"patternProperties": {
365366
"^\\$\\$([^\\.]+)$": {
366-
"schema": {
367-
"$ref": "#"
368-
},
369-
"minimum": 1
367+
"$ref": "#"
370368
}
371369
},
372370
"maxProperties": 1,
373-
"additionalProperties": false
371+
"minProperties": 1,
372+
"additionalProperties": false,
373+
"patternRequired": [
374+
"^\\$\\$([^\\.]+)$"
375+
]
374376
},
375377
"_macro_call_0": {
376378
"id": "#macro_call_0",
377379
"description": "short syntax for function call",
378380
"type": "object",
379-
"patternGroups": {
381+
"patternProperties": {
380382
"^\\$\\#(.+)$": {
381-
"schema": {
382-
"$ref": "#"
383-
},
384-
"minimum": 1
383+
"$ref": "#"
385384
}
386385
},
387386
"maxProperties": 1,
388-
"additionalProperties": false
387+
"minProperties": 1,
388+
"additionalProperties": false,
389+
"patternRequired": [
390+
"^\\$\\#(.+)$"
391+
]
389392
},
390393
"_macro_calc_0": {
391394
"id": "#macro_calc_0",
392395
"description": "short calculations syntax",
393396
"type": "object",
394-
"patternGroups": {
397+
"patternProperties": {
395398
"\\$([+\\-*/=!<>&\\|^]{1,2})": {
396-
"schema": {
397-
"$ref": "#"
398-
},
399-
"minimum": 1
399+
"$ref": "#"
400400
}
401401
},
402402
"maxProperties": 1,
403-
"additionalProperties": false
403+
"minProperties": 1,
404+
"additionalProperties": false,
405+
"patternRequired": [
406+
"\\$([+\\-*/=!<>&\\|^]{1,2})"
407+
]
404408
},
405409
"parallel": {
406410
"id": "#parallel",

0 commit comments

Comments
 (0)