expo-image-manipulator 10.2.1 → 10.3.0

package/CHANGELOG.md

@@ -10,7 +10,22 @@
 
 ### 💡 Others
 
-## 10.2.1 — 2022-02-01
+## 10.3.0 — 2022-04-18
+
+### 🎉 New features
+
+- Native module on iOS is now written in Swift using the new API. ([#15277](https://github.com/expo/expo/pull/15277) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Remove `data:image` part in web base64 result. ([#16191](https://github.com/expo/expo/pull/16191) by [@AllanChain](https://github.com/AllanChain))
+- On iOS fix rotation causing extra image borders. ([#16669](https://github.com/expo/expo/pull/16669) by [@mnightingale](https://github.com/mnightingale))
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 10.2.1 - 2022-02-01
 
 ### 🐛 Bug fixes
 

package/README.md

@@ -4,12 +4,12 @@ Provides functions that let you manipulation images on the local file system, eg
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/imagemanipulator.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/imagemanipulator/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/imagemanipulator.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/imagemanipulator/)
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/imagemanipulator/).
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/imagemanipulator/).
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -3,20 +3,35 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '10.2.1'
+version = '10.3.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
@@ -44,22 +59,22 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 
   kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 23
-    versionName "10.2.1"
+    versionName "10.3.0"
   }
   lintOptions {
     abortOnError false
@@ -71,5 +86,5 @@ dependencies {
 
   api "androidx.annotation:annotation:1.0.0"
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }

package/build/ExpoImageManipulator.d.ts

@@ -1,2 +1,3 @@
 declare const _default: import("expo-modules-core").ProxyNativeModule;
 export default _default;
+//# sourceMappingURL=ExpoImageManipulator.d.ts.map

package/build/ExpoImageManipulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoImageManipulator.d.ts","sourceRoot":"","sources":["../src/ExpoImageManipulator.ts"],"names":[],"mappings":";AACA,wBAA6D"}

package/build/ExpoImageManipulator.web.d.ts

@@ -4,3 +4,4 @@ declare const _default: {
     manipulateAsync(uri: string, actions: Action[] | undefined, options: SaveOptions): Promise<ImageResult>;
 };
 export default _default;
+//# sourceMappingURL=ExpoImageManipulator.web.d.ts.map

package/build/ExpoImageManipulator.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoImageManipulator.web.d.ts","sourceRoot":"","sources":["../src/ExpoImageManipulator.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;;;yBAiDnE,MAAM,0CAEF,WAAW,GACnB,QAAQ,WAAW,CAAC;;AARzB,wBA2BE"}

package/build/ExpoImageManipulator.web.js

@@ -1,24 +1,24 @@
 import { crop, flip, resize, rotate } from './actions/index.web';
 import { getContext } from './utils/getContext.web';
 function getResults(canvas, options) {
-    let base64;
+    let uri;
     if (options) {
         const { format = 'png' } = options;
         if (options.format === 'png' && options.compress !== undefined) {
             console.warn('compress is not supported with png format.');
         }
         const quality = Math.min(1, Math.max(0, options.compress ?? 1));
-        base64 = canvas.toDataURL('image/' + format, quality);
+        uri = canvas.toDataURL('image/' + format, quality);
     }
     else {
         // defaults to PNG with no loss
-        base64 = canvas.toDataURL();
+        uri = canvas.toDataURL();
     }
     return {
-        uri: base64,
+        uri,
         width: canvas.width,
         height: canvas.height,
-        base64,
+        base64: uri.replace(/^data:image\/\w+;base64,/, ''),
     };
 }
 function loadImageAsync(uri) {

package/build/ExpoImageManipulator.web.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoImageManipulator.web.js","sourceRoot":"","sources":["../src/ExpoImageManipulator.web.ts"],"names":[],"mappings":"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","sourcesContent":["import { ImageResult, SaveOptions, Action } from './ImageManipulator.types';\nimport { crop, flip, resize, rotate } from './actions/index.web';\nimport { getContext } from './utils/getContext.web';\n\nfunction getResults(canvas: HTMLCanvasElement, options?: SaveOptions): ImageResult {\n  let base64;\n  if (options) {\n    const { format = 'png' } = options;\n    if (options.format === 'png' && options.compress !== undefined) {\n      console.warn('compress is not supported with png format.');\n    }\n    const quality = Math.min(1, Math.max(0, options.compress ?? 1));\n    base64 = canvas.toDataURL('image/' + format, quality);\n  } else {\n    // defaults to PNG with no loss\n    base64 = canvas.toDataURL();\n  }\n  return {\n    uri: base64,\n    width: canvas.width,\n    height: canvas.height,\n    base64,\n  };\n}\n\nfunction loadImageAsync(uri: string): Promise<HTMLCanvasElement> {\n  return new Promise((resolve, reject) => {\n    const imageSource = new Image();\n    imageSource.crossOrigin = 'anonymous';\n    const canvas = document.createElement('canvas');\n    imageSource.onload = () => {\n      canvas.width = imageSource.naturalWidth;\n      canvas.height = imageSource.naturalHeight;\n\n      const context = getContext(canvas);\n      context.drawImage(imageSource, 0, 0, imageSource.naturalWidth, imageSource.naturalHeight);\n\n      resolve(canvas);\n    };\n    imageSource.onerror = () => reject(canvas);\n    imageSource.src = uri;\n  });\n}\n\nexport default {\n  get name(): string {\n    return 'ExpoImageManipulator';\n  },\n  async manipulateAsync(\n    uri: string,\n    actions: Action[] = [],\n    options: SaveOptions\n  ): Promise<ImageResult> {\n    const originalCanvas = await loadImageAsync(uri);\n\n    const resultCanvas = actions.reduce((canvas, action) => {\n      if ('crop' in action) {\n        return crop(canvas, action.crop);\n      } else if ('resize' in action) {\n        return resize(canvas, action.resize);\n      } else if ('flip' in action) {\n        return flip(canvas, action.flip);\n      } else if ('rotate' in action) {\n        return rotate(canvas, action.rotate);\n      } else {\n        return canvas;\n      }\n    }, originalCanvas);\n\n    return getResults(resultCanvas, options);\n  },\n};\n"]}
+{"version":3,"file":"ExpoImageManipulator.web.js","sourceRoot":"","sources":["../src/ExpoImageManipulator.web.ts"],"names":[],"mappings":"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","sourcesContent":["import { ImageResult, SaveOptions, Action } from './ImageManipulator.types';\nimport { crop, flip, resize, rotate } from './actions/index.web';\nimport { getContext } from './utils/getContext.web';\n\nfunction getResults(canvas: HTMLCanvasElement, options?: SaveOptions): ImageResult {\n  let uri: string;\n  if (options) {\n    const { format = 'png' } = options;\n    if (options.format === 'png' && options.compress !== undefined) {\n      console.warn('compress is not supported with png format.');\n    }\n    const quality = Math.min(1, Math.max(0, options.compress ?? 1));\n    uri = canvas.toDataURL('image/' + format, quality);\n  } else {\n    // defaults to PNG with no loss\n    uri = canvas.toDataURL();\n  }\n  return {\n    uri,\n    width: canvas.width,\n    height: canvas.height,\n    base64: uri.replace(/^data:image\\/\\w+;base64,/, ''),\n  };\n}\n\nfunction loadImageAsync(uri: string): Promise<HTMLCanvasElement> {\n  return new Promise((resolve, reject) => {\n    const imageSource = new Image();\n    imageSource.crossOrigin = 'anonymous';\n    const canvas = document.createElement('canvas');\n    imageSource.onload = () => {\n      canvas.width = imageSource.naturalWidth;\n      canvas.height = imageSource.naturalHeight;\n\n      const context = getContext(canvas);\n      context.drawImage(imageSource, 0, 0, imageSource.naturalWidth, imageSource.naturalHeight);\n\n      resolve(canvas);\n    };\n    imageSource.onerror = () => reject(canvas);\n    imageSource.src = uri;\n  });\n}\n\nexport default {\n  get name(): string {\n    return 'ExpoImageManipulator';\n  },\n  async manipulateAsync(\n    uri: string,\n    actions: Action[] = [],\n    options: SaveOptions\n  ): Promise<ImageResult> {\n    const originalCanvas = await loadImageAsync(uri);\n\n    const resultCanvas = actions.reduce((canvas, action) => {\n      if ('crop' in action) {\n        return crop(canvas, action.crop);\n      } else if ('resize' in action) {\n        return resize(canvas, action.resize);\n      } else if ('flip' in action) {\n        return flip(canvas, action.flip);\n      } else if ('rotate' in action) {\n        return rotate(canvas, action.rotate);\n      } else {\n        return canvas;\n      }\n    }, originalCanvas);\n\n    return getResults(resultCanvas, options);\n  },\n};\n"]}

package/build/ImageManipulator.d.ts

@@ -12,3 +12,4 @@ import { Action, ImageResult, SaveOptions } from './ImageManipulator.types';
  */
 export declare function manipulateAsync(uri: string, actions?: Action[], saveOptions?: SaveOptions): Promise<ImageResult>;
 export * from './ImageManipulator.types';
+//# sourceMappingURL=ImageManipulator.d.ts.map

package/build/ImageManipulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImageManipulator.d.ts","sourceRoot":"","sources":["../src/ImageManipulator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAc,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIxF;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAM,EAAO,EACtB,WAAW,GAAE,WAAgB,GAC5B,OAAO,CAAC,WAAW,CAAC,CAStB;AAED,cAAc,0BAA0B,CAAC"}

package/build/ImageManipulator.types.d.ts

@@ -87,3 +87,4 @@ export declare type SaveOptions = {
      */
     format?: SaveFormat;
 };
+//# sourceMappingURL=ImageManipulator.types.d.ts.map

package/build/ImageManipulator.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImageManipulator.types.d.ts","sourceRoot":"","sources":["../src/ImageManipulator.types.ts"],"names":[],"mappings":"AACA,oBAAY,WAAW,GAAG;IACxB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAGF,oBAAY,YAAY,GAAG;IACzB;;;OAGG;IACH,MAAM,EAAE;QACN,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAGF,oBAAY,YAAY,GAAG;IACzB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,oBAAY,QAAQ;IAClB,QAAQ,aAAa;IACrB,UAAU,eAAe;CAC1B;AAGD,oBAAY,UAAU,GAAG;IACvB;;;OAGG;IACH,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAGF,oBAAY,UAAU,GAAG;IACvB;;OAEG;IACH,IAAI,EAAE;QACJ,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAGF,oBAAY,MAAM,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,GAAG,UAAU,CAAC;AAG3E,oBAAY,UAAU;IACpB,IAAI,SAAS;IACb,GAAG,QAAQ;IACX;;OAEG;IACH,IAAI,SAAS;CACd;AAGD;;GAEG;AACH,oBAAY,WAAW,GAAG;IACxB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAC"}

package/build/actions/CropAction.web.d.ts

@@ -1,3 +1,4 @@
 import { ActionCrop } from '../ImageManipulator.types';
 declare const _default: (canvas: HTMLCanvasElement, options: ActionCrop['crop']) => HTMLCanvasElement;
 export default _default;
+//# sourceMappingURL=CropAction.web.d.ts.map

package/build/actions/CropAction.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CropAction.web.d.ts","sourceRoot":"","sources":["../../src/actions/CropAction.web.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;iCAG/B,iBAAiB,WAAW,UAAU,CAAC,MAAM,CAAC;AAAtE,wBA6BE"}

package/build/actions/FlipAction.web.d.ts

@@ -1,3 +1,4 @@
 import { ActionFlip } from '../ImageManipulator.types';
 declare const _default: (canvas: HTMLCanvasElement, flip: ActionFlip['flip']) => HTMLCanvasElement;
 export default _default;
+//# sourceMappingURL=FlipAction.web.d.ts.map

package/build/actions/FlipAction.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FlipAction.web.d.ts","sourceRoot":"","sources":["../../src/actions/FlipAction.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,MAAM,2BAA2B,CAAC;iCAGzC,iBAAiB,QAAQ,UAAU,CAAC,MAAM,CAAC;AAAnE,wBAsBE"}

package/build/actions/ResizeAction.web.d.ts

@@ -1,3 +1,4 @@
 import { ActionResize } from '../ImageManipulator.types';
 declare const _default: (canvas: HTMLCanvasElement, { width, height }: ActionResize['resize']) => HTMLCanvasElement;
 export default _default;
+//# sourceMappingURL=ResizeAction.web.d.ts.map

package/build/actions/ResizeAction.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResizeAction.web.d.ts","sourceRoot":"","sources":["../../src/actions/ResizeAction.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;iCAqGjC,iBAAiB,qBAAqB,YAAY,CAAC,QAAQ,CAAC;AAApF,wBAiBE"}

package/build/actions/RotateAction.web.d.ts

@@ -1,3 +1,4 @@
 import { ActionRotate } from '../ImageManipulator.types';
 declare const _default: (canvas: HTMLCanvasElement, degrees: ActionRotate['rotate']) => HTMLCanvasElement;
 export default _default;
+//# sourceMappingURL=RotateAction.web.d.ts.map

package/build/actions/RotateAction.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RotateAction.web.d.ts","sourceRoot":"","sources":["../../src/actions/RotateAction.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;iCAoBjC,iBAAiB,WAAW,YAAY,CAAC,QAAQ,CAAC;AAA1E,wBAoBE"}

package/build/actions/index.web.d.ts

@@ -2,3 +2,4 @@ export { default as crop } from './CropAction.web';
 export { default as flip } from './FlipAction.web';
 export { default as resize } from './ResizeAction.web';
 export { default as rotate } from './RotateAction.web';
+//# sourceMappingURL=index.web.d.ts.map

package/build/actions/index.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../src/actions/index.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC"}

package/build/utils/getContext.web.d.ts

@@ -1 +1,2 @@
 export declare function getContext(canvas: HTMLCanvasElement): CanvasRenderingContext2D;
+//# sourceMappingURL=getContext.web.d.ts.map

package/build/utils/getContext.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getContext.web.d.ts","sourceRoot":"","sources":["../../src/utils/getContext.web.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,wBAAwB,CAM9E"}

package/build/validators.d.ts

@@ -3,3 +3,4 @@ export declare function validateArguments(uri: string, actions: Action[], saveOp
 export declare function validateUri(uri: string): void;
 export declare function validateActions(actions: Action[]): void;
 export declare function validateSaveOptions({ base64, compress, format }: SaveOptions): void;
+//# sourceMappingURL=validators.d.ts.map

package/build/validators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAON,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,QAIzF;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAI7C;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CA8BvD;AA6CD,wBAAgB,mBAAmB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,GAAG,IAAI,CAgBnF"}

package/expo-module.config.json

@@ -0,0 +1,7 @@
+{
+  "name": "expo-image-manipulator",
+  "platforms": ["ios", "android"],
+  "ios": {
+    "modulesClassNames": ["ImageManipulatorModule"]
+  }
+}

package/ios/{EXImageManipulator.podspec → ExpoImageManipulator.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXImageManipulator'
+  s.name           = 'ExpoImageManipulator'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
@@ -11,16 +11,23 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platform       = :ios, '12.0'
+  s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
   s.dependency 'EXImageLoader'
 
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+  }
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
-    s.source_files = "#{s.name}/**/*.h"
+    s.source_files = "**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m}"
+    s.source_files = "**/*.{h,m,swift}"
   end
 end

package/ios/ImageManipulations.swift

@@ -0,0 +1,209 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import UIKit
+
+/**
+ Main `manipulate` function that takes an array of any supported actions to apply.
+ */
+internal func manipulate(image initialImage: UIImage, actions: [ManipulateAction]) throws -> UIImage {
+  var image: UIImage = initialImage
+
+  image = try fixImageOrientation(image)
+
+  for action in actions {
+    if let resize = action.resize {
+      image = try manipulate(image: image, resize: resize)
+    } else if let rotate = action.rotate {
+      image = try manipulate(image: image, rotate: rotate)
+    } else if let flip = action.flip {
+      image = try manipulate(image: image, flip: flip)
+    } else if let crop = action.crop {
+      image = try manipulate(image: image, crop: crop)
+    }
+  }
+  return image
+}
+
+/**
+ Draws a new image by resizing given image to specified size.
+ */
+internal func manipulate(image: UIImage, resize: ResizeOptions) throws -> UIImage {
+  let imageWidth = image.size.width
+  let imageHeight = image.size.height
+  let imageRatio = imageWidth / imageHeight
+
+  var targetSize = CGSize.zero
+
+  if let width = resize.width {
+    targetSize.width = width
+    targetSize.height = width / imageRatio
+  }
+  if let height = resize.height {
+    targetSize.height = height
+    targetSize.width = targetSize.width == 0 ? imageRatio * targetSize.height : targetSize.width
+  }
+
+  UIGraphicsBeginImageContextWithOptions(targetSize, false, 1.0)
+  image.draw(in: CGRect(origin: .zero, size: targetSize))
+
+  guard let newImage = UIGraphicsGetImageFromCurrentImageContext() else {
+    UIGraphicsEndImageContext()
+    throw NoImageInContextException()
+  }
+
+  UIGraphicsEndImageContext()
+  return newImage
+}
+
+/**
+ Creates a new image by rotating given image by the rotate angle.
+ */
+internal func manipulate(image: UIImage, rotate: Double) throws -> UIImage {
+  guard let cgImage = image.cgImage else {
+    throw ImageNotFoundException()
+  }
+  let rads = rotate * Double.pi / 180
+  let rotatedView = UIView(frame: CGRect(origin: .zero, size: image.size))
+
+  rotatedView.transform = CGAffineTransform(rotationAngle: rads)
+
+  let rotatedSize = CGSize(width: rotatedView.frame.size.width.rounded(.down), height: rotatedView.frame.size.height.rounded(.down))
+  let origin = CGPoint(x: -image.size.width / 2, y: -image.size.height / 2)
+
+  return try drawInNewContext(size: rotatedSize) { context in
+    context.translateBy(x: rotatedSize.width / 2, y: rotatedSize.height / 2)
+    context.rotate(by: rads)
+    context.scaleBy(x: 1.0, y: -1.0)
+    context.draw(cgImage, in: CGRect(origin: origin, size: image.size))
+  }
+}
+
+/**
+ Creates a new image by flipping given image vertically or horizontally.
+ */
+internal func manipulate(image: UIImage, flip: FlipType) throws -> UIImage {
+  let imageView = UIImageView(image: image)
+
+  return try drawInNewContext(size: imageView.frame.size) { context in
+    switch flip {
+    case .vertical:
+      let transform = CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: 0, ty: imageView.frame.size.height)
+      context.concatenate(transform)
+    case .horizontal:
+      let transform = CGAffineTransform(a: -1, b: 0, c: 0, d: 1, tx: imageView.frame.size.width, ty: 0)
+      context.concatenate(transform)
+    }
+    imageView.layer.render(in: context)
+  }
+}
+
+/**
+ Creates a new image by cropping given image to specified width and height.
+ */
+internal func manipulate(image: UIImage, crop: CropRect) throws -> UIImage {
+  let rect = crop.toRect()
+  let isOutOfBounds = rect.origin.x > image.size.width
+  || rect.origin.y > image.size.height
+  || rect.width > image.size.width
+  || rect.height > image.size.height
+
+  guard !isOutOfBounds else {
+    throw ImageInvalidCropException()
+  }
+  guard let cgImage = image.cgImage?.cropping(to: rect) else {
+    throw ImageCropFailedException(rect)
+  }
+  return UIImage(cgImage: cgImage, scale: image.scale, orientation: image.imageOrientation)
+}
+
+/**
+ Makes sure the image is oriented up and not mirrored.
+ Guarantees that the original pixel data matches the displayed orientation.
+ */
+internal func fixImageOrientation(_ image: UIImage) throws -> UIImage {
+  guard let cgImage = image.cgImage else {
+    throw ImageNotFoundException()
+  }
+  guard let colorSpace = cgImage.colorSpace else {
+    // That should never happen as `colorSpace` is empty only when the image is a mask.
+    throw ImageColorSpaceNotFoundException()
+  }
+
+  var transform = CGAffineTransform.identity
+
+  switch image.imageOrientation {
+  case .down, .downMirrored:
+    transform = transform.translatedBy(x: image.size.width, y: image.size.height)
+    transform = transform.rotated(by: Double.pi)
+  case .left, .leftMirrored:
+    transform = transform.translatedBy(x: image.size.width, y: 0)
+    transform = transform.rotated(by: Double.pi / 2)
+  case .right, .rightMirrored:
+    transform = transform.translatedBy(x: 0, y: image.size.height)
+    transform = transform.rotated(by: -Double.pi / 2)
+  default:
+    break
+  }
+
+  switch image.imageOrientation {
+  case .upMirrored, .downMirrored:
+    transform = transform.translatedBy(x: image.size.width, y: 0)
+    transform = transform.scaledBy(x: -1, y: 1)
+  case .leftMirrored, .rightMirrored:
+    transform = transform.translatedBy(x: image.size.height, y: 0)
+    transform = transform.scaledBy(x: -1, y: 1)
+  default:
+    break
+  }
+
+  let context = CGContext(
+    data: nil,
+    width: Int(image.size.width),
+    height: Int(image.size.height),
+    bitsPerComponent: cgImage.bitsPerComponent,
+    bytesPerRow: 0,
+    space: colorSpace,
+    bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
+  )
+
+  guard let context = context else {
+    throw ImageContextLostException()
+  }
+
+  context.concatenate(transform)
+
+  switch image.imageOrientation {
+  case .left, .leftMirrored, .right, .rightMirrored:
+    context.draw(cgImage, in: CGRect(x: 0, y: 0, width: image.size.height, height: image.size.width))
+  default:
+    context.draw(cgImage, in: CGRect(x: 0, y: 0, width: image.size.width, height: image.size.height))
+  }
+
+  guard let newCGImage = context.makeImage() else {
+    throw ImageDrawingFailedException()
+  }
+  return UIImage(cgImage: newCGImage)
+}
+
+/**
+ Helper function for drawing the image in graphics context.
+ Throws appropriate exceptions when the context is missing or the image couldn't be rendered.
+ */
+private func drawInNewContext(size: CGSize, drawing: (CGContext) -> Void) throws -> UIImage {
+  UIGraphicsBeginImageContext(size)
+
+  guard let context = UIGraphicsGetCurrentContext() else {
+    UIGraphicsEndImageContext()
+    throw ImageContextLostException()
+  }
+
+  drawing(context)
+
+  guard let newImage = UIGraphicsGetImageFromCurrentImageContext() else {
+    UIGraphicsEndImageContext()
+    throw NoImageInContextException()
+  }
+
+  UIGraphicsEndImageContext()
+  return newImage
+}

package/ios/ImageManipulatorArguments.swift

@@ -0,0 +1,93 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import CoreGraphics
+import ExpoModulesCore
+
+/**
+ Represents a single manipulate action. Only one field can be set.
+ */
+internal struct ManipulateAction: Record {
+  @Field
+  var resize: ResizeOptions?
+
+  @Field
+  var rotate: Double?
+
+  @Field
+  var flip: FlipType?
+
+  @Field
+  var crop: CropRect?
+}
+
+/**
+ Options provided for resize action.
+ */
+internal struct ResizeOptions: Record {
+  @Field
+  var width: CGFloat?
+
+  @Field
+  var height: CGFloat?
+}
+
+/**
+ Cropping rect for crop action.
+ */
+internal struct CropRect: Record {
+  @Field
+  var originX: Double = 0.0
+
+  @Field
+  var originY: Double = 0.0
+
+  @Field
+  var width: Double = 0.0
+
+  @Field
+  var height: Double = 0.0
+
+  func toRect() -> CGRect {
+    return CGRect(x: originX, y: originY, width: width, height: height)
+  }
+}
+
+/**
+ Options to use when saving the resulted image.
+ */
+internal struct ManipulateOptions: Record {
+  @Field
+  var base64: Bool = false
+
+  @Field
+  var compress: Double = 1.0
+
+  @Field
+  var format: ImageFormat = .jpeg
+}
+
+/**
+ Possible options for flip action.
+ */
+internal enum FlipType: String, EnumArgument {
+  case vertical
+  case horizontal
+}
+
+/**
+ Enum with supported image formats.
+ */
+internal enum ImageFormat: String, EnumArgument {
+  case jpeg
+  case jpg
+  case png
+
+  var fileExtension: String {
+    switch self {
+    case .jpeg, .jpg:
+      return ".jpg"
+    case .png:
+      return ".png"
+    }
+  }
+}

package/ios/ImageManipulatorExceptions.swift

@@ -0,0 +1,82 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import CoreGraphics
+import ExpoModulesCore
+
+internal class ImageContextLostException: Exception {
+  override var reason: String {
+    "Image context has been lost"
+  }
+}
+
+internal class ImageDrawingFailedException: Exception {
+  override var reason: String {
+    "Drawing the new image failed"
+  }
+}
+
+internal class ImageNotFoundException: Exception {
+  override var reason: String {
+    "Image cannot be found"
+  }
+}
+
+internal class ImageColorSpaceNotFoundException: Exception {
+  override var reason: String {
+    "The image does not specify any color space"
+  }
+}
+
+internal class ImageInvalidCropException: Exception {
+  override var reason: String {
+    "Invalid crop options has been passed. Please make sure the requested crop rectangle is inside source image"
+  }
+}
+
+internal class ImageCropFailedException: GenericException<CGRect> {
+  override var reason: String {
+    "Cropping the image to rectangle (x: \(param.origin.x), y: \(param.origin.y), width: \(param.width), height: \(param.height)) has failed"
+  }
+}
+
+internal class NoImageInContextException: Exception {
+  override var reason: String {
+    "Could not read the image from the drawing context"
+  }
+}
+
+internal class ImageLoaderNotFoundException: Exception {
+  override var reason: String {
+    "ImageLoader module not found, make sure 'expo-image-loader' is linked correctly"
+  }
+}
+
+internal class FileSystemNotFoundException: Exception {
+  override var reason: String {
+    "FileSystem module not found, make sure 'expo-file-system' is linked correctly"
+  }
+}
+
+internal class FileSystemReadPermissionException: GenericException<String> {
+  override var reason: String {
+    "File '\(param)' is not readable"
+  }
+}
+
+internal class ImageLoadingFailedException: GenericException<String> {
+  override var reason: String {
+    "Could not load the image: \(param)"
+  }
+}
+
+internal class CorruptedImageDataException: Exception {
+  override var reason: String {
+    "Cannot create image data for given image format"
+  }
+}
+
+internal class ImageWriteFailedException: GenericException<String> {
+  override var reason: String {
+    "Writing image data to the file has failed: \(param)"
+  }
+}

package/ios/ImageManipulatorModule.swift

@@ -0,0 +1,133 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import CoreGraphics
+import Photos
+import UIKit
+import ExpoModulesCore
+
+public class ImageManipulatorModule: Module {
+  typealias LoadImageCallback = (Result<UIImage, Error>) -> Void
+  typealias SaveImageResult = (url: URL, data: Data)
+
+  public func definition() -> ModuleDefinition {
+    name("ExpoImageManipulator")
+
+    function("manipulateAsync", manipulateImage)
+      .runOnQueue(.main)
+  }
+
+  internal func manipulateImage(url: URL, actions: [ManipulateAction], options: ManipulateOptions, promise: Promise) {
+    loadImage(atUrl: url) { result in
+      switch result {
+      case .failure(let error):
+        return promise.reject(error)
+      case .success(let image):
+        do {
+          let newImage = try manipulate(image: image, actions: actions)
+          let saveResult = try self.saveImage(newImage, options: options)
+
+          promise.resolve([
+            "uri": saveResult.url.absoluteString,
+            "width": newImage.cgImage?.width ?? 0,
+            "height": newImage.cgImage?.height ?? 0,
+            "base64": options.base64 ? saveResult.data.base64EncodedData() : nil
+          ])
+        } catch {
+          promise.reject(error)
+        }
+      }
+    }
+  }
+
+  /**
+   Loads the image from given URL.
+   */
+  internal func loadImage(atUrl url: URL, callback: @escaping LoadImageCallback) {
+    if url.scheme == "data" {
+      guard let data = try? Data(contentsOf: url), let image = UIImage(data: data) else {
+        return callback(.failure(CorruptedImageDataException()))
+      }
+      return callback(.success(image))
+    }
+    if url.scheme == "assets-library" {
+      // TODO: ALAsset URLs are deprecated as of iOS 11, we should migrate to `ph://` soon.
+      return loadImageFromPhotoLibrary(url: url, callback: callback)
+    }
+
+    guard let imageLoader = self.appContext?.imageLoader else {
+      return callback(.failure(ImageLoaderNotFoundException()))
+    }
+    guard let fileSystem = self.appContext?.fileSystem else {
+      return callback(.failure(FileSystemNotFoundException()))
+    }
+    guard fileSystem.permissions(forURI: url).contains(.read) else {
+      return callback(.failure(FileSystemReadPermissionException(url.absoluteString)))
+    }
+
+    imageLoader.loadImage(for: url) { error, image in
+      guard let image = image, error == nil else {
+        return callback(.failure(ImageLoadingFailedException(error.debugDescription)))
+      }
+      callback(.success(image))
+    }
+  }
+
+  /**
+   Loads the image from user's photo library.
+   */
+  internal func loadImageFromPhotoLibrary(url: URL, callback: @escaping LoadImageCallback) {
+    guard let asset = PHAsset.fetchAssets(withALAssetURLs: [url], options: nil).firstObject else {
+      return callback(.failure(ImageNotFoundException()))
+    }
+    let size = CGSize(width: asset.pixelWidth, height: asset.pixelHeight)
+    let options = PHImageRequestOptions()
+
+    options.resizeMode = .exact
+    options.isNetworkAccessAllowed = true
+    options.isSynchronous = true
+    options.deliveryMode = .highQualityFormat
+
+    PHImageManager.default().requestImage(for: asset, targetSize: size, contentMode: .aspectFit, options: options) { image, _ in
+      guard let image = image else {
+        return callback(.failure(ImageNotFoundException()))
+      }
+      return callback(.success(image))
+    }
+  }
+
+  /**
+   Saves the image as a file.
+   */
+  internal func saveImage(_ image: UIImage, options: ManipulateOptions) throws -> SaveImageResult {
+    guard let fileSystem = self.appContext?.fileSystem else {
+      throw FileSystemNotFoundException()
+    }
+    let directory = URL(fileURLWithPath: fileSystem.cachesDirectory).appendingPathComponent("ImageManipulator")
+    let filename = UUID().uuidString.appending(options.format.fileExtension)
+    let fileUrl = directory.appendingPathComponent(filename)
+
+    fileSystem.ensureDirExists(withPath: directory.path)
+
+    guard let data = imageData(from: image, format: options.format, compression: options.compress) else {
+      throw CorruptedImageDataException()
+    }
+    do {
+      try data.write(to: fileUrl, options: .atomic)
+    } catch let error {
+      throw ImageWriteFailedException(error.localizedDescription)
+    }
+    return (url: fileUrl, data: data)
+  }
+}
+
+/**
+ Returns pixel data representation of the image.
+ */
+func imageData(from image: UIImage, format: ImageFormat, compression: Double) -> Data? {
+  switch format {
+  case .jpeg, .jpg:
+    return image.jpegData(compressionQuality: compression)
+  case .png:
+    return image.pngData()
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-manipulator",
-  "version": "10.2.1",
+  "version": "10.3.0",
   "description": "Provides functions that let you manipulation images on the local file system, eg: resize, crop.",
   "main": "build/ImageManipulator.js",
   "types": "build/ImageManipulator.d.ts",
@@ -31,7 +31,7 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/imagemanipulator/",
   "dependencies": {
-    "expo-image-loader": "~3.1.0"
+    "expo-image-loader": "~3.2.0"
   },
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
@@ -39,5 +39,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
+  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
 }

package/src/ExpoImageManipulator.web.ts

@@ -3,23 +3,23 @@ import { crop, flip, resize, rotate } from './actions/index.web';
 import { getContext } from './utils/getContext.web';
 
 function getResults(canvas: HTMLCanvasElement, options?: SaveOptions): ImageResult {
-  let base64;
+  let uri: string;
   if (options) {
     const { format = 'png' } = options;
     if (options.format === 'png' && options.compress !== undefined) {
       console.warn('compress is not supported with png format.');
     }
     const quality = Math.min(1, Math.max(0, options.compress ?? 1));
-    base64 = canvas.toDataURL('image/' + format, quality);
+    uri = canvas.toDataURL('image/' + format, quality);
   } else {
     // defaults to PNG with no loss
-    base64 = canvas.toDataURL();
+    uri = canvas.toDataURL();
   }
   return {
-    uri: base64,
+    uri,
     width: canvas.width,
     height: canvas.height,
-    base64,
+    base64: uri.replace(/^data:image\/\w+;base64,/, ''),
   };
 }
 

package/ios/EXImageManipulator/EXImageManipulatorModule.h

@@ -1,7 +0,0 @@
-//  Copyright © 2018 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXExportedModule.h>
-#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
-
-@interface EXImageManipulatorModule : EXExportedModule <EXModuleRegistryConsumer>
-@end

package/ios/EXImageManipulator/EXImageManipulatorModule.m

@@ -1,373 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <EXImageManipulator/EXImageManipulatorModule.h>
-#import <ExpoModulesCore/EXFileSystemInterface.h>
-#import <ExpoModulesCore/EXImageLoaderInterface.h>
-#import <Photos/Photos.h>
-
-@interface EXImageManipulatorModule ()
-
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-@property (nonatomic, weak) id<EXFileSystemInterface> fileSystem;
-@property (nonatomic, weak) id<EXImageLoaderInterface> imageLoader;
-
-@end
-
-static NSString* const ACTION_KEY_RESIZE = @"resize";
-static NSString* const ACTION_KEY_ROTATE = @"rotate";
-static NSString* const ACTION_KEY_FLIP = @"flip";
-static NSString* const ACTION_KEY_CROP = @"crop";
-
-static NSString* const SAVE_OPTIONS_KEY_FORMAT = @"format";
-static NSString* const SAVE_OPTIONS_KEY_COMPRESS = @"compress";
-static NSString* const SAVE_OPTIONS_KEY_BASE64 = @"base64";
-
-@implementation EXImageManipulatorModule
-
-EX_EXPORT_MODULE(ExpoImageManipulator);
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  _moduleRegistry = moduleRegistry;
-  _fileSystem = [moduleRegistry getModuleImplementingProtocol:@protocol(EXFileSystemInterface)];
-  _imageLoader = [moduleRegistry getModuleImplementingProtocol:@protocol(EXImageLoaderInterface)];
-}
-
-EX_EXPORT_METHOD_AS(manipulateAsync,
-                    uri:(NSString *)uri
-                    actions:(NSArray *)actions
-                    saveOptions:(NSDictionary *)saveOptions
-                    resolve:(EXPromiseResolveBlock)resolve
-                    reject:(EXPromiseRejectBlock)reject)
-{
-  NSURL *url = [NSURL URLWithString:uri];
-  // no scheme provided in uri, handle as a local path and add 'file://' scheme
-  if (!url.scheme) {
-    url = [NSURL fileURLWithPath:uri isDirectory:false];
-  }
-  NSString *path = [url.path stringByStandardizingPath];
-
-  if ([[url scheme] isEqualToString:@"data"]) {
-    NSData *data = [[NSData alloc] initWithContentsOfURL:url];
-    if (data != nil) {
-      UIImage *image = [UIImage imageWithData:data];
-      image = [self fixOrientation:image];
-      [self manipulateImage:image actions:actions saveOptions:saveOptions resolver:resolve rejecter:reject];
-      return;
-    }
-  }
-
-  if (!_fileSystem) {
-    return reject(@"E_MISSING_MODULE", @"No FileSystem module.", nil);
-  }
-  if (!([_fileSystem permissionsForURI:url] & EXFileSystemPermissionRead)) {
-    return reject(@"E_FILESYSTEM_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't readable.", uri], nil);
-  }
-
-  NSString *errorMessage;
-  if (![self areActionsValid:actions errorMessage:&errorMessage] || ![self areSaveOptionsValid:saveOptions errorMessage:&errorMessage]) {
-    return reject(@"E_IMAGE_MANIPULATOR_INVALID_ARG", errorMessage, nil);
-  }
-
-  if ([[url scheme] isEqualToString:@"assets-library"]) {
-    PHFetchResult<PHAsset *> *fetchResult = [PHAsset fetchAssetsWithALAssetURLs:@[url] options:nil];
-    if (fetchResult.count > 0) {
-      PHAsset *asset = fetchResult[0];
-      CGSize size = CGSizeMake([asset pixelWidth], [asset pixelHeight]);
-      PHImageRequestOptions *options = [PHImageRequestOptions new];
-      [options setResizeMode:PHImageRequestOptionsResizeModeExact];
-      [options setNetworkAccessAllowed:YES];
-      [options setSynchronous:NO];
-      [options setDeliveryMode:PHImageRequestOptionsDeliveryModeHighQualityFormat];
-
-      [[PHImageManager defaultManager] requestImageForAsset:asset targetSize:size contentMode:PHImageContentModeAspectFit options:options resultHandler:^(UIImage * _Nullable image, NSDictionary * _Nullable info) {
-        if (!image) {
-          reject(@"E_IMAGE_MANIPULATION_FAILED", [NSString stringWithFormat:@"The file isn't convertable to image. Given path: `%@`.", path], nil);
-          return;
-        }
-        image = [self fixOrientation:image];
-        [self manipulateImage:image actions:actions saveOptions:saveOptions resolver:resolve rejecter:reject];
-      }];
-      return;
-    } else {
-      return reject(@"E_IMAGE_MANIPULATION_FAILED", [NSString stringWithFormat:@"The file does not exist. Given path: `%@`.", path], nil);
-    }
-  } else {
-    [_imageLoader loadImageForURL:url completionHandler:^(NSError *error, UIImage *loadedImage) {
-      if (error != nil) {
-        return reject(@"E_IMAGE_MANIPULATION_FAILED", @"Could not get the image", error);
-      }
-
-      UIImage *image = [self fixOrientation:loadedImage];
-      [self manipulateImage:image actions:actions saveOptions:saveOptions resolver:resolve rejecter:reject];
-    }];
-  }
-}
-
--(BOOL)areActionsValid:(NSArray *)actions errorMessage:(NSString **)errorMessage
-{
-  for (NSDictionary *action in actions) {
-    int actionsCounter = 0;
-    if (action[ACTION_KEY_RESIZE]) {
-      actionsCounter += 1;
-    }
-
-    if (action[ACTION_KEY_ROTATE]) {
-      actionsCounter += 1;
-    }
-
-    if (action[ACTION_KEY_FLIP]) {
-      actionsCounter += 1;
-    }
-
-    if (action[ACTION_KEY_CROP]) {
-      actionsCounter += 1;
-
-      if (action[ACTION_KEY_CROP][@"originX"] == nil
-          || action[ACTION_KEY_CROP][@"originY"] == nil
-          || action[ACTION_KEY_CROP][@"width"] == nil
-          || action[ACTION_KEY_CROP][@"height"] == nil
-          ) {
-        *errorMessage = @"Invalid crop options has been passed. Please make sure the object contains originX, originY, width and height.";
-        return NO;
-      }
-
-    }
-
-    if (actionsCounter != 1) {
-      *errorMessage = [NSString stringWithFormat:@"Single action must contain exactly one transformation from list: ['%@', '%@', '%@', '%@']",
-                       ACTION_KEY_RESIZE,
-                       ACTION_KEY_ROTATE,
-                       ACTION_KEY_FLIP,
-                       ACTION_KEY_CROP];
-      return NO;
-    }
-  }
-  return YES;
-}
-
--(BOOL)areSaveOptionsValid:(NSDictionary *)saveOptions errorMessage:(NSString **)errorMessage
-{
-  NSString* format = saveOptions[SAVE_OPTIONS_KEY_FORMAT];
-  if (![format isEqualToString:@"jpeg"] && ![format isEqualToString:@"png"]) {
-    *errorMessage = [NSString stringWithFormat:@"SaveOption 'format' must be one of ['png', 'jpeg']. Obtained '%@'.", format];
-    return NO;
-  }
-  return YES;
-}
-
--(UIImage *)fixOrientation:(UIImage *)image
-{
-  if (image.imageOrientation == UIImageOrientationUp) {
-    return image;
-  }
-
-  CGAffineTransform transform = CGAffineTransformIdentity;
-  switch (image.imageOrientation) {
-    case UIImageOrientationDown:
-    case UIImageOrientationDownMirrored:
-      transform = CGAffineTransformTranslate(transform, image.size.width, image.size.height);
-      transform = CGAffineTransformRotate(transform, M_PI);
-      break;
-
-    case UIImageOrientationLeft:
-    case UIImageOrientationLeftMirrored:
-      transform = CGAffineTransformTranslate(transform, image.size.width, 0);
-      transform = CGAffineTransformRotate(transform, M_PI_2);
-      break;
-
-    case UIImageOrientationRight:
-    case UIImageOrientationRightMirrored:
-      transform = CGAffineTransformTranslate(transform, 0, image.size.height);
-      transform = CGAffineTransformRotate(transform, -M_PI_2);
-      break;
-
-    default:
-      break;
-  }
-
-  switch (image.imageOrientation) {
-    case UIImageOrientationUpMirrored:
-    case UIImageOrientationDownMirrored:
-      transform = CGAffineTransformTranslate(transform, image.size.width, 0);
-      transform = CGAffineTransformScale(transform, -1, 1);
-      break;
-
-    case UIImageOrientationLeftMirrored:
-    case UIImageOrientationRightMirrored:
-      transform = CGAffineTransformTranslate(transform, image.size.height, 0);
-      transform = CGAffineTransformScale(transform, -1, 1);
-      break;
-
-    default:
-      break;
-  }
-
-  CGContextRef ctx = CGBitmapContextCreate(NULL, image.size.width, image.size.height, CGImageGetBitsPerComponent(image.CGImage), 0, CGImageGetColorSpace(image.CGImage), CGImageGetBitmapInfo(image.CGImage));
-  CGContextConcatCTM(ctx, transform);
-  switch (image.imageOrientation) {
-    case UIImageOrientationLeft:
-    case UIImageOrientationLeftMirrored:
-    case UIImageOrientationRight:
-    case UIImageOrientationRightMirrored:
-      CGContextDrawImage(ctx, CGRectMake(0, 0, image.size.height, image.size.width), image.CGImage);
-      break;
-
-    default:
-      CGContextDrawImage(ctx, CGRectMake(0, 0, image.size.width, image.size.height), image.CGImage);
-      break;
-  }
-
-  CGImageRef cgimg = CGBitmapContextCreateImage(ctx);
-  UIImage *img = [UIImage imageWithCGImage:cgimg];
-  CGContextRelease(ctx);
-  CGImageRelease(cgimg);
-  return img;
-}
-
--(void)manipulateImage:(UIImage *)image
-               actions:(NSArray *)actions
-           saveOptions:(NSDictionary *)saveOptions
-              resolver:(EXPromiseResolveBlock)resolve
-              rejecter:(EXPromiseRejectBlock)reject
-{
-  for (NSDictionary *action in actions) {
-    if (action[ACTION_KEY_RESIZE]) {
-      image = [self resizeImage:image options:action[ACTION_KEY_RESIZE]];
-    } else if (action[ACTION_KEY_ROTATE]) {
-      image = [self rotateImage:image rotation:(NSNumber *)action[ACTION_KEY_ROTATE]];
-    } else if (action[ACTION_KEY_FLIP]) {
-      image = [self flipImage:image flipType:action[ACTION_KEY_FLIP]];
-    } else if (action[ACTION_KEY_CROP]) {
-      NSString *errorMessage;
-      image = [self cropImage:image options:action[ACTION_KEY_CROP] didFailWithErrorMessage:&errorMessage];
-      if (errorMessage != nil) {
-        return reject(@"E_INVALID_CROP_DATA", errorMessage, nil);
-      }
-    }
-  }
-
-  float compressionValue = saveOptions[SAVE_OPTIONS_KEY_COMPRESS] != nil ? [(NSNumber *)saveOptions[SAVE_OPTIONS_KEY_COMPRESS] floatValue] : 1.0;
-
-  NSString *format = saveOptions[SAVE_OPTIONS_KEY_FORMAT];
-  NSData *imageData = nil;
-  NSString *extension;
-  if ([format isEqualToString:@"jpeg"]) {
-    imageData = UIImageJPEGRepresentation(image, compressionValue);
-    extension = @".jpg";
-  } else if ([format isEqualToString:@"png"]) {
-    imageData = UIImagePNGRepresentation(image);
-    extension = @".png";
-  }
-
-  NSString *directory = [_fileSystem.cachesDirectory stringByAppendingPathComponent:@"ImageManipulator"];
-  [_fileSystem ensureDirExistsWithPath:directory];
-  NSString *fileName = [[[NSUUID UUID] UUIDString] stringByAppendingString:extension];
-  NSString *newPath = [directory stringByAppendingPathComponent:fileName];
-  [imageData writeToFile:newPath atomically:YES];
-  NSURL *fileURL = [NSURL fileURLWithPath:newPath];
-  NSString *filePath = [fileURL absoluteString];
-
-  NSMutableDictionary *response = [NSMutableDictionary new];
-  response[@"uri"] = filePath;
-  response[@"width"] = @(CGImageGetWidth(image.CGImage));
-  response[@"height"] = @(CGImageGetHeight(image.CGImage));
-  if (saveOptions[SAVE_OPTIONS_KEY_BASE64] && [saveOptions[SAVE_OPTIONS_KEY_BASE64] boolValue]) {
-    response[@"base64"] = [imageData base64EncodedStringWithOptions:0];
-  }
-  resolve(response);
-}
-
-- (UIImage *)resizeImage:(UIImage *)image options:(NSDictionary *)resize
-{
-  float imageWidth = image.size.width;
-  float imageHeight = image.size.height;
-  float imageRatio = imageWidth / imageHeight;
-
-  NSInteger requestedWidth = 0;
-  NSInteger requestedHeight = 0;
-
-  if (resize[@"width"]) {
-    requestedWidth = [(NSNumber *)resize[@"width"] integerValue];
-    requestedHeight = requestedWidth / imageRatio;
-  }
-  if (resize[@"height"]) {
-    requestedHeight = [(NSNumber *)resize[@"height"] integerValue];
-    requestedWidth = requestedWidth == 0 ? imageRatio * requestedHeight : requestedWidth;
-  }
-
-  CGSize requestedSize = CGSizeMake(requestedWidth, requestedHeight);
-  UIGraphicsBeginImageContextWithOptions(requestedSize, NO, 1.0);
-  [image drawInRect:CGRectMake(0, 0, requestedWidth, requestedHeight)];
-  image = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-
-  return image;
-}
-
-- (UIImage *)rotateImage:(UIImage *)image rotation:(NSNumber *)rotation
-{
-  float rads = [rotation integerValue] * M_PI / 180;
-  CGSize size = image.size;
-  UIView *rotatedViewBox = [[UIView alloc] initWithFrame:CGRectMake(0,0,size.width, size.height)];
-  CGAffineTransform t = CGAffineTransformMakeRotation(rads);
-  rotatedViewBox.transform = t;
-  CGSize rotatedSize = rotatedViewBox.frame.size;
-
-  UIGraphicsBeginImageContext(rotatedSize);
-  CGContextRef bitmap = UIGraphicsGetCurrentContext();
-  CGContextTranslateCTM(bitmap, rotatedSize.width/2, rotatedSize.height/2);
-  CGContextRotateCTM(bitmap, rads);
-  CGContextScaleCTM(bitmap, 1.0, -1.0);
-  CGContextDrawImage(bitmap, CGRectMake(-size.width / 2, -size.height / 2, size.width, size.height), image.CGImage);
-
-  image = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  return image;
-}
-
-- (UIImage *)flipImage:(UIImage *)image flipType:(NSString *)flip
-{
-  UIImageView *tempImageView = [[UIImageView alloc] initWithImage:image];
-  UIGraphicsBeginImageContext(tempImageView.frame.size);
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  CGAffineTransform transform;
-
-  if ([flip isEqualToString:@"vertical"]) {
-    transform = CGAffineTransformMake(1, 0, 0, -1, 0, tempImageView.frame.size.height);
-    CGContextConcatCTM(context, transform);
-  } else if ([flip isEqualToString:@"horizontal"]) {
-    transform = CGAffineTransformMake(-1, 0, 0, 1, tempImageView.frame.size.width, 0);
-    CGContextConcatCTM(context, transform);
-  }
-
-  [tempImageView.layer renderInContext:context];
-  image = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  return image;
-}
-
-- (UIImage *)cropImage:(UIImage *)image options:(NSDictionary *)cropData didFailWithErrorMessage:(NSString **)errorMessage
-{
-  float originX = [(NSNumber *)cropData[@"originX"] floatValue];
-  float originY = [(NSNumber *)cropData[@"originY"] floatValue];
-  float requestedWidth = [(NSNumber *)cropData[@"width"] floatValue];
-  float requestedHeight = [(NSNumber *)cropData[@"height"] floatValue];
-
-  if (originX > image.size.width
-      || originY > image.size.height
-      || requestedWidth > image.size.width
-      || requestedHeight > image.size.height
-  ) {
-    *errorMessage = @"Invalid crop options has been passed. Please make sure the requested crop rectangle is inside source image.";
-    return nil;
-  }
-  CGRect cropDimensions = CGRectMake(originX, originY, requestedWidth, requestedHeight);
-  CGImageRef takenCGImage = image.CGImage;
-  CGImageRef cropCGImage = CGImageCreateWithImageInRect(takenCGImage, cropDimensions);
-  image = [UIImage imageWithCGImage:cropCGImage scale:image.scale orientation:image.imageOrientation];
-  CGImageRelease(cropCGImage);
-  return image;
-}
-
-@end

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-image-manipulator",
-  "platforms": ["ios", "android"]
-}