@d-zero/print 1.2.0 → 2.1.0

package/README.md

@@ -48,7 +48,7 @@ IDが指定されていない場合は、連番がIDとして使用されます
 
 ## ページフック
 
-[Frontmatter](https://jekyllrb.com/docs/front-matter/)の`hooks`に配列としてスクリプトファイルのパスを渡すと、ページを開いた後（厳密にはPuppetterの`waitUntil: 'networkidle0'`のタイミング直後）にそれらのスクリプトを実行します。スクリプトは配列の順番通りに逐次実行されます。
+[Frontmatter](https://jekyllrb.com/docs/front-matter/)の`hooks`に配列としてスクリプトファイルのパスを渡すと、ページを開いた後（厳密にはPuppeteerの`waitUntil: 'networkidle0'`のタイミング直後）にそれらのスクリプトを実行します。スクリプトは配列の順番通りに逐次実行されます。
 
 ```txt
 ---

package/dist/cli.js

@@ -1,29 +1,44 @@
 #!/usr/bin/env node
-import minimist from 'minimist';
-import { print } from './print.js';
+import { createCLI, parseCommonOptions } from '@d-zero/cli-core';
+import { print } from './print-main-process.js';
 import { readConfig } from './read-config.js';
-const cli = minimist(process.argv.slice(2), {
-    alias: {
+const { options, args, hasConfigFile } = createCLI({
+    aliases: {
         f: 'listfile',
         t: 'type',
     },
+    usage: [
+        'Usage:',
+        '\tprint -f <listfile> [--type <png|pdf|note>] [--limit <number>] [--debug]',
+        '\tprint <url>... [--type <png|pdf|note>] [--limit <number>] [--debug]',
+    ],
+    parseArgs: (cli) => ({
+        ...parseCommonOptions(cli),
+        listfile: cli.listfile,
+        type: cli.type,
+    }),
+    validateArgs: (options, cli) => {
+        return !!(options.listfile?.length || cli._.length > 0);
+    },
 });
-const limit = cli.limit ? Number.parseInt(cli.limit) : undefined;
-const debug = !!cli.debug;
-const verbose = !!cli.verbose;
-const type = cli.type === 'note' ? 'note' : cli.type === 'pdf' ? 'pdf' : 'png';
-if (cli.listfile?.length) {
-    const { urlList, hooks } = await readConfig(cli.listfile);
-    await print(urlList, { type, limit, debug, verbose, hooks });
+const type = options.type === 'note' ? 'note' : options.type === 'pdf' ? 'pdf' : 'png';
+if (hasConfigFile) {
+    const { urlList, hooks } = await readConfig(options.listfile);
+    await print(urlList, {
+        type,
+        limit: options.limit,
+        debug: options.debug,
+        verbose: options.verbose,
+        hooks,
+    });
     process.exit(0);
 }
-if (cli._.length > 0) {
-    await print(cli._, { type, limit, verbose, debug });
+if (args.length > 0) {
+    await print(args, {
+        type,
+        limit: options.limit,
+        verbose: options.verbose,
+        debug: options.debug,
+    });
     process.exit(0);
 }
-process.stderr.write([
-    'Usage:',
-    '\tprint -f <listfile> [--type <png|pdf|note>] [--limit <number>] [--debug]',
-    '\tprint <url>... [--type <png|pdf|note>] [--limit <number>] [--debug]',
-].join('\n') + '\n');
-process.exit(1);

package/dist/{png-to-pdf.d.ts → modules/png-to-pdf.d.ts}

@@ -1,5 +1,5 @@
-import type { Page } from '@d-zero/puppeteer-page';
 import type { Screenshot } from '@d-zero/puppeteer-screenshot';
+import type { Page } from 'puppeteer';
 /**
  *
  * @param page

package/dist/{print-pdf-with-note.d.ts → modules/print-pdf-with-note.d.ts}

@@ -1,5 +1,5 @@
-import type { Page } from '@d-zero/puppeteer-page';
 import type { Screenshot } from '@d-zero/puppeteer-screenshot';
+import type { Page } from 'puppeteer';
 /**
  *
  * @param page

package/dist/{print-pdf.d.ts → modules/print-pdf.d.ts}

@@ -1,5 +1,5 @@
-import type { Page } from '@d-zero/puppeteer-page';
 import type { PageHook } from '@d-zero/puppeteer-page-scan';
+import type { Page } from 'puppeteer';
 /**
  *
  * @param page

package/dist/{print-png.d.ts → modules/print-png.d.ts}

@@ -1,5 +1,5 @@
-import type { Page } from '@d-zero/puppeteer-page';
 import type { PageHook } from '@d-zero/puppeteer-screenshot';
+import type { Page } from 'puppeteer';
 /**
  *
  * @param page

package/dist/print-child-process.d.ts

@@ -0,0 +1,7 @@
+import type { PrintType } from './types.js';
+import type { PageHook } from '@d-zero/puppeteer-page-scan';
+export type ChildProcessParams = {
+    dir: string;
+    type: PrintType;
+    hooks?: readonly PageHook[];
+};

package/dist/print-child-process.js

@@ -0,0 +1,27 @@
+import path from 'node:path';
+import { createChildProcess } from '@d-zero/puppeteer-dealer';
+import { pngToPdf } from './modules/png-to-pdf.js';
+import { printPdf } from './modules/print-pdf.js';
+import { printPng } from './modules/print-png.js';
+createChildProcess((param) => {
+    const { dir, type, hooks } = param;
+    return {
+        async eachPage({ page, id, url }, logger) {
+            const ext = type === 'pdf' ? 'pdf' : 'png';
+            const fileName = `${id}.${ext}`;
+            const filePath = path.resolve(dir, fileName);
+            if (type === 'pdf') {
+                await printPdf(page, url, filePath, logger, hooks);
+                logger('🔚 Closing');
+                return;
+            }
+            const result = await printPng(page, url, id, filePath, logger, hooks);
+            if (type === 'png') {
+                logger('🔚 Closing');
+                return;
+            }
+            await pngToPdf(page, result, logger);
+            logger('🔚 Closing');
+        },
+    };
+});

package/dist/{print.d.ts → print-main-process.d.ts}

@@ -1,5 +1,6 @@
 import type { PrintType } from './types.js';
 import type { PageHook } from '@d-zero/puppeteer-page-scan';
+import type { LaunchOptions } from 'puppeteer';
 export interface PrintOptions {
     readonly type?: PrintType;
     readonly limit?: number;
@@ -15,4 +16,4 @@ export interface PrintOptions {
 export declare function print(urlList: readonly (string | {
     id: string | null;
     url: string;
-})[], options?: PrintOptions): Promise<void>;
+})[], options?: PrintOptions & LaunchOptions): Promise<void>;

package/dist/print-main-process.js

@@ -0,0 +1,30 @@
+import { mkdir } from 'node:fs/promises';
+import path from 'node:path';
+import { createProcess, deal } from '@d-zero/puppeteer-dealer';
+import c from 'ansi-colors';
+/**
+ *
+ * @param urlList
+ * @param options
+ */
+export async function print(urlList, options) {
+    const dir = path.resolve(process.cwd(), '.print');
+    await mkdir(dir, { recursive: true }).catch(() => { });
+    const type = options?.type ?? 'png';
+    await deal(urlList.map((url) => {
+        if (typeof url === 'string') {
+            return { id: null, url };
+        }
+        return url;
+    }), (_, done, total) => {
+        return `${c.bold.magenta('🎨 Print pages')} ${c.bgBlueBright(` ${type} `)} ${done}/${total}`;
+    }, () => {
+        return createProcess(path.resolve(import.meta.dirname, 'print-child-process.js'), {
+            dir,
+            type,
+            hooks: options?.hooks,
+        }, {
+            ...options,
+        });
+    });
+}

package/dist/read-config.js

@@ -1,22 +1,16 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
 import { readPageHooks } from '@d-zero/puppeteer-page-scan';
 import { toKvList } from '@d-zero/readtext/list';
-import fm from 'front-matter';
+import { readConfigFile } from '@d-zero/shared/config-reader';
 /**
  *
  * @param filePath
  */
 export async function readConfig(filePath) {
-    const fileContent = await fs.readFile(filePath, 'utf8');
-    const content = 
-    // @ts-ignore
-    fm(fileContent);
+    const { content, baseDir } = await readConfigFile(filePath);
     const urlList = toKvList(content.body).map((kv) => ({
         id: kv.value ? kv.key : null,
         url: kv.value || kv.key,
     }));
-    const baseDir = path.dirname(filePath);
     const hooks = await readPageHooks(content.attributes?.hooks ?? [], baseDir);
     return {
         urlList,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/print",
-	"version": "1.2.0",
+	"version": "2.1.0",
 	"description": "Print web pages to PDF or image files.",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -27,18 +27,18 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/html-distiller": "1.0.2",
-		"@d-zero/puppeteer-dealer": "0.3.0",
-		"@d-zero/puppeteer-page-scan": "3.0.0",
-		"@d-zero/puppeteer-screenshot": "3.0.0",
-		"@d-zero/readtext": "1.1.2",
+		"@d-zero/cli-core": "1.1.0",
+		"@d-zero/html-distiller": "1.0.3",
+		"@d-zero/puppeteer-dealer": "0.5.0",
+		"@d-zero/puppeteer-page-scan": "4.0.1",
+		"@d-zero/puppeteer-screenshot": "3.1.0",
+		"@d-zero/readtext": "1.1.4",
+		"@d-zero/shared": "0.9.0",
 		"ansi-colors": "4.1.3",
 		"dayjs": "1.11.13",
 		"front-matter": "4.0.2",
-		"minimist": "1.2.8"
+		"minimist": "1.2.8",
+		"puppeteer": "24.10.1"
 	},
-	"devDependencies": {
-		"@d-zero/puppeteer-page": "0.3.0"
-	},
-	"gitHead": "e4fd17857e31022d121527b00fd7f009dbdb2142"
+	"gitHead": "04c6969564182c36ee38ef41e78130936dfa4863"
 }

package/dist/print.js

@@ -1,44 +0,0 @@
-import { mkdir } from 'node:fs/promises';
-import path from 'node:path';
-import { deal } from '@d-zero/puppeteer-dealer';
-import c from 'ansi-colors';
-import { pngToPdf } from './png-to-pdf.js';
-import { printPdf } from './print-pdf.js';
-import { printPng } from './print-png.js';
-/**
- *
- * @param urlList
- * @param options
- */
-export async function print(urlList, options) {
-    const dir = path.resolve(process.cwd(), '.print');
-    await mkdir(dir, { recursive: true }).catch(() => { });
-    const type = options?.type ?? 'png';
-    const hooks = options?.hooks;
-    await deal(urlList.map((url) => {
-        if (typeof url === 'string') {
-            return { id: null, url };
-        }
-        return url;
-    }), (_, done, total) => {
-        return `${c.bold.magenta('🎨 Print pages')} ${c.bgBlueBright(` ${type} `)} ${done}/${total}`;
-    }, {
-        async deal(page, id, url, logger) {
-            const ext = type === 'pdf' ? 'pdf' : 'png';
-            const fileName = `${id}.${ext}`;
-            const filePath = path.resolve(dir, fileName);
-            if (type === 'pdf') {
-                await printPdf(page, url, filePath, logger, hooks);
-                logger('🔚 Closing');
-                return;
-            }
-            const result = await printPng(page, url, id, filePath, logger, hooks);
-            if (type === 'png') {
-                logger('🔚 Closing');
-                return;
-            }
-            await pngToPdf(page, result, logger);
-            logger('🔚 Closing');
-        },
-    }, options);
-}