geotiff 3.0.4-beta.2 → 3.0.4

package/dist-node/worker/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../dist-module/worker/create.js"],"names":[],"mappings":";;;;;AAEA,yBAKC;AAPD,4DAAgC;AAEhC,SAAwB,MAAM;IAC5B,MAAM,MAAM,GAAG,k7/OAAk7/O,CAAC;IACl8/O,OAAO,IAAI,oBAAM,CAAC,OAAO,MAAM,KAAK,WAAW;QAC7C,CAAC,CAAC,qCAAqC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC1F,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC,CAAC;AACnF,CAAC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../dist-module/worker/create.js"],"names":[],"mappings":";;;;;AAEA,yBAKC;AAPD,4DAAgC;AAEhC,SAAwB,MAAM;IAC5B,MAAM,MAAM,GAAG,4hgPAA4hgP,CAAC;IAC5igP,OAAO,IAAI,oBAAM,CAAC,OAAO,MAAM,KAAK,WAAW;QAC7C,CAAC,CAAC,qCAAqC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC1F,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC,CAAC;AACnF,CAAC"}

package/dist-node/worker/decoder.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* global globalThis */
 /* eslint-disable import/no-mutable-exports */
 const index_js_1 = require("../compression/index.js");
-const worker = globalThis;
+const worker = /** @type {Worker} */ ( /** @type {unknown} */(globalThis));
 worker.addEventListener('message', async (e) => {
     const { compression, decoderParameters, buffer, ...extra } = e.data;
     try {
         const decoder = await (0, index_js_1.getDecoder)(compression, decoderParameters);
         const decoded = await decoder.decode(buffer);
-        worker.postMessage({ decoded, ...extra }, { transfer: [decoded] });
+        worker.postMessage({ decoded, ...extra }, [decoded]);
     }
     catch (error) {
         if (error instanceof Error) {

package/dist-node/worker/decoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"decoder.js","sourceRoot":"","sources":["../../dist-module/worker/decoder.js"],"names":[],"mappings":";;AAAA,uBAAuB;AACvB,8CAA8C;AAC9C,sDAAqD;AACrD,MAAM,MAAM,GAAG,UAAU,CAAC;AAC1B,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC3C,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC;IACpE,IAAI,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,KAAK,EAAE,CAAC;QACX,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QAC3D,CAAC;aACI,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;AACL,CAAC,CAAC,CAAC;AACH,mCAAmC"}
+{"version":3,"file":"decoder.js","sourceRoot":"","sources":["../../dist-module/worker/decoder.js"],"names":[],"mappings":";;AAAA,uBAAuB;AACvB,8CAA8C;AAC9C,sDAAqD;AACrD,MAAM,MAAM,GAAG,qBAAqB,CAAC,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC,CAAC;AAC3E,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC3C,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC;IACpE,IAAI,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,KAAK,EAAE,CAAC;QACX,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QAC3D,CAAC;aACI,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;AACL,CAAC,CAAC,CAAC;AACH,mCAAmC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geotiff",
-  "version": "3.0.4-beta.2",
+  "version": "3.0.4",
   "description": "GeoTIFF image decoding in JavaScript",
   "repository": {
     "type": "git",

package/src/geotiffimage.js

@@ -253,7 +253,7 @@ class GeoTIFFImage {
    * @returns {Number} the number of samples per pixel
    */
   getSamplesPerPixel() {
-    return this.fileDirectory.getValue('SamplesPerPixel') || 1;
+    return this.fileDirectory.hasTag('SamplesPerPixel') ? this.fileDirectory.getValue('SamplesPerPixel') : 1;
   }
 
   /**
@@ -272,7 +272,7 @@ class GeoTIFFImage {
     if (this.isTiled) {
       return this.fileDirectory.getValue('TileLength') || 0;
     }
-    const rowsPerStrip = this.fileDirectory.getValue('RowsPerStrip');
+    const rowsPerStrip = this.fileDirectory.hasTag('RowsPerStrip') && this.fileDirectory.getValue('RowsPerStrip');
     if (rowsPerStrip) {
       return Math.min(rowsPerStrip, this.getHeight());
     }
@@ -936,7 +936,7 @@ class GeoTIFFImage {
    * @returns {number|null}
    */
   getGDALNoData() {
-    const string = this.fileDirectory.getValue('GDAL_NODATA');
+    const string = this.fileDirectory.hasTag('GDAL_NODATA') && this.fileDirectory.getValue('GDAL_NODATA');
     if (!string) {
       return null;
     }

package/src/globals.js

@@ -71,13 +71,13 @@ export function getFieldTypeSize(fieldType) {
  */
 
 export const tagDictionary = /** @type {const} */ ({
-  NewSubfileType: { tag: 254, type: fieldTypes.LONG },
-  SubfileType: { tag: 255, type: fieldTypes.SHORT },
-  ImageWidth: { tag: 256, type: fieldTypes.SHORT },
-  ImageLength: { tag: 257, type: fieldTypes.SHORT },
+  NewSubfileType: { tag: 254, type: fieldTypes.LONG, eager: true },
+  SubfileType: { tag: 255, type: fieldTypes.SHORT, eager: true },
+  ImageWidth: { tag: 256, type: fieldTypes.SHORT, eager: true },
+  ImageLength: { tag: 257, type: fieldTypes.SHORT, eager: true },
   BitsPerSample: { tag: 258, type: fieldTypes.SHORT, isArray: true, eager: true },
-  Compression: { tag: 259, type: fieldTypes.SHORT },
-  PhotometricInterpretation: { tag: 262, type: fieldTypes.SHORT },
+  Compression: { tag: 259, type: fieldTypes.SHORT, eager: true },
+  PhotometricInterpretation: { tag: 262, type: fieldTypes.SHORT, eager: true },
   Threshholding: { tag: 263, type: fieldTypes.SHORT },
   CellWidth: { tag: 264, type: fieldTypes.SHORT },
   CellLength: { tag: 265, type: fieldTypes.SHORT },
@@ -88,14 +88,14 @@ export const tagDictionary = /** @type {const} */ ({
   Model: { tag: 272, type: fieldTypes.ASCII },
   StripOffsets: { tag: 273, type: fieldTypes.SHORT, isArray: true },
   Orientation: { tag: 274, type: fieldTypes.SHORT },
-  SamplesPerPixel: { tag: 277, type: fieldTypes.SHORT },
-  RowsPerStrip: { tag: 278, type: fieldTypes.SHORT },
+  SamplesPerPixel: { tag: 277, type: fieldTypes.SHORT, eager: true },
+  RowsPerStrip: { tag: 278, type: fieldTypes.SHORT, eager: true },
   StripByteCounts: { tag: 279, type: fieldTypes.LONG, isArray: true },
   MinSampleValue: { tag: 280, type: fieldTypes.SHORT, isArray: true },
   MaxSampleValue: { tag: 281, type: fieldTypes.SHORT, isArray: true },
   XResolution: { tag: 282, type: fieldTypes.RATIONAL },
   YResolution: { tag: 283, type: fieldTypes.RATIONAL },
-  PlanarConfiguration: { tag: 284, type: fieldTypes.SHORT },
+  PlanarConfiguration: { tag: 284, type: fieldTypes.SHORT, eager: true },
   PageName: { tag: 285, type: fieldTypes.ASCII },
   XPosition: { tag: 286, type: fieldTypes.RATIONAL },
   YPosition: { tag: 287, type: fieldTypes.RATIONAL },
@@ -117,8 +117,8 @@ export const tagDictionary = /** @type {const} */ ({
   PrimaryChromaticities: { tag: 319, type: fieldTypes.RATIONAL, isArray: true },
   ColorMap: { tag: 320, type: fieldTypes.SHORT, isArray: true },
   HalftoneHints: { tag: 321, type: fieldTypes.SHORT, isArray: true },
-  TileWidth: { tag: 322, type: fieldTypes.SHORT },
-  TileLength: { tag: 323, type: fieldTypes.SHORT },
+  TileWidth: { tag: 322, type: fieldTypes.SHORT, eager: true },
+  TileLength: { tag: 323, type: fieldTypes.SHORT, eager: true },
   TileOffsets: { tag: 324, type: fieldTypes.LONG, isArray: true },
   TileByteCounts: { tag: 325, type: fieldTypes.SHORT, isArray: true },
   InkSet: { tag: 332, type: fieldTypes.SHORT },
@@ -126,7 +126,7 @@ export const tagDictionary = /** @type {const} */ ({
   NumberOfInks: { tag: 334, type: fieldTypes.SHORT },
   DotRange: { tag: 336, type: fieldTypes.BYTE, isArray: true },
   TargetPrinter: { tag: 337, type: fieldTypes.ASCII },
-  ExtraSamples: { tag: 338, type: fieldTypes.BYTE, isArray: true },
+  ExtraSamples: { tag: 338, type: fieldTypes.BYTE, isArray: true, eager: true },
   SampleFormat: { tag: 339, type: fieldTypes.SHORT, isArray: true, eager: true },
   SMinSampleValue: { tag: 340, isArray: true },
   SMaxSampleValue: { tag: 341, isArray: true },
@@ -178,7 +178,7 @@ export const tagDictionary = /** @type {const} */ ({
   ICCProfile: { tag: 34675, name: 'ICC Profile' },
   XMP: { tag: 700 },
   GDAL_METADATA: { tag: 42112 },
-  GDAL_NODATA: { tag: 42113, type: fieldTypes.ASCII },
+  GDAL_NODATA: { tag: 42113, type: fieldTypes.ASCII, eager: true },
   Photoshop: { tag: 34377 },
   ModelPixelScale: { tag: 33550, type: fieldTypes.DOUBLE, isArray: true, eager: true },
   ModelTiepoint: { tag: 33922, type: fieldTypes.DOUBLE, isArray: true, eager: true },
@@ -191,6 +191,15 @@ export const tagDictionary = /** @type {const} */ ({
 
 /** @typedef {keyof typeof tagDictionary} TagName */
 /** @typedef {typeof tagDictionary[keyof typeof tagDictionary]['tag']} Tag */
+/**
+ * @typedef {Extract<keyof typeof tagDictionary,
+ *   { [K in keyof typeof tagDictionary]: (typeof tagDictionary)[K] extends { eager: true }
+ *   ? K : never }[keyof typeof tagDictionary]>} EagerTagName
+ */
+/**
+ * @typedef {Extract<Tag, { [K in keyof typeof tagDictionary]: (typeof tagDictionary)[K] extends { eager: true }
+ *   ? (typeof tagDictionary)[K]['tag'] : never }[keyof typeof tagDictionary]>} EagerTag
+ */
 /** @typedef {Extract<typeof tagDictionary[keyof typeof tagDictionary], {type: any}>['type']} TagType */
 
 /**

package/src/imagefiledirectory.js

@@ -306,9 +306,9 @@ export class ImageFileDirectory {
 
   /**
    * Synchronously retrieves the value for a given tag. If it is deferred, an error is thrown.
-   * @template {import('./globals.js').TagName} [T=any]
-   * @param {T|number} tagIdentifier The field tag ID or name
-   * @returns {T extends import('./globals.js').TagName ? (import('./globals.js').TagValue<T> | undefined) : unknown}
+   * @template {import('./globals.js').EagerTagName | import('./globals.js').EagerTag} [T=any]
+   * @param {T} tagIdentifier The field tag ID or name
+   * @returns {T extends import('./globals.js').TagName ? (import('./globals.js').TagValue<T> | undefined) : any}
    * the field value,
    * or undefined if it does not exist
    * @throws {Error} If the tag is deferred and requires asynchronous loading
@@ -414,7 +414,7 @@ export class ImageFileDirectory {
     const geoKeyDirectory = {};
     for (let i = 4; i <= rawGeoKeyDirectory[3] * 4; i += 4) {
       const key = (/** @type {Record<number, import('./globals.js').GeoKeyName>} */ (geoKeyNames))[rawGeoKeyDirectory[i]];
-      const location = rawGeoKeyDirectory[i + 1] || null;
+      const location = /** @type {import('./globals.js').EagerTag} */ (rawGeoKeyDirectory[i + 1]) || null;
       const count = rawGeoKeyDirectory[i + 2];
       const offset = rawGeoKeyDirectory[i + 3];
 

package/src/pool.js

@@ -15,6 +15,7 @@ class WorkerWrapper {
    * @param {Worker} worker the worker to wrap
    */
   constructor(worker) {
+    /** @type {Worker} */
     this.worker = worker;
     this.worker.addEventListener('message', (e) => this._onWorkerMessage(e));
     this.jobIdCounter = 0;
@@ -57,7 +58,7 @@ class WorkerWrapper {
    * @returns {Promise<{decoded: ArrayBuffer}>} a promise that gets resolved/rejected when a message with the same jobId is
    * received from the worker.
    */
-  submitJob(message, transferables = undefined) {
+  submitJob(message, transferables) {
     const jobId = this.newJobId();
     let resolve;
     let reject;
@@ -68,7 +69,11 @@ class WorkerWrapper {
     });
 
     this.jobs.set(jobId, { resolve, reject });
-    this.worker.postMessage({ ...message, jobId }, { transfer: transferables });
+    if (transferables) {
+      this.worker.postMessage({ ...message, jobId }, transferables);
+    } else {
+      this.worker.postMessage({ ...message, jobId });
+    }
     return promise;
   }
 

package/src/worker/decoder.js

@@ -2,14 +2,14 @@
 /* eslint-disable import/no-mutable-exports */
 import { getDecoder } from '../compression/index.js';
 
-const worker = globalThis;
+const worker = /** @type {Worker} */ (/** @type {unknown} */ (globalThis));
 
 worker.addEventListener('message', async (e) => {
   const { compression, decoderParameters, buffer, ...extra } = e.data;
   try {
     const decoder = await getDecoder(compression, decoderParameters);
     const decoded = await decoder.decode(buffer);
-    worker.postMessage({ decoded, ...extra }, { transfer: [decoded] });
+    worker.postMessage({ decoded, ...extra }, [decoded]);
   } catch (error) {
     if (error instanceof Error) {
       worker.postMessage({ error: error.message, ...extra });