@iconify/tools 2.1.0 → 2.1.2

package/lib/css/parser/tokens.cjs

@@ -47,122 +47,146 @@ function getTokens(css) {
       }
       throw css_parser_error.styleParseError("Invalid css rule", css, textQueue[0]?.index);
     };
-    findTokens(css, ['"', "'", "/*", "{", "}", ";", "url(", "\\"]).forEach((token) => {
-      if (token.index < start) {
-        return;
-      }
-      switch (token.token) {
-        case "/*": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          start = token.index;
-          const end = css.indexOf("*/", start + 2);
-          if (end === -1) {
-            throw css_parser_error.styleParseError("Missing comment closing statement", css, start);
-          }
-          start = end + 2;
-          break;
+    findTokens(css, ['"', "'", "/*", "{", "}", ";", "url(", "\\"]).forEach(
+      (token) => {
+        if (token.index < start) {
+          return;
         }
-        case "\\":
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index + 2),
-            index: start
-          });
-          start = token.index + 2;
-          break;
-        case "url(": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          start = token.index;
-          const end = css_parser_strings.findEndOfURL(css, start);
-          if (typeof end !== "number") {
-            throw end;
+        switch (token.token) {
+          case "/*": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            start = token.index;
+            const end = css.indexOf("*/", start + 2);
+            if (end === -1) {
+              throw css_parser_error.styleParseError(
+                "Missing comment closing statement",
+                css,
+                start
+              );
+            }
+            start = end + 2;
+            break;
           }
-          textQueue.push({
-            type: "url",
-            text: css.slice(start, end),
-            index: start
-          });
-          start = end;
-          break;
-        }
-        case '"':
-        case "'": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          start = token.index;
-          const end = css_parser_strings.findEndOfQuotedString(css, token.token, start);
-          if (end === null) {
-            throw css_parser_error.styleParseError("Missing closing " + token.token, css, start);
+          case "\\":
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index + 2),
+              index: start
+            });
+            start = token.index + 2;
+            break;
+          case "url(": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            start = token.index;
+            const end = css_parser_strings.findEndOfURL(css, start);
+            if (typeof end !== "number") {
+              throw end;
+            }
+            textQueue.push({
+              type: "url",
+              text: css.slice(start, end),
+              index: start
+            });
+            start = end;
+            break;
           }
-          textQueue.push({
-            type: "quoted-string",
-            text: css.slice(start, end),
-            index: start
-          });
-          start = end;
-          break;
-        }
-        case ";": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          checkRule(token.token);
-          start = token.index + 1;
-          textQueue = [];
-          break;
-        }
-        case "{": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          const item = css_parser_text.textTokensToSelector(textQueue);
-          if (!item) {
-            throw css_parser_error.styleParseError("Invalid css rule", css, start);
+          case '"':
+          case "'": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            start = token.index;
+            const end = css_parser_strings.findEndOfQuotedString(
+              css,
+              token.token,
+              start
+            );
+            if (end === null) {
+              throw css_parser_error.styleParseError(
+                "Missing closing " + token.token,
+                css,
+                start
+              );
+            }
+            textQueue.push({
+              type: "quoted-string",
+              text: css.slice(start, end),
+              index: start
+            });
+            start = end;
+            break;
           }
-          items.push(item);
-          start = token.index + 1;
-          textQueue = [];
-          depth++;
-          break;
-        }
-        case "}": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          checkRule("");
-          items.push({
-            type: "close",
-            index: token.index
-          });
-          if (!depth) {
-            throw css_parser_error.styleParseError("Unexpected }", css, token.index);
+          case ";": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            checkRule(token.token);
+            start = token.index + 1;
+            textQueue = [];
+            break;
+          }
+          case "{": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            const item = css_parser_text.textTokensToSelector(textQueue);
+            if (!item) {
+              throw css_parser_error.styleParseError(
+                "Invalid css rule",
+                css,
+                start
+              );
+            }
+            items.push(item);
+            start = token.index + 1;
+            textQueue = [];
+            depth++;
+            break;
           }
-          depth--;
-          start = token.index + 1;
-          textQueue = [];
-          break;
+          case "}": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            checkRule("");
+            items.push({
+              type: "close",
+              index: token.index
+            });
+            if (!depth) {
+              throw css_parser_error.styleParseError(
+                "Unexpected }",
+                css,
+                token.index
+              );
+            }
+            depth--;
+            start = token.index + 1;
+            textQueue = [];
+            break;
+          }
+          default:
+            throw new Error(
+              `Forgot to parse token: ${token.token}`
+            );
         }
-        default:
-          throw new Error(`Forgot to parse token: ${token.token}`);
       }
-    });
+    );
     if (depth) {
       return css_parser_error.styleParseError("Missing }", css);
     }

package/lib/css/parser/tokens.mjs

@@ -43,122 +43,146 @@ function getTokens(css) {
       }
       throw styleParseError("Invalid css rule", css, textQueue[0]?.index);
     };
-    findTokens(css, ['"', "'", "/*", "{", "}", ";", "url(", "\\"]).forEach((token) => {
-      if (token.index < start) {
-        return;
-      }
-      switch (token.token) {
-        case "/*": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          start = token.index;
-          const end = css.indexOf("*/", start + 2);
-          if (end === -1) {
-            throw styleParseError("Missing comment closing statement", css, start);
-          }
-          start = end + 2;
-          break;
+    findTokens(css, ['"', "'", "/*", "{", "}", ";", "url(", "\\"]).forEach(
+      (token) => {
+        if (token.index < start) {
+          return;
         }
-        case "\\":
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index + 2),
-            index: start
-          });
-          start = token.index + 2;
-          break;
-        case "url(": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          start = token.index;
-          const end = findEndOfURL(css, start);
-          if (typeof end !== "number") {
-            throw end;
+        switch (token.token) {
+          case "/*": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            start = token.index;
+            const end = css.indexOf("*/", start + 2);
+            if (end === -1) {
+              throw styleParseError(
+                "Missing comment closing statement",
+                css,
+                start
+              );
+            }
+            start = end + 2;
+            break;
           }
-          textQueue.push({
-            type: "url",
-            text: css.slice(start, end),
-            index: start
-          });
-          start = end;
-          break;
-        }
-        case '"':
-        case "'": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          start = token.index;
-          const end = findEndOfQuotedString(css, token.token, start);
-          if (end === null) {
-            throw styleParseError("Missing closing " + token.token, css, start);
+          case "\\":
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index + 2),
+              index: start
+            });
+            start = token.index + 2;
+            break;
+          case "url(": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            start = token.index;
+            const end = findEndOfURL(css, start);
+            if (typeof end !== "number") {
+              throw end;
+            }
+            textQueue.push({
+              type: "url",
+              text: css.slice(start, end),
+              index: start
+            });
+            start = end;
+            break;
           }
-          textQueue.push({
-            type: "quoted-string",
-            text: css.slice(start, end),
-            index: start
-          });
-          start = end;
-          break;
-        }
-        case ";": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          checkRule(token.token);
-          start = token.index + 1;
-          textQueue = [];
-          break;
-        }
-        case "{": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          const item = textTokensToSelector(textQueue);
-          if (!item) {
-            throw styleParseError("Invalid css rule", css, start);
+          case '"':
+          case "'": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            start = token.index;
+            const end = findEndOfQuotedString(
+              css,
+              token.token,
+              start
+            );
+            if (end === null) {
+              throw styleParseError(
+                "Missing closing " + token.token,
+                css,
+                start
+              );
+            }
+            textQueue.push({
+              type: "quoted-string",
+              text: css.slice(start, end),
+              index: start
+            });
+            start = end;
+            break;
           }
-          items.push(item);
-          start = token.index + 1;
-          textQueue = [];
-          depth++;
-          break;
-        }
-        case "}": {
-          textQueue.push({
-            type: "chunk",
-            text: css.slice(start, token.index),
-            index: start
-          });
-          checkRule("");
-          items.push({
-            type: "close",
-            index: token.index
-          });
-          if (!depth) {
-            throw styleParseError("Unexpected }", css, token.index);
+          case ";": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            checkRule(token.token);
+            start = token.index + 1;
+            textQueue = [];
+            break;
+          }
+          case "{": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            const item = textTokensToSelector(textQueue);
+            if (!item) {
+              throw styleParseError(
+                "Invalid css rule",
+                css,
+                start
+              );
+            }
+            items.push(item);
+            start = token.index + 1;
+            textQueue = [];
+            depth++;
+            break;
           }
-          depth--;
-          start = token.index + 1;
-          textQueue = [];
-          break;
+          case "}": {
+            textQueue.push({
+              type: "chunk",
+              text: css.slice(start, token.index),
+              index: start
+            });
+            checkRule("");
+            items.push({
+              type: "close",
+              index: token.index
+            });
+            if (!depth) {
+              throw styleParseError(
+                "Unexpected }",
+                css,
+                token.index
+              );
+            }
+            depth--;
+            start = token.index + 1;
+            textQueue = [];
+            break;
+          }
+          default:
+            throw new Error(
+              `Forgot to parse token: ${token.token}`
+            );
         }
-        default:
-          throw new Error(`Forgot to parse token: ${token.token}`);
       }
-    });
+    );
     if (depth) {
       return styleParseError("Missing }", css);
     }

package/lib/css/parser/types.d.ts

@@ -9,7 +9,7 @@ interface TextToken {
 /**
  * Values
  */
-declare type CSSATValue = string | string[];
+type CSSATValue = string | string[];
 /**
  * Tokens
  */
@@ -37,8 +37,8 @@ interface CSSCloseToken {
     type: 'close';
     index: number;
 }
-declare type CSSTokenWithSelector = CSSSelectorToken | CSSAtRuleToken;
-declare type CSSToken = CSSRuleToken | CSSSelectorToken | CSSAtRuleToken | CSSCloseToken;
+type CSSTokenWithSelector = CSSSelectorToken | CSSAtRuleToken;
+type CSSToken = CSSRuleToken | CSSSelectorToken | CSSAtRuleToken | CSSCloseToken;
 /**
  * Tree tokens
  */
@@ -48,6 +48,6 @@ interface CSSSelectorTreeToken extends CSSSelectorToken {
 interface CSSAtRuleTreeToken extends CSSAtRuleToken {
     children: CSSTreeToken[];
 }
-declare type CSSTreeToken = CSSRuleToken | CSSSelectorTreeToken | CSSAtRuleTreeToken;
+type CSSTreeToken = CSSRuleToken | CSSSelectorTreeToken | CSSAtRuleTreeToken;
 
 export { CSSATValue, CSSAtRuleToken, CSSAtRuleTreeToken, CSSCloseToken, CSSRuleToken, CSSSelectorToken, CSSSelectorTreeToken, CSSToken, CSSTokenWithSelector, CSSTreeToken, TextToken };

package/lib/download/api/cache.cjs

@@ -18,15 +18,16 @@ function apiCacheKey(query) {
 }
 async function storeAPICache(options, key, data) {
   const expires = Date.now() + options.ttl * 1e3;
-  const filename = options.dir + "/" + key + "." + expires + ".json";
+  const filename = options.dir + "/" + key + "." + expires.toString() + ".json";
   if (!storedFiles[options.dir]) {
     await getStoredFiles(options.dir);
   }
-  await fs.promises.writeFile(filename, JSON.stringify({
+  const content = {
     version: cacheVersion,
     expires,
     data
-  }, null, 4), "utf8");
+  };
+  await fs.promises.writeFile(filename, JSON.stringify(content, null, 4), "utf8");
   storedFiles[options.dir][key] = {
     filename,
     expires
@@ -42,7 +43,9 @@ async function getAPICache(dir, key) {
   }
   const time = Date.now();
   try {
-    const content = JSON.parse(await fs.promises.readFile(item.filename, "utf8"));
+    const content = JSON.parse(
+      await fs.promises.readFile(item.filename, "utf8")
+    );
     return content.version === cacheVersion && content.expires > time ? content.data : null;
   } catch (err) {
     return null;
@@ -61,23 +64,27 @@ async function getStoredFiles(dir, clear = false) {
     });
   } catch (err) {
   }
-  await misc_scan.scanDirectory(dir, async (ext, file, subdir, path) => {
-    if (ext !== ".json") {
-      return false;
-    }
-    const filename = path + subdir + file + ext;
-    const parts = file.split(".");
-    const expires = parseInt(parts.pop());
-    if (clear || expires < time || parts.length !== 1) {
-      await fs.promises.unlink(filename);
-      return false;
-    }
-    const cacheKey = parts[0];
-    storage[cacheKey] = {
-      filename,
-      expires
-    };
-  }, false);
+  await misc_scan.scanDirectory(
+    dir,
+    async (ext, file, subdir, path) => {
+      if (ext !== ".json") {
+        return false;
+      }
+      const filename = path + subdir + file + ext;
+      const parts = file.split(".");
+      const expires = parseInt(parts.pop());
+      if (clear || expires < time || parts.length !== 1) {
+        await fs.promises.unlink(filename);
+        return false;
+      }
+      const cacheKey = parts[0];
+      storage[cacheKey] = {
+        filename,
+        expires
+      };
+    },
+    false
+  );
 }
 
 exports.apiCacheKey = apiCacheKey;