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

package/lib/service/index.ts

@@ -1,7 +1,12 @@
 import _ from 'lodash'
 import { generator, runGenerator, runGenerators, prompt } from '@feathershq/pinion'
 
-import { FeathersBaseContext, getDatabaseAdapter } from '../commons'
+import {
+  checkPreconditions,
+  FeathersBaseContext,
+  getDatabaseAdapter,
+  initializeBaseContext
+} from '../commons'
 
 export interface ServiceGeneratorContext extends FeathersBaseContext {
   /**
@@ -44,6 +49,10 @@ export interface ServiceGeneratorContext extends FeathersBaseContext {
    * The chosen service type
    */
   type: 'knex' | 'mongodb' | 'custom'
+  /**
+   * Which schema definition format to use
+   */
+  schema: 'typebox' | 'json' | false
   /**
    * Wether this service uses authentication
    */
@@ -58,25 +67,43 @@ export interface ServiceGeneratorContext extends FeathersBaseContext {
  * Parameters the generator is called with
  */
 export type ServiceGeneratorArguments = FeathersBaseContext &
-  Partial<Pick<ServiceGeneratorContext, 'name' | 'path' | 'type' | 'authentication' | 'isEntityService'>>
+  Partial<
+    Pick<ServiceGeneratorContext, 'name' | 'path' | 'type' | 'authentication' | 'isEntityService' | 'schema'>
+  >
 
 export const generate = (ctx: ServiceGeneratorArguments) =>
   generator(ctx)
+    .then(initializeBaseContext())
+    .then(checkPreconditions())
     .then(
       prompt<ServiceGeneratorArguments, ServiceGeneratorContext>(
-        ({ name, path, type, authentication, isEntityService }) => [
+        ({ name, path, type, schema, authentication, isEntityService }) => [
           {
             name: 'name',
             type: 'input',
             when: !name,
-            message: 'What is the name of your service?'
+            message: 'What is the name of your service?',
+            validate: (input) => {
+              if (!input || input === 'authentication') {
+                return 'Invalid service name'
+              }
+
+              return true
+            }
           },
           {
             name: 'path',
             type: 'input',
             when: !path,
             message: 'Which path should the service be registered on?',
-            default: (answers: ServiceGeneratorArguments) => `${_.kebabCase(answers.name)}`
+            default: (answers: ServiceGeneratorArguments) => `${_.kebabCase(answers.name)}`,
+            validate: (input) => {
+              if (!input || input === 'authentication') {
+                return 'Invalid service path'
+              }
+
+              return true
+            }
           },
           {
             name: 'authentication',
@@ -89,7 +116,7 @@ export const generate = (ctx: ServiceGeneratorArguments) =>
             type: 'list',
             when: !type,
             message: 'What kind of service is it?',
-            default: getDatabaseAdapter(ctx.feathers.database),
+            default: getDatabaseAdapter(ctx.feathers?.database),
             choices: [
               {
                 value: 'knex',
@@ -104,6 +131,27 @@ export const generate = (ctx: ServiceGeneratorArguments) =>
                 name: 'A custom service'
               }
             ]
+          },
+          {
+            name: 'schema',
+            type: 'list',
+            when: schema === undefined,
+            message: 'Which schema definition format do you want to use?',
+            default: ctx.feathers?.schema || 'json',
+            choices: [
+              {
+                value: 'typebox',
+                name: 'TypeBox'
+              },
+              {
+                value: 'json',
+                name: 'JSON schema'
+              },
+              {
+                value: false,
+                name: 'No schema'
+              }
+            ]
           }
         ]
       )

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

@@ -2,27 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
-const schemaImports = ({ upperName, folder, fileName }) => `import type {
+const commons_1 = require("../../commons");
+const schemaImports = ({ upperName, folder, fileName }) => /* ts */ `import type {
+  ${upperName},
   ${upperName}Data,
-  ${upperName}Patch,
-  ${upperName}Result,
   ${upperName}Query,
-} from './services/${folder.join('/')}/${fileName}.schema'
+} from './services/${folder.join('/')}/${fileName}'
 
 export type {
+  ${upperName},
   ${upperName}Data,
-  ${upperName}Patch,
-  ${upperName}Result,
   ${upperName}Query,
 }`;
 const declarationTemplate = ({ path, upperName }) => `  '${path}': ClientService<
-    ${upperName}Result,
+    ${upperName},
     ${upperName}Data,
-    ${upperName}Patch,
-    Paginated<${upperName}Result>, 
+    Partial<${upperName}Data>,
+    Paginated<${upperName}>, 
     Params<${upperName}Query>
-  >`;
+  > & {
+    // Add custom methods here
+  }`;
+const registrationTemplate = ({ path }) => `  client.use('${path}', connection.service('${path}'), {
+  // List all standard and custom methods
+  methods: ['find', 'get', 'create', 'update', 'patch', 'remove']
+})
+`;
 const toClientFile = (0, pinion_1.toFile)(({ lib }) => [lib, 'client.ts']);
-const generate = async (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)((ctx) => ctx.language === 'ts', (0, pinion_1.inject)(schemaImports, (0, pinion_1.after)("from '@feathersjs/feathers'"), toClientFile), (0, pinion_1.inject)(declarationTemplate, (0, pinion_1.after)('export interface ServiceTypes'), toClientFile)));
+const generate = async (ctx) => (0, pinion_1.generator)(ctx)
+    .then((0, commons_1.injectSource)(registrationTemplate, (0, pinion_1.before)('return client'), (0, pinion_1.toFile)(({ lib }) => [lib, 'client'])))
+    .then((0, pinion_1.when)((ctx) => ctx.language === 'ts', (0, pinion_1.inject)(schemaImports, (0, pinion_1.after)("from '@feathersjs/feathers'"), toClientFile), (0, pinion_1.inject)(declarationTemplate, (0, pinion_1.after)('export interface ServiceTypes'), toClientFile)));
 exports.generate = generate;
 //# sourceMappingURL=client.tpl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"client.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/client.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA2E;AAG3E,MAAM,aAAa,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAAC;IAChF,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;qBACQ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ;;;IAG7C,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;EACX,CAAA;AAEF,MAAM,mBAAmB,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC3E,MAAM,IAAI;MACN,SAAS;MACT,SAAS;MACT,SAAS;gBACC,SAAS;aACZ,SAAS;IAClB,CAAA;AAEJ,MAAM,YAAY,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAA;AAE9E,MAAM,QAAQ,GAAG,KAAK,EAAE,GAA4B,EAAE,EAAE,CAC7D,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAC9B,IAAA,eAAM,EAAC,aAAa,EAAE,IAAA,cAAK,EAAC,6BAA6B,CAAC,EAAE,YAAY,CAAC,EACzE,IAAA,eAAM,EAAC,mBAAmB,EAAE,IAAA,cAAK,EAAC,+BAA+B,CAAC,EAAE,YAAY,CAAC,CAClF,CACF,CAAA;AAPU,QAAA,QAAQ,YAOlB"}
+{"version":3,"file":"client.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/client.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAmF;AACnF,2CAA4C;AAG5C,MAAM,aAAa,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAAC,QAAQ,CAAC;IACzF,SAAS;IACT,SAAS;IACT,SAAS;qBACQ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ;;;IAG7C,SAAS;IACT,SAAS;IACT,SAAS;EACX,CAAA;AAEF,MAAM,mBAAmB,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC3E,MAAM,IAAI;MACN,SAAS;MACT,SAAS;cACD,SAAS;gBACP,SAAS;aACZ,SAAS;;;IAGlB,CAAA;AAEJ,MAAM,oBAAoB,GAAG,CAAC,EAC5B,IAAI,EACoB,EAAE,EAAE,CAAC,iBAAiB,IAAI,0BAA0B,IAAI;;;;CAIjF,CAAA;AAED,MAAM,YAAY,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAA;AAE9E,MAAM,QAAQ,GAAG,KAAK,EAAE,GAA4B,EAAE,EAAE,CAC7D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,oBAAoB,EACpB,IAAA,eAAM,EAAC,eAAe,CAAC,EACvB,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAC9D,CACF;KACA,IAAI,CACH,IAAA,aAAI,EACF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAC9B,IAAA,eAAM,EAAC,aAAa,EAAE,IAAA,cAAK,EAAC,6BAA6B,CAAC,EAAE,YAAY,CAAC,EACzE,IAAA,eAAM,EAAC,mBAAmB,EAAE,IAAA,cAAK,EAAC,+BAA+B,CAAC,EAAE,YAAY,CAAC,CAClF,CACF,CAAA;AAfQ,QAAA,QAAQ,YAehB"}

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

@@ -1,36 +1,53 @@
-import { generator, inject, toFile, when, after } from '@feathershq/pinion'
+import { generator, inject, toFile, when, after, before } from '@feathershq/pinion'
+import { injectSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
-const schemaImports = ({ upperName, folder, fileName }: ServiceGeneratorContext) => `import type {
+const schemaImports = ({ upperName, folder, fileName }: ServiceGeneratorContext) => /* ts */ `import type {
+  ${upperName},
   ${upperName}Data,
-  ${upperName}Patch,
-  ${upperName}Result,
   ${upperName}Query,
-} from './services/${folder.join('/')}/${fileName}.schema'
+} from './services/${folder.join('/')}/${fileName}'
 
 export type {
+  ${upperName},
   ${upperName}Data,
-  ${upperName}Patch,
-  ${upperName}Result,
   ${upperName}Query,
 }`
 
 const declarationTemplate = ({ path, upperName }: ServiceGeneratorContext) =>
   `  '${path}': ClientService<
-    ${upperName}Result,
+    ${upperName},
     ${upperName}Data,
-    ${upperName}Patch,
-    Paginated<${upperName}Result>, 
+    Partial<${upperName}Data>,
+    Paginated<${upperName}>, 
     Params<${upperName}Query>
-  >`
+  > & {
+    // Add custom methods here
+  }`
+
+const registrationTemplate = ({
+  path
+}: ServiceGeneratorContext) => `  client.use('${path}', connection.service('${path}'), {
+  // List all standard and custom methods
+  methods: ['find', 'get', 'create', 'update', 'patch', 'remove']
+})
+`
 
 const toClientFile = toFile<ServiceGeneratorContext>(({ lib }) => [lib, 'client.ts'])
 
 export const generate = async (ctx: ServiceGeneratorContext) =>
-  generator(ctx).then(
-    when(
-      (ctx) => ctx.language === 'ts',
-      inject(schemaImports, after("from '@feathersjs/feathers'"), toClientFile),
-      inject(declarationTemplate, after('export interface ServiceTypes'), toClientFile)
+  generator(ctx)
+    .then(
+      injectSource(
+        registrationTemplate,
+        before('return client'),
+        toFile<ServiceGeneratorContext>(({ lib }) => [lib, 'client'])
+      )
+    )
+    .then(
+      when(
+        (ctx) => ctx.language === 'ts',
+        inject(schemaImports, after("from '@feathersjs/feathers'"), toClientFile),
+        inject(declarationTemplate, after('export interface ServiceTypes'), toClientFile)
+      )
     )
-  )

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

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generate = void 0;
+const pinion_1 = require("@feathershq/pinion");
+const commons_1 = require("../../commons");
+const template = ({ camelName, upperName, relative, type }) => /* ts */ `import { jsonSchema, resolve } from '@feathersjs/schema'
+import type { FromSchema } from '@feathersjs/schema'
+
+import type { HookContext } from '${relative}/declarations'
+import { dataValidator, queryValidator } from '${relative}/schemas/validators'
+
+// Schema for the basic data model (e.g. creating new entries)
+export const ${camelName}DataSchema = {
+  $id: '${upperName}Data',
+  type: 'object',
+  additionalProperties: false,
+  required: [ 'text' ],
+  properties: {
+    text: {
+      type: 'string'
+    }
+  }
+} as const
+export type ${upperName}Data = FromSchema<typeof ${camelName}DataSchema>
+export const ${camelName}DataValidator = jsonSchema.getDataValidator(${camelName}DataSchema, dataValidator)
+export const ${camelName}DataResolver = resolve<${upperName}Data, HookContext>({
+  properties: {}
+})
+
+// Schema for the data that is being returned
+export const ${camelName}Schema = {
+  $id: '${upperName}',
+  type: 'object',
+  additionalProperties: false,
+  required: [ ...${camelName}DataSchema.required, '${type === 'mongodb' ? '_id' : 'id'}' ],
+  properties: {
+    ...${camelName}DataSchema.properties,
+    ${type === 'mongodb' ? '_id' : 'id'}: {
+      type: '${type === 'mongodb' ? 'string' : 'number'}'
+    }
+  }
+} as const
+export type ${upperName} = FromSchema<typeof ${camelName}Schema>
+export const ${camelName}Resolver = resolve<${upperName}, HookContext>({
+  properties: {}
+})
+export const ${camelName}ExternalResolver = resolve<${upperName}, HookContext>({
+  properties: {}
+})
+
+// Schema for allowed query properties
+export const ${camelName}QuerySchema = {
+  $id: '${upperName}Query',
+  type: 'object',
+  additionalProperties: false,
+  properties: {
+    ...jsonSchema.querySyntax(${camelName}Schema.properties)
+  }
+} as const
+export type ${upperName}Query = FromSchema<typeof ${camelName}QuerySchema>
+export const ${camelName}QueryValidator = jsonSchema.getValidator(${camelName}QuerySchema, queryValidator)
+export const ${camelName}QueryResolver = resolve<${upperName}Query, HookContext>({
+  properties: {}
+})
+`;
+const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)(({ schema }) => schema === 'json', (0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
+    lib,
+    'services',
+    ...folder,
+    `${fileName}.schema`
+]))));
+exports.generate = generate;
+//# sourceMappingURL=schema.json.tpl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"schema.json.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/schema.json.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAChB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,IAAI,EACoB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;oCAGJ,QAAQ;iDACK,QAAQ;;;eAG1C,SAAS;UACd,SAAS;;;;;;;;;;cAUL,SAAS,4BAA4B,SAAS;eAC7C,SAAS,+CAA+C,SAAS;eACjE,SAAS,0BAA0B,SAAS;;;;;eAK5C,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;;;;cAIzC,SAAS,wBAAwB,SAAS;eACzC,SAAS,sBAAsB,SAAS;;;eAGxC,SAAS,8BAA8B,SAAS;;;;;eAKhD,SAAS;UACd,SAAS;;;;gCAIa,SAAS;;;cAG3B,SAAS,6BAA6B,SAAS;eAC9C,SAAS,4CAA4C,SAAS;eAC9D,SAAS,2BAA2B,SAAS;;;CAG3D,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,MAAM,EACjC,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,CACF,CAAA;AAdU,QAAA,QAAQ,YAclB"}

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

@@ -0,0 +1,85 @@
+import { generator, toFile, when } from '@feathershq/pinion'
+import { renderSource } from '../../commons'
+import { ServiceGeneratorContext } from '../index'
+
+const template = ({
+  camelName,
+  upperName,
+  relative,
+  type
+}: ServiceGeneratorContext) => /* ts */ `import { jsonSchema, resolve } from '@feathersjs/schema'
+import type { FromSchema } from '@feathersjs/schema'
+
+import type { HookContext } from '${relative}/declarations'
+import { dataValidator, queryValidator } from '${relative}/schemas/validators'
+
+// Schema for the basic data model (e.g. creating new entries)
+export const ${camelName}DataSchema = {
+  $id: '${upperName}Data',
+  type: 'object',
+  additionalProperties: false,
+  required: [ 'text' ],
+  properties: {
+    text: {
+      type: 'string'
+    }
+  }
+} as const
+export type ${upperName}Data = FromSchema<typeof ${camelName}DataSchema>
+export const ${camelName}DataValidator = jsonSchema.getDataValidator(${camelName}DataSchema, dataValidator)
+export const ${camelName}DataResolver = resolve<${upperName}Data, HookContext>({
+  properties: {}
+})
+
+// Schema for the data that is being returned
+export const ${camelName}Schema = {
+  $id: '${upperName}',
+  type: 'object',
+  additionalProperties: false,
+  required: [ ...${camelName}DataSchema.required, '${type === 'mongodb' ? '_id' : 'id'}' ],
+  properties: {
+    ...${camelName}DataSchema.properties,
+    ${type === 'mongodb' ? '_id' : 'id'}: {
+      type: '${type === 'mongodb' ? 'string' : 'number'}'
+    }
+  }
+} as const
+export type ${upperName} = FromSchema<typeof ${camelName}Schema>
+export const ${camelName}Resolver = resolve<${upperName}, HookContext>({
+  properties: {}
+})
+export const ${camelName}ExternalResolver = resolve<${upperName}, HookContext>({
+  properties: {}
+})
+
+// Schema for allowed query properties
+export const ${camelName}QuerySchema = {
+  $id: '${upperName}Query',
+  type: 'object',
+  additionalProperties: false,
+  properties: {
+    ...jsonSchema.querySyntax(${camelName}Schema.properties)
+  }
+} as const
+export type ${upperName}Query = FromSchema<typeof ${camelName}QuerySchema>
+export const ${camelName}QueryValidator = jsonSchema.getValidator(${camelName}QuerySchema, queryValidator)
+export const ${camelName}QueryResolver = resolve<${upperName}Query, HookContext>({
+  properties: {}
+})
+`
+
+export const generate = (ctx: ServiceGeneratorContext) =>
+  generator(ctx).then(
+    when<ServiceGeneratorContext>(
+      ({ schema }) => schema === 'json',
+      renderSource(
+        template,
+        toFile(({ lib, folder, fileName }: ServiceGeneratorContext) => [
+          lib,
+          'services',
+          ...folder,
+          `${fileName}.schema`
+        ])
+      )
+    )
+  )

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

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generate = void 0;
+const pinion_1 = require("@feathershq/pinion");
+const commons_1 = require("../../commons");
+const template = ({ camelName, upperName, relative, type }) => /* ts */ `import { jsonSchema, resolve } from '@feathersjs/schema'
+import { Type, querySyntax } from '@feathersjs/typebox'
+import type { Static } from '@feathersjs/typebox'
+
+import type { HookContext } from '${relative}/declarations'
+import { dataValidator, queryValidator } from '${relative}/schemas/validators'
+
+// Schema for the basic data model (e.g. creating new entries)
+export const ${camelName}DataSchema = Type.Object({
+  text: Type.String()
+}, { $id: '${upperName}Data', additionalProperties: false })
+export type ${upperName}Data = Static<typeof ${camelName}DataSchema>
+export const ${camelName}DataValidator = jsonSchema.getDataValidator(${camelName}DataSchema, dataValidator)
+export const ${camelName}DataResolver = resolve<${upperName}Data, HookContext>({
+  properties: {}
+})
+
+// Schema for the data that is being returned
+export const ${camelName}Schema = Type.Intersect([
+  ${camelName}DataSchema, 
+  Type.Object({
+    ${type === 'mongodb' ? '_id: Type.String()' : 'id: Type.Number()'}
+  })
+], { $id: '${upperName}', additionalProperties: false })
+export type ${upperName} = Static<typeof ${camelName}Schema>
+export const ${camelName}Resolver = resolve<${upperName}, HookContext>({
+  properties: {}
+})
+
+export const ${camelName}ExternalResolver = resolve<${upperName}, HookContext>({
+  properties: {}
+})
+
+// Schema for allowed query properties
+export const ${camelName}QuerySchema = Type.Intersect([
+  querySyntax(${camelName}Schema),
+  // Add additional query properties here
+  Type.Object({})
+])
+export type ${upperName}Query = Static<typeof ${camelName}QuerySchema>
+export const ${camelName}QueryValidator = jsonSchema.getValidator(${camelName}QuerySchema, queryValidator)
+export const ${camelName}QueryResolver = resolve<${upperName}Query, HookContext>({
+  properties: {}
+})
+`;
+const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)(({ schema }) => schema === 'typebox', (0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
+    lib,
+    'services',
+    ...folder,
+    `${fileName}.schema`
+]))));
+exports.generate = generate;
+//# sourceMappingURL=schema.typebox.tpl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"schema.typebox.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/schema.typebox.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAChB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,IAAI,EACoB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;oCAIJ,QAAQ;iDACK,QAAQ;;;eAG1C,SAAS;;aAEX,SAAS;cACR,SAAS,wBAAwB,SAAS;eACzC,SAAS,+CAA+C,SAAS;eACjE,SAAS,0BAA0B,SAAS;;;;;eAK5C,SAAS;IACpB,SAAS;;MAEP,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB;;aAExD,SAAS;cACR,SAAS,oBAAoB,SAAS;eACrC,SAAS,sBAAsB,SAAS;;;;eAIxC,SAAS,8BAA8B,SAAS;;;;;eAKhD,SAAS;gBACR,SAAS;;;;cAIX,SAAS,yBAAyB,SAAS;eAC1C,SAAS,4CAA4C,SAAS;eAC9D,SAAS,2BAA2B,SAAS;;;CAG3D,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,EACpC,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,CACF,CAAA;AAdU,QAAA,QAAQ,YAclB"}

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

@@ -0,0 +1,70 @@
+import { generator, toFile, when } from '@feathershq/pinion'
+import { renderSource } from '../../commons'
+import { ServiceGeneratorContext } from '../index'
+
+const template = ({
+  camelName,
+  upperName,
+  relative,
+  type
+}: ServiceGeneratorContext) => /* ts */ `import { jsonSchema, resolve } from '@feathersjs/schema'
+import { Type, querySyntax } from '@feathersjs/typebox'
+import type { Static } from '@feathersjs/typebox'
+
+import type { HookContext } from '${relative}/declarations'
+import { dataValidator, queryValidator } from '${relative}/schemas/validators'
+
+// Schema for the basic data model (e.g. creating new entries)
+export const ${camelName}DataSchema = Type.Object({
+  text: Type.String()
+}, { $id: '${upperName}Data', additionalProperties: false })
+export type ${upperName}Data = Static<typeof ${camelName}DataSchema>
+export const ${camelName}DataValidator = jsonSchema.getDataValidator(${camelName}DataSchema, dataValidator)
+export const ${camelName}DataResolver = resolve<${upperName}Data, HookContext>({
+  properties: {}
+})
+
+// Schema for the data that is being returned
+export const ${camelName}Schema = Type.Intersect([
+  ${camelName}DataSchema, 
+  Type.Object({
+    ${type === 'mongodb' ? '_id: Type.String()' : 'id: Type.Number()'}
+  })
+], { $id: '${upperName}', additionalProperties: false })
+export type ${upperName} = Static<typeof ${camelName}Schema>
+export const ${camelName}Resolver = resolve<${upperName}, HookContext>({
+  properties: {}
+})
+
+export const ${camelName}ExternalResolver = resolve<${upperName}, HookContext>({
+  properties: {}
+})
+
+// Schema for allowed query properties
+export const ${camelName}QuerySchema = Type.Intersect([
+  querySyntax(${camelName}Schema),
+  // Add additional query properties here
+  Type.Object({})
+])
+export type ${upperName}Query = Static<typeof ${camelName}QuerySchema>
+export const ${camelName}QueryValidator = jsonSchema.getValidator(${camelName}QuerySchema, queryValidator)
+export const ${camelName}QueryResolver = resolve<${upperName}Query, HookContext>({
+  properties: {}
+})
+`
+
+export const generate = (ctx: ServiceGeneratorContext) =>
+  generator(ctx).then(
+    when<ServiceGeneratorContext>(
+      ({ schema }) => schema === 'typebox',
+      renderSource(
+        template,
+        toFile(({ lib, folder, fileName }: ServiceGeneratorContext) => [
+          lib,
+          'services',
+          ...folder,
+          `${fileName}.schema`
+        ])
+      )
+    )
+  )

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

@@ -1,2 +1,3 @@
 import { ServiceGeneratorContext } from '../index';
+export declare const template: ({ camelName, authentication, isEntityService, path, className, relative, schema, fileName }: ServiceGeneratorContext) => string;
 export declare const generate: (ctx: ServiceGeneratorContext) => Promise<ServiceGeneratorContext>;

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

@@ -1,26 +1,79 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
+exports.generate = exports.template = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const template = ({ relative, path, className, camelName, fileName }) => `import type { Application } from '${relative}/declarations'
+const template = ({ camelName, authentication, isEntityService, path, className, relative, schema, fileName }) => /* 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
@@ -30,17 +83,16 @@ declare module '${relative}/declarations' {
   }
 }
 `;
-const importTemplate = ({ camelName, folder, fileName }) => `import { ${camelName} } from './${folder.join('/')}/${fileName}.service'`;
-const configureTemplate = ({ camelName }) => `  app.configure(${camelName})`;
+exports.template = template;
 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 }) => [
+    .then((0, commons_1.renderSource)(exports.template, (0, pinion_1.toFile)(({ lib, fileName, folder }) => [
     lib,
     'services',
     ...folder,
-    `${fileName}.service`
+    `${fileName}`
 ])))
-    .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));
+    .then((0, commons_1.injectSource)(({ camelName, folder, fileName }) => `import { ${camelName} } from './${folder.join('/')}/${fileName}'`, (0, pinion_1.prepend)(), toServiceIndex))
+    .then((0, commons_1.injectSource)(({ camelName }) => `  app.configure(${camelName})`, (0, pinion_1.after)('export const services'), toServiceIndex));
 exports.generate = generate;
 //# sourceMappingURL=service.tpl.js.map