kopscript 0.13.0 → 0.14.0

package/LLM.md

@@ -303,9 +303,10 @@ class Pair<K, V> {
 Pair<number, string> p = new Pair<number, string>(1, "a");
 ```
 
-One or more unconstrained, invariant type parameters per class/interface (real *or*
-`extern` — see the `extern` section below), comma-separated: `<T>`, `<K, V>`, `<A, B, C>`,
-however many the declaration needs.
+One or more invariant type parameters per class/interface (real *or* `extern` — see the
+`extern` section below), comma-separated: `<T>`, `<K, V>`, `<A, B, C>`, however many the
+declaration needs — each optionally constrained to a single interface: `<T : IComparable>`,
+`<K : IHashable, V>` (mixing constrained and unconstrained params is fine).
 Erased at codegen (JS has no generics either; `Box<number>` and `Box<string>` both
 compile to the exact same plain `class Box`), so there's no runtime cost and no way to
 inspect a type parameter at runtime.
@@ -322,10 +323,30 @@ inspect a type parameter at runtime.
 - Nesting works: `Box<Box<number>>`, `Box<number[]>`, `Box<number>?`, `Box<number>?[]`,
   `Pair<number, Pair<string, bool>>`.
 - Inside the class/interface's own body, each type parameter is fully abstract — you can
-  store it, return it, pass it around, but (unconstrained) you **cannot call any member on
-  a bare type-parameter value** (`this.value.Foo()` where `value: T` is a compile error:
-  "Cannot access member 'Foo' on type 'T'"). This is correct, not a bug — same as an
-  unconstrained type parameter in C#/Java/TypeScript.
+  store it, return it, pass it around, but an **unconstrained** parameter (no `: IFoo`)
+  means you **cannot call any member on a bare type-parameter value** (`this.value.Foo()`
+  where `value: T` is a compile error: "Cannot access member 'Foo' on type 'T'"). This is
+  correct, not a bug — same as an unconstrained type parameter in C#/Java/TypeScript.
+
+**Constraints**: `<T : IComparable>` lifts the "no member calls" restriction — a member
+call on a constrained `T` resolves against the constraint interface's own signature:
+```ks
+interface IComparable { number CompareTo(); }
+class Box<T : IComparable> {
+  public T Value;
+  constructor(T v) { this.Value = v; }
+  public number Compare() { return this.Value.CompareTo(); } // legal — T : IComparable
+}
+Box<Money> b = new Box<Money>(new Money(5));   // Money must implement IComparable
+```
+A type argument satisfies a constraint by implementing the interface directly, through an
+ancestor (`classImplementsInterface` walks the whole superclass chain), or — inside another
+generic body — by already being an equally- or more-constrained type parameter of its own
+(`class Wrapper<T : IComparable> { Box<T> MakeBox(T v) { return new Box<T>(v); } }` is
+legal without ever naming a concrete type). Checked everywhere a type argument is bound: on
+`new`, on a bare generic type reference, and on a generic base in a base list.
+**v1 limit**: at most one constraint per parameter (`T : IFoo, IBar` isn't supported), and
+the constraint must be an interface, never a class.
 
 **Generic inheritance**: a class/interface base list CAN name a generic base, with its own
 type arguments, in either direction:
@@ -349,8 +370,6 @@ though either half alone would work.
 - **Generic functions.** `T Identity<T>(T x)` doesn't parse — only classes and interfaces
   take type parameters, not free functions/methods themselves (a method *inside* a
   generic class can use that class's own type parameters freely, same as any other member).
-- **Constraints.** No `T : IComparable` — a type parameter is always fully unconstrained,
-  which is why you can't call members on a bare one (see above).
 - **Variance.** No `out`/`in`/covariance/contravariance — see invariance above.
 
 ## Nullable types — `T?`
@@ -428,13 +447,14 @@ KopScript-declared name exactly. Extern class members use real JS member names v
 (camelCase, no rename mechanism). No inheritance modeling between two `extern class`
 declarations — each stands alone.
 
-`extern class` can carry type parameters (`extern class Box<T> { constructor(T v); T Value
-{ get; } } from "some-package";`) — identical rules to a real generic class (see "Generics"
-above: one or more unconstrained invariant parameters, erased, generic inheritance
-included), so a generic type from another package instantiates and type-checks exactly
-like a local one (`Box<number>`, arity/invariance errors included) — and a real KopScript
-class can extend a generic `extern class` with a concrete or threaded-through type
-argument, same as extending a real generic base.
+`extern class` can carry type parameters, optionally constrained (`extern class Box<T :
+IComparable> { constructor(T v); T Value { get; } } from "some-package";`) — identical
+rules to a real generic class (see "Generics" above: invariant, erased, generic
+inheritance and constraints both included), so a generic type from another package
+instantiates and type-checks exactly like a local one (`Box<number>`, arity/invariance/
+constraint errors included) — and a real KopScript class can extend a generic `extern
+class` with a concrete or threaded-through type argument, same as extending a real generic
+base.
 
 **Never write `async` on an extern function/method signature** — declare its return type
 as `task`/`task<T>` directly (`task<string> text();`, not `async task<string> text();`).
@@ -521,10 +541,10 @@ Locals/params: **camelCase**. This is convention, not enforced by the compiler.
 
 ## Does not exist (don't reach for these)
 
-Generics beyond one or more unconstrained type parameters and single-generic-base
-inheritance (no `T : IFoo` constraints, no generic functions, no variance, no more than one
-generic entry per base list — see Generics above for what *is* supported) ·
-`any`/`unknown` annotations ·
+Generics beyond one or more type parameters (each with at most one interface constraint)
+and single-generic-base inheritance (no `T : IFoo, IBar` multi-constraints, no generic
+functions, no variance, no more than one generic entry per base list — see Generics above
+for what *is* supported) · `any`/`unknown` annotations ·
 a `let`/`var` keyword (locals are just `Type name = value;`) · decorators/annotations ·
 reflection · type inference on declarations · ternary expression · union/tuple types ·
 **object-literal syntax** (`{ key: value }` as a value — this doesn't exist *anywhere* in

package/README.md

@@ -22,9 +22,11 @@ LLM's context, as opposed to this README's narrative explanation.
   explicit `virtual`/`override` dispatch (methods are sealed unless marked `virtual`), and a full
   `public`/`protected`/`private` access model enforced at compile time.
 - **Strongly typed**: every declaration is explicitly typed and checked at compile time.
-- **Generics**: one or more unconstrained, invariant type parameters on classes and
-  interfaces (`class Box<T> { public T Value; }`, `class Pair<K, V> { ... }`) — erased at
-  codegen with zero runtime cost, the same way `task<T>`/`state<T>` already are.
+- **Generics**: one or more invariant type parameters on classes and interfaces
+  (`class Box<T> { public T Value; }`, `class Pair<K, V> { ... }`), each optionally
+  constrained to an interface (`class Box<T : IComparable> { ... }`), plus generic
+  inheritance (`class IntBox : Box<number> { }`) — erased at codegen with zero runtime
+  cost, the same way `task<T>`/`state<T>` already are.
 - **Nullable types with compiler-enforced null-checking**: `T?` (`string?`, `Dog?`,
   `number[]?`) — a `T?` can't be used where a `T` is expected without an `if (x != null)`
   check first (checked statically, not just at runtime), and comparing a value that can
@@ -253,17 +255,33 @@ compile to the identical plain `class Box`, so there's no runtime cost.
 Still a deliberately small slice of generics, not a scaled-down promise of more later
 inside v1:
 
-- **Invariant, unconstrained.** No `T : ISomething` (constraints) — and because a type
-  parameter is fully unconstrained, you can't call any member on a bare `T`/`K`/`V` value
-  inside the generic class's own body (that's correct behavior, the same restriction
-  C#/Java/TypeScript put on an unconstrained parameter, not a bug). Invariant means
-  `Box<Dog>` is **not** assignable to `Box<Animal>` even though `Dog : Animal`, and
-  `Pair<number, string>` is not assignable to `Pair<string, number>` — every slot must
-  match exactly, in order.
+- **Invariant.** `Box<Dog>` is **not** assignable to `Box<Animal>` even though `Dog :
+  Animal`, and `Pair<number, string>` is not assignable to `Pair<string, number>` — every
+  slot must match exactly, in order.
 - **No generic functions.** `T Identity<T>(T x)` isn't supported — only classes and
   interfaces take type parameters. A method *inside* a generic class can still use that
   class's own type parameters freely; it's just not introducing one of its own.
 
+By default a type parameter is fully unconstrained, so you can't call any member on a bare
+`T`/`K`/`V` value inside the generic class's own body — the same restriction C#/Java/
+TypeScript put on an unconstrained parameter, not a bug. A single optional `: IFoo`
+constraint per parameter lifts that:
+
+```ks
+interface IComparable { number CompareTo(); }
+class Box<T : IComparable> {
+  public T Value;
+  constructor(T v) { this.Value = v; }
+  public number Compare() { return this.Value.CompareTo(); } // legal — T is constrained
+}
+Box<Money> b = new Box<Money>(new Money(5));   // Money must implement IComparable
+```
+
+The constraint must be an interface (never a class), and a type argument satisfies it by
+implementing it directly, through an ancestor, or (inside another generic body) by already
+being an equally-or-more-constrained type parameter of its own. **v1 limit**: at most one
+constraint per parameter — `T : IFoo, IBar` isn't supported.
+
 A class or interface *can* extend/implement a generic base, type arguments and all:
 
 ```ks
@@ -383,11 +401,12 @@ consumes `Component`/`Router` themselves via `extern class ... from "kopular/...
 proving `extern` works as a real cross-*package* boundary, not just for describing DOM
 globals within a single project.
 
-An `extern class` can carry its own type parameter(s), `extern class Box<T> { ... }` or
-`extern class Pair<K, V> { ... }` — exactly the same rules as a real generic class (see
-"Generics" above: invariant, unconstrained, erased, and a real class can extend it as a
-generic base), so a generic type from another package (e.g. Kopular's `FormField<T>`) can
-be described and instantiated generically, not just per concrete type:
+An `extern class` can carry its own type parameter(s), optionally constrained —
+`extern class Box<T> { ... }`, `extern class Pair<K, V> { ... }`, `extern class Box<T :
+IComparable> { ... }` — exactly the same rules as a real generic class (see "Generics"
+above: invariant, erased, and a real class can extend it as a generic base), so a generic
+type from another package (e.g. Kopular's `FormField<T>`) can be described and
+instantiated generically, not just per concrete type:
 
 ```ks
 extern class Box<T> {

package/dist/checker.js

@@ -64,6 +64,19 @@ export class Checker {
         // doubles as the arity table (its length is how many type arguments a
         // reference to that name must supply). See resolveType/validateGenericArity.
         this.genericTypeParams = new Map();
+        // Same shape/population sites as genericTypeParams, but each entry is a
+        // parallel array of that generic's per-parameter constraint interface
+        // name (or null if unconstrained) — e.g. "Pair" -> [null, "IHashable"]
+        // for `class Pair<K, V : IHashable>`. See resolveBaseTypeArgs/checkNew/
+        // checkConstraintSatisfied.
+        this.genericTypeParamConstraints = new Map();
+        // The constraint interface (or null) for every type parameter *currently
+        // in scope* while checking a generic declaration's own body — set/
+        // restored by withTypeParamsInScope alongside namedTypes, so a bare `T`
+        // value's member access (`this.value.Foo()`) can resolve Foo against the
+        // constraint's own signature instead of always erroring (see
+        // checkMemberInner's "typeParam" branch).
+        this.activeConstraints = new Map();
         this.importedNames = new Set();
         this.rawContents = new Map();
         this.hoverEntries = [];
@@ -75,13 +88,17 @@ export class Checker {
         }
         for (const [name, info] of this.imports.classes) {
             this.classes.set(name, info);
-            if (info.typeParams.length > 0)
+            if (info.typeParams.length > 0) {
                 this.genericTypeParams.set(name, info.typeParams);
+                this.genericTypeParamConstraints.set(name, info.typeParamConstraints);
+            }
         }
         for (const [name, info] of this.imports.interfaces) {
             this.interfaces.set(name, info);
-            if (info.typeParams.length > 0)
+            if (info.typeParams.length > 0) {
                 this.genericTypeParams.set(name, info.typeParams);
+                this.genericTypeParamConstraints.set(name, info.typeParamConstraints);
+            }
         }
         for (const [name, info] of this.imports.enums)
             this.enums.set(name, info);
@@ -110,15 +127,24 @@ export class Checker {
             this.namedTypes.set(e.name, "enum");
         for (const c of externClassDecls)
             this.namedTypes.set(c.name, "class");
-        for (const c of classDecls)
-            if (c.typeParams.length > 0)
-                this.genericTypeParams.set(c.name, c.typeParams.map((p) => p.name));
-        for (const i of interfaceDecls)
-            if (i.typeParams.length > 0)
-                this.genericTypeParams.set(i.name, i.typeParams.map((p) => p.name));
-        for (const c of externClassDecls)
-            if (c.typeParams.length > 0)
-                this.genericTypeParams.set(c.name, c.typeParams.map((p) => p.name));
+        for (const c of classDecls) {
+            if (c.typeParams.length === 0)
+                continue;
+            this.genericTypeParams.set(c.name, c.typeParams.map((p) => p.name));
+            this.genericTypeParamConstraints.set(c.name, c.typeParams.map((p) => p.constraint));
+        }
+        for (const i of interfaceDecls) {
+            if (i.typeParams.length === 0)
+                continue;
+            this.genericTypeParams.set(i.name, i.typeParams.map((p) => p.name));
+            this.genericTypeParamConstraints.set(i.name, i.typeParams.map((p) => p.constraint));
+        }
+        for (const c of externClassDecls) {
+            if (c.typeParams.length === 0)
+                continue;
+            this.genericTypeParams.set(c.name, c.typeParams.map((p) => p.name));
+            this.genericTypeParamConstraints.set(c.name, c.typeParams.map((p) => p.constraint));
+        }
         for (const e of enumDecls)
             this.registerEnum(e);
         for (const i of interfaceDecls)
@@ -203,6 +229,7 @@ export class Checker {
         this.classes.set(decl.name, {
             name: decl.name,
             typeParams: decl.typeParams.map((p) => p.name),
+            typeParamConstraints: decl.typeParams.map((p) => p.constraint),
             superclass: null,
             superclassTypeArgs: null,
             interfaces: [],
@@ -394,6 +421,14 @@ export class Checker {
                 else if (declaredParams && suppliedCount > 0 && suppliedCount !== declaredParams.length) {
                     this.diagnostics.error("KS4090", `Type '${type.name}' expects ${this.describeArity(declaredParams)}, got ${suppliedCount}`, line, col);
                 }
+                else if (declaredParams && suppliedCount === declaredParams.length) {
+                    const constraints = this.genericTypeParamConstraints.get(type.name);
+                    type.typeArgs.forEach((arg, i) => {
+                        const constraint = constraints?.[i];
+                        if (constraint)
+                            this.checkConstraintSatisfied(arg, constraint, declaredParams[i], line, col);
+                    });
+                }
                 type.typeArgs?.forEach((a) => this.validateGenericArity(a, line, col));
                 return;
             }
@@ -415,8 +450,11 @@ export class Checker {
         if (typeParams.length === 0)
             return fn();
         const previous = typeParams.map((p) => this.namedTypes.get(p.name));
-        for (const p of typeParams)
+        const previousConstraints = typeParams.map((p) => this.activeConstraints.get(p.name));
+        for (const p of typeParams) {
             this.namedTypes.set(p.name, "typeParam");
+            this.activeConstraints.set(p.name, p.constraint);
+        }
         try {
             return fn();
         }
@@ -427,6 +465,11 @@ export class Checker {
                     this.namedTypes.delete(p.name);
                 else
                     this.namedTypes.set(p.name, prev);
+                const prevConstraint = previousConstraints[i];
+                if (prevConstraint === undefined)
+                    this.activeConstraints.delete(p.name);
+                else
+                    this.activeConstraints.set(p.name, prevConstraint);
             });
         }
     }
@@ -551,7 +594,14 @@ export class Checker {
             }
             return { methods, bases, baseTypeArgs };
         });
-        this.interfaces.set(decl.name, { name: decl.name, typeParams: decl.typeParams.map((p) => p.name), bases, baseTypeArgs, methods });
+        this.interfaces.set(decl.name, {
+            name: decl.name,
+            typeParams: decl.typeParams.map((p) => p.name),
+            typeParamConstraints: decl.typeParams.map((p) => p.constraint),
+            bases,
+            baseTypeArgs,
+            methods,
+        });
         this.recordHover(decl.line, decl.col, decl.typeParams.length > 0 ? `interface ${decl.name}<${decl.typeParams.map((p) => p.name).join(", ")}>` : `interface ${decl.name}`);
     }
     checkInterfaceHierarchy(decl) {
@@ -677,6 +727,7 @@ export class Checker {
         this.classes.set(decl.name, {
             name: decl.name,
             typeParams: decl.typeParams.map((p) => p.name),
+            typeParamConstraints: decl.typeParams.map((p) => p.constraint),
             superclass,
             superclassTypeArgs,
             interfaces,
@@ -715,7 +766,15 @@ export class Checker {
         if (genericBaseCount.count > 1) {
             this.diagnostics.error("KS4095", `'${declName}' has more than one generic entry in its base list — v1 supports at most one`, declLine, declCol);
         }
-        return typeArgNodes.map((a) => this.resolveType(a, declLine, declCol));
+        const resolvedArgs = typeArgNodes.map((a) => this.resolveType(a, declLine, declCol));
+        const constraints = this.genericTypeParamConstraints.get(baseName);
+        const declaredParamNames = this.genericTypeParams.get(baseName);
+        resolvedArgs.forEach((arg, i) => {
+            const constraint = constraints?.[i];
+            if (constraint)
+                this.checkConstraintSatisfied(arg, constraint, declaredParamNames[i], declLine, declCol);
+        });
+        return resolvedArgs;
     }
     checkClassHierarchy(decl) {
         const info = this.classes.get(decl.name);
@@ -846,6 +905,38 @@ export class Checker {
         }
         return false;
     }
+    // Checks that `argType` (bound to type parameter `paramName`, declared
+    // `paramName : constraintInterfaceName`) actually satisfies the
+    // constraint: a class implementing the interface (possibly via an
+    // ancestor — classImplementsInterface already walks the chain), the
+    // interface itself (or one extending it), or a currently-in-scope type
+    // parameter whose own constraint already extends this one (so a
+    // constrained T can be threaded into another equally-constrained slot,
+    // e.g. `class Wrapper<T : IComparable> { void F(Box<T> b) { ... } }`
+    // passing Wrapper's own T to a `Box<T : IComparable>`). Anything else —
+    // a primitive, an array, an unconstrained type parameter, an unrelated
+    // class — is a compile error.
+    checkConstraintSatisfied(argType, constraintInterfaceName, paramName, line, col) {
+        if (argType.kind === "unknown")
+            return; // an earlier error already reported; don't cascade
+        let satisfied;
+        if (argType.kind === "class") {
+            satisfied = this.classImplementsInterface(argType.name, constraintInterfaceName);
+        }
+        else if (argType.kind === "interface") {
+            satisfied = this.interfaceExtends(argType.name, constraintInterfaceName);
+        }
+        else if (argType.kind === "typeParam") {
+            const ownConstraint = this.activeConstraints.get(argType.name);
+            satisfied = !!ownConstraint && this.interfaceExtends(ownConstraint, constraintInterfaceName);
+        }
+        else {
+            satisfied = false;
+        }
+        if (!satisfied) {
+            this.diagnostics.error("KS4096", `Type argument '${T.typeToString(argType)}' does not satisfy constraint '${constraintInterfaceName}' for type parameter '${paramName}'`, line, col);
+        }
+    }
     lookupField(className, fieldName) {
         let current = className;
         while (current) {
@@ -1626,6 +1717,12 @@ export class Checker {
                 return T.UNKNOWN;
             }
             typeArgs = expr.typeArgs.map((a) => this.resolveType(a, expr.line, expr.col));
+            const constraints = this.genericTypeParamConstraints.get(expr.className);
+            typeArgs.forEach((arg, i) => {
+                const constraint = constraints?.[i];
+                if (constraint)
+                    this.checkConstraintSatisfied(arg, constraint, info.typeParams[i], expr.line, expr.col);
+            });
         }
         this.recordHover(expr.line, expr.col, typeArgs ? `class ${expr.className}<${typeArgs.map(T.typeToString).join(", ")}>` : `class ${expr.className}`);
         // The constructor being called may be inherited from a generic
@@ -1851,6 +1948,22 @@ export class Checker {
             this.diagnostics.error("KS4084", `Interface '${objectType.name}' has no member '${expr.property}'`, expr.line, expr.col);
             return { type: T.UNKNOWN, methodInfo: null };
         }
+        // A bare type-parameter receiver (`this.value.Foo()` where `value: T`)
+        // — resolves against the constraint interface's own signature if `T`
+        // is constrained; an unconstrained `T` falls through to the generic
+        // "cannot access member" error below, unchanged from before constraints
+        // existed (see README/LLM.md's own documented restriction).
+        if (objectType.kind === "typeParam") {
+            const constraintName = this.activeConstraints.get(objectType.name);
+            if (constraintName) {
+                const sig = this.collectInterfaceMethods(constraintName).find((m) => m.name === expr.property);
+                if (sig) {
+                    return { type: sig.returnType, methodInfo: { params: sig.params, returnType: sig.returnType, visibility: "public", isVirtual: false, isOverride: false } };
+                }
+                this.diagnostics.error("KS4097", `Interface '${constraintName}' (the constraint on type parameter '${objectType.name}') has no member '${expr.property}'`, expr.line, expr.col);
+                return { type: T.UNKNOWN, methodInfo: null };
+            }
+        }
         if (objectType.kind !== "unknown") {
             this.diagnostics.error("KS4085", `Cannot access member '${expr.property}' on type '${T.typeToString(objectType)}'`, expr.line, expr.col);
         }

package/dist/parser.js

@@ -243,17 +243,21 @@ export class Parser {
         this.consume(TokenKind.RParen, "Expected ')' after parameters");
         return params;
     }
-    // `<K, V>` right after a class/interface name — one or more type
-    // parameters, comma-separated. Empty array if absent, the overwhelmingly
-    // common case. Constraint syntax (`<T : IFoo>`) isn't parsed yet — every
-    // entry's `constraint` is always null for now (see AST.TypeParamDecl).
+    // `<K : IHashable, V>` right after a class/interface/function name — one
+    // or more type parameters, comma-separated, each with an optional
+    // `: InterfaceName` constraint. Empty array if absent, the overwhelmingly
+    // common case.
     parseTypeParamList() {
         if (!this.match(TokenKind.Lt))
             return [];
         const params = [];
         do {
             const nameTok = this.consume(TokenKind.Identifier, "Expected a type parameter name");
-            params.push({ name: nameTok.lexeme, constraint: null, line: nameTok.line, col: nameTok.col });
+            let constraint = null;
+            if (this.match(TokenKind.Colon)) {
+                constraint = this.consume(TokenKind.Identifier, "Expected a constraint interface name after ':'").lexeme;
+            }
+            params.push({ name: nameTok.lexeme, constraint, line: nameTok.line, col: nameTok.col });
         } while (this.match(TokenKind.Comma));
         this.consume(TokenKind.Gt, "Expected '>' after type parameter list");
         return params;

package/dist/printer.js

@@ -121,6 +121,12 @@ export class Printer {
     printBaseListEntry(entry) {
         return entry.typeArgs ? `${entry.name}<${entry.typeArgs.map((t) => this.printType(t)).join(", ")}>` : entry.name;
     }
+    printTypeParamName(decl) {
+        if (decl.typeParams.length === 0)
+            return decl.name;
+        const params = decl.typeParams.map((p) => (p.constraint ? `${p.name} : ${p.constraint}` : p.name)).join(", ");
+        return `${decl.name}<${params}>`;
+    }
     // ---------- top-level declarations ----------
     printStatement(stmt, indent) {
         const pad = indentStr(indent);
@@ -215,7 +221,7 @@ export class Printer {
     printClass(decl, indent) {
         const pad = indentStr(indent);
         const memberPad = indentStr(indent + 1);
-        const nameWithTypeParam = decl.typeParams.length > 0 ? `${decl.name}<${decl.typeParams.map((p) => p.name).join(", ")}>` : decl.name;
+        const nameWithTypeParam = this.printTypeParamName(decl);
         const header = decl.baseList.length > 0 ? `class ${nameWithTypeParam} : ${decl.baseList.map((b) => this.printBaseListEntry(b)).join(", ")} {` : `class ${nameWithTypeParam} {`;
         const prefix = decl.isExported ? "" : "private ";
         const memberParts = [];
@@ -253,7 +259,7 @@ export class Printer {
     printInterface(decl, indent) {
         const pad = indentStr(indent);
         const memberPad = indentStr(indent + 1);
-        const nameWithTypeParam = decl.typeParams.length > 0 ? `${decl.name}<${decl.typeParams.map((p) => p.name).join(", ")}>` : decl.name;
+        const nameWithTypeParam = this.printTypeParamName(decl);
         const header = decl.baseList.length > 0 ? `interface ${nameWithTypeParam} : ${decl.baseList.map((b) => this.printBaseListEntry(b)).join(", ")} {` : `interface ${nameWithTypeParam} {`;
         const prefix = decl.isExported ? "" : "private ";
         if (decl.methods.length === 0)
@@ -282,7 +288,7 @@ export class Printer {
         const pad = indentStr(indent);
         const memberPad = indentStr(indent + 1);
         const prefix = decl.isExported ? "" : "private ";
-        const nameWithTypeParam = decl.typeParams.length > 0 ? `${decl.name}<${decl.typeParams.map((p) => p.name).join(", ")}>` : decl.name;
+        const nameWithTypeParam = this.printTypeParamName(decl);
         const lines = [];
         if (decl.hasConstructor)
             lines.push(`${memberPad}constructor(${this.printParams(decl.ctorParams)});`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kopscript",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "KopScript: a small OOP, strongly-typed language that transpiles to JavaScript, with generics and nullable types",
   "type": "module",
   "license": "MIT",