fix: correct types for attribute 'set_' setter function

pmndrs · Aug 13, 2023 · a7dfc9f · a7dfc9f
1 parent 1a42e55
commit a7dfc9f
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 3 deletions.
diff --git a/.changeset/big-sloths-divide.md b/.changeset/big-sloths-divide.md
@@ -0,0 +1,5 @@
+---
+"webidl-dts-gen": minor
+---
+
+fix: correct types for attribute 'set\_' setter function
diff --git a/packages/webidl-dts-gen/src/convert-idl.ts b/packages/webidl-dts-gen/src/convert-idl.ts
@@ -370,12 +370,44 @@ function createEmscriptenAttributeGetter(value: webidl2.AttributeMemberType) {
 }
 
 function createEmscriptenAttributeSetter(value: webidl2.AttributeMemberType) {
-  const parameter = ts.factory.createParameterDeclaration([], undefined, value.name, undefined, convertType(value.idlType))
+  let idlType: webidl2.IDLTypeDescription
+  let parameters: ts.ParameterDeclaration[]
+
+  if (isFrozenArrayAttribute(value)) {
+    idlType = (value.idlType.idlType[0] as unknown as webidl2.IDLTypeDescription)
+    parameters = [
+      ts.factory.createParameterDeclaration(
+        [],
+        undefined,
+        'index',
+        undefined,
+        ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
+      ),
+      ts.factory.createParameterDeclaration(
+        [],
+        undefined,
+        'value',
+        undefined,
+        convertType(idlType),
+      ),
+    ]
+  } else {
+    idlType = value.idlType
+    parameters = [
+      ts.factory.createParameterDeclaration(
+        [],
+        undefined,
+        'value',
+        undefined,
+        convertType(idlType),
+      ),
+    ]
+  }
 
   return createMethod({
     name: 'set_' + value.name,
     type: ts.factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword),
-    parameters: [parameter],
+    parameters,
     emscripten: true,
   })
 }

diff --git a/packages/webidl-dts-gen/tst/index.spec.ts b/packages/webidl-dts-gen/tst/index.spec.ts
@@ -195,6 +195,26 @@ describe('convert', () => {
       )
     })
 
+    it('supports non array attributes', async () => {
+      const idl = multiLine(
+        'interface Foo {', //
+        '    attribute float position;', //
+        '};', //
+      )
+
+      const ts = await convert(idl, { emscripten: true })
+
+      expect(ts).toBe(
+        withDefaultEmscriptenOutput(
+          'class Foo {', //
+          '    get_position(): number;', //
+          '    set_position(value: number): void;', //
+          '    position: number;', //
+          '}', //
+        ),
+      )
+    })
+
     it('supports array attributes', async () => {
       const idl = multiLine(
         'interface Foo {', //
@@ -208,7 +228,7 @@ describe('convert', () => {
         withDefaultEmscriptenOutput(
           'class Foo {', //
           '    get_position(index: number): number;', //
-          '    set_position(position: ReadonlyArray<number>): void;', //
+          '    set_position(index: number, value: number): void;', //
           '    position: number;', //
           '}', //
         ),