Merge pull request #544 from J3m5/refactor/lodash-get

refactor(lodash-get): simplify get lodash get method usage and fix some eslint warnings

Author: marshallswain

src/make-find-mixin.ts

@@ -224,9 +224,8 @@ export default function makeFindMixin(options) {
       getPaginationForQuery(params = {}) {
         const pagination = this[PAGINATION]
         const { qid, queryId, pageId } = getQueryInfo(params)
-        const queryInfo = _get(pagination, `[${qid}][${queryId}]`) || {}
-        const pageInfo =
-          _get(pagination, `[${qid}][${queryId}][${pageId}]`) || {}
+        const queryInfo = _get(pagination, [qid, queryId], {})
+        const pageInfo = _get(pagination, [qid, queryId, pageId], {})
 
         return { queryInfo, pageInfo }
       }

src/service-module/make-base-model.ts

@@ -49,7 +49,7 @@ export default function makeBaseModel(options: FeathersVuexOptions) {
   const { serverAlias } = options
 
   // If this serverAlias already has a BaseModel, return it
-  const ExistingBaseModel = _get(globalModels, `[${serverAlias}].BaseModel`)
+  const ExistingBaseModel = _get(globalModels, [serverAlias, 'BaseModel'])
   if (ExistingBaseModel) {
     return ExistingBaseModel as ModelStatic
   }

src/service-module/make-service-plugin.ts

@@ -93,7 +93,7 @@ export default function prepareMakeServicePlugin(
       store.registerModule(options.namespace, module, { preserveState: false })
 
       // (2a^) Monkey patch the BaseModel in globalModels
-      const BaseModel = _get(globalModels, `[${options.serverAlias}].BaseModel`)
+      const BaseModel = _get(globalModels, [options.serverAlias, 'BaseModel'])
       if (BaseModel && !BaseModel.store) {
         Object.assign(BaseModel, {
           store

src/service-module/service-module.getters.ts

@@ -14,9 +14,7 @@ import { ServiceState } from '..'
 import { Id } from '@feathersjs/feathers'
 
 const FILTERS = ['$sort', '$limit', '$skip', '$select']
-const OPERATORS = ['$in', '$nin', '$lt', '$lte', '$gt', '$gte', '$ne', '$or']
 const additionalOperators = ['$elemMatch']
-const defaultOps = FILTERS.concat(OPERATORS).concat(additionalOperators)
 
 export default function makeServiceGetters() {
   return {
@@ -109,10 +107,7 @@ export default function makeServiceGetters() {
       if (keepCopiesInStore) {
         return state.copiesById[id]
       } else {
-        const Model = _get(
-          models,
-          `[${serverAlias}].byServicePath[${servicePath}]`
-        )
+        const Model = _get(models, [serverAlias, 'byServicePath', servicePath])
 
         return Model.copiesById[id]
       }

src/service-module/service-module.mutations.ts

@@ -34,8 +34,8 @@ export type PendingIdServiceMethodName = Exclude<
 export default function makeServiceMutations() {
   function addItems(state, items) {
     const { serverAlias, idField, tempIdField, modelName } = state
-    const Model = _get(models, `[${serverAlias}][${modelName}]`)
-    const BaseModel = _get(models, `[${serverAlias}].BaseModel`)
+    const Model = _get(models, [serverAlias, modelName])
+    const BaseModel = _get(models, [serverAlias, 'BaseModel'])
 
     for (let item of items) {
       const id = getId(item, idField)
@@ -69,8 +69,8 @@ export default function makeServiceMutations() {
 
   function updateItems(state, items) {
     const { idField, replaceItems, addOnUpsert, serverAlias, modelName } = state
-    const Model = _get(models, `[${serverAlias}][${modelName}]`)
-    const BaseModel = _get(models, `[${state.serverAlias}].BaseModel`)
+    const Model = _get(models, [serverAlias, modelName])
+    const BaseModel = _get(models, [state.serverAlias, 'BaseModel'])
 
     for (let item of items) {
       const id = getId(item, idField)
@@ -121,7 +121,7 @@ export default function makeServiceMutations() {
   }
 
   function mergeInstance(state, item) {
-    const { serverAlias, idField, tempIdField, modelName } = state
+    const { idField } = state
     const id = getId(item, idField)
     const existingItem = state.keyedById[id]
     if (existingItem) {
@@ -172,7 +172,7 @@ export default function makeServiceMutations() {
       }
 
       // Add _id to temp's clone as well if it exists
-      const Model = _get(models, `[${state.serverAlias}][${state.modelName}]`)
+      const Model = _get(models, [state.serverAlias, state.modelName])
       const tempClone = Model && Model.copiesById && Model.copiesById[tempId]
       if (tempClone) {
         tempClone[state.idField] = id
@@ -262,10 +262,7 @@ export default function makeServiceMutations() {
     createCopy(state, id) {
       const { servicePath, keepCopiesInStore, serverAlias } = state
       const current = state.keyedById[id] || state.tempsById[id]
-      const Model = _get(
-        models,
-        `[${serverAlias}].byServicePath[${servicePath}]`
-      )
+      const Model = _get(models, [serverAlias, 'byServicePath', servicePath])
 
       if (Model) {
         var model = new Model(current, { clone: true })
@@ -291,13 +288,14 @@ export default function makeServiceMutations() {
     // Resets the copy to match the original record, locally
     resetCopy(state, id) {
       const { servicePath, keepCopiesInStore } = state
-      const Model = _get(
-        models,
-        `[${state.serverAlias}].byServicePath[${servicePath}]`
-      )
+      const Model = _get(models, [
+        state.serverAlias,
+        'byServicePath',
+        servicePath
+      ])
       const copy = keepCopiesInStore
         ? state.copiesById[id]
-        : Model && _get(Model, `copiesById[${id}]`)
+        : Model && _get(Model, ['copiesById', id])
 
       if (copy) {
         const original =
@@ -311,13 +309,14 @@ export default function makeServiceMutations() {
     // Deep assigns copy to original record, locally
     commitCopy(state, id) {
       const { servicePath, keepCopiesInStore } = state
-      const Model = _get(
-        models,
-        `[${state.serverAlias}].byServicePath[${servicePath}]`
-      )
+      const Model = _get(models, [
+        state.serverAlias,
+        'byServicePath',
+        servicePath
+      ])
       const copy = keepCopiesInStore
         ? state.copiesById[id]
-        : Model && _get(Model, `copiesById[${id}]`)
+        : Model && _get(Model, ['copiesById', id])
 
       if (copy) {
         const original =
@@ -397,10 +396,15 @@ export default function makeServiceMutations() {
       state[`is${uppercaseMethod}Pending`] = false
     },
 
-    setIdPending(state, payload: { method: PendingIdServiceMethodName, id: Id | Id[] }): void {
+    setIdPending(
+      state,
+      payload: { method: PendingIdServiceMethodName; id: Id | Id[] }
+    ): void {
       const { method, id } = payload
       const uppercaseMethod = method.charAt(0).toUpperCase() + method.slice(1)
-      const isIdMethodPending = state[`isId${uppercaseMethod}Pending`] as ServiceState['isIdCreatePending']
+      const isIdMethodPending = state[
+        `isId${uppercaseMethod}Pending`
+      ] as ServiceState['isIdCreatePending']
       // if `id` is an array, ensure it doesn't have duplicates
       const ids = Array.isArray(id) ? [...new Set(id)] : [id]
       ids.forEach(id => {
@@ -409,10 +413,15 @@ export default function makeServiceMutations() {
         }
       })
     },
-    unsetIdPending(state, payload: { method: PendingIdServiceMethodName, id: Id | Id[] }): void {
+    unsetIdPending(
+      state,
+      payload: { method: PendingIdServiceMethodName; id: Id | Id[] }
+    ): void {
       const { method, id } = payload
       const uppercaseMethod = method.charAt(0).toUpperCase() + method.slice(1)
-      const isIdMethodPending = state[`isId${uppercaseMethod}Pending`] as ServiceState['isIdCreatePending']
+      const isIdMethodPending = state[
+        `isId${uppercaseMethod}Pending`
+      ] as ServiceState['isIdCreatePending']
       // if `id` is an array, ensure it doesn't have duplicates
       const ids = Array.isArray(id) ? [...new Set(id)] : [id]
       ids.forEach(id => {

src/service-module/service-module.state.ts

@@ -139,7 +139,7 @@ export default function makeDefaultState(options: MakeServicePluginOptions) {
     isIdCreatePending: [],
     isIdUpdatePending: [],
     isIdPatchPending: [],
-    isIdRemovePending: [],
+    isIdRemovePending: []
   }
 
   if (options.Model) {

src/service-module/types.ts

@@ -269,7 +269,10 @@ export interface ModelStatic extends EventEmitter {
    * @param id ID of record to retrieve
    * @param params Get params
    */
-  getFromStore<M extends Model = Model>(id: Id | Ref<Id>, params?: Params | Ref<Params>): M | undefined
+  getFromStore<M extends Model = Model>(
+    id: Id | Ref<Id>,
+    params?: Params | Ref<Params>
+  ): M | undefined
 }
 
 /** Model instance interface */