X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=e3dd3c602375f2ba6a50a18edc2b24cbc91d918a;hb=36a5d30e562005ee6ddd8d69b7c3b10749f4448b;hp=5c1a36d561168c4231a334ec49570dc52af495e0;hpb=68437301d6d8209c09c7df0b1d11999ca77665d2;p=ldk-java diff --git a/typescript_strings.py b/typescript_strings.py index 5c1a36d5..e3dd3c60 100644 --- a/typescript_strings.py +++ b/typescript_strings.py @@ -1,19 +1,23 @@ from bindingstypes import ConvInfo - +from enum import Enum def first_to_lower(string: str) -> str: first = string[0] return first.lower() + string[1:] +class Target(Enum): + NODEJS = 1, + BROWSER = 2 + class Consts: - def __init__(self, DEBUG): + def __init__(self, DEBUG: bool, target: Target, **kwargs): self.c_type_map = dict( uint8_t = ['number', 'Uint8Array'], uint16_t = ['number', 'Uint16Array'], uint32_t = ['number', 'Uint32Array'], - long = ['number'], + uint64_t = ['number'], ) self.to_hu_conv_templates = dict( @@ -21,27 +25,14 @@ class Consts: default = 'const {var_name}_hu_conv: {human_type} = new {human_type}(null, {var_name});', ) - self.bindings_header = """ - -const path = require('path').join(__dirname, 'bindings.wasm'); -const bytes = require('fs').readFileSync(path); -let imports = {}; -// add all exports to dictionary and move down? -// use `module.exports`? -// imports['./bindings.js'] = require('./bindings.js'); - -const wasmModule = new WebAssembly.Module(bytes); -const wasmInstance = new WebAssembly.Instance(wasmModule, imports); -// module.exports = wasmInstance.exports; -const wasm = wasmInstance.exports; - + self.bindings_header = self.wasm_import_header(target) + """ export class VecOrSliceDef { public dataptr: number; public datalen: number; public stride: number; public constructor(dataptr: number, datalen: number, stride: number) { - this.dataptr = dataptr; - this.datalen = datalen; + this.dataptr = dataptr; + this.datalen = datalen; this.stride = stride; } } @@ -82,7 +73,7 @@ public static native long new_empty_slice_vec(); // TODO: finalize myself } } - """ +""" self.c_file_pfx = """#include #include @@ -223,7 +214,7 @@ import * as bindings from '../bindings' // TODO: figure out location self.c_fn_args_pfx = "void* ctx_TODO" self.file_ext = ".ts" self.ptr_c_ty = "uint32_t" - self.ptr_native_ty = "uint32_t" + self.ptr_native_ty = "number" # "uint32_t" self.result_c_ty = "uint32_t" self.ptr_arr = "uint32_tArray" self.get_native_arr_len_call = ("", ".len") @@ -262,6 +253,24 @@ import * as bindings from '../bindings' // TODO: figure out location else: return None + + def wasm_import_header(self, target): + if target == Target.NODEJS: + return """ +const path = require('path').join(__dirname, 'bindings.wasm'); +const bytes = require('fs').readFileSync(path); +let imports = {}; +// add all exports to dictionary and move down? +// use `module.exports`? +// imports['./bindings.js'] = require('./bindings.js'); + +const wasmModule = new WebAssembly.Module(bytes); +const wasmInstance = new WebAssembly.Instance(wasmModule, imports); +// module.exports = wasmInstance.exports; +const wasm = wasmInstance.exports; +""" + return '' + def init_str(self, c_array_class_caches): return "" @@ -294,7 +303,7 @@ import * as bindings from '../bindings' // TODO: figure out location export enum {struct_name} {{ {out_typescript_enum_fields} }} - """ +""" return (out_c, out_typescript_enum, "") @@ -399,15 +408,13 @@ import * as bindings from '../bindings' // TODO: figure out location else: trait_constructor_arguments += ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance" - - out_typescript_human = f""" {self.hu_struct_file_prefix} - + export class {struct_name.replace("LDK","")} extends CommonBase {{ - + bindings_instance?: bindings.{struct_name}; - + constructor(ptr?: number, arg?: bindings.{struct_name}{constructor_arguments}) {{ if (Number.isFinite(ptr)) {{ super(ptr); @@ -419,38 +426,32 @@ import * as bindings from '../bindings' // TODO: figure out location {pointer_to_adder} }} }} - + protected finalize() {{ - if (this.ptr != 0) {{ - bindings.{struct_name.replace("LDK","")}_free(this.ptr); - }} + if (this.ptr != 0) {{ + bindings.{struct_name.replace("LDK","")}_free(this.ptr); + }} super.finalize(); }} - + static new_impl(arg: {struct_name.replace("LDK", "")}Interface{impl_constructor_arguments}): {struct_name.replace("LDK", "")} {{ const impl_holder: {struct_name}Holder = new {struct_name}Holder(); let structImplementation = {{ - // todo: in-line interface filling - {out_interface_implementation_overrides} }}; impl_holder.held = new {struct_name.replace("LDK", "")} (null, structImplementation{trait_constructor_arguments}); }} - }} - + export interface {struct_name.replace("LDK", "")}Interface {{ {out_java_interface} }} - + class {struct_name}Holder {{ held: {struct_name.replace("LDK", "")}; }} - - """ - - +""" out_typescript_bindings += "\t\texport interface " + struct_name + " {\n" java_meths = [] @@ -477,11 +478,11 @@ import * as bindings from '../bindings' // TODO: figure out location out_typescript_bindings += f"""): number {{ throw new Error('unimplemented'); // TODO: bind to WASM }} - + export function {struct_name}_get_obj_from_jcalls(val: number): {struct_name} {{ throw new Error('unimplemented'); // TODO: bind to WASM }} - """ +""" out_typescript_bindings += '\n// OUT_TYPESCRIPT_BINDINGS :: MAP_TRAIT :: END\n\n\n' @@ -638,9 +639,11 @@ import * as bindings from '../bindings' // TODO: figure out location out_c = out_c + "\treturn ret;\n" out_c = out_c + "}\n" - return (out_typescript_bindings, out_typescript_human, out_c) + def trait_struct_inc_refcnt(self, ty_info): + return "" + def map_complex_enum(self, struct_name, variant_list, camel_to_snake): java_hu_type = struct_name.replace("LDK", "") @@ -717,3 +720,33 @@ import * as bindings from '../bindings' // TODO: figure out location out_java_enum += ("}\n") out_java_enum += (java_hu_subclasses) return (out_java, out_java_enum, out_c) + + def map_opaque_struct(self, struct_name): + implementations = "" + method_header = "" + if struct_name.startswith("LDKLocked"): + implementations += "implements AutoCloseable " + method_header = """ + public close() { +""" + else: + method_header = """ + protected finalize() { + super.finalize(); +""" + + out_opaque_struct_human = f""" + {self.hu_struct_file_prefix} + + export default class {struct_name.replace("LDK","")} extends CommonBase {implementations}{{ + constructor(_dummy: object, ptr: number) {{ + super(ptr); + }} + + {method_header} + if (this.ptr != 0) {{ + bindings.{struct_name.replace("LDK","")}_free(this.ptr); + }} + }} +""" + return out_opaque_struct_human