@gramio/format - npm Package Compare versions

Comparing version 0.3.1 to 0.3.2

dist/markdown/index.cjs

@@ -29,14 +29,3 @@ 'use strict';
     const tokenList = token;
-    let itemStart = tokenList.ordered && tokenList.start !== "" ? tokenList.start : "-";
-    return index.join(
-      tokenList.items,
-      (item) => {
-        return index.join(
-          item.tokens,
-          (x) => index.format`${typeof itemStart === "number" ? itemStart++ : itemStart} ${processToken(x)}`,
-          ""
-        );
-      },
-      "\n"
-    );
+    return processListToken(tokenList);
   }
@@ -61,2 +50,26 @@ if (token.type === "codespan") {
 }
+function processListToken(tokenList) {
+  const isOrdered = tokenList.ordered;
+  const startNumber = isOrdered && typeof tokenList.start === "number" ? tokenList.start : 1;
+  return index.join(
+    tokenList.items,
+    (item, itemIndex) => {
+      const bulletOrNumber = isOrdered ? startNumber + itemIndex : "-";
+      return index.join(
+        item.tokens,
+        (subToken, subTokenIndex) => {
+          if (subTokenIndex === 0) {
+            return index.format`${bulletOrNumber}${isOrdered ? "." : ""} ${processToken(subToken)}`;
+          }
+          if (subToken.type === "list") {
+            return index.format`\n${processToken(subToken)}`;
+          }
+          return processToken(subToken);
+        },
+        ""
+      );
+    },
+    "\n"
+  );
+}
 function workaroundForHeading(tokens) {
@@ -63,0 +76,0 @@ const result = [];

dist/markdown/index.js

 import { lexer } from 'marked';
-import { join, blockquote, bold, italic, link, strikethrough, format, code, pre, formatSaveIndents } from '../index.js';
+import { join, blockquote, bold, italic, link, strikethrough, code, pre, formatSaveIndents, format } from '../index.js';
 
@@ -27,14 +27,3 @@ function processToken(token) {
     const tokenList = token;
-    let itemStart = tokenList.ordered && tokenList.start !== "" ? tokenList.start : "-";
-    return join(
-      tokenList.items,
-      (item) => {
-        return join(
-          item.tokens,
-          (x) => format`${typeof itemStart === "number" ? itemStart++ : itemStart} ${processToken(x)}`,
-          ""
-        );
-      },
-      "\n"
-    );
+    return processListToken(tokenList);
   }
@@ -59,2 +48,26 @@ if (token.type === "codespan") {
 }
+function processListToken(tokenList) {
+  const isOrdered = tokenList.ordered;
+  const startNumber = isOrdered && typeof tokenList.start === "number" ? tokenList.start : 1;
+  return join(
+    tokenList.items,
+    (item, itemIndex) => {
+      const bulletOrNumber = isOrdered ? startNumber + itemIndex : "-";
+      return join(
+        item.tokens,
+        (subToken, subTokenIndex) => {
+          if (subTokenIndex === 0) {
+            return format`${bulletOrNumber}${isOrdered ? "." : ""} ${processToken(subToken)}`;
+          }
+          if (subToken.type === "list") {
+            return format`\n${processToken(subToken)}`;
+          }
+          return processToken(subToken);
+        },
+        ""
+      );
+    },
+    "\n"
+  );
+}
 function workaroundForHeading(tokens) {
@@ -61,0 +74,0 @@ const result = [];

package.json

 {
 	"name": "@gramio/format",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"repository": {
@@ -5,0 +5,0 @@ "type": "git",

No alert changes

Improved metrics

Total package byte prevSize

105899

0.75%

Lines of code

1345

1.97%

No dependency changes