@shaclmate/compiler 4.0.12 → 4.0.13

package/dist/generators/ts/AbstractCollectionType.js

@@ -196,7 +196,10 @@ export class AbstractCollectionType extends AbstractContainerType {
             schema = code `${schema}.nonempty().min(${this.minCount})`;
         }
         else {
-            schema = code `${schema}.default(() => [])`;
+            schema = code `${schema}.optional()`;
+        }
+        if (!this._mutable) {
+            schema = code `${schema}.readonly()`;
         }
         return schema;
     }

package/dist/generators/ts/AbstractUnionType.js

@@ -296,9 +296,9 @@ ${joinCode(this.concreteMembers.map(({ jsonTypeCheck, type, unwrap, wrap }) => c
                 return code `${imports.z}.discriminatedUnion("${this.discriminant.name}", [${joinCode(this.concreteMembers.map(({ type }) => type.jsonSchema({
                     includeDiscriminantProperty: true,
                     context: "type",
-                })), { on: "," })}])`;
+                })), { on: "," })}]).readonly()`;
             case "typeof":
-                return code `${imports.z}.union([${joinCode(this.concreteMembers.map(({ type }) => type.jsonSchema({ context: "type" })), { on: "," })}])`;
+                return code `${imports.z}.union([${joinCode(this.concreteMembers.map(({ type }) => type.jsonSchema({ context: "type" })), { on: "," })}]).readonly()`;
             default:
                 throw this.discriminant;
         }

package/dist/generators/ts/_NamedObjectType/NamedObjectType_jsonSchemaFunctionDeclaration.js

@@ -6,25 +6,19 @@ export function NamedObjectType_jsonSchemaFunctionDeclaration() {
     if (!this.features.has("json")) {
         return Maybe.empty();
     }
-    const mergeZodObjectSchemas = [];
+    let properties = [];
     for (const parentObjectType of this.parentObjectTypes) {
-        mergeZodObjectSchemas.push(parentObjectType.jsonSchema({ context: "type" }));
+        properties.push(code `...${parentObjectType.jsonSchema({ context: "type" })}.shape`);
     }
     if (this.properties.length > 0) {
-        mergeZodObjectSchemas.push(code `${imports.z}.object({ ${joinCode(this.properties
+        properties = properties.concat(this.properties
             .flatMap((property) => property.jsonZchema.toList())
-            .map(({ key, schema }) => code `"${key}": ${schema}`), { on: "," })} })`);
+            .map(({ key, schema }) => code `"${key}": ${schema}`));
     }
+    // ${this.properties.every((property) => !property.mutable) ? `.readonly()` : ""}
     return Maybe.of(code `\
 export function schema() {
-  return ${mergeZodObjectSchemas.length > 0
-        ? mergeZodObjectSchemas.reduce((merged, zodObjectSchema) => {
-            if (merged === null) {
-                return zodObjectSchema;
-            }
-            return code `${merged}.merge(${zodObjectSchema})`;
-        }, null)
-        : `${imports.z}.object()`} satisfies ${imports.z}.ZodType<${syntheticNamePrefix}Json>;
+  return ${imports.z}.object({${joinCode(properties, { on: "," })}}) satisfies ${imports.z}.ZodType<${syntheticNamePrefix}Json>;
 }`);
 }
 //# sourceMappingURL=NamedObjectType_jsonSchemaFunctionDeclaration.js.map

package/dist/generators/ts/_NamedObjectType/ShaclProperty.js

@@ -101,7 +101,7 @@ export class ShaclProperty extends AbstractProperty {
     }
     get jsonSignature() {
         const typeJsonType = this.type.jsonType();
-        return Maybe.of(code `readonly ${this.name}${typeJsonType.optional ? "?" : ""}: ${typeJsonType.requiredName}`);
+        return Maybe.of(code `${!this.mutable ? "readonly " : ""}${this.name}${typeJsonType.optional ? "?" : ""}: ${typeJsonType.requiredName}`);
     }
     get jsonZchema() {
         let schema = this.type.jsonSchema({

package/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@shaclmate/shacl-ast": "4.0.12",
+    "@shaclmate/shacl-ast": "4.0.13",
     "@rdfjs/data-model": "~2.1.1",
     "@rdfjs/dataset": "~2.0.2",
     "@rdfjs/prefix-map": "~0.1.2",
@@ -78,5 +78,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.12"
+  "version": "4.0.13"
 }