release: 0.0.1-alpha.7

showlotus · Jan 3, 2024 · a6760be · a6760be
1 parent b0fd5a1
commit a6760be
Show file tree

Hide file tree

Showing 18 changed files with 208 additions and 115 deletions.
diff --git a/packages/babel-plugin-jsx/src/transform-vue-jsx.ts b/packages/babel-plugin-jsx/src/transform-vue-jsx.ts
@@ -19,7 +19,7 @@ const Components = {
   Fragment: 'Fragment',
   Template: 'Template',
   Dialog: 'Dialog',
-}
+};
 
 const getJSXAttributeValue = (
   path: NodePath<t.JSXAttribute>,
@@ -174,12 +174,12 @@ const genProps = (props: t.ObjectExpression) => {
 
 const genComponent = (component: t.Identifier | t.StringLiteral) => {
   return t.objectProperty(
-    t.identifier('component'), 
-    t.isStringLiteral(component) 
+    t.identifier('component'),
+    t.isStringLiteral(component)
       ? component
-      : component.name.indexOf(":") > -1 
-        ? t.stringLiteral(component.name) 
-        : component
+      : component.name.indexOf(':') > -1
+      ? t.stringLiteral(component.name)
+      : component
   );
 };
 
@@ -215,7 +215,9 @@ const isNamedSlot = (slot: t.Expression) => {
     }
   });
   if (componentPropertyIdx > -1) {
-    const componentProperty = properties[componentPropertyIdx] as t.ObjectProperty;
+    const componentProperty = properties[
+      componentPropertyIdx
+    ] as t.ObjectProperty;
     const oldVal = (componentProperty.value as t.StringLiteral).value;
     const slotName = oldVal.split(':')[1];
     properties.splice(componentPropertyIdx, 1);
@@ -224,16 +226,28 @@ const isNamedSlot = (slot: t.Expression) => {
   return '';
 };
 
-const genButtonsSlot = (slot: t.ObjectExpression) => {
-  const targetSlots = (slot as t.ObjectExpression).properties.find(v => {
+const genChildSlot = (slot: t.ObjectExpression, slotName: string) => {
+  const targetSlots = (slot as t.ObjectExpression).properties.find((v) => {
     return t.isObjectProperty(v) && (v.key as t.Identifier).name === 'slots';
   })! as t.ObjectProperty;
-  const targetDefault = (targetSlots.value as t.ObjectExpression).properties.find(v => {
+  if (!targetSlots) {
+    return slot;
+  }
+
+  const targetDefault = (
+    targetSlots.value as t.ObjectExpression
+  ).properties.find((v) => {
     return t.isObjectProperty(v) && (v.key as t.Identifier).name === 'default';
-  })!
+  })!;
   const value = (targetDefault as t.ObjectProperty).value;
-  return t.isArrayExpression(value) ? value : t.arrayExpression([value as t.ObjectExpression]);
-}
+  if (slotName === 'buttons') {
+    return t.isArrayExpression(value)
+      ? value
+      : t.arrayExpression([value as t.ObjectExpression]);
+  } else {
+    return value;
+  }
+};
 
 const genSlots = (slots: t.Expression[]) => {
   const defaultSlots = [] as t.Expression[];
@@ -243,21 +257,17 @@ const genSlots = (slots: t.Expression[]) => {
     const properties = (slot as t.ObjectExpression).properties;
     const slotName = isNamedSlot(slot);
     if (slotName) {
-      // 对于 buttons 的具名插槽特殊处理
-      if (slotName === 'buttons') {
-        namedSlots[slotName] = genButtonsSlot(slot as t.ObjectExpression);
-      } else {
-        namedSlots[slotName] = slot;
-      }
+      // 对于具名插槽特殊处理
+      namedSlots[slotName] = genChildSlot(slot as t.ObjectExpression, slotName);
     } else if (properties) {
       const componentPropertyIdx = properties.findIndex((item) => {
         if (t.isObjectProperty(item)) {
           return (
             (item.key as t.Identifier).name === 'component' &&
-            (
-              t.isStringLiteral(item.value) && item.value.value === Components.Dialog ||
-              t.isIdentifier(item.value) && item.value.name === Components.Dialog
-            )
+            ((t.isStringLiteral(item.value) &&
+              item.value.value === Components.Dialog) ||
+              (t.isIdentifier(item.value) &&
+                item.value.name === Components.Dialog))
           );
         }
       });
@@ -302,7 +312,7 @@ const isTemplate = (tag: t.Identifier) => {
 
 const isFragment = (tag: t.Identifier) => {
   return tag.name === Components.Fragment;
-}
+};
 
 const hasSlot = (path: NodePath<t.JSXElement>, state: State) => {
   const attributes = path.get('openingElement').get('attributes');
@@ -327,24 +337,28 @@ const transformJSXElement = (
   const { tag, props } = buildProps(path, state);
 
   if (isFragment(tag)) {
-    return t.objectExpression([
-      genKey(path, state),
-      ...genProps(props as t.ObjectExpression),
-      genSlots(children),
-    ])
+    return t.objectExpression(
+      [
+        genKey(path, state),
+        ...genProps(props as t.ObjectExpression),
+        children.length && genSlots(children),
+      ].filter(Boolean) as t.ObjectProperty[]
+    );
   }
 
   const slotName = hasSlot(path, state);
   if (isTemplate(tag) && slotName) {
     tag.name += `:${slotName}`;
   }
 
-  return t.objectExpression([
-    genKey(path, state),
-    genComponent(tag),
-    ...genProps(props as t.ObjectExpression),
-    genSlots(children),
-  ]);
+  return t.objectExpression(
+    [
+      genKey(path, state),
+      genComponent(tag),
+      ...genProps(props as t.ObjectExpression),
+      children.length && genSlots(children),
+    ].filter(Boolean) as t.ObjectProperty[]
+  );
 };
 
 const visitor: Visitor<State> = {

diff --git a/...-explorer/dist/assets/cssMode-153b17a8.js → ...-explorer/dist/assets/cssMode-271b4f52.js b/...-explorer/dist/assets/cssMode-153b17a8.js → ...-explorer/dist/assets/cssMode-271b4f52.js
@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { m as monaco_editor_core_star } from "./index-97bacbf1.js";
+import { m as monaco_editor_core_star } from "./index-d310fd64.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)

diff --git a/...lorer/dist/assets/freemarker2-a034e277.js → ...lorer/dist/assets/freemarker2-d2483059.js b/...lorer/dist/assets/freemarker2-a034e277.js → ...lorer/dist/assets/freemarker2-d2483059.js
@@ -1,4 +1,4 @@
-import { m as monaco_editor_core_star } from "./index-97bacbf1.js";
+import { m as monaco_editor_core_star } from "./index-d310fd64.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)

diff --git a/...plorer/dist/assets/handlebars-ea33f7a7.js → ...plorer/dist/assets/handlebars-90f14e46.js b/...plorer/dist/assets/handlebars-ea33f7a7.js → ...plorer/dist/assets/handlebars-90f14e46.js
@@ -1,4 +1,4 @@
-import { m as monaco_editor_core_star } from "./index-97bacbf1.js";
+import { m as monaco_editor_core_star } from "./index-d310fd64.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)

diff --git a/...jsx-explorer/dist/assets/html-07533a4f.js → ...jsx-explorer/dist/assets/html-048c3aad.js b/...jsx-explorer/dist/assets/html-07533a4f.js → ...jsx-explorer/dist/assets/html-048c3aad.js
@@ -1,4 +1,4 @@
-import { m as monaco_editor_core_star } from "./index-97bacbf1.js";
+import { m as monaco_editor_core_star } from "./index-d310fd64.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)

diff --git a/...explorer/dist/assets/htmlMode-22b79c2c.js → ...explorer/dist/assets/htmlMode-0a7c49eb.js b/...explorer/dist/assets/htmlMode-22b79c2c.js → ...explorer/dist/assets/htmlMode-0a7c49eb.js
@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { m as monaco_editor_core_star } from "./index-97bacbf1.js";
+import { m as monaco_editor_core_star } from "./index-d310fd64.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)