@formspec/build 0.1.0-alpha.57 → 0.1.0-alpha.59

package/dist/browser.js

@@ -884,7 +884,7 @@ function generateJsonSchemaFromIR(ir, options) {
       applyConstraints(ctx.defs[schemaName], typeDef.constraints, ctx);
     }
     if (typeDef.annotations && typeDef.annotations.length > 0) {
-      applyAnnotations(ctx.defs[schemaName], typeDef.annotations, ctx);
+      applyAnnotations(ctx.defs[schemaName], typeDef.annotations, ctx, typeDef.type);
     }
   }
   const properties = {};
@@ -957,7 +957,7 @@ function generateFieldSchema(field, ctx) {
     }
   }
   applyResolvedMetadata(schema, field.metadata);
-  applyAnnotations(schema, rootAnnotations, ctx);
+  applyAnnotations(schema, rootAnnotations, ctx, field.type);
   if (itemStringSchema !== void 0) {
     applyAnnotations(itemStringSchema, itemAnnotations, ctx);
   }
@@ -1000,32 +1000,36 @@ function applyPathTargetedConstraints(schema, pathConstraints, ctx, typeNode) {
     return schema;
   }
   if (schema.$ref) {
-    const { $ref, ...rest } = schema;
-    const refPart = { $ref };
-    const overridePart = {
-      properties: propertyOverrides,
-      ...rest
+    return {
+      ...schema,
+      properties: propertyOverrides
     };
-    return { allOf: [refPart, overridePart] };
   }
   if (schema.type === "object" && schema.properties) {
-    const missingOverrides = {};
     for (const [target, overrideSchema] of Object.entries(propertyOverrides)) {
-      if (schema.properties[target]) {
-        mergeSchemaOverride(schema.properties[target], overrideSchema);
-      } else {
-        missingOverrides[target] = overrideSchema;
+      if (Object.hasOwn(schema.properties, target)) {
+        const existing = schema.properties[target];
+        if (existing) {
+          mergeSchemaOverride(existing, overrideSchema);
+          continue;
+        }
       }
+      Object.defineProperty(schema.properties, target, {
+        value: overrideSchema,
+        writable: true,
+        enumerable: true,
+        configurable: true
+      });
     }
-    if (Object.keys(missingOverrides).length === 0) {
-      return schema;
-    }
-    return {
-      allOf: [schema, { properties: missingOverrides }]
-    };
+    return schema;
   }
   if (schema.allOf) {
-    schema.allOf = [...schema.allOf, { properties: propertyOverrides }];
+    const overrideMember = { properties: propertyOverrides };
+    const flattened = tryFlattenAllOfToSiblings(schema, overrideMember);
+    if (flattened !== void 0) {
+      return flattened;
+    }
+    schema.allOf = [...schema.allOf, overrideMember];
     return schema;
   }
   return schema;
@@ -1138,7 +1142,7 @@ function generatePropertySchema(prop, ctx) {
   const schema = generateTypeNode(prop.type, ctx);
   applyConstraints(schema, prop.constraints, ctx);
   applyResolvedMetadata(schema, prop.metadata);
-  applyAnnotations(schema, prop.annotations, ctx);
+  applyAnnotations(schema, prop.annotations, ctx, prop.type);
   return schema;
 }
 function generateUnionType(type, ctx) {
@@ -1241,13 +1245,20 @@ function buildPropertyOverrides(pathConstraints, typeNode, ctx) {
     grouped.push(constraint);
     byTarget.set(target, grouped);
   }
-  const overrides = {};
+  const overrides = /* @__PURE__ */ Object.create(null);
   for (const [target, constraints] of byTarget) {
-    overrides[resolveSerializedPropertyName(target, typeNode, ctx)] = buildPathOverrideSchema(
+    const resolvedName = resolveSerializedPropertyName(target, typeNode, ctx);
+    const schema = buildPathOverrideSchema(
       constraints.map(stripLeadingPathSegment),
       resolveTargetTypeNode(target, typeNode, ctx),
       ctx
     );
+    Object.defineProperty(overrides, resolvedName, {
+      value: schema,
+      writable: true,
+      enumerable: true,
+      configurable: true
+    });
   }
   return overrides;
 }
@@ -1274,6 +1285,34 @@ function buildPathOverrideSchema(constraints, typeNode, ctx) {
   schema.properties = buildPropertyOverrides(nestedConstraints, effectiveType, ctx);
   return schema;
 }
+function tryFlattenAllOfToSiblings(schema, overrideMember) {
+  if (schema.allOf?.length !== 1) {
+    return void 0;
+  }
+  const [soleMember] = schema.allOf;
+  if (soleMember === void 0) {
+    return void 0;
+  }
+  const { allOf: _allOf, ...outerRest } = schema;
+  const outerKeys = new Set(Object.keys(outerRest));
+  const memberKeys = new Set(Object.keys(soleMember));
+  const overrideKeys = new Set(Object.keys(overrideMember));
+  for (const key of memberKeys) {
+    if (outerKeys.has(key) || overrideKeys.has(key)) {
+      return void 0;
+    }
+  }
+  for (const key of overrideKeys) {
+    if (outerKeys.has(key)) {
+      return void 0;
+    }
+  }
+  return {
+    ...outerRest,
+    ...soleMember,
+    ...overrideMember
+  };
+}
 function mergeSchemaOverride(target, override) {
   const nullableValueBranch = getNullableUnionValueSchema(target);
   if (nullableValueBranch !== void 0) {
@@ -1281,11 +1320,16 @@ function mergeSchemaOverride(target, override) {
     return;
   }
   if (override.properties !== void 0) {
-    const mergedProperties = target.properties ?? {};
+    const mergedProperties = target.properties ?? /* @__PURE__ */ Object.create(null);
     for (const [name, propertyOverride] of Object.entries(override.properties)) {
-      const existing = mergedProperties[name];
+      const existing = Object.hasOwn(mergedProperties, name) ? mergedProperties[name] : void 0;
       if (existing === void 0) {
-        mergedProperties[name] = propertyOverride;
+        Object.defineProperty(mergedProperties, name, {
+          value: propertyOverride,
+          writable: true,
+          enumerable: true,
+          configurable: true
+        });
       } else {
         mergeSchemaOverride(existing, propertyOverride);
       }
@@ -1303,7 +1347,12 @@ function mergeSchemaOverride(target, override) {
     if (key === "properties" || key === "items") {
       continue;
     }
-    target[key] = value;
+    Object.defineProperty(target, key, {
+      value,
+      writable: true,
+      enumerable: true,
+      configurable: true
+    });
   }
 }
 function stripLeadingPathSegment(constraint) {
@@ -1403,7 +1452,7 @@ function applyConstraints(schema, constraints, ctx) {
     }
   }
 }
-function applyAnnotations(schema, annotations, ctx) {
+function applyAnnotations(schema, annotations, ctx, typeNode) {
   for (const annotation of annotations) {
     switch (annotation.annotationKind) {
       case "displayName":
@@ -1416,7 +1465,7 @@ function applyAnnotations(schema, annotations, ctx) {
         schema[`${ctx.vendorPrefix}-remarks`] = annotation.value;
         break;
       case "defaultValue":
-        schema.default = annotation.value;
+        schema.default = coerceDefaultValue(annotation.value, typeNode, schema, ctx);
         break;
       case "format":
         schema.format = annotation.value;
@@ -1441,6 +1490,34 @@ function applyAnnotations(schema, annotations, ctx) {
     }
   }
 }
+function coerceDefaultValue(value, typeNode, emittedSchema, ctx) {
+  if (typeNode?.kind !== "custom") {
+    return value;
+  }
+  const registration = ctx.extensionRegistry?.findType(typeNode.typeId);
+  if (registration === void 0) {
+    return value;
+  }
+  if (registration.serializeDefault !== void 0) {
+    return registration.serializeDefault(value, typeNode.payload);
+  }
+  const declaredType = emittedSchema["type"];
+  if (declaredType === "string" && typeof value !== "string") {
+    if (typeof value === "number") {
+      if (!Number.isFinite(value)) {
+        return value;
+      }
+      return String(value);
+    }
+    if (typeof value === "boolean") {
+      return String(value);
+    }
+    if (typeof value === "bigint") {
+      return value.toString();
+    }
+  }
+  return value;
+}
 function generateCustomType(type, ctx) {
   const registration = ctx.extensionRegistry?.findType(type.typeId);
   if (registration === void 0) {
@@ -1871,7 +1948,9 @@ import {
 import {
   getTagDefinition,
   normalizeFormSpecTagName,
-  getSyntheticLogger
+  getSyntheticLogger,
+  _validateExtensionSetup,
+  logSetupDiagnostics
 } from "@formspec/analysis/internal";
 var BUILTIN_METADATA_TAGS = /* @__PURE__ */ new Set(["apiName", "displayName"]);
 function buildConstraintTagSources(extensions) {
@@ -1881,6 +1960,16 @@ function buildConstraintTagSources(extensions) {
       constraintTags: extension.constraintTags.map((tag) => ({
         tagName: normalizeFormSpecTagName(tag.tagName)
       }))
+    } : {},
+    // Include customTypes so _validateExtensionSetup can check tsTypeNames for
+    // unsupported built-in overrides and invalid identifier patterns.
+    ...extension.types !== void 0 ? {
+      customTypes: extension.types.map((type) => ({
+        // tsTypeNames: deprecated in favour of symbol-based detection, but
+        // still required for name-based validation in _validateExtensionSetup
+        // until the bridge is fully retired (see §synthetic-checker-retirement §4C).
+        tsTypeNames: type.tsTypeNames ?? [type.typeName]
+      }))
     } : {}
   }));
 }
@@ -1890,7 +1979,13 @@ function createExtensionRegistry(extensions) {
     extensionCount: extensions.length,
     extensionIds: extensions.map((e) => e.extensionId)
   });
-  const reservedTagSources = buildConstraintTagSources(extensions);
+  const extensionTagSources = buildConstraintTagSources(extensions);
+  const setupDiagnostics = _validateExtensionSetup(extensionTagSources);
+  logSetupDiagnostics(registryLog, {
+    diagnosticCount: setupDiagnostics.length,
+    codes: setupDiagnostics.map((d) => d.kind)
+  });
+  const reservedTagSources = extensionTagSources;
   let symbolMap = /* @__PURE__ */ new Map();
   const typeMap = /* @__PURE__ */ new Map();
   const typeNameMap = /* @__PURE__ */ new Map();
@@ -2027,10 +2122,12 @@ function createExtensionRegistry(extensions) {
     constraintTagCount: constraintTagMap.size,
     broadeningCount: builtinBroadeningMap.size,
     annotationCount: annotationMap.size,
-    metadataSlotCount: metadataSlotMap.size
+    metadataSlotCount: metadataSlotMap.size,
+    setupDiagnosticCount: setupDiagnostics.length
   });
   return {
     extensions,
+    setupDiagnostics,
     findType: (typeId) => typeMap.get(typeId),
     findTypeByName: (typeName) => typeNameMap.get(typeName),
     findTypeByBrand: (brand) => brandMap.get(brand),