Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop relying on experimental-specifier-resolution #397

Merged
merged 1 commit into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .mocharc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"node-option": [
"experimental-specifier-resolution=node",
"loader=ts-node/esm",
"no-warnings"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
concat,
arr,
fill,
} from "./index";
} from "./index.js";

describe("common", () => {
describe("integerToOctetStringLE", () => {
Expand Down
12 changes: 6 additions & 6 deletions packages/dap/src/aggregator.spec.ts
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
12 changes: 8 additions & 4 deletions packages/dap/src/aggregator.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/ciphertext.spec.ts
Original file line number Diff line number Diff line change
@@ -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", () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/ciphertext.ts
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
10 changes: 5 additions & 5 deletions packages/dap/src/client.spec.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
18 changes: 9 additions & 9 deletions packages/dap/src/client.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/encoding.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
encodeOpaque16,
Parser,
ParseSource,
} from "./encoding";
} from "./encoding.js";

class Uint16 implements Encodable {
constructor(public n: number) {}
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/errors.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DAPError } from "./errors";
import { DAPError } from "./errors.js";
import assert from "assert";

describe("DAPError", () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/errors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TaskId } from "./taskId";
import { TaskId } from "./taskId.js";

interface Problem {
type: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/extension.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Buffer } from "buffer";
import { Encodable } from "./encoding";
import { Encodable } from "./encoding.js";

enum ExtensionType {
TBD,
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/hpkeConfig.spec.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
4 changes: 2 additions & 2 deletions packages/dap/src/hpkeConfig.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions packages/dap/src/index.ts
Original file line number Diff line number Diff line change
@@ -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";
10 changes: 5 additions & 5 deletions packages/dap/src/report.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
12 changes: 6 additions & 6 deletions packages/dap/src/report.ts
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/reportId.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReportId } from "./reportId";
import { ReportId } from "./reportId.js";
import assert from "assert";

describe("DAP ReportID", () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/reportId.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Encodable } from "./encoding";
import { Encodable } from "./encoding.js";
import { randomBytes } from "@divviup/common";
import { Buffer } from "buffer";

Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/taskId.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TaskId } from "./taskId";
import { TaskId } from "./taskId.js";
import assert from "assert";

describe("DAP TaskId", () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/taskId.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions packages/field/src/PrimeField.spec.ts
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion packages/field/src/PrimeField.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/field/src/index.spec.ts
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions packages/field/src/index.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/interop-test-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/interop-test-client/src/index.spec.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/prg/src/index.spec.ts
Original file line number Diff line number Diff line change
@@ -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" };

Expand Down
6 changes: 3 additions & 3 deletions packages/prg/src/index.ts
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 1 addition & 1 deletion packages/prg/src/sha3.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/prio3/src/circuit.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions packages/prio3/src/circuits/count.ts
Original file line number Diff line number Diff line change
@@ -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<boolean, number> {
gadgets = [new Mul()];
Expand Down
4 changes: 2 additions & 2 deletions packages/prio3/src/circuits/histogram.ts
Original file line number Diff line number Diff line change
@@ -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<number, number[]> {
gadgets = [new PolyEval([0n, -1n, 1n])];
Expand Down
4 changes: 2 additions & 2 deletions packages/prio3/src/circuits/proof.ts
Original file line number Diff line number Diff line change
@@ -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<M, AR> extends Circuit<M, AR> {
gadgets: ProofGadget[];
Expand Down
4 changes: 2 additions & 2 deletions packages/prio3/src/circuits/query.ts
Original file line number Diff line number Diff line change
@@ -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<M, AR> extends Circuit<M, AR> {
gadgets: QueryGadget[];
Expand Down
4 changes: 2 additions & 2 deletions packages/prio3/src/circuits/sum.ts
Original file line number Diff line number Diff line change
@@ -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<number | bigint, bigint> {
Expand Down
2 changes: 1 addition & 1 deletion packages/prio3/src/flp.spec.ts
Original file line number Diff line number Diff line change
@@ -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<M, AR>(
flp: Flp<M, AR>,
Expand Down
2 changes: 1 addition & 1 deletion packages/prio3/src/gadgets/mul.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/prio3/src/gadgets/polyEval.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/prio3/src/gadgets/proof.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/prio3/src/gadgets/query.ts
Original file line number Diff line number Diff line change
@@ -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[][];
Expand Down
Loading