@feathersjs/generators 5.0.13 → 5.0.15

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.15](https://github.com/feathersjs/feathers/compare/v5.0.14...v5.0.15) (2024-01-22)
+
+### Bug Fixes
+
+- **generators:** Move generators and CLI to featherscloud/pinion ([#3386](https://github.com/feathersjs/feathers/issues/3386)) ([eb87c99](https://github.com/feathersjs/feathers/commit/eb87c9922db56c5610e5b808f3ffe033c830e2b2))
+
+## [5.0.14](https://github.com/feathersjs/feathers/compare/v5.0.13...v5.0.14) (2024-01-05)
+
+### Bug Fixes
+
+- **generators:** Harden mongodb.js to reliably extract database from any connection string ([#3264](https://github.com/feathersjs/feathers/issues/3264)) ([7b0f82c](https://github.com/feathersjs/feathers/commit/7b0f82c631ff5549cdc9a8e0ffcc705d067c2157))
+
 ## [5.0.13](https://github.com/feathersjs/feathers/compare/v5.0.12...v5.0.13) (2023-12-29)
 
 **Note:** Version bump only for package @feathersjs/generators

package/lib/app/index.d.ts

@@ -1,4 +1,4 @@
-import { FeathersBaseContext, FeathersAppInfo } from '../commons';
+import { FeathersBaseContext, FeathersAppInfo } from '../commons.js';
 export interface AppGeneratorData extends FeathersAppInfo {
     /**
      * The application name
@@ -28,35 +28,27 @@ export type AppGeneratorContext = FeathersBaseContext & AppGeneratorData & {
 export type AppGeneratorArguments = FeathersBaseContext & Partial<AppGeneratorData>;
 export declare const generate: (ctx: AppGeneratorArguments) => Promise<{
     dependencies: string[];
+    devDependencies: any[];
     feathers: FeathersAppInfo;
-    pkg: import("../commons").AppPackageJson;
+    pkg: import("../commons.js").AppPackageJson & import("@featherscloud/pinion").JSONData;
     lib: string;
     test: string;
     language: "ts" | "js";
-    dependencyVersions?: import("../commons").DependencyVersions;
+    dependencyVersions: import("../commons.js").DependencyVersions & {
+        '@feathersjs/cli': any;
+    } & {
+        '@feathersjs/cli': any;
+    };
     cwd: string;
-    _?: (string | number)[];
-    pinion: import("@feathershq/pinion").Configuration;
-    /**
-     * The application name
-     */
-    name: string;
-    /**
-     * A short description of the app
-     */
-    description: string;
-    /**
-     * The database connection string
-     */
-    connectionString: string;
-    /**
-     * Generate a client
-     */
-    client: boolean;
-    database: "mongodb" | "mysql" | "postgresql" | "sqlite" | "mssql" | "other";
-    packager: "yarn" | "npm" | "pnpm";
-    transports: ("rest" | "websockets")[];
-    framework: "koa" | "express";
-    schema: false | "typebox" | "json";
-    devDependencies: string[];
+    argv: string[];
+    pinion: import("@featherscloud/pinion").Configuration;
+    name?: string;
+    description?: string;
+    connectionString?: string;
+    client?: boolean;
+    database?: "mongodb" | "mysql" | "postgresql" | "sqlite" | "mssql" | "other";
+    packager?: "yarn" | "npm" | "pnpm";
+    transports?: ("rest" | "websockets")[];
+    framework?: "koa" | "express";
+    schema?: false | "typebox" | "json";
 }>;

package/lib/app/index.js

@@ -1,22 +1,18 @@
-"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 path_1 = require("path");
-const chalk_1 = __importDefault(require("chalk"));
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("../commons");
-const connection_1 = require("../connection");
-const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, commons_1.initializeBaseContext)())
+import { sep, dirname } from 'path';
+import chalk from 'chalk';
+import { prompt, runGenerators, fromFile, copyFiles, toFile } from '@featherscloud/pinion';
+import { initializeBaseContext, addVersions, install } from '../commons.js';
+import { generate as connectionGenerator, prompts as connectionPrompts } from '../connection/index.js';
+// Set __dirname in es module
+const __dirname = dirname(new URL(import.meta.url).pathname);
+export const generate = (ctx) => Promise.resolve(ctx)
+    .then(initializeBaseContext())
     .then((ctx) => ({
     ...ctx,
     dependencies: [],
     devDependencies: []
 }))
-    .then((0, pinion_1.prompt)((ctx) => [
+    .then(prompt((ctx) => [
     {
         name: 'language',
         type: 'list',
@@ -32,7 +28,7 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
         type: 'input',
         when: !ctx.name,
         message: 'What is the name of your application?',
-        default: ctx.cwd.split(path_1.sep).pop(),
+        default: ctx.cwd.split(sep).pop(),
         validate: (input) => {
             if (ctx.dependencyVersions[input]) {
                 return `Application can not have the same name as a dependency`;
@@ -52,7 +48,7 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
         when: !ctx.framework,
         message: 'Which HTTP framework do you want to use?',
         choices: [
-            { value: 'koa', name: `KoaJS ${chalk_1.default.grey('(recommended)')}` },
+            { value: 'koa', name: `KoaJS ${chalk.grey('(recommended)')}` },
             { value: 'express', name: 'Express' }
         ]
     },
@@ -82,33 +78,33 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
         type: 'confirm',
         when: ctx.client === undefined,
         message: (answers) => `Generate ${answers.language === 'ts' ? 'end-to-end typed ' : ''}client?`,
-        suffix: chalk_1.default.grey(' Can be used with React, Angular, Vue, React Native, Node.js etc.')
+        suffix: chalk.grey(' Can be used with React, Angular, Vue, React Native, Node.js etc.')
     },
     {
         type: 'list',
         name: 'schema',
         when: !ctx.schema,
         message: 'What is your preferred schema (model) definition format?',
-        suffix: chalk_1.default.grey(' Schemas allow to type, validate, secure and populate your data and configuration'),
+        suffix: chalk.grey(' Schemas allow to type, validate, secure and populate your data and configuration'),
         choices: [
-            { value: 'typebox', name: `TypeBox ${chalk_1.default.grey('(recommended)')}` },
+            { value: 'typebox', name: `TypeBox ${chalk.grey('(recommended)')}` },
             { value: 'json', name: 'JSON schema' },
-            { value: false, name: `No schema ${chalk_1.default.grey('(not recommended)')}` }
+            { value: false, name: `No schema ${chalk.grey('(not recommended)')}` }
         ]
     },
-    ...(0, connection_1.prompts)(ctx)
+    ...connectionPrompts(ctx)
 ]))
-    .then((0, pinion_1.runGenerators)(__dirname, 'templates'))
-    .then((0, pinion_1.copyFiles)((0, pinion_1.fromFile)(__dirname, 'static'), (0, pinion_1.toFile)('.')))
-    .then((0, commons_1.initializeBaseContext)())
+    .then(runGenerators(__dirname, 'templates'))
+    .then(copyFiles(fromFile(__dirname, 'static'), toFile('.')))
+    .then(initializeBaseContext())
     .then(async (ctx) => {
-    const { dependencies } = await (0, connection_1.generate)(ctx);
+    const { dependencies } = await connectionGenerator(ctx);
     return {
         ...ctx,
         dependencies
     };
 })
-    .then((0, pinion_1.install)(({ transports, framework, dependencyVersions, dependencies, schema }) => {
+    .then(install(({ transports, framework, dependencyVersions, dependencies, schema }) => {
     const hasSocketio = transports.includes('websockets');
     dependencies.push('@feathersjs/feathers', '@feathersjs/errors', '@feathersjs/schema', '@feathersjs/configuration', '@feathersjs/transport-commons', '@feathersjs/adapter-commons', '@feathersjs/authentication', '@feathersjs/authentication-client', 'winston');
     if (hasSocketio) {
@@ -123,14 +119,13 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
     if (schema === 'typebox') {
         dependencies.push('@feathersjs/typebox');
     }
-    return (0, commons_1.addVersions)(dependencies, dependencyVersions);
+    return addVersions(dependencies, dependencyVersions);
 }, false, ({ packager }) => packager))
-    .then((0, pinion_1.install)(({ language, devDependencies, dependencyVersions }) => {
+    .then(install(({ language, devDependencies, dependencyVersions }) => {
     devDependencies.push('nodemon', 'axios', 'mocha', 'cross-env', 'prettier', '@feathersjs/cli', '@feathersjs/rest-client');
     if (language === 'ts') {
         devDependencies.push('@types/mocha', '@types/node', 'nodemon', 'ts-node', 'typescript', 'shx');
     }
-    return (0, commons_1.addVersions)(devDependencies, dependencyVersions);
+    return addVersions(devDependencies, dependencyVersions);
 }, true, ({ packager }) => packager));
-exports.generate = generate;
 //# sourceMappingURL=index.js.map

package/lib/app/index.js.map

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

package/lib/app/index.ts

@@ -1,8 +1,17 @@
-import { sep } from 'path'
+import { sep, dirname } from 'path'
 import chalk from 'chalk'
-import { generator, prompt, runGenerators, fromFile, install, copyFiles, toFile } from '@feathershq/pinion'
-import { FeathersBaseContext, FeathersAppInfo, initializeBaseContext, addVersions } from '../commons'
-import { generate as connectionGenerator, prompts as connectionPrompts } from '../connection'
+import { prompt, runGenerators, fromFile, copyFiles, toFile } from '@featherscloud/pinion'
+import {
+  FeathersBaseContext,
+  FeathersAppInfo,
+  initializeBaseContext,
+  addVersions,
+  install
+} from '../commons.js'
+import { generate as connectionGenerator, prompts as connectionPrompts } from '../connection/index.js'
+
+// Set __dirname in es module
+const __dirname = dirname(new URL(import.meta.url).pathname)
 
 export interface AppGeneratorData extends FeathersAppInfo {
   /**
@@ -36,7 +45,7 @@ export type AppGeneratorContext = FeathersBaseContext &
 export type AppGeneratorArguments = FeathersBaseContext & Partial<AppGeneratorData>
 
 export const generate = (ctx: AppGeneratorArguments) =>
-  generator(ctx)
+  Promise.resolve(ctx)
     .then(initializeBaseContext())
     .then((ctx) => ({
       ...ctx,
@@ -44,7 +53,7 @@ export const generate = (ctx: AppGeneratorArguments) =>
       devDependencies: []
     }))
     .then(
-      prompt<AppGeneratorArguments, AppGeneratorContext>((ctx) => [
+      prompt((ctx) => [
         {
           name: 'language',
           type: 'list',
@@ -142,7 +151,7 @@ export const generate = (ctx: AppGeneratorArguments) =>
       }
     })
     .then(
-      install<AppGeneratorContext>(
+      install(
         ({ transports, framework, dependencyVersions, dependencies, schema }) => {
           const hasSocketio = transports.includes('websockets')
 
@@ -181,7 +190,7 @@ export const generate = (ctx: AppGeneratorArguments) =>
       )
     )
     .then(
-      install<AppGeneratorContext>(
+      install(
         ({ language, devDependencies, dependencyVersions }) => {
           devDependencies.push(
             'nodemon',

package/lib/app/templates/app.test.tpl.d.ts

@@ -1,2 +1,5 @@
-import { AppGeneratorContext } from '../index';
-export declare const generate: (ctx: AppGeneratorContext) => Promise<AppGeneratorContext>;
+import { AppGeneratorContext } from '../index.js';
+export declare const generate: (ctx: AppGeneratorContext) => Promise<import("../../commons.js").FeathersBaseContext & import("../index.js").AppGeneratorData & {
+    dependencies: string[];
+    devDependencies: string[];
+}>;

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("../../commons");
+import { toFile } from '@featherscloud/pinion';
+import { renderSource } from '../../commons.js';
 const template = ({ lib }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/app.test.html
 import assert from 'assert'
 import axios from 'axios'
@@ -44,6 +41,5 @@ describe('Feathers application tests', () => {
   })
 })
 `;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)('test', 'app.test')));
-exports.generate = generate;
+export const generate = (ctx) => Promise.resolve(ctx).then(renderSource(template, toFile('test', 'app.test')));
 //# sourceMappingURL=app.test.tpl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"app.test.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/app.test.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,EACiB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;0BAIV,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoC5B,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAY,EAAC,QAAQ,EAAE,IAAA,eAAM,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;AAD5D,QAAA,QAAQ,YACoD"}
+{"version":3,"file":"app.test.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/app.test.tpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAG/C,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,EACiB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;0BAIV,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoC5B,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA"}

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

@@ -1,6 +1,6 @@
-import { generator, toFile } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AppGeneratorContext } from '../index'
+import { toFile } from '@featherscloud/pinion'
+import { renderSource } from '../../commons.js'
+import { AppGeneratorContext } from '../index.js'
 
 const template = ({
   lib
@@ -47,4 +47,4 @@ describe('Feathers application tests', () => {
 `
 
 export const generate = (ctx: AppGeneratorContext) =>
-  generator(ctx).then(renderSource(template, toFile('test', 'app.test')))
+  Promise.resolve(ctx).then(renderSource(template, toFile('test', 'app.test')))

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

@@ -1,2 +1,2 @@
-import { AppGeneratorContext } from '../index';
+import { AppGeneratorContext } from '../index.js';
 export declare const generate: (ctx: AppGeneratorContext) => Promise<AppGeneratorContext>;

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("../../commons");
+import { toFile } from '@featherscloud/pinion';
+import { renderSource } from '../../commons.js';
 const tsKoaApp = ({ transports, schema }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/application.html
 import { feathers } from '@feathersjs/feathers'
 import configuration from '@feathersjs/configuration'
@@ -119,6 +116,5 @@ app.hooks({
 export { app }
 `;
 const template = (ctx) => ctx.framework === 'express' ? tsExpressApp(ctx) : tsKoaApp(ctx);
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib }) => lib, 'app')));
-exports.generate = generate;
+export const generate = (ctx) => Promise.resolve(ctx).then(renderSource(template, toFile(({ lib }) => lib, 'app')));
 //# sourceMappingURL=app.tpl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"app.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/app.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAChB,UAAU,EACV,MAAM,EACc,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;EAMlC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,EAAE;;EAEtF,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,0DAA0D,CAAC,CAAC,CAAC,EAAE;;;;EAIlF,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC,EAAE;;;;;8BAKpD,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;EAY5E,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC/B,CAAC,CAAC;;;;IAIF;IACA,CAAC,CAAC,EACN;;EAEE,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;;;;;;CAmBnE,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,EACpB,UAAU,EACV,MAAM,EACc,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;EAOlC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,EAAE;;;EAGtF,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,0DAA0D,CAAC,CAAC,CAAC,EAAE;;;;EAIlF,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC,EAAE;;;;;8BAKpD,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE;;;;;;;;;EAU5E,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC/B,CAAC,CAAC;;;;IAIF;IACA,CAAC,CAAC,EACN;;EAEE,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;;;;;;;;;CAsBnE,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CAC5C,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAE1D,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,KAAK,CAAC,CACrD,CACF,CAAA;AANU,QAAA,QAAQ,YAMlB"}
+{"version":3,"file":"app.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/app.tpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAG/C,MAAM,QAAQ,GAAG,CAAC,EAChB,UAAU,EACV,MAAM,EACc,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;EAMlC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,EAAE;;EAEtF,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,0DAA0D,CAAC,CAAC,CAAC,EAAE;;;;EAIlF,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC,EAAE;;;;;8BAKpD,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;EAY5E,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC/B,CAAC,CAAC;;;;IAIF;IACA,CAAC,CAAC,EACN;;EAEE,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;;;;;;CAmBnE,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,EACpB,UAAU,EACV,MAAM,EACc,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;EAOlC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,EAAE;;;EAGtF,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,0DAA0D,CAAC,CAAC,CAAC,EAAE;;;;EAIlF,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC,EAAE;;;;;8BAKpD,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE;;;;;;;;;EAU5E,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC/B,CAAC,CAAC;;;;IAIF;IACA,CAAC,CAAC,EACN;;EAEE,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;;;;;;;;;CAsBnE,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CAC5C,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAEjE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CACvB,YAAY,CACV,QAAQ,EACR,MAAM,CAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CACrD,CACF,CAAA"}

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

@@ -1,6 +1,6 @@
-import { generator, toFile } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AppGeneratorContext } from '../index'
+import { toFile } from '@featherscloud/pinion'
+import { renderSource } from '../../commons.js'
+import { AppGeneratorContext } from '../index.js'
 
 const tsKoaApp = ({
   transports,
@@ -133,7 +133,7 @@ const template = (ctx: AppGeneratorContext) =>
   ctx.framework === 'express' ? tsExpressApp(ctx) : tsKoaApp(ctx)
 
 export const generate = (ctx: AppGeneratorContext) =>
-  generator(ctx).then(
+  Promise.resolve(ctx).then(
     renderSource(
       template,
       toFile<AppGeneratorContext>(({ lib }) => lib, 'app')

package/lib/app/templates/channels.tpl.d.ts

@@ -1,2 +1,2 @@
-import { AppGeneratorContext } from '../index';
+import { AppGeneratorContext } from '../index.js';
 export declare const generate: (ctx: AppGeneratorContext) => Promise<AppGeneratorContext>;

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("../../commons");
+import { toFile, when } from '@featherscloud/pinion';
+import { renderSource } from '../../commons.js';
 const template = ({ language }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/channels.html
 import type { RealTimeConnection, Params } from '@feathersjs/feathers'
 import type { AuthenticationResult } from '@feathersjs/authentication'
@@ -40,6 +37,5 @@ export const channels = (app: Application) => {
   })
 }
 `;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)(({ transports }) => transports.includes('websockets'), (0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib }) => lib, 'channels'))));
-exports.generate = generate;
+export const generate = (ctx) => Promise.resolve(ctx).then(when(({ transports }) => transports.includes('websockets'), renderSource(template, toFile(({ lib }) => lib, 'channels'))));
 //# sourceMappingURL=channels.tpl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"channels.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/channels.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAChB,QAAQ,EACY,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;;kFAQ8C,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BzF,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,EACrD,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,CAAC,CAC1D,CACF,CACF,CAAA;AATU,QAAA,QAAQ,YASlB"}
+{"version":3,"file":"channels.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/channels.tpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAG/C,MAAM,QAAQ,GAAG,CAAC,EAChB,QAAQ,EACY,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;;kFAQ8C,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BzF,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CACvB,IAAI,CACF,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,EACrD,YAAY,CACV,QAAQ,EACR,MAAM,CAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,CAAC,CAC1D,CACF,CACF,CAAA"}

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

@@ -1,6 +1,6 @@
-import { generator, toFile, when } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AppGeneratorContext } from '../index'
+import { toFile, when } from '@featherscloud/pinion'
+import { renderSource } from '../../commons.js'
+import { AppGeneratorContext } from '../index.js'
 
 const template = ({
   language
@@ -43,7 +43,7 @@ export const channels = (app: Application) => {
 `
 
 export const generate = (ctx: AppGeneratorContext) =>
-  generator(ctx).then(
+  Promise.resolve(ctx).then(
     when<AppGeneratorContext>(
       ({ transports }) => transports.includes('websockets'),
       renderSource(

package/lib/app/templates/client.test.tpl.d.ts

@@ -1,2 +1,2 @@
-import { AppGeneratorContext } from '../index';
+import { AppGeneratorContext } from '../index.js';
 export declare const generate: (ctx: AppGeneratorContext) => Promise<AppGeneratorContext>;

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("../../commons");
+import { toFile, when } from '@featherscloud/pinion';
+import { renderSource } from '../../commons.js';
 const template = ({ lib }) => /* ts */ `import assert from 'assert'
 import axios from 'axios'
 import type { Server } from 'http'
@@ -22,6 +19,5 @@ describe('client tests', () => {
   })
 })
 `;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)((ctx) => ctx.client, (0, commons_1.renderSource)(template, (0, pinion_1.toFile)('test', 'client.test'))));
-exports.generate = generate;
+export const generate = (ctx) => Promise.resolve(ctx).then(when((ctx) => ctx.client, renderSource(template, toFile('test', 'client.test'))));
 //# sourceMappingURL=client.test.tpl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"client.test.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/client.test.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAE,GAAG,EAAuB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;0BAGlC,GAAG;mCACM,GAAG;;;;;;;;;;;;;;CAcrC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EAAsB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,IAAA,sBAAY,EAAC,QAAQ,EAAE,IAAA,eAAM,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CACtG,CAAA;AAHU,QAAA,QAAQ,YAGlB"}
+{"version":3,"file":"client.test.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/client.test.tpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAG/C,MAAM,QAAQ,GAAG,CAAC,EAAE,GAAG,EAAuB,EAAE,EAAE,CAAC,QAAQ,CAAC;;;0BAGlC,GAAG;mCACM,GAAG;;;;;;;;;;;;;;CAcrC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CACvB,IAAI,CAAsB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CACtG,CAAA"}

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

@@ -1,6 +1,6 @@
-import { generator, toFile, when } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AppGeneratorContext } from '../index'
+import { toFile, when } from '@featherscloud/pinion'
+import { renderSource } from '../../commons.js'
+import { AppGeneratorContext } from '../index.js'
 
 const template = ({ lib }: AppGeneratorContext) => /* ts */ `import assert from 'assert'
 import axios from 'axios'
@@ -23,6 +23,6 @@ describe('client tests', () => {
 `
 
 export const generate = (ctx: AppGeneratorContext) =>
-  generator(ctx).then(
+  Promise.resolve(ctx).then(
     when<AppGeneratorContext>((ctx) => ctx.client, renderSource(template, toFile('test', 'client.test')))
   )

package/lib/app/templates/client.tpl.d.ts

@@ -1,2 +1,2 @@
-import { AppGeneratorContext } from '../index';
+import { AppGeneratorContext } from '../index.js';
 export declare const generate: (ctx: AppGeneratorContext) => Promise<AppGeneratorContext>;

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("../../commons");
+import { toFile, when } from '@featherscloud/pinion';
+import { renderSource } from '../../commons.js';
 const template = ({ name, language }) => /* ts */ `// For more information about this file see https://dove.feathersjs.com/guides/cli/client.html
 import { feathers } from '@feathersjs/feathers'
 import type { TransportConnection, Application } from '@feathersjs/feathers'
@@ -38,6 +35,5 @@ export const createClient = <Configuration = any> (
   return client
 }
 `;
-const generate = async (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)((ctx) => ctx.client, (0, commons_1.renderSource)(template, (0, pinion_1.toFile)(({ lib }) => lib, 'client'))));
-exports.generate = generate;
+export const generate = async (ctx) => Promise.resolve(ctx).then(when((ctx) => ctx.client, renderSource(template, toFile(({ lib }) => lib, 'client'))));
 //# sourceMappingURL=client.tpl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"client.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/client.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAChB,IAAI,EACJ,QAAQ,EACY,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;eAerB,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,mBAAmB,IAAI;;;;;;;;;;;;;;;;;;;CAmBrE,CAAA;AAEM,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAwB,EAAE,EAAE,CACzD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EACnB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CACxD,CACF,CACF,CAAA;AATU,QAAA,QAAQ,YASlB"}
+{"version":3,"file":"client.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/client.tpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAG/C,MAAM,QAAQ,GAAG,CAAC,EAChB,IAAI,EACJ,QAAQ,EACY,EAAE,EAAE,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;eAerB,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,mBAAmB,IAAI;;;;;;;;;;;;;;;;;;;CAmBrE,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAwB,EAAE,EAAE,CACzD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CACvB,IAAI,CACF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EACnB,YAAY,CACV,QAAQ,EACR,MAAM,CAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CACxD,CACF,CACF,CAAA"}

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

@@ -1,6 +1,6 @@
-import { generator, toFile, when } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AppGeneratorContext } from '../index'
+import { toFile, when } from '@featherscloud/pinion'
+import { renderSource } from '../../commons.js'
+import { AppGeneratorContext } from '../index.js'
 
 const template = ({
   name,
@@ -42,7 +42,7 @@ export const createClient = <Configuration = any> (
 `
 
 export const generate = async (ctx: AppGeneratorContext) =>
-  generator(ctx).then(
+  Promise.resolve(ctx).then(
     when<AppGeneratorContext>(
       (ctx) => ctx.client,
       renderSource(

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

@@ -1,2 +1,2 @@
-import { AppGeneratorContext } from '../index';
+import { AppGeneratorContext } from '../index.js';
 export declare const generate: (ctx: AppGeneratorContext) => Promise<AppGeneratorContext>;

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("../../commons");
+import { toFile, when, writeJSON } from '@featherscloud/pinion';
+import { renderSource } from '../../commons.js';
 const defaultConfig = ({}) => ({
     host: 'localhost',
     port: 3030,
@@ -66,10 +63,9 @@ export type ApplicationConfiguration = Static<typeof configurationSchema>
 
 export const configurationValidator = getValidator(configurationSchema, dataValidator)
 `;
-const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, pinion_1.writeJSON)(defaultConfig, (0, pinion_1.toFile)('config', 'default.json')))
-    .then((0, pinion_1.writeJSON)(testConfig, (0, pinion_1.toFile)('config', 'test.json')))
-    .then((0, pinion_1.writeJSON)(customEnvironment, (0, pinion_1.toFile)('config', 'custom-environment-variables.json')))
-    .then((0, pinion_1.when)((ctx) => ctx.schema !== false, (0, commons_1.renderSource)(async (ctx) => ctx.schema === 'typebox' ? configurationTypeboxTemplate(ctx) : configurationJsonTemplate(ctx), (0, pinion_1.toFile)(({ lib }) => lib, 'configuration'))));
-exports.generate = generate;
+export const generate = (ctx) => Promise.resolve(ctx)
+    .then(writeJSON(defaultConfig, toFile('config', 'default.json')))
+    .then(writeJSON(testConfig, toFile('config', 'test.json')))
+    .then(writeJSON(customEnvironment, toFile('config', 'custom-environment-variables.json')))
+    .then(when((ctx) => ctx.schema !== false, renderSource(async (ctx) => ctx.schema === 'typebox' ? configurationTypeboxTemplate(ctx) : configurationJsonTemplate(ctx), toFile(({ lib }) => lib, 'configuration'))));
 //# sourceMappingURL=configuration.tpl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"configuration.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/configuration.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAuE;AACvE,2CAA4C;AAG5C,MAAM,aAAa,GAAG,CAAC,EAAuB,EAAE,EAAE,CAAC,CAAC;IAClD,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,CAAC,uBAAuB,CAAC;IAClC,QAAQ,EAAE;QACR,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,EAAE;KACR;CACF,CAAC,CAAA;AAEF,MAAM,iBAAiB,GAAG;IACxB,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,QAAQ;KACnB;IACD,IAAI,EAAE,UAAU;IAChB,cAAc,EAAE;QACd,MAAM,EAAE,iBAAiB;KAC1B;CACF,CAAA;AAED,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,IAAI;CACX,CAAA;AAED,MAAM,yBAAyB,GAC7B,CAAC,EAAuB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;CAqB9B,CAAA;AAED,MAAM,4BAA4B,GAChC,CAAC,EAAuB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;CAiB9B,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CAAC,IAAA,kBAAS,EAAC,aAAa,EAAE,IAAA,eAAM,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;KAChE,IAAI,CAAC,IAAA,kBAAS,EAAC,UAAU,EAAE,IAAA,eAAM,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;KAC1D,IAAI,CAAC,IAAA,kBAAS,EAAC,iBAAiB,EAAE,IAAA,eAAM,EAAC,QAAQ,EAAE,mCAAmC,CAAC,CAAC,CAAC;KACzF,IAAI,CACH,IAAA,aAAI,EACF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,EAC7B,IAAA,sBAAY,EACV,KAAK,EAAE,GAAG,EAAE,EAAE,CACZ,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAC/F,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,eAAe,CAAC,CAC/D,CACF,CACF,CAAA;AAdQ,QAAA,QAAQ,YAchB"}
+{"version":3,"file":"configuration.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/configuration.tpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAG/C,MAAM,aAAa,GAAG,CAAC,EAAuB,EAAE,EAAE,CAAC,CAAC;IAClD,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,CAAC,uBAAuB,CAAC;IAClC,QAAQ,EAAE;QACR,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,EAAE;KACR;CACF,CAAC,CAAA;AAEF,MAAM,iBAAiB,GAAG;IACxB,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,QAAQ;KACnB;IACD,IAAI,EAAE,UAAU;IAChB,cAAc,EAAE;QACd,MAAM,EAAE,iBAAiB;KAC1B;CACF,CAAA;AAED,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,IAAI;CACX,CAAA;AAED,MAAM,yBAAyB,GAC7B,CAAC,EAAuB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;CAqB9B,CAAA;AAED,MAAM,4BAA4B,GAChC,CAAC,EAAuB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;CAiB9B,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;KACjB,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;KAChE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;KAC1D,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,QAAQ,EAAE,mCAAmC,CAAC,CAAC,CAAC;KACzF,IAAI,CACH,IAAI,CACF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,EAC7B,YAAY,CACV,KAAK,EAAE,GAAG,EAAE,EAAE,CACZ,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAC/F,MAAM,CAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,eAAe,CAAC,CAC/D,CACF,CACF,CAAA"}

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

@@ -1,6 +1,6 @@
-import { generator, toFile, when, writeJSON } from '@feathershq/pinion'
-import { renderSource } from '../../commons'
-import { AppGeneratorContext } from '../index'
+import { toFile, when, writeJSON } from '@featherscloud/pinion'
+import { renderSource } from '../../commons.js'
+import { AppGeneratorContext } from '../index.js'
 
 const defaultConfig = ({}: AppGeneratorContext) => ({
   host: 'localhost',
@@ -73,7 +73,7 @@ export const configurationValidator = getValidator(configurationSchema, dataVali
 `
 
 export const generate = (ctx: AppGeneratorContext) =>
-  generator(ctx)
+  Promise.resolve(ctx)
     .then(writeJSON(defaultConfig, toFile('config', 'default.json')))
     .then(writeJSON(testConfig, toFile('config', 'test.json')))
     .then(writeJSON(customEnvironment, toFile('config', 'custom-environment-variables.json')))

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

@@ -1,2 +1,2 @@
-import { AppGeneratorContext } from '../index';
+import { AppGeneratorContext } from '../index.js';
 export declare const generate: (ctx: AppGeneratorContext) => Promise<AppGeneratorContext>;