@flarum/cli 2.0.0-beta.12 → 2.0.0-beta.15

package/lib/steps/monorepo/create.js

@@ -0,0 +1,186 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonorepoCreate = void 0;
+const tslib_1 = require("tslib");
+/* eslint-disable no-await-in-loop */
+const child_process_1 = require("child_process");
+const monorepo_1 = require("../../utils/monorepo");
+const cond_format_1 = require("boilersmith/utils/cond-format");
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const fs_1 = require("fs");
+const path_1 = require("path");
+const os_1 = require("os");
+const simple_git_1 = (0, tslib_1.__importDefault)(require("simple-git"));
+const mem_fs_editor_1 = require("mem-fs-editor");
+const commit_async_1 = require("boilersmith/utils/commit-async");
+const validation_1 = require("../../utils/validation");
+async function addGitPackage(cwd, path, remote, mainBranch = 'main') {
+    const tmpDir = (0, fs_1.mkdtempSync)((0, path_1.resolve)((0, os_1.tmpdir)(), `${path.replace('/', '_')}-`));
+    (0, child_process_1.execSync)(`git clone ${remote} ${tmpDir} --verbose --branch ${mainBranch} --single-branch`, { cwd });
+    (0, child_process_1.execSync)(`git filter-repo --to-subdirectory-filter ${path}`, { cwd: tmpDir });
+    if (mainBranch) {
+        await (0, simple_git_1.default)(tmpDir).checkout(mainBranch);
+    }
+    await (0, simple_git_1.default)(tmpDir).branch(['REWRITE']);
+    await (0, simple_git_1.default)(tmpDir).checkout('REWRITE');
+    // Merge from remote
+    const remoteName = path.replace('/', '_').replace('-', '_');
+    await (0, simple_git_1.default)(cwd).addRemote(remoteName, tmpDir);
+    (0, child_process_1.execSync)(`git fetch ${remoteName}`, { cwd });
+    (0, child_process_1.execSync)(`git merge ${remoteName}/REWRITE --allow-unrelated-histories --no-edit`, { cwd });
+    await (0, simple_git_1.default)(cwd).removeRemote(remoteName);
+    (0, fs_1.rmSync)(tmpDir, { recursive: true, force: true });
+}
+function makeRunCommitStep(cwd, fs, io, paths, providers) {
+    return async function (packagePaths, step, message) {
+        for (const path of packagePaths) {
+            await step.run(fs, paths.onMonorepoSub((0, path_1.resolve)(cwd, path), cwd), io, providers);
+        }
+        await (0, commit_async_1.commitAsync)(fs);
+        await commitAll(cwd, message);
+    };
+}
+async function getMonorepoConf(io, monorepoConfPath) {
+    var _a;
+    if (monorepoConfPath) {
+        return JSON.parse((0, fs_1.readFileSync)(monorepoConfPath, 'utf8'));
+    }
+    const packages = { extensions: [], composer: [], npm: [] };
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const confirm = await io.getParam({
+            name: 'confirm',
+            type: 'confirm',
+            initial: true,
+            message: 'Add another package to monorepo?',
+        }, true);
+        if (!confirm)
+            break;
+        const packageType = (await io.getParam({
+            name: 'packageType',
+            message: 'Package Type',
+            type: 'select',
+            choices: [
+                { title: 'Flarum Extension', value: 'extensions' },
+                { title: 'Composer PHP Package', value: 'composer' },
+                { title: 'NPM JS/TS Package', value: 'npm' },
+                { title: 'Flarum Core', value: 'core' },
+            ],
+            validate: (value) => value !== 'core' || !packages.core || 'A core package has already been specified.',
+        }, true));
+        const packageName = await io.getParam({
+            name: 'name',
+            message: 'Package Name (used to generate subdirectory path)',
+            type: 'text',
+            validate: validation_1.Validator.fileName,
+        }, true);
+        const gitRemote = await io.getParam({
+            name: 'remote',
+            message: 'Git remote (e.g. git@github.com:flarum/core.git)',
+            type: 'text',
+            validate: validation_1.Validator.gitRepo,
+        }, true);
+        const packageInfo = {
+            name: packageName,
+            gitRemote,
+        };
+        if (packageType === 'core') {
+            packages.core = packageInfo;
+        }
+        else {
+            const typePackages = (_a = packages[packageType]) !== null && _a !== void 0 ? _a : [];
+            typePackages.push(packageInfo);
+            packages[packageType] = typePackages;
+        }
+    }
+    return { packages };
+}
+async function commitAll(cwd, message) {
+    await (0, simple_git_1.default)(cwd).add('.');
+    await (0, simple_git_1.default)(cwd).commit(message);
+}
+class MonorepoCreate {
+    constructor(scaffolder, monorepoConfPath) {
+        this.type = 'Create a monorepo of Flarum extensions';
+        this.composable = false;
+        this.exposes = [];
+        this.scaffolder = scaffolder;
+        this.monorepoConfPath = monorepoConfPath;
+    }
+    async run(fs, paths, io, providers) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        const target = (_a = paths.requestedDir()) !== null && _a !== void 0 ? _a : paths.package('flarum_monorepo');
+        const confirmTarget = await io.getParam({
+            name: 'confirmTarget',
+            message: `Create monorepo in directory: "${(0, cond_format_1.condFormat)(io.supportsAnsiColor, chalk_1.default.dim, target)}" (will be overwritten)?`,
+            type: 'confirm',
+            initial: true,
+        });
+        if (!confirmTarget) {
+            io.error('Target not confirmed', true);
+            return fs;
+        }
+        const conf = await getMonorepoConf(io, this.monorepoConfPath ? paths.cwd(this.monorepoConfPath) : undefined);
+        const runCommitStep = makeRunCommitStep(target, fs, io, paths, providers);
+        (0, fs_1.rmSync)(target, { recursive: true, force: true });
+        (0, fs_1.mkdirSync)(target);
+        await (0, simple_git_1.default)(target).init();
+        for (const lib of (_b = conf.packages.npm) !== null && _b !== void 0 ? _b : []) {
+            await addGitPackage(target, (0, monorepo_1.npmPath)(lib.name), lib.gitRemote, lib.mainBranch);
+        }
+        for (const lib of (_c = conf.packages.composer) !== null && _c !== void 0 ? _c : []) {
+            await addGitPackage(target, (0, monorepo_1.composerPath)(lib.name), lib.gitRemote, lib.mainBranch);
+        }
+        for (const ext of (_d = conf.packages.extensions) !== null && _d !== void 0 ? _d : []) {
+            await addGitPackage(target, (0, monorepo_1.extensionPath)(ext.name), ext.gitRemote, ext.mainBranch);
+        }
+        const corePkg = conf.packages.core;
+        if (corePkg) {
+            await addGitPackage(target, (0, monorepo_1.corePath)(corePkg.name), corePkg.gitRemote, corePkg.mainBranch);
+        }
+        const npmPaths = (_f = (_e = conf.packages.npm) === null || _e === void 0 ? void 0 : _e.map((lib) => (0, monorepo_1.npmPath)(lib.name))) !== null && _f !== void 0 ? _f : [];
+        const composerPaths = (_h = (_g = conf.packages.composer) === null || _g === void 0 ? void 0 : _g.map((lib) => (0, monorepo_1.composerPath)(lib.name))) !== null && _h !== void 0 ? _h : [];
+        const flarumPaths = (_k = (_j = conf.packages.extensions) === null || _j === void 0 ? void 0 : _j.map((ext) => (0, monorepo_1.extensionPath)(ext.name))) !== null && _k !== void 0 ? _k : [];
+        if (corePkg) {
+            flarumPaths.push((0, monorepo_1.corePath)(corePkg.name));
+        }
+        flarumPaths.forEach((path) => {
+            (0, fs_1.rmSync)((0, path_1.resolve)(target, path, '.github'), { force: true, recursive: true });
+        });
+        [...npmPaths, ...composerPaths, ...flarumPaths].forEach((path) => {
+            (0, fs_1.rmSync)((0, path_1.resolve)(target, path, '.styleci.yml'), { force: true });
+        });
+        await commitAll(target, [
+            'chore: remove centralizable repo config',
+            '- Remove .github conf folder from Flarum packages',
+            '- Remove styleci config from all packages',
+        ]);
+        (0, mem_fs_editor_1.create)(fs).writeJSON((0, path_1.resolve)(target, 'flarum-monorepo.json'), conf);
+        await (0, commit_async_1.commitAsync)(fs);
+        await commitAll(target, 'chore: add monorepo config file');
+        [...composerPaths, ...flarumPaths].forEach((path) => {
+            const cwd = (0, path_1.resolve)(target, path);
+            const relRepoPath = path.includes('/') ? '../../*/*' : './../*/*';
+            (0, child_process_1.execSync)(`composer config repositories.0 path "${relRepoPath}"`, { cwd });
+            (0, child_process_1.execSync)('composer config minimum-stability dev', { cwd });
+            (0, child_process_1.execSync)('composer config prefer-stable true', { cwd });
+            const composerJsonPath = (0, path_1.resolve)(cwd, 'composer.json');
+            const composerJson = (0, fs_1.readFileSync)(composerJsonPath);
+            (0, fs_1.writeFileSync)(composerJsonPath, composerJson.toString().replace('"dev-master": "1.x-dev"', '"dev-main": "1.x-dev"'));
+        });
+        [...composerPaths, ...flarumPaths].forEach((path) => {
+            const cwd = (0, path_1.resolve)(target, path);
+            (0, child_process_1.execSync)('composer install --dry-run --no-interaction --no-ansi --no-progress --no-scripts --no-autoloader', { cwd });
+        });
+        await commitAll(target, 'chore: set up composer path repos');
+        (0, mem_fs_editor_1.create)(fs).writeJSON((0, path_1.resolve)(target, 'flarum-monorepo.json'), conf);
+        await (0, commit_async_1.commitAsync)(fs);
+        await commitAll(target, 'chore: add monorepo config file');
+        await runCommitStep(flarumPaths, this.scaffolder.genAuditStep(false), 'chore: flarum-cli audit infra --fix');
+        return fs;
+    }
+    getExposed() {
+        return {};
+    }
+}
+exports.MonorepoCreate = MonorepoCreate;

package/lib/steps/monorepo/split.d.ts

@@ -0,0 +1,12 @@
+import { IO } from 'boilersmith/io';
+import { Paths } from 'boilersmith/paths';
+import { Step } from 'boilersmith/step-manager';
+import { Store } from 'mem-fs';
+import { FlarumProviders } from '../../providers';
+export declare class MonorepoSplit implements Step<FlarumProviders> {
+    type: string;
+    composable: boolean;
+    exposes: never[];
+    run(fs: Store, paths: Paths, io: IO, _providers: FlarumProviders): Promise<Store>;
+    getExposed(): Record<string, unknown>;
+}

package/lib/steps/monorepo/split.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonorepoSplit = void 0;
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const simple_git_1 = (0, tslib_1.__importDefault)(require("simple-git"));
+const monorepo_1 = require("../../utils/monorepo");
+async function addRemote(cwd, name, remote) {
+    try {
+        await (0, simple_git_1.default)(cwd).addRemote(name, remote);
+    }
+    catch (_a) {
+        // ignore, remote already exists.
+    }
+}
+async function splitAndPush(cwd, splitExecPath, splitPath, remoteName, remoteBranch) {
+    const sha1 = (0, child_process_1.execSync)(`${splitExecPath} --prefix=${splitPath}`, { cwd, stdio: ['pipe', 'pipe', 'ignore'] })
+        .toString()
+        .trim();
+    (0, child_process_1.execSync)(`git push ${remoteName} "${sha1}:refs/heads/${remoteBranch || 'main'}"`, { cwd });
+}
+async function removeRemote(cwd, name) {
+    await (0, simple_git_1.default)(cwd).removeRemote(name);
+}
+class MonorepoSplit {
+    constructor() {
+        this.type = 'Split monorepo changes to the respective cloned repos.';
+        this.composable = false;
+        this.exposes = [];
+    }
+    async run(fs, paths, io, _providers) {
+        var _a, _b, _c, _d;
+        const platform = process.platform;
+        if (platform !== 'linux' && platform !== 'darwin') {
+            io.error(`Your platform, "${platform}", is not supported. Split can only be run on linux and mac`, true);
+            return fs;
+        }
+        const splitExec = (0, path_1.resolve)(__dirname, `../../../bin/splitsh-lite-${platform}`);
+        const target = (_a = paths.requestedDir()) !== null && _a !== void 0 ? _a : paths.package();
+        await (0, simple_git_1.default)(target).pull();
+        const conf = (0, monorepo_1.getMonorepoConf)(fs, paths);
+        const corePkg = conf.packages.core;
+        // Add Remotes
+        for (const lib of (_b = conf.packages.npm) !== null && _b !== void 0 ? _b : []) {
+            await addRemote(target, lib.name, lib.gitRemote);
+            await splitAndPush(target, splitExec, (0, monorepo_1.npmPath)(lib.name), lib.name, lib.mainBranch).finally(() => {
+                return removeRemote(target, lib.name);
+            });
+        }
+        for (const lib of (_c = conf.packages.composer) !== null && _c !== void 0 ? _c : []) {
+            await addRemote(target, lib.name, lib.gitRemote);
+            await splitAndPush(target, splitExec, (0, monorepo_1.composerPath)(lib.name), lib.name, lib.mainBranch).finally(() => {
+                return removeRemote(target, lib.name);
+            });
+        }
+        for (const ext of (_d = conf.packages.extensions) !== null && _d !== void 0 ? _d : []) {
+            await addRemote(target, ext.name, ext.gitRemote);
+            await splitAndPush(target, splitExec, (0, monorepo_1.extensionPath)(ext.name), ext.name, ext.mainBranch).finally(() => {
+                return removeRemote(target, ext.name);
+            });
+        }
+        if (corePkg) {
+            await addRemote(target, corePkg.name, corePkg.gitRemote);
+            await splitAndPush(target, splitExec, (0, monorepo_1.corePath)(corePkg.name), corePkg.name, corePkg.mainBranch).finally(() => {
+                return removeRemote(target, corePkg.name);
+            });
+        }
+        return fs;
+    }
+    getExposed() {
+        throw new Error('Method not implemented.');
+    }
+}
+exports.MonorepoSplit = MonorepoSplit;

package/lib/steps/stubs/backend/api-controller.d.ts

@@ -17,7 +17,7 @@ export declare class GenerateApiControllerStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
             choices?: undefined;
             optional?: undefined;

package/lib/steps/stubs/backend/api-controller.js

@@ -24,6 +24,7 @@ class GenerateApiControllerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'classType',
@@ -43,6 +44,7 @@ class GenerateApiControllerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'serializerClassName',
                     type: 'text',
+                    message: 'Serializer class name',
                 },
                 {
                     name: 'handlerCommandClass',
@@ -54,6 +56,7 @@ class GenerateApiControllerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'handlerCommandClassName',
                     type: 'text',
+                    message: 'Handler command class name',
                 },
             ],
         };

package/lib/steps/stubs/backend/api-serializer.d.ts

@@ -19,7 +19,7 @@ export declare class GenerateApiSerializerStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/api-serializer.js

@@ -26,6 +26,7 @@ class GenerateApiSerializerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'modelClass',
@@ -36,10 +37,12 @@ class GenerateApiSerializerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'modelClassName',
                     type: 'text',
+                    message: 'Model class name',
                 },
                 {
                     name: 'modelType',
                     type: 'text',
+                    message: 'Model type',
                 },
             ],
         };

package/lib/steps/stubs/backend/command.d.ts

@@ -12,11 +12,6 @@ export declare class GenerateCommandStub extends BasePhpStubStep {
             type: string;
             message: string;
             validate: typeof Validator.className;
-        } | {
-            name: string;
-            type: string;
-            message?: undefined;
-            validate?: undefined;
         } | {
             name: string;
             type: string;

package/lib/steps/stubs/backend/command.js

@@ -24,6 +24,7 @@ class GenerateCommandStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'commandName',

package/lib/steps/stubs/backend/event-listener.d.ts

@@ -15,7 +15,7 @@ export declare class GenerateEventListenerStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/event-listener.js

@@ -24,6 +24,7 @@ class GenerateEventListenerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'eventClass',
@@ -34,6 +35,7 @@ class GenerateEventListenerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'eventClassName',
                     type: 'text',
+                    message: 'Event Class Name',
                 },
             ],
         };

package/lib/steps/stubs/backend/handler-command.d.ts

@@ -16,7 +16,7 @@ export declare class GenerateHandlerCommandStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
             choices?: undefined;
         } | {

package/lib/steps/stubs/backend/handler-command.js

@@ -24,6 +24,7 @@ class GenerateHandlerCommandStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'classType',

package/lib/steps/stubs/backend/handler.d.ts

@@ -17,7 +17,7 @@ export declare class GenerateHandlerStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
             optional?: undefined;
         } | {

package/lib/steps/stubs/backend/handler.js

@@ -26,6 +26,7 @@ class GenerateHandlerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'handlerCommandClass',
@@ -36,6 +37,7 @@ class GenerateHandlerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'handlerCommandClassName',
                     type: 'text',
+                    message: 'Handler command class name',
                 },
                 {
                     name: 'repositoryClass',
@@ -46,6 +48,7 @@ class GenerateHandlerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'repositoryClassName',
                     type: 'text',
+                    message: 'Repository Class Name',
                 },
                 {
                     name: 'validatorClass',
@@ -56,6 +59,7 @@ class GenerateHandlerStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'validatorClassName',
                     type: 'text',
+                    message: 'Validator Class Name',
                 },
             ],
         };

package/lib/steps/stubs/backend/integration-test.d.ts

@@ -16,7 +16,7 @@ export declare class GenerateIntegrationTestStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/integration-test.js

@@ -23,10 +23,12 @@ class GenerateIntegrationTestStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'extensionId',
                     type: 'text',
+                    message: 'Extension Id',
                 },
             ],
         };

package/lib/steps/stubs/backend/job.d.ts

@@ -13,7 +13,7 @@ export declare class GenerateJobStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/job.js

@@ -20,6 +20,7 @@ class GenerateJobStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/backend/migration.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateMigrationStub = void 0;
-const node_fs_1 = require("node:fs");
+const fs_1 = require("fs");
 const validation_1 = require("../../../utils/validation");
 const migration_1 = require("../../../utils/migration");
 const php_base_1 = require("../php-base");
@@ -36,12 +36,15 @@ class GenerateMigrationStub extends php_base_1.BasePhpStubStep {
     async getFileName(fs, paths, _paramProvider) {
         let persistedMigrations;
         try {
-            persistedMigrations = (0, node_fs_1.readdirSync)(paths.package('migrations'));
+            persistedMigrations = (0, fs_1.readdirSync)(paths.package('migrations'));
         }
         catch (_a) {
             persistedMigrations = [];
         }
-        const memMigrations = fs.all().map(f => f.path).filter(p => p.startsWith(paths.package('migrations')));
+        const memMigrations = fs
+            .all()
+            .map((f) => f.path)
+            .filter((p) => p.startsWith(paths.package('migrations')));
         return (0, migration_1.getNextMigrationName)([...persistedMigrations, ...memMigrations], this.params.name) + '.php';
     }
 }

package/lib/steps/stubs/backend/model.d.ts

@@ -19,7 +19,7 @@ export declare class GenerateModelStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
             optional?: undefined;
         } | {

package/lib/steps/stubs/backend/model.js

@@ -23,6 +23,7 @@ class GenerateModelStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'tableName',

package/lib/steps/stubs/backend/policy.d.ts

@@ -15,7 +15,7 @@ export declare class GeneratePolicyStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/policy.js

@@ -24,6 +24,7 @@ class GeneratePolicyStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'modelClass',
@@ -34,6 +35,7 @@ class GeneratePolicyStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'modelClassName',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/backend/repository.d.ts

@@ -15,7 +15,7 @@ export declare class GenerateRepositoryStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/repository.js

@@ -24,6 +24,7 @@ class GenerateRepositoryStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
                 {
                     name: 'modelClass',
@@ -34,6 +35,7 @@ class GenerateRepositoryStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'modelClassName',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/backend/service-provider.d.ts

@@ -13,7 +13,7 @@ export declare class GenerateServiceProviderStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/service-provider.js

@@ -20,6 +20,7 @@ class GenerateServiceProviderStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/backend/validator.d.ts

@@ -13,7 +13,7 @@ export declare class GenerateValidatorStub extends BasePhpStubStep {
         } | {
             name: string;
             type: string;
-            message?: undefined;
+            message: string;
             validate?: undefined;
         })[];
     };

package/lib/steps/stubs/backend/validator.js

@@ -20,6 +20,7 @@ class GenerateValidatorStub extends php_base_1.BasePhpStubStep {
                 {
                     name: 'classNamespace',
                     type: 'text',
+                    message: 'Class Namespace',
                 },
             ],
         };

package/lib/steps/stubs/flarum-base.js

@@ -4,7 +4,7 @@ exports.FlarumBaseStubStep = void 0;
 const stub_base_1 = require("boilersmith/steps/stub-base");
 class FlarumBaseStubStep extends stub_base_1.BaseStubStep {
     async precompileParams(fs, paths, io) {
-        return Object.assign(Object.assign({}, await super.precompileParams(fs, paths, io)), { extensionId: this.scaffolder.templateParamVal('extensionId', fs, paths, io) });
+        return Object.assign(Object.assign({}, (await super.precompileParams(fs, paths, io))), { extensionId: this.scaffolder.templateParamVal('extensionId', fs, paths, io) });
     }
 }
 exports.FlarumBaseStubStep = FlarumBaseStubStep;