@travetto/image 3.4.0-rc.7 → 3.4.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ArcSine Technologies
+Copyright (c) 2023 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/image",
-  "version": "3.4.0-rc.7",
+  "version": "3.4.1",
   "description": "Image support, resizing, and optimization",
   "keywords": [
     "images",
@@ -23,8 +23,8 @@
     "directory": "module/image"
   },
   "dependencies": {
-    "@travetto/base": "^3.4.0-rc.7",
-    "@travetto/command": "^3.4.0-rc.7"
+    "@travetto/base": "^3.4.1",
+    "@travetto/command": "^3.4.1"
   },
   "travetto": {
     "displayName": "Image"

package/src/resource.ts

@@ -2,19 +2,19 @@ import fs from 'fs/promises';
 import { Readable } from 'stream';
 
 import { ManifestFileUtil, RootIndex, path } from '@travetto/manifest';
-import { Env, FileResourceProvider, StreamUtil } from '@travetto/base';
+import { Env, ResourceLoader, StreamUtil } from '@travetto/base';
 
 import { ImageConverter } from './convert';
 
 /**
  * Resource provider for images that allows for real-time optimization
  */
-export class ImageOptimizingResourceProvider extends FileResourceProvider {
+export class ImageOptimizingResourceLoader extends ResourceLoader {
 
   #cacheRoot: string;
 
-  constructor(paths?: string[], cacheRoot?: string) {
-    super({ paths, includeCommon: true });
+  constructor(paths: string[] = [], cacheRoot?: string) {
+    super(paths);
 
     this.#cacheRoot = cacheRoot ?? path.resolve(Env.get('TRV_IMAGE_CACHE', ManifestFileUtil.toolPath(RootIndex, 'image_cache')));
   }
@@ -27,7 +27,6 @@ export class ImageOptimizingResourceProvider extends FileResourceProvider {
    * Fetch image, compress and return as buffer
    */
   async readOptimized(rel: string): Promise<Buffer> {
-    const pth = await this.resolve(rel);
     const cachedOutput = path.resolve(this.#cacheRoot, rel);
     await fs.mkdir(path.dirname(cachedOutput), { recursive: true });
 
@@ -36,9 +35,9 @@ export class ImageOptimizingResourceProvider extends FileResourceProvider {
 
     if (!exists) {
       let stream: Buffer | Readable = await this.readStream(rel);
-      if (/[.]png$/.test(pth)) {
+      if (/[.]png$/.test(rel)) {
         stream = await ImageConverter.optimize('png', stream);
-      } else if (/[.]jpe?g$/i.test(pth)) {
+      } else if (/[.]jpe?g$/i.test(rel)) {
         stream = await ImageConverter.optimize('jpeg', stream);
       }
       await StreamUtil.pipe(stream, handle.createWriteStream());