semantifold 0.12.0 → 0.14.0

package/src/frontends/javascript-typescript.js

@@ -6,7 +6,7 @@ import {missingType, parseFailure, SemantifoldDiagnostic, unsupportedSyntax} fro
 import {blockReferencesProtectedEntry} from "../semantic/effects.js"
 import {locationFromOffsets, moduleLocation} from "../semantic/location.js"
 import {withAdaptedOperation} from "../semantic/operators.js"
-import {withParserRanges} from "../semantic/provenance.js"
+import {setParserRanges, withParserRanges} from "../semantic/provenance.js"
 import {hasOnlyUnicodeScalars, scalarType} from "../semantic/scalars.js"
 import {isTask034ResourceProbe} from "../semantic/capabilities.js"
 import {hasExactEffectSupport} from "../backends/effects.js"
@@ -16,7 +16,7 @@ import {documentedValueType, instantiatedRecordFieldType, iterationBindingType,
 /** @typedef {NonNullable<import("@babel/parser").ParseResult<import("@babel/types").File>["tokens"]>[number]} BabelToken */
 /** @typedef {{byStart: Map<number, BabelToken>, tokens: BabelToken[]}} BabelTokenIndex */
 /** @typedef {{name: string, nameLocation: import("../semantic/types.js").SourceLocation, parameters: import("../semantic/types.js").Parameter[], returnType: import("../semantic/types.js").SemanticFunctionReturnType, typeParameters?: import("../semantic/types.js").TypeParameter[], location: import("../semantic/types.js").SourceLocation}} JavaScriptFunctionSignature */
-/** @typedef {{bindings: Map<string, import("../semantic/types.js").SemanticBindingType>, classes: Map<string, import("../semantic/types.js").ClassDeclaration>, currentClass?: import("../semantic/types.js").ClassDeclaration, errors: Map<string, import("../semantic/types.js").ErrorDeclaration>, errorNames: Map<string, import("../semantic/types.js").ErrorDeclaration>, functions: Map<string, JavaScriptFunctionSignature>, lexicalValueNames?: Set<string>, orderedMapDeclarations?: Set<object>, recordNames: Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>, records: Map<string, import("../semantic/types.js").RecordDeclaration>, returnType?: import("../semantic/types.js").SemanticFunctionReturnType, typeParameters?: Map<string, import("../semantic/types.js").TypeParameter>, valueRecordNames: Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration>}} JavaScriptConversionContext */
+/** @typedef {{bindings: Map<string, import("../semantic/types.js").SemanticBindingType>, catchBindingNames?: Set<string>, catchBindingNodes?: Map<string, import("../semantic/types.js").CatchBinding>, classes: Map<string, import("../semantic/types.js").ClassDeclaration>, currentClass?: import("../semantic/types.js").ClassDeclaration, errors: Map<string, import("../semantic/types.js").ErrorDeclaration>, errorNames: Map<string, import("../semantic/types.js").ErrorDeclaration>, functions: Map<string, JavaScriptFunctionSignature>, lexicalValueNames?: Set<string>, orderedMapDeclarations?: Set<object>, recordNames: Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>, records: Map<string, import("../semantic/types.js").RecordDeclaration>, returnType?: import("../semantic/types.js").SemanticFunctionReturnType, typeParameters?: Map<string, import("../semantic/types.js").TypeParameter>, valueRecordNames: Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration>}} JavaScriptConversionContext */
 
 /** @type {WeakMap<object, BabelTokenIndex>} */
 const nodeTokens = new WeakMap()
@@ -875,7 +875,7 @@ function convertLocalStatement(node, language, filename, source, context) {
  * @param {string} name - Local name.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} recordNames - Nominal declarations by source name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} recordNames - Nominal declarations by source name.
  * @param {Map<string, import("../semantic/types.js").TypeParameter>} [typeParameters] - Declaration-scoped parameters.
  * @returns {import("../semantic/types.js").SemanticValueType} Semantic type.
  */
@@ -966,12 +966,23 @@ function convertStatement(node, language, filename, source, canonicalZeroRequire
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
  * @param {JavaScriptConversionContext} context - Typed lexical context.
- * @returns {import("../semantic/types.js").RaiseStatement} Semantic raise.
+ * @returns {import("../semantic/types.js").RaiseStatement | import("../semantic/types.js").RethrowStatement} Semantic raise or rethrow.
  */
 function convertTypedThrow(node, language, filename, source, context) {
   const location = nodeLocation(node, filename, source)
   const argument = node.argument
 
+  if (argument?.type == "Identifier" && context.catchBindingNames?.has(argument.name) && context.bindings.get(argument.name)?.kind == "ErrorType") {
+    const bindingNode = context.catchBindingNodes?.get(argument.name)
+
+    if (!bindingNode) return unsupportedSyntax(language, "throw of a catch binding without an exact handler binding", location)
+    return withParserRanges({
+      binding: argument.name,
+      bindingNode,
+      kind: /** @type {const} */ ("RethrowStatement"),
+      location
+    }, {keyword: tokenLocation(node, "throw", node.start ?? 0, argument.start ?? node.end ?? source.length, filename, source)})
+  }
   if (!argument || argument.type != "NewExpression" || argument.callee.type != "Identifier" ||
     context.bindings.has(argument.callee.name) || !context.errorNames.has(argument.callee.name) || argument.arguments.length != 1 ||
     argument.arguments[0].type == "SpreadElement" || argument.arguments[0].type == "ArgumentPlaceholder" ||
@@ -1006,53 +1017,134 @@ function convertTypedThrow(node, language, filename, source, context) {
 function convertTypedTry(node, language, filename, source, canonicalZeroRequired, context) {
   const location = nodeLocation(node, filename, source)
 
-  if (node.finalizer || !node.handler || node.handler.param?.type != "Identifier" || node.handler.body.directives.length > 0) {
-    return unsupportedSyntax(language, "try without one explicit guarded catch", location)
-  }
-  const binding = node.handler.param
-  const guard = node.handler.body.body[0]
-
-  if (!guard || guard.type != "IfStatement" || guard.alternate || guard.test.type != "UnaryExpression" ||
-    guard.test.operator != "!" || guard.test.argument.type != "BinaryExpression" || guard.test.argument.operator != "instanceof" ||
-    guard.test.argument.left.type != "Identifier" || guard.test.argument.left.name != binding.name ||
-    guard.test.argument.right.type != "Identifier" || guard.test.argument.right.name == binding.name ||
-    context.bindings.has(guard.test.argument.right.name) || !context.errorNames.has(guard.test.argument.right.name) ||
-    guard.consequent.type != "BlockStatement" || guard.consequent.body.length != 1 || guard.consequent.directives.length > 0 ||
-    guard.consequent.body[0].type != "ThrowStatement" || guard.consequent.body[0].argument?.type != "Identifier" ||
-    guard.consequent.body[0].argument.name != binding.name) {
-    return unsupportedSyntax(language, "catch without exact instanceof guard and unmatched rethrow", nodeLocation(guard ?? node.handler, filename, source))
-  }
-  const declaration = /** @type {import("../semantic/types.js").ErrorDeclaration} */ (context.errorNames.get(guard.test.argument.right.name))
-  const caughtTypeLocation = identifierLocation(guard.test.argument.right, filename, source)
-  const catchType = withParserRanges({
-    declarationId: /** @type {string} */ (declaration.id),
-    kind: /** @type {const} */ ("ErrorType")
-  }, {type: caughtTypeLocation})
+  if (!node.handler) {
+    if (!node.finalizer) return unsupportedSyntax(language, "try without an explicit guarded catch", location)
+    const bodyContext = {...context, bindings: new Map(context.bindings)}
+    const semantic = /** @type {import("../semantic/types.js").TryStatement} */ (withParserRanges({
+      body: convertBlock(node.block, language, filename, source, canonicalZeroRequired, bodyContext),
+      handlers: [],
+      kind: /** @type {const} */ ("TryStatement"),
+      location
+    }, {
+      try: tokenLocation(node, "try", node.start ?? 0, node.block.start ?? node.end ?? source.length, filename, source)
+    }))
+
+    semantic.finallyBody = convertBlock(node.finalizer.body, language, filename, source, canonicalZeroRequired,
+      {...context, bindings: new Map(context.bindings)}, nodeLocation(node.finalizer, filename, source))
+    setParserRanges(semantic, {finally: nodeLocation(node.finalizer, filename, source),
+      try: tokenLocation(node, "try", node.start ?? 0, node.block.start ?? node.end ?? source.length, filename, source)})
+    return semantic
+  }
+  /** @type {import("../semantic/types.js").CatchHandler[]} */
+  const handlers = []
+  const seenHandlerNames = new Set(context.catchBindingNames ?? [])
   const bodyContext = {...context, bindings: new Map(context.bindings)}
-  const catchContext = {...context, bindings: new Map(context.bindings)}
 
-  catchContext.bindings.set(binding.name, catchType)
-  const catchStatements = node.handler.body.body.slice(1)
+  // JavaScript has no sibling catch clauses, so the exact native profile for ordered
+  // multi-catch is a guarded dispatch chain: each unmatched guard rethrows into the next
+  // clause. The chain flattens back to one ordered handler list here.
+  /** @type {import("@babel/types").CatchClause | undefined} */
+  let clause = node.handler
+
+  while (clause) {
+    const binding = clause.param
+
+    if (binding?.type != "Identifier" || clause.body.directives.length > 0) {
+      return unsupportedSyntax(language, "catch without one explicit binding", nodeLocation(clause, filename, source))
+    }
+    if (seenHandlerNames.has(binding.name)) {
+      return unsupportedSyntax(language, `catch binding '${binding.name}' shadows an outer handler binding`,
+        identifierLocation(binding, filename, source))
+    }
+    seenHandlerNames.add(binding.name)
+
+    /** @type {import("@babel/types").Statement | undefined} */
+    const guard = clause.body.body[0]
+
+    if (!guard || guard.type != "IfStatement" || guard.test.type != "UnaryExpression" ||
+      guard.test.operator != "!" || guard.test.argument.type != "BinaryExpression" || guard.test.argument.operator != "instanceof" ||
+      guard.test.argument.left.type != "Identifier" || guard.test.argument.left.name != binding.name ||
+      guard.test.argument.right.type != "Identifier" || guard.test.argument.right.name == binding.name ||
+      context.bindings.has(guard.test.argument.right.name) || !context.errorNames.has(guard.test.argument.right.name) ||
+      guard.consequent.type != "BlockStatement" || guard.consequent.body.length != 1 || guard.consequent.directives.length > 0 ||
+      (guard.alternate && (guard.alternate.type != "BlockStatement" || guard.alternate.directives.length > 0))) {
+      return unsupportedSyntax(language, "catch without exact instanceof guard", nodeLocation(guard ?? clause, filename, source))
+    }
+
+    /** @type {import("@babel/types").Statement | undefined} */
+    const dispatch = guard.consequent.body[0]
+    /** @type {import("@babel/types").CatchClause | undefined} */
+    let nextClause = undefined
+    /** @type {import("@babel/types").Statement[]} */
+    let handlerBodyStatements = clause.body.body.slice(1)
+    let handlerBodyLocation = nodeLocation(clause.body, filename, source)
+
+    if (dispatch.type == "TryStatement") {
+      if (dispatch.finalizer || !dispatch.handler || dispatch.block.body.length != 1 || dispatch.block.body[0].type != "ThrowStatement" ||
+        dispatch.block.body[0].argument?.type != "Identifier" || dispatch.block.body[0].argument.name != binding.name ||
+        !guard.alternate || clause.body.body.length != 1) {
+        return unsupportedSyntax(language, "catch guard dispatch without exact rethrow of its own binding",
+          nodeLocation(dispatch, filename, source))
+      }
+      nextClause = dispatch.handler
+      handlerBodyStatements = /** @type {import("@babel/types").BlockStatement} */ (guard.alternate).body
+      handlerBodyLocation = nodeLocation(guard.alternate, filename, source)
+    } else if (dispatch.type != "ThrowStatement" || dispatch.argument?.type != "Identifier" || dispatch.argument.name != binding.name) {
+      return unsupportedSyntax(language, "catch guard without exact unmatched rethrow", nodeLocation(dispatch, filename, source))
+    } else if (guard.alternate) {
+      if (clause.body.body.length != 1) {
+        return unsupportedSyntax(language, "catch guard dispatch without exact rethrow of its own binding",
+          nodeLocation(guard.alternate, filename, source))
+      }
+      handlerBodyStatements = /** @type {import("@babel/types").BlockStatement} */ (guard.alternate).body
+      handlerBodyLocation = nodeLocation(guard.alternate, filename, source)
+    }
 
-  return withParserRanges({
-    body: convertBlock(node.block, language, filename, source, canonicalZeroRequired, bodyContext),
-    catchBinding: withParserRanges({
+    const declaration = /** @type {import("../semantic/types.js").ErrorDeclaration} */ (context.errorNames.get(guard.test.argument.right.name))
+    const caughtTypeLocation = identifierLocation(guard.test.argument.right, filename, source)
+    const catchType = withParserRanges({
+      declarationId: /** @type {string} */ (declaration.id),
+      kind: /** @type {const} */ ("ErrorType")
+    }, {type: caughtTypeLocation})
+    const catchContext = {...context, bindings: new Map(context.bindings), catchBindingNames: new Set(seenHandlerNames),
+      catchBindingNodes: new Map(context.catchBindingNodes)}
+
+    catchContext.bindings.set(binding.name, catchType)
+    const catchBindingNode = withParserRanges({
       kind: /** @type {const} */ ("CatchBinding"),
       location: identifierLocation(binding, filename, source),
       mutable: /** @type {const} */ (false),
       name: binding.name,
       type: catchType
-    }, {name: identifierLocation(binding, filename, source)}),
-    catchBody: convertBlock(catchStatements, language, filename, source, canonicalZeroRequired, catchContext,
-      nodeLocation(node.handler.body, filename, source)),
-    catchType,
+    }, {name: identifierLocation(binding, filename, source)})
+
+    catchContext.catchBindingNodes.set(binding.name, catchBindingNode)
+    handlers.push(withParserRanges({
+      catchBinding: catchBindingNode,
+      catchBody: convertBlock(handlerBodyStatements, language, filename, source, canonicalZeroRequired, catchContext,
+        handlerBodyLocation),
+      catchType,
+      kind: /** @type {const} */ ("CatchHandler"),
+      location: nodeLocation(clause, filename, source)
+    }, {catch: tokenLocation(clause, "catch", clause.start ?? 0, binding.start ?? clause.end ?? source.length, filename, source)}))
+    clause = nextClause
+  }
+  const semantic = /** @type {import("../semantic/types.js").TryStatement} */ (withParserRanges({
+    body: convertBlock(node.block, language, filename, source, canonicalZeroRequired, bodyContext),
+    handlers,
     kind: /** @type {const} */ ("TryStatement"),
     location
   }, {
-    catch: tokenLocation(node.handler, "catch", node.handler.start ?? 0, binding.start ?? node.handler.end ?? source.length, filename, source),
-    guard: nodeLocation(guard, filename, source),
     try: tokenLocation(node, "try", node.start ?? 0, node.block.start ?? node.end ?? source.length, filename, source)
-  })
+  }))
+
+  if (node.finalizer) {
+    semantic.finallyBody = convertBlock(node.finalizer.body, language, filename, source, canonicalZeroRequired,
+      {...context, bindings: new Map(context.bindings)}, nodeLocation(node.finalizer, filename, source))
+    setParserRanges(semantic, {finally: nodeLocation(node.finalizer, filename, source),
+      try: tokenLocation(node, "try", node.start ?? 0, node.block.start ?? node.end ?? source.length, filename, source)})
+  }
+  return semantic
 }
 
 /**
@@ -1301,7 +1393,7 @@ function classJsdocTypeParameters(node, ownerId, filename, source) {
  * @param {import("../semantic/types.js").SourceLocation} location - Source location.
  * @param {string} source - Complete parser input.
  * @param {import("../semantic/types.js").SourceLocation} [typeLocation] - Exact type token location.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} [recordNames] - Nominal declarations by source name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} [recordNames] - Nominal declarations by source name.
  * @param {Map<string, import("../semantic/types.js").TypeParameter>} [typeParameters] - Declaration-scoped parameters.
  * @returns {import("../semantic/types.js").SemanticValueType} Semantic type.
  */
@@ -1319,7 +1411,7 @@ function convertType(sourceType, language, subject, location, source, typeLocati
  * @param {import("../semantic/types.js").SourceLocation} location - Function location.
  * @param {string} source - Complete parser input.
  * @param {import("../semantic/types.js").SourceLocation} [typeLocation] - Exact annotation location.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} [recordNames] - Nominal declarations by source name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} [recordNames] - Nominal declarations by source name.
  * @param {Map<string, import("../semantic/types.js").TypeParameter>} [typeParameters] - Declaration-scoped parameters.
  * @returns {import("../semantic/types.js").SemanticFunctionReturnType} Semantic return type.
  */
@@ -1336,7 +1428,7 @@ function convertReturnType(sourceType, language, subject, location, source, type
  * @param {import("../semantic/types.js").SourceLocation} ownerLocation - Owning declaration location.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} [recordNames] - Nominal declarations by source name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} [recordNames] - Nominal declarations by source name.
  * @param {Map<string, import("../semantic/types.js").TypeParameter>} [typeParameters] - Declaration-scoped parameters.
  * @returns {import("../semantic/types.js").SemanticValueType} Semantic type.
  */
@@ -1356,7 +1448,7 @@ function convertTypeScriptType(annotation, subject, ownerLocation, filename, sou
  * @param {import("../semantic/types.js").SourceLocation} ownerLocation - Owning declaration.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} [recordNames] - Nominal declarations by source name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} [recordNames] - Nominal declarations by source name.
  * @param {Map<string, import("../semantic/types.js").TypeParameter>} [typeParameters] - Declaration-scoped parameters.
  * @returns {import("../semantic/types.js").SemanticValueType} Semantic value type.
  */
@@ -1375,7 +1467,7 @@ function convertTypeScriptValueTypeNode(typeNode, subject, ownerLocation, filena
   }
   if (typeNode.type == "TSTypeReference" && typeNode.typeName.type == "Identifier" &&
     recordNames.has(typeNode.typeName.name)) {
-    const declaration = /** @type {import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration} */ (recordNames.get(typeNode.typeName.name))
+    const declaration = /** @type {import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration} */ (recordNames.get(typeNode.typeName.name))
 
     if (declaration.kind == "EffectResourceDeclaration") {
       if (typeNode.typeParameters) return unsupportedSyntax("typescript", "generic owned resource type", nodeLocation(typeNode, filename, source))
@@ -1457,7 +1549,7 @@ function convertTypeScriptValueTypeNode(typeNode, subject, ownerLocation, filena
  * @param {import("../semantic/types.js").SourceLocation} ownerLocation - Function location.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} [recordNames] - Nominal declarations by source name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} [recordNames] - Nominal declarations by source name.
  * @param {Map<string, import("../semantic/types.js").TypeParameter>} [typeParameters] - Declaration-scoped parameters.
  * @returns {import("../semantic/types.js").SemanticFunctionReturnType} Semantic return type.
  */
@@ -1504,7 +1596,7 @@ function typeScriptTypeParameters(declaration, ownerId, filename, source) {
  * @param {"javascript" | "typescript"} language - Frontend language.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} recordNames - Nominal declarations by source name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} recordNames - Nominal declarations by source name.
  * @param {string} ownerId - Stable function identity.
  * @returns {JavaScriptFunctionSignature} Semantic function signature.
  */
@@ -1561,7 +1653,7 @@ function convertFunctionSignature(node, language, filename, source, recordNames,
  * @param {import("@babel/types").FunctionDeclaration} node - Babel function.
  * @param {JavaScriptFunctionSignature} signature - Converted signature.
  * @param {Map<string, JavaScriptFunctionSignature>} functions - Module signatures.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} recordNames - Nominal declarations by name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} recordNames - Nominal declarations by name.
  * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration>} valueRecordNames - Nominal declarations available in value positions.
  * @param {Map<string, import("../semantic/types.js").RecordDeclaration>} records - Record declarations by identity.
  * @param {Map<string, import("../semantic/types.js").ClassDeclaration>} classes - Reference classes by identity.
@@ -1691,7 +1783,7 @@ function convertJavaScriptError(node, declaration, language, filename, source) {
  * Predeclares the bounded native private-field reference-class profile and all callable signatures.
  * @param {import("@babel/types").ClassDeclaration} node - Parser class.
  * @param {import("../semantic/types.js").ClassDeclaration} declaration - Predeclared class identity.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} nominalNames - Nominal types by name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} nominalNames - Nominal types by name.
  * @param {"javascript" | "typescript"} language - Source language.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
@@ -1782,7 +1874,7 @@ function predeclareReferenceClass(node, declaration, nominalNames, language, fil
  * Converts one reference class body after every class signature is complete.
  * @param {import("@babel/types").ClassDeclaration} node - Parser class.
  * @param {import("../semantic/types.js").ClassDeclaration} declaration - Complete predeclared class signature.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} nominalNames - Nominal types by name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} nominalNames - Nominal types by name.
  * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration>} valueNames - Nominal constructors by name.
  * @param {Map<string, import("../semantic/types.js").RecordDeclaration>} records - Records by identity.
  * @param {Map<string, import("../semantic/types.js").ClassDeclaration>} classes - Classes by identity.
@@ -1824,7 +1916,7 @@ function convertReferenceClassBodies(node, declaration, nominalNames, valueNames
  * Reads one constructor or method signature without admitting overloads or modifiers.
  * @param {import("@babel/types").ClassMethod} node - Parser method.
  * @param {import("../semantic/types.js").ClassDeclaration} declaration - Declaring class.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} nominalNames - Nominal types.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} nominalNames - Nominal types.
  * @param {"javascript" | "typescript"} language - Source language.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
@@ -1880,7 +1972,7 @@ function convertClassCallableSignature(node, declaration, nominalNames, language
  * Converts one exact TypeScript readonly constructor-parameter record profile.
  * @param {import("@babel/types").ClassDeclaration} node - Class declaration.
  * @param {import("../semantic/types.js").RecordDeclaration} declaration - Predeclared nominal identity.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} recordNames - All nominal declarations by name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} recordNames - All nominal declarations by name.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
  * @returns {import("../semantic/types.js").RecordDeclaration} Semantic record declaration.
@@ -1935,7 +2027,7 @@ function convertTypeScriptRecord(node, declaration, recordNames, filename, sourc
  * Converts one exact JSDoc constructor/readonly-assignment/freeze record profile.
  * @param {import("@babel/types").ClassDeclaration} node - Class declaration.
  * @param {import("../semantic/types.js").RecordDeclaration} declaration - Predeclared nominal identity.
- * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} recordNames - Nominal declarations by name.
+ * @param {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} recordNames - Nominal declarations by name.
  * @param {string} filename - Source filename.
  * @param {string} source - Complete source.
  * @returns {import("../semantic/types.js").RecordDeclaration} Semantic record declaration.
@@ -2267,7 +2359,7 @@ export function parseJavaScriptTypeScript({capabilities = [], filename, language
     fields: [], id: `class:${index}`, kind: /** @type {const} */ ("ClassDeclaration"),
     location: nodeLocation(node, filename, source), methods: [], name: node.id?.name ?? ""
   }))
-  const recordNames = /** @type {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration>} */ (
+  const recordNames = /** @type {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration | import("../semantic/types.js").EffectResourceDeclaration | import("../semantic/types.js").InterfaceDeclaration>} */ (
     new Map(program?.records ?? []))
   for (const resource of capabilities.flatMap(({resources}) => resources)) recordNames.set(resource.name, resource)
   const valueRecordNames = /** @type {Map<string, import("../semantic/types.js").RecordDeclaration | import("../semantic/types.js").ClassDeclaration>} */ (