chore: Expose async API for parsing C++ code

Signed-off-by: Roberto Raggi <[email protected]>

Author: robertoraggi

packages/cxx-frontend/src/Parser.ts

@@ -22,7 +22,7 @@ import initCxx, { cxx } from "./cxx";
 import { Unit } from "./Unit";
 import { AST } from "./AST";
 
-interface ParseParams {
+interface ParserParams {
   /**
    * Path to the file to parse.
    */
@@ -32,6 +32,12 @@ interface ParseParams {
    * Source code to parse.
    */
   source: string;
+
+  resolve?: (
+    name: string,
+    kind: "quoted" | "angled",
+    next: boolean
+  ) => Promise<string | undefined>;
 }
 
 export class Parser {
@@ -48,7 +54,7 @@ export class Parser {
 
   static async initFromURL(
     url: URL,
-    { signal }: { signal?: AbortSignal } = {},
+    { signal }: { signal?: AbortSignal } = {}
   ) {
     const response = await fetch(url, { signal });
 
@@ -69,8 +75,8 @@ export class Parser {
     return cxx !== undefined && cxx !== null;
   }
 
-  constructor(options: ParseParams) {
-    const { path, source } = options;
+  constructor(options: ParserParams) {
+    const { path, source, resolve } = options;
 
     if (typeof path !== "string") {
       throw new TypeError("expected parameter 'path' of type 'string'");
@@ -80,14 +86,14 @@ export class Parser {
       throw new TypeError("expected parameter 'source' of type 'string'");
     }
 
-    this.#unit = cxx.createUnit(source, path);
+    this.#unit = cxx.createUnit(source, path, { resolve });
   }
 
-  parse() {
+  async parse() {
     if (!this.#unit) {
       return;
     }
-    this.#unit.parse();
+    await this.#unit.parse();
     this.#ast = AST.from(this.#unit.getHandle(), this);
   }
 

packages/cxx-frontend/src/Preprocessor.ts

@@ -22,11 +22,6 @@ import { cxx } from "./cxx";
 
 interface PreprocessorOptions {
   systemIncludePaths?: string[];
-
-  fs?: {
-    existsSync(path: string): boolean;
-    readFileSync(path: string): string;
-  };
 }
 
 export class Preprocessor {
@@ -39,7 +34,7 @@ export class Preprocessor {
    *
    * @param source
    */
-  constructor({ systemIncludePaths, fs }: PreprocessorOptions = {}) {
+  constructor({ systemIncludePaths }: PreprocessorOptions = {}) {
     this.#control = new cxx.Control();
     this.#diagnosticClient = new cxx.DiagnosticsClient();
     this.#handle = new cxx.Preprocessor(this.#control, this.#diagnosticClient);
@@ -48,13 +43,6 @@ export class Preprocessor {
     systemIncludePaths?.forEach((path) => {
       this.#handle.addIncludePath(path);
     });
-
-    if (fs) {
-      const { existsSync, readFileSync } = fs;
-
-      this.#handle.setCanResolveFiles(true);
-      this.#handle.setup(existsSync, readFileSync);
-    }
   }
 
   /**

packages/cxx-frontend/src/Unit.ts

@@ -22,7 +22,7 @@ import { Diagnostic } from "./Diagnostic";
 
 export interface Unit {
   delete(): void;
-  parse(): boolean;
+  parse(): Promise<boolean>;
   getHandle(): number;
   getUnitHandle(): number;
   getDiagnostics(): Diagnostic[];

packages/cxx-frontend/src/cxx-js.d.ts

@@ -83,14 +83,22 @@ interface Lexer {
   tokenText(): string;
 }
 
+interface Api {
+  resolve?: (
+    name: string,
+    kind: "quoted" | "angled",
+    isIncludeNext: boolean
+  ) => Promise<string | undefined>;
+}
+
 export type CXX = {
   Control: Control;
   DiagnosticsClient: DiagnosticsClient;
   Preprocessor: Preprocessor;
   Lexer: Lexer;
   TranslationUnit: TranslationUnit;
 
-  createUnit(source: string, path: string): Unit;
+  createUnit(source: string, path: string, api: Api): Unit;
   getASTKind(handle: number): number;
   getASTSlot(handle: number, slot: number): number;
   getASTSlotKind(handle: number, slot: number): ASTSlotKind;
@@ -105,11 +113,11 @@ export type CXX = {
   getTokenLocation(handle: number, unitHandle: number): SourceLocation;
   getStartLocation(
     handle: number,
-    unitHandle: number,
+    unitHandle: number
   ): SourceLocation | undefined;
   getEndLocation(
     handle: number,
-    unitHandle: number,
+    unitHandle: number
   ): SourceLocation | undefined;
 };