@travetto/image 4.1.1 → 5.0.0-rc.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/README.md

@@ -19,16 +19,16 @@ The utility's primary structure revolves around the [CommandOperation](https://g
 
 **Code: Simple Image Resize**
 ```typescript
-import { createReadStream } from 'node:fs';
+import { createReadStream, createWriteStream } from 'node:fs';
+import { pipeline } from 'node:stream/promises';
 
-import { StreamUtil } from '@travetto/base';
 import { ImageConverter } from '@travetto/image';
 
 export class ResizeService {
   async resizeImage(imgPath: string, width: number, height: number): Promise<string> {
     const stream = await ImageConverter.resize(createReadStream(imgPath), { w: width, h: height });
     const out = imgPath.replace(/[.][^.]+$/, (ext) => `.resized${ext}`);
-    await StreamUtil.writeToFile(stream, out);
+    await pipeline(stream, createWriteStream(out));
     return out;
   }
 }

package/package.json

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

package/src/convert.ts

@@ -1,10 +1,10 @@
 import { Readable } from 'node:stream';
+import { buffer as toBuffer } from 'node:stream/consumers';
 import { createReadStream } from 'node:fs';
 import { ChildProcess } from 'node:child_process';
 import { pipeline } from 'node:stream/promises';
 
 import { CommandOperation } from '@travetto/command';
-import { MemoryWritable, StreamUtil } from '@travetto/base';
 
 /**
  * Image output options
@@ -62,13 +62,12 @@ export class ImageConverter {
 
   static async #stream<T extends ImageType>(proc: ChildProcess, input: T): Promise<T> {
     if (Buffer.isBuffer(input)) {
-      const buffer = new MemoryWritable();
-      await Promise.all([
-        pipeline(await StreamUtil.toStream(input), proc.stdin!),
-        pipeline(proc.stdout!, buffer)
+      const [_, output] = await Promise.all([
+        pipeline(Readable.from(input), proc.stdin!),
+        toBuffer(proc.stdout!)
       ]);
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      return buffer.toBuffer() as T;
+      return output as T;
     } else {
       input.pipe(proc.stdin!); // Start the process
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -122,13 +121,12 @@ export class ImageConverter {
       image = createReadStream(image);
     }
 
-    const buffer = new MemoryWritable();
-    await Promise.all([
+    const [_, output] = await Promise.all([
       pipeline(image, proc.stdin!),
-      pipeline(proc.stdout!, buffer)
+      toBuffer(proc.stdout!)
     ]);
 
-    const text = buffer.toBuffer('utf8');
+    const text = output.toString('utf8');
     const [w, h] = text.split('X').map(x => parseFloat(x));
 
     return { width: w, height: h };

package/src/resource.ts

@@ -1,21 +1,21 @@
 import fs from 'node:fs/promises';
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
+import path from 'node:path';
 
-import { RuntimeContext, path } from '@travetto/manifest';
-import { Env, ResourceLoader } from '@travetto/base';
+import { Env, FileLoader, RuntimeContext } from '@travetto/base';
 
 import { ImageConverter } from './convert';
 
 /**
  * Resource provider for images that allows for real-time optimization
  */
-export class ImageOptimizingResourceLoader extends ResourceLoader {
+export class ImageOptimizingResourceLoader extends FileLoader {
 
   #cacheRoot: string;
 
   constructor(paths: string[] = [], cacheRoot?: string) {
-    super(paths);
+    super([...paths, ...Env.resourcePaths]);
 
     this.#cacheRoot = cacheRoot ?? path.resolve(Env.TRV_IMAGE_CACHE.val || RuntimeContext.toolPath('image_cache'));
   }