From 791a847e42335f8f97cc6c74d6a3988faf539ce4 Mon Sep 17 00:00:00 2001 From: Kenny Daniel Date: Thu, 6 Mar 2025 08:53:28 -0800 Subject: [PATCH] Revert "Simplify relative import paths" This reverts commit e590f4ee03263460a389bdd29678015727cdcd5a. --- src/assemble.js | 4 ++-- src/column.js | 2 +- src/constants.js | 10 ++++----- src/convert.js | 2 +- src/datapage.js | 2 +- src/delta.js | 2 +- src/encoding.js | 2 +- src/hyparquet.js | 58 ++++++++++++++++++++++++------------------------ src/indexes.js | 2 +- src/metadata.js | 2 +- src/plain.js | 2 +- src/query.js | 4 ++-- src/read.js | 2 +- src/schema.js | 2 +- src/thrift.js | 2 +- src/utils.js | 2 +- tsconfig.json | 1 - 17 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/assemble.js b/src/assemble.js index d13be90..b0376d5 100644 --- a/src/assemble.js +++ b/src/assemble.js @@ -6,7 +6,7 @@ import { isListLike, isMapLike } from './schema.js' * Reconstructs a complex nested structure from flat arrays of definition and repetition levels, * according to Dremel encoding. * - * @import {DecodedArray, FieldRepetitionType} from './types.d.ts' + * @import {DecodedArray, FieldRepetitionType} from '../src/types.d.ts' * @param {any[]} output * @param {number[] | undefined} definitionLevels * @param {number[]} repetitionLevels @@ -103,7 +103,7 @@ export function assembleLists( * Assemble a nested structure from subcolumn data. * https://github.com/apache/parquet-format/blob/apache-parquet-format-2.10.0/LogicalTypes.md#nested-types * - * @import {SchemaTree} from './types.d.ts' + * @import {SchemaTree} from '../src/types.d.ts' * @param {Map} subcolumnData * @param {SchemaTree} schema top-level schema element * @param {number} [depth] depth of nested structure diff --git a/src/column.js b/src/column.js index 9d4d174..9b76a68 100644 --- a/src/column.js +++ b/src/column.js @@ -123,7 +123,7 @@ export function getColumnRange({ dictionary_page_offset, data_page_offset, total /** * Read parquet header from a buffer. * - * @import {ColumnMetaData, DecodedArray, DataReader, PageHeader, ParquetReadOptions, SchemaTree} from './types.d.ts' + * @import {ColumnMetaData, DecodedArray, DataReader, PageHeader, ParquetReadOptions, SchemaTree} from '../src/types.d.ts' * @param {DataReader} reader - parquet file reader * @returns {PageHeader} metadata object and bytes read */ diff --git a/src/constants.js b/src/constants.js index d8e9587..bc38702 100644 --- a/src/constants.js +++ b/src/constants.js @@ -1,4 +1,4 @@ -/** @type {import('./types.d.ts').ParquetType[]} */ +/** @type {import('../src/types.d.ts').ParquetType[]} */ export const ParquetType = [ 'BOOLEAN', 'INT32', @@ -29,7 +29,7 @@ export const FieldRepetitionType = [ 'REPEATED', ] -/** @type {import('./types.d.ts').ConvertedType[]} */ +/** @type {import('../src/types.d.ts').ConvertedType[]} */ export const ConvertedType = [ 'UTF8', 'MAP', @@ -55,7 +55,7 @@ export const ConvertedType = [ 'INTERVAL', ] -/** @type {import('./types.d.ts').LogicalTypeType[]} */ +/** @type {import('../src/types.d.ts').LogicalTypeType[]} */ export const logicalTypeType = [ 'NULL', 'STRING', @@ -85,7 +85,7 @@ export const CompressionCodec = [ 'LZ4_RAW', ] -/** @type {import('./types.d.ts').PageType[]} */ +/** @type {import('../src/types.d.ts').PageType[]} */ export const PageType = [ 'DATA_PAGE', 'INDEX_PAGE', @@ -93,7 +93,7 @@ export const PageType = [ 'DATA_PAGE_V2', ] -/** @type {import('./types.d.ts').BoundaryOrder[]} */ +/** @type {import('../src/types.d.ts').BoundaryOrder[]} */ export const BoundaryOrder = [ 'UNORDERED', 'ASCENDING', diff --git a/src/convert.js b/src/convert.js index cd49afa..3db468e 100644 --- a/src/convert.js +++ b/src/convert.js @@ -3,7 +3,7 @@ const dayMillis = 86400000 // 1 day in milliseconds /** * Convert known types from primitive to rich, and dereference dictionary. * - * @import {DecodedArray, Encoding, SchemaElement} from './types.d.ts' + * @import {DecodedArray, Encoding, SchemaElement} from '../src/types.d.ts' * @param {DecodedArray} data series of primitive types * @param {DecodedArray | undefined} dictionary * @param {SchemaElement} schemaElement diff --git a/src/datapage.js b/src/datapage.js index c46780c..1fcbd27 100644 --- a/src/datapage.js +++ b/src/datapage.js @@ -71,7 +71,7 @@ export function readDictionaryPage(bytes, diph, columnMetadata, typeLength) { } /** - * @import {ColumnMetaData, CompressionCodec, Compressors, DataPage, DataPageHeader, DataPageHeaderV2, DataReader, DecodedArray, DictionaryPageHeader, PageHeader, SchemaTree} from './types.d.ts' + * @import {ColumnMetaData, CompressionCodec, Compressors, DataPage, DataPageHeader, DataPageHeaderV2, DataReader, DecodedArray, DictionaryPageHeader, PageHeader, SchemaTree} from '../src/types.d.ts' * @param {DataReader} reader data view for the page * @param {DataPageHeader} daph data page header * @param {SchemaTree[]} schemaPath diff --git a/src/delta.js b/src/delta.js index 3ab7d1d..ab63b0d 100644 --- a/src/delta.js +++ b/src/delta.js @@ -1,7 +1,7 @@ import { readVarInt, readZigZagBigInt } from './thrift.js' /** - * @import {DataReader} from './types.d.ts' + * @import {DataReader} from '../src/types.d.ts' * @param {DataReader} reader * @param {number} count number of values to read * @param {Int32Array | BigInt64Array} output diff --git a/src/encoding.js b/src/encoding.js index 1770897..6f1f4ab 100644 --- a/src/encoding.js +++ b/src/encoding.js @@ -146,7 +146,7 @@ export function byteStreamSplit(reader, count, type, typeLength) { } /** - * @import {DataReader, DecodedArray, ParquetType} from './types.d.ts' + * @import {DataReader, DecodedArray, ParquetType} from '../src/types.d.ts' * @param {ParquetType} type * @param {number | undefined} typeLength * @returns {number} diff --git a/src/hyparquet.js b/src/hyparquet.js index c79d55f..94e4027 100644 --- a/src/hyparquet.js +++ b/src/hyparquet.js @@ -27,36 +27,36 @@ export function parquetReadObjects(options) { * `import { ParquetReadOptions } from 'hyparquet'` for example. * * @template {any} T - * @typedef {import('./types.d.ts').Awaitable} Awaitable + * @typedef {import('../src/types.d.ts').Awaitable} Awaitable */ /** - * @typedef {import('./types.d.ts').AsyncBuffer} AsyncBuffer - * @typedef {import('./types.d.ts').DataReader} DataReader - * @typedef {import('./types.d.ts').FileMetaData} FileMetaData - * @typedef {import('./types.d.ts').SchemaTree} SchemaTree - * @typedef {import('./types.d.ts').SchemaElement} SchemaElement - * @typedef {import('./types.d.ts').ParquetType} ParquetType - * @typedef {import('./types.d.ts').FieldRepetitionType} FieldRepetitionType - * @typedef {import('./types.d.ts').ConvertedType} ConvertedType - * @typedef {import('./types.d.ts').TimeUnit} TimeUnit - * @typedef {import('./types.d.ts').LogicalType} LogicalType - * @typedef {import('./types.d.ts').LogicalTypeType} LogicalTypeType - * @typedef {import('./types.d.ts').RowGroup} RowGroup - * @typedef {import('./types.d.ts').ColumnChunk} ColumnChunk - * @typedef {import('./types.d.ts').ColumnMetaData} ColumnMetaData - * @typedef {import('./types.d.ts').Encoding} Encoding - * @typedef {import('./types.d.ts').CompressionCodec} CompressionCodec - * @typedef {import('./types.d.ts').Compressors} Compressors - * @typedef {import('./types.d.ts').Statistics} Statistics - * @typedef {import('./types.d.ts').PageType} PageType - * @typedef {import('./types.d.ts').PageHeader} PageHeader - * @typedef {import('./types.d.ts').DataPageHeader} DataPageHeader - * @typedef {import('./types.d.ts').DictionaryPageHeader} DictionaryPageHeader - * @typedef {import('./types.d.ts').DecodedArray} DecodedArray - * @typedef {import('./types.d.ts').OffsetIndex} OffsetIndex - * @typedef {import('./types.d.ts').ColumnIndex} ColumnIndex - * @typedef {import('./types.d.ts').BoundaryOrder} BoundaryOrder - * @typedef {import('./types.d.ts').ColumnData} ColumnData - * @typedef {import('./types.d.ts').ParquetReadOptions} ParquetReadOptions + * @typedef {import('../src/types.d.ts').AsyncBuffer} AsyncBuffer + * @typedef {import('../src/types.d.ts').DataReader} DataReader + * @typedef {import('../src/types.d.ts').FileMetaData} FileMetaData + * @typedef {import('../src/types.d.ts').SchemaTree} SchemaTree + * @typedef {import('../src/types.d.ts').SchemaElement} SchemaElement + * @typedef {import('../src/types.d.ts').ParquetType} ParquetType + * @typedef {import('../src/types.d.ts').FieldRepetitionType} FieldRepetitionType + * @typedef {import('../src/types.d.ts').ConvertedType} ConvertedType + * @typedef {import('../src/types.d.ts').TimeUnit} TimeUnit + * @typedef {import('../src/types.d.ts').LogicalType} LogicalType + * @typedef {import('../src/types.d.ts').LogicalTypeType} LogicalTypeType + * @typedef {import('../src/types.d.ts').RowGroup} RowGroup + * @typedef {import('../src/types.d.ts').ColumnChunk} ColumnChunk + * @typedef {import('../src/types.d.ts').ColumnMetaData} ColumnMetaData + * @typedef {import('../src/types.d.ts').Encoding} Encoding + * @typedef {import('../src/types.d.ts').CompressionCodec} CompressionCodec + * @typedef {import('../src/types.d.ts').Compressors} Compressors + * @typedef {import('../src/types.d.ts').Statistics} Statistics + * @typedef {import('../src/types.d.ts').PageType} PageType + * @typedef {import('../src/types.d.ts').PageHeader} PageHeader + * @typedef {import('../src/types.d.ts').DataPageHeader} DataPageHeader + * @typedef {import('../src/types.d.ts').DictionaryPageHeader} DictionaryPageHeader + * @typedef {import('../src/types.d.ts').DecodedArray} DecodedArray + * @typedef {import('../src/types.d.ts').OffsetIndex} OffsetIndex + * @typedef {import('../src/types.d.ts').ColumnIndex} ColumnIndex + * @typedef {import('../src/types.d.ts').BoundaryOrder} BoundaryOrder + * @typedef {import('../src/types.d.ts').ColumnData} ColumnData + * @typedef {import('../src/types.d.ts').ParquetReadOptions} ParquetReadOptions */ diff --git a/src/indexes.js b/src/indexes.js index c8d0b9a..8118bf1 100644 --- a/src/indexes.js +++ b/src/indexes.js @@ -33,7 +33,7 @@ export function readOffsetIndex(reader) { } /** - * @import {ColumnIndex, DataReader, OffsetIndex, PageLocation, SchemaElement} from './types.d.ts' + * @import {ColumnIndex, DataReader, OffsetIndex, PageLocation, SchemaElement} from '../src/types.d.ts' * @param {any} loc * @returns {PageLocation} */ diff --git a/src/metadata.js b/src/metadata.js index 52457d9..adefe61 100644 --- a/src/metadata.js +++ b/src/metadata.js @@ -244,7 +244,7 @@ function timeUnit(unit) { /** * Convert column statistics based on column type. * - * @import {AsyncBuffer, FileMetaData, LogicalType, MinMaxType, SchemaElement, SchemaTree, Statistics, TimeUnit} from './types.d.ts' + * @import {AsyncBuffer, FileMetaData, LogicalType, MinMaxType, SchemaElement, SchemaTree, Statistics, TimeUnit} from '../src/types.d.ts' * @param {any} stats * @param {SchemaElement} schema * @returns {Statistics} diff --git a/src/plain.js b/src/plain.js index e3e3148..b1a21da 100644 --- a/src/plain.js +++ b/src/plain.js @@ -1,7 +1,7 @@ /** * Read `count` values of the given type from the reader.view. * - * @import {DataReader, DecodedArray, ParquetType} from './types.d.ts' + * @import {DataReader, DecodedArray, ParquetType} from '../src/types.d.ts' * @param {DataReader} reader - buffer to read data from * @param {ParquetType} type - parquet type of the data * @param {number} count - number of values to read diff --git a/src/query.js b/src/query.js index 5315ebb..72c6bdf 100644 --- a/src/query.js +++ b/src/query.js @@ -8,7 +8,7 @@ import { equals } from './utils.js' * Accepts optional filter object to filter the results and orderBy column name to sort the results. * Note that using orderBy may SIGNIFICANTLY increase the query time. * - * @import {ParquetQueryFilter} from './types.d.ts' + * @import {ParquetQueryFilter} from '../src/types.d.ts' * @param {ParquetReadOptions & { filter?: ParquetQueryFilter, orderBy?: string }} options * @returns {Promise[]>} resolves when all requested rows and columns are parsed */ @@ -48,7 +48,7 @@ export async function parquetQuery(options) { /** * Reads a list rows from a parquet file, reading only the row groups that contain the rows. * Returns a sparse array of rows. - * @import {ParquetReadOptions} from './types.d.ts' + * @import {ParquetReadOptions} from '../src/types.d.ts' * @param {ParquetReadOptions & { rows: number[] }} options * @returns {Promise[]>} */ diff --git a/src/read.js b/src/read.js index fad053e..78d68ed 100644 --- a/src/read.js +++ b/src/read.js @@ -198,7 +198,7 @@ export async function readRowGroup(options, rowGroup, groupStart, rowLimit) { /** * Return a list of sub-columns needed to construct a top-level column. * - * @import {ParquetReadOptions, RowGroup, SchemaTree} from './types.d.ts' + * @import {ParquetReadOptions, RowGroup, SchemaTree} from '../src/types.d.ts' * @param {SchemaTree} schema * @param {string[]} output * @returns {string[]} diff --git a/src/schema.js b/src/schema.js index a5f8bf9..2917e5b 100644 --- a/src/schema.js +++ b/src/schema.js @@ -1,7 +1,7 @@ /** * Build a tree from the schema elements. * - * @import {SchemaElement, SchemaTree} from './types.d.ts' + * @import {SchemaElement, SchemaTree} from '../src/types.d.ts' * @param {SchemaElement[]} schema * @param {number} rootIndex index of the root element * @param {string[]} path path to the element diff --git a/src/thrift.js b/src/thrift.js index f79d634..819eecc 100644 --- a/src/thrift.js +++ b/src/thrift.js @@ -19,7 +19,7 @@ const CompactType = { /** * Parse TCompactProtocol * - * @import {DataReader} from './types.d.ts' + * @import {DataReader} from '../src/types.d.ts' * @param {DataReader} reader * @returns {Record} */ diff --git a/src/utils.js b/src/utils.js index 447a985..f408421 100644 --- a/src/utils.js +++ b/src/utils.js @@ -194,7 +194,7 @@ export function cachedAsyncBuffer({ byteLength, slice }) { * Returns canonical cache key for a byte range 'start,end'. * Normalize int-range and suffix-range requests to the same key. * - * @import {AsyncBuffer, Awaitable, DecodedArray} from './types.d.ts' + * @import {AsyncBuffer, Awaitable, DecodedArray} from '../src/types.d.ts' * @param {number} start start byte of range * @param {number} [end] end byte of range, or undefined for suffix range * @param {number} [size] size of file, or undefined for suffix range diff --git a/tsconfig.json b/tsconfig.json index b62627c..04d5724 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,6 @@ "lib": ["esnext", "dom"], "module": "nodenext", "noEmit": true, - "noUnusedParameters": true, "resolveJsonModule": true, "strict": true },