修复疏松列表的问题；release 0.0.2

Author: Mr-Python-in-China

examples/SupportedGrammer/problem-0.md

@@ -38,6 +38,10 @@ This is `inline code`
 2. item 2
 3. item 3
 
+- item 1
+
+- item 2
+
 [NOI website](https://noi.cn/)
 
 ![1.jpg](https://private-static.mrpython.top/cnoi-gen-test-img_324e0508.jpg)

package-lock.json

@@ -3,7 +3,7 @@
   "private": true,
   "description": "A website to generate CNOI-style statements for competitive programming.",
   "license": "AGPL-3.0",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "module",
   "repository": {
     "url": "https://github.com/Mr-Python-in-China/cnoi-statement-generator"

package.json

@@ -42,7 +42,7 @@ export function initContext(): CompilerContext {
 
 export function collectDefinitions(
   tree: mdast.Root,
-  { definitionById, footnoteById }: CompilerContext,
+  { definitionById, footnoteById }: CompilerContext
 ) {
   // Collect definitions and footnote definitions
   visit(tree, (node) => {
@@ -60,7 +60,7 @@ export function collectDefinitions(
 // Revert reference nodes to plain text
 function revert(
   node: Extract<mdast.Nodes, mdast.Reference>,
-  ctx: CompilerContext,
+  ctx: CompilerContext
 ) {
   const { data } = ctx;
   let suffix = '#"]';
@@ -75,7 +75,7 @@ function revert(
       '#"!["#"',
       node.alt ? escapeTypstString(node.alt) : "",
       '"',
-      suffix,
+      suffix
     );
     return;
   }
@@ -140,18 +140,18 @@ export const handlers = {
             ? "txt"
             : node.lang === "markdown"
               ? "md"
-              : node.lang,
+              : node.lang
       )}", "`,
       escapeTypstString(node.value),
-      '")\n',
+      '")\n'
     );
   },
   inlineCode: (node, ctx) => {
     const { data } = ctx;
     data.push(
       `#raw(block: false, lang: "txt", "`,
       escapeTypstString(node.value),
-      '")',
+      '")'
     );
   },
   list: (node, ctx) => {
@@ -163,17 +163,6 @@ export const handlers = {
       data.push("#list(");
     }
     data.push("\n");
-    let loose = node.spread ?? false;
-    if (!loose)
-      for (const item of node.children)
-        if (
-          item.spread ||
-          (typeof item.spread !== "boolean" && item.children.length > 1)
-        ) {
-          loose = true;
-          break;
-        }
-    if (loose) for (const item of node.children) item.spread = true;
     for (const item of node.children) {
       data.push("[");
       parseContent(item, ctx);
@@ -183,7 +172,7 @@ export const handlers = {
   },
   listItem: (node, ctx) => {
     for (const item of node.children) {
-      if (item.type === "paragraph" && !node.spread)
+      if (item.type === "paragraph")
         for (const child of item.children) parseContent(child, ctx);
       else parseContent(item, ctx);
     }
@@ -288,7 +277,7 @@ export const handlers = {
       data.push(
         '#footnote(label("',
         FOOTNOTE_ID_PREFIX + escapeTypstString(node.identifier),
-        '"))',
+        '"))'
       );
     } else {
       data.push('#"[^', escapeTypstString(node.identifier), ']"');
@@ -300,7 +289,7 @@ export const handlers = {
     data.push(
       '#raw(block: false, lang: "html", "',
       escapeTypstString(node.value),
-      '")',
+      '")'
     );
   },
   yaml: () => {
@@ -309,7 +298,7 @@ export const handlers = {
 } as const satisfies {
   [K in keyof mdast.RootContentMap]: (
     node: mdast.RootContentMap[K],
-    ctx: CompilerContext,
+    ctx: CompilerContext
   ) => void;
 };
 

src/compiler/remarkTypst/compiler.ts

@@ -525,10 +525,8 @@ describe("Handlers", () => {
       );
       expect(ctx.data.join("")).toBe(
         `#enum(
-[#par[#"Item 1"]
-],
-[#par[#"Item 2"]
-],
+[#"Item 1"],
+[#"Item 2"],
 )
 `,
       );
@@ -567,10 +565,8 @@ describe("Handlers", () => {
       );
       expect(ctx.data.join("")).toBe(
         `#enum(
-[#par[#"Item 1"]
-],
-[#par[#"Item 2"]
-],
+[#"Item 1"],
+[#"Item 2"],
 )
 `,
       );
@@ -610,11 +606,8 @@ describe("Handlers", () => {
       );
       expect(ctx.data.join("")).toBe(
         `#enum(
-[#par[#"Item 1.1"]
-#par[#"Item 1.2"]
-],
-[#par[#"Item 2"]
-],
+[#"Item 1.1"#"Item 1.2"],
+[#"Item 2"],
 )
 `,
       );