diff --git a/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts b/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts index 9a0d28c9faa2dabb21a69d4e78251dfc4195ff73..15cf4529b77232b3b92f0be946e41de4d2439295 100644 --- a/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts +++ b/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts @@ -1,8 +1,6 @@ -export function login(name: string, pwd: string) { - return { name, pwd } -} +import { login } from './login.uts' export class User { async login(name: string, pwd: string) { - return { name, pwd } + login(name, pwd) } } diff --git a/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts b/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts new file mode 100644 index 0000000000000000000000000000000000000000..fdd62391f0ed1743ffbb61c872c49529e2a0b264 --- /dev/null +++ b/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts @@ -0,0 +1,3 @@ +export function login(name: string, pwd: string) { + return { name, pwd } +} diff --git a/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/android/app-android/index.kt b/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt similarity index 58% rename from packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/android/app-android/index.kt rename to packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt index 4d6ac5b29808e0751ed63c377dd66777f3c614c5..28ae5856eb87296e5954a93babe1d8626c305012 100644 --- a/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/android/app-android/index.kt +++ b/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt @@ -1,15 +1,11 @@ -package index; fun login(name: String, pwd: String): UtsJSONObject { - return object : () { + return object : UtsJSONObject() { var name = name var pwd = pwd }; } open class User { open fun async login(name: String, pwd: String) { - return object : () { - var name = name - var pwd = pwd - }; + login(name, pwd); } } diff --git a/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt.map b/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt.map new file mode 100644 index 0000000000000000000000000000000000000000..4a2bfea076ca82ae2caeeafe22b17251fc6945f9 --- /dev/null +++ b/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt.map @@ -0,0 +1 @@ +{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts"],"sourcesContent":["export function login(name: string, pwd: string) {\n return { name, pwd }\n}\n","import { login } from './login.uts'\nexport class User {\n async login(name: string, pwd: string) {\n login(name, pwd)\n }\n}\n"],"names":[],"mappings":"AAAO,IAAS,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,iBAAE;IAC/C,OAAO;QAAE,IAAA,IAAI,GAAJ,IAAI;QAAE,IAAA,GAAG,GAAH,GAAG;KAAE,CAAA;;ACAf,WAAM,IAAI;IACf,eAAM,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,EAAE;QACrC,MAAM,IAAI,EAAE,GAAG,CAAC;;CAEnB"} \ No newline at end of file diff --git a/packages/uts-darwin-arm64/uts.darwin-arm64.node b/packages/uts-darwin-arm64/uts.darwin-arm64.node index 79e2cb589e7560292c62b0f0fdb0d7d9c635be35..12c9466790615ab423f8317a8fcd347138b014d5 100755 Binary files a/packages/uts-darwin-arm64/uts.darwin-arm64.node and b/packages/uts-darwin-arm64/uts.darwin-arm64.node differ diff --git a/packages/uts-darwin-x64/uts.darwin-x64.node b/packages/uts-darwin-x64/uts.darwin-x64.node index 4349bcf4e4765b66bc33c38f1f420b50aa5e667f..500e599d1fce23a0f860424299836090f91d2e75 100755 Binary files a/packages/uts-darwin-x64/uts.darwin-x64.node and b/packages/uts-darwin-x64/uts.darwin-x64.node differ diff --git a/packages/uts/src/api.ts b/packages/uts/src/api.ts index 49d349ac69793eba332b69a9d58b127c16b24329..99d4f02cc7cfe9a88290e35fbb79ea4cfad63dfb 100644 --- a/packages/uts/src/api.ts +++ b/packages/uts/src/api.ts @@ -71,7 +71,11 @@ export function toSwift(options: UtsOptions): Promise { } export function bundle(options: UtsBundleOptions): Promise { - return bindings.bundle(toBuffer(options)).then((res: string) => res) + const bundleOptions = resolveOptions(options) + if (!bundleOptions) { + return Promise.resolve({}) + } + return bindings.bundle(toBuffer(bundleOptions)).then((res: string) => res) } function toBuffer(t: any): Buffer { diff --git a/packages/uts/src/types.ts b/packages/uts/src/types.ts index b57a0f6923ee64d57c4191166f62f13ea3c7b0f8..a42ab24f0ded89647540946cbe92e663d5c22f7f 100644 --- a/packages/uts/src/types.ts +++ b/packages/uts/src/types.ts @@ -38,10 +38,6 @@ export interface UtsResult { error?: Error } -export interface UtsBundleOptions { +export interface UtsBundleOptions extends UtsOptions { target: UtsTarget - entry: Record - output: { - path: string - } } diff --git a/scripts/test.js b/scripts/test.js index 3defb22d97518fa1bfbcdd84044e0eae3a36a4cc..f2edf3cb4322fd058a0dcbb2c51aa48d4346a5c1 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -3,7 +3,7 @@ const path = require('path') const { parse, runBuild, bundle, UtsTarget } = require('../packages/uts/dist') const projectDir = path.resolve(__dirname, '../packages/playground/uts') -const start = Date.now() +let start = Date.now() parse( fs.readFileSync( path.resolve( @@ -16,52 +16,24 @@ parse( console.log('parse: ' + (Date.now() - start) + 'ms') console.log(JSON.stringify(res)) }) - -// bundle({ -// entry: { -// 'test-uniplugin': path.resolve( -// projectDir, -// 'uni_modules/test-uniplugin/app-android/index.uts' -// ), -// }, -// output: { -// path: path.resolve( -// projectDir, -// 'unpackage/dist/app-plus/uni_modules/test-uniplugin/bundle' -// ), -// }, -// }).then((res) => { -// console.log(res) -// }) - -// uts -// runBuild(UtsTarget.KOTLIN, { -// silent: false, -// input: { -// dir: path.resolve(projectDir, 'uni_modules/test-uniplugin'), -// extname: '.uts', -// }, -// output: { -// dir: path.resolve( -// projectDir, -// 'unpackage/dist/app-plus/uni_modules/test-uniplugin/android' -// ), -// sourceMap: false, -// inlineSourcesContent: false, -// }, -// }) -// runBuild(UtsTarget.SWIFT, { -// silent: false, -// input: { -// dir: path.resolve(projectDir, 'uni_modules/test-uniplugin'), -// extname: '.uts', -// }, -// output: { -// dir: path.resolve( -// projectDir, -// 'unpackage/dist/app-plus/uni_modules/test-uniplugin/ios' -// ), -// sourceMap: false, -// inlineSourcesContent: false, -// }, -// }) +start = Date.now() +bundle({ + input: { + root: path.resolve(projectDir, 'uni_modules/test-uniplugin'), + filename: path.resolve( + projectDir, + 'uni_modules/test-uniplugin/app-android/index.uts' + ), + }, + output: { + outDir: path.resolve( + projectDir, + 'unpackage/dist/app-plus/uni_modules/test-uniplugin/' + ), + sourceMap: true, + extname: 'kt', + }, +}).then((res) => { + console.log('bundle: ' + (Date.now() - start) + 'ms') + console.log(JSON.stringify(res)) +})