Merge pull request #57 from cjpearson/fix-multilink

Stricter multilink typing
dohomi · Nov 1, 2023 · 06c373d · 06c373d
2 parents 48dc396 + 34cbc74
commit 06c373d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/genericTypes.ts b/src/genericTypes.ts
@@ -145,17 +145,6 @@ async function generateMultiLinkTypeIfNotYetGenerated(title: string, compilerOpt
         $id: '#/multilink',
         title: title,
         'oneOf': [
-            {
-                type: 'object',
-                properties: {
-                    cached_url: {
-                        type: 'string'
-                    },
-                    linktype: {
-                        type: 'string'
-                    }
-                }
-            },
             {
                 type: 'object',
                 properties: {

diff --git a/src/index.ts b/src/index.ts
@@ -118,7 +118,22 @@ export default async function storyblokToTypescript({
 
             obj[key] = element
 
-            if (TYPES.includes(type)) {
+            if (type === 'multilink') {
+                const excludedLinktypes = [];
+                const baseType = camelcase(getTitle(type), {
+                    pascalCase: true
+                })
+
+                if (!schemaElement.email_link_type) {
+                    excludedLinktypes.push('{ linktype?: "email" }');
+                }
+                if (!schemaElement.asset_link_type) {
+                    excludedLinktypes.push('{ linktype?: "asset" }');
+                }
+
+                obj[key].tsType = excludedLinktypes.length ?
+                    `Exclude<${baseType}, ${excludedLinktypes.join(' | ')}>` : baseType
+            } else if (TYPES.includes(type)) {
                 obj[key].tsType = camelcase(getTitle(type), {
                     pascalCase: true
                 })