schema: allow array of tbl-cap

Author: jjallaire

src/resources/editor/tools/vs-code.mjs

@@ -7875,7 +7875,9 @@ var require_yaml_intelligence_resources = __commonJS({
       "schema/cell-table.yml": [
         {
           name: "tbl-cap",
-          schema: "string",
+          schema: {
+            maybeArrayOf: "string"
+          },
           description: "Table caption"
         },
         {
@@ -17077,7 +17079,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "Website description",
         "The path to the favicon for this website",
         "Base URL for published website",
-        "Path to site (defaults to \u2018/\u2019). Not required if you specify\n<code>site-url</code>.",
+        "Path to site (defaults to <code>/</code>). Not required if you\nspecify <code>site-url</code>.",
         "Base URL for website source code repository",
         "Subdirectory of repository containing website",
         "Branch of website source code (defaults to <code>main</code>)",
@@ -18570,7 +18572,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "Description metadata for HTML version of book",
         "The path to the favicon for this website",
         "Base URL for published website",
-        "Path to site (defaults to \u2018/\u2019). Not required if you specify\n<code>site-url</code>.",
+        "Path to site (defaults to <code>/</code>). Not required if you\nspecify <code>site-url</code>.",
         "Base URL for website source code repository",
         "Subdirectory of repository containing website",
         "Branch of website source code (defaults to <code>main</code>)",
@@ -18749,8 +18751,8 @@ var require_yaml_intelligence_resources = __commonJS({
         "Cover image (used in HTML and ePub formats)",
         "Sharing buttons to include on navbar or sidebar (one or more of\n<code>twitter</code>, <code>facebook</code>, <code>linkedin</code>)",
         "Sharing buttons to include on navbar or sidebar (one or more of\n<code>twitter</code>, <code>facebook</code>, <code>linkedin</code>)",
-        "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and `docx)",
-        "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and `docx)",
+        "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and\n<code>docx</code>)",
+        "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and\n<code>docx</code>)",
         "Custom tools for navbar or sidebar",
         "internal-schema-hack",
         "Project configuration.",
@@ -18771,7 +18773,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "Description metadata for HTML version of book",
         "The path to the favicon for this website",
         "Base URL for published website",
-        "Path to site (defaults to \u2018/\u2019). Not required if you specify\n<code>site-url</code>.",
+        "Path to site (defaults to <code>/</code>). Not required if you\nspecify <code>site-url</code>.",
         "Base URL for website source code repository",
         "Subdirectory of repository containing website",
         "Branch of website source code (defaults to <code>main</code>)",
@@ -18950,8 +18952,8 @@ var require_yaml_intelligence_resources = __commonJS({
         "Cover image (used in HTML and ePub formats)",
         "Sharing buttons to include on navbar or sidebar (one or more of\n<code>twitter</code>, <code>facebook</code>, <code>linkedin</code>)",
         "Sharing buttons to include on navbar or sidebar (one or more of\n<code>twitter</code>, <code>facebook</code>, <code>linkedin</code>)",
-        "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and `docx)",
-        "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and `docx)",
+        "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and\n<code>docx</code>)",
+        "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and\n<code>docx</code>)",
         "Custom tools for navbar or sidebar",
         "internal-schema-hack"
       ],
@@ -25818,6 +25820,9 @@ var ValidationContext = class {
           if (e.schemaPath.indexOf("propertyNames") !== -1) {
             return 10;
           }
+          if (t[0] === "required") {
+            return 0;
+          }
           if (t[0] === "type") {
             if (t[1] === "null") {
               return 10;
@@ -26128,9 +26133,9 @@ function validateObject(value, schema2, context) {
   }
   return result;
 }
-function validate(value, schema2, source) {
+function validate(value, schema2, source, pruneErrors = true) {
   const context = new ValidationContext();
-  return context.validate(schema2, source, value);
+  return context.validate(schema2, source, value, pruneErrors);
 }
 
 // ../yaml-validation/yaml-schema.ts
@@ -26154,8 +26159,8 @@ var YAMLSchema = class {
       return error;
     }).filter((error) => error !== null);
   }
-  async validateParse(src, annotation) {
-    const validationErrors = validate(annotation, this.schema, src);
+  async validateParse(src, annotation, pruneErrors = true) {
+    const validationErrors = validate(annotation, this.schema, src, pruneErrors);
     if (validationErrors.length) {
       const localizedErrors = this.transformErrors(annotation, validationErrors);
       return {
@@ -26750,7 +26755,7 @@ var isObject2 = (value) => {
   const type2 = typeof value;
   return value !== null && (type2 === "object" || type2 === "function");
 };
-async function readAndValidateYamlFromMappedString(mappedYaml, schema2) {
+async function readAndValidateYamlFromMappedString(mappedYaml, schema2, pruneErrors = true) {
   const result = await withValidator(schema2, async (validator) => {
     const annotation = await readAnnotatedYamlFromMappedString(mappedYaml);
     if (annotation === null) {
@@ -26759,7 +26764,7 @@ async function readAndValidateYamlFromMappedString(mappedYaml, schema2) {
     const validateYaml = !isObject2(annotation.result) || annotation.result["validate-yaml"] !== false;
     const yaml = annotation.result;
     if (validateYaml) {
-      const valResult = await validator.validateParse(mappedYaml, annotation);
+      const valResult = await validator.validateParse(mappedYaml, annotation, pruneErrors);
       return {
         yaml,
         yamlValidationErrors: valResult.errors
@@ -27492,7 +27497,7 @@ async function breakQuartoMd(src, validate2 = false) {
   let codeEndRange;
   const lineBuffer = [];
   const flushLineBuffer = async (cell_type, index) => {
-    if (lineBuffer.length) {
+    if (lineBuffer.length || cell_type === "code") {
       const mappedChunks = [];
       for (const line of lineBuffer) {
         mappedChunks.push(line.range);

src/resources/editor/tools/yaml/web-worker.js

@@ -854,7 +854,9 @@
   "schema/cell-table.yml": [
     {
       "name": "tbl-cap",
-      "schema": "string",
+      "schema": {
+        "maybeArrayOf": "string"
+      },
       "description": "Table caption"
     },
     {
@@ -10056,7 +10058,7 @@
     "Website description",
     "The path to the favicon for this website",
     "Base URL for published website",
-    "Path to site (defaults to ‘/’). Not required if you specify\n<code>site-url</code>.",
+    "Path to site (defaults to <code>/</code>). Not required if you\nspecify <code>site-url</code>.",
     "Base URL for website source code repository",
     "Subdirectory of repository containing website",
     "Branch of website source code (defaults to <code>main</code>)",
@@ -11549,7 +11551,7 @@
     "Description metadata for HTML version of book",
     "The path to the favicon for this website",
     "Base URL for published website",
-    "Path to site (defaults to ‘/’). Not required if you specify\n<code>site-url</code>.",
+    "Path to site (defaults to <code>/</code>). Not required if you\nspecify <code>site-url</code>.",
     "Base URL for website source code repository",
     "Subdirectory of repository containing website",
     "Branch of website source code (defaults to <code>main</code>)",
@@ -11728,8 +11730,8 @@
     "Cover image (used in HTML and ePub formats)",
     "Sharing buttons to include on navbar or sidebar (one or more of\n<code>twitter</code>, <code>facebook</code>, <code>linkedin</code>)",
     "Sharing buttons to include on navbar or sidebar (one or more of\n<code>twitter</code>, <code>facebook</code>, <code>linkedin</code>)",
-    "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and `docx)",
-    "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and `docx)",
+    "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and\n<code>docx</code>)",
+    "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and\n<code>docx</code>)",
     "Custom tools for navbar or sidebar",
     "internal-schema-hack",
     "Project configuration.",
@@ -11750,7 +11752,7 @@
     "Description metadata for HTML version of book",
     "The path to the favicon for this website",
     "Base URL for published website",
-    "Path to site (defaults to ‘/’). Not required if you specify\n<code>site-url</code>.",
+    "Path to site (defaults to <code>/</code>). Not required if you\nspecify <code>site-url</code>.",
     "Base URL for website source code repository",
     "Subdirectory of repository containing website",
     "Branch of website source code (defaults to <code>main</code>)",
@@ -11929,8 +11931,8 @@
     "Cover image (used in HTML and ePub formats)",
     "Sharing buttons to include on navbar or sidebar (one or more of\n<code>twitter</code>, <code>facebook</code>, <code>linkedin</code>)",
     "Sharing buttons to include on navbar or sidebar (one or more of\n<code>twitter</code>, <code>facebook</code>, <code>linkedin</code>)",
-    "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and `docx)",
-    "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and `docx)",
+    "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and\n<code>docx</code>)",
+    "Download buttons for other formats to include on navbar or sidebar\n(one or more of <code>pdf</code>, <code>epub</code>, and\n<code>docx</code>)",
     "Custom tools for navbar or sidebar",
     "internal-schema-hack"
   ],

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

@@ -1,5 +1,6 @@
 - name: tbl-cap
-  schema: string
+  schema:
+    maybeArrayOf: string
   description: Table caption
 
 - name: tbl-subcap