Merge pull request #3 from sourcetoad/composite-change

Composite change

Author: erik-perri

__tests__/setup.ts

@@ -1,8 +1,10 @@
 import { initializeImageMagick } from '@imagemagick/magick-wasm';
+import { createRequire } from 'module';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 global.__filename = fileURLToPath(import.meta.url);
 global.__dirname = dirname(__filename);
+global.require = createRequire(import.meta.url);
 
 await initializeImageMagick();

__tests__/utils/getInsetAtGravity.spec.ts

@@ -58,15 +58,12 @@ describe('getInsetAtGravity', () => {
       7,
     ],
     // endregion
-  ])('works as expected with %s', async (_, file, gravity, expected) => {
+  ])('works as expected with %s', (_, file, gravity, expected) => {
     let result: number | undefined = undefined;
 
-    await ImageMagick.read(
-      fs.readFileSync(`samples/input/${file}`),
-      (image) => {
-        result = getInsetAtGravity(image, gravity as number);
-      },
-    );
+    ImageMagick.read(fs.readFileSync(`samples/input/${file}`), (image) => {
+      result = getInsetAtGravity(image, gravity as number);
+    });
 
     expect(result).toEqual(expected);
   });

package-lock.json

@@ -29,22 +29,22 @@
     "node": ">=16.0.0"
   },
   "dependencies": {
-    "@imagemagick/magick-wasm": "^0.0.18",
+    "@imagemagick/magick-wasm": "^0.0.19",
     "fast-glob": "^3.2.12",
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@types/node": "^18.11.18",
-    "@types/yargs": "^17.0.20",
-    "@typescript-eslint/eslint-plugin": "^5.48.2",
-    "@typescript-eslint/parser": "^5.48.2",
-    "esbuild": "0.16.17",
-    "eslint": "^8.32.0",
+    "@types/node": "^18.13.0",
+    "@types/yargs": "^17.0.22",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
+    "esbuild": "0.17.7",
+    "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-simple-import-sort": "^9.0.0",
-    "prettier": "2.8.3",
-    "typescript": "^4.9.4",
-    "vitest": "^0.27.3"
+    "eslint-plugin-simple-import-sort": "^10.0.0",
+    "prettier": "2.8.4",
+    "typescript": "^4.9.5",
+    "vitest": "^0.28.4"
   }
 }

package.json

@@ -9,14 +9,14 @@ import createBadgeImage from './createBadgeImage';
 import createImageBadgeComposite from './createImageBadgeComposite';
 import getInsetAtGravity from './getInsetAtGravity';
 
-export default async function addBadgeOverlay(
+export default function addBadgeOverlay(
   inputFile: string,
   outputFile: string,
   badgeOptions: BadgeOptions,
   textOptions: TextOptions,
   badgeGravity: BadgeGravity,
-): Promise<void> {
-  await ImageMagick.read(fs.readFileSync(inputFile), async (image) => {
+): void {
+  ImageMagick.read(fs.readFileSync(inputFile), (image) => {
     const insetWidth =
       image.width -
       getInsetAtGravity(image, Gravity.East) -
@@ -59,9 +59,6 @@ export default async function addBadgeOverlay(
       .filter((name) => /date:/i.test(name))
       .forEach((name) => composite.removeAttribute(name));
 
-    await composite.write(
-      (data) => fs.writeFileSync(outputFile, data),
-      image.format,
-    );
+    composite.write((data) => fs.writeFileSync(outputFile, data), image.format);
   });
 }

samples/output/ic_launcher-mdpi.png

@@ -133,7 +133,7 @@ export default function createImageBadgeComposite(
   composite.compositeGravity(
     badge,
     getGravityFromBadgeGravity(gravity),
-    CompositeOperator.Atop,
+    CompositeOperator.Over,
     offset,
   );
 

samples/output/ic_launcher-xxxhdpi-dark-transparent.png

@@ -47,7 +47,7 @@ export default async function processAddBadgeCommand({
 
     setBadgeFont(fontFile ?? resolve(__dirname, defaultOptions.fontFile));
 
-    await addBadgeOverlay(
+    addBadgeOverlay(
       inputImage,
       outputImage,
       {

samples/output/ic_launcher-xxxhdpi-north.png

@@ -43,7 +43,7 @@ export default async function processAddBadgesCommand({
     console.info(`${dryRun ? 'Would process' : 'Processing'} ${inputFile}`);
 
     if (!dryRun) {
-      await addBadgeOverlay(
+      addBadgeOverlay(
         inputFile,
         inputFile,
         {