fix(zarrmultiscalespatialimage): support Zarr stores not ending in .z…

…arr (#721)

* fix(zarrmultiscalespatialimage): support Zarr stores not ending in .zarr

The isZarr regex was updated to support .zarr/image, besides just .zarr and DANDI /zarr/.

fix #719

* fix(ZarrMultiscaleSpatialImage): add word boundary to isZarr regex

---------

Co-authored-by: Paul Elliott <paul.elliott@kitware.com>

src/IO/ZarrMultiscaleSpatialImage.js

@@ -10,7 +10,7 @@ import { getComponentType } from './dtypeUtils'
 import { MAX_CONCURRENCY } from '../Context/ViewerMachineContext'
 
 // ends with zarr and optional nested image name like foo.zarr/image1
-export const isZarr = url => /zarr((\/)[\w-]+\/?)?$/.test(url)
+export const isZarr = url => /\w[./]zarr\b/.test(url)
 
 const TCZYX = Object.freeze(['t', 'c', 'z', 'y', 'x'])
 

test/zarrTest.js

@@ -39,14 +39,22 @@ test('Test isZarr', t => {
     'real url'
   )
 
-  t.false(isZarr('foo.asdf'), 'not when .asdf extension')
+  t.true(isZarr('https://site.com/zarr/a/b'), 'deep nested image')
+  t.true(
+    isZarr('https://site.com/foo.zarr/a/b'),
+    'deep nested image with zarr as extension'
+  )
+
+  t.false(isZarr('zarr.asdf'), 'not when .asdf extension')
   t.false(
-    isZarr('foo.zarr.asdf/asdf'),
+    isZarr('barzarr.asdf'),
+    'not when .asdf extension withfilename barzarr'
+  )
+  t.false(
+    isZarr('barzarr.asdf/asdf'),
     'not when .asdf extension and has suffix'
   )
-
-  t.false(isZarr('foo.zarr.asdf.baz'), '.baz suffix')
-  t.false(isZarr('foo.zarrX.png'), '.zarrX extension, not .zarr')
+  t.false(isZarr('foo.zarrX'), '.zarrX extension, not .zarr')
 
   t.end()
 })