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

package/lib/service/index.js

@@ -7,86 +7,94 @@ exports.generate = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../commons");
+const chalk_1 = __importDefault(require("chalk"));
 const generate = (ctx) => (0, pinion_1.generator)(ctx)
     .then((0, commons_1.initializeBaseContext)())
     .then((0, commons_1.checkPreconditions)())
-    .then((0, pinion_1.prompt)(({ name, path, type, schema, authentication, isEntityService, feathers }) => [
-    {
-        name: 'name',
-        type: 'input',
-        when: !name,
-        message: 'What is the name of your service?',
-        validate: (input) => {
-            if (!input || input === 'authentication') {
-                return 'Invalid service name';
+    .then((0, pinion_1.prompt)(({ name, path, type, schema, authentication, isEntityService, feathers, lib, language }) => {
+    const sqlDisabled = commons_1.DATABASE_TYPES.every((name) => name === 'mongodb' || name === 'other' || !(0, commons_1.fileExists)(lib, `${name}.${language}`));
+    const mongodbDisabled = !(0, commons_1.fileExists)(lib, `mongodb.${language}`);
+    return [
+        {
+            name: 'name',
+            type: 'input',
+            when: !name,
+            message: 'What is the name of your service?',
+            validate: (input) => {
+                if (!input || input === 'authentication') {
+                    return 'Invalid service name';
+                }
+                return true;
             }
-            return true;
-        }
-    },
-    {
-        name: 'path',
-        type: 'input',
-        when: !path,
-        message: 'Which path should the service be registered on?',
-        default: (answers) => `${lodash_1.default.kebabCase(answers.name)}`,
-        validate: (input) => {
-            if (!input || input === 'authentication') {
-                return 'Invalid service path';
+        },
+        {
+            name: 'path',
+            type: 'input',
+            when: !path,
+            message: 'Which path should the service be registered on?',
+            default: (answers) => `${lodash_1.default.kebabCase(answers.name)}`,
+            validate: (input) => {
+                if (!input || input === 'authentication') {
+                    return 'Invalid service path';
+                }
+                return true;
             }
-            return true;
+        },
+        {
+            name: 'authentication',
+            type: 'confirm',
+            when: authentication === undefined && !isEntityService,
+            message: 'Does this service require authentication?'
+        },
+        {
+            name: 'type',
+            type: 'list',
+            when: !type,
+            message: 'What database is the service using?',
+            default: (0, commons_1.getDatabaseAdapter)(feathers === null || feathers === void 0 ? void 0 : feathers.database),
+            choices: [
+                {
+                    value: 'knex',
+                    name: `SQL${sqlDisabled ? chalk_1.default.gray(' (connection not available)') : ''}`,
+                    disabled: sqlDisabled
+                },
+                {
+                    value: 'mongodb',
+                    name: `MongoDB${mongodbDisabled ? chalk_1.default.gray(' (connection not available)') : ''}`,
+                    disabled: mongodbDisabled
+                },
+                {
+                    value: 'custom',
+                    name: 'A custom service'
+                }
+            ]
+        },
+        {
+            name: 'schema',
+            type: 'list',
+            when: schema === undefined,
+            message: 'Which schema definition format do you want to use?',
+            suffix: chalk_1.default.grey(' Schemas allow to type, validate, secure and populate data'),
+            default: feathers === null || feathers === void 0 ? void 0 : feathers.schema,
+            choices: (answers) => [
+                {
+                    value: 'typebox',
+                    name: `TypeBox ${chalk_1.default.gray(' (recommended)')}`
+                },
+                {
+                    value: 'json',
+                    name: 'JSON schema'
+                },
+                {
+                    value: false,
+                    name: `No schema${answers.type !== 'custom' ? chalk_1.default.gray(' (not recommended with a database)') : ''}`
+                }
+            ]
         }
-    },
-    {
-        name: 'authentication',
-        type: 'confirm',
-        when: authentication === undefined && !isEntityService,
-        message: 'Does this service require authentication?'
-    },
-    {
-        name: 'type',
-        type: 'list',
-        when: !type,
-        message: 'What kind of service is it?',
-        default: (0, commons_1.getDatabaseAdapter)(feathers === null || feathers === void 0 ? void 0 : feathers.database),
-        choices: [
-            {
-                value: 'knex',
-                name: 'SQL'
-            },
-            {
-                value: 'mongodb',
-                name: 'MongoDB'
-            },
-            {
-                value: 'custom',
-                name: 'A custom service'
-            }
-        ]
-    },
-    {
-        name: 'schema',
-        type: 'list',
-        when: schema === undefined,
-        message: 'Which schema definition format do you want to use?',
-        default: feathers === null || feathers === void 0 ? void 0 : feathers.schema,
-        choices: [
-            {
-                value: 'typebox',
-                name: 'TypeBox'
-            },
-            {
-                value: 'json',
-                name: 'JSON schema'
-            },
-            {
-                value: false,
-                name: 'No schema'
-            }
-        ]
-    }
-]))
+    ];
+}))
     .then(async (ctx) => {
-    const { name, path, type } = ctx;
+    const { name, path, type, authStrategies = [] } = ctx;
     const kebabName = lodash_1.default.kebabCase(name);
     const camelName = lodash_1.default.camelCase(name);
     const upperName = lodash_1.default.upperFirst(camelName);
@@ -107,6 +115,7 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
         camelName,
         kebabPath,
         relative,
+        authStrategies,
         ...ctx
     };
 })

package/lib/service/index.js.map

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

package/lib/service/index.ts

@@ -3,10 +3,13 @@ import { generator, runGenerator, runGenerators, prompt } from '@feathershq/pini
 
 import {
   checkPreconditions,
+  DATABASE_TYPES,
   FeathersBaseContext,
+  fileExists,
   getDatabaseAdapter,
   initializeBaseContext
 } from '../commons'
+import chalk from 'chalk'
 
 export interface ServiceGeneratorContext extends FeathersBaseContext {
   /**
@@ -65,6 +68,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[]
 }
 
 /**
@@ -81,87 +88,99 @@ export const generate = (ctx: ServiceGeneratorArguments) =>
     .then(checkPreconditions())
     .then(
       prompt<ServiceGeneratorArguments, ServiceGeneratorContext>(
-        ({ name, path, type, schema, authentication, isEntityService, feathers }) => [
-          {
-            name: 'name',
-            type: 'input',
-            when: !name,
-            message: 'What is the name of your service?',
-            validate: (input) => {
-              if (!input || input === 'authentication') {
-                return 'Invalid service name'
-              }
+        ({ name, path, type, schema, authentication, isEntityService, feathers, lib, language }) => {
+          const sqlDisabled = DATABASE_TYPES.every(
+            (name) => name === 'mongodb' || name === 'other' || !fileExists(lib, `${name}.${language}`)
+          )
+          const mongodbDisabled = !fileExists(lib, `mongodb.${language}`)
 
-              return true
-            }
-          },
-          {
-            name: 'path',
-            type: 'input',
-            when: !path,
-            message: 'Which path should the service be registered on?',
-            default: (answers: ServiceGeneratorArguments) => `${_.kebabCase(answers.name)}`,
-            validate: (input) => {
-              if (!input || input === 'authentication') {
-                return 'Invalid service path'
-              }
+          return [
+            {
+              name: 'name',
+              type: 'input',
+              when: !name,
+              message: 'What is the name of your service?',
+              validate: (input) => {
+                if (!input || input === 'authentication') {
+                  return 'Invalid service name'
+                }
 
-              return true
-            }
-          },
-          {
-            name: 'authentication',
-            type: 'confirm',
-            when: authentication === undefined && !isEntityService,
-            message: 'Does this service require authentication?'
-          },
-          {
-            name: 'type',
-            type: 'list',
-            when: !type,
-            message: 'What kind of service is it?',
-            default: getDatabaseAdapter(feathers?.database),
-            choices: [
-              {
-                value: 'knex',
-                name: 'SQL'
-              },
-              {
-                value: 'mongodb',
-                name: 'MongoDB'
-              },
-              {
-                value: 'custom',
-                name: 'A custom service'
+                return true
               }
-            ]
-          },
-          {
-            name: 'schema',
-            type: 'list',
-            when: schema === undefined,
-            message: 'Which schema definition format do you want to use?',
-            default: feathers?.schema,
-            choices: [
-              {
-                value: 'typebox',
-                name: 'TypeBox'
-              },
-              {
-                value: 'json',
-                name: 'JSON schema'
-              },
-              {
-                value: false,
-                name: 'No schema'
+            },
+            {
+              name: 'path',
+              type: 'input',
+              when: !path,
+              message: 'Which path should the service be registered on?',
+              default: (answers: ServiceGeneratorArguments) => `${_.kebabCase(answers.name)}`,
+              validate: (input) => {
+                if (!input || input === 'authentication') {
+                  return 'Invalid service path'
+                }
+
+                return true
               }
-            ]
-          }
-        ]
+            },
+            {
+              name: 'authentication',
+              type: 'confirm',
+              when: authentication === undefined && !isEntityService,
+              message: 'Does this service require authentication?'
+            },
+            {
+              name: 'type',
+              type: 'list',
+              when: !type,
+              message: 'What database is the service using?',
+              default: getDatabaseAdapter(feathers?.database),
+              choices: [
+                {
+                  value: 'knex',
+                  name: `SQL${sqlDisabled ? chalk.gray(' (connection not available)') : ''}`,
+                  disabled: sqlDisabled
+                },
+                {
+                  value: 'mongodb',
+                  name: `MongoDB${mongodbDisabled ? chalk.gray(' (connection not available)') : ''}`,
+                  disabled: mongodbDisabled
+                },
+                {
+                  value: 'custom',
+                  name: 'A custom service'
+                }
+              ]
+            },
+            {
+              name: 'schema',
+              type: 'list',
+              when: schema === undefined,
+              message: 'Which schema definition format do you want to use?',
+              suffix: chalk.grey(' Schemas allow to type, validate, secure and populate data'),
+              default: feathers?.schema,
+              choices: (answers: ServiceGeneratorContext) => [
+                {
+                  value: 'typebox',
+                  name: `TypeBox ${chalk.gray(' (recommended)')}`
+                },
+                {
+                  value: 'json',
+                  name: 'JSON schema'
+                },
+                {
+                  value: false,
+                  name: `No schema${
+                    answers.type !== 'custom' ? chalk.gray(' (not recommended with a database)') : ''
+                  }`
+                }
+              ]
+            }
+          ]
+        }
       )
     )
     .then(async (ctx): Promise<ServiceGeneratorContext> => {
-      const { name, path, type } = ctx
+      const { name, path, type, authStrategies = [] } = ctx
       const kebabName = _.kebabCase(name)
       const camelName = _.camelCase(name)
       const upperName = _.upperFirst(camelName)
@@ -184,6 +203,7 @@ export const generate = (ctx: ServiceGeneratorArguments) =>
         camelName,
         kebabPath,
         relative,
+        authStrategies,
         ...ctx
       }
     })

package/lib/service/templates/client.tpl.js

@@ -14,8 +14,7 @@ export type {
 `;
 const registrationTemplate = ({ camelName }) => `  client.configure(${camelName}Client)`;
 const toClientFile = (0, pinion_1.toFile)(({ lib }) => [lib, 'client']);
-const generate = async (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, commons_1.injectSource)(registrationTemplate, (0, pinion_1.before)('return client'), toClientFile))
-    .then((0, commons_1.injectSource)(importTemplate, (0, pinion_1.after)(({ language }) => language === 'ts' ? 'import type { AuthenticationClientOptions }' : 'import authenticationClient'), toClientFile));
+const generate = async (ctx) => (0, pinion_1.generator)(ctx);
 exports.generate = generate;
+(0, pinion_1.when)(({ lib, language }) => (0, commons_1.fileExists)(lib, `client.${language}`), (0, commons_1.injectSource)(registrationTemplate, (0, pinion_1.before)('return client'), toClientFile), (0, commons_1.injectSource)(importTemplate, (0, pinion_1.after)(({ language }) => language === 'ts' ? 'import type { AuthenticationClientOptions }' : 'import authenticationClient'), toClientFile));
 //# sourceMappingURL=client.tpl.js.map

package/lib/service/templates/client.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/client.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAqE;AACrE,2CAA4C;AAG5C,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAA2B,EAAE,EAAE,CAAC,QAAQ,CAAC;WAC9F,SAAS,6BAA6B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ;;IAEzE,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;qBACQ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ;CAChD,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CACtE,sBAAsB,SAAS,SAAS,CAAA;AAE1C,MAAM,YAAY,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAA;AAE3E,MAAM,QAAQ,GAAG,KAAK,EAAE,GAA4B,EAAE,EAAE,CAC7D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CAAC,IAAA,sBAAY,EAAC,oBAAoB,EAAE,IAAA,eAAM,EAAC,eAAe,CAAC,EAAE,YAAY,CAAC,CAAC;KAC/E,IAAI,CACH,IAAA,sBAAY,EACV,cAAc,EACd,IAAA,cAAK,EAA0B,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAC9C,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,6BAA6B,CAClG,EACD,YAAY,CACb,CACF,CAAA;AAXQ,QAAA,QAAQ,YAWhB"}
+{"version":3,"file":"client.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/client.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA2E;AAC3E,2CAAwD;AAGxD,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAA2B,EAAE,EAAE,CAAC,QAAQ,CAAC;WAC9F,SAAS,6BAA6B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ;;IAEzE,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;qBACQ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ;CAChD,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CACtE,sBAAsB,SAAS,SAAS,CAAA;AAE1C,MAAM,YAAY,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAA;AAE3E,MAAM,QAAQ,GAAG,KAAK,EAAE,GAA4B,EAAE,EAAE,CAAC,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAA;AAAjE,QAAA,QAAQ,YAAyD;AAC9E,IAAA,aAAI,EACF,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,IAAA,oBAAU,EAAC,GAAG,EAAE,UAAU,QAAQ,EAAE,CAAC,EAC5D,IAAA,sBAAY,EAAC,oBAAoB,EAAE,IAAA,eAAM,EAAC,eAAe,CAAC,EAAE,YAAY,CAAC,EACzE,IAAA,sBAAY,EACV,cAAc,EACd,IAAA,cAAK,EAA0B,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAC9C,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,6BAA6B,CAClG,EACD,YAAY,CACb,CACF,CAAA"}

package/lib/service/templates/client.tpl.ts

@@ -1,5 +1,5 @@
-import { generator, toFile, after, before } from '@feathershq/pinion'
-import { injectSource } from '../../commons'
+import { generator, toFile, after, before, when } from '@feathershq/pinion'
+import { fileExists, injectSource } from '../../commons'
 import { ServiceGeneratorContext } from '../index'
 
 const importTemplate = ({ upperName, folder, fileName, camelName }: ServiceGeneratorContext) => /* ts */ `
@@ -17,15 +17,15 @@ const registrationTemplate = ({ camelName }: ServiceGeneratorContext) =>
 
 const toClientFile = toFile<ServiceGeneratorContext>(({ lib }) => [lib, 'client'])
 
-export const generate = async (ctx: ServiceGeneratorContext) =>
-  generator(ctx)
-    .then(injectSource(registrationTemplate, before('return client'), toClientFile))
-    .then(
-      injectSource(
-        importTemplate,
-        after<ServiceGeneratorContext>(({ language }) =>
-          language === 'ts' ? 'import type { AuthenticationClientOptions }' : 'import authenticationClient'
-        ),
-        toClientFile
-      )
-    )
+export const generate = async (ctx: ServiceGeneratorContext) => generator(ctx)
+when<ServiceGeneratorContext>(
+  ({ lib, language }) => fileExists(lib, `client.${language}`),
+  injectSource(registrationTemplate, before('return client'), toClientFile),
+  injectSource(
+    importTemplate,
+    after<ServiceGeneratorContext>(({ language }) =>
+      language === 'ts' ? 'import type { AuthenticationClientOptions }' : 'import authenticationClient'
+    ),
+    toClientFile
+  )
+)

package/lib/service/templates/schema.json.tpl.js

@@ -3,9 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const template = ({ camelName, upperName, relative, type, cwd, lib }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/service.schemas.html
-import { resolve, getValidator, querySyntax } from '@feathersjs/schema'
+const authFieldsTemplate = (authStrategies) => authStrategies
+    .map((name) => name === 'local'
+    ? `    email: { type: 'string' },
+    password: { type: 'string' }`
+    : `    ${name}Id: { type: 'string' }`)
+    .join(',\n');
+const template = ({ camelName, upperName, relative, authStrategies, isEntityService, type, cwd, lib }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/service.schemas.html
+import { resolve, getValidator, querySyntax } from '@feathersjs/schema'${type === 'mongodb'
+    ? `
+import { ObjectIdSchema } from '@feathersjs/schema'`
+    : ''}
 import type { FromSchema } from '@feathersjs/schema'
+${(0, commons_1.localTemplate)(authStrategies, `import { passwordHash } from '@feathersjs/authentication-local'`)}
 
 import type { HookContext } from '${relative}/declarations'
 import { dataValidator, queryValidator } from '${relative}/${(0, commons_1.fileExists)(cwd, lib, 'schemas') ? 'schemas/' : '' // This is for legacy backwards compatibility
@@ -16,42 +26,39 @@ export const ${camelName}Schema = {
   $id: '${upperName}',
   type: 'object',
   additionalProperties: false,
-  required: [ '${type === 'mongodb' ? '_id' : 'id'}', 'text' ],
+  required: [ '${type === 'mongodb' ? '_id' : 'id'}', ${(0, commons_1.localTemplate)(authStrategies, `'email'`, `'text'`)} ],
   properties: {
-    ${type === 'mongodb'
-    ? `_id: {
-      type: 'string',
-      objectid: true
-    },`
-    : `id: {
-      type: 'number'
-    },`}
-    text: {
-      type: 'string'
-    }
+    ${type === 'mongodb' ? `_id: ObjectIdSchema(),` : `id: { type: 'number' },`}
+    ${isEntityService
+    ? authFieldsTemplate(authStrategies)
+    : `
+    text: { type: 'string' }`}
   }
 } as const
 export type ${upperName} = FromSchema<typeof ${camelName}Schema>
 export const ${camelName}Validator = getValidator(${camelName}Schema, dataValidator)
 export const ${camelName}Resolver = resolve<${upperName}, HookContext>({})
 
-export const ${camelName}ExternalResolver = resolve<${upperName}, HookContext>({})
+export const ${camelName}ExternalResolver = resolve<${upperName}, HookContext>({
+  ${(0, commons_1.localTemplate)(authStrategies, `// The password should never be visible externally
+  password: async () => undefined`)}
+})
 
 // Schema for creating new data
 export const ${camelName}DataSchema = {
   $id: '${upperName}Data',
   type: 'object',
   additionalProperties: false,
-  required: [ 'text' ],
+  required: [ ${(0, commons_1.localTemplate)(authStrategies, `'email'`, `'text'`)} ],
   properties: {
-    text: {
-      type: 'string'
-    }
+    ...${camelName}Schema.properties
   }
 } as const
 export type ${upperName}Data = FromSchema<typeof ${camelName}DataSchema>
 export const ${camelName}DataValidator = getValidator(${camelName}DataSchema, dataValidator)
-export const ${camelName}DataResolver = resolve<${upperName}Data, HookContext>({})
+export const ${camelName}DataResolver = resolve<${upperName}Data, HookContext>({
+  ${(0, commons_1.localTemplate)(authStrategies, `password: passwordHash({ strategy: 'local' })`)}
+})
 
 // Schema for updating existing data
 export const ${camelName}PatchSchema = {
@@ -65,7 +72,9 @@ export const ${camelName}PatchSchema = {
 } as const
 export type ${upperName}Patch = FromSchema<typeof ${camelName}PatchSchema>
 export const ${camelName}PatchValidator = getValidator(${camelName}PatchSchema, dataValidator)
-export const ${camelName}PatchResolver = resolve<${upperName}Patch, HookContext>({})
+export const ${camelName}PatchResolver = resolve<${upperName}Patch, HookContext>({
+  ${(0, commons_1.localTemplate)(authStrategies, `password: passwordHash({ strategy: 'local' })`)}
+})
 
 // Schema for allowed query properties
 export const ${camelName}QuerySchema = {
@@ -78,7 +87,19 @@ export const ${camelName}QuerySchema = {
 } as const
 export type ${upperName}Query = FromSchema<typeof ${camelName}QuerySchema>
 export const ${camelName}QueryValidator = getValidator(${camelName}QuerySchema, queryValidator)
-export const ${camelName}QueryResolver = resolve<${upperName}Query, HookContext>({})
+export const ${camelName}QueryResolver = resolve<${upperName}Query, HookContext>({
+  ${isEntityService
+    ? `
+  // 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
+  }`
+    : ''}
+})
 `;
 const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)(({ schema }) => schema === 'json', (0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib, folder, fileName }) => [
     lib,

package/lib/service/templates/schema.json.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.json.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/schema.json.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAAwD;AAGxD,MAAM,QAAQ,GAAG,CAAC,EAChB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,GAAG,EACH,GAAG,EACqB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;oCAIJ,QAAQ;iDACK,QAAQ,IACvD,IAAA,oBAAU,EAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,6CAA6C;AACjG;;;eAGe,SAAS;UACd,SAAS;;;iBAGF,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;;MAG5C,IAAI,KAAK,SAAS;IAChB,CAAC,CAAC;;;OAGH;IACC,CAAC,CAAC;;OAGN;;;;;;cAMU,SAAS,wBAAwB,SAAS;eACzC,SAAS,4BAA4B,SAAS;eAC9C,SAAS,sBAAsB,SAAS;;eAExC,SAAS,8BAA8B,SAAS;;;eAGhD,SAAS;UACd,SAAS;;;;;;;;;;cAUL,SAAS,4BAA4B,SAAS;eAC7C,SAAS,gCAAgC,SAAS;eAClD,SAAS,0BAA0B,SAAS;;;eAG5C,SAAS;UACd,SAAS;;;;;SAKV,SAAS;;;cAGJ,SAAS,6BAA6B,SAAS;eAC9C,SAAS,iCAAiC,SAAS;eACnD,SAAS,2BAA2B,SAAS;;;eAG7C,SAAS;UACd,SAAS;;;;qBAIE,SAAS;;;cAGhB,SAAS,6BAA6B,SAAS;eAC9C,SAAS,iCAAiC,SAAS;eACnD,SAAS,2BAA2B,SAAS;CAC3D,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,MAAM,EACjC,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAA2B,EAAE,EAAE,CAAC;IAC7D,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,SAAS;CACrB,CAAC,CACH,CACF,CACF,CAAA;AAdU,QAAA,QAAQ,YAclB"}
+{"version":3,"file":"schema.json.tpl.js","sourceRoot":"","sources":["../../../src/service/templates/schema.json.tpl.ts"],"names":[],"mappings":"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"}