diff --git a/__test__/lib/zip-format.test.js b/__test__/lib/zip-format.test.js index 45556dd17..d1911ba26 100644 --- a/__test__/lib/zip-format.test.js +++ b/__test__/lib/zip-format.test.js @@ -1,4 +1,4 @@ -import {getFormattedZip, zipToTimeZone} from "../../src/lib"; +import {getFormattedZip, zipToTimeZone} from "../../src/lib/zip-format"; describe('test getFormattedZip', () => { it('handles zip correctly', () => { diff --git a/src/lib/gzip.ts b/src/lib/gzip.ts new file mode 100644 index 000000000..b70fefb71 --- /dev/null +++ b/src/lib/gzip.ts @@ -0,0 +1,23 @@ +import zlib from "zlib"; + +export const gzip = (str: string): Promise => + new Promise((resolve, reject) => { + zlib.gzip(str, (err, res) => { + if (err) { + reject(err); + } else { + resolve(res); + } + }); + }); + +export const gunzip = (buf: zlib.InputType): Promise => + new Promise((resolve, reject) => { + zlib.gunzip(buf, (err, res) => { + if (err) { + reject(err); + } else { + resolve(res); + } + }); + }); diff --git a/src/lib/index.ts b/src/lib/index.ts deleted file mode 100644 index ff4f27e23..000000000 --- a/src/lib/index.ts +++ /dev/null @@ -1,42 +0,0 @@ -import zlib from "zlib"; - -import { getFormattedPhoneNumber } from "./phone-format"; -import { sleep } from "./utils"; - -export { getFormattedPhoneNumber }; - -export { getFormattedZip, zipToTimeZone } from "./zip-format"; -export { isClient } from "./is-client"; -export { sleep }; -export { - findParent, - getInteractionPath, - interactionStepForId, - getTopMostParent, - getChildren, - makeTree -} from "./interaction-step-helpers"; - -export { ROLE_HIERARCHY, hasRole, isRoleGreater } from "./permissions"; - -export const gzip = (str: string) => - new Promise((resolve, reject) => { - zlib.gzip(str, (err, res) => { - if (err) { - reject(err); - } else { - resolve(res); - } - }); - }); - -export const gunzip = (buf: zlib.InputType) => - new Promise((resolve, reject) => { - zlib.gunzip(buf, (err, res) => { - if (err) { - reject(err); - } else { - resolve(res); - } - }); - }); diff --git a/src/server/api/lib/campaign.ts b/src/server/api/lib/campaign.ts index eb452bea1..c0cabe447 100644 --- a/src/server/api/lib/campaign.ts +++ b/src/server/api/lib/campaign.ts @@ -11,8 +11,9 @@ import type { QueryResult } from "pg"; import type { RelayPaginatedResponse } from "../../../api/pagination"; import { config } from "../../../config"; -import { gzip, makeTree } from "../../../lib"; import { parseIanaZone } from "../../../lib/datetime"; +import { gzip } from "../../../lib/gzip"; +import { makeTree } from "../../../lib/interaction-step-helpers"; import { allScriptFields } from "../../../lib/scripts"; import { loadContactsFromDataWarehouse, diff --git a/src/server/index.ts b/src/server/index.ts index 1923f01e9..7ff3fd92c 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -3,7 +3,7 @@ import { createLightship } from "lightship"; import cron from "node-cron"; import { config, ServerMode } from "../config"; -import { sleep } from "../lib"; +import { sleep } from "../lib/utils"; import logger from "../logger"; import { checkForBadDeliverability } from "./api/lib/alerts"; import { createApp } from "./app"; diff --git a/src/server/worker.ts b/src/server/worker.ts index 384a6d240..aeab32d56 100644 --- a/src/server/worker.ts +++ b/src/server/worker.ts @@ -4,7 +4,7 @@ import type { LogFunctionFactory, Runner, TaskList } from "graphile-worker"; import { Logger, run } from "graphile-worker"; import { config } from "../config"; -import { sleep } from "../lib"; +import { sleep } from "../lib/utils"; import logger from "../logger"; import pgPool from "./db"; import { diff --git a/src/workers/jobs/index.js b/src/workers/jobs/index.js index bd20e0922..7fbea0c80 100644 --- a/src/workers/jobs/index.js +++ b/src/workers/jobs/index.js @@ -3,7 +3,7 @@ import _ from "lodash"; import zipCodeToTimeZone from "zipcode-to-timezone"; import { config } from "../../config"; -import { gunzip } from "../../lib"; +import { gunzip } from "../../lib/gzip"; import { getFormattedPhoneNumber } from "../../lib/phone-format"; import { isValidTimezone } from "../../lib/tz-helpers"; import logger from "../../logger";