@base44-preview/vite-plugin 0.2.26-pr.43.e9195be → 0.2.27-pr.41.77be9cb

package/src/jsx-processor.ts

@@ -1,26 +1,14 @@
 import type { NodePath } from "@babel/traverse";
 import type * as t from "@babel/types";
-import { CollectionIdProcessor } from "./processors/collection-id-processor.js";
-import { ReferenceFieldProcessor } from "./processors/collection-reference-field-processor.js";
-import { DataItemIdProcessor } from "./processors/collection-item-id-processor.js";
-import { DataItemFieldProcessor } from "./processors/collection-item-field-processor.js";
 import { StaticArrayProcessor } from "./processors/static-array-processor.js";
 
 export class JSXProcessor {
-  private collectionIdProcessor: CollectionIdProcessor;
-  private referenceFieldProcessor: ReferenceFieldProcessor;
-  private dataItemIdProcessor: DataItemIdProcessor;
-  private dataItemFieldProcessor: DataItemFieldProcessor;
   private staticArrayProcessor: StaticArrayProcessor;
 
   constructor(
     private types: typeof t,
     private filename: string
   ) {
-    this.collectionIdProcessor = new CollectionIdProcessor(types);
-    this.referenceFieldProcessor = new ReferenceFieldProcessor(types);
-    this.dataItemIdProcessor = new DataItemIdProcessor(types);
-    this.dataItemFieldProcessor = new DataItemFieldProcessor(types);
     this.staticArrayProcessor = new StaticArrayProcessor(types);
   }
 
@@ -29,13 +17,8 @@ export class JSXProcessor {
 
     this.addSourceLocationAttribute(path);
     this.addDynamicContentAttribute(path);
-
-    this.collectionIdProcessor.process(path);
-    this.referenceFieldProcessor.process(path);
-    this.dataItemIdProcessor.process(path);
-    this.dataItemFieldProcessor.process(path);
+    this.addContentEditableAttribute(path);
     this.staticArrayProcessor.process(path);
-
   }
 
   private addSourceLocationAttribute(
@@ -44,7 +27,7 @@ export class JSXProcessor {
     const { line, column } = path.node.loc?.start || { line: 1, column: 0 };
     const value = `${this.filename}:${line}:${column}`;
 
-    path.node.attributes.unshift(
+    path.node.attributes.push(
       this.types.jsxAttribute(
         this.types.jsxIdentifier("data-source-location"),
         this.types.stringLiteral(value)
@@ -62,16 +45,7 @@ export class JSXProcessor {
       parentElement.node as t.JSXElement
     );
 
-    const sourceLocIdx = path.node.attributes.findIndex(
-      (attr) =>
-        this.types.isJSXAttribute(attr) &&
-        this.types.isJSXIdentifier(attr.name) &&
-        attr.name.name === "data-source-location"
-    );
-
-    path.node.attributes.splice(
-      sourceLocIdx + 1,
-      0,
+    path.node.attributes.push(
       this.types.jsxAttribute(
         this.types.jsxIdentifier("data-dynamic-content"),
         this.types.stringLiteral(isDynamic ? "true" : "false")
@@ -79,6 +53,17 @@ export class JSXProcessor {
     );
   }
 
+  private addContentEditableAttribute(
+    path: NodePath<t.JSXOpeningElement>
+  ): void {
+    path.node.attributes.push(
+      this.types.jsxAttribute(
+        this.types.jsxIdentifier("content-editable"),
+        this.types.stringLiteral("true")
+      )
+    );
+  }
+
   private hasAttribute(
     path: NodePath<t.JSXOpeningElement>,
     name: string
@@ -152,18 +137,6 @@ export class JSXProcessor {
       }
     };
 
-    const attributes = jsxElement.openingElement?.attributes || [];
-    for (const attr of attributes) {
-      if (hasDynamicContent) break;
-      if (this.types.isJSXSpreadAttribute(attr)) {
-        hasDynamicContent = true;
-        break;
-      }
-      if (this.types.isJSXAttribute(attr) && attr.value) {
-        traverseNode(attr.value as unknown as Record<string, unknown>);
-      }
-    }
-
     for (const child of jsxElement.children) {
       if (hasDynamicContent) break;
       traverseNode(child as unknown as Record<string, unknown>);

package/src/jsx-utils.ts

@@ -1,5 +1,4 @@
 import type * as t from "@babel/types";
-import { ALLOWED_CUSTOM_COMPONENTS } from "./consts.js";
 
 export class JSXUtils {
   private static types: typeof t;
@@ -13,119 +12,4 @@ export class JSXUtils {
       ? `${attr.name.namespace.name}:${attr.name.name.name}`
       : attr.name.name;
   }
-
-  static getElementName(node: t.JSXOpeningElement): string | null {
-    const name = node.name;
-
-    if (this.types.isJSXIdentifier(name)) {
-      return name.name;
-    }
-
-    if (this.types.isJSXNamespacedName(name)) {
-      return `${name.namespace.name}:${name.name.name}`;
-    }
-
-    if (this.types.isJSXMemberExpression(name)) {
-      return this.collectJSXMemberName(name);
-    }
-
-    return null;
-  }
-
-  private static collectJSXMemberName(
-    node: t.JSXMemberExpression
-  ): string {
-    const parts: string[] = [node.property.name];
-    let current: t.JSXMemberExpression["object"] = node.object;
-
-    while (this.types.isJSXMemberExpression(current)) {
-      parts.unshift(current.property.name);
-      current = current.object;
-    }
-
-    if (this.types.isJSXIdentifier(current)) {
-      parts.unshift(current.name);
-    }
-
-    return parts.join(".");
-  }
-
-  static isCustomComponent(name: string): boolean {
-    return name.length > 0 && name.charAt(0) === name.charAt(0).toUpperCase();
-  }
-
-  static isAllowedCustomComponent(name: string): boolean {
-    return ALLOWED_CUSTOM_COMPONENTS.includes(name);
-  }
-
-  static isDOMElement(name: string): boolean {
-    return name.length > 0 && name.charAt(0) === name.charAt(0).toLowerCase();
-  }
-
-  static isDOMOrAllowed(name: string): boolean {
-    return this.isDOMElement(name) || this.isAllowedCustomComponent(name);
-  }
-
-  static producesJSX(node: t.Expression | t.Node): boolean {
-    const types = this.types;
-
-    if (types.isJSXElement(node) || types.isJSXFragment(node)) return true;
-
-    if (types.isConditionalExpression(node)) {
-      return (
-        this.producesJSX(node.consequent) || this.producesJSX(node.alternate)
-      );
-    }
-
-    if (types.isLogicalExpression(node)) {
-      return this.producesJSX(node.left) || this.producesJSX(node.right);
-    }
-
-    if (types.isCallExpression(node)) {
-      if (types.isMemberExpression(node.callee)) {
-        const prop = node.callee.property;
-        if (
-          types.isIdentifier(prop) &&
-          (prop.name === "map" || prop.name === "flatMap")
-        ) {
-          const callback = node.arguments[0];
-          if (callback) return this.callbackProducesJSX(callback);
-        }
-      }
-    }
-
-    if (types.isParenthesizedExpression(node)) {
-      return this.producesJSX(node.expression);
-    }
-
-    return false;
-  }
-
-  private static callbackProducesJSX(
-    callback: t.Expression | t.SpreadElement | t.ArgumentPlaceholder
-  ): boolean {
-    const types = this.types;
-
-    if (types.isArrowFunctionExpression(callback)) {
-      if (types.isBlockStatement(callback.body)) {
-        return this.doesBlockReturnJSX(callback.body);
-      }
-      return this.producesJSX(callback.body);
-    }
-
-    if (types.isFunctionExpression(callback)) {
-      return this.doesBlockReturnJSX(callback.body);
-    }
-
-    return false;
-  }
-
-  static doesBlockReturnJSX(block: t.BlockStatement): boolean {
-    for (const stmt of block.body) {
-      if (this.types.isReturnStatement(stmt) && stmt.argument) {
-        if (this.producesJSX(stmt.argument)) return true;
-      }
-    }
-    return false;
-  }
 }