Revert "feat: resolve vcsPath correctly when sourcePath was suppl…

…ied beforehand, refactor metadata generation procedures"

This reverts commit 568f43b.

src/models.ts

@@ -230,6 +230,7 @@ export interface MetaDataOptions {
     isContributorsEnabled?: boolean;
     vcsConnector?: VCSConnector;
     addSystemMeta?: boolean;
+    addSourcePath?: boolean;
     resources?: Resources;
     shouldAlwaysAddVCSPath?: boolean;
 }

src/resolvers/md2md.ts

@@ -8,32 +8,30 @@ import {ArgvService, PluginService} from '../services';
 import {getVarsPerFile, logger} from '../utils';
 import {PluginOptions, ResolveMd2MdOptions} from '../models';
 import {PROCESSING_FINISHED} from '../constants';
+import {getContentWithUpdatedMetadata} from '../services/metadata';
 import {ChangelogItem} from '@diplodoc/transform/lib/plugins/changelog/types';
-import {enrichWithFrontMatter} from '../services/metadata';
 
 export async function resolveMd2Md(options: ResolveMd2MdOptions): Promise<void> {
     const {inputPath, outputPath, metadata: metadataOptions} = options;
     const {input, output, changelogs: changelogsSetting} = ArgvService.getConfig();
     const resolvedInputPath = resolve(input, inputPath);
 
-    const vars = getVarsPerFile(inputPath);
+    const varsPreset = getVarsPerFile(inputPath);
 
-    const content = await enrichWithFrontMatter({
-        fileContent: readFileSync(resolvedInputPath, 'utf8'),
+    const content = await getContentWithUpdatedMetadata(
+        readFileSync(resolvedInputPath, 'utf8'),
         metadataOptions,
-        resolvedFrontMatterVars: {
-            systemVars: vars.__system as unknown,
-            metadataVars: vars.__metadata,
-        },
-    });
+        varsPreset.__system as unknown,
+        varsPreset.__metadata,
+    );
 
     const {result, changelogs} = transformMd2Md(content, {
         path: resolvedInputPath,
         destPath: outputPath,
         root: resolve(input),
         destRoot: resolve(output),
         collectOfPlugins: PluginService.getCollectOfPlugins(),
-        vars: vars,
+        vars: varsPreset,
         log,
         copyFile,
     });

src/services/authors.ts

@@ -1,12 +1,12 @@
-import {Contributor} from '../models';
+import {replaceDoubleToSingleQuotes} from '../utils';
 import {VCSConnector} from '../vcs-connector/connector-models';
 
-async function updateAuthorMetadataStringByAuthorData(
-    authorLogin: string | object,
+async function updateAuthorMetadataStringByAuthorLogin(
+    authorLogin: string,
     vcsConnector?: VCSConnector,
-): Promise<Contributor | null> {
+): Promise<string> {
     if (!vcsConnector) {
-        return null;
+        return '';
     }
 
     const user = await getAuthorDetails(vcsConnector, authorLogin);
@@ -15,49 +15,52 @@ async function updateAuthorMetadataStringByAuthorData(
         return user;
     }
 
-    return null;
+    return '';
 }
 
 async function updateAuthorMetadataStringByFilePath(
     filePath: string,
     vcsConnector?: VCSConnector,
-): Promise<Contributor | null> {
+): Promise<string> {
     if (!vcsConnector) {
-        return null;
+        return '';
     }
 
     const user = vcsConnector.getExternalAuthorByPath(filePath);
 
     if (user) {
-        return user;
+        const author = replaceDoubleToSingleQuotes(JSON.stringify(user));
+        return author;
     }
 
-    return null;
+    return '';
 }
 
 async function getAuthorDetails(
     vcsConnector: VCSConnector,
     author: string | object,
-): Promise<Contributor | null> {
+): Promise<string | null> {
     if (typeof author === 'object') {
-        return author as Contributor;
+        // Avoiding problems when adding to html markup
+        return replaceDoubleToSingleQuotes(JSON.stringify(author));
     }
 
     try {
-        return JSON.parse(author);
+        JSON.parse(author);
+        return replaceDoubleToSingleQuotes(author);
     } catch {
         const user = await vcsConnector.getUserByLogin(author);
 
         if (user) {
-            return user;
+            return replaceDoubleToSingleQuotes(JSON.stringify(user));
         }
 
         return null;
     }
 }
 
 export {
-    updateAuthorMetadataStringByAuthorData as updateAuthorMetadataStringByAuthorLogin,
+    updateAuthorMetadataStringByAuthorLogin,
     updateAuthorMetadataStringByFilePath,
     getAuthorDetails,
 };

src/services/contributors.ts

@@ -1,5 +1,7 @@
 import {readFile} from 'fs/promises';
 import {dirname, join} from 'path';
+
+import {replaceDoubleToSingleQuotes} from '../utils';
 import {REGEXP_INCLUDE_CONTENTS, REGEXP_INCLUDE_FILE_PATH} from '../constants';
 import {Contributor, Contributors} from '../models';
 import {FileContributors, VCSConnector} from '../vcs-connector/connector-models';
@@ -10,10 +12,19 @@ export interface ContributorsServiceFileData {
     fileContent: string;
 }
 
-export async function getFileContributors(
+async function getFileContributorsMetadata(
     fileData: ContributorsServiceFileData,
     vcsConnector: VCSConnector,
-): Promise<Contributor[]> {
+): Promise<string> {
+    const contributors = await getFileContributorsString(fileData, vcsConnector);
+
+    return `contributors: ${contributors}`;
+}
+
+async function getFileContributorsString(
+    fileData: ContributorsServiceFileData,
+    vcsConnector: VCSConnector,
+): Promise<string> {
     const {resolvedFilePath, inputFolderPathLength} = fileData;
 
     const relativeFilePath = resolvedFilePath.substring(inputFolderPathLength);
@@ -35,7 +46,7 @@ export async function getFileContributors(
         fileContributorsWithContributorsIncludedFiles,
     ).map(([, contributor]) => contributor);
 
-    return contributorsArray;
+    return replaceDoubleToSingleQuotes(JSON.stringify(contributorsArray));
 }
 
 async function getContributorsForNestedFiles(
@@ -112,7 +123,7 @@ function getRelativeIncludeFilePaths(
     return relativeIncludeFilePaths;
 }
 
-export async function getFileIncludes(fileData: ContributorsServiceFileData) {
+async function getFileIncludes(fileData: ContributorsServiceFileData) {
     const {fileContent, inputFolderPathLength} = fileData;
 
     const results = new Set<string>();
@@ -150,3 +161,5 @@ export async function getFileIncludes(fileData: ContributorsServiceFileData) {
 
     return Array.from(results.values());
 }
+
+export {getFileContributorsMetadata, getFileContributorsString, getFileIncludes};