@takeshape/schema 8.43.0 → 8.43.1

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.
Files changed (19) hide show
  1. package/es/layers/layers.js +1 -1
  2. package/es/layers/type-utils.js +8 -11
  3. package/es/schemas/project-schema/v4.0.0.json +110 -58
  4. package/lib/layers/layers.d.ts +3 -3
  5. package/lib/layers/layers.d.ts.map +1 -1
  6. package/lib/layers/layers.js +1 -1
  7. package/lib/layers/refs.d.ts +11 -11
  8. package/lib/layers/refs.d.ts.map +1 -1
  9. package/lib/layers/type-utils.d.ts +6 -7
  10. package/lib/layers/type-utils.d.ts.map +1 -1
  11. package/lib/layers/type-utils.js +8 -13
  12. package/lib/layers/visitor.d.ts +3 -3
  13. package/lib/layers/visitor.d.ts.map +1 -1
  14. package/lib/project-schema/v4.0.0.d.ts +72 -55
  15. package/lib/project-schema/v4.0.0.d.ts.map +1 -1
  16. package/lib/schemas/index.d.ts +87 -25
  17. package/lib/schemas/index.d.ts.map +1 -1
  18. package/lib/schemas/project-schema/v4.0.0.json +110 -58
  19. package/package.json +4 -4
package/lib/schemas/project-schema/v4.0.0.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "type": "array",
8
8
  "minItems": 1,
9
9
  "items": {
10
- "$ref": "#/definitions/contentSchema"
10
+ "$ref": "#/definitions/propertySchema"
11
11
  }
12
12
  },
13
13
  "nonNegativeInteger": {
@@ -100,14 +100,29 @@
100
100
  },
101
101
  "required": ["$ref"]
102
102
  },
103
+ "shapeSchemaEnum": {
104
+ "title": "Shape Schema Enum",
105
+ "type": "object",
106
+ "properties": {
107
+ "enum": {
108
+ "type": "array",
109
+ "items": {
110
+ "type": "string"
111
+ },
112
+ "minItems": 1
113
+ }
114
+ },
115
+ "additionalProperties": false,
116
+ "required": ["enum"]
117
+ },
103
118
  "objectSchema": {
104
119
  "title": "Object Schema",
120
+ "type": "object",
105
121
  "allOf": [
106
122
  {
107
- "$ref": "#/definitions/contentSchema"
123
+ "$ref": "#/definitions/propertySchema"
108
124
  },
109
125
  {
110
- "type": "object",
111
126
  "properties": {
112
127
  "type": {
113
128
  "type": "string",
@@ -116,7 +131,7 @@
116
131
  "properties": {
117
132
  "type": "object",
118
133
  "additionalProperties": {
119
- "$ref": "#/definitions/contentSchema"
134
+ "$ref": "#/definitions/propertySchema"
120
135
  }
121
136
  }
122
137
  },
@@ -124,12 +139,12 @@
124
139
  }
125
140
  ]
126
141
  },
127
- "arraySchema": {
128
- "title": "Array Schema",
142
+ "returnShapeArraySchema": {
143
+ "title": "Return Shape Array Schema",
129
144
  "type": "object",
130
145
  "allOf": [
131
146
  {
132
- "$ref": "#/definitions/contentSchema"
147
+ "$ref": "#/definitions/propertySchema"
133
148
  },
134
149
  {
135
150
  "properties": {
@@ -138,29 +153,26 @@
138
153
  "const": "array"
139
154
  },
140
155
  "items": {
141
- "$ref": "#/definitions/contentObjectSchema"
156
+ "oneOf": [
157
+ {"$ref": "#/definitions/refSchema"},
158
+ {
159
+ "type": "object",
160
+ "properties": {
161
+ "type": {
162
+ "enum": ["boolean", "integer", "number", "string"]
163
+ }
164
+ },
165
+ "required": ["type"]
166
+ }
167
+ ]
142
168
  }
143
169
  },
144
170
  "required": ["type", "items"]
145
171
  }
146
172
  ]
147
173
  },
148
- "enumSchema": {
149
- "title": "Enum Schema",
150
- "type": "object",
151
- "properties": {
152
- "enum": {
153
- "type": "array",
154
- "items": {
155
- "type": "string"
156
- }
157
- }
158
- },
159
- "required": ["enum"],
160
- "additionalProperties": false
161
- },
162
- "allOfSchema": {
163
- "title": "All Of Schema",
174
+ "shapeSchemaAllOf": {
175
+ "title": "Shape Schema All Of",
164
176
  "type": "object",
165
177
  "properties": {
166
178
  "allOf": {
@@ -184,8 +196,37 @@
184
196
  "required": ["allOf"],
185
197
  "additionalProperties": false
186
198
  },
187
- "oneOfSchema": {
188
- "title": "One Of Schema",
199
+ "allOfSchema": {
200
+ "title": "AllOfSchema",
201
+ "allOf": [
202
+ {"$ref": "#/definitions/propertySchema"},
203
+ {
204
+ "type": "object",
205
+ "properties": {
206
+ "allOf": {
207
+ "type": "array",
208
+ "items": {
209
+ "oneOf": [
210
+ {
211
+ "$ref": "#/definitions/refSchema"
212
+ },
213
+ {
214
+ "$ref": "#/definitions/refSchemaLegacy"
215
+ },
216
+ {
217
+ "$ref": "#/definitions/objectSchema"
218
+ }
219
+ ],
220
+ "unevaluatedProperties": true
221
+ }
222
+ }
223
+ },
224
+ "required": ["allOf"]
225
+ }
226
+ ]
227
+ },
228
+ "shapeSchemaOneOf": {
229
+ "title": "Shape Schema One Of",
189
230
  "type": "object",
190
231
  "properties": {
191
232
  "oneOf": {
@@ -209,30 +250,46 @@
209
250
  "required": ["oneOf"],
210
251
  "additionalProperties": false
211
252
  },
212
- "contentObjectSchema": {
213
- "title": "Content Object Schema",
214
- "type": "object",
215
- "oneOf": [
216
- {
217
- "$ref": "#/definitions/allOfSchema"
218
- },
219
- {
220
- "$ref": "#/definitions/oneOfSchema"
221
- },
222
- {
223
- "$ref": "#/definitions/refSchema"
224
- },
225
- {
226
- "$ref": "#/definitions/refSchemaLegacy"
227
- },
228
- {
229
- "$ref": "#/definitions/objectSchema"
230
- },
253
+ "oneOfSchema": {
254
+ "title": "OneOfSchema",
255
+ "allOf": [
256
+ {"$ref": "#/definitions/propertySchema"},
231
257
  {
232
- "$ref": "#/definitions/arraySchema"
258
+ "type": "object",
259
+ "properties": {
260
+ "oneOf": {
261
+ "type": "array",
262
+ "items": {
263
+ "oneOf": [
264
+ {
265
+ "$ref": "#/definitions/refSchema"
266
+ },
267
+ {
268
+ "$ref": "#/definitions/refSchemaLegacy"
269
+ },
270
+ {
271
+ "$ref": "#/definitions/objectSchema"
272
+ }
273
+ ],
274
+ "unevaluatedProperties": true
275
+ }
276
+ }
277
+ },
278
+ "required": ["oneOf"],
279
+ "additionalProperties": false
233
280
  }
234
281
  ]
235
282
  },
283
+ "shapeSchema": {
284
+ "title": "Shape Schema",
285
+ "type": "object",
286
+ "oneOf": [
287
+ {"$ref": "#/definitions/shapeSchemaAllOf"},
288
+ {"$ref": "#/definitions/shapeSchemaOneOf"},
289
+ {"$ref": "#/definitions/shapeSchemaEnum"},
290
+ {"$ref": "#/definitions/objectSchema"}
291
+ ]
292
+ },
236
293
  "queryMap": {
237
294
  "title": "Query Map",
238
295
  "type": "object",
@@ -244,11 +301,11 @@
244
301
  },
245
302
  "args": {
246
303
  "title": "Args",
247
- "oneOf": [{"type": "string"}, {"$ref": "#/definitions/contentObjectSchema"}]
304
+ "oneOf": [{"type": "string"}, {"$ref": "#/definitions/objectSchema"}]
248
305
  },
249
306
  "returnShape": {
250
307
  "title": "Return Shape",
251
- "oneOf": [{"type": "string"}, {"$ref": "#/definitions/arraySchema"}]
308
+ "oneOf": [{"type": "string"}, {"$ref": "#/definitions/returnShapeArraySchema"}]
252
309
  },
253
310
  "directiveConfigItem": {
254
311
  "title": "Directive Config Item",
@@ -1249,8 +1306,8 @@
1249
1306
  },
1250
1307
  "required": ["resolver", "shape"]
1251
1308
  },
1252
- "contentSchema": {
1253
- "title": "Content Schema",
1309
+ "propertySchema": {
1310
+ "title": "Property Schema",
1254
1311
  "type": "object",
1255
1312
  "properties": {
1256
1313
  "$ref": {
@@ -1301,7 +1358,7 @@
1301
1358
  "format": "regex"
1302
1359
  },
1303
1360
  "items": {
1304
- "$ref": "#/definitions/contentSchema"
1361
+ "$ref": "#/definitions/propertySchema"
1305
1362
  },
1306
1363
  "maxItems": {
1307
1364
  "$ref": "#/definitions/nonNegativeInteger"
@@ -1325,7 +1382,7 @@
1325
1382
  "properties": {
1326
1383
  "type": "object",
1327
1384
  "additionalProperties": {
1328
- "$ref": "#/definitions/contentSchema"
1385
+ "$ref": "#/definitions/propertySchema"
1329
1386
  },
1330
1387
  "default": {}
1331
1388
  },
@@ -1442,12 +1499,7 @@
1442
1499
  "enum": ["extend", "replace"]
1443
1500
  },
1444
1501
  "schema": {
1445
- "oneOf": [
1446
- {"$ref": "#/definitions/objectSchema"},
1447
- {"$ref": "#/definitions/allOfSchema"},
1448
- {"$ref": "#/definitions/oneOfSchema"},
1449
- {"$ref": "#/definitions/enumSchema"}
1450
- ]
1502
+ "$ref": "#/definitions/shapeSchema"
1451
1503
  }
1452
1504
  },
1453
1505
  "required": [
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@takeshape/schema",
3
- "version": "8.43.0",
3
+ "version": "8.43.1",
4
4
  "description": "TakeShape Schema",
5
5
  "homepage": "https://www.takeshape.io",
6
6
  "repository": {
@@ -21,9 +21,9 @@
21
21
  "examples"
22
22
  ],
23
23
  "dependencies": {
24
- "@takeshape/errors": "8.43.0",
25
- "@takeshape/json-schema": "8.43.0",
26
- "@takeshape/util": "8.43.0",
24
+ "@takeshape/errors": "8.43.1",
25
+ "@takeshape/json-schema": "8.43.1",
26
+ "@takeshape/util": "8.43.1",
27
27
  "ajv": "^7.0.4",
28
28
  "ajv-formats": "^1.5.1",
29
29
  "lodash": "^4.17.20",