@emasoft/svg-matrix 1.0.30 → 1.0.31

package/src/inkscape-support.js

@@ -55,11 +55,14 @@ export function findLayers(doc) {
       layers.push({
         element: el,
         label: getLayerLabel(el),
-        id: el.getAttribute('id')
+        id: (typeof el.getAttribute === 'function' ? el.getAttribute('id') : null)
       });
     }
-    for (const child of el.children) {
-      walk(child);
+    // Safety check: ensure children is an array before iteration
+    if (Array.isArray(el.children)) {
+      for (const child of el.children) {
+        walk(child);
+      }
     }
   };
 
@@ -75,6 +78,9 @@ export function findLayers(doc) {
  * @returns {Object|null} Named view settings or null if not found
  */
 export function getNamedViewSettings(doc) {
+  // Validate doc parameter
+  if (!doc) return null;
+
   // Find namedview element - may be direct child or nested
   let namedview = null;
 
@@ -84,7 +90,7 @@ export function getNamedViewSettings(doc) {
       namedview = el;
       return;
     }
-    if (el.children) {
+    if (el.children && Array.isArray(el.children)) {
       for (const child of el.children) {
         findNamedview(child);
         if (namedview) return;
@@ -93,7 +99,7 @@ export function getNamedViewSettings(doc) {
   };
 
   findNamedview(doc);
-  if (!namedview) return null;
+  if (!namedview || typeof namedview.getAttribute !== 'function') return null;
 
   return {
     pagecolor: namedview.getAttribute('pagecolor'),
@@ -118,21 +124,27 @@ export function getNamedViewSettings(doc) {
  * @returns {Array<{position: string, orientation: string, id: string|null}>} Array of guide info
  */
 export function findGuides(doc) {
+  // Validate doc parameter
+  if (!doc) return [];
+
   const guides = [];
 
   const walk = (el) => {
     if (!el || !el.children) return;
     if (el.tagName === 'sodipodi:guide') {
       guides.push({
-        position: el.getAttribute('position'),
-        orientation: el.getAttribute('orientation'),
-        id: el.getAttribute('id'),
-        inkscapeColor: el.getAttribute('inkscape:color'),
-        inkscapeLabel: el.getAttribute('inkscape:label')
+        position: el.getAttribute?.('position') || null,
+        orientation: el.getAttribute?.('orientation') || null,
+        id: el.getAttribute?.('id') || null,
+        inkscapeColor: el.getAttribute?.('inkscape:color') || null,
+        inkscapeLabel: el.getAttribute?.('inkscape:label') || null
       });
     }
-    for (const child of el.children) {
-      walk(child);
+    // Safety check: ensure children is an array before iteration
+    if (Array.isArray(el.children)) {
+      for (const child of el.children) {
+        walk(child);
+      }
     }
   };
 
@@ -148,7 +160,7 @@ export function findGuides(doc) {
  * @returns {Object|null} Arc parameters or null if not an arc
  */
 export function getArcParameters(element) {
-  if (!element) return null;
+  if (!element || typeof element.getAttribute !== 'function') return null;
 
   const type = element.getAttribute('sodipodi:type');
   if (type !== 'arc') return null;
@@ -183,7 +195,7 @@ export function getNodeTypes(element) {
  * @returns {Object|null} Export settings or null if not set
  */
 export function getExportSettings(element) {
-  if (!element) return null;
+  if (!element || typeof element.getAttribute !== 'function') return null;
 
   const filename = element.getAttribute('inkscape:export-filename');
   const xdpi = element.getAttribute('inkscape:export-xdpi');
@@ -191,10 +203,14 @@ export function getExportSettings(element) {
 
   if (!filename && !xdpi && !ydpi) return null;
 
+  // Parse DPI values and handle NaN by returning null
+  const parsedXdpi = xdpi ? parseFloat(xdpi) : null;
+  const parsedYdpi = ydpi ? parseFloat(ydpi) : null;
+
   return {
     filename,
-    xdpi: xdpi ? parseFloat(xdpi) : null,
-    ydpi: ydpi ? parseFloat(ydpi) : null
+    xdpi: (parsedXdpi !== null && !isNaN(parsedXdpi)) ? parsedXdpi : null,
+    ydpi: (parsedYdpi !== null && !isNaN(parsedYdpi)) ? parsedYdpi : null
   };
 }
 
@@ -205,7 +221,8 @@ export function getExportSettings(element) {
  * @returns {boolean} True if element is a tiled clone
  */
 export function isTiledClone(element) {
-  return element?.hasAttribute('inkscape:tiled-clone-of') || false;
+  if (!element || typeof element.hasAttribute !== 'function') return false;
+  return element.hasAttribute('inkscape:tiled-clone-of');
 }
 
 /**
@@ -241,6 +258,9 @@ export function hasInkscapeNamespaces(doc) {
  * @returns {Object} The document (modified in place)
  */
 export function ensureInkscapeNamespaces(doc) {
+  // Validate doc parameter
+  if (!doc) return doc;
+
   const svg = doc.documentElement || doc;
 
   // Safety check: ensure getAttribute and setAttribute methods exist
@@ -271,6 +291,9 @@ export function ensureInkscapeNamespaces(doc) {
  * @returns {Set<string>} Set of referenced IDs
  */
 export function findReferencedIds(element) {
+  // Validate element parameter
+  if (!element) return new Set();
+
   const ids = new Set();
 
   // Attributes that can contain url(#id) references
@@ -284,14 +307,14 @@ export function findReferencedIds(element) {
   const hrefAttrs = ['href', 'xlink:href'];
 
   const extractUrlId = (value) => {
-    if (!value) return null;
+    if (!value || typeof value !== 'string') return null;
     // Match url(#id) or url("#id")
     const match = value.match(/url\(["']?#([^"')]+)["']?\)/);
     return match ? match[1] : null;
   };
 
   const extractHrefId = (value) => {
-    if (!value) return null;
+    if (!value || typeof value !== 'string') return null;
     // Match #id references
     if (value.startsWith('#')) {
       return value.slice(1);
@@ -324,7 +347,7 @@ export function findReferencedIds(element) {
     }
 
     // Recurse into children
-    if (el.children) {
+    if (el.children && Array.isArray(el.children)) {
       for (const child of el.children) {
         walk(child);
       }
@@ -342,6 +365,9 @@ export function findReferencedIds(element) {
  * @returns {Map<string, Object>} Map of ID to element
  */
 export function buildDefsMapFromDefs(doc) {
+  // Validate doc parameter
+  if (!doc) return new Map();
+
   const defsMap = new Map();
 
   const walk = (el) => {
@@ -354,7 +380,7 @@ export function buildDefsMapFromDefs(doc) {
     }
 
     // Recurse
-    if (el.children) {
+    if (el.children && Array.isArray(el.children)) {
       for (const child of el.children) {
         walk(child);
       }
@@ -367,7 +393,7 @@ export function buildDefsMapFromDefs(doc) {
     if (el.tagName === 'defs') {
       walk(el);
     }
-    if (el.children) {
+    if (el.children && Array.isArray(el.children)) {
       for (const child of el.children) {
         findDefs(child);
       }
@@ -387,6 +413,14 @@ export function buildDefsMapFromDefs(doc) {
  * @returns {Set<string>} Complete set of IDs including all nested dependencies
  */
 export function resolveDefsDependencies(initialIds, defsMap) {
+  // Validate parameters
+  if (!initialIds || !(initialIds instanceof Set)) {
+    throw new Error('initialIds must be a Set');
+  }
+  if (!defsMap || !(defsMap instanceof Map)) {
+    throw new Error('defsMap must be a Map');
+  }
+
   const resolved = new Set();
   const toProcess = [...initialIds];
 
@@ -424,7 +458,7 @@ export function cloneElement(element) {
   const attrs = {};
   if (element._attributes) {
     Object.assign(attrs, element._attributes);
-  } else if (element.getAttributeNames) {
+  } else if (typeof element.getAttributeNames === 'function') {
     for (const name of element.getAttributeNames()) {
       attrs[name] = element.getAttribute(name);
     }
@@ -432,7 +466,7 @@ export function cloneElement(element) {
 
   // Clone children recursively
   const clonedChildren = [];
-  if (element.children) {
+  if (element.children && Array.isArray(element.children)) {
     for (const child of element.children) {
       const clonedChild = cloneElement(child);
       if (clonedChild) {
@@ -464,6 +498,11 @@ export function cloneElement(element) {
  * @returns {{svg: SVGElement, layerInfo: {id: string, label: string}}} Extracted SVG and layer info
  */
 export function extractLayer(doc, layerOrId, options = {}) {
+  // Validate doc parameter
+  if (!doc) {
+    throw new Error('doc parameter is required');
+  }
+
   const { preserveTransform = true } = options;
 
   // Find the layer element
@@ -471,11 +510,17 @@ export function extractLayer(doc, layerOrId, options = {}) {
   if (typeof layerOrId === 'string') {
     const layers = findLayers(doc);
     const found = layers.find(l => l.id === layerOrId || l.label === layerOrId);
-    if (!found || !found.element) {
-      throw new Error(`Layer not found or invalid: ${layerOrId}`);
+    if (!found) {
+      throw new Error(`Layer not found: ${layerOrId}`);
+    }
+    if (!found.element) {
+      throw new Error(`Layer element is invalid for: ${layerOrId}`);
     }
     layer = found.element;
   } else {
+    if (!layerOrId) {
+      throw new Error('layerOrId parameter is required');
+    }
     layer = layerOrId;
   }
 
@@ -499,7 +544,7 @@ export function extractLayer(doc, layerOrId, options = {}) {
   const svgAttrs = {};
   if (svgRoot._attributes) {
     Object.assign(svgAttrs, svgRoot._attributes);
-  } else if (svgRoot.getAttributeNames) {
+  } else if (typeof svgRoot.getAttributeNames === 'function') {
     for (const name of svgRoot.getAttributeNames()) {
       svgAttrs[name] = svgRoot.getAttribute(name);
     }
@@ -538,7 +583,7 @@ export function extractLayer(doc, layerOrId, options = {}) {
 
   // Get layer info
   const layerInfo = {
-    id: layer.getAttribute('id'),
+    id: (typeof layer.getAttribute === 'function' ? layer.getAttribute('id') : null),
     label: getLayerLabel(layer)
   };
 
@@ -555,6 +600,11 @@ export function extractLayer(doc, layerOrId, options = {}) {
  * @returns {Array<{svg: Object, layerInfo: {id: string, label: string}}>} Array of extracted SVGs
  */
 export function extractAllLayers(doc, options = {}) {
+  // Validate doc parameter
+  if (!doc) {
+    throw new Error('doc parameter is required');
+  }
+
   const { includeHidden = false } = options;
   const layers = findLayers(doc);
   const results = [];
@@ -564,6 +614,9 @@ export function extractAllLayers(doc, options = {}) {
 
     // Skip hidden layers unless requested
     if (!includeHidden) {
+      // Validate getAttribute method exists
+      if (typeof layer.getAttribute !== 'function') continue;
+
       const style = layer.getAttribute('style') || '';
       const display = layer.getAttribute('display');
       const visibility = layer.getAttribute('visibility');
@@ -596,6 +649,11 @@ export function extractAllLayers(doc, options = {}) {
  * @returns {Object} Summary of shared resources
  */
 export function analyzeLayerDependencies(doc) {
+  // Validate doc parameter
+  if (!doc) {
+    throw new Error('doc parameter is required');
+  }
+
   const layers = findLayers(doc);
   const defsMap = buildDefsMapFromDefs(doc);
   const layerRefs = new Map(); // layer ID -> Set of referenced def IDs

package/src/logger.js

@@ -126,11 +126,21 @@ export const Logger = {
    * @private
    */
   _format(level, message) {
+    // Why: Validate parameters to prevent crashes from invalid inputs
+    if (typeof level !== 'string' || !level) {
+      throw new Error('Logger._format: level must be a non-empty string');
+    }
+    if (message === null || message === undefined) {
+      throw new Error('Logger._format: message cannot be null or undefined');
+    }
+    // Why: Convert message to string to handle non-string inputs gracefully
+    const messageStr = String(message);
+
     if (this.timestamps) {
       const ts = new Date().toISOString();
-      return `[${ts}] [${level}] ${message}`;
+      return `[${ts}] [${level}] ${messageStr}`;
     }
-    return `[${level}] ${message}`;
+    return `[${level}] ${messageStr}`;
   },
 
   /**
@@ -144,7 +154,14 @@ export const Logger = {
   _bufferWrite(message) {
     if (!this.logToFile) return;
 
-    this._buffer.push(message);
+    // Why: Validate message parameter to prevent buffer corruption
+    if (message === null || message === undefined) {
+      throw new Error('Logger._bufferWrite: message cannot be null or undefined');
+    }
+    // Why: Convert to string to handle non-string inputs gracefully
+    const messageStr = String(message);
+
+    this._buffer.push(messageStr);
 
     // Why: Flush when buffer is full to prevent unbounded memory growth
     if (this._buffer.length >= LOG_BUFFER_SIZE) {
@@ -188,6 +205,10 @@ export const Logger = {
    * @param {...any} args - Additional arguments
    */
   error(message, ...args) {
+    // Why: Validate message parameter to prevent crashes
+    if (message === null || message === undefined) {
+      throw new Error('Logger.error: message cannot be null or undefined');
+    }
     if (this.level >= LogLevel.ERROR) {
       const formatted = this._format('ERROR', message);
       console.error(formatted, ...args);
@@ -203,6 +224,10 @@ export const Logger = {
    * @param {...any} args - Additional arguments
    */
   warn(message, ...args) {
+    // Why: Validate message parameter to prevent crashes
+    if (message === null || message === undefined) {
+      throw new Error('Logger.warn: message cannot be null or undefined');
+    }
     if (this.level >= LogLevel.WARN) {
       const formatted = this._format('WARN', message);
       console.warn(formatted, ...args);
@@ -216,6 +241,10 @@ export const Logger = {
    * @param {...any} args - Additional arguments
    */
   info(message, ...args) {
+    // Why: Validate message parameter to prevent crashes
+    if (message === null || message === undefined) {
+      throw new Error('Logger.info: message cannot be null or undefined');
+    }
     if (this.level >= LogLevel.INFO) {
       const formatted = this._format('INFO', message);
       console.log(formatted, ...args);
@@ -229,6 +258,10 @@ export const Logger = {
    * @param {...any} args - Additional arguments
    */
   debug(message, ...args) {
+    // Why: Validate message parameter to prevent crashes
+    if (message === null || message === undefined) {
+      throw new Error('Logger.debug: message cannot be null or undefined');
+    }
     if (this.level >= LogLevel.DEBUG) {
       const formatted = this._format('DEBUG', message);
       console.log(formatted, ...args);
@@ -257,6 +290,10 @@ export const Logger = {
  * @param {number} level - Log level from LogLevel enum
  */
 export function setLogLevel(level) {
+  // Why: Validate level is a number to catch type errors
+  if (typeof level !== 'number' || !Number.isFinite(level)) {
+    throw new Error(`setLogLevel: level must be a finite number, got ${typeof level}`);
+  }
   // Why: Validate level is within valid range to catch typos
   if (level < LogLevel.SILENT || level > LogLevel.DEBUG) {
     throw new Error(`Invalid log level: ${level}. Use LogLevel.SILENT (0) through LogLevel.DEBUG (4)`);
@@ -281,10 +318,18 @@ export function getLogLevel() {
  * @param {boolean} [withTimestamps=true] - Include timestamps
  */
 export function enableFileLogging(filePath, withTimestamps = true) {
+  // Why: Validate filePath type to catch type errors
+  if (typeof filePath !== 'string') {
+    throw new Error(`enableFileLogging: filePath must be a string, got ${typeof filePath}`);
+  }
   // Why: Don't accept empty/null paths - would cause confusing errors later
   if (!filePath) {
     throw new Error('File path required for enableFileLogging()');
   }
+  // Why: Validate withTimestamps type to catch type errors
+  if (typeof withTimestamps !== 'boolean') {
+    throw new Error(`enableFileLogging: withTimestamps must be a boolean, got ${typeof withTimestamps}`);
+  }
   Logger.logToFile = filePath;
   Logger.timestamps = withTimestamps;
 }