Fix Type Exports, Fix Build Output

.babelrc.js

@@ -1,8 +1,6 @@
 module.exports = {
   plugins: [
-    ...(process.env.PIKA
-      ? [[require(`babel-plugin-import-graphql`), { runtime: true }]]
-      : []),
+    require(`babel-plugin-import-graphql`),
     require(`@babel/plugin-transform-runtime`),
     require(`@babel/plugin-proposal-class-properties`),
     require(`@babel/plugin-transform-object-assign`),
@@ -13,7 +11,8 @@ module.exports = {
     [
       require(`@babel/preset-env`),
       {
-        targets: { node: true },
+        targets: { node: 12 },
+        modules: false,
         useBuiltIns: `usage`,
         corejs: 3,
         bugfixes: true
@@ -28,7 +27,7 @@ module.exports = {
         [
           require(`@babel/preset-env`),
           {
-            targets: { node: true },
+            targets: { node: 12 },
             modules: `commonjs`,
             useBuiltIns: `usage`,
             corejs: 3,

.eslintrc.js

@@ -1,18 +1,14 @@
-const { join } = require(`path`)
-
-const srcDir = join(__dirname, `src`)
-
 module.exports = {
   root: true,
-  parser: "@typescript-eslint/parser",
+  parser: `@typescript-eslint/parser`,
   env: {
     es6: true,
     node: true,
     browser: true,
     "jest/globals": true
   },
   plugins: [
-    "@typescript-eslint", // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin
+    `@typescript-eslint`, // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin
     `jest`, // https://github.com/jest-community/eslint-plugin-jest
     `import`, // https://github.com/benmosher/eslint-plugin-import
     `promise` // https://github.com/xjamundx/eslint-plugin-promise
@@ -24,6 +20,7 @@ module.exports = {
     ecmaVersion: 2020,
     sourceType: `module`
   },
+  ignorePatterns: [`**/pkg/**/*`],
   rules: {
     // Possible Errors
     "for-direction": 2,
@@ -248,7 +245,7 @@ module.exports = {
     "operator-linebreak": 0,
     "padded-blocks": [2, `never`],
     "padding-line-between-statements": 0,
-    "quote-props": [2, "as-needed"],
+    "quote-props": [2, `as-needed`],
     quotes: 0, // Conflicts with TypeScript, use TypeScript Plugin Rule Instead
     "require-jsdoc": 0,
     semi: [0, `never`],
@@ -307,8 +304,8 @@ module.exports = {
     "@typescript-eslint/no-use-before-define": 0,
     "@typescript-eslint/camelcase": 0,
     "@typescript-eslint/no-var-requires": 0,
-    "@typescript-eslint/no-unused-vars": ["error", { vars: "local", args: "none", ignoreRestSiblings: true }],
-    "@typescript-eslint/quotes": ["error", "backtick", { avoidEscape: true }],
+    "@typescript-eslint/no-unused-vars": [`error`, { vars: `local`, args: `none`, ignoreRestSiblings: true }],
+    "@typescript-eslint/quotes": [`error`, `backtick`, { avoidEscape: true }],
 
     // jest
     "jest/consistent-test-it"                   : 2,
@@ -318,7 +315,7 @@ module.exports = {
     "jest/no-hooks"                             : 0,
     "jest/no-identical-title"                   : 2,
     "jest/no-jest-import"                       : 2,
-    "jest/no-large-snapshots"                   : [1, { "maxSize": 12 }],
+    "jest/no-large-snapshots"                   : [1, { maxSize: 12 }],
     "jest/no-test-prefixes"                     : 2,
     "jest/prefer-to-have-length"                : 1,
     "jest/prefer-to-be-null"                    : 1,
@@ -330,7 +327,7 @@ module.exports = {
 
     // import
     "import/no-extraneous-dependencies": 0,
-    "import/no-cycle": "warn",
+    "import/no-cycle": `warn`,
     "import/prefer-default-export": 0,
     "import/no-named-default": 0,
     "import/no-webpack-loader-syntax": 0,

package.json

@@ -42,76 +42,76 @@
     "version": "npm run build"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.2",
+    "@babel/runtime": "^7.11.2",
     "@saeris/graphql-directives": "^0.3.1",
     "@saeris/graphql-scalars": "^1.4.2",
-    "apollo-datasource": "^0.7.1",
-    "apollo-datasource-rest": "^0.9.2",
-    "apollo-server-lambda": "^2.14.2",
+    "apollo-datasource": "^0.7.2",
+    "apollo-datasource-rest": "^0.9.3",
+    "apollo-server-lambda": "^2.16.1",
     "aws-lambda": "^1.0.6",
     "core-js": "^3.6.5",
     "datauri": "^3.0.0",
-    "date-fns": "^2.14.0",
-    "graphql": "^15.0.0",
-    "graphql-tag": "^2.10.3",
-    "graphql-tools": "^6.0.7",
+    "date-fns": "^2.15.0",
+    "graphql": "^15.3.0",
+    "graphql-tag": "^2.11.0",
+    "graphql-tools": "^6.0.18",
     "isomorphic-fetch": "^2.2.1",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
     "node-vibrant": "^3.1.5",
-    "potrace": "^2.1.6",
+    "potrace": "^2.1.8",
     "querystring": "^0.2.0",
-    "regenerator-runtime": "^0.13.5",
+    "regenerator-runtime": "^0.13.7",
     "svgo": "^1.3.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.10.2",
-    "@babel/node": "^7.10.1",
-    "@babel/plugin-proposal-class-properties": "^7.10.1",
-    "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
-    "@babel/plugin-transform-object-assign": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.10.1",
-    "@babel/preset-env": "^7.10.2",
-    "@babel/preset-typescript": "^7.10.1",
+    "@babel/core": "^7.11.4",
+    "@babel/node": "^7.10.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
+    "@babel/plugin-transform-object-assign": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.0",
+    "@babel/preset-env": "^7.11.0",
+    "@babel/preset-typescript": "^7.10.4",
     "@pika/pack": "^0.5.0",
     "@pika/plugin-build-node": "^0.9.2",
     "@pika/plugin-build-types": "^0.9.2",
     "@pika/plugin-standard-pkg": "^0.9.2",
-    "@types/aws-lambda": "^8.10.53",
+    "@types/aws-lambda": "^8.10.61",
     "@types/graphql": "^14.5.0",
-    "@types/jest": "^25.2.3",
-    "@types/node": "^14.0.10",
+    "@types/jest": "^26.0.10",
+    "@types/node": "^14.6.0",
     "@types/svgo": "^1.3.3",
-    "@typescript-eslint/eslint-plugin": "^3.1.0",
-    "@typescript-eslint/parser": "^3.1.0",
-    "apollo": "^2.28.0",
-    "aws-sdk": "^2.690.0",
+    "@typescript-eslint/eslint-plugin": "^3.9.1",
+    "@typescript-eslint/parser": "^3.9.1",
+    "apollo": "^2.30.2",
+    "aws-sdk": "^2.738.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.0.1",
+    "babel-jest": "^26.3.0",
     "babel-loader": "^8.1.0",
     "babel-plugin-import-graphql": "^2.7.0",
-    "codecov": "^3.7.0",
+    "codecov": "^3.7.2",
     "cross-env": "^7.0.2",
-    "dotenv-webpack": "^1.8.0",
-    "eslint": "^7.1.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jest": "^23.13.2",
+    "dotenv-webpack": "^2.0.0",
+    "eslint": "^7.7.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-jest": "^23.20.0",
     "eslint-plugin-promise": "^4.2.1",
     "fiddly": "^0.9.1",
     "graphql-cli": "^4.0.0",
     "husky": "^4.2.5",
-    "jest": "^26.0.1",
+    "jest": "^26.4.1",
     "jest-transform-graphql": "^2.1.0",
-    "lint-staged": "^10.2.9",
-    "netlify-lambda": "1.6.3",
+    "lint-staged": "^10.2.11",
+    "netlify-lambda": "2.0.1",
     "prettier": "^2.0.5",
-    "serverless": "^1.72.0",
-    "serverless-dotenv-plugin": "^2.4.2",
-    "serverless-offline": "^6.3.1",
-    "serverless-webpack": "^5.3.2",
-    "typescript": "^3.9.5",
-    "webpack": "^4.43.0",
-    "webpack-node-externals": "^1.6.0"
+    "serverless": "^1.79.0",
+    "serverless-dotenv-plugin": "^3.0.0",
+    "serverless-offline": "^6.5.0",
+    "serverless-webpack": "^5.3.3",
+    "typescript": "^4.0.2",
+    "webpack": "^4.44.1",
+    "webpack-node-externals": "^2.5.1"
   },
   "@pika/pack": {
     "pipeline": [

src/index.ts

@@ -1,4 +1,4 @@
-export { server, Context } from "./server"
+export { server } from "./server"
 export { schema } from "./schema"
 export { dataSources } from "./sources"
 export { playground } from "./playground"

src/resolvers/shared/types.ts → src/resolvers/Resolver.ts

@@ -1,6 +1,6 @@
 import { GraphQLResolveInfo } from "graphql";
-import { Context } from "../../server";
-import { Sources } from "../../sources";
+import { Context } from "../server";
+import { Sources } from "../sources";
 
 export type Resolver<Parent = any, Args = any, Return = any> = (
   parent: Parent,

src/resolvers/backdrop.ts

@@ -1,5 +1,5 @@
-import { ImageResult } from "../sources";
-import { Resolver } from "./shared";
+import { ImageResult } from "../sources/images";
+import { Resolver } from "./Resolver";
 
 export { file, original, custom, svg, colors } from "./shared";
 

src/resolvers/episode.ts

@@ -1,4 +1,4 @@
-import { Resolver } from "./shared";
+import { Resolver } from "./Resolver";
 
 export const number = (parent: Record<string, string>) => parent.episode_number;
 

src/resolvers/index.ts

@@ -19,7 +19,7 @@ import * as Season from "./season";
 import * as Still from "./still";
 import * as TV from "./tv";
 
-export {
+export const resolvers = {
   Backdrop,
   Cast,
   Company,

src/resolvers/logo.ts

@@ -1,5 +1,5 @@
-import { ImageResult } from "../sources";
-import { Resolver } from "./shared";
+import { ImageResult } from "../sources/images";
+import { Resolver } from "./Resolver";
 
 export { file, original, custom, svg, colors } from "./shared";
 

src/resolvers/person.ts

@@ -1,5 +1,5 @@
 import { groupBy } from "lodash";
-import { Resolver } from "./shared";
+import { Resolver } from "./Resolver";
 
 export { gender } from "./shared";
 

src/resolvers/photo.ts

@@ -1,5 +1,5 @@
-import { ImageResult } from "../sources";
-import { Resolver } from "./shared";
+import { ImageResult } from "../sources/images";
+import { Resolver } from "./Resolver";
 
 export { file, original, custom, svg, colors } from "./shared";
 

src/resolvers/poster.ts

@@ -1,5 +1,5 @@
-import { ImageResult } from "../sources";
-import { Resolver } from "./shared";
+import { ImageResult } from "../sources/images";
+import { Resolver } from "./Resolver";
 
 export { file, original, custom, svg, colors } from "./shared";
 

src/resolvers/query.ts

@@ -1,6 +1,6 @@
 import { groupBy } from "lodash";
 import { GraphQLResolveInfo } from "graphql";
-import { Resolver } from "./shared";
+import { Resolver } from "./Resolver";
 import { Sources } from "../sources";
 
 const mapResults = (type?: "movie" | "tv") => (

src/resolvers/season.ts

@@ -1,4 +1,4 @@
-import { Resolver } from "./shared";
+import { Resolver } from "./Resolver";
 
 export const poster = (parent: Record<string, string>) => parent.poster_path;
 

src/resolvers/shared/getCast.ts

@@ -1,4 +1,4 @@
-import { Resolver } from "./types";
+import { Resolver } from "../Resolver";
 
 export const cast: Resolver<{ credits: { cast: any[] } }, { limit: number }> = (
   { credits },

src/resolvers/shared/getCrew.ts

@@ -1,4 +1,4 @@
-import { Resolver } from "./types";
+import { Resolver } from "../Resolver";
 
 export const crew: Resolver<
   { credits: { crew: { id: string; job: string }[] } },

src/resolvers/shared/getImage.ts

@@ -1,5 +1,5 @@
-import { Color, ImageResult, ColorsResult } from "../../sources";
-import { Resolver } from "./types";
+import { Color, ImageResult, ColorsResult } from "../../sources/images";
+import { Resolver } from "../Resolver";
 
 type Args = {
   color: Color;

src/resolvers/shared/getSimilar.ts

@@ -1,4 +1,4 @@
-import { Resolver } from "./types";
+import { Resolver } from "../Resolver";
 
 export const similar: Resolver<
   { similar: { results: any[] } },

src/resolvers/shared/getVideos.ts

@@ -1,4 +1,4 @@
-import { Resolver } from "./types";
+import { Resolver } from "../Resolver";
 import { filterResults } from "../../utils";
 
 export const videos: Resolver<

src/resolvers/shared/index.ts

@@ -4,4 +4,3 @@ export { gender } from "./getGender";
 export { file, original, custom, svg, colors } from "./getImage";
 export { similar } from "./getSimilar";
 export { videos } from "./getVideos";
-export { Resolver } from "./types";

src/resolvers/still.ts

@@ -1,5 +1,5 @@
-import { ImageResult } from "../sources";
-import { Resolver } from "./shared";
+import { ImageResult } from "../sources/images";
+import { Resolver } from "./Resolver";
 
 export { file, original, custom, svg, colors } from "./shared";
 

src/resolvers/tv.ts

@@ -1,4 +1,4 @@
-import { Resolver } from "./shared";
+import { Resolver } from "./Resolver";
 
 export { cast, crew, similar, videos } from "./shared";
 

src/schema.ts

@@ -9,12 +9,8 @@ import {
   URLScalar,
   URL
 } from "@saeris/graphql-scalars";
-import * as types from "./types";
-import * as enums from "./types/enums";
-import * as inputs from "./types/inputs";
-import * as interfaces from "./types/interfaces";
-import * as unions from "./types/unions";
-import * as resolvers from "./resolvers";
+import { types, enums, inputs, interfaces, unions } from "./types";
+import { resolvers } from "./resolvers";
 
 // TODO: Re-Write Schema Definition to remove makeExecutableSchema entirely
 // to conform to Apollo Server's standard implementation

src/sources/index.ts

@@ -3,8 +3,6 @@ import { Context } from "../server";
 import { Images } from "./images";
 import { MovieDB } from "./movieDB";
 
-export { Color, SVGResult, ImageResult, ColorsResult } from "./images";
-
 export interface Sources extends DataSources<Context> {
   Images: Images;
   MovieDB: MovieDB;

src/types/enums/index.ts

@@ -1,6 +1,8 @@
-export { default as Gender } from "./gender.gql"
-export { default as Palette } from "./palette.gql"
-export { default as ReleaseStatus } from "./releaseStatus.gql"
-export { default as TVStatus } from "./tvStatus.gql"
-export { default as TVType } from "./tvType.gql"
-export { default as VideoType } from "./videoType.gql"
+import { default as Gender } from "./gender.gql"
+import { default as Palette } from "./palette.gql"
+import { default as ReleaseStatus } from "./releaseStatus.gql"
+import { default as TVStatus } from "./tvStatus.gql"
+import { default as TVType } from "./tvType.gql"
+import { default as VideoType } from "./videoType.gql"
+
+export const enums = [Gender, Palette, ReleaseStatus, TVStatus, TVType, VideoType]