fix: issues found during dev-test

Author: CountRedClaw

src/components/package.ts

@@ -95,6 +95,12 @@ export const createVersionPackage = async (
       return await zip.buildResult(options)
 
     case BUILD_TYPE.EXPORT_VERSION:
+      if (buildResult.config.format !== HTML_EXPORT_GROUP_FORMAT && buildResult.exportDocuments.length === 1) {
+        return Buffer.from(await dumpRestDocument(buildResultDto.exportDocuments[0], ctx.config.format).arrayBuffer())
+      }
+      await createExportDocumentDataFiles(zip, buildResultDto.exportDocuments, ctx)
+      return await zip.buildResult(options)
+
     case BUILD_TYPE.EXPORT_REST_OPERATIONS_GROUP:
       await createExportDocumentDataFiles(zip, buildResultDto.exportDocuments, ctx)
       return await zip.buildResult(options)

src/strategies/export-version.strategy.ts

@@ -38,7 +38,7 @@ import { OpenApiExtensionKey } from '@netcracker/qubership-apihub-api-unifier'
 import { isRestDocument, isTextDocument } from '../apitypes'
 
 function extractTypeAndSubtype(type: string): string {
-  return type.split('.')[0]
+  return type.split(';')[0]
 }
 
 async function prepareData(file: File): Promise<ZippableDocument['data']> {
@@ -107,15 +107,17 @@ export class ExportVersionStrategy implements BuilderStrategy {
 
     buildResult.exportDocuments.push(...transformedDocuments)
 
-    if (buildResult.exportDocuments.length === 1) {
-      buildResult.exportFileName = createSingleFileExportName(packageId, version, getDocumentTitle(buildResult.exportDocuments[0].fileId), format)
-      return buildResult
-    }
-
     if (format === HTML_EXPORT_GROUP_FORMAT) {
       const readme = buildResult.exportDocuments.find(({fileId}) => fileId.toLowerCase() === 'readme.md')?.description
       buildResult.exportDocuments.push(createExportDocument('index.html', await generateIndexHtmlPage(packageId, version, generatedHtmlExportDocuments, readme)))
       buildResult.exportDocuments.push(...await createCommonStaticExportDocuments(packageId, version))
+      buildResult.exportFileName = `${packageId}_${version}.zip`
+      return buildResult
+    }
+
+    if (buildResult.exportDocuments.length === 1) {
+      buildResult.exportFileName = createSingleFileExportName(packageId, version, getDocumentTitle(buildResult.exportDocuments[0].fileId), format)
+      return buildResult
     }
 
     buildResult.exportFileName = `${packageId}_${version}.zip`

src/utils/export.ts

@@ -62,12 +62,21 @@ export async function generateHtmlPage(document: string, fileTitle: string, pack
     .replace('{{packageName}}', packageId)
     .replace('{{version}}', version)
     .replace('{{breadcrumbs}}', breadcrumbs)
-    .replace('{{spec}}', document)
+    .replace('{{spec}}', escapeHTML(document))
     // todo use packageName instead of packageId
     .replace('{{packageNameAndVersion}}', `${packageId} ${version}`)
   return new Blob([filled])
 }
 
+function escapeHTML(str: string): string {
+  return str
+    .replace(/&/g, '&')
+    .replace(/'/g, ''')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&#34;')
+}
+
 async function generateReadmeParts(readme?: string): Promise<[string, string]> {
   if (!readme) {
     return ['', '']