Resolving TODOs

Author: cesarParra

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

@@ -2,8 +2,6 @@ import {
   ParsedFile,
   Skip,
   UnparsedApexBundle,
-  UnparsedCustomFieldBundle,
-  UnparsedCustomObjectBundle,
   UnparsedSourceBundle,
   UserDefinedChangelogConfig,
 } from '../shared/types';
@@ -21,6 +19,7 @@ import { skip } from '../shared/utils';
 import { reflectCustomFieldsAndObjects } from '../reflection/sobject/reflectCustomFieldsAndObjects';
 import { CustomObjectMetadata } from '../reflection/sobject/reflect-custom-object-sources';
 import { Type } from '@cparra/apex-reflection';
+import { filterApexSourceFiles, filterCustomObjectsAndFields } from '#utils/source-bundle-utils';
 
 export type ChangeLogPageData = {
   content: string;
@@ -55,27 +54,12 @@ export function generateChangeLog(
 }
 
 function reflect(bundles: UnparsedSourceBundle[], config: Omit<UserDefinedChangelogConfig, 'targetGenerator'>) {
-  // TODO: Move to utility and reuse
-  function filterApexSourceFiles(sourceFiles: UnparsedSourceBundle[]): UnparsedApexBundle[] {
-    return sourceFiles.filter((sourceFile): sourceFile is UnparsedApexBundle => sourceFile.type === 'apex');
-  }
-
   const filterOutOfScopeApex = apply(filterScope, config.scope);
 
   function reflectApexFiles(sourceFiles: UnparsedApexBundle[]) {
     return pipe(reflectApexSource(sourceFiles), TE.map(filterOutOfScopeApex));
   }
 
-  // TODO: Move to utility and reuse
-  function filterCustomObjectsAndFields(
-    sourceFiles: UnparsedSourceBundle[],
-  ): (UnparsedCustomObjectBundle | UnparsedCustomFieldBundle)[] {
-    return sourceFiles.filter(
-      (sourceFile): sourceFile is UnparsedCustomObjectBundle =>
-        sourceFile.type === 'customobject' || sourceFile.type === 'customfield',
-    );
-  }
-
   return pipe(
     reflectApexFiles(filterApexSourceFiles(bundles)),
     TE.chain((parsedApexFiles) => {

src/core/markdown/generate-docs.ts

@@ -17,9 +17,7 @@ import {
   DocPageReference,
   TransformReference,
   ParsedFile,
-  UnparsedCustomObjectBundle,
   UnparsedSourceBundle,
-  UnparsedCustomFieldBundle,
 } from '../shared/types';
 import { parsedFilesToRenderableBundle } from './adapters/renderable-bundle';
 import { reflectApexSource } from '../reflection/apex/reflect-apex-source';
@@ -37,6 +35,7 @@ import { HookError } from '../errors/errors';
 import { CustomObjectMetadata } from '../reflection/sobject/reflect-custom-object-sources';
 import { Type } from '@cparra/apex-reflection';
 import { reflectCustomFieldsAndObjects } from '../reflection/sobject/reflectCustomFieldsAndObjects';
+import { filterApexSourceFiles, filterCustomObjectsAndFields } from '#utils/source-bundle-utils';
 
 export type MarkdownGeneratorConfig = Omit<
   UserDefinedMarkdownConfig,
@@ -55,19 +54,6 @@ export function generateDocs(unparsedBundles: UnparsedSourceBundle[], config: Ma
   );
   const sort = apply(sortTypesAndMembers, config.sortAlphabetically);
 
-  function filterApexSourceFiles(sourceFiles: UnparsedSourceBundle[]): UnparsedApexBundle[] {
-    return sourceFiles.filter((sourceFile): sourceFile is UnparsedApexBundle => sourceFile.type === 'apex');
-  }
-
-  function filterCustomObjectsAndFields(
-    sourceFiles: UnparsedSourceBundle[],
-  ): (UnparsedCustomObjectBundle | UnparsedCustomFieldBundle)[] {
-    return sourceFiles.filter(
-      (sourceFile): sourceFile is UnparsedCustomObjectBundle =>
-        sourceFile.type === 'customobject' || sourceFile.type === 'customfield',
-    );
-  }
-
   function filterOutCustomFields(parsedFiles: ParsedFile[]): ParsedFile<Type | CustomObjectMetadata>[] {
     return parsedFiles.filter(
       (parsedFile): parsedFile is ParsedFile<Type | CustomObjectMetadata> => parsedFile.source.type !== 'customfield',

src/util/source-bundle-utils.ts

@@ -0,0 +1,19 @@
+import {
+  UnparsedApexBundle,
+  UnparsedCustomFieldBundle,
+  UnparsedCustomObjectBundle,
+  UnparsedSourceBundle,
+} from '../core/shared/types';
+
+export function filterApexSourceFiles(sourceFiles: UnparsedSourceBundle[]): UnparsedApexBundle[] {
+  return sourceFiles.filter((sourceFile): sourceFile is UnparsedApexBundle => sourceFile.type === 'apex');
+}
+
+export function filterCustomObjectsAndFields(
+  sourceFiles: UnparsedSourceBundle[],
+): (UnparsedCustomObjectBundle | UnparsedCustomFieldBundle)[] {
+  return sourceFiles.filter(
+    (sourceFile): sourceFile is UnparsedCustomObjectBundle =>
+      sourceFile.type === 'customobject' || sourceFile.type === 'customfield',
+  );
+}