@diplodoc/cli 4.15.0 → 4.16.0

package/package.json

@@ -3,7 +3,7 @@
   "author": "Yandex Data UI Team <data-ui@yandex-team.ru>",
   "description": "Make documentation using yfm-docs in Markdown and HTML formats",
   "license": "MIT",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:diplodoc-platform/cli.git"
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@diplodoc/client": "^2.1.1",
-    "@diplodoc/translation": "^1.0.7",
+    "@diplodoc/translation": "^1.1.0",
     "katex": "^0.16.9",
     "shelljs": "0.8.5",
     "threads": "1.7.0",
@@ -62,13 +62,13 @@
     "ajv": "^8.11.0",
     "async": "^3.2.4",
     "axios": "^1.6.7",
-    "chalk": "4.1.2",
+    "chalk": "^4.1.2",
     "esbuild": "^0.20.0",
     "glob": "^8.0.3",
     "html-escaper": "^3.0.3",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",
-    "lint-staged": "13.2.2",
+    "lint-staged": "^12.5.0",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
     "minimatch": "^9.0.3",

package/src/cmd/translate/compose.ts

@@ -100,15 +100,7 @@ function pipeline(input: string, output: string, {useSource}: ComposeOptions) {
             loadFile<string>(join(input, file.xliff)),
         ]);
 
-        let schemas;
-        if (['.yaml', '.json'].includes(file.ext)) {
-            schemas = resolveSchemas(file.path);
-
-            if (!schemas) {
-                return;
-            }
-        }
-
+        const schemas = await resolveSchemas(file.path);
         const result = _compose(skeleton, xliff, {useSource, schemas});
         const filePath = join(output, file.path);
 

package/src/cmd/translate/extract.ts

@@ -121,24 +121,21 @@ function pipeline(params: PipelineParameters) {
         const xliffPath = join(outputRoot, outputPath + '.xliff');
         const skeletonPath = join(outputRoot, outputPath + '.skl');
 
-        let schemas;
-        if (['.yaml', '.json'].includes(ext)) {
-            schemas = resolveSchemas(path);
-
-            if (!schemas) {
-                return;
-            }
-        }
-
+        const schemas = await resolveSchemas(path);
         const content = await loadFile(inputPath);
 
         await mkdir(dirname(xliffPath), {recursive: true});
 
-        const {xliff, skeleton} = _extract(content, {
+        const {xliff, skeleton, units} = _extract(content, {
             source,
             target,
+            schemas,
         });
 
+        if (!units.length) {
+            return;
+        }
+
         await Promise.all([dumpFile(skeletonPath, skeleton), dumpFile(xliffPath, xliff)]);
     };
 }

package/src/cmd/translate/handler.ts

@@ -22,6 +22,7 @@ import {
     extract,
     loadFile,
     normalizeParams,
+    resolveSchemas,
 } from './utils';
 
 const REQUESTS_LIMIT = 20;
@@ -262,7 +263,9 @@ function translator(params: TranslatorParams, split: Split) {
             return;
         }
 
+        const schemas = await resolveSchemas(path);
         const {units, skeleton} = extract(content, {
+            compact: true,
             source: {
                 language: sourceLanguage,
                 locale: 'RU',
@@ -271,6 +274,7 @@ function translator(params: TranslatorParams, split: Split) {
                 language: targetLanguage,
                 locale: 'US',
             },
+            schemas,
         });
 
         if (!units.length) {
@@ -279,7 +283,7 @@ function translator(params: TranslatorParams, split: Split) {
         }
 
         const parts = await split(path, units);
-        const composed = compose(skeleton, parts, {useSource: true});
+        const composed = compose(skeleton, parts, {useSource: true, schemas});
 
         await dumpFile(outputPath, composed);
     };

package/src/cmd/translate/utils/fs.ts

@@ -1,17 +1,30 @@
 import {JSONValue, resolveRefs} from '@diplodoc/translation';
-import {extname} from 'path';
 import {dump, load} from 'js-yaml';
 import {readFile, writeFile} from 'fs/promises';
 
+function last<T>(array: T[]): T | undefined {
+    return array[array.length - 1];
+}
+
+function ext(path: string) {
+    const parts = path.split('.');
+
+    if (last(parts) === 'skl') {
+        parts.pop();
+    }
+
+    return last(parts);
+}
+
 function parseFile(text: string, path: string): JSONValue | string {
     if (typeof text !== 'string') {
         return text;
     }
 
-    switch (extname(path)) {
-        case '.yaml':
+    switch (ext(path)) {
+        case 'yaml':
             return load(text) as object;
-        case '.json':
+        case 'json':
             return JSON.parse(text);
         default:
             return text;
@@ -23,22 +36,22 @@ function stringifyFile(content: JSONValue | string, path: string): string {
         return content;
     }
 
-    switch (extname(path)) {
-        case '.yaml':
+    switch (ext(path)) {
+        case 'yaml':
             return dump(content);
-        case '.json':
+        case 'json':
             return JSON.stringify(content);
         default:
             return content as unknown as string;
     }
 }
 
-export async function loadFile<T = string | JSONValue>(path: string): Promise<T> {
+export async function loadFile<T = string | JSONValue>(path: string, resolve = true): Promise<T> {
     const text = await readFile(path, 'utf8');
 
     let content = parseFile(text, path);
 
-    if (content && typeof content === 'object') {
+    if (content && typeof content === 'object' && resolve) {
         content = await resolveRefs(content, path, parseFile);
     }
 
@@ -50,3 +63,27 @@ export async function dumpFile(path: string, content: string | JSONValue) {
 
     await writeFile(path, text, 'utf8');
 }
+
+/**
+ * Takes toc schema if file matched as toc.
+ * Takes leading schema if file matched as leading page.
+ * Takes presets schema if file matched as presets.
+ * Any way translation inner logic will search `$schema` attribute with high priority.
+ * If `$schema` attribute not found anc precise schema not resolved,
+ * we think that current yaml is a part of complex toc.yaml
+ */
+export async function resolveSchemas(path: string) {
+    if (path.endsWith('toc.yaml')) {
+        return [await loadFile('schemas/toc-schema.yaml', false)];
+    }
+
+    if (path.endsWith('index.yaml')) {
+        return [await loadFile('schemas/leading-schema.yaml', false)];
+    }
+
+    if (path.endsWith('presets.yaml')) {
+        return [await loadFile('schemas/presets-schema.yaml', false)];
+    }
+
+    return [await loadFile('schemas/toc-schema.yaml', false)];
+}

package/src/cmd/translate/utils/index.ts

@@ -3,7 +3,7 @@ import {basename, dirname, extname, resolve} from 'path';
 import {readFileSync} from 'node:fs';
 import glob from 'glob';
 
-export {dumpFile, loadFile} from './fs';
+export {dumpFile, loadFile, resolveSchemas} from './fs';
 export {extract, compose} from './translate';
 export {TranslateError, LimitExceed, RequestError, AuthError} from './errors';
 
@@ -138,10 +138,6 @@ function normalizeInput(params: TranslateArgs, language: string, exts: string[])
     return {input, files};
 }
 
-export function resolveSchemas(_path: string) {
-    return null;
-}
-
 export class Defer<T = string> {
     resolve!: (text: T) => void;