Skip to content

Include env/RT in generated definitions #1901

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
dcodeIO merged 4 commits into from
Jun 12, 2021
Merged

Include env/RT in generated definitions #1901

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce71603
Include env/RT in generated definitions
dcodeIO Jun 11, 2021
b6ed41b
Update src/definitions.ts
dcodeIO Jun 11, 2021
5011535
Update src/definitions.ts
dcodeIO Jun 11, 2021
ff90bf7
__unpin as well
dcodeIO Jun 11, 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
43 changes: 28 additions & 15 deletions src/definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,23 +438,19 @@ export class TSDBuilder extends ExportsWalker {
}

visitFunction(name: string, element: Function): void {
if (element.isAny(CommonFlags.PRIVATE | CommonFlags.SET)) return;
if (element.isAny(CommonFlags.PRIVATE)) return;
var sb = this.sb;
var signature = element.signature;
indent(sb, this.indentLevel);
if (element.is(CommonFlags.PROTECTED)) sb.push("protected ");
if (element.is(CommonFlags.STATIC)) sb.push("static ");
if (element.is(CommonFlags.GET)) {
sb.push("get ");
sb.push(name); // 'get:funcName' internally
sb.push("(): ");
sb.push(this.typeToString(signature.returnType));
sb.push(";\n");
return;
if (!element.isAny(CommonFlags.STATIC | CommonFlags.INSTANCE)) {
sb.push("export function ");
} else {
if (!element.isAny(CommonFlags.STATIC | CommonFlags.INSTANCE)) sb.push("export function ");
sb.push(name);
if (element.is(CommonFlags.PROTECTED)) sb.push("protected ");
if (element.is(CommonFlags.STATIC)) sb.push("static ");
if (element.is(CommonFlags.GET)) sb.push("get ");
else if (element.is(CommonFlags.SET)) sb.push("set ");
}
sb.push(name);
sb.push("(");
var parameters = signature.parameterTypes;
var numParameters = parameters.length;
Expand Down Expand Up @@ -604,12 +600,12 @@ export class TSDBuilder extends ExportsWalker {

build(): string {
var sb = this.sb;
var isWasm64 = this.program.options.isWasm64;
var options = this.program.options;
sb.push("type i8 = number;\n");
sb.push("type i16 = number;\n");
sb.push("type i32 = number;\n");
sb.push("type i64 = bigint;\n");
if (isWasm64) {
if (options.isWasm64) {
sb.push("type isize = bigint;\n");
} else {
sb.push("type isize = number;\n");
Expand All @@ -618,7 +614,7 @@ export class TSDBuilder extends ExportsWalker {
sb.push("type u16 = number;\n");
sb.push("type u32 = number;\n");
sb.push("type u64 = bigint;\n");
if (isWasm64) {
if (options.isWasm64) {
sb.push("type usize = bigint;\n");
} else {
sb.push("type usize = number;\n");
Expand All @@ -627,6 +623,23 @@ export class TSDBuilder extends ExportsWalker {
sb.push("type f64 = number;\n");
sb.push("type bool = boolean | number;\n");
this.walk();
if (options.exportMemory) {
sb.push("export const memory: WebAssembly.Memory;\n");
}
if (options.exportTable) {
sb.push("export const table: WebAssembly.Table;\n");
}
if (options.explicitStart) {
sb.push("export function _start(): void;\n");
}
if (options.exportRuntime) {
sb.push("export function __new(size: usize, id: u32): usize;\n");
sb.push("export function __pin(ptr: usize): usize;\n");
sb.push("export function __unpin(ptr: usize): void;\n");
sb.push("export function __collect(): void;\n");
sb.push("export const __rtti_base: usize;\n");
}
sb.push("export const __setArgumentsLength: ((n: i32) => void) | undefined;\n");
return this.sb.join("");
}
}
Expand Down