@riebeckite/plugin-svg-optimizer 0.0.40 → 0.0.42

package/dist/index.js

@@ -26,90 +26,14 @@ function svgOptimizer(options = {}) {
       svgo: SVGO_VERSION
     }),
     options,
-    transformAssets: async ({ assets, readAsset, cache, logger, tracer }) => {
+    transformAssets: async (context) => {
       stats = emptyStats();
       if (resolved.keepOriginal) return [];
       const outputs = [];
-      for (const asset of assets) {
+      for (const asset of context.assets) {
         if (extensionOf(asset.path) !== "svg") continue;
-        stats.inputs += 1;
-        if (asset.size !== void 0 && asset.size > DEFAULT_MAX_INPUT_BYTES) {
-          stats.skipped.push({ path: asset.path, reason: "oversized" });
-          logger.warn(`Skipped oversized SVG asset: ${asset.path}`);
-          continue;
-        }
-        const input = await readAsset(asset.path);
-        if (!input || input.byteLength > DEFAULT_MAX_INPUT_BYTES) {
-          stats.skipped.push({ path: asset.path, reason: "unreadable" });
-          logger.warn(
-            `Skipped oversized or unreadable SVG asset: ${asset.path}`
-          );
-          continue;
-        }
-        const cacheKey = assetCacheKey(asset.path, input);
-        const cached = await cache.get(cacheKey);
-        if (isCachedSvgTransform(cached)) {
-          stats.cacheHits += 1;
-          tracer.event("svg-transform.cache-hit", { path: asset.path });
-          if (cached.content !== null) {
-            const output = outputFor(asset.path, cached.content);
-            stats.optimized += 1;
-            stats.savedBytes += input.byteLength - output.content.byteLength;
-            outputs.push(output);
-          } else {
-            stats.noReduction += 1;
-          }
-          continue;
-        }
-        stats.cacheMisses += 1;
-        const source = decode(input);
-        if (source === null) {
-          stats.skipped.push({ path: asset.path, reason: "invalid UTF-8" });
-          logger.warn(
-            `Skipped SVG asset that is not valid UTF-8: ${asset.path}`
-          );
-          await cache.set(cacheKey, { content: null });
-          continue;
-        }
-        const unsafe = unsafeReason(source);
-        if (unsafe) {
-          stats.skipped.push({ path: asset.path, reason: unsafe });
-          logger.warn(
-            `Skipped SVG asset containing ${unsafe}: ${asset.path}. Optimization is not sanitization.`
-          );
-          await cache.set(cacheKey, { content: null });
-          continue;
-        }
-        let optimized;
-        try {
-          optimized = optimize(source, config).data;
-        } catch {
-          stats.skipped.push({ path: asset.path, reason: "optimize failed" });
-          logger.warn(
-            `Skipped SVG asset that could not be optimized: ${asset.path}`
-          );
-          await cache.set(cacheKey, { content: null });
-          continue;
-        }
-        const content = Buffer.from(optimized, "utf8");
-        if (content.byteLength >= input.byteLength) {
-          stats.noReduction += 1;
-          tracer.event("svg-transform.no-reduction", { path: asset.path });
-          await cache.set(cacheKey, { content: null });
-          continue;
-        }
-        await cache.set(cacheKey, {
-          content: content.toString("base64")
-        });
-        tracer.event("svg-transform.run", { path: asset.path });
-        stats.optimized += 1;
-        stats.savedBytes += input.byteLength - content.byteLength;
-        outputs.push({
-          sourcePath: asset.path,
-          path: asset.path,
-          content,
-          mimeType: MIME_TYPE
-        });
+        const output = await optimizeSvgAsset(asset, context, config, stats);
+        if (output) outputs.push(output);
       }
       return outputs;
     },
@@ -124,60 +48,157 @@ function svgOptimizer(options = {}) {
             ja: "最適化結果、キャッシュ利用、スキップしたアセットを表示します。"
           },
           order: 23,
-          collect: () => resolved.keepOriginal ? {
-            kind: "key-value",
-            items: [
-              {
-                key: { en: "Status", ja: "状態" },
-                value: "disabled (keepOriginal)"
-              }
-            ]
-          } : {
-            kind: "key-value",
-            items: [
-              { key: { en: "Inputs", ja: "入力" }, value: stats.inputs },
-              {
-                key: { en: "Optimized", ja: "最適化" },
-                value: stats.optimized
-              },
-              {
-                key: { en: "No reduction", ja: "削減なし" },
-                value: stats.noReduction
-              },
-              {
-                key: { en: "Cache hits", ja: "キャッシュヒット" },
-                value: stats.cacheHits
-              },
-              {
-                key: { en: "Cache misses", ja: "キャッシュミス" },
-                value: stats.cacheMisses
-              },
-              {
-                key: { en: "Saved", ja: "削減量" },
-                value: formatBytes(stats.savedBytes)
-              },
-              {
-                key: { en: "Skipped", ja: "スキップ" },
-                value: stats.skipped.length
-              },
-              ...stats.skipped.length > 0 ? [
-                {
-                  key: {
-                    en: "Skipped assets",
-                    ja: "スキップしたアセット"
-                  },
-                  value: stats.skipped.slice(0, 20).map(
-                    (skipped) => `${skipped.path} (${skipped.reason})`
-                  ).join("; ")
-                }
-              ] : []
-            ]
-          }
+          collect: () => collectInspectorItems(resolved, stats)
         }
       ]
     }
   });
 }
+async function optimizeSvgAsset(asset, context, config, stats) {
+  stats.inputs += 1;
+  const input = await readSvgInput(asset, context, stats);
+  if (!input) return void 0;
+  const cacheKey = assetCacheKey(asset.path, input);
+  const cached = await context.cache.get(cacheKey);
+  if (isCachedSvgTransform(cached))
+    return applyCachedSvg(cached, asset, input, context, stats);
+  stats.cacheMisses += 1;
+  const source = decode(input);
+  if (source === null)
+    return skipSvgAsset(
+      stats,
+      context,
+      cacheKey,
+      asset.path,
+      "invalid UTF-8",
+      `Skipped SVG asset that is not valid UTF-8: ${asset.path}`
+    );
+  const unsafe = unsafeReason(source);
+  if (unsafe)
+    return skipSvgAsset(
+      stats,
+      context,
+      cacheKey,
+      asset.path,
+      unsafe,
+      `Skipped SVG asset containing ${unsafe}: ${asset.path}. Optimization is not sanitization.`
+    );
+  let optimized;
+  try {
+    optimized = optimize(source, config).data;
+  } catch {
+    return skipSvgAsset(
+      stats,
+      context,
+      cacheKey,
+      asset.path,
+      "optimize failed",
+      `Skipped SVG asset that could not be optimized: ${asset.path}`
+    );
+  }
+  const content = Buffer.from(optimized, "utf8");
+  if (content.byteLength >= input.byteLength) {
+    stats.noReduction += 1;
+    context.tracer.event("svg-transform.no-reduction", { path: asset.path });
+    await context.cache.set(cacheKey, { content: null });
+    return void 0;
+  }
+  await context.cache.set(cacheKey, { content: content.toString("base64") });
+  context.tracer.event("svg-transform.run", { path: asset.path });
+  stats.optimized += 1;
+  stats.savedBytes += input.byteLength - content.byteLength;
+  return {
+    sourcePath: asset.path,
+    path: asset.path,
+    content,
+    mimeType: MIME_TYPE
+  };
+}
+async function readSvgInput(asset, context, stats) {
+  if (asset.size !== void 0 && asset.size > DEFAULT_MAX_INPUT_BYTES) {
+    stats.skipped.push({ path: asset.path, reason: "oversized" });
+    context.logger.warn(`Skipped oversized SVG asset: ${asset.path}`);
+    return void 0;
+  }
+  const input = await context.readAsset(asset.path);
+  if (!input || input.byteLength > DEFAULT_MAX_INPUT_BYTES) {
+    stats.skipped.push({ path: asset.path, reason: "unreadable" });
+    context.logger.warn(
+      `Skipped oversized or unreadable SVG asset: ${asset.path}`
+    );
+    return void 0;
+  }
+  return input;
+}
+function applyCachedSvg(cached, asset, input, context, stats) {
+  stats.cacheHits += 1;
+  context.tracer.event("svg-transform.cache-hit", { path: asset.path });
+  if (cached.content === null) {
+    stats.noReduction += 1;
+    return void 0;
+  }
+  const output = outputFor(asset.path, cached.content);
+  stats.optimized += 1;
+  stats.savedBytes += input.byteLength - output.content.byteLength;
+  return output;
+}
+async function skipSvgAsset(stats, context, cacheKey, path, reason, message) {
+  stats.skipped.push({ path, reason });
+  context.logger.warn(message);
+  await context.cache.set(cacheKey, { content: null });
+  return void 0;
+}
+function collectInspectorItems(resolved, stats) {
+  if (resolved.keepOriginal)
+    return {
+      kind: "key-value",
+      items: [
+        {
+          key: { en: "Status", ja: "状態" },
+          value: "disabled (keepOriginal)"
+        }
+      ]
+    };
+  return {
+    kind: "key-value",
+    items: [
+      { key: { en: "Inputs", ja: "入力" }, value: stats.inputs },
+      {
+        key: { en: "Optimized", ja: "最適化" },
+        value: stats.optimized
+      },
+      {
+        key: { en: "No reduction", ja: "削減なし" },
+        value: stats.noReduction
+      },
+      {
+        key: { en: "Cache hits", ja: "キャッシュヒット" },
+        value: stats.cacheHits
+      },
+      {
+        key: { en: "Cache misses", ja: "キャッシュミス" },
+        value: stats.cacheMisses
+      },
+      {
+        key: { en: "Saved", ja: "削減量" },
+        value: formatBytes(stats.savedBytes)
+      },
+      {
+        key: { en: "Skipped", ja: "スキップ" },
+        value: stats.skipped.length
+      },
+      ...stats.skipped.length > 0 ? [
+        {
+          key: {
+            en: "Skipped assets",
+            ja: "スキップしたアセット"
+          },
+          value: stats.skipped.slice(0, 20).map((skipped) => `${skipped.path} (${skipped.reason})`).join("; ")
+        }
+      ] : []
+    ]
+  };
+}
 function svgoConfig(options) {
   const overrides = {
     cleanupIds: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-svg-optimizer",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -14,14 +14,14 @@
     }
   },
   "dependencies": {
-    "@riebeckite/core": "0.0.40",
-    "svgo": "^4.1.0"
+    "svgo": "^4.1.0",
+    "@riebeckite/core": "0.0.42"
   },
   "devDependencies": {
-    "@riebeckite/plugin-image-optimizer": "0.0.40",
-    "@riebeckite/plugin-obsidian-markdown": "0.0.40",
     "sharp": "^0.35.5",
-    "tsx": "^4.22.4"
+    "tsx": "^4.22.4",
+    "@riebeckite/plugin-image-optimizer": "0.0.42",
+    "@riebeckite/plugin-obsidian-markdown": "0.0.42"
   },
   "publishConfig": {
     "access": "public"