From c10209299f2ba50127a75707caf7858e18511079 Mon Sep 17 00:00:00 2001 From: modesty Date: Sun, 20 Jul 2025 10:54:21 -0700 Subject: [PATCH] build: clean up dist dir for new build. Also add node: protocol imports for node modules --- lib/parserstream.js | 6 +++--- lib/pdf.js | 10 +++++----- lib/pdfanno.js | 2 +- lib/pdfcanvas.js | 2 +- lib/pdffield.js | 2 +- lib/pdffill.js | 2 +- lib/pdffont.js | 2 +- lib/pdfimage.js | 2 +- lib/pdfline.js | 2 +- lib/ptixmlinject.js | 2 +- pdfparser.js | 10 +++++----- rollup/bundle-pdfjs-base.js | 8 +++++--- src/cli/p2jcli.ts | 6 +++--- 13 files changed, 29 insertions(+), 27 deletions(-) diff --git a/lib/parserstream.js b/lib/parserstream.js index 7031356f..606e0c74 100644 --- a/lib/parserstream.js +++ b/lib/parserstream.js @@ -1,6 +1,6 @@ -import { Transform, Readable } from "stream"; -import fs from "fs"; -import { Buffer } from "buffer"; +import { Transform, Readable } from "node:stream"; +import fs from "node:fs"; +import { Buffer } from "node:buffer"; export class ParserStream extends Transform { static createContentStream(jsonObj) { diff --git a/lib/pdf.js b/lib/pdf.js index 82c18c49..d950d9a9 100644 --- a/lib/pdf.js +++ b/lib/pdf.js @@ -1,8 +1,8 @@ -import process from "process"; -import console from "console"; -import fs from "fs"; -import nodeUtil from "util"; -import { EventEmitter } from "events"; +import process from "node:process"; +import console from "node:console"; +import fs from "node:fs"; +import nodeUtil from "node:util"; +import { EventEmitter } from "node:events"; import { _PARSER_SIG } from "./pkinfo.js"; import PDFField from "./pdffield.js"; diff --git a/lib/pdfanno.js b/lib/pdfanno.js index cef10055..c731096a 100644 --- a/lib/pdfanno.js +++ b/lib/pdfanno.js @@ -1,4 +1,4 @@ -import nodeUtil from "util"; +import nodeUtil from "node:util"; //BEGIN - MQZ 9/19/2012. Helper functions to parse acroForm elements function setupRadioButton(annotation, item) { diff --git a/lib/pdfcanvas.js b/lib/pdfcanvas.js index 0ce619a0..a2f5efe8 100644 --- a/lib/pdfcanvas.js +++ b/lib/pdfcanvas.js @@ -1,4 +1,4 @@ -import nodeUtil from "util"; +import nodeUtil from "node:util"; import PDFLine from "./pdfline.js"; import PDFFill from "./pdffill.js"; import PDFFont from "./pdffont.js"; diff --git a/lib/pdffield.js b/lib/pdffield.js index 76bb9acb..86a29887 100644 --- a/lib/pdffield.js +++ b/lib/pdffield.js @@ -1,4 +1,4 @@ -import nodeUtil from "util"; +import nodeUtil from "node:util"; import PDFUnit from "./pdfunit.js"; const kFBANotOverridable = 0x00000400; // indicates the field is read only by the user diff --git a/lib/pdffill.js b/lib/pdffill.js index afceb9e8..5dcdaab5 100644 --- a/lib/pdffill.js +++ b/lib/pdffill.js @@ -1,4 +1,4 @@ -import nodeUtil from "util"; +import nodeUtil from "node:util"; import PDFUnit from "./pdfunit.js"; export default class PDFFill{ diff --git a/lib/pdffont.js b/lib/pdffont.js index 7ddf8fd9..edf07e5b 100644 --- a/lib/pdffont.js +++ b/lib/pdffont.js @@ -1,4 +1,4 @@ -import nodeUtil from 'util'; +import nodeUtil from 'node:util'; import PDFUnit from './pdfunit.js'; import { kFontFaces, kFontStyles } from './pdfconst.js'; diff --git a/lib/pdfimage.js b/lib/pdfimage.js index f7e13f18..72d98911 100644 --- a/lib/pdfimage.js +++ b/lib/pdfimage.js @@ -1,5 +1,5 @@ -import { Buffer } from "buffer"; +import { Buffer } from "node:buffer"; export default class PDFImage { #_src = ''; #_onload = null; diff --git a/lib/pdfline.js b/lib/pdfline.js index 8664486e..c46a40ba 100644 --- a/lib/pdfline.js +++ b/lib/pdfline.js @@ -1,4 +1,4 @@ -import nodeUtil from "util"; +import nodeUtil from "node:util"; import PDFUnit from "./pdfunit.js"; export default class PDFLine { diff --git a/lib/ptixmlinject.js b/lib/ptixmlinject.js index 13669bbf..eac8f244 100644 --- a/lib/ptixmlinject.js +++ b/lib/ptixmlinject.js @@ -1,4 +1,4 @@ -import fs from "fs"; +import fs from "node:fs"; import { DOMParser } from "./simpleXmlParser.js"; /** diff --git a/pdfparser.js b/pdfparser.js index 1feb3a5e..8ebe5e2e 100644 --- a/pdfparser.js +++ b/pdfparser.js @@ -1,8 +1,8 @@ -import fs from "fs"; -import nodeUtil from "util"; -import { readFile } from "fs/promises"; -import { EventEmitter } from "events"; -import { Buffer } from "buffer"; +import fs from "node:fs"; +import nodeUtil from "node:util"; +import { readFile } from "node:fs/promises"; +import { EventEmitter } from "node:events"; +import { Buffer } from "node:buffer"; import PDFJS from "./lib/pdf.js"; import { ParserStream, StringifyStream } from "./lib/parserstream.js"; diff --git a/rollup/bundle-pdfjs-base.js b/rollup/bundle-pdfjs-base.js index 8053d20b..af57b7c7 100644 --- a/rollup/bundle-pdfjs-base.js +++ b/rollup/bundle-pdfjs-base.js @@ -64,7 +64,7 @@ const _baseCode = _pdfjsFiles.reduce( fs.writeFileSync(path.join(__dirname, "../lib/pdfjs-code.js"), ` - ${"import nodeUtil from 'util';import { Blob } from 'buffer';import { DOMParser } from './simpleXmlParser.js';import PDFAnno from './pdfanno.js';import Image from './pdfimage.js';import { createScratchCanvas } from './pdfcanvas.js';"} + ${"import nodeUtil from 'node:util';import { Blob } from 'node:buffer';import { DOMParser } from './simpleXmlParser.js';import PDFAnno from './pdfanno.js';import Image from './pdfimage.js';import { createScratchCanvas } from './pdfcanvas.js';"} ${"export const PDFJS = {};"} ${"const globalScope = { console };"} ${_baseCode} @@ -76,9 +76,11 @@ fs.writeFileSync(path.join(__dirname, "../lib/pdfjs-code.js"), ); const targetDir = path.join(__dirname, "../dist"); -if (!fs.existsSync(targetDir)) { - fs.mkdirSync(targetDir); +if (fs.existsSync(targetDir)) { + fs.rmSync(targetDir, { recursive: true, force: true }); } +fs.mkdirSync(targetDir); + fs.copyFileSync(path.join(__dirname, "../pdfparser.d.ts"), path.join(targetDir, "pdfparser.d.ts")); // .d.cts should have "export =" instead of "export default" const typeDefContent = fs.readFileSync(path.join(__dirname, "../pdfparser.d.ts"), "utf8"); diff --git a/src/cli/p2jcli.ts b/src/cli/p2jcli.ts index d136de13..c623fdba 100644 --- a/src/cli/p2jcli.ts +++ b/src/cli/p2jcli.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import nodeUtil from "util"; -import fs from "fs"; -import path from "path"; +import nodeUtil from "node:util"; +import fs from "node:fs"; +import path from "node:path"; import { yargs } from "./p2jcliarg.js"; import PDFParser from "../../dist/pdfparser.js";