@diplodoc/transform 4.47.4 → 4.48.1

package/lib/plugins/notes/index.js

@@ -37,7 +37,9 @@ const index = (md, { lang, notesAutotitle, path: optPath, log }) => {
         while (i < tokens.length) {
             const match = matchOpenToken(tokens, i);
             if (match) {
-                const closeTokenIdx = findCloseTokenIdx(tokens, i + 4, path, log);
+                // Skip paragraph_close for open token (+1) and paragraph_open for close token (+1)
+                // This is minimal useless content length
+                const closeTokenIdx = findCloseTokenIdx(tokens, i + 2, path, log);
                 if (!closeTokenIdx) {
                     i += 3;
                     continue;

package/lib/plugins/notes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/notes/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/notes/index.ts"],"names":[],"mappings":";AAAA,iCAA2B;AAK3B,oCAA6F;AAE7F,2CAAmC;AAEnC,MAAM,QAAQ,GAAG,sDAAsD,CAAC;AACxE,MAAM,WAAW,GAAG,iBAAiB,CAAC;AAEtC,SAAS,QAAQ,CAAC,IAAY,EAAE,UAA+B;IAC3D,IAAI,IAAI,GAAG,UAAU,CAAC;IAEtB,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC9C,IAAI,GAAG,IAAI,CAAC;KACf;IAED,OAAO,kBAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC;AACD,MAAM,eAAe,GAAuB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;IACtD,OAAO,CACH,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB;QACnC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC/B,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,eAAe,CACnD,CAAC;AACN,CAAC,CAAC;AAEF,SAAS,cAAc,CAAC,MAAe,EAAE,CAAS;IAC9C,OAAO,CACH,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB;QACnC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC/B,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CACxC,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CAAC,MAAe,EAAE,CAAS;IAC/C,OAAO,CACH,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB;QACnC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC/B,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAC3C,CAAC;AACN,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAA,kCAAiB,EAAC,MAAM,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;AAErF,aAAa;AACb,MAAM,KAAK,GAAuB,CAAC,EAAE,EAAE,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAC,EAAE,EAAE;IACjF,cAAc,GAAG,OAAO,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC;IAE7E,MAAM,MAAM,GAAG,CAAC,KAAgB,EAAE,EAAE;QAChC,MAAM,EAAC,MAAM,EAAE,GAAG,EAAC,GAAG,KAAK,CAAC;QAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;YACtB,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAExC,IAAI,KAAK,EAAE;gBACP,mFAAmF;gBACnF,yCAAyC;gBACzC,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;gBAElE,IAAI,CAAC,aAAa,EAAE;oBAChB,CAAC,IAAI,CAAC,CAAC;oBACP,SAAS;iBACZ;gBAED,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;gBACpC,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBAChE,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,uBAAuB,IAAI,EAAE,CAAC,CAAC;gBAC7D,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBACxC,YAAY,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBACjC,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC;gBAEhD,IAAI,aAAa,IAAI,YAAY,CAAC,GAAG,EAAE;oBACnC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;iBAC1C;gBAED,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;gBACnE,aAAa,CAAC,GAAG,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC;gBAE9C,sBAAsB;gBACtB,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;gBACjE,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;gBAC7C,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;gBACrD,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;gBAEpE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;gBACvB,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC;gBAExB,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAE7D,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpE,WAAW,CAAC,QAAQ,GAAG,EAAE,CAAC;gBAE1B,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBACvE,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;gBACjD,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;gBAE1E,IAAI,YAAY,CAAC,GAAG,EAAE;oBAClB,WAAW,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;iBACxE;gBAED,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CACjB,WAAW,CAAC,OAAO,EACnB,KAAK,CAAC,EAAE,EACR,KAAK,CAAC,GAAG,EACT,WAAW,CAAC,QAAQ,CACvB,CAAC;gBAEF,MAAM,YAAY,GAAG,CAAC,YAAY,CAAC,CAAC;gBACpC,IAAI,WAAW,CAAC,OAAO,EAAE;oBACrB,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;iBACzD;gBAED,YAAY,CAAC,IAAI,CACb,WAAW,EACX,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,EACrC,YAAY,EACZ,aAAa,CAChB,CAAC;gBAEF,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,YAAY,CAAC,CAAC;gBAEzD,CAAC,EAAE,CAAC;aACP;iBAAM,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,KAAK,eAAe,EAAE;gBAChF,GAAG,CAAC,IAAI,CAAC,6BAA6B,IAAI,CAAC,CAAC,CAAC,UAAU,IAAA,YAAI,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAE5E,CAAC,IAAI,CAAC,CAAC;aACV;iBAAM;gBACH,CAAC,EAAE,CAAC;aACP;SACJ;IACL,CAAC,CAAC;IAEF,IAAI;QACA,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;KAC7D;IAAC,OAAO,CAAC,EAAE;QACR,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KACvC;AACL,CAAC,CAAC;AAEF,iBAAS,KAAK,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.47.4",
+  "version": "4.48.1",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",

package/src/scss/_common.scss

@@ -135,7 +135,7 @@
     dl,
     table,
     pre {
-        margin: 0 0 15px;
+        margin-block: var(--yfm-text-block-margin-block, 0 15px);
     }
 
     ul,
@@ -333,12 +333,17 @@
     }
 
     li + li {
-        margin-top: 0.33em;
+        margin-block: var(--yfm-list-item-margin-block, 0.33em 0);
     }
 
     li p,
     li blockquote {
-        margin-top: 15px;
+        margin-block: var(--yfm-list-text-margin-block, 15px);
+    }
+
+    li > p:last-child,
+    li > blockquote:last-child {
+        margin-block: var(--yfm-list-text-last-margin-block, 15px);
     }
 
     code {

package/src/transform/plugins/notes/index.ts

@@ -58,7 +58,9 @@ const index: MarkdownItPluginCb = (md, {lang, notesAutotitle, path: optPath, log
             const match = matchOpenToken(tokens, i);
 
             if (match) {
-                const closeTokenIdx = findCloseTokenIdx(tokens, i + 4, path, log);
+                // Skip paragraph_close for open token (+1) and paragraph_open for close token (+1)
+                // This is minimal useless content length
+                const closeTokenIdx = findCloseTokenIdx(tokens, i + 2, path, log);
 
                 if (!closeTokenIdx) {
                     i += 3;