Merge pull request feathersjs-ecosystem#1 from feathersjs-ecosystem/master

update forked feathers-vuex

Author: dallinbjohnson

package-lock.json

@@ -150,7 +150,7 @@
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^5.0.2",
     "@vue/test-utils": "^1.0.2",
-    "axios": "^0.19.2",
+    "axios": "^0.21.1",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.1.0",

package.json

@@ -45,7 +45,7 @@ export default function makeFindMixin(options) {
     name = 'service'
   }
 
-  const nameToUse = (name || service).replace('-', '_')
+  const nameToUse = (name || service).replace(/-/g, '_')
   const prefix = getServicePrefix(nameToUse)
   const capitalized = getServiceCapitalization(nameToUse)
   const SERVICE_NAME = `${prefix}ServiceName`

src/make-find-mixin.ts

@@ -38,7 +38,7 @@ export default function makeFindMixin(options) {
     name = 'service'
   }
 
-  const nameToUse = (name || service).replace('-', '_')
+  const nameToUse = (name || service).replace(/-/g, '_')
   const singularized = inflection.singularize(nameToUse)
   const prefix = inflection.camelize(singularized, true)
   const capitalized = prefix.charAt(0).toUpperCase() + prefix.slice(1)

src/make-get-mixin.ts

@@ -421,7 +421,7 @@ export default function makeBaseModel(options: FeathersVuexOptions) {
       const { idField, _dispatch } = this.constructor as typeof BaseModel
       const id = getId(this, idField)
 
-      if (!id) {
+      if (id !== 0 && !id) {
         const error = new Error(
           `Missing ${idField} property. You must create the data before you can update with this data`
         )

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

@@ -23,7 +23,7 @@ export default function makeServiceModule(
     state: makeDefaultState(options),
     getters: makeGetters(),
     mutations: makeMutations(),
-    actions: makeActions(service)
+    actions: makeActions({service, options})
   }
   const fromOptions = _pick(options, [
     'state',

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

@@ -6,8 +6,14 @@ eslint
 import fastCopy from 'fast-copy'
 import { getId } from '../utils'
 import { Service } from '@feathersjs/feathers'
+import { MakeServicePluginOptions } from './types'
 
-export default function makeServiceActions(service: Service<any>) {
+interface serviceAndOptions {
+  service: Service<any>
+  options: MakeServicePluginOptions
+}
+
+export default function makeServiceActions({service, options}: serviceAndOptions) {
   const serviceActions = {
     find({ commit, dispatch }, params) {
       params = params || {}
@@ -322,9 +328,9 @@ export default function makeServiceActions(service: Service<any>) {
         commit('removeItems', toRemove) // commit removal
       }
 
-      if (service.FeathersVuexModel) {
+      if (options.Model) {
         toAdd.forEach((item, index) => {
-          toAdd[index] = new service.FeathersVuexModel(item, { commit: false })
+          toAdd[index] = new options.Model(item, { commit: false })
         })
       }
 

src/service-module/service-module.actions.ts

@@ -274,7 +274,7 @@ export function getServicePrefix(servicePath) {
   const parts = servicePath.split('/')
   let name = parts[parts.length - 1]
   // name = inflection.underscore(name)
-  name = name.replace('-', '_')
+  name = name.replace(/-/g, '_')
   name = inflection.camelize(name, true)
   return name
 }
@@ -283,7 +283,7 @@ export function getServiceCapitalization(servicePath) {
   const parts = servicePath.split('/')
   let name = parts[parts.length - 1]
   // name = inflection.underscore(name)
-  name = name.replace('-', '_')
+  name = name.replace(/-/g, '_')
   name = inflection.camelize(name)
   return name
 }

src/utils.ts

@@ -162,7 +162,8 @@ describe('Utils', function () {
         ['environment-Panos', 'environmentPanos'],
         ['env-panos', 'envPanos'],
         ['envPanos', 'envPanos'],
-        ['api/v1/env-panos', 'envPanos']
+        ['api/v1/env-panos', 'envPanos'],
+        ['very-long-service', 'veryLongService']
       ]
       decisionTable.forEach(([path, prefix]) => {
         assert(
@@ -181,7 +182,8 @@ describe('Utils', function () {
         ['environment-Panos', 'EnvironmentPanos'],
         ['env-panos', 'EnvPanos'],
         ['envPanos', 'EnvPanos'],
-        ['api/v1/env-panos', 'EnvPanos']
+        ['api/v1/env-panos', 'EnvPanos'],
+        ['very-long-service', 'VeryLongService']
       ]
       decisionTable.forEach(([path, prefix]) => {
         assert(