fix typings

Author: matthewdowns

src/lib/Shapefile/Shapefile.test.ts

@@ -4,7 +4,7 @@ import { DbaseVersion, ShapePolygon } from '../../types'
 import Shapefile from './Shapefile'
 
 const testsDir = resolve(__dirname, '../../../tests')
-const USA_adm = readFileSync(join(testsDir, 'USA_adm.zip'))
+const USA_adm = new Uint8Array(readFileSync(join(testsDir, 'USA_adm.zip')))
 
 describe('Shapefile', () => {
   describe('USA_adm', () => {

src/lib/Shapefile/Shapefile.ts

@@ -1,13 +1,13 @@
 import JSZip from 'jszip'
-import {
+import type {
   Dbase,
   DbaseVersion,
   Shape,
   ShapeIndex
 } from '../../types'
 import * as parsers from './parsers'
-import { DbfOptions } from './parsers/dbf'
-import { ShapefileContents } from './Shapefile.types'
+import type { DbfOptions } from './parsers/dbf'
+import type { ShapefileContents } from './Shapefile.types'
 
 type JSZipLoadAsyncParamters = Parameters<typeof JSZip.loadAsync>
 

src/lib/Shapefile/index.ts

@@ -1,2 +1,2 @@
 export { default } from './Shapefile'
-export * from './Shapefile.types'
+export type * from './Shapefile.types'

src/lib/Shapefile/parsers/dbf.ts

@@ -9,7 +9,7 @@ export interface DbfOptions {
   properties: boolean
 }
 
-function dbf(arrayBuffer: ArrayBuffer, options: DbfOptions): Dbase<DbaseVersion, typeof options.properties> {
+function dbf(arrayBuffer: ArrayBufferLike, options: DbfOptions): Dbase<DbaseVersion, typeof options.properties> {
   const array = new Uint8Array(arrayBuffer)
   const dv = new DataView(arrayBuffer)
 
@@ -111,7 +111,7 @@ function getFields(array: Uint8Array, header: DbaseHeader<DbaseVersion>, options
   return fields
 }
 
-function getField(arrayBuffer: ArrayBuffer, version: DbaseVersion, properties: boolean): DbaseField<typeof version, typeof properties> {
+function getField(arrayBuffer: Uint8Array, version: DbaseVersion, properties: boolean): DbaseField<typeof version, typeof properties> {
   const array = new Uint8Array(arrayBuffer)
 
   switch (version) {

src/lib/Shapefile/parsers/shp.ts

@@ -13,14 +13,14 @@ import {
   ShapeType
 } from '../../../types'
 
-function shp(arrayBuffer: ArrayBuffer): Shape {
+function shp(arrayBuffer: ArrayBufferLike): Shape {
   return {
     header: getHeader(arrayBuffer.slice(0, 100)),
     records: getRecords(arrayBuffer.slice(100, arrayBuffer.byteLength))
   }
 }
 
-function getHeader(arrayBuffer: ArrayBuffer): ShapeHeader {
+function getHeader(arrayBuffer: ArrayBufferLike): ShapeHeader {
   const dv = new DataView(arrayBuffer)
   return {
     file: {
@@ -44,7 +44,7 @@ function getHeader(arrayBuffer: ArrayBuffer): ShapeHeader {
   }
 }
 
-function getRecords(arrayBuffer: ArrayBuffer): Array<ShapeRecord<ShapeType>> {
+function getRecords(arrayBuffer: ArrayBufferLike): Array<ShapeRecord<ShapeType>> {
   const dv = new DataView(arrayBuffer)
 
   let bp = 0
@@ -159,7 +159,7 @@ function getRecords(arrayBuffer: ArrayBuffer): Array<ShapeRecord<ShapeType>> {
   return records
 }
 
-function getBoundingBox(arrayBuffer: ArrayBuffer): ShapeBoundingBox {
+function getBoundingBox(arrayBuffer: ArrayBufferLike): ShapeBoundingBox {
   const dv = new DataView(arrayBuffer)
   return {
     minX: dv.getFloat64(0, true),
@@ -169,11 +169,11 @@ function getBoundingBox(arrayBuffer: ArrayBuffer): ShapeBoundingBox {
   }
 }
 
-function getPoint(arrayBuffer: ArrayBuffer): ShapePoint
-function getPoint(arrayBuffer: ArrayBuffer, type: undefined): ShapePoint
-function getPoint(arrayBuffer: ArrayBuffer, type: 'M'): ShapePointZ
-function getPoint(arrayBuffer: ArrayBuffer, type: 'Z'): ShapePointZ
-function getPoint(arrayBuffer: ArrayBuffer, type?: 'M' | 'Z'): ShapePoint | ShapePointZ {
+function getPoint(arrayBuffer: ArrayBufferLike): ShapePoint
+function getPoint(arrayBuffer: ArrayBufferLike, type: undefined): ShapePoint
+function getPoint(arrayBuffer: ArrayBufferLike, type: 'M'): ShapePointZ
+function getPoint(arrayBuffer: ArrayBufferLike, type: 'Z'): ShapePointZ
+function getPoint(arrayBuffer: ArrayBufferLike, type?: 'M' | 'Z'): ShapePoint | ShapePointZ {
   const dv = new DataView(arrayBuffer)
   return {
     x: dv.getFloat64(0, true),

src/lib/Shapefile/parsers/shx.ts

@@ -4,7 +4,7 @@ import {
   ShapeIndexRecord
 } from '../../../types'
 
-function shx(buffer: ArrayBuffer): ShapeIndex {
+function shx(buffer: ArrayBufferLike): ShapeIndex {
   const header = getHeader(buffer.slice(0, 100))
   const records = getRecords(buffer.slice(100, buffer.byteLength))
 
@@ -14,7 +14,7 @@ function shx(buffer: ArrayBuffer): ShapeIndex {
   }
 }
 
-function getHeader(arrayBuffer: ArrayBuffer): ShapeHeader {
+function getHeader(arrayBuffer: ArrayBufferLike): ShapeHeader {
   const dv = new DataView(arrayBuffer)
   return {
     file: {
@@ -38,7 +38,7 @@ function getHeader(arrayBuffer: ArrayBuffer): ShapeHeader {
   }
 }
 
-function getRecords(arrayBuffer: ArrayBuffer): ShapeIndexRecord[] {
+function getRecords(arrayBuffer: ArrayBufferLike): ShapeIndexRecord[] {
   const dv = new DataView(arrayBuffer)
 
   let bp = 0