wip(uts): swift

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

@@ -4,6 +4,12 @@ import View from 'android.view.View'
 import { IUser } from './interface.uts'
 import { login } from './login.uts'
 import logo from '../static/logo.png'
+
+type GetBatteryInfoOptions = {
+  success?: (res: UTSJSONObject) => void
+  fail?: (res: UTSJSONObject) => void
+  complete?: (res: UTSJSONObject) => void
+}
 export class User implements IUser {
   async login(name: string, pwd: string) {
     setTimeout(() => {

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

@@ -18,10 +18,4 @@ export default async function getBatteryInfo(options: GetBatteryInfoOptions) {
   if (options.complete != null) {
     options.complete!(res)
   }
-}
-class Test1 {}
-export class Test {
-  constructor(){
-    new Test1()
-  }
-}
+}
\ No newline at end of file

packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-android/index.kt

@@ -16,10 +16,15 @@ fun login(name: String, pwd: String): UTSJSONObject {
     };
 }
 val __default = getResourcePath("uni_modules/test-uniplugin/static/logo.png");
+open class GetBatteryInfoOptions : UTSJSONObject() {
+    open var success: UTSCallback? = null;
+    open var fail: UTSCallback? = null;
+    open var complete: UTSCallback? = null;
+}
 open class User : IUser {
     open suspend fun login(name: String, pwd: String) = CoroutineScope(Dispatchers.Default).async {
         setTimeout(fun(){
-            console.log("timeout", " at uni_modules/test-uniplugin/app-android/index.uts:10");
+            console.log("timeout", " at uni_modules/test-uniplugin/app-android/index.uts:16");
         }
         , 1000);
         login(name, pwd);

packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-android/index.kt.map

-{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/static/logo.png","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/interface.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts"],"sourcesContent":["import { getResourcePath } from 'io.dcloud.uts.android'\nexport default getResourcePath('uni_modules/test-uniplugin/static/logo.png')\n                ","import Log from 'android.util.Log'\nimport FrameLayout from 'android.widget.FrameLayout'\nimport View from 'android.view.View'\nimport { IUser } from './interface.uts'\nimport { login } from './login.uts'\nimport logo from '../static/logo.png'\nexport class User implements IUser {\n  async login(name: string, pwd: string) {\n    setTimeout(() => {\n      console.log('timeout')\n    }, 1000)\n    login(name, pwd)\n    Log.info('123')\n    Log.info(logo)\n  }\n  register(name: string, callback: () => void) {\n    Log.info(logo as FrameLayout)\n  }\n  test(view: View) {}\n}\nfunction login(name: string, callback: () => void) {}\nexport function register(name: string, callback: () => void) {}\n","export interface IUser {\n  register(name: string): void\n}\n","export function login(name: string, pwd: string) {\n  console.log('login')\n  return { name, pwd }\n}\n"],"names":[],"mappings":";;;AAAA;ACAA,OAAgB,gBAAkB,CAAA;AAClC,OAAwB,0BAA4B,CAAA;AACpD,OAAiB,iBAAmB,CAAA;UCFnB,KAAK;QACpB,QAAQ,CAAC,IAAY,EAAN,MAAM,GAAG,IAAI;;ACDvB,IAAS,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,iBAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,OAAO,2DAAC;IACpB,OAAO;QAAE,IAAA,IAAI,GAAJ,IAAI;QAAE,IAAA,GAAG,GAAH,GAAG;KAAE,CAAA;AACtB;gBHFe,eAAe,CAAC,4CAA4C,CAAC;ACKrE,WAAM,IAAI,GAAY,KAAK;qBAC1B,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,8CAAE;QACrC,UAAU,CAAC,KAAM;YACf,OAAO,CAAC,GAAG,CAAC,SAAS,4DAAC;QACxB;QAAC,EAAE,IAAI,CAAC;QACR,MAAM,IAAI,EAAE,GAAG,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;QACf,GAAG,CAAC,IAAI,WAAM;IAChB;iBACA,QAAQ,CAAC,IAAY,EAAN,MAAM,EAAE,QAAoB,aAAA,EAAE;QAC3C,GAAG,CAAC,IAAI,cAAS,WAAW,CAAC;IAC/B;aACA,IAAI,CAAC,IAAU,EAAJ,IAAI,EAAE,CAAC;CACnB;AACD,UAAe,IAAY,EAAN,MAAM,EAAE,QAAoB,QAAJ,IAAI,EAAE,CAAC,CAAC;AAC9C,IAAS,QAAQ,CAAC,IAAY,EAAN,MAAM,EAAE,QAAoB,aAAA,EAAE,CAAC,CAAC"}
\ 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/static/logo.png","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/interface.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts"],"sourcesContent":["import { getResourcePath } from 'io.dcloud.uts.android'\nexport default getResourcePath('uni_modules/test-uniplugin/static/logo.png')\n                ","import Log from 'android.util.Log'\nimport FrameLayout from 'android.widget.FrameLayout'\nimport View from 'android.view.View'\nimport { IUser } from './interface.uts'\nimport { login } from './login.uts'\nimport logo from '../static/logo.png'\n\ntype GetBatteryInfoOptions = {\n  success?: (res: UTSJSONObject) => void\n  fail?: (res: UTSJSONObject) => void\n  complete?: (res: UTSJSONObject) => void\n}\nexport class User implements IUser {\n  async login(name: string, pwd: string) {\n    setTimeout(() => {\n      console.log('timeout')\n    }, 1000)\n    login(name, pwd)\n    Log.info('123')\n    Log.info(logo)\n  }\n  register(name: string, callback: () => void) {\n    Log.info(logo as FrameLayout)\n  }\n  test(view: View) {}\n}\nfunction login(name: string, callback: () => void) {}\nexport function register(name: string, callback: () => void) {}\n","export interface IUser {\n  register(name: string): void\n}\n","export function login(name: string, pwd: string) {\n  console.log('login')\n  return { name, pwd }\n}\n"],"names":[],"mappings":";;;AAAA;ACAA,OAAgB,gBAAkB,CAAA;AAClC,OAAwB,0BAA4B,CAAA;AACpD,OAAiB,iBAAmB,CAAA;UCFnB,KAAK;QACpB,QAAQ,CAAC,IAAY,EAAN,MAAM,GAAG,IAAI;;ACDvB,IAAS,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,iBAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,OAAO,2DAAC;IACpB,OAAO;QAAE,IAAA,IAAI,GAAJ,IAAI;QAAE,IAAA,GAAG,GAAH,GAAG;KAAE,CAAA;AACtB;gBHFe,eAAe,CAAC,4CAA4C,CAAC;ACM/C,WAAxB,qBAAqB;IACxB,SAAA,OAAO,EAAC,WAA8B,SAAA;IACtC,SAAA,IAAI,EAAC,WAA8B,SAAA;IACnC,SAAA,QAAQ,EAAC,WAA8B,SAAA;CACxC;AACM,WAAM,IAAI,GAAY,KAAK;qBAC1B,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,8CAAE;QACrC,UAAU,CAAC,KAAM;YACf,OAAO,CAAC,GAAG,CAAC,SAAS,4DAAC;QACxB;QAAC,EAAE,IAAI,CAAC;QACR,MAAM,IAAI,EAAE,GAAG,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;QACf,GAAG,CAAC,IAAI,WAAM;IAChB;iBACA,QAAQ,CAAC,IAAY,EAAN,MAAM,EAAE,QAAoB,aAAA,EAAE;QAC3C,GAAG,CAAC,IAAI,cAAS,WAAW,CAAC;IAC/B;aACA,IAAI,CAAC,IAAU,EAAJ,IAAI,EAAE,CAAC;CACnB;AACD,UAAe,IAAY,EAAN,MAAM,EAAE,QAAoB,QAAJ,IAAI,EAAE,CAAC,CAAC;AAC9C,IAAS,QAAQ,CAAC,IAAY,EAAN,MAAM,EAAE,QAAoB,aAAA,EAAE,CAAC,CAAC"}
\ No newline at end of file

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

+import DCUTSPlugin;
 import UIKit;
-typealias GetBatteryInfoOptions = {
-    var success?: (_ res: UTSJSONObject) -> Void;
-    var fail?: (_ res: UTSJSONObject) -> Void;
-    var complete?: (_ res: UTSJSONObject) -> Void;
-};
-async func getBatteryInfo(_ options: GetBatteryInfoOptions) {
-    var res = [
-        "errMsg": "getBatteryInfo:ok",
-        "level": UIDevice.current.batteryLevel * 100,
-        "isCharging": UIDevice.current.batteryState == UIDevice.BatteryState.charging
-    ];
-    if (options.success != nil) options.success!(res);
-    if (options.complete != nil) options.complete!(res);
-}
-class Test1 : NSObject {
+class GetBatteryInfoOptions : UTSJSONObject {
+    var success: UTSCallback?;
+    var fail: UTSCallback?;
+    var complete: UTSCallback?;
+    init(_ success: UTSCallback, _ fail: UTSCallback, _ complete: UTSCallback){
+        self.success = success;
+        self.fail = fail;
+        self.complete = complete;
+    }
 }
-@objc(UTSSDKModulesTestUniPluginTest)
-@@objcMembers
-class Test : NSObject {
-    override init(){
-        Test1();
+@objc(UTSSDKModulesTestUniPluginIndexSwift)
+@objcMembers
+class IndexSwift : NSObject {
+    static func async getBatteryInfo(_ options: GetBatteryInfoOptions) {
+        var res = [
+            "errMsg": "getBatteryInfo:ok",
+            "level": UIDevice.current.batteryLevel * 100,
+            "isCharging": UIDevice.current.batteryState == UIDevice.BatteryState.charging
+        ] as [String: Any];
+        if (options.success != nil) options.success!(res);
+        if (options.complete != nil) options.complete!(res);
     }
 }

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}\nclass Test1 {}\nexport class Test {\n  constructor(){\n    new Test1()\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;AACA,MAAM,KAAK;CAAG;AACP;;MAAM,IAAI;IACf,eAAa;QACX,AAAI,KAAK,EAAE;IACb;CACD"}
\ 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}"],"names":[],"mappings":";AAAA;AAE6B,MAAxB,qBAAqB;IACxB,IAAA,OAAO,EAAC,WAA8B,EAAA;IACtC,IAAA,IAAI,EAAC,WAA8B,EAAA;IACnC,IAAA,QAAQ,EAAC,WAA8B,EAAA;WAFvC,OAAO,EAAC,WAA8B,IACtC,IAAI,EAAC,WAA8B,IACnC,QAAQ,EAAC,WAA8B;;;;;CACxC;;;;sBAE6B,cAAc,CAAC,EAAA,OAA8B,EAArB,qBAAqB,EAAE;QAC3E,IAAM,GAAG,GAAG;YACV,CAAA,MAAM,GAAE,mBAAmB;YAC3B,CAAA,KAAK,GAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,GAAG,GAAG;YAC1C,CAAA,UAAU,GAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC,QAAQ;0BAC5E;QACD,IAAI,OAAO,CAAC,OAAO,IAAI,GAAI,EACzB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;QAEvB,IAAI,OAAO,CAAC,QAAQ,IAAI,GAAI,EAC1B,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;IAE1B"}
\ No newline at end of file

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

@@ -32,7 +32,7 @@ export async function compileSwift(filename: string) {
       package: '',
       sourceMap: resolveSourceMapPath(),
       extname: 'swift',
-      imports: [],
+      imports: ['DCUTSPlugin'],
       logFilename: true,
       noColor: isInHBuilderX(),
     },

scripts/test.js

@@ -63,6 +63,7 @@ function testSwift() {
     output: {
       outDir: path.resolve(projectDir, 'unpackage/dist/app'),
       package: 'UTSSDKModulesTestUniPlugin',
+      imports: ['DCUTSPlugin'],
       sourceMap: true,
       extname: 'swift',
       logFilename: true,