fix(generator): change order of cleanup of the overrides (#82)

* fix(generator): change order of cleanup of the overrides to avoid to remove overrides.

fix ariaSelected attribute on DataGridCell not compliant to specs

* fix(generator): add tests

* fix(generator): cleanup tests

Author: dvelluto

scripts/generateWrappers/consts.js

@@ -370,6 +370,12 @@ const Vivid3ComponentsExtraPropertiesMap = {
       type: { text: 'string' }
     }
   ],
+  DataGridCell: [
+    {
+      name: 'ariaSelected',
+      type: { text: 'boolean | undefined' }
+    }
+  ],
   Select: [
     {
       name: 'disabled',

scripts/generateWrappers/generator.js

@@ -160,8 +160,8 @@ const renderComponentV3 = prefix => classDeclaration => language => componentCla
   const componentName = getClassName(classDeclaration)
   const componentTagName = `${componentPrefix}-${camel2kebab(componentName)}`
   const events = [...(classDeclaration.events?.map(({ name }) => name) || []), ...(ComponentsEventsMapV3[componentClassName] || [])]
-  const properties = (classDeclaration.members?.filter(({ privacy = 'public', kind, readonly }) => kind === 'field' && privacy === 'public' && readonly !== true) || [])
-    .concat(Vivid3ComponentsExtraPropertiesMap[componentName] || [])
+  const properties = (Vivid3ComponentsExtraPropertiesMap[componentName] || [])
+    .concat(classDeclaration.members?.filter(({ privacy = 'public', kind, readonly }) => kind === 'field' && privacy === 'public' && readonly !== true) || [])
   const attributes = classDeclaration.attributes?.filter(({ fieldName }) => properties.find(({ name }) => fieldName === name)) || []
   const propertyNames = properties.map(({ name }) => `'${name}'`)
   const props = [

scripts/generateWrappers/generator.spec.js

@@ -328,6 +328,49 @@ describe("generator", () => {
       `);
     });
 
+    it("should add extra props from Vivid3ComponentsExtraPropertiesMap", async () => {
+      function replaceComponentWithOverridable() {
+        const newData = JSON.parse(JSON.stringify(MOCK_DATA));
+        newData.modules[0].declarations[1].name = 'DataGridCell'
+        return newData;
+      }
+      setTokenTemplateMock(TemplateToken.PROPS);
+      const newData = replaceComponentWithOverridable();
+
+      await generateWrappersV3InstanceTS({ elements: newData });
+
+      const content = fs.outputFile.mock.calls[0][1];
+      expect(content).toMatchInlineSnapshot(`
+        "  onChange?: (event: SyntheticEvent) => void,
+          \\"ariaSelected\\"?: any /* boolean | undefined */,
+          \\"field1\\"?: any /* AccordionExpandMode */,
+          \\"field2\\"?: string | null,
+          \\"activeItemIndex\\"?: number"
+      `);
+    });
+ 
+    it("should override default props with extra props from Vivid3ComponentsExtraPropertiesMap", async () => {
+      function replaceComponentWithOverridable() {
+        const newData = JSON.parse(JSON.stringify(MOCK_DATA));
+        newData.modules[0].declarations[1].name = 'DataGridCell'
+        newData.modules[0].declarations[1].members[0].name = 'ariaSelected'
+        newData.modules[0].declarations[1].attributes[0].name = 'ariaSelected'
+        return newData;
+      }
+      setTokenTemplateMock(TemplateToken.PROPS);
+      const newData = replaceComponentWithOverridable();
+
+      await generateWrappersV3InstanceTS({ elements: newData });
+
+      const content = fs.outputFile.mock.calls[0][1];
+      expect(content).toMatchInlineSnapshot(`
+        "  onChange?: (event: SyntheticEvent) => void,
+          \\"ariaSelected\\"?: any /* boolean | undefined */,
+          \\"field2\\"?: string | null,
+          \\"activeItemIndex\\"?: number"
+      `);
+    });
+
     it("should replace component registration for DataGridRow with empty string", async () => {
       setTokenTemplateMock(`
             import { register<% component-name %> } from '@vonage/vivid'