From ebf993ef1ffc31e59db1b20126966be62139912c Mon Sep 17 00:00:00 2001 From: erezrokah Date: Mon, 7 Aug 2023 17:05:35 +0200 Subject: [PATCH] chore: Switch to ESM --- package-lock.json | 52 ++++++++++++++++++++--------------------- package.json | 6 ++++- src/arrow/index.test.ts | 2 +- src/arrow/index.ts | 2 +- src/grpc/server.test.ts | 2 +- src/main.ts | 2 +- src/serve.test.ts | 2 +- 7 files changed, 36 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index c645ac6..59fac6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.2", "license": "MPL-2.0", "dependencies": { + "@apache-arrow/esnext-esm": "^12.0.1", "@cloudquery/plugin-pb-javascript": "^0.0.6", - "apache-arrow": "^12.0.1", "yargs": "^17.7.2" }, "devDependencies": { @@ -41,6 +41,31 @@ "node": ">=0.10.0" } }, + "node_modules/@apache-arrow/esnext-esm": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/@apache-arrow/esnext-esm/-/esnext-esm-12.0.1.tgz", + "integrity": "sha512-TXgd8dmH8y+cpbFryhCdAixTFZwEG5OUzkfh0ZaYe/V4P/JOA7hT3jBqvOZV833CLdNjAYjO0fl/p7NVL/ryPg==", + "dependencies": { + "@types/command-line-args": "5.2.0", + "@types/command-line-usage": "5.0.2", + "@types/node": "18.14.5", + "@types/pad-left": "2.1.1", + "command-line-args": "5.2.1", + "command-line-usage": "6.1.3", + "flatbuffers": "23.3.3", + "json-bignum": "^0.0.3", + "pad-left": "^2.1.0", + "tslib": "^2.5.0" + }, + "bin": { + "arrow2csv": "bin/arrow2csv.js" + } + }, + "node_modules/@apache-arrow/esnext-esm/node_modules/@types/node": { + "version": "18.14.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.5.tgz", + "integrity": "sha512-CRT4tMK/DHYhw1fcCEBwME9CSaZNclxfzVMe7GsO6ULSwsttbj70wSiX6rZdIjGblu93sTJxLdhNIT85KKI7Qw==" + }, "node_modules/@ava/typescript": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/@ava/typescript/-/typescript-4.1.0.tgz", @@ -754,31 +779,6 @@ "node": ">= 8" } }, - "node_modules/apache-arrow": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/apache-arrow/-/apache-arrow-12.0.1.tgz", - "integrity": "sha512-g17ARsc/KEAzViy8PEFsDBlL4ZLx3BesgQCplDLgUWtY0aFWNdEmfaZsbbXVRDfQ21D7vbUKtu0ZWNgcbxDrig==", - "dependencies": { - "@types/command-line-args": "5.2.0", - "@types/command-line-usage": "5.0.2", - "@types/node": "18.14.5", - "@types/pad-left": "2.1.1", - "command-line-args": "5.2.1", - "command-line-usage": "6.1.3", - "flatbuffers": "23.3.3", - "json-bignum": "^0.0.3", - "pad-left": "^2.1.0", - "tslib": "^2.5.0" - }, - "bin": { - "arrow2csv": "bin/arrow2csv.js" - } - }, - "node_modules/apache-arrow/node_modules/@types/node": { - "version": "18.14.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.5.tgz", - "integrity": "sha512-CRT4tMK/DHYhw1fcCEBwME9CSaZNclxfzVMe7GsO6ULSwsttbj70wSiX6rZdIjGblu93sTJxLdhNIT85KKI7Qw==" - }, "node_modules/arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", diff --git a/package.json b/package.json index 045aecd..2820fbc 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,10 @@ "!dist/tsconfig.tsbuildinfo", "!dist/**/*.map" ], + "type": "module", + "exports": { + "./serve": "./dist/serve.js" + }, "scripts": { "dev": "ts-node src/index.ts", "build": "rm -rf dist && tsc", @@ -65,8 +69,8 @@ } }, "dependencies": { + "@apache-arrow/esnext-esm": "^12.0.1", "@cloudquery/plugin-pb-javascript": "^0.0.6", - "apache-arrow": "^12.0.1", "yargs": "^17.7.2" } } diff --git a/src/arrow/index.test.ts b/src/arrow/index.test.ts index f704db4..b74c40e 100644 --- a/src/arrow/index.test.ts +++ b/src/arrow/index.test.ts @@ -1,5 +1,5 @@ import test from 'ava'; -import { testArrow } from './'; +import { testArrow } from './index.js'; test('testArrow', (t) => { const vectors = testArrow(); diff --git a/src/arrow/index.ts b/src/arrow/index.ts index df0b4a2..1ff71fb 100644 --- a/src/arrow/index.ts +++ b/src/arrow/index.ts @@ -1,4 +1,4 @@ -import { makeVector, vectorFromArray, Dictionary, Uint8, Utf8 } from 'apache-arrow'; +import { makeVector, vectorFromArray, Dictionary, Uint8, Utf8 } from '@apache-arrow/esnext-esm'; export const testArrow = () => { const uft8Vector = vectorFromArray(['foo', 'bar', 'baz'], new Utf8()); diff --git a/src/grpc/server.test.ts b/src/grpc/server.test.ts index ac8d882..dd13e31 100644 --- a/src/grpc/server.test.ts +++ b/src/grpc/server.test.ts @@ -1,5 +1,5 @@ import test from 'ava'; -import { getServer } from './server'; +import { getServer } from './server.js'; test('getServer', (t) => { const serve = getServer(); diff --git a/src/main.ts b/src/main.ts index 644afcf..b9abefd 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,4 +1,4 @@ #!/usr/bin/env node -import { serve } from './serve'; +import { serve } from './serve.js'; serve.parse(); diff --git a/src/serve.test.ts b/src/serve.test.ts index 116e620..e6946ed 100644 --- a/src/serve.test.ts +++ b/src/serve.test.ts @@ -1,5 +1,5 @@ import test from 'ava'; -import { serve as serveWithExit, ServeArgs } from './serve'; +import { serve as serveWithExit, ServeArgs } from './serve.js'; const serve = serveWithExit.exitProcess(false);