wip(uts): compiler

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":";AAAA,aAAgC;AAChC,oBAAuE;;;;iBCD3D,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;;;;;;;;;;;;;;;;;;;;;;;;;;QAJvC,uBAAM,MAAM;QACZ,qBAAK,QAAM;QACX,iCAAW,KAAK,kBAAkB,IAAI;QACtC,2BAAQ,KAAK,kBAAkB,IAAI;QACnC,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;YAAO,wBAAkC;gBACvC,QAAQ,GAAG,CAAC;YACd;gBAAO,yBAAmC;oBACxC,QAAQ,GAAG,CAAC;gBACd;;;QACA,OAAO,GAAI;IACb;AACF;AAEO;YAAe,mCAAY;IAC5B;IACA;IACA;IACJ,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":";AAAA,aAAgC;AAChC,oBAAuE;;;;iBCD3D,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;YAAO,wBAAkC;gBACvC,QAAQ,GAAG,CAAC;YACd;gBAAO,yBAAmC;oBACxC,QAAQ,GAAG,CAAC;gBACd;;;QACA,OAAO,GAAI;IACb;AACF;AAEO;YAAe,mCAAY;IAC5B;IACA;IACA;IACJ,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/playground/uts/unpackage/dist/dev/app-plus/uni_modules/test-uniplugin/utssdk/app-ios/index.swift

@@ -20,15 +20,15 @@ public class GetBatteryInfoOptions : NSObject, UTSObject {
         set {
             switch(key){
                 case "name":
-                    name = try! utsSubscriptCheckValue(newValue);
+                    self.name = try! utsSubscriptCheckValue(newValue);
                 case "pwd":
-                    pwd = try! utsSubscriptCheckValue(newValue);
+                    self.pwd = try! utsSubscriptCheckValue(newValue);
                 case "success":
-                    success = try! utsSubscriptCheckValueIfPresent(newValue);
+                    self.success = try! utsSubscriptCheckValueIfPresent(newValue);
                 case "fail":
-                    fail = try! utsSubscriptCheckValueIfPresent(newValue);
+                    self.fail = try! utsSubscriptCheckValueIfPresent(newValue);
                 case "complete":
-                    complete = try! utsSubscriptCheckValueIfPresent(newValue);
+                    self.complete = try! utsSubscriptCheckValueIfPresent(newValue);
                 default:
                     break;
             }
@@ -38,11 +38,11 @@ public class GetBatteryInfoOptions : NSObject, UTSObject {
         super.init();
     }
     public init(_ obj: UTSJSONObject) {
-        name = obj["name"] as! String;
-        pwd = obj["pwd"] as! NSNumber;
-        success = obj["success"] as! ((_ res: UTSJSONObject) -> Void)?;
-        fail = obj["fail"] as! ((_ res: UTSJSONObject) -> Void)?;
-        complete = obj["complete"] as! ((_ res: UTSJSONObject) -> Void)?;
+        self.name = obj["name"] as! String;
+        self.pwd = obj["pwd"] as! NSNumber;
+        self.success = obj["success"] as! ((_ res: UTSJSONObject) -> Void)?;
+        self.fail = obj["fail"] as! ((_ res: UTSJSONObject) -> Void)?;
+        self.complete = obj["complete"] as! ((_ res: UTSJSONObject) -> Void)?;
     }
 }
 public func getBatteryInfo(_ options: GetBatteryInfoOptions) {

packages/uni-uts-v1/__tests__/examples/demo/unpackage/dist/dev/app-plus/uni_modules/test-uts/utssdk/app-android/index.kt

@@ -7,6 +7,7 @@ import io.dcloud.uts.Map;
 import io.dcloud.uts.Set;
 import io.dcloud.uts.UTSAndroid;
 import io.dcloud.uts.*;
+import io.dcloud.uniapp.*;
 fun test() {}
 fun testByJs() {
     return test();

packages/uni-uts-v1/src/kotlin.ts

@@ -378,6 +378,7 @@ const DEFAULT_IMPORTS = [
   'io.dcloud.uts.Set',
   'io.dcloud.uts.UTSAndroid',
   'io.dcloud.uts.*',
+  'io.dcloud.uniapp.*',
 ]
 
 export async function compile(

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

@@ -32,6 +32,7 @@ const DEFAULT_IMPORTS = [
   'io.dcloud.uts.Set',
   'io.dcloud.uts.UTSAndroid',
   'io.dcloud.uts.*',
+  'io.dcloud.uniapp.*',
   'io.dcloud.uniapp.framework.*',
   'io.dcloud.uniapp.vue.*',
   'io.dcloud.uniapp.vue.shared.*',