@feathersjs/generators 5.0.0-pre.37 → 5.0.0-pre.38

package/lib/commons.ts

@@ -20,10 +20,12 @@ export const { version } = JSON.parse(fs.readFileSync(join(__dirname, '..', 'pac
 
 export type DependencyVersions = { [key: string]: string }
 
+export const DATABASE_TYPES = ['mongodb', 'mysql', 'postgresql', 'sqlite', 'mssql', 'other'] as const
+
 /**
  * The database types supported by this generator
  */
-export type DatabaseType = 'mongodb' | 'mysql' | 'postgresql' | 'sqlite' | 'mssql'
+export type DatabaseType = (typeof DATABASE_TYPES)[number]
 
 /**
  * Returns the name of the Feathers database adapter for a supported database type
@@ -45,7 +47,7 @@ export type FeathersAppInfo = {
   /**
    * The package manager used
    */
-  packager: 'yarn' | 'npm'
+  packager: 'yarn' | 'npm' | 'pnpm'
   /**
    * A list of all chosen transports
    */
@@ -57,7 +59,7 @@ export type FeathersAppInfo = {
   /**
    * The main schema definition format
    */
-  schema: 'typebox' | 'json'
+  schema: 'typebox' | 'json' | false
 }
 
 export interface AppPackageJson extends PackageJson {
@@ -299,3 +301,22 @@ export const yyyymmddhhmmss = (offset = 0) => {
     now.getUTCSeconds().toString().padStart(2, '0')
   )
 }
+
+/**
+ * Render a template if `local` authentication strategy has been selected
+ * @param authStrategies The list of selected authentication strategies
+ * @param content The content to render if `local` is selected
+ * @param alt The content to render if `local` is not selected
+ * @returns
+ */
+export const localTemplate = (authStrategies: string[], content: string, alt = '') =>
+  authStrategies.includes('local') ? content : alt
+
+/**
+ * Render a template if an `oauth` authentication strategy has been selected
+ * @param authStrategies
+ * @param content
+ * @returns
+ */
+export const oauthTemplate = (authStrategies: string[], content: string) =>
+  authStrategies.filter((s) => s !== 'local').length > 0 ? content : ''

package/lib/connection/index.d.ts

@@ -21,12 +21,9 @@ export declare const prompts: ({ database, connectionString, pkg, name }: Connec
 } | {
     name: string;
     type: string;
-    when: boolean;
+    when: (answers: ConnectionGeneratorContext) => boolean;
     message: string;
-    default: (answers: {
-        name?: string;
-        database: DatabaseType;
-    }) => string;
+    default: (answers: ConnectionGeneratorContext) => string;
     suffix?: undefined;
     choices?: undefined;
 })[];
@@ -38,18 +35,4 @@ export declare const DATABASE_CLIENTS: {
     mssql: string;
 };
 export declare const getDatabaseClient: (database: DatabaseType) => string;
-export declare const generate: (ctx: ConnectionGeneratorArguments) => Promise<{
-    dependencies: string[];
-    name?: string;
-    database: DatabaseType;
-    connectionString: string;
-    feathers: import("../commons").FeathersAppInfo;
-    pkg: import("../commons").AppPackageJson;
-    lib: string;
-    test: string;
-    language: "ts" | "js";
-    dependencyVersions?: import("../commons").DependencyVersions;
-    cwd: string;
-    _?: (string | number)[];
-    pinion: import("@feathershq/pinion").Configuration;
-}>;
+export declare const generate: (ctx: ConnectionGeneratorArguments) => Promise<ConnectionGeneratorContext>;

package/lib/connection/index.js

@@ -13,7 +13,8 @@ const defaultConnectionString = (type, name) => {
         mysql: `mysql://root:@localhost:3306/${name}`,
         postgresql: `postgres://postgres:@localhost:5432/${name}`,
         sqlite: `${name}.sqlite`,
-        mssql: `mssql://root:password@localhost:1433/${name}`
+        mssql: `mssql://root:password@localhost:1433/${name}`,
+        other: ''
     };
     return connectionStrings[type];
 };
@@ -24,19 +25,23 @@ const prompts = ({ database, connectionString, pkg, name }) => [
         type: 'list',
         when: !database,
         message: 'Which database are you connecting to?',
-        suffix: chalk_1.default.grey(' Other databases can be added at any time'),
+        suffix: chalk_1.default.grey(' Databases can be added at any time'),
         choices: [
             { value: 'sqlite', name: 'SQLite' },
             { value: 'mongodb', name: 'MongoDB' },
             { value: 'postgresql', name: 'PostgreSQL' },
             { value: 'mysql', name: 'MySQL/MariaDB' },
-            { value: 'mssql', name: 'Microsoft SQL' }
+            { value: 'mssql', name: 'Microsoft SQL' },
+            {
+                value: 'other',
+                name: `Another database ${chalk_1.default.grey('(not configured automatically, use with custom services)')}`
+            }
         ]
     },
     {
         name: 'connectionString',
         type: 'input',
-        when: !connectionString,
+        when: (answers) => !connectionString && database !== 'other' && answers.database !== 'other',
         message: 'Enter your database connection string',
         default: (answers) => (0, exports.defaultConnectionString)(answers.database, answers.name || name || pkg.name)
     }
@@ -49,14 +54,13 @@ exports.DATABASE_CLIENTS = {
     mysql: 'mysql',
     mssql: 'mssql'
 };
-const getDatabaseClient = (database) => exports.DATABASE_CLIENTS[database];
+const getDatabaseClient = (database) => database === 'other' ? null : exports.DATABASE_CLIENTS[database];
 exports.getDatabaseClient = getDatabaseClient;
 const generate = (ctx) => (0, pinion_1.generator)(ctx)
     .then((0, commons_1.initializeBaseContext)())
     .then((0, commons_1.checkPreconditions)())
     .then((0, pinion_1.prompt)(exports.prompts))
-    .then((0, pinion_1.runGenerator)(__dirname, 'templates', ({ database }) => `${(0, commons_1.getDatabaseAdapter)(database)}.tpl`))
-    .then((0, pinion_1.mergeJSON)(({ connectionString, database }) => (0, commons_1.getDatabaseAdapter)(database) === 'knex'
+    .then((0, pinion_1.when)((ctx) => ctx.database !== 'other', (0, pinion_1.runGenerator)(__dirname, 'templates', ({ database }) => `${(0, commons_1.getDatabaseAdapter)(database)}.tpl`), (0, pinion_1.mergeJSON)(({ connectionString, database }) => (0, commons_1.getDatabaseAdapter)(database) === 'knex'
     ? {
         [database]: {
             client: (0, exports.getDatabaseClient)(database),
@@ -66,8 +70,7 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
     }
     : {
         [database]: connectionString
-    }, (0, pinion_1.toFile)('config', 'default.json')))
-    .then((ctx) => {
+    }, (0, pinion_1.toFile)('config', 'default.json')), async (ctx) => {
     const dependencies = [];
     const adapter = (0, commons_1.getDatabaseAdapter)(ctx.database);
     const dbClient = (0, exports.getDatabaseClient)(ctx.database);
@@ -83,6 +86,6 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
         };
     }
     return (0, pinion_1.install)((0, commons_1.addVersions)(dependencies, ctx.dependencyVersions), false, ctx.feathers.packager)(ctx);
-});
+}));
 exports.generate = generate;
 //# sourceMappingURL=index.js.map

package/lib/connection/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connection/index.ts"],"names":[],"mappings":"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"}

package/lib/connection/index.ts

@@ -1,4 +1,4 @@
-import { generator, runGenerator, prompt, install, mergeJSON, toFile } from '@feathershq/pinion'
+import { generator, runGenerator, prompt, install, mergeJSON, toFile, when } from '@feathershq/pinion'
 import chalk from 'chalk'
 import {
   FeathersBaseContext,
@@ -25,7 +25,8 @@ export const defaultConnectionString = (type: DatabaseType, name: string) => {
     mysql: `mysql://root:@localhost:3306/${name}`,
     postgresql: `postgres://postgres:@localhost:5432/${name}`,
     sqlite: `${name}.sqlite`,
-    mssql: `mssql://root:password@localhost:1433/${name}`
+    mssql: `mssql://root:password@localhost:1433/${name}`,
+    other: ''
   }
 
   return connectionStrings[type]
@@ -37,21 +38,26 @@ export const prompts = ({ database, connectionString, pkg, name }: ConnectionGen
     type: 'list',
     when: !database,
     message: 'Which database are you connecting to?',
-    suffix: chalk.grey(' Other databases can be added at any time'),
+    suffix: chalk.grey(' Databases can be added at any time'),
     choices: [
       { value: 'sqlite', name: 'SQLite' },
       { value: 'mongodb', name: 'MongoDB' },
       { value: 'postgresql', name: 'PostgreSQL' },
       { value: 'mysql', name: 'MySQL/MariaDB' },
-      { value: 'mssql', name: 'Microsoft SQL' }
+      { value: 'mssql', name: 'Microsoft SQL' },
+      {
+        value: 'other',
+        name: `Another database ${chalk.grey('(not configured automatically, use with custom services)')}`
+      }
     ]
   },
   {
     name: 'connectionString',
     type: 'input',
-    when: !connectionString,
+    when: (answers: ConnectionGeneratorContext) =>
+      !connectionString && database !== 'other' && answers.database !== 'other',
     message: 'Enter your database connection string',
-    default: (answers: { name?: string; database: DatabaseType }) =>
+    default: (answers: ConnectionGeneratorContext) =>
       defaultConnectionString(answers.database, answers.name || name || pkg.name)
   }
 ]
@@ -64,7 +70,8 @@ export const DATABASE_CLIENTS = {
   mssql: 'mssql'
 }
 
-export const getDatabaseClient = (database: DatabaseType) => DATABASE_CLIENTS[database]
+export const getDatabaseClient = (database: DatabaseType) =>
+  database === 'other' ? null : DATABASE_CLIENTS[database]
 
 export const generate = (ctx: ConnectionGeneratorArguments) =>
   generator(ctx)
@@ -72,52 +79,53 @@ export const generate = (ctx: ConnectionGeneratorArguments) =>
     .then(checkPreconditions())
     .then(prompt<ConnectionGeneratorArguments, ConnectionGeneratorContext>(prompts))
     .then(
-      runGenerator<ConnectionGeneratorContext>(
-        __dirname,
-        'templates',
-        ({ database }) => `${getDatabaseAdapter(database)}.tpl`
-      )
-    )
-    .then(
-      mergeJSON<ConnectionGeneratorContext>(
-        ({ connectionString, database }) =>
-          getDatabaseAdapter(database) === 'knex'
-            ? {
-                [database]: {
-                  client: getDatabaseClient(database),
-                  connection: connectionString,
-                  ...(database === 'sqlite' ? { useNullAsDefault: true } : {})
+      when<ConnectionGeneratorContext>(
+        (ctx) => ctx.database !== 'other',
+        runGenerator<ConnectionGeneratorContext>(
+          __dirname,
+          'templates',
+          ({ database }) => `${getDatabaseAdapter(database)}.tpl`
+        ),
+        mergeJSON<ConnectionGeneratorContext>(
+          ({ connectionString, database }) =>
+            getDatabaseAdapter(database) === 'knex'
+              ? {
+                  [database]: {
+                    client: getDatabaseClient(database),
+                    connection: connectionString,
+                    ...(database === 'sqlite' ? { useNullAsDefault: true } : {})
+                  }
                 }
-              }
-            : {
-                [database]: connectionString
-              },
-        toFile('config', 'default.json')
-      )
-    )
-    .then((ctx: ConnectionGeneratorContext) => {
-      const dependencies: string[] = []
-      const adapter = getDatabaseAdapter(ctx.database)
-      const dbClient = getDatabaseClient(ctx.database)
+              : {
+                  [database]: connectionString
+                },
+          toFile('config', 'default.json')
+        ),
+        async (ctx: ConnectionGeneratorContext) => {
+          const dependencies: string[] = []
+          const adapter = getDatabaseAdapter(ctx.database)
+          const dbClient = getDatabaseClient(ctx.database)
 
-      dependencies.push(`@feathersjs/${adapter}`)
+          dependencies.push(`@feathersjs/${adapter}`)
 
-      if (adapter === 'knex') {
-        dependencies.push('knex')
-      }
+          if (adapter === 'knex') {
+            dependencies.push('knex')
+          }
 
-      dependencies.push(dbClient)
+          dependencies.push(dbClient)
 
-      if (ctx.dependencies) {
-        return {
-          ...ctx,
-          dependencies: [...ctx.dependencies, ...dependencies]
-        }
-      }
+          if (ctx.dependencies) {
+            return {
+              ...ctx,
+              dependencies: [...ctx.dependencies, ...dependencies]
+            }
+          }
 
-      return install<ConnectionGeneratorContext>(
-        addVersions(dependencies, ctx.dependencyVersions),
-        false,
-        ctx.feathers.packager
-      )(ctx)
-    })
+          return install<ConnectionGeneratorContext>(
+            addVersions(dependencies, ctx.dependencyVersions),
+            false,
+            ctx.feathers.packager
+          )(ctx)
+        }
+      )
+    )

package/lib/connection/templates/knex.tpl.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
+const promises_1 = require("fs/promises");
+const path_1 = __importDefault(require("path"));
 const template = ({ database }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/databases.html
 import knex from 'knex'
 import type { Knex } from 'knex'
@@ -43,6 +48,10 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
     }
 }, (0, pinion_1.toFile)('package.json')))
     .then((0, commons_1.injectSource)(importTemplate, (0, pinion_1.before)('import { services } from'), toAppFile))
-    .then((0, commons_1.injectSource)(configureTemplate, (0, pinion_1.before)('app.configure(services)'), toAppFile));
+    .then((0, commons_1.injectSource)(configureTemplate, (0, pinion_1.before)('app.configure(services)'), toAppFile))
+    .then(async (ctx) => {
+    await (0, promises_1.mkdir)(path_1.default.join(ctx.cwd, 'migrations'));
+    return ctx;
+});
 exports.generate = generate;
 //# sourceMappingURL=knex.tpl.js.map

package/lib/connection/templates/knex.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/connection/templates/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAyE;AAEzE,2CAA0D;AAE1D,MAAM,QAAQ,GAAG,CAAC,EAChB,QAAQ,EACmB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;MAOrC,QAAQ;;;;eAIC,QAAQ;4BACK,QAAQ;;;aAGvB,QAAQ;;CAEpB,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,EACH,QAAQ,EACR,QAAQ,EACmB,EAAE,EAAE,CAAC,QAAQ,CAAC;yBAClB,GAAG;;;0BAGF,QAAQ;;EAEhC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,yBAAyB;CACxE,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAClE,YAAY,QAAQ,cAAc,QAAQ,GAAG,CAAA;AAC/C,MAAM,iBAAiB,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC,iBAAiB,QAAQ,GAAG,CAAA;AAEpG,MAAM,SAAS,GAAG,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;AAExE,MAAM,QAAQ,GAAG,CAAC,GAA+B,EAAE,EAAE,CAC1D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAC3E,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,QAAQ,EAAE,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC,CAAC;KAChD,IAAI,CACH,IAAA,kBAAS,EACP;IACE,OAAO,EAAE;QACP,OAAO,EAAE,qBAAqB;QAC9B,cAAc,EAAE,mBAAmB;QACnC,IAAI,EAAE,0DAA0D;KACjE;CACF,EACD,IAAA,eAAM,EAAC,cAAc,CAAC,CACvB,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,cAAc,EAAE,IAAA,eAAM,EAAC,0BAA0B,CAAC,EAAE,SAAS,CAAC,CAAC;KACjF,IAAI,CAAC,IAAA,sBAAY,EAAC,iBAAiB,EAAE,IAAA,eAAM,EAAC,yBAAyB,CAAC,EAAE,SAAS,CAAC,CAAC,CAAA;AAtB3E,QAAA,QAAQ,YAsBmE"}
+{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/connection/templates/knex.tpl.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyE;AAEzE,2CAA0D;AAC1D,0CAAmC;AACnC,gDAAuB;AAEvB,MAAM,QAAQ,GAAG,CAAC,EAChB,QAAQ,EACmB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;MAOrC,QAAQ;;;;eAIC,QAAQ;4BACK,QAAQ;;;aAGvB,QAAQ;;CAEpB,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,EACH,QAAQ,EACR,QAAQ,EACmB,EAAE,EAAE,CAAC,QAAQ,CAAC;yBAClB,GAAG;;;0BAGF,QAAQ;;EAEhC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,yBAAyB;CACxE,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAClE,YAAY,QAAQ,cAAc,QAAQ,GAAG,CAAA;AAC/C,MAAM,iBAAiB,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC,iBAAiB,QAAQ,GAAG,CAAA;AAEpG,MAAM,SAAS,GAAG,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;AAExE,MAAM,QAAQ,GAAG,CAAC,GAA+B,EAAE,EAAE,CAC1D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAC3E,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,QAAQ,EAAE,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC,CAAC;KAChD,IAAI,CACH,IAAA,kBAAS,EACP;IACE,OAAO,EAAE;QACP,OAAO,EAAE,qBAAqB;QAC9B,cAAc,EAAE,mBAAmB;QACnC,IAAI,EAAE,0DAA0D;KACjE;CACF,EACD,IAAA,eAAM,EAAC,cAAc,CAAC,CACvB,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,cAAc,EAAE,IAAA,eAAM,EAAC,0BAA0B,CAAC,EAAE,SAAS,CAAC,CAAC;KACjF,IAAI,CAAC,IAAA,sBAAY,EAAC,iBAAiB,EAAE,IAAA,eAAM,EAAC,yBAAyB,CAAC,EAAE,SAAS,CAAC,CAAC;KACnF,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAClB,MAAM,IAAA,gBAAK,EAAC,cAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAA;IAC7C,OAAO,GAAG,CAAA;AACZ,CAAC,CAAC,CAAA;AA1BO,QAAA,QAAQ,YA0Bf"}

package/lib/connection/templates/knex.tpl.ts

@@ -1,6 +1,8 @@
 import { generator, toFile, before, mergeJSON } from '@feathershq/pinion'
 import { ConnectionGeneratorContext } from '../index'
 import { injectSource, renderSource } from '../../commons'
+import { mkdir } from 'fs/promises'
+import path from 'path'
 
 const template = ({
   database
@@ -65,3 +67,7 @@ export const generate = (ctx: ConnectionGeneratorContext) =>
     )
     .then(injectSource(importTemplate, before('import { services } from'), toAppFile))
     .then(injectSource(configureTemplate, before('app.configure(services)'), toAppFile))
+    .then(async (ctx) => {
+      await mkdir(path.join(ctx.cwd, 'migrations'))
+      return ctx
+    })

package/lib/connection/templates/mongodb.tpl.js

@@ -3,35 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const template = ({}) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/databases.html
+const template = ({ database }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/databases.html
 import { MongoClient } from 'mongodb'
 import type { Db } from 'mongodb'
 import type { Application } from './declarations'
 
 declare module './declarations' {
   interface Configuration {
-    mongodbClient: Promise<Db>
+    ${database}Client: Promise<Db>
   }
 }
 
-export const mongodb = (app: Application) => {
-  const connection = app.get('mongodb') as string
+export const ${database} = (app: Application) => {
+  const connection = app.get('${database}') as string
   const database = new URL(connection).pathname.substring(1)
   const mongoClient = MongoClient.connect(connection)
     .then(client => client.db(database))
 
-  app.set('mongodbClient', mongoClient)
+  app.set('${database}Client', mongoClient)
 }
 `;
 const keywordImport = `import { keywordObjectId } from '@feathersjs/mongodb'`;
 const keywordTemplate = `dataValidator.addKeyword(keywordObjectId)
 queryValidator.addKeyword(keywordObjectId)`;
-const importTemplate = "import { mongodb } from './mongodb'";
-const configureTemplate = 'app.configure(mongodb)';
+const importTemplate = ({ database }) => `import { ${database} } from './${database}'`;
+const configureTemplate = ({ database }) => `app.configure(${database})`;
 const toAppFile = (0, pinion_1.toFile)(({ lib }) => [lib, 'app']);
 const toValidatorFile = (0, pinion_1.toFile)(({ lib }) => [lib, 'validators']);
 const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib }) => lib, 'mongodb')))
+    .then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, database }) => [lib, database])))
     .then((0, commons_1.injectSource)(importTemplate, (0, pinion_1.before)('import { services } from'), toAppFile))
     .then((0, commons_1.injectSource)(configureTemplate, (0, pinion_1.before)('app.configure(services)'), toAppFile))
     .then((0, commons_1.injectSource)(keywordImport, (0, pinion_1.prepend)(), toValidatorFile))

package/lib/connection/templates/mongodb.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongodb.tpl.js","sourceRoot":"","sources":["../../../src/connection/templates/mongodb.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA+E;AAE/E,2CAA0D;AAE1D,MAAM,QAAQ,GACZ,CAAC,EAA8B,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;CAmB9C,CAAA;AAED,MAAM,aAAa,GAAG,uDAAuD,CAAA;AAE7E,MAAM,eAAe,GAAG;2CACmB,CAAA;AAE3C,MAAM,cAAc,GAAG,qCAAqC,CAAA;AAC5D,MAAM,iBAAiB,GAAG,wBAAwB,CAAA;AAClD,MAAM,SAAS,GAAG,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;AAC/E,MAAM,eAAe,GAAG,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAA;AAErF,MAAM,QAAQ,GAAG,CAAC,GAA+B,EAAE,EAAE,CAC1D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,CAChE,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,cAAc,EAAE,IAAA,eAAM,EAAC,0BAA0B,CAAC,EAAE,SAAS,CAAC,CAAC;KACjF,IAAI,CAAC,IAAA,sBAAY,EAAC,iBAAiB,EAAE,IAAA,eAAM,EAAC,yBAAyB,CAAC,EAAE,SAAS,CAAC,CAAC;KACnF,IAAI,CAAC,IAAA,sBAAY,EAAC,aAAa,EAAE,IAAA,gBAAO,GAAE,EAAE,eAAe,CAAC,CAAC;KAC7D,IAAI,CAAC,IAAA,sBAAY,EAAC,eAAe,EAAE,IAAA,eAAM,GAAE,EAAE,eAAe,CAAC,CAAC,CAAA;AAXtD,QAAA,QAAQ,YAW8C"}
+{"version":3,"file":"mongodb.tpl.js","sourceRoot":"","sources":["../../../src/connection/templates/mongodb.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA+E;AAE/E,2CAA0D;AAE1D,MAAM,QAAQ,GAAG,CAAC,EAChB,QAAQ,EACmB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;MAOrC,QAAQ;;;;eAIC,QAAQ;gCACS,QAAQ;;;;;aAK3B,QAAQ;;CAEpB,CAAA;AAED,MAAM,aAAa,GAAG,uDAAuD,CAAA;AAE7E,MAAM,eAAe,GAAG;2CACmB,CAAA;AAE3C,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAClE,YAAY,QAAQ,cAAc,QAAQ,GAAG,CAAA;AAC/C,MAAM,iBAAiB,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC,iBAAiB,QAAQ,GAAG,CAAA;AACpG,MAAM,SAAS,GAAG,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;AAC/E,MAAM,eAAe,GAAG,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAA;AAErF,MAAM,QAAQ,GAAG,CAAC,GAA+B,EAAE,EAAE,CAC1D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAC3E,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,cAAc,EAAE,IAAA,eAAM,EAAC,0BAA0B,CAAC,EAAE,SAAS,CAAC,CAAC;KACjF,IAAI,CAAC,IAAA,sBAAY,EAAC,iBAAiB,EAAE,IAAA,eAAM,EAAC,yBAAyB,CAAC,EAAE,SAAS,CAAC,CAAC;KACnF,IAAI,CAAC,IAAA,sBAAY,EAAC,aAAa,EAAE,IAAA,gBAAO,GAAE,EAAE,eAAe,CAAC,CAAC;KAC7D,IAAI,CAAC,IAAA,sBAAY,EAAC,eAAe,EAAE,IAAA,eAAM,GAAE,EAAE,eAAe,CAAC,CAAC,CAAA;AAXtD,QAAA,QAAQ,YAW8C"}

package/lib/connection/templates/mongodb.tpl.ts

@@ -2,25 +2,26 @@ import { generator, toFile, before, prepend, append } from '@feathershq/pinion'
 import { ConnectionGeneratorContext } from '../index'
 import { injectSource, renderSource } from '../../commons'
 
-const template =
-  ({}: ConnectionGeneratorContext) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/databases.html
+const template = ({
+  database
+}: ConnectionGeneratorContext) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/databases.html
 import { MongoClient } from 'mongodb'
 import type { Db } from 'mongodb'
 import type { Application } from './declarations'
 
 declare module './declarations' {
   interface Configuration {
-    mongodbClient: Promise<Db>
+    ${database}Client: Promise<Db>
   }
 }
 
-export const mongodb = (app: Application) => {
-  const connection = app.get('mongodb') as string
+export const ${database} = (app: Application) => {
+  const connection = app.get('${database}') as string
   const database = new URL(connection).pathname.substring(1)
   const mongoClient = MongoClient.connect(connection)
     .then(client => client.db(database))
 
-  app.set('mongodbClient', mongoClient)
+  app.set('${database}Client', mongoClient)
 }
 `
 
@@ -29,8 +30,9 @@ const keywordImport = `import { keywordObjectId } from '@feathersjs/mongodb'`
 const keywordTemplate = `dataValidator.addKeyword(keywordObjectId)
 queryValidator.addKeyword(keywordObjectId)`
 
-const importTemplate = "import { mongodb } from './mongodb'"
-const configureTemplate = 'app.configure(mongodb)'
+const importTemplate = ({ database }: ConnectionGeneratorContext) =>
+  `import { ${database} } from './${database}'`
+const configureTemplate = ({ database }: ConnectionGeneratorContext) => `app.configure(${database})`
 const toAppFile = toFile<ConnectionGeneratorContext>(({ lib }) => [lib, 'app'])
 const toValidatorFile = toFile<ConnectionGeneratorContext>(({ lib }) => [lib, 'validators'])
 
@@ -39,7 +41,7 @@ export const generate = (ctx: ConnectionGeneratorContext) =>
     .then(
       renderSource(
         template,
-        toFile<ConnectionGeneratorContext>(({ lib }) => lib, 'mongodb')
+        toFile<ConnectionGeneratorContext>(({ lib, database }) => [lib, database])
       )
     )
     .then(injectSource(importTemplate, before('import { services } from'), toAppFile))

package/lib/service/index.d.ts

@@ -56,6 +56,10 @@ export interface ServiceGeneratorContext extends FeathersBaseContext {
      * Set to true if this service is for an authentication entity
      */
     isEntityService?: boolean;
+    /**
+     * The authentication strategies (if it is an entity service)
+     */
+    authStrategies: string[];
 }
 /**
  * Parameters the generator is called with