zone5 1.0.1 → 1.1.0

package/dist/processor/config.d.ts

@@ -6,7 +6,5 @@ export declare const ProcessorConfigSchema: z.ZodPrefault<z.ZodObject<{
     resize_gamma: z.ZodDefault<z.ZodNumber>;
     variants: z.ZodDefault<z.ZodArray<z.ZodNumber>>;
 }, z.core.$strip>>;
-export type ProcessorConfig = z.infer<typeof ProcessorConfigSchema> & {
-    clear?: boolean;
-    forceOverwrite?: boolean;
-};
+export type ProcessorConfig = z.infer<typeof ProcessorConfigSchema>;
+export declare const configHash: (config: ProcessorConfig) => string;

package/dist/processor/config.js

@@ -1,3 +1,4 @@
+import { createHash } from 'crypto';
 import sharp from 'sharp';
 import z from 'zod';
 export const ProcessorConfigSchema = z
@@ -7,3 +8,9 @@ export const ProcessorConfigSchema = z
     variants: z.array(z.number().int().min(1)).default([640, 768, 1280, 1920, 2560]),
 })
     .prefault({});
+export const configHash = (config) => {
+    // Generate SHAKE256 hash with length 4 for config
+    const hash = createHash('shake256', { outputLength: 4 });
+    hash.update(JSON.stringify(config));
+    return hash.digest('hex');
+};

package/dist/processor/index.d.ts

@@ -1,6 +1,6 @@
 import type { BaseConfigType } from '../config.js';
 import { type DominantColor } from './color.js';
-import type { ProcessorConfig } from './config.js';
+import { type ProcessorConfig } from './config.js';
 import type { ExifItem } from './exif/exif.js';
 import type { GeojsonPoint } from './exif/types.js';
 export interface ItemFeature {

package/dist/processor/index.js

@@ -4,6 +4,7 @@ import { join, parse, relative } from 'path';
 import sharp from 'sharp';
 import { generateBlurhash } from './blurhash.js';
 import { getDominantColors } from './color.js';
+import { configHash } from './config.js';
 import exifFromFilePath from './exif/index.js';
 import { fileExists, sourceFileHash } from './file.js';
 import { generateImageVariants } from './variants.js';
@@ -11,14 +12,18 @@ const tracer = trace.getTracer('zone5-processor');
 const processor = async (options) => {
     return tracer.startActiveSpan('zone5.processor', async (span) => {
         try {
-            const { base, sourceFile, clear = false, forceOverwrite = false } = options;
+            const { base, processor: processorConfig, sourceFile, clear = false, forceOverwrite = false } = options;
             const { name: fileBasename } = parse(sourceFile);
             const sourceHash = sourceFileHash(base.root, sourceFile);
-            const featureFile = join(base.cache, `${fileBasename}-${sourceHash}`, 'index.json');
+            const procConfigHash = configHash(processorConfig);
+            const cacheDir = join(base.cache, `${procConfigHash}-${fileBasename}-${sourceHash}`);
+            const featureFile = join(cacheDir, 'index.json');
             span.setAttributes({
                 'zone5.sourceFile': sourceFile,
                 'zone5.fileBasename': fileBasename,
                 'zone5.sourceHash': sourceHash,
+                'zone5.configHash': procConfigHash,
+                'zone5.cacheDir': cacheDir,
                 'zone5.clear': clear,
                 'zone5.forceOverwrite': forceOverwrite,
             });
@@ -27,7 +32,7 @@ const processor = async (options) => {
                     exifFromFilePath(sourceFile),
                     generateBlurhash(sourceFile),
                     getDominantColors(sourceFile),
-                    generateImageVariants(options),
+                    generateImageVariants({ sourceFile, processor: processorConfig, cacheDir, clear, forceOverwrite }),
                     sharp(sourceFile).metadata(),
                 ]);
                 const feature = {

package/dist/processor/variants.d.ts

@@ -1,13 +1,12 @@
-import type { BaseConfigType } from '../config.js';
 import type { ProcessorConfig } from './config.js';
 export interface GeneratedVariant {
     width: number;
     path: string;
 }
 export declare function generateImageVariants(options: {
-    base: BaseConfigType;
     processor: ProcessorConfig;
     sourceFile: string;
+    cacheDir: string;
     clear?: boolean;
     forceOverwrite?: boolean;
 }): Promise<GeneratedVariant[]>;

package/dist/processor/variants.js

@@ -2,7 +2,7 @@ import { SpanStatusCode, trace } from '@opentelemetry/api';
 import { rm } from 'fs/promises';
 import { join, parse } from 'path';
 import sharp from 'sharp';
-import { ensureDirectoryExists, fileExists, sourceFileHash } from './file.js';
+import { ensureDirectoryExists, fileExists } from './file.js';
 const tracer = trace.getTracer('zone5-processor-variants');
 const addDebugText = async (img, width, height) => {
     const svg = `<svg height="100" width="300">
@@ -13,7 +13,7 @@ const addDebugText = async (img, width, height) => {
 export async function generateImageVariants(options) {
     return tracer.startActiveSpan('zone5.generateImageVariants', async (span) => {
         try {
-            const { base, processor, sourceFile, clear = false, forceOverwrite = false } = options;
+            const { processor, sourceFile, cacheDir, clear = false, forceOverwrite = false } = options;
             // Parse file path components
             const { name: fileBasename, ext: fileExtension } = parse(sourceFile);
             // Get source image metadata to check dimensions
@@ -25,22 +25,21 @@ export async function generateImageVariants(options) {
                 'zone5.sourceFile': sourceFile,
                 'zone5.sourceWidth': sourceWidth,
                 'zone5.validWidthsCount': validWidths.length,
+                'zone5.cacheDir': cacheDir,
                 'zone5.clear': clear,
                 'zone5.forceOverwrite': forceOverwrite,
             });
-            // Create cache subdirectory
-            const sourceHash = sourceFileHash(base.root, sourceFile);
-            const cacheSubDir = join(base.cache, `${fileBasename}-${sourceHash}`);
+            // Prepare cache directory
             if (clear) {
-                await rm(cacheSubDir, { recursive: true, force: true });
+                await rm(cacheDir, { recursive: true, force: true });
             }
-            await ensureDirectoryExists(cacheSubDir);
+            await ensureDirectoryExists(cacheDir);
             // Generate variants for each valid width
             const variants = [];
             let generatedCount = 0;
             for (const width of validWidths) {
                 const variantFilename = `${fileBasename}-${width}${fileExtension}`;
-                const variantPath = join(cacheSubDir, variantFilename);
+                const variantPath = join(cacheDir, variantFilename);
                 // Check if variant already exists and should be overwritten
                 const variantExists = await fileExists(variantPath);
                 if (!variantExists || forceOverwrite) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zone5",
-	"version": "1.0.1",
+	"version": "1.1.0",
 	"repository": {
 		"url": "https://github.com/cwygoda/zone5"
 	},