From 94a15c2c95f37119a2817dee22db2d845ec974be Mon Sep 17 00:00:00 2001
From: Rowan Winsemius <rowanwins@yahoo.com.au>
Date: Sun, 9 Oct 2022 14:08:17 +1100
Subject: [PATCH 1/3] Add support for holes

---
 packages/turf-mask/README.md                  |  31 ++-
 packages/turf-mask/index.d.ts                 |   2 +-
 packages/turf-mask/index.js                   |  30 ++-
 packages/turf-mask/test.js                    |  52 +++-
 .../test/in/polygon-with-hole.geojson         |  28 ++
 .../turf-mask/test/out/multi-polygon.geojson  | 242 +++++++++---------
 .../turf-mask/test/out/overlapping.geojson    |  34 +--
 .../test/out/polygon-with-hole.geojson        |  23 ++
 8 files changed, 286 insertions(+), 156 deletions(-)
 create mode 100644 packages/turf-mask/test/in/polygon-with-hole.geojson
 create mode 100644 packages/turf-mask/test/out/polygon-with-hole.geojson

diff --git a/packages/turf-mask/README.md b/packages/turf-mask/README.md
index 2c105ac48e..b7d0186cf4 100644
--- a/packages/turf-mask/README.md
+++ b/packages/turf-mask/README.md
@@ -8,31 +8,44 @@ Takes any type of [polygon][1] and an optional mask and returns a [polygon][1] e
 
 ### Parameters
 
-*   `polygon` **([FeatureCollection][2] | [Feature][3]<([Polygon][4] | [MultiPolygon][5])>)** GeoJSON Polygon used as interior rings or holes.
-*   `mask` **[Feature][3]<[Polygon][4]>?** GeoJSON Polygon used as the exterior ring (if undefined, the world extent is used)
+- `polygon` **([FeatureCollection][2] | [Feature][3]<([Polygon][4] | [MultiPolygon][5])>)** GeoJSON Polygon used as interior rings or holes.
+- `mask` **[Feature][3]<[Polygon][4]>?** GeoJSON Polygon used as the exterior ring (if undefined, the world extent is used)
 
 ### Examples
 
 ```javascript
-var polygon = turf.polygon([[[112, -21], [116, -36], [146, -39], [153, -24], [133, -10], [112, -21]]]);
-var mask = turf.polygon([[[90, -55], [170, -55], [170, 10], [90, 10], [90, -55]]]);
+var polygon = turf.polygon([
+  [
+    [112, -21],
+    [116, -36],
+    [146, -39],
+    [153, -24],
+    [133, -10],
+    [112, -21],
+  ],
+]);
+var mask = turf.polygon([
+  [
+    [90, -55],
+    [170, -55],
+    [170, 10],
+    [90, 10],
+    [90, -55],
+  ],
+]);
 
 var masked = turf.mask(polygon, mask);
 
 //addToMap
-var addToMap = [masked]
+var addToMap = [masked];
 ```
 
 Returns **[Feature][3]<[Polygon][4]>** Masked Polygon (exterior ring with holes).
 
 [1]: https://tools.ietf.org/html/rfc7946#section-3.1.6
-
 [2]: https://tools.ietf.org/html/rfc7946#section-3.3
-
 [3]: https://tools.ietf.org/html/rfc7946#section-3.2
-
 [4]: https://tools.ietf.org/html/rfc7946#section-3.1.6
-
 [5]: https://tools.ietf.org/html/rfc7946#section-3.1.7
 
 <!-- This file is automatically generated. Please don't edit it directly:
diff --git a/packages/turf-mask/index.d.ts b/packages/turf-mask/index.d.ts
index d9f99901da..b51dd12cc9 100644
--- a/packages/turf-mask/index.d.ts
+++ b/packages/turf-mask/index.d.ts
@@ -6,4 +6,4 @@ import { Feature, Polygon, MultiPolygon, FeatureCollection } from "geojson";
 export default function <T extends Polygon | MultiPolygon>(
   poly: Feature<T> | FeatureCollection<T> | T,
   mask?: Feature<Polygon> | Polygon
-): Feature<Polygon>;
+): Feature<Polygon | MultiPolygon>;
diff --git a/packages/turf-mask/index.js b/packages/turf-mask/index.js
index 1c8fb89cbc..f541dbf0aa 100644
--- a/packages/turf-mask/index.js
+++ b/packages/turf-mask/index.js
@@ -2,12 +2,15 @@ import { polygon as createPolygon, multiPolygon } from "@turf/helpers";
 import polygonClipping from "polygon-clipping";
 
 /**
- * Takes any type of {@link Polygon|polygon} and an optional mask and returns a {@link Polygon|polygon} exterior ring with holes.
+ * Takes any type of {@link Polygon|polygon} and an optional mask and returns a {@link Polygon|polygon} exterior ring with holes. If the input polygon has holes
+ * and you'd like to retain them then set `ignoreHoles=false` and a {@link MultiPolygon|multipolygon} will be returned where the holes will be returned as outer rings.
  *
  * @name mask
  * @param {FeatureCollection|Feature<Polygon|MultiPolygon>} polygon GeoJSON Polygon used as interior rings or holes.
  * @param {Feature<Polygon>} [mask] GeoJSON Polygon used as the exterior ring (if undefined, the world extent is used)
- * @returns {Feature<Polygon>} Masked Polygon (exterior ring with holes).
+ * @param {Object} [options={}] Optional parameters
+ * @param {boolean} [options.ignoreHoles=true] Ignore holes in the input polygon. If false then they are converted to outer rings and a MultiPolygon is returned.
+ * @returns {Feature<Polygon|MultiPolygon>} Masked Polygon (exterior ring with holes).
  * @example
  * var polygon = turf.polygon([[[112, -21], [116, -36], [146, -39], [153, -24], [133, -10], [112, -21]]]);
  * var mask = turf.polygon([[[90, -55], [170, -55], [170, 10], [90, 10], [90, -55]]]);
@@ -17,9 +20,11 @@ import polygonClipping from "polygon-clipping";
  * //addToMap
  * var addToMap = [masked]
  */
-function mask(polygon, mask) {
+function mask(polygon, mask, options) {
+  options = options || {};
+  var ignoreHoles = "ignoreHoles" in options ? options.ignoreHoles : true;
   // Define mask
-  var maskPolygon = createMask(mask);
+  var maskPolygon = createMask(mask, ignoreHoles);
 
   var polygonOuters = null;
   if (polygon.type === "FeatureCollection") polygonOuters = unionFc(polygon);
@@ -29,7 +34,15 @@ function mask(polygon, mask) {
     );
 
   polygonOuters.geometry.coordinates.forEach(function (contour) {
-    maskPolygon.geometry.coordinates.push(contour[0]);
+    if (ignoreHoles) {
+      maskPolygon.geometry.coordinates.push(contour[0]);
+    } else {
+      for (let index = 0; index < contour.length; index++) {
+        const ring = contour[index];
+        if (index === 0) maskPolygon.geometry.coordinates[0].push(ring);
+        else maskPolygon.geometry.coordinates.push([ring]);
+      }
+    }
   });
 
   return maskPolygon;
@@ -60,9 +73,10 @@ function createGeomFromPolygonClippingOutput(unioned) {
  *
  * @private
  * @param {Feature<Polygon>} [mask] default to world if undefined
+ * @param {Boolean} [ignoreHoles] whether to ignore holes or not. If false we return a MultiPolygon
  * @returns {Feature<Polygon>} mask coordinate
  */
-function createMask(mask) {
+function createMask(mask, ignoreHoles) {
   var world = [
     [
       [180, 90],
@@ -72,8 +86,10 @@ function createMask(mask) {
       [180, 90],
     ],
   ];
+
   var coordinates = (mask && mask.geometry.coordinates) || world;
-  return createPolygon(coordinates);
+
+  return ignoreHoles ? createPolygon(coordinates) : multiPolygon([coordinates]);
 }
 
 export default mask;
diff --git a/packages/turf-mask/test.js b/packages/turf-mask/test.js
index 29cdfc66ff..075ba83f18 100644
--- a/packages/turf-mask/test.js
+++ b/packages/turf-mask/test.js
@@ -5,7 +5,7 @@ import load from "load-json-file";
 import write from "write-json-file";
 import mask from "./index";
 
-const SKIP = ["multi-polygon.geojson", "overlapping.geojson"];
+const SKIP = [];
 
 const directories = {
   in: path.join(__dirname, "test", "in") + path.sep,
@@ -34,3 +34,53 @@ test("turf-mask", (t) => {
   }
   t.end();
 });
+
+test("turf-mask-ignoreHoles", (t) => {
+  const { name, geojson } = fixtures.find(
+    (f) => f.name === "polygon-with-hole"
+  );
+  const [polygon, masking] = geojson.features;
+  const results = mask(polygon, masking, {
+    ignoreHoles: false,
+  });
+
+  t.deepEquals(
+    results,
+    {
+      type: "Feature",
+      properties: {},
+      geometry: {
+        type: "MultiPolygon",
+        coordinates: [
+          [
+            [
+              [180, 90],
+              [-180, 90],
+              [-180, -90],
+              [180, -90],
+              [180, 90],
+            ],
+            [
+              [0, 0],
+              [16, 0],
+              [16, 16],
+              [0, 16],
+              [0, 0],
+            ],
+          ],
+          [
+            [
+              [6, 6],
+              [6, 10],
+              [10, 10],
+              [10, 6],
+              [6, 6],
+            ],
+          ],
+        ],
+      },
+    },
+    name
+  );
+  t.end();
+});
diff --git a/packages/turf-mask/test/in/polygon-with-hole.geojson b/packages/turf-mask/test/in/polygon-with-hole.geojson
new file mode 100644
index 0000000000..ee7c06ba19
--- /dev/null
+++ b/packages/turf-mask/test/in/polygon-with-hole.geojson
@@ -0,0 +1,28 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [0, 0],
+            [16, 0],
+            [16, 16],
+            [0, 16],
+            [0, 0]
+          ],
+          [
+            [6, 6],
+            [6, 10],
+            [10, 10],
+            [10, 6],
+            [6, 6]
+          ]
+        ]
+      },
+      "properties": {}
+    }
+  ]
+}
diff --git a/packages/turf-mask/test/out/multi-polygon.geojson b/packages/turf-mask/test/out/multi-polygon.geojson
index 920193fbd8..478c157cfb 100644
--- a/packages/turf-mask/test/out/multi-polygon.geojson
+++ b/packages/turf-mask/test/out/multi-polygon.geojson
@@ -11,131 +11,131 @@
         [180, -90],
         [180, 90]
       ],
-      [
-        [174.8347149, -36.8815236],
-        [174.835116, -36.8807968],
-        [174.8347295, -36.8806857],
-        [174.8350004, -36.8802174],
-        [174.8351245, -36.8798054],
-        [174.8353415, -36.8797934],
-        [174.8355479, -36.8795814],
-        [174.8354683, -36.8795601],
-        [174.8355874, -36.8793891],
-        [174.8357201, -36.8790301],
-        [174.8357777, -36.8790427],
-        [174.8360549, -36.8784168],
-        [174.8360445, -36.8784047],
-        [174.8369669, -36.8778472],
-        [174.837355, -36.8776834],
-        [174.8384676, -36.878055],
-        [174.8376266, -36.8798969],
-        [174.8371047, -36.8807158],
-        [174.8362531, -36.881711],
-        [174.8355443, -36.8821803],
-        [174.8350392, -36.8821049],
-        [174.8347409, -36.8819051],
-        [174.8347774, -36.881634],
-        [174.8347149, -36.8815236]
-      ],
       [
         [174.8257084, -36.8869965],
-        [174.8259044, -36.8868107],
-        [174.8261193, -36.8867062],
-        [174.8261552, -36.8866995],
-        [174.8261688, -36.886697],
-        [174.8263768, -36.8866582],
-        [174.8265485, -36.8865621],
-        [174.8268918, -36.8864866],
-        [174.8272938, -36.8863759],
-        [174.827812, -36.8862177],
-        [174.8285583, -36.8859898],
-        [174.8285298, -36.8854835],
-        [174.828547, -36.8850853],
-        [174.8290133, -36.8842478],
-        [174.8294482, -36.8835612],
-        [174.8295855, -36.8828026],
-        [174.829535, -36.8828012],
-        [174.829225, -36.8827923],
-        [174.8290019, -36.8821676],
-        [174.8291049, -36.8820989],
-        [174.8294238, -36.8818914],
-        [174.8293809, -36.8815138],
-        [174.829062, -36.8788584],
-        [174.8290963, -36.8787142],
-        [174.8291735, -36.8785151],
-        [174.8291478, -36.8783915],
-        [174.8291478, -36.8782886],
-        [174.8302808, -36.8777874],
-        [174.8305018, -36.8776747],
-        [174.8309073, -36.8774235],
-        [174.8312421, -36.8772587],
-        [174.8312077, -36.8771008],
-        [174.8313365, -36.8770253],
-        [174.8315081, -36.8771832],
-        [174.8319464, -36.8770175],
-        [174.8320384, -36.8768042],
-        [174.8322194, -36.876702],
-        [174.8322845, -36.8767656],
-        [174.8325172, -36.8766213],
-        [174.8329038, -36.8761774],
-        [174.8331871, -36.8758692],
-        [174.833726, -36.8754489],
-        [174.8343983, -36.8756894],
-        [174.8345787, -36.8753974],
-        [174.8345392, -36.8752539],
-        [174.8350149, -36.875154],
-        [174.8350022, -36.8752449],
-        [174.8350096, -36.8753835],
-        [174.8350415, -36.8755096],
-        [174.8346298, -36.8755945],
-        [174.8347802, -36.8758729],
-        [174.8352751, -36.8760453],
-        [174.8353743, -36.8758963],
-        [174.8356795, -36.8760915],
-        [174.8357668, -36.876134],
-        [174.8357051, -36.8761931],
-        [174.8355399, -36.8764449],
-        [174.8353877, -36.8766751],
-        [174.8351645, -36.8767575],
-        [174.8349499, -36.8768261],
-        [174.8347697, -36.8769085],
-        [174.8343234, -36.8772656],
-        [174.8337539, -36.8777781],
-        [174.8333146, -36.878309],
-        [174.8331132, -36.8782542],
-        [174.8328699, -36.878784],
-        [174.8342416, -36.8795988],
-        [174.8347595, -36.8798408],
-        [174.8349119, -36.8798696],
-        [174.8348716, -36.8800115],
-        [174.8346495, -36.8804375],
-        [174.8346312, -36.8804379],
-        [174.8325982, -36.8803963],
-        [174.8324179, -36.8806023],
-        [174.8321192, -36.8820636],
-        [174.8319151, -36.8828293],
-        [174.8311496, -36.8842651],
-        [174.8315144, -36.8849051],
-        [174.8321967, -36.8848087],
-        [174.8332402, -36.8837406],
-        [174.8340081, -36.8834433],
-        [174.836428, -36.8830636],
-        [174.8367485, -36.8829628],
-        [174.8369142, -36.88283],
-        [174.8373394, -36.8830989],
-        [174.8373321, -36.8831729],
-        [174.8367548, -36.8837641],
-        [174.8356801, -36.8844927],
-        [174.8354962, -36.8846273],
-        [174.834388, -36.885941],
-        [174.8341202, -36.8862468],
-        [174.8336846, -36.8865436],
-        [174.8314673, -36.8878689],
-        [174.8311438, -36.8878347],
-        [174.8296591, -36.8874264],
-        [174.8278042, -36.8875561],
         [174.8276109, -36.887539],
+        [174.8278042, -36.8875561],
+        [174.8296591, -36.8874264],
+        [174.8311438, -36.8878347],
+        [174.8314673, -36.8878689],
+        [174.8336846, -36.8865436],
+        [174.8341202, -36.8862468],
+        [174.834388, -36.885941],
+        [174.8354962, -36.8846273],
+        [174.8356801, -36.8844927],
+        [174.8367548, -36.8837641],
+        [174.8373321, -36.8831729],
+        [174.8373394, -36.8830989],
+        [174.8369142, -36.88283],
+        [174.8367485, -36.8829628],
+        [174.836428, -36.8830636],
+        [174.8340081, -36.8834433],
+        [174.8332402, -36.8837406],
+        [174.8321967, -36.8848087],
+        [174.8315144, -36.8849051],
+        [174.8311496, -36.8842651],
+        [174.8319151, -36.8828293],
+        [174.8321192, -36.8820636],
+        [174.8324179, -36.8806023],
+        [174.8325982, -36.8803963],
+        [174.8346312, -36.8804379],
+        [174.8346495, -36.8804375],
+        [174.8348716, -36.8800115],
+        [174.8349119, -36.8798696],
+        [174.8347595, -36.8798408],
+        [174.8342416, -36.8795988],
+        [174.8328699, -36.878784],
+        [174.8331132, -36.8782542],
+        [174.8333146, -36.878309],
+        [174.8337539, -36.8777781],
+        [174.8343234, -36.8772656],
+        [174.8347697, -36.8769085],
+        [174.8349499, -36.8768261],
+        [174.8351645, -36.8767575],
+        [174.8353877, -36.8766751],
+        [174.8355399, -36.8764449],
+        [174.8357051, -36.8761931],
+        [174.8357668, -36.876134],
+        [174.8356795, -36.8760915],
+        [174.8353743, -36.8758963],
+        [174.8352751, -36.8760453],
+        [174.8347802, -36.8758729],
+        [174.8346298, -36.8755945],
+        [174.8350415, -36.8755096],
+        [174.8350096, -36.8753835],
+        [174.8350022, -36.8752449],
+        [174.8350149, -36.875154],
+        [174.8345392, -36.8752539],
+        [174.8345787, -36.8753974],
+        [174.8343983, -36.8756894],
+        [174.833726, -36.8754489],
+        [174.8331871, -36.8758692],
+        [174.8329038, -36.8761774],
+        [174.8325172, -36.8766213],
+        [174.8322845, -36.8767656],
+        [174.8322194, -36.876702],
+        [174.8320384, -36.8768042],
+        [174.8319464, -36.8770175],
+        [174.8315081, -36.8771832],
+        [174.8313365, -36.8770253],
+        [174.8312077, -36.8771008],
+        [174.8312421, -36.8772587],
+        [174.8309073, -36.8774235],
+        [174.8305018, -36.8776747],
+        [174.8302808, -36.8777874],
+        [174.8291478, -36.8782886],
+        [174.8291478, -36.8783915],
+        [174.8291735, -36.8785151],
+        [174.8290963, -36.8787142],
+        [174.829062, -36.8788584],
+        [174.8293809, -36.8815138],
+        [174.8294238, -36.8818914],
+        [174.8291049, -36.8820989],
+        [174.8290019, -36.8821676],
+        [174.829225, -36.8827923],
+        [174.829535, -36.8828012],
+        [174.8295855, -36.8828026],
+        [174.8294482, -36.8835612],
+        [174.8290133, -36.8842478],
+        [174.828547, -36.8850853],
+        [174.8285298, -36.8854835],
+        [174.8285583, -36.8859898],
+        [174.827812, -36.8862177],
+        [174.8272938, -36.8863759],
+        [174.8268918, -36.8864866],
+        [174.8265485, -36.8865621],
+        [174.8263768, -36.8866582],
+        [174.8261688, -36.886697],
+        [174.8261552, -36.8866995],
+        [174.8261193, -36.8867062],
+        [174.8259044, -36.8868107],
         [174.8257084, -36.8869965]
+      ],
+      [
+        [174.8347149, -36.8815236],
+        [174.8347774, -36.881634],
+        [174.8347409, -36.8819051],
+        [174.8350392, -36.8821049],
+        [174.8355443, -36.8821803],
+        [174.8362531, -36.881711],
+        [174.8371047, -36.8807158],
+        [174.8376266, -36.8798969],
+        [174.8384676, -36.878055],
+        [174.837355, -36.8776834],
+        [174.8369669, -36.8778472],
+        [174.8360445, -36.8784047],
+        [174.8360549, -36.8784168],
+        [174.8357777, -36.8790427],
+        [174.8357201, -36.8790301],
+        [174.8355874, -36.8793891],
+        [174.8354683, -36.8795601],
+        [174.8355479, -36.8795814],
+        [174.8353415, -36.8797934],
+        [174.8351245, -36.8798054],
+        [174.8350004, -36.8802174],
+        [174.8347295, -36.8806857],
+        [174.835116, -36.8807968],
+        [174.8347149, -36.8815236]
       ]
     ]
   }
diff --git a/packages/turf-mask/test/out/overlapping.geojson b/packages/turf-mask/test/out/overlapping.geojson
index 3d1646a9fd..0eb8878233 100644
--- a/packages/turf-mask/test/out/overlapping.geojson
+++ b/packages/turf-mask/test/out/overlapping.geojson
@@ -12,25 +12,25 @@
         [180, 90]
       ],
       [
-        [132.17629902699358, -13.364967199604362],
-        [144.931640625, -12.726084296948184],
-        [153.544921875, -22.75592068148639],
-        [150.380859375, -35.02999636902566],
-        [146.42578125, -38.8225909761771],
-        [135.35156249999997, -36.738884124394296],
-        [132.9837069753474, -33.32471360739497],
-        [131.8359375, -34.59704151614416],
-        [126.73828125, -34.234512362369856],
-        [123.29894671677008, -32.162843535475524],
-        [122.16796875, -34.59704151614416],
-        [118.30078125, -34.30714385628803],
         [113.02734374999999, -27.527758206861886],
-        [114.9609375, -19.973348786110602],
-        [119.70703125, -16.467694748288956],
-        [120.4266908193729, -17.582874301397172],
-        [121.55273437499999, -15.029685756555674],
+        [118.30078125, -34.30714385628803],
+        [122.16796875, -34.59704151614416],
+        [123.29894671677008, -32.162843535475524],
+        [126.73828125, -34.234512362369856],
+        [131.8359375, -34.59704151614416],
+        [132.9837069753474, -33.32471360739497],
+        [135.35156249999997, -36.738884124394296],
+        [146.42578125, -38.8225909761771],
+        [150.380859375, -35.02999636902566],
+        [153.544921875, -22.75592068148639],
+        [144.931640625, -12.726084296948184],
+        [132.17629902699358, -13.364967199604362],
         [130.078125, -11.436955216143177],
-        [132.17629902699358, -13.364967199604362]
+        [121.55273437499999, -15.029685756555674],
+        [120.4266908193729, -17.58287430139717],
+        [119.70703125, -16.467694748288956],
+        [114.9609375, -19.973348786110602],
+        [113.02734374999999, -27.527758206861886]
       ]
     ]
   }
diff --git a/packages/turf-mask/test/out/polygon-with-hole.geojson b/packages/turf-mask/test/out/polygon-with-hole.geojson
new file mode 100644
index 0000000000..57ea643129
--- /dev/null
+++ b/packages/turf-mask/test/out/polygon-with-hole.geojson
@@ -0,0 +1,23 @@
+{
+  "type": "Feature",
+  "properties": {},
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [180, 90],
+        [-180, 90],
+        [-180, -90],
+        [180, -90],
+        [180, 90]
+      ],
+      [
+        [0, 0],
+        [16, 0],
+        [16, 16],
+        [0, 16],
+        [0, 0]
+      ]
+    ]
+  }
+}

From c6070840a0904b27bd24a2ea9d7b26716026e14c Mon Sep 17 00:00:00 2001
From: Rowan Winsemius <rowanwins@yahoo.com.au>
Date: Sun, 9 Oct 2022 14:42:25 +1100
Subject: [PATCH 2/3] Add handling for someone providing options but no mask

---
 packages/turf-mask/index.js |  8 +++++-
 packages/turf-mask/test.js  | 50 +++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/packages/turf-mask/index.js b/packages/turf-mask/index.js
index f541dbf0aa..a2f322c626 100644
--- a/packages/turf-mask/index.js
+++ b/packages/turf-mask/index.js
@@ -21,7 +21,14 @@ import polygonClipping from "polygon-clipping";
  * var addToMap = [masked]
  */
 function mask(polygon, mask, options) {
+  // Handling in case someone doesn't pass in a mask but they do provide options
+  if (typeof mask === "object" && options === undefined) {
+    options = mask;
+    mask = undefined;
+  }
+
   options = options || {};
+
   var ignoreHoles = "ignoreHoles" in options ? options.ignoreHoles : true;
   // Define mask
   var maskPolygon = createMask(mask, ignoreHoles);
@@ -86,7 +93,6 @@ function createMask(mask, ignoreHoles) {
       [180, 90],
     ],
   ];
-
   var coordinates = (mask && mask.geometry.coordinates) || world;
 
   return ignoreHoles ? createPolygon(coordinates) : multiPolygon([coordinates]);
diff --git a/packages/turf-mask/test.js b/packages/turf-mask/test.js
index 075ba83f18..998c4ea2d9 100644
--- a/packages/turf-mask/test.js
+++ b/packages/turf-mask/test.js
@@ -84,3 +84,53 @@ test("turf-mask-ignoreHoles", (t) => {
   );
   t.end();
 });
+
+test("turf-mask with options but no mask", (t) => {
+  const { name, geojson } = fixtures.find(
+    (f) => f.name === "polygon-with-hole"
+  );
+  const [polygon] = geojson.features;
+  const results = mask(polygon, undefined, {
+    ignoreHoles: false,
+  });
+
+  t.deepEquals(
+    results,
+    {
+      type: "Feature",
+      properties: {},
+      geometry: {
+        type: "MultiPolygon",
+        coordinates: [
+          [
+            [
+              [180, 90],
+              [-180, 90],
+              [-180, -90],
+              [180, -90],
+              [180, 90],
+            ],
+            [
+              [0, 0],
+              [16, 0],
+              [16, 16],
+              [0, 16],
+              [0, 0],
+            ],
+          ],
+          [
+            [
+              [6, 6],
+              [6, 10],
+              [10, 10],
+              [10, 6],
+              [6, 6],
+            ],
+          ],
+        ],
+      },
+    },
+    name
+  );
+  t.end();
+});

From 8eed36106b8ad6db3a032f0515fbc959264a6141 Mon Sep 17 00:00:00 2001
From: Rowan Winsemius <rowanwins@yahoo.com.au>
Date: Sun, 9 Oct 2022 15:24:19 +1100
Subject: [PATCH 3/3] fix up no mask argument handling

---
 packages/turf-mask/index.js | 2 +-
 packages/turf-mask/test.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/turf-mask/index.js b/packages/turf-mask/index.js
index a2f322c626..a23cb2f73c 100644
--- a/packages/turf-mask/index.js
+++ b/packages/turf-mask/index.js
@@ -22,7 +22,7 @@ import polygonClipping from "polygon-clipping";
  */
 function mask(polygon, mask, options) {
   // Handling in case someone doesn't pass in a mask but they do provide options
-  if (typeof mask === "object" && options === undefined) {
+  if (typeof mask === "object" && !("type" in mask) && options === undefined) {
     options = mask;
     mask = undefined;
   }
diff --git a/packages/turf-mask/test.js b/packages/turf-mask/test.js
index 998c4ea2d9..c40d3a27cd 100644
--- a/packages/turf-mask/test.js
+++ b/packages/turf-mask/test.js
@@ -90,7 +90,7 @@ test("turf-mask with options but no mask", (t) => {
     (f) => f.name === "polygon-with-hole"
   );
   const [polygon] = geojson.features;
-  const results = mask(polygon, undefined, {
+  const results = mask(polygon, {
     ignoreHoles: false,
   });