fix(uts): 修复 main.uts 中日志输出时，控制台显示文件名不正确

packages/playground/uts/unpackage/dist/dev/.sourcemap/app/uni_modules/test-uniplugin/utssdk/app-ios/index.swift.map

-{"version":3,"sources":["uni_modules/test-uniplugin/utssdk/app-ios/index.uts","uni_modules/test-uniplugin/utssdk/interface.uts"],"sourcesContent":["import { UIDevice } from 'UIKit'\nimport { CLLocationManager, CLAuthorizationStatus } from 'CoreLocation'\nimport { ShowToast } from '../interface.uts'\n\ntype GetBatteryInfoOptions = {\n  name: string\n  pwd: number\n  success?: (res: UTSJSONObject) => void\n  fail?: (res: UTSJSONObject) => void\n  complete?: (res: UTSJSONObject) => void\n}\n\nexport default function getBatteryInfo(options: GetBatteryInfoOptions) {\n  new UIAlertController(\n    (title = title),\n    (message = message),\n    (preferredStyle = UIAlertController.Style.alert)\n  )\n  const res = {\n    errMsg: 'getBatteryInfo:ok',\n    level: UIDevice.current.batteryLevel * 100,\n    isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging,\n  }\n  if (options.success != null) {\n    options.success!(res)\n  }\n  if (options.complete != null) {\n    options.complete!(res)\n  }\n}\n\nexport function test1(callback: () => void): string {\n  console.log({ \"a\": \"b\" })\n  console.log('test1')\n\n\n\n\n  console.log('def ios')\n\n\n  console.log('ndef android')\n\n\n\n\n\n  console.log('def android || def ios')\n\n\n\n\n  console.log(CLLocationManager, CLAuthorizationStatus)\n  const a = -3\n  console.log(~a)\n  return 'test1'\n}\n\nclass Test1 { }\nexport class Test {\n  constructor() {\n    new Test1()\n  }\n  test(): string | null {\n    if (UTSiOS.macros(\"swift(>=1)\")) {\n      console.log(\"swift(>=1)\")\n    }\n    if (UTSiOS.macros(\"arch(i386) || arch(arm)\")) {\n      console.log(\"arch(i386) || arch(arm)\")\n    }\n    if (UTSiOS.available(\"iOS 14, macOS 11.0, *\")) {\n      console.log(\"iOS 14, macOS 11.0, *\")\n    } else if (UTSiOS.available(\"iOS 13,*\")) {\n      console.log(\"iOS 13,*\")\n    } else if (UTSiOS.unavailable(\"tvOS 12\")) {\n      console.log(\"tvOS 12\")\n    }\n    return null\n  }\n}\n\nexport async function testAsync() {\n  uni.showToast()\n  uni.showToast()\n  uni.showModel()\n  return { a: 1 }\n}\n\nexport const showToast1: ShowToast = (msg) => { }\nexport const showToast2: ShowToast = function (msg) { }\nexport const showToast3: ShowToast = function showToast(msg) { }\n","export type ShowToast = (msg: string) => void\n"],"names":[],"mappings":"AACA,oBAAuE;;AADvE,aAAgC;;;;iBCApB,eAAa,KAAK,MAAM,KAAK,IAAI;ADIhB;;aAAxB;IACH,WAAA,MAAM,MAAM,EAAA;IACZ,WAAA,KAAK,QAAM,EAAA;IACX,WAAA,aAAW,KAAK,kBAAkB,IAAI,GAAA;IACtC,WAAA,UAAQ,KAAK,kBAAkB,IAAI,GAAA;IACnC,WAAA,cAAY,KAAK,kBAAkB,IAAI,GAAA;;;;;;;;;;;;;;;;;;;;;;;;;;aAJvC,uBAAM,MAAM;aACZ,qBAAK,QAAM;aACX,iCAAW,KAAK,kBAAkB,IAAI;aACtC,2BAAQ,KAAK,kBAAkB,IAAI;aACnC,mCAAY,KAAK,kBAAkB,IAAI;;AACzC;AAEe,YAAS,eAAe,EAAA,SAAS,qBAAqB,EAAE;IACjE,kBACD,OAAQ,OACR,SAAU,SACV,gBAAiB,kBAAkB,KAAK,CAAC,KAAK;IAEjD,IAAM,MAAM;QACV,CAAA,SAAQ;QACR,CAAA,QAAO,SAAS,OAAO,CAAC,YAAY,GAAG,GAAG;QAC1C,CAAA,aAAY,SAAS,OAAO,CAAC,YAAY,IAAI,SAAS,YAAY,CAAC,QAAQ;MAC5E;IACD,IAAI,QAAQ,OAAO,IAAI,GAAI,EAAE;QAC3B,QAAQ,OAAO,EAAE;IACnB;IACA,IAAI,QAAQ,QAAQ,IAAI,GAAI,EAAE;QAC5B,QAAQ,QAAQ,EAAE;IACpB;AACF;AAEO,YAAS,MAAM,EAAA,yBAAgB,IAAI,KAAG,MAAM,CAAC;IAClD,QAAQ,GAAG,CAAC;QAAE,KAAK;MAAK;IACxB,QAAQ,GAAG,CAAC;IAKZ,QAAQ,GAAG,CAAC;IAGZ,QAAQ,GAAG,CAAC;IAMZ,QAAQ,GAAG,CAAC;IAKZ,QAAQ,GAAG,CAAC,mBAAmB;IAC/B,IAAM,cAAI,EAAE;IACZ,QAAQ,GAAG,CAAC,CAAC;IACb,OAAO;AACT;AAEA;;aAAM;AAAQ;AACP;;aAAM;IACX,aAAc;QACR;IACN;IACA,YAAA,UAAQ,MAAM,EAAQ;QACpB;YACE,QAAQ,GAAG,CAAC;cACb;QACD;YACE,QAAQ,GAAG,CAAC;cACb;QACD,qCAA+C;YAC7C,QAAQ,GAAG,CAAC;QACd,OAAO,wBAAkC;YACvC,QAAQ,GAAG,CAAC;QACd,OAAO,yBAAmC;YACxC,QAAQ,GAAG,CAAC;QACd;QACA,OAAO,GAAI;IACb;AACF;AAEO;YAAe,mCAAY;IAChC;IACA;IACA;IACA,OAAO;QAAE,CAAA,IAAG,CAAC;MAAE;AACjB;AAEO,WAAM,wBAAwB;GAAC;;AAC/B,WAAM,wBAAwB;CAAU,EAAA,GAAG;;AAC3C,WAAM,wBAAwB;CAAmB,EAAA,GAAG;;AAtF9B;;;IAC3B,WAAA,MAAM,MAAM,EAAA;IACZ,WAAA,KAAK,QAAM,EAAA;IACX,WAAA,SAAQ,aAA8B;IACtC,WAAA,MAAK,aAA8B;IACnC,WAAA,UAAS,aAA8B;AACzC;+BAEuC,EAAA,SAAS,+BAAqB;;;;;SALxD,KAAK;yBAAL;;;SACH,KAAK;sBAAL;;;SACI,KAAK;0BAAL;;;;wBAsBQ,0BAAuB,MAAM;;;IAA7B;;;;;;8BAgCZ,MAAM;;;;;;;;6BC/DS,KAAK,MAAM,KAAK,IAAI;sBAApB;;6BAAA,KAAK,MAAM,KAAK,IAAI;sBAApB;;6BAAA,KAAK,MAAM,KAAK,IAAI;sBAApB;;;;;4CDYc,EAAA,SAAS,+BAAqB;kCAA9B;;qCAmBjB,0BAAuB,MAAM;yBAA7B;;;;;;0CC/BG,KAAK,MAAM,KAAK,IAAI;8BAApB;;0CAAA,KAAK,MAAM,KAAK,IAAI;8BAApB;;0CAAA,KAAK,MAAM,KAAK,IAAI;8BAApB"}
\ No newline at end of file
+{"version":3,"sources":["uni_modules/test-uniplugin/utssdk/app-ios/index.uts","uni_modules/test-uniplugin/utssdk/interface.uts"],"sourcesContent":["import { UIDevice } from 'UIKit'\nimport { CLLocationManager, CLAuthorizationStatus } from 'CoreLocation'\nimport { ShowToast } from '../interface.uts'\n\ntype GetBatteryInfoOptions = {\n  name: string\n  pwd: number\n  success?: (res: UTSJSONObject) => void\n  fail?: (res: UTSJSONObject) => void\n  complete?: (res: UTSJSONObject) => void\n}\n\nexport default function getBatteryInfo(options: GetBatteryInfoOptions) {\n  new UIAlertController(\n    (title = title),\n    (message = message),\n    (preferredStyle = UIAlertController.Style.alert)\n  )\n  const res = {\n    errMsg: 'getBatteryInfo:ok',\n    level: UIDevice.current.batteryLevel * 100,\n    isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging,\n  }\n  if (options.success != null) {\n    options.success!(res)\n  }\n  if (options.complete != null) {\n    options.complete!(res)\n  }\n}\n\nexport function test1(callback: () => void): string {\n  console.log({ \"a\": \"b\" })\n  console.log('test1')\n\n\n\n\n  console.log('def ios')\n\n\n  console.log('ndef android')\n\n\n\n\n\n  console.log('def android || def ios')\n\n\n\n\n  console.log(CLLocationManager, CLAuthorizationStatus)\n  const a = -3\n  console.log(~a)\n  return 'test1'\n}\n\nclass Test1 { }\nexport class Test {\n  constructor() {\n    new Test1()\n  }\n  test(): string | null {\n    if (UTSiOS.macros(\"swift(>=1)\")) {\n      console.log(\"swift(>=1)\")\n    }\n    if (UTSiOS.macros(\"arch(i386) || arch(arm)\")) {\n      console.log(\"arch(i386) || arch(arm)\")\n    }\n    if (UTSiOS.available(\"iOS 14, macOS 11.0, *\")) {\n      console.log(\"iOS 14, macOS 11.0, *\")\n    } else if (UTSiOS.available(\"iOS 13,*\")) {\n      console.log(\"iOS 13,*\")\n    } else if (UTSiOS.unavailable(\"tvOS 12\")) {\n      console.log(\"tvOS 12\")\n    }\n    return null\n  }\n}\n\nexport async function testAsync() {\n  uni.showToast()\n  uni.showToast()\n  uni.showModel()\n  return { a: 1 }\n}\n\nexport const showToast1: ShowToast = (msg) => { }\nexport const showToast2: ShowToast = function (msg) { }\nexport const showToast3: ShowToast = function showToast(msg) { }\n","export type ShowToast = (msg: string) => void\n"],"names":[],"mappings":"AACA,oBAAuE;;AADvE,aAAgC;;;;iBCApB,eAAa,KAAK,MAAM,KAAK,IAAI;ADIhB;;aAAxB;IACH,iBAAM,MAAM,EAAA;IACZ,gBAAK,QAAM,EAAA;IACX,wBAAW,KAAK,kBAAkB,IAAI,GAAA;IACtC,qBAAQ,KAAK,kBAAkB,IAAI,GAAA;IACnC,yBAAY,KAAK,kBAAkB,IAAI,GAAA;;;;;;;;;;;;;;;;;;;;;;;;;;oCAJjC,MAAM;kCACP,QAAM;8CACA,KAAK,kBAAkB,IAAI;wCAC9B,KAAK,kBAAkB,IAAI;gDACvB,KAAK,kBAAkB,IAAI;;AACzC;AAEe,YAAS,eAAe,EAAA,SAAS,qBAAqB,EAAE;IACjE,kBACD,OAAQ,OACR,SAAU,SACV,gBAAiB,kBAAkB,KAAK,CAAC,KAAK;IAEjD,IAAM,MAAM;QACV,CAAA,SAAQ;QACR,CAAA,QAAO,SAAS,OAAO,CAAC,YAAY,GAAG,GAAG;QAC1C,CAAA,aAAY,SAAS,OAAO,CAAC,YAAY,IAAI,SAAS,YAAY,CAAC,QAAQ;MAC5E;IACD,IAAI,QAAQ,OAAO,IAAI,GAAI,EAAE;QAC3B,QAAQ,OAAO,EAAE;IACnB;IACA,IAAI,QAAQ,QAAQ,IAAI,GAAI,EAAE;QAC5B,QAAQ,QAAQ,EAAE;IACpB;AACF;AAEO,YAAS,MAAM,EAAA,yBAAgB,IAAI,KAAG,MAAM,CAAC;IAClD,QAAQ,GAAG,CAAC;QAAE,KAAK;MAAK;IACxB,QAAQ,GAAG,CAAC;IAKZ,QAAQ,GAAG,CAAC;IAGZ,QAAQ,GAAG,CAAC;IAMZ,QAAQ,GAAG,CAAC;IAKZ,QAAQ,GAAG,CAAC,mBAAmB;IAC/B,IAAM,cAAI,EAAE;IACZ,QAAQ,GAAG,CAAC,CAAC;IACb,OAAO;AACT;AAEA;;aAAM;AAAQ;AACP;;aAAM;IACX,aAAc;QACR;IACN;IACA,YAAA,UAAQ,MAAM,EAAQ;QACpB;YACE,QAAQ,GAAG,CAAC;cACb;QACD;YACE,QAAQ,GAAG,CAAC;cACb;QACD,qCAA+C;YAC7C,QAAQ,GAAG,CAAC;QACd,OAAO,wBAAkC;YACvC,QAAQ,GAAG,CAAC;QACd,OAAO,yBAAmC;YACxC,QAAQ,GAAG,CAAC;QACd;QACA,OAAO,GAAI;IACb;AACF;AAEO;YAAe,mCAAY;IAChC;IACA;IACA;IACA,OAAO;QAAE,CAAA,IAAG,CAAC;MAAE;AACjB;AAEO,WAAM,wBAAwB;GAAC;;AAC/B,WAAM,wBAAwB;CAAU,EAAA,GAAG;;AAC3C,WAAM,wBAAwB;CAAmB,EAAA,GAAG;;AAtF9B;;;IAC3B,WAAA,MAAM,MAAM,EAAA;IACZ,WAAA,KAAK,QAAM,EAAA;IACX,WAAA,SAAQ,aAA8B;IACtC,WAAA,MAAK,aAA8B;IACnC,WAAA,UAAS,aAA8B;AACzC;+BAEuC,EAAA,SAAS,+BAAqB;;;;;SALxD,KAAK;yBAAL;;;SACH,KAAK;sBAAL;;;SACI,KAAK;0BAAL;;;;wBAsBQ,0BAAuB,MAAM;;;IAA7B;;;;;;8BAgCZ,MAAM;;;;;;;;6BC/DS,KAAK,MAAM,KAAK,IAAI;sBAApB;;6BAAA,KAAK,MAAM,KAAK,IAAI;sBAApB;;6BAAA,KAAK,MAAM,KAAK,IAAI;sBAApB;;;;;4CDYc,EAAA,SAAS,+BAAqB;kCAA9B;;qCAmBjB,0BAAuB,MAAM;yBAA7B;;;;;;0CC/BG,KAAK,MAAM,KAAK,IAAI;8BAApB;;0CAAA,KAAK,MAAM,KAAK,IAAI;8BAApB;;0CAAA,KAAK,MAAM,KAAK,IAAI;8BAApB"}
\ No newline at end of file

packages/uni-app-uts/src/plugins/android/mainUTS.ts

@@ -16,8 +16,7 @@ export function uniAppMainPlugin(): Plugin {
     async transform(code, id) {
       if (normalizePath(id) === mainUTS) {
         code = await parseImports(code)
-        return `
-import './${MANIFEST_JSON_UTS}'
+        return `import './${MANIFEST_JSON_UTS}'
 import './${PAGES_JSON_UTS}'
 ${code}
 `

packages/uni-app-uts/src/plugins/android/plugin.ts

@@ -180,7 +180,7 @@ export function uniAppPlugin(options: {
         }
       }
       const res = await resolveUTSCompiler().compileApp(
-        path.join(tempOutputDir, 'index.uts'),
+        path.join(tempOutputDir, 'main.uts'),
         {
           pageCount,
           uniCloudObjectInfo: getUniCloudObjectInfo(uniCloudSpaceList),
@@ -250,7 +250,7 @@ export function uniAppPlugin(options: {
 
 function normalizeFilename(filename: string, isMain = false) {
   if (isMain) {
-    return 'index.uts'
+    return 'main.uts'
   }
   return parseUTSRelativeFilename(filename)
 }
@@ -262,8 +262,7 @@ function normalizeCode(code: string, isMain = false) {
   const automatorCode = process.env.UNI_AUTOMATOR_WS_ENDPOINT
     ? 'initAutomator();'
     : ''
-  return `
-${code}  
+  return `${code}
 export function main(app: IApp) {
     definePageRoutes();
     defineAppConfig();

packages/uni-app-uts/src/plugins/android/utils.ts

@@ -25,7 +25,7 @@ export const UVUE_CLASS_NAME_PREFIX = 'Gen'
 
 export const DEFAULT_APPID = 'HBuilder'
 
-export const ENTRY_FILENAME = 'index.uts'
+export const ENTRY_FILENAME = 'main.uts'
 
 export async function parseImports(code: string) {
   await init

packages/uni-uts-v1/src/uvue/index.ts

@@ -119,6 +119,7 @@ export async function compileApp(entry: string, options: CompileAppOptions) {
       outDir: isProd
         ? kotlinSrcDir(path.resolve(outputDir, '.uniappx/android/'))
         : kotlinSrcDir(kotlinDir(outputDir)),
+      outFilename: 'index.kt', // 强制 main.kt => index.kt 因为云端，真机运行识别的都是 index.kt
       package: pkg,
       sourceMap:
         sourceMap !== false

packages/uts/src/types.ts

@@ -34,6 +34,7 @@ export type UTSInputOptions = UTSParseOptions & {
 
 export type UTSOutputOptions = {
   outDir: string
+  outFilename?: string
   package: string
   imports?: string[]
   sourceMap?: boolean | string