@formspec/build 0.1.0-alpha.33 → 0.1.0-alpha.34

package/dist/index.d.ts

@@ -35,7 +35,7 @@ export type { JSONSchema7, JSONSchemaType, ExtendedJSONSchema7, FormSpecSchemaEx
 export { createExtensionRegistry } from "./extensions/index.js";
 export type { ExtensionRegistry } from "./extensions/index.js";
 export type { UISchema, UISchemaElement, UISchemaElementBase, UISchemaElementType, ControlElement, VerticalLayout, HorizontalLayout, GroupLayout, Categorization, Category, LabelElement, Rule, RuleEffect, RuleConditionSchema, SchemaBasedCondition, } from "./ui-schema/types.js";
-export type { GenerateFromClassOptions, GenerateFromClassResult, GenerateSchemasOptions, GenerateSchemasFromProgramOptions, StaticSchemaGenerationOptions, } from "./generators/class-schema.js";
+export type { DiscriminatorResolutionOptions, GenerateFromClassOptions, GenerateFromClassResult, GenerateSchemasOptions, GenerateSchemasFromProgramOptions, StaticSchemaGenerationOptions, } from "./generators/class-schema.js";
 export type { StaticBuildContext } from "./static-build.js";
 export type { DiscoveredTypeSchemas, GenerateSchemasFromDeclarationOptions, GenerateSchemasFromParameterOptions, GenerateSchemasFromReturnTypeOptions, GenerateSchemasFromTypeOptions, SchemaSourceDeclaration, } from "./generators/discovered-schema.js";
 export type { BuildMixedAuthoringSchemasOptions, MixedAuthoringSchemas, } from "./generators/mixed-authoring.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -2903,6 +2903,9 @@ function extractDefaultValueAnnotation(initializer, file = "") {
 function isObjectType(type) {
   return !!(type.flags & ts3.TypeFlags.Object);
 }
+function isIntersectionType(type) {
+  return !!(type.flags & ts3.TypeFlags.Intersection);
+}
 function isTypeReference(type) {
   return !!(type.flags & ts3.TypeFlags.Object) && !!(type.objectFlags & ts3.ObjectFlags.Reference);
 }
@@ -2923,10 +2926,11 @@ function makeParseOptions(extensionRegistry, fieldType, checker, subjectType, ho
     ...hostType !== void 0 && { hostType }
   };
 }
-function createAnalyzerMetadataPolicy(input) {
+function createAnalyzerMetadataPolicy(input, discriminator) {
   return {
     raw: input,
-    normalized: normalizeMetadataPolicy(input)
+    normalized: normalizeMetadataPolicy(input),
+    discriminator
   };
 }
 function resolveNodeMetadata(metadataPolicy, declarationKind, logicalName, node, checker, extensionRegistry, buildContext) {
@@ -2994,8 +2998,11 @@ function analyzeDeclarationRootInfo(declaration, checker, file = "", extensionRe
     diagnostics: docResult.diagnostics
   };
 }
-function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, metadataPolicy) {
-  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
+function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, metadataPolicy, discriminatorOptions) {
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(
+    metadataPolicy,
+    discriminatorOptions
+  );
   const name = classDecl.name?.text ?? "AnonymousClass";
   const fields = [];
   const fieldLayouts = [];
@@ -3076,8 +3083,11 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
     staticMethods
   };
 }
-function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegistry, metadataPolicy) {
-  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
+function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegistry, metadataPolicy, discriminatorOptions) {
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(
+    metadataPolicy,
+    discriminatorOptions
+  );
   const name = interfaceDecl.name.text;
   const fields = [];
   const typeRegistry = {};
@@ -3145,19 +3155,31 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegist
     staticMethods: []
   };
 }
-function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry, metadataPolicy) {
-  if (!ts3.isTypeLiteralNode(typeAlias.type)) {
+function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry, metadataPolicy, discriminatorOptions) {
+  const members = getObjectLikeTypeAliasMembers(typeAlias.type);
+  if (members === null) {
     const sourceFile = typeAlias.getSourceFile();
     const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
     const kindDesc = ts3.SyntaxKind[typeAlias.type.kind] ?? "unknown";
     return {
       ok: false,
-      error: `Type alias "${typeAlias.name.text}" at line ${String(line + 1)} is not an object type literal (found ${kindDesc})`
+      error: `Type alias "${typeAlias.name.text}" at line ${String(line + 1)} is not an object-like type alias (found ${kindDesc})`
     };
   }
-  const typeLiteral = typeAlias.type;
-  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(
+    metadataPolicy,
+    discriminatorOptions
+  );
   const name = typeAlias.name.text;
+  const duplicatePropertyNames = findDuplicateObjectLikeTypeAliasPropertyNames(members);
+  if (duplicatePropertyNames.length > 0) {
+    const sourceFile = typeAlias.getSourceFile();
+    const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
+    return {
+      ok: false,
+      error: `Type alias "${name}" at line ${String(line + 1)} contains duplicate property names across object-like members: ${duplicatePropertyNames.join(", ")}`
+    };
+  }
   const fields = [];
   const typeRegistry = {};
   const diagnostics = [];
@@ -3170,7 +3192,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
   const annotations = [...typeAliasDoc.annotations];
   diagnostics.push(...typeAliasDoc.diagnostics);
   const visiting = /* @__PURE__ */ new Set();
-  for (const member of typeLiteral.members) {
+  for (const member of members) {
     if (ts3.isPropertySignature(member)) {
       const fieldNode = analyzeInterfacePropertyToIR(
         member,
@@ -3279,15 +3301,43 @@ function isNullishSemanticType(type) {
   }
   return type.isUnion() && type.types.some((member) => isNullishSemanticType(member));
 }
-function isStringLikeSemanticType(type) {
+function isStringLikeSemanticType(type, checker, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(type)) {
+    return false;
+  }
+  seen.add(type);
   if (type.flags & ts3.TypeFlags.StringLike) {
     return true;
   }
   if (type.isUnion()) {
-    return type.types.length > 0 && type.types.every((member) => isStringLikeSemanticType(member));
+    return type.types.length > 0 && type.types.every((member) => isStringLikeSemanticType(member, checker, seen));
+  }
+  const baseConstraint = checker.getBaseConstraintOfType(type);
+  if (baseConstraint !== void 0 && baseConstraint !== type) {
+    return isStringLikeSemanticType(baseConstraint, checker, seen);
   }
   return false;
 }
+function getObjectLikeTypeAliasMembers(typeNode) {
+  if (ts3.isParenthesizedTypeNode(typeNode)) {
+    return getObjectLikeTypeAliasMembers(typeNode.type);
+  }
+  if (ts3.isTypeLiteralNode(typeNode)) {
+    return [...typeNode.members];
+  }
+  if (ts3.isIntersectionTypeNode(typeNode)) {
+    const members = [];
+    for (const intersectionMember of typeNode.types) {
+      const resolvedMembers = getObjectLikeTypeAliasMembers(intersectionMember);
+      if (resolvedMembers === null) {
+        return null;
+      }
+      members.push(...resolvedMembers);
+    }
+    return members;
+  }
+  return null;
+}
 function extractDiscriminatorDirective(node, file, diagnostics) {
   const discriminatorTags = getLeadingParsedTags(node).filter(
     (tag) => tag.normalizedTagName === "discriminator"
@@ -3394,7 +3444,7 @@ function validateDiscriminatorDirective(node, checker, file, diagnostics) {
     );
     return null;
   }
-  if (!isStringLikeSemanticType(property.type)) {
+  if (!isStringLikeSemanticType(property.type, checker)) {
     diagnostics.push(
       makeAnalysisDiagnostic(
         "TYPE_MISMATCH",
@@ -3421,8 +3471,8 @@ function getConcreteTypeArgumentForDiscriminator(node, subjectType, checker, typ
   const localTypeParameter = node.typeParameters?.[typeParameterIndex];
   return localTypeParameter === void 0 ? null : checker.getTypeAtLocation(localTypeParameter);
 }
-function resolveLiteralDiscriminatorPropertyValue(boundType, fieldName, checker, provenance, diagnostics) {
-  const propertySymbol = boundType.getProperty(fieldName);
+function resolveLiteralDiscriminatorPropertyValue(boundType, propertyName, checker, provenance, diagnostics) {
+  const propertySymbol = boundType.getProperty(propertyName);
   if (propertySymbol === void 0) {
     return void 0;
   }
@@ -3453,6 +3503,9 @@ function resolveLiteralDiscriminatorPropertyValue(boundType, fieldName, checker,
   }
   return void 0;
 }
+function getDiscriminatorIdentityPropertyNames(fieldName) {
+  return fieldName === "object" ? ["object"] : [fieldName, "object"];
+}
 function resolveDiscriminatorApiName(boundType, checker, metadataPolicy) {
   const declaration = resolveNamedDiscriminatorDeclaration(boundType, checker);
   if (declaration === null) {
@@ -3473,6 +3526,10 @@ function resolveDiscriminatorApiName(boundType, checker, metadataPolicy) {
   );
   return metadata?.apiName;
 }
+function applyDiscriminatorApiNamePrefix(value, discriminatorOptions) {
+  const prefix = discriminatorOptions?.apiNamePrefix;
+  return prefix === void 0 || prefix === "" ? value : `${prefix}${value}`;
+}
 function resolveNamedDiscriminatorDeclaration(type, checker, seen = /* @__PURE__ */ new Set()) {
   if (seen.has(type)) {
     return null;
@@ -3527,22 +3584,27 @@ function resolveDiscriminatorValue(boundType, fieldName, checker, provenance, di
       return null;
     }
   }
-  const literalIdentityValue = resolveLiteralDiscriminatorPropertyValue(
-    boundType,
-    fieldName,
-    checker,
-    provenance,
-    diagnostics
-  );
-  if (literalIdentityValue !== void 0) {
-    return literalIdentityValue;
+  for (const identityPropertyName of getDiscriminatorIdentityPropertyNames(fieldName)) {
+    const literalIdentityValue = resolveLiteralDiscriminatorPropertyValue(
+      boundType,
+      identityPropertyName,
+      checker,
+      provenance,
+      diagnostics
+    );
+    if (literalIdentityValue === null) {
+      return null;
+    }
+    if (literalIdentityValue !== void 0) {
+      return literalIdentityValue;
+    }
   }
   const apiName = resolveDiscriminatorApiName(boundType, checker, metadataPolicy);
   if (apiName?.source === "explicit") {
-    return apiName.value;
+    return applyDiscriminatorApiNamePrefix(apiName.value, metadataPolicy.discriminator);
   }
   if (apiName?.source === "inferred") {
-    return apiName.value;
+    return applyDiscriminatorApiNamePrefix(apiName.value, metadataPolicy.discriminator);
   }
   diagnostics.push(
     makeAnalysisDiagnostic(
@@ -3605,15 +3667,20 @@ function buildInstantiatedReferenceName(baseName, typeArguments, checker) {
   return renderedArguments.length === 0 ? baseName : `${baseName}__${renderedArguments.join("__")}`;
 }
 function extractReferenceTypeArguments(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy, extensionRegistry, diagnostics) {
-  const typeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
-  if (typeNode === void 0) {
+  const sourceTypeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
+  if (sourceTypeNode === void 0) {
     return [];
   }
-  const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
-  if (!ts3.isTypeReferenceNode(resolvedTypeNode) || resolvedTypeNode.typeArguments === void 0) {
+  const unwrapParentheses = (typeNode) => ts3.isParenthesizedTypeNode(typeNode) ? unwrapParentheses(typeNode.type) : typeNode;
+  const directTypeNode = unwrapParentheses(sourceTypeNode);
+  const referenceTypeNode = ts3.isTypeReferenceNode(directTypeNode) ? directTypeNode : (() => {
+    const resolvedTypeNode = resolveAliasedTypeNode(directTypeNode, checker);
+    return ts3.isTypeReferenceNode(resolvedTypeNode) ? resolvedTypeNode : null;
+  })();
+  if (referenceTypeNode?.typeArguments === void 0) {
     return [];
   }
-  return resolvedTypeNode.typeArguments.map((argumentNode) => {
+  return referenceTypeNode.typeArguments.map((argumentNode) => {
     const argumentType = checker.getTypeFromTypeNode(argumentNode);
     return {
       tsType: argumentType,
@@ -3727,10 +3794,10 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting, diagnosti
   };
 }
 function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visiting, diagnostics, hostType, metadataPolicy, extensionRegistry) {
-  if (!ts3.isIdentifier(prop.name)) {
+  const name = getAnalyzableObjectLikePropertyName(prop.name);
+  if (name === null) {
     return null;
   }
-  const name = prop.name.text;
   const tsType = checker.getTypeAtLocation(prop);
   const optional = prop.questionToken !== void 0;
   const provenance = provenanceForNode(prop, file);
@@ -3786,6 +3853,31 @@ function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visitin
     provenance
   };
 }
+function findDuplicateObjectLikeTypeAliasPropertyNames(members) {
+  const seen = /* @__PURE__ */ new Set();
+  const duplicates = /* @__PURE__ */ new Set();
+  for (const member of members) {
+    if (!ts3.isPropertySignature(member)) {
+      continue;
+    }
+    const name = getAnalyzableObjectLikePropertyName(member.name);
+    if (name === null) {
+      continue;
+    }
+    if (seen.has(name)) {
+      duplicates.add(name);
+      continue;
+    }
+    seen.add(name);
+  }
+  return [...duplicates].sort();
+}
+function getAnalyzableObjectLikePropertyName(name) {
+  if (!ts3.isIdentifier(name)) {
+    return null;
+  }
+  return name.text;
+}
 function applyEnumMemberDisplayNames(type, annotations) {
   if (!annotations.some(
     (annotation) => annotation.annotationKind === "displayName" && annotation.value.trim().startsWith(":")
@@ -3978,6 +4070,23 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
       diagnostics
     );
   }
+  if (isIntersectionType(type)) {
+    const sourceTypeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
+    const resolvedSourceTypeNode = sourceTypeNode === void 0 ? void 0 : resolveAliasedTypeNode(sourceTypeNode, checker);
+    if (resolvedSourceTypeNode !== void 0 && getObjectLikeTypeAliasMembers(resolvedSourceTypeNode) !== null) {
+      return resolveObjectType(
+        type,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        sourceNode,
+        metadataPolicy,
+        extensionRegistry,
+        diagnostics
+      );
+    }
+  }
   if (isObjectType(type)) {
     return resolveObjectType(
       type,
@@ -4357,7 +4466,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
       };
     }
   }
-  const recordNode = tryResolveRecordType(
+  const recordNode = isObjectType(type) ? tryResolveRecordType(
     type,
     checker,
     file,
@@ -4366,7 +4475,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
     metadataPolicy,
     extensionRegistry,
     collectedDiagnostics
-  );
+  ) : null;
   if (recordNode) {
     visiting.delete(type);
     if (registryTypeName !== void 0 && shouldRegisterNamedType) {
@@ -4563,9 +4672,10 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
       );
     }
     const typeAliasDecl = declarations.find(ts3.isTypeAliasDeclaration);
-    if (typeAliasDecl && ts3.isTypeLiteralNode(typeAliasDecl.type)) {
+    const typeAliasMembers = typeAliasDecl === void 0 ? null : getObjectLikeTypeAliasMembers(typeAliasDecl.type);
+    if (typeAliasDecl && typeAliasMembers !== null) {
       return buildFieldNodeInfoMap(
-        typeAliasDecl.type.members,
+        typeAliasMembers,
         checker,
         file,
         typeRegistry,
@@ -4856,17 +4966,18 @@ function findInterfaceByName(sourceFile, interfaceName) {
 function findTypeAliasByName(sourceFile, aliasName) {
   return findNodeByName(sourceFile, aliasName, ts4.isTypeAliasDeclaration, (n) => n.name.text);
 }
-function analyzeNamedTypeToIR(filePath, typeName, extensionRegistry, metadataPolicy) {
+function analyzeNamedTypeToIR(filePath, typeName, extensionRegistry, metadataPolicy, discriminatorOptions) {
   const ctx = createProgramContext(filePath);
   return analyzeNamedTypeToIRFromProgramContext(
     ctx,
     filePath,
     typeName,
     extensionRegistry,
-    metadataPolicy
+    metadataPolicy,
+    discriminatorOptions
   );
 }
-function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensionRegistry, metadataPolicy) {
+function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensionRegistry, metadataPolicy, discriminatorOptions) {
   const analysisFilePath = path.resolve(filePath);
   const classDecl = findClassByName(ctx.sourceFile, typeName);
   if (classDecl !== null) {
@@ -4875,7 +4986,8 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
       ctx.checker,
       analysisFilePath,
       extensionRegistry,
-      metadataPolicy
+      metadataPolicy,
+      discriminatorOptions
     );
   }
   const interfaceDecl = findInterfaceByName(ctx.sourceFile, typeName);
@@ -4885,7 +4997,8 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
       ctx.checker,
       analysisFilePath,
       extensionRegistry,
-      metadataPolicy
+      metadataPolicy,
+      discriminatorOptions
     );
   }
   const typeAlias = findTypeAliasByName(ctx.sourceFile, typeName);
@@ -4895,7 +5008,8 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
       ctx.checker,
       analysisFilePath,
       extensionRegistry,
-      metadataPolicy
+      metadataPolicy,
+      discriminatorOptions
     );
     if (result.ok) {
       return result.analysis;
@@ -5032,7 +5146,8 @@ function generateSchemasFromClass(options) {
     ctx.checker,
     options.filePath,
     options.extensionRegistry,
-    options.metadata
+    options.metadata,
+    options.discriminator
   );
   return generateClassSchemas(
     analysis,
@@ -5058,7 +5173,8 @@ function generateSchemasFromProgram(options) {
     options.filePath,
     options.typeName,
     options.extensionRegistry,
-    options.metadata
+    options.metadata,
+    options.discriminator
   );
   return generateClassSchemas(
     analysis,
@@ -5277,7 +5393,7 @@ function generateSchemasFromResolvedType(options, skipNamedDeclaration = false,
     typeRegistry,
     /* @__PURE__ */ new Set(),
     options.sourceNode,
-    createAnalyzerMetadataPolicy(options.metadata),
+    createAnalyzerMetadataPolicy(options.metadata, options.discriminator),
     options.extensionRegistry,
     diagnostics
   );
@@ -5326,7 +5442,8 @@ function generateSchemasFromDeclaration(options) {
         options.context.checker,
         filePath,
         options.extensionRegistry,
-        options.metadata
+        options.metadata,
+        options.discriminator
       ),
       filePath,
       options
@@ -5339,7 +5456,8 @@ function generateSchemasFromDeclaration(options) {
         options.context.checker,
         filePath,
         options.extensionRegistry,
-        options.metadata
+        options.metadata,
+        options.discriminator
       ),
       filePath,
       options
@@ -5351,7 +5469,8 @@ function generateSchemasFromDeclaration(options) {
       options.context.checker,
       filePath,
       options.extensionRegistry,
-      options.metadata
+      options.metadata,
+      options.discriminator
     );
     if (analyzedAlias.ok) {
       return generateSchemasFromAnalysis(analyzedAlias.analysis, filePath, options);
@@ -5417,7 +5536,8 @@ function buildMixedAuthoringSchemas(options) {
     filePath,
     typeName,
     schemaOptions.extensionRegistry,
-    schemaOptions.metadata
+    schemaOptions.metadata,
+    schemaOptions.discriminator
   );
   const composedAnalysis = composeAnalysisWithOverlays(analysis, overlays, schemaOptions.metadata);
   const ir = canonicalizeTSDoc(