ref(cleanup)

Signed-off-by: Jesse Stuart <hi@jessestuart.com>
jessestuart · Apr 17, 2019 · 467ce51 · 467ce51
1 parent ad30223
commit 467ce51
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 57 deletions.
diff --git a/package.json b/package.json
@@ -63,9 +63,9 @@
   "license": "MIT",
   "main": "index.js",
   "peerDependencies": {
-    "gatsby": "^2.3.22",
-    "gatsby-image": "^2.0.38",
-    "gatsby-source-filesystem": "^2.0.29",
+    "gatsby": "^2",
+    "gatsby-image": "^2",
+    "gatsby-source-filesystem": "^2",
     "react": "^16"
   },
   "repository": {

diff --git a/src/set-fields-on-graphql-node-type.ts b/src/set-fields-on-graphql-node-type.ts
@@ -4,7 +4,7 @@ import exif from 'exif-parser'
 
 import fs from 'fs'
 
-import ExifDataType from './types/exif-data'
+import ExifData from './types/exif-data'
 import S3ImageAssetNode from './types/s3-image-asset-node'
 
 const {
@@ -14,7 +14,7 @@ const {
   GraphQLString,
 } = require('gatsby/graphql')
 
-export const resolveExifData = (image: S3ImageAssetNode): ExifDataType => {
+export const resolveExifData = (image: S3ImageAssetNode): ExifData => {
   const file = fs.readFileSync(image.absolutePath)
   const tags = exif.create(file).parse().tags
   const timestamp = tags.DateTimeOriginal * 1000
@@ -40,9 +40,9 @@ interface ExtendNodeTypeOptions {
   }
 }
 
-export default ({ type }: ExtendNodeTypeOptions) => {
+export default ({ type }: ExtendNodeTypeOptions): Promise<any> => {
   if (type.name !== 'S3ImageAsset') {
-    return
+    return Promise.resolve()
   }
 
   return Promise.resolve({

diff --git a/src/source-nodes.ts b/src/source-nodes.ts
@@ -49,57 +49,46 @@ export const sourceNodes = async (
 
   return await Promise.all(
     _.compact(
-      s3Entities.map(async (entity: S3.Object) => {
-        if (!isImage(entity)) {
-          return null
-        }
-
-        const url: string | undefined = constructS3UrlForAsset({
-          bucketName,
-          domain,
-          key: entity.Key,
-          protocol,
-        })
-        if (!url) {
-          return null
-        }
-
-        // const entityData = {
-        //   bucketName,
-        //   cache,
-        //   createNode,
-        //   createNodeId,
-        //   domain,
-        //   entity,
-        //   localFile___NODE: null,
-        //   protocol,
-        //   url,
-        //   store,
-        // }
+      s3Entities.map(
+        async (entity: S3.Object): Promise<void> => {
+          if (!isImage(entity)) {
+            return
+          }
 
-        try {
-          const fileNode = await createS3RemoteFileNode({
-            cache,
-            createNode,
-            createNodeId,
-            url,
-            store,
+          const url: string | undefined = constructS3UrlForAsset({
+            bucketName,
+            domain,
+            key: entity.Key,
+            protocol,
           })
-          if (!fileNode) {
-            return null
+          if (!url) {
+            return
           }
 
-          return await createS3ImageAssetNode({
-            createNode,
-            createNodeId,
-            entity,
-            fileNode,
-            url,
-          })
-        } catch (err) {
-          Promise.reject(err)
+          try {
+            const fileNode = await createS3RemoteFileNode({
+              cache,
+              createNode,
+              createNodeId,
+              url,
+              store,
+            })
+            if (!fileNode) {
+              return
+            }
+
+            return await createS3ImageAssetNode({
+              createNode,
+              createNodeId,
+              entity,
+              fileNode,
+              url,
+            })
+          } catch (err) {
+            Promise.reject(err)
+          }
         }
-      })
+      )
     )
   )
 }
@@ -136,7 +125,7 @@ const createS3ImageAssetNode = async ({
   entity: S3.Object
   fileNode: { absolutePath: string; id: string }
   url: string
-}): Promise<any> => {
+}): Promise<void> => {
   const { Key, ETag } = entity
   // TODO: Use the `mime-types` lib to populate this dynamically.
   // const ContentType = 'image/jpeg'
@@ -150,7 +139,7 @@ const createS3ImageAssetNode = async ({
   await createNode({
     ...entity,
     absolutePath: fileNode.absolutePath,
-    children: fileNodeId,
+    children: [fileNodeId],
     ETag: objectHash,
     id: createNodeId(objectHash),
     Key,

diff --git a/src/types/exif-data.ts b/src/types/exif-data.ts
@@ -66,5 +66,3 @@ export enum ExifFields {
   Model,
   ShutterSpeedValue,
 }
-
-console.log(ExifFields)
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,5 +66,3 @@ export enum ExifFields { @@
       Model,
       ShutterSpeedValue,
     }
-    console.log(ExifFields)