@feathersjs/cli 5.0.0-pre.29 → 5.0.0-pre.30

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,+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"}
+{"version":3,"file":"service.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/service.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsE;AACtE,2CAA0D;AAGnD,MAAM,QAAQ,GAAG,CAAC,EACvB,SAAS,EACT,cAAc,EACd,eAAe,EACf,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,MAAM,EACN,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;EACtC,cAAc,IAAI,eAAe,CAAC,CAAC,CAAC,2DAA2D,CAAC,CAAC,CAAC,EAAE;EAEpG,MAAM;IACJ,CAAC,CAAC;;;;IAIF,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;CACnB;IACG,CAAC,CAAC,EACN;;oCAEoC,QAAQ;WACjC,SAAS,0BAA0B,QAAQ;;mBAEnC,QAAQ;EACzB,MAAM,CAAC,CAAC,CAAC,oBAAoB,QAAQ,UAAU,CAAC,CAAC,CAAC,EAAE;;;eAGvC,SAAS;;aAEX,IAAI,UAAU,SAAS;;;;;;;iBAOnB,IAAI;;cAGb,cAAc;IACZ,CAAC,CAAC;6BACiB;IACnB,CAAC,CAAC,EACN;SAEE,eAAe;IACb,CAAC,CAAC;;;;;;sCAM0B;IAC5B,CAAC,CAAC,EACN;;;cAIE,MAAM;IACJ,CAAC,CAAC;oCACwB,SAAS;mCACV,SAAS;mCACT,SAAS;kCACV,SAAS;OACpC;IACG,CAAC,CAAC,EACN;;;cAIE,MAAM;IACJ,CAAC,CAAC;oCACwB,SAAS;sCACP,SAAS;OACxC;IACG,CAAC,CAAC,EACN;;;;;;;;;kBASY,QAAQ;;OAEnB,IAAI,MAAM,SAAS;;;CAGzB,CAAA;AAlGY,QAAA,QAAQ,YAkGpB;AAED,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,gBAAQ,EACR,IAAA,eAAM,EAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAA2B,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,EAAE;CACd,CAAC,CACH,CACF;KACA,IAAI,CACH,IAAA,sBAAY,EACV,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAClC,YAAY,SAAS,cAAc,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ,GAAG,EACpE,IAAA,gBAAO,GAAE,EACT,cAAc,CACf,CACF;KACA,IAAI,CACH,IAAA,sBAAY,EACV,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,mBAAmB,SAAS,GAAG,EAClD,IAAA,cAAK,EAAC,uBAAuB,CAAC,EAC9B,cAAc,CACf,CACF,CAAA;AA3BQ,QAAA,QAAQ,YA2BhB"}

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

@@ -1,26 +1,97 @@
-import { generator, prepend, toFile, after } from '@feathershq/pinion'
+import { generator, toFile, after, prepend } from '@feathershq/pinion'
 import { injectSource, renderSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-const template = ({ relative, path, className, camelName, fileName }: ServiceGeneratorContext) =>
-  `import type { Application } from '${relative}/declarations'
+export const template = ({
+  camelName,
+  authentication,
+  isEntityService,
+  path,
+  className,
+  relative,
+  schema,
+  fileName
+}: ServiceGeneratorContext) => /* ts */ `
+${authentication || isEntityService ? `import { authenticate } from '@feathersjs/authentication'` : ''}
+${
+  schema
+    ? `
+import { hooks as schemaHooks } from '@feathersjs/schema'
+    
+import {
+  ${camelName}DataValidator,
+  ${camelName}QueryValidator,
+  ${camelName}Resolver,
+  ${camelName}DataResolver,
+  ${camelName}QueryResolver,
+  ${camelName}ExternalResolver
+} from './${fileName}.schema'
+`
+    : ''
+}
 
-import { ${className}, ${camelName}Hooks } from './${fileName}.class'
+import type { Application } from '${relative}/declarations'
+import { ${className}, getOptions } from './${fileName}.class'
 
-// A configure function that registers the service and its hooks via \`app.configure\`
-export function ${camelName} (app: Application) {
-  const options = { // Service options will go here
-  }
+export * from './${fileName}.class'
+${schema ? `export * from './${fileName}.schema'` : ''}
 
+// A configure function that registers the service and its hooks via \`app.configure\`
+export const ${camelName} = (app: Application) => {
   // Register our service on the Feathers application
-  app.use('${path}', new ${className}(options), {
+  app.use('${path}', new ${className}(getOptions(app)), {
     // A list of all methods this service exposes externally
     methods: ['find', 'get', 'create', 'update', 'patch', 'remove'],
     // You can add additional custom events to be sent to clients here
     events: []
   })
   // Initialize hooks
-  app.service('${path}').hooks(${camelName}Hooks)
+  app.service('${path}').hooks({
+    around: {
+      all: [${
+        authentication
+          ? `
+        authenticate('jwt'),`
+          : ''
+      }
+      ]${
+        isEntityService
+          ? `,
+      find: [ authenticate('jwt') ],
+      get: [ authenticate('jwt') ],
+      create: [],
+      update: [ authenticate('jwt') ],
+      patch: [ authenticate('jwt') ],
+      remove: [ authenticate('jwt') ]`
+          : ''
+      }
+    },
+    before: {
+      all: [${
+        schema
+          ? `
+        schemaHooks.validateQuery(${camelName}QueryValidator),
+        schemaHooks.validateData(${camelName}DataValidator),
+        schemaHooks.resolveQuery(${camelName}QueryResolver),
+        schemaHooks.resolveData(${camelName}DataResolver)
+      `
+          : ''
+      }]
+    },
+    after: {
+      all: [${
+        schema
+          ? `
+        schemaHooks.resolveResult(${camelName}Resolver),
+        schemaHooks.resolveExternal(${camelName}ExternalResolver)
+      `
+          : ''
+      }]
+    },
+    error: {
+      all: []
+    }
+  })
 }
 
 // Add this service to the service type index
@@ -31,11 +102,6 @@ declare module '${relative}/declarations' {
 }
 `
 
-const importTemplate = ({ camelName, folder, fileName }: ServiceGeneratorContext) =>
-  `import { ${camelName} } from './${folder.join('/')}/${fileName}.service'`
-
-const configureTemplate = ({ camelName }: ServiceGeneratorContext) => `  app.configure(${camelName})`
-
 const toServiceIndex = toFile(({ lib }: ServiceGeneratorContext) => [lib, 'services', `index`])
 
 export const generate = (ctx: ServiceGeneratorContext) =>
@@ -43,13 +109,26 @@ export const generate = (ctx: ServiceGeneratorContext) =>
     .then(
       renderSource(
         template,
-        toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
+        toFile(({ lib, fileName, folder }: ServiceGeneratorContext) => [
           lib,
           'services',
           ...folder,
-          `${fileName}.service`
+          `${fileName}`
         ])
       )
     )
-    .then(injectSource(importTemplate, prepend(), toServiceIndex))
-    .then(injectSource(configureTemplate, after('export const services'), toServiceIndex))
+    .then(
+      injectSource<ServiceGeneratorContext>(
+        ({ camelName, folder, fileName }) =>
+          `import { ${camelName} } from './${folder.join('/')}/${fileName}'`,
+        prepend(),
+        toServiceIndex
+      )
+    )
+    .then(
+      injectSource<ServiceGeneratorContext>(
+        ({ camelName }) => `  app.configure(${camelName})`,
+        after('export const services'),
+        toServiceIndex
+      )
+    )

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

@@ -3,7 +3,7 @@ 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 }) => `import assert from 'assert'
+const template = ({ relative, lib, path }) => /* ts */ `import assert from 'assert'
 import { app } from '../${relative}/${lib}/app'
 
 describe('${path} service', () => {

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,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"}
+{"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,CAAC,QAAQ,CAAC;0BACtD,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,8 +2,7 @@ import { generator, toFile } from '@feathershq/pinion'
 import { renderSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-const template = ({ relative, lib, path }: ServiceGeneratorContext) =>
-  `import assert from 'assert'
+const template = ({ relative, lib, path }: ServiceGeneratorContext) => /* ts */ `import assert from 'assert'
 import { app } from '../${relative}/${lib}/app'
 
 describe('${path} service', () => {

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

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

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

@@ -1,10 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = exports.importTemplate = exports.template = void 0;
+exports.generate = exports.template = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const template = ({ className, upperName, relative }) => `import type { Application } from '${relative}/declarations'
-  
+const template = ({ className, upperName, schema, fileName, relative }) => `
+import type { Id, NullableId, Params } from '@feathersjs/feathers'
+
+import type { Application } from '${relative}/declarations'
+${schema
+    ? `import type {
+  ${upperName},
+  ${upperName}Data,
+  ${upperName}Query
+} from './${fileName}.schema'
+`
+    : `
+export type ${upperName} = any
+export type ${upperName}Data = any
+export type ${upperName}Query = any
+`}
+
 export interface ${className}Options {
   app: Application
 }
@@ -18,20 +33,20 @@ export class ${className} {
   constructor (public options: ${className}Options) {
   }
 
-  async find (_params?: ${upperName}Params): Promise<${upperName}Result[]> {
+  async find (_params?: ${upperName}Params): Promise<${upperName}[]> {
     return []
   }
 
-  async get (id: Id, _params?: ${upperName}Params): Promise<${upperName}Result> {
+  async get (id: Id, _params?: ${upperName}Params): Promise<${upperName}> {
     return {
       id: 0,
       text: \`A new message with ID: \${id}!\`
     }
   }
 
-  async create (data: ${upperName}Data, params?: ${upperName}Params): Promise<${upperName}Result>
-  async create (data: ${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}Result[]>
-  async create (data: ${upperName}Data|${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}Result|${upperName}Result[]> {
+  async create (data: ${upperName}Data, params?: ${upperName}Params): Promise<${upperName}>
+  async create (data: ${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}[]>
+  async create (data: ${upperName}Data|${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}|${upperName}[]> {
     if (Array.isArray(data)) {
       return Promise.all(data.map(current => this.create(current, params)));
     }
@@ -42,46 +57,38 @@ export class ${className} {
     }
   }
 
-  async update (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
+  async update (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}> {
     return {
       id: 0,
       ...data
     }
   }
 
-  async patch (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
+  async patch (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}> {
     return {
       id: 0,
       ...data
     }
   }
 
-  async remove (id: NullableId, _params?: ${upperName}Params): Promise<${upperName}Result> {
+  async remove (id: NullableId, _params?: ${upperName}Params): Promise<${upperName}> {
     return {
       id: 0,
       text: 'removed'
     }
   }
 }
+
+export const getOptions = (app: Application) => {
+  return { app }
+}
 `;
 exports.template = template;
-exports.importTemplate = "import type { Id, NullableId, Params } from '@feathersjs/feathers'";
-const optionTemplate = ({}) => `    app`;
-const toServiceFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
-    lib,
-    'services',
-    ...folder,
-    `${fileName}.service`
-]);
-const toClassFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
+const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(exports.template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
     lib,
     'services',
     ...folder,
     `${fileName}.class`
-]);
-const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .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,+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"}
+{"version":3,"file":"custom.tpl.js","sourceRoot":"","sources":["../../../src/service/type/custom.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAGrC,MAAM,QAAQ,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAAC;;;oCAGvE,QAAQ;EAE1C,MAAM;IACJ,CAAC,CAAC;IACF,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;CACnB;IACG,CAAC,CAAC;cACQ,SAAS;cACT,SAAS;cACT,SAAS;CAEvB;;mBAEmB,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,IAAI,SAAS;;;;;;;;;;;wCAWjF,SAAS,mBAAmB,SAAS,oBAAoB,SAAS;;;;;;;uCAOnE,SAAS,mBAAmB,SAAS,oBAAoB,SAAS;;;;;;;4CAO7D,SAAS,oBAAoB,SAAS;;;;;;;;;;;CAWjF,CAAA;AAjFY,QAAA,QAAQ,YAiFpB;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,gBAAQ,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,QAAQ;CACpB,CAAC,CACH,CACF,CAAA;AAXU,QAAA,QAAQ,YAWlB"}

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

@@ -1,10 +1,26 @@
-import { generator, toFile, after, prepend, append } from '@feathershq/pinion'
-import { injectSource } from '../../commons'
+import { generator, toFile } from '@feathershq/pinion'
+import { renderSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-export const template = ({ className, upperName, relative }: ServiceGeneratorContext) =>
-  `import type { Application } from '${relative}/declarations'
-  
+export const template = ({ className, upperName, schema, fileName, relative }: ServiceGeneratorContext) => `
+import type { Id, NullableId, Params } from '@feathersjs/feathers'
+
+import type { Application } from '${relative}/declarations'
+${
+  schema
+    ? `import type {
+  ${upperName},
+  ${upperName}Data,
+  ${upperName}Query
+} from './${fileName}.schema'
+`
+    : `
+export type ${upperName} = any
+export type ${upperName}Data = any
+export type ${upperName}Query = any
+`
+}
+
 export interface ${className}Options {
   app: Application
 }
@@ -18,20 +34,20 @@ export class ${className} {
   constructor (public options: ${className}Options) {
   }
 
-  async find (_params?: ${upperName}Params): Promise<${upperName}Result[]> {
+  async find (_params?: ${upperName}Params): Promise<${upperName}[]> {
     return []
   }
 
-  async get (id: Id, _params?: ${upperName}Params): Promise<${upperName}Result> {
+  async get (id: Id, _params?: ${upperName}Params): Promise<${upperName}> {
     return {
       id: 0,
       text: \`A new message with ID: \${id}!\`
     }
   }
 
-  async create (data: ${upperName}Data, params?: ${upperName}Params): Promise<${upperName}Result>
-  async create (data: ${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}Result[]>
-  async create (data: ${upperName}Data|${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}Result|${upperName}Result[]> {
+  async create (data: ${upperName}Data, params?: ${upperName}Params): Promise<${upperName}>
+  async create (data: ${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}[]>
+  async create (data: ${upperName}Data|${upperName}Data[], params?: ${upperName}Params): Promise<${upperName}|${upperName}[]> {
     if (Array.isArray(data)) {
       return Promise.all(data.map(current => this.create(current, params)));
     }
@@ -42,49 +58,42 @@ export class ${className} {
     }
   }
 
-  async update (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
+  async update (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}> {
     return {
       id: 0,
       ...data
     }
   }
 
-  async patch (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
+  async patch (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}> {
     return {
       id: 0,
       ...data
     }
   }
 
-  async remove (id: NullableId, _params?: ${upperName}Params): Promise<${upperName}Result> {
+  async remove (id: NullableId, _params?: ${upperName}Params): Promise<${upperName}> {
     return {
       id: 0,
       text: 'removed'
     }
   }
 }
-`
 
-export const importTemplate = "import type { Id, NullableId, Params } from '@feathersjs/feathers'"
-
-const optionTemplate = ({}: ServiceGeneratorContext) => `    app`
-
-const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
-  lib,
-  'services',
-  ...folder,
-  `${fileName}.service`
-])
-
-const toClassFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
-  lib,
-  'services',
-  ...folder,
-  `${fileName}.class`
-])
+export const getOptions = (app: Application) => {
+  return { app }
+}
+`
 
 export const generate = (ctx: ServiceGeneratorContext) =>
-  generator(ctx)
-    .then(injectSource(template, append(), toClassFile))
-    .then(injectSource(importTemplate, prepend(), toClassFile))
-    .then(injectSource(optionTemplate, after('const options ='), toServiceFile, false))
+  generator(ctx).then(
+    renderSource(
+      template,
+      toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
+        lib,
+        'services',
+        ...folder,
+        `${fileName}.class`
+      ])
+    )
+  )

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

@@ -1,5 +1,3 @@
 import { ServiceGeneratorContext } from '../index';
-export declare const importTemplate = "import { KnexService } from '@feathersjs/knex'\nimport type { KnexAdapterParams } from '@feathersjs/knex'";
-export declare const classCode: ({ className, upperName }: ServiceGeneratorContext) => string;
-export declare const optionTemplate: ({ kebabName, feathers }: ServiceGeneratorContext) => string;
+export declare const template: ({ className, upperName, kebabName, feathers, schema, fileName, relative }: ServiceGeneratorContext) => string;
 export declare const generate: (ctx: ServiceGeneratorContext) => Promise<ServiceGeneratorContext>;

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = exports.optionTemplate = exports.classCode = exports.importTemplate = void 0;
+exports.generate = exports.template = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const migrationTemplate = ({ kebabName }) => `import type { Knex } from 'knex'
+const migrationTemplate = ({ kebabName }) => /* ts */ `import type { Knex } from 'knex'
 
 export async function up(knex: Knex): Promise<void> {
   await knex.schema.createTable('${kebabName}', table => {
@@ -16,36 +16,46 @@ export async function down(knex: Knex): Promise<void> {
   await knex.schema.dropTable('${kebabName}')
 }
 `;
-exports.importTemplate = `import { KnexService } from \'@feathersjs/knex\'
-import type { KnexAdapterParams } from \'@feathersjs/knex\'`;
-const classCode = ({ className, upperName }) => `export interface ${upperName}Params extends KnexAdapterParams<${upperName}Query> {
+const template = ({ className, upperName, kebabName, feathers, schema, fileName, relative }) => /* ts */ `import { KnexService } from '@feathersjs/knex'
+import type { KnexAdapterParams } from '@feathersjs/knex'
+
+import type { Application } from '${relative}/declarations'
+${schema
+    ? `import type {
+  ${upperName},
+  ${upperName}Data,
+  ${upperName}Query
+} from './${fileName}.schema'
+`
+    : `
+export type ${upperName} = any
+export type ${upperName}Data = any
+export type ${upperName}Query = any
+`}
+
+export interface ${upperName}Params extends KnexAdapterParams<${upperName}Query> {
 }
 
 // By default calls the standard Knex adapter service methods but can be customized with your own functionality.
-export class ${className} extends KnexService<${upperName}Result, ${upperName}Data, ${upperName}Params> {
+export class ${className} extends KnexService<${upperName}, ${upperName}Data, ${upperName}Params> {
 }
-`;
-exports.classCode = classCode;
-const optionTemplate = ({ kebabName, feathers }) => `    paginate: app.get('paginate'),
+
+export const getOptions = (app: Application) => {
+  return {
+    paginate: app.get('paginate'),
     Model: app.get('${feathers.database}Client'),
-    name: '${kebabName}'`;
-exports.optionTemplate = optionTemplate;
-const toServiceFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
-    lib,
-    'services',
-    ...folder,
-    `${fileName}.service`
-]);
-const toClassFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
+    name: '${kebabName}'
+  }
+}
+`;
+exports.template = template;
+const generate = (ctx) => (0, pinion_1.generator)(ctx)
+    .then((0, commons_1.renderSource)(exports.template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
     lib,
     'services',
     ...folder,
     `${fileName}.class`
-]);
-const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .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,+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"}
+{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/service/type/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,iBAAiB,GAAG,CAAC,EACzB,SAAS,EACe,EAAE,EAAE,CAAC,QAAQ,CAAC;;;mCAGL,SAAS;;;;;;;iCAOX,SAAS;;CAEzC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,EACvB,SAAS,EACT,SAAS,EACT,SAAS,EACT,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;oCAGJ,QAAQ;EAE1C,MAAM;IACJ,CAAC,CAAC;IACF,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;CACnB;IACG,CAAC,CAAC;cACQ,SAAS;cACT,SAAS;cACT,SAAS;CAEvB;;mBAEmB,SAAS,oCAAoC,SAAS;;;;eAI1D,SAAS,wBAAwB,SAAS,KAAK,SAAS,SAAS,SAAS;;;;;;sBAMnE,QAAQ,CAAC,QAAQ;aAC1B,SAAS;;;CAGrB,CAAA;AAzCY,QAAA,QAAQ,YAyCpB;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,gBAAQ,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,QAAQ;CACpB,CAAC,CACH,CACF;KACA,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;AAvBQ,QAAA,QAAQ,YAuBhB"}

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

@@ -1,8 +1,10 @@
-import { generator, toFile, after, prepend, append } from '@feathershq/pinion'
-import { injectSource, renderSource } from '../../commons'
+import { generator, toFile } from '@feathershq/pinion'
+import { renderSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-const migrationTemplate = ({ kebabName }: ServiceGeneratorContext) => `import type { Knex } from 'knex'
+const migrationTemplate = ({
+  kebabName
+}: ServiceGeneratorContext) => /* ts */ `import type { Knex } from 'knex'
 
 export async function up(knex: Knex): Promise<void> {
   await knex.schema.createTable('${kebabName}', table => {
@@ -16,42 +18,62 @@ export async function down(knex: Knex): Promise<void> {
 }
 `
 
-export const importTemplate = `import { KnexService } from \'@feathersjs/knex\'
-import type { KnexAdapterParams } from \'@feathersjs/knex\'`
+export const template = ({
+  className,
+  upperName,
+  kebabName,
+  feathers,
+  schema,
+  fileName,
+  relative
+}: ServiceGeneratorContext) => /* ts */ `import { KnexService } from '@feathersjs/knex'
+import type { KnexAdapterParams } from '@feathersjs/knex'
 
-export const classCode = ({ className, upperName }: ServiceGeneratorContext) =>
-  `export interface ${upperName}Params extends KnexAdapterParams<${upperName}Query> {
+import type { Application } from '${relative}/declarations'
+${
+  schema
+    ? `import type {
+  ${upperName},
+  ${upperName}Data,
+  ${upperName}Query
+} from './${fileName}.schema'
+`
+    : `
+export type ${upperName} = any
+export type ${upperName}Data = any
+export type ${upperName}Query = any
+`
+}
+
+export interface ${upperName}Params extends KnexAdapterParams<${upperName}Query> {
 }
 
 // By default calls the standard Knex adapter service methods but can be customized with your own functionality.
-export class ${className} extends KnexService<${upperName}Result, ${upperName}Data, ${upperName}Params> {
+export class ${className} extends KnexService<${upperName}, ${upperName}Data, ${upperName}Params> {
 }
-`
 
-export const optionTemplate = ({ kebabName, feathers }: ServiceGeneratorContext) =>
-  `    paginate: app.get('paginate'),
+export const getOptions = (app: Application) => {
+  return {
+    paginate: app.get('paginate'),
     Model: app.get('${feathers.database}Client'),
-    name: '${kebabName}'`
-
-const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
-  lib,
-  'services',
-  ...folder,
-  `${fileName}.service`
-])
-
-const toClassFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
-  lib,
-  'services',
-  ...folder,
-  `${fileName}.class`
-])
+    name: '${kebabName}'
+  }
+}
+`
 
 export const generate = (ctx: ServiceGeneratorContext) =>
   generator(ctx)
-    .then(injectSource(classCode, append(), toClassFile))
-    .then(injectSource(importTemplate, prepend(), toClassFile))
-    .then(injectSource(optionTemplate, after('const options ='), toServiceFile, false))
+    .then(
+      renderSource(
+        template,
+        toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
+          lib,
+          'services',
+          ...folder,
+          `${fileName}.class`
+        ])
+      )
+    )
     .then(
       renderSource(
         migrationTemplate,

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

@@ -1,4 +1,3 @@
 import { ServiceGeneratorContext } from '../index';
-export declare const importTemplate = "import { MongoDBService } from '@feathersjs/mongodb'\nimport type { MongoDBAdapterParams } from '@feathersjs/mongodb'";
-export declare const classCode: ({ className, upperName }: ServiceGeneratorContext) => string;
+export declare const template: ({ className, upperName, kebabName, schema, fileName, relative }: ServiceGeneratorContext) => string;
 export declare const generate: (ctx: ServiceGeneratorContext) => Promise<ServiceGeneratorContext>;