@feathersjs/cli 5.0.0-pre.25 → 5.0.0-pre.28

package/lib/service/templates/resolver.tpl.ts

@@ -2,7 +2,7 @@ import { generator, toFile } from '@feathershq/pinion'
 import { renderSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-const template = ({ camelName, upperName, relative, schemaPath }: ServiceGeneratorContext) =>
+const template = ({ camelName, upperName, relative, fileName }: ServiceGeneratorContext) =>
   `import { resolve } from '@feathersjs/schema'
 import type { HookContext } from '${relative}/declarations'
 
@@ -11,13 +11,13 @@ import type {
   ${upperName}Patch,
   ${upperName}Result,
   ${upperName}Query,
-} from '${relative}/${schemaPath}'
+} from './${fileName}.schema'
 import {
   ${camelName}DataSchema,
   ${camelName}PatchSchema,
   ${camelName}ResultSchema,
   ${camelName}QuerySchema
-} from '${relative}/${schemaPath}'
+} from './${fileName}.schema'
 
 
 // Resolver for the basic data model (e.g. creating new entries)
@@ -70,7 +70,7 @@ export const generate = (ctx: ServiceGeneratorContext) =>
       template,
       toFile(({ lib, folder, fileName }: ServiceGeneratorContext) => [
         lib,
-        'resolvers',
+        'services',
         ...folder,
         `${fileName}.resolver`
       ])

package/lib/service/templates/schema.tpl.js

@@ -45,7 +45,7 @@ export const ${camelName}ResultSchema = schema({
   properties: {
     ...${camelName}DataSchema.properties,
     ${type === 'mongodb' ? '_id' : 'id'}: {
-      type: 'string'
+      type: '${type === 'mongodb' ? 'string' : 'number'}'
     }
   }
 } as const)
@@ -67,7 +67,7 @@ export type ${upperName}Query = Infer<typeof ${camelName}QuerySchema>
 `;
 const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
     lib,
-    'schemas',
+    'services',
     ...folder,
     `${fileName}.schema`
 ])));

package/lib/service/templates/schema.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/schema.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAA2B,EAAE,EAAE,CAC3E;;;;eAIa,SAAS;UACd,SAAS;;;;;;;;;;;cAWL,SAAS,uBAAuB,SAAS;;;;eAIxC,SAAS;UACd,SAAS;;;;;SAKV,SAAS;;;;cAIJ,SAAS,wBAAwB,SAAS;;;;eAIzC,SAAS;UACd,SAAS;;;mBAGA,SAAS,yBAAyB,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;;SAE7E,SAAS;MACZ,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;;;;;;cAMzB,SAAS,yBAAyB,SAAS;;;;eAI1C,SAAS;UACd,SAAS;;;;qBAIE,SAAS;;;;cAIhB,SAAS,wBAAwB,SAAS;CACvD,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,SAAS;IACT,GAAG,MAAM;IACT,GAAG,QAAQ,SAAS;CACrB,CAAC,CACH,CACF,CAAA;AAXU,QAAA,QAAQ,YAWlB"}
+{"version":3,"file":"schema.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/schema.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAA2B,EAAE,EAAE,CAC3E;;;;eAIa,SAAS;UACd,SAAS;;;;;;;;;;;cAWL,SAAS,uBAAuB,SAAS;;;;eAIxC,SAAS;UACd,SAAS;;;;;SAKV,SAAS;;;;cAIJ,SAAS,wBAAwB,SAAS;;;;eAIzC,SAAS;UACd,SAAS;;;mBAGA,SAAS,yBAAyB,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;;SAE7E,SAAS;MACZ,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;eACxB,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;;;;;cAKzC,SAAS,yBAAyB,SAAS;;;;eAI1C,SAAS;UACd,SAAS;;;;qBAIE,SAAS;;;;cAIhB,SAAS,wBAAwB,SAAS;CACvD,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,SAAS;CACrB,CAAC,CACH,CACF,CAAA;AAXU,QAAA,QAAQ,YAWlB"}

package/lib/service/templates/schema.tpl.ts

@@ -45,7 +45,7 @@ export const ${camelName}ResultSchema = schema({
   properties: {
     ...${camelName}DataSchema.properties,
     ${type === 'mongodb' ? '_id' : 'id'}: {
-      type: 'string'
+      type: '${type === 'mongodb' ? 'string' : 'number'}'
     }
   }
 } as const)
@@ -72,7 +72,7 @@ export const generate = (ctx: ServiceGeneratorContext) =>
       template,
       toFile(({ lib, folder, fileName }: ServiceGeneratorContext) => [
         lib,
-        'schemas',
+        'services',
         ...folder,
         `${fileName}.schema`
       ])

package/lib/service/templates/service.tpl.js

@@ -3,56 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const template = ({ relative, path, className, schemaPath, resolverPath, camelName, upperName, isEntityService, authentication }) => `import { resolveAll } from '@feathersjs/schema'
-${isEntityService || authentication ? `import { authenticate } from '@feathersjs/authentication'` : ''}
-import type { Application } from '${relative}/declarations'
-import type {
-  ${upperName}Data,
-  ${upperName}Result,
-  ${upperName}Query,
-} from '${relative}/${schemaPath}'
-import { ${camelName}Resolvers } from '${relative}/${resolverPath}'
+const template = ({ relative, path, className, camelName, fileName }) => `import type { Application } from '${relative}/declarations'
 
-export const hooks = {
-  around: {
-    all: [${authentication
-    ? `
-      authenticate('jwt'),`
-    : ''} ${!isEntityService
-    ? `
-      resolveAll(${camelName}Resolvers)`
-    : ''}
-    ]${isEntityService
-    ? `,
-    get: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ],
-    find: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ],
-    create: [
-      resolveAll(${camelName}Resolvers)
-    ],
-    patch: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ],
-    update: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ],
-    remove: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ]`
-    : ''}
-  },
-  before: {},
-  after: {},
-  error: {}
-}
+import { ${className}, ${camelName}Hooks } from './${fileName}.class'
 
 // A configure function that registers the service and its hooks via \`app.configure\`
 export function ${camelName} (app: Application) {
@@ -67,7 +20,7 @@ export function ${camelName} (app: Application) {
     events: []
   })
   // Initialize hooks
-  app.service('${path}').hooks(hooks)
+  app.service('${path}').hooks(${camelName}Hooks)
 }
 
 // Add this service to the service type index
@@ -77,16 +30,17 @@ declare module '${relative}/declarations' {
   }
 }
 `;
-const importTemplate = ({ camelName, path }) => `import { ${camelName} } from './${path}'`;
+const importTemplate = ({ camelName, folder, fileName }) => `import { ${camelName} } from './${folder.join('/')}/${fileName}.service'`;
 const configureTemplate = ({ camelName }) => `  app.configure(${camelName})`;
-const toServiceIndex = (0, pinion_1.toFile)(({ lib, language }) => [
+const toServiceIndex = (0, pinion_1.toFile)(({ lib }) => [lib, 'services', `index`]);
+const generate = (ctx) => (0, pinion_1.generator)(ctx)
+    .then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
     lib,
     'services',
-    `index.${language}`
-]);
-const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [lib, 'services', ...folder, fileName])))
-    .then((0, pinion_1.inject)((0, commons_1.getSource)(importTemplate), (0, pinion_1.prepend)(), toServiceIndex))
-    .then((0, pinion_1.inject)(configureTemplate, (0, pinion_1.after)('export const services'), toServiceIndex));
+    ...folder,
+    `${fileName}.service`
+])))
+    .then((0, commons_1.injectSource)(importTemplate, (0, pinion_1.prepend)(), toServiceIndex))
+    .then((0, commons_1.injectSource)(configureTemplate, (0, pinion_1.after)('export const services'), toServiceIndex));
 exports.generate = generate;
 //# sourceMappingURL=service.tpl.js.map

package/lib/service/templates/service.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/service.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,2CAAuD;AAGvD,MAAM,QAAQ,GAAG,CAAC,EAChB,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,UAAU,EACV,YAAY,EACZ,SAAS,EACT,SAAS,EACT,eAAe,EACf,cAAc,EACU,EAAE,EAAE,CAC5B;EACA,eAAe,IAAI,cAAc,CAAC,CAAC,CAAC,2DAA2D,CAAC,CAAC,CAAC,EAAE;oCAClE,QAAQ;;IAExC,SAAS;IACT,SAAS;IACT,SAAS;UACH,QAAQ,IAAI,UAAU;WACrB,SAAS,qBAAqB,QAAQ,IAAI,YAAY;;;;YAK3D,cAAc;IACZ,CAAC,CAAC;2BACiB;IACnB,CAAC,CAAC,EACN,IACA,CAAC,eAAe;IACd,CAAC,CAAC;mBACW,SAAS,YAAY;IAClC,CAAC,CAAC,EACN;OAEI,eAAe;IACb,CAAC,CAAC;;;mBAGS,SAAS;;;;mBAIT,SAAS;;;mBAGT,SAAS;;;;mBAIT,SAAS;;;;mBAIT,SAAS;;;;mBAIT,SAAS;MACtB;IACE,CAAC,CAAC,EACN;;;;;;;;kBAQc,SAAS;;;;;aAKd,IAAI,UAAU,SAAS;;;;;;;iBAOnB,IAAI;;;;kBAIH,QAAQ;;OAEnB,IAAI,MAAM,SAAS;;;CAGzB,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAA2B,EAAE,EAAE,CACtE,YAAY,SAAS,cAAc,IAAI,GAAG,CAAA;AAE5C,MAAM,iBAAiB,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAAC,mBAAmB,SAAS,GAAG,CAAA;AAErG,MAAM,cAAc,GAAG,IAAA,eAAM,EAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAAC;IAC5E,GAAG;IACH,UAAU;IACV,SAAS,QAAQ,EAAE;CACpB,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE,QAAQ,CAAC,CAAC,CACvG,CACF;KACA,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,cAAc,CAAC,EAAE,IAAA,gBAAO,GAAE,EAAE,cAAc,CAAC,CAAC;KAClE,IAAI,CAAC,IAAA,eAAM,EAAC,iBAAiB,EAAE,IAAA,cAAK,EAAC,uBAAuB,CAAC,EAAE,cAAc,CAAC,CAAC,CAAA;AATvE,QAAA,QAAQ,YAS+D"}
+{"version":3,"file":"service.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/service.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsE;AACtE,2CAA0D;AAG1D,MAAM,QAAQ,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAC/F,qCAAqC,QAAQ;;WAEpC,SAAS,KAAK,SAAS,mBAAmB,QAAQ;;;kBAG3C,SAAS;;;;;aAKd,IAAI,UAAU,SAAS;;;;;;;iBAOnB,IAAI,YAAY,SAAS;;;;kBAIxB,QAAQ;;OAEnB,IAAI,MAAM,SAAS;;;CAGzB,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAClF,YAAY,SAAS,cAAc,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ,WAAW,CAAA;AAE5E,MAAM,iBAAiB,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAAC,mBAAmB,SAAS,GAAG,CAAA;AAErG,MAAM,cAAc,GAAG,IAAA,eAAM,EAAC,CAAC,EAAE,GAAG,EAA2B,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;AAExF,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,UAAU;CACtB,CAAC,CACH,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,cAAc,EAAE,IAAA,gBAAO,GAAE,EAAE,cAAc,CAAC,CAAC;KAC7D,IAAI,CAAC,IAAA,sBAAY,EAAC,iBAAiB,EAAE,IAAA,cAAK,EAAC,uBAAuB,CAAC,EAAE,cAAc,CAAC,CAAC,CAAA;AAd7E,QAAA,QAAQ,YAcqE"}

package/lib/service/templates/service.tpl.ts

@@ -1,74 +1,11 @@
-import { generator, inject, prepend, toFile, after } from '@feathershq/pinion'
-import { getSource, renderSource } from '../../commons'
+import { generator, prepend, toFile, after } from '@feathershq/pinion'
+import { injectSource, renderSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-const template = ({
-  relative,
-  path,
-  className,
-  schemaPath,
-  resolverPath,
-  camelName,
-  upperName,
-  isEntityService,
-  authentication
-}: ServiceGeneratorContext) =>
-  `import { resolveAll } from '@feathersjs/schema'
-${isEntityService || authentication ? `import { authenticate } from '@feathersjs/authentication'` : ''}
-import type { Application } from '${relative}/declarations'
-import type {
-  ${upperName}Data,
-  ${upperName}Result,
-  ${upperName}Query,
-} from '${relative}/${schemaPath}'
-import { ${camelName}Resolvers } from '${relative}/${resolverPath}'
+const template = ({ relative, path, className, camelName, fileName }: ServiceGeneratorContext) =>
+  `import type { Application } from '${relative}/declarations'
 
-export const hooks = {
-  around: {
-    all: [${
-      authentication
-        ? `
-      authenticate('jwt'),`
-        : ''
-    } ${
-    !isEntityService
-      ? `
-      resolveAll(${camelName}Resolvers)`
-      : ''
-  }
-    ]${
-      isEntityService
-        ? `,
-    get: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ],
-    find: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ],
-    create: [
-      resolveAll(${camelName}Resolvers)
-    ],
-    patch: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ],
-    update: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ],
-    remove: [
-      authenticate('jwt'),
-      resolveAll(${camelName}Resolvers)
-    ]`
-        : ''
-    }
-  },
-  before: {},
-  after: {},
-  error: {}
-}
+import { ${className}, ${camelName}Hooks } from './${fileName}.class'
 
 // A configure function that registers the service and its hooks via \`app.configure\`
 export function ${camelName} (app: Application) {
@@ -83,7 +20,7 @@ export function ${camelName} (app: Application) {
     events: []
   })
   // Initialize hooks
-  app.service('${path}').hooks(hooks)
+  app.service('${path}').hooks(${camelName}Hooks)
 }
 
 // Add this service to the service type index
@@ -94,24 +31,25 @@ declare module '${relative}/declarations' {
 }
 `
 
-const importTemplate = ({ camelName, path }: ServiceGeneratorContext) =>
-  `import { ${camelName} } from './${path}'`
+const importTemplate = ({ camelName, folder, fileName }: ServiceGeneratorContext) =>
+  `import { ${camelName} } from './${folder.join('/')}/${fileName}.service'`
 
 const configureTemplate = ({ camelName }: ServiceGeneratorContext) => `  app.configure(${camelName})`
 
-const toServiceIndex = toFile(({ lib, language }: ServiceGeneratorContext) => [
-  lib,
-  'services',
-  `index.${language}`
-])
+const toServiceIndex = toFile(({ lib }: ServiceGeneratorContext) => [lib, 'services', `index`])
 
 export const generate = (ctx: ServiceGeneratorContext) =>
   generator(ctx)
     .then(
       renderSource(
         template,
-        toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [lib, 'services', ...folder, fileName])
+        toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
+          lib,
+          'services',
+          ...folder,
+          `${fileName}.service`
+        ])
       )
     )
-    .then(inject(getSource(importTemplate), prepend(), toServiceIndex))
-    .then(inject(configureTemplate, after('export const services'), toServiceIndex))
+    .then(injectSource(importTemplate, prepend(), toServiceIndex))
+    .then(injectSource(configureTemplate, after('export const services'), toServiceIndex))

package/lib/service/templates/test.tpl.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const template = ({ relative, lib, path, name }) => `import assert from 'assert'
+const template = ({ relative, lib, path }) => `import assert from 'assert'
 import { app } from '../${relative}/${lib}/app'
 
-describe('${name} service', () => {
+describe('${path} service', () => {
   it('registered the service', () => {
     const service = app.service('${path}')
 
@@ -14,11 +14,11 @@ describe('${name} service', () => {
   })
 })
 `;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ test, folder, kebabName }) => [
+const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ test, folder, fileName }) => [
     test,
     'services',
     ...folder,
-    `${kebabName}.test`
+    `${fileName}.test`
 ])));
 exports.generate = generate;
 //# sourceMappingURL=test.tpl.js.map

package/lib/service/templates/test.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/test.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAA2B,EAAE,EAAE,CAC1E;0BACwB,QAAQ,IAAI,GAAG;;YAE7B,IAAI;;mCAEmB,IAAI;;;;;CAKtC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA0B,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC/D,IAAI;IACJ,UAAU;IACV,GAAG,MAAM;IACT,GAAG,SAAS,OAAO;CACpB,CAAC,CACH,CACF,CAAA;AAXU,QAAA,QAAQ,YAWlB"}
+{"version":3,"file":"test.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/test.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAA2B,EAAE,EAAE,CACpE;0BACwB,QAAQ,IAAI,GAAG;;YAE7B,IAAI;;mCAEmB,IAAI;;;;;CAKtC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA0B,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC9D,IAAI;IACJ,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,OAAO;CACnB,CAAC,CACH,CACF,CAAA;AAXU,QAAA,QAAQ,YAWlB"}

package/lib/service/templates/test.tpl.ts

@@ -2,11 +2,11 @@ import { generator, toFile } from '@feathershq/pinion'
 import { renderSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-const template = ({ relative, lib, path, name }: ServiceGeneratorContext) =>
+const template = ({ relative, lib, path }: ServiceGeneratorContext) =>
   `import assert from 'assert'
 import { app } from '../${relative}/${lib}/app'
 
-describe('${name} service', () => {
+describe('${path} service', () => {
   it('registered the service', () => {
     const service = app.service('${path}')
 
@@ -19,11 +19,11 @@ export const generate = (ctx: ServiceGeneratorContext) =>
   generator(ctx).then(
     renderSource(
       template,
-      toFile<ServiceGeneratorContext>(({ test, folder, kebabName }) => [
+      toFile<ServiceGeneratorContext>(({ test, folder, fileName }) => [
         test,
         'services',
         ...folder,
-        `${kebabName}.test`
+        `${fileName}.test`
       ])
     )
   )

package/lib/service/type/custom.tpl.d.ts

@@ -1,4 +1,4 @@
 import { ServiceGeneratorContext } from '../index';
-export declare const template: ({ className, upperName }: ServiceGeneratorContext) => string;
+export declare const template: ({ className, upperName, relative }: ServiceGeneratorContext) => string;
 export declare const importTemplate = "import type { Id, NullableId, Params } from '@feathersjs/feathers'";
 export declare const generate: (ctx: ServiceGeneratorContext) => Promise<ServiceGeneratorContext>;

package/lib/service/type/custom.tpl.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = exports.importTemplate = exports.template = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const template = ({ className, upperName }) => `export interface ${className}Options {
+const template = ({ className, upperName, relative }) => `import type { Application } from '${relative}/declarations'
+  
+export interface ${className}Options {
   app: Application
 }
 
@@ -22,9 +24,9 @@ export class ${className} {
 
   async get (id: Id, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       text: \`A new message with ID: \${id}!\`
-    };
+    }
   }
 
   async create (data: ${upperName}Data, params?: ${upperName}Params): Promise<${upperName}Result>
@@ -35,45 +37,51 @@ export class ${className} {
     }
 
     return {
-      id: 'created',
+      id: 0,
       ...data
-    };
+    }
   }
 
   async update (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       ...data
-    };
+    }
   }
 
   async patch (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       ...data
-    };
+    }
   }
 
   async remove (id: NullableId, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       text: 'removed'
-    };
+    }
   }
 }
 `;
 exports.template = template;
 exports.importTemplate = "import type { Id, NullableId, Params } from '@feathersjs/feathers'";
 const optionTemplate = ({}) => `    app`;
-const toServiceFile = (0, pinion_1.toFile)(({ lib, language, folder, fileName }) => [
+const toServiceFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
+    lib,
+    'services',
+    ...folder,
+    `${fileName}.service`
+]);
+const toClassFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
     lib,
     'services',
     ...folder,
-    `${fileName}.${language}`
+    `${fileName}.class`
 ]);
 const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, pinion_1.inject)((0, commons_1.getSource)(exports.template), (0, pinion_1.before)('export const hooks ='), toServiceFile))
-    .then((0, pinion_1.inject)((0, commons_1.getSource)(exports.importTemplate), (0, pinion_1.prepend)(), toServiceFile))
-    .then((0, pinion_1.inject)(optionTemplate, (0, pinion_1.after)('const options ='), toServiceFile));
+    .then((0, commons_1.injectSource)(exports.template, (0, pinion_1.append)(), toClassFile))
+    .then((0, commons_1.injectSource)(exports.importTemplate, (0, pinion_1.prepend)(), toClassFile))
+    .then((0, commons_1.injectSource)(optionTemplate, (0, pinion_1.after)('const options ='), toServiceFile, false));
 exports.generate = generate;
 //# sourceMappingURL=custom.tpl.js.map

package/lib/service/type/custom.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.tpl.js","sourceRoot":"","sources":["../../../src/service/type/custom.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsF;AACtF,2CAAyC;AAGlC,MAAM,QAAQ,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC5E,oBAAoB,SAAS;;;;mBAIZ,SAAS,yBAAyB,SAAS;;;;;eAK/C,SAAS;iCACS,SAAS;;;0BAGhB,SAAS,oBAAoB,SAAS;;;;iCAI/B,SAAS,oBAAoB,SAAS;;;;;;;wBAO/C,SAAS,kBAAkB,SAAS,oBAAoB,SAAS;wBACjE,SAAS,oBAAoB,SAAS,oBAAoB,SAAS;wBACnE,SAAS,QAAQ,SAAS,oBAAoB,SAAS,oBAAoB,SAAS,UAAU,SAAS;;;;;;;;;;;wCAWvF,SAAS,mBAAmB,SAAS,oBAAoB,SAAS;;;;;;;uCAOnE,SAAS,mBAAmB,SAAS,oBAAoB,SAAS;;;;;;;4CAO7D,SAAS,oBAAoB,SAAS;;;;;;;CAOjF,CAAA;AA3DY,QAAA,QAAQ,YA2DpB;AAEY,QAAA,cAAc,GAAG,oEAAoE,CAAA;AAElG,MAAM,cAAc,GAAG,CAAC,EAA2B,EAAE,EAAE,CAAC,SAAS,CAAA;AAEjE,MAAM,aAAa,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7F,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,IAAI,QAAQ,EAAE;CAC1B,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,gBAAQ,CAAC,EAAE,IAAA,eAAM,EAA0B,sBAAsB,CAAC,EAAE,aAAa,CAAC,CAAC;KACzG,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,sBAAc,CAAC,EAAE,IAAA,gBAAO,GAAE,EAAE,aAAa,CAAC,CAAC;KACjE,IAAI,CAAC,IAAA,eAAM,EAAC,cAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,CAAC,CAAC,CAAA;AAJ7D,QAAA,QAAQ,YAIqD"}
+{"version":3,"file":"custom.tpl.js","sourceRoot":"","sources":["../../../src/service/type/custom.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,2CAA4C;AAGrC,MAAM,QAAQ,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAA2B,EAAE,EAAE,CACtF,qCAAqC,QAAQ;;mBAE5B,SAAS;;;;mBAIT,SAAS,yBAAyB,SAAS;;;;;eAK/C,SAAS;iCACS,SAAS;;;0BAGhB,SAAS,oBAAoB,SAAS;;;;iCAI/B,SAAS,oBAAoB,SAAS;;;;;;;wBAO/C,SAAS,kBAAkB,SAAS,oBAAoB,SAAS;wBACjE,SAAS,oBAAoB,SAAS,oBAAoB,SAAS;wBACnE,SAAS,QAAQ,SAAS,oBAAoB,SAAS,oBAAoB,SAAS,UAAU,SAAS;;;;;;;;;;;wCAWvF,SAAS,mBAAmB,SAAS,oBAAoB,SAAS;;;;;;;uCAOnE,SAAS,mBAAmB,SAAS,oBAAoB,SAAS;;;;;;;4CAO7D,SAAS,oBAAoB,SAAS;;;;;;;CAOjF,CAAA;AA7DY,QAAA,QAAQ,YA6DpB;AAEY,QAAA,cAAc,GAAG,oEAAoE,CAAA;AAElG,MAAM,cAAc,GAAG,CAAC,EAA2B,EAAE,EAAE,CAAC,SAAS,CAAA;AAEjE,MAAM,aAAa,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACnF,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,UAAU;CACtB,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACjF,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,QAAQ;CACpB,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CAAC,IAAA,sBAAY,EAAC,gBAAQ,EAAE,IAAA,eAAM,GAAE,EAAE,WAAW,CAAC,CAAC;KACnD,IAAI,CAAC,IAAA,sBAAY,EAAC,sBAAc,EAAE,IAAA,gBAAO,GAAE,EAAE,WAAW,CAAC,CAAC;KAC1D,IAAI,CAAC,IAAA,sBAAY,EAAC,cAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC,CAAA;AAJ1E,QAAA,QAAQ,YAIkE"}

package/lib/service/type/custom.tpl.ts

@@ -1,9 +1,11 @@
-import { generator, inject, toFile, after, before, prepend } from '@feathershq/pinion'
-import { getSource } from '../../commons'
+import { generator, toFile, after, prepend, append } from '@feathershq/pinion'
+import { injectSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-export const template = ({ className, upperName }: ServiceGeneratorContext) =>
-  `export interface ${className}Options {
+export const template = ({ className, upperName, relative }: ServiceGeneratorContext) =>
+  `import type { Application } from '${relative}/declarations'
+  
+export interface ${className}Options {
   app: Application
 }
 
@@ -22,9 +24,9 @@ export class ${className} {
 
   async get (id: Id, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       text: \`A new message with ID: \${id}!\`
-    };
+    }
   }
 
   async create (data: ${upperName}Data, params?: ${upperName}Params): Promise<${upperName}Result>
@@ -35,30 +37,30 @@ export class ${className} {
     }
 
     return {
-      id: 'created',
+      id: 0,
       ...data
-    };
+    }
   }
 
   async update (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       ...data
-    };
+    }
   }
 
   async patch (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       ...data
-    };
+    }
   }
 
   async remove (id: NullableId, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       text: 'removed'
-    };
+    }
   }
 }
 `
@@ -67,15 +69,22 @@ export const importTemplate = "import type { Id, NullableId, Params } from '@fea
 
 const optionTemplate = ({}: ServiceGeneratorContext) => `    app`
 
-const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, language, folder, fileName }) => [
+const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
+  lib,
+  'services',
+  ...folder,
+  `${fileName}.service`
+])
+
+const toClassFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
   lib,
   'services',
   ...folder,
-  `${fileName}.${language}`
+  `${fileName}.class`
 ])
 
 export const generate = (ctx: ServiceGeneratorContext) =>
   generator(ctx)
-    .then(inject(getSource(template), before<ServiceGeneratorContext>('export const hooks ='), toServiceFile))
-    .then(inject(getSource(importTemplate), prepend(), toServiceFile))
-    .then(inject(optionTemplate, after('const options ='), toServiceFile))
+    .then(injectSource(template, append(), toClassFile))
+    .then(injectSource(importTemplate, prepend(), toClassFile))
+    .then(injectSource(optionTemplate, after('const options ='), toServiceFile, false))

package/lib/service/type/knex.tpl.js

@@ -30,16 +30,22 @@ const optionTemplate = ({ kebabName, feathers }) => `    paginate: app.get('pagi
     Model: app.get('${feathers.database}Client'),
     name: '${kebabName}'`;
 exports.optionTemplate = optionTemplate;
-const toServiceFile = (0, pinion_1.toFile)(({ lib, folder, fileName, language }) => [
+const toServiceFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
     lib,
     'services',
     ...folder,
-    `${fileName}.${language}`
+    `${fileName}.service`
+]);
+const toClassFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
+    lib,
+    'services',
+    ...folder,
+    `${fileName}.class`
 ]);
 const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, pinion_1.inject)((0, commons_1.getSource)(exports.classCode), (0, pinion_1.before)('export const hooks ='), toServiceFile))
-    .then((0, pinion_1.inject)((0, commons_1.getSource)(exports.importTemplate), (0, pinion_1.prepend)(), toServiceFile))
-    .then((0, pinion_1.inject)(exports.optionTemplate, (0, pinion_1.after)('const options ='), toServiceFile))
+    .then((0, commons_1.injectSource)(exports.classCode, (0, pinion_1.append)(), toClassFile))
+    .then((0, commons_1.injectSource)(exports.importTemplate, (0, pinion_1.prepend)(), toClassFile))
+    .then((0, commons_1.injectSource)(exports.optionTemplate, (0, pinion_1.after)('const options ='), toServiceFile, false))
     .then((0, commons_1.renderSource)(migrationTemplate, (0, pinion_1.toFile)('migrations', ({ kebabName }) => {
     // Probably not great but it works to align with the Knex migration file format
     const migrationDate = new Date().toISOString().replace(/\D/g, '').substring(0, 14);

package/lib/service/type/knex.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/service/type/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsF;AACtF,2CAAuD;AAGvD,MAAM,iBAAiB,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAAC;;;mCAGnC,SAAS;;;;;;;iCAOX,SAAS;;CAEzC,CAAA;AAEY,QAAA,cAAc,GAAG;4DAC8B,CAAA;AAErD,MAAM,SAAS,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC7E,oBAAoB,SAAS,oCAAoC,SAAS;;;;eAI7D,SAAS,wBAAwB,SAAS,WAAW,SAAS,SAAS,SAAS;;CAE9F,CAAA;AAPY,QAAA,SAAS,aAOrB;AAEM,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,QAAQ,EAA2B,EAAE,EAAE,CACjF;sBACoB,QAAQ,CAAC,QAAQ;aAC1B,SAAS,GAAG,CAAA;AAHZ,QAAA,cAAc,kBAGF;AAEzB,MAAM,aAAa,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7F,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,IAAI,QAAQ,EAAE;CAC1B,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,iBAAS,CAAC,EAAE,IAAA,eAAM,EAA0B,sBAAsB,CAAC,EAAE,aAAa,CAAC,CACrG;KACA,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,sBAAc,CAAC,EAAE,IAAA,gBAAO,GAAE,EAAE,aAAa,CAAC,CAAC;KACjE,IAAI,CAAC,IAAA,eAAM,EAAC,sBAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,CAAC,CAAC;KACrE,IAAI,CACH,IAAA,sBAAY,EACV,iBAAiB,EACjB,IAAA,eAAM,EAA0B,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAC9D,+EAA+E;IAC/E,MAAM,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAElF,OAAO,GAAG,aAAa,IAAI,SAAS,EAAE,CAAA;AACxC,CAAC,CAAC,CACH,CACF,CAAA;AAjBQ,QAAA,QAAQ,YAiBhB"}
+{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/service/type/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,2CAA0D;AAG1D,MAAM,iBAAiB,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAAC;;;mCAGnC,SAAS;;;;;;;iCAOX,SAAS;;CAEzC,CAAA;AAEY,QAAA,cAAc,GAAG;4DAC8B,CAAA;AAErD,MAAM,SAAS,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC7E,oBAAoB,SAAS,oCAAoC,SAAS;;;;eAI7D,SAAS,wBAAwB,SAAS,WAAW,SAAS,SAAS,SAAS;;CAE9F,CAAA;AAPY,QAAA,SAAS,aAOrB;AAEM,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,QAAQ,EAA2B,EAAE,EAAE,CACjF;sBACoB,QAAQ,CAAC,QAAQ;aAC1B,SAAS,GAAG,CAAA;AAHZ,QAAA,cAAc,kBAGF;AAEzB,MAAM,aAAa,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACnF,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,UAAU;CACtB,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACjF,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,QAAQ;CACpB,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CAAC,IAAA,sBAAY,EAAC,iBAAS,EAAE,IAAA,eAAM,GAAE,EAAE,WAAW,CAAC,CAAC;KACpD,IAAI,CAAC,IAAA,sBAAY,EAAC,sBAAc,EAAE,IAAA,gBAAO,GAAE,EAAE,WAAW,CAAC,CAAC;KAC1D,IAAI,CAAC,IAAA,sBAAY,EAAC,sBAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;KAClF,IAAI,CACH,IAAA,sBAAY,EACV,iBAAiB,EACjB,IAAA,eAAM,EAA0B,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAC9D,+EAA+E;IAC/E,MAAM,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAElF,OAAO,GAAG,aAAa,IAAI,SAAS,EAAE,CAAA;AACxC,CAAC,CAAC,CACH,CACF,CAAA;AAfQ,QAAA,QAAQ,YAehB"}

package/lib/service/type/knex.tpl.ts

@@ -1,5 +1,5 @@
-import { generator, inject, toFile, before, after, prepend } from '@feathershq/pinion'
-import { getSource, renderSource } from '../../commons'
+import { generator, toFile, after, prepend, append } from '@feathershq/pinion'
+import { injectSource, renderSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
 const migrationTemplate = ({ kebabName }: ServiceGeneratorContext) => `import type { Knex } from 'knex'
@@ -33,20 +33,25 @@ export const optionTemplate = ({ kebabName, feathers }: ServiceGeneratorContext)
     Model: app.get('${feathers.database}Client'),
     name: '${kebabName}'`
 
-const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName, language }) => [
+const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
   lib,
   'services',
   ...folder,
-  `${fileName}.${language}`
+  `${fileName}.service`
+])
+
+const toClassFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
+  lib,
+  'services',
+  ...folder,
+  `${fileName}.class`
 ])
 
 export const generate = (ctx: ServiceGeneratorContext) =>
   generator(ctx)
-    .then(
-      inject(getSource(classCode), before<ServiceGeneratorContext>('export const hooks ='), toServiceFile)
-    )
-    .then(inject(getSource(importTemplate), prepend(), toServiceFile))
-    .then(inject(optionTemplate, after('const options ='), toServiceFile))
+    .then(injectSource(classCode, append(), toClassFile))
+    .then(injectSource(importTemplate, prepend(), toClassFile))
+    .then(injectSource(optionTemplate, after('const options ='), toServiceFile, false))
     .then(
       renderSource(
         migrationTemplate,