@ugo-studio/jspp 0.1.3 → 0.1.5

package/README.md

@@ -132,15 +132,15 @@ This phase will broaden the range of supported JavaScript syntax and features.
 - [x] **Objects:** Literals, property access (dot and bracket notation), methods.
 - [x] **Arrays:** Literals, indexing, and core methods (`.push`, `.pop`, `.length`, etc.).
 - [x] **Operators:** Full suite of arithmetic, logical, and comparison operators.
-- [ ] **Control Flow:** tenary operators, `for` loops, `while` loops, `switch`.
+- [x] **Control Flow:** tenary operators, `for` loops, `while` loops, `switch`.
 
 ### **Phase 3: Interoperability & Standard Library**
 
 This phase will focus on building out the standard library and enabling modular code.
 
 - [ ] **JS Standard Library:** Implementation of common built-in objects and functions (`Math`, `Date`, `String.prototype.*`, `Array.prototype.*`).
+- [x] **Asynchronous Operations:** A C++ implementation of the JavaScript event loop, `Promise`, and `async/await`.
 - [ ] **Module System:** Support for `import` and `export` to transpile multi-file projects.
-- [ ] **Asynchronous Operations:** A C++ implementation of the JavaScript event loop, `Promise`, and `async/await`.
 
 ### **Phase 4: Optimization & Advanced Features**
 

package/dist/analysis/scope.js

@@ -1,8 +1,10 @@
+import * as ts from "typescript";
 export const RESERVED_KEYWORDS = new Set([
     "jspp",
     "std",
     "co_yield",
     "co_return",
+    "co_await",
 ]);
 export const BUILTIN_OBJECTS = new Set([
     { name: "undefined", isConst: true },
@@ -12,13 +14,27 @@ export const BUILTIN_OBJECTS = new Set([
     { name: "performance", isConst: false },
     { name: "global", isConst: false },
     { name: "globalThis", isConst: false },
+    { name: "process", isConst: false },
+    { name: "Error", isConst: false },
+    { name: "Promise", isConst: false },
+    { name: "Function", isConst: false },
+    { name: "setTimeout", isConst: false },
+    { name: "clearTimeout", isConst: false },
+    { name: "setInterval", isConst: false },
+    { name: "clearInterval", isConst: false },
+    { name: "Array", isConst: false },
+    { name: "Object", isConst: false },
+    { name: "Math", isConst: false },
 ]);
 // Represents a single scope (e.g., a function body or a block statement)
 export class Scope {
     parent;
+    ownerFunction;
     symbols = new Map();
-    constructor(parent) {
+    children = [];
+    constructor(parent, ownerFunction) {
         this.parent = parent;
+        this.ownerFunction = ownerFunction;
     }
     // Defines a variable in this scope.
     define(name, type) {
@@ -42,7 +58,7 @@ export class ScopeManager {
     allScopes = []; // Array to store all created scopes
     reservedKeywords = new Set(RESERVED_KEYWORDS);
     constructor() {
-        const rootScope = new Scope(null); // The global scope
+        const rootScope = new Scope(null, null); // The global scope
         this.currentScope = rootScope;
         this.allScopes.push(rootScope); // Add the root scope to our list
         for (const { name, isConst } of BUILTIN_OBJECTS) {
@@ -54,8 +70,9 @@ export class ScopeManager {
         }
     }
     // Enters a new, nested scope.
-    enterScope() {
-        const newScope = new Scope(this.currentScope);
+    enterScope(ownerFunction) {
+        const newScope = new Scope(this.currentScope, ownerFunction);
+        this.currentScope.children.push(newScope);
         this.currentScope = newScope;
         this.allScopes.push(newScope); // Add every new scope to the list
     }
@@ -67,11 +84,23 @@ export class ScopeManager {
     }
     // Defines a variable in the current scope.
     define(name, type) {
+        // if (name === "named" || name === "letVal") console.log("Defining", name, "in scope. isBuiltin:", type.isBuiltin, " type:", type.type);
         if (this.reservedKeywords.has(name) && !type.isBuiltin) {
             throw new Error(`SyntaxError: Unexpected reserved word "${name}"`);
         }
         this.currentScope.define(name, type);
     }
+    // Defines a `var` variable (hoisted to function or global scope).
+    defineVar(name, type) {
+        if (this.reservedKeywords.has(name) && !type.isBuiltin) {
+            throw new Error(`SyntaxError: Unexpected reserved word "${name}"`);
+        }
+        let scope = this.currentScope;
+        while (scope.parent && scope.ownerFunction === scope.parent.ownerFunction) {
+            scope = scope.parent;
+        }
+        scope.define(name, type);
+    }
     // Looks up a variable's type information from the current scope upwards.
     lookup(name) {
         const scope = this.currentScope.findScopeFor(name);

package/dist/analysis/typeAnalyzer.js

@@ -8,13 +8,34 @@ export class TypeAnalyzer {
     functionTypeInfo = new Map();
     functionStack = [];
     nodeToScope = new Map();
+    labelStack = [];
+    loopDepth = 0;
+    switchDepth = 0;
     analyze(ast) {
         this.nodeToScope.set(ast, this.scopeManager.currentScope);
+        const crossScopeModificationVisitor = (node) => {
+            if (ts.isIdentifier(node)) {
+                const name = node.getText();
+                const definingScope = this.scopeManager.currentScope
+                    .findScopeFor(name);
+                if (definingScope) {
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    const definingFunc = definingScope.ownerFunction;
+                    if (definingFunc !== currentFuncNode) {
+                        const typeInfo = this.scopeManager.lookup(name);
+                        if (typeInfo) {
+                            typeInfo.needsHeapAllocation = true;
+                        }
+                    }
+                }
+            }
+        };
         const visitor = {
             // Enter new scope for any block-like structure
             Block: {
                 enter: (node, parent) => {
-                    this.scopeManager.enterScope();
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    this.scopeManager.enterScope(currentFuncNode);
                     this.nodeToScope.set(node, this.scopeManager.currentScope);
                     if (parent && ts.isCatchClause(parent) &&
                         parent.variableDeclaration) {
@@ -35,21 +56,33 @@ export class TypeAnalyzer {
             },
             ForStatement: {
                 enter: (node) => {
-                    this.scopeManager.enterScope();
+                    this.loopDepth++;
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    this.scopeManager.enterScope(currentFuncNode);
                     this.nodeToScope.set(node, this.scopeManager.currentScope);
                 },
-                exit: () => this.scopeManager.exitScope(),
+                exit: () => {
+                    this.loopDepth--;
+                    this.scopeManager.exitScope();
+                },
             },
             ForOfStatement: {
                 enter: (node) => {
-                    this.scopeManager.enterScope();
+                    this.loopDepth++;
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    this.scopeManager.enterScope(currentFuncNode);
                     this.nodeToScope.set(node, this.scopeManager.currentScope);
                 },
-                exit: () => this.scopeManager.exitScope(),
+                exit: () => {
+                    this.loopDepth--;
+                    this.scopeManager.exitScope();
+                },
             },
             ForInStatement: {
                 enter: (node) => {
-                    this.scopeManager.enterScope();
+                    this.loopDepth++;
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    this.scopeManager.enterScope(currentFuncNode);
                     this.nodeToScope.set(node, this.scopeManager.currentScope);
                     const forIn = node;
                     if (ts.isVariableDeclarationList(forIn.initializer)) {
@@ -71,7 +104,87 @@ export class TypeAnalyzer {
                         // The generator will handle assigning to it.
                     }
                 },
-                exit: () => this.scopeManager.exitScope(),
+                exit: () => {
+                    this.loopDepth--;
+                    this.scopeManager.exitScope();
+                },
+            },
+            WhileStatement: {
+                enter: (node) => {
+                    this.loopDepth++;
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    this.scopeManager.enterScope(currentFuncNode);
+                    this.nodeToScope.set(node, this.scopeManager.currentScope);
+                },
+                exit: () => {
+                    this.loopDepth--;
+                    this.scopeManager.exitScope();
+                },
+            },
+            DoStatement: {
+                enter: (node) => {
+                    this.loopDepth++;
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    this.scopeManager.enterScope(currentFuncNode);
+                    this.nodeToScope.set(node, this.scopeManager.currentScope);
+                },
+                exit: () => {
+                    this.loopDepth--;
+                    this.scopeManager.exitScope();
+                },
+            },
+            SwitchStatement: {
+                enter: (node) => {
+                    this.switchDepth++;
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    this.scopeManager.enterScope(currentFuncNode);
+                    this.nodeToScope.set(node, this.scopeManager.currentScope);
+                },
+                exit: () => {
+                    this.switchDepth--;
+                    this.scopeManager.exitScope();
+                },
+            },
+            LabeledStatement: {
+                enter: (node) => {
+                    this.nodeToScope.set(node, this.scopeManager.currentScope);
+                    this.labelStack.push(node.label.text);
+                },
+                exit: () => {
+                    this.labelStack.pop();
+                },
+            },
+            BreakStatement: {
+                enter: (node) => {
+                    const breakNode = node;
+                    if (breakNode.label) {
+                        if (!this.labelStack.includes(breakNode.label.text)) {
+                            throw new Error(`SyntaxError: Undefined label '${breakNode.label.text}'`);
+                        }
+                    }
+                    else {
+                        if (this.loopDepth === 0 && this.switchDepth === 0) {
+                            throw new Error("SyntaxError: Unlabeled break must be inside an iteration or switch statement");
+                        }
+                    }
+                },
+            },
+            ContinueStatement: {
+                enter: (node) => {
+                    const continueNode = node;
+                    if (continueNode.label) {
+                        if (!this.labelStack.includes(continueNode.label.text)) {
+                            throw new Error(`SyntaxError: Undefined label '${continueNode.label.text}'`);
+                        }
+                        // Also need to check if the label belongs to a loop, but that's harder here.
+                        // The TS checker should handle this. We'll assume for now it does.
+                    }
+                    else {
+                        if (this.loopDepth === 0) {
+                            throw new Error("SyntaxError: Unlabeled continue must be inside an iteration statement");
+                        }
+                    }
+                },
             },
             ArrowFunction: {
                 enter: (node) => {
@@ -82,7 +195,7 @@ export class TypeAnalyzer {
                             captures: new Map(),
                         };
                         this.functionTypeInfo.set(node, funcType);
-                        this.scopeManager.enterScope();
+                        this.scopeManager.enterScope(node);
                         this.nodeToScope.set(node, this.scopeManager.currentScope);
                         // Define parameters in the new scope
                         node.parameters.forEach((p) => this.scopeManager.define(p.name.getText(), {
@@ -108,9 +221,10 @@ export class TypeAnalyzer {
                             isClosure: false,
                             captures: new Map(),
                             declaration: node,
+                            needsHeapAllocation: true, // Added: Functions are always heap-allocated
                         };
                         this.functionTypeInfo.set(node, funcType);
-                        this.scopeManager.enterScope();
+                        this.scopeManager.enterScope(node);
                         this.nodeToScope.set(node, this.scopeManager.currentScope);
                         // If the function expression is named, define the name within its own scope for recursion.
                         if (node.name) {
@@ -143,11 +257,12 @@ export class TypeAnalyzer {
                                 isClosure: false,
                                 captures: new Map(),
                                 declaration: node,
+                                needsHeapAllocation: true,
                             };
                             this.scopeManager.define(funcName, funcType);
                             this.functionTypeInfo.set(node, funcType);
                         }
-                        this.scopeManager.enterScope();
+                        this.scopeManager.enterScope(node);
                         this.nodeToScope.set(node, this.scopeManager.currentScope);
                         // Define parameters in the new scope
                         node.parameters.forEach((p) => this.scopeManager.define(p.name.getText(), {
@@ -165,23 +280,114 @@ export class TypeAnalyzer {
                     this.scopeManager.exitScope();
                 },
             },
+            ClassDeclaration: {
+                enter: (node) => {
+                    const classNode = node;
+                    if (classNode.name) {
+                        const name = classNode.name.getText();
+                        const typeInfo = {
+                            type: "function", // Classes are functions
+                            declaration: classNode,
+                            needsHeapAllocation: true,
+                        };
+                        this.scopeManager.define(name, typeInfo);
+                    }
+                    const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
+                    this.scopeManager.enterScope(currentFuncNode);
+                    this.nodeToScope.set(node, this.scopeManager.currentScope);
+                },
+                exit: () => {
+                    this.scopeManager.exitScope();
+                },
+            },
+            MethodDeclaration: {
+                enter: (node) => {
+                    if (ts.isMethodDeclaration(node)) {
+                        const funcType = {
+                            type: "function",
+                            isClosure: false,
+                            captures: new Map(),
+                            declaration: node,
+                            needsHeapAllocation: true,
+                        };
+                        // Methods don't need to be defined in scope by name generally,
+                        // but we need to track them for captures.
+                        this.functionTypeInfo.set(node, funcType);
+                        this.scopeManager.enterScope(node);
+                        this.nodeToScope.set(node, this.scopeManager.currentScope);
+                        node.parameters.forEach((p) => this.scopeManager.define(p.name.getText(), {
+                            type: "auto",
+                            isParameter: true,
+                            declaration: p,
+                        }));
+                        this.functionStack.push(node);
+                    }
+                },
+                exit: (node) => {
+                    if (ts.isMethodDeclaration(node)) {
+                        this.functionStack.pop();
+                    }
+                    this.scopeManager.exitScope();
+                },
+            },
+            Constructor: {
+                enter: (node) => {
+                    if (ts.isConstructorDeclaration(node)) {
+                        const funcType = {
+                            type: "function",
+                            isClosure: false,
+                            captures: new Map(),
+                            declaration: node,
+                            needsHeapAllocation: true,
+                        };
+                        this.functionTypeInfo.set(node, funcType);
+                        this.scopeManager.enterScope(node);
+                        this.nodeToScope.set(node, this.scopeManager.currentScope);
+                        node.parameters.forEach((p) => this.scopeManager.define(p.name.getText(), {
+                            type: "auto",
+                            isParameter: true,
+                            declaration: p,
+                        }));
+                        this.functionStack.push(node); // Constructor acts like a function
+                    }
+                },
+                exit: (node) => {
+                    if (ts.isConstructorDeclaration(node)) {
+                        this.functionStack.pop();
+                    }
+                    this.scopeManager.exitScope();
+                },
+            },
             VariableDeclaration: {
                 enter: (node) => {
                     if (ts.isVariableDeclaration(node)) {
                         const name = node.name.getText();
+                        const isBlockScoped = (node.parent.flags & (ts.NodeFlags.Let | ts.NodeFlags.Const)) !== 0;
                         const isConst = (node.parent.flags & ts.NodeFlags.Const) !== 0;
                         let type = "auto";
+                        let needsHeap = false;
                         if (node.initializer) {
                             if (ts.isArrayLiteralExpression(node.initializer)) {
                                 type = "array";
                             }
+                            else if (ts.isArrowFunction(node.initializer) ||
+                                ts.isFunctionExpression(node.initializer)) {
+                                type = "function";
+                                needsHeap = true;
+                            }
                         }
                         const typeInfo = {
                             type,
                             declaration: node,
                             isConst,
+                            needsHeapAllocation: needsHeap,
                         };
-                        this.scopeManager.define(name, typeInfo);
+                        if (isBlockScoped) {
+                            this.scopeManager.define(name, typeInfo);
+                        }
+                        else {
+                            this.scopeManager.defineVar(name, typeInfo);
+                        }
                     }
                 },
             },
@@ -190,7 +396,7 @@ export class TypeAnalyzer {
                     if (ts.isIdentifier(node)) {
                         if (isBuiltinObject.call(this, node))
                             return;
-                        const currentFuncNode = this.functionStack[this.functionStack.length - 1];
+                        const currentFuncNode = this.functionStack[this.functionStack.length - 1] ?? null;
                         if (currentFuncNode &&
                             (ts.isFunctionDeclaration(currentFuncNode) ||
                                 ts.isFunctionExpression(currentFuncNode)) &&
@@ -201,17 +407,19 @@ export class TypeAnalyzer {
                         // And see if it belongs to an outer scope
                         const definingScope = this.scopeManager.currentScope
                             .findScopeFor(node.text);
-                        if (definingScope &&
-                            definingScope !== this.scopeManager.currentScope) {
-                            // This is a potential capture!
-                            // Find which function we are currently in and mark the capture.
-                            if (currentFuncNode) {
+                        if (definingScope) {
+                            const definingFunc = definingScope.ownerFunction;
+                            if (definingFunc !== currentFuncNode) {
+                                // This is a capture!
                                 const type = this.scopeManager.lookup(node.text);
                                 if (type) {
-                                    const info = this.functionTypeInfo.get(currentFuncNode);
-                                    if (info) {
-                                        info.isClosure = true;
-                                        info.captures?.set(node.text, type);
+                                    type.needsHeapAllocation = true;
+                                    if (currentFuncNode) {
+                                        const info = this.functionTypeInfo.get(currentFuncNode);
+                                        if (info) {
+                                            info.isClosure = true;
+                                            info.captures?.set(node.text, type);
+                                        }
                                     }
                                 }
                             }
@@ -219,6 +427,37 @@ export class TypeAnalyzer {
                     }
                 },
             },
+            BinaryExpression: {
+                enter: (node) => {
+                    if (ts.isBinaryExpression(node)) {
+                        const isAssignment = node.operatorToken.kind >=
+                            ts.SyntaxKind.FirstAssignment &&
+                            node.operatorToken.kind <=
+                                ts.SyntaxKind.LastAssignment;
+                        if (isAssignment) {
+                            crossScopeModificationVisitor(node.left);
+                        }
+                    }
+                },
+            },
+            PostfixUnaryExpression: {
+                enter: (node) => {
+                    if (ts.isPostfixUnaryExpression(node)) {
+                        crossScopeModificationVisitor(node.operand);
+                    }
+                },
+            },
+            PrefixUnaryExpression: {
+                enter: (node) => {
+                    if (ts.isPrefixUnaryExpression(node)) {
+                        const op = node.operator;
+                        if (op === ts.SyntaxKind.PlusPlusToken ||
+                            op === ts.SyntaxKind.MinusMinusToken) {
+                            crossScopeModificationVisitor(node.operand);
+                        }
+                    }
+                },
+            },
         };
         this.traverser.traverse(ast, visitor);
     }

package/dist/ast/symbols.js

@@ -0,0 +1,29 @@
+export var DeclaredSymbolType;
+(function (DeclaredSymbolType) {
+    DeclaredSymbolType["letOrConst"] = "letOrConst";
+    DeclaredSymbolType["function"] = "function";
+    DeclaredSymbolType["var"] = "var";
+})(DeclaredSymbolType || (DeclaredSymbolType = {}));
+export class DeclaredSymbols {
+    symbols;
+    constructor(...m) {
+        this.symbols = new Map();
+        m.forEach((ds) => ds.symbols.forEach((v, k) => this.symbols.set(k, v)));
+    }
+    has(name) {
+        return this.symbols.has(name);
+    }
+    get(name) {
+        return this.symbols.get(name);
+    }
+    set(name, value) {
+        return this.symbols.set(name, value);
+    }
+    update(name, update) {
+        const oldValue = this.get(name);
+        if (oldValue) {
+            const newValue = { ...oldValue, ...update };
+            return this.symbols.set(name, newValue);
+        }
+    }
+}

package/dist/cli-utils/args.js

@@ -0,0 +1,57 @@
+import path from "path";
+import { COLORS } from "./colors";
+export function parseArgs(rawArgs) {
+    let jsFilePathArg = null;
+    let isRelease = false;
+    let keepCpp = false;
+    let outputExePath = null;
+    let scriptArgs = [];
+    for (let i = 0; i < rawArgs.length; i++) {
+        const arg = rawArgs[i];
+        if (!arg)
+            continue;
+        if (arg === "--") {
+            scriptArgs = rawArgs.slice(i + 1);
+            break;
+        }
+        if (arg === "--release") {
+            isRelease = true;
+        }
+        else if (arg === "--keep-cpp") {
+            keepCpp = true;
+        }
+        else if (arg === "-o" || arg === "--output") {
+            if (i + 1 < rawArgs.length) {
+                outputExePath = rawArgs[i + 1] ?? null;
+                i++;
+            }
+            else {
+                console.error(`${COLORS.red}Error: --output requires a file path argument.${COLORS.reset}`);
+                process.exit(1);
+            }
+        }
+        else if (arg.startsWith("-")) {
+            console.warn(`${COLORS.yellow}Warning: Unknown argument '${arg}'${COLORS.reset}`);
+        }
+        else {
+            if (jsFilePathArg) {
+                console.error(`${COLORS.red}Error: Multiple input files specified.${COLORS.reset}`);
+                process.exit(1);
+            }
+            jsFilePathArg = arg;
+        }
+    }
+    if (!jsFilePathArg) {
+        console.log(`${COLORS.bold}Usage:${COLORS.reset} jspp <path-to-js-file> [--release] [--keep-cpp] [-o <output-path>] [-- <args...>]`);
+        process.exit(1);
+    }
+    return {
+        jsFilePath: path.resolve(process.cwd(), jsFilePathArg),
+        isRelease,
+        keepCpp,
+        outputExePath: outputExePath
+            ? path.resolve(process.cwd(), outputExePath)
+            : null,
+        scriptArgs,
+    };
+}

package/dist/cli-utils/colors.js

@@ -0,0 +1,9 @@
+export const COLORS = {
+    reset: "\x1b[0m",
+    cyan: "\x1b[36m",
+    green: "\x1b[32m",
+    yellow: "\x1b[33m",
+    red: "\x1b[31m",
+    dim: "\x1b[2m",
+    bold: "\x1b[1m",
+};

package/dist/cli-utils/file-utils.js

@@ -0,0 +1,20 @@
+import fs from "fs/promises";
+import path from "path";
+export async function getLatestMtime(dirPath) {
+    let maxMtime = 0;
+    const entries = await fs.readdir(dirPath, { withFileTypes: true });
+    for (const entry of entries) {
+        const fullPath = path.join(dirPath, entry.name);
+        if (entry.isDirectory()) {
+            const nestedMtime = await getLatestMtime(fullPath);
+            if (nestedMtime > maxMtime)
+                maxMtime = nestedMtime;
+        }
+        else {
+            const stats = await fs.stat(fullPath);
+            if (stats.mtimeMs > maxMtime)
+                maxMtime = stats.mtimeMs;
+        }
+    }
+    return maxMtime;
+}

package/dist/cli-utils/spinner.js

@@ -0,0 +1,55 @@
+import { COLORS } from "./colors";
+export class Spinner {
+    frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+    interval = null;
+    frameIndex = 0;
+    text;
+    constructor(text) {
+        this.text = text;
+    }
+    start() {
+        process.stdout.write("\x1b[?25l"); // Hide cursor
+        this.frameIndex = 0;
+        this.render();
+        this.interval = setInterval(() => {
+            this.frameIndex = (this.frameIndex + 1) % this.frames.length;
+            this.render();
+        }, 80);
+    }
+    update(text) {
+        this.text = text;
+        this.render();
+    }
+    stop(symbol = "", color = COLORS.reset) {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.interval = null;
+        }
+        this.clearLine();
+        process.stdout.write(`${color}${symbol} ${COLORS.reset} ${this.text}\n`);
+        process.stdout.write("\x1b[?25h"); // Show cursor
+    }
+    succeed(text) {
+        if (text)
+            this.text = text;
+        this.stop("✔", COLORS.green);
+    }
+    fail(text) {
+        if (text)
+            this.text = text;
+        this.stop("✖", COLORS.red);
+    }
+    info(text) {
+        if (text)
+            this.text = text;
+        this.stop("ℹ", COLORS.cyan);
+    }
+    render() {
+        this.clearLine();
+        const frame = this.frames[this.frameIndex];
+        process.stdout.write(`${COLORS.cyan}${frame} ${COLORS.reset} ${this.text}`);
+    }
+    clearLine() {
+        process.stdout.write("\r\x1b[K");
+    }
+}