wip(uts): harmony 增加sourceMap

dcloudio · Jan 16, 2025 · 8c54132 · 8c54132
1 parent 4b0ab04
commit 8c54132
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 13 deletions.
diff --git a/packages/uni-cli-shared/src/vite/plugins/uts/uni_modules.ts b/packages/uni-cli-shared/src/vite/plugins/uts/uni_modules.ts
@@ -458,6 +458,7 @@ export function uniUTSAppUniModulesPlugin(
       return compiler.compileArkTS(pluginDir, {
         isX: !!options.x,
         isExtApi,
+        sourceMap: enableSourceMap(),
         transform: {
           uniExtApiProviderName: extApiProvider?.name,
           uniExtApiProviderService: extApiProvider?.service,

diff --git a/packages/uni-uts-v1/__tests__/sourceMap.spec.ts b/packages/uni-uts-v1/__tests__/sourceMap.spec.ts
@@ -56,6 +56,40 @@ describe('uts:sourceMap', () => {
     ).toBe(sourceMapFile)
   })
 
+  test('resolveUTSPluginSourceMapFile with uni_modules uts=>arkts', () => {
+    const sourceMapFile = resolveUTSPluginSourceMapFile(
+      'arkts',
+      resolve(inputDir, uniModulesPluginDir, 'utssdk/app-harmony/index.uts'),
+      inputDir,
+      outputDir
+    )
+    expect(
+      normalizePath(sourceMapFile).endsWith(
+        'uni_modules/test-uniplugin/utssdk/app-harmony/index.ets.map'
+      )
+    ).toBe(true)
+    expect(
+      resolveUTSPluginSourceMapFile(
+        'arkts',
+        resolve(inputDir, uniModulesPluginDir, 'utssdk/index.uts'),
+        inputDir,
+        outputDir
+      )
+    ).toBe(sourceMapFile)
+    expect(
+      resolveUTSPluginSourceMapFile(
+        'arkts',
+        resolve(
+          inputDir,
+          uniModulesPluginDir,
+          'utssdk/app-harmony/utils/utils.uts'
+        ),
+        inputDir,
+        outputDir
+      )
+    ).toBe(sourceMapFile)
+  })
+
   test('resolveUTSPluginSourceMapFile with uni_modules uts=>swift', () => {
     const sourceMapFile = resolveUTSPluginSourceMapFile(
       'swift',

diff --git a/packages/uni-uts-v1/src/arkts.ts b/packages/uni-uts-v1/src/arkts.ts
@@ -6,6 +6,7 @@ import {
   normalizeUTSResult,
   resolveBundleInputFileName,
   resolveBundleInputRoot,
+  resolveUTSSourceMapPath,
 } from './utils'
 import type { CompileResult } from '.'
 import { sync } from 'fast-glob'
@@ -14,6 +15,7 @@ interface ArkTSCompilerOptions {
   isX?: boolean
   isExtApi?: boolean
   isOhpmPackage?: boolean
+  sourceMap?: boolean
   transform?: {
     uniExtApiProviderName?: string
     uniExtApiProviderService?: string
@@ -129,7 +131,7 @@ export async function compileArkTSExtApi(
   rootDir: string,
   pluginDir: string,
   outputDir: string,
-  { isExtApi, isX, isOhpmPackage = false, transform }: ArkTSCompilerOptions
+  { isExtApi, isX, isOhpmPackage = false, sourceMap }: ArkTSCompilerOptions
 ): Promise<CompileResult | void> {
   const filename = resolveAppHarmonyIndexFile(pluginDir)
   if (!filename) {
@@ -170,7 +172,9 @@ export async function compileArkTSExtApi(
       outFilename: 'utssdk/app-harmony/index.ets',
       package: '',
       imports: [],
-      sourceMap: false,
+      sourceMap: sourceMap
+        ? path.resolve(resolveUTSSourceMapPath(), 'uni_modules', pluginId)
+        : false,
       extname: '.ets',
       logFilename: false,
       isPlugin: true,
@@ -340,15 +344,15 @@ export default {
 
 export async function compileArkTS(
   pluginDir: string,
-  { isExtApi, isX, transform }: ArkTSCompilerOptions
+  options: ArkTSCompilerOptions
 ): Promise<CompileResult | void> {
   const inputDir = process.env.UNI_INPUT_DIR
   const pluginId = path.basename(pluginDir)
   return compileArkTSExtApi(
     resolveBundleInputRoot('app-harmony', inputDir),
     pluginDir,
     resolveAppHarmonyUniModuleDir(pluginId),
-    { isExtApi, isX, transform }
+    options
   )
 }
 

diff --git a/packages/uni-uts-v1/src/sourceMap.ts b/packages/uni-uts-v1/src/sourceMap.ts
@@ -28,11 +28,13 @@ import {
 const EXTNAME = {
   kotlin: '.kt',
   swift: '.swift',
+  arkts: '.ets',
 }
 
 const PLATFORM_DIR = {
   kotlin: 'app-android',
   swift: 'app-ios',
+  arkts: 'app-harmony',
 }
 
 const uniModulesUTSPackagePrefix = 'uts.sdk.modules.'
@@ -166,7 +168,7 @@ export function resolveUTSSourceMapFile(
 }
 
 export function resolveUTSPluginSourceMapFile(
-  target: 'kotlin' | 'swift',
+  target: 'kotlin' | 'swift' | 'arkts',
   filename: string,
   inputDir: string,
   outputDir: string
@@ -179,13 +181,23 @@ export function resolveUTSPluginSourceMapFile(
     throw `plugin dir not found`
   }
   const is_uni_modules = basename(dirname(pluginDir)) === 'uni_modules'
-  const sourceMapFile = join(
-    join(outputDir, '../.sourcemap/app'),
-    relative(inputDir, pluginDir),
-    is_uni_modules ? 'utssdk' : '',
-    PLATFORM_DIR[target],
-    `index${EXTNAME[target]}.map`
-  )
+  const sourceMapFile =
+    target === 'arkts'
+      ? join(
+          outputDir,
+          '../.sourcemap/app-harmony',
+          relative(inputDir, pluginDir),
+          is_uni_modules ? 'utssdk' : '',
+          PLATFORM_DIR[target],
+          `index${EXTNAME[target]}.map`
+        )
+      : join(
+          join(outputDir, '../.sourcemap/app'),
+          relative(inputDir, pluginDir),
+          is_uni_modules ? 'utssdk' : '',
+          PLATFORM_DIR[target],
+          `index${EXTNAME[target]}.map`
+        )
   if (!existsSync(sourceMapFile)) {
     throw `${sourceMapFile} not found`
   }
@@ -199,7 +211,7 @@ function resolvePluginDir(
   outputDir: string,
   filename: string
 ) {
-  // 目标文件是编译后 kt 或 swift
+  // 目标文件是编译后 kt 或 swift 或 ets
   if (filename.startsWith(outputDir)) {
     const relativePath = relative(outputDir, filename)
     const hasSrc = normalizePath(relativePath).includes('/src/')