Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(gatsby): convert component-data-dependencies to typescript #24028

Merged
merged 13 commits into from
May 14, 2020
Merged

chore(gatsby): convert component-data-dependencies to typescript #24028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8e5bc89
Convert component-data-dependencies
Kornil May 12, 2020
11ddcd8
Convert test file
Kornil May 12, 2020
b656b00
Convert import statement
Kornil May 12, 2020
c01318d
Update snapshot
Kornil May 12, 2020
5c7bfd6
Refactor to use existing types
Kornil May 13, 2020
986232a
Use provided union type
Kornil May 13, 2020
11267b4
Merge branch 'master' of github.com:gatsbyjs/gatsby into typescript-g…
Kornil May 13, 2020
fbb7c9c
Improve reducer name
Kornil May 13, 2020
c7e56cd
Remove nodeId number type
Kornil May 14, 2020
8eecca8
Convert nodeId to string & use optional chain
Kornil May 14, 2020
4875d0e
Prefer non-null instead of casting
Kornil May 14, 2020
08d9f6e
missed one spot ;)
pieh May 14, 2020
c6e4018
Merge remote-tracking branch 'origin/master' into typescript-gatsby-p…
pieh May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...napshots__/page-data-dependencies.js.snap → ...napshots__/page-data-dependencies.ts.snap
View file
Open in desktop
File renamed without changes.
32 changes: 17 additions & 15 deletions ...ucers/__tests__/page-data-dependencies.js → ...ucers/__tests__/page-data-dependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
const reducer = require(`../component-data-dependencies`)
import { componentDataDependenciesReducer as reducer } from "../component-data-dependencies"

import { ICreatePageDependencyAction } from "../../types"

describe(`add page data dependency`, () => {
it(`lets you add a node dependency`, () => {
const action = {
const action: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/hi/`,
Expand All @@ -16,21 +18,21 @@ describe(`add page data dependency`, () => {
})
})
it(`lets you add a node dependency to multiple paths`, () => {
const action = {
const action: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/hi/`,
nodeId: `1.2.3`,
},
}
const action2 = {
const action2: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/hi2/`,
nodeId: `1.2.3`,
},
}
const action3 = {
const action3: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/blog/`,
Expand All @@ -48,14 +50,14 @@ describe(`add page data dependency`, () => {
})
})
it(`lets you add a connection dependency`, () => {
const action = {
const action: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/hi/`,
connection: `Markdown.Remark`,
},
}
const action2 = {
const action2: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/hi2/`,
Expand All @@ -72,19 +74,19 @@ describe(`add page data dependency`, () => {
})
})
it(`removes duplicate paths`, () => {
const action = {
const action: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/hi/`,
nodeId: 1,
nodeId: `1`,
connection: `MarkdownRemark`,
},
}
const action2 = {
const action2: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/hi2/`,
nodeId: 1,
nodeId: `1`,
connection: `MarkdownRemark`,
},
}
Expand All @@ -95,11 +97,11 @@ describe(`add page data dependency`, () => {
// Add different action
state = reducer(state, action2)

expect(state.connections.get(`MarkdownRemark`).size).toEqual(2)
expect(state.nodes.get(1).size).toEqual(2)
expect(state.connections.get(`MarkdownRemark`)?.size).toEqual(2)
expect(state.nodes.get(`1`)?.size).toEqual(2)
})
it(`lets you add both a node and connection in one action`, () => {
const action = {
const action: ICreatePageDependencyAction = {
type: `CREATE_COMPONENT_DEPENDENCY`,
payload: {
path: `/hi/`,
Expand All @@ -108,7 +110,7 @@ describe(`add page data dependency`, () => {
},
}

let state = reducer(undefined, action)
const state = reducer(undefined, action)

expect(state).toMatchSnapshot()
})
Expand Down
33 changes: 19 additions & 14 deletions ...x/reducers/component-data-dependencies.js → ...x/reducers/component-data-dependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
module.exports = (
state = { nodes: new Map(), connections: new Map() },
action
) => {
import { IGatsbyState, ActionsUnion } from "../types"

export const componentDataDependenciesReducer = (
state: IGatsbyState["componentDataDependencies"] = {
nodes: new Map(),
connections: new Map(),
},
action: ActionsUnion
): IGatsbyState["componentDataDependencies"] => {
switch (action.type) {
case `DELETE_CACHE`:
return { nodes: new Map(), connections: new Map() }
Expand All @@ -12,36 +17,36 @@ module.exports = (

// If this nodeId not set yet.
if (action.payload.nodeId) {
let existingPaths = new Set()
let existingPaths: Set<string> = new Set()
if (state.nodes.has(action.payload.nodeId)) {
existingPaths = state.nodes.get(action.payload.nodeId)
existingPaths = state.nodes.get(action.payload.nodeId)!
}
if (!existingPaths.has(action.payload.path || action.payload.id)) {
existingPaths.add(action.payload.path || action.payload.id)
if (!existingPaths.has(action.payload.path)) {
existingPaths.add(action.payload.path)
}
state.nodes.set(action.payload.nodeId, existingPaths)
}

// If this connection not set yet.
if (action.payload.connection) {
let existingPaths = new Set()
let existingPaths: Set<string> = new Set()
if (state.connections.has(action.payload.connection)) {
existingPaths = state.connections.get(action.payload.connection)
existingPaths = state.connections.get(action.payload.connection)!
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is so weird that TS is not smart enough to know that this for sure exists given the check above it, but 🤷‍♂️

}
if (!existingPaths.has(action.payload.path || action.payload.id)) {
existingPaths.add(action.payload.path || action.payload.id)
if (!existingPaths.has(action.payload.path)) {
existingPaths.add(action.payload.path)
}
state.connections.set(action.payload.connection, existingPaths)
}

return state
case `DELETE_COMPONENTS_DEPENDENCIES`:
state.nodes.forEach((val, _key) => {
state.nodes.forEach(val => {
for (const path of action.payload.paths) {
val.delete(path)
}
})
state.connections.forEach((val, _key) => {
state.connections.forEach(val => {
for (const path of action.payload.paths) {
val.delete(path)
}
Expand Down
3 changes: 2 additions & 1 deletion packages/gatsby/src/redux/reducers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { webpackCompilationHashReducer } from "./webpack-compilation-hash"
import { reducer as logReducer } from "gatsby-cli/lib/reporter/redux/reducer"
import { lastAction } from "./last-action"
import { jobsV2Reducer } from "./jobsv2"
import { componentDataDependenciesReducer } from "./component-data-dependencies"

/**
* @property exports.nodesTouched Set<string>
Expand All @@ -28,7 +29,7 @@ module.exports = {
schema: schemaReducer,
pages: pagesReducer,
status: statusReducer,
componentDataDependencies: require(`./component-data-dependencies`),
componentDataDependencies: componentDataDependenciesReducer,
components: require(`./components`),
staticQueryComponents: staticQueryComponentsReducer,
jobs: require(`./jobs`),
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby/src/redux/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ export interface IRemoveStaleJobV2Action {

export interface ICreatePageDependencyAction {
type: `CREATE_COMPONENT_DEPENDENCY`
plugin: string
plugin?: string
payload: {
path: string
nodeId?: string
Expand Down