Schema fixes

Author: dbuezas

src/jsonschema.ts

@@ -1,14 +1,16 @@
 import { InputConfig } from "./types";
 
+type Whitespace = " " | "\t" | "\n" | "\r";
+
 type With$fn<T> = {
   [K in keyof T]:
     | (T[K] extends (infer U)[]
         ? With$fn<U>[] // handle arrays recursively
         : T[K] extends object
-        ? With$fn<T[K]> // handle objects recursively
-        : T[K]) // retain original type
-    | (string & `$ex ${string}`)
-    | (string & `$fn ${string}`); // allow string starting with $ex or $fn
+          ? With$fn<T[K]> // handle objects recursively
+          : T[K]) // retain original type
+    | (string & `${Whitespace | ""}$ex${Whitespace}${string}`)
+    | (string & `${Whitespace | ""}$fn${Whitespace}${string}`); // allow string starting with $ex or $fn with optional whitespace
 };
 
-export type JsonSchemaRoot = With$fn<InputConfig>
+export type JsonSchemaRoot = With$fn<InputConfig>;

yaml-editor/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "start": "npm run schema && webpack serve --open --mode development",
     "build": "npm run schema &&rm -rf dist && webpack --mode production",
-    "schema": "cd .. && typescript-json-schema --noExtraProps tsconfig.json InputConfig > yaml-editor/src/schema.json",
+    "schema": "cd .. && typescript-json-schema --required tsconfig.json JsonSchemaRoot > yaml-editor/src/schema.json",
     "deploy": "pnpm run build && gh-pages -d dist"
   },
   "dependencies": {