Merge remote-tracking branch 'origin/dev' into alpha

pages/index/basicTest.test.js

@@ -3,35 +3,44 @@ const ERR_RE = /expected:<(.*)> but was:<(.*)>/
 let result;
 
 beforeAll(async () => {
-    await program.reLaunch('/pages/index/basicTest')
-    page = await program.currentPage()
-    await page.waitFor(3000);
-    const data = await page.data();
-    result = data['result']
+  await program.reLaunch('/pages/index/basicTest')
+  page = await program.currentPage()
+  await page.waitFor(3000);
+  const data = await page.data();
+  result = data['result']
 })
 
 function getApiFailed(describe, api) {
-    const failed = result[describe]?.failed?.find(item => {
-        return item.split(':')[0] === api
-    })
-    return failed
+  const failed = result[describe]?.failed?.find(item => {
+    return item.split(':')[0] === api
+  })
+  return failed
 }
 
 describes.forEach(d => {
-    d?.describe && describe(d.describe, () => {
-        d?.tests && d.tests.forEach(api => {
-            it(api, ()=>{
-                const failed = getApiFailed(d.describe, api)
-                if (failed) {
-                    const parts = failed.split('\n')
-                    const matches = parts[1].match(ERR_RE)
-                    if (matches?.length) {
-                        expect(matches[2]).toEqual(matches[1])
-                    } else {
-                        expect(parts[1]).toEqual('')
-                    }
-                }
-            })
-        })
-   })
+  d?.describe && describe(d.describe, () => {
+    d?.tests && d.tests.forEach(api => {
+      it(api, () => {
+        const failed = getApiFailed(d.describe, api)
+        if (failed) {
+          const parts = failed.split('\n')
+          const matches = parts[1].match(ERR_RE)
+          if (matches?.length) {
+            expect(matches[2]).toEqual(matches[1])
+          } else {
+            expect(parts[1]).toEqual('')
+          }
+        }
+      })
+    })
+  })
 })
+
+if (process.env.uniTestPlatformInfo.toLocaleLowerCase().startsWith('ios')) {
+  describe('testTypeFromAppJs',  () => {
+    it("jest_testTypeFromAppJs", async () => {
+      const res = await page.callMethod('jest_testTypeFromAppJs')
+      expect(res).toEqual(true)
+    })
+  })
+}
\ No newline at end of file

pages/index/basicTest.uvue

@@ -20,7 +20,10 @@
   <!-- #endif -->
 </template>
 <script lang="ts">
-import { runTests, Result } from '../../uni_modules/uts-tests'
+import { runTests, Result } from '../../uni_modules/uts-tests'
+// #ifdef APP-IOS
+import { testTypeFromAppJs, Options } from '@/uni_modules/uts-ios-tests'
+// #endif
 export default {
   data() {
     return {
@@ -46,7 +49,14 @@ export default {
         this.names.push(key)
         this.resultArray.push(resultMap[key] as Result)
       }
-    },
+    },
+    // #ifdef APP-IOS
+    jest_testTypeFromAppJs() {
+      return testTypeFromAppJs({
+        num: 1
+      } as Options)
+    }
+    // #endif
   },
 }
 </script>

uni_modules/uts-ios-tests/package.json

+{
+  "id": "uts-ios-tests",
+  "displayName": "uts-ios-tests",
+  "version": "1.0.0",
+  "description": "uts-ios-tests",
+  "keywords": [
+    "uts-ios-tests"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.6.8"
+  },
+  "dcloudext": {
+    "type": "uts",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u",
+        "alipay": "u"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-android": "u",
+          "app-ios": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

uni_modules/uts-ios-tests/readme.md

+# uts-ios-tests
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file

uni_modules/uts-ios-tests/utssdk/app-js/index.uts

+import { Options } from '../interface.uts';
+
+export function testTypeFromAppJs(options : Options) {
+  return options instanceof Options
+}
+
+export {
+  Options
+}
\ No newline at end of file

uni_modules/uts-ios-tests/utssdk/interface.uts

+export type Options = {
+  num: number
+}
\ No newline at end of file

uni_modules/uts-tests/utssdk/Date.uts

@@ -44,7 +44,29 @@ export function testDate() : Result {
 			// expect(date1.toTimeString()).toEqual("08:00:00 GMT+0800");
 			// expect(date2.toTimeString()).toEqual("03:24:00 GMT+0800");
 			// // #endif
-		})
+		})
+    
+    test('toXString', () => {
+    	const event = new Date('1995-12-17T03:24:00');
+      // #ifndef APP-ANDROID
+      expect(event.toString()).toEqual("Sun Dec 17 1995 03:24:00 GMT+0800");
+      expect(event.toTimeString()).toEqual("03:24:00 GMT+0800");
+      // #endif
+      expect(event.toISOString()).toEqual("1995-12-16T19:24:00.000Z");
+      expect(event.toJSON()).toEqual("1995-12-16T19:24:00.000Z");
+      expect(event.toDateString()).toEqual("Sun Dec 17 1995");
+      
+      const event2 = new Date('2014-01-09 22:00:00');
+      // #ifndef APP-ANDROID
+      expect(event2.toString()).toEqual("Thu Jan 09 2014 22:00:00 GMT+0800");
+      expect(event2.toTimeString()).toEqual("2014-01-09T14:00:00.000Z");
+      // #endif
+      expect(event2.toISOString()).toEqual("2014-01-09T14:00:00.000Z");
+      expect(event2.toJSON()).toEqual("Thu Jan 09 2014");
+      expect(event2.toDateString()).toEqual("22:00:00 GMT+0800");
+      
+    })
+    
 		
         test('getDate', () => {
             const birthday = new Date('August 19, 1975 23:15:30');