tsc-ts 0.0.5 → 0.0.6

package/src/compiler/checker-symbols.ts

@@ -46,15 +46,6 @@ import {
 } from './binder-utilities.js';
 import { type Diagnostic, type DiagnosticMessage, Diagnostics, compareDiagnostics } from './diagnostics.js';
 import { NameResolver } from './name-resolver.js';
-import {
-  CheckFlags,
-  InternalSymbolName,
-  Symbol,
-  SymbolFlags,
-  type SymbolTable,
-  addDeclaration,
-  getSymbolId,
-} from './symbol.js';
 import { SyntaxKind } from './syntax-kind.js';
 import { type Checker, createDiagnosticForNode } from './checker.js';
 import {
@@ -92,6 +83,19 @@ import {
 import { isJSAliasDeclaration } from './checker-javascript.js';
 import { getFeatureMap } from './checker-features.js';
 import { NodeBuilderInternalFlags } from './transformers/declarations-resolver.js';
+import {
+  addDeclaration,
+  CheckFlags,
+  declarationAt,
+  declarationCount,
+  getDeclarations,
+  getSymbolId,
+  InternalSymbolName,
+  setDeclarations,
+  Symbol,
+  SymbolFlags,
+  type SymbolTable,
+} from './symbol.js';
 
 // ---- Name resolution
 
@@ -200,8 +204,8 @@ export class CheckerNameResolver extends NameResolver {
     ) {
       const merged = getMergedSymbol(c, result);
       if (
-        merged.declarations.length !== 0 &&
-        merged.declarations.every(
+        declarationCount(merged) !== 0 &&
+        getDeclarations(merged).every(
           (d) =>
             d.kind === SyntaxKind.NamespaceExportDeclaration ||
             (d.kind === SyntaxKind.SourceFile && (d as SourceFile).globalExports !== undefined),
@@ -259,7 +263,7 @@ export class CheckerNameResolver extends NameResolver {
       const locals = isGlobal ? getLocals(lastLocation!) : undefined;
       const nonValueSymbol = locals !== undefined ? getSymbolOfMeaning(c, locals, name, ~SymbolFlags.Value) : undefined;
       if (nonValueSymbol !== undefined) {
-        const importDeclaration = nonValueSymbol.declarations.find(
+        const importDeclaration = getDeclarations(nonValueSymbol).find(
           (d) =>
             d.kind === SyntaxKind.ImportSpecifier ||
             d.kind === SyntaxKind.ImportClause ||
@@ -728,7 +732,7 @@ function mergeFileGlobals(c: Checker, file: SourceFile): void {
     if (locals !== undefined) {
       const fileGlobalThis = locals.get('globalThis');
       if (fileGlobalThis !== undefined)
-        for (const d of fileGlobalThis.declarations)
+        for (const d of getDeclarations(fileGlobalThis))
           c.addDiagnostic(
             createDiagnosticForNode(d, Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, [
               'globalThis',
@@ -992,7 +996,7 @@ export function initializeGlobals(c: Checker): void {
   // addUndefinedToGlobalsOrErrorOnRedeclaration
   const target = globals.get('undefined');
   if (target !== undefined) {
-    for (const declaration of target.declarations)
+    for (const declaration of getDeclarations(target))
       if (!isTypeDeclaration(declaration))
         c.addDiagnostic(
           createDiagnosticForNode(
@@ -1052,7 +1056,7 @@ function mergeModuleAugmentation(c: Checker, moduleName: Node): void {
   const moduleNode = moduleName.parent as ModuleDeclaration;
   const augmentationSymbol = moduleNode.symbol!;
   // Several augmentations in one file share a symbol; merge it once.
-  if (augmentationSymbol.declarations[0]! !== moduleNode) return;
+  if (augmentationSymbol.declaration! !== moduleNode) return;
   if (isGlobalScopeAugmentation(moduleNode)) {
     if (augmentationSymbol.exports !== undefined)
       mergeSymbolTable(c, c.globals, augmentationSymbol.exports, false, undefined);
@@ -1148,7 +1152,7 @@ export function mergeSymbol(c: Checker, target: Symbol, source: Symbol, unidirec
     if ((target.flags & SymbolFlags.ConstEnumOnlyModule) === 0) sourceFlags &= ~SymbolFlags.ConstEnumOnlyModule;
     target.flags |= sourceFlags;
     if (source.valueDeclaration !== undefined) setValueDeclaration(target, source.valueDeclaration);
-    for (const d of source.declarations) addDeclaration(target, d);
+    for (const d of getDeclarations(source)) addDeclaration(target, d);
     if (source.members !== undefined) {
       if (target.members === undefined) target.members = new Map<string, Symbol>();
       mergeSymbolTable(c, target.members, source.members, unidirectional, undefined);
@@ -1162,7 +1166,7 @@ export function mergeSymbol(c: Checker, target: Symbol, source: Symbol, unidirec
     // `var globalThis` already reports a conflict with the built-in.
     if (target !== c.globalThisSymbol)
       c.error(
-        getNameOfDeclaration(source.declarations[0]!),
+        getNameOfDeclaration(source.declaration!),
         Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity,
         symbolToString(c, target),
       );
@@ -1184,8 +1188,8 @@ function reportMergeSymbolError(c: Checker, target: Symbol, source: Symbol): voi
 }
 
 function isPlainJSFile(symbol: Symbol): boolean {
-  if (symbol.declarations.length === 0) return false;
-  const file = getSourceFileOfNode(symbol.declarations[0]!);
+  if (declarationCount(symbol) === 0) return false;
+  const file = getSourceFileOfNode(symbol.declaration!);
   return file.isJS() && file.checkJsDirective === undefined;
 }
 
@@ -1196,7 +1200,8 @@ function addDuplicateDeclarationErrors(
   name: string,
   source: Symbol,
 ): void {
-  for (const node of target.declarations) addDuplicateDeclarationError(c, node, message, name, source.declarations);
+  for (const node of getDeclarations(target))
+    addDuplicateDeclarationError(c, node, message, name, getDeclarations(source));
 }
 
 export function addDuplicateDeclarationError(
@@ -1204,7 +1209,7 @@ export function addDuplicateDeclarationError(
   node: Node,
   message: DiagnosticMessage,
   name: string,
-  relatedNodes: Node[],
+  relatedNodes: readonly Node[],
 ): void {
   const errorNode = getNameOfDeclaration(node) ?? node;
   const error = lookupOrIssueError(c, errorNode, message, [name]);
@@ -1256,7 +1261,7 @@ export function getExcludedSymbolFlags(flags: SymbolFlags): SymbolFlags {
 
 export function cloneSymbol(c: Checker, symbol: Symbol): Symbol {
   const result = c.newSymbol(symbol.flags, symbol.name);
-  result.declarations = symbol.declarations.slice();
+  setDeclarations(result, getDeclarations(symbol).slice());
   result.parent = symbol.parent;
   result.valueDeclaration = symbol.valueDeclaration;
   if (symbol.members !== undefined) result.members = new Map(symbol.members);
@@ -1271,7 +1276,7 @@ export function cloneSymbol(c: Checker, symbol: Symbol): Symbol {
  */
 function copySharedSymbol(c: Checker, shared: Symbol): Symbol {
   const result = c.newSymbol(shared.flags, shared.name);
-  result.declarations = shared.declarations.slice();
+  setDeclarations(result, getDeclarations(shared).slice());
   result.parent = shared.parent;
   result.valueDeclaration = shared.valueDeclaration;
   if (shared.members !== undefined) result.members = new Map(shared.members);
@@ -1315,7 +1320,7 @@ export function getSymbolOfDeclaration(c: Checker, node: Node): Symbol | undefin
 }
 
 function hasStaticDeclaration(symbol: Symbol): boolean {
-  for (const d of symbol.declarations) if (hasStaticModifier(d)) return true;
+  for (const d of getDeclarations(symbol)) if (hasStaticModifier(d)) return true;
   return false;
 }
 
@@ -1331,7 +1336,7 @@ export function getLateBoundSymbol(c: Checker, symbol: Symbol): Symbol {
     } else {
       // An `F[name] = …` assignment in a script has no parent. Checking its target late-binds it
       // with the members of the function it's assigned to.
-      for (const declaration of symbol.declarations)
+      for (const declaration of getDeclarations(symbol))
         if (declaration instanceof BinaryExpression) checkExpressionCached(c, declaration.left);
     }
   }
@@ -1340,7 +1345,7 @@ export function getLateBoundSymbol(c: Checker, symbol: Symbol): Symbol {
 }
 
 function hasLateBindableDeclaration(c: Checker, symbol: Symbol): boolean {
-  for (const declaration of symbol.declarations) if (hasLateBindableName(c, declaration)) return true;
+  for (const declaration of getDeclarations(symbol)) if (hasLateBindableName(c, declaration)) return true;
   return false;
 }
 
@@ -1357,7 +1362,7 @@ export function getGlobalSymbol(
 }
 
 function getGlobalTypeDeclaration(symbol: Symbol): Node | undefined {
-  for (const d of symbol.declarations) {
+  for (const d of getDeclarations(symbol)) {
     switch (d.kind) {
       case SyntaxKind.ClassDeclaration:
       case SyntaxKind.InterfaceDeclaration:
@@ -1490,8 +1495,8 @@ export function resolveSymbolEx(c: Checker, symbol: Symbol, dontResolveAlias: bo
 }
 
 export function getDeclarationOfAliasSymbol(symbol: Symbol): Node | undefined {
-  for (let i = symbol.declarations.length - 1; i >= 0; i--) {
-    const d = symbol.declarations[i]!;
+  for (let i = declarationCount(symbol) - 1; i >= 0; i--) {
+    const d = declarationAt(symbol, i);
     if (isAliasSymbolDeclaration(d)) return d;
   }
   return undefined;
@@ -1622,7 +1627,7 @@ function getResolvedMembersOrExports(c: Checker, symbol: Symbol, isStatic: boole
   if (isStatic) links.resolvedExports = early;
   else links.resolvedMembers = early;
   let late: SymbolTable | undefined;
-  for (const decl of symbol.declarations) {
+  for (const decl of getDeclarations(symbol)) {
     const members = getMembersOfDeclaration(decl);
     if (members === undefined) continue;
     for (const member of members) {
@@ -1639,7 +1644,7 @@ function getResolvedMembersOrExports(c: Checker, symbol: Symbol, isStatic: boole
   // JavaScript `F[name] = …` assignments with late-bindable names.
   const assignments = isStatic ? symbol.exports?.get(InternalSymbolName.AssignmentDeclaration) : undefined;
   if (assignments !== undefined)
-    for (const member of assignments.declarations)
+    for (const member of getDeclarations(assignments))
       if (hasLateBindableName(c, member)) {
         if (late === undefined) late = new Map<string, Symbol>();
         lateBindMember(c, symbol, early, late, member);
@@ -1694,7 +1699,9 @@ function lateBindMember(c: Checker, parent: Symbol, early: SymbolTable, late: Sy
     const earlySymbol = early.get(memberName);
     if ((lateSymbol.flags & getExcludedSymbolFlags(symbolFlags)) !== 0) {
       const declarations =
-        earlySymbol !== undefined ? earlySymbol.declarations.concat(lateSymbol.declarations) : lateSymbol.declarations;
+        earlySymbol !== undefined
+          ? getDeclarations(earlySymbol).concat(getDeclarations(lateSymbol))
+          : getDeclarations(lateSymbol);
       const name =
         (type.flags & 16384) !== 0 ? declarationNameToString(getSourceFileOfNode(declName), declName) : memberName;
       for (const d of declarations) c.error(getNameOfDeclaration(d) ?? d, Diagnostics.Duplicate_identifier_0, name);
@@ -1723,14 +1730,14 @@ function lateBindIndexSignature(c: Checker, early: SymbolTable, late: SymbolTabl
     late.set(InternalSymbolName.Index, indexSymbol);
   }
   // Unlike late-bound members, `decl` gets no late symbol: the index symbol isn't one property.
-  if (indexSymbol.declarations.length === 0 || (getSymbol(decl)!.flags & SymbolFlags.ReplaceableByMethod) === 0)
+  if (declarationCount(indexSymbol) === 0 || (getSymbol(decl)!.flags & SymbolFlags.ReplaceableByMethod) === 0)
     addDeclaration(indexSymbol, decl);
 }
 
 function addDeclarationToLateBoundSymbol(c: Checker, symbol: Symbol, member: Node, symbolFlags: SymbolFlags): void {
   const memberSymbol = getSymbol(member)!;
   c.symbolLinks(memberSymbol).lateSymbol = symbol;
-  if (symbol.declarations.length === 0 || (memberSymbol.flags & SymbolFlags.ReplaceableByMethod) === 0) {
+  if (declarationCount(symbol) === 0 || (memberSymbol.flags & SymbolFlags.ReplaceableByMethod) === 0) {
     symbol.flags |= symbolFlags;
     addDeclaration(symbol, member);
   }
@@ -1754,7 +1761,7 @@ export function symbolIsValue(c: Checker, symbol: Symbol): boolean {
 function isDeclarationContainedBy(symbol: Symbol, container: Symbol): boolean {
   const declaration = symbol.valueDeclaration;
   if (declaration !== undefined)
-    for (const d of container.declarations) if (declaration.pos >= d.pos && declaration.end <= d.end) return true;
+    for (const d of getDeclarations(container)) if (declaration.pos >= d.pos && declaration.end <= d.end) return true;
   return false;
 }
 

package/src/compiler/checker-type-factory.ts

@@ -9,7 +9,6 @@ import { TypeSystemPropertyName, popTypeResolution, pushTypeResolution } from '.
 import { isGenericIndexType } from './checker-type-operators.js';
 import { compareCodePoints } from './diagnostics.js';
 import { Diagnostics } from './diagnostic-messages.js';
-import { CheckFlags, type Symbol, SymbolFlags, type SymbolTable, getSymbolId } from './symbol.js';
 import type { Checker } from './checker.js';
 import {
   CachedTypeKind,
@@ -79,6 +78,7 @@ import {
 import { addOptionality } from './checker-symbol-types.js';
 import { getSourceFileOfNode } from './binder-utilities.js';
 import { isPartOfTypeNode } from './transformers/alias-references.js';
+import { CheckFlags, declarationCount, getSymbolId, type Symbol, SymbolFlags, type SymbolTable } from './symbol.js';
 
 export const enum UnionReduction {
   None = 0,
@@ -265,7 +265,7 @@ export function createAnonymousType(
 
 export function setStructuredTypeMembers(
   c: Checker,
-  t: StructuredType,
+  t: Type,
   members: SymbolTable | undefined,
   callSignatures: Signature[],
   constructSignatures: Signature[],
@@ -514,11 +514,11 @@ export function compareSymbols(c: Checker, s1: Symbol | undefined, s2: Symbol |
   if (s1 === s2) return 0;
   if (s1 === undefined) return 1;
   if (s2 === undefined) return -1;
-  if (s1.declarations.length !== 0 && s2.declarations.length !== 0) {
-    const r = compareNodes(c, s1.declarations[0]!, s2.declarations[0]!);
+  if (declarationCount(s1) !== 0 && declarationCount(s2) !== 0) {
+    const r = compareNodes(c, s1.declaration!, s2.declaration!);
     if (r !== 0) return r;
-  } else if (s1.declarations.length !== 0) return -1;
-  else if (s2.declarations.length !== 0) return 1;
+  } else if (declarationCount(s1) !== 0) return -1;
+  else if (declarationCount(s2) !== 0) return 1;
   const r = compareCodePoints(s1.name, s2.name);
   if (r !== 0) return r;
   if (structuralTies) return 0;
@@ -581,6 +581,18 @@ function compareTypeLists(c: Checker, s1: readonly Type[] | undefined, s2: reado
   return 0;
 }
 
+/** compareTypeLists of the targets of two array mappers. */
+function compareMapperTargets(c: Checker, a: ArrayTypeMapper, b: ArrayTypeMapper): number {
+  const n1 = a.targetCount();
+  const n2 = b.targetCount();
+  if (n1 !== n2) return n1 - n2;
+  for (let i = 0; i < n1; i++) {
+    const r = compareTypes(c, a.targetAt(i), b.targetAt(i));
+    if (r !== 0) return r;
+  }
+  return 0;
+}
+
 function compareElementLabels(n1: Node | undefined, n2: Node | undefined): number {
   if (n1 === n2) return 0;
   if (n1 === undefined) return -1;
@@ -626,7 +638,7 @@ export function compareTypeMappers(c: Checker, m1: TypeMapper | undefined, m2: T
       const a = m1 as ArrayTypeMapper;
       const b = m2 as ArrayTypeMapper;
       const r = compareTypeLists(c, a.sources, b.sources);
-      return r !== 0 ? r : compareTypeLists(c, a.targets, b.targets);
+      return r !== 0 ? r : compareMapperTargets(c, a, b);
     }
     case TypeMapperKind.Merged: {
       const a = m1 as MergedTypeMapper;
@@ -675,15 +687,15 @@ function declarationPlaces(c: Checker, t: Type): number[] {
   const queue: Type[] = [t];
   const seen = new Set<Type>();
   const visit = (symbol: Symbol | undefined): void => {
-    if (symbol === undefined || symbol.declarations.length === 0) return;
-    const node = symbol.declarations[0]!;
+    if (symbol === undefined || declarationCount(symbol) === 0) return;
+    const node = symbol.declaration!;
     const file = sourceFileOf(node);
     (file.isDeclarationFile ? libraryPlaces : places).push((c.fileIndex.get(file) ?? 0) * 0x4000000 + node.pos);
   };
   const mapper = (m: TypeMapper | undefined): void => {
     if (m === undefined) return;
     if (m instanceof SimpleTypeMapper) queue.push(m.target);
-    else if (m instanceof ArrayTypeMapper) for (const u of m.targets) queue.push(u);
+    else if (m instanceof ArrayTypeMapper) for (let i = 0; i < m.targetCount(); i++) queue.push(m.targetAt(i));
     else if (m instanceof ArrayToSingleTypeMapper) queue.push(m.target);
     else if (m instanceof MergedTypeMapper || m instanceof CompositeTypeMapper) {
       mapper(m.m1);
@@ -928,13 +940,38 @@ export function unionContainsType(c: Checker, union: UnionType, t: Type): boolea
   const types = union.types;
   if (types.length < linearTypeSearchLimit) return indexOfType(types, t, 0) >= 0;
   const side = sideOf(c, union);
-  let set = side.constituentSet;
-  if (set === undefined) {
+  let table = side.constituentIds;
+  if (table === undefined) {
     if (side.membershipTests++ === 0) return binarySearchTypes(c, types, t) >= 0;
-    set = new Set(types);
-    side.constituentSet = set;
+    table = constituentTable(types);
+    side.constituentIds = table;
+  }
+  // Type ids are unique within a checker, so a matching id is `t` itself.
+  const key = t.id + 1;
+  const mask = table.length - 1;
+  for (let slot = Math.imul(key, 0x9e3779b1) & mask; ; slot = (slot + 1) & mask) {
+    const value = table[slot]!;
+    if (value === key) return true;
+    if (value === 0) return false;
+  }
+}
+
+/**
+ * An open-addressing table of the ids of `types` (each plus one; zero marks an empty slot), with at
+ * least twice as many slots as types so that probes stay short.
+ */
+function constituentTable(types: readonly Type[]): Int32Array {
+  let size = 4;
+  while (size < types.length * 2) size *= 2;
+  const table = new Int32Array(size);
+  const mask = size - 1;
+  for (const t of types) {
+    const key = t.id + 1;
+    let slot = Math.imul(key, 0x9e3779b1) & mask;
+    while (table[slot] !== 0) slot = (slot + 1) & mask;
+    table[slot] = key;
   }
-  return set.has(t);
+  return table;
 }
 
 /**
@@ -2101,7 +2138,7 @@ export function createTypeReferenceEx(c: Checker, target: Type, typeArguments: T
     target.symbol,
   ) as TypeReference;
   type.target = target;
-  type.resolvedTypeArguments = typeArguments;
+  type.resolvedTypeArguments = c.typeLists.intern(hash, typeArguments);
   references.add(hash, type);
   return type;
 }

package/src/compiler/checker-type-nodes.ts

@@ -39,7 +39,6 @@ import {
   isDeclarationStatementKind,
 } from './binder-utilities.js';
 import { Diagnostics } from './diagnostics.js';
-import { CheckFlags, type Symbol, SymbolFlags, getSymbolId } from './symbol.js';
 import { SyntaxKind } from './syntax-kind.js';
 import type { Checker } from './checker.js';
 import {
@@ -115,6 +114,7 @@ import { checkExpression, checkExpressionCached, getResolvedSymbol } from './che
 import { checkExpressionWithTypeArguments } from './checker-calls.js';
 import { getIntendedTypeFromJSDocTypeReference } from './checker-jsdoc.js';
 import { getCombinedNodeFlags, hasSyntacticModifier } from './binder-utilities.js';
+import { CheckFlags, getDeclarations, getSymbolId, type Symbol, SymbolFlags } from './symbol.js';
 
 export function getTypeFromTypeNode(c: Checker, node: Node): Type {
   return getConditionalFlowTypeOfType(c, getTypeFromTypeNodeWorker(c, node), node);
@@ -720,7 +720,7 @@ export function getAliasSymbolForTypeNode(c: Checker, node: Node): Symbol | unde
 
 function isLocalTypeAlias(symbol: Symbol): boolean {
   let declaration: Node | undefined;
-  for (const d of symbol.declarations) {
+  for (const d of getDeclarations(symbol)) {
     if (isTypeAlias(d)) {
       declaration = d;
       break;

package/src/compiler/checker-type-operators.ts

@@ -25,7 +25,6 @@ import {
   type TypeReferenceNode,
 } from './ast.js';
 import { Diagnostics, Diagnostic } from './diagnostics.js';
-import { CheckFlags, InternalSymbolName, type Symbol, SymbolFlags, getSymbolId } from './symbol.js';
 import { SyntaxKind } from './syntax-kind.js';
 import type { Checker } from './checker.js';
 import {
@@ -189,6 +188,15 @@ import {
   instantiateReverseMappedType as instantiateReverseMappedTypeOfInference,
   resolveReverseMappedTypeMembers as resolveReverseMappedTypeMembersOfInference,
 } from './checker-inference.js';
+import {
+  CheckFlags,
+  copyDeclarations,
+  declarationCount,
+  getSymbolId,
+  InternalSymbolName,
+  type Symbol,
+  SymbolFlags,
+} from './symbol.js';
 
 // ---- Genericity
 
@@ -1658,7 +1666,7 @@ export function resolveMappedTypeMembers(c: Checker, t: MappedType): void {
       c.symbolKeyTypes.set(symbolId, keyType);
       if (modifiersProp !== undefined) {
         c.symbolSyntheticOrigins.set(symbolId, modifiersProp);
-        if (shouldLinkPropDeclarations) prop.declarations = modifiersProp.declarations;
+        if (shouldLinkPropDeclarations) copyDeclarations(prop, modifiersProp);
       }
       members.set(propName, prop);
     } else if (isValidIndexKeyType(c, propNameType) || (propNameType.flags & (TypeFlags.Any | TypeFlags.Enum)) !== 0) {
@@ -2251,7 +2259,7 @@ function computeReferenceArgs(c: Checker, root: ConditionalRoot): ReferenceArgs
     let kind = ReferenceArgKind.Fixed;
     let inferTypeParameter: Type | undefined;
     for (const tp of root.inferTypeParameters) {
-      const declaration = tp.symbol?.declarations[0];
+      const declaration = tp.symbol?.declaration;
       if (
         declaration === undefined ||
         isNodeDescendantOf(declaration, argNode) ||
@@ -2265,9 +2273,9 @@ function computeReferenceArgs(c: Checker, root: ConditionalRoot): ReferenceArgs
       const inner = skipTypeParentheses(argNode);
       if (inner.kind === SyntaxKind.InferType) {
         const tp = root.inferTypeParameters.find(
-          (t) => t.symbol!.declarations[0] === (inner as InferTypeNode).typeParameter,
+          (t) => t.symbol!.declaration === (inner as InferTypeNode).typeParameter,
         );
-        if (tp !== undefined && tp.symbol!.declarations.length === 1 && !isReferencedInOtherArg(c, tp, argNodes, i)) {
+        if (tp !== undefined && declarationCount(tp.symbol!) === 1 && !isReferencedInOtherArg(c, tp, argNodes, i)) {
           kind = ReferenceArgKind.Infer;
           inferTypeParameter = tp;
         }