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

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

@@ -1,35 +1,45 @@
 "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, kebabName, schema, fileName, relative }) => /* ts */ `import { MongoDBService } from \'@feathersjs/mongodb\'
+import type { MongoDBAdapterParams } 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} extends MongoDBService<${upperName}, ${upperName}Data, ${upperName}Params> {
+}
+
+export const getOptions = (app: Application) => {
+  return {
+    paginate: app.get('paginate'),
+    Model: app.get('mongodbClient').then(db => db.collection('${kebabName}'))
+  }
 }
 `;
-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,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,EACgB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;oCAGJ,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,2BAA2B,SAAS,KAAK,SAAS,SAAS,SAAS;;;;;;gEAM5B,SAAS;;;CAGxE,CAAA;AAvCY,QAAA,QAAQ,YAuCpB;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,57 @@
-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,
+  kebabName,
+  schema,
+  fileName,
+  relative
+}: ServiceGeneratorContext) => /* ts */ `import { MongoDBService } from \'@feathersjs/mongodb\'
+import type { MongoDBAdapterParams } 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} extends MongoDBService<${upperName}, ${upperName}Data, ${upperName}Params> {
+}
 
-const toClassFile = toFile<ServiceGeneratorContext>(({ lib, folder, fileName }) => [
-  lib,
-  'services',
-  ...folder,
-  `${fileName}.class`
-])
+export const getOptions = (app: Application) => {
+  return {
+    paginate: app.get('paginate'),
+    Model: app.get('mongodbClient').then(db => db.collection('${kebabName}'))
+  }
+}
+`
 
 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.30",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "bin": {
@@ -47,41 +47,40 @@
     "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.30",
+    "@feathersjs/authentication-local": "^5.0.0-pre.30",
+    "@feathersjs/authentication-oauth": "^5.0.0-pre.30",
+    "@feathersjs/configuration": "^5.0.0-pre.30",
+    "@feathersjs/errors": "^5.0.0-pre.30",
+    "@feathersjs/express": "^5.0.0-pre.30",
+    "@feathersjs/feathers": "^5.0.0-pre.30",
+    "@feathersjs/knex": "^5.0.0-pre.30",
+    "@feathersjs/koa": "^5.0.0-pre.30",
+    "@feathersjs/mongodb": "^5.0.0-pre.30",
+    "@feathersjs/schema": "^5.0.0-pre.30",
+    "@feathersjs/socketio": "^5.0.0-pre.30",
+    "@feathersjs/transport-commons": "^5.0.0-pre.30",
+    "@feathersjs/typebox": "^5.0.0-pre.30",
+    "@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": "b535c91197f4b997520e0a0e608793eeba791931"
 }

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"}

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

@@ -1,50 +0,0 @@
-import { generator, toFile } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AppGeneratorContext } from '../index'
-
-const template = ({}: AppGeneratorContext) =>
-  `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>
-`
-
-export const generate = (ctx: AppGeneratorContext) =>
-  generator(ctx).then(
-    renderSource(
-      template,
-      toFile<AppGeneratorContext>(({ lib }) => lib, 'configuration')
-    )
-  )

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

@@ -1,98 +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 = ({ camelName, upperName, relative, authStrategies, type, fileName }) => `import { resolve } from '@feathersjs/schema'
-${authStrategies.includes('local') ? `import { passwordHash } from '@feathersjs/authentication-local'` : ''}
-import type { HookContext } from '${relative}/declarations'
-import type {
-  ${upperName}Data,
-  ${upperName}Patch,
-  ${upperName}Result,
-  ${upperName}Query,
-} from './${fileName}.schema'
-import {
-  ${camelName}DataSchema,
-  ${camelName}PatchSchema,
-  ${camelName}ResultSchema,
-  ${camelName}QuerySchema
-} from './${fileName}.schema'
-
-
-// Resolver for the basic data model (e.g. creating new entries)
-export const ${camelName}DataResolver = resolve<${upperName}Data, HookContext>({
-  schema: ${camelName}DataSchema,
-  validate: 'before',
-  properties: {
-    ${authStrategies.includes('local') ? `password: passwordHash({ strategy: 'local' })` : ''}
-  }
-})
-
-
-// Resolver for making partial updates
-export const ${camelName}PatchResolver = resolve<${upperName}Patch, HookContext>({
-  schema: ${camelName}PatchSchema,
-  validate: 'before',
-  properties: {
-    ${authStrategies.includes('local') ? `password: passwordHash({ strategy: 'local' })` : ''}
-  }
-})
-
-
-// Resolver for the data that is being returned
-export const ${camelName}ResultResolver = resolve<${upperName}Result, HookContext>({
-  schema: ${camelName}ResultSchema,
-  validate: false,
-  properties: {}
-})
-
-
-// Resolver for the "safe" version that external clients are allowed to see
-export const ${camelName}DispatchResolver = resolve<${upperName}Result, HookContext>({
-  schema: ${camelName}ResultSchema,
-  validate: false,
-  properties: {
-    // The password should never be visible externally
-    password: async () => undefined
-  }  
-})
-
-
-// Resolver for allowed query properties
-export const ${camelName}QueryResolver = resolve<${upperName}Query, HookContext>({
-  schema: ${camelName}QuerySchema,
-  validate: 'before',
-  properties: {
-    // If there is a user (e.g. with authentication), they are only allowed to see their own data
-    ${type === 'mongodb' ? '_id' : 'id'}: async (value, user, context) => {
-      if (context.params.user) {
-        return context.params.user.${type === 'mongodb' ? '_id' : 'id'}
-      }
-
-      return value
-    }
-  }
-})
-
-
-// Export all resolvers in a format that can be used with the resolveAll hook
-export const ${camelName}Resolvers = {
-  result: ${camelName}ResultResolver,
-  dispatch: ${camelName}DispatchResolver,
-  data: {
-    create: ${camelName}DataResolver,
-    update: ${camelName}DataResolver,
-    patch: ${camelName}PatchResolver
-  },
-  query: ${camelName}QueryResolver
-}
-`;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
-    lib,
-    'services',
-    ...folder,
-    `${fileName}.resolver`
-]), { force: true }));
-exports.generate = generate;
-//# sourceMappingURL=user.resolver.tpl.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"user.resolver.tpl.js","sourceRoot":"","sources":["../../../src/authentication/templates/user.resolver.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAChB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,cAAc,EACd,IAAI,EACJ,QAAQ,EACuB,EAAE,EAAE,CACnC;EACA,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,iEAAiE,CAAC,CAAC,CAAC,EAAE;oCACvE,QAAQ;;IAExC,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;;IAEhB,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;YACD,QAAQ;;;;eAIL,SAAS,0BAA0B,SAAS;YAC/C,SAAS;;;MAGf,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,+CAA+C,CAAC,CAAC,CAAC,EAAE;;;;;;eAM9E,SAAS,2BAA2B,SAAS;YAChD,SAAS;;;MAGf,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,+CAA+C,CAAC,CAAC,CAAC,EAAE;;;;;;eAM9E,SAAS,4BAA4B,SAAS;YACjD,SAAS;;;;;;;eAON,SAAS,8BAA8B,SAAS;YACnD,SAAS;;;;;;;;;;eAUN,SAAS,2BAA2B,SAAS;YAChD,SAAS;;;;MAIf,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;;qCAEF,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;;;;;;;;;;eAUvD,SAAS;YACZ,SAAS;cACP,SAAS;;cAET,SAAS;cACT,SAAS;aACV,SAAS;;WAEX,SAAS;;CAEnB,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,EAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAkC,EAAE,EAAE,CAAC;IACpE,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,WAAW;CACvB,CAAC,EACF,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CACF,CAAA;AAZU,QAAA,QAAQ,YAYlB"}

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

@@ -1,111 +0,0 @@
-import { generator, toFile } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AuthenticationGeneratorContext } from '../index'
-
-const template = ({
-  camelName,
-  upperName,
-  relative,
-  authStrategies,
-  type,
-  fileName
-}: AuthenticationGeneratorContext) =>
-  `import { resolve } from '@feathersjs/schema'
-${authStrategies.includes('local') ? `import { passwordHash } from '@feathersjs/authentication-local'` : ''}
-import type { HookContext } from '${relative}/declarations'
-import type {
-  ${upperName}Data,
-  ${upperName}Patch,
-  ${upperName}Result,
-  ${upperName}Query,
-} from './${fileName}.schema'
-import {
-  ${camelName}DataSchema,
-  ${camelName}PatchSchema,
-  ${camelName}ResultSchema,
-  ${camelName}QuerySchema
-} from './${fileName}.schema'
-
-
-// Resolver for the basic data model (e.g. creating new entries)
-export const ${camelName}DataResolver = resolve<${upperName}Data, HookContext>({
-  schema: ${camelName}DataSchema,
-  validate: 'before',
-  properties: {
-    ${authStrategies.includes('local') ? `password: passwordHash({ strategy: 'local' })` : ''}
-  }
-})
-
-
-// Resolver for making partial updates
-export const ${camelName}PatchResolver = resolve<${upperName}Patch, HookContext>({
-  schema: ${camelName}PatchSchema,
-  validate: 'before',
-  properties: {
-    ${authStrategies.includes('local') ? `password: passwordHash({ strategy: 'local' })` : ''}
-  }
-})
-
-
-// Resolver for the data that is being returned
-export const ${camelName}ResultResolver = resolve<${upperName}Result, HookContext>({
-  schema: ${camelName}ResultSchema,
-  validate: false,
-  properties: {}
-})
-
-
-// Resolver for the "safe" version that external clients are allowed to see
-export const ${camelName}DispatchResolver = resolve<${upperName}Result, HookContext>({
-  schema: ${camelName}ResultSchema,
-  validate: false,
-  properties: {
-    // The password should never be visible externally
-    password: async () => undefined
-  }  
-})
-
-
-// Resolver for allowed query properties
-export const ${camelName}QueryResolver = resolve<${upperName}Query, HookContext>({
-  schema: ${camelName}QuerySchema,
-  validate: 'before',
-  properties: {
-    // If there is a user (e.g. with authentication), they are only allowed to see their own data
-    ${type === 'mongodb' ? '_id' : 'id'}: async (value, user, context) => {
-      if (context.params.user) {
-        return context.params.user.${type === 'mongodb' ? '_id' : 'id'}
-      }
-
-      return value
-    }
-  }
-})
-
-
-// Export all resolvers in a format that can be used with the resolveAll hook
-export const ${camelName}Resolvers = {
-  result: ${camelName}ResultResolver,
-  dispatch: ${camelName}DispatchResolver,
-  data: {
-    create: ${camelName}DataResolver,
-    update: ${camelName}DataResolver,
-    patch: ${camelName}PatchResolver
-  },
-  query: ${camelName}QueryResolver
-}
-`
-
-export const generate = (ctx: AuthenticationGeneratorContext) =>
-  generator(ctx).then(
-    renderSource(
-      template,
-      toFile(({ lib, folder, fileName }: AuthenticationGeneratorContext) => [
-        lib,
-        'services',
-        ...folder,
-        `${fileName}.resolver`
-      ]),
-      { force: true }
-    )
-  )

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

@@ -1,79 +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 = ({ camelName, upperName, authStrategies, type }) => `import { schema, querySyntax } from '@feathersjs/schema'
-import type { Infer } from '@feathersjs/schema'
-  
-// Schema for the basic data model (e.g. creating new entries)
-export const ${camelName}DataSchema = schema({
-  $id: '${upperName}Data',
-  type: 'object',
-  additionalProperties: false,
-  required: [ ${authStrategies.includes('local') ? "'email'" : ''} ],
-  properties: {
-    ${authStrategies
-    .map((name) => name === 'local'
-    ? `    email: { type: 'string' },
-    password: { type: 'string' }`
-    : `    ${name}Id: { type: 'string' }`)
-    .join(',\n')}
-  }
-} as const)
-
-export type ${upperName}Data = Infer<typeof ${camelName}DataSchema>
-
-
-// Schema for making partial updates
-export const ${camelName}PatchSchema = schema({
-  $id: '${upperName}Patch',
-  type: 'object',
-  additionalProperties: false,
-  required: [],
-  properties: {
-    ...${camelName}DataSchema.properties
-  }
-} as const)
-
-export type ${upperName}Patch = Infer<typeof ${camelName}PatchSchema>
-
-// Schema for the data that is being returned
-export const ${camelName}ResultSchema = schema({
-  $id: '${upperName}Result',
-  type: 'object',
-  additionalProperties: false,
-  required: [ '${type === 'mongodb' ? '_id' : 'id'}' ],
-  properties: {
-    ...${camelName}DataSchema.properties,
-    ${type === 'mongodb' ? '_id' : 'id'}: {
-      type: '${type === 'mongodb' ? 'string' : 'number'}'
-    }
-  }
-} as const)
-
-export type ${upperName}Result = Infer<typeof ${camelName}ResultSchema>
-
-// Queries shouldn't allow doing anything with the password
-const { password, ...${camelName}QueryProperties } = ${camelName}ResultSchema.properties
-
-// Schema for allowed query properties
-export const ${camelName}QuerySchema = schema({
-  $id: '${upperName}Query',
-  type: 'object',
-  additionalProperties: false,
-  properties: {
-    ...querySyntax(${camelName}QueryProperties)
-  }
-} as const)
-
-export type ${upperName}Query = Infer<typeof ${camelName}QuerySchema>
-`;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
-    lib,
-    'services',
-    ...folder,
-    `${fileName}.schema`
-]), { force: true }));
-exports.generate = generate;
-//# sourceMappingURL=user.schema.tpl.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"user.schema.tpl.js","sourceRoot":"","sources":["../../../src/authentication/templates/user.schema.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAkC,EAAE,EAAE,CAClG;;;;eAIa,SAAS;UACd,SAAS;;;gBAGH,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;MAE3D,cAAc;KACb,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI,KAAK,OAAO;IACd,CAAC,CAAC;iCACqB;IACvB,CAAC,CAAC,OAAO,IAAI,wBAAwB,CACxC;KACA,IAAI,CAAC,KAAK,CAAC;;;;cAIJ,SAAS,uBAAuB,SAAS;;;;eAIxC,SAAS;UACd,SAAS;;;;;SAKV,SAAS;;;;cAIJ,SAAS,wBAAwB,SAAS;;;eAGzC,SAAS;UACd,SAAS;;;iBAGF,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;;SAEzC,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;;;;;cAKzC,SAAS,yBAAyB,SAAS;;;uBAGlC,SAAS,uBAAuB,SAAS;;;eAGjD,SAAS;UACd,SAAS;;;;qBAIE,SAAS;;;;cAIhB,SAAS,wBAAwB,SAAS;CACvD,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,EAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAkC,EAAE,EAAE,CAAC;IACpE,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,SAAS;CACrB,CAAC,EACF,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CACF,CAAA;AAZU,QAAA,QAAQ,YAYlB"}