Skip to content

Android gen #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 14, 2021
Merged

Android gen #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1784be0
feat: support new interface
hui19 Dec 14, 2021
5e6b1c4
feat: support collection
hui19 Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 37 additions & 88 deletions lib/java/DNJavaContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import DNJavaTypeConverter from './DNJavaTypeConverter.js'

let JC = new DNJavaTypeConverter
export class DNContext {
constructor(internal) {
this.internal = internal
Expand All @@ -16,33 +19,6 @@ export class DNContext {
}

var packageName = ''
var basic_type_signature = new Map([
['char', 'C'],
['int', 'I'],
['double', 'D'],
['float', 'F'],
['byte', 'B'],
['short', 'S'],
['long', 'J'],
['boolean', 'Z'],
['void', 'V']
])

var basic_type_conversion = function (type) {
if(type === 'float') return 'double'

var intArray = ['short', 'byte', 'long']
if(intArray.includes(type)) return 'int'

if(type === 'boolean') return 'bool'

if(type === 'char') return 'String'

return type;
}

var basic_type_wrapper = ['byte', 'short', 'long', 'long', 'float', 'char']

export class DNArgumentContext extends DNContext {
constructor(internal, name, type) {
super(internal)
Expand All @@ -61,67 +37,48 @@ export class DNMethodContext extends DNContext {
}

parse() {
var result = '\n ' + this.methodReturnType() + ' ' + this.methodName + '(' + this.methodArgs() + ')' + ' {\n'
var type = ''
if (this.returnType == 'char') {
type = 'int'
} else {
type = DNJavaTypeConverter.DNJava2DartBasicTypeMap[this.returnType]
}
var nullCheck = DNJavaTypeConverter.javaBasicType.includes(this.returnType) ? '' : '?'
var result = '\n ' + (type == null ? this.returnType : type) + nullCheck + ' ' + this.methodName + '(' + this.methodArgs() + ')' + ' {\n'
result += ' ' + this.methodImpl()
result += ' }'
return result
}

methodReturnType() {
return basic_type_conversion(this.returnType);
}

methodImpl() {
// this.basicTypeWrapper()
var callerPrefix = ' invoke(\'' + this.methodName + '\', '
var args = '[' + this.basicTypeWrapper() + '], '
var returnType = '\'' + this.JNIReturnType() + '\''
return 'return' + callerPrefix + args + returnType + ');\n'
var callerPrefix = JC.convertToDartInvoke(this.returnType) + '(\'' + this.methodName + '\''
var args = ''
if (this.args.length > 0) {
args = ', ' + 'args: [' + this.basicTypeWrapper() + ']'
}
return 'return ' + callerPrefix + args + ');\n'
}

basicTypeWrapper() {
var types = this.args.map(arg => arg.type)
var argNames = this.args.map(arg => arg.name)
var wrapperArgs = ''
for(var i = 0; i < argNames.length; i++) {
if(i != 0) {
wrapperArgs += JC.convertToDartArgument(types[i], argNames[i]);
if(i != argNames.length - 1) {
wrapperArgs += ','
}

if(basic_type_wrapper.includes(types[i])) {
if(types[i] == 'char') {
wrapperArgs += 'jchar(' + argNames[i] + '.codeUnitAt(0))'
continue
}

wrapperArgs += types[i] + '(' + argNames[i] + ')'
continue
}

wrapperArgs += argNames[i]
}
return wrapperArgs
}

JNIReturnType() {
var result = basic_type_signature.get(this.returnType)
if (result == undefined) {
//todo class jni signature
if(this.returnType == 'String') {
result = 'Ljava/lang/String;'
}
}
return result
}

methodArgs() {
var argList = ''
this.args.forEach((element, index) => {
var argType = basic_type_conversion(element.type)
if(index == this.args.length - 1){
argList += argType + ' ' + element.name
}else{
argList += argType + ' ' + element.name + ', '
var argType = DNJavaTypeConverter.DNJava2DartBasicTypeMap[element.type]
argList += (argType == null ? element.type : argType) + ' ' + element.name
if(index != this.args.length - 1){
argList += ','
}
})
return argList
Expand All @@ -140,12 +97,15 @@ export class DNClassContext extends DNContext {
}

parse() {
var result = 'class ' + this.name + ' extends JObject'
var result = '@native(javaClass: \'' + packageName + this.name + '\')\n'
result += 'class ' + this.name + ' extends JObject'
result += ' {\n'
result += this.name + '([Pointer? ptr]) : super(\"' + packageName + this.name + '\", ' + 'pointer: ptr' + ');\n'
if (this.args.length != 0) {
result += this.name + '(' + this.methodArgs() + ') : super(\"' + packageName + this.name + '\", [' + this.basicTypeWrapper() + ']);\n'
}
result += this.name + '.withParameters(' + this.methodArgs() + ') : super(args: [' + this.basicTypeWrapper() + ']);\n'
} else {
result += this.name + '() : super();\n'
}
result += this.name + '.fromPointer(Pointer<Void> pointer) : super.fromPointer(pointer);\n'
this.methods.forEach(element => {
var parseRet = element.parse()
result += parseRet ? parseRet + '\n' : ''
Expand All @@ -157,11 +117,10 @@ export class DNClassContext extends DNContext {
methodArgs() {
var argList = ''
this.args.forEach((element, index) => {
var argType = basic_type_conversion(element.type)
if(index == this.args.length - 1){
argList += argType + ' ' + element.name
}else{
argList += argType + ' ' + element.name + ', '
var argType = DNJavaTypeConverter.DNJava2DartBasicTypeMap[element.type]
argList += (argType == null ? element.type : argType) + ' ' + element.name
if(index != this.args.length - 1){
argList += ','
}
})
return argList
Expand All @@ -172,21 +131,10 @@ export class DNClassContext extends DNContext {
var argNames = this.args.map(arg => arg.name)
var wrapperArgs = ''
for(var i = 0; i < argNames.length; i++) {
if(i != 0) {
wrapperArgs += JC.convertToDartArgument(types[i], argNames[i]);
if(i != argNames.length - 1) {
wrapperArgs += ','
}

if(basic_type_wrapper.includes(types[i])) {
if(types[i] == 'char') {
wrapperArgs += 'jchar(' + argNames[i] + '.codeUnitAt(0))'
continue
}

wrapperArgs += types[i] + '(' + argNames[i] + ')'
continue
}

wrapperArgs += argNames[i]
}
return wrapperArgs
}
Expand Down Expand Up @@ -250,6 +198,7 @@ export class DNRootContext extends DNContext {
var result = ""
var packageSet = new Set()
result += '// Generated by @dartnative/codegen:\n// https://www.npmjs.com/package/@dartnative/codegen\n\n'
result += "import 'dart:ffi';\n"
result += "import 'package:dart_native/dart_native.dart';\n"
result += "import 'package:dart_native_gen/dart_native_gen.dart';\n"
result += this.children.map(ctx => ctx.parse()).join('\n\n')
Expand Down
100 changes: 100 additions & 0 deletions lib/java/DNJavaTypeConverter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
export default class DNJavaTypeConverter {
DNJavaTypeConverter() {
if (!DNJavaTypeConverter.instance) {
DNJavaTypeConverter.instance = this
}
return DNJavaTypeConverter.instance
}

convertToDartArgument(javaType, argName) {
if (javaType == 'char') {
return 'jchar(' + argName + '.codeUnitAt(0))'
}
if (javaType == 'int' || javaType == 'double' || javaType == 'boolean') {
return argName;
}

var wrapperType = DNJavaTypeConverter.DNJava2DartWrapperTypeMap[javaType]
if (wrapperType != null) {
return wrapperType + '(' + argName + ')'
}

return argName
}

convertToDartInvoke(returnType) {
var invokeType = DNJavaTypeConverter.DNDartInvokeMap[returnType]
if (invokeType != null) {
return 'invoke' + invokeType
}

return 'invokeObject<' + returnType + '>';
}
}

DNJavaTypeConverter.DNJava2DartBasicTypeMap = {
// java type | dart type
'byte' : 'int',
'short' : 'int',
'char' : 'String',
'int' : 'int',
'long' : 'int',
'float' : 'double',
'double' : 'double',
'boolean' : 'bool',
'Set' : 'Set',
'HashSet' : 'Set',
'Map' : 'Map',
'HashMap' : 'Map',
'List' : 'List',
'ArrayList' : 'List',
}


DNJavaTypeConverter.DNJava2DartWrapperTypeMap = {
// java type | dart wrapper type
'byte' : 'byte',
'int' : 'int',
'short' : 'short',
'char' : 'jchar',
'float' : 'float',
'long' : 'long',
'double' : 'double',
'boolean' : 'boolean',
'Set' : 'JSet',
'HashSet' : 'JHashSet',
'Map' : 'JMap',
'HashMap' : 'JHashMap',
'List' : 'JList',
'ArrayList' : 'JArrayList',
'Boolean' : 'JBoolean',
'Byte' : 'JByte',
'Character' : 'JCharacter',
'Double' : 'JDouble',
'Float' : 'JFloat',
'Integer' : 'JInteger',
'Long' : 'JLong',
'Short' : 'JShort',
}

DNJavaTypeConverter.DNDartInvokeMap = {
// java type | dart invoke type
'int' : 'Int',
'byte' : 'Byte',
'short' : 'Short',
'long' : 'Long',
'char' : 'Char',
'boolean' : 'Bool',
'void' : 'Void',
'String' : 'String',
'float' : 'Float',
'double' : 'Double',
'Set' : 'Set',
'HashSet' : 'HashSet',
'Map' : 'Map',
'HashMap' : 'HashMap',
'List' : 'List',
'ArrayList' : 'ArrayList',
}

DNJavaTypeConverter.javaBasicType = ['int', 'byte', 'short', 'long', 'char', 'boolean', 'float', 'double', 'void']
2 changes: 1 addition & 1 deletion lib/objc/DNObjectiveCContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ export class DNClassContext extends DNContext {
parse() {
this.preMarkConstructMethods()
var result = this.availability.map((a) => a.parse()).join(' ') + '\n'
result += '@native\nclass ' + this.name
result += '@native()\nclass ' + this.name
if (this.superClass) {
result += ' extends ' + this.superClass
}
Expand Down
3 changes: 3 additions & 0 deletions test/java/helloworld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,7 @@ public String getString(String s) {
return "test success";
}

public HashSet<String> getHash(HashSet<String> bts) {
return new HashSet<String>();
}
}