fix: return type by overloading and forward export ParsedCSS

Author: b10902118

src/Inspector.ts

@@ -552,6 +552,15 @@ export class Inspector extends EventEmitter {
     });
   }
 
+  // Function overloads for getMatchedStyles
+  async getMatchedStyles(
+    element: InspectorElement,
+    options: MatchedStylesOptions & { raw: true },
+  ): Promise<GetMatchedStylesForNodeResponse>;
+  async getMatchedStyles(
+    element: InspectorElement,
+    options?: MatchedStylesOptions & { raw?: false },
+  ): Promise<ParsedCSS>;
   async getMatchedStyles(
     element: InspectorElement,
     options: MatchedStylesOptions = {},
@@ -572,6 +581,15 @@ export class Inspector extends EventEmitter {
     return raw ? ret : parseGetMatchedStylesForNodeResponse(ret, parseOptions);
   }
 
+  // Function overloads for getComputedStyle
+  async getComputedStyle(
+    element: InspectorElement,
+    options: ComputedStyleOptions & { raw: true },
+  ): Promise<GetComputedStyleForNodeResponse>;
+  async getComputedStyle(
+    element: InspectorElement,
+    options?: ComputedStyleOptions & { raw?: false },
+  ): Promise<Record<string, string>>;
   async getComputedStyle(
     element: InspectorElement,
     options: ComputedStyleOptions = {},

src/InspectorDOM.ts

@@ -326,19 +326,31 @@ export class InspectorElement extends InspectorNode {
   /**
    * @experimental
    */
+  async getMatchedStyles(
+    options: MatchedStylesOptions & { raw: true },
+  ): Promise<GetMatchedStylesForNodeResponse>;
+  async getMatchedStyles(
+    options?: MatchedStylesOptions & { raw?: false },
+  ): Promise<ParsedCSS>;
   async getMatchedStyles(
     options: MatchedStylesOptions = {},
   ): Promise<GetMatchedStylesForNodeResponse | ParsedCSS> {
-    return await this.inspector.getMatchedStyles(this, options);
+    return await this.inspector.getMatchedStyles(this, options as any); // FIXME
   }
 
   /**
    * @experimental
    */
+  async getComputedStyle(
+    options: ComputedStyleOptions & { raw: true },
+  ): Promise<GetComputedStyleForNodeResponse>;
+  async getComputedStyle(
+    options?: ComputedStyleOptions & { raw?: false },
+  ): Promise<Record<string, string>>;
   async getComputedStyle(
     options: ComputedStyleOptions = {},
   ): Promise<Record<string, string> | GetComputedStyleForNodeResponse> {
-    return await this.inspector.getComputedStyle(this, options);
+    return await this.inspector.getComputedStyle(this, options as any); // FIXME
   }
 }
 

src/index.shared.ts

@@ -1,3 +1,6 @@
 export * from "./constants.js";
 export * from "./types.js";
 export * from "./InspectorDOM.js";
+
+// for user to type function parameters accepting the returned value
+export { ParsedCSS } from "@devtoolcss/parser";

src/types.ts

@@ -18,7 +18,7 @@ export type GetMatchedStylesForNodeResponse = {
 };
 
 export type GetComputedStyleForNodeResponse = {
-  computedStyle: Record<string, string>[];
+  computedStyle: { name: string; value: string }[];
   extraFields: Object;
 };