imxc 0.6.12 → 0.6.13

package/dist/emitter.js

@@ -589,6 +589,9 @@ function emitNode(node, lines, depth) {
             emitLocComment(node.loc, 'OpenPopup', lines, indent);
             lines.push(`${indent}imx::renderer::open_popup(${node.id});`);
             break;
+        case 'guard_return':
+            emitGuardReturn(node, lines, indent);
+            break;
         case 'conditional':
             emitConditional(node, lines, indent, depth);
             break;
@@ -1960,6 +1963,12 @@ function emitCursor(node, lines, indent) {
     emitLocComment(node.loc, 'Cursor', lines, indent);
     lines.push(`${indent}imx::renderer::set_cursor_pos(${emitFloat(node.x)}, ${emitFloat(node.y)});`);
 }
+function emitGuardReturn(node, lines, indent) {
+    emitLocComment(node.loc, 'return null guard', lines, indent);
+    lines.push(`${indent}if (${node.condition}) {`);
+    lines.push(`${indent}${INDENT}return;`);
+    lines.push(`${indent}}`);
+}
 function emitConditional(node, lines, indent, depth) {
     if (node.loc) {
         lines.push(`${indent}// ${node.loc.file}:${node.loc.line} conditional`);

package/dist/init.js

@@ -39,7 +39,7 @@ export function addToProject(projectDir) {
     console.log('    include(FetchContent)');
     console.log('    FetchContent_Declare(imx');
     console.log('        GIT_REPOSITORY https://github.com/bgocumlu/imx.git');
-    console.log('        GIT_TAG v0.6.12');
+    console.log('        GIT_TAG v0.6.13');
     console.log('    )');
     console.log('    FetchContent_MakeAvailable(imx)');
     console.log('    include(ImxCompile)');

package/dist/ir.d.ts

@@ -37,7 +37,7 @@ export interface IRPropParam {
     name: string;
     type: string | 'callback';
 }
-export type IRNode = IRBeginContainer | IREndContainer | IRText | IRButton | IRTextInput | IRCheckbox | IRSeparator | IRSpacing | IRDummy | IRSameLine | IRNewLine | IRCursor | IRBeginPopup | IREndPopup | IROpenPopup | IRConditional | IRListMap | IRCustomComponent | IRMenuItem | IRBeginTable | IREndTable | IRBeginTableRow | IREndTableRow | IRBeginTableCell | IREndTableCell | IRBeginTreeNode | IREndTreeNode | IRBeginCollapsingHeader | IREndCollapsingHeader | IRSliderFloat | IRSliderInt | IRDragFloat | IRDragInt | IRCombo | IRInputInt | IRInputFloat | IRColorEdit | IRListBox | IRProgressBar | IRTooltip | IRShortcut | IRDockLayout | IRNativeWidget | IRBulletText | IRLabelText | IRSelectable | IRRadio | IRInputTextMultiline | IRColorPicker | IRColorEdit3 | IRColorPicker3 | IRPlotLines | IRPlotHistogram | IRImage | IRDrawLine | IRDrawRect | IRDrawCircle | IRDrawText | IRDrawBezierCubic | IRDrawBezierQuadratic | IRDrawPolyline | IRDrawConvexPolyFilled | IRDrawNgon | IRDrawNgonFilled | IRDrawTriangle | IRInputFloatN | IRInputIntN | IRDragFloatN | IRDragIntN | IRSliderFloatN | IRSliderIntN | IRSmallButton | IRArrowButton | IRInvisibleButton | IRImageButton | IRVSliderFloat | IRVSliderInt | IRSliderAngle | IRBeginCombo | IREndCombo | IRBullet | IRBeginListBox | IREndListBox;
+export type IRNode = IRBeginContainer | IREndContainer | IRText | IRButton | IRTextInput | IRCheckbox | IRSeparator | IRSpacing | IRDummy | IRSameLine | IRNewLine | IRCursor | IRBeginPopup | IREndPopup | IROpenPopup | IRGuardReturn | IRConditional | IRListMap | IRCustomComponent | IRMenuItem | IRBeginTable | IREndTable | IRBeginTableRow | IREndTableRow | IRBeginTableCell | IREndTableCell | IRBeginTreeNode | IREndTreeNode | IRBeginCollapsingHeader | IREndCollapsingHeader | IRSliderFloat | IRSliderInt | IRDragFloat | IRDragInt | IRCombo | IRInputInt | IRInputFloat | IRColorEdit | IRListBox | IRProgressBar | IRTooltip | IRShortcut | IRDockLayout | IRNativeWidget | IRBulletText | IRLabelText | IRSelectable | IRRadio | IRInputTextMultiline | IRColorPicker | IRColorEdit3 | IRColorPicker3 | IRPlotLines | IRPlotHistogram | IRImage | IRDrawLine | IRDrawRect | IRDrawCircle | IRDrawText | IRDrawBezierCubic | IRDrawBezierQuadratic | IRDrawPolyline | IRDrawConvexPolyFilled | IRDrawNgon | IRDrawNgonFilled | IRDrawTriangle | IRInputFloatN | IRInputIntN | IRDragFloatN | IRDragIntN | IRSliderFloatN | IRSliderIntN | IRSmallButton | IRArrowButton | IRInvisibleButton | IRImageButton | IRVSliderFloat | IRVSliderInt | IRSliderAngle | IRBeginCombo | IREndCombo | IRBullet | IRBeginListBox | IREndListBox;
 export interface IRBeginContainer {
     kind: 'begin_container';
     tag: 'Window' | 'View' | 'Indent' | 'TextWrap' | 'Row' | 'Column' | 'DockSpace' | 'MainMenuBar' | 'MenuBar' | 'Menu' | 'TabBar' | 'TabItem' | 'Theme' | 'DockLayout' | 'DockSplit' | 'DockPanel' | 'Modal' | 'Group' | 'ID' | 'StyleColor' | 'StyleVar' | 'DragDropSource' | 'DragDropTarget' | 'Canvas' | 'Disabled' | 'Child' | 'Font' | 'ContextMenu' | 'MultiSelect';
@@ -211,6 +211,11 @@ export interface IROpenPopup {
     id: string;
     loc?: SourceLoc;
 }
+export interface IRGuardReturn {
+    kind: 'guard_return';
+    condition: string;
+    loc?: SourceLoc;
+}
 export interface IRConditional {
     kind: 'conditional';
     condition: string;

package/dist/lowering.js

@@ -75,9 +75,18 @@ export function lowerComponent(parsed, validation, externalInterfaces) {
     const body = [];
     if (func.body) {
         collectLocalAliases(func.body, ctx);
-        const returnStmt = func.body.statements.find(ts.isReturnStatement);
-        if (returnStmt && returnStmt.expression) {
-            lowerJsxExpression(returnStmt.expression, body, ctx);
+        for (const stmt of func.body.statements) {
+            const guard = lowerTopLevelGuardReturn(stmt, ctx);
+            if (guard) {
+                body.push(guard);
+                continue;
+            }
+            if (ts.isReturnStatement(stmt)) {
+                if (stmt.expression) {
+                    lowerJsxExpression(stmt.expression, body, ctx);
+                }
+                break;
+            }
         }
     }
     return {
@@ -89,6 +98,28 @@ export function lowerComponent(parsed, validation, externalInterfaces) {
         body,
     };
 }
+function lowerTopLevelGuardReturn(stmt, ctx) {
+    if (!ts.isIfStatement(stmt) || !statementReturnsNullish(stmt.thenStatement)) {
+        return undefined;
+    }
+    return {
+        kind: 'guard_return',
+        condition: exprToCpp(stmt.expression, ctx),
+        loc: getLoc(stmt, ctx),
+    };
+}
+function statementReturnsNullish(stmt) {
+    if (ts.isReturnStatement(stmt)) {
+        return isNullishReturnExpression(stmt.expression);
+    }
+    if (ts.isBlock(stmt) && stmt.statements.length === 1 && ts.isReturnStatement(stmt.statements[0])) {
+        return isNullishReturnExpression(stmt.statements[0].expression);
+    }
+    return false;
+}
+function isNullishReturnExpression(expr) {
+    return !expr || expr.kind === ts.SyntaxKind.NullKeyword || expr.kind === ts.SyntaxKind.UndefinedKeyword;
+}
 function collectLocalAliases(body, ctx) {
     for (const stmt of body.statements) {
         if (ts.isReturnStatement(stmt)) {

package/dist/templates/custom.js

@@ -428,7 +428,7 @@ set(FETCHCONTENT_QUIET OFF)
 FetchContent_Declare(
     imx
     GIT_REPOSITORY https://github.com/bgocumlu/imx.git
-GIT_TAG v0.6.12
+GIT_TAG v0.6.13
     GIT_SHALLOW TRUE
     GIT_PROGRESS TRUE
 )

package/dist/templates/hotreload.js

@@ -313,7 +313,7 @@ set(FETCHCONTENT_QUIET OFF)
 FetchContent_Declare(
     imx
     GIT_REPOSITORY https://github.com/bgocumlu/imx.git
-GIT_TAG v0.6.12
+GIT_TAG v0.6.13
     GIT_SHALLOW TRUE
     GIT_PROGRESS TRUE
 )

package/dist/templates/index.js

@@ -402,7 +402,7 @@ set(FETCHCONTENT_QUIET OFF)
 FetchContent_Declare(
     imx
     GIT_REPOSITORY ${repoUrl}
-GIT_TAG v0.6.12
+GIT_TAG v0.6.13
     GIT_SHALLOW TRUE
     GIT_PROGRESS TRUE
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imxc",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "description": "Compiler for IMX — compiles React-like .tsx to native Dear ImGui C++",
   "type": "module",
   "bin": {