WIP

freiksenet · freiksenet · commit ca9b0c9d5156 · 2020-05-27T10:21:04.000+03:00
diff --git a/packages/gatsby/cache-dir/page-data-processors/asComponent.js b/packages/gatsby/cache-dir/page-data-processors/asComponent.js
@@ -1,6 +1,7 @@
 import React from "react"
 
 export default function asComponent(data, { getModule }) {
+  console.log("foo")
   if (data != null) {
     const component = getModule(data.moduleId)
     return (...additionalArgs) =>
diff --git a/packages/gatsby/src/redux/actions/internal.ts b/packages/gatsby/src/redux/actions/internal.ts
@@ -18,10 +18,13 @@ import {
   IPageQueryRunAction,
   IRemoveStaleJobAction,
   ISetSiteConfig,
+  IAddPageDataProcessorAction,
 } from "../types"
 
 import { store } from "../"
 
+import { registerModule, generateModuleId } from "./modules/register-module"
+
 import { gatsbyConfigSchema } from "../../joi-schemas/joi"
 import { didYouMean } from "../../utils/did-you-mean"
 
@@ -60,7 +63,6 @@ export const deleteComponentsDependencies = (
   // get list of modules
   const { queryModuleDependencies } = store.getState()
 
-
   let modules = new Set<string>()
 
   const addModule = modules.add.bind(modules)
@@ -310,3 +312,40 @@ export const setSiteConfig = (config?: unknown): ISetSiteConfig => {
     payload: normalizedPayload,
   }
 }
+
+export function addPageDataProcessor({
+  queryID,
+  path,
+  processorSource,
+}: {
+  queryID: string
+  path: string
+  processorSource: string
+}) {
+  return function dispatchAddPageDataProcessor(
+    dispatch: (AnyAction) => void
+  ): void {
+    const processorModuleId = generateModuleId({
+      source: processorSource,
+      importName: undefined,
+    })
+    dispatch([
+      registerModule({
+        moduleID: processorModuleId,
+        source: processorSource,
+      }),
+      addModuleDependencyToQueryResult({
+        moduleID: processorModuleId,
+        path,
+      }),
+      {
+        type: `ADD_PAGE_DATA_PROCESSOR`,
+        payload: {
+          queryID,
+          path,
+          moduleID: processorModuleId,
+        },
+      },
+    ])
+  }
+}
diff --git a/packages/gatsby/src/redux/actions/public.js b/packages/gatsby/src/redux/actions/public.js
@@ -1471,26 +1471,4 @@ actions.removePageData = (id: PageDataRemove) => {
 
 actions.registerModule = registerModule
 
-actions.addPageDataProcessor = ({
-  queryId,
-  path,
-  processorSource,
-}) => dispatch => {
-  const processorModuleId = generateModuleId({ source: processorSource })
-  dispatch([
-    actions.registerModule({
-      moduleId: processorModuleId,
-      source: processorSource,
-    }),
-    {
-      type: `ADD_PAGE_DATA_PROCESSOR`,
-      payload: {
-        queryId,
-        path,
-        moduleId: processorModuleId,
-      },
-    },
-  ])
-}
-
 module.exports = { actions }
diff --git a/packages/gatsby/src/redux/reducers/page-data-processors.ts b/packages/gatsby/src/redux/reducers/page-data-processors.ts
@@ -10,18 +10,18 @@ export function pageDataProcessorsReducer(
     }
 
     case `ADD_PAGE_DATA_PROCESSOR`: {
-      let processorMap = state.get(action.payload.queryId)
+      let processorMap = state.get(action.payload.queryID)
       if (!processorMap) {
         processorMap = new Map()
-        state.set(action.payload.queryId, processorMap)
+        state.set(action.payload.queryID, processorMap)
       }
 
       let processorsByPath = processorMap.get(action.payload.path)
       if (!processorsByPath) {
         processorsByPath = new Set()
         processorMap.set(action.payload.path, processorsByPath)
       }
-      processorsByPath.add(action.payload.moduleId)
+      processorsByPath.add(action.payload.moduleID)
       return state
     }
   }
diff --git a/packages/gatsby/src/redux/types.ts b/packages/gatsby/src/redux/types.ts
@@ -680,8 +680,8 @@ export interface ITouchNodeAction {
 export interface IAddPageDataProcessorAction {
   type: `ADD_PAGE_DATA_PROCESSOR`
   payload: {
-    queryId: string
+    queryID: string
     path: string
-    moduleId: string
+    moduleID: string
   }
 }
diff --git a/packages/gatsby/src/schema/context.ts b/packages/gatsby/src/schema/context.ts
@@ -9,12 +9,14 @@ import { IGraphQLRunnerStats } from "../query/types"
 import { IGatsbyResolverContext, IGraphQLSpanTracer } from "./type-definitions"
 
 import { store } from "../redux"
-import { actions } from "../redux/actions/public"
 import {
   registerModule,
   generateModuleId,
 } from "../redux/actions/modules/register-module"
-import { addModuleDependencyToQueryResult } from "../redux/actions/internal"
+import {
+  addModuleDependencyToQueryResult,
+  addPageDataProcessor,
+} from "../redux/actions/internal"
 import { pathToArray } from "../query/utils"
 
 export default function withResolverContext<TSource, TArgs>({
@@ -105,8 +107,8 @@ export default function withResolverContext<TSource, TArgs>({
       const path = pathToArrayFlattening(info.path).join(`.`)
       if (context && context.path) {
         store.dispatch(
-          actions.addPageDataProcessor({
-            queryId: context.path,
+          addPageDataProcessor({
+            queryID: context.path,
             path,
             processorSource,
           })

Original file line number	Diff line number	Diff line change
`@@ -10,18 +10,18 @@ export function pageDataProcessorsReducer(`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	case `ADD_PAGE_DATA_PROCESSOR`: {
`13`		`- let processorMap = state.get(action.payload.queryId)`
	`13`	`+ let processorMap = state.get(action.payload.queryID)`
`14`	`14`	`if (!processorMap) {`
`15`	`15`	`processorMap = new Map()`
`16`		`- state.set(action.payload.queryId, processorMap)`
	`16`	`+ state.set(action.payload.queryID, processorMap)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`let processorsByPath = processorMap.get(action.payload.path)`
`20`	`20`	`if (!processorsByPath) {`
`21`	`21`	`processorsByPath = new Set()`
`22`	`22`	`processorMap.set(action.payload.path, processorsByPath)`
`23`	`23`	`}`
`24`		`- processorsByPath.add(action.payload.moduleId)`
	`24`	`+ processorsByPath.add(action.payload.moduleID)`
`25`	`25`	`return state`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -680,8 +680,8 @@ export interface ITouchNodeAction {`
`680`	`680`	`export interface IAddPageDataProcessorAction {`
`681`	`681`	type: `ADD_PAGE_DATA_PROCESSOR`
`682`	`682`	`payload: {`
`683`		`- queryId: string`
	`683`	`+ queryID: string`
`684`	`684`	`path: string`
`685`		`- moduleId: string`
	`685`	`+ moduleID: string`
`686`	`686`	`}`
`687`	`687`	`}`