Skip to content

Commit

Permalink
refactor(SUP-87): dependencies cleanup part 2 (#7)
Browse files Browse the repository at this point in the history
* refactor: remove uuid lib

* refactor: move tests folder out of src

* refactor: update jest types
  • Loading branch information
kurpav authored and aklarfeld committed Nov 14, 2023
1 parent 257f885 commit 3897567
Show file tree
Hide file tree
Showing 9 changed files with 145 additions and 139 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
clearMocks: true,
roots: ['<rootDir>/src'],
roots: ['<rootDir>/test'],
transform: {
'^.+\\.(ts|tsx)$': 'ts-jest',
'^.+\\.(js)$': 'babel-jest'
Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"types": "build/src/index.d.ts",
"version": "1.1.41",
"scripts": {
"test": "yarn run clean && tsc && NODE_ENV=test jest --setupFiles dotenv/config",
"test": "NODE_ENV=test jest --setupFiles dotenv/config",
"clean": "rm -rf build/ && rm -rf supergood-*.log",
"build": "yarn run clean && tsc"
},
Expand All @@ -26,13 +26,12 @@
"signal-exit": "^3.0.7"
},
"devDependencies": {
"@jest/globals": "^29.4.1",
"@types/jest": "^29.5.8",
"@types/json-server": "^0.14.4",
"@types/lodash.get": "^4.4.7",
"@types/lodash.set": "^4.3.7",
"@types/signal-exit": "^3.0.1",
"@types/superagent": "^4.1.16",
"@types/uuid": "^9.0.1",
"@typescript-eslint/eslint-plugin": "^5.49.0",
"@typescript-eslint/parser": "^5.49.0",
"axios": "^1.4.0",
Expand All @@ -49,8 +48,7 @@
"superagent": "^8.0.9",
"ts-jest": "^29.0.5",
"typescript": "^4.9.4",
"undici": "^5.23.0",
"uuid": "^9.0.0"
"undici": "^5.23.0"
},
"bugs": {
"url": "https://github.com/supergoodsystems/supergood-js/issues"
Expand Down
23 changes: 6 additions & 17 deletions src/test/core.int.test.ts → test/core.int.test.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
import Supergood from '..';
import { postEvents, postError } from '../api';
import Supergood from '../src';
import { postEvents, postError } from '../src/api';
import { initialize } from './json-server-config';
import { errors } from '../constants';
import {
afterAll,
expect,
test,
jest,
describe,
beforeAll,
beforeEach,
xtest,
xdescribe
} from '@jest/globals';
import { errors } from '../src/constants';
import { request } from 'undici';
import { ErrorPayloadType, EventRequestType } from '../types';
import { ErrorPayloadType, EventRequestType } from '../src/types';
import initialDB from './initial-db';
import http from 'http';
import fs from 'fs';
Expand All @@ -25,7 +14,7 @@ import get from 'lodash.get';
import superagent from 'superagent';
import axios from 'axios';
import fetch from 'node-fetch';
import { sleep } from '../utils';
import { sleep } from '../src/utils';

const base64Regex =
/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
Expand Down Expand Up @@ -84,7 +73,7 @@ const getErrors = (mockedPostError: jest.Mock): ErrorPayloadType => {
)[1] as ErrorPayloadType;
};

jest.mock('../api', () => ({
jest.mock('../src/api', () => ({
postEvents: jest.fn(async (eventSinkUrl, data) => ({ data })),
postError: jest.fn(async (errorSinkUrl, payload) => ({
payload
Expand Down
File renamed without changes.
9 changes: 4 additions & 5 deletions src/test/endToEnd.int.test.ts → test/endToEnd.int.test.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import Supergood from '..';
import { xtest, describe, expect } from '@jest/globals';
import Supergood from '../src';
import postgres from 'postgres';
import axios from 'axios';
import { v4 as uuid } from 'uuid';
import crypto from 'node:crypto';

describe('end-to-end tests', () => {
xtest('log to the staging database after a simple get request', async () => {
test('log to the staging database after a simple get request', async () => {
await Supergood.init(
{
clientId: process.env.SUPERGOOD_CLIENT_ID as string,
clientSecret: process.env.SUPERGOOD_CLIENT_SECRET as string
},
process.env.SUPERGOOD_BASE_URL
);
const queryId = `?id=${uuid()}`;
const queryId = `?id=${crypto.randomUUID()}`;
const organizationId = process.env.SUPERGOOD_ORGANIZATION_ID as string;
await axios.get(`https://supergood-testbed.herokuapp.com/200${queryId}`);
await Supergood.close();
Expand Down
File renamed without changes.
File renamed without changes.
114 changes: 14 additions & 100 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,106 +1,20 @@
{
"compilerOptions": {
"baseUrl": ".",
"outDir": "./build",
"allowJs": true,
/* Visit https://aka.ms/tsconfig to read more about this file */

/* Projects */
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */

/* Modules */
"module": "commonjs", /* Specify what module code is generated. */
// "rootDir": "./", /* Specify the root folder within your source files. */
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
"resolveJsonModule": true, /* Enable importing .json files. */
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */

/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */

/* Emit */
"declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
// "outDir": "./", /* Specify an output folder for all emitted files. */
// "removeComments": true, /* Disable emitting comments. */
// "noEmit": true, /* Disable emitting files from a compilation. */
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */

/* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */

/* Type Checking */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */

/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
"removeComments": true,
"target": "es2016",
"module": "commonjs",
"resolveJsonModule": true,
"declaration": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
"skipLibCheck": true,
"moduleResolution": "node",
"sourceMap": true,
"allowSyntheticDefaultImports": true
},
"include": ["./src/**/*", "src/test/**/*", "package.json"],
"include": ["./src"]
}
Loading

0 comments on commit 3897567

Please sign in to comment.