feat: Add ParseFilesConfig.resolveParseFiles to handle the include/ex…

…clude config
AgoraIO-Extensions · Dec 13, 2023 · f43e2bf · f43e2bf
1 parent d84cff0
commit f43e2bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/cxx-parser/__tests__/unit_test/cxx_parser_configs.test.ts b/cxx-parser/__tests__/unit_test/cxx_parser_configs.test.ts
@@ -2,7 +2,10 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
-import { CXXParserConfigs } from '../../src/cxx_parser_configs';
+import {
+  CXXParserConfigs,
+  ParseFilesConfig,
+} from '../../src/cxx_parser_configs';
 
 describe('CXXParserConfigs', () => {
   let tmpDir: string = '';
@@ -72,7 +75,7 @@ describe('ParseFilesConfig', () => {
       args as unknown as CXXParserConfigs
     );
 
-    let finalParseFiles = config.parseFiles.resolveParseFiles();
+    let finalParseFiles = ParseFilesConfig.resolveParseFiles(config.parseFiles);
 
     expect(finalParseFiles.length).toBe(1);
     expect(finalParseFiles[0]).toEqual(path1); // file1.h

diff --git a/cxx-parser/src/cxx_parser.ts b/cxx-parser/src/cxx_parser.ts
@@ -6,7 +6,7 @@ import path from 'path';
 import { ParseResult, TerraContext } from '@agoraio-extensions/terra-core';
 
 import { ClangASTStructConstructorParser } from './constructor_initializer_parser';
-import { CXXParserConfigs } from './cxx_parser_configs';
+import { CXXParserConfigs, ParseFilesConfig } from './cxx_parser_configs';
 import { CXXFile, CXXTYPE, cast } from './cxx_terra_node';
 
 export function generateChecksum(files: string[]) {
@@ -117,7 +117,9 @@ export function CXXParser(
 ): ParseResult | undefined {
   let cxxParserConfigs = CXXParserConfigs.resolve(terraContext.configDir, args);
 
-  let parseFiles = cxxParserConfigs.parseFiles.resolveParseFiles();
+  let parseFiles = ParseFilesConfig.resolveParseFiles(
+    cxxParserConfigs.parseFiles
+  );
   let jsonContent = dumpCXXAstJson(
     terraContext,
     cxxParserConfigs.includeHeaderDirs,

diff --git a/cxx-parser/src/cxx_parser_configs.ts b/cxx-parser/src/cxx_parser_configs.ts
@@ -25,9 +25,9 @@ export class ParseFilesConfig {
    *
    * @returns An array of strings representing the files to be parsed.
    */
-  resolveParseFiles(): string[] {
-    return this.include.filter((it) => {
-      return !this.exclude.includes(it);
+  static resolveParseFiles(config: ParseFilesConfig): string[] {
+    return config.include.filter((it) => {
+      return !config.exclude.includes(it);
     });
   }
 }