xpict 0.1.0 → 0.1.2

package/dist/layers/image-layer.d.ts

@@ -12,5 +12,5 @@ export type ImageLayerOptions<Data> = {
 export declare class ImageLayer<Data> extends Layer<Data> {
     private options;
     constructor(options: ImageLayerOptions<Data>);
-    render(ctx: RenderContext, data: Data): Promise<void>;
+    render(ctx: RenderContext, data: Data, index?: number): Promise<void>;
 }

package/dist/layers/image-layer.js

@@ -12,14 +12,16 @@ class ImageLayer extends layer_1.Layer {
         super(options.when);
         this.options = options;
     }
-    async render(ctx, data) {
-        const xValue = (0, resolve_axis_1.resolveAxis)(this.options.x, data, 0);
-        const yValue = (0, resolve_axis_1.resolveAxis)(this.options.y, data, 0);
+    async render(ctx, data, index = 0) {
+        const localX = (0, resolve_axis_1.resolveAxis)(this.options.x, data, index);
+        const localY = (0, resolve_axis_1.resolveAxis)(this.options.y, data, index);
+        const x = ctx.offsetX + localX;
+        const y = ctx.offsetY + localY;
         const img = await (0, sharp_1.default)(this.options.src(data))
             .resize(this.options.width, this.options.height)
             .toBuffer();
         ctx.image = ctx.image.composite([
-            { input: img, left: xValue, top: yValue }
+            { input: img, left: x, top: y }
         ]);
     }
 }

package/dist/template.d.ts

@@ -1,4 +1,4 @@
-import { Color } from "sharp";
+import sharp, { Color } from "sharp";
 import { Layer } from "./layers/layer";
 export type TemplateConfig = {
     width: number;
@@ -6,11 +6,16 @@ export type TemplateConfig = {
     fill?: Color;
 };
 export type TemplateOptions<Data> = {
+    imagePath?: undefined;
     config: TemplateConfig;
     layers: Layer<Data>[];
+} | {
+    config?: undefined;
+    imagePath: string;
+    layers: Layer<Data>[];
 };
 export declare class Template<Data> {
     readonly options: TemplateOptions<Data>;
     constructor(options: TemplateOptions<Data>);
-    render(data: Data): Promise<Buffer>;
+    render(data: Data): Promise<sharp.Sharp>;
 }

package/dist/template.js

@@ -11,20 +11,26 @@ class Template {
         this.options = options;
     }
     async render(data) {
-        const { width, height, fill } = this.options.config;
-        let image = (0, sharp_1.default)({
-            create: {
-                width: width,
-                height: height,
-                channels: 4,
-                background: fill !== null && fill !== void 0 ? fill : {
-                    r: 0,
-                    g: 0,
-                    b: 0,
-                    alpha: 0
+        let image;
+        if (this.options.config) {
+            const { width, height, fill } = this.options.config;
+            image = (0, sharp_1.default)({
+                create: {
+                    width: width,
+                    height: height,
+                    channels: 4,
+                    background: fill !== null && fill !== void 0 ? fill : {
+                        r: 0,
+                        g: 0,
+                        b: 0,
+                        alpha: 0
+                    }
                 }
-            }
-        });
+            });
+        }
+        else {
+            image = (0, sharp_1.default)(this.options.imagePath);
+        }
         const ctx = {
             image: image,
             offsetX: 0,
@@ -36,7 +42,7 @@ class Template {
             await layer.render(ctx, data);
             ctx.image = await (0, commit_frame_1.commitFrame)(ctx.image);
         }
-        return ctx.image.png().toBuffer();
+        return ctx.image;
     }
 }
 exports.Template = Template;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpict",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Xpict é uma biblioteca para a geração de imagens padronizadas a partir de modelos declarativos.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",