imxc 0.6.6 → 0.6.8

package/dist/emitter.js

@@ -1346,8 +1346,14 @@ function emitBeginContainer(node, lines, indent) {
         }
         case 'ID': {
             const scope = node.props['scope'] ?? '""';
-            if (scope.startsWith('"')) {
-                lines.push(`${indent}ImGui::PushID(${scope});`);
+            const scopeType = node.props['_scopeType'] ?? (scope.startsWith('"') ? 'string' : 'number');
+            if (scopeType === 'string') {
+                if (scope.startsWith('"') || scope.endsWith('.c_str()')) {
+                    lines.push(`${indent}ImGui::PushID(${scope});`);
+                }
+                else {
+                    lines.push(`${indent}ImGui::PushID((${scope}).c_str());`);
+                }
             }
             else {
                 lines.push(`${indent}ImGui::PushID(static_cast<int>(${scope}));`);
@@ -1642,7 +1648,7 @@ function emitText(node, lines, indent) {
 function emitButton(node, lines, indent, depth) {
     emitLocComment(node.loc, 'Button', lines, indent);
     const title = asCharPtr(node.title);
-    const disabledArg = node.disabled ? ', {}, true' : '';
+    const disabledArg = node.disabled !== undefined ? `, {}, ${node.disabled}` : '';
     const pressedVar = node.action.length > 0 ? nextWidgetTemp('button_pressed') : undefined;
     const resultVar = emitBoolWidgetCall(`imx::renderer::button(${title}${disabledArg})`, node.item, lines, indent, pressedVar);
     if (node.action.length > 0 && resultVar) {

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.6');
+    console.log('        GIT_TAG v0.6.8');
     console.log('    )');
     console.log('    FetchContent_MakeAvailable(imx)');
     console.log('    include(ImxCompile)');

package/dist/ir.d.ts

@@ -138,7 +138,7 @@ export interface IRButton {
     kind: 'button';
     title: string;
     action: string[];
-    disabled?: boolean;
+    disabled?: string;
     style?: string;
     item?: IRItemInteraction;
     loc?: SourceLoc;

package/dist/lowering.js

@@ -316,6 +316,54 @@ export function exprToCpp(node, ctx) {
     // Fallback: use text representation
     return node.getText();
 }
+function isStringLikeExpr(expr, ctx) {
+    if (ts.isStringLiteral(expr) || ts.isNoSubstitutionTemplateLiteral(expr) || ts.isTemplateExpression(expr)) {
+        return true;
+    }
+    if (ts.isConditionalExpression(expr)) {
+        return isStringLikeExpr(expr.whenTrue, ctx) || isStringLikeExpr(expr.whenFalse, ctx);
+    }
+    if (ts.isBinaryExpression(expr) && expr.operatorToken.kind === ts.SyntaxKind.PlusToken) {
+        return isStringLikeExpr(expr.left, ctx) || isStringLikeExpr(expr.right, ctx)
+            || inferExprType(expr.left, ctx) === 'string'
+            || inferExprType(expr.right, ctx) === 'string';
+    }
+    return inferExprType(expr, ctx) === 'string';
+}
+function coerceExprToCppString(expr, ctx) {
+    if (ts.isStringLiteral(expr) || ts.isNoSubstitutionTemplateLiteral(expr)) {
+        return JSON.stringify(expr.text);
+    }
+    if (ts.isConditionalExpression(expr)) {
+        const condition = exprToCpp(expr.condition, ctx);
+        const whenTrue = coerceExprToCppString(expr.whenTrue, ctx);
+        const whenFalse = coerceExprToCppString(expr.whenFalse, ctx);
+        return `${condition} ? ${whenTrue} : ${whenFalse}`;
+    }
+    const cppExpr = exprToCpp(expr, ctx);
+    if (isStringLikeExpr(expr, ctx)) {
+        return cppExpr.startsWith('"') ? `std::string(${cppExpr})` : cppExpr;
+    }
+    if (inferExprType(expr, ctx) === 'bool') {
+        return `${cppExpr} ? std::string("true") : std::string("false")`;
+    }
+    return `std::to_string(${cppExpr})`;
+}
+function normalizeIdScopeAttrs(attrs, rawAttrs, ctx) {
+    const normalized = { ...attrs };
+    const scopeExpr = rawAttrs.get('scope');
+    if (!scopeExpr)
+        return normalized;
+    if (isStringLikeExpr(scopeExpr, ctx)) {
+        normalized['scope'] = coerceExprToCppString(scopeExpr, ctx);
+        normalized['_scopeType'] = 'string';
+    }
+    else {
+        normalized['scope'] = exprToCpp(scopeExpr, ctx);
+        normalized['_scopeType'] = 'number';
+    }
+    return normalized;
+}
 function stmtToCpp(stmt, ctx) {
     if (ts.isExpressionStatement(stmt)) {
         return exprToCpp(stmt.expression, ctx) + ';';
@@ -444,8 +492,11 @@ function lowerJsxElement(node, body, ctx) {
     }
     if (isHostComponent(name)) {
         const def = HOST_COMPONENTS[name];
-        const attrs = getAttributes(node.openingElement.attributes, ctx);
+        let attrs = getAttributes(node.openingElement.attributes, ctx);
         const rawAttrs = getRawAttributes(node.openingElement.attributes);
+        if (name === 'ID') {
+            attrs = normalizeIdScopeAttrs(attrs, rawAttrs, ctx);
+        }
         if (name === 'Table') {
             lowerTableElement(node, body, ctx, attrs, rawAttrs, getLoc(node, ctx));
             return;
@@ -630,8 +681,11 @@ function lowerJsxSelfClosing(node, body, ctx) {
         }
         return;
     }
-    const attrs = getAttributes(node.attributes, ctx);
+    let attrs = getAttributes(node.attributes, ctx);
     const rawAttrs = getRawAttributes(node.attributes);
+    if (name === 'ID') {
+        attrs = normalizeIdScopeAttrs(attrs, rawAttrs, ctx);
+    }
     const loc = getLoc(node, ctx);
     switch (name) {
         case 'Table': {
@@ -991,7 +1045,7 @@ function lowerButton(attrs, rawAttrs, body, ctx, loc) {
     if (onPressExpr) {
         action = extractActionStatements(onPressExpr, ctx);
     }
-    const disabled = attrs['disabled'] === 'true' ? true : undefined;
+    const disabled = attrs['disabled'];
     const style = attrs['style'];
     const item = lowerItemInteraction(attrs, rawAttrs, ctx);
     body.push({ kind: 'button', title, action, disabled, style, item, loc });

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.6
+    GIT_TAG v0.6.8
     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.6
+    GIT_TAG v0.6.8
     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.6
+    GIT_TAG v0.6.8
     GIT_SHALLOW TRUE
     GIT_PROGRESS TRUE
 )

package/package.json

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