feat: 完善代码生成，解决编译错误

Author: lc-soft

src/binding.ts

@@ -262,7 +262,10 @@ function compileObjectInitializer(obj: ObjectBinding) {
   }
   switch (init.kind) {
     case SyntaxKind.StringLiteral:
-      return `strdup(${init.text})`;
+      if (init.text === 'NULL') {
+        return 'NULL';
+      }
+      return `strdup2(${init.text})`;
     case SyntaxKind.NumericLiteral:
       return init.text;
     case SyntaxKind.NewExpression:
@@ -401,52 +404,48 @@ function compileComponentEventHandlers(ctx: ComponentContext) {
   ].join("\n\n");
 }
 
-function compileComponentMethods(ctx: ComponentContext) {
-  return [
-    `static void ${ctx.name}_react_init(ui_widget_t *w)`,
-    "{",
-    `        ${ctx.name}_react_t *_that = ui_widget_get_data(w, ${ctx.name}_proto);`,
-    `        ${ctx.name}_load_template(w, &_that->refs);`,
-    `        ${ctx.name}_react_init_state(w);`,
-    `        ${ctx.name}_react_init_events(w);`,
-    `        ${ctx.name}_react_update(w);`,
-    "}\n",
-    `static void ${ctx.name}_react_destroy(ui_widget_t *w)`,
-    "{",
-    `        ${ctx.name}_react_destroy_state(w);`,
-    "}\n",
-    compileComponentMethod({ ctx, name: "react_update" }),
-  ].join("\n");
-}
-
 function compileTypes(ctx: ComponentContext) {
   return [
-    "typedef struct {",
+    `typedef struct ${ctx.name}_react_state {`,
     ...ctx.state.map(
       (item) =>
         `        ${getObjectTypeName(item.initializer)} ${item.identifier};`
     ),
     `} ${ctx.name}_react_state_t;`,
-    '',
-    'typedef struct {',
+    "",
+    `typedef struct ${ctx.name}_react {`,
     `        ${ctx.name}_react_state_t state;`,
     `        ${ctx.name}_refs_t refs;`,
-    `} ${ctx.name}_react_t;`
-  ].join('\n');
+    `} ${ctx.name}_react_t;`,
+  ].join("\n");
 }
 
 function compileComponent(ctx: ComponentContext) {
   return [
-    compiler.compileComponentState(ctx),
-    compiler.compileComponentEventHandlers(ctx),
-    compiler.compileComponentMethods(ctx),
+    compileComponentState(ctx),
+    compileComponentMethod({ ctx, name: "react_update" }),
+    compileComponentEventHandlers(ctx),
+    [
+      `static void ${ctx.name}_react_init(ui_widget_t *w)`,
+      "{",
+      `        ${ctx.name}_react_t *_that = ui_widget_get_data(w, ${ctx.name}_proto);`,
+      `        ${ctx.name}_load_template(w, &_that->refs);`,
+      `        ${ctx.name}_react_init_state(w);`,
+      `        ${ctx.name}_react_init_events(w);`,
+      `        ${ctx.name}_react_update(w);`,
+      "}\n",
+      `static void ${ctx.name}_react_destroy(ui_widget_t *w)`,
+      "{",
+      `        ${ctx.name}_react_destroy_state(w);`,
+      "}",
+    ].join("\n"),
   ].join("\n\n");
 }
 
 let contextList: FunctionContext[] = [];
 
 export function getFunctionContext() {
-  if (contextList.length < 2) {
+  if (contextList.length < 1) {
     throw new SyntaxError("FunctionContext is missing");
   }
   return contextList[contextList.length - 1];
@@ -662,10 +661,9 @@ export const compiler = {
   compileObjectDestroyer,
   compileFunction,
   compileComponentState,
-  compileComponentMethods,
   compileComponentEventHandlers,
   compileComponentMethod,
-  compileComponent
+  compileComponent,
 };
 
 export const factory = {

src/compile.ts

@@ -1,4 +1,4 @@
-import React, { ReactElement, ReactNode } from "react";
+import React, { ReactElement, ReactNode, isValidElement } from "react";
 import {
   call,
   ComponentContext,
@@ -9,6 +9,7 @@ import {
   compiler,
 } from "./binding.js";
 import fmt from "./fmt.js";
+import { JSXObjectBinding } from "./jsx-runtime.js";
 
 type ComponentFunction<T = {}> = {
   displayName?: string;
@@ -63,7 +64,7 @@ function transformNodeStyle(node: Node, style: Record<string, any>) {
 
 function transformNodeChildren(node: Node, rawChildren: ReactNode[]) {
   let isPureText = true;
-  let needFormat = false;
+  let needFormat = true;
   const children = [];
 
   React.Children.forEach(rawChildren, (child) => {
@@ -73,16 +74,16 @@ function transformNodeChildren(node: Node, rawChildren: ReactNode[]) {
         children.push(`${child}`);
         break;
       case "object":
-        if (child) {
-          if (isObjectBinding(child)) {
-            needFormat = true;
-            children.push(child);
-          } else if (React.isValidElement(child)) {
-            isPureText = false;
+        if (isValidElement(child)) {
+          isPureText = false;
+          if (child.type === JSXObjectBinding) {
+            children.push(child.props.value);
+          } else {
+            needFormat = false;
             children.push(child);
           }
-          break;
         }
+        break;
       default:
         break;
     }
@@ -276,13 +277,21 @@ void ${ctx.name}_update(ui_widget_t *w);
 
 static void ${ctx.name}_init(ui_widget_t *w)
 {
-        ui_widget_add_data(${ctx.name}_proto, sizeof(${ctx.name}_t));
+        ui_widget_add_data(w, ${ctx.name}_proto, sizeof(${ctx.name}_t));
         ${ctx.name}_react_init(w);
         // Write the initialization code for your component here
         // such as state initialization, event binding, etc
         // ...
 }
 
+static void ${ctx.name}_destroy(ui_widget_t *w)
+{
+        // Write code here to destroy the relevant resources of the component
+        // ...
+
+        ${ctx.name}_react_destroy(w);
+}
+
 void ${ctx.name}_update(ui_widget_t *w)
 {
         ${ctx.name}_react_update(w);

src/fmt.ts

@@ -14,7 +14,7 @@ export default function fmt(...args: Value[]) {
     8,
     CType.Size
   );
-  const list = args.map((value) => stringifyValue(value));
+  const list = args.map((value) => stringifyValue(value).__meta__.name);
 
   ctx.body.push(...list.map((id) => `${len.__meta__.name} += strlen(${id})`));
   ctx.body.push(

src/jsx.d.ts

@@ -0,0 +1,9 @@
+declare namespace JSX {
+  interface IntrinsicElements {
+    a: LinkProps;
+    text: WidgetBaseProps;
+    textinput: TextInputProps;
+    widget: WidgetProps;
+    div: WidgetProps;
+  }
+}

src/useState.ts

@@ -62,7 +62,7 @@ export default function useState(initialValue: Value) {
   const ctx = getComponentContext();
   const stateName =
     ctx.stateNames[ctx.state.length] || `unnamed_state_${ctx.state.length}`;
-  const stateCName = `_that->${stateName}`;
+  const stateCName = `_that->state.${stateName}`;
 
   if (isObjectBinding(initialValue)) {
     value = initialValue;