From 746d3757efd15f158e5a2fc99c2ddaab69bb8985 Mon Sep 17 00:00:00 2001
From: acyza <101238421+acyza@users.noreply.github.com>
Date: Mon, 20 May 2024 01:16:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=87=AA=E8=B0=83=E7=94=A8=E8=87=AA=E5=8A=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=B0usingComponents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-cli-shared/src/mp/usingComponents.ts  | 71 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/packages/uni-cli-shared/src/mp/usingComponents.ts b/packages/uni-cli-shared/src/mp/usingComponents.ts
index 599137f8879..a11a10b50fa 100644
--- a/packages/uni-cli-shared/src/mp/usingComponents.ts
+++ b/packages/uni-cli-shared/src/mp/usingComponents.ts
@@ -1,7 +1,9 @@
 import {
+  type ExportDefaultDeclaration,
   type IfStatement,
   type ImportDeclaration,
   type Node,
+  type ObjectExpression,
   type ObjectProperty,
   type Program,
   type Statement,
@@ -28,6 +30,7 @@ import { BINDING_COMPONENTS, EXTNAME_VUE_RE } from '../constants'
 import { isAppVue, normalizeMiniProgramFilename, removeExt } from '../utils'
 import { cleanUrl, parseVueRequest } from '../vite/utils'
 import { addMiniProgramUsingComponents } from '../json/mp/jsonFile'
+import path from 'path'
 
 type BindingComponents = Record<
   string,
@@ -190,11 +193,56 @@ export async function updateMiniProgramGlobalComponents(
   }
 }
 
+function parseVueComponentName(filename: string) {
+  let name = path.basename(removeExt(filename))
+
+  const ast = scriptDescriptors.get(filename)
+  if (!ast) return name
+
+  const exportDefaultDecliaration = scriptDescriptors
+    .get(filename)
+    ?.ast.body.find(
+      (v) => v.type === 'ExportDefaultDeclaration'
+    ) as ExportDefaultDeclaration | null
+
+  if (!exportDefaultDecliaration) return name
+
+  let defineComponentDeclaration: ObjectExpression | null = null
+
+  const { declaration } = exportDefaultDecliaration
+
+  if (declaration.type === 'ObjectExpression') {
+    defineComponentDeclaration = declaration
+  } else if (
+    declaration.type === 'CallExpression' &&
+    declaration.callee.type === 'Identifier' &&
+    declaration.callee.name === '_defineComponent'
+  ) {
+    defineComponentDeclaration =
+      (declaration.arguments[0] as ObjectExpression | undefined) || null
+  }
+
+  if (!defineComponentDeclaration) return name
+
+  for (const prop of defineComponentDeclaration.properties) {
+    if (
+      prop.type === 'ObjectProperty' &&
+      prop.key.type === 'Identifier' &&
+      prop.key.name === '__name' &&
+      prop.value.type === 'StringLiteral'
+    ) {
+      return prop.value.value
+    }
+  }
+  return name
+}
+
 function createUsingComponents(
   bindingComponents: BindingComponents,
   imports: ImportDeclaration[],
   inputDir: string,
-  normalizeComponentName: (name: string) => string
+  normalizeComponentName: (name: string) => string,
+  filename?: string
 ) {
   const usingComponents: Record<string, string> = {}
   imports.forEach(({ source: { value }, specifiers: [specifier] }) => {
@@ -211,6 +259,22 @@ function createUsingComponents(
       )
     }
   })
+
+  if (filename) {
+    const componentName = parseVueComponentName(filename)
+
+    if (
+      Object.keys(bindingComponents).find(
+        (v) => bindingComponents[v].tag === componentName
+      ) &&
+      !usingComponents[componentName]
+    ) {
+      usingComponents[componentName] = addLeadingSlash(
+        removeExt(normalizeMiniProgramFilename(filename, inputDir))
+      )
+    }
+  }
+
   return usingComponents
 }
 
@@ -250,7 +314,8 @@ export function updateMiniProgramComponentsByMainFilename(
       bindingComponents,
       imports,
       inputDir,
-      normalizeComponentName
+      normalizeComponentName,
+      mainFilename
     )
   )
 }
@@ -347,6 +412,7 @@ interface ParseDescriptor {
 }
 export interface ScriptDescriptor extends TemplateDescriptor {
   setupBindingComponents: BindingComponents
+  ast: Program
 }
 
 async function parseGlobalDescriptor(
@@ -396,6 +462,7 @@ export async function parseScriptDescriptor(
     bindingComponents: parseComponents(ast),
     setupBindingComponents: findBindingComponents(ast.body),
     imports,
+    ast,
   }
 
   scriptDescriptors.set(filename, descriptor)