writr 1.9.1 → 1.9.2
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/bin/writr.js +7 -0
- package/dist/cache.d.ts +3 -3
- package/dist/cache.js +9 -16
- package/dist/cache.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.js +7 -15
- package/dist/config.js.map +1 -1
- package/dist/data/dataProviderInterface.d.ts +3 -3
- package/dist/data/dataProviderInterface.js +1 -2
- package/dist/data/dataService.d.ts +5 -5
- package/dist/data/dataService.js +10 -17
- package/dist/data/dataService.js.map +1 -1
- package/dist/data/fileDataProvider.d.ts +4 -4
- package/dist/data/fileDataProvider.js +15 -22
- package/dist/data/fileDataProvider.js.map +1 -1
- package/dist/generator.d.ts +2 -2
- package/dist/generator.js +16 -23
- package/dist/generator.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +18 -22
- package/dist/index.js.map +1 -1
- package/dist/log.js +3 -7
- package/dist/log.js.map +1 -1
- package/dist/migrate/ghostMigrationProvider.d.ts +1 -1
- package/dist/migrate/ghostMigrationProvider.js +12 -19
- package/dist/migrate/ghostMigrationProvider.js.map +1 -1
- package/dist/migrate/jekyllMigrationProvider.d.ts +1 -1
- package/dist/migrate/jekyllMigrationProvider.js +6 -10
- package/dist/migrate/jekyllMigrationProvider.js.map +1 -1
- package/dist/migrate/mediumMigrationProvider.d.ts +1 -1
- package/dist/migrate/mediumMigrationProvider.js +11 -18
- package/dist/migrate/mediumMigrationProvider.js.map +1 -1
- package/dist/migrate/migrationProviderInterface.js +1 -2
- package/dist/migrate/wordpressMigrationProvider.d.ts +1 -1
- package/dist/migrate/wordpressMigrationProvider.js +15 -22
- package/dist/migrate/wordpressMigrationProvider.js.map +1 -1
- package/dist/migrate.js +9 -13
- package/dist/migrate.js.map +1 -1
- package/dist/post.js +9 -16
- package/dist/post.js.map +1 -1
- package/dist/render/atomRenderProvider.d.ts +3 -3
- package/dist/render/atomRenderProvider.js +7 -11
- package/dist/render/atomRenderProvider.js.map +1 -1
- package/dist/render/htmRenderlProvider.d.ts +5 -5
- package/dist/render/htmRenderlProvider.js +10 -15
- package/dist/render/htmRenderlProvider.js.map +1 -1
- package/dist/render/imageRenderProvider.d.ts +3 -3
- package/dist/render/imageRenderProvider.js +5 -9
- package/dist/render/imageRenderProvider.js.map +1 -1
- package/dist/render/jsonRenderProvider.d.ts +3 -3
- package/dist/render/jsonRenderProvider.js +5 -9
- package/dist/render/jsonRenderProvider.js.map +1 -1
- package/dist/render/renderProviderInterface.d.ts +2 -2
- package/dist/render/renderProviderInterface.js +1 -2
- package/dist/serve.d.ts +1 -1
- package/dist/serve.js +5 -12
- package/dist/serve.js.map +1 -1
- package/dist/storage/fileStorageProvider.d.ts +1 -1
- package/dist/storage/fileStorageProvider.js +14 -21
- package/dist/storage/fileStorageProvider.js.map +1 -1
- package/dist/storage/storageProviderInterface.js +1 -2
- package/dist/storage/storageService.d.ts +1 -1
- package/dist/storage/storageService.js +3 -7
- package/dist/storage/storageService.js.map +1 -1
- package/dist/tag.d.ts +1 -1
- package/dist/tag.js +3 -7
- package/dist/tag.js.map +1 -1
- package/dist/utils/parser.js +3 -7
- package/dist/utils/parser.js.map +1 -1
- package/dist/utils/setup.js +12 -19
- package/dist/utils/setup.js.map +1 -1
- package/package.json +26 -23
- package/bin/writr +0 -9
package/bin/writr.js
ADDED
package/dist/cache.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Config } from "./config";
|
|
2
|
-
import { Post } from "./post";
|
|
3
|
-
import { Tag } from "./tag";
|
|
1
|
+
import { Config } from "./config.js";
|
|
2
|
+
import { Post } from "./post.js";
|
|
3
|
+
import { Tag } from "./tag.js";
|
|
4
4
|
import Keyv from "keyv";
|
|
5
5
|
export declare class Cache {
|
|
6
6
|
cache: Keyv;
|
package/dist/cache.js
CHANGED
|
@@ -1,22 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.Cache = void 0;
|
|
7
|
-
const post_1 = require("./post");
|
|
8
|
-
const tag_1 = require("./tag");
|
|
9
|
-
const keyv_1 = __importDefault(require("keyv"));
|
|
10
|
-
class Cache {
|
|
1
|
+
import { Post } from "./post.js";
|
|
2
|
+
import { Tag } from "./tag.js";
|
|
3
|
+
import Keyv from "keyv";
|
|
4
|
+
export class Cache {
|
|
11
5
|
constructor(config) {
|
|
12
|
-
this.cache = new
|
|
6
|
+
this.cache = new Keyv({ ttl: config.cache.ttl, namespace: "data-cache" });
|
|
13
7
|
}
|
|
14
8
|
//cache
|
|
15
9
|
async getPost(key) {
|
|
16
10
|
key = this.formatName(key, "post");
|
|
17
11
|
let result = await this.cache.get(key);
|
|
18
12
|
if (result) {
|
|
19
|
-
result =
|
|
13
|
+
result = Post.create(result);
|
|
20
14
|
}
|
|
21
15
|
return result;
|
|
22
16
|
}
|
|
@@ -29,7 +23,7 @@ class Cache {
|
|
|
29
23
|
if (result) {
|
|
30
24
|
let posts = new Array();
|
|
31
25
|
for (let i = 0; i < result.length; i++) {
|
|
32
|
-
posts.push(
|
|
26
|
+
posts.push(Post.create(result[i]));
|
|
33
27
|
}
|
|
34
28
|
result = posts;
|
|
35
29
|
}
|
|
@@ -42,7 +36,7 @@ class Cache {
|
|
|
42
36
|
key = this.formatName(key, "tag");
|
|
43
37
|
let result = await this.cache.get(key);
|
|
44
38
|
if (result) {
|
|
45
|
-
result =
|
|
39
|
+
result = Tag.create(result);
|
|
46
40
|
}
|
|
47
41
|
return result;
|
|
48
42
|
}
|
|
@@ -55,7 +49,7 @@ class Cache {
|
|
|
55
49
|
if (result) {
|
|
56
50
|
let tags = new Array();
|
|
57
51
|
for (let i = 0; i < result.length; i++) {
|
|
58
|
-
tags.push(
|
|
52
|
+
tags.push(Tag.create(result[i]));
|
|
59
53
|
}
|
|
60
54
|
result = tags;
|
|
61
55
|
}
|
|
@@ -73,5 +67,4 @@ class Cache {
|
|
|
73
67
|
return result;
|
|
74
68
|
}
|
|
75
69
|
}
|
|
76
|
-
exports.Cache = Cache;
|
|
77
70
|
//# sourceMappingURL=cache.js.map
|
package/dist/cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
package/dist/config.js
CHANGED
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ConfigCache = exports.Config = void 0;
|
|
7
|
-
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
8
|
-
const log_1 = require("./log");
|
|
9
|
-
class Config {
|
|
1
|
+
import fs from "fs-extra";
|
|
2
|
+
import { ConsoleMessage } from "./log.js";
|
|
3
|
+
export class Config {
|
|
10
4
|
constructor(config = undefined) {
|
|
11
5
|
this.cache = new ConfigCache();
|
|
12
|
-
this.log = new
|
|
6
|
+
this.log = new ConsoleMessage();
|
|
13
7
|
this.program = {};
|
|
14
8
|
this.provider = {};
|
|
15
9
|
this.render = ["html", "json", "atom"];
|
|
@@ -34,8 +28,8 @@ class Config {
|
|
|
34
28
|
}
|
|
35
29
|
loadConfig(filePath) {
|
|
36
30
|
let result = false;
|
|
37
|
-
if (
|
|
38
|
-
let buff =
|
|
31
|
+
if (fs.existsSync(filePath)) {
|
|
32
|
+
let buff = fs.readFileSync(filePath);
|
|
39
33
|
let obj = JSON.parse(buff.toString());
|
|
40
34
|
this.parse(obj);
|
|
41
35
|
result = true;
|
|
@@ -100,13 +94,11 @@ class Config {
|
|
|
100
94
|
}
|
|
101
95
|
}
|
|
102
96
|
}
|
|
103
|
-
|
|
104
|
-
class ConfigCache {
|
|
97
|
+
export class ConfigCache {
|
|
105
98
|
constructor() {
|
|
106
99
|
this.connection = "";
|
|
107
100
|
this.ttl = 6000;
|
|
108
101
|
this.type = "memory";
|
|
109
102
|
}
|
|
110
103
|
}
|
|
111
|
-
exports.ConfigCache = ConfigCache;
|
|
112
104
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Config } from "../config";
|
|
2
|
-
import { Post } from "../post";
|
|
3
|
-
import { Tag } from "../tag";
|
|
1
|
+
import { Config } from "../config.js";
|
|
2
|
+
import { Post } from "../post.js";
|
|
3
|
+
import { Tag } from "../tag.js";
|
|
4
4
|
export interface DataProviderInterface {
|
|
5
5
|
getPost(id: string): Promise<Post | undefined>;
|
|
6
6
|
getPosts(): Promise<Array<Post>>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Config } from "../config";
|
|
2
|
-
import { Post } from "../post";
|
|
3
|
-
import { Tag } from "../tag";
|
|
4
|
-
import { DataProviderInterface } from "./dataProviderInterface";
|
|
5
|
-
import { Cache } from "../cache";
|
|
1
|
+
import { Config } from "../config.js";
|
|
2
|
+
import { Post } from "../post.js";
|
|
3
|
+
import { Tag } from "../tag.js";
|
|
4
|
+
import { DataProviderInterface } from "./dataProviderInterface.js";
|
|
5
|
+
import { Cache } from "../cache.js";
|
|
6
6
|
export declare class DataService {
|
|
7
7
|
config: Config;
|
|
8
8
|
cache: Cache;
|
package/dist/data/dataService.js
CHANGED
|
@@ -1,16 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.DataService = void 0;
|
|
7
|
-
const fileDataProvider_1 = require("./fileDataProvider");
|
|
8
|
-
const cache_1 = require("../cache");
|
|
9
|
-
const array_sort_1 = __importDefault(require("array-sort"));
|
|
10
|
-
class DataService {
|
|
1
|
+
import { FileDataProvider } from "./fileDataProvider.js";
|
|
2
|
+
import { Cache } from "../cache.js";
|
|
3
|
+
import arraySort from "array-sort";
|
|
4
|
+
export class DataService {
|
|
11
5
|
constructor(config) {
|
|
12
6
|
this.config = config;
|
|
13
|
-
this.cache = new
|
|
7
|
+
this.cache = new Cache(this.config);
|
|
14
8
|
}
|
|
15
9
|
//posts
|
|
16
10
|
async getPost(id) {
|
|
@@ -30,7 +24,7 @@ class DataService {
|
|
|
30
24
|
if (!posts) {
|
|
31
25
|
result = await this.getProvider().getPosts();
|
|
32
26
|
//sort
|
|
33
|
-
result = (
|
|
27
|
+
result = arraySort(result, "date", { reverse: true });
|
|
34
28
|
//cache
|
|
35
29
|
await this.cache.setPosts(cacheKey, result);
|
|
36
30
|
}
|
|
@@ -46,7 +40,7 @@ class DataService {
|
|
|
46
40
|
if (!posts) {
|
|
47
41
|
result = await this.getProvider().getPublishedPosts();
|
|
48
42
|
//sort
|
|
49
|
-
result = (
|
|
43
|
+
result = arraySort(result, "date", { reverse: true });
|
|
50
44
|
//cache
|
|
51
45
|
await this.cache.setPosts(cacheKey, result);
|
|
52
46
|
}
|
|
@@ -99,7 +93,7 @@ class DataService {
|
|
|
99
93
|
if (!tags) {
|
|
100
94
|
result = await this.getProvider().getTags();
|
|
101
95
|
//sort
|
|
102
|
-
result = (
|
|
96
|
+
result = arraySort(result, "id", { reverse: false });
|
|
103
97
|
await this.cache.setTags(cacheKey, result);
|
|
104
98
|
}
|
|
105
99
|
else {
|
|
@@ -114,7 +108,7 @@ class DataService {
|
|
|
114
108
|
if (!tags) {
|
|
115
109
|
result = await this.getProvider().getPublishedTags();
|
|
116
110
|
//sort
|
|
117
|
-
result = (
|
|
111
|
+
result = arraySort(result, "id", { reverse: false });
|
|
118
112
|
await this.cache.setTags(cacheKey, result);
|
|
119
113
|
}
|
|
120
114
|
else {
|
|
@@ -126,12 +120,11 @@ class DataService {
|
|
|
126
120
|
let result;
|
|
127
121
|
switch (this.config.provider.name) {
|
|
128
122
|
default:
|
|
129
|
-
result = new
|
|
123
|
+
result = new FileDataProvider();
|
|
130
124
|
break;
|
|
131
125
|
}
|
|
132
126
|
result.init(this.config);
|
|
133
127
|
return result;
|
|
134
128
|
}
|
|
135
129
|
}
|
|
136
|
-
exports.DataService = DataService;
|
|
137
130
|
//# sourceMappingURL=dataService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataService.js","sourceRoot":"","sources":["../../src/data/dataService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dataService.js","sourceRoot":"","sources":["../../src/data/dataService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Post } from "../post";
|
|
2
|
-
import { Tag } from "../tag";
|
|
3
|
-
import { Config } from "../config";
|
|
4
|
-
import { DataProviderInterface } from "./dataProviderInterface";
|
|
1
|
+
import { Post } from "../post.js";
|
|
2
|
+
import { Tag } from "../tag.js";
|
|
3
|
+
import { Config } from "../config.js";
|
|
4
|
+
import { DataProviderInterface } from "./dataProviderInterface.js";
|
|
5
5
|
export declare class FileDataProvider implements DataProviderInterface {
|
|
6
6
|
__postPath: string;
|
|
7
7
|
__posts: Array<Post>;
|
|
@@ -1,19 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const post_1 = require("../post");
|
|
8
|
-
const tag_1 = require("../tag");
|
|
9
|
-
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
10
|
-
const gray_matter_1 = __importDefault(require("gray-matter"));
|
|
11
|
-
const log_1 = require("../log");
|
|
12
|
-
class FileDataProvider {
|
|
1
|
+
import { Post } from "../post.js";
|
|
2
|
+
import { Tag } from "../tag.js";
|
|
3
|
+
import fs from "fs-extra";
|
|
4
|
+
import matter from 'gray-matter';
|
|
5
|
+
import { ConsoleMessage } from "../log.js";
|
|
6
|
+
export class FileDataProvider {
|
|
13
7
|
constructor() {
|
|
14
8
|
this.__postPath = "";
|
|
15
9
|
this.__posts = [];
|
|
16
|
-
this.log = new
|
|
10
|
+
this.log = new ConsoleMessage();
|
|
17
11
|
}
|
|
18
12
|
init(config) {
|
|
19
13
|
if (config.path) {
|
|
@@ -38,8 +32,8 @@ class FileDataProvider {
|
|
|
38
32
|
};
|
|
39
33
|
if (this.__posts.length === 0) {
|
|
40
34
|
let directory = this.__postPath;
|
|
41
|
-
if (
|
|
42
|
-
let files =
|
|
35
|
+
if (fs.existsSync(directory)) {
|
|
36
|
+
let files = fs.readdirSync(directory);
|
|
43
37
|
for (const file of files) {
|
|
44
38
|
if (hasExtension(file, supportedExtensions)) {
|
|
45
39
|
let filePath = directory + "/" + file;
|
|
@@ -86,9 +80,9 @@ class FileDataProvider {
|
|
|
86
80
|
let result = new Array();
|
|
87
81
|
posts.forEach(post => {
|
|
88
82
|
post.tags.forEach(tagName => {
|
|
89
|
-
let tag = result.find(t => t.id === new
|
|
83
|
+
let tag = result.find(t => t.id === new Tag(tagName).id);
|
|
90
84
|
if (tag == null) {
|
|
91
|
-
tag = new
|
|
85
|
+
tag = new Tag(tagName);
|
|
92
86
|
result.push(tag);
|
|
93
87
|
}
|
|
94
88
|
let postExists = tag.posts.find(p => this.formatToKey(p.title) === this.formatToKey(post.title)) != null;
|
|
@@ -104,11 +98,11 @@ class FileDataProvider {
|
|
|
104
98
|
}
|
|
105
99
|
async parsePost(filePath) {
|
|
106
100
|
let result;
|
|
107
|
-
if (await
|
|
108
|
-
result = new
|
|
109
|
-
let buff = await
|
|
101
|
+
if (await fs.pathExists(filePath)) {
|
|
102
|
+
result = new Post();
|
|
103
|
+
let buff = await fs.readFile(filePath);
|
|
110
104
|
let data = buff.toString();
|
|
111
|
-
let m = (
|
|
105
|
+
let m = matter(data);
|
|
112
106
|
let mData = m.data;
|
|
113
107
|
result.matter = m.data;
|
|
114
108
|
result.content = m.content;
|
|
@@ -135,5 +129,4 @@ class FileDataProvider {
|
|
|
135
129
|
return result;
|
|
136
130
|
}
|
|
137
131
|
}
|
|
138
|
-
exports.FileDataProvider = FileDataProvider;
|
|
139
132
|
//# sourceMappingURL=fileDataProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileDataProvider.js","sourceRoot":"","sources":["../../src/data/fileDataProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fileDataProvider.js","sourceRoot":"","sources":["../../src/data/fileDataProvider.ts"],"names":[],"mappings":"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"}
|
package/dist/generator.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { DataService } from "./data/dataService";
|
|
2
|
-
import { Config } from "./config";
|
|
1
|
+
import { DataService } from "./data/dataService.js";
|
|
2
|
+
import { Config } from "./config.js";
|
|
3
3
|
export declare class SiteGenerator {
|
|
4
4
|
config: Config | undefined;
|
|
5
5
|
data: DataService | undefined;
|
package/dist/generator.js
CHANGED
|
@@ -1,20 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const jsonRenderProvider_1 = require("./render/jsonRenderProvider");
|
|
10
|
-
const atomRenderProvider_1 = require("./render/atomRenderProvider");
|
|
11
|
-
const imageRenderProvider_1 = require("./render/imageRenderProvider");
|
|
12
|
-
const dataService_1 = require("./data/dataService");
|
|
13
|
-
const config_1 = require("./config");
|
|
14
|
-
class SiteGenerator {
|
|
1
|
+
import fs from "fs-extra";
|
|
2
|
+
import { HtmlRenderProvider } from "./render/htmRenderlProvider.js";
|
|
3
|
+
import { JSONRenderProvider } from "./render/jsonRenderProvider.js";
|
|
4
|
+
import { AtomRenderProvider } from "./render/atomRenderProvider.js";
|
|
5
|
+
import { ImageRenderProvider } from "./render/imageRenderProvider.js";
|
|
6
|
+
import { DataService } from "./data/dataService.js";
|
|
7
|
+
import { Config } from "./config.js";
|
|
8
|
+
export class SiteGenerator {
|
|
15
9
|
constructor(options) {
|
|
16
10
|
const params = options.opts();
|
|
17
|
-
this.config = new
|
|
11
|
+
this.config = new Config();
|
|
18
12
|
if (params.config) {
|
|
19
13
|
this.config.loadConfig(params.config);
|
|
20
14
|
}
|
|
@@ -25,30 +19,30 @@ class SiteGenerator {
|
|
|
25
19
|
this.config.loadParams(params);
|
|
26
20
|
}
|
|
27
21
|
this.config.loadProgram(options);
|
|
28
|
-
this.data = new
|
|
22
|
+
this.data = new DataService(this.config);
|
|
29
23
|
}
|
|
30
24
|
async run() {
|
|
31
25
|
let result = true;
|
|
32
26
|
if (this.data === undefined || this.config === undefined) {
|
|
33
27
|
return false;
|
|
34
28
|
}
|
|
35
|
-
if (
|
|
36
|
-
|
|
29
|
+
if (fs.existsSync(this.config.output)) {
|
|
30
|
+
fs.removeSync(this.config.output);
|
|
37
31
|
}
|
|
38
32
|
let render = true;
|
|
39
33
|
for (let i = 0; i < this.config.render.length; i++) {
|
|
40
34
|
let type = this.config.render[i];
|
|
41
35
|
if (type === "html") {
|
|
42
|
-
render = await new
|
|
36
|
+
render = await new HtmlRenderProvider().render(this.data, this.config);
|
|
43
37
|
}
|
|
44
38
|
if (type === "json") {
|
|
45
|
-
render = await new
|
|
39
|
+
render = await new JSONRenderProvider().render(this.data, this.config);
|
|
46
40
|
}
|
|
47
41
|
if (type === "atom") {
|
|
48
|
-
render = await new
|
|
42
|
+
render = await new AtomRenderProvider().render(this.data, this.config);
|
|
49
43
|
}
|
|
50
44
|
if (type === "images") {
|
|
51
|
-
render = await new
|
|
45
|
+
render = await new ImageRenderProvider().render(this.data, this.config);
|
|
52
46
|
}
|
|
53
47
|
}
|
|
54
48
|
if (render) {
|
|
@@ -57,5 +51,4 @@ class SiteGenerator {
|
|
|
57
51
|
return result;
|
|
58
52
|
}
|
|
59
53
|
}
|
|
60
|
-
exports.SiteGenerator = SiteGenerator;
|
|
61
54
|
//# sourceMappingURL=generator.js.map
|
package/dist/generator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,mBAAmB,EAAC,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAEnC,MAAM,OAAO,aAAa;IAKzB,YAAY,OAAY;QACvB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAE3B,IAAI,MAAM,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACtC;QAED,IAAI,MAAM,CAAC,IAAI,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAClC;QAED,IAAI,MAAM,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;SAC9B;QAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAI,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,GAAG;QACR,IAAI,MAAM,GAAG,IAAI,CAAC;QAElB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YACzD,OAAO,KAAK,CAAC;SACb;QAED,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACtC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAClC;QAED,IAAI,MAAM,GAAwB,IAAI,CAAC;QAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnD,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,IAAI,IAAI,KAAK,MAAM,EAAE;gBACpB,MAAM,GAAG,MAAM,IAAI,kBAAkB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aACvE;YACD,IAAI,IAAI,KAAK,MAAM,EAAE;gBACpB,MAAM,GAAG,MAAM,IAAI,kBAAkB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aACvE;YACD,IAAI,IAAI,KAAK,MAAM,EAAE;gBACpB,MAAM,GAAG,MAAM,IAAI,kBAAkB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aACvE;YACD,IAAI,IAAI,KAAK,QAAQ,EAAE;gBACtB,MAAM,GAAG,MAAM,IAAI,mBAAmB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aACxE;SACD;QAED,IAAI,MAAM,EAAE;YACX,MAAM,GAAG,MAAM,CAAC;SAChB;QAED,OAAO,MAAM,CAAC;IACf,CAAC;CAED"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { DataService } from "./data/dataService";
|
|
3
|
-
import { Config } from "./config";
|
|
2
|
+
import { DataService } from "./data/dataService.js";
|
|
3
|
+
import { Config } from "./config.js";
|
|
4
4
|
export declare class Writr {
|
|
5
5
|
config: Config | undefined;
|
|
6
6
|
data: DataService | undefined;
|
package/dist/index.js
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const generator_1 = require("./generator");
|
|
9
|
-
const migrate_1 = require("./migrate");
|
|
10
|
-
class Writr {
|
|
1
|
+
import { createCommand } from "commander";
|
|
2
|
+
import { Setup } from "./utils/setup.js";
|
|
3
|
+
import { ConsoleMessage } from "./log.js";
|
|
4
|
+
import { Serve } from "./serve.js";
|
|
5
|
+
import { SiteGenerator } from "./generator.js";
|
|
6
|
+
import { Migrate } from "./migrate.js";
|
|
7
|
+
export class Writr {
|
|
11
8
|
async parseCLI(process) {
|
|
12
|
-
const program =
|
|
9
|
+
const program = createCommand();
|
|
13
10
|
program.storeOptionsAsProperties(true);
|
|
14
11
|
program
|
|
15
12
|
.command('build', { isDefault: true })
|
|
@@ -20,10 +17,10 @@ class Writr {
|
|
|
20
17
|
.option("-c, --config <path>", "custom configuration path")
|
|
21
18
|
.action(async (options) => {
|
|
22
19
|
try {
|
|
23
|
-
await new
|
|
20
|
+
await new SiteGenerator(options).run();
|
|
24
21
|
}
|
|
25
22
|
catch (error) {
|
|
26
|
-
new
|
|
23
|
+
new ConsoleMessage().error('Error: ' + error.message);
|
|
27
24
|
}
|
|
28
25
|
});
|
|
29
26
|
program
|
|
@@ -32,10 +29,10 @@ class Writr {
|
|
|
32
29
|
.argument('[name]', 'Name of the project', 'Blog')
|
|
33
30
|
.action(async (name) => {
|
|
34
31
|
try {
|
|
35
|
-
await new
|
|
32
|
+
await new Setup(name).init();
|
|
36
33
|
}
|
|
37
34
|
catch (error) {
|
|
38
|
-
new
|
|
35
|
+
new ConsoleMessage().error('Error: ' + error.message);
|
|
39
36
|
}
|
|
40
37
|
});
|
|
41
38
|
program
|
|
@@ -43,10 +40,10 @@ class Writr {
|
|
|
43
40
|
.description('Create new markdown file')
|
|
44
41
|
.action(async () => {
|
|
45
42
|
try {
|
|
46
|
-
await new
|
|
43
|
+
await new Setup('new').new();
|
|
47
44
|
}
|
|
48
45
|
catch (error) {
|
|
49
|
-
new
|
|
46
|
+
new ConsoleMessage().error('Error: ' + error.message);
|
|
50
47
|
}
|
|
51
48
|
});
|
|
52
49
|
program
|
|
@@ -56,10 +53,10 @@ class Writr {
|
|
|
56
53
|
.action(async (options) => {
|
|
57
54
|
try {
|
|
58
55
|
const [type, src, dest] = options;
|
|
59
|
-
await new
|
|
56
|
+
await new Migrate(type).migrate(src, dest);
|
|
60
57
|
}
|
|
61
58
|
catch (error) {
|
|
62
|
-
new
|
|
59
|
+
new ConsoleMessage().error('Error: ' + error.message);
|
|
63
60
|
}
|
|
64
61
|
});
|
|
65
62
|
program
|
|
@@ -71,14 +68,13 @@ class Writr {
|
|
|
71
68
|
.option("-w, --watch", "Watch for changes and rebuild", false)
|
|
72
69
|
.action(async (options) => {
|
|
73
70
|
try {
|
|
74
|
-
await new
|
|
71
|
+
await new Serve(options).run();
|
|
75
72
|
}
|
|
76
73
|
catch (error) {
|
|
77
|
-
new
|
|
74
|
+
new ConsoleMessage().error('Error: ' + error.message);
|
|
78
75
|
}
|
|
79
76
|
});
|
|
80
77
|
program.parse(process.argv);
|
|
81
78
|
}
|
|
82
79
|
}
|
|
83
|
-
exports.Writr = Writr;
|
|
84
80
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|