Merge pull request #56 from cjpearson/component-typing

Better typing when there are no component restrictions
dohomi · Nov 1, 2023 · 13d666c · 13d666c
2 parents 06c373d + a400b9a
commit 13d666c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -80,8 +80,8 @@ describe("storyblokToTypescript", () => {
         });
         const mainType = prepareString(types[2]);
         const expectation = makeExpectString(`
-            myField?:any[];
-            myRequiredField:any[];
+            myField?:ResourceNameStoryblok[];
+            myRequiredField:ResourceNameStoryblok[];
         `);
 
         expect(mainType).toBe(expectation);

diff --git a/src/index.ts b/src/index.ts
@@ -31,16 +31,20 @@ export default async function storyblokToTypescript({
     const getStoryTypeTitle = (t: string) => `StoryblokStory<${camelcase(getTitle(t), {pascalCase: true})}>`
 
     const groupUuids: { [k: string]: JSONSchema4 } = {}
+    const allComponents: string[] = []
 
     componentsJson.components.forEach(value => {
+        const componentName = camelcase(getTitle(value.name), {
+            pascalCase: true
+        })
         if (value.component_group_uuid) {
             if (!groupUuids[value.component_group_uuid]) {
                 groupUuids[value.component_group_uuid] = []
             }
-            groupUuids[value.component_group_uuid].push(camelcase(getTitle(value.name), {
-                pascalCase: true
-            }))
+            groupUuids[value.component_group_uuid].push(componentName)
         }
+
+        allComponents.push(componentName)
     })
 
     async function genTsSchema() {
@@ -167,6 +171,7 @@ export default async function storyblokToTypescript({
                     }
                 } else {
                     console.log('Type: bloks array but not whitelisted (will result in all elements):', title)
+                    obj[key].tsType = `(${allComponents.join(' | ')})[]`
                 }
             }
             Object.assign(parseObj, obj)