Skip to content

Commit 3e58ffe

Browse files
committed
Change: moduleName to Build instead of member
1 parent cd6fc1d commit 3e58ffe

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

src/definitions.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -373,23 +373,16 @@ export class IDLBuilder extends ExportsWalker {
373373
export class TSDBuilder extends ExportsWalker {
374374

375375
/** Builds TypeScript definitions for the specified program. */
376-
static build(program: Program, moduleName?: string): string {
377-
return new TSDBuilder(program, false, moduleName).build();
376+
static build(program: Program, moduleName: string = "ASModule"): string {
377+
return new TSDBuilder(program).build(moduleName.trim());
378378
}
379379

380-
private moduleName: string = "ASModule";
381380
private sb: string[] = [];
382381
private indentLevel: i32 = 0;
383382

384383
/** Constructs a new WebIDL builder. */
385-
constructor(program: Program, includePrivate: bool = false, moduleName?: string) {
384+
constructor(program: Program, includePrivate: bool = false) {
386385
super(program, includePrivate);
387-
388-
if (moduleName) {
389-
if (moduleName.trim().match(/^[a-z0-9_]+$/i)) {
390-
this.moduleName = moduleName.trim();
391-
}
392-
}
393386
}
394387

395388
visitGlobal(name: string, element: Global): void {
@@ -596,10 +589,10 @@ export class TSDBuilder extends ExportsWalker {
596589
}
597590
}
598591

599-
build(): string {
592+
build(moduleName: string): string {
600593
var sb = this.sb;
601594
var isWasm64 = this.program.options.isWasm64;
602-
sb.push("declare module " + this.moduleName + " {\n");
595+
sb.push("declare module " + moduleName + " {\n");
603596
sb.push(" type i8 = number;\n");
604597
sb.push(" type i16 = number;\n");
605598
sb.push(" type i32 = number;\n");
@@ -625,7 +618,7 @@ export class TSDBuilder extends ExportsWalker {
625618
this.walk();
626619
--this.indentLevel;
627620
sb.push("}\n");
628-
sb.push("export default " + this.moduleName + ";\n");
621+
sb.push("export default " + moduleName + ";\n");
629622
return this.sb.join("");
630623
}
631624
}

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ export function buildIDL(program: Program): string {
253253
}
254254

255255
/** Builds TypeScript definitions for the specified program. */
256-
export function buildTSD(program: Program, moduleName?: string): string {
256+
export function buildTSD(program: Program, moduleName: string = "ASModule"): string {
257257
return TSDBuilder.build(program, moduleName);
258258
}
259259

0 commit comments

Comments
 (0)