@flarum/cli 2.0.0-beta.9 → 3.0.0

package/lib/boilersmith/step-manager.js

@@ -3,20 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AtomicStepManager = exports.StepManager = void 0;
 /* eslint-disable no-await-in-loop */
 const mem_fs_1 = require("mem-fs");
-const mem_fs_editor_1 = require("mem-fs-editor");
 const exposed_param_manager_1 = require("./exposed-param-manager");
-const formatDependencies = (strings) => strings.map(s => `"${s}"`).join(', ');
+const commit_async_1 = require("./utils/commit-async");
+const formatDependencies = (strings) => strings.map((s) => `"${s}"`).join(', ');
 class StepManager {
     constructor() {
         this.steps = [];
         this.namedSteps = new Map();
         this.exposedParams = new exposed_param_manager_1.ExposedParamManager();
+        this.silent = false;
     }
     /**
      * A step is an incremental operation that updates the filesystem.
      */
     step(step, shouldRun = {}, dependencies = [], predefinedParams = {}, mapPaths = []) {
         this.validateDependencies(step, dependencies, mapPaths);
+        if (!shouldRun.silent) {
+            shouldRun.silent = this.silent;
+            shouldRun.confirmationMessage = this.silent ? undefined : shouldRun.confirmationMessage;
+            shouldRun.optional = this.silent ? false : shouldRun.optional;
+            shouldRun.default = this.silent ? true : shouldRun.default;
+        }
         this.steps = [...this.steps, { step, shouldRun, dependencies, predefinedParams, mapPaths }];
         return this;
     }
@@ -25,6 +32,12 @@ class StepManager {
             throw new Error(`Named steps must have unique names. A step with name "${name}" already exists.`);
         }
         this.validateDependencies(step, dependencies, mapPaths);
+        if (!shouldRun.silent) {
+            shouldRun.silent = this.silent;
+            shouldRun.confirmationMessage = this.silent ? undefined : shouldRun.confirmationMessage;
+            shouldRun.optional = this.silent ? false : shouldRun.optional;
+            shouldRun.default = this.silent ? true : shouldRun.default;
+        }
         const newStep = { name, step, shouldRun, dependencies, predefinedParams, mapPaths };
         this.steps = [...this.steps, newStep];
         this.namedSteps.set(name, newStep);
@@ -36,8 +49,14 @@ class StepManager {
         this.steps = [...this.steps, atomicCollection];
         return this;
     }
+    silentGroup(callback) {
+        this.silent = true;
+        callback(this);
+        this.silent = false;
+        return this;
+    }
     validateDependencies(step, dependencies, mapPaths) {
-        const missingDependencySteps = dependencies.map(dep => dep.sourceStep).filter(stepName => !this.namedSteps.has(stepName));
+        const missingDependencySteps = dependencies.map((dep) => dep.sourceStep).filter((stepName) => !this.namedSteps.has(stepName));
         if (missingDependencySteps.length > 0) {
             throw new Error(`Step of type "${step.type}" depends on nonexistent named steps ${formatDependencies(missingDependencySteps)}`);
         }
@@ -52,7 +71,7 @@ class StepManager {
             if (mapPaths.length === 0 && (sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.mapPaths.length)) {
                 throw new Error(`Non path-mapped step of type "${step.type}" may not depend on path-mapped step "${sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.name}".`);
             }
-            const missingMapPathsDeps = mapPaths.filter(p => sourceStep && !sourceStep.mapPaths.includes(p));
+            const missingMapPathsDeps = mapPaths.filter((p) => sourceStep && !sourceStep.mapPaths.includes(p));
             if (sourceStep && (missingMapPathsDeps === null || missingMapPathsDeps === void 0 ? void 0 : missingMapPathsDeps.length) && sourceStep.mapPaths.length > 0) {
                 throw new Error(`Step of type "${step.type}" (A) depends on named step: "${sourceStep.name}" (B), but is mapped across some paths that (B) is not: "${missingMapPathsDeps.join(', ')}"`);
             }
@@ -61,8 +80,8 @@ class StepManager {
             throw new Error(`Step of type "${step.type}" depends on nonexistent exposed params ${formatDependencies(missingDependencyParams)} from named steps ${formatDependencies(missingDependencyParamSteps)}`);
         }
     }
-    async run(paths, io, providers, dry = false) {
-        if (dry && this.steps.some(s => !(s instanceof AtomicStepManager) && !s.step.composable)) {
+    async run(paths, io, providers, dry = false, args = {}) {
+        if (dry && this.steps.some((s) => !(s instanceof AtomicStepManager) && !s.step.composable)) {
             throw new Error('Cannot dry run, as this step manager has non-composable steps.');
         }
         const stepNames = [];
@@ -70,18 +89,18 @@ class StepManager {
             const shouldRun = await this.stepShouldRun(step, io, packagePath);
             if (!shouldRun)
                 return;
-            const fs = await this.runStep(step, paths, io, providers, packagePath);
+            const fs = await this.runStep(step, paths, io, providers, packagePath, undefined, args);
             if (!dry) {
-                await this.commit(fs);
+                await (0, commit_async_1.commitAsync)(fs);
             }
             stepNames.push(packagePath ? `${step.step.type} (${packagePath})` : step.step.type);
         };
         try {
             for (const storedStep of this.steps) {
                 if (storedStep instanceof AtomicStepManager) {
-                    const res = await storedStep.run(paths, io, providers);
+                    const res = await storedStep.run(paths, io, providers, false, args);
                     if (!res.succeeded) {
-                        throw new Error(res.error);
+                        throw new Error(JSON.stringify(res));
                     }
                     stepNames.push(...res.stepsRan);
                 }
@@ -102,6 +121,7 @@ class StepManager {
                 errorTrace: error instanceof Error ? error.stack : undefined,
                 stepsRan: stepNames,
                 messages: io.getOutput(),
+                e: error,
             };
         }
         return {
@@ -116,7 +136,7 @@ class StepManager {
         for (const dep of storedStep.dependencies) {
             const sourceStep = this.namedSteps.get(dep.sourceStep);
             const sourcePackagePath = (sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.mapPaths.length) ? packagePath : undefined;
-            if (!this.exposedParams.stepRan(dep.sourceStep, sourcePackagePath))
+            if (!this.exposedParams.stepRan(dep.sourceStep, sourcePackagePath) && !dep.promptWhenMissing)
                 allDependenciesRan = false;
             if (dep.exposedName !== '__succeeded' && dep.dontRunIfFalsy && !this.exposedParams.get(dep.sourceStep, dep.exposedName, sourcePackagePath)) {
                 noRequiredNonFalsyDependenciesAreFalsy = false;
@@ -134,20 +154,26 @@ class StepManager {
         });
         return promptConfirm;
     }
-    async runStep(storedStep, paths, io, providers, packagePath, fs = (0, mem_fs_1.create)()) {
+    async runStep(storedStep, paths, io, providers, packagePath, fs = (0, mem_fs_1.create)(), args = {}) {
+        const cached = {};
+        Object.entries(args).forEach(([key, value]) => {
+            if (value !== undefined) {
+                cached[key] = value;
+            }
+        });
         const initial = storedStep.dependencies.reduce((initial, dep) => {
             const sourceStep = this.namedSteps.get(dep.sourceStep);
             let depValue;
             depValue =
-                dep.exposedName === '__succeeded' ?
-                    this.exposedParams.stepRan(dep.sourceStep, packagePath) :
-                    this.exposedParams.get(dep.sourceStep, dep.exposedName, (sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.mapPaths.length) ? packagePath : undefined);
+                dep.exposedName === '__succeeded'
+                    ? this.exposedParams.stepRan(dep.sourceStep, packagePath)
+                    : this.exposedParams.get(dep.sourceStep, dep.exposedName, (sourceStep === null || sourceStep === void 0 ? void 0 : sourceStep.mapPaths.length) ? packagePath : undefined);
             if (dep.modifier) {
                 depValue = dep.modifier(depValue);
             }
             initial[dep.consumedName || dep.exposedName] = depValue;
             return initial;
-        }, {});
+        }, cached);
         const cloned = io.newInstance(Object.assign(Object.assign({}, initial), storedStep.predefinedParams), io.getOutput());
         const stepPaths = packagePath ? paths.onMonorepoSub(packagePath) : paths;
         const newFs = await storedStep.step.run(fs, stepPaths, cloned, providers);
@@ -156,16 +182,6 @@ class StepManager {
         }
         return newFs;
     }
-    async commit(fs) {
-        return new Promise((resolve, _reject) => {
-            (0, mem_fs_editor_1.create)(fs).commit(err => {
-                if (err) {
-                    throw new Error(err);
-                }
-                resolve(true);
-            });
-        });
-    }
 }
 exports.StepManager = StepManager;
 class AtomicStepManager extends StepManager {
@@ -190,13 +206,13 @@ class AtomicStepManager extends StepManager {
     atomicGroup(_callback) {
         throw new Error("Atomic groups can't be nested.");
     }
-    async run(paths, io, providers, dry = false) {
+    async run(paths, io, providers, dry = false, args = {}) {
         let fs = (0, mem_fs_1.create)();
         const checkAndRun = async (step, packagePath) => {
             const shouldRun = await this.stepShouldRun(step, io, packagePath);
             if (!shouldRun)
                 return;
-            fs = await this.runStep(step, paths, io, providers, packagePath, fs);
+            fs = await this.runStep(step, paths, io, providers, packagePath, fs, args);
             stepNames.push(packagePath ? `${step.step.type} (${packagePath})` : step.step.type);
         };
         const stepNames = [];
@@ -222,7 +238,7 @@ class AtomicStepManager extends StepManager {
             };
         }
         if (!dry) {
-            await this.commit(fs);
+            await (0, commit_async_1.commitAsync)(fs);
         }
         return {
             succeeded: true,

package/lib/boilersmith/steps/stub-base.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseStubStep = void 0;
 const tslib_1 = require("tslib");
-const pick_deep_1 = (0, tslib_1.__importDefault)(require("pick-deep"));
+const pick_deep_1 = tslib_1.__importDefault(require("pick-deep"));
 const mem_fs_editor_1 = require("mem-fs-editor");
 const clone_and_fill_1 = require("../utils/clone-and-fill");
-const node_path_1 = require("node:path");
+const path_1 = require("path");
 class BaseStubStep {
     constructor(stubDir, scaffolder) {
         this.composable = true;
@@ -27,7 +27,7 @@ class BaseStubStep {
         const newFileName = await this.getFileName(fs, paths, io);
         const newFilePath = paths.package(this.schema.root || this.defaultRoot, this.subdir, newFileName);
         const stub = (0, clone_and_fill_1.cloneAndFill)(this.schema.sourceFile, this.params);
-        fsEditor.copyTpl((0, node_path_1.resolve)(this.stubDir, stub), newFilePath, this.params);
+        fsEditor.copyTpl((0, path_1.resolve)(this.stubDir, stub), newFilePath, this.params);
         return fs;
     }
     getExposed(_paths, _paramProvider) {
@@ -38,7 +38,7 @@ class BaseStubStep {
     }
     async compileParams(fs, paths, io) {
         const params = await this.precompileParams(fs, paths, io);
-        const paramDefs = this.schema.params.filter(param => !this.implicitParams.includes(param.name) && !Object.keys(params).includes(param.name));
+        const paramDefs = this.schema.params.filter((param) => !this.implicitParams.includes(param.name) && !Object.keys(params).includes(param.name));
         for (const paramDef of paramDefs) {
             // eslint-disable-next-line no-await-in-loop
             params[paramDef.name] = await io.getParam(paramDef);

package/lib/boilersmith/utils/clone-and-fill.js

@@ -11,7 +11,7 @@ function cloneAndFill(obj, params) {
         if (typeof obj === 'string')
             return fill(obj, params);
         if (Array.isArray(obj))
-            return obj.map(v => recursiveCopyAndFill(v, params));
+            return obj.map((v) => recursiveCopyAndFill(v, params));
         // eslint-disable-next-line no-new-object
         if (obj !== new Object(obj))
             return obj;

package/lib/boilersmith/utils/commit-async.d.ts

@@ -0,0 +1,2 @@
+import { Store } from 'mem-fs';
+export declare function commitAsync(fs: Store): Promise<boolean>;

package/lib/boilersmith/utils/commit-async.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commitAsync = void 0;
+const mem_fs_editor_1 = require("mem-fs-editor");
+async function commitAsync(fs) {
+    return new Promise((resolve, _reject) => {
+        (0, mem_fs_editor_1.create)(fs).commit((err) => {
+            if (err) {
+                throw new Error(err);
+            }
+            resolve(true);
+        });
+    });
+}
+exports.commitAsync = commitAsync;

package/lib/boilersmith/utils/json-leaf-paths.d.ts

@@ -1,7 +1,7 @@
-declare type JSONSchema = string | number | boolean | JSONSchemaObject | JSONSchemaArray | null;
+type JSONSchema = string | number | boolean | JSONSchemaObject | JSONSchemaArray | null;
 interface JSONSchemaObject {
     [key: string]: JSONSchema;
 }
-declare type JSONSchemaArray = Array<JSONSchema>;
+type JSONSchemaArray = Array<JSONSchema>;
 export declare function jsonLeafPaths(obj: JSONSchema): string[];
 export {};

package/lib/boilersmith/utils/read-tpl.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readTpl = void 0;
 const ejs_1 = require("ejs");
-const node_fs_1 = require("node:fs");
+const fs_1 = require("fs");
 function readTpl(path, data, options) {
-    const template = (0, node_fs_1.readFileSync)(path, 'utf8');
+    const template = (0, fs_1.readFileSync)(path, 'utf8');
     return (0, ejs_1.render)(template, data, Object.assign(Object.assign({ filename: path }, options), { async: false }));
 }
 exports.readTpl = readTpl;

package/lib/commands/audit/infra.d.ts

@@ -7,10 +7,7 @@ export default class AuditInfra extends BaseCommand {
         fix: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         monorepo: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
-    static args: {
-        name: string;
-        description: string;
-    }[];
-    protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+    static args: import("@oclif/core/lib/interfaces").Arg<any>[];
+    protected steps(stepManager: StepManager<FlarumProviders>, extRoot: string): StepManager<FlarumProviders>;
     protected additionalPreRunChecks(extRoot: string): Promise<void>;
 }

package/lib/commands/audit/infra.js

@@ -1,19 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const base_command_1 = (0, tslib_1.__importDefault)(require("../../base-command"));
+const base_command_1 = tslib_1.__importDefault(require("../../base-command"));
 const gen_ext_scaffolder_1 = require("../../steps/gen-ext-scaffolder");
 const core_1 = require("@oclif/core");
+const yarn_1 = require("../../steps/misc/yarn");
+const composer_1 = require("../../steps/misc/composer");
+const npm_1 = require("../../steps/misc/npm");
 class AuditInfra extends base_command_1.default {
-    steps(stepManager) {
+    steps(stepManager, extRoot) {
         this.dry = !this.flags.fix;
-        const mapPaths = this.flags.monorepo ? this.monorepoPaths({
-            includeCore: true,
-            includeExtensions: true,
-            includePhpPackages: false,
-            includeJSPackages: false,
-        }) : [];
-        stepManager.step((0, gen_ext_scaffolder_1.genExtScaffolder)().genAuditStep(!this.flags.fix), {}, [], {}, mapPaths);
+        const mapPaths = this.flags.monorepo
+            ? this.monorepoPaths({
+                includeCore: true,
+                includeExtensions: true,
+                includePhpPackages: false,
+                includeJSPackages: false,
+            })
+            : [];
+        stepManager.namedStep('audit', (0, gen_ext_scaffolder_1.genExtScaffolder)().genAuditStep(!this.flags.fix), {}, [], {}, mapPaths);
+        if (!this.flags.monorepo && !this.dry) {
+            const packageManager = this.jsPackageManager(extRoot);
+            stepManager.step(packageManager === 'npm' ? new npm_1.NpmInstall() : new yarn_1.YarnInstall(), { optional: true, confirmationMessage: `Run \`${packageManager !== null && packageManager !== void 0 ? packageManager : 'yarn'}\`? (recommended)`, default: true }, [
+                {
+                    sourceStep: 'audit',
+                    exposedName: '__succeeded',
+                    dontRunIfFalsy: true,
+                },
+            ]);
+            stepManager.step(new composer_1.ComposerInstall(), { optional: true, confirmationMessage: 'Run `composer update`? (recommended)', default: true }, [
+                {
+                    sourceStep: 'audit',
+                    exposedName: '__succeeded',
+                    dontRunIfFalsy: true,
+                },
+            ]);
+        }
         return stepManager;
     }
     async additionalPreRunChecks(extRoot) {

package/lib/commands/infra.d.ts

@@ -6,15 +6,7 @@ export default class Infra extends BaseCommand {
     static flags: {
         monorepo: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
-    static args: ({
-        name: string;
-        description: string;
-    } | {
-        name: string;
-        description: string;
-        required: boolean;
-        options: ("core" | "icon" | "js" | "jsCommon" | "css" | "locale" | "gitConf" | "githubActions" | "prettier" | "typescript" | "bundlewatch" | "backendTesting" | "editorConfig" | "styleci")[];
-    })[];
-    protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+    static args: import("@oclif/core/lib/interfaces").Arg<any>[];
+    protected steps(stepManager: StepManager<FlarumProviders>, extRoot: string): StepManager<FlarumProviders>;
     protected additionalPreRunChecks(extRoot: string): Promise<void>;
 }

package/lib/commands/infra.js

@@ -2,25 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const composer_1 = require("../steps/misc/composer");
-const base_command_1 = (0, tslib_1.__importDefault)(require("../base-command"));
+const base_command_1 = tslib_1.__importDefault(require("../base-command"));
 const gen_ext_scaffolder_1 = require("../steps/gen-ext-scaffolder");
+const npm_1 = require("../steps/misc/npm");
 const yarn_1 = require("../steps/misc/yarn");
 const core_1 = require("@oclif/core");
 class Infra extends base_command_1.default {
-    steps(stepManager) {
+    steps(stepManager, extRoot) {
         const module = this.args.module;
-        const mapPaths = this.flags.monorepo ? this.monorepoPaths({
-            includeCore: true,
-            includeExtensions: true,
-            includePhpPackages: false,
-            includeJSPackages: false,
-        }) : [];
-        stepManager
-            .namedStep('infra', (0, gen_ext_scaffolder_1.genExtScaffolder)().genInfraStep(this.args.module), {}, [], {}, mapPaths);
+        const mapPaths = this.flags.monorepo
+            ? this.monorepoPaths({
+                includeCore: true,
+                includeExtensions: true,
+                includePhpPackages: false,
+                includeJSPackages: false,
+            })
+            : [];
+        stepManager.namedStep('infra', (0, gen_ext_scaffolder_1.genExtScaffolder)().genInfraStep(this.args.module), {}, [], {}, mapPaths);
         const JS_MODULES = ['js', 'prettier', 'typescript'];
-        const PHP_MODULES = ['backendTesting'];
+        const PHP_MODULES = ['backendTesting', 'phpstan'];
+        const packageManager = this.jsPackageManager(extRoot);
         if (!this.flags.monorepo && JS_MODULES.includes(module)) {
-            stepManager.step(new yarn_1.YarnInstall(), { optional: true, confirmationMessage: 'Run `yarn`? (recommended)', default: true }, [
+            stepManager.step(packageManager === 'npm' ? new npm_1.NpmInstall() : new yarn_1.YarnInstall(), { optional: true, confirmationMessage: `Run \`${packageManager !== null && packageManager !== void 0 ? packageManager : 'yarn'}\`? (recommended)`, default: true }, [
                 {
                     sourceStep: 'infra',
                     exposedName: '__succeeded',
@@ -47,9 +50,12 @@ class Infra extends base_command_1.default {
 exports.default = Infra;
 Infra.description = 'Add/Update infrastructure to the latest scaffolding for some module in an extension. For example, you can use this to add/update TypeScript, backend testing, GitHub Actions, and other features.';
 Infra.flags = Object.assign({ monorepo: core_1.Flags.boolean({ char: 'm', default: false }) }, base_command_1.default.flags);
-Infra.args = [{
+Infra.args = [
+    {
         name: 'module',
         description: 'The name of the module to enable/update.',
         required: true,
         options: [...gen_ext_scaffolder_1.EXTENSION_MODULES],
-    }, ...base_command_1.default.args];
+    },
+    ...base_command_1.default.args,
+];

package/lib/commands/init.d.ts

@@ -6,12 +6,9 @@ export default class Init extends BaseCommand {
     static flags: {
         [x: string]: import("@oclif/core/lib/interfaces").CompletableFlag<any>;
     };
-    static args: {
-        name: string;
-        description: string;
-    }[];
+    static args: import("@oclif/core/lib/interfaces").Arg<any>[];
     protected requireExistingExtension: boolean;
-    protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
+    protected steps(stepManager: StepManager<FlarumProviders>, extRoot: string): StepManager<FlarumProviders>;
     protected welcomeMessage(): string;
     protected goodbyeMessage(): string;
     protected additionalPreRunChecks(extRoot: string): Promise<void>;

package/lib/commands/init.js

@@ -3,21 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const composer_1 = require("../steps/misc/composer");
 const yarn_1 = require("../steps/misc/yarn");
-const base_command_1 = (0, tslib_1.__importDefault)(require("../base-command"));
-const yosay_1 = (0, tslib_1.__importDefault)(require("yosay"));
+const base_command_1 = tslib_1.__importDefault(require("../base-command"));
+const yosay_1 = tslib_1.__importDefault(require("yosay"));
 const gen_ext_scaffolder_1 = require("../steps/gen-ext-scaffolder");
 const git_1 = require("../steps/misc/git");
+const npm_1 = require("../steps/misc/npm");
 class Init extends base_command_1.default {
     constructor() {
         super(...arguments);
         this.requireExistingExtension = false;
     }
-    steps(stepManager) {
+    steps(stepManager, extRoot) {
+        const packageManager = this.jsPackageManager(extRoot);
         return stepManager
             .namedStep('gitInit', new git_1.GitInit(), { optional: true, confirmationMessage: 'Run `git init`? (recommended)', default: true })
             .namedStep('skeleton', (0, gen_ext_scaffolder_1.genExtScaffolder)().genInitStep())
             .step(new composer_1.ComposerInstall(), { optional: true, confirmationMessage: 'Run `composer install`? (recommended)', default: true })
-            .step(new yarn_1.YarnInstall(), { optional: true, confirmationMessage: 'Run `yarn install`? (recommended)', default: true }, [
+            .step(packageManager === 'npm' ? new npm_1.NpmInstall() : new yarn_1.YarnInstall(), { optional: true, confirmationMessage: `Run \`${packageManager !== null && packageManager !== void 0 ? packageManager : 'yarn'}\`? (recommended)`, default: true }, [
             {
                 sourceStep: 'skeleton',
                 exposedName: 'modules.js',
@@ -29,7 +31,7 @@ class Init extends base_command_1.default {
         return (0, yosay_1.default)('Welcome to a Flarum extension generator\n\n- Flarum Team');
     }
     goodbyeMessage() {
-        return 'Extension generation complete! Visit https://docs.flarum.org/extend to learn more about Flarum extension development.';
+        return 'Extension generation complete! Visit https://docs.flarum.org/2.x/extend to learn more about Flarum extension development.';
     }
     async additionalPreRunChecks(extRoot) {
         if (await this.confirmOverrideFiles(extRoot, '**/*', 'Directory not empty. Overwrite?')) {

package/lib/commands/make/backend/{api-serializer.d.ts → api-resource.d.ts}

@@ -1,14 +1,11 @@
 import { StepManager } from 'boilersmith/step-manager';
 import { FlarumProviders } from '../../../providers';
 import BaseCommand from '../../../base-command';
-export default class ApiSerializer extends BaseCommand {
+export default class ApiResource extends BaseCommand {
     static description: string;
     static flags: {
         [x: string]: import("@oclif/core/lib/interfaces").CompletableFlag<any>;
     };
-    static args: {
-        name: string;
-        description: string;
-    }[];
+    static args: import("@oclif/core/lib/interfaces").Arg<any>[];
     protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
 }

package/lib/commands/make/backend/api-resource.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
+const base_command_1 = tslib_1.__importDefault(require("../../../base-command"));
+const api_resource_1 = require("../../../steps/stubs/backend/api-resource");
+const api_resource_2 = require("../../../steps/extenders/api-resource");
+class ApiResource extends base_command_1.default {
+    steps(stepManager) {
+        return stepManager.atomicGroup((stepManager) => {
+            stepManager
+                .namedStep('api-resource', new api_resource_1.GenerateApiResourceStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
+                .step(new api_resource_2.GenerateApiResourceExtender(), { optional: true, confirmationMessage: 'Generate corresponding Extender?', default: true }, [
+                {
+                    sourceStep: 'api-resource',
+                    exposedName: 'class',
+                    consumedName: 'resourceClass',
+                },
+            ]);
+        });
+    }
+}
+exports.default = ApiResource;
+ApiResource.description = 'Generate an API resource class';
+ApiResource.flags = Object.assign({}, base_command_1.default.flags);
+ApiResource.args = [...base_command_1.default.args];

package/lib/commands/make/backend/command.d.ts

@@ -6,9 +6,6 @@ export default class Command extends BaseCommand {
     static flags: {
         [x: string]: import("@oclif/core/lib/interfaces").CompletableFlag<any>;
     };
-    static args: {
-        name: string;
-        description: string;
-    }[];
+    static args: import("@oclif/core/lib/interfaces").Arg<any>[];
     protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
 }

package/lib/commands/make/backend/command.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const base_command_1 = (0, tslib_1.__importDefault)(require("../../../base-command"));
+const base_command_1 = tslib_1.__importDefault(require("../../../base-command"));
 const command_1 = require("../../../steps/stubs/backend/command");
 const console_command_1 = require("../../../steps/extenders/console-command");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class Command extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
+        return stepManager.atomicGroup((stepManager) => {
             stepManager
                 .namedStep('command', new command_1.GenerateCommandStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
                 .step(new console_command_1.GenerateConsoleCommandExtender(), { optional: true, confirmationMessage: 'Generate corresponding extender?', default: true }, [
@@ -24,4 +23,4 @@ class Command extends base_command_1.default {
 exports.default = Command;
 Command.description = 'Generate a console command class';
 Command.flags = Object.assign({}, base_command_1.default.flags);
-Command.args = [...base_command_1.default.args];
+Command.args = [base_command_1.default.classNameArg, ...base_command_1.default.args];

package/lib/commands/make/backend/{api-controller.d.ts → controller.d.ts}

@@ -1,14 +1,11 @@
 import { StepManager } from 'boilersmith/step-manager';
 import BaseCommand from '../../../base-command';
 import { FlarumProviders } from '../../../providers';
-export default class ApiController extends BaseCommand {
+export default class Controller extends BaseCommand {
     static description: string;
     static flags: {
         [x: string]: import("@oclif/core/lib/interfaces").CompletableFlag<any>;
     };
-    static args: {
-        name: string;
-        description: string;
-    }[];
+    static args: import("@oclif/core/lib/interfaces").Arg<any>[];
     protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
 }

package/lib/commands/make/backend/controller.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const base_command_1 = tslib_1.__importDefault(require("../../../base-command"));
+const controller_1 = require("../../../steps/stubs/backend/controller");
+const route_1 = require("../../../steps/extenders/route");
+const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
+class Controller extends base_command_1.default {
+    steps(stepManager) {
+        return stepManager.atomicGroup((stepManager) => {
+            stepManager
+                .namedStep('controller', new controller_1.GenerateControllerStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
+                .step(new route_1.GenerateRoutesExtender(), { optional: true, confirmationMessage: 'Generate corresponding extender?', default: !this.args.className }, [
+                {
+                    sourceStep: 'controller',
+                    exposedName: 'class',
+                    consumedName: 'routeHandler',
+                },
+                {
+                    sourceStep: 'controller',
+                    exposedName: 'frontend',
+                    consumedName: 'frontend',
+                },
+            ]);
+        });
+    }
+}
+exports.default = Controller;
+Controller.description = 'Generate a controller class';
+Controller.flags = Object.assign({}, base_command_1.default.flags);
+Controller.args = [base_command_1.default.classNameArg, ...base_command_1.default.args];

package/lib/commands/make/backend/event-listener.d.ts

@@ -6,9 +6,6 @@ export default class EventListener extends BaseCommand {
     static flags: {
         [x: string]: import("@oclif/core/lib/interfaces").CompletableFlag<any>;
     };
-    static args: {
-        name: string;
-        description: string;
-    }[];
+    static args: import("@oclif/core/lib/interfaces").Arg<any>[];
     protected steps(stepManager: StepManager<FlarumProviders>): StepManager<FlarumProviders>;
 }

package/lib/commands/make/backend/event-listener.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const base_command_1 = (0, tslib_1.__importDefault)(require("../../../base-command"));
+const base_command_1 = tslib_1.__importDefault(require("../../../base-command"));
 const event_listener_1 = require("../../../steps/stubs/backend/event-listener");
 const event_1 = require("../../../steps/extenders/event");
 const gen_ext_scaffolder_1 = require("../../../steps/gen-ext-scaffolder");
 class EventListener extends base_command_1.default {
     steps(stepManager) {
-        return stepManager
-            .atomicGroup(stepManager => {
+        return stepManager.atomicGroup((stepManager) => {
             stepManager
                 .namedStep('listener', new event_listener_1.GenerateEventListenerStub(this.STUB_PATH, (0, gen_ext_scaffolder_1.genExtScaffolder)()))
                 .step(new event_1.GenerateEventListenerExtender(), { optional: true, confirmationMessage: 'Generate corresponding extender?', default: true }, [