@mfgames-writing/format 3.1.1 → 3.2.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/lib/build.d.ts +2 -6
- package/lib/build.d.ts.map +1 -1
- package/lib/build.js +5 -2
- package/lib/build.js.map +1 -1
- package/lib/cli.d.ts +1 -1
- package/lib/content.d.ts +1 -1
- package/lib/image.d.ts +2 -4
- package/lib/includes.d.ts +7 -0
- package/lib/includes.d.ts.map +1 -0
- package/lib/includes.js +63 -0
- package/lib/includes.js.map +1 -0
- package/lib/index.d.ts +2 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/markdown.d.ts +2 -4
- package/lib/plugins.d.ts +2 -6
- package/lib/tests/OverrideTheme.d.ts +3 -11
- package/lib/tests/overrides-theme.d.ts +1 -1
- package/lib/tests/theme-overrides.test.d.ts +1 -1
- package/package.json +6 -4
package/lib/build.d.ts
CHANGED
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
export declare function runBuild(
|
|
2
|
-
|
|
3
|
-
packageJson: any,
|
|
4
|
-
logger: any
|
|
5
|
-
): Promise<any>;
|
|
6
|
-
//# sourceMappingURL=build.d.ts.map
|
|
1
|
+
export declare function runBuild(argv: any, packageJson: any, logger: any): Promise<any>;
|
|
2
|
+
//# sourceMappingURL=build.d.ts.map
|
package/lib/build.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAmBA,wBAAsB,QAAQ,CAC1B,IAAI,EAAE,GAAG,EACT,WAAW,EAAE,GAAG,EAChB,MAAM,EAAE,GAAG,GACZ,OAAO,CAAC,GAAG,CAAC,CAcd"}
|
package/lib/build.js
CHANGED
|
@@ -19,6 +19,7 @@ const Finder = require("fs-finder");
|
|
|
19
19
|
const mkdirp = require("mkdirp-promise");
|
|
20
20
|
const uuid = require("uuid");
|
|
21
21
|
const liquid = require("liquid-node");
|
|
22
|
+
const includes_1 = require("./includes");
|
|
22
23
|
function runBuild(argv, packageJson, logger) {
|
|
23
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
25
|
// The entire build system is based on promises. We start with the
|
|
@@ -43,7 +44,7 @@ exports.runBuild = runBuild;
|
|
|
43
44
|
* promise, otherwise it returns the resulting file.
|
|
44
45
|
*/
|
|
45
46
|
function loadPublication(args, argv) {
|
|
46
|
-
let promise = new Promise((resolve, reject) => {
|
|
47
|
+
let promise = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
|
47
48
|
// If we have a file provided, use that.
|
|
48
49
|
let publicationFile = undefined;
|
|
49
50
|
if (argv.c) {
|
|
@@ -76,11 +77,13 @@ function loadPublication(args, argv) {
|
|
|
76
77
|
args.rootDirectory = path.dirname(publicationFile);
|
|
77
78
|
args.publicationFile = publicationFile;
|
|
78
79
|
args.publication = config;
|
|
80
|
+
// Resolve any include statements.
|
|
81
|
+
yield (0, includes_1.mergeIncludes)(args);
|
|
79
82
|
// Ensure every content has a process data which is used to pass values.
|
|
80
83
|
prepareContents(config.contents);
|
|
81
84
|
// Finish up processing this file.
|
|
82
85
|
resolve(args);
|
|
83
|
-
});
|
|
86
|
+
}));
|
|
84
87
|
// Return the resulting promise chain.
|
|
85
88
|
return promise;
|
|
86
89
|
}
|
package/lib/build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAQoC;AACpC,6BAA6B;AAC7B,uCAAuC;AACvC,uCAAyE;AACzE,uCAAuC;AACvC,oCAAqC;AACrC,yCAA0C;AAC1C,6BAA8B;AAC9B,sCAAuC;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
|
package/lib/cli.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=cli.d.ts.map
|
|
2
|
+
//# sourceMappingURL=cli.d.ts.map
|
package/lib/content.d.ts
CHANGED
|
@@ -13,4 +13,4 @@ export declare function loadContents(args: EditionArgs): Promise<EditionArgs>;
|
|
|
13
13
|
* Renders the various content for inclusion with the format.
|
|
14
14
|
*/
|
|
15
15
|
export declare function renderContents(args: EditionArgs): Promise<EditionArgs>;
|
|
16
|
-
//# sourceMappingURL=content.d.ts.map
|
|
16
|
+
//# sourceMappingURL=content.d.ts.map
|
package/lib/image.d.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
1
|
import { ContentArgs } from "@mfgames-writing/contracts";
|
|
2
|
-
export declare function processImages(
|
|
3
|
-
|
|
4
|
-
): Promise<ContentArgs>;
|
|
5
|
-
//# sourceMappingURL=image.d.ts.map
|
|
2
|
+
export declare function processImages(content: ContentArgs): Promise<ContentArgs>;
|
|
3
|
+
//# sourceMappingURL=image.d.ts.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { PublicationArgs } from "@mfgames-writing/contracts";
|
|
2
|
+
/**
|
|
3
|
+
* Processes the publication file and handles any include statements that
|
|
4
|
+
* may be included.
|
|
5
|
+
*/
|
|
6
|
+
export declare function mergeIncludes(args: PublicationArgs): Promise<void>;
|
|
7
|
+
//# sourceMappingURL=includes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"includes.d.ts","sourceRoot":"","sources":["../src/includes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAe,MAAM,4BAA4B,CAAC;AAK1E;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAWxE"}
|
package/lib/includes.js
ADDED
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.mergeIncludes = void 0;
|
|
13
|
+
const path = require("path");
|
|
14
|
+
const fs_1 = require("fs");
|
|
15
|
+
const set = require("lodash.set");
|
|
16
|
+
/**
|
|
17
|
+
* Processes the publication file and handles any include statements that
|
|
18
|
+
* may be included.
|
|
19
|
+
*/
|
|
20
|
+
function mergeIncludes(args) {
|
|
21
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
// If we don't have an include statement, then nothing to do.
|
|
23
|
+
if (!args.publication.includes) {
|
|
24
|
+
args.logger.debug("no include statements to process");
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
// Loop through each include and process them.
|
|
28
|
+
for (const include of args.publication.includes) {
|
|
29
|
+
yield mergeInclude(args, include);
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
exports.mergeIncludes = mergeIncludes;
|
|
34
|
+
function mergeInclude(args, include) {
|
|
35
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
36
|
+
// Report what we're doing.
|
|
37
|
+
const publication = args.publication;
|
|
38
|
+
const directory = args.rootDirectory;
|
|
39
|
+
const log = args.logger;
|
|
40
|
+
log.info("merging include", include);
|
|
41
|
+
// The first thing is to figure out what we're going to be including.
|
|
42
|
+
// We start with a `{}` because everything could be optional and we
|
|
43
|
+
// want to allow multiples.
|
|
44
|
+
let data = {};
|
|
45
|
+
if (include.json) {
|
|
46
|
+
// Get the normalized path to the json.
|
|
47
|
+
const jsonPath = path.isAbsolute(include.json)
|
|
48
|
+
? include.json
|
|
49
|
+
: path.join(directory, include.json);
|
|
50
|
+
const rawJson = yield fs_1.promises.readFile(jsonPath);
|
|
51
|
+
const jsonData = JSON.parse(rawJson.toString());
|
|
52
|
+
log.trace("including JSON:", jsonPath, jsonData);
|
|
53
|
+
data = Object.assign(Object.assign({}, data), jsonData);
|
|
54
|
+
}
|
|
55
|
+
log.trace("final merged object", data);
|
|
56
|
+
// We've gotten all the data combined together, now merge it.
|
|
57
|
+
for (const merge of [include.merge].flat()) {
|
|
58
|
+
set(publication, merge, data);
|
|
59
|
+
log.debug("merging into", merge);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=includes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"includes.js","sourceRoot":"","sources":["../src/includes.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6BAA6B;AAC7B,2BAAoC;AACpC,kCAAkC;AAElC;;;GAGG;AACH,SAAsB,aAAa,CAAC,IAAqB;;QACrD,6DAA6D;QAC7D,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,OAAO;SACV;QAED,8CAA8C;QAC9C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;YAC7C,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACrC;IACL,CAAC;CAAA;AAXD,sCAWC;AAED,SAAe,YAAY,CACvB,IAAqB,EACrB,OAAoB;;QAEpB,2BAA2B;QAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;QAExB,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAErC,qEAAqE;QACrE,mEAAmE;QACnE,2BAA2B;QAC3B,IAAI,IAAI,GAAG,EAAE,CAAC;QAEd,IAAI,OAAO,CAAC,IAAI,EAAE;YACd,uCAAuC;YACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC1C,CAAC,CAAC,OAAO,CAAC,IAAI;gBACd,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,OAAO,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEhD,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAEjD,IAAI,mCAAQ,IAAI,GAAK,QAAQ,CAAE,CAAC;SACnC;QAED,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;QAEvC,6DAA6D;QAC7D,KAAK,MAAM,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YACxC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC9B,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;SACpC;IACL,CAAC;CAAA"}
|
package/lib/index.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export * from "./build";
|
|
|
5
5
|
export * from "./configs";
|
|
6
6
|
export * from "./content";
|
|
7
7
|
export * from "./image";
|
|
8
|
+
export * from "./includes";
|
|
8
9
|
export * from "./markdown";
|
|
9
10
|
export * from "./plugins";
|
|
10
|
-
//# sourceMappingURL=index.d.ts.map
|
|
11
|
+
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -17,6 +17,7 @@ __exportStar(require("./build"), exports);
|
|
|
17
17
|
__exportStar(require("./configs"), exports);
|
|
18
18
|
__exportStar(require("./content"), exports);
|
|
19
19
|
__exportStar(require("./image"), exports);
|
|
20
|
+
__exportStar(require("./includes"), exports);
|
|
20
21
|
__exportStar(require("./markdown"), exports);
|
|
21
22
|
__exportStar(require("./plugins"), exports);
|
|
22
23
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;AAEH,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,4CAA0B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;AAEH,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,6CAA2B;AAC3B,4CAA0B"}
|
package/lib/markdown.d.ts
CHANGED
|
@@ -2,7 +2,5 @@ import { ContentArgs } from "@mfgames-writing/contracts";
|
|
|
2
2
|
/**
|
|
3
3
|
* Renders a Markdown file as HTML.
|
|
4
4
|
*/
|
|
5
|
-
export declare function renderContentMarkdown(
|
|
6
|
-
|
|
7
|
-
): Promise<ContentArgs>;
|
|
8
|
-
//# sourceMappingURL=markdown.d.ts.map
|
|
5
|
+
export declare function renderContentMarkdown(content: ContentArgs): Promise<ContentArgs>;
|
|
6
|
+
//# sourceMappingURL=markdown.d.ts.map
|
package/lib/plugins.d.ts
CHANGED
|
@@ -1,7 +1,3 @@
|
|
|
1
1
|
import { EditionArgs } from "@mfgames-writing/contracts";
|
|
2
|
-
export declare function loadModule(
|
|
3
|
-
|
|
4
|
-
name: string,
|
|
5
|
-
requireDefault?: boolean
|
|
6
|
-
): any;
|
|
7
|
-
//# sourceMappingURL=plugins.d.ts.map
|
|
2
|
+
export declare function loadModule(args: EditionArgs, name: string, requireDefault?: boolean): any;
|
|
3
|
+
//# sourceMappingURL=plugins.d.ts.map
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import {
|
|
3
|
-
Theme,
|
|
4
|
-
EditionArgs,
|
|
5
|
-
ContentArgs,
|
|
6
|
-
ContentTheme,
|
|
7
|
-
} from "@mfgames-writing/contracts";
|
|
2
|
+
import { Theme, EditionArgs, ContentArgs, ContentTheme } from "@mfgames-writing/contracts";
|
|
8
3
|
import Token = require("markdown-it/lib/token");
|
|
9
4
|
export declare class OverrideTheme implements Theme {
|
|
10
5
|
stylesheetFileName: string;
|
|
@@ -21,11 +16,8 @@ export declare class OverrideTheme implements Theme {
|
|
|
21
16
|
renderHtml(args: ContentArgs): Promise<ContentArgs>;
|
|
22
17
|
renderLayout(args: ContentArgs): Promise<ContentArgs>;
|
|
23
18
|
renderNavigationTitle(args: ContentArgs): string;
|
|
24
|
-
renderStylesheet(
|
|
25
|
-
args: EditionArgs,
|
|
26
|
-
mode?: string | string[] | undefined
|
|
27
|
-
): Buffer;
|
|
19
|
+
renderStylesheet(args: EditionArgs, mode?: string | string[] | undefined): Buffer;
|
|
28
20
|
renderTableOfContents(args: ContentArgs): Promise<ContentArgs>;
|
|
29
21
|
getContentTheme(content: ContentArgs): ContentTheme;
|
|
30
22
|
}
|
|
31
|
-
//# sourceMappingURL=OverrideTheme.d.ts.map
|
|
23
|
+
//# sourceMappingURL=OverrideTheme.d.ts.map
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=theme-overrides.test.d.ts.map
|
|
2
|
+
//# sourceMappingURL=theme-overrides.test.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mfgames-writing/format",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.2.0",
|
|
4
4
|
"description": "A command-line framework for formatting books into a variety of formats and themes.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ebook",
|
|
@@ -46,6 +46,7 @@
|
|
|
46
46
|
"jimp": "^0.3.5",
|
|
47
47
|
"js-yaml": "^3.6.1",
|
|
48
48
|
"liquid-node": "^2.6.1",
|
|
49
|
+
"lodash.set": "^4.3.2",
|
|
49
50
|
"markdown-it": "^12.2.0",
|
|
50
51
|
"marked": "^0.3.5",
|
|
51
52
|
"mkdirp": "^0.5.1",
|
|
@@ -72,13 +73,14 @@
|
|
|
72
73
|
"@types/js-yaml": "^3.5.21-alpha",
|
|
73
74
|
"@types/markdown-it": "^12.0.3",
|
|
74
75
|
"@types/marked": "0.0.26-alpha",
|
|
75
|
-
"@types/node": "
|
|
76
|
+
"@types/node": "16.11.7",
|
|
76
77
|
"@types/read-pkg-up": "^3.0.1",
|
|
77
78
|
"@types/uuidjs": "^3.3.1",
|
|
78
79
|
"@types/yargs": "0.0.21-alpha",
|
|
79
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
80
|
+
"@typescript-eslint/eslint-plugin": "^5.10.2",
|
|
81
|
+
"@typescript-eslint/parser": "^5.10.2",
|
|
80
82
|
"barrelsby": "^1.0.2",
|
|
81
|
-
"eslint": "^
|
|
83
|
+
"eslint": "^8.8.0",
|
|
82
84
|
"expect": "^22.4.3",
|
|
83
85
|
"jest": "^26",
|
|
84
86
|
"rimraf": "^2.6.2",
|