@unocss/preset-icons 0.55.2 → 0.55.3

package/dist/browser.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const cdn = require('./shared/preset-icons.54d3f633.cjs');
+const cdn = require('./shared/preset-icons.03b1ec6a.cjs');
 const core = require('./core.cjs');
 require('ofetch');
 require('@unocss/core');

package/dist/browser.mjs

@@ -1,4 +1,4 @@
-import { c as createCDNLoader, l as loadIcon } from './shared/preset-icons.3f82c70f.mjs';
+import { c as createCDNLoader, l as loadIcon } from './shared/preset-icons.05307f91.mjs';
 import { createPresetIcons } from './core.mjs';
 export { combineLoaders } from './core.mjs';
 import 'ofetch';

package/dist/core.d.cts

@@ -80,4 +80,4 @@ interface IconsOptions {
 declare function createPresetIcons(lookupIconLoader: (options: IconsOptions) => Promise<UniversalIconLoader>): (options?: IconsOptions) => Preset;
 declare function combineLoaders(loaders: UniversalIconLoader[]): UniversalIconLoader;
 
-export { IconsOptions, combineLoaders, createPresetIcons };
+export { type IconsOptions, combineLoaders, createPresetIcons };

package/dist/core.d.mts

@@ -80,4 +80,4 @@ interface IconsOptions {
 declare function createPresetIcons(lookupIconLoader: (options: IconsOptions) => Promise<UniversalIconLoader>): (options?: IconsOptions) => Preset;
 declare function combineLoaders(loaders: UniversalIconLoader[]): UniversalIconLoader;
 
-export { IconsOptions, combineLoaders, createPresetIcons };
+export { type IconsOptions, combineLoaders, createPresetIcons };

package/dist/core.d.ts

@@ -80,4 +80,4 @@ interface IconsOptions {
 declare function createPresetIcons(lookupIconLoader: (options: IconsOptions) => Promise<UniversalIconLoader>): (options?: IconsOptions) => Preset;
 declare function combineLoaders(loaders: UniversalIconLoader[]): UniversalIconLoader;
 
-export { IconsOptions, combineLoaders, createPresetIcons };
+export { type IconsOptions, combineLoaders, createPresetIcons };

package/dist/index.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const cdn = require('./shared/preset-icons.54d3f633.cjs');
+const cdn = require('./shared/preset-icons.03b1ec6a.cjs');
 const core = require('./core.cjs');
 require('ofetch');
 require('@unocss/core');

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { c as createCDNLoader, l as loadIcon } from './shared/preset-icons.3f82c70f.mjs';
+import { c as createCDNLoader, l as loadIcon } from './shared/preset-icons.05307f91.mjs';
 import { createPresetIcons, combineLoaders } from './core.mjs';
 import 'ofetch';
 import '@unocss/core';

package/dist/shared/{preset-icons.54d3f633.cjs → preset-icons.03b1ec6a.cjs}

@@ -150,6 +150,32 @@ function calculateSize(size, ratio, precision) {
   }
 }
 
+function splitSVGDefs(content) {
+  let defs = "";
+  const index = content.indexOf("<defs");
+  while (index >= 0) {
+    const start = content.indexOf(">", index);
+    const end = content.indexOf("</defs");
+    if (start === -1 || end === -1) {
+      break;
+    }
+    const endEnd = content.indexOf(">", end);
+    if (endEnd === -1) {
+      break;
+    }
+    defs += content.slice(start + 1, end).trim();
+    content = content.slice(0, index).trim() + content.slice(endEnd + 1);
+  }
+  return {
+    defs,
+    content
+  };
+}
+function wrapSVGContent(body, start, end) {
+  const { defs, content } = splitSVGDefs(body);
+  return (defs ? "<defs>" + defs + "</defs>" : "") + start + content + end;
+}
+
 const isUnsetKeyword = (value) => value === "unset" || value === "undefined" || value === "none";
 function iconToSVG(icon, customisations) {
   const fullIcon = {
@@ -226,7 +252,11 @@ function iconToSVG(icon, customisations) {
       }
     }
     if (transformations.length) {
-      body = '<g transform="' + transformations.join(" ") + '">' + body + "</g>";
+      body = wrapSVGContent(
+        body,
+        '<g transform="' + transformations.join(" ") + '">',
+        "</g>"
+      );
     }
   });
   const customisationsWidth = fullCustomisations.width;
@@ -250,9 +280,11 @@ function iconToSVG(icon, customisations) {
   };
   setAttr("width", width);
   setAttr("height", height);
-  attributes.viewBox = box.left.toString() + " " + box.top.toString() + " " + boxWidth.toString() + " " + boxHeight.toString();
+  const viewBox = [box.left, box.top, boxWidth, boxHeight];
+  attributes.viewBox = viewBox.join(" ");
   return {
     attributes,
+    viewBox,
     body
   };
 }
@@ -337,11 +369,19 @@ async function mergeIconProps(svg, collection, icon, options, propsProvider, aft
 
 async function getCustomIcon(custom, collection, icon, options) {
   let result;
-  if (typeof custom === "function") {
-    result = await custom(icon);
-  } else {
-    const inline = custom[icon];
-    result = typeof inline === "function" ? await inline() : inline;
+  try {
+    if (typeof custom === "function") {
+      result = await custom(icon);
+    } else {
+      const inline = custom[icon];
+      result = typeof inline === "function" ? await inline() : inline;
+    }
+  } catch (err) {
+    console.warn(
+      `Failed to load custom icon "${icon}" in "${collection}":`,
+      err
+    );
+    return;
   }
   if (result) {
     const cleanupIdx = result.indexOf("<svg");
@@ -422,7 +462,16 @@ const loadIcon = async (collection, icon, options) => {
   const custom = options?.customCollections?.[collection];
   if (custom) {
     if (typeof custom === "function") {
-      const result = await custom(icon);
+      let result;
+      try {
+        result = await custom(icon);
+      } catch (err) {
+        console.warn(
+          `Failed to load custom icon "${icon}" in "${collection}":`,
+          err
+        );
+        return;
+      }
       if (result) {
         if (typeof result === "string") {
           return await getCustomIcon(
@@ -450,7 +499,6 @@ const loadIcon = async (collection, icon, options) => {
       return await getCustomIcon(custom, collection, icon, options);
     }
   }
-  return void 0;
 };
 
 function getDefaultExportFromCjs (x) {
@@ -599,6 +647,7 @@ var collections = [
 	"svg-spinners",
 	"system-uicons",
 	"tabler",
+	"tdesign",
 	"teenyicons",
 	"topcoat",
 	"twemoji",

package/dist/shared/{preset-icons.3f82c70f.mjs → preset-icons.05307f91.mjs}

@@ -148,6 +148,32 @@ function calculateSize(size, ratio, precision) {
   }
 }
 
+function splitSVGDefs(content) {
+  let defs = "";
+  const index = content.indexOf("<defs");
+  while (index >= 0) {
+    const start = content.indexOf(">", index);
+    const end = content.indexOf("</defs");
+    if (start === -1 || end === -1) {
+      break;
+    }
+    const endEnd = content.indexOf(">", end);
+    if (endEnd === -1) {
+      break;
+    }
+    defs += content.slice(start + 1, end).trim();
+    content = content.slice(0, index).trim() + content.slice(endEnd + 1);
+  }
+  return {
+    defs,
+    content
+  };
+}
+function wrapSVGContent(body, start, end) {
+  const { defs, content } = splitSVGDefs(body);
+  return (defs ? "<defs>" + defs + "</defs>" : "") + start + content + end;
+}
+
 const isUnsetKeyword = (value) => value === "unset" || value === "undefined" || value === "none";
 function iconToSVG(icon, customisations) {
   const fullIcon = {
@@ -224,7 +250,11 @@ function iconToSVG(icon, customisations) {
       }
     }
     if (transformations.length) {
-      body = '<g transform="' + transformations.join(" ") + '">' + body + "</g>";
+      body = wrapSVGContent(
+        body,
+        '<g transform="' + transformations.join(" ") + '">',
+        "</g>"
+      );
     }
   });
   const customisationsWidth = fullCustomisations.width;
@@ -248,9 +278,11 @@ function iconToSVG(icon, customisations) {
   };
   setAttr("width", width);
   setAttr("height", height);
-  attributes.viewBox = box.left.toString() + " " + box.top.toString() + " " + boxWidth.toString() + " " + boxHeight.toString();
+  const viewBox = [box.left, box.top, boxWidth, boxHeight];
+  attributes.viewBox = viewBox.join(" ");
   return {
     attributes,
+    viewBox,
     body
   };
 }
@@ -335,11 +367,19 @@ async function mergeIconProps(svg, collection, icon, options, propsProvider, aft
 
 async function getCustomIcon(custom, collection, icon, options) {
   let result;
-  if (typeof custom === "function") {
-    result = await custom(icon);
-  } else {
-    const inline = custom[icon];
-    result = typeof inline === "function" ? await inline() : inline;
+  try {
+    if (typeof custom === "function") {
+      result = await custom(icon);
+    } else {
+      const inline = custom[icon];
+      result = typeof inline === "function" ? await inline() : inline;
+    }
+  } catch (err) {
+    console.warn(
+      `Failed to load custom icon "${icon}" in "${collection}":`,
+      err
+    );
+    return;
   }
   if (result) {
     const cleanupIdx = result.indexOf("<svg");
@@ -420,7 +460,16 @@ const loadIcon = async (collection, icon, options) => {
   const custom = options?.customCollections?.[collection];
   if (custom) {
     if (typeof custom === "function") {
-      const result = await custom(icon);
+      let result;
+      try {
+        result = await custom(icon);
+      } catch (err) {
+        console.warn(
+          `Failed to load custom icon "${icon}" in "${collection}":`,
+          err
+        );
+        return;
+      }
       if (result) {
         if (typeof result === "string") {
           return await getCustomIcon(
@@ -448,7 +497,6 @@ const loadIcon = async (collection, icon, options) => {
       return await getCustomIcon(custom, collection, icon, options);
     }
   }
-  return void 0;
 };
 
 function getDefaultExportFromCjs (x) {
@@ -597,6 +645,7 @@ var collections = [
 	"svg-spinners",
 	"system-uicons",
 	"tabler",
+	"tdesign",
 	"teenyicons",
 	"topcoat",
 	"twemoji",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-icons",
-  "version": "0.55.2",
+  "version": "0.55.3",
   "description": "Pure CSS Icons for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -47,9 +47,9 @@
     "*.css"
   ],
   "dependencies": {
-    "@iconify/utils": "^2.1.7",
-    "ofetch": "^1.1.1",
-    "@unocss/core": "0.55.2"
+    "@iconify/utils": "^2.1.9",
+    "ofetch": "^1.3.3",
+    "@unocss/core": "0.55.3"
   },
   "devDependencies": {
     "@iconify/types": "^2.0.0"