feat(schema-utils): Separate out utils from the schema module (#3114)

modules/arrow/src/exports/geoarrow-loader.ts

@@ -3,8 +3,8 @@
 // Copyright (c) vis.gl contributors
 
 import type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';
-import {ArrowWorkerLoader} from './arrow-loader';
 import type {BinaryGeometry} from '@loaders.gl/schema';
+import {ArrowWorkerLoader} from './arrow-loader';
 import type {ArrowTable, ArrowTableBatch} from '../schema/arrow-table-type';
 
 export type GeoArrowLoaderOptions = LoaderOptions & {

modules/arrow/src/geoarrow-writer.ts

@@ -1,7 +1,7 @@
 // import type {} from '@loaders.gl/loader-utils';
 
 import type {WriterWithEncoder, WriterOptions} from '@loaders.gl/loader-utils';
-import {GeoJSONTable, BinaryGeometry} from '@loaders.gl/schema';
+import type {GeoJSONTable, BinaryGeometry} from '@loaders.gl/schema';
 import {encodeGeoArrowSync} from './lib/encoders/encode-geoarrow';
 
 // __VERSION__ is injected by babel-plugin-version-inline

modules/arrow/src/index.ts

@@ -8,7 +8,7 @@ export {VECTOR_TYPES} from './lib/types';
 import {ArrowTableBatchAggregator} from './schema/arrow-table-batch';
 
 // Make the ArrowBatch type available
-import {TableBatchBuilder} from '@loaders.gl/schema';
+import {TableBatchBuilder} from '@loaders.gl/schema-utils';
 TableBatchBuilder.ArrowBatch = ArrowTableBatchAggregator;
 
 // Arrow loader / Writer

modules/arrow/src/lib/geoarrow/convert-geoarrow-to-binary-geometry.ts

@@ -4,7 +4,7 @@
 
 import * as arrow from 'apache-arrow';
 import {earcut} from '@math.gl/polygon';
-import {BinaryFeatureCollection as BinaryFeatures} from '@loaders.gl/schema';
+import type {BinaryFeatureCollection as BinaryFeatures} from '@loaders.gl/schema';
 import {GeoArrowEncoding} from '@loaders.gl/gis';
 import {updateBoundsFromGeoArrowSamples} from './get-arrow-bounds';
 import {TypedArray} from '@loaders.gl/loader-utils';

modules/arrow/src/lib/geoarrow/convert-geoarrow-to-geojson-geometry.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 // import * as arrow from 'apache-arrow';
-import {
+import type {
   MultiPolygon,
   Position,
   Polygon,

modules/arrow/src/lib/tables/convert-arrow-to-table.ts

@@ -13,7 +13,7 @@ import type {
 } from '@loaders.gl/schema';
 import type {ArrowTable} from '../../schema/arrow-table-type';
 
-import {convertTable} from '@loaders.gl/schema';
+import {convertTable} from '@loaders.gl/schema-utils';
 import {getGeometryColumnsFromSchema} from '@loaders.gl/gis';
 import {convertArrowToSchema} from '../tables/convert-arrow-schema';
 import {parseGeometryFromArrow} from '../geoarrow/convert-geoarrow-to-geojson-geometry';

modules/arrow/src/lib/tables/convert-table-to-arrow.ts

@@ -3,7 +3,8 @@
 // Copyright (c) vis.gl contributors
 
 import * as arrow from 'apache-arrow';
-import {Table, getTableLength, getTableNumCols, getTableCellAt} from '@loaders.gl/schema';
+import type {Table} from '@loaders.gl/schema';
+import {getTableLength, getTableNumCols, getTableCellAt} from '@loaders.gl/schema-utils';
 import {deserializeArrowSchema} from '../tables/convert-arrow-schema';
 
 /**

modules/arrow/src/schema/arrow-table-batch.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {ColumnarTableBatchAggregator} from '@loaders.gl/schema';
+import {ColumnarTableBatchAggregator} from '@loaders.gl/schema-utils';
 import type {ArrowTableBatch} from './arrow-table-type';
 import * as arrow from 'apache-arrow';
 

modules/arrow/test/data/geoarrow/test-cases.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {FeatureCollection} from '@loaders.gl/schema';
+import type {FeatureCollection} from '@loaders.gl/schema';
 
 export const GEOARROW_POINT_FILE = '@loaders.gl/arrow/test/data/geoarrow/point.arrow';
 export const GEOARROW_MULTIPOINT_FILE = '@loaders.gl/arrow/test/data/geoarrow/multipoint.arrow';

modules/arrow/test/geoarrow/convert-geoarrow-to-geojson.spec.ts

@@ -6,7 +6,7 @@ import test, {Test} from 'tape-promise/tape';
 import {GEOARROW_TEST_CASES, GEOARROW_ENCODINGS} from '../data/geoarrow/test-cases';
 
 import {load} from '@loaders.gl/core';
-import {FeatureCollection} from '@loaders.gl/schema';
+import type {FeatureCollection} from '@loaders.gl/schema';
 import {ArrowLoader, serializeArrowSchema, parseGeometryFromArrow} from '@loaders.gl/arrow';
 import {getGeometryColumnsFromSchema} from '@loaders.gl/gis';
 

modules/arrow/tsconfig.json

@@ -12,6 +12,7 @@
     {"path": "../gis"},
     {"path": "../loader-utils"},
     {"path": "../schema"},
+    {"path": "../schema-utils"},
     {"path": "../wkt"}
   ]
 }

modules/bson/tsconfig.json

@@ -9,6 +9,7 @@
   },
   "references": [
     {"path": "../loader-utils"},
-    {"path": "../schema"}
+    {"path": "../schema"},
+    {"path": "../schema-utils"}
   ]
 }

modules/core/package.json

@@ -57,6 +57,7 @@
   "dependencies": {
     "@loaders.gl/loader-utils": "^5.0.0-alpha.0",
     "@loaders.gl/schema": "^5.0.0-alpha.0",
+    "@loaders.gl/schema-utils": "^5.0.0-alpha.0",
     "@loaders.gl/worker-utils": "^5.0.0-alpha.0",
     "@probe.gl/log": "^4.0.2"
   },

modules/core/src/lib/api/encode-table.ts

@@ -9,7 +9,7 @@ import {
   WriterOptionsType,
   WriterWithEncoder
 } from '@loaders.gl/loader-utils';
-import {Table} from '@loaders.gl/schema';
+import type {Table} from '@loaders.gl/schema';
 
 export async function encodeTable<WriterT extends WriterWithEncoder = WriterWithEncoder>(
   data: Table,

modules/core/src/lib/api/parse-in-batches.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {isTable, makeBatchFromTable, type Batch} from '@loaders.gl/schema';
+import type {Batch} from '@loaders.gl/schema';
+import {isTable, makeBatchFromTable} from '@loaders.gl/schema-utils';
 import type {
   Loader,
   LoaderWithParser,

modules/core/src/lib/api/select-loader.ts

@@ -4,13 +4,13 @@
 
 import type {LoaderContext, LoaderOptions, Loader} from '@loaders.gl/loader-utils';
 import {compareArrayBuffers, path, log} from '@loaders.gl/loader-utils';
+import {TypedArray} from '@loaders.gl/schema';
 import {normalizeLoader} from '../loader-utils/normalize-loader';
 import {getResourceUrl, getResourceMIMEType} from '../utils/resource-utils';
 import {compareMIMETypes} from '../utils/mime-type-utils';
 import {getRegisteredLoaders} from './register-loaders';
 import {isBlob} from '../../javascript-utils/is-type';
 import {stripQueryString} from '../utils/url-utils';
-import {TypedArray} from '@loaders.gl/schema';
 
 const EXT_PATTERN = /\.([^.]+)$/;
 

modules/core/test/lib/api/load-in-batches.spec.ts

@@ -7,7 +7,7 @@ import {loadInBatches, fetchFile, isBrowser} from '@loaders.gl/core';
 import {CSVLoader} from '@loaders.gl/csv';
 import {OBJLoader} from '@loaders.gl/obj';
 import {KMLLoader} from '@loaders.gl/kml';
-import {ObjectRowTableBatch} from '@loaders.gl/schema';
+import type {ObjectRowTableBatch} from '@loaders.gl/schema';
 
 const CSV_SAMPLE_VERY_LONG_URL = '@loaders.gl/csv/test/data/sample-very-long.csv';
 const OBJ_ASCII_URL = '@loaders.gl/obj/test/data/bunny.obj';

modules/core/test/lib/loader-utils/normalize-loader.spec.ts

@@ -10,7 +10,7 @@ import * as threeDTiles from '@loaders.gl/3d-tiles';
 import * as arrow from '@loaders.gl/arrow';
 import * as csv from '@loaders.gl/csv';
 import * as draco from '@loaders.gl/draco';
-import * as tables from '@loaders.gl/schema';
+import * as tables from '@loaders.gl/schema-utils';
 import * as gltf from '@loaders.gl/gltf';
 import * as images from '@loaders.gl/images';
 import * as kml from '@loaders.gl/kml';

modules/core/tsconfig.json

@@ -10,6 +10,7 @@
   "references": [
     {"path": "../loader-utils"},
     {"path": "../schema"},
+    {"path": "../schema-utils"},
     {"path": "../worker-utils"}
   ]
 }

modules/csv/src/csv-loader.ts

@@ -10,7 +10,7 @@ import {
   TableBatchBuilder,
   convertToArrayRow,
   convertToObjectRow
-} from '@loaders.gl/schema';
+} from '@loaders.gl/schema-utils';
 import Papa from './papaparse/papaparse';
 import AsyncIteratorStreamer from './papaparse/async-iterator-streamer';
 

modules/csv/src/lib/encoders/encode-csv.ts

@@ -3,7 +3,8 @@
 // Copyright (c) vis.gl contributors
 // Copyright 2022 Foursquare Labs, Inc.
 
-import {Table, makeArrayRowIterator, getTableNumCols} from '@loaders.gl/schema';
+import type {Table} from '@loaders.gl/schema';
+import {makeArrayRowIterator, getTableNumCols} from '@loaders.gl/schema-utils';
 import {csvFormatRows} from 'd3-dsv';
 import type {CSVWriterOptions} from '../../csv-writer';
 

modules/csv/test/csv-loader.spec.ts

@@ -3,7 +3,7 @@ import {validateLoader} from 'test/common/conformance';
 
 import {load, loadInBatches, isAsyncIterable} from '@loaders.gl/core';
 import {CSVLoader} from '../src/csv-loader';
-import {getTableLength} from '@loaders.gl/schema';
+import {getTableLength} from '@loaders.gl/schema-utils';
 
 // Small CSV Sample Files
 const CSV_SAMPLE_URL = '@loaders.gl/csv/test/data/sample.csv';

modules/csv/test/csv-writer.spec.ts

@@ -8,7 +8,7 @@ import {CSVWriterOptions, CSVWriter} from '@loaders.gl/csv';
 import {encodeTableAsText} from '@loaders.gl/core';
 
 import {Table} from '@loaders.gl/schema';
-import {makeTestTable, tableWithGeometryColumn} from '@loaders.gl/schema/test/shared-utils';
+import {makeTestTable, tableWithGeometryColumn} from '@loaders.gl/schema-utils/test/shared-utils';
 
 type TestCase = {
   name: string;

modules/csv/tsconfig.json

@@ -9,6 +9,7 @@
   },
   "references": [
     {"path": "../loader-utils"},
-    {"path": "../schema"}
+    {"path": "../schema"},
+    {"path": "../schema-utils"}
   ]
 }

modules/draco/src/lib/draco-parser.ts

@@ -25,7 +25,7 @@ import type {
   DracoOctahedronTransform
 } from './draco-types';
 
-import {getMeshBoundingBox} from '@loaders.gl/schema';
+import {getMeshBoundingBox} from '@loaders.gl/schema-utils';
 import {getDracoSchema} from './utils/get-draco-schema';
 
 /** Options to control draco parsing */

modules/draco/src/lib/utils/get-draco-schema.ts

@@ -1,4 +1,5 @@
-import {deduceMeshField, MeshAttribute, Schema, Field} from '@loaders.gl/schema';
+import {MeshAttribute, Schema, Field} from '@loaders.gl/schema';
+import {deduceMeshField} from '@loaders.gl/schema-utils';
 import type {DracoAttribute, DracoLoaderData, DracoMetadataEntry} from '../draco-types';
 
 /** Extract an arrow-like schema from a Draco mesh */

modules/draco/test/draco-compression-ratio.spec.ts

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 import test from 'tape-promise/tape';
 import {fetchFile, parse, encode} from '@loaders.gl/core';
-import {getMeshSize} from '@loaders.gl/schema';
+// import {getMeshSize} from '@loaders.gl/schema-utils';
 import {DracoWriter, DracoLoader} from '@loaders.gl/draco';
 import {validateMeshCategoryData} from 'test/common/conformance';
 

modules/draco/tsconfig.json

@@ -10,6 +10,7 @@
   "references": [
     {"path": "../loader-utils"},
     {"path": "../schema"},
+    {"path": "../schema-utils"},
     {"path": "../worker-utils"},
     {"path": "../polyfills"}
   ]

modules/excel/src/lib/parse-excel.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {ExcelLoaderOptions} from '../excel-loader';
 import {utils, read} from 'xlsx';
 // import {convertToArrayRow} from '@loaders.gl/schema';

modules/excel/test/excel-loader.spec.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test from 'tape-promise/tape';
 import {load, loadInBatches} from '@loaders.gl/core';
 import type {ObjectRowTable, ObjectRowTableBatch} from '@loaders.gl/schema';

modules/geopackage/src/lib/parse-geopackage.ts

@@ -1,7 +1,15 @@
 /* eslint-disable camelcase, @typescript-eslint/no-use-before-define */
 import {isBrowser} from '@loaders.gl/loader-utils';
 import {WKBLoader} from '@loaders.gl/wkt';
-import {Schema, Field, Geometry, DataType, Tables, GeoJSONTable, Feature} from '@loaders.gl/schema';
+import type {
+  Schema,
+  Field,
+  Geometry,
+  DataType,
+  Tables,
+  GeoJSONTable,
+  Feature
+} from '@loaders.gl/schema';
 import {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';
 import {Proj4Projection} from '@math.gl/proj4';
 import initSqlJs, {SqlJsStatic, Database, Statement} from 'sql.js';

modules/geopackage/test/geopackage-loader.spec.ts

@@ -1,7 +1,7 @@
 import test from 'tape-promise/tape';
 import {load, fetchFile} from '@loaders.gl/core';
 import {GeoPackageLoader} from '@loaders.gl/geopackage';
-// import {Tables, ObjectRowTable, Feature} from '@loaders.gl/schema';
+// import type {Tables, ObjectRowTable, Feature} from '@loaders.gl/schema';
 
 const GPKG_RIVERS = '@loaders.gl/geopackage/test/data/rivers_small.gpkg';
 const GPKG_RIVERS_GEOJSON = '@loaders.gl/geopackage/test/data/rivers_small.geojson';

modules/gis/src/lib/binary-features/extract-geometry-info.ts

@@ -1,4 +1,8 @@
-import {Feature, GeojsonGeometryInfo} from '@loaders.gl/schema';
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {Feature, GeojsonGeometryInfo} from '@loaders.gl/schema';
 
 /**
  *  Initial scan over GeoJSON features

modules/gis/src/lib/tables/convert-table-to-geojson.ts

@@ -11,7 +11,7 @@ import type {
   Feature,
   Geometry
 } from '@loaders.gl/schema';
-import {getTableLength, getTableRowAsObject} from '@loaders.gl/schema';
+import {getTableLength, getTableRowAsObject} from '@loaders.gl/schema-utils';
 
 import {GeoColumnMetadata, getGeoMetadata} from '../geo/geoparquet-metadata';
 

modules/gis/tsconfig.json

@@ -9,6 +9,7 @@
   },
   "references": [
     {"path": "../loader-utils"},
-    {"path": "../schema"}
+    {"path": "../schema"},
+    {"path": "../schema-utils"}
   ]
 }

modules/json/src/lib/encoder-utils/encode-table-row.ts

@@ -3,7 +3,8 @@
 // Copyright (c) vis.gl contributors
 // Copyright 2022 Foursquare Labs, Inc.
 
-import {Feature, Table, getTableRowAsObject} from '@loaders.gl/schema';
+import type {Feature, Table} from '@loaders.gl/schema';
+import {getTableRowAsObject} from '@loaders.gl/schema-utils';
 import {getRowPropertyObject} from './encode-utils';
 import {Utf8ArrayBufferEncoder} from './utf8-encoder';
 

modules/json/src/lib/encoder-utils/encode-utils.ts

@@ -3,7 +3,8 @@
 // Copyright (c) vis.gl contributors
 // Copyright 2022 Foursquare Labs, Inc.
 
-import {Table, getTableLength, getTableNumCols, getTableRowAsArray} from '@loaders.gl/schema';
+import type {Table} from '@loaders.gl/schema';
+import {getTableLength, getTableNumCols, getTableRowAsArray} from '@loaders.gl/schema-utils';
 
 type Row = {[key: string]: unknown};
 

modules/json/src/lib/encoders/geojson-encoder.ts

@@ -4,7 +4,7 @@
 // Copyright 2022 Foursquare Labs, Inc.
 
 import type {TableBatch} from '@loaders.gl/schema';
-import {getTableLength} from '@loaders.gl/schema';
+import {getTableLength} from '@loaders.gl/schema-utils';
 import {detectGeometryColumnIndex} from '../encoder-utils/encode-utils';
 import {encodeTableRow} from '../encoder-utils/encode-table-row';
 import {Utf8ArrayBufferEncoder} from '../encoder-utils/utf8-encoder';

modules/json/src/lib/encoders/json-encoder.ts

@@ -3,7 +3,8 @@
 // Copyright (c) vis.gl contributors
 // Copyright 2022 Foursquare Labs, Inc.
 
-import {Table, makeRowIterator} from '@loaders.gl/schema';
+import type {Table} from '@loaders.gl/schema';
+import {makeRowIterator} from '@loaders.gl/schema-utils';
 import type {JSONWriterOptions} from '../../json-writer';
 
 /**

modules/json/src/lib/parsers/parse-json-in-batches.ts

@@ -4,7 +4,8 @@
 
 import type {Schema, TableBatch} from '@loaders.gl/schema';
 import type {JSONLoaderOptions, MetadataBatch, JSONBatch} from '../../json-loader';
-import {TableBatchBuilder} from '@loaders.gl/schema';
+
+import {TableBatchBuilder} from '@loaders.gl/schema-utils';
 import {assert, makeTextDecoderIterator} from '@loaders.gl/loader-utils';
 import StreamingJSONParser from '../json-parser/streaming-json-parser';
 import JSONPath from '../jsonpath/jsonpath';

modules/json/src/lib/parsers/parse-json.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import type {RowTable} from '@loaders.gl/schema';
-import {makeTableFromData} from '@loaders.gl/schema';
+import {makeTableFromData} from '@loaders.gl/schema-utils';
 import type {JSONLoaderOptions} from '../../json-loader';
 
 export function parseJSONSync(jsonText: string, options: JSONLoaderOptions): RowTable {

modules/json/src/lib/parsers/parse-ndjson-in-batches.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import type {TableBatch} from '@loaders.gl/schema';
-import {TableBatchBuilder} from '@loaders.gl/schema';
+import {TableBatchBuilder} from '@loaders.gl/schema-utils';
 import {
   LoaderOptions,
   makeLineIterator,