@diplodoc/transform 4.32.4 → 4.34.0

package/src/js/_yfm-only.ts

@@ -0,0 +1 @@
+import './term';

package/src/js/base.ts

@@ -0,0 +1,2 @@
+import './polyfill';
+import './code';

package/src/js/index.ts

@@ -1,8 +1,7 @@
 import '@diplodoc/cut-extension/runtime';
 import '@diplodoc/tabs-extension/runtime';
 
-import './polyfill';
-import './code';
-import './term';
+import './base';
+import './_yfm-only';
 import './wide-mode';
 import './patch';

package/src/scss/_yfm-only.scss

@@ -0,0 +1,12 @@
+/**
+    Note: This file excludes "cut" and "tabs" as they are handled separately
+    in dedicated extensions (packages). In the future, "note", "file", "term"
+    and "table" will also be excluded from this file and moved to yfm.scss,
+    once they are moved to separate packages. Direct usage is not recommended,
+    as the file is subject to changes without prior notice.
+ */
+
+@import 'note';
+@import 'file';
+@import 'table';
+@import 'term';

package/src/scss/base.scss

@@ -0,0 +1,4 @@
+@import 'common';
+@import 'anchor';
+@import 'highlight';
+@import 'code';

package/src/scss/yfm.scss

@@ -1,12 +1,5 @@
-@import 'common';
-@import 'note';
-@import 'anchor';
-@import 'highlight';
-@import 'code';
-@import 'file';
-@import 'term';
-@import 'table';
+@import 'base';
+@import 'yfm-only';
 @import 'modal';
-
 @import '@diplodoc/cut-extension/runtime';
 @import '@diplodoc/tabs-extension/runtime';

package/src/transform/plugins/includes/collect.ts

@@ -12,7 +12,6 @@ function processRecursive(
     includePath: string,
     targetDestPath: string,
     options: IncludeCollectOpts,
-    appendix: Map<string, string>,
 ) {
     const {path, log, copyFile, includedParentPath: includedParentPathNullable, included} = options;
     const includedParentPath = includedParentPathNullable || path;
@@ -34,20 +33,16 @@ function processRecursive(
                 const includedRelativePath = getRelativePath(includedParentPath, includePath);
 
                 // The appendix is the map that protects from multiple include files
-                if (!appendix.has(includedRelativePath)) {
+                if (!options.appendix?.has(includedRelativePath)) {
                     // Recursive function to include the depth structure
-                    const includeContent = collectRecursive(
-                        content,
-                        {
-                            ...options,
-                            path: includePath,
-                            includedParentPath,
-                        },
-                        appendix,
-                    );
+                    const includeContent = collectRecursive(content, {
+                        ...options,
+                        path: includePath,
+                        includedParentPath,
+                    });
 
                     // Add to appendix set structure
-                    appendix.set(
+                    options.appendix?.set(
                         includedRelativePath,
                         `{% included (${includedRelativePath}) %}\n${includeContent}\n{% endincluded %}`,
                     );
@@ -59,11 +54,7 @@ function processRecursive(
     }
 }
 
-function collectRecursive(
-    result: string,
-    options: IncludeCollectOpts,
-    appendix: Map<string, string>,
-) {
+function collectRecursive(result: string, options: IncludeCollectOpts) {
     const {root, path, destPath = '', log, singlePage} = options;
 
     const INCLUDE_REGEXP = /{%\s*include\s*(notitle)?\s*\[(.+?)]\((.+?)\)\s*%}/g;
@@ -100,7 +91,7 @@ function collectRecursive(
 
         includesPaths.push(includePath);
 
-        processRecursive(includePath, targetDestPath, options, appendix);
+        processRecursive(includePath, targetDestPath, options);
 
         includesPaths.pop();
     }
@@ -109,14 +100,16 @@ function collectRecursive(
 }
 
 function collect(input: string, options: IncludeCollectOpts) {
-    const appendix: Map<string, string> = new Map();
+    const shouldWriteAppendix = !options.appendix;
+
+    options.appendix = options.appendix ?? new Map();
 
-    input = collectRecursive(input, options, appendix);
+    input = collectRecursive(input, options);
 
-    if (!options.path.includes('_includes')) {
+    if (shouldWriteAppendix) {
         // Appendix should be appended to the end of the file (it supports depth structure, so the included files will have included as well)
-        if (appendix.size > 0) {
-            input += '\n' + [...appendix.values()].join('\n');
+        if (options.appendix.size > 0) {
+            input += '\n' + [...options.appendix.values()].join('\n');
         }
     }
 

package/src/transform/plugins/includes/types.ts

@@ -14,4 +14,5 @@ export type IncludeCollectOpts = MarkdownItPluginOpts & {
     included: Boolean;
     includedParentPath?: string;
     additionalIncludedList?: string[];
+    appendix?: Map<string, string>;
 };

package/src/transform/preprocessors/included/index.ts

@@ -74,7 +74,7 @@ const index: MarkdownItPreprocessorCb<{
 
     // To reduce file reading we can include the file content into the generated content
     if (included) {
-        const lines = input.split('\n') || [];
+        const lines = input?.split('\n') || [];
 
         // The finction reads the files from bottom to top(!). It stops the loop if it does not have anything to swap.
         // If the function finds something to process then it restarts the loop because the position of the last element has been moved.