@@ -37,12 +37,7 @@ function main() {
3737 const typedefMatches = matchAll ( TYPEDEF_RE , interfaceFile )
3838
3939 if ( command === 'symbols' ) {
40- const symbols = matches
41- . map ( match => {
42- const name = match [ 2 ]
43- return `_${ name }
44- } )
45- . concat ( '_malloc' , '_free' )
40+ const symbols = buildSymbols ( matches )
4641 writeFile ( destination , JSON . stringify ( symbols ) )
4742 return
4843 }
@@ -70,32 +65,46 @@ function main() {
7065 throw new Error ( `Bad command "${ command } ${ USAGE } )
7166}
7267
73- const MaybeAsync = 'MaybeAsync('
68+ // $1: attribute name
69+ // $2: inner type
70+ const ATTRIBUTE_REGEX = / ^ ( \w + ) \( ( .+ ) \) $ /
71+ type Attribute = 'MaybeAsync' | 'AsyncifyOnly'
72+
73+ function parseAttributes ( type : string ) {
74+ let text = type
75+ let match : RegExpExecArray | null = null
76+ const attributes = new Set < Attribute > ( )
77+ while ( ( match = ATTRIBUTE_REGEX . exec ( text . trim ( ) ) ) !== null ) {
78+ attributes . add ( match [ 1 ] as Attribute )
79+ text = match [ 2 ]
80+ }
81+
82+ if ( text . includes ( ')' ) ) {
83+ throw new Error ( `parseAttributes should consume all attributes, but did not: ${ text } )
84+ }
85+
86+ return { type : text , attributes }
87+ }
7488
7589interface ParsedType {
7690 typescript : string
7791 ffi : string | null
7892 ctype : string
79- async : boolean
93+ attributes : Set < Attribute >
8094}
8195
8296function cTypeToTypescriptType ( ctype : string ) : ParsedType {
97+ let { type, attributes } = parseAttributes ( ctype )
98+
8399 // simplify
84- let type = ctype
85100 // remove const: ignored in JS
86- type = ctype . replace ( / \b c o n s t \b / , '' ) . trim ( )
101+ type = type . replace ( / \b c o n s t \b / , '' ) . trim ( )
87102 // collapse spaces (around a *, maybe)
88103 type = type . split ( ' ' ) . join ( '' )
89104
90- let async = false
91- if ( type . startsWith ( MaybeAsync ) && type . endsWith ( ')' ) ) {
92- async = true
93- type = type . slice ( MaybeAsync . length , - 1 )
94- }
95-
96105 // mapping
97106 if ( type . includes ( 'char*' ) ) {
98- return { ffi : 'string' , typescript : 'string' , ctype, async }
107+ return { ffi : 'string' , typescript : 'string' , ctype, attributes }
99108 }
100109
101110 let typescript = type . replace ( / \* / g, 'Pointer' )
@@ -116,7 +125,7 @@ function cTypeToTypescriptType(ctype: string): ParsedType {
116125 ffi = 'number'
117126 }
118127
119- return { typescript : typescript , ffi, ctype, async }
128+ return { typescript, ffi, ctype, attributes }
120129}
121130
122131function renderFunction ( args : {
@@ -137,16 +146,16 @@ function renderFunction(args: {
137146 } )
138147 . join ( ', ' )
139148
140- const forceSync = ASYNCIFY && ! async && returnType . async
141- const markAsync = async && returnType . async
149+ const forceSync = ASYNCIFY && ! async && returnType . attributes . has ( 'MaybeAsync' )
150+ const markAsync = async && returnType . attributes . has ( 'MaybeAsync' )
142151
143152 let typescriptFunctionName = functionName
144153 if ( markAsync ) {
145154 typescriptFunctionName += '_MaybeAsync'
146155 }
147156
148157 const typescriptReturnType =
149- async && returnType . async
158+ async && returnType . attributes . has ( 'MaybeAsync' )
150159 ? `${ returnType . typescript } ${ returnType . typescript }
151160 : returnType . typescript
152161 const typescriptFunctionType = `(${ typescriptParams } ${ typescriptReturnType }
@@ -179,6 +188,17 @@ function renderFunction(args: {
179188 return ` ${ typescriptFunctionName } ${ typescriptFunctionType } ${ cwrap }
180189}
181190
191+ function buildSymbols ( matches : RegExpMatchArray [ ] ) {
192+ const parsed = matches . map ( match => {
193+ const [ , returnType , functionName , , rawParams ] = match
194+ const params = parseParams ( rawParams )
195+ return { functionName, returnType : cTypeToTypescriptType ( returnType . trim ( ) ) , params }
196+ } )
197+ const filtered = parsed . filter ( fn => ! fn . returnType . attributes . has ( 'AsyncifyOnly' ) || ASYNCIFY )
198+ const names = filtered . map ( fn => '_' + fn . functionName )
199+ return names . concat ( '_malloc' , '_free' )
200+ }
201+
182202function buildFFI ( matches : RegExpExecArray [ ] ) {
183203 const parsed = matches . map ( match => {
184204 const [ , returnType , functionName , , rawParams ] = match
@@ -187,8 +207,11 @@ function buildFFI(matches: RegExpExecArray[]) {
187207 } )
188208 const decls : string [ ] = [ ]
189209 parsed . forEach ( fn => {
190- decls . push ( renderFunction ( { ...fn , async : false } ) )
191- if ( fn . returnType . async && ASYNCIFY ) {
210+ if ( ! fn . returnType . attributes . has ( 'AsyncifyOnly' ) || ASYNCIFY ) {
211+ decls . push ( renderFunction ( { ...fn , async : false } ) )
212+ }
213+
214+ if ( fn . returnType . attributes . has ( 'MaybeAsync' ) && ASYNCIFY ) {
192215 decls . push ( renderFunction ( { ...fn , async : true } ) )
193216 }
194217 } )
0 commit comments