@@ -373,23 +373,16 @@ export class IDLBuilder extends ExportsWalker {
373
373
export class TSDBuilder extends ExportsWalker {
374
374
375
375
/** 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 ( ) ) ;
378
378
}
379
379
380
- private moduleName : string = "ASModule" ;
381
380
private sb : string [ ] = [ ] ;
382
381
private indentLevel : i32 = 0 ;
383
382
384
383
/** Constructs a new WebIDL builder. */
385
- constructor ( program : Program , includePrivate : bool = false , moduleName ?: string ) {
384
+ constructor ( program : Program , includePrivate : bool = false ) {
386
385
super ( program , includePrivate ) ;
387
-
388
- if ( moduleName ) {
389
- if ( moduleName . trim ( ) . match ( / ^ [ a - z 0 - 9 _ ] + $ / i) ) {
390
- this . moduleName = moduleName . trim ( ) ;
391
- }
392
- }
393
386
}
394
387
395
388
visitGlobal ( name : string , element : Global ) : void {
@@ -596,10 +589,10 @@ export class TSDBuilder extends ExportsWalker {
596
589
}
597
590
}
598
591
599
- build ( ) : string {
592
+ build ( moduleName : string ) : string {
600
593
var sb = this . sb ;
601
594
var isWasm64 = this . program . options . isWasm64 ;
602
- sb . push ( "declare module " + this . moduleName + " {\n" ) ;
595
+ sb . push ( "declare module " + moduleName + " {\n" ) ;
603
596
sb . push ( " type i8 = number;\n" ) ;
604
597
sb . push ( " type i16 = number;\n" ) ;
605
598
sb . push ( " type i32 = number;\n" ) ;
@@ -625,7 +618,7 @@ export class TSDBuilder extends ExportsWalker {
625
618
this . walk ( ) ;
626
619
-- this . indentLevel ;
627
620
sb . push ( "}\n" ) ;
628
- sb . push ( "export default " + this . moduleName + ";\n" ) ;
621
+ sb . push ( "export default " + moduleName + ";\n" ) ;
629
622
return this . sb . join ( "" ) ;
630
623
}
631
624
}
0 commit comments