Remove mixed enums; add ast-grep (#116)

* Add AST Grep

* Add first ast-grep rule and CI

* Remove mixed enums

* [Automated] Update generated code

* Update deno client

mise.toml

@@ -1,5 +1,6 @@
 [tools]
 deno = "2.1.8"
+"npm:@ast-grep/cli" = "0.32.2"
 rust = { version = "1.78.0", postinstall = "rustup component add rustfmt clippy rust-analyzer" }
 
 [settings]
@@ -94,6 +95,16 @@ description = "Run deno lint"
 dir = "src/clients/deno"
 run = ["deno lint", "deno check ."]
 
+[tasks."lint:ast-grep"]
+description = "Run ast-grep lint"
+run = """
+{% set format = '' %}
+{% if get_env(name='CI', default='') == 'true' %}
+  {% set format = ' --format=github' %}
+{% endif %}
+sg scan {{format}} .
+"""
+
 [tasks."lint"]
 description = "Run all linting tasks"
 depends = ["lint:*"]

sg/rules/no-mixed-enums.yml

@@ -0,0 +1,20 @@
+id: no-mixed-enum
+language: rust
+severity: error
+message: Don't mix call style and object style enum variants
+rule:
+  matches: enum
+  all:
+    - has:
+        stopBy: end
+        all:
+          - kind: field_declaration_list
+    - has:
+        stopBy: end
+        all:
+          - kind: ordered_field_declaration_list
+utils:
+  enum:
+    any:
+      - pattern: enum $VARIANT{$$$BODY}
+      - pattern: pub enum $VARIANT{$$$BODY}

sgconfig.yml

@@ -0,0 +1,2 @@
+ruleDirs:
+- ./sg/rules

src/clients/deno/main.ts

@@ -368,11 +368,10 @@ export class WebView implements Disposable {
       $type: "getSize",
       include_decorations: includeDecorations,
     });
-    const { width, height, scale_factor: scaleFactor } = returnResult(
+    return returnResult(
       result,
       "size",
     );
-    return { width, height, scaleFactor };
   }
 
   /**

src/clients/deno/schemas/WebViewMessage.ts

@@ -19,6 +19,15 @@ export type Notification =
     $type: "closed";
   };
 
+export type SizeWithScale = {
+  /** The height of the window in logical pixels. */
+  height: number;
+  /** The ratio between physical and logical sizes. */
+  scaleFactor: number;
+  /** The width of the window in logical pixels. */
+  width: number;
+};
+
 /**
  * Types that can be returned from webview results.
  */
@@ -41,14 +50,7 @@ export type ResultType =
   | {
     $type: "size";
 
-    value: {
-      /** The height of the window in logical pixels. */
-      height: number;
-      /** The ratio between physical and logical sizes. */
-      scale_factor: number;
-      /** The width of the window in logical pixels. */
-      width: number;
-    };
+    value: SizeWithScale;
   };
 
 /**
@@ -99,18 +101,17 @@ export const Notification: z.ZodType<Notification> = z.discriminatedUnion(
   ],
 );
 
+export const SizeWithScale: z.ZodType<SizeWithScale> = z.object({
+  height: z.number(),
+  scaleFactor: z.number(),
+  width: z.number(),
+});
+
 export const ResultType: z.ZodType<ResultType> = z.discriminatedUnion("$type", [
   z.object({ $type: z.literal("string"), value: z.string() }),
   z.object({ $type: z.literal("boolean"), value: z.boolean() }),
   z.object({ $type: z.literal("float"), value: z.number() }),
-  z.object({
-    $type: z.literal("size"),
-    value: z.object({
-      height: z.number(),
-      scale_factor: z.number(),
-      width: z.number(),
-    }),
-  }),
+  z.object({ $type: z.literal("size"), value: SizeWithScale }),
 ]);
 
 export const Response: z.ZodType<Response> = z.discriminatedUnion("$type", [

src/clients/deno/schemas/WebViewOptions.ts

@@ -1,6 +1,13 @@
 // DO NOT EDIT: This file is auto-generated by generate-schema/index.ts
 import { z } from "npm:zod";
 
+export type Size = {
+  /** The height of the window in logical pixels. */
+  height: number;
+  /** The width of the window in logical pixels. */
+  width: number;
+};
+
 /**
  * The content to load into the webview.
  */
@@ -19,10 +26,7 @@ export type WebViewContent =
   };
 
 export type WindowSizeStates = "maximized" | "fullscreen";
-export type WindowSize = WindowSizeStates | {
-  height: number;
-  width: number;
-};
+export type WindowSize = WindowSizeStates | Size;
 
 /**
  * Options for creating a webview.
@@ -70,6 +74,11 @@ export type WebViewOptions = {
   userAgent?: string;
 };
 
+export const Size: z.ZodType<Size> = z.object({
+  height: z.number(),
+  width: z.number(),
+});
+
 export const WebViewContent: z.ZodType<WebViewContent> = z.union([
   z.object({
     headers: z.record(z.string(), z.string()).optional(),
@@ -84,7 +93,7 @@ export const WindowSizeStates: z.ZodType<WindowSizeStates> = z.enum([
 ]);
 export const WindowSize: z.ZodType<WindowSize> = z.union([
   WindowSizeStates,
-  z.object({ height: z.number(), width: z.number() }),
+  Size,
 ]);
 
 export const WebViewOptions: z.ZodType<WebViewOptions> = z.object({