@qrdx/cli 0.0.7 → 0.0.9

package/dist/index.js

@@ -2,7 +2,8 @@
 import { readFileSync, mkdirSync, writeFileSync, createReadStream } from 'fs';
 import { join, resolve, extname } from 'path';
 import { readFile } from 'fs/promises';
-import { BODY_PATTERN, CORNER_EYE_PATTERNS, CORNER_EYE_DOT_PATTERNS, getTemplateIds, FRAME_STYLES, DEFAULT_FRAME_TEXT, FRAME_TEXT_MAX_LENGTH, DEFAULT_MARGIN, getFrameDimensions, colorConfigSchema, errorLevelSchema, QRCodeSVG, svgToEPS } from 'qrdx';
+import { BODY_PATTERN, CORNER_EYE_PATTERNS, CORNER_EYE_DOT_PATTERNS, getTemplateIds, BUILT_IN_FRAMES, DEFAULT_FRAME_TEXT, FRAME_TEXT_MAX_LENGTH, DEFAULT_MARGIN, getFrameDimensions, colorConfigSchema, errorLevelSchema, QRCodeSVG, svgToEPS, FRAME_STYLES } from 'qrdx';
+import { getQRAsPNG } from 'qrdx/node';
 import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import * as readline from 'readline';
@@ -138,7 +139,6 @@ var OUTPUT_FORMATS = [
   "webp",
   "eps"
 ];
-var encodeRaster = (image, format) => format === "webp" ? image.webp({ lossless: true }) : image.png();
 function buildSVGString(props) {
   const element = createElement(QRCodeSVG, {
     size: props.size ?? 512,
@@ -198,24 +198,6 @@ async function buildEPSString(props) {
   }
   return await svgToEPS(buildSVGString(epsProps));
 }
-async function findLogoBox(sharp, svgString) {
-  const imageTag = svgString.match(/<image\b[^>]*?(?:\/>|><\/image>)/)?.[0];
-  if (!imageTag) {
-    return null;
-  }
-  const markerTag = imageTag.replace(/^<image\b/, '<rect class="qrdx-logo-box"').replace(/\shref="[^"]*"/, "").replace(/(?:\/>|><\/image>)$/, ' fill="#000"/>');
-  const markerSvg = svgString.replace(imageTag, markerTag).replace(
-    /<svg\b[^>]*>/,
-    (open) => `${open}<style>*{visibility:hidden}.qrdx-logo-box{visibility:visible}</style>`
-  );
-  const { info } = await sharp(Buffer.from(markerSvg, "utf-8")).png().trim().toBuffer({ resolveWithObject: true });
-  return {
-    left: -(info.trimOffsetLeft ?? 0),
-    top: -(info.trimOffsetTop ?? 0),
-    width: info.width,
-    height: info.height
-  };
-}
 async function saveOutput(options) {
   const { outputPath, format, ...qrProps } = options;
   const svgString = buildSVGString(qrProps);
@@ -229,33 +211,24 @@ ${svgString}`;
     writeFileSync(outputPath, await buildEPSString(qrProps), "utf-8");
     return;
   }
+  const pngBytes = await getQRAsPNG(qrProps, {
+    size: qrProps.size ?? 512,
+    loadExternalLogos: true
+  });
+  if (format === "png") {
+    writeFileSync(outputPath, pngBytes);
+    return;
+  }
   let sharp;
   try {
     const mod = await import('sharp');
     sharp = mod.default;
   } catch {
     throw new Error(
-      `${format === "webp" ? "WebP" : "PNG"} output needs the sharp package (native binaries). It is optional and may not have installed; use SVG or reinstall: https://sharp.pixelplumbing.com/install`
+      "WebP output needs the sharp package (native binaries). It is optional and may not have installed; use SVG or reinstall: https://sharp.pixelplumbing.com/install"
     );
   }
-  const svgBuffer = Buffer.from(svgString, "utf-8");
-  const size = qrProps.size ?? 512;
-  const { width, height } = getFrameDimensions(size, qrProps.frame);
-  const qrImage = sharp(svgBuffer).resize(
-    Math.round(width),
-    Math.round(height)
-  );
-  const logoSrc = qrProps.imageSettings?.src;
-  const box = logoSrc ? await findLogoBox(sharp, svgString) : null;
-  if (!(logoSrc && box)) {
-    await encodeRaster(qrImage, format).toFile(outputPath);
-    return;
-  }
-  const logo = await sharp(await loadLogo(logoSrc)).resize(box.width, box.height, { fit: "fill" }).png().toBuffer();
-  const composited = sharp(await qrImage.png().toBuffer()).composite([
-    { input: logo, left: box.left, top: box.top }
-  ]);
-  await encodeRaster(composited, format).toFile(outputPath);
+  await sharp(Buffer.from(pngBytes)).webp({ lossless: true }).toFile(outputPath);
 }
 var RESET = "\x1B[0m";
 var TEXT = "\x1B[38;5;145m";
@@ -869,7 +842,15 @@ async function runGenerate(args, meta) {
     if (flags.frame === void 0 && !frame) {
       const res = await p.select({
         message: `Frame ${DIM}(call-to-action label around the code)${RESET}`,
-        options: FRAME_STYLES.map((style) => ({ value: style, label: style })),
+        // Every built-in frame, by its style name and its name
+        options: [
+          { value: "none", label: "none" },
+          ...BUILT_IN_FRAMES.map((item) => ({
+            value: item.style,
+            label: item.style,
+            hint: item.name
+          }))
+        ],
         initialValue: "none"
       });
       if (isCancel2(res)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrdx/cli",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "QR code generator CLI for developers: styled SVG, PNG, WebP and vector EPS QR codes from the command line",
   "keywords": [
     "qr-code",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@clack/prompts": "^1.8.1",
     "picocolors": "^1.1.1",
-    "qrdx": "0.0.49",
+    "qrdx": "0.0.52",
     "react": "19.3.1",
     "react-dom": "19.3.1"
   },