Merge fc53e5b into 93fc6ad

.eslintrc.js

@@ -5,20 +5,20 @@ module.exports = {
     ecmaVersion: 7,
     ecmaFeatures: {
       experimentalObjectRestSpread: true,
-      jsx: true
+      jsx: true,
     },
-    sourceType: 'module'
+    sourceType: 'module',
   },
   extends: ['plugin:jest/recommended', 'prettier'],
   plugins: ['json', 'prettier'],
   env: {
     es6: true,
-    node: true
+    node: true,
   },
   globals: {
     document: false,
     navigator: false,
-    window: false
+    window: false,
   },
   rules: {
     'accessor-pairs': 'error',
@@ -111,7 +111,7 @@ module.exports = {
     'spaced-comment': [
       'error',
       'always',
-      { markers: ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] }
+      { markers: ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] },
     ],
     'use-isnan': 'error',
     'valid-typeof': 'error',
@@ -127,6 +127,6 @@ module.exports = {
     'jest/prefer-to-have-length': 'error',
     'jest/valid-describe': 'error',
     'jest/valid-expect': 'error',
-    'jest/valid-expect-in-promise': 'error'
-  }
+    'jest/valid-expect-in-promise': 'error',
+  },
 };

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 node_js:
-  - "8"
+  - '10'
+  - '12'
+  - '14'
 script:
   - npm run lint:ci
   - npm run test:ci

examples/github/index.js

@@ -11,8 +11,8 @@ const request = https.request(
     path: '/repos/paularmstrong/normalizr/issues',
     method: 'get',
     headers: {
-      'user-agent': 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)'
-    }
+      'user-agent': 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)',
+    },
   },
   (res) => {
     res.on('data', (d) => {

examples/github/schema.js

@@ -5,29 +5,29 @@ export const user = new schema.Entity('users');
 export const label = new schema.Entity('labels');
 
 export const milestone = new schema.Entity('milestones', {
-  creator: user
+  creator: user,
 });
 
 export const issue = new schema.Entity('issues', {
   assignee: user,
   assignees: [user],
   labels: label,
   milestone,
-  user
+  user,
 });
 
 export const pullRequest = new schema.Entity('pullRequests', {
   assignee: user,
   assignees: [user],
   labels: label,
   milestone,
-  user
+  user,
 });
 
 export const issueOrPullRequest = new schema.Array(
   {
     issues: issue,
-    pullRequests: pullRequest
+    pullRequests: pullRequest,
   },
   (entity) => (entity.pull_request ? 'pullRequests' : 'issues')
 );

examples/redux/index.js

@@ -18,8 +18,8 @@ const start = () => {
             return 'Repo slug must be in the form "user/project"';
           }
           return true;
-        }
-      }
+        },
+      },
     ])
     .then(({ repo }) => {
       store.dispatch(Action.setRepo(repo));
@@ -34,8 +34,8 @@ const main = () => {
         type: 'list',
         name: 'action',
         message: 'What would you like to do?',
-        choices: ['Browse current state', 'Get new data', new inquirer.Separator(), 'Quit']
-      }
+        choices: ['Browse current state', 'Get new data', new inquirer.Separator(), 'Quit'],
+      },
     ])
     .then(({ action }) => {
       switch (action) {
@@ -62,10 +62,10 @@ const browseMain = () => {
             new inquirer.Separator(),
             ...Object.keys(store.getState()).map((value) => ({ value, name: `Browse ${value}` })),
             new inquirer.Separator(),
-            { value: 'main', name: 'Go Back to Main Menu' }
+            { value: 'main', name: 'Go Back to Main Menu' },
           ];
-        }
-      }
+        },
+      },
     ])
     .then((answers) => {
       switch (answers.browseMainAction) {
@@ -95,16 +95,16 @@ const browse = (stateKey) => {
           { value: 'denormalize', name: 'Denormalize' },
           new inquirer.Separator(),
           { value: 'browseMain', name: 'Go Back to Browse Menu' },
-          { value: 'main', name: 'Go Back to Main Menu' }
-        ]
+          { value: 'main', name: 'Go Back to Main Menu' },
+        ],
       },
       {
         type: 'list',
         name: 'list',
         message: `Select the ${stateKey} to view:`,
         choices: Object.keys(store.getState()[stateKey]),
-        when: ({ action }) => action === 'view'
-      }
+        when: ({ action }) => action === 'view',
+      },
     ])
     .then(({ action, list }) => {
       const state = store.getState()[stateKey];
@@ -144,9 +144,9 @@ const browseDenormalized = (stateKey) => {
           ...Object.keys(store.getState()[stateKey]),
           new inquirer.Separator(),
           { value: 'browse', name: 'Go Back to Browse Menu' },
-          { value: 'main', name: 'Go Back to Main Menu' }
-        ]
-      }
+          { value: 'main', name: 'Go Back to Main Menu' },
+        ],
+      },
     ])
     .then(({ selector }) => {
       switch (selector) {
@@ -174,10 +174,10 @@ const pull = () => {
           return [
             ...Object.keys(store.getState()).map((value) => ({ value, name: value })),
             new inquirer.Separator(),
-            { value: 'main', name: 'Go Back to Main Menu' }
+            { value: 'main', name: 'Go Back to Main Menu' },
           ];
-        }
-      }
+        },
+      },
     ])
     .then((answers) => {
       switch (answers.pullAction) {

examples/redux/src/api/index.js

@@ -2,6 +2,6 @@ import GitHubApi from 'github';
 
 export default new GitHubApi({
   headers: {
-    'user-agent': 'Normalizr Redux Example'
-  }
+    'user-agent': 'Normalizr Redux Example',
+  },
 });

examples/redux/src/api/schema.js

@@ -6,37 +6,37 @@ export const commit = new schema.Entity(
   'commits',
   {
     author: user,
-    committer: user
+    committer: user,
   },
   { idAttribute: 'sha' }
 );
 
 export const label = new schema.Entity('labels');
 
 export const milestone = new schema.Entity('milestones', {
-  creator: user
+  creator: user,
 });
 
 export const issue = new schema.Entity('issues', {
   assignee: user,
   assignees: [user],
   labels: [label],
   milestone,
-  user
+  user,
 });
 
 export const pullRequest = new schema.Entity('pullRequests', {
   assignee: user,
   assignees: [user],
   labels: [label],
   milestone,
-  user
+  user,
 });
 
 export const issueOrPullRequest = new schema.Array(
   {
     issues: issue,
-    pullRequests: pullRequest
+    pullRequests: pullRequest,
   },
   (entity) => (entity.pull_request ? 'pullRequests' : 'issues')
 );

examples/redux/src/redux/actions.js

@@ -8,5 +8,5 @@ export { setRepo } from './modules/repos';
 export const ADD_ENTITIES = 'ADD_ENTITIES';
 export const addEntities = (entities) => ({
   type: ADD_ENTITIES,
-  payload: entities
+  payload: entities,
 });

examples/redux/src/redux/modules/commits.js

@@ -10,7 +10,7 @@ export default function reducer(state = {}, action) {
     case ADD_ENTITIES:
       return {
         ...state,
-        ...action.payload.commits
+        ...action.payload.commits,
       };
 
     default:
@@ -25,7 +25,7 @@ export const getCommits = ({ page = 0 } = {}) => (dispatch, getState, { api, sch
   return api.repos
     .getCommits({
       owner,
-      repo
+      repo,
     })
     .then((response) => {
       const data = normalize(response, [schema.commit]);

examples/redux/src/redux/modules/issues.js

@@ -10,7 +10,7 @@ export default function reducer(state = {}, action) {
     case ADD_ENTITIES:
       return {
         ...state,
-        ...action.payload.issues
+        ...action.payload.issues,
       };
 
     default:
@@ -25,7 +25,7 @@ export const getIssues = ({ page = 0 } = {}) => (dispatch, getState, { api, sche
   return api.issues
     .getForRepo({
       owner,
-      repo
+      repo,
     })
     .then((response) => {
       const data = normalize(response, [schema.issue]);

examples/redux/src/redux/modules/labels.js

@@ -10,7 +10,7 @@ export default function reducer(state = {}, action) {
     case ADD_ENTITIES:
       return {
         ...state,
-        ...action.payload.labels
+        ...action.payload.labels,
       };
 
     default:
@@ -25,7 +25,7 @@ export const getLabels = ({ page = 0 } = {}) => (dispatch, getState, { api, sche
   return api.issues
     .getLabels({
       owner,
-      repo
+      repo,
     })
     .then((response) => {
       const data = normalize(response, [schema.label]);

examples/redux/src/redux/modules/milestones.js

@@ -10,7 +10,7 @@ export default function reducer(state = {}, action) {
     case ADD_ENTITIES:
       return {
         ...state,
-        ...action.payload.milestones
+        ...action.payload.milestones,
       };
 
     default:
@@ -25,7 +25,7 @@ export const getMilestones = ({ page = 0 } = {}) => (dispatch, getState, { api,
   return api.issues
     .getMilestones({
       owner,
-      repo
+      repo,
     })
     .then((response) => {
       const data = normalize(response, [schema.milestone]);

examples/redux/src/redux/modules/pull-requests.js

@@ -10,7 +10,7 @@ export default function reducer(state = {}, action) {
     case ADD_ENTITIES:
       return {
         ...state,
-        ...action.payload.pullRequests
+        ...action.payload.pullRequests,
       };
 
     default:
@@ -25,7 +25,7 @@ export const getPullRequests = ({ page = 0 } = {}) => (dispatch, getState, { api
   return api.pullRequests
     .getAll({
       owner,
-      repo
+      repo,
     })
     .then((response) => {
       const data = normalize(response, [schema.pullRequest]);

examples/redux/src/redux/modules/repos.js

@@ -5,7 +5,7 @@ export default function reducer(state = {}, action) {
     case Action.SET_REPO:
       return {
         ...state,
-        ...action.payload
+        ...action.payload,
       };
 
     default:
@@ -14,14 +14,14 @@ export default function reducer(state = {}, action) {
 }
 
 const Action = {
-  SET_REPO: 'SET_REPO'
+  SET_REPO: 'SET_REPO',
 };
 
 export const setRepo = (slug) => {
   const [owner, repo] = slug.split('/');
   return {
     type: Action.SET_REPO,
-    payload: { owner, repo }
+    payload: { owner, repo },
   };
 };
 

examples/redux/src/redux/modules/users.js

@@ -12,8 +12,8 @@ export default function reducer(state = {}, action) {
           ...mergedUsers,
           [id]: {
             ...(mergedUsers[id] || {}),
-            ...user
-          }
+            ...user,
+          },
         };
       }, state);
 

examples/redux/src/redux/reducer.js

@@ -14,7 +14,7 @@ const reducer = combineReducers({
   [MILESTONES_STATE_KEY]: milestones,
   [PULLREQUESTS_STATE_KEY]: pullRequests,
   [REPO_STATE_KEY]: repos,
-  [USERS_STATE_KEY]: users
+  [USERS_STATE_KEY]: users,
 });
 
 export default reducer;