wip(uts): compiler

packages/playground/uts/uni_modules/test-uniplugin/app-ios/index.uts

@@ -19,3 +19,5 @@ export default async function getBatteryInfo(options: GetBatteryInfoOptions) {
     options.complete!(res)
   }
 }
+
+export class Test {}

packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift

@@ -13,3 +13,5 @@ async func getBatteryInfo(_ options: GetBatteryInfoOptions) {
     if (options.success != nil) options.success!(res);
     if (options.complete != nil) options.complete!(res);
 }
+class Test : NSObject {
+}

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

-{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-ios/index.uts"],"sourcesContent":["import { UIDevice } from 'UIKit'\n\ntype GetBatteryInfoOptions = {\n  success?: (res: UTSJSONObject) => void\n  fail?: (res: UTSJSONObject) => void\n  complete?: (res: UTSJSONObject) => void\n}\n\nexport default async function getBatteryInfo(options: GetBatteryInfoOptions) {\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"],"names":[],"mappings":"AAAA;UAEK,qBAAqB;QACxB,OAAO,MAAI,GAAkB,EAAb,aAAa,KAAK,IAAI;QACtC,IAAI,MAAI,GAAkB,EAAb,aAAa,KAAK,IAAI;QACnC,QAAQ,MAAI,GAAkB,EAAb,aAAa,KAAK,IAAI;;AAG1B,WAAe,cAAc,CAAC,EAAA,OAA8B,EAArB,qBAAqB,EAAE;IAC3E,IAAM,GAAG,GAAG;QACV,CAAA,MAAM,GAAE,mBAAmB;QAC3B,CAAA,KAAK,GAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,GAAG,GAAG;QAC1C,CAAA,UAAU,GAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC,QAAQ;KAC5E;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,GAAI,EACzB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;IAEvB,IAAI,OAAO,CAAC,QAAQ,IAAI,GAAI,EAC1B,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;AAE1B"}
\ No newline at end of file
+{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-ios/index.uts"],"sourcesContent":["import { UIDevice } from 'UIKit'\n\ntype GetBatteryInfoOptions = {\n  success?: (res: UTSJSONObject) => void\n  fail?: (res: UTSJSONObject) => void\n  complete?: (res: UTSJSONObject) => void\n}\n\nexport default async function getBatteryInfo(options: GetBatteryInfoOptions) {\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 class Test {}\n"],"names":[],"mappings":"AAAA;UAEK,qBAAqB;QACxB,OAAO,MAAI,GAAkB,EAAb,aAAa,KAAK,IAAI;QACtC,IAAI,MAAI,GAAkB,EAAb,aAAa,KAAK,IAAI;QACnC,QAAQ,MAAI,GAAkB,EAAb,aAAa,KAAK,IAAI;;AAG1B,WAAe,cAAc,CAAC,EAAA,OAA8B,EAArB,qBAAqB,EAAE;IAC3E,IAAM,GAAG,GAAG;QACV,CAAA,MAAM,GAAE,mBAAmB;QAC3B,CAAA,KAAK,GAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,GAAG,GAAG;QAC1C,CAAA,UAAU,GAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC,QAAQ;KAC5E;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,GAAI,EACzB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;IAEvB,IAAI,OAAO,CAAC,QAAQ,IAAI,GAAI,EAC1B,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;AAE1B;AAEO,MAAM,IAAI;CAAG"}
\ No newline at end of file

packages/uni-uts-vite/src/utils/compiler/kotlin.ts

@@ -35,8 +35,7 @@ export async function compileKotlin(filename: string) {
   const inputDir = process.env.UNI_INPUT_DIR
   const outputDir = process.env.UNI_OUTPUT_DIR
   // let time = Date.now()
-  await bundle({
-    target: UtsTarget.KOTLIN,
+  await bundle(UtsTarget.KOTLIN, {
     input: {
       root: inputDir,
       filename,

packages/uni-uts-vite/src/utils/compiler/swift.ts

@@ -22,8 +22,7 @@ export async function compileSwift(filename: string) {
   const inputDir = process.env.UNI_INPUT_DIR
   const outputDir = process.env.UNI_OUTPUT_DIR
   // let time = Date.now()
-  await bundle({
-    target: UtsTarget.SWIFT,
+  await bundle(UtsTarget.SWIFT, {
     input: {
       root: inputDir,
       filename,

packages/uts/src/types.ts

@@ -29,6 +29,7 @@ export type UtsOutputOptions = {
   extname: string
   logFilename?: boolean
   noColor?: boolean
+  isPlugin?: boolean
 }
 export interface UtsOptions {
   input: UtsInputOptions
@@ -41,6 +42,4 @@ export interface UtsResult {
   error?: Error
 }
 
-export interface UtsBundleOptions extends UtsOptions {
-  target: UtsTarget
-}
+export interface UtsBundleOptions extends UtsOptions {}

scripts/test.js

@@ -33,6 +33,7 @@ function testKotlin() {
       sourceMap: true,
       extname: 'kt',
       logFilename: true,
+      isPlugin: true,
     },
   }).then((res) => {
     console.log('bundle: ' + (Date.now() - start) + 'ms')
@@ -65,6 +66,7 @@ function testSwift() {
       sourceMap: true,
       extname: 'swift',
       logFilename: true,
+      isPlugin: true,
     },
   }).then((res) => {
     console.log('bundle: ' + (Date.now() - start) + 'ms')