@tmlmt/cooklang-parser 3.0.0-alpha.22 → 3.0.0-alpha.23

package/dist/index.cjs

@@ -1833,6 +1833,10 @@ function parseNestedMetaVar(content, varName) {
   const match = content.match(nestedMetaVarRegex(varName));
   if (!match) return void 0;
   const nestedContent = match[1];
+  const lines = nestedContent.split(/\r?\n/).filter((line) => line.trim() !== "");
+  if (lines.length > 0 && lines[0].trim().startsWith("- ")) {
+    return parseListItems(lines);
+  }
   return parseNestedBlock(nestedContent);
 }
 function parseNestedBlock(content) {
@@ -1859,7 +1863,7 @@ function parseNestedBlock(content) {
     if (currentIndent !== baseIndent) {
       throw new BadIndentationError();
     }
-    const keyValueMatch = line.match(/^[ ]*([^:\n]+?):\s*(.*)$/);
+    const keyValueMatch = line.match(/^ *([^:\n]+?):\s*(.*)$/);
     if (!keyValueMatch) {
       i2++;
       continue;
@@ -1871,7 +1875,7 @@ function parseNestedBlock(content) {
       let j = i2 + 1;
       while (j < lines.length) {
         const childLine = lines[j];
-        const childIndent = childLine.match(/^([ ]*)/)?.[1]?.length;
+        const childIndent = childLine.match(/^( *)/)?.[1]?.length;
         if (childIndent && childIndent > baseIndent) {
           childLines.push(childLine);
           j++;
@@ -1882,14 +1886,7 @@ function parseNestedBlock(content) {
       if (childLines.length > 0) {
         const firstChildTrimmed = childLines[0].trim();
         if (firstChildTrimmed.startsWith("- ")) {
-          const reconstructedContent = `${key}:
-${childLines.join("\n")}`;
-          const listResult = parseListMetaVar(reconstructedContent, key);
-          if (listResult) {
-            result[key] = listResult.map(
-              (item) => parseMetadataValue(item)
-            );
-          }
+          result[key] = parseListItems(childLines);
         } else {
           const childContent = childLines.join("\n");
           const nested = parseNestedBlock(childContent);
@@ -1897,16 +1894,67 @@ ${childLines.join("\n")}`;
             result[key] = nested;
           }
         }
+      } else {
+        result[key] = "";
       }
       i2 = j;
     } else {
-      result[key] = parseMetadataValue(rawValue);
+      result[key] = parseSingleLineMetadataValue(rawValue);
       i2++;
     }
   }
   return result;
 }
-function parseMetadataValue(rawValue) {
+function parseListItems(childLines) {
+  const listIndent = childLines[0].match(/^( *)/)?.[1]?.length;
+  const groups = [];
+  let currentGroup = [];
+  for (const line of childLines) {
+    const indent = line.match(/^( *)/)?.[1]?.length;
+    if (indent === listIndent && line.trim().startsWith("- ")) {
+      if (currentGroup.length > 0) {
+        groups.push(currentGroup);
+      }
+      currentGroup = [line];
+    } else {
+      currentGroup.push(line);
+    }
+  }
+  groups.push(currentGroup);
+  const isObjectItem = (group) => {
+    if (group.length > 1) return true;
+    const value = group[0].replace(/^\s*-\s*/, "").trim();
+    return /^[^:\n]+:\s/.test(value);
+  };
+  const hasObjectItems = groups.some(isObjectItem);
+  if (!hasObjectItems) {
+    return groups.map((group) => {
+      const value = group[0].replace(/^\s*-\s*/, "").trim();
+      return parseSingleLineMetadataValue(value);
+    });
+  }
+  const items = [];
+  for (const group of groups) {
+    const firstLine = group[0];
+    const afterDash = firstLine.replace(/^\s*-\s*/, "");
+    const dashPrefixMatch = firstLine.match(/^( *-\s*)/);
+    const contentIndent = dashPrefixMatch?.[1]?.length;
+    const objectLines = [" ".repeat(contentIndent) + afterDash];
+    for (let k = 1; k < group.length; k++) {
+      objectLines.push(group[k]);
+    }
+    const parsed = parseNestedBlock(objectLines.join("\n"));
+    if (parsed) {
+      items.push(parsed);
+    } else {
+      items.push(
+        parseSingleLineMetadataValue(afterDash.trim())
+      );
+    }
+  }
+  return items;
+}
+function parseSingleLineMetadataValue(rawValue) {
   if (rawValue.startsWith("[") && rawValue.endsWith("]")) {
     return rawValue.slice(1, -1).split(",").map((item) => item.trim());
   }
@@ -1921,7 +1969,7 @@ function parseAnyMetaVar(content, varName) {
   const list = parseListMetaVar(content, varName);
   if (list) return list;
   const simple = parseSimpleMetaVar(content, varName);
-  if (simple) return parseMetadataValue(simple);
+  if (simple) return parseSingleLineMetadataValue(simple);
   return void 0;
 }
 function getNumericValueFromYield(v) {
@@ -2005,7 +2053,7 @@ function extractMetadata(content) {
   const sourceName = parseSimpleMetaVar(metadataContent, "source.name");
   const sourceUrl = parseSimpleMetaVar(metadataContent, "source.url");
   const sourceAuthor = parseSimpleMetaVar(metadataContent, "source.author");
-  if (sourceNested) {
+  if (sourceNested && !Array.isArray(sourceNested)) {
     const source = {};
     if (typeof sourceNested.name === "string") source.name = sourceNested.name;
     if (typeof sourceNested.url === "string") source.url = sourceNested.url;
@@ -2025,7 +2073,7 @@ function extractMetadata(content) {
   const prepTime = parseSimpleMetaVar(metadataContent, "prep time") ?? parseSimpleMetaVar(metadataContent, "time.prep");
   const cookTime = parseSimpleMetaVar(metadataContent, "cook time") ?? parseSimpleMetaVar(metadataContent, "time.cook");
   const totalTime = parseSimpleMetaVar(metadataContent, "time required") ?? parseSimpleMetaVar(metadataContent, "time") ?? parseSimpleMetaVar(metadataContent, "duration");
-  if (timeNested) {
+  if (timeNested && !Array.isArray(timeNested)) {
     const time = {};
     if (typeof timeNested.prep === "string") time.prep = timeNested.prep;
     if (typeof timeNested.cook === "string") time.cook = timeNested.cook;
@@ -5160,6 +5208,7 @@ function getEffectiveChoices(recipe, variant) {
 // v8 ignore if -- @preserve
 /* v8 ignore else -- expliciting error type -- @preserve */
 /* v8 ignore next 4 -- @preserve: defensive guard; regex always matches */
+/* v8 ignore else -- @preserve: empty non nested block will in practice be detected earlier */
 // v8 ignore if -- @preserve: defensive type guard
 /* v8 ignore if -- @preserve */
 // v8 ignore next -- @preserve