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

Enable stricter checks in tsc #406

Merged
merged 3 commits into from
Sep 11, 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
3 changes: 1 addition & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion packages/dap/src/ciphertext.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Buffer } from "buffer";
import { Encodable, encodeOpaque16, encodeOpaque32 } from "./encoding.js";
import type { Encodable } from "./encoding.js";
import { encodeOpaque16, encodeOpaque32 } from "./encoding.js";

export class HpkeCiphertext implements Encodable {
constructor(
Expand Down
3 changes: 2 additions & 1 deletion packages/dap/src/client.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import assert from "assert";
import { DAPClient, KnownVdafSpec, VdafMeasurement } from "./client.js";
import type { KnownVdafSpec, VdafMeasurement } from "./client.js";
import { DAPClient } from "./client.js";
import { HpkeConfig, HpkeConfigList } from "./hpkeConfig.js";
import { TaskId } from "./taskId.js";
import { DAPError } from "./errors.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/dap/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
PlaintextInputShare,
} from "./report.js";
import { HpkeConfigList } from "./hpkeConfig.js";
import { ClientVdaf } from "@divviup/vdaf";
import type { ClientVdaf } from "@divviup/vdaf";
import { Extension } from "./extension.js";
import { DAPError } from "./errors.js";
import { CONTENT_TYPES, DAP_VERSION } from "./constants.js";
Expand Down
9 changes: 2 additions & 7 deletions packages/dap/src/encoding.spec.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import assert from "assert";
import { Buffer } from "buffer";
import { arr } from "@divviup/common";
import {
Encodable,
encodeArray16,
encodeOpaque16,
Parser,
ParseSource,
} from "./encoding.js";
import type { Encodable, ParseSource } from "./encoding.js";
import { encodeArray16, encodeOpaque16, Parser } from "./encoding.js";

class Uint16 implements Encodable {
constructor(public n: number) {}
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.js";
import type { Encodable } from "./encoding.js";

enum ExtensionType {
TBD,
Expand Down
3 changes: 2 additions & 1 deletion packages/dap/src/hpkeConfig.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Buffer } from "buffer";
import { CipherSuite, KemId, KdfId, AeadId } from "hpke-js";
import { Parser, ParseSource, Encodable, encodeArray16 } from "./encoding.js";
import type { ParseSource, Encodable } from "./encoding.js";
import { Parser, encodeArray16 } from "./encoding.js";
import { HpkeCiphertext } from "./ciphertext.js";

export class HpkeConfigList implements Encodable {
Expand Down
2 changes: 1 addition & 1 deletion 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.js";
export { DAPError } from "./errors.js";
export type { ReportOptions } from "./client.js";
export { KnownVdafSpec, VdafMeasurement } from "./client.js";
export type { KnownVdafSpec, VdafMeasurement } from "./client.js";
export { TaskId } from "./taskId.js";
export { HpkeConfig } from "./hpkeConfig.js";
8 changes: 2 additions & 6 deletions packages/dap/src/report.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { Buffer } from "buffer";
import { TaskId } from "./taskId.js";
import {
Encodable,
encodeArray32,
encodeArray16,
encodeOpaque32,
} from "./encoding.js";
import type { Encodable } from "./encoding.js";
import { encodeArray32, encodeArray16, encodeOpaque32 } from "./encoding.js";
import { ReportId } from "./reportId.js";
import { HpkeCiphertext } from "./ciphertext.js";
import { DAP_VERSION, Role } from "./constants.js";
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.js";
import type { 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.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.js";
import type { Encodable } from "./encoding.js";

export class TaskId implements Encodable {
buffer: Buffer;
Expand Down
5 changes: 3 additions & 2 deletions packages/interop-test-client/src/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { app } from "./index.js";
import { arr, randomBytes } from "@divviup/common";
import { AddressInfo } from "node:net";
import { spawnSync, SpawnSyncReturns } from "node:child_process";
import type { AddressInfo } from "node:net";
import type { SpawnSyncReturns } from "node:child_process";
import { spawnSync } from "node:child_process";
import { Server } from "node:http";

const JANUS_INTEROP_AGGREGATOR_IMAGE =
Expand Down
6 changes: 4 additions & 2 deletions packages/interop-test-client/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// This script implements the client role of draft-dcook-ppm-dap-interop-test-design-02.
import express, { Request, Response } from "express";
import DAPClient, { ReportOptions } from "@divviup/dap";
import type { Request, Response } from "express";
import express from "express";
import type { ReportOptions } from "@divviup/dap";
import DAPClient from "@divviup/dap";

import * as url from "node:url";
import * as fs from "node:fs";
Expand Down
3 changes: 1 addition & 2 deletions packages/prg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"dependencies": {
"@divviup/common": "^0.1.0",
"@divviup/field": "^0.1.0",
"jssha": "^3.3.1",
"one-webcrypto": "^1.0.3"
"jssha": "^3.3.1"
}
}
3 changes: 2 additions & 1 deletion packages/prg/src/sha3.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import jsSHA from "jssha";
import { PrgConstructor, Prg } from "./prg.js";
import type { PrgConstructor } from "./prg.js";
import { 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/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.js";
import type { Flp } from "./flp.js";

export function runFlp<M, AR>(
flp: Flp<M, AR>,
Expand Down
3 changes: 2 additions & 1 deletion packages/prio3/src/genericFlp.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ 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 type { GenericCircuit } from "./circuit.js";
import { Circuit } from "./circuit.js";
import { arr, nextPowerOf2 } from "@divviup/common";
import assert from "assert";
import { PolyEval } from "./gadgets/polyEval.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/prio3/src/genericFlp.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { arr } from "@divviup/common";
import { Flp } from "./flp.js";
import type { Flp } from "./flp.js";
import { Field } from "@divviup/field";
import { Circuit } from "./circuit.js";
import { Query } from "./circuits/query.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/prio3/src/prio3.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import assert from "assert";
import { Prio3Count, Prio3Histogram, Prio3Sum } from "./instantiations.js";
import { TestFlp128 } from "./flp.spec.js";
import { PrgSha3 } from "@divviup/prg";
import { TestVector } from "@divviup/vdaf";
import type { TestVector } from "@divviup/vdaf";
import { arr } from "@divviup/common";
import countTestVector0 from "./testVectors/Prio3Count_0.json" assert { type: "json" };
import histogramTestVector0 from "./testVectors/Prio3Histogram_0.json" assert { type: "json" };
Expand Down
7 changes: 4 additions & 3 deletions packages/prio3/src/prio3.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Shares, Vdaf } from "@divviup/vdaf";
import { PrgConstructor } from "@divviup/prg";
import type { Shares } from "@divviup/vdaf";
import { Vdaf } from "@divviup/vdaf";
import type { PrgConstructor } from "@divviup/prg";
import { fill, arr, concat } from "@divviup/common";
import { Field } from "@divviup/field";
import { Flp } from "./flp.js";
import type { Flp } from "./flp.js";
import { Buffer } from "buffer";

type PrepareState = {
Expand Down
3 changes: 2 additions & 1 deletion packages/vdaf/src/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Field128 } from "@divviup/field";
import { Shares, Vdaf } from "./index.js";
import type { Shares } from "./index.js";
import { Vdaf } from "./index.js";
import { PrgSha3 } from "@divviup/prg";
import assert from "assert";

Expand Down
2 changes: 2 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"lib": ["dom", "es2020"],
"module": "esnext",
"moduleResolution": "node",
"strict": true,
"verbatimModuleSyntax": true,
"preserveConstEnums": true,
"esModuleInterop": true,
"declaration": true,
Expand Down