@feathersjs/generators 5.0.0-pre.37 → 5.0.0

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

@@ -1,4 +1,4 @@
-import { generator, toFile, writeJSON } from '@feathershq/pinion'
+import { generator, toFile, when, writeJSON } from '@feathershq/pinion'
 import { renderSource } from '../../commons'
 import { AppGeneratorContext } from '../index'
 
@@ -18,7 +18,10 @@ const customEnvironment = {
     __name: 'PORT',
     __format: 'number'
   },
-  host: 'HOSTNAME'
+  host: 'HOSTNAME',
+  authentication: {
+    secret: 'FEATHERS_SECRET'
+  }
 }
 
 const testConfig = {
@@ -26,7 +29,7 @@ const testConfig = {
 }
 
 const configurationJsonTemplate =
-  ({}: AppGeneratorContext) => /* ts */ `import { defaultAppSettings, getValidator } from '@feathersjs/schema'
+  ({}: AppGeneratorContext) => `import { defaultAppSettings, getValidator } from '@feathersjs/schema'
 import type { FromSchema } from '@feathersjs/schema'
 
 import { dataValidator } from './validators'
@@ -50,7 +53,7 @@ export type ApplicationConfiguration = FromSchema<typeof configurationSchema>
 `
 
 const configurationTypeboxTemplate =
-  ({}: AppGeneratorContext) => /* ts */ `import { Type, getValidator, defaultAppConfiguration } from '@feathersjs/typebox'
+  ({}: AppGeneratorContext) => `import { Type, getValidator, defaultAppConfiguration } from '@feathersjs/typebox'
 import type { Static } from '@feathersjs/typebox'
 
 import { dataValidator } from './validators'
@@ -75,9 +78,12 @@ export const generate = (ctx: AppGeneratorContext) =>
     .then(writeJSON(testConfig, toFile('config', 'test.json')))
     .then(writeJSON(customEnvironment, toFile('config', 'custom-environment-variables.json')))
     .then(
-      renderSource(
-        async (ctx) =>
-          ctx.schema === 'typebox' ? configurationTypeboxTemplate(ctx) : configurationJsonTemplate(ctx),
-        toFile<AppGeneratorContext>(({ lib }) => lib, 'configuration')
+      when<AppGeneratorContext>(
+        (ctx) => ctx.schema !== false,
+        renderSource(
+          async (ctx) =>
+            ctx.schema === 'typebox' ? configurationTypeboxTemplate(ctx) : configurationJsonTemplate(ctx),
+          toFile<AppGeneratorContext>(({ lib }) => lib, 'configuration')
+        )
       )
     )

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

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
-const template = ({ framework }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/typescript.html
+const template = ({ framework, schema }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/typescript.html
 import { HookContext as FeathersHookContext, NextFunction } from '@feathersjs/feathers'
 import { Application as FeathersApplication } from '@feathersjs/${framework}'
-import { ApplicationConfiguration } from './configuration'
+${schema === false
+    ? `type ApplicationConfiguration = any`
+    : `import { ApplicationConfiguration } from './configuration'`}
 
 export { NextFunction }
 

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

@@ -1 +1 @@
-{"version":3,"file":"declarations.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/declarations.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4E;AAG5E,MAAM,QAAQ,GAAG,CAAC,EAChB,SAAS,EACW,EAAE,EAAE,CAAC,QAAQ,CAAC;;kEAE8B,SAAS;;;;;;;;;;;;;;;;;;CAkB1E,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,KAAK,IAAI,EACnC,IAAA,uBAAc,EACZ,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,CACjE,CACF,CACF,CAAA;AATU,QAAA,QAAQ,YASlB"}
+{"version":3,"file":"declarations.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/declarations.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4E;AAG5E,MAAM,QAAQ,GAAG,CAAC,EAChB,SAAS,EACT,MAAM,EACc,EAAE,EAAE,CAAC,QAAQ,CAAC;;kEAE8B,SAAS;EAEzE,MAAM,KAAK,KAAK;IACd,CAAC,CAAC,qCAAqC;IACvC,CAAC,CAAC,4DACN;;;;;;;;;;;;;;;;;CAiBC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,KAAK,IAAI,EACnC,IAAA,uBAAc,EACZ,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,CACjE,CACF,CACF,CAAA;AATU,QAAA,QAAQ,YASlB"}

package/lib/app/templates/declarations.tpl.ts

@@ -2,11 +2,16 @@ import { generator, toFile, when, renderTemplate } from '@feathershq/pinion'
 import { AppGeneratorContext } from '../index'
 
 const template = ({
-  framework
+  framework,
+  schema
 }: AppGeneratorContext) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/typescript.html
 import { HookContext as FeathersHookContext, NextFunction } from '@feathersjs/feathers'
 import { Application as FeathersApplication } from '@feathersjs/${framework}'
-import { ApplicationConfiguration } from './configuration'
+${
+  schema === false
+    ? `type ApplicationConfiguration = any`
+    : `import { ApplicationConfiguration } from './configuration'`
+}
 
 export { NextFunction }
 

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

@@ -24,7 +24,7 @@ const tsPackageJson = (lib) => ({
         'bundle:client': 'npm run compile && npm pack --pack-destination ./public'
     }
 });
-const packageJson = ({ name, description, language, packager, database, framework, transports, lib, test, schema }) => ({
+const packageJson = ({ name, description, client, language, packager, database, framework, transports, lib, test, schema }) => ({
     name,
     description,
     version: '0.0.0',
@@ -49,8 +49,14 @@ const packageJson = ({ name, description, language, packager, database, framewor
         lib,
         test
     },
-    files: ['lib/client.js', 'lib/**/*.d.ts', 'lib/**/*.shared.js'],
-    main: language === 'ts' ? 'lib/client' : `${lib}/client`,
+    ...(client
+        ? {
+            files: ['lib/client.js', 'lib/**/*.d.ts', 'lib/**/*.shared.js'],
+            main: language === 'ts' ? 'lib/client' : `${lib}/client`
+        }
+        : {
+            main: 'lib/index'
+        }),
     ...(language === 'ts' ? tsPackageJson(lib) : jsPackageJson(lib))
 });
 const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.writeJSON)(packageJson, (0, pinion_1.toFile)('package.json')));

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

@@ -1 +1 @@
-{"version":3,"file":"package.json.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/package.json.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAiE;AAGjE,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;IACtC,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE;QACP,KAAK,EAAE,QAAQ,GAAG,EAAE;QACpB,GAAG,EAAE,WAAW,GAAG,GAAG;QACtB,QAAQ,EAAE,gCAAgC;QAC1C,KAAK,EAAE,wDAAwD;QAC/D,IAAI,EAAE,eAAe;QACrB,eAAe,EAAE,sCAAsC;KACxD;CACF,CAAC,CAAA;AAEF,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;IACtC,OAAO,EAAE;QACP,GAAG,EAAE,sBAAsB,GAAG,WAAW;QACzC,OAAO,EAAE,wBAAwB;QACjC,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,gCAAgC;QAC1C,KAAK,EACH,mGAAmG;QACrG,IAAI,EAAE,eAAe;QACrB,eAAe,EAAE,yDAAyD;KAC3E;CACF,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,CAAC,EACnB,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,UAAU,EACV,GAAG,EACH,IAAI,EACJ,MAAM,EACc,EAAE,EAAE,CAAC,CAAC;IAC1B,IAAI;IACJ,WAAW;IACX,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,CAAC,UAAU,CAAC;IACtB,MAAM,EAAE,EAAE;IACV,YAAY,EAAE,EAAc;IAC5B,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;KAC3C;IACD,QAAQ,EAAE;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,UAAU;QACV,MAAM;KACP;IACD,WAAW,EAAE;QACX,GAAG;QACH,IAAI;KACL;IACD,KAAK,EAAE,CAAC,eAAe,EAAE,eAAe,EAAE,oBAAoB,CAAC;IAC/D,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS;IACxD,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CACjE,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,kBAAS,EAAC,WAAW,EAAE,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC,CAAA;AADxD,QAAA,QAAQ,YACgD"}
+{"version":3,"file":"package.json.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/package.json.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAiE;AAGjE,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;IACtC,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE;QACP,KAAK,EAAE,QAAQ,GAAG,EAAE;QACpB,GAAG,EAAE,WAAW,GAAG,GAAG;QACtB,QAAQ,EAAE,gCAAgC;QAC1C,KAAK,EAAE,wDAAwD;QAC/D,IAAI,EAAE,eAAe;QACrB,eAAe,EAAE,sCAAsC;KACxD;CACF,CAAC,CAAA;AAEF,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;IACtC,OAAO,EAAE;QACP,GAAG,EAAE,sBAAsB,GAAG,WAAW;QACzC,OAAO,EAAE,wBAAwB;QACjC,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,gCAAgC;QAC1C,KAAK,EACH,mGAAmG;QACrG,IAAI,EAAE,eAAe;QACrB,eAAe,EAAE,yDAAyD;KAC3E;CACF,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,CAAC,EACnB,IAAI,EACJ,WAAW,EACX,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,UAAU,EACV,GAAG,EACH,IAAI,EACJ,MAAM,EACc,EAAE,EAAE,CAAC,CAAC;IAC1B,IAAI;IACJ,WAAW;IACX,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,CAAC,UAAU,CAAC;IACtB,MAAM,EAAE,EAAE;IACV,YAAY,EAAE,EAAc;IAC5B,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;KAC3C;IACD,QAAQ,EAAE;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,UAAU;QACV,MAAM;KACP;IACD,WAAW,EAAE;QACX,GAAG;QACH,IAAI;KACL;IACD,GAAG,CAAC,MAAM;QACR,CAAC,CAAC;YACE,KAAK,EAAE,CAAC,eAAe,EAAE,eAAe,EAAE,oBAAoB,CAAC;YAC/D,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS;SACzD;QACH,CAAC,CAAC;YACE,IAAI,EAAE,WAAW;SAClB,CAAC;IACN,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CACjE,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,kBAAS,EAAC,WAAW,EAAE,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC,CAAA;AADxD,QAAA,QAAQ,YACgD"}

package/lib/app/templates/package.json.tpl.ts

@@ -29,6 +29,7 @@ const tsPackageJson = (lib: string) => ({
 const packageJson = ({
   name,
   description,
+  client,
   language,
   packager,
   database,
@@ -62,8 +63,14 @@ const packageJson = ({
     lib,
     test
   },
-  files: ['lib/client.js', 'lib/**/*.d.ts', 'lib/**/*.shared.js'],
-  main: language === 'ts' ? 'lib/client' : `${lib}/client`,
+  ...(client
+    ? {
+        files: ['lib/client.js', 'lib/**/*.d.ts', 'lib/**/*.shared.js'],
+        main: language === 'ts' ? 'lib/client' : `${lib}/client`
+      }
+    : {
+        main: 'lib/index'
+      }),
   ...(language === 'ts' ? tsPackageJson(lib) : jsPackageJson(lib))
 })
 

package/lib/authentication/index.d.ts

@@ -6,42 +6,7 @@ export interface AuthenticationGeneratorContext extends ServiceGeneratorContext
     authStrategies: string[];
     dependencies: string[];
 }
-export type AuthenticationGeneratorArguments = FeathersBaseContext & Partial<Pick<AuthenticationGeneratorContext, 'service' | 'authStrategies' | 'entity' | 'path'>>;
-export declare const localTemplate: (authStrategies: string[], content: string) => string;
-export declare const oauthTemplate: (authStrategies: string[], content: string) => string;
-export declare const prompts: (ctx: AuthenticationGeneratorArguments) => ({
-    type: string;
-    name: string;
-    when: boolean;
-    message: string;
-    suffix: string;
-    choices: ({
-        name: string;
-        value: string;
-        checked: boolean;
-    } | {
-        name: string;
-        value: string;
-        checked?: undefined;
-    })[];
-    default?: undefined;
-} | {
-    name: string;
-    type: string;
-    when: boolean;
-    message: string;
-    default: string;
-    suffix?: undefined;
-    choices?: undefined;
-} | {
-    name: string;
-    type: string;
-    when: boolean;
-    message: string;
-    suffix: string;
-    default: string;
-    choices?: undefined;
-})[];
+export type AuthenticationGeneratorArguments = FeathersBaseContext & Partial<Pick<AuthenticationGeneratorContext, 'service' | 'authStrategies' | 'path' | 'schema' | 'type'>>;
 export declare const generate: (ctx: AuthenticationGeneratorArguments) => Promise<{
     dependencies: string[];
     name: string;
@@ -58,6 +23,7 @@ export declare const generate: (ctx: AuthenticationGeneratorArguments) => Promis
     schema: false | "typebox" | "json";
     authentication: boolean;
     isEntityService?: boolean;
+    authStrategies: string[];
     feathers: import("../commons").FeathersAppInfo;
     pkg: import("../commons").AppPackageJson;
     lib: string;
@@ -67,7 +33,6 @@ export declare const generate: (ctx: AuthenticationGeneratorArguments) => Promis
     cwd: string;
     _?: (string | number)[];
     pinion: import("@feathershq/pinion").Configuration;
-    service: string;
     entity: string;
-    authStrategies: string[];
+    service: string;
 }>;

package/lib/authentication/index.js

@@ -3,16 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = exports.prompts = exports.oauthTemplate = exports.localTemplate = void 0;
+exports.generate = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../commons");
 const index_1 = require("../service/index");
-const localTemplate = (authStrategies, content) => authStrategies.includes('local') ? content : '';
-exports.localTemplate = localTemplate;
-const oauthTemplate = (authStrategies, content) => authStrategies.filter((s) => s !== 'local').length > 0 ? content : '';
-exports.oauthTemplate = oauthTemplate;
-const prompts = (ctx) => [
+const generate = (ctx) => (0, pinion_1.generator)(ctx)
+    .then((0, commons_1.initializeBaseContext)())
+    .then((0, commons_1.checkPreconditions)())
+    .then((0, pinion_1.prompt)((ctx) => [
     {
         type: 'checkbox',
         name: 'authStrategies',
@@ -60,31 +59,17 @@ const prompts = (ctx) => [
         when: !ctx.path,
         message: 'What path should the service be registered on?',
         default: 'users'
-    },
-    {
-        name: 'entity',
-        type: 'input',
-        when: !ctx.entity,
-        message: 'What is your authenticated entity name?',
-        suffix: chalk_1.default.grey(' Will be available in params (e.g. params.user)'),
-        default: 'user'
     }
-];
-exports.prompts = prompts;
-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(async (ctx) => {
-    var _a;
     const serviceContext = await (0, index_1.generate)({
         ...ctx,
         name: ctx.service,
-        isEntityService: true,
-        type: (0, commons_1.getDatabaseAdapter)((_a = ctx.feathers) === null || _a === void 0 ? void 0 : _a.database)
+        isEntityService: true
     });
     return {
         ...ctx,
+        entity: ctx.service,
         ...serviceContext
     };
 })

package/lib/authentication/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/authentication/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/authentication/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,+CAA8E;AAC9E,wCAAwG;AACxG,4CAAwF;AAYjF,MAAM,QAAQ,GAAG,CAAC,GAAqC,EAAE,EAAE,CAChE,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CAAC,IAAA,+BAAqB,GAAE,CAAC;KAC7B,IAAI,CAAC,IAAA,4BAAkB,GAAE,CAAC;KAC1B,IAAI,CACH,IAAA,eAAM,EACJ,CAAC,GAAqC,EAAE,EAAE,CAAC;IACzC;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,CAAC,GAAG,CAAC,cAAc;QACzB,OAAO,EAAE,kDAAkD;QAC3D,MAAM,EAAE,eAAK,CAAC,IAAI,CAAC,wDAAwD,CAAC;QAC5E,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,IAAI;aACd;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,QAAQ;aAChB;YACD;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,UAAU;aAClB;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,SAAS;aACjB;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,QAAQ;aAChB;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,OAAO;aACf;SACF;KACF;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,CAAC,GAAG,CAAC,OAAO;QAClB,OAAO,EAAE,2CAA2C;QACpD,OAAO,EAAE,MAAM;KAChB;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI;QACf,OAAO,EAAE,gDAAgD;QACzD,OAAO,EAAE,OAAO;KACjB;CACF,CACF,CACF;KACA,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAClB,MAAM,cAAc,GAAG,MAAM,IAAA,gBAAgB,EAAC;QAC5C,GAAG,GAAG;QACN,IAAI,EAAE,GAAG,CAAC,OAAO;QACjB,eAAe,EAAE,IAAI;KACtB,CAAC,CAAA;IAEF,OAAO;QACL,GAAG,GAAG;QACN,MAAM,EAAE,GAAG,CAAC,OAAO;QACnB,GAAG,cAAc;KAClB,CAAA;AACH,CAAC,CAAC;KACD,IAAI,CAAC,IAAA,sBAAa,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;KAC3C,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;IACZ,MAAM,YAAY,GAAa,EAAE,CAAA;IAEjC,YAAY,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAA;IAErD,IAAI,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACxC,YAAY,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAA;KACtD;IAED,IAAI,GAAG,CAAC,YAAY,EAAE;QACpB,OAAO;YACL,GAAG,GAAG;YACN,YAAY,EAAE,CAAC,GAAG,GAAG,CAAC,YAAY,EAAE,GAAG,YAAY,CAAC;SACrD,CAAA;KACF;IAED,OAAO,IAAA,gBAAO,EACZ,IAAA,qBAAW,EAAC,YAAY,EAAE,GAAG,CAAC,kBAAkB,CAAC,EACjD,KAAK,EACL,GAAG,CAAC,QAAQ,CAAC,QAAQ,CACtB,CAAC,GAAG,CAAC,CAAA;AACR,CAAC,CAAC,CAAA;AA7FO,QAAA,QAAQ,YA6Ff"}

package/lib/authentication/index.ts

@@ -1,12 +1,6 @@
 import chalk from 'chalk'
 import { generator, runGenerators, prompt, install } from '@feathershq/pinion'
-import {
-  addVersions,
-  checkPreconditions,
-  FeathersBaseContext,
-  getDatabaseAdapter,
-  initializeBaseContext
-} from '../commons'
+import { addVersions, checkPreconditions, FeathersBaseContext, initializeBaseContext } from '../commons'
 import { generate as serviceGenerator, ServiceGeneratorContext } from '../service/index'
 
 export interface AuthenticationGeneratorContext extends ServiceGeneratorContext {
@@ -17,87 +11,76 @@ export interface AuthenticationGeneratorContext extends ServiceGeneratorContext
 }
 
 export type AuthenticationGeneratorArguments = FeathersBaseContext &
-  Partial<Pick<AuthenticationGeneratorContext, 'service' | 'authStrategies' | 'entity' | 'path'>>
-
-export const localTemplate = (authStrategies: string[], content: string) =>
-  authStrategies.includes('local') ? content : ''
-export const oauthTemplate = (authStrategies: string[], content: string) =>
-  authStrategies.filter((s) => s !== 'local').length > 0 ? content : ''
-
-export const prompts = (ctx: AuthenticationGeneratorArguments) => [
-  {
-    type: 'checkbox',
-    name: 'authStrategies',
-    when: !ctx.authStrategies,
-    message: 'Which authentication methods do you want to use?',
-    suffix: chalk.grey(' Other methods and providers can be added at any time.'),
-    choices: [
-      {
-        name: 'Email + Password',
-        value: 'local',
-        checked: true
-      },
-      {
-        name: 'Google',
-        value: 'google'
-      },
-      {
-        name: 'Facebook',
-        value: 'facebook'
-      },
-      {
-        name: 'Twitter',
-        value: 'twitter'
-      },
-      {
-        name: 'GitHub',
-        value: 'github'
-      },
-      {
-        name: 'Auth0',
-        value: 'auth0'
-      }
-    ]
-  },
-  {
-    name: 'service',
-    type: 'input',
-    when: !ctx.service,
-    message: 'What is your authentication service name?',
-    default: 'user'
-  },
-  {
-    name: 'path',
-    type: 'input',
-    when: !ctx.path,
-    message: 'What path should the service be registered on?',
-    default: 'users'
-  },
-  {
-    name: 'entity',
-    type: 'input',
-    when: !ctx.entity,
-    message: 'What is your authenticated entity name?',
-    suffix: chalk.grey(' Will be available in params (e.g. params.user)'),
-    default: 'user'
-  }
-]
+  Partial<Pick<AuthenticationGeneratorContext, 'service' | 'authStrategies' | 'path' | 'schema' | 'type'>>
 
 export const generate = (ctx: AuthenticationGeneratorArguments) =>
   generator(ctx)
     .then(initializeBaseContext())
     .then(checkPreconditions())
-    .then(prompt<AuthenticationGeneratorArguments, AuthenticationGeneratorContext>(prompts))
+    .then(
+      prompt<AuthenticationGeneratorArguments, AuthenticationGeneratorContext>(
+        (ctx: AuthenticationGeneratorArguments) => [
+          {
+            type: 'checkbox',
+            name: 'authStrategies',
+            when: !ctx.authStrategies,
+            message: 'Which authentication methods do you want to use?',
+            suffix: chalk.grey(' Other methods and providers can be added at any time.'),
+            choices: [
+              {
+                name: 'Email + Password',
+                value: 'local',
+                checked: true
+              },
+              {
+                name: 'Google',
+                value: 'google'
+              },
+              {
+                name: 'Facebook',
+                value: 'facebook'
+              },
+              {
+                name: 'Twitter',
+                value: 'twitter'
+              },
+              {
+                name: 'GitHub',
+                value: 'github'
+              },
+              {
+                name: 'Auth0',
+                value: 'auth0'
+              }
+            ]
+          },
+          {
+            name: 'service',
+            type: 'input',
+            when: !ctx.service,
+            message: 'What is your authentication service name?',
+            default: 'user'
+          },
+          {
+            name: 'path',
+            type: 'input',
+            when: !ctx.path,
+            message: 'What path should the service be registered on?',
+            default: 'users'
+          }
+        ]
+      )
+    )
     .then(async (ctx) => {
       const serviceContext = await serviceGenerator({
         ...ctx,
         name: ctx.service,
-        isEntityService: true,
-        type: getDatabaseAdapter(ctx.feathers?.database)
+        isEntityService: true
       })
 
       return {
         ...ctx,
+        entity: ctx.service,
         ...serviceContext
       }
     })

package/lib/authentication/templates/authentication.tpl.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const index_1 = require("../index");
+const commons_2 = require("../../commons");
 const template = ({ authStrategies }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/authentication.html
 import { AuthenticationService, JWTStrategy } from '@feathersjs/authentication'
-${(0, index_1.localTemplate)(authStrategies, `import { LocalStrategy } from '@feathersjs/authentication-local'`)}
-${(0, index_1.oauthTemplate)(authStrategies, `import { oauth, OAuthStrategy } from '@feathersjs/authentication-oauth'`)}
+${(0, commons_2.localTemplate)(authStrategies, `import { LocalStrategy } from '@feathersjs/authentication-local'`)}
+${(0, commons_2.oauthTemplate)(authStrategies, `import { oauth, OAuthStrategy } from '@feathersjs/authentication-oauth'`)}
 
 import type { Application } from './declarations'
 
@@ -26,7 +26,7 @@ export const authentication = (app: Application) => {
     .join('\n')}
 
   app.use('authentication', authentication)
-  ${(0, index_1.oauthTemplate)(authStrategies, `app.configure(oauth())`)}
+  ${(0, commons_2.oauthTemplate)(authStrategies, `app.configure(oauth())`)}
 }
 `;
 const importTemplate = "import { authentication } from './authentication'";

package/lib/authentication/templates/authentication.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"authentication.tpl.js","sourceRoot":"","sources":["../../../src/authentication/templates/authentication.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA8D;AAC9D,2CAA0D;AAC1D,oCAAuF;AAEvF,MAAM,QAAQ,GAAG,CAAC,EAChB,cAAc,EACiB,EAAE,EAAE,CAAC,QAAQ,CAAC;;EAE7C,IAAA,qBAAa,EAAC,cAAc,EAAE,kEAAkE,CAAC;EACjG,IAAA,qBAAa,EAAC,cAAc,EAAE,yEAAyE,CAAC;;;;;;;;;;;;;;IActG,cAAc;KACb,GAAG,CACF,CAAC,QAAQ,EAAE,EAAE,CACX,8BAA8B,QAAQ,MACpC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBACjD,GAAG,CACN;KACA,IAAI,CAAC,IAAI,CAAC;;;IAGX,IAAA,qBAAa,EAAC,cAAc,EAAE,wBAAwB,CAAC;;CAE1D,CAAA;AAED,MAAM,cAAc,GAAG,mDAAmD,CAAA;AAC1E,MAAM,iBAAiB,GAAG,+BAA+B,CAAA;AACzD,MAAM,SAAS,GAAG,IAAA,eAAM,EAAiC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;AAE5E,MAAM,QAAQ,GAAG,CAAC,GAAmC,EAAE,EAAE,CAC9D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAiC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,gBAAgB,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,CAAA;AAT3E,QAAA,QAAQ,YASmE"}
+{"version":3,"file":"authentication.tpl.js","sourceRoot":"","sources":["../../../src/authentication/templates/authentication.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA8D;AAC9D,2CAA0D;AAE1D,2CAA4D;AAE5D,MAAM,QAAQ,GAAG,CAAC,EAChB,cAAc,EACiB,EAAE,EAAE,CAAC,QAAQ,CAAC;;EAE7C,IAAA,uBAAa,EAAC,cAAc,EAAE,kEAAkE,CAAC;EACjG,IAAA,uBAAa,EAAC,cAAc,EAAE,yEAAyE,CAAC;;;;;;;;;;;;;;IActG,cAAc;KACb,GAAG,CACF,CAAC,QAAQ,EAAE,EAAE,CACX,8BAA8B,QAAQ,MACpC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBACjD,GAAG,CACN;KACA,IAAI,CAAC,IAAI,CAAC;;;IAGX,IAAA,uBAAa,EAAC,cAAc,EAAE,wBAAwB,CAAC;;CAE1D,CAAA;AAED,MAAM,cAAc,GAAG,mDAAmD,CAAA;AAC1E,MAAM,iBAAiB,GAAG,+BAA+B,CAAA;AACzD,MAAM,SAAS,GAAG,IAAA,eAAM,EAAiC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;AAE5E,MAAM,QAAQ,GAAG,CAAC,GAAmC,EAAE,EAAE,CAC9D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAiC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,gBAAgB,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,CAAA;AAT3E,QAAA,QAAQ,YASmE"}

package/lib/authentication/templates/authentication.tpl.ts

@@ -1,6 +1,7 @@
 import { generator, before, toFile } from '@feathershq/pinion'
 import { injectSource, renderSource } from '../../commons'
-import { AuthenticationGeneratorContext, localTemplate, oauthTemplate } from '../index'
+import { AuthenticationGeneratorContext } from '../index'
+import { localTemplate, oauthTemplate } from '../../commons'
 
 const template = ({
   authStrategies

package/lib/authentication/templates/client.test.tpl.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const index_1 = require("../index");
+const commons_2 = require("../../commons");
 const template = ({ authStrategies, upperName, type, lib }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/client.test.html
 import assert from 'assert'
 import axios from 'axios'
 
 import rest from '@feathersjs/rest-client'
-${(0, index_1.localTemplate)(authStrategies, `import authenticationClient from '@feathersjs/authentication-client'`)}
+${(0, commons_2.localTemplate)(authStrategies, `import authenticationClient from '@feathersjs/authentication-client'`)}
 import { app } from '../${lib}/app'
 import { createClient } from '../${lib}/client' 
-${(0, index_1.localTemplate)(authStrategies, `import type { ${upperName}Data } from '../${lib}/client'`)}
+${(0, commons_2.localTemplate)(authStrategies, `import type { ${upperName}Data } from '../${lib}/client'`)}
 
 const port = app.get('port')
 const appUrl = \`http://\${app.get('host')}:\${port}\`
@@ -32,7 +32,7 @@ describe('application client tests', () => {
     assert.ok(client)
   })
 
-  ${(0, index_1.localTemplate)(authStrategies, `
+  ${(0, commons_2.localTemplate)(authStrategies, `
   it('creates and authenticates a user with email and password', async () => {
     const userData: ${upperName}Data = {
       email: 'someone@example.com',
@@ -57,6 +57,6 @@ describe('application client tests', () => {
   })`)}
 })
 `;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ test }) => test, 'client.test'), { force: true }));
+const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)(({ lib, language }) => (0, commons_1.fileExists)(lib, `client.${language}`), (0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ test }) => test, 'client.test'), { force: true })));
 exports.generate = generate;
 //# sourceMappingURL=client.test.tpl.js.map

package/lib/authentication/templates/client.test.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.test.tpl.js","sourceRoot":"","sources":["../../../src/authentication/templates/client.test.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAC5C,oCAAwE;AAExE,MAAM,QAAQ,GAAG,CAAC,EAChB,cAAc,EACd,SAAS,EACT,IAAI,EACJ,GAAG,EAC4B,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;EAK7C,IAAA,qBAAa,EAAC,cAAc,EAAE,sEAAsE,CAAC;0BAC7E,GAAG;mCACM,GAAG;EACpC,IAAA,qBAAa,EAAC,cAAc,EAAE,iBAAiB,SAAS,mBAAmB,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;IAoBvF,IAAA,qBAAa,EACb,cAAc,EACd;;sBAEkB,SAAS;;;;;;;;;;;;;;;;;;;6CAmBc,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;KACzE,CACF;;CAEF,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAmC,EAAE,EAAE,CAC9D,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAiC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,EACzE,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CACF,CAAA;AAPU,QAAA,QAAQ,YAOlB"}
+{"version":3,"file":"client.test.tpl.js","sourceRoot":"","sources":["../../../src/authentication/templates/client.test.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAAwD;AAExD,2CAA6C;AAE7C,MAAM,QAAQ,GAAG,CAAC,EAChB,cAAc,EACd,SAAS,EACT,IAAI,EACJ,GAAG,EAC4B,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;EAK7C,IAAA,uBAAa,EAAC,cAAc,EAAE,sEAAsE,CAAC;0BAC7E,GAAG;mCACM,GAAG;EACpC,IAAA,uBAAa,EAAC,cAAc,EAAE,iBAAiB,SAAS,mBAAmB,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;IAoBvF,IAAA,uBAAa,EACb,cAAc,EACd;;sBAEkB,SAAS;;;;;;;;;;;;;;;;;;;6CAmBc,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;KACzE,CACF;;CAEF,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAmC,EAAE,EAAE,CAC9D,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,IAAA,oBAAU,EAAC,GAAG,EAAE,UAAU,QAAQ,EAAE,CAAC,EAC5D,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAiC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,EACzE,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CACF,CACF,CAAA;AAVU,QAAA,QAAQ,YAUlB"}

package/lib/authentication/templates/client.test.tpl.ts

@@ -1,6 +1,7 @@
-import { generator, toFile } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AuthenticationGeneratorContext, localTemplate } from '../index'
+import { generator, toFile, when } from '@feathershq/pinion'
+import { fileExists, renderSource } from '../../commons'
+import { AuthenticationGeneratorContext } from '../index'
+import { localTemplate } from '../../commons'
 
 const template = ({
   authStrategies,
@@ -66,9 +67,12 @@ describe('application client tests', () => {
 
 export const generate = (ctx: AuthenticationGeneratorContext) =>
   generator(ctx).then(
-    renderSource(
-      template,
-      toFile<AuthenticationGeneratorContext>(({ test }) => test, 'client.test'),
-      { force: true }
+    when<AuthenticationGeneratorContext>(
+      ({ lib, language }) => fileExists(lib, `client.${language}`),
+      renderSource(
+        template,
+        toFile<AuthenticationGeneratorContext>(({ test }) => test, 'client.test'),
+        { force: true }
+      )
     )
   )

package/lib/commons.d.ts

@@ -6,10 +6,11 @@ export declare const version: any;
 export type DependencyVersions = {
     [key: string]: string;
 };
+export declare const DATABASE_TYPES: readonly ["mongodb", "mysql", "postgresql", "sqlite", "mssql", "other"];
 /**
  * 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
  *
@@ -29,7 +30,7 @@ export type FeathersAppInfo = {
     /**
      * The package manager used
      */
-    packager: 'yarn' | 'npm';
+    packager: 'yarn' | 'npm' | 'pnpm';
     /**
      * A list of all chosen transports
      */
@@ -41,7 +42,7 @@ export type FeathersAppInfo = {
     /**
      * The main schema definition format
      */
-    schema: 'typebox' | 'json';
+    schema: 'typebox' | 'json' | false;
 };
 export interface AppPackageJson extends PackageJson {
     feathers?: FeathersAppInfo;
@@ -153,3 +154,18 @@ export declare const fileExists: (...filenames: string[]) => boolean;
  * @returns The current date and time in the format `YYYYMMDDHHMMSS`
  */
 export declare const yyyymmddhhmmss: (offset?: number) => string;
+/**
+ * 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 declare const localTemplate: (authStrategies: string[], content: string, alt?: string) => string;
+/**
+ * Render a template if an `oauth` authentication strategy has been selected
+ * @param authStrategies
+ * @param content
+ * @returns
+ */
+export declare const oauthTemplate: (authStrategies: string[], content: string) => string;