@loaders.gl/shapefile 4.0.0-alpha.23 → 4.0.0-alpha.24

package/dist/dbf-worker.js

@@ -326,7 +326,7 @@
   }
 
   // src/dbf-loader.ts
-  var VERSION = true ? "4.0.0-alpha.23" : "latest";
+  var VERSION = true ? "4.0.0-alpha.24" : "latest";
   var DBFWorkerLoader = {
     name: "DBF",
     id: "dbf",

package/dist/es5/dbf-loader.js

@@ -11,7 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _parseDbf = require("./lib/parsers/parse-dbf");
 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 VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+var VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
 var DBFWorkerLoader = {
   name: 'DBF',
   id: 'dbf',

package/dist/es5/shapefile-loader.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ShapefileLoader = void 0;
 var _shpLoader = require("./shp-loader");
 var _parseShapefile = require("./lib/parsers/parse-shapefile");
-var VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+var VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
 var ShapefileLoader = {
   name: 'Shapefile',
   id: 'shapefile',

package/dist/es5/shp-loader.js

@@ -11,7 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _parseShp = require("./lib/parsers/parse-shp");
 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 VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+var VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
 var SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];
 exports.SHP_MAGIC_NUMBER = SHP_MAGIC_NUMBER;
 var SHPWorkerLoader = {

package/dist/esm/dbf-loader.js

@@ -1,5 +1,5 @@
 import { parseDBF, parseDBFInBatches } from './lib/parsers/parse-dbf';
-const VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+const VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
 export const DBFWorkerLoader = {
   name: 'DBF',
   id: 'dbf',

package/dist/esm/shapefile-loader.js

@@ -1,6 +1,6 @@
 import { SHP_MAGIC_NUMBER } from './shp-loader';
 import { parseShapefile, parseShapefileInBatches } from './lib/parsers/parse-shapefile';
-const VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+const VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
 export const ShapefileLoader = {
   name: 'Shapefile',
   id: 'shapefile',

package/dist/esm/shp-loader.js

@@ -1,5 +1,5 @@
 import { parseSHP, parseSHPInBatches } from './lib/parsers/parse-shp';
-const VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+const VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
 export const SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];
 export const SHPWorkerLoader = {
   name: 'SHP',

package/dist/shp-worker.js

@@ -430,7 +430,7 @@
   }
 
   // src/shp-loader.ts
-  var VERSION = true ? "4.0.0-alpha.23" : "latest";
+  var VERSION = true ? "4.0.0-alpha.24" : "latest";
   var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
   var SHPWorkerLoader = {
     name: "SHP",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/shapefile",
   "description": "Loader for the Shapefile Format",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -22,7 +22,6 @@
   "module": "dist/esm/index.js",
   "sideEffects": false,
   "browser": {
-    "./src/lib/filesystems/node-filesystem.js": false,
     "fs": false
   },
   "files": [
@@ -37,10 +36,10 @@
     "build-worker-dbf": "esbuild src/workers/dbf-worker.ts --bundle --outfile=dist/dbf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.0-alpha.23",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.23",
-    "@loaders.gl/schema": "4.0.0-alpha.23",
+    "@loaders.gl/gis": "4.0.0-alpha.24",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.24",
+    "@loaders.gl/schema": "4.0.0-alpha.24",
     "@math.gl/proj4": "^3.5.1"
   },
-  "gitHead": "e212f2a0c0e342f7cb65ce84fa2ff39f64b7d94b"
+  "gitHead": "97a8990595c132fb14e3445a8768d9f4cb98ff05"
 }

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.loaders = globalThis.loaders || {};
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/dbf-loader.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DBFLoader = exports.DBFWorkerLoader = void 0;
-const parse_dbf_1 = require("./lib/parsers/parse-dbf");
-// __VERSION__ is injected by babel-plugin-version-inline
-// @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
-/**
- * DBFLoader - DBF files are used to contain non-geometry columns in Shapefiles
- */
-exports.DBFWorkerLoader = {
-    name: 'DBF',
-    id: 'dbf',
-    module: 'shapefile',
-    version: VERSION,
-    worker: true,
-    category: 'table',
-    extensions: ['dbf'],
-    mimeTypes: ['application/x-dbf'],
-    options: {
-        dbf: {
-            encoding: 'latin1'
-        }
-    }
-};
-/** DBF file loader */
-exports.DBFLoader = {
-    ...exports.DBFWorkerLoader,
-    parse: async (arrayBuffer, options) => (0, parse_dbf_1.parseDBF)(arrayBuffer, options),
-    parseSync: parse_dbf_1.parseDBF,
-    parseInBatches: parse_dbf_1.parseDBFInBatches
-};

package/dist/index.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SHPWorkerLoader = exports.SHPLoader = exports.DBFWorkerLoader = exports.DBFLoader = exports.ShapefileLoader = void 0;
-var shapefile_loader_1 = require("./shapefile-loader");
-Object.defineProperty(exports, "ShapefileLoader", { enumerable: true, get: function () { return shapefile_loader_1.ShapefileLoader; } });
-var dbf_loader_1 = require("./dbf-loader");
-Object.defineProperty(exports, "DBFLoader", { enumerable: true, get: function () { return dbf_loader_1.DBFLoader; } });
-Object.defineProperty(exports, "DBFWorkerLoader", { enumerable: true, get: function () { return dbf_loader_1.DBFWorkerLoader; } });
-var shp_loader_1 = require("./shp-loader");
-Object.defineProperty(exports, "SHPLoader", { enumerable: true, get: function () { return shp_loader_1.SHPLoader; } });
-Object.defineProperty(exports, "SHPWorkerLoader", { enumerable: true, get: function () { return shp_loader_1.SHPWorkerLoader; } });

package/dist/lib/parsers/parse-dbf.js

@@ -1,344 +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.parseDBFInBatches = exports.parseDBF = void 0;
-const binary_chunk_reader_1 = __importDefault(require("../streaming/binary-chunk-reader"));
-const LITTLE_ENDIAN = true;
-const DBF_HEADER_SIZE = 32;
-var STATE;
-(function (STATE) {
-    STATE[STATE["START"] = 0] = "START";
-    STATE[STATE["FIELD_DESCRIPTORS"] = 1] = "FIELD_DESCRIPTORS";
-    STATE[STATE["FIELD_PROPERTIES"] = 2] = "FIELD_PROPERTIES";
-    STATE[STATE["END"] = 3] = "END";
-    STATE[STATE["ERROR"] = 4] = "ERROR";
-})(STATE || (STATE = {}));
-class DBFParser {
-    constructor(options) {
-        this.binaryReader = new binary_chunk_reader_1.default();
-        this.state = STATE.START;
-        this.result = {
-            data: []
-        };
-        this.textDecoder = new TextDecoder(options.encoding);
-    }
-    /**
-     * @param arrayBuffer
-     */
-    write(arrayBuffer) {
-        this.binaryReader.write(arrayBuffer);
-        this.state = parseState(this.state, this.result, this.binaryReader, this.textDecoder);
-        // this.result.progress.bytesUsed = this.binaryReader.bytesUsed();
-        // important events:
-        // - schema available
-        // - first rows available
-        // - all rows available
-    }
-    end() {
-        this.binaryReader.end();
-        this.state = parseState(this.state, this.result, this.binaryReader, this.textDecoder);
-        // this.result.progress.bytesUsed = this.binaryReader.bytesUsed();
-        if (this.state !== STATE.END) {
-            this.state = STATE.ERROR;
-            this.result.error = 'DBF incomplete file';
-        }
-    }
-}
-/**
- * @param arrayBuffer
- * @param options
- * @returns DBFTable or rows
- */
-function parseDBF(arrayBuffer, options = {}) {
-    const { encoding = 'latin1' } = options.dbf || {};
-    const dbfParser = new DBFParser({ encoding });
-    dbfParser.write(arrayBuffer);
-    dbfParser.end();
-    const { data, schema } = dbfParser.result;
-    const shape = options?.tables?.format || options?.dbf?.shape;
-    switch (shape) {
-        case 'object-row-table': {
-            const table = {
-                shape: 'object-row-table',
-                schema,
-                data
-            };
-            return table;
-        }
-        case 'table':
-            return { schema, rows: data };
-        case 'rows':
-        default:
-            return data;
-    }
-}
-exports.parseDBF = parseDBF;
-/**
- * @param asyncIterator
- * @param options
- */
-async function* parseDBFInBatches(asyncIterator, options = {}) {
-    const { encoding = 'latin1' } = options.dbf || {};
-    const parser = new DBFParser({ encoding });
-    let headerReturned = false;
-    for await (const arrayBuffer of asyncIterator) {
-        parser.write(arrayBuffer);
-        if (!headerReturned && parser.result.dbfHeader) {
-            headerReturned = true;
-            yield parser.result.dbfHeader;
-        }
-        if (parser.result.data.length > 0) {
-            yield parser.result.data;
-            parser.result.data = [];
-        }
-    }
-    parser.end();
-    if (parser.result.data.length > 0) {
-        yield parser.result.data;
-    }
-}
-exports.parseDBFInBatches = parseDBFInBatches;
-/**
- * https://www.dbase.com/Knowledgebase/INT/db7_file_fmt.htm
- * @param state
- * @param result
- * @param binaryReader
- * @param textDecoder
- * @returns
- */
-/* eslint-disable complexity, max-depth */
-function parseState(state, result, binaryReader, textDecoder) {
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-        try {
-            switch (state) {
-                case STATE.ERROR:
-                case STATE.END:
-                    return state;
-                case STATE.START:
-                    // Parse initial file header
-                    // DBF Header
-                    const dataView = binaryReader.getDataView(DBF_HEADER_SIZE);
-                    if (!dataView) {
-                        return state;
-                    }
-                    result.dbfHeader = parseDBFHeader(dataView);
-                    result.progress = {
-                        bytesUsed: 0,
-                        rowsTotal: result.dbfHeader.nRecords,
-                        rows: 0
-                    };
-                    state = STATE.FIELD_DESCRIPTORS;
-                    break;
-                case STATE.FIELD_DESCRIPTORS:
-                    // Parse DBF field descriptors (schema)
-                    const fieldDescriptorView = binaryReader.getDataView(
-                    // @ts-ignore
-                    result.dbfHeader.headerLength - DBF_HEADER_SIZE);
-                    if (!fieldDescriptorView) {
-                        return state;
-                    }
-                    result.dbfFields = parseFieldDescriptors(fieldDescriptorView, textDecoder);
-                    result.schema = {
-                        fields: result.dbfFields.map((dbfField) => makeField(dbfField)),
-                        metadata: {}
-                    };
-                    state = STATE.FIELD_PROPERTIES;
-                    // TODO(kyle) Not exactly sure why start offset needs to be headerLength + 1?
-                    // parsedbf uses ((fields.length + 1) << 5) + 2;
-                    binaryReader.skip(1);
-                    break;
-                case STATE.FIELD_PROPERTIES:
-                    const { recordLength = 0, nRecords = 0 } = result?.dbfHeader || {};
-                    while (result.data.length < nRecords) {
-                        const recordView = binaryReader.getDataView(recordLength - 1);
-                        if (!recordView) {
-                            return state;
-                        }
-                        // Note: Avoid actually reading the last byte, which may not be present
-                        binaryReader.skip(1);
-                        // @ts-ignore
-                        const row = parseRow(recordView, result.dbfFields, textDecoder);
-                        result.data.push(row);
-                        // @ts-ignore
-                        result.progress.rows = result.data.length;
-                    }
-                    state = STATE.END;
-                    break;
-                default:
-                    state = STATE.ERROR;
-                    result.error = `illegal parser state ${state}`;
-                    return state;
-            }
-        }
-        catch (error) {
-            state = STATE.ERROR;
-            result.error = `DBF parsing failed: ${error.message}`;
-            return state;
-        }
-    }
-}
-/**
- * @param headerView
- */
-function parseDBFHeader(headerView) {
-    return {
-        // Last updated date
-        year: headerView.getUint8(1) + 1900,
-        month: headerView.getUint8(2),
-        day: headerView.getUint8(3),
-        // Number of records in data file
-        nRecords: headerView.getUint32(4, LITTLE_ENDIAN),
-        // Length of header in bytes
-        headerLength: headerView.getUint16(8, LITTLE_ENDIAN),
-        // Length of each record
-        recordLength: headerView.getUint16(10, LITTLE_ENDIAN),
-        // Not sure if this is usually set
-        languageDriver: headerView.getUint8(29)
-    };
-}
-/**
- * @param view
- */
-function parseFieldDescriptors(view, textDecoder) {
-    // NOTE: this might overestimate the number of fields if the "Database
-    // Container" container exists and is included in the headerLength
-    const nFields = (view.byteLength - 1) / 32;
-    const fields = [];
-    let offset = 0;
-    for (let i = 0; i < nFields; i++) {
-        const name = textDecoder
-            .decode(new Uint8Array(view.buffer, view.byteOffset + offset, 11))
-            // eslint-disable-next-line no-control-regex
-            .replace(/\u0000/g, '');
-        fields.push({
-            name,
-            dataType: String.fromCharCode(view.getUint8(offset + 11)),
-            fieldLength: view.getUint8(offset + 16),
-            decimal: view.getUint8(offset + 17)
-        });
-        offset += 32;
-    }
-    return fields;
-}
-/*
- * @param {BinaryChunkReader} binaryReader
-function parseRows(binaryReader, fields, nRecords, recordLength, textDecoder) {
-  const rows = [];
-  for (let i = 0; i < nRecords; i++) {
-    const recordView = binaryReader.getDataView(recordLength - 1);
-    binaryReader.skip(1);
-    // @ts-ignore
-    rows.push(parseRow(recordView, fields, textDecoder));
-  }
-  return rows;
-}
- */
-/**
- *
- * @param view
- * @param fields
- * @param textDecoder
- * @returns
- */
-function parseRow(view, fields, textDecoder) {
-    const out = {};
-    let offset = 0;
-    for (const field of fields) {
-        const text = textDecoder.decode(new Uint8Array(view.buffer, view.byteOffset + offset, field.fieldLength));
-        out[field.name] = parseField(text, field.dataType);
-        offset += field.fieldLength;
-    }
-    return out;
-}
-/**
- * Should NaN be coerced to null?
- * @param text
- * @param dataType
- * @returns Field depends on a type of the data
- */
-function parseField(text, dataType) {
-    switch (dataType) {
-        case 'B':
-            return parseNumber(text);
-        case 'C':
-            return parseCharacter(text);
-        case 'F':
-            return parseNumber(text);
-        case 'N':
-            return parseNumber(text);
-        case 'O':
-            return parseNumber(text);
-        case 'D':
-            return parseDate(text);
-        case 'L':
-            return parseBoolean(text);
-        default:
-            throw new Error('Unsupported data type');
-    }
-}
-/**
- * Parse YYYYMMDD to date in milliseconds
- * @param str YYYYMMDD
- * @returns new Date as a number
- */
-function parseDate(str) {
-    return Date.UTC(str.slice(0, 4), parseInt(str.slice(4, 6), 10) - 1, str.slice(6, 8));
-}
-/**
- * Read boolean value
- * any of Y, y, T, t coerce to true
- * any of N, n, F, f coerce to false
- * otherwise null
- * @param value
- * @returns boolean | null
- */
-function parseBoolean(value) {
-    return /^[nf]$/i.test(value) ? false : /^[yt]$/i.test(value) ? true : null;
-}
-/**
- * Return null instead of NaN
- * @param text
- * @returns number | null
- */
-function parseNumber(text) {
-    const number = parseFloat(text);
-    return isNaN(number) ? null : number;
-}
-/**
- *
- * @param text
- * @returns string | null
- */
-function parseCharacter(text) {
-    return text.trim() || null;
-}
-/**
- * Create a standard Arrow-style `Field` from field descriptor.
- * TODO - use `fieldLength` and `decimal` to generate smaller types?
- * @param param0
- * @returns Field
- */
-// eslint-disable
-function makeField({ name, dataType, fieldLength, decimal }) {
-    switch (dataType) {
-        case 'B':
-            return { name, type: 'float64', nullable: true, metadata: {} };
-        case 'C':
-            return { name, type: 'utf8', nullable: true, metadata: {} };
-        case 'F':
-            return { name, type: 'float64', nullable: true, metadata: {} };
-        case 'N':
-            return { name, type: 'float64', nullable: true, metadata: {} };
-        case 'O':
-            return { name, type: 'float64', nullable: true, metadata: {} };
-        case 'D':
-            return { name, type: 'timestamp-millisecond', nullable: true, metadata: {} };
-        case 'L':
-            return { name, type: 'bool', nullable: true, metadata: {} };
-        default:
-            throw new Error('Unsupported data type');
-    }
-}