@napi-rs/cli 3.0.0-alpha.7 → 3.0.0-alpha.9

package/src/utils/__tests__/typegen.spec.ts

@@ -18,13 +18,13 @@ test('should ident string correctly', (t) => {
     foo() {
       a = b
     }
-  
+
   bar = () => {
-  
+
   }
       boz = 1
     }
-  
+
   namespace B {
       namespace C {
   type D = A
@@ -43,6 +43,21 @@ test('should process type def correctly', async (t) => {
       '__fixtures__',
       'napi_type_def',
     ),
+    true,
+  )
+
+  t.snapshot(dts)
+})
+
+test('should process type def with noConstEnum correctly', async (t) => {
+  const { dts } = await processTypeDef(
+    join(
+      fileURLToPath(import.meta.url),
+      '../',
+      '__fixtures__',
+      'napi_type_def',
+    ),
+    false,
   )
 
   t.snapshot(dts)

package/src/utils/config.ts

@@ -24,6 +24,11 @@ interface UserNapiConfig {
    */
   npmClient?: string
 
+  /**
+   * Whether generate const enum for typescript bindings
+   */
+  constEnum?: boolean
+
   /**
    * @deprecated binaryName instead
    */
@@ -114,8 +119,8 @@ export async function readNapiConfig(path: string): Promise<NapiConfig> {
   let targets: string[] = userNapiConfig.targets ?? []
 
   // compatible with old config
-  if (userNapiConfig.package?.name) {
-    napiConfig.packageName = userNapiConfig.package.name
+  if (userNapiConfig?.name) {
+    napiConfig.packageName = userNapiConfig.name
   }
 
   if (!targets.length) {

package/src/utils/typegen.ts

@@ -25,7 +25,11 @@ interface TypeDefLine {
   js_mod?: string
 }
 
-function prettyPrint(line: TypeDefLine, ident: number): string {
+function prettyPrint(
+  line: TypeDefLine,
+  constEnum: boolean,
+  ident: number,
+): string {
   let s = line.js_doc ?? ''
   switch (line.kind) {
     case TypeDefKind.Interface:
@@ -33,7 +37,8 @@ function prettyPrint(line: TypeDefLine, ident: number): string {
       break
 
     case TypeDefKind.Enum:
-      s += `export const enum ${line.name} {\n${line.def}\n}`
+      const enumName = constEnum ? 'const enum' : 'enum'
+      s += `export ${enumName} ${line.name} {\n${line.def}\n}`
       break
 
     case TypeDefKind.Struct:
@@ -52,6 +57,7 @@ function prettyPrint(line: TypeDefLine, ident: number): string {
 
 export async function processTypeDef(
   intermediateTypeFile: string,
+  constEnum: boolean,
   header?: string,
 ) {
   const exports: string[] = []
@@ -65,7 +71,7 @@ export async function processTypeDef(
     ([namespace, defs]) => {
       if (namespace === TOP_LEVEL_NAMESPACE) {
         for (const def of defs) {
-          dts += prettyPrint(def, 0) + '\n\n'
+          dts += prettyPrint(def, constEnum, 0) + '\n\n'
           switch (def.kind) {
             case TypeDefKind.Const:
             case TypeDefKind.Enum:
@@ -85,7 +91,7 @@ export async function processTypeDef(
         exports.push(namespace)
         dts += `export namespace ${namespace} {\n`
         for (const def of defs) {
-          dts += prettyPrint(def, 2) + '\n'
+          dts += prettyPrint(def, constEnum, 2) + '\n'
         }
         dts += '}\n\n'
       }