T-341 fix types

Author: lukas-reineke

generateFields.js

@@ -2,55 +2,55 @@ const { format } = require('prettier');
 
 const getBaseType = type => (type.ofType ? getBaseType(type.ofType) : type);
 
-const nameMap = {};
+const generateFieldsAndValues = (maxDepth, fields) => {
+    const valueArray = [];
+    const generateFields = (maxDepth, fields, parents = []) =>
+        Object.values(fields)
+            .map(field => {
+                const nextFields = getBaseType(field.type)._fields;
+                if (!nextFields) {
+                    const value =
+                        [...parents, field.name].join('{') +
+                        '}'.repeat(parents.length);
+                    valueArray.push(`'${value}'`);
+                    return `${field.name}: '${value}'`;
+                }
+                if (parents.length > maxDepth) {
+                    return;
+                }
+                return `${field.name}: {
+                    ${generateFields(maxDepth, nextFields, [
+                        ...parents,
+                        field.name,
+                    ])}
+                }`;
+            })
+            .filter(Boolean);
 
-const getName = name => {
-    const mappedName =
-        Object.keys(nameMap).find(key => nameMap[key] === name) ||
-        Object.keys(nameMap).length;
-    nameMap[mappedName] = name;
-    return mappedName;
+    return [valueArray, generateFields(maxDepth, fields)];
 };
 
-const generateFields = ({ type, maxDepth }, fields, parents = []) =>
-    Object.values(fields)
-        .map(field => {
-            const nextFields = getBaseType(field.type)._fields;
-            if (!nextFields) {
-                const value = [...parents, field.name]
-                    .map(name => getName(name))
-                    .join('%');
-                return `${field.name}: ${type ? 'string' : `'${value}'`}`;
-            }
-            if (parents.length > maxDepth) {
-                return;
-            }
-            return `${field.name}: {
-                ${generateFields({ type, maxDepth }, nextFields, [
-                    ...parents,
-                    field.name,
-                ])}
-            }`;
-        })
-        .filter(Boolean);
-
 module.exports = {
     plugin: (schema, _documents, { maxDepth, baseTypes }) => {
         const typeMap = schema.getTypeMap();
-        let final = Object.values(typeMap)
+        const final = Object.values(typeMap)
             .filter(type => baseTypes.includes(type.name))
-            .map(
-                type => `export type ${type.name}Fields = {
-                    ${generateFields({ type: true, maxDepth }, type._fields)}
+            .map(type => {
+                const [values, generatedFields] = generateFieldsAndValues(
+                    maxDepth,
+                    type._fields,
+                );
+                return `export type ${type.name}Fields = {
+                    ${generatedFields}
                 };
                 export const ${type.name}Fields: ${type.name}Fields = {
-                    ${generateFields({ type: false, maxDepth }, type._fields)}
-                };`,
-            )
+                    ${generatedFields}
+                };
+                export type ${type.name}Field = ${values.join('|')};
+                `;
+            })
             .join('');
 
-        final += `export const nameMap = ${JSON.stringify(nameMap)}`;
-
         return format(final, {
             parser: 'typescript',
             trailingComma: 'all',