kopscript 0.7.2 → 0.9.0

package/dist/parser.js

@@ -16,7 +16,7 @@ export class Parser {
         while (!this.check(TokenKind.EOF)) {
             if (this.check(TokenKind.Using)) {
                 const t = this.peek();
-                this.diagnostics.error("'using' directives must appear at the top of the file, before any other declaration", t.line, t.col);
+                this.diagnostics.error("KS2001", "'using' directives must appear at the top of the file, before any other declaration", t.line, t.col);
                 this.parseUsing(); // consume and discard so parsing can continue
                 continue;
             }
@@ -44,7 +44,7 @@ export class Parser {
             const expr = this.parseExpression();
             if (!this.check(TokenKind.EOF)) {
                 const t = this.peek();
-                this.diagnostics.error(`Unexpected token '${t.lexeme}' after expression`, t.line, t.col);
+                this.diagnostics.error("KS2002", `Unexpected token '${t.lexeme}' after expression`, t.line, t.col);
             }
             return expr;
         }
@@ -60,7 +60,7 @@ export class Parser {
             const type = this.parseType();
             if (!this.check(TokenKind.EOF)) {
                 const t = this.peek();
-                this.diagnostics.error(`Unexpected token '${t.lexeme}' after type`, t.line, t.col);
+                this.diagnostics.error("KS2003", `Unexpected token '${t.lexeme}' after type`, t.line, t.col);
             }
             return type;
         }
@@ -152,11 +152,11 @@ export class Parser {
         if (this.isDeclStart()) {
             const decl = this.parseDeclaration(isExported);
             if (decl.kind === "VarDecl") {
-                this.diagnostics.error("'public'/'private' cannot modify a variable declaration", modifierTok.line, modifierTok.col);
+                this.diagnostics.error("KS2004", "'public'/'private' cannot modify a variable declaration", modifierTok.line, modifierTok.col);
             }
             return decl;
         }
-        this.diagnostics.error("Expected a class, interface, enum, or function declaration after 'public'/'private'", modifierTok.line, modifierTok.col);
+        this.diagnostics.error("KS2005", "Expected a class, interface, enum, or function declaration after 'public'/'private'", modifierTok.line, modifierTok.col);
         throw new ParseError();
     }
     // Lookahead for the C#-style `Type name` declaration shape (locals and
@@ -204,7 +204,7 @@ export class Parser {
             return { kind: "FunctionDecl", isExported, isAsync, name, params, returnType: type, body, line: start.line, col: start.col };
         }
         if (isAsync) {
-            this.diagnostics.error("'async' cannot modify a variable declaration", start.line, start.col);
+            this.diagnostics.error("KS2006", "'async' cannot modify a variable declaration", start.line, start.col);
         }
         this.consume(TokenKind.Assign, "Expected '=' in variable declaration");
         const init = this.parseExpression();
@@ -273,7 +273,7 @@ export class Parser {
             if (this.check(TokenKind.Template)) {
                 const templateStart = this.advance();
                 if (template) {
-                    this.diagnostics.error(`Class '${name}' already has a 'template' declaration`, templateStart.line, templateStart.col);
+                    this.diagnostics.error("KS2007", `Class '${name}' already has a 'template' declaration`, templateStart.line, templateStart.col);
                 }
                 this.consume(TokenKind.From, "Expected 'from \"<path>\"' after 'template'");
                 const pathTok = this.consume(TokenKind.String, "Expected a file path string after 'from'");
@@ -333,7 +333,7 @@ export class Parser {
                 const params = this.parseParamList();
                 const body = this.parseBlock();
                 if (isStatic && (isVirtual || isOverride)) {
-                    this.diagnostics.error("'static' methods cannot be 'virtual' or 'override'", memberStart.line, memberStart.col);
+                    this.diagnostics.error("KS2008", "'static' methods cannot be 'virtual' or 'override'", memberStart.line, memberStart.col);
                 }
                 methods.push({
                     kind: "MethodDecl",
@@ -354,13 +354,13 @@ export class Parser {
             }
             else if (this.check(TokenKind.LBrace)) {
                 if (isVirtual || isOverride) {
-                    this.diagnostics.error("'virtual'/'override' are only valid on methods", memberStart.line, memberStart.col);
+                    this.diagnostics.error("KS2009", "'virtual'/'override' are only valid on methods", memberStart.line, memberStart.col);
                 }
                 if (isAsync) {
-                    this.diagnostics.error("'async' is only valid on methods", memberStart.line, memberStart.col);
+                    this.diagnostics.error("KS2010", "'async' is only valid on methods", memberStart.line, memberStart.col);
                 }
                 if (isStatic) {
-                    this.diagnostics.error("'static' properties are not supported in v1 (use a static field instead)", memberStart.line, memberStart.col);
+                    this.diagnostics.error("KS2011", "'static' properties are not supported in v1 (use a static field instead)", memberStart.line, memberStart.col);
                 }
                 this.advance(); // '{'
                 this.consume(TokenKind.Get, "Expected 'get' in property accessor list");
@@ -386,10 +386,10 @@ export class Parser {
             }
             else {
                 if (isVirtual || isOverride) {
-                    this.diagnostics.error("'virtual'/'override' are only valid on methods", memberStart.line, memberStart.col);
+                    this.diagnostics.error("KS2012", "'virtual'/'override' are only valid on methods", memberStart.line, memberStart.col);
                 }
                 if (isAsync) {
-                    this.diagnostics.error("'async' is only valid on methods", memberStart.line, memberStart.col);
+                    this.diagnostics.error("KS2013", "'async' is only valid on methods", memberStart.line, memberStart.col);
                 }
                 let initializer = null;
                 if (isStatic) {
@@ -500,7 +500,7 @@ export class Parser {
         const start = this.advance(); // 'raw'
         const typeTok = this.consume(TokenKind.Identifier, "Expected 'string' after 'raw'");
         if (typeTok.lexeme !== "string") {
-            this.diagnostics.error(`'raw' declarations must be of type 'string', got '${typeTok.lexeme}'`, typeTok.line, typeTok.col);
+            this.diagnostics.error("KS2014", `'raw' declarations must be of type 'string', got '${typeTok.lexeme}'`, typeTok.line, typeTok.col);
         }
         const name = this.consume(TokenKind.Identifier, "Expected name").lexeme;
         this.consume(TokenKind.From, "Expected 'from \"<path>\"' after 'raw string <Name>'");
@@ -531,10 +531,10 @@ export class Parser {
             if (this.check(TokenKind.Constructor)) {
                 const ctorTok = this.advance();
                 if (virtualTok) {
-                    this.diagnostics.error(`'virtual' is not valid on an extern constructor`, virtualTok.line, virtualTok.col);
+                    this.diagnostics.error("KS2015", `'virtual' is not valid on an extern constructor`, virtualTok.line, virtualTok.col);
                 }
                 if (hasConstructor) {
-                    this.diagnostics.error(`Extern class '${name}' already has a constructor signature`, ctorTok.line, ctorTok.col);
+                    this.diagnostics.error("KS2016", `Extern class '${name}' already has a constructor signature`, ctorTok.line, ctorTok.col);
                 }
                 ctorParams = this.parseParamList();
                 hasConstructor = true;
@@ -550,7 +550,7 @@ export class Parser {
             }
             else if (this.check(TokenKind.LBrace)) {
                 if (virtualTok) {
-                    this.diagnostics.error(`'virtual' is not valid on an extern property`, virtualTok.line, virtualTok.col);
+                    this.diagnostics.error("KS2017", `'virtual' is not valid on an extern property`, virtualTok.line, virtualTok.col);
                 }
                 this.advance();
                 this.consume(TokenKind.Get, "Expected 'get' in extern property accessor list");
@@ -566,7 +566,7 @@ export class Parser {
             }
             else {
                 if (virtualTok) {
-                    this.diagnostics.error(`'virtual' is not valid on an extern property`, virtualTok.line, virtualTok.col);
+                    this.diagnostics.error("KS2018", `'virtual' is not valid on an extern property`, virtualTok.line, virtualTok.col);
                 }
                 this.consume(TokenKind.Semicolon, "Expected ';' after extern property declaration");
                 properties.push({ isStatic, name: memberName, type, hasSetter: true });
@@ -671,7 +671,7 @@ export class Parser {
             finallyBlock = this.parseBlock();
         }
         if (!catchBlock && !finallyBlock) {
-            this.diagnostics.error("'try' must be followed by 'catch' and/or 'finally'", start.line, start.col);
+            this.diagnostics.error("KS2019", "'try' must be followed by 'catch' and/or 'finally'", start.line, start.col);
         }
         return { kind: "TryStatement", tryBlock, catchParam, catchBlock, finallyBlock, line: start.line, col: start.col };
     }
@@ -945,7 +945,7 @@ export class Parser {
             this.consume(TokenKind.RParen, "Expected ')' after expression");
             return expr;
         }
-        this.diagnostics.error(`Unexpected token '${t.lexeme || t.kind}'`, t.line, t.col);
+        this.diagnostics.error("KS2020", `Unexpected token '${t.lexeme || t.kind}'`, t.line, t.col);
         throw new ParseError();
     }
     // Distinguishes a lambda's parameter list from a parenthesized expression.
@@ -1049,7 +1049,7 @@ export class Parser {
         const subParser = new Parser(subTokens, subDiagnostics);
         const expr = subParser.parseExpression();
         for (const d of subDiagnostics.diagnostics) {
-            this.diagnostics.error(d.message, token.line, token.col);
+            this.diagnostics.error("KS2021", d.message, token.line, token.col);
         }
         return expr;
     }
@@ -1109,7 +1109,7 @@ export class Parser {
         if (this.check(kind))
             return this.advance();
         const t = this.peek();
-        this.diagnostics.error(message, t.line, t.col);
+        this.diagnostics.error("KS2022", message, t.line, t.col);
         throw new ParseError();
     }
     synchronize() {

package/dist/sourcemap.js

@@ -0,0 +1,113 @@
+// A minimal, self-contained source-map v3 (base64 VLQ) encoder — hand-rolled
+// rather than pulling in the `source-map` package, to keep kopscript at zero
+// runtime dependencies (see README.md/package.json). No imports beyond this
+// file's own code; nothing here reads or writes the filesystem.
+//
+// Spec: https://sourcemaps.info/spec.html — the encoding this file
+// implements (VLQ digit format, per-line column reset) is described there.
+const BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+const VLQ_BASE_SHIFT = 5;
+const VLQ_BASE = 1 << VLQ_BASE_SHIFT; // 32 — 5 data bits per base64 digit
+const VLQ_BASE_MASK = VLQ_BASE - 1; // 0x1F
+const VLQ_CONTINUATION_BIT = VLQ_BASE; // 0x20 — set on every digit but the last
+// Sign-and-magnitude, not two's complement: the sign lives in the low bit of
+// the shifted value, not as a separate leading digit — this is what makes a
+// small negative delta (the common case for a line's *second* segment
+// resetting a column back down) encode just as compactly as a small
+// positive one.
+function toSignedVLQ(value) {
+    return value < 0 ? (-value << 1) + 1 : value << 1;
+}
+function encodeVLQValue(value) {
+    let vlq = toSignedVLQ(value);
+    let result = "";
+    do {
+        let digit = vlq & VLQ_BASE_MASK;
+        vlq >>>= VLQ_BASE_SHIFT;
+        if (vlq > 0)
+            digit |= VLQ_CONTINUATION_BIT;
+        result += BASE64_CHARS[digit];
+    } while (vlq > 0);
+    return result;
+}
+// Encodes one mapping segment's fields (already converted to deltas by the
+// caller) as a contiguous run of VLQ digit-groups — e.g. `[0, 0, 0, 0]` (the
+// "no change from the previous segment" case) always encodes to `"AAAA"`.
+export function encodeVLQ(values) {
+    return values.map(encodeVLQValue).join("");
+}
+// Builds one file's source-map v3 JSON incrementally, one `addMapping` call
+// per source position worth recording (see codegen.ts for how call sites are
+// chosen — statement-level, not full expression/column granularity). Only
+// ever describes a single source file per generated file, matching
+// kopscript's one-.ks-file-in, one-.js-file-out compilation model.
+export class SourceMapBuilder {
+    constructor(fileName, sourceFileName, sourceContent) {
+        // `mappings` is one comma-joined segment-string per GENERATED line,
+        // joined with `;` at the end — an empty array entry for a generated line
+        // with no recorded mapping produces the required-but-empty group between
+        // two semicolons, not a skipped line (that would shift every later line's
+        // meaning, since position in the `;`-separated list *is* the line number).
+        this.lineGroups = [];
+        // Per the spec, `generatedColumn` deltas reset to being measured from 0
+        // at the start of every generated line, but `sourceLine`/`sourceColumn`
+        // deltas accumulate across the *entire* file, never resetting — tracking
+        // both correctly is the one genuinely easy-to-get-wrong part of this.
+        this.prevGeneratedColumn = 0;
+        this.prevSourceLine = 0;
+        this.prevSourceColumn = 0;
+        this.fileName = fileName;
+        this.sourceFileName = sourceFileName;
+        this.sourceContent = sourceContent;
+    }
+    lineGroup(generatedLine) {
+        const index = generatedLine - 1;
+        while (this.lineGroups.length <= index)
+            this.lineGroups.push([]);
+        return this.lineGroups[index];
+    }
+    // `generatedLine`/`sourceLine`/`sourceColumn` are 1-indexed (kopscript's
+    // own convention throughout the lexer/parser/AST — see lexer.ts). Per the
+    // source-map spec itself, everything is 0-indexed in the encoded output;
+    // the `- 1`s below are that conversion, done in exactly one place.
+    // `generatedColumn` is the real (already 0-indexed) character offset from
+    // the start of its generated line — there's no separate convention to
+    // convert there since "0 spaces of indent" already means column 0.
+    addMapping(generatedLine, generatedColumn, sourceLine, sourceColumn) {
+        const group = this.lineGroup(generatedLine);
+        if (group.length === 0)
+            this.prevGeneratedColumn = 0; // new line: column deltas restart at 0
+        const zSourceLine = sourceLine - 1;
+        const zSourceColumn = sourceColumn - 1;
+        group.push(encodeVLQ([
+            generatedColumn - this.prevGeneratedColumn,
+            0, // sourceIndex delta — always 0, exactly one source file per map
+            zSourceLine - this.prevSourceLine,
+            zSourceColumn - this.prevSourceColumn,
+        ]));
+        this.prevGeneratedColumn = generatedColumn;
+        this.prevSourceLine = zSourceLine;
+        this.prevSourceColumn = zSourceColumn;
+    }
+    // Prepends `count` empty line-groups — for when marks were recorded
+    // relative to a chunk's own start (line 1) before it was known how many
+    // lines of *other* content would end up preceding that chunk in the final
+    // output. See codegen.ts's `generate()`: body statements are marked
+    // before it's known whether the `state<T>` prelude will precede them.
+    shiftLines(count) {
+        if (count <= 0)
+            return;
+        this.lineGroups.unshift(...Array.from({ length: count }, () => []));
+    }
+    toJSON() {
+        const mappings = this.lineGroups.map((segments) => segments.join(",")).join(";");
+        return JSON.stringify({
+            version: 3,
+            file: this.fileName,
+            sources: [this.sourceFileName],
+            sourcesContent: [this.sourceContent],
+            names: [],
+            mappings,
+        });
+    }
+}

package/dist/template_compiler.js

@@ -222,7 +222,7 @@ export class TemplateCompiler {
         const elementChildren = node.children.filter((c) => c.kind === "element");
         const textChildren = node.children.filter((c) => c.kind === "text");
         if (textChildren.length > 0 && elementChildren.length > 0) {
-            this.diagnostics.error(`<${node.tag}> cannot mix text and element children — Kopular's DOM bindings have no text-node API, so text can only be a whole element's content`, node.line, node.col);
+            this.diagnostics.error("KS5015", `<${node.tag}> cannot mix text and element children — Kopular's DOM bindings have no text-node API, so text can only be a whole element's content`, node.line, node.col);
         }
         else if (textChildren.length > 0) {
             const parts = textChildren.flatMap((t) => t.parts).map((p) => (p.kind === "Expr" ? { kind: "Expr", expression: this.resolve(p.expression, localScope) } : p));

package/dist/template_lexer.js

@@ -130,7 +130,7 @@ export class TemplateLexer {
             while (!this.isAtEnd() && this.peek() !== '"')
                 value += this.advance();
             if (this.isAtEnd()) {
-                this.diagnostics.error("Unterminated attribute value", line, col);
+                this.diagnostics.error("KS5001", "Unterminated attribute value", line, col);
             }
             else {
                 this.advance(); // closing '"'
@@ -143,7 +143,7 @@ export class TemplateLexer {
         while (!this.isAtEnd() && !/[\s=>/]/.test(this.peek()))
             name += this.advance();
         if (name.length === 0) {
-            this.diagnostics.error(`Unexpected character '${this.peek()}' in tag`, line, col);
+            this.diagnostics.error("KS5002", `Unexpected character '${this.peek()}' in tag`, line, col);
             this.advance(); // avoid an infinite loop on a genuinely unexpected character
             return this.nextTagToken();
         }

package/dist/template_parser.js

@@ -44,7 +44,7 @@ export class TemplateParser {
         const expr = new Parser(tokens, localDiagnostics).parseStandaloneExpression();
         for (const d of localDiagnostics.diagnostics) {
             const { line, col } = remapPosition(fragmentLine, fragmentCol, d.line, d.col);
-            this.diagnostics.error(d.message, line, col);
+            this.diagnostics.error("KS5003", d.message, line, col);
         }
         return expr;
     }
@@ -57,7 +57,7 @@ export class TemplateParser {
         const tokens = new Lexer(source, localDiagnostics).tokenize();
         const ofIndex = tokens.findIndex((t) => t.kind === TokenKind.Identifier && t.lexeme === "of");
         if (ofIndex < 1 || tokens[ofIndex - 1].kind !== TokenKind.Identifier) {
-            this.diagnostics.error(`Expected '*for="Type varName of iterable"', got '${source}'`, fragmentLine, fragmentCol);
+            this.diagnostics.error("KS5004", `Expected '*for="Type varName of iterable"', got '${source}'`, fragmentLine, fragmentCol);
             return null;
         }
         const varNameToken = tokens[ofIndex - 1];
@@ -67,7 +67,7 @@ export class TemplateParser {
         const iterable = new Parser(iterableTokens, localDiagnostics).parseStandaloneExpression();
         for (const d of localDiagnostics.diagnostics) {
             const { line, col } = remapPosition(fragmentLine, fragmentCol, d.line, d.col);
-            this.diagnostics.error(d.message, line, col);
+            this.diagnostics.error("KS5005", d.message, line, col);
         }
         return { varType, varName: varNameToken.lexeme, iterable, line: fragmentLine, col: fragmentCol };
     }
@@ -104,7 +104,7 @@ export class TemplateParser {
                 const exprCol = col;
                 advancePos(text.slice(i, exprStartOffset));
                 if (end === -1) {
-                    this.diagnostics.error("Unterminated '{{' interpolation", exprLine, exprCol);
+                    this.diagnostics.error("KS5006", "Unterminated '{{' interpolation", exprLine, exprCol);
                     break;
                 }
                 const exprSource = text.slice(exprStartOffset, end);
@@ -139,7 +139,7 @@ export class TemplateParser {
         const elementRoots = roots.filter((r) => r.kind === "element");
         if (elementRoots.length !== 1) {
             const at = roots[0] ?? { line: 1, col: 1 };
-            this.diagnostics.error(`A template must have exactly one top-level element, found ${elementRoots.length}`, at.line, at.col);
+            this.diagnostics.error("KS5007", `A template must have exactly one top-level element, found ${elementRoots.length}`, at.line, at.col);
             return null;
         }
         return elementRoots[0];
@@ -153,7 +153,7 @@ export class TemplateParser {
             return this.parseElement();
         }
         const t = this.advance();
-        this.diagnostics.error(`Unexpected token in template ('${t.lexeme}')`, t.line, t.col);
+        this.diagnostics.error("KS5008", `Unexpected token in template ('${t.lexeme}')`, t.line, t.col);
         return null;
     }
     parseElement() {
@@ -183,7 +183,7 @@ export class TemplateParser {
             }
             else if (name === "*if") {
                 if (ifCondition || forBinding) {
-                    this.diagnostics.error(`Only one structural directive ('*if'/'*for') is allowed per element`, nameTok.line, nameTok.col);
+                    this.diagnostics.error("KS5009", `Only one structural directive ('*if'/'*for') is allowed per element`, nameTok.line, nameTok.col);
                 }
                 else {
                     ifCondition = this.parseEmbeddedExpression(valueTok.lexeme, valueTok.line, valueTok.col);
@@ -191,7 +191,7 @@ export class TemplateParser {
             }
             else if (name === "*for") {
                 if (ifCondition || forBinding) {
-                    this.diagnostics.error(`Only one structural directive ('*if'/'*for') is allowed per element`, nameTok.line, nameTok.col);
+                    this.diagnostics.error("KS5010", `Only one structural directive ('*if'/'*for') is allowed per element`, nameTok.line, nameTok.col);
                 }
                 else {
                     forBinding = this.parseForBinding(valueTok.lexeme, valueTok.line, valueTok.col);
@@ -219,11 +219,11 @@ export class TemplateParser {
             if (this.check(TemplateTokenKind.TagClose)) {
                 const closeTok = this.advance();
                 if (closeTok.lexeme !== tag) {
-                    this.diagnostics.error(`Mismatched closing tag: expected '</${tag}>', got '</${closeTok.lexeme}>'`, closeTok.line, closeTok.col);
+                    this.diagnostics.error("KS5011", `Mismatched closing tag: expected '</${tag}>', got '</${closeTok.lexeme}>'`, closeTok.line, closeTok.col);
                 }
             }
             else {
-                this.diagnostics.error(`Expected closing tag '</${tag}>'`, tagTok.line, tagTok.col);
+                this.diagnostics.error("KS5012", `Expected closing tag '</${tag}>'`, tagTok.line, tagTok.col);
             }
         }
         return { kind: "element", tag, staticAttrs, propBindings, eventBindings, ifCondition, forBinding, children, line: tagTok.line, col: tagTok.col };
@@ -233,7 +233,7 @@ export class TemplateParser {
     }
     consumeAttrValue(attrNameTok) {
         if (!this.check(TemplateTokenKind.AttrValue)) {
-            this.diagnostics.error(`Expected a quoted value after '${attrNameTok.lexeme}='`, attrNameTok.line, attrNameTok.col);
+            this.diagnostics.error("KS5013", `Expected a quoted value after '${attrNameTok.lexeme}='`, attrNameTok.line, attrNameTok.col);
             return null;
         }
         return this.advance();
@@ -243,7 +243,7 @@ export class TemplateParser {
             this.advance();
         }
         else {
-            this.diagnostics.error(message, at.line, at.col);
+            this.diagnostics.error("KS5014", message, at.line, at.col);
         }
     }
 }

package/package.json

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