Skip to content

Commit f80ab1b

Browse files
refactor: force all logging through the context-sensitive abstraction
1 parent 856ad54 commit f80ab1b

File tree

3 files changed

+13
-22
lines changed

3 files changed

+13
-22
lines changed

src/DatabasePageRenderer.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Page } from '@notionhq/client/build/src/api-types';
44

55
import { AssetWriter } from './AssetWriter';
66
import { FrontmatterRenderer } from './FrontmatterRenderer';
7-
import { logger, RenderingLoggingContext } from './logger';
7+
import { RenderingLoggingContext } from './logger';
88
import { PropertiesParser } from './PropertiesParser';
99
import { RecursiveBodyRenderer } from './RecursiveBodyRenderer';
1010
import { RenderDatabasePageTask as RenderDatabasePageTask } from './RenderDatabasePageTask';
@@ -24,10 +24,6 @@ export class DatabasePageRenderer {
2424
page: Page,
2525
config: DatabaseConfigRenderPages
2626
): Promise<RenderDatabasePageTask> {
27-
if (page.archived) {
28-
logger.warn(`rendering archived page ${page.url}`);
29-
}
30-
3127
const props = await this.propertiesParser.parsePageProperties(page, config);
3228

3329
const categorySlug = slugify(props.meta.category);
@@ -47,15 +43,23 @@ export class DatabasePageRenderer {
4743
render: async () => {
4844
const context = new RenderingLoggingContext(page.url, file);
4945

46+
if (page.archived) {
47+
context.warn(`page is arvhied`);
48+
}
49+
5050
try {
5151
const assetWriter = new AssetWriter(destDir);
5252

5353
const frontmatter = this.frontmatterRenderer.renderFrontmatter(props);
54-
const body = await this.bodyRenderer.renderBody(page, assetWriter, context);
55-
54+
const body = await this.bodyRenderer.renderBody(
55+
page,
56+
assetWriter,
57+
context
58+
);
59+
5660
await fs.mkdir(destDir, { recursive: true });
5761
await fs.writeFile(file, frontmatter + body);
58-
62+
5963
context.complete();
6064
} catch (error) {
6165
// While catch-log-throw is usually an antipattern, it is the renderes job to orchestrate the rendering

src/DeferredRenderer.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { ChildDatabaseRenderer } from './ChildDatabaseRenderer';
44
import { Database } from './Database';
55
import { DatabaseEntryRenderer } from './DatabaseEntryRenderer';
66
import { DatabasePageRenderer } from './DatabasePageRenderer';
7-
import { logger } from './logger';
87
import { RenderDatabaseEntryTask } from './RenderDatabaseEntryTask';
98
import { RenderDatabasePageTask as RenderDatabasePageTask } from './RenderDatabasePageTask';
109
import { RenderedDatabaseEntry } from './RenderedDatabaseEntry';
@@ -93,8 +92,6 @@ export class DeferredRenderer {
9392
const promises = batch.map((fn) => fn());
9493
await Promise.all(promises);
9594
}
96-
97-
logger.success("sync complete");
9895
}
9996

10097
public getRenderedPages(): (RenderedDatabasePage | RenderedDatabaseEntry)[] {

src/logger.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@ const info = (...args: any[]): void => {
55
console.log(chalk.cyan("info"), ...args);
66
};
77

8-
const tip = (...args: any[]): void => {
9-
console.log(chalk.blue("tip"), ...args);
10-
};
11-
12-
const success = (...args: any[]): void => {
13-
console.log(chalk.green("success"), ...args);
14-
};
15-
168
const warn = (...args: any[]): void => {
179
console.warn(chalk.yellow("warning"), ...args);
1810
};
@@ -21,10 +13,8 @@ const error = (...args: any[]): void => {
2113
console.error(chalk.red("error"), ...args);
2214
};
2315

24-
export const logger = {
16+
const logger = {
2517
info,
26-
tip,
27-
success,
2818
warn,
2919
error,
3020
};

0 commit comments

Comments
 (0)