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

package/lib/hook/templates/hook.tpl.ts

@@ -2,8 +2,10 @@ import { generator, toFile } from '@feathershq/pinion'
 import { HookGeneratorContext } from '../index'
 import { renderSource } from '../../commons'
 
-const aroundTemplate = ({ camelName, name }: HookGeneratorContext) => `
-import type { HookContext, NextFunction } from '../declarations'
+const aroundTemplate = ({
+  camelName,
+  name
+}: HookGeneratorContext) => /* ts */ `import type { HookContext, NextFunction } from '../declarations'
 
 export const ${camelName} = async (context: HookContext, next: NextFunction) => {
   console.log(\`Running hook ${name} on \${context.path}\.\${context.method}\`)
@@ -14,7 +16,7 @@ export const ${camelName} = async (context: HookContext, next: NextFunction) =>
 const regularTemplate = ({
   camelName,
   name
-}: HookGeneratorContext) => `import type { HookContext } from '../declarations'
+}: HookGeneratorContext) => /* ts */ `import type { HookContext } from '../declarations'
 
 export const ${camelName} = async (context: HookContext) => {
   console.log(\`Running hook ${name} on \${context.path}\.\${context.method}\`)

package/lib/index.d.ts

@@ -1,16 +1,2 @@
-/// <reference types="yargs" />
-import { Argv } from '@feathershq/pinion';
-import { FeathersBaseContext } from './commons';
-export declare const commandRunner: (yarg: any) => Promise<FeathersBaseContext & {
-    lib: string;
-    test: string;
-    language: "js" | "ts";
-    feathers: import("./commons").FeathersAppInfo;
-}>;
-export declare const generate: (ctx: FeathersBaseContext) => Promise<FeathersBaseContext & {
-    lib: string;
-    test: string;
-    language: "js" | "ts";
-    feathers: import("./commons").FeathersAppInfo;
-}>;
-export declare const command: (yargs: Argv) => Argv<{}>;
+export * from './cli';
+export * from './commons';

package/lib/index.js

@@ -1,27 +1,19 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = exports.generate = exports.commandRunner = void 0;
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("./commons");
-const commandRunner = (yarg) => {
-    const ctx = (0, pinion_1.getContext)({
-        ...yarg.argv
-    });
-    return (0, exports.generate)(ctx);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-exports.commandRunner = commandRunner;
-const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, commons_1.initializeBaseContext)())
-    .then((0, pinion_1.runGenerator)(__dirname, (ctx) => `${ctx._[1]}`, 'index'));
-exports.generate = generate;
-const command = (yargs) => yargs
-    .command('generate', 'Run a generator', (yarg) => yarg
-    .command('app', 'Generate a new app', exports.commandRunner)
-    .command('service', 'Generate a service', exports.commandRunner)
-    .command('hook', 'Generate a hook', exports.commandRunner)
-    .command('connection', 'Connect to a different database', exports.commandRunner)
-    .command('authentication', 'Set up authentication with a custom entity', exports.commandRunner))
-    .usage('Usage: $0 <command> [options]')
-    .help();
-exports.command = command;
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./cli"), exports);
+__exportStar(require("./commons"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,uCAAsE;AAE/D,MAAM,aAAa,GAAG,CAAC,IAAS,EAAE,EAAE;IACzC,MAAM,GAAG,GAAG,IAAA,mBAAU,EAAsB;QAC1C,GAAG,IAAI,CAAC,IAAI;KACb,CAAC,CAAA;IAEF,OAAO,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAA;AACtB,CAAC,CAAA;AANY,QAAA,aAAa,iBAMzB;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CAAC,IAAA,+BAAqB,GAAE,CAAC;KAC7B,IAAI,CAAC,IAAA,qBAAY,EAAC,SAAS,EAAE,CAAC,GAAwB,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;AAH3E,QAAA,QAAQ,YAGmE;AAEjF,MAAM,OAAO,GAAG,CAAC,KAAW,EAAE,EAAE,CACrC,KAAK;KACF,OAAO,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAC/C,IAAI;KACD,OAAO,CAAC,KAAK,EAAE,oBAAoB,EAAE,qBAAa,CAAC;KACnD,OAAO,CAAC,SAAS,EAAE,oBAAoB,EAAE,qBAAa,CAAC;KACvD,OAAO,CAAC,MAAM,EAAE,iBAAiB,EAAE,qBAAa,CAAC;KACjD,OAAO,CAAC,YAAY,EAAE,iCAAiC,EAAE,qBAAa,CAAC;KACvE,OAAO,CAAC,gBAAgB,EAAE,4CAA4C,EAAE,qBAAa,CAAC,CAC1F;KACA,KAAK,CAAC,+BAA+B,CAAC;KACtC,IAAI,EAAE,CAAA;AAXE,QAAA,OAAO,WAWT"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAqB;AACrB,4CAAyB"}

package/lib/index.ts

@@ -1,28 +1,2 @@
-import { Argv, generator, runGenerator, getContext } from '@feathershq/pinion'
-import { FeathersBaseContext, initializeBaseContext } from './commons'
-
-export const commandRunner = (yarg: any) => {
-  const ctx = getContext<FeathersBaseContext>({
-    ...yarg.argv
-  })
-
-  return generate(ctx)
-}
-
-export const generate = (ctx: FeathersBaseContext) =>
-  generator(ctx)
-    .then(initializeBaseContext())
-    .then(runGenerator(__dirname, (ctx: FeathersBaseContext) => `${ctx._[1]}`, 'index'))
-
-export const command = (yargs: Argv) =>
-  yargs
-    .command('generate', 'Run a generator', (yarg) =>
-      yarg
-        .command('app', 'Generate a new app', commandRunner)
-        .command('service', 'Generate a service', commandRunner)
-        .command('hook', 'Generate a hook', commandRunner)
-        .command('connection', 'Connect to a different database', commandRunner)
-        .command('authentication', 'Set up authentication with a custom entity', commandRunner)
-    )
-    .usage('Usage: $0 <command> [options]')
-    .help()
+export * from './cli'
+export * from './commons'

package/lib/service/index.d.ts

@@ -40,6 +40,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
      */
@@ -52,7 +56,7 @@ export interface ServiceGeneratorContext extends FeathersBaseContext {
 /**
  * Parameters the generator is called with
  */
-export declare type ServiceGeneratorArguments = FeathersBaseContext & Partial<Pick<ServiceGeneratorContext, 'name' | 'path' | 'type' | 'authentication' | 'isEntityService'>>;
+export declare type ServiceGeneratorArguments = FeathersBaseContext & Partial<Pick<ServiceGeneratorContext, 'name' | 'path' | 'type' | 'authentication' | 'isEntityService' | 'schema'>>;
 export declare const generate: (ctx: ServiceGeneratorArguments) => Promise<{
     /**
      * The chosen service name
@@ -94,6 +98,10 @@ export declare const generate: (ctx: ServiceGeneratorArguments) => Promise<{
      * The chosen service type
      */
     type: 'knex' | 'mongodb' | 'custom';
+    /**
+     * Which schema definition format to use
+     */
+    schema: 'typebox' | 'json' | false;
     /**
      * Wether this service uses authentication
      */
@@ -106,7 +114,7 @@ export declare const generate: (ctx: ServiceGeneratorArguments) => Promise<{
     pkg: import("../commons").AppPackageJson;
     lib: string;
     test: string;
-    language: "js" | "ts";
+    language: "ts" | "js";
     dependencyVersions?: import("../commons").DependencyVersions;
     cwd: string;
     _?: (string | number)[];

package/lib/service/index.js

@@ -8,48 +8,86 @@ const lodash_1 = __importDefault(require("lodash"));
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../commons");
 const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, pinion_1.prompt)(({ name, path, type, authentication, isEntityService }) => [
-    {
-        name: 'name',
-        type: 'input',
-        when: !name,
-        message: 'What is the name of your service?'
-    },
-    {
-        name: 'path',
-        type: 'input',
-        when: !path,
-        message: 'Which path should the service be registered on?',
-        default: (answers) => `${lodash_1.default.kebabCase(answers.name)}`
-    },
-    {
-        name: 'authentication',
-        type: 'confirm',
-        when: authentication === undefined && !isEntityService,
-        message: 'Does this service require authentication?'
-    },
-    {
-        name: 'type',
-        type: 'list',
-        when: !type,
-        message: 'What kind of service is it?',
-        default: (0, commons_1.getDatabaseAdapter)(ctx.feathers.database),
-        choices: [
-            {
-                value: 'knex',
-                name: 'SQL'
-            },
-            {
-                value: 'mongodb',
-                name: 'MongoDB'
-            },
-            {
-                value: 'custom',
-                name: 'A custom service'
+    .then((0, commons_1.initializeBaseContext)())
+    .then((0, commons_1.checkPreconditions)())
+    .then((0, pinion_1.prompt)(({ name, path, type, schema, authentication, isEntityService }) => {
+    var _a, _b;
+    return [
+        {
+            name: 'name',
+            type: 'input',
+            when: !name,
+            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) => `${lodash_1.default.kebabCase(answers.name)}`,
+            validate: (input) => {
+                if (!input || input === 'authentication') {
+                    return 'Invalid service path';
+                }
+                return true;
+            }
+        },
+        {
+            name: 'authentication',
+            type: 'confirm',
+            when: authentication === undefined && !isEntityService,
+            message: 'Does this service require authentication?'
+        },
+        {
+            name: 'type',
+            type: 'list',
+            when: !type,
+            message: 'What kind of service is it?',
+            default: (0, commons_1.getDatabaseAdapter)((_a = ctx.feathers) === null || _a === void 0 ? void 0 : _a.database),
+            choices: [
+                {
+                    value: 'knex',
+                    name: 'SQL'
+                },
+                {
+                    value: 'mongodb',
+                    name: 'MongoDB'
+                },
+                {
+                    value: 'custom',
+                    name: 'A custom service'
+                }
+            ]
+        },
+        {
+            name: 'schema',
+            type: 'list',
+            when: schema === undefined,
+            message: 'Which schema definition format do you want to use?',
+            default: ((_b = ctx.feathers) === null || _b === void 0 ? void 0 : _b.schema) || 'json',
+            choices: [
+                {
+                    value: 'typebox',
+                    name: 'TypeBox'
+                },
+                {
+                    value: 'json',
+                    name: 'JSON schema'
+                },
+                {
+                    value: false,
+                    name: 'No schema'
+                }
+            ]
+        }
+    ];
+}))
     .then(async (ctx) => {
     const { name, path, type } = ctx;
     const kebabName = lodash_1.default.kebabCase(name);

package/lib/service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAsB;AACtB,+CAAmF;AAEnF,wCAAoE;AA2D7D,MAAM,QAAQ,GAAG,CAAC,GAA8B,EAAE,EAAE,CACzD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,eAAM,EACJ,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;IACzD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,CAAC,IAAI;QACX,OAAO,EAAE,mCAAmC;KAC7C;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,CAAC,IAAI;QACX,OAAO,EAAE,iDAAiD;QAC1D,OAAO,EAAE,CAAC,OAAkC,EAAE,EAAE,CAAC,GAAG,gBAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;KAChF;IACD;QACE,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,cAAc,KAAK,SAAS,IAAI,CAAC,eAAe;QACtD,OAAO,EAAE,2CAA2C;KACrD;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,IAAI;QACX,OAAO,EAAE,6BAA6B;QACtC,OAAO,EAAE,IAAA,4BAAkB,EAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAClD,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,MAAM;gBACb,IAAI,EAAE,KAAK;aACZ;YACD;gBACE,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,kBAAkB;aACzB;SACF;KACF;CACF,CACF,CACF;KACA,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAClB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAA;IAChC,MAAM,SAAS,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,SAAS,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,SAAS,GAAG,gBAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,SAAS,GAAG,GAAG,SAAS,SAAS,CAAA;IAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAG,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC1D,MAAM,QAAQ,GAAG,gBAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE/B,OAAO;QACL,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,MAAM;QACN,QAAQ;QACR,SAAS;QACT,SAAS;QACT,SAAS;QACT,SAAS;QACT,QAAQ;QACR,GAAG,GAAG;KACP,CAAA;AACH,CAAC,CAAC;KACD,IAAI,CAAC,IAAA,sBAAa,EAA0B,SAAS,EAAE,WAAW,CAAC,CAAC;KACpE,IAAI,CAAC,IAAA,qBAAY,EAA0B,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC,CAAA;AA1EnF,QAAA,QAAQ,YA0E2E"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"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"}

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,15 +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}Result,
   ${upperName}Query,
-} from './services/${folder.join('/')}/${fileName}.schema'
+} from './services/${folder.join('/')}/${fileName}'
 
-export * from './services/${folder.join('/')}/${fileName}.schema'`;
-const declarationTemplate = ({ path, upperName }) => `  '${path}': Service<${upperName}Result, ${upperName}Data, Params<${upperName}Query>>`;
+export type {
+  ${upperName},
+  ${upperName}Data,
+  ${upperName}Query,
+}`;
+const declarationTemplate = ({ path, upperName }) => `  '${path}': ClientService<
+    ${upperName},
+    ${upperName}Data,
+    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;qBACQ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ;;4BAErB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ,UAAU,CAAA;AAElE,MAAM,mBAAmB,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC3E,MAAM,IAAI,cAAc,SAAS,WAAW,SAAS,gBAAgB,SAAS,SAAS,CAAA;AAEzF,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,24 +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}Result,
   ${upperName}Query,
-} from './services/${folder.join('/')}/${fileName}.schema'
+} from './services/${folder.join('/')}/${fileName}'
 
-export * from './services/${folder.join('/')}/${fileName}.schema'`
+export type {
+  ${upperName},
+  ${upperName}Data,
+  ${upperName}Query,
+}`
 
 const declarationTemplate = ({ path, upperName }: ServiceGeneratorContext) =>
-  `  '${path}': Service<${upperName}Result, ${upperName}Data, Params<${upperName}Query>>`
+  `  '${path}': ClientService<
+    ${upperName},
+    ${upperName}Data,
+    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"}