Allow nested colourFuncs throughout

Author: Perlkonig

src/schemas/schema.d.ts

@@ -344,24 +344,24 @@ export interface Glyph {
  */
 export interface FunctionFlatten {
   func: "flatten";
-  fg: PositiveInteger | Colourstrings;
-  bg: PositiveInteger | Colourstrings;
+  fg: PositiveInteger | Colourstrings | Colourfuncs;
+  bg: PositiveInteger | Colourstrings | Colourfuncs;
   opacity: number;
 }
 /**
  * Chooses the foreground colour with the best contrast against the given background.
  */
 export interface FunctionBestContrast {
   func: "bestContrast";
-  bg: PositiveInteger | Colourstrings;
-  fg: (PositiveInteger | Colourstrings)[];
+  bg: PositiveInteger | Colourstrings | Colourfuncs;
+  fg: (PositiveInteger | Colourstrings | Colourfuncs)[];
 }
 /**
  * Lightens or darkens a colour by the specified amount of saturation and luminance. Positive deltas lighten, negative darken.
  */
 export interface FunctionLighten {
   func: "lighten";
-  colour: PositiveInteger | Colourstrings;
+  colour: PositiveInteger | Colourstrings | Colourfuncs;
   ds: number;
   dl: number;
 }

src/schemas/schema.json

@@ -44,13 +44,15 @@
                 "fg": {
                     "anyOf": [
                         {"$ref": "#/$defs/positiveInteger"},
-                        {"$ref": "#/$defs/colourstrings"}
+                        {"$ref": "#/$defs/colourstrings"},
+                        {"$ref": "#/$defs/colourfuncs"}
                     ]
                 },
                 "bg": {
                     "anyOf": [
                         {"$ref": "#/$defs/positiveInteger"},
-                        {"$ref": "#/$defs/colourstrings"}
+                        {"$ref": "#/$defs/colourstrings"},
+                        {"$ref": "#/$defs/colourfuncs"}
                     ]
                 },
                 "opacity": {
@@ -73,7 +75,8 @@
                 "colour": {
                     "anyOf": [
                         {"$ref": "#/$defs/positiveInteger"},
-                        {"$ref": "#/$defs/colourstrings"}
+                        {"$ref": "#/$defs/colourstrings"},
+                        {"$ref": "#/$defs/colourfuncs"}
                     ]
                 },
                 "ds": {
@@ -96,15 +99,17 @@
                 "bg": {
                     "anyOf": [
                         {"$ref": "#/$defs/positiveInteger"},
-                        {"$ref": "#/$defs/colourstrings"}
+                        {"$ref": "#/$defs/colourstrings"},
+                        {"$ref": "#/$defs/colourfuncs"}
                     ]
                 },
                 "fg": {
                     "type": "array",
                     "items": {
                         "anyOf": [
                             {"$ref": "#/$defs/positiveInteger"},
-                            {"$ref": "#/$defs/colourstrings"}
+                            {"$ref": "#/$defs/colourstrings"},
+                            {"$ref": "#/$defs/colourfuncs"}
                         ]
                     }
                 }