@d-zero/print 2.4.8 → 2.6.0

package/README.md

@@ -20,6 +20,7 @@ npx @d-zero/print <url>... [options]
 
 ### オプション
 
+- `-v, --version`: バージョンを表示
 - `-f, --listfile <file>`: URLリストを持つファイルのパス
 - `<url>`: 対象のURL（複数指定可能）
 - `-t, --type <type>`: 出力形式（デフォルト: png）
@@ -27,7 +28,14 @@ npx @d-zero/print <url>... [options]
   - `pdf`: PDFファイル（ブラウザの印刷機能を使用、Print CSSが適用されます）
   - `note`: PNG画像のスクリーンショットに対してメモ欄付きのPDFファイルが生成されます
 - `-d, --devices <devices>`: デバイスプリセット（カンマ区切り、デフォルト: desktop-compact,mobile）
+- `-T, --timeout <ms>`: リクエストタイムアウト（ミリ秒、デフォルト: 30000）
+- `-o, --open-disclosures`: キャプチャ前にすべての`<details>`要素を開き、すべての`button[aria-expanded="false"]`要素をクリックします
+  - 新しい要素が見つからなくなるまで繰り返し処理（最大1000回、各イテレーション後500ms待機）
+  - ネストされた要素や動的に生成される要素にも対応
+  - 最大イテレーション数に達した場合はエラーで終了
 - `--limit <number>`: 並列実行数の上限（デフォルト: 10）
+- `--interval <ms>`: 並列実行間の間隔（デフォルト: なし）
+  - 数値または"min-max"形式でランダム範囲を指定可能
 - `--debug`: デバッグモード（デフォルト: false）
 - `--verbose`: 詳細ログモード（デフォルト: false）
 
@@ -55,6 +63,10 @@ npx @d-zero/print -f urls.txt --type pdf
 
 # ファイルから読み込み + デバイス指定
 npx @d-zero/print -f urls.txt --devices desktop,mobile
+
+# disclosure要素を展開してキャプチャ
+npx @d-zero/print https://example.com --open-disclosures
+npx @d-zero/print https://example.com -o
 ```
 
 #### URLリストのファイルフォーマット

package/dist/cli.js

@@ -1,14 +1,20 @@
 #!/usr/bin/env node
+import { createRequire } from 'node:module';
 import { createCLI, parseCommonOptions, parseList } from '@d-zero/cli-core';
 import { parseDevicesOption } from '@d-zero/puppeteer-page-scan';
 import { print } from './print-main-process.js';
 import { readConfig } from './read-config.js';
+const require = createRequire(import.meta.url);
+const pkg = require('../package.json');
 const { options, args, hasConfigFile } = createCLI({
+    name: pkg.name,
+    version: pkg.version,
     aliases: {
         f: 'listfile',
         t: 'type',
         d: 'devices',
         T: 'timeout',
+        o: 'openDisclosures',
     },
     usage: [
         'Usage:',
@@ -20,6 +26,7 @@ const { options, args, hasConfigFile } = createCLI({
         '\t-t, --type <type>         Output type: png|pdf|note (default: png)',
         '\t-d, --devices <devices>   Device presets (comma-separated, default: desktop-compact,mobile)',
         '\t-T, --timeout <ms>        Request timeout in milliseconds (default: 30000)',
+        '\t-o, --open-disclosures    Open all <details> and aria-expanded elements before capture',
         '\t--limit <number>          Limit concurrent processes',
         '\t--interval <ms>           Interval between parallel executions (default: none)',
         '\t                           Format: number or "min-max" for random range',
@@ -40,6 +47,7 @@ const { options, args, hasConfigFile } = createCLI({
         type: cli.type,
         devices: cli.devices,
         timeout: cli.timeout ? Number(cli.timeout) : undefined,
+        openDisclosures: cli['open-disclosures'] === true || cli.o === true ? true : undefined,
     }),
     validateArgs: (options, cli) => {
         return !!(options.listfile?.length || cli._.length > 0);
@@ -59,6 +67,7 @@ if (hasConfigFile) {
         devices,
         timeout: options.timeout,
         interval: options.interval,
+        openDisclosures: options.openDisclosures,
     });
     process.exit(0);
 }
@@ -71,6 +80,7 @@ if (args.length > 0) {
         devices,
         timeout: options.timeout,
         interval: options.interval,
+        openDisclosures: options.openDisclosures,
     });
     process.exit(0);
 }

package/dist/modules/print-pdf-with-note.js

@@ -10,7 +10,7 @@ import dayjs from 'dayjs';
  */
 export async function printPdfWithNote(page, { id, filePath, url, title }) {
     if (!filePath) {
-        throw new Error(`No file path (ID: ${id}): ${url}`);
+        throw new Error(`No file path (ID: "${id}"): ${url}`);
     }
     const datetime = dayjs().format('YYYY-MM-DD HH:mm');
     await page.evaluate(() => {
@@ -37,7 +37,7 @@ export async function printPdfWithNote(page, { id, filePath, url, title }) {
 						<div style="font-size: 0.6em">Printed: ${datetime}</div>
 					</div>
 					<div>
-						<div style="font-size: 3mm; margin-bottom: 1mm; text-align: right;">[ID: ${id}]</div>
+						<div style="font-size: 3mm; margin-bottom: 1mm; text-align: right;">[${id}]</div>
 						<div style="text-align: right; background-color: #000; color: #fff;">Note:</div>
 					</div>
 				</div>
@@ -45,7 +45,7 @@ export async function printPdfWithNote(page, { id, filePath, url, title }) {
         footerTemplate: `
 				<div style="font-size: 2mm; width: 100%; display: flex; justify-content: space-between; margin: 0 1cm; font-family: monospace;">
 					<div>
-						<span>[ID: ${id}] ${url}</span>
+						<span>[${id}] ${url}</span>
 					</div>
 					<div>
 						<span class="pageNumber"></span>/<span class="totalPages"></span>

package/dist/modules/print-pdf.d.ts

@@ -9,5 +9,6 @@ import type { Page } from 'puppeteer';
  * @param hooks
  * @param devices
  * @param timeout
+ * @param openDisclosures
  */
-export declare function printPdf(page: Page, url: string, filePath: string, update: (log: string) => void, hooks?: readonly PageHook[], devices?: Sizes, timeout?: number): Promise<void>;
+export declare function printPdf(page: Page, url: string, filePath: string, update: (log: string) => void, hooks?: readonly PageHook[], devices?: Sizes, timeout?: number, openDisclosures?: boolean): Promise<void>;

package/dist/modules/print-pdf.js

@@ -8,8 +8,9 @@ import { beforePageScan, pageScanListener, devicePresets, } from '@d-zero/puppet
  * @param hooks
  * @param devices
  * @param timeout
+ * @param openDisclosures
  */
-export async function printPdf(page, url, filePath, update, hooks, devices, timeout) {
+export async function printPdf(page, url, filePath, update, hooks, devices, timeout, openDisclosures) {
     // Use the first desktop device or fallback to desktop preset
     const defaultWidth = devicePresets.desktop.width;
     let pdfWidth = defaultWidth;
@@ -32,6 +33,7 @@ export async function printPdf(page, url, filePath, update, hooks, devices, time
         listener: pageScanListener(update),
         hooks,
         timeout,
+        openDisclosures,
     });
     update('📄 Save as PDF');
     await page.pdf({

package/dist/modules/print-png.d.ts

@@ -11,5 +11,6 @@ import type { Page } from 'puppeteer';
  * @param hooks
  * @param devices
  * @param timeout
+ * @param openDisclosures
  */
-export declare function printPng(page: Page, url: string, fileId: string, filePath: string, update: (log: string) => void, hooks?: readonly PageHook[], devices?: Sizes, timeout?: number): Promise<Record<string, import("@d-zero/puppeteer-screenshot").Screenshot>>;
+export declare function printPng(page: Page, url: string, fileId: string, filePath: string, update: (log: string) => void, hooks?: readonly PageHook[], devices?: Sizes, timeout?: number, openDisclosures?: boolean): Promise<Record<string, import("@d-zero/puppeteer-screenshot").Screenshot>>;

package/dist/modules/print-png.js

@@ -10,8 +10,9 @@ import { screenshot, screenshotListener } from '@d-zero/puppeteer-screenshot';
  * @param hooks
  * @param devices
  * @param timeout
+ * @param openDisclosures
  */
-export function printPng(page, url, fileId, filePath, update, hooks, devices, timeout) {
+export function printPng(page, url, fileId, filePath, update, hooks, devices, timeout, openDisclosures) {
     const defaultSizes = {
         'desktop-compact': devicePresets['desktop-compact'],
         mobile: devicePresets.mobile,
@@ -23,5 +24,6 @@ export function printPng(page, url, fileId, filePath, update, hooks, devices, ti
         listener: screenshotListener(update),
         hooks,
         timeout,
+        openDisclosures,
     });
 }

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

@@ -6,4 +6,5 @@ export type ChildProcessParams = {
     hooks?: readonly PageHook[];
     devices?: Sizes;
     timeout?: number;
+    openDisclosures?: boolean;
 };

package/dist/print-child-process.js

@@ -4,18 +4,18 @@ 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, devices, timeout } = param;
+    const { dir, type, hooks, devices, timeout, openDisclosures } = 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, devices, timeout);
+                await printPdf(page, url, filePath, logger, hooks, devices, timeout, openDisclosures);
                 logger('🔚 Closing');
                 return;
             }
-            const result = await printPng(page, url, id, filePath, logger, hooks, devices, timeout);
+            const result = await printPng(page, url, id, filePath, logger, hooks, devices, timeout, openDisclosures);
             if (type === 'png') {
                 logger('🔚 Closing');
                 return;

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

@@ -11,6 +11,7 @@ export interface PrintOptions {
     readonly devices?: Sizes;
     readonly timeout?: number;
     readonly interval?: number | DelayOptions;
+    readonly openDisclosures?: boolean;
 }
 /**
  *

package/dist/print-main-process.js

@@ -25,9 +25,15 @@ export async function print(urlList, options) {
             hooks: options?.hooks,
             devices: options?.devices,
             timeout: options?.timeout,
+            openDisclosures: options?.openDisclosures,
         }, {
             ...options,
             interval: options?.interval,
         });
+    }, {
+        limit: options?.limit,
+        debug: options?.debug,
+        verbose: options?.verbose,
+        interval: options?.interval,
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/print",
-	"version": "2.4.8",
+	"version": "2.6.0",
 	"description": "Print web pages to PDF or image files.",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -24,18 +24,18 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/cli-core": "1.2.7",
-		"@d-zero/html-distiller": "2.0.3",
-		"@d-zero/puppeteer-dealer": "0.6.4",
-		"@d-zero/puppeteer-page-scan": "4.3.4",
-		"@d-zero/puppeteer-screenshot": "3.2.13",
-		"@d-zero/readtext": "1.1.15",
+		"@d-zero/cli-core": "1.3.0",
+		"@d-zero/html-distiller": "2.0.4",
+		"@d-zero/puppeteer-dealer": "0.6.5",
+		"@d-zero/puppeteer-page-scan": "4.4.0",
+		"@d-zero/puppeteer-screenshot": "3.3.0",
+		"@d-zero/readtext": "1.1.16",
 		"@d-zero/shared": "0.17.1",
 		"ansi-colors": "4.1.3",
 		"dayjs": "1.11.19",
 		"front-matter": "4.0.2",
 		"minimist": "1.2.8",
-		"puppeteer": "24.34.0"
+		"puppeteer": "24.36.0"
 	},
-	"gitHead": "c976f890ac4225e20df8fc83118f31231bd6323c"
+	"gitHead": "e2189e6878674b8fef5fa3c121ad109c448040fe"
 }