From 06147212a8e320f057ba4d95215a80b780d385f0 Mon Sep 17 00:00:00 2001 From: David Cook Date: Fri, 8 Sep 2023 15:21:58 -0500 Subject: [PATCH] Stop relying on experimental-specifier-resolution --- .mocharc.json | 1 - packages/common/src/index.spec.ts | 2 +- packages/dap/src/aggregator.spec.ts | 12 ++++++------ packages/dap/src/aggregator.ts | 12 ++++++++---- packages/dap/src/ciphertext.spec.ts | 2 +- packages/dap/src/ciphertext.ts | 2 +- packages/dap/src/client.spec.ts | 10 +++++----- packages/dap/src/client.ts | 18 +++++++++--------- packages/dap/src/encoding.spec.ts | 2 +- packages/dap/src/errors.spec.ts | 2 +- packages/dap/src/errors.ts | 2 +- packages/dap/src/extension.ts | 2 +- packages/dap/src/hpkeConfig.spec.ts | 2 +- packages/dap/src/hpkeConfig.ts | 4 ++-- packages/dap/src/index.ts | 12 ++++++------ packages/dap/src/report.spec.ts | 10 +++++----- packages/dap/src/report.ts | 12 ++++++------ packages/dap/src/reportId.spec.ts | 2 +- packages/dap/src/reportId.ts | 2 +- packages/dap/src/taskId.spec.ts | 2 +- packages/dap/src/taskId.ts | 2 +- packages/field/src/PrimeField.spec.ts | 4 ++-- packages/field/src/PrimeField.ts | 2 +- packages/field/src/index.spec.ts | 2 +- packages/field/src/index.ts | 4 ++-- packages/interop-test-client/package.json | 2 +- packages/interop-test-client/src/index.spec.ts | 2 +- packages/prg/src/index.spec.ts | 2 +- packages/prg/src/index.ts | 6 +++--- packages/prg/src/sha3.ts | 2 +- packages/prio3/src/circuit.ts | 2 +- packages/prio3/src/circuits/count.ts | 4 ++-- packages/prio3/src/circuits/histogram.ts | 4 ++-- packages/prio3/src/circuits/proof.ts | 4 ++-- packages/prio3/src/circuits/query.ts | 4 ++-- packages/prio3/src/circuits/sum.ts | 4 ++-- packages/prio3/src/flp.spec.ts | 2 +- packages/prio3/src/gadgets/mul.ts | 2 +- packages/prio3/src/gadgets/polyEval.ts | 2 +- packages/prio3/src/gadgets/proof.ts | 2 +- packages/prio3/src/gadgets/query.ts | 2 +- packages/prio3/src/genericFlp.spec.ts | 18 +++++++++--------- packages/prio3/src/genericFlp.ts | 8 ++++---- packages/prio3/src/index.ts | 4 ++-- packages/prio3/src/instantiations.ts | 10 +++++----- packages/prio3/src/prio3.spec.ts | 6 +++--- packages/prio3/src/prio3.ts | 2 +- packages/vdaf/src/index.spec.ts | 2 +- 48 files changed, 113 insertions(+), 110 deletions(-) diff --git a/.mocharc.json b/.mocharc.json index 8e868f641..23c6ddfd9 100644 --- a/.mocharc.json +++ b/.mocharc.json @@ -1,6 +1,5 @@ { "node-option": [ - "experimental-specifier-resolution=node", "loader=ts-node/esm", "no-warnings" ] diff --git a/packages/common/src/index.spec.ts b/packages/common/src/index.spec.ts index e203cd12f..989621c66 100644 --- a/packages/common/src/index.spec.ts +++ b/packages/common/src/index.spec.ts @@ -11,7 +11,7 @@ import { concat, arr, fill, -} from "./index"; +} from "./index.js"; describe("common", () => { describe("integerToOctetStringLE", () => { diff --git a/packages/dap/src/aggregator.spec.ts b/packages/dap/src/aggregator.spec.ts index 17fffd7a7..985f2b7cf 100644 --- a/packages/dap/src/aggregator.spec.ts +++ b/packages/dap/src/aggregator.spec.ts @@ -1,15 +1,15 @@ -import { Aggregator } from "./aggregator"; +import { Aggregator } from "./aggregator.js"; import assert from "assert"; -import { Role } from "./constants"; -import { HpkeConfig, HpkeConfigList } from "./hpkeConfig"; +import { Role } from "./constants.js"; +import { HpkeConfig, HpkeConfigList } from "./hpkeConfig.js"; import { InputShareAad, InputShareInfo, PlaintextInputShare, ReportMetadata, -} from "./report"; -import { TaskId } from "./taskId"; -import { ReportId } from "./reportId"; +} from "./report.js"; +import { TaskId } from "./taskId.js"; +import { ReportId } from "./reportId.js"; import { KdfId, AeadId } from "hpke-js"; import { DhkemP256HkdfSha256 } from "@hpke/core"; diff --git a/packages/dap/src/aggregator.ts b/packages/dap/src/aggregator.ts index 24340574b..74155a577 100644 --- a/packages/dap/src/aggregator.ts +++ b/packages/dap/src/aggregator.ts @@ -1,7 +1,11 @@ -import { Role } from "./constants"; -import { InputShareAad, InputShareInfo, PlaintextInputShare } from "./report"; -import { HpkeCiphertext } from "./ciphertext"; -import { HpkeConfigList } from "./hpkeConfig"; +import { Role } from "./constants.js"; +import { + InputShareAad, + InputShareInfo, + PlaintextInputShare, +} from "./report.js"; +import { HpkeCiphertext } from "./ciphertext.js"; +import { HpkeConfigList } from "./hpkeConfig.js"; export class Aggregator { public url: URL; diff --git a/packages/dap/src/ciphertext.spec.ts b/packages/dap/src/ciphertext.spec.ts index 58b898bbc..373a9959c 100644 --- a/packages/dap/src/ciphertext.spec.ts +++ b/packages/dap/src/ciphertext.spec.ts @@ -1,4 +1,4 @@ -import { HpkeCiphertext } from "./ciphertext"; +import { HpkeCiphertext } from "./ciphertext.js"; import assert from "assert"; describe("DAP HpkeCiphertext", () => { it("cannot be built from a negative configId", () => { diff --git a/packages/dap/src/ciphertext.ts b/packages/dap/src/ciphertext.ts index 87372aae1..ca22f8fa3 100644 --- a/packages/dap/src/ciphertext.ts +++ b/packages/dap/src/ciphertext.ts @@ -1,5 +1,5 @@ import { Buffer } from "buffer"; -import { Encodable, encodeOpaque16, encodeOpaque32 } from "./encoding"; +import { Encodable, encodeOpaque16, encodeOpaque32 } from "./encoding.js"; export class HpkeCiphertext implements Encodable { constructor( diff --git a/packages/dap/src/client.spec.ts b/packages/dap/src/client.spec.ts index c9c3d74ba..cb04f3282 100644 --- a/packages/dap/src/client.spec.ts +++ b/packages/dap/src/client.spec.ts @@ -1,10 +1,10 @@ import assert from "assert"; -import { DAPClient, KnownVdafSpec, VdafMeasurement } from "./client"; -import { HpkeConfig, HpkeConfigList } from "./hpkeConfig"; -import { TaskId } from "./taskId"; -import { DAPError } from "./errors"; +import { DAPClient, KnownVdafSpec, VdafMeasurement } from "./client.js"; +import { HpkeConfig, HpkeConfigList } from "./hpkeConfig.js"; +import { TaskId } from "./taskId.js"; +import { DAPError } from "./errors.js"; import { zip } from "@divviup/common"; -import { encodeOpaque32 } from "./encoding"; +import { encodeOpaque32 } from "./encoding.js"; import { Prio3Count, Prio3Histogram, Prio3Sum } from "@divviup/prio3"; import { inspect } from "node:util"; import { KdfId, AeadId, CipherSuite } from "hpke-js"; diff --git a/packages/dap/src/client.ts b/packages/dap/src/client.ts index 3711888bc..0d1409804 100644 --- a/packages/dap/src/client.ts +++ b/packages/dap/src/client.ts @@ -1,22 +1,22 @@ import { Buffer } from "buffer"; -import { TaskId } from "./taskId"; -import { ReportId } from "./reportId"; +import { TaskId } from "./taskId.js"; +import { ReportId } from "./reportId.js"; import { Report, ReportMetadata, InputShareAad, PlaintextInputShare, -} from "./report"; -import { HpkeConfigList } from "./hpkeConfig"; +} from "./report.js"; +import { HpkeConfigList } from "./hpkeConfig.js"; import { ClientVdaf } from "@divviup/vdaf"; -import { Extension } from "./extension"; -import { DAPError } from "./errors"; -import { CONTENT_TYPES, DAP_VERSION } from "./constants"; -import { Aggregator } from "./aggregator"; +import { Extension } from "./extension.js"; +import { DAPError } from "./errors.js"; +import { CONTENT_TYPES, DAP_VERSION } from "./constants.js"; +import { Aggregator } from "./aggregator.js"; import { Prio3Count, Prio3Histogram, Prio3Sum } from "@divviup/prio3"; import { randomBytes } from "@divviup/common"; -export { TaskId } from "./taskId"; +export { TaskId } from "./taskId.js"; export interface ReportOptions { timestamp?: Date; diff --git a/packages/dap/src/encoding.spec.ts b/packages/dap/src/encoding.spec.ts index 7f126736d..90e2ccc3a 100644 --- a/packages/dap/src/encoding.spec.ts +++ b/packages/dap/src/encoding.spec.ts @@ -7,7 +7,7 @@ import { encodeOpaque16, Parser, ParseSource, -} from "./encoding"; +} from "./encoding.js"; class Uint16 implements Encodable { constructor(public n: number) {} diff --git a/packages/dap/src/errors.spec.ts b/packages/dap/src/errors.spec.ts index 7781f00dc..fb0717105 100644 --- a/packages/dap/src/errors.spec.ts +++ b/packages/dap/src/errors.spec.ts @@ -1,4 +1,4 @@ -import { DAPError } from "./errors"; +import { DAPError } from "./errors.js"; import assert from "assert"; describe("DAPError", () => { diff --git a/packages/dap/src/errors.ts b/packages/dap/src/errors.ts index 4f6cea0f6..e12c5348a 100644 --- a/packages/dap/src/errors.ts +++ b/packages/dap/src/errors.ts @@ -1,4 +1,4 @@ -import { TaskId } from "./taskId"; +import { TaskId } from "./taskId.js"; interface Problem { type: string; diff --git a/packages/dap/src/extension.ts b/packages/dap/src/extension.ts index b30f29cd9..3ca27539c 100644 --- a/packages/dap/src/extension.ts +++ b/packages/dap/src/extension.ts @@ -1,5 +1,5 @@ import { Buffer } from "buffer"; -import { Encodable } from "./encoding"; +import { Encodable } from "./encoding.js"; enum ExtensionType { TBD, diff --git a/packages/dap/src/hpkeConfig.spec.ts b/packages/dap/src/hpkeConfig.spec.ts index 84cb688f8..e8fa3c8c9 100644 --- a/packages/dap/src/hpkeConfig.spec.ts +++ b/packages/dap/src/hpkeConfig.spec.ts @@ -1,4 +1,4 @@ -import { HpkeConfig, HpkeConfigList } from "./hpkeConfig"; +import { HpkeConfig, HpkeConfigList } from "./hpkeConfig.js"; import assert from "assert"; import { KemId, KdfId, AeadId } from "hpke-js"; import { DhkemX25519HkdfSha256 } from "@hpke/dhkem-x25519"; diff --git a/packages/dap/src/hpkeConfig.ts b/packages/dap/src/hpkeConfig.ts index 4197d74b2..a40c0aabc 100644 --- a/packages/dap/src/hpkeConfig.ts +++ b/packages/dap/src/hpkeConfig.ts @@ -1,7 +1,7 @@ import { Buffer } from "buffer"; import { CipherSuite, KemId, KdfId, AeadId } from "hpke-js"; -import { Parser, ParseSource, Encodable, encodeArray16 } from "./encoding"; -import { HpkeCiphertext } from "./ciphertext"; +import { Parser, ParseSource, Encodable, encodeArray16 } from "./encoding.js"; +import { HpkeCiphertext } from "./ciphertext.js"; export class HpkeConfigList implements Encodable { #selectedConfig?: HpkeConfig; diff --git a/packages/dap/src/index.ts b/packages/dap/src/index.ts index 439f30478..8df4fca60 100644 --- a/packages/dap/src/index.ts +++ b/packages/dap/src/index.ts @@ -1,6 +1,6 @@ -export { DAPClient, DAPClient as default } from "./client"; -export { DAPError } from "./errors"; -export type { ReportOptions } from "./client"; -export { KnownVdafSpec, VdafMeasurement } from "./client"; -export { TaskId } from "./taskId"; -export { HpkeConfig } from "./hpkeConfig"; +export { DAPClient, DAPClient as default } from "./client.js"; +export { DAPError } from "./errors.js"; +export type { ReportOptions } from "./client.js"; +export { KnownVdafSpec, VdafMeasurement } from "./client.js"; +export { TaskId } from "./taskId.js"; +export { HpkeConfig } from "./hpkeConfig.js"; diff --git a/packages/dap/src/report.spec.ts b/packages/dap/src/report.spec.ts index ca95eaaac..4a0cab947 100644 --- a/packages/dap/src/report.spec.ts +++ b/packages/dap/src/report.spec.ts @@ -4,12 +4,12 @@ import { PlaintextInputShare, Report, ReportMetadata, -} from "./report"; -import { TaskId } from "./taskId"; -import { ReportId } from "./reportId"; -import { HpkeCiphertext } from "./ciphertext"; +} from "./report.js"; +import { TaskId } from "./taskId.js"; +import { ReportId } from "./reportId.js"; +import { HpkeCiphertext } from "./ciphertext.js"; import assert from "assert"; -import { Role } from "./constants"; +import { Role } from "./constants.js"; describe("DAP Report", () => { it("encodes as expected", () => { diff --git a/packages/dap/src/report.ts b/packages/dap/src/report.ts index ce84a64ff..aeac5b5ad 100644 --- a/packages/dap/src/report.ts +++ b/packages/dap/src/report.ts @@ -1,15 +1,15 @@ import { Buffer } from "buffer"; -import { TaskId } from "./taskId"; +import { TaskId } from "./taskId.js"; import { Encodable, encodeArray32, encodeArray16, encodeOpaque32, -} from "./encoding"; -import { ReportId } from "./reportId"; -import { HpkeCiphertext } from "./ciphertext"; -import { DAP_VERSION, Role } from "./constants"; -import { Extension } from "./extension"; +} from "./encoding.js"; +import { ReportId } from "./reportId.js"; +import { HpkeCiphertext } from "./ciphertext.js"; +import { DAP_VERSION, Role } from "./constants.js"; +import { Extension } from "./extension.js"; export class ReportMetadata implements Encodable { constructor( diff --git a/packages/dap/src/reportId.spec.ts b/packages/dap/src/reportId.spec.ts index 926bb8cff..56a7d3458 100644 --- a/packages/dap/src/reportId.spec.ts +++ b/packages/dap/src/reportId.spec.ts @@ -1,4 +1,4 @@ -import { ReportId } from "./reportId"; +import { ReportId } from "./reportId.js"; import assert from "assert"; describe("DAP ReportID", () => { diff --git a/packages/dap/src/reportId.ts b/packages/dap/src/reportId.ts index 57a646a67..af596a3ca 100644 --- a/packages/dap/src/reportId.ts +++ b/packages/dap/src/reportId.ts @@ -1,4 +1,4 @@ -import { Encodable } from "./encoding"; +import { Encodable } from "./encoding.js"; import { randomBytes } from "@divviup/common"; import { Buffer } from "buffer"; diff --git a/packages/dap/src/taskId.spec.ts b/packages/dap/src/taskId.spec.ts index 45aef243b..e6fb0c1cd 100644 --- a/packages/dap/src/taskId.spec.ts +++ b/packages/dap/src/taskId.spec.ts @@ -1,4 +1,4 @@ -import { TaskId } from "./taskId"; +import { TaskId } from "./taskId.js"; import assert from "assert"; describe("DAP TaskId", () => { diff --git a/packages/dap/src/taskId.ts b/packages/dap/src/taskId.ts index 85fc5eefd..b6dee0d1d 100644 --- a/packages/dap/src/taskId.ts +++ b/packages/dap/src/taskId.ts @@ -1,6 +1,6 @@ import { Buffer } from "buffer"; import { randomBytes } from "@divviup/common"; -import { Encodable } from "./encoding"; +import { Encodable } from "./encoding.js"; export class TaskId implements Encodable { buffer: Buffer; diff --git a/packages/field/src/PrimeField.spec.ts b/packages/field/src/PrimeField.spec.ts index 21887c867..5bce6fb4f 100644 --- a/packages/field/src/PrimeField.spec.ts +++ b/packages/field/src/PrimeField.spec.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-call */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ import { expect } from "chai"; -import { PrimeField } from "./PrimeField"; -import { Vector } from "./Vector"; +import { PrimeField } from "./PrimeField.js"; +import { Vector } from "./Vector.js"; let F: PrimeField; diff --git a/packages/field/src/PrimeField.ts b/packages/field/src/PrimeField.ts index f593c6280..f9ea5d1fb 100644 --- a/packages/field/src/PrimeField.ts +++ b/packages/field/src/PrimeField.ts @@ -1,6 +1,6 @@ /// source: https://github.com/GuildOfWeavers/galois import { webcrypto } from "one-webcrypto"; -import { Vector } from "./Vector"; +import { Vector } from "./Vector.js"; import { octetStringToIntegerBE } from "@divviup/common"; // IMPORTS diff --git a/packages/field/src/index.spec.ts b/packages/field/src/index.spec.ts index 8d31eefea..d36b663f9 100644 --- a/packages/field/src/index.spec.ts +++ b/packages/field/src/index.spec.ts @@ -1,5 +1,5 @@ import assert from "assert"; -import { Field, Field64, Field96, Field128 } from "."; +import { Field, Field64, Field96, Field128 } from "./index.js"; import { arr } from "@divviup/common"; function testField(field: Field, name: string) { diff --git a/packages/field/src/index.ts b/packages/field/src/index.ts index d764e4849..031eb087d 100644 --- a/packages/field/src/index.ts +++ b/packages/field/src/index.ts @@ -1,5 +1,5 @@ -import { PrimeField } from "./PrimeField"; -export { Vector } from "./Vector"; +import { PrimeField } from "./PrimeField.js"; +export { Vector } from "./Vector.js"; import { integerToOctetStringLE, octetStringToIntegerLE, diff --git a/packages/interop-test-client/package.json b/packages/interop-test-client/package.json index cacc98e5a..3f4916773 100644 --- a/packages/interop-test-client/package.json +++ b/packages/interop-test-client/package.json @@ -6,7 +6,7 @@ "type": "module", "scripts": { "check": "tsc --noEmit -p ./tsconfig.json", - "start": "node --no-warnings --experimental-specifier-resolution=node --experimental-loader=ts-node/esm src/index.ts", + "start": "node --no-warnings --experimental-loader=ts-node/esm src/index.ts", "test": "mocha \"src/**/*.spec.ts\"", "lint": "eslint src --ext .ts && prettier -c src --ignore-path ../../.prettierignore", "format": "prettier -w src", diff --git a/packages/interop-test-client/src/index.spec.ts b/packages/interop-test-client/src/index.spec.ts index 478bd0d3c..48a21c6d6 100644 --- a/packages/interop-test-client/src/index.spec.ts +++ b/packages/interop-test-client/src/index.spec.ts @@ -1,4 +1,4 @@ -import { app } from "."; +import { app } from "./index.js"; import { arr, randomBytes } from "@divviup/common"; import { AddressInfo } from "node:net"; import { spawnSync, SpawnSyncReturns } from "node:child_process"; diff --git a/packages/prg/src/index.spec.ts b/packages/prg/src/index.spec.ts index 9c72b8381..90f57cced 100644 --- a/packages/prg/src/index.spec.ts +++ b/packages/prg/src/index.spec.ts @@ -1,5 +1,5 @@ import { assert } from "chai"; -import { PrgSha3 } from "."; +import { PrgSha3 } from "./index.js"; import { Field128, Field64 } from "@divviup/field"; import PrgSha3TestVector from "./testVectors/PrgSha3.json" assert { type: "json" }; diff --git a/packages/prg/src/index.ts b/packages/prg/src/index.ts index 782c9e87c..1ea388d9d 100644 --- a/packages/prg/src/index.ts +++ b/packages/prg/src/index.ts @@ -1,3 +1,3 @@ -export { Prg } from "./prg"; -export type { PrgConstructor } from "./prg"; -export { PrgSha3 } from "./sha3"; +export { Prg } from "./prg.js"; +export type { PrgConstructor } from "./prg.js"; +export { PrgSha3 } from "./sha3.js"; diff --git a/packages/prg/src/sha3.ts b/packages/prg/src/sha3.ts index 6474addfc..6945ca3ec 100644 --- a/packages/prg/src/sha3.ts +++ b/packages/prg/src/sha3.ts @@ -1,5 +1,5 @@ import jsSHA from "jssha"; -import { PrgConstructor, Prg } from "./prg"; +import { PrgConstructor, Prg } from "./prg.js"; export const PrgSha3: PrgConstructor = class PrgSha3 extends Prg { static seedSize = 16; diff --git a/packages/prio3/src/circuit.ts b/packages/prio3/src/circuit.ts index 13dd6f1ac..1b39934d8 100644 --- a/packages/prio3/src/circuit.ts +++ b/packages/prio3/src/circuit.ts @@ -1,5 +1,5 @@ import { Field } from "@divviup/field"; -import { Gadget } from "./gadget"; +import { Gadget } from "./gadget.js"; import { nextPowerOf2 } from "@divviup/common"; export interface GenericCircuit { diff --git a/packages/prio3/src/circuits/count.ts b/packages/prio3/src/circuits/count.ts index b574a3c54..8aac6f127 100644 --- a/packages/prio3/src/circuits/count.ts +++ b/packages/prio3/src/circuits/count.ts @@ -1,6 +1,6 @@ -import { Circuit } from "../circuit"; +import { Circuit } from "../circuit.js"; import { Field64 } from "@divviup/field"; -import { Mul } from "../gadgets/mul"; +import { Mul } from "../gadgets/mul.js"; export class Count extends Circuit { gadgets = [new Mul()]; diff --git a/packages/prio3/src/circuits/histogram.ts b/packages/prio3/src/circuits/histogram.ts index 26954a566..5fbcf3dfb 100644 --- a/packages/prio3/src/circuits/histogram.ts +++ b/packages/prio3/src/circuits/histogram.ts @@ -1,6 +1,6 @@ -import { Circuit } from "../circuit"; +import { Circuit } from "../circuit.js"; import { Field128 } from "@divviup/field"; -import { PolyEval } from "../gadgets/polyEval"; +import { PolyEval } from "../gadgets/polyEval.js"; export class Histogram extends Circuit { gadgets = [new PolyEval([0n, -1n, 1n])]; diff --git a/packages/prio3/src/circuits/proof.ts b/packages/prio3/src/circuits/proof.ts index 975b9de31..7a55e01dc 100644 --- a/packages/prio3/src/circuits/proof.ts +++ b/packages/prio3/src/circuits/proof.ts @@ -1,6 +1,6 @@ -import { Circuit } from "../circuit"; +import { Circuit } from "../circuit.js"; import { Field } from "@divviup/field"; -import { Proof as ProofGadget } from "../gadgets/proof"; +import { Proof as ProofGadget } from "../gadgets/proof.js"; export class Proof extends Circuit { gadgets: ProofGadget[]; diff --git a/packages/prio3/src/circuits/query.ts b/packages/prio3/src/circuits/query.ts index a7a1636a5..e8357f717 100644 --- a/packages/prio3/src/circuits/query.ts +++ b/packages/prio3/src/circuits/query.ts @@ -1,7 +1,7 @@ -import { Circuit } from "../circuit"; +import { Circuit } from "../circuit.js"; import { Field } from "@divviup/field"; import { nextPowerOf2 } from "@divviup/common"; -import { Query as QueryGadget } from "../gadgets/query"; +import { Query as QueryGadget } from "../gadgets/query.js"; export class Query extends Circuit { gadgets: QueryGadget[]; diff --git a/packages/prio3/src/circuits/sum.ts b/packages/prio3/src/circuits/sum.ts index bf8e734f4..d19041906 100644 --- a/packages/prio3/src/circuits/sum.ts +++ b/packages/prio3/src/circuits/sum.ts @@ -1,6 +1,6 @@ -import { Circuit } from "../circuit"; +import { Circuit } from "../circuit.js"; import { Field128 } from "@divviup/field"; -import { PolyEval } from "../gadgets/polyEval"; +import { PolyEval } from "../gadgets/polyEval.js"; import { arr } from "@divviup/common"; export class Sum extends Circuit { diff --git a/packages/prio3/src/flp.spec.ts b/packages/prio3/src/flp.spec.ts index 9bd2e6e16..0fee7c0df 100644 --- a/packages/prio3/src/flp.spec.ts +++ b/packages/prio3/src/flp.spec.ts @@ -1,6 +1,6 @@ import assert from "assert"; import { Field, Field128 } from "@divviup/field"; -import { Flp } from "./flp"; +import { Flp } from "./flp.js"; export function runFlp( flp: Flp, diff --git a/packages/prio3/src/gadgets/mul.ts b/packages/prio3/src/gadgets/mul.ts index 83c966696..5d9725e4f 100644 --- a/packages/prio3/src/gadgets/mul.ts +++ b/packages/prio3/src/gadgets/mul.ts @@ -1,5 +1,5 @@ import { Field } from "@divviup/field"; -import { Gadget } from "../gadget"; +import { Gadget } from "../gadget.js"; export class Mul extends Gadget { arity = 2; diff --git a/packages/prio3/src/gadgets/polyEval.ts b/packages/prio3/src/gadgets/polyEval.ts index 6d76fa545..6b4097626 100644 --- a/packages/prio3/src/gadgets/polyEval.ts +++ b/packages/prio3/src/gadgets/polyEval.ts @@ -1,6 +1,6 @@ import { fill } from "@divviup/common"; import { Field } from "@divviup/field"; -import { Gadget } from "../gadget"; +import { Gadget } from "../gadget.js"; function stripPolynomial(polynomial: bigint[]): bigint[] { let index = polynomial.length - 1; diff --git a/packages/prio3/src/gadgets/proof.ts b/packages/prio3/src/gadgets/proof.ts index 0d040f7c1..6fc5fa752 100644 --- a/packages/prio3/src/gadgets/proof.ts +++ b/packages/prio3/src/gadgets/proof.ts @@ -1,6 +1,6 @@ import { Field } from "@divviup/field"; import { arr, fill, nextPowerOf2 } from "@divviup/common"; -import { Gadget } from "../gadget"; +import { Gadget } from "../gadget.js"; export class Proof extends Gadget { gadget: Gadget; diff --git a/packages/prio3/src/gadgets/query.ts b/packages/prio3/src/gadgets/query.ts index b02e75425..f1f43efbf 100644 --- a/packages/prio3/src/gadgets/query.ts +++ b/packages/prio3/src/gadgets/query.ts @@ -1,6 +1,6 @@ import { Field } from "@divviup/field"; import { nextPowerOf2, arr, fill } from "@divviup/common"; -import { Gadget } from "../gadget"; +import { Gadget } from "../gadget.js"; export class Query extends Gadget { wire: bigint[][]; diff --git a/packages/prio3/src/genericFlp.spec.ts b/packages/prio3/src/genericFlp.spec.ts index ede3d017f..fcc3efe3f 100644 --- a/packages/prio3/src/genericFlp.spec.ts +++ b/packages/prio3/src/genericFlp.spec.ts @@ -1,15 +1,15 @@ -import { Gadget } from "./gadget"; +import { Gadget } from "./gadget.js"; import { Field, Field128, Field64 } from "@divviup/field"; -import { Count } from "./circuits/count"; -import { Sum } from "./circuits/sum"; -import { Histogram } from "./circuits/histogram"; -import { FlpGeneric } from "./genericFlp"; -import { runFlp } from "./flp.spec"; -import { Circuit, GenericCircuit } from "./circuit"; +import { Count } from "./circuits/count.js"; +import { Sum } from "./circuits/sum.js"; +import { Histogram } from "./circuits/histogram.js"; +import { FlpGeneric } from "./genericFlp.js"; +import { runFlp } from "./flp.spec.js"; +import { Circuit, GenericCircuit } from "./circuit.js"; import { arr, nextPowerOf2 } from "@divviup/common"; import assert from "assert"; -import { PolyEval } from "./gadgets/polyEval"; -import { Mul } from "./gadgets/mul"; +import { PolyEval } from "./gadgets/polyEval.js"; +import { Mul } from "./gadgets/mul.js"; function testGadget(gadget: Gadget, field: Field, testLength: number) { const evalAt = field.randomElement(); diff --git a/packages/prio3/src/genericFlp.ts b/packages/prio3/src/genericFlp.ts index 915ad5a1f..af43530bf 100644 --- a/packages/prio3/src/genericFlp.ts +++ b/packages/prio3/src/genericFlp.ts @@ -1,9 +1,9 @@ import { arr } from "@divviup/common"; -import { Flp } from "./flp"; +import { Flp } from "./flp.js"; import { Field } from "@divviup/field"; -import { Circuit } from "./circuit"; -import { Query } from "./circuits/query"; -import { Proof } from "./circuits/proof"; +import { Circuit } from "./circuit.js"; +import { Query } from "./circuits/query.js"; +import { Proof } from "./circuits/proof.js"; export class FlpGeneric implements Flp { constructor(public circuit: Circuit) {} diff --git a/packages/prio3/src/index.ts b/packages/prio3/src/index.ts index fb0f21056..7b7675291 100644 --- a/packages/prio3/src/index.ts +++ b/packages/prio3/src/index.ts @@ -1,2 +1,2 @@ -export { Prio3 } from "./prio3"; -export { Prio3Count, Prio3Histogram, Prio3Sum } from "./instantiations"; +export { Prio3 } from "./prio3.js"; +export { Prio3Count, Prio3Histogram, Prio3Sum } from "./instantiations.js"; diff --git a/packages/prio3/src/instantiations.ts b/packages/prio3/src/instantiations.ts index 21660eadb..9d523e112 100644 --- a/packages/prio3/src/instantiations.ts +++ b/packages/prio3/src/instantiations.ts @@ -1,9 +1,9 @@ import { PrgSha3 } from "@divviup/prg"; -import { Prio3 } from "."; -import { FlpGeneric } from "./genericFlp"; -import { Count } from "./circuits/count"; -import { Histogram } from "./circuits/histogram"; -import { Sum } from "./circuits/sum"; +import { Prio3 } from "./index.js"; +import { FlpGeneric } from "./genericFlp.js"; +import { Count } from "./circuits/count.js"; +import { Histogram } from "./circuits/histogram.js"; +import { Sum } from "./circuits/sum.js"; export class Prio3Count extends Prio3 { constructor({ shares }: { shares: number }) { diff --git a/packages/prio3/src/prio3.spec.ts b/packages/prio3/src/prio3.spec.ts index b9d26b7f2..688707475 100644 --- a/packages/prio3/src/prio3.spec.ts +++ b/packages/prio3/src/prio3.spec.ts @@ -1,7 +1,7 @@ -import { Prio3 } from "."; +import { Prio3 } from "./index.js"; import assert from "assert"; -import { Prio3Count, Prio3Histogram, Prio3Sum } from "./instantiations"; -import { TestFlp128 } from "./flp.spec"; +import { Prio3Count, Prio3Histogram, Prio3Sum } from "./instantiations.js"; +import { TestFlp128 } from "./flp.spec.js"; import { PrgSha3 } from "@divviup/prg"; import { TestVector } from "@divviup/vdaf"; import { arr } from "@divviup/common"; diff --git a/packages/prio3/src/prio3.ts b/packages/prio3/src/prio3.ts index d4313e1a4..e90cec4ea 100644 --- a/packages/prio3/src/prio3.ts +++ b/packages/prio3/src/prio3.ts @@ -2,7 +2,7 @@ import { Shares, Vdaf } from "@divviup/vdaf"; import { PrgConstructor } from "@divviup/prg"; import { fill, arr, concat } from "@divviup/common"; import { Field } from "@divviup/field"; -import { Flp } from "./flp"; +import { Flp } from "./flp.js"; import { Buffer } from "buffer"; type PrepareState = { diff --git a/packages/vdaf/src/index.spec.ts b/packages/vdaf/src/index.spec.ts index 9251e5099..b613e7ea1 100644 --- a/packages/vdaf/src/index.spec.ts +++ b/packages/vdaf/src/index.spec.ts @@ -1,5 +1,5 @@ import { Field128 } from "@divviup/field"; -import { Shares, Vdaf } from "."; +import { Shares, Vdaf } from "./index.js"; import { PrgSha3 } from "@divviup/prg"; import assert from "assert";