Introduce ParsedType alias and refactor type unions

Author: cesarParra

src/core/changelog/generate-change-log.ts

@@ -10,7 +10,7 @@ import {
 import { pipe } from 'fp-ts/function';
 import * as TE from 'fp-ts/TaskEither';
 import { reflectApexSource } from '../reflection/apex/reflect-apex-source';
-import { Changelog, hasChanges, processChangelog, VersionManifest } from './process-changelog';
+import { Changelog, hasChanges, ParsedType, processChangelog, VersionManifest } from './process-changelog';
 import { convertToRenderableChangelog, RenderableChangelog } from './renderable-changelog';
 import { CompilationRequest, Template } from '../template';
 import { changelogTemplate } from './templates/changelog-template';
@@ -19,14 +19,9 @@ import { apply } from '#utils/fp';
 import { filterScope } from '../reflection/apex/filter-scope';
 import { isInSource, isSkip, passThroughHook, skip, toFrontmatterString } from '../shared/utils';
 import { reflectCustomFieldsAndObjectsAndMetadataRecords } from '../reflection/sobject/reflectCustomFieldsAndObjectsAndMetadataRecords';
-import { CustomObjectMetadata } from '../reflection/sobject/reflect-custom-object-sources';
-import { Type } from '@cparra/apex-reflection';
 import { filterApexSourceFiles, filterCustomObjectsFieldsAndMetadataRecords } from '#utils/source-bundle-utils';
-import { CustomFieldMetadata } from '../reflection/sobject/reflect-custom-field-source';
 import { hookableTemplate } from '../markdown/templates/hookable';
 import changelogToSourceChangelog from './helpers/changelog-to-source-changelog';
-import { CustomMetadataMetadata } from '../reflection/sobject/reflect-custom-metadata-source';
-import { TriggerMetadata } from '../reflection/trigger/reflect-trigger-source';
 import { reflectTriggerSource } from '../reflection/trigger/reflect-trigger-source';
 import { filterTriggerFiles } from '#utils/source-bundle-utils';
 
@@ -81,7 +76,6 @@ function reflect(bundles: UnparsedSourceBundle[], config: Omit<UserDefinedChange
         TE.map((parsedObjectFiles) => [...parsedApexFiles, ...parsedObjectFiles]),
       );
     }),
-    // Add trigger reflection
     TE.chain((parsedFiles) => {
       return pipe(
         reflectTriggerSource(filterTriggerFiles(bundles)),
@@ -94,26 +88,14 @@ function reflect(bundles: UnparsedSourceBundle[], config: Omit<UserDefinedChange
 function toManifests({ oldVersion, newVersion }: { oldVersion: ParsedFile[]; newVersion: ParsedFile[] }) {
   function parsedFilesToManifest(parsedFiles: ParsedFile[]): VersionManifest {
     return {
-      types: parsedFiles.reduce(
-        (
-          previousValue: (
-            | Type
-            | CustomObjectMetadata
-            | CustomFieldMetadata
-            | CustomMetadataMetadata
-            | TriggerMetadata
-          )[],
-          parsedFile: ParsedFile,
-        ) => {
-          if (!isInSource(parsedFile.source) && parsedFile.type.type_name === 'customobject') {
-            // When we are dealing with a custom object that was not in the source (for extension fields), we return all
-            // of its fields.
-            return [...previousValue, ...parsedFile.type.fields];
-          }
-          return [...previousValue, parsedFile.type];
-        },
-        [] as (Type | CustomObjectMetadata | CustomFieldMetadata | CustomMetadataMetadata | TriggerMetadata)[],
-      ),
+      types: parsedFiles.reduce((previousValue: ParsedType[], parsedFile: ParsedFile) => {
+        if (!isInSource(parsedFile.source) && parsedFile.type.type_name === 'customobject') {
+          // When we are dealing with a custom object that was not in the source (for extension fields), we return all
+          // of its fields.
+          return [...previousValue, ...parsedFile.type.fields];
+        }
+        return [...previousValue, parsedFile.type];
+      }, [] as ParsedType[]),
     };
   }
 

src/core/changelog/process-changelog.ts

@@ -6,8 +6,10 @@ import { CustomFieldMetadata } from '../reflection/sobject/reflect-custom-field-
 import { CustomMetadataMetadata } from '../reflection/sobject/reflect-custom-metadata-source';
 import { TriggerMetadata } from '../reflection/trigger/reflect-trigger-source';
 
+export type ParsedType = Type | CustomObjectMetadata | CustomFieldMetadata | CustomMetadataMetadata | TriggerMetadata;
+
 export type VersionManifest = {
-  types: (Type | CustomObjectMetadata | CustomFieldMetadata | CustomMetadataMetadata | TriggerMetadata)[];
+  types: ParsedType[];
 };
 
 type ModificationTypes =

src/core/changelog/renderable-changelog.ts

@@ -1,11 +1,8 @@
-import { Changelog, MemberModificationType, NewOrModifiedMember } from './process-changelog';
+import { Changelog, MemberModificationType, NewOrModifiedMember, ParsedType } from './process-changelog';
 import { ClassMirror, EnumMirror, InterfaceMirror, Type } from '@cparra/apex-reflection';
 import { RenderableContent } from '../renderables/types';
 import { adaptDescribable } from '../renderables/documentables';
 import { CustomObjectMetadata } from '../reflection/sobject/reflect-custom-object-sources';
-import { CustomFieldMetadata } from '../reflection/sobject/reflect-custom-field-source';
-import { CustomMetadataMetadata } from '../reflection/sobject/reflect-custom-metadata-source';
-import { TriggerMetadata } from '../reflection/trigger/reflect-trigger-source';
 
 type NewTypeRenderable = {
   name: string;
@@ -59,10 +56,7 @@ export type RenderableChangelog = {
   removedTriggers: NewOrRemovedTriggerSection | null;
 };
 
-export function convertToRenderableChangelog(
-  changelog: Changelog,
-  newManifest: (Type | CustomObjectMetadata | CustomFieldMetadata | CustomMetadataMetadata | TriggerMetadata)[],
-): RenderableChangelog {
+export function convertToRenderableChangelog(changelog: Changelog, newManifest: ParsedType[]): RenderableChangelog {
   const allNewTypes = [...changelog.newApexTypes, ...changelog.newCustomObjects].map(
     (newType) => newManifest.find((type) => type.name.toLowerCase() === newType.toLowerCase())!,
   );