@ugo-studio/jspp 0.1.4 → 0.1.5

package/dist/core/codegen/statement-handlers.js

@@ -1,15 +1,17 @@
 import ts from "typescript";
+import { DeclaredSymbols } from "../../ast/symbols";
 import { CodeGenerator } from "./";
+import { collectBlockScopedDeclarations, collectFunctionScopedDeclarations, } from "./helpers";
 export function visitSourceFile(node, context) {
     const sourceFile = node;
     let code = "";
-    const varDecls = sourceFile.statements
-        .filter(ts.isVariableStatement)
-        .flatMap((stmt) => stmt.declarationList.declarations);
+    // 1. Collect all var declarations (recursively) + top-level let/const
+    const varDecls = collectFunctionScopedDeclarations(sourceFile);
+    const topLevelLetConst = collectBlockScopedDeclarations(sourceFile.statements);
     const funcDecls = sourceFile.statements.filter(ts.isFunctionDeclaration);
     const classDecls = sourceFile.statements.filter(ts.isClassDeclaration);
-    const hoistedSymbols = new Map();
-    // 1. Hoist function declarations
+    const hoistedSymbols = new DeclaredSymbols();
+    // Hoist function declarations
     funcDecls.forEach((func) => {
         code += this.hoistDeclaration(func, hoistedSymbols);
     });
@@ -17,19 +19,27 @@ export function visitSourceFile(node, context) {
     classDecls.forEach((cls) => {
         code += this.hoistDeclaration(cls, hoistedSymbols);
     });
-    // Hoist variable declarations
+    // Hoist variable declarations (var)
     varDecls.forEach((decl) => {
         code += this.hoistDeclaration(decl, hoistedSymbols);
     });
+    // Hoist top-level let/const
+    topLevelLetConst.forEach((decl) => {
+        code += this.hoistDeclaration(decl, hoistedSymbols);
+    });
+    // Compile symbols for other statements (excluding function)
+    const topLevelScopeSymbols = this.prepareScopeSymbolsForVisit(context.topLevelScopeSymbols, context.localScopeSymbols);
+    const localScopeSymbols = new DeclaredSymbols(hoistedSymbols); // hoistedSymbols becomes new local
     // 2. Assign all hoisted functions first
     const contextForFunctions = {
         ...context,
-        currentScopeSymbols: new Map(context.currentScopeSymbols),
+        localScopeSymbols: new DeclaredSymbols(context.localScopeSymbols, hoistedSymbols),
     };
-    hoistedSymbols.forEach((v, k) => contextForFunctions.currentScopeSymbols.set(k, v));
     funcDecls.forEach((stmt) => {
         const funcName = stmt.name?.getText();
         if (funcName) {
+            this.markSymbolAsChecked(funcName, contextForFunctions.topLevelScopeSymbols, contextForFunctions.localScopeSymbols);
+            this.markSymbolAsChecked(funcName, topLevelScopeSymbols, localScopeSymbols);
             const lambda = this.generateLambda(stmt, contextForFunctions, {
                 isAssignment: true,
             });
@@ -38,8 +48,6 @@ export function visitSourceFile(node, context) {
     });
     // 3. Process other statements
     sourceFile.statements.forEach((stmt) => {
-        const topLevelScopeSymbols = this.prepareScopeSymbolsForVisit(context.topLevelScopeSymbols, context.currentScopeSymbols);
-        const currentScopeSymbols = hoistedSymbols; // hoistedSymbols becomes new local
         if (ts.isFunctionDeclaration(stmt)) {
             // Already handled
         }
@@ -50,7 +58,7 @@ export function visitSourceFile(node, context) {
             const contextForVisit = {
                 ...context,
                 topLevelScopeSymbols,
-                currentScopeSymbols,
+                localScopeSymbols,
                 isAssignmentOnly: !isLetOrConst,
             };
             const assignments = this.visit(stmt.declarationList, contextForVisit);
@@ -63,9 +71,7 @@ export function visitSourceFile(node, context) {
                 ...context,
                 isFunctionBody: false,
                 topLevelScopeSymbols,
-                currentScopeSymbols,
-                // currentScopeSymbols: undefined, // clear the currentScopeSymbols for nested visit
-                // topLevelScopeSymbols: undefined, // clear the topLevelScopeSymbols for nested visit
+                localScopeSymbols,
             });
         }
     });
@@ -75,12 +81,11 @@ export function visitBlock(node, context) {
     let code = "{\n";
     this.indentationLevel++;
     const block = node;
-    const varDecls = block.statements
-        .filter(ts.isVariableStatement)
-        .flatMap((stmt) => stmt.declarationList.declarations);
+    // Collect ONLY block-scoped declarations (let/const)
+    const blockScopedDecls = collectBlockScopedDeclarations(block.statements);
     const funcDecls = block.statements.filter(ts.isFunctionDeclaration);
     const classDecls = block.statements.filter(ts.isClassDeclaration);
-    const hoistedSymbols = new Map();
+    const hoistedSymbols = new DeclaredSymbols();
     // 1. Hoist all function declarations
     funcDecls.forEach((func) => {
         code += this.hoistDeclaration(func, hoistedSymbols);
@@ -89,19 +94,23 @@ export function visitBlock(node, context) {
     classDecls.forEach((cls) => {
         code += this.hoistDeclaration(cls, hoistedSymbols);
     });
-    // Hoist variable declarations
-    varDecls.forEach((decl) => {
+    // Hoist variable declarations (let/const only)
+    blockScopedDecls.forEach((decl) => {
         code += this.hoistDeclaration(decl, hoistedSymbols);
     });
+    // Compile symbols for other statements (excluding function)
+    const topLevelScopeSymbols = this.prepareScopeSymbolsForVisit(context.topLevelScopeSymbols, context.localScopeSymbols);
+    const localScopeSymbols = new DeclaredSymbols(hoistedSymbols); // hoistedSymbols becomes new local
     // 2. Assign all hoisted functions first
     const contextForFunctions = {
         ...context,
-        currentScopeSymbols: new Map(context.currentScopeSymbols),
+        localScopeSymbols: new DeclaredSymbols(context.localScopeSymbols, hoistedSymbols),
     };
-    hoistedSymbols.forEach((v, k) => contextForFunctions.currentScopeSymbols.set(k, v));
     funcDecls.forEach((stmt) => {
         const funcName = stmt.name?.getText();
         if (funcName) {
+            this.markSymbolAsChecked(funcName, contextForFunctions.topLevelScopeSymbols, contextForFunctions.localScopeSymbols);
+            this.markSymbolAsChecked(funcName, topLevelScopeSymbols, localScopeSymbols);
             const lambda = this.generateLambda(stmt, contextForFunctions, {
                 isAssignment: true,
             });
@@ -110,8 +119,6 @@ export function visitBlock(node, context) {
     });
     // 3. Process other statements
     block.statements.forEach((stmt) => {
-        const topLevelScopeSymbols = this.prepareScopeSymbolsForVisit(context.topLevelScopeSymbols, context.currentScopeSymbols);
-        const currentScopeSymbols = hoistedSymbols; // hoistedSymbols becomes new local
         if (ts.isFunctionDeclaration(stmt)) {
             // Do nothing, already handled
         }
@@ -122,7 +129,7 @@ export function visitBlock(node, context) {
             const contextForVisit = {
                 ...context,
                 topLevelScopeSymbols,
-                currentScopeSymbols,
+                localScopeSymbols,
                 isAssignmentOnly: !isLetOrConst,
             };
             const assignments = this.visit(stmt.declarationList, contextForVisit);
@@ -135,16 +142,14 @@ export function visitBlock(node, context) {
                 ...context,
                 isFunctionBody: false,
                 topLevelScopeSymbols,
-                currentScopeSymbols,
-                // currentScopeSymbols: undefined, // clear the currentScopeSymbols for nested visit
-                // topLevelScopeSymbols: undefined, // clear the topLevelScopeSymbols for nested visit
+                localScopeSymbols,
             });
         }
     });
     if (context.isFunctionBody) {
         const lastStatement = block.statements[block.statements.length - 1];
         if (!lastStatement || !ts.isReturnStatement(lastStatement)) {
-            code += `${this.indent()}${this.getReturnCommand(context)} jspp::AnyValue::make_undefined();\n`;
+            code += `${this.indent()}${this.getReturnCommand(context)} jspp::Constants::UNDEFINED;\n`;
         }
     }
     this.indentationLevel--;
@@ -212,7 +217,7 @@ export function visitIfStatement(node, context) {
                 isFunctionBody: false,
             });
     }
-    return `${this.indent()}if ((${condition}).is_truthy()) ${thenStmt}${elseStmt}`;
+    return `${this.indent()}if (is_truthy(${condition})) ${thenStmt}${elseStmt}`;
 }
 export function visitExpressionStatement(node, context) {
     return (this.indent() +
@@ -222,7 +227,7 @@ export function visitExpressionStatement(node, context) {
 export function visitThrowStatement(node, context) {
     const throwStmt = node;
     const expr = this.visit(throwStmt.expression, context);
-    return `${this.indent()}throw jspp::Exception(${expr});
+    return `${this.indent()}throw jspp::Exception(${expr});
 `;
 }
 export function visitTryStatement(node, context) {
@@ -239,18 +244,23 @@ export function visitTryStatement(node, context) {
         const hasReturnedFlagName = this.generateUniqueName("__try_has_returned_", declaredSymbols);
         let code = `${this.indent()}{\n`;
         this.indentationLevel++;
-        code += `${this.indent()}jspp::AnyValue ${resultVarName};\n`;
-        code += `${this.indent()}bool ${hasReturnedFlagName} = false;\n`;
+        code += `${this.indent()}jspp::AnyValue ${resultVarName};
+`;
+        code += `${this.indent()}bool ${hasReturnedFlagName} = false;
+`;
         const finallyBlockCode = this.visit(tryStmt.finallyBlock, {
             ...context,
             isFunctionBody: false,
         });
         code +=
-            `${this.indent()}auto ${finallyLambdaName} = [=]() ${finallyBlockCode.trim()};\n`;
-        code += `${this.indent()}try {\n`;
+            `${this.indent()}auto ${finallyLambdaName} = [=]() ${finallyBlockCode.trim()};
+`;
+        code += `${this.indent()}try {
+`;
         this.indentationLevel++;
         code +=
-            `${this.indent()}${resultVarName} = ([=, &${hasReturnedFlagName}]() -> jspp::AnyValue {\n`;
+            `${this.indent()}${resultVarName} = ([=, &${hasReturnedFlagName}]() -> jspp::AnyValue {
+`;
         this.indentationLevel++;
         const innerContext = {
             ...context,
@@ -258,7 +268,8 @@ export function visitTryStatement(node, context) {
             isInsideTryCatchLambda: true,
             hasReturnedFlag: hasReturnedFlagName,
         };
-        code += `${this.indent()}try {\n`;
+        code += `${this.indent()}try {
+`;
         this.indentationLevel++;
         code += this.visit(tryStmt.tryBlock, innerContext);
         this.indentationLevel--;
@@ -267,7 +278,8 @@ export function visitTryStatement(node, context) {
             const exceptionName = this.generateUniqueExceptionName(tryStmt.catchClause.variableDeclaration?.name.getText());
             const catchContext = { ...innerContext, exceptionName };
             code +=
-                `${this.indent()}catch (const std::exception& ${exceptionName}) {\n`;
+                `${this.indent()}catch (const std::exception& ${exceptionName}) {
+`;
             this.indentationLevel++;
             code += this.visit(tryStmt.catchClause.block, catchContext);
             this.indentationLevel--;
@@ -276,18 +288,20 @@ export function visitTryStatement(node, context) {
         else {
             code += `${this.indent()}catch (...) { throw; }\n`;
         }
-        code += `${this.indent()}${this.getReturnCommand(context)} jspp::AnyValue::make_undefined();\n`;
+        code += `${this.indent()}${this.getReturnCommand(context)} jspp::Constants::UNDEFINED;\n`;
         this.indentationLevel--;
         code += `${this.indent()}})();\n`;
         this.indentationLevel--;
-        code += `${this.indent()}} catch (...) {\n`;
+        code += `${this.indent()}} catch (...) {
+`;
         this.indentationLevel++;
         code += `${this.indent()}${finallyLambdaName}();\n`;
         code += `${this.indent()}throw;\n`;
         this.indentationLevel--;
         code += `${this.indent()}}\n`;
         code += `${this.indent()}${finallyLambdaName}();\n`;
-        code += `${this.indent()}if (${hasReturnedFlagName}) {\n`;
+        code += `${this.indent()}if (${hasReturnedFlagName}) {
+`;
         this.indentationLevel++;
         code += `${this.indent()}return ${resultVarName};\n`;
         this.indentationLevel--;
@@ -331,7 +345,7 @@ export function visitCatchClause(node, context) {
         // Shadow the C++ exception variable *only if* the names don't clash.
         if (varName !== exceptionName) {
             code +=
-                `${this.indent()}auto ${exceptionName} = std::make_shared<jspp::AnyValue>(jspp::AnyValue::make_undefined());\n`;
+                `${this.indent()}auto ${exceptionName} = std::make_shared<jspp::AnyValue>(jspp::Constants::UNDEFINED);\n`;
         }
         code += this.visit(catchClause.block, context);
         this.indentationLevel--;
@@ -361,7 +375,7 @@ export function visitYieldExpression(node, context) {
             if (typeInfo &&
                 !typeInfo.isParameter &&
                 !typeInfo.isBuiltin) {
-                exprText = this.getDerefCode(exprText, this.getJsVarName(expr), typeInfo);
+                exprText = this.getDerefCode(exprText, this.getJsVarName(expr), context, typeInfo);
             }
         }
         // Handle `yield*` expression
@@ -378,23 +392,23 @@ export function visitYieldExpression(node, context) {
             code +=
                 `${this.indent()}auto ${iterator} = jspp::Access::get_object_value_iterator(${iterableRef}, ${varName});\n`;
             code +=
-                `${this.indent()}auto ${nextFunc} = ${iterator}.get_own_property("next").as_function();\n`;
+                `${this.indent()}auto ${nextFunc} = ${iterator}.get_own_property("next");\n`;
             code +=
-                `${this.indent()}auto ${nextRes} = ${nextFunc}->call(${iterator}, {});\n`;
+                `${this.indent()}auto ${nextRes} = ${nextFunc}.call(${iterator}, {}, "next");\n`;
             code +=
-                `${this.indent()}while (!${nextRes}.get_own_property("done").is_truthy()) {\n`;
+                `${this.indent()}while (!is_truthy(${nextRes}.get_own_property("done"))) {\n`;
             this.indentationLevel++;
             code +=
                 `${this.indent()}co_yield ${nextRes}.get_own_property("value");\n`;
             code +=
-                `${this.indent()}${nextRes} = ${nextFunc}->call(${iterator}, {});\n`;
+                `${this.indent()}${nextRes} = ${nextFunc}.call(${iterator}, {}, "next");\n`;
             this.indentationLevel--;
-            code += `${this.indent()}}}\n`;
+            code += `${this.indent()}}\n`;
             return code;
         }
         return `${this.indent()}co_yield ${exprText}`;
     }
-    return `${this.indent()}co_yield jspp::AnyValue::make_undefined()`;
+    return `${this.indent()}co_yield jspp::Constants::UNDEFINED`;
 }
 export function visitReturnStatement(node, context) {
     if (context.isMainContext) {
@@ -418,14 +432,14 @@ export function visitReturnStatement(node, context) {
                 else if (typeInfo &&
                     !typeInfo.isParameter &&
                     !typeInfo.isBuiltin) {
-                    finalExpr = this.getDerefCode(exprText, this.getJsVarName(expr), typeInfo);
+                    finalExpr = this.getDerefCode(exprText, this.getJsVarName(expr), context, typeInfo);
                 }
             }
             returnCode += `${this.indent()}${returnCmd} ${finalExpr};\n`;
         }
         else {
             returnCode +=
-                `${this.indent()}${returnCmd} jspp::AnyValue::make_undefined();\n`;
+                `${this.indent()}${returnCmd} jspp::Constants::UNDEFINED;\n`;
         }
         return returnCode;
     }
@@ -442,10 +456,10 @@ export function visitReturnStatement(node, context) {
             if (typeInfo &&
                 !typeInfo.isParameter &&
                 !typeInfo.isBuiltin) {
-                finalExpr = this.getDerefCode(exprText, this.getJsVarName(expr), typeInfo);
+                finalExpr = this.getDerefCode(exprText, this.getJsVarName(expr), context, typeInfo);
             }
         }
         return `${this.indent()}${returnCmd} ${finalExpr};\n`;
     }
-    return `${this.indent()}${returnCmd} jspp::AnyValue::make_undefined();\n`;
+    return `${this.indent()}${returnCmd} jspp::Constants::UNDEFINED;\n`;
 }

package/dist/core/codegen/visitor.js

@@ -3,7 +3,7 @@ import { CodeGenerator } from "./";
 import { visitClassDeclaration } from "./class-handlers";
 import { visitCaseClause, visitDefaultClause, visitDoStatement, visitForInStatement, visitForOfStatement, visitForStatement, visitSwitchStatement, visitWhileStatement, } from "./control-flow-handlers";
 import { visitVariableDeclaration, visitVariableDeclarationList, } from "./declaration-handlers";
-import { visitArrayLiteralExpression, visitAwaitExpression, visitBinaryExpression, visitCallExpression, visitConditionalExpression, visitElementAccessExpression, visitNewExpression, visitObjectLiteralExpression, visitParenthesizedExpression, visitPostfixUnaryExpression, visitPrefixUnaryExpression, visitPropertyAccessExpression, visitTemplateExpression, visitTypeOfExpression, visitVoidExpression, } from "./expression-handlers";
+import { visitArrayLiteralExpression, visitAwaitExpression, visitBinaryExpression, visitCallExpression, visitConditionalExpression, visitDeleteExpression, visitElementAccessExpression, visitNewExpression, visitObjectLiteralExpression, visitParenthesizedExpression, visitPostfixUnaryExpression, visitPrefixUnaryExpression, visitPropertyAccessExpression, visitTemplateExpression, visitTypeOfExpression, visitVoidExpression, } from "./expression-handlers";
 import { visitArrowFunction, visitFunctionDeclaration, visitFunctionExpression, } from "./function-handlers";
 import { visitFalseKeyword, visitIdentifier, visitNoSubstitutionTemplateLiteral, visitNullKeyword, visitNumericLiteral, visitStringLiteral, visitThisKeyword, visitTrueKeyword, visitUndefinedKeyword, } from "./literal-handlers";
 import { visitBlock, visitBreakStatement, visitCatchClause, visitContinueStatement, visitExpressionStatement, visitIfStatement, visitLabeledStatement, visitReturnStatement, visitSourceFile, visitThrowStatement, visitTryStatement, visitVariableStatement, visitYieldExpression, } from "./statement-handlers";
@@ -72,6 +72,8 @@ export function visit(node, context) {
             return visitBinaryExpression.call(this, node, context);
         case ts.SyntaxKind.ConditionalExpression:
             return visitConditionalExpression.call(this, node, context);
+        case ts.SyntaxKind.DeleteExpression:
+            return visitDeleteExpression.call(this, node, context);
         case ts.SyntaxKind.ThrowStatement:
             return visitThrowStatement.call(this, node, context);
         case ts.SyntaxKind.TryStatement:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ugo-studio/jspp",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A modern transpiler that converts JavaScript code into high-performance, standard C++23.",
   "main": "dist/index.js",
   "module": "src/index.ts",