@diplodoc/cli 4.11.0 → 4.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/index.js +63 -24
- package/build/index.js.map +2 -2
- package/build/linter.js +22 -5
- package/build/linter.js.map +2 -2
- package/package.json +2 -2
- package/src/cmd/build/index.ts +6 -0
- package/src/models.ts +12 -3
- package/src/resolvers/md2html.ts +11 -5
- package/src/resolvers/md2md.ts +1 -0
- package/src/services/metadata.ts +34 -6
- package/src/services/preset.ts +3 -2
- package/src/utils/markup.ts +37 -20
- package/src/utils/presets.ts +5 -2
package/build/linter.js
CHANGED
|
@@ -210,6 +210,7 @@ function isExternalHref(href) {
|
|
|
210
210
|
// src/utils/markup.ts
|
|
211
211
|
var import_ssr = require("@diplodoc/client/ssr");
|
|
212
212
|
var import_manifest = __toESM(require("@diplodoc/client/manifest"));
|
|
213
|
+
var import_html_escaper = require("html-escaper");
|
|
213
214
|
var \u0441arriage = import_process.platform === "win32" /* WINDOWS */ ? "\r\n" : "\n";
|
|
214
215
|
|
|
215
216
|
// src/utils/path.ts
|
|
@@ -304,7 +305,8 @@ function isObject(o) {
|
|
|
304
305
|
var import_path6 = require("path");
|
|
305
306
|
function getVarsPerFile(filePath) {
|
|
306
307
|
const { vars: argVars } = argv_default.getConfig();
|
|
307
|
-
|
|
308
|
+
const result = __spreadValues(__spreadValues({}, preset_default.get((0, import_path6.dirname)(filePath))), argVars);
|
|
309
|
+
return result;
|
|
308
310
|
}
|
|
309
311
|
function getVarsPerRelativeFile(filePath) {
|
|
310
312
|
const { input } = argv_default.getConfig();
|
|
@@ -337,10 +339,11 @@ function getContentWithUpdatedStaticMetadata({
|
|
|
337
339
|
addSystemMeta,
|
|
338
340
|
addSourcePath,
|
|
339
341
|
resources,
|
|
340
|
-
systemVars
|
|
342
|
+
systemVars,
|
|
343
|
+
metadataVars = []
|
|
341
344
|
}) {
|
|
342
345
|
const newMetadatas = [];
|
|
343
|
-
if ((!addSystemMeta || !systemVars) && !addSourcePath && !resources) {
|
|
346
|
+
if ((!addSystemMeta || !systemVars) && !addSourcePath && !resources && metadataVars.length === 0) {
|
|
344
347
|
return fileContent;
|
|
345
348
|
}
|
|
346
349
|
const matches = matchMetadata(fileContent);
|
|
@@ -356,7 +359,19 @@ function getContentWithUpdatedStaticMetadata({
|
|
|
356
359
|
}
|
|
357
360
|
if (matches && matches.length > 0) {
|
|
358
361
|
const [, fileMetadata, , fileMainContent] = matches;
|
|
359
|
-
|
|
362
|
+
if (!metadataVars.length) {
|
|
363
|
+
return `${getUpdatedMetadataString(newMetadatas, fileMetadata)}${fileMainContent}`;
|
|
364
|
+
}
|
|
365
|
+
const parsed = (0, import_js_yaml.load)(fileMetadata);
|
|
366
|
+
if (!Array.isArray(parsed.metadata)) {
|
|
367
|
+
parsed.metadata = [parsed.metadata];
|
|
368
|
+
}
|
|
369
|
+
parsed.metadata = parsed.metadata.concat(metadataVars);
|
|
370
|
+
const patchedMetada = (0, import_js_yaml.dump)(parsed);
|
|
371
|
+
return `${getUpdatedMetadataString(newMetadatas, patchedMetada)}${fileMainContent}`;
|
|
372
|
+
}
|
|
373
|
+
if (metadataVars.length) {
|
|
374
|
+
newMetadatas.push((0, import_js_yaml.dump)({ metadata: metadataVars }));
|
|
360
375
|
}
|
|
361
376
|
return `${getUpdatedMetadataString(newMetadatas)}${fileContent}`;
|
|
362
377
|
}
|
|
@@ -970,7 +985,9 @@ var tocs_default = {
|
|
|
970
985
|
var import_path14 = require("path");
|
|
971
986
|
var presetStorage = /* @__PURE__ */ new Map();
|
|
972
987
|
function add2(parsedPreset, path, varsPreset) {
|
|
973
|
-
const combinedValues = __spreadValues(__spreadValues({}, parsedPreset.default || {}), parsedPreset[varsPreset] || {})
|
|
988
|
+
const combinedValues = __spreadProps(__spreadValues(__spreadValues({}, parsedPreset.default || {}), parsedPreset[varsPreset] || {}), {
|
|
989
|
+
__metadata: parsedPreset.__metadata
|
|
990
|
+
});
|
|
974
991
|
const key = (0, import_path14.dirname)((0, import_path14.normalize)(path));
|
|
975
992
|
presetStorage.set(key, combinedValues);
|
|
976
993
|
}
|