refactor: be specific stuff

xeroxinteractive · Mar 4, 2021 · 8474ef8 · 8474ef8
1 parent 6a5f436
commit 8474ef8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/src/cf-definitions-builder.ts b/src/cf-definitions-builder.ts
@@ -185,12 +185,11 @@ export default class CFDefinitionsBuilder {
     }
 
     private addEntryTypeAlias = (file: SourceFile, aliasName: string, entryType: string) => {
-        const typeIdName = moduleTypeIdName(file.getBaseNameWithoutExtension());
-        file.addStatements([`export const ${typeIdName} = '${aliasName}';`]);
+        file.addStatements([`export const typeId = '${aliasName}';`]);
         file.addTypeAlias({
             isExported: true,
             name: moduleName(aliasName),
-            type: renderGenericType('CMSEntry', `typeof ${typeIdName}, ${entryType}`),
+            type: renderGenericType('CMSEntry', `typeof typeId, ${entryType}`),
         });
     };
 
@@ -226,7 +225,7 @@ export default class CFDefinitionsBuilder {
             namespaceImport: 'Contentful',
         });
         file.addImportDeclaration({
-            moduleSpecifier: '@src/types/contentful/static',
+            moduleSpecifier: '@common/helpers/contentful/getCMSEntry',
             namedImports: ['CMSEntry'],
         });
     }

diff --git a/src/renderer/cf-render-prop-link.ts b/src/renderer/cf-render-prop-link.ts
@@ -4,7 +4,7 @@ import {renderUnionType} from './render-union-type';
 
 const linkContentType = (field: Pick<Field, 'validations'>): string => {
     const validations = linkContentTypeValidations(field);
-    return validations?.length > 0 ? renderUnionType(validations.map(moduleName)) : 'CMSEntries';
+    return validations?.length > 0 ? renderUnionType(validations.map(moduleName)) : 'CMSEntry<string, Record<string, any>>';
 };
 
 export const renderPropLink = (field: Pick<Field, 'validations' | 'linkType'>) => {

diff --git a/src/utils.ts b/src/utils.ts
@@ -9,13 +9,6 @@ export const moduleName = (name: string): string => {
     return pipe([replaceDash, upperFirst, addPrefix, removeSpace])(name);
 };
 
-export const moduleManagementName = (name: string): string => {
-    const removeSpace = (input: string): string => input.replace(/\s/g, '');
-    const replaceDash = (input: string): string => input.replace(/-/g, '__');
-    const addPrefix = (input: string): string => input.endsWith('CMSManagementEntry') ? input : `${input}CMSManagementEntry`;
-    return pipe([replaceDash, upperFirst, addPrefix, removeSpace])(name);
-};
-
 export const moduleFieldsName = (name: string): string => moduleName(name) + 'Fields';
 
 export const moduleTypeIdName = (name: string): string => camelCase(moduleName(name).replace(/CMSEntry$/, '')) + 'TypeId';