@loaders.gl/geotiff 4.0.0-alpha.9 → 4.0.0-beta.1

package/dist/es5/lib/ome/omexml.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.fromString = fromString;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _fastXmlParser = _interopRequireDefault(require("fast-xml-parser"));
+var _fastXmlParser = require("fast-xml-parser");
 var _tiffUtils = require("../utils/tiff-utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var PARSER_OPTIONS = {
+var xmlParser = new _fastXmlParser.XMLParser({
   attributeNamePrefix: '',
-  attrNodeName: 'attr',
-  parseNodeValue: true,
+  attributesGroupName: 'attr',
+  parseTagValue: true,
   parseAttributeValue: true,
   ignoreAttributes: false
-};
+});
 var parse = function parse(str) {
-  return _fastXmlParser.default.parse(str, PARSER_OPTIONS);
+  return xmlParser.parse(str);
 };
 function fromString(str) {
   var res = parse(str);

package/dist/es5/lib/ome/omexml.js.map

@@ -1 +1 @@
-{"version":3,"file":"omexml.js","names":["_fastXmlParser","_interopRequireDefault","require","_tiffUtils","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","PARSER_OPTIONS","attributeNamePrefix","attrNodeName","parseNodeValue","parseAttributeValue","ignoreAttributes","parse","str","parser","fromString","res","OME","Error","ensureArray","Image","map","img","Channels","Pixels","Channel","c","attr","Color","intToRgba","_img$AquisitionDate","AquisitionDate","_img$Description","Description","image","format","sizes","name","size","concat","unit","join","SizeX","SizeY","Type","SizeZ","SizeT","SizeC"],"sources":["../../../../src/lib/ome/omexml.ts"],"sourcesContent":["import parser from 'fast-xml-parser';\nimport {ensureArray, intToRgba} from '../utils/tiff-utils';\n\n// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.\nconst PARSER_OPTIONS = {\n  // Nests attributes withtout prefix under 'attr' key for each node\n  attributeNamePrefix: '',\n  attrNodeName: 'attr',\n\n  // Parses numbers for both attributes and nodes\n  parseNodeValue: true,\n  parseAttributeValue: true,\n\n  // Forces attributes to be parsed\n  ignoreAttributes: false\n};\n\nconst parse = (str: string): Root => parser.parse(str, PARSER_OPTIONS);\n\nexport function fromString(str: string) {\n  const res = parse(str);\n  if (!res.OME) {\n    throw Error('Failed to parse OME-XML metadata.');\n  }\n  return ensureArray(res.OME.Image).map((img) => {\n    const Channels = ensureArray(img.Pixels.Channel).map((c) => {\n      if ('Color' in c.attr) {\n        return {...c.attr, Color: intToRgba(c.attr.Color)};\n      }\n      return {...c.attr};\n    });\n    const {AquisitionDate = '', Description = ''} = img;\n    const image = {\n      ...img.attr,\n      AquisitionDate,\n      Description,\n      Pixels: {\n        ...img.Pixels.attr,\n        Channels\n      }\n    };\n    return {\n      ...image,\n      format() {\n        const {Pixels} = image;\n\n        const sizes = (['X', 'Y', 'Z'] as const)\n          .map((name) => {\n            const size = Pixels[`PhysicalSize${name}` as const];\n            const unit = Pixels[`PhysicalSize${name}Unit` as const];\n            return size && unit ? `${size} ${unit}` : '-';\n          })\n          .join(' x ');\n\n        return {\n          'Acquisition Date': image.AquisitionDate,\n          'Dimensions (XY)': `${Pixels.SizeX} x ${Pixels.SizeY}`,\n          'Pixels Type': Pixels.Type,\n          'Pixels Size (XYZ)': sizes,\n          'Z-sections/Timepoints': `${Pixels.SizeZ} x ${Pixels.SizeT}`,\n          Channels: Pixels.SizeC\n        };\n      }\n    };\n  });\n}\n\nexport type OMEXML = ReturnType<typeof fromString>;\nexport type DimensionOrder = 'XYZCT' | 'XYZTC' | 'XYCTZ' | 'XYCZT' | 'XYTCZ' | 'XYTZC';\n\n// Structure of node is determined by the PARSER_OPTIONS.\ntype Node<T, A> = T & {attr: A};\ntype Attrs<Fields extends string, T = string> = {[K in Fields]: T};\n\ntype OMEAttrs = Attrs<'xmlns' | 'xmlns:xsi' | 'xsi:schemaLocation'>;\ntype OME = Node<{Insturment: Insturment; Image: Image | Image[]}, OMEAttrs>;\n\ntype Insturment = Node<\n  {Objective: Node<{}, Attrs<'ID' | 'Model' | 'NominalMagnification'>>},\n  Attrs<'ID'>\n>;\n\ninterface ImageNodes {\n  AquisitionDate?: string;\n  Description?: string;\n  Pixels: Pixels;\n  InstrumentRef: Node<{}, {ID: string}>;\n  ObjectiveSettings: Node<{}, {ID: string}>;\n}\ntype Image = Node<ImageNodes, Attrs<'ID' | 'Name'>>;\n\ntype PixelType =\n  | 'int8'\n  | 'int16'\n  | 'int32'\n  | 'uint8'\n  | 'uint16'\n  | 'uint32'\n  | 'float'\n  | 'bit'\n  | 'double'\n  | 'complex'\n  | 'double-complex';\n\nexport type UnitsLength =\n  | 'Ym'\n  | 'Zm'\n  | 'Em'\n  | 'Pm'\n  | 'Tm'\n  | 'Gm'\n  | 'Mm'\n  | 'km'\n  | 'hm'\n  | 'dam'\n  | 'm'\n  | 'dm'\n  | 'cm'\n  | 'mm'\n  | 'µm'\n  | 'nm'\n  | 'pm'\n  | 'fm'\n  | 'am'\n  | 'zm'\n  | 'ym'\n  | 'Å'\n  | 'thou'\n  | 'li'\n  | 'in'\n  | 'ft'\n  | 'yd'\n  | 'mi'\n  | 'ua'\n  | 'ly'\n  | 'pc'\n  | 'pt'\n  | 'pixel'\n  | 'reference frame';\n\ntype PhysicalSize<Name extends string> = `PhysicalSize${Name}`;\ntype PhysicalSizeUnit<Name extends string> = `PhysicalSize${Name}Unit`;\ntype Size<Names extends string> = `Size${Names}`;\n\ntype PixelAttrs = Attrs<\n  PhysicalSize<'X' | 'Y' | 'Z'> | 'SignificantBits' | Size<'T' | 'C' | 'Z' | 'Y' | 'X'>,\n  number\n> &\n  Attrs<PhysicalSizeUnit<'X' | 'Y' | 'Z'>, UnitsLength> &\n  Attrs<'BigEndian' | 'Interleaved', boolean> & {\n    ID: string;\n    DimensionOrder: DimensionOrder;\n    Type: PixelType;\n  };\n\ntype Pixels = Node<\n  {\n    Channel: Channel | Channel[];\n    TiffData: Node<{}, Attrs<'IFD' | 'PlaneCount'>>;\n  },\n  PixelAttrs\n>;\n\ntype ChannelAttrs =\n  | {\n      ID: string;\n      SamplesPerPixel: number;\n      Name?: string;\n    }\n  | {\n      ID: string;\n      SamplesPerPixel: number;\n      Name?: string;\n      Color: number;\n    };\n\ntype Channel = Node<{}, ChannelAttrs>;\n\ntype Root = {OME: OME};\n"],"mappings":"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"}
+{"version":3,"file":"omexml.js","names":["_fastXmlParser","require","_tiffUtils","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","xmlParser","XMLParser","attributeNamePrefix","attributesGroupName","parseTagValue","parseAttributeValue","ignoreAttributes","parse","str","fromString","res","OME","Error","ensureArray","Image","map","img","Channels","Pixels","Channel","c","attr","Color","intToRgba","_img$AquisitionDate","AquisitionDate","_img$Description","Description","image","format","sizes","name","size","concat","unit","join","SizeX","SizeY","Type","SizeZ","SizeT","SizeC"],"sources":["../../../../src/lib/ome/omexml.ts"],"sourcesContent":["import {XMLParser} from 'fast-xml-parser';\nimport {ensureArray, intToRgba} from '../utils/tiff-utils';\n\n// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.\nconst xmlParser = new XMLParser({\n  // Nests attributes withtout prefix under 'attr' key for each node\n  attributeNamePrefix: '',\n  attributesGroupName: 'attr',\n\n  // Parses numbers for both attributes and nodes\n  parseTagValue: true,\n  parseAttributeValue: true,\n\n  // Forces attributes to be parsed\n  ignoreAttributes: false\n});\n\nconst parse = (str: string): Root => xmlParser.parse(str);\n\nexport function fromString(str: string) {\n  const res = parse(str);\n  if (!res.OME) {\n    throw Error('Failed to parse OME-XML metadata.');\n  }\n  return ensureArray(res.OME.Image).map((img) => {\n    const Channels = ensureArray(img.Pixels.Channel).map((c) => {\n      if ('Color' in c.attr) {\n        return {...c.attr, Color: intToRgba(c.attr.Color)};\n      }\n      return {...c.attr};\n    });\n    const {AquisitionDate = '', Description = ''} = img;\n    const image = {\n      ...img.attr,\n      AquisitionDate,\n      Description,\n      Pixels: {\n        ...img.Pixels.attr,\n        Channels\n      }\n    };\n    return {\n      ...image,\n      format() {\n        const {Pixels} = image;\n\n        const sizes = (['X', 'Y', 'Z'] as const)\n          .map((name) => {\n            const size = Pixels[`PhysicalSize${name}` as const];\n            const unit = Pixels[`PhysicalSize${name}Unit` as const];\n            return size && unit ? `${size} ${unit}` : '-';\n          })\n          .join(' x ');\n\n        return {\n          'Acquisition Date': image.AquisitionDate,\n          'Dimensions (XY)': `${Pixels.SizeX} x ${Pixels.SizeY}`,\n          'Pixels Type': Pixels.Type,\n          'Pixels Size (XYZ)': sizes,\n          'Z-sections/Timepoints': `${Pixels.SizeZ} x ${Pixels.SizeT}`,\n          Channels: Pixels.SizeC\n        };\n      }\n    };\n  });\n}\n\nexport type OMEXML = ReturnType<typeof fromString>;\nexport type DimensionOrder = 'XYZCT' | 'XYZTC' | 'XYCTZ' | 'XYCZT' | 'XYTCZ' | 'XYTZC';\n\n// Structure of node is determined by the PARSER_OPTIONS.\ntype Node<T, A> = T & {attr: A};\ntype Attrs<Fields extends string, T = string> = {[K in Fields]: T};\n\ntype OMEAttrs = Attrs<'xmlns' | 'xmlns:xsi' | 'xsi:schemaLocation'>;\ntype OME = Node<{Insturment: Insturment; Image: Image | Image[]}, OMEAttrs>;\n\ntype Insturment = Node<\n  {Objective: Node<{}, Attrs<'ID' | 'Model' | 'NominalMagnification'>>},\n  Attrs<'ID'>\n>;\n\ninterface ImageNodes {\n  AquisitionDate?: string;\n  Description?: string;\n  Pixels: Pixels;\n  InstrumentRef: Node<{}, {ID: string}>;\n  ObjectiveSettings: Node<{}, {ID: string}>;\n}\ntype Image = Node<ImageNodes, Attrs<'ID' | 'Name'>>;\n\ntype PixelType =\n  | 'int8'\n  | 'int16'\n  | 'int32'\n  | 'uint8'\n  | 'uint16'\n  | 'uint32'\n  | 'float'\n  | 'bit'\n  | 'double'\n  | 'complex'\n  | 'double-complex';\n\nexport type UnitsLength =\n  | 'Ym'\n  | 'Zm'\n  | 'Em'\n  | 'Pm'\n  | 'Tm'\n  | 'Gm'\n  | 'Mm'\n  | 'km'\n  | 'hm'\n  | 'dam'\n  | 'm'\n  | 'dm'\n  | 'cm'\n  | 'mm'\n  | 'µm'\n  | 'nm'\n  | 'pm'\n  | 'fm'\n  | 'am'\n  | 'zm'\n  | 'ym'\n  | 'Å'\n  | 'thou'\n  | 'li'\n  | 'in'\n  | 'ft'\n  | 'yd'\n  | 'mi'\n  | 'ua'\n  | 'ly'\n  | 'pc'\n  | 'pt'\n  | 'pixel'\n  | 'reference frame';\n\ntype PhysicalSize<Name extends string> = `PhysicalSize${Name}`;\ntype PhysicalSizeUnit<Name extends string> = `PhysicalSize${Name}Unit`;\ntype Size<Names extends string> = `Size${Names}`;\n\ntype PixelAttrs = Attrs<\n  PhysicalSize<'X' | 'Y' | 'Z'> | 'SignificantBits' | Size<'T' | 'C' | 'Z' | 'Y' | 'X'>,\n  number\n> &\n  Attrs<PhysicalSizeUnit<'X' | 'Y' | 'Z'>, UnitsLength> &\n  Attrs<'BigEndian' | 'Interleaved', boolean> & {\n    ID: string;\n    DimensionOrder: DimensionOrder;\n    Type: PixelType;\n  };\n\ntype Pixels = Node<\n  {\n    Channel: Channel | Channel[];\n    TiffData: Node<{}, Attrs<'IFD' | 'PlaneCount'>>;\n  },\n  PixelAttrs\n>;\n\ntype ChannelAttrs =\n  | {\n      ID: string;\n      SamplesPerPixel: number;\n      Name?: string;\n    }\n  | {\n      ID: string;\n      SamplesPerPixel: number;\n      Name?: string;\n      Color: number;\n    };\n\ntype Channel = Node<{}, ChannelAttrs>;\n\ntype Root = {OME: OME};\n"],"mappings":"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"}

package/dist/esm/lib/ome/omexml.js

@@ -1,13 +1,13 @@
-import parser from 'fast-xml-parser';
+import { XMLParser } from 'fast-xml-parser';
 import { ensureArray, intToRgba } from '../utils/tiff-utils';
-const PARSER_OPTIONS = {
+const xmlParser = new XMLParser({
   attributeNamePrefix: '',
-  attrNodeName: 'attr',
-  parseNodeValue: true,
+  attributesGroupName: 'attr',
+  parseTagValue: true,
   parseAttributeValue: true,
   ignoreAttributes: false
-};
-const parse = str => parser.parse(str, PARSER_OPTIONS);
+});
+const parse = str => xmlParser.parse(str);
 export function fromString(str) {
   const res = parse(str);
   if (!res.OME) {

package/dist/esm/lib/ome/omexml.js.map

@@ -1 +1 @@
-{"version":3,"file":"omexml.js","names":["parser","ensureArray","intToRgba","PARSER_OPTIONS","attributeNamePrefix","attrNodeName","parseNodeValue","parseAttributeValue","ignoreAttributes","parse","str","fromString","res","OME","Error","Image","map","img","Channels","Pixels","Channel","c","attr","Color","AquisitionDate","Description","image","format","sizes","name","size","concat","unit","join","SizeX","SizeY","Type","SizeZ","SizeT","SizeC"],"sources":["../../../../src/lib/ome/omexml.ts"],"sourcesContent":["import parser from 'fast-xml-parser';\nimport {ensureArray, intToRgba} from '../utils/tiff-utils';\n\n// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.\nconst PARSER_OPTIONS = {\n  // Nests attributes withtout prefix under 'attr' key for each node\n  attributeNamePrefix: '',\n  attrNodeName: 'attr',\n\n  // Parses numbers for both attributes and nodes\n  parseNodeValue: true,\n  parseAttributeValue: true,\n\n  // Forces attributes to be parsed\n  ignoreAttributes: false\n};\n\nconst parse = (str: string): Root => parser.parse(str, PARSER_OPTIONS);\n\nexport function fromString(str: string) {\n  const res = parse(str);\n  if (!res.OME) {\n    throw Error('Failed to parse OME-XML metadata.');\n  }\n  return ensureArray(res.OME.Image).map((img) => {\n    const Channels = ensureArray(img.Pixels.Channel).map((c) => {\n      if ('Color' in c.attr) {\n        return {...c.attr, Color: intToRgba(c.attr.Color)};\n      }\n      return {...c.attr};\n    });\n    const {AquisitionDate = '', Description = ''} = img;\n    const image = {\n      ...img.attr,\n      AquisitionDate,\n      Description,\n      Pixels: {\n        ...img.Pixels.attr,\n        Channels\n      }\n    };\n    return {\n      ...image,\n      format() {\n        const {Pixels} = image;\n\n        const sizes = (['X', 'Y', 'Z'] as const)\n          .map((name) => {\n            const size = Pixels[`PhysicalSize${name}` as const];\n            const unit = Pixels[`PhysicalSize${name}Unit` as const];\n            return size && unit ? `${size} ${unit}` : '-';\n          })\n          .join(' x ');\n\n        return {\n          'Acquisition Date': image.AquisitionDate,\n          'Dimensions (XY)': `${Pixels.SizeX} x ${Pixels.SizeY}`,\n          'Pixels Type': Pixels.Type,\n          'Pixels Size (XYZ)': sizes,\n          'Z-sections/Timepoints': `${Pixels.SizeZ} x ${Pixels.SizeT}`,\n          Channels: Pixels.SizeC\n        };\n      }\n    };\n  });\n}\n\nexport type OMEXML = ReturnType<typeof fromString>;\nexport type DimensionOrder = 'XYZCT' | 'XYZTC' | 'XYCTZ' | 'XYCZT' | 'XYTCZ' | 'XYTZC';\n\n// Structure of node is determined by the PARSER_OPTIONS.\ntype Node<T, A> = T & {attr: A};\ntype Attrs<Fields extends string, T = string> = {[K in Fields]: T};\n\ntype OMEAttrs = Attrs<'xmlns' | 'xmlns:xsi' | 'xsi:schemaLocation'>;\ntype OME = Node<{Insturment: Insturment; Image: Image | Image[]}, OMEAttrs>;\n\ntype Insturment = Node<\n  {Objective: Node<{}, Attrs<'ID' | 'Model' | 'NominalMagnification'>>},\n  Attrs<'ID'>\n>;\n\ninterface ImageNodes {\n  AquisitionDate?: string;\n  Description?: string;\n  Pixels: Pixels;\n  InstrumentRef: Node<{}, {ID: string}>;\n  ObjectiveSettings: Node<{}, {ID: string}>;\n}\ntype Image = Node<ImageNodes, Attrs<'ID' | 'Name'>>;\n\ntype PixelType =\n  | 'int8'\n  | 'int16'\n  | 'int32'\n  | 'uint8'\n  | 'uint16'\n  | 'uint32'\n  | 'float'\n  | 'bit'\n  | 'double'\n  | 'complex'\n  | 'double-complex';\n\nexport type UnitsLength =\n  | 'Ym'\n  | 'Zm'\n  | 'Em'\n  | 'Pm'\n  | 'Tm'\n  | 'Gm'\n  | 'Mm'\n  | 'km'\n  | 'hm'\n  | 'dam'\n  | 'm'\n  | 'dm'\n  | 'cm'\n  | 'mm'\n  | 'µm'\n  | 'nm'\n  | 'pm'\n  | 'fm'\n  | 'am'\n  | 'zm'\n  | 'ym'\n  | 'Å'\n  | 'thou'\n  | 'li'\n  | 'in'\n  | 'ft'\n  | 'yd'\n  | 'mi'\n  | 'ua'\n  | 'ly'\n  | 'pc'\n  | 'pt'\n  | 'pixel'\n  | 'reference frame';\n\ntype PhysicalSize<Name extends string> = `PhysicalSize${Name}`;\ntype PhysicalSizeUnit<Name extends string> = `PhysicalSize${Name}Unit`;\ntype Size<Names extends string> = `Size${Names}`;\n\ntype PixelAttrs = Attrs<\n  PhysicalSize<'X' | 'Y' | 'Z'> | 'SignificantBits' | Size<'T' | 'C' | 'Z' | 'Y' | 'X'>,\n  number\n> &\n  Attrs<PhysicalSizeUnit<'X' | 'Y' | 'Z'>, UnitsLength> &\n  Attrs<'BigEndian' | 'Interleaved', boolean> & {\n    ID: string;\n    DimensionOrder: DimensionOrder;\n    Type: PixelType;\n  };\n\ntype Pixels = Node<\n  {\n    Channel: Channel | Channel[];\n    TiffData: Node<{}, Attrs<'IFD' | 'PlaneCount'>>;\n  },\n  PixelAttrs\n>;\n\ntype ChannelAttrs =\n  | {\n      ID: string;\n      SamplesPerPixel: number;\n      Name?: string;\n    }\n  | {\n      ID: string;\n      SamplesPerPixel: number;\n      Name?: string;\n      Color: number;\n    };\n\ntype Channel = Node<{}, ChannelAttrs>;\n\ntype Root = {OME: OME};\n"],"mappings":"AAAA,OAAOA,MAAM,MAAM,iBAAiB;AACpC,SAAQC,WAAW,EAAEC,SAAS,QAAO,qBAAqB;AAG1D,MAAMC,cAAc,GAAG;EAErBC,mBAAmB,EAAE,EAAE;EACvBC,YAAY,EAAE,MAAM;EAGpBC,cAAc,EAAE,IAAI;EACpBC,mBAAmB,EAAE,IAAI;EAGzBC,gBAAgB,EAAE;AACpB,CAAC;AAED,MAAMC,KAAK,GAAIC,GAAW,IAAWV,MAAM,CAACS,KAAK,CAACC,GAAG,EAAEP,cAAc,CAAC;AAEtE,OAAO,SAASQ,UAAUA,CAACD,GAAW,EAAE;EACtC,MAAME,GAAG,GAAGH,KAAK,CAACC,GAAG,CAAC;EACtB,IAAI,CAACE,GAAG,CAACC,GAAG,EAAE;IACZ,MAAMC,KAAK,CAAC,mCAAmC,CAAC;EAClD;EACA,OAAOb,WAAW,CAACW,GAAG,CAACC,GAAG,CAACE,KAAK,CAAC,CAACC,GAAG,CAAEC,GAAG,IAAK;IAC7C,MAAMC,QAAQ,GAAGjB,WAAW,CAACgB,GAAG,CAACE,MAAM,CAACC,OAAO,CAAC,CAACJ,GAAG,CAAEK,CAAC,IAAK;MAC1D,IAAI,OAAO,IAAIA,CAAC,CAACC,IAAI,EAAE;QACrB,OAAO;UAAC,GAAGD,CAAC,CAACC,IAAI;UAAEC,KAAK,EAAErB,SAAS,CAACmB,CAAC,CAACC,IAAI,CAACC,KAAK;QAAC,CAAC;MACpD;MACA,OAAO;QAAC,GAAGF,CAAC,CAACC;MAAI,CAAC;IACpB,CAAC,CAAC;IACF,MAAM;MAACE,cAAc,GAAG,EAAE;MAAEC,WAAW,GAAG;IAAE,CAAC,GAAGR,GAAG;IACnD,MAAMS,KAAK,GAAG;MACZ,GAAGT,GAAG,CAACK,IAAI;MACXE,cAAc;MACdC,WAAW;MACXN,MAAM,EAAE;QACN,GAAGF,GAAG,CAACE,MAAM,CAACG,IAAI;QAClBJ;MACF;IACF,CAAC;IACD,OAAO;MACL,GAAGQ,KAAK;MACRC,MAAMA,CAAA,EAAG;QACP,MAAM;UAACR;QAAM,CAAC,GAAGO,KAAK;QAEtB,MAAME,KAAK,GAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAC3BZ,GAAG,CAAEa,IAAI,IAAK;UACb,MAAMC,IAAI,GAAGX,MAAM,gBAAAY,MAAA,CAAgBF,IAAI,EAAY;UACnD,MAAMG,IAAI,GAAGb,MAAM,gBAAAY,MAAA,CAAgBF,IAAI,UAAgB;UACvD,OAAOC,IAAI,IAAIE,IAAI,MAAAD,MAAA,CAAMD,IAAI,OAAAC,MAAA,CAAIC,IAAI,IAAK,GAAG;QAC/C,CAAC,CAAC,CACDC,IAAI,CAAC,KAAK,CAAC;QAEd,OAAO;UACL,kBAAkB,EAAEP,KAAK,CAACF,cAAc;UACxC,iBAAiB,KAAAO,MAAA,CAAKZ,MAAM,CAACe,KAAK,SAAAH,MAAA,CAAMZ,MAAM,CAACgB,KAAK,CAAE;UACtD,aAAa,EAAEhB,MAAM,CAACiB,IAAI;UAC1B,mBAAmB,EAAER,KAAK;UAC1B,uBAAuB,KAAAG,MAAA,CAAKZ,MAAM,CAACkB,KAAK,SAAAN,MAAA,CAAMZ,MAAM,CAACmB,KAAK,CAAE;UAC5DpB,QAAQ,EAAEC,MAAM,CAACoB;QACnB,CAAC;MACH;IACF,CAAC;EACH,CAAC,CAAC;AACJ"}
+{"version":3,"file":"omexml.js","names":["XMLParser","ensureArray","intToRgba","xmlParser","attributeNamePrefix","attributesGroupName","parseTagValue","parseAttributeValue","ignoreAttributes","parse","str","fromString","res","OME","Error","Image","map","img","Channels","Pixels","Channel","c","attr","Color","AquisitionDate","Description","image","format","sizes","name","size","concat","unit","join","SizeX","SizeY","Type","SizeZ","SizeT","SizeC"],"sources":["../../../../src/lib/ome/omexml.ts"],"sourcesContent":["import {XMLParser} from 'fast-xml-parser';\nimport {ensureArray, intToRgba} from '../utils/tiff-utils';\n\n// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.\nconst xmlParser = new XMLParser({\n  // Nests attributes withtout prefix under 'attr' key for each node\n  attributeNamePrefix: '',\n  attributesGroupName: 'attr',\n\n  // Parses numbers for both attributes and nodes\n  parseTagValue: true,\n  parseAttributeValue: true,\n\n  // Forces attributes to be parsed\n  ignoreAttributes: false\n});\n\nconst parse = (str: string): Root => xmlParser.parse(str);\n\nexport function fromString(str: string) {\n  const res = parse(str);\n  if (!res.OME) {\n    throw Error('Failed to parse OME-XML metadata.');\n  }\n  return ensureArray(res.OME.Image).map((img) => {\n    const Channels = ensureArray(img.Pixels.Channel).map((c) => {\n      if ('Color' in c.attr) {\n        return {...c.attr, Color: intToRgba(c.attr.Color)};\n      }\n      return {...c.attr};\n    });\n    const {AquisitionDate = '', Description = ''} = img;\n    const image = {\n      ...img.attr,\n      AquisitionDate,\n      Description,\n      Pixels: {\n        ...img.Pixels.attr,\n        Channels\n      }\n    };\n    return {\n      ...image,\n      format() {\n        const {Pixels} = image;\n\n        const sizes = (['X', 'Y', 'Z'] as const)\n          .map((name) => {\n            const size = Pixels[`PhysicalSize${name}` as const];\n            const unit = Pixels[`PhysicalSize${name}Unit` as const];\n            return size && unit ? `${size} ${unit}` : '-';\n          })\n          .join(' x ');\n\n        return {\n          'Acquisition Date': image.AquisitionDate,\n          'Dimensions (XY)': `${Pixels.SizeX} x ${Pixels.SizeY}`,\n          'Pixels Type': Pixels.Type,\n          'Pixels Size (XYZ)': sizes,\n          'Z-sections/Timepoints': `${Pixels.SizeZ} x ${Pixels.SizeT}`,\n          Channels: Pixels.SizeC\n        };\n      }\n    };\n  });\n}\n\nexport type OMEXML = ReturnType<typeof fromString>;\nexport type DimensionOrder = 'XYZCT' | 'XYZTC' | 'XYCTZ' | 'XYCZT' | 'XYTCZ' | 'XYTZC';\n\n// Structure of node is determined by the PARSER_OPTIONS.\ntype Node<T, A> = T & {attr: A};\ntype Attrs<Fields extends string, T = string> = {[K in Fields]: T};\n\ntype OMEAttrs = Attrs<'xmlns' | 'xmlns:xsi' | 'xsi:schemaLocation'>;\ntype OME = Node<{Insturment: Insturment; Image: Image | Image[]}, OMEAttrs>;\n\ntype Insturment = Node<\n  {Objective: Node<{}, Attrs<'ID' | 'Model' | 'NominalMagnification'>>},\n  Attrs<'ID'>\n>;\n\ninterface ImageNodes {\n  AquisitionDate?: string;\n  Description?: string;\n  Pixels: Pixels;\n  InstrumentRef: Node<{}, {ID: string}>;\n  ObjectiveSettings: Node<{}, {ID: string}>;\n}\ntype Image = Node<ImageNodes, Attrs<'ID' | 'Name'>>;\n\ntype PixelType =\n  | 'int8'\n  | 'int16'\n  | 'int32'\n  | 'uint8'\n  | 'uint16'\n  | 'uint32'\n  | 'float'\n  | 'bit'\n  | 'double'\n  | 'complex'\n  | 'double-complex';\n\nexport type UnitsLength =\n  | 'Ym'\n  | 'Zm'\n  | 'Em'\n  | 'Pm'\n  | 'Tm'\n  | 'Gm'\n  | 'Mm'\n  | 'km'\n  | 'hm'\n  | 'dam'\n  | 'm'\n  | 'dm'\n  | 'cm'\n  | 'mm'\n  | 'µm'\n  | 'nm'\n  | 'pm'\n  | 'fm'\n  | 'am'\n  | 'zm'\n  | 'ym'\n  | 'Å'\n  | 'thou'\n  | 'li'\n  | 'in'\n  | 'ft'\n  | 'yd'\n  | 'mi'\n  | 'ua'\n  | 'ly'\n  | 'pc'\n  | 'pt'\n  | 'pixel'\n  | 'reference frame';\n\ntype PhysicalSize<Name extends string> = `PhysicalSize${Name}`;\ntype PhysicalSizeUnit<Name extends string> = `PhysicalSize${Name}Unit`;\ntype Size<Names extends string> = `Size${Names}`;\n\ntype PixelAttrs = Attrs<\n  PhysicalSize<'X' | 'Y' | 'Z'> | 'SignificantBits' | Size<'T' | 'C' | 'Z' | 'Y' | 'X'>,\n  number\n> &\n  Attrs<PhysicalSizeUnit<'X' | 'Y' | 'Z'>, UnitsLength> &\n  Attrs<'BigEndian' | 'Interleaved', boolean> & {\n    ID: string;\n    DimensionOrder: DimensionOrder;\n    Type: PixelType;\n  };\n\ntype Pixels = Node<\n  {\n    Channel: Channel | Channel[];\n    TiffData: Node<{}, Attrs<'IFD' | 'PlaneCount'>>;\n  },\n  PixelAttrs\n>;\n\ntype ChannelAttrs =\n  | {\n      ID: string;\n      SamplesPerPixel: number;\n      Name?: string;\n    }\n  | {\n      ID: string;\n      SamplesPerPixel: number;\n      Name?: string;\n      Color: number;\n    };\n\ntype Channel = Node<{}, ChannelAttrs>;\n\ntype Root = {OME: OME};\n"],"mappings":"AAAA,SAAQA,SAAS,QAAO,iBAAiB;AACzC,SAAQC,WAAW,EAAEC,SAAS,QAAO,qBAAqB;AAG1D,MAAMC,SAAS,GAAG,IAAIH,SAAS,CAAC;EAE9BI,mBAAmB,EAAE,EAAE;EACvBC,mBAAmB,EAAE,MAAM;EAG3BC,aAAa,EAAE,IAAI;EACnBC,mBAAmB,EAAE,IAAI;EAGzBC,gBAAgB,EAAE;AACpB,CAAC,CAAC;AAEF,MAAMC,KAAK,GAAIC,GAAW,IAAWP,SAAS,CAACM,KAAK,CAACC,GAAG,CAAC;AAEzD,OAAO,SAASC,UAAUA,CAACD,GAAW,EAAE;EACtC,MAAME,GAAG,GAAGH,KAAK,CAACC,GAAG,CAAC;EACtB,IAAI,CAACE,GAAG,CAACC,GAAG,EAAE;IACZ,MAAMC,KAAK,CAAC,mCAAmC,CAAC;EAClD;EACA,OAAOb,WAAW,CAACW,GAAG,CAACC,GAAG,CAACE,KAAK,CAAC,CAACC,GAAG,CAAEC,GAAG,IAAK;IAC7C,MAAMC,QAAQ,GAAGjB,WAAW,CAACgB,GAAG,CAACE,MAAM,CAACC,OAAO,CAAC,CAACJ,GAAG,CAAEK,CAAC,IAAK;MAC1D,IAAI,OAAO,IAAIA,CAAC,CAACC,IAAI,EAAE;QACrB,OAAO;UAAC,GAAGD,CAAC,CAACC,IAAI;UAAEC,KAAK,EAAErB,SAAS,CAACmB,CAAC,CAACC,IAAI,CAACC,KAAK;QAAC,CAAC;MACpD;MACA,OAAO;QAAC,GAAGF,CAAC,CAACC;MAAI,CAAC;IACpB,CAAC,CAAC;IACF,MAAM;MAACE,cAAc,GAAG,EAAE;MAAEC,WAAW,GAAG;IAAE,CAAC,GAAGR,GAAG;IACnD,MAAMS,KAAK,GAAG;MACZ,GAAGT,GAAG,CAACK,IAAI;MACXE,cAAc;MACdC,WAAW;MACXN,MAAM,EAAE;QACN,GAAGF,GAAG,CAACE,MAAM,CAACG,IAAI;QAClBJ;MACF;IACF,CAAC;IACD,OAAO;MACL,GAAGQ,KAAK;MACRC,MAAMA,CAAA,EAAG;QACP,MAAM;UAACR;QAAM,CAAC,GAAGO,KAAK;QAEtB,MAAME,KAAK,GAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAC3BZ,GAAG,CAAEa,IAAI,IAAK;UACb,MAAMC,IAAI,GAAGX,MAAM,gBAAAY,MAAA,CAAgBF,IAAI,EAAY;UACnD,MAAMG,IAAI,GAAGb,MAAM,gBAAAY,MAAA,CAAgBF,IAAI,UAAgB;UACvD,OAAOC,IAAI,IAAIE,IAAI,MAAAD,MAAA,CAAMD,IAAI,OAAAC,MAAA,CAAIC,IAAI,IAAK,GAAG;QAC/C,CAAC,CAAC,CACDC,IAAI,CAAC,KAAK,CAAC;QAEd,OAAO;UACL,kBAAkB,EAAEP,KAAK,CAACF,cAAc;UACxC,iBAAiB,KAAAO,MAAA,CAAKZ,MAAM,CAACe,KAAK,SAAAH,MAAA,CAAMZ,MAAM,CAACgB,KAAK,CAAE;UACtD,aAAa,EAAEhB,MAAM,CAACiB,IAAI;UAC1B,mBAAmB,EAAER,KAAK;UAC1B,uBAAuB,KAAAG,MAAA,CAAKZ,MAAM,CAACkB,KAAK,SAAAN,MAAA,CAAMZ,MAAM,CAACmB,KAAK,CAAE;UAC5DpB,QAAQ,EAAEC,MAAM,CAACoB;QACnB,CAAC;MACH;IACF,CAAC;EACH,CAAC,CAAC;AACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/geotiff",
-  "version": "4.0.0-alpha.9",
+  "version": "4.0.0-beta.1",
   "description": "Framework-independent loaders for tiff and geotiff",
   "license": "MIT",
   "publishConfig": {
@@ -36,8 +36,8 @@
     "geotiff": "ilan-gold/geotiff.js#ilan-gold/viv_094"
   },
   "dependencies": {
-    "fast-xml-parser": "^3.16.0",
+    "fast-xml-parser": "^4.2.5",
     "geotiff": "^1.0.4"
   },
-  "gitHead": "03ff81ab468f20f3bddeec787aa88d477a7e1c72"
+  "gitHead": "35c625e67132b0784e597d9ddabae8aefea29ff2"
 }

package/src/lib/ome/omexml.ts

@@ -1,21 +1,21 @@
-import parser from 'fast-xml-parser';
+import {XMLParser} from 'fast-xml-parser';
 import {ensureArray, intToRgba} from '../utils/tiff-utils';
 
 // WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.
-const PARSER_OPTIONS = {
+const xmlParser = new XMLParser({
   // Nests attributes withtout prefix under 'attr' key for each node
   attributeNamePrefix: '',
-  attrNodeName: 'attr',
+  attributesGroupName: 'attr',
 
   // Parses numbers for both attributes and nodes
-  parseNodeValue: true,
+  parseTagValue: true,
   parseAttributeValue: true,
 
   // Forces attributes to be parsed
   ignoreAttributes: false
-};
+});
 
-const parse = (str: string): Root => parser.parse(str, PARSER_OPTIONS);
+const parse = (str: string): Root => xmlParser.parse(str);
 
 export function fromString(str: string) {
   const res = parse(str);

package/dist/bundle.js

@@ -1,30 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const moduleExports = __importStar(require("./index"));
-// @ts-ignore
-globalThis.loaders = globalThis.loaders || {};
-// @ts-ignore
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/index.js

@@ -1,10 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TiffPixelSource = exports.loadGeoTiff = void 0;
-var load_geotiff_1 = require("./lib/load-geotiff");
-Object.defineProperty(exports, "loadGeoTiff", { enumerable: true, get: function () { return load_geotiff_1.loadGeoTiff; } });
-var tiff_pixel_source_1 = require("./lib/tiff-pixel-source");
-Object.defineProperty(exports, "TiffPixelSource", { enumerable: true, get: function () { return __importDefault(tiff_pixel_source_1).default; } });

package/dist/lib/load-geotiff.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadGeoTiff = void 0;
-const geotiff_1 = require("geotiff");
-const proxies_1 = require("./utils/proxies");
-// import Pool from './lib/Pool';
-const load_ome_tiff_1 = require("./ome/load-ome-tiff");
-/**
- * Opens an OME-TIFF via URL and returns data source and associated metadata for first image.
- *
- * @param source url string, File/Blob object, or GeoTIFF object
- * @param opts options for initializing a tiff pixel source.
- *  - `opts.headers` are passed to each underlying fetch request.
- *  - `opts.offsets` are a performance enhancment to index the remote tiff source using pre-computed byte-offsets.
- *  - `opts.pool` indicates whether a multi-threaded pool of image decoders should be used to decode tiles (default = true).
- * @return data source and associated OME-Zarr metadata.
- */
-async function loadGeoTiff(source, opts = {}) {
-    const { headers, offsets } = opts;
-    // Create tiff source
-    let tiff;
-    if (source instanceof geotiff_1.GeoTIFF) {
-        tiff = source;
-    }
-    else if (typeof source === 'string') {
-        tiff = await (0, geotiff_1.fromUrl)(source, headers);
-    }
-    else {
-        tiff = await (0, geotiff_1.fromBlob)(source);
-    }
-    // if (pool) {
-    /*
-     * Creates a worker pool to decode tiff tiles. Wraps tiff
-     * in a Proxy that injects 'pool' into `tiff.readRasters`.
-     */
-    // tiff = createPoolProxy(tiff, new Pool());
-    // }
-    if (offsets) {
-        /*
-         * Performance enhancement. If offsets are provided, we
-         * create a proxy that intercepts calls to `tiff.getImage`
-         * and injects the pre-computed offsets.
-         */
-        tiff = (0, proxies_1.createOffsetsProxy)(tiff, offsets);
-    }
-    /*
-     * Inspect tiff source for our performance enhancing proxies.
-     * Prints warnings to console if `offsets` or `pool` are missing.
-     */
-    (0, proxies_1.checkProxies)(tiff);
-    const firstImage = await tiff.getImage(0);
-    if ((0, load_ome_tiff_1.isOmeTiff)(firstImage)) {
-        return (0, load_ome_tiff_1.loadOmeTiff)(tiff, firstImage);
-    }
-    throw new Error('GeoTIFF not recognized.');
-}
-exports.loadGeoTiff = loadGeoTiff;

package/dist/lib/ome/load-ome-tiff.js

@@ -1,46 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadOmeTiff = exports.isOmeTiff = void 0;
-const tiff_pixel_source_1 = __importDefault(require("../tiff-pixel-source"));
-const ome_indexers_1 = require("./ome-indexers");
-const ome_utils_1 = require("./ome-utils");
-const omexml_1 = require("./omexml");
-const isOmeTiff = (img) => img.fileDirectory.ImageDescription.includes('<OME');
-exports.isOmeTiff = isOmeTiff;
-async function loadOmeTiff(tiff, firstImage) {
-    // Get first image from tiff and inspect OME-XML metadata
-    const { ImageDescription, SubIFDs, PhotometricInterpretation: photometricInterpretation } = firstImage.fileDirectory;
-    const omexml = (0, omexml_1.fromString)(ImageDescription);
-    /*
-     * Image pyramids are stored differently between versions of Bioformats.
-     * Thus we need a different indexer depending on which format we have.
-     */
-    let levels;
-    let pyramidIndexer;
-    if (SubIFDs) {
-        // Image is >= Bioformats 6.0 and resolutions are stored using SubIFDs.
-        levels = SubIFDs.length + 1;
-        pyramidIndexer = (0, ome_indexers_1.getOmeSubIFDIndexer)(tiff, omexml);
-    }
-    else {
-        // Image is legacy format; resolutions are stored as separate images.
-        levels = omexml.length;
-        pyramidIndexer = (0, ome_indexers_1.getOmeLegacyIndexer)(tiff, omexml);
-    }
-    // TODO: The OmeTIFF loader only works for the _first_ image in the metadata.
-    const imgMeta = omexml[0];
-    const { labels, getShape, physicalSizes, dtype } = (0, ome_utils_1.getOmePixelSourceMeta)(imgMeta);
-    const tileSize = firstImage.getTileWidth();
-    const meta = { photometricInterpretation, physicalSizes };
-    const data = Array.from({ length: levels }).map((_, resolution) => {
-        const shape = getShape(resolution);
-        const indexer = (sel) => pyramidIndexer(sel, resolution);
-        const source = new tiff_pixel_source_1.default(indexer, dtype, tileSize, shape, labels, meta);
-        return source;
-    });
-    return { data, metadata: imgMeta };
-}
-exports.loadOmeTiff = loadOmeTiff;

package/dist/lib/ome/ome-indexers.js

@@ -1,108 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOmeSubIFDIndexer = exports.getOmeLegacyIndexer = void 0;
-/*
- * An "indexer" for a GeoTIFF-based source is a function that takes a
- * "selection" (e.g. { z, t, c }) and returns a Promise for the GeoTIFFImage
- * object corresponding to that selection.
- *
- * For OME-TIFF images, the "selection" object is the same regardless of
- * the format version. However, modern version of Bioformats have a different
- * memory layout for pyramidal resolutions. Thus, we have two different "indexers"
- * depending on which format version is detected.
- *
- * TODO: We currently only support indexing the first image in the OME-TIFF with
- * our indexers. There can be multiple images in an OME-TIFF, so supporting these
- * images will require extending these indexers or creating new methods.
- */
-/*
- * Returns an indexer for legacy Bioformats images. This assumes that
- * downsampled resolutions are stored sequentially in the OME-TIFF.
- */
-function getOmeLegacyIndexer(tiff, rootMeta) {
-    const imgMeta = rootMeta[0];
-    const { SizeT, SizeC, SizeZ } = imgMeta.Pixels;
-    const ifdIndexer = getOmeIFDIndexer(imgMeta);
-    return (sel, pyramidLevel) => {
-        // Get IFD index at base pyramid level
-        const index = ifdIndexer(sel);
-        // Get index of first image at pyramidal level
-        const pyramidIndex = pyramidLevel * SizeZ * SizeT * SizeC;
-        // Return image at IFD index for pyramidal level
-        return tiff.getImage(index + pyramidIndex);
-    };
-}
-exports.getOmeLegacyIndexer = getOmeLegacyIndexer;
-/*
- * Returns an indexer for modern Bioforamts images that store multiscale
- * resolutions using SubIFDs.
- *
- * The ifdIndexer returns the 'index' to the base resolution for a
- * particular 'selection'. The SubIFDs to the downsampled resolutions
- * of the 'selection' are stored within the `baseImage.fileDirectory`.
- * We use the SubIFDs to get the IFD for the corresponding sub-resolution.
- *
- * NOTE: This function create a custom IFD cache rather than mutating
- * `GeoTIFF.ifdRequests` with a random offset. The IFDs are cached in
- * an ES6 Map that maps a string key that identifies the selection uniquely
- * to the corresponding IFD.
- */
-function getOmeSubIFDIndexer(tiff, rootMeta) {
-    const imgMeta = rootMeta[0];
-    const ifdIndexer = getOmeIFDIndexer(imgMeta);
-    const ifdCache = new Map();
-    return async (sel, pyramidLevel) => {
-        const index = ifdIndexer(sel);
-        const baseImage = await tiff.getImage(index);
-        // It's the highest resolution, no need to look up SubIFDs.
-        if (pyramidLevel === 0) {
-            return baseImage;
-        }
-        const { SubIFDs } = baseImage.fileDirectory;
-        if (!SubIFDs) {
-            throw Error('Indexing Error: OME-TIFF is missing SubIFDs.');
-        }
-        // Get IFD for the selection at the pyramidal level
-        const key = `${sel.t}-${sel.c}-${sel.z}-${pyramidLevel}`;
-        if (!ifdCache.has(key)) {
-            // Only create a new request if we don't have the key.
-            const subIfdOffset = SubIFDs[pyramidLevel - 1];
-            ifdCache.set(key, tiff.parseFileDirectoryAt(subIfdOffset));
-        }
-        const ifd = (await ifdCache.get(key));
-        // Create a new image object manually from IFD
-        // https://github.com/geotiffjs/geotiff.js/blob/8ef472f41b51d18074aece2300b6a8ad91a21ae1/src/geotiff.js#L447-L453
-        return new baseImage.constructor(ifd.fileDirectory, ifd.geoKeyDirectory, tiff.dataView, tiff.littleEndian, tiff.cache, tiff.source);
-    };
-}
-exports.getOmeSubIFDIndexer = getOmeSubIFDIndexer;
-/*
- * Returns a function that computes the image index based on the dimension
- * order and dimension sizes.
- */
-function getOmeIFDIndexer(imgMeta) {
-    const { SizeC, SizeZ, SizeT, DimensionOrder } = imgMeta.Pixels;
-    switch (DimensionOrder) {
-        case 'XYZCT': {
-            return ({ t, c, z }) => t * SizeZ * SizeC + c * SizeZ + z;
-        }
-        case 'XYZTC': {
-            return ({ t, c, z }) => c * SizeZ * SizeT + t * SizeZ + z;
-        }
-        case 'XYCTZ': {
-            return ({ t, c, z }) => z * SizeC * SizeT + t * SizeC + c;
-        }
-        case 'XYCZT': {
-            return ({ t, c, z }) => t * SizeC * SizeZ + z * SizeC + c;
-        }
-        case 'XYTCZ': {
-            return ({ t, c, z }) => z * SizeT * SizeC + c * SizeT + t;
-        }
-        case 'XYTZC': {
-            return ({ t, c, z }) => c * SizeT * SizeZ + z * SizeT + t;
-        }
-        default: {
-            throw new Error(`Invalid OME-XML DimensionOrder, got ${DimensionOrder}.`);
-        }
-    }
-}

package/dist/lib/ome/ome-utils.js

@@ -1,63 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOmePixelSourceMeta = exports.DTYPE_LOOKUP = void 0;
-const utils_1 = require("./utils");
-exports.DTYPE_LOOKUP = {
-    uint8: 'Uint8',
-    uint16: 'Uint16',
-    uint32: 'Uint32',
-    float: 'Float32',
-    double: 'Float64',
-    int8: 'Int8',
-    int16: 'Int16',
-    int32: 'Int32'
-};
-function getOmePixelSourceMeta({ Pixels }) {
-    // e.g. 'XYZCT' -> ['t', 'c', 'z', 'y', 'x']
-    const labels = (0, utils_1.getLabels)(Pixels.DimensionOrder);
-    // Compute "shape" of image
-    const dims = (0, utils_1.getDims)(labels);
-    const shape = Array(labels.length).fill(0);
-    shape[dims('t')] = Pixels.SizeT;
-    shape[dims('c')] = Pixels.SizeC;
-    shape[dims('z')] = Pixels.SizeZ;
-    // Push extra dimension if data are interleaved.
-    if (Pixels.Interleaved) {
-        // @ts-ignore
-        labels.push('_c');
-        shape.push(3);
-    }
-    // Creates a new shape for different level of pyramid.
-    // Assumes factor-of-two downsampling.
-    const getShape = (level) => {
-        const s = [...shape];
-        s[dims('x')] = Pixels.SizeX >> level;
-        s[dims('y')] = Pixels.SizeY >> level;
-        return s;
-    };
-    if (!(Pixels.Type in exports.DTYPE_LOOKUP)) {
-        throw Error(`Pixel type ${Pixels.Type} not supported.`);
-    }
-    const dtype = exports.DTYPE_LOOKUP[Pixels.Type];
-    if (Pixels.PhysicalSizeX && Pixels.PhysicalSizeY) {
-        const physicalSizes = {
-            x: {
-                size: Pixels.PhysicalSizeX,
-                unit: Pixels.PhysicalSizeXUnit
-            },
-            y: {
-                size: Pixels.PhysicalSizeY,
-                unit: Pixels.PhysicalSizeYUnit
-            }
-        };
-        if (Pixels.PhysicalSizeZ) {
-            physicalSizes.z = {
-                size: Pixels.PhysicalSizeZ,
-                unit: Pixels.PhysicalSizeZUnit
-            };
-        }
-        return { labels, getShape, physicalSizes, dtype };
-    }
-    return { labels, getShape, dtype };
-}
-exports.getOmePixelSourceMeta = getOmePixelSourceMeta;

package/dist/lib/ome/omexml.js

@@ -1,66 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromString = void 0;
-const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
-const tiff_utils_1 = require("../utils/tiff-utils");
-// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.
-const PARSER_OPTIONS = {
-    // Nests attributes withtout prefix under 'attr' key for each node
-    attributeNamePrefix: '',
-    attrNodeName: 'attr',
-    // Parses numbers for both attributes and nodes
-    parseNodeValue: true,
-    parseAttributeValue: true,
-    // Forces attributes to be parsed
-    ignoreAttributes: false
-};
-const parse = (str) => fast_xml_parser_1.default.parse(str, PARSER_OPTIONS);
-function fromString(str) {
-    const res = parse(str);
-    if (!res.OME) {
-        throw Error('Failed to parse OME-XML metadata.');
-    }
-    return (0, tiff_utils_1.ensureArray)(res.OME.Image).map((img) => {
-        const Channels = (0, tiff_utils_1.ensureArray)(img.Pixels.Channel).map((c) => {
-            if ('Color' in c.attr) {
-                return { ...c.attr, Color: (0, tiff_utils_1.intToRgba)(c.attr.Color) };
-            }
-            return { ...c.attr };
-        });
-        const { AquisitionDate = '', Description = '' } = img;
-        const image = {
-            ...img.attr,
-            AquisitionDate,
-            Description,
-            Pixels: {
-                ...img.Pixels.attr,
-                Channels
-            }
-        };
-        return {
-            ...image,
-            format() {
-                const { Pixels } = image;
-                const sizes = ['X', 'Y', 'Z']
-                    .map((name) => {
-                    const size = Pixels[`PhysicalSize${name}`];
-                    const unit = Pixels[`PhysicalSize${name}Unit`];
-                    return size && unit ? `${size} ${unit}` : '-';
-                })
-                    .join(' x ');
-                return {
-                    'Acquisition Date': image.AquisitionDate,
-                    'Dimensions (XY)': `${Pixels.SizeX} x ${Pixels.SizeY}`,
-                    'Pixels Type': Pixels.Type,
-                    'Pixels Size (XYZ)': sizes,
-                    'Z-sections/Timepoints': `${Pixels.SizeZ} x ${Pixels.SizeT}`,
-                    Channels: Pixels.SizeC
-                };
-            }
-        };
-    });
-}
-exports.fromString = fromString;

package/dist/lib/ome/utils.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDims = exports.getLabels = void 0;
-function getLabels(dimOrder) {
-    return dimOrder.toLowerCase().split('').reverse();
-}
-exports.getLabels = getLabels;
-/*
- * Creates an ES6 map of 'label' -> index
- * > const labels = ['a', 'b', 'c', 'd'];
- * > const dims = getDims(labels);
- * > dims('a') === 0;
- * > dims('b') === 1;
- * > dims('c') === 2;
- * > dims('hi!'); // throws
- */
-function getDims(labels) {
-    const lookup = new Map(labels.map((name, i) => [name, i]));
-    if (lookup.size !== labels.length) {
-        throw Error('Labels must be unique, found duplicated label.');
-    }
-    return (name) => {
-        const index = lookup.get(name);
-        if (index === undefined) {
-            throw Error('Invalid dimension.');
-        }
-        return index;
-    };
-}
-exports.getDims = getDims;

package/dist/lib/tiff-pixel-source.js

@@ -1,64 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tiff_utils_1 = require("./utils/tiff-utils");
-class TiffPixelSource {
-    // eslint-disable-next-line max-params
-    constructor(indexer, dtype, tileSize, shape, labels, meta) {
-        this._indexer = indexer;
-        this.dtype = dtype;
-        this.tileSize = tileSize;
-        this.shape = shape;
-        this.labels = labels;
-        this.meta = meta;
-    }
-    async getRaster({ selection, signal }) {
-        const image = await this._indexer(selection);
-        return this._readRasters(image, { signal });
-    }
-    async getTile({ x, y, selection, signal }) {
-        const { height, width } = this._getTileExtent(x, y);
-        const x0 = x * this.tileSize;
-        const y0 = y * this.tileSize;
-        const window = [x0, y0, x0 + width, y0 + height];
-        const image = await this._indexer(selection);
-        return this._readRasters(image, { window, width, height, signal });
-    }
-    async _readRasters(image, props) {
-        const interleave = (0, tiff_utils_1.isInterleaved)(this.shape);
-        const raster = await image.readRasters({ interleave, ...props });
-        if (props?.signal?.aborted) {
-            throw tiff_utils_1.SIGNAL_ABORTED;
-        }
-        /*
-         * geotiff.js returns objects with different structure
-         * depending on `interleave`. It's weird, but this seems to work.
-         */
-        const data = (interleave ? raster : raster[0]);
-        return {
-            data,
-            width: raster.width,
-            height: raster.height
-        };
-    }
-    /*
-     * Computes tile size given x, y coord.
-     */
-    _getTileExtent(x, y) {
-        const { height: zoomLevelHeight, width: zoomLevelWidth } = (0, tiff_utils_1.getImageSize)(this);
-        let height = this.tileSize;
-        let width = this.tileSize;
-        const maxXTileCoord = Math.floor(zoomLevelWidth / this.tileSize);
-        const maxYTileCoord = Math.floor(zoomLevelHeight / this.tileSize);
-        if (x === maxXTileCoord) {
-            width = zoomLevelWidth % this.tileSize;
-        }
-        if (y === maxYTileCoord) {
-            height = zoomLevelHeight % this.tileSize;
-        }
-        return { height, width };
-    }
-    onTileError(err) {
-        console.error(err); // eslint-disable-line no-console
-    }
-}
-exports.default = TiffPixelSource;

package/dist/lib/utils/Pool.js

@@ -1,83 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// import Worker from 'web-worker:./decoder.worker.ts';
-// https://developer.mozilla.org/en-US/docs/Web/API/NavigatorConcurrentHardware/hardwareConcurrency
-// We need to give a different way of getting this for safari, so 4 is probably a safe bet
-// for parallel processing in the meantime.  More can't really hurt since they'll just block
-// each other and not the UI thread, which is the real benefit.
-const defaultPoolSize = globalThis?.navigator?.hardwareConcurrency ?? 4;
-/**
- * Pool for workers to decode chunks of the images.
- * This is a line-for-line copy of GeoTIFFs old implementation: https://github.com/geotiffjs/geotiff.js/blob/v1.0.0-beta.6/src/pool.js
- */
-class Pool {
-    /**
-     * @constructor
-     * @param {Number} size The size of the pool. Defaults to the number of CPUs
-     *                      available. When this parameter is `null` or 0, then the
-     *                      decoding will be done in the main thread.
-     */
-    constructor(size = defaultPoolSize) {
-        this.workers = [];
-        this.idleWorkers = [];
-        this.waitQueue = [];
-        this.decoder = null;
-        // eslint-disable-next-line no-plusplus
-        for (let i = 0; i < size; ++i) {
-            const w = new Worker('./decoder.worker');
-            this.workers.push(w);
-            this.idleWorkers.push(w);
-        }
-    }
-    /**
-     * Decode the given block of bytes with the set compression method.
-     * @param {ArrayBuffer} buffer the array buffer of bytes to decode.
-     * @returns {Promise.<ArrayBuffer>} the decoded result as a `Promise`
-     */
-    async decode(fileDirectory, buffer) {
-        const currentWorker = await this.waitForWorker();
-        return new Promise((resolve, reject) => {
-            currentWorker.onmessage = (event) => {
-                // this.workers.push(currentWorker);
-                // eslint-disable-next-line
-                this.finishTask(currentWorker);
-                resolve(event.data[0]);
-            };
-            currentWorker.onerror = (error) => {
-                // this.workers.push(currentWorker);
-                // eslint-disable-next-line
-                this.finishTask(currentWorker);
-                reject(error);
-            };
-            currentWorker.postMessage(['decode', fileDirectory, buffer], [buffer]);
-        });
-    }
-    async waitForWorker() {
-        const idleWorker = this.idleWorkers.pop();
-        if (idleWorker) {
-            return idleWorker;
-        }
-        const waiter = {};
-        const promise = new Promise((resolve) => {
-            waiter.resolve = resolve;
-        });
-        this.waitQueue.push(waiter);
-        return promise;
-    }
-    async finishTask(currentWorker) {
-        const waiter = this.waitQueue.pop();
-        if (waiter) {
-            waiter.resolve(currentWorker);
-        }
-        else {
-            this.idleWorkers.push(currentWorker);
-        }
-    }
-    destroy() {
-        // eslint-disable-next-line no-plusplus
-        for (let i = 0; i < this.workers.length; ++i) {
-            this.workers[i].terminate();
-        }
-    }
-}
-exports.default = Pool;

package/dist/lib/utils/proxies.js

@@ -1,86 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPoolProxy = exports.createOffsetsProxy = exports.checkProxies = void 0;
-const VIV_PROXY_KEY = '__viv';
-const OFFSETS_PROXY_KEY = `${VIV_PROXY_KEY}-offsets`;
-const POOL_PROXY_KEY = `${VIV_PROXY_KEY}-decoder-pool`;
-/*
- * Inspect if the GeoTIFF source is wrapped in our proxies,
- * and warn if missing.
- */
-function checkProxies(tiff) {
-    if (!isProxy(tiff, OFFSETS_PROXY_KEY)) {
-        console.warn('GeoTIFF source is missing offsets proxy.'); // eslint-disable-line no-console
-    }
-    if (!isProxy(tiff, POOL_PROXY_KEY)) {
-        console.warn('GeoTIFF source is missing decoder-pool proxy.'); // eslint-disable-line no-console
-    }
-}
-exports.checkProxies = checkProxies;
-/*
- * > isProxy(tiff, POOL_PROXY_KEY) === true; // false
- * > tiff = createPoolProxy(tiff, new Pool());
- * > isProxy(tiff, POOL_PROXY_KEY) === true; // true
- */
-function isProxy(tiff, proxyFlag) {
-    return tiff[proxyFlag];
-}
-/*
- * Creates an ES6 Proxy that wraps a GeoTIFF object. The proxy
- * handler intercepts calls to `tiff.getImage` and uses our custom
- * pre-computed offsets to pre-fetch the correct file directory.
- *
- * This is a bit of a hack. Internally GeoTIFF inspects `this.ifdRequests`
- * to see which fileDirectories need to be traversed. By adding the
- * ifdRequest for an 'index' manually, GeoTIFF will await that request
- * rather than traversing the file system remotely.
- */
-function createOffsetsProxy(tiff, offsets) {
-    const get = (target, key) => {
-        // Intercept `tiff.getImage`
-        if (key === 'getImage') {
-            return (index) => {
-                // Manually add ifdRequest to tiff if missing and we have an offset.
-                if (!(index in target.ifdRequests) && index in offsets) {
-                    const offset = offsets[index];
-                    target.ifdRequests[index] = target.parseFileDirectoryAt(offset);
-                }
-                return target.getImage(index);
-            };
-        }
-        // tiff['__viv-offsets'] === true
-        if (key === OFFSETS_PROXY_KEY) {
-            return true;
-        }
-        return Reflect.get(target, key);
-    };
-    return new Proxy(tiff, { get });
-}
-exports.createOffsetsProxy = createOffsetsProxy;
-/*
- * Creates an ES6 Proxy that wraps a GeoTIFF object. The proxy
- * handler intercepts calls to `tiff.readRasters` and injects
- * a pool argument to every call. This means our TiffPixelSource
- * doesn't need to be aware of whether a decoder pool is in use.
- *
- * > tiff.readRasters({ window }) -> tiff.readRasters({ window, pool });
- */
-function createPoolProxy(tiff, pool) {
-    const get = (target, key) => {
-        // Intercept calls to `image.readRasters`
-        if (key === 'readRasters') {
-            return (options) => {
-                // Inject `pool` argument with other raster options.
-                // @ts-ignore
-                return target.readRasters({ ...options, pool });
-            };
-        }
-        // tiff['__viv-decoder-pool'] === true
-        if (key === POOL_PROXY_KEY) {
-            return true;
-        }
-        return Reflect.get(target, key);
-    };
-    return new Proxy(tiff, { get });
-}
-exports.createPoolProxy = createPoolProxy;

package/dist/lib/utils/tiff-utils.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SIGNAL_ABORTED = exports.getImageSize = exports.isInterleaved = exports.intToRgba = exports.ensureArray = void 0;
-function ensureArray(x) {
-    return Array.isArray(x) ? x : [x];
-}
-exports.ensureArray = ensureArray;
-/*
- * Converts 32-bit integer color representation to RGBA tuple.
- * Used to serialize colors from OME-XML metadata.
- *
- * > console.log(intToRgba(100100));
- * > // [0, 1, 135, 4]
- */
-function intToRgba(int) {
-    if (!Number.isInteger(int)) {
-        throw Error('Not an integer.');
-    }
-    // Write number to int32 representation (4 bytes).
-    const buffer = new ArrayBuffer(4);
-    const view = new DataView(buffer);
-    view.setInt32(0, int, false); // offset === 0, littleEndian === false
-    // Take u8 view and extract number for each byte (1 byte for R/G/B/A).
-    const bytes = new Uint8Array(buffer);
-    return Array.from(bytes);
-}
-exports.intToRgba = intToRgba;
-/*
- * Helper method to determine whether pixel data is interleaved or not.
- * > isInterleaved([1, 24, 24]) === false;
- * > isInterleaved([1, 24, 24, 3]) === true;
- */
-function isInterleaved(shape) {
-    const lastDimSize = shape[shape.length - 1];
-    return lastDimSize === 3 || lastDimSize === 4;
-}
-exports.isInterleaved = isInterleaved;
-function getImageSize(source) {
-    const interleaved = isInterleaved(source.shape);
-    const [height, width] = source.shape.slice(interleaved ? -3 : -2);
-    return { height, width };
-}
-exports.getImageSize = getImageSize;
-exports.SIGNAL_ABORTED = '__vivSignalAborted';

package/dist/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/typings/geotiff.js

@@ -1 +0,0 @@
-"use strict";