refactor : use AST utils

xtuc · xtuc · commit d7d82b25d554 · 2018-05-16T13:22:46.000+02:00
diff --git a/declarations.d.ts b/declarations.d.ts
@@ -62,6 +62,7 @@ declare module "@webassemblyjs/ast" {
 	export class ModuleExport extends Node {
 		name: string;
 	}
+	export class ModuleExportDescr extends Node {}
 	export class IndexLiteral extends Node {}
 	export class NumberLiteral extends Node {}
 	export class Global extends Node {}
@@ -78,7 +79,7 @@ declare module "@webassemblyjs/ast" {
 		params: FuncParam[];
 		results: string[];
 	}
-	export class TypeInstructionFunc extends Node {}
+	export class TypeInstruction extends Node {}
 	export class IndexInFuncSection extends Node {}
 	export function indexLiteral(index: number): IndexLiteral;
 	export function numberLiteral(num: number): NumberLiteral;
@@ -92,13 +93,17 @@ declare module "@webassemblyjs/ast" {
 		type: string,
 		init: Node[]
 	): ObjectInstruction;
-	export function func(initFuncId, funcParams, funcResults, funcBody): Func;
-	export function typeInstructionFunc(params: FuncParam[], results: string[]): TypeInstructionFunc;
+	export function signature(params: FuncParam[], results: string[]): Signature;
+	export function func(initFuncId, Signature, funcBody): Func;
+	export function typeInstruction(id: Identifier, functype: Signature): TypeInstruction;
 	export function indexInFuncSection(index: IndexLiteral): IndexInFuncSection;
 	export function moduleExport(
 		identifier: string,
+		descr: ModuleExportDescr
+	): ModuleExport;
+	export function moduleExportDescr(
 		type: string,
-		index: IndexLiteral
+		index: ModuleExportDescr
 	): ModuleExport;
 
 	export function getSectionMetadata(ast: any, section: string);
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
@@ -202,8 +202,6 @@ const rewriteExportNames = ({ ast, module }) => bin => {
 			const usedName = module.isUsed(path.node.name);
 			if (usedName) {
 				path.node.name = usedName;
-				// TODO remove this when fixed in @webassemblyjs
-				path.node.descr.id = t.numberLiteral(+path.node.descr.id.raw);
 			} else {
 				path.remove();
 			}
@@ -229,10 +227,6 @@ const rewriteImports = ({ ast, usedDependencyMap }) => bin => {
 			} else {
 				path.node.module = WebAssemblyUtils.MANGLED_MODULE;
 				path.node.name = result.name;
-				if (path.node.descr.id)
-					path.node.descr.id = t.numberLiteral(+path.node.descr.id.raw);
-				if (path.node.descr.name)
-					path.node.descr.name = t.numberLiteral(+path.node.descr.name.raw);
 			}
 		}
 	});
@@ -284,19 +278,20 @@ const addInitFunction = ({
 	const funcResults = [];
 
 	// Code section
-	const func = t.func(initFuncId, funcParams, funcResults, funcBody);
+	const funcSignature = t.signature(funcParams, funcResults);
+	const func = t.func(initFuncId, funcSignature, funcBody);
 
 	// Type section
-	const functype = t.typeInstructionFunc(
-		func.signature.params,
-		func.signature.results
-	);
+	const functype = t.typeInstruction(undefined, funcSignature);
 
 	// Func section
 	const funcindex = t.indexInFuncSection(nextTypeIndex);
 
 	// Export section
-	const moduleExport = t.moduleExport(initFuncId.value, "Func", nextFuncIndex);
+	const moduleExport = t.moduleExport(
+		initFuncId.value,
+		t.moduleExportDescr("Func", nextFuncIndex)
+	);
 
 	return addWithAST(ast, bin, [func, moduleExport, funcindex, functype]);
 };
@@ -330,7 +325,8 @@ class WebAssemblyGenerator extends Generator {
 
 		const ast = decode(bin, {
 			ignoreDataSection: true,
-			ignoreCodeSection: true
+			ignoreCodeSection: true,
+			ignoreCustomNameSection: true
 		});
 
 		const importedGlobals = getImportedGlobals(ast);
