@@ -13,6 +13,7 @@ export const generateMasterInterfaces = (
1313 const MainNamespace = [ 'namespace Main {' ] ;
1414 const RendererNamespace = [ 'namespace Renderer {' ] ;
1515 const MainInterfaceForRemote = [ 'interface RemoteMainInterface {' ] ;
16+ const CrossProcessExportsNamespace = [ 'namespace CrossProcessExports {' ] ;
1617 const constDeclarations : string [ ] = [ ] ;
1718 const EMRI : Record < string , boolean > = { } ;
1819
@@ -34,39 +35,58 @@ export const generateMasterInterfaces = (
3435 API . forEach ( ( module , index ) => {
3536 if ( module . name === 'process' ) return ;
3637 let TargetNamespace ;
37- const isClass =
38- module . type === 'Class' ||
39- API . some (
40- ( tModule , tIndex ) =>
41- index !== tIndex && tModule . name . toLowerCase ( ) === module . name . toLowerCase ( ) ,
42- ) ;
43- const moduleString = isClass
44- ? ` class ${ _ . upperFirst ( module . name ) } ${ _ . upperFirst ( module . name ) }
45- : '' ;
38+ const isClass = module . type === 'Class' ;
4639 if ( module . type === 'Structure' ) {
4740 // We must be a structure or something
4841 return ;
4942 }
43+ const moduleString =
44+ isClass && module . process . exported
45+ ? ` class ${ _ . upperFirst ( module . name ) } ${ _ . upperFirst ( module . name ) }
46+ : '' ;
5047 const newConstDeclarations : string [ ] = [ ] ;
51- if ( ! isClass || module . name !== classify ( module . name ) ) {
48+ if ( ( ! isClass || module . name !== classify ( module . name ) ) && module . process . exported ) {
5249 if ( isClass ) {
5350 newConstDeclarations . push (
5451 `type ${ classify ( module . name ) } ${ _ . upperFirst ( module . name ) } ,
5552 `const ${ classify ( module . name ) } ${ _ . upperFirst ( module . name ) } ,
5653 ) ;
5754 } else {
58- newConstDeclarations . push ( `const ${ classify ( module . name ) } ${ _ . upperFirst ( module . name ) } ) ;
55+ // In the case where this module is actually the static methods on a Class type
56+ if (
57+ API . some (
58+ ( tModule , tIndex ) =>
59+ index !== tIndex &&
60+ tModule . name . toLowerCase ( ) === module . name . toLowerCase ( ) &&
61+ tModule . type === 'Class' ,
62+ ) &&
63+ ! isClass
64+ ) {
65+ newConstDeclarations . push (
66+ `const ${ classify ( module . name ) } ${ _ . upperFirst ( module . name ) } ,
67+ ) ;
68+ } else {
69+ newConstDeclarations . push (
70+ `const ${ classify ( module . name ) } ${ _ . upperFirst ( module . name ) } ,
71+ ) ;
72+ }
5973 }
6074 }
6175 constDeclarations . push ( ...newConstDeclarations ) ;
62- if ( module . process . main && module . process . renderer ) {
63- TargetNamespace = CommonNamespace ;
64- } else if ( module . process . main ) {
65- TargetNamespace = MainNamespace ;
66- } else if ( module . process . renderer ) {
67- TargetNamespace = RendererNamespace ;
76+ if ( module . process . exported ) {
77+ if ( module . process . main && module . process . renderer ) {
78+ TargetNamespace = CommonNamespace ;
79+ } else if ( module . process . main ) {
80+ TargetNamespace = MainNamespace ;
81+ } else if ( module . process . renderer ) {
82+ TargetNamespace = RendererNamespace ;
83+ }
6884 }
69- if ( module . process . main && ! EMRI [ classify ( module . name ) . toLowerCase ( ) ] ) {
85+ if (
86+ module . process . main &&
87+ module . process . exported &&
88+ ! EMRI [ classify ( module . name ) . toLowerCase ( ) ]
89+ ) {
7090 MainInterfaceForRemote . push (
7191 ` ${ classify ( module . name ) } ${ isClass ? 'typeof ' : '' } ${ _ . upperFirst ( module . name ) } ,
7292 ) ;
@@ -75,9 +95,12 @@ export const generateMasterInterfaces = (
7595 debug ( classify ( module . name ) . toLowerCase ( ) , EMRI [ classify ( module . name ) . toLowerCase ( ) ] ) ;
7696 if ( ! EMRI [ classify ( module . name ) . toLowerCase ( ) ] ) {
7797 if ( moduleString ) TargetNamespace . push ( moduleString ) ;
98+ if ( moduleString ) CrossProcessExportsNamespace . push ( moduleString ) ;
7899 }
79100 EMRI [ classify ( module . name ) . toLowerCase ( ) ] = true ;
80- TargetNamespace . push ( ...newConstDeclarations . map ( s => ` ${ s . substr ( 0 , s . length - 1 ) } ) ) ;
101+ const declarations = newConstDeclarations . map ( s => ` ${ s . substr ( 0 , s . length - 1 ) } ) ;
102+ TargetNamespace . push ( ...declarations ) ;
103+ CrossProcessExportsNamespace . push ( ...declarations ) ;
81104 }
82105 } ) ;
83106
@@ -88,11 +111,13 @@ export const generateMasterInterfaces = (
88111 CommonNamespace . push ( alias ) ;
89112 MainNamespace . push ( alias ) ;
90113 RendererNamespace . push ( alias ) ;
114+ CrossProcessExportsNamespace . push ( alias ) ;
91115 }
92116
93117 CommonNamespace . push ( '}' ) ;
94118 MainNamespace . push ( '}' ) ;
95119 RendererNamespace . push ( '}' ) ;
120+ CrossProcessExportsNamespace . push ( '}' ) ;
96121
97122 const withSemicolons = ( lines : string [ ] ) => {
98123 return lines . map ( l => ( l . endsWith ( '{' ) || l . endsWith ( '}' ) ? l : `${ l } ) ) ;
@@ -101,5 +126,6 @@ export const generateMasterInterfaces = (
101126 addToOutput ( withSemicolons ( CommonNamespace ) ) ;
102127 addToOutput ( withSemicolons ( MainNamespace ) ) ;
103128 addToOutput ( withSemicolons ( RendererNamespace ) ) ;
129+ addToOutput ( withSemicolons ( CrossProcessExportsNamespace ) ) ;
104130 addToOutput ( constDeclarations ) ;
105131} ;
0 commit comments