@beltype/cli 0.1.8 → 0.1.9

package/README.md

@@ -77,6 +77,8 @@ npx playwright-core@1.63.0 install chromium-headless-shell
 
 The companions come from npm, pinned exactly: `@beltype/cicero` 0.1.10, `@beltype/caster` 0.2.5 and `@beltype/common` 0.1.2.
 
+The package is a binary, not a module: it has no `exports` map and ships no typings, so `import '@beltype/cli'` is not a supported road until a consumer asks for one.
+
 ## Working on it
 
 ```bash

package/dist/src/main.js

@@ -78,7 +78,7 @@ async function main(argv) {
     const output = values.output ?? input.replace(/\.html?$/i, '') + '.pdf';
     const created = createdFromEnv();
     const result = await print(input, output, { given, sandbox: !values['no-sandbox'], ...(values.trace !== undefined ? { trace: values.trace } : {}), ...(created ? { created } : {}) });
-    console.log(`${result.output}: ${result.pages} pages, ${result.words} words, ${(result.ms / 1000).toFixed(1)} s`);
+    console.log(`${result.output}: ${result.pages} pages, ${result.words} words, ${(result.ms / 1000).toFixed(1)} s${result.standard ? `, ${result.standard}` : ''}`);
     if (result.check) {
         for (const line of checkLines(result.check))
             console.log(line);

package/dist/src/print.js

@@ -15,7 +15,7 @@ import { chromium } from 'playwright-core';
 import { ciceroFlags } from '@beltype/cicero/flags';
 import { cliFlags, tableOf } from './flags.js';
 import { checkPages, requireMupdf } from './check.js';
-import { ARGS, VIEWPORT, documentAssets, servedHtml, routeCompanions, routeDocument, printOnPage, refusal, deferralLine } from './run.js';
+import { ARGS, VIEWPORT, documentAssets, servedHtml, routeCompanions, routeDocument, printOnPage, refusal, deferralLine, standardOf } from './run.js';
 export { spliceHead } from './run.js';
 const round = (ms) => Math.round(ms * 10) / 10;
 /**
@@ -41,6 +41,8 @@ export async function print(input, output, options = {}) {
     let step = 'launch';
     let chromiumVersion = 'unknown';
     try {
+        // A run that refuses writes no file, so an earlier print at this path must not stand for it.
+        fs.rmSync(output, { force: true });
         if (flags.beltype.check)
             await requireMupdf();
         const html = fs.readFileSync(input, 'utf8');
@@ -77,7 +79,7 @@ export async function print(input, output, options = {}) {
             }
             else
                 lap('print');
-            const { bytes, pages, words, screens, confessions } = printed;
+            const { bytes, pages, words, screens, confessions, conformance } = printed;
             step = 'close';
             await browser.close();
             lap('close');
@@ -93,7 +95,7 @@ export async function print(input, output, options = {}) {
                 check = await checkPages(screens, bytes, path.resolve(output).replace(/\.pdf$/i, '') + '.check', flags.beltype.printer, confessions);
                 lap('check');
             }
-            return { output, pages, words, deferred: printed.deferred.length, ms: performance.now() - started, ...(check ? { check } : {}) };
+            return { output, pages, words, deferred: printed.deferred.length, standard: standardOf(conformance), ms: performance.now() - started, ...(check ? { check } : {}) };
         }
         finally {
             await browser.close();

package/dist/src/run.js

@@ -169,6 +169,12 @@ function fromAssets(assets, assetPath) {
 function within(dir, rel) {
     const file = path.resolve(dir, rel);
     const inside = path.relative(dir, file);
-    return !inside.startsWith('..') && !path.isAbsolute(inside) && isFile(file) ? file : null;
+    if (inside.startsWith('..') || path.isAbsolute(inside) || !isFile(file))
+        return null;
+    // A link is followed to where it lands, and only a landing inside the folder is served.
+    const landed = path.relative(fs.realpathSync(dir), fs.realpathSync(file));
+    return !landed.startsWith('..') && !path.isAbsolute(landed) ? file : null;
 }
+/** What a print's file claims, as Caster's report says it: `pdf-2.0; pdf-ua-2`, or `pdf-2.0` alone where the claim was not asked for or was withdrawn; `null` where Caster never saw the file (`--printer chromium`). */
+export const standardOf = (conformance) => conformance === null ? null : conformance === 'pdfua2' ? 'pdf-2.0; pdf-ua-2' : 'pdf-2.0';
 const isFile = (file) => fs.existsSync(file) && fs.statSync(file).isFile();

package/dist/src/serve.js

@@ -22,7 +22,7 @@ import { chromium } from 'playwright-core';
 import { ciceroFlags } from '@beltype/cicero/flags';
 import { BuildError, ValidationError, FlagError } from '@beltype/common/errors';
 import { cliFlags, createdFromEnv, parseFlagArgs } from './flags.js';
-import { ARGS, ORIGIN, VIEWPORT, documentAssets, servedHtml, routeCompanions, routeDocument, printOnPage, cutAndPrint, refusal, deferralLine } from './run.js';
+import { ARGS, ORIGIN, VIEWPORT, documentAssets, servedHtml, routeCompanions, routeDocument, printOnPage, cutAndPrint, refusal, deferralLine, standardOf } from './run.js';
 import { keepMergeInPage, reseatInPage, seatMergeInPage } from './in-page.js';
 const HOLDER_PATH = '/_beltype/holder.html';
 const HOLDER = `<!doctype html><html><head><meta charset="utf-8"><title>holder</title></head><body><script type="module">
@@ -507,4 +507,7 @@ function instant(value) {
     return date.toISOString();
 }
 /** What the file claims, as Caster's report says it: `x-beltype-standard: pdf-2.0; pdf-ua-2`, or `pdf-2.0` alone where the claim was not asked for or was withdrawn. A print under `beltype.printer=chromium` is Chromium's own file, which Caster never saw, and carries no header. */
-export const standardHeader = (conformance) => conformance === null ? {} : { 'x-beltype-standard': conformance === 'pdfua2' ? 'pdf-2.0; pdf-ua-2' : 'pdf-2.0' };
+export const standardHeader = (conformance) => {
+    const standard = standardOf(conformance);
+    return standard === null ? {} : { 'x-beltype-standard': standard };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beltype/cli",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "beltype, the command line: a finished HTML document printed to PDF by Cicero and Caster in Chromium's headless shell.",
   "type": "module",
   "license": "MIT",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@beltype/caster": "0.2.5",
-    "@beltype/cicero": "0.1.10",
+    "@beltype/cicero": "0.1.11",
     "@beltype/common": "0.1.2",
     "playwright-core": "1.63.0"
   },