abstract-image 13.0.61 → 13.1.0

package/src/exporters/dxf2d-export-image.ts

@@ -8,7 +8,7 @@ import type { Size } from "../model/size.js";
 
 export const DXF_STANDARD = "AC1015";
 export const DXF_DATA_URL = "data:application/dxf,";
-export const DXF_ENTITIES: string[] = [
+export const DXF_ENTITIES: Array<string> = [
   "3DFACE",
   "3DSOLID",
   "ACAD_PROXY_ENTITY",
@@ -87,11 +87,13 @@ export function dxf2dExportImageEncoded(root: AbstractImage, options?: Optional<
 }
 
 function encodeWindows1252(str: string): Uint8Array {
+  // oxlint-disable-next-line no-bitwise
   return Uint8Array.from(str, (c) => c.charCodeAt(0) & 0xff);
 }
 
 /**
- * @deprecated Use `dxf2dExportImageEncoded()` instead. Otherwise the text might not be correctly encoded in some languages.
+ * @deprecated Use `dxf2dExportImageEncoded()` instead. Otherwise the text might not be correctly encoded in some
+ *   languages.
  */
 export function dxf2dExportImage(root: AbstractImage, options?: Optional<DxfOptions>): string {
   const externalCache = new Map<string, DxfInsert>();
@@ -115,15 +117,7 @@ export function dxf2dExportImage(root: AbstractImage, options?: Optional<DxfOpti
   blocks += createSpaceBlock("*Model_Space", modelSpaceHandle, newHandle);
   blocks += createSpaceBlock("*Paper_Space", paperSpaceHandle, newHandle);
   for (const component of root.components) {
-    const [newEntities, newBlocks, newBlockRecords] = componentDxf(
-      component,
-      layer,
-      root.size,
-      modelSpaceHandle,
-      externalCache,
-      opts,
-      newHandle
-    );
+    const [newEntities, newBlocks, newBlockRecords] = componentDxf(component, layer, root.size, modelSpaceHandle, externalCache, opts, newHandle);
     entities += newEntities;
     blocks += newBlocks;
     blockRecords.push(...newBlockRecords);
@@ -192,15 +186,7 @@ function componentDxf(
 
   if (c.type === "group") {
     for (const child of c.children) {
-      const [newEntities, newBlocks, newBlockRecords] = componentDxf(
-        child,
-        layer,
-        size,
-        modelSpaceHandle,
-        externalCache,
-        options,
-        newHandle
-      );
+      const [newEntities, newBlocks, newBlockRecords] = componentDxf(child, layer, size, modelSpaceHandle, externalCache, options, newHandle);
       entities += newEntities;
       blocks += newBlocks;
       blockRecords.push(...newBlockRecords);
@@ -214,11 +200,7 @@ function componentDxf(
     }
     const imageData = options.imageDataByUrl[c.data.url];
     const url =
-      imageData === undefined
-        ? c.data.url
-        : typeof imageData === "string"
-          ? imageData
-          : DXF_DATA_URL + dxf2dExportImage(imageData, options);
+      imageData === undefined ? c.data.url : typeof imageData === "string" ? imageData : DXF_DATA_URL + dxf2dExportImage(imageData, options);
     if (url === undefined || typeof url !== "string" || !url.startsWith(DXF_DATA_URL)) {
       return [entities, blocks, blockRecords];
     }
@@ -253,9 +235,7 @@ function componentDxf(
     const externalBlockRecords = extractBlockRecords(dxfString);
 
     const newBlockRecordHandle = newHandle();
-    const newName = `EMBEDED_IMAGE_${randomID()}_${scale.x.toPrecision(4).replace(".", "_")}X${scale.y
-      .toPrecision(4)
-      .replace(".", "_")}`;
+    const newName = `EMBEDED_IMAGE_${randomID()}_${scale.x.toPrecision(4).replace(".", "_")}X${scale.y.toPrecision(4).replace(".", "_")}`;
 
     const initOldHandlesMap = new Map<string, string>();
 
@@ -373,8 +353,8 @@ function componentDxf(
     entities += "70\n0\n";
 
     if (options.useStrokeThickness) {
-      entities += "40\n" + (c.strokeThickness ?? 0) + "\n";
-      entities += "41\n" + (c.strokeThickness ?? 0) + "\n";
+      entities += "40\n" + c.strokeThickness + "\n";
+      entities += "41\n" + c.strokeThickness + "\n";
     }
 
     const points: ReadonlyArray<Point> = [
@@ -422,8 +402,8 @@ function componentDxf(
     entities += "70\n0\n";
 
     if (options.useStrokeThickness) {
-      entities += "40\n" + (c.strokeThickness ?? 0) + "\n";
-      entities += "41\n" + (c.strokeThickness ?? 0) + "\n";
+      entities += "40\n" + c.strokeThickness + "\n";
+      entities += "41\n" + c.strokeThickness + "\n";
     }
 
     for (const point of c.points) {
@@ -448,8 +428,7 @@ function componentDxf(
   }
 
   if (c.type === "text") {
-    const horizontalAlignment =
-      c.horizontalGrowthDirection === "left" ? 2 : c.horizontalGrowthDirection === "uniform" ? 1 : 0;
+    const horizontalAlignment = c.horizontalGrowthDirection === "left" ? 2 : c.horizontalGrowthDirection === "uniform" ? 1 : 0;
     const verticalAlignment = c.verticalGrowthDirection === "up" ? 0 : c.verticalGrowthDirection === "uniform" ? 2 : 3;
     const fontSize = c.fontSize - 2;
 
@@ -618,9 +597,7 @@ function extractEntities(dxf: string): string | undefined {
 }
 
 function extractBlockRecords(dxf: string): ReadonlyArray<BlockRecord> {
-  return [
-    ...dxf.matchAll(/^\s*0\s*\n\s*BLOCK_RECORD[\s\S]*?\n\s*5\s*\n\s*([0-9A-Fa-f]+)[\s\S]*?\n\s*2\s*\n\s*([^\r\n]+)/gm),
-  ].map((match) => ({
+  return [...dxf.matchAll(/^\s*0\s*\n\s*BLOCK_RECORD[\s\S]*?\n\s*5\s*\n\s*([0-9A-Fa-f]+)[\s\S]*?\n\s*2\s*\n\s*([^\r\n]+)/gm)].map((match) => ({
     name: match[2],
     id: match[1],
   }));
@@ -676,7 +653,7 @@ function remapHandleIds(
 
   function collectAndRemap(src: string): string {
     const lines = src.split("\n");
-    const out: string[] = [];
+    const out: Array<string> = [];
     let i = 0;
     let inEntityHeader = false;
     while (i < lines.length) {
@@ -727,7 +704,7 @@ function scaleDxf(dxfString: string | undefined, sx: number, sy: number, _height
   const yCoordinateCodes = new Set([20, 21, 22, 23, 24, 25, 26, 27, 28]);
 
   const lines = dxfString.split(/\r?\n/);
-  const scaledLines: string[] = [];
+  const scaledLines: Array<string> = [];
 
   let currentAcDbEntity = "";
   for (let i = 0; i < lines.length; i += 2) {
@@ -739,9 +716,6 @@ function scaleDxf(dxfString: string | undefined, sx: number, sy: number, _height
     }
 
     scaledLines.push(codeLine);
-    if (valueLine === undefined) {
-      continue;
-    }
 
     const code = parseInt(codeLine.trim(), 10);
     let value = valueLine;
@@ -816,13 +790,7 @@ function getScale(extents: DxfExtents, c: BinaryImage): { readonly x: number; re
   };
 }
 
-function createExternalInsert(
-  ins: DxfInsert,
-  c: BinaryImage,
-  size: Size,
-  modelSpaceHandle: string,
-  newHandle: () => string
-): string {
+function createExternalInsert(ins: DxfInsert, c: BinaryImage, size: Size, modelSpaceHandle: string, newHandle: () => string): string {
   const srcH = ins.extents.maxY - ins.extents.minY;
   const srcW = ins.extents.maxX - ins.extents.minX;
   const destW = c.bottomRight.x - c.topLeft.x;
@@ -1006,12 +974,7 @@ function createStyleTable(newHandle: () => string): string {
   return table;
 }
 
-function createDimStyleTable(
-  newHandle: () => string,
-  dimArrowSize: number = 1.0,
-  dimGlobalScale: number = 1.0,
-  dimFontSize: number = 1.0
-): string {
+function createDimStyleTable(newHandle: () => string, dimArrowSize: number = 1.0, dimGlobalScale: number = 1.0, dimFontSize: number = 1.0): string {
   const rootId = newHandle();
   let table = "";
   table += "0\nTABLE\n";
@@ -1129,12 +1092,7 @@ function createBlockRecordsTable(
   return table;
 }
 
-function createObjects(
-  modelSpaceHandle: string,
-  paperSpaceHandle: string,
-  root: AbstractImage,
-  newHandle: () => string
-): string {
+function createObjects(modelSpaceHandle: string, paperSpaceHandle: string, root: AbstractImage, newHandle: () => string): string {
   let objects = "";
   const rootDictId = newHandle();
   const groupDictId = newHandle();
@@ -1161,8 +1119,7 @@ function createObjects(
   objects += "0\nLAYOUT\n5\n" + layoutModelId + "\n102\n{ACAD_REACTORS\n330\n" + layoutDictId + "\n102\n}\n";
   objects += "330\n" + layoutDictId + "\n100\nAcDbPlotSettings\n1\n\n2\nnone_device\n4\n\n6\n\n";
   objects += "40\n0.0\n41\n0.0\n42\n0.0\n43\n0.0\n44\n0.0\n45\n0.0\n46\n0.0\n47\n0.0\n48\n0.0\n49\n0.0\n";
-  objects +=
-    "140\n0.0\n141\n0.0\n142\n1.0\n143\n1.0\n70\n1712\n72\n0\n73\n0\n74\n0\n7\n\n75\n0\n147\n1.0\n148\n0.0\n149\n0.0\n";
+  objects += "140\n0.0\n141\n0.0\n142\n1.0\n143\n1.0\n70\n1712\n72\n0\n73\n0\n74\n0\n7\n\n75\n0\n147\n1.0\n148\n0.0\n149\n0.0\n";
   objects += "100\nAcDbLayout\n1\nModel\n70\n1\n71\n0\n";
   objects += "10\n0.0\n20\n0.0\n11\n" + root.size.width + "\n21\n" + root.size.height + "\n";
   objects += "12\n0.0\n22\n0.0\n32\n0.0\n14\n0.0\n24\n0.0\n34\n0.0\n";
@@ -1174,8 +1131,7 @@ function createObjects(
   objects += "0\nLAYOUT\n5\n" + layoutPaperId + "\n102\n{ACAD_REACTORS\n330\n" + layoutDictId + "\n102\n}\n";
   objects += "330\n" + layoutDictId + "\n100\nAcDbPlotSettings\n1\n\n2\nnone_device\n4\n\n6\n\n";
   objects += "40\n0.0\n41\n0.0\n42\n0.0\n43\n0.0\n44\n0.0\n45\n0.0\n46\n0.0\n47\n0.0\n48\n0.0\n49\n0.0\n";
-  objects +=
-    "140\n0.0\n141\n0.0\n142\n1.0\n143\n1.0\n70\n688\n72\n0\n73\n0\n74\n5\n7\n\n75\n16\n147\n1.0\n148\n0.0\n149\n0.0\n";
+  objects += "140\n0.0\n141\n0.0\n142\n1.0\n143\n1.0\n70\n688\n72\n0\n73\n0\n74\n5\n7\n\n75\n16\n147\n1.0\n148\n0.0\n149\n0.0\n";
   objects += "100\nAcDbLayout\n1\nLayout1\n70\n1\n71\n1\n";
   objects += "10\n0.0\n20\n0.0\n11\n" + root.size.width + "\n21\n" + root.size.height + "\n";
   objects += "12\n0.0\n22\n0.0\n32\n0.0\n14\n1.0E+20\n24\n1.0E+20\n34\n1.0E+20\n";
@@ -1339,6 +1295,7 @@ function isBlack(color: Color): boolean {
 }
 
 function colorToInteger(color: Color): number {
+  // oxlint-disable-next-line no-bitwise
   const colorAsInt = (color.r << 16) + (color.g << 8) + color.b;
   if (Number.isNaN(colorAsInt)) {
     return 0;

package/src/exporters/eps-export-image.ts

@@ -4,8 +4,7 @@ import type { Component, Text } from "../model/component.js";
 
 type CharacterEncoding = "standard-encoding" | "iso-latin-1-encoding";
 
-export function epsExportImage(root: AbstractImage): string;
-export function epsExportImage(root: AbstractImage, characterEncoding: "standard-encoding"): string;
+export function epsExportImage(root: AbstractImage, characterEncoding?: "standard-encoding"): string;
 export function epsExportImage(root: AbstractImage, characterEncoding: "iso-latin-1-encoding"): Uint8Array;
 export function epsExportImage(root: AbstractImage, characterEncoding?: CharacterEncoding): string | Uint8Array {
   if (characterEncoding === "iso-latin-1-encoding") {
@@ -16,10 +15,9 @@ export function epsExportImage(root: AbstractImage, characterEncoding?: Characte
     ].join("\n");
     return encodeLatin1Encoding(eps);
   } else {
-    return [
-      ...createEpsHeaderLines(root),
-      ...root.components.flatMap((c) => epsExportComponent(c, root.size.height, "standard-encoding")),
-    ].join("\n");
+    return [...createEpsHeaderLines(root), ...root.components.flatMap((c) => epsExportComponent(c, root.size.height, "standard-encoding"))].join(
+      "\n"
+    );
   }
 }
 
@@ -53,12 +51,7 @@ function epsExportComponent(c: Component, height: number, characterEncoding: Cha
       const ry = 0.5 * (c.bottomRight.y - c.topLeft.y);
       return [
         ...getColored(c.fillColor, [`${cx} ${cy} ${rx} ${ry} 0 360 ellipse`, "closepath", "fill"]),
-        ...getColored(c.strokeColor, [
-          `${cx} ${cy} ${rx} ${ry} 0 360 ellipse`,
-          "closepath",
-          `${c.strokeThickness} setlinewidth`,
-          "stroke",
-        ]),
+        ...getColored(c.strokeColor, [`${cx} ${cy} ${rx} ${ry} 0 360 ellipse`, "closepath", `${c.strokeThickness} setlinewidth`, "stroke"]),
       ];
     }
     case "group": {
@@ -102,10 +95,7 @@ function epsExportComponent(c: Component, height: number, characterEncoding: Cha
       const h = c.bottomRight.y - c.topLeft.y;
       return [
         ...getColored(c.fillColor, [`${c.topLeft.x} ${height - c.bottomRight.y} ${w} ${h} rectfill`]),
-        ...getColored(c.strokeColor, [
-          `${c.strokeThickness} setlinewidth`,
-          `${c.topLeft.x} ${height - c.bottomRight.y} ${w} ${h} rectstroke`,
-        ]),
+        ...getColored(c.strokeColor, [`${c.strokeThickness} setlinewidth`, `${c.topLeft.x} ${height - c.bottomRight.y} ${w} ${h} rectstroke`]),
       ];
     }
     case "text": {
@@ -165,14 +155,14 @@ function createFontName(characterEncoding: CharacterEncoding, fontFamily: string
 function encodeLatin1Encoding(text: string): Uint8Array {
   // ISOLatin1Encoding is close to iso-8859-1 encoding (https://en.wikipedia.org/wiki/PostScript_Latin_1_Encoding)
   // Code points 0-256 returned by codePointAt() maps to iso-8859-1
-  const unknownCharacter = "?".codePointAt(0) || 32;
+  const unknownCharacter = "?".codePointAt(0) ?? 32;
   const output: Array<number> = [];
   // Array.from() to handle characters consisting of multiple code points
   for (const c of Array.from(text)) {
     if (c.length > 1) {
       output.push(unknownCharacter);
     } else {
-      const cp = c.codePointAt(0) || 32;
+      const cp = c.codePointAt(0) ?? 32;
       if (cp > 255) {
         output.push(unknownCharacter);
       }

package/src/exporters/react-svg-export-image.tsx

@@ -1,10 +1,10 @@
 import { fromByteArray } from "base64-js";
 import React from "react";
 import type { AbstractImage } from "../model/abstract-image.js";
+import type { Color } from "../model/color.js";
+import type { AbstractFontWeight, Component, GrowthDirection } from "../model/component.js";
 import type { Point } from "../model/point.js";
 import { createPoint } from "../model/point.js";
-import type { AbstractFontWeight, Component, GrowthDirection } from "../model/component.js";
-import type { Color } from "../model/color.js";
 import type { Optional } from "../model/shared.js";
 
 export interface ReactSvgCallbacks {
@@ -32,7 +32,7 @@ export function ReactSvg({
   const opts: ReactSvgOptions = {
     imageDataByUrl: options?.imageDataByUrl ?? {},
   };
-  const cb = callbacks || {};
+  const cb = callbacks ?? {};
   const id = "ai_root";
   return (
     <svg
@@ -85,13 +85,7 @@ function getIdAttr(target: Element | undefined, rootId: string): string | undefi
   return parts[1];
 }
 
-function JsxComponent({
-  component,
-  options,
-}: {
-  readonly component: Component;
-  readonly options: ReactSvgOptions;
-}): React.JSX.Element {
+function JsxComponent({ component, options }: { readonly component: Component; readonly options: ReactSvgOptions }): React.JSX.Element {
   switch (component.type) {
     case "group":
       return (
@@ -109,8 +103,8 @@ function JsxComponent({
       const id = makeIdAttr(component.id);
       if (component.data.type === "url") {
         const data = options.imageDataByUrl[component.data.url];
-        if (typeof data === "string" || data === undefined) {
-          return <image x={x} y={y} width={width} height={height} id={id} href={data ?? component.data.url} />;
+        if (typeof data === "string") {
+          return <image x={x} y={y} width={width} height={height} id={id} href={data} />;
         }
         const scale = Math.min(width / (data.size.width || 1), height / (data.size.height || 1));
         return (
@@ -145,10 +139,8 @@ function JsxComponent({
       );
     }
     case "line": {
-      const strokeDasharray =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
-      const strokeDashoffset =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
+      const strokeDasharray = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
+      const strokeDashoffset = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
       return (
         <line
           id={makeIdAttr(component.id)}
@@ -171,7 +163,7 @@ function JsxComponent({
       }
       const alignmentBaseline = getBaselineAdjustment(component.verticalGrowthDirection);
       const transform = `rotate(${component.clockwiseRotationDegrees} ${component.position.x} ${component.position.y})`;
-      const lines: Array<string> = component.text !== null ? component.text.split("\n") : [];
+      const lines = component.text.split("\n");
       const tSpans = lines.map((t, i) => (
         <TSpan
           key={t}
@@ -192,7 +184,7 @@ function JsxComponent({
       };
       return (
         <>
-          {component.strokeThickness > 0 && component.strokeColor && (
+          {component.strokeThickness > 0 && (
             <text
               style={{
                 ...baseStyle,
@@ -205,11 +197,7 @@ function JsxComponent({
               {tSpans}
             </text>
           )}
-          <text
-            style={{ ...baseStyle, fill: colorToRgb(component.textColor) }}
-            transform={transform}
-            id={makeIdAttr(component.id)}
-          >
+          <text style={{ ...baseStyle, fill: colorToRgb(component.textColor) }} transform={transform} id={makeIdAttr(component.id)}>
             {tSpans}
           </text>
         </>
@@ -220,10 +208,8 @@ function JsxComponent({
       const ry = Math.abs(component.bottomRight.y - component.topLeft.y) * 0.5;
       const cx = (component.bottomRight.x + component.topLeft.x) * 0.5;
       const cy = (component.bottomRight.y + component.topLeft.y) * 0.5;
-      const strokeDasharray =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
-      const strokeDashoffset =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
+      const strokeDasharray = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
+      const strokeDashoffset = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
       return (
         <ellipse
           id={makeIdAttr(component.id)}
@@ -242,11 +228,9 @@ function JsxComponent({
       );
     }
     case "polyline": {
-      let linePoints = component.points.map((p) => p.x.toString() + "," + p.y.toString()).join(" ");
-      const strokeDasharray =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
-      const strokeDashoffset =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
+      const linePoints = component.points.map((p) => p.x.toString() + "," + p.y.toString()).join(" ");
+      const strokeDasharray = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
+      const strokeDashoffset = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
       return (
         <polyline
           id={makeIdAttr(component.id)}
@@ -263,11 +247,9 @@ function JsxComponent({
       );
     }
     case "polygon": {
-      let points = component.points.map((p) => p.x.toString() + "," + p.y.toString()).join(" ");
-      const strokeDasharray =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
-      const strokeDashoffset =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
+      const points = component.points.map((p) => p.x.toString() + "," + p.y.toString()).join(" ");
+      const strokeDasharray = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
+      const strokeDashoffset = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
       return (
         <polygon
           id={makeIdAttr(component.id)}
@@ -284,10 +266,8 @@ function JsxComponent({
       );
     }
     case "rectangle": {
-      const strokeDasharray =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
-      const strokeDashoffset =
-        component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
+      const strokeDasharray = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.dashes.join(" ") : undefined;
+      const strokeDashoffset = component.strokeDashStyle.dashes.length > 0 ? component.strokeDashStyle.offset : undefined;
       return (
         <rect
           id={makeIdAttr(component.id)}
@@ -343,12 +323,7 @@ function TSpan({
     const splitText = split[i];
     if (inside) {
       tags.push(
-        <tspan
-          key={i}
-          baselineShift="sub"
-          alignmentBaseline={alignmentBaseline}
-          style={{ fontSize: (fontSize * 0.8).toString() + "px" }}
-        >
+        <tspan key={i} baselineShift="sub" alignmentBaseline={alignmentBaseline} style={{ fontSize: (fontSize * 0.8).toString() + "px" }}>
           {splitText}
         </tspan>
       );
@@ -378,7 +353,7 @@ function getBaselineAdjustment(d: GrowthDirection): "baseline" | "central" | "ha
   if (d === "down") {
     return "hanging";
   }
-  throw "Unknown text alignment " + d;
+  throw new Error("Unknown text alignment " + d);
 }
 
 function getTextAnchor(d: GrowthDirection): "end" | "middle" | "start" {
@@ -391,7 +366,7 @@ function getTextAnchor(d: GrowthDirection): "end" | "middle" | "start" {
   if (d === "right") {
     return "start";
   }
-  throw "Unknown text anchor " + d;
+  throw new Error("Unknown text anchor " + d);
 }
 
 function colorToRgb(color: Color): string {

package/src/exporters/svg-export-image.ts

@@ -1,7 +1,7 @@
 import { fromByteArray } from "base64-js";
-import type { Component, GrowthDirection } from "../model/component.js";
 import type { AbstractImage } from "../model/abstract-image.js";
 import type { Color } from "../model/color.js";
+import type { Component, GrowthDirection } from "../model/component.js";
 import type { Optional } from "../model/shared.js";
 
 export const SVG_DATA_URL = "data:image/svg+xml,";
@@ -15,8 +15,8 @@ export type SvgOptions = {
 export function createSVG(image: AbstractImage, options?: Optional<SvgOptions>): string {
   const opts: SvgOptions = {
     imageDataByUrl: options?.imageDataByUrl ?? {},
-    pixelWidth: options?.pixelWidth || image.size.width,
-    pixelHeight: options?.pixelHeight || image.size.height,
+    pixelWidth: options?.pixelWidth ?? image.size.width,
+    pixelHeight: options?.pixelHeight ?? image.size.height,
   };
   const subOptions: SvgOptions = { ...opts, pixelWidth: 0, pixelHeight: 0 };
   const imageElements = image.components.map((c: Component) => abstractComponentToSVG(c, subOptions));
@@ -75,15 +75,10 @@ function abstractComponentToSVG(component: Component, options: SvgOptions): stri
       return "";
     }
     case "subimage": {
-      const scale = Math.min(
-        component.size.width / (component.image.size.width || 1),
-        component.size.height / (component.image.size.height || 1)
-      );
-      return createElement(
-        "g",
-        { transform: `translate(${component.topLeft.x}, ${component.topLeft.y}) scale(${scale})` },
-        [createSVG(component.image, { ...options, pixelWidth: undefined, pixelHeight: undefined })]
-      );
+      const scale = Math.min(component.size.width / (component.image.size.width || 1), component.size.height / (component.image.size.height || 1));
+      return createElement("g", { transform: `translate(${component.topLeft.x}, ${component.topLeft.y}) scale(${scale})` }, [
+        createSVG(component.image, { ...options, pixelWidth: undefined, pixelHeight: undefined }),
+      ]);
     }
     case "line": {
       const dashStyle: Attributes =
@@ -297,7 +292,7 @@ interface Attributes {
   readonly [key: string]: string;
 }
 
-function createElement(elementName: string, attributes: Attributes, innerElements: string[]): string {
+function createElement(elementName: string, attributes: Attributes, innerElements: Array<string>): string {
   const formattedName = convertUpperToHyphenLower(elementName);
   let element = `<${formattedName}`;
 
@@ -360,7 +355,7 @@ function getBaselineAdjustment(d: GrowthDirection): "baseline" | "central" | "ha
   if (d === "down") {
     return "hanging";
   }
-  throw "Unknown text alignment " + d;
+  throw new Error("Unknown text alignment " + d);
 }
 
 function getTextAnchor(d: GrowthDirection): string {
@@ -373,7 +368,7 @@ function getTextAnchor(d: GrowthDirection): string {
   if (d === "right") {
     return "start";
   }
-  throw "Unknown text anchor " + d;
+  throw new Error("Unknown text anchor " + d);
 }
 
 function colorToRgb(color: Color): string {

package/src/model/abstract-image.ts

@@ -1,7 +1,7 @@
-import type { Size } from "./size.js";
 import type { Color } from "./color.js";
 import type { Component } from "./component.js";
 import type { Point } from "./point.js";
+import type { Size } from "./size.js";
 
 export interface AbstractImage {
   readonly topLeft: Point;
@@ -10,12 +10,7 @@ export interface AbstractImage {
   readonly components: Array<Component>;
 }
 
-export function createAbstractImage(
-  topLeft: Point,
-  size: Size,
-  backgroundColor: Color,
-  components: Array<Component>
-): AbstractImage {
+export function createAbstractImage(topLeft: Point, size: Size, backgroundColor: Color, components: Array<Component>): AbstractImage {
   return {
     topLeft: topLeft,
     size: size,

package/src/model/color.ts

@@ -10,15 +10,11 @@ export function fromArgb(a: number, r: number, g: number, b: number): Color {
 }
 
 export function toString6Hex(color: Color): string {
-  return (
-    ("00" + color.r.toString(16)).substr(-2) +
-    ("00" + color.g.toString(16)).substr(-2) +
-    ("00" + color.b.toString(16)).substr(-2)
-  );
+  return ("00" + color.r.toString(16)).substr(-2) + ("00" + color.g.toString(16)).substr(-2) + ("00" + color.b.toString(16)).substr(-2);
 }
 
 export function fromString(s: string): Color | undefined {
-  if (s === null || s === undefined || s.length !== 9 || s[0] !== "#") {
+  if (s?.length !== 9 || !s.startsWith("#")) {
     return undefined;
   }
 
@@ -27,7 +23,7 @@ export function fromString(s: string): Color | undefined {
   const g: number = parseInt(s.substring(5, 5 + 2), 16);
   const b: number = parseInt(s.substring(7, 7 + 2), 16);
 
-  if (isNaN(a) || isNaN(r) || isNaN(g) || isNaN(b)) {
+  if (Number.isNaN(a) || Number.isNaN(r) || Number.isNaN(g) || Number.isNaN(b)) {
     return undefined;
   }
 
@@ -37,12 +33,7 @@ export function fromString(s: string): Color | undefined {
 export function fromString2(s: string, def?: Color): Color {
   if (s.startsWith("#")) {
     if (s.length === 9) {
-      return fromArgb(
-        parseInt(s.slice(1, 3), 16),
-        parseInt(s.slice(3, 5), 16),
-        parseInt(s.slice(5, 7), 16),
-        parseInt(s.slice(7, 9), 16)
-      );
+      return fromArgb(parseInt(s.slice(1, 3), 16), parseInt(s.slice(3, 5), 16), parseInt(s.slice(5, 7), 16), parseInt(s.slice(7, 9), 16));
     }
     return fromArgb(255, parseInt(s.slice(1, 3), 16), parseInt(s.slice(3, 5), 16), parseInt(s.slice(5, 7), 16));
   }

package/src/model/component.ts

@@ -1,9 +1,9 @@
-import type { Point } from "./point.js";
-import { createPoint } from "./point.js";
+import type { AbstractImage } from "./abstract-image.js";
 import type { Color } from "./color.js";
 import type { DashStyle } from "./dash-style.js";
 import { solidLine } from "./dash-style.js";
-import type { AbstractImage } from "./abstract-image.js";
+import type { Point } from "./point.js";
+import { createPoint } from "./point.js";
 import type { Size } from "./size.js";
 
 export type Component = BinaryImage | Ellipse | Line | PolyLine | Polygon | Rectangle | Text | SubImage | Group;
@@ -22,9 +22,7 @@ export function createGroup(name: string, children: Array<Component>): Group {
   };
 }
 
-/**
- * Embed a foreign binary image in any suported format.
- */
+/** Embed a foreign binary image in any suported format. */
 
 export type BinaryFormat = "svg" | "png" | "dxf";
 
@@ -49,13 +47,7 @@ export interface ImageUrl {
   readonly url: string;
 }
 
-export function createBinaryImage(
-  topLeft: Point,
-  bottomRight: Point,
-  format: BinaryFormat,
-  data: ImageData,
-  id?: string
-): BinaryImage {
+export function createBinaryImage(topLeft: Point, bottomRight: Point, format: BinaryFormat, data: ImageData, id?: string): BinaryImage {
   return {
     type: "binaryimage",
     topLeft: topLeft,