@empyria/common 0.1.3 → 0.1.4

package/lib/Ata.js

@@ -46,13 +46,30 @@ export function cloneBySchema(schema) {
  * @param {Object} schemaDef - Map of property name to its JSON schema.
  * @param {Object} [options={}]
  * @param {boolean} [options.strict] - If true, disallows properties not listed in `schemaDef`.
- * @returns {Object} A JSON schema: `{ type: 'object', properties, required: <all keys>, additionalProperties }`.
+ * @param {boolean} [options.optional] - If true, a property whose own schema carries
+ *   `optional: true` is excluded from `required` (that marker is then stripped from the
+ *   property itself — never leaked into the resulting schema, since it isn't a real JSON
+ *   Schema keyword). Off by default: every declared property is required, exactly as before —
+ *   a caller that never sets `optional: true` on any property sees no difference either way.
+ * @returns {Object} A JSON schema: `{ type: 'object', properties, required, additionalProperties }`.
  */
 export function defineSchema(schemaDef, options = {}) {
+	const properties = {}
+	const required = []
+
+	for (const [key, propertySchema] of Object.entries(schemaDef)) {
+		if (options.optional && propertySchema?.optional) {
+			const { optional, ...rest } = propertySchema
+			properties[key] = rest
+		} else {
+			properties[key] = propertySchema
+			required.push(key)
+		}
+	}
 	const schema = {
 		type: 'object',
-		properties: schemaDef,
-		required: Object.keys(schemaDef),
+		properties,
+		required,
 		additionalProperties: !options.strict,
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@empyria/common",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"description": "Shared backend goodies for Empyria",
 	"license": "MIT",
 	"author": "Imre Fazekas <imre.fazekas@icloud.com>",
@@ -19,8 +19,8 @@
 		"test:watch": "bun test --watch"
 	},
 	"dependencies": {
-		"@empyria/classification": "0.1.2",
-		"ata-validator": "1.7.1",
+		"@empyria/classification": "0.1.3",
+		"ata-validator": "1.7.4",
 		"clerobee": "1.0.8",
 		"ms": "2.1.3"
 	},