From f82cfbeeb26bb8dd4ee60054b6dc720f6e6978bb Mon Sep 17 00:00:00 2001
From: Terry McDonell <35645950+terry-longmacch@users.noreply.github.com>
Date: Tue, 28 Jan 2025 13:46:45 +1100
Subject: [PATCH 1/3] fix: enable default value in case

---
 functions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.ts b/functions.ts
index 69b294a72..6cc98b6f7 100644
--- a/functions.ts
+++ b/functions.ts
@@ -179,7 +179,7 @@ export interface Fbetween extends FunctionCall<boolean> {
 export type FCaseParameter = {
   case: Expression<boolean>;
   value: Expression<PropertyType>;
-};
+} | Expression<PropertyType>;
 
 /**
  * Textual representation of a switch-case function.

From 5fc8b1c38ca6372a047608eeeeff25eb44dbbe6b Mon Sep 17 00:00:00 2001
From: Terry McDonell <35645950+terry-longmacch@users.noreply.github.com>
Date: Tue, 28 Jan 2025 13:50:59 +1100
Subject: [PATCH 2/3] feat: add wellknownnames to support qgis markers

---
 schema.json | 44 ++++++++++++++++++++++++++++++++++++++------
 style.ts    |  8 +++++++-
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/schema.json b/schema.json
index 17a37e20f..7fab0554a 100644
--- a/schema.json
+++ b/schema.json
@@ -21349,8 +21349,45 @@
                 },
                 {
                     "enum": [
+                        "arrow",
+                        "arrowhead",
+                        "asterisk_fill",
                         "circle",
                         "cross",
+                        "cross2",
+                        "cross_fill",
+                        "decagon",
+                        "diagonal_half_square",
+                        "diamond",
+                        "equilateral_triangle",
+                        "filled_arrowhead",
+                        "half_arc",
+                        "half_square",
+                        "heart",
+                        "hexagon",
+                        "horline",
+                        "left_half_triangle",
+                        "line",
+                        "octagon",
+                        "parallelogram_left",
+                        "parallelogram_right",
+                        "pentagon",
+                        "quarter_arc",
+                        "quarter_circle",
+                        "quarter_square",
+                        "right_half_triangle",
+                        "rounded_square",
+                        "semi_circle",
+                        "shield",
+                        "square",
+                        "square_with_corners",
+                        "star",
+                        "star_diamond",
+                        "third_arc",
+                        "third_circle",
+                        "trapezoid",
+                        "triangle",
+                        "x",
                         "shape://backslash",
                         "shape://carrow",
                         "shape://dot",
@@ -21359,11 +21396,7 @@
                         "shape://plus",
                         "shape://slash",
                         "shape://times",
-                        "shape://vertline",
-                        "square",
-                        "star",
-                        "triangle",
-                        "x"
+                        "shape://vertline"
                     ],
                     "type": "string"
                 }
@@ -21389,4 +21422,3 @@
     },
     "type": "object"
 }
-
diff --git a/style.ts b/style.ts
index c4f911d21..821805778 100644
--- a/style.ts
+++ b/style.ts
@@ -176,7 +176,13 @@ export type FontSpec = `ttf://${string}#0x${string}`;
  * https://github.com/microsoft/TypeScript/issues/6579
  *
  */
-export type WellKnownName = 'circle' | 'square' | 'triangle' | 'star' | 'cross' | 'x'
+export type WellKnownName = 'arrow' | 'arrowhead' | 'asterisk_fill' | 'circle' | 'cross' | 'cross2'
+| 'cross_fill' | 'decagon' | 'diagonal_half_square' | 'diamond' | 'equilateral_triangle'
+| 'filled_arrowhead' | 'half_arc' | 'half_square' | 'heart' | 'hexagon' | 'horline' | 'left_half_triangle'
+| 'line' | 'octagon' | 'parallelogram_left' | 'parallelogram_right' | 'pentagon' | 'quarter_arc'
+| 'quarter_circle' | 'quarter_square' | 'right_half_triangle' | 'rounded_square' | 'semi_circle'
+| 'shield' | 'square' | 'square_with_corners' | 'star' | 'star_diamond' | 'third_arc' | 'third_circle'
+| 'trapezoid' | 'triangle' | 'x'
 | 'shape://vertline' | 'shape://horline' | 'shape://slash'
 | 'shape://backslash' | 'shape://dot' | 'shape://plus'
 | 'shape://times' | 'shape://oarrow' | 'shape://carrow'

From 70d7d9c36fb0b8ef7a5fb875d2a67fc826b06c45 Mon Sep 17 00:00:00 2001
From: Terry McDonell <35645950+terry-longmacch@users.noreply.github.com>
Date: Sun, 2 Feb 2025 08:34:07 +1100
Subject: [PATCH 3/3] fix: revert typing of fcaseparameter

---
 functions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.ts b/functions.ts
index 6cc98b6f7..69b294a72 100644
--- a/functions.ts
+++ b/functions.ts
@@ -179,7 +179,7 @@ export interface Fbetween extends FunctionCall<boolean> {
 export type FCaseParameter = {
   case: Expression<boolean>;
   value: Expression<PropertyType>;
-} | Expression<PropertyType>;
+};
 
 /**
  * Textual representation of a switch-case function.