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

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, feathers, schema, fileName, relative }: ServiceGeneratorContext) => string;
 export declare const generate: (ctx: ServiceGeneratorContext) => Promise<ServiceGeneratorContext>;

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

@@ -1,51 +1,63 @@
 "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 = ({ kebabPath }) => /* ts */ `import type { Knex } from 'knex'
 
 export async function up(knex: Knex): Promise<void> {
-  await knex.schema.createTable('${kebabName}', table => {
+  await knex.schema.createTable('${kebabPath}', table => {
     table.increments('id')
     table.string('text')
   })
 }
 
 export async function down(knex: Knex): Promise<void> {
-  await knex.schema.dropTable('${kebabName}')
+  await knex.schema.dropTable('${kebabPath}')
 }
 `;
-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, feathers, schema, fileName, relative }) => /* ts */ `import type { Params } from '@feathersjs/feathers'
+import { KnexService } from '@feathersjs/knex'
+import type { KnexAdapterParams, KnexAdapterOptions } 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}<ServiceParams extends Params = ${upperName}Params>
+  extends KnexService<${upperName}, ${upperName}Data, ServiceParams> {
 }
-`;
-exports.classCode = classCode;
-const optionTemplate = ({ kebabName, feathers }) => `    paginate: app.get('paginate'),
+
+export const getOptions = (app: Application): KnexAdapterOptions => {
+  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: '${fileName}'
+  }
+}
+`;
+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,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;oCAIJ,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,mCAAmC,SAAS;wBAC5C,SAAS,KAAK,SAAS;;;;;;sBAMzB,QAAQ,CAAC,QAAQ;aAC1B,QAAQ;;;CAGpB,CAAA;AA1CY,QAAA,QAAQ,YA0CpB;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,57 +1,80 @@
-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 = ({
+  kebabPath
+}: ServiceGeneratorContext) => /* ts */ `import type { Knex } from 'knex'
 
 export async function up(knex: Knex): Promise<void> {
-  await knex.schema.createTable('${kebabName}', table => {
+  await knex.schema.createTable('${kebabPath}', table => {
     table.increments('id')
     table.string('text')
   })
 }
 
 export async function down(knex: Knex): Promise<void> {
-  await knex.schema.dropTable('${kebabName}')
+  await knex.schema.dropTable('${kebabPath}')
 }
 `
 
-export const importTemplate = `import { KnexService } from \'@feathersjs/knex\'
-import type { KnexAdapterParams } from \'@feathersjs/knex\'`
+export const template = ({
+  className,
+  upperName,
+  feathers,
+  schema,
+  fileName,
+  relative
+}: ServiceGeneratorContext) => /* ts */ `import type { Params } from '@feathersjs/feathers'
+import { KnexService } from '@feathersjs/knex'
+import type { KnexAdapterParams, KnexAdapterOptions } 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}<ServiceParams extends Params = ${upperName}Params>
+  extends KnexService<${upperName}, ${upperName}Data, ServiceParams> {
 }
-`
 
-export const optionTemplate = ({ kebabName, feathers }: ServiceGeneratorContext) =>
-  `    paginate: app.get('paginate'),
+export const getOptions = (app: Application): KnexAdapterOptions => {
+  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: '${fileName}'
+  }
+}
+`
 
 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, schema, fileName, kebabPath, relative }: ServiceGeneratorContext) => string;
 export declare const generate: (ctx: ServiceGeneratorContext) => Promise<ServiceGeneratorContext>;

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

@@ -1,35 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = exports.classCode = exports.importTemplate = void 0;
+exports.generate = exports.template = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-exports.importTemplate = `import { MongoDBService } from \'@feathersjs/mongodb\'
-import type { MongoDBAdapterParams } from \'@feathersjs/mongodb\'`;
-const classCode = ({ className, upperName }) => `export interface ${upperName}Params extends MongoDBAdapterParams<${upperName}Query> {
+const template = ({ className, upperName, schema, fileName, kebabPath, relative }) => /* ts */ `import type { Params } from '@feathersjs/feathers'
+import { MongoDBService } from \'@feathersjs/mongodb\'
+import type { MongoDBAdapterParams, MongoDBAdapterOptions } from \'@feathersjs/mongodb\'
+
+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 MongoDBAdapterParams<${upperName}Query> {
 }
 
 // By default calls the standard MongoDB adapter service methods but can be customized with your own functionality.
-export class ${className} extends MongoDBService<${upperName}Result, ${upperName}Data, ${upperName}Params> {
+export class ${className}<ServiceParams extends Params = ${upperName}Params>
+  extends MongoDBService<${upperName}, ${upperName}Data, ServiceParams> {
+}
+
+export const getOptions = (app: Application): MongoDBAdapterOptions => {
+  return {
+    paginate: app.get('paginate'),
+    Model: app.get('mongodbClient').then(db => db.collection('${kebabPath}'))
+  }
 }
 `;
-exports.classCode = classCode;
-const optionTemplate = ({ kebabName }) => `    paginate: app.get('paginate'),
-    Model: app.get('mongodbClient').then(db => db.collection('${kebabName}'))`;
-const toServiceFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
-    lib,
-    'services',
-    ...folder,
-    `${fileName}.service`
-]);
-const toClassFile = (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
+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)(optionTemplate, (0, pinion_1.after)('const options ='), toServiceFile, false));
+])));
 exports.generate = generate;
 //# sourceMappingURL=mongodb.tpl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mongodb.tpl.js","sourceRoot":"","sources":["../../../src/service/type/mongodb.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAC9E,2CAA4C;AAG/B,QAAA,cAAc,GAAG;kEACoC,CAAA;AAE3D,MAAM,SAAS,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC7E,oBAAoB,SAAS,uCAAuC,SAAS;;;;eAIhE,SAAS,2BAA2B,SAAS,WAAW,SAAS,SAAS,SAAS;;CAEjG,CAAA;AAPY,QAAA,SAAS,aAOrB;AAED,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAChE;gEAC8D,SAAS,KAAK,CAAA;AAE9E,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,cAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC,CAAA;AAJ1E,QAAA,QAAQ,YAIkE"}
+{"version":3,"file":"mongodb.tpl.js","sourceRoot":"","sources":["../../../src/service/type/mongodb.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAGrC,MAAM,QAAQ,GAAG,CAAC,EACvB,SAAS,EACT,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;oCAIJ,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,uCAAuC,SAAS;;;;eAI7D,SAAS,mCAAmC,SAAS;2BACzC,SAAS,KAAK,SAAS;;;;;;gEAMc,SAAS;;;CAGxE,CAAA;AAzCY,QAAA,QAAQ,YAyCpB;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/mongodb.tpl.ts

@@ -1,39 +1,59 @@
-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 importTemplate = `import { MongoDBService } from \'@feathersjs/mongodb\'
-import type { MongoDBAdapterParams } from \'@feathersjs/mongodb\'`
+export const template = ({
+  className,
+  upperName,
+  schema,
+  fileName,
+  kebabPath,
+  relative
+}: ServiceGeneratorContext) => /* ts */ `import type { Params } from '@feathersjs/feathers'
+import { MongoDBService } from \'@feathersjs/mongodb\'
+import type { MongoDBAdapterParams, MongoDBAdapterOptions } from \'@feathersjs/mongodb\'
 
-export const classCode = ({ className, upperName }: ServiceGeneratorContext) =>
-  `export interface ${upperName}Params extends MongoDBAdapterParams<${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
+`
 }
 
-// By default calls the standard MongoDB adapter service methods but can be customized with your own functionality.
-export class ${className} extends MongoDBService<${upperName}Result, ${upperName}Data, ${upperName}Params> {
+export interface ${upperName}Params extends MongoDBAdapterParams<${upperName}Query> {
 }
-`
-
-const optionTemplate = ({ kebabName }: ServiceGeneratorContext) =>
-  `    paginate: app.get('paginate'),
-    Model: app.get('mongodbClient').then(db => db.collection('${kebabName}'))`
 
-const toServiceFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
-  lib,
-  'services',
-  ...folder,
-  `${fileName}.service`
-])
+// By default calls the standard MongoDB adapter service methods but can be customized with your own functionality.
+export class ${className}<ServiceParams extends Params = ${upperName}Params>
+  extends MongoDBService<${upperName}, ${upperName}Data, ServiceParams> {
+}
 
-const toClassFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
-  lib,
-  'services',
-  ...folder,
-  `${fileName}.class`
-])
+export const getOptions = (app: Application): MongoDBAdapterOptions => {
+  return {
+    paginate: app.get('paginate'),
+    Model: app.get('mongodbClient').then(db => db.collection('${kebabPath}'))
+  }
+}
+`
 
 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))
+  generator(ctx).then(
+    renderSource(
+      template,
+      toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
+        lib,
+        'services',
+        ...folder,
+        `${fileName}.class`
+      ])
+    )
+  )

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/cli",
   "description": "The command line interface for creating Feathers applications",
-  "version": "5.0.0-pre.29",
+  "version": "5.0.0-pre.31",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "bin": {
@@ -47,41 +47,42 @@
     "mocha": "mocha --timeout 60000 --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts",
     "test": "npm run compile && npm run mocha"
   },
-  "directories": {
-    "lib": "lib/cli"
-  },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@feathershq/pinion": "^0.3.5",
     "chalk": "^4.0.1",
+    "commander": "^9.4.1",
     "lodash": "^4.17.21",
     "prettier": "^2.7.1"
   },
   "devDependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.29",
-    "@feathersjs/authentication-local": "^5.0.0-pre.29",
-    "@feathersjs/authentication-oauth": "^5.0.0-pre.29",
-    "@feathersjs/configuration": "^5.0.0-pre.29",
-    "@feathersjs/errors": "^5.0.0-pre.29",
-    "@feathersjs/express": "^5.0.0-pre.29",
-    "@feathersjs/feathers": "^5.0.0-pre.29",
-    "@feathersjs/knex": "^5.0.0-pre.29",
-    "@feathersjs/koa": "^5.0.0-pre.29",
-    "@feathersjs/mongodb": "^5.0.0-pre.29",
-    "@feathersjs/schema": "^5.0.0-pre.29",
-    "@feathersjs/socketio": "^5.0.0-pre.29",
-    "@feathersjs/transport-commons": "^5.0.0-pre.29",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.7.17",
-    "@types/prettier": "^2.7.0",
+    "@feathersjs/authentication": "^5.0.0-pre.31",
+    "@feathersjs/authentication-client": "^5.0.0-pre.31",
+    "@feathersjs/authentication-local": "^5.0.0-pre.31",
+    "@feathersjs/authentication-oauth": "^5.0.0-pre.31",
+    "@feathersjs/configuration": "^5.0.0-pre.31",
+    "@feathersjs/errors": "^5.0.0-pre.31",
+    "@feathersjs/express": "^5.0.0-pre.31",
+    "@feathersjs/feathers": "^5.0.0-pre.31",
+    "@feathersjs/knex": "^5.0.0-pre.31",
+    "@feathersjs/koa": "^5.0.0-pre.31",
+    "@feathersjs/mongodb": "^5.0.0-pre.31",
+    "@feathersjs/rest-client": "^5.0.0-pre.31",
+    "@feathersjs/schema": "^5.0.0-pre.31",
+    "@feathersjs/socketio": "^5.0.0-pre.31",
+    "@feathersjs/transport-commons": "^5.0.0-pre.31",
+    "@feathersjs/typebox": "^5.0.0-pre.31",
+    "@types/mocha": "^10.0.0",
+    "@types/node": "^18.8.2",
+    "@types/prettier": "^2.7.1",
     "axios": "^0.27.2",
     "mocha": "^10.0.0",
     "shx": "^0.3.4",
     "ts-node": "^10.9.1",
-    "type-fest": "^2.19.0",
-    "typescript": "^4.8.3"
+    "type-fest": "^3.0.0",
+    "typescript": "^4.8.4"
   },
-  "gitHead": "4314dc89a41a8bbaabf00b47697bf7887861d17d"
+  "gitHead": "4500dbeb8cea566678cf88b3313a88efd93a2ed9"
 }

package/lib/app/templates/configuration.tpl.js

@@ -1,45 +0,0 @@
-"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 = ({}) => `import { schema, Ajv } from '@feathersjs/schema'
-import type { Infer } from '@feathersjs/schema'
-import { authenticationSettingsSchema } from '@feathersjs/authentication'
-
-export const configurationSchema = schema(
-  {
-    $id: 'ApplicationConfiguration',
-    type: 'object',
-    additionalProperties: false,
-    required: [ 'host', 'port', 'public', 'paginate' ],
-    properties: {
-      host: { type: 'string' },
-      port: { type: 'number' },
-      public: { type: 'string' },
-      authentication: authenticationSettingsSchema,
-      origins: {
-        type: 'array',
-        items: {
-          type: 'string'
-        }
-      },
-      paginate: {
-        type: 'object',
-        additionalProperties: false,
-        required: [ 'default', 'max' ],
-        properties: {
-          default: { type: 'number' },
-          max: { type: 'number' }
-        }
-      }
-    }
-  } as const,
-  new Ajv()
-)
-
-export type ConfigurationSchema = Infer<typeof configurationSchema>
-`;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib }) => lib, 'configuration')));
-exports.generate = generate;
-//# sourceMappingURL=configuration.tpl.js.map

package/lib/app/templates/configuration.tpl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"configuration.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/configuration.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAuB,EAAE,EAAE,CAC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCD,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,eAAe,CAAC,CAC/D,CACF,CAAA;AANU,QAAA,QAAQ,YAMlB"}