npm - @maka/maka-cli - Versions diffs - 5.11.0 → 5.13.0 - Mend

@maka/maka-cli 5.11.0 → 5.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (115) hide show

package/bundle/typescript/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.11.0",
+  "version": "5.13.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",
@@ -42,6 +42,7 @@
     "@aws-sdk/client-route-53-domains": "^3.1111.0",
     "@dotenvx/dotenvx": "^2.21.0",
     "@inquirer/prompts": "^8.5.2",
+    "@maka/meteor-sdk": "^0.1.2",
     "@maka/tar": "^6.2.2",
     "blessed": "^0.1.81",
     "change-case": "^5.4.4",

package/bundle/typescript/src/commands/aws/ci.sub.cmd.js CHANGED Viewed

@@ -168,6 +168,7 @@ Command.create({
                 if (result) {
                     Log.success('Instance created!  NOTE: You are now being billed for this EC2.');
                     Log.bright('Run "maka aws:set-host" to configure your ssh.json file');
+                    Log.bright('Then run "maka deploy:github --env <env>" to scaffold your GitHub Actions deploy pipeline');
                 }
             }
             else {

package/bundle/typescript/src/commands/aws/ci.sub.cmd.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ci.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/aws/ci.sub.cmd.ts"],"names":[],"mappings":"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~~gBACxE~~,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,wCAAwC,CAAC,CAAC;gBACrD,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,sBAAsB,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC;gBACzF,IAAI,gBAAgB,EAAE,CAAC;oBACrB,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACvC,IAAI,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;wBAC9B,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;oBAC/B,CAAC;gBACH,CAAC;gBAED,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,6BAA6B,KAAK,IAAI,EAAE,IAAI,CAAC,CAAC;gBACxF,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IAAC,OAAM,CAAC,EAAE,CAAC;QACV,IAAI,CAAC,EAAE,CAAC;YACN,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,EAAE,UAAU,CAAC,CAAC"}
1	+ {"version":3,"file":"ci.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/aws/ci.sub.cmd.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/build/build.js CHANGED Viewed

@@ -1,10 +1,7 @@
 import path from 'path';
 import fs from 'fs';
-import semver from 'semver';
-import { execSync } from 'child_process';
 import { Actions } from '../../tools/actions/actions.class.js';
 import { Command } from '../../command.js';
-import { Log } from '../../tools/log/log.class.js';
 const BuildCommand = Command.create({
     name: 'build',
     usage: 'maka build',
@@ -38,38 +35,12 @@ const BuildCommand = Command.create({
         'maka build --force --directory'
     ]
 }, async function (args, opts) {
-    const { mpi, fsi, pkg } = this;
+    const { mpi, fsi } = this;
     try {
-        if (mpi.isMeteorInstalled()) {
-            Log.notice('Meteor is installed.');
-        }
-        else {
-            Log.warn('Meteor is not installed or cannot be found in your path. Installing...');
-            execSync('maka install --force', { stdio: 'inherit' });
-        }
-        // Check for meteor package requirements
-        await pkg.checkMeteorPackage('autoupdate', { shouldInstall: true });
         // If force was passed
         const useForce = opts.force;
-        //Check version
-        if (!useForce) {
-            try {
-                const globalMeteorVersion = await mpi.getGlobalMeteorVersion();
-                const projectMeteorVersion = fsi.getProjectMeteorVersion();
-                const isOutdated = semver.gt(globalMeteorVersion, projectMeteorVersion);
-                if (isOutdated) {
-                    const shouldUpdate = await Actions.confirm(`This project's meteor version (${projectMeteorVersion}) is behind your installed meteor version (${globalMeteorVersion}). Update?`);
-                    if (shouldUpdate) {
-                        await mpi.invokeMeteorCommand('update', ['--release', globalMeteorVersion]);
-                    }
-                }
-            }
-            catch (error) {
-                Log.error(`Failed to check or update Meteor version: ${error}`);
-            }
-        }
-        const processArgs = [fsi.pathFromProject({ pathParts: ['build'] })].concat(process.argv.slice(3));
         const projectDirectory = fsi.findProjectDirectory();
+        const appDir = fsi.findAppDirectory();
         // Check if output already exists (tarball or directory)
         const bundle = opts.directory
             ? path.join(projectDirectory, 'build', 'bundle')
@@ -81,13 +52,18 @@ const BuildCommand = Command.create({
                 throw new Error('Aborted.');
             }
         }
-        // Remove --force from args as it's not a Meteor option
-        processArgs.forEach((arg, idx) => {
-            if (arg === '--force') {
-                processArgs.splice(idx, 2);
-            }
+        // Read the app's own .meteor/release raw, rather than reusing
+        // fsi.getProjectMeteorVersion()'s value -- that method pads to 3
+        // semver components (e.g. "3.5" -> "3.5.0") for version-comparison
+        // purposes, which isn't necessarily a real, resolvable release name
+        // (Meteor releases aren't always published with a patch component).
+        const release = fs.readFileSync(path.join(appDir, '.meteor', 'release'), 'utf8').trim();
+        await mpi.buildViaSdk({
+            appDir,
+            outputPath: bundle,
+            directory: !!opts.directory,
+            release,
         });
-        await this.mpi.invokeMeteorCommand('build', processArgs);
     }
     catch (e) {
         console.error(e);

package/bundle/typescript/src/commands/build/build.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../src/commands/build/build.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;~~AACpB~~,OAAO,~~MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,~~EAAE,~~QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,~~OAAO,EAAE,~~OAAO,EAAE,~~MAAM,sCAAsC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;~~AAC3C~~,~~OAAO,EAAE,GAAG,EAAE,~~MAAM,~~8BAA8B,CAAC;AAOnD,MAAM,~~YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAClC,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,YAAY;IACnB,SAAS,EAAE;QACT;YACE,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,qDAAqD;SACnE;QACD;YACE,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,8EAA8E;SAC5F;KACF;IACD,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,SAAS,EAAE,+CAA+C;IAC1D,mBAAmB,EAAE,IAAI;IACzB,WAAW,EAAE;;;;;;;;GAQZ;IACD,QAAQ,EAAE;QACR,YAAY;QACZ,wBAAwB;QACxB,gCAAgC;KACjC;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAgB;IACjD,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,~~EAAE,GAAG,~~IAAI,CAAC;~~IAC/B~~,IAAI,CAAC;QACH,~~IAAI,GAAG,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC5B,GAAG,CAAC,MAAM,CAAC,~~sBAAsB~~,CAAC,CAAC~~;QACrC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAC;YACnF,QAAQ,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,wCAAwC;QACxC,MAAM,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;QAEnE,sBAAsB;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAE5B,~~eAAe;QACf,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,~~MAAM,~~mBAAmB~~,GAAG,~~MAAM,~~GAAG,CAAC,~~sBAAsB,EAAE,CAAC;gBAC/D,MAAM,~~oBAAoB,~~GAAG,GAAG,CAAC,uBAAuB,~~EAAE,CAAC;~~gBAE3D~~,MAAM,~~UAAU,GAAG,~~MAAM,~~CAAC,EAAE,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;gBACxE,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,YAAY,~~GAAG,~~MAAM,OAAO,CAAC,OAAO,CAAC,kCAAkC,oBAAoB,8CAA8C,mBAAmB,YAAY,CAAC,CAAC;oBAChL,IAAI,YAAY,EAAE,CAAC;wBACjB,MAAM,~~GAAG,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAC;oBAC9E,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,GAAG,CAAC,KAAK,CAAC,6CAA6C,KAAK,EAAE,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;QAED,MAAM,WAAW,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAClG,MAAM,gBAAgB,~~GAAG,GAAG,CAAC,oBAAoB,~~EAAE,CAAC;~~QAEpD~~,wDAAwD;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS;YAC3B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,QAAQ,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QAEvD,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC;YAClE,MAAM,QAAQ,GAAG,QAAQ,IAAI,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,UAAU,iCAAiC,CAAC,CAAC;YAClH,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,~~uDAAuD~~;~~QACvD~~,~~WAAW~~,~~CAAC~~,~~OAAO~~,~~CAAC~~,~~CAAC~~,GAAG,EAAE,~~GAAG~~,~~EAAE~~,~~EAAE;YAC/B~~,IAAI,~~GAAG~~,~~KAAK~~,SAAS,EAAE,CAAC~~;gBACtB~~,~~WAAW~~,~~CAAC,~~MAAM,CAAC,~~GAAG~~,EAAE,CAAC,CAAC,CAAC;~~YAC7B~~,~~CAAC~~;~~QACH~~,~~CAAC~~,~~CAAC~~,~~CAAC~~;~~QAEH~~,~~MAAM~~,~~IAAI~~,CAAC,~~GAAG,~~CAAC,~~mBAAmB~~,CAAC,OAAO,~~EAAE,WAAW,~~CAAC,CAAC;~~IAC3D~~,CAAC;IAAC,OAAM,CAAC,EAAE,CAAC;QAEV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,eAAe,YAAY,CAAC"}
1	+ {"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../src/commands/build/build.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAO3C,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAClC,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,YAAY;IACnB,SAAS,EAAE;QACT;YACE,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,qDAAqD;SACnE;QACD;YACE,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,8EAA8E;SAC5F;KACF;IACD,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,SAAS,EAAE,+CAA+C;IAC1D,mBAAmB,EAAE,IAAI;IACzB,WAAW,EAAE;;;;;;;;GAQZ;IACD,QAAQ,EAAE;QACR,YAAY;QACZ,wBAAwB;QACxB,gCAAgC;KACjC;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAgB;IACjD,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,IAAI,CAAC;QACH,sBAAsB;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAE5B,MAAM,gBAAgB,GAAG,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAEtC,wDAAwD;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS;YAC3B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,QAAQ,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QAEvD,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC;YAClE,MAAM,QAAQ,GAAG,QAAQ,IAAI,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,UAAU,iCAAiC,CAAC,CAAC;YAClH,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,8DAA8D;QAC9D,iEAAiE;QACjE,mEAAmE;QACnE,oEAAoE;QACpE,oEAAoE;QACpE,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAExF,MAAM,GAAG,CAAC,WAAW,CAAC;YACpB,MAAM;YACN,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS;YAC3B,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAAC,OAAM,CAAC,EAAE,CAAC;QAEV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,eAAe,YAAY,CAAC"}

package/bundle/typescript/src/commands/create.js CHANGED Viewed

@@ -11,6 +11,7 @@ import MakaGen from '../generators/maka.gen.js';
 import { Command } from '../command.js';
 import { Log } from '../tools/log/log.class.js';
 import { Actions } from '../tools/actions/actions.class.js';
+import { hardExit } from '../tools/mpi/sdk-runtime.js';
 import { HtmlEngines, CssEngines, JsEngines, ApiEngines, TestEngines, ClientEngines, GraphqlEngines, SsrEngines, ThemeEngines } from '../tools/fsi/fsi.interfaces.js';
 Command.create({
     name: 'create',
@@ -83,11 +84,6 @@ Command.create({
             boolFlag: true,
             description: 'Include i18n translation support'
         },
-        {
-            name: 'skipMeteorInstall',
-            boolFlag: true,
-            description: 'Skip automatic Meteor installation if not found'
-        },
         {
             name: 'skipLint',
             boolFlag: true,
@@ -141,7 +137,6 @@ Command.create({
         // Parse boolean options
         const skipConfirm = parseBool(opts.skipConfirm);
         const skipLint = parseBool(opts.skipLint);
-        const skipMeteorInstall = parseBool(opts.skipMeteorInstall);
         const withHooks = parseBool(opts.withHooks);
         const withTranslations = parseBool(opts.withTranslations);
         const force = parseBool(opts.force);
@@ -155,24 +150,6 @@ Command.create({
         }
         // Ensure it is lowercase
         name = kebabCase(name);
-        // Continue with Maka project creation
-        if (this.mpi.isMeteorInstalled()) {
-            Log.notice('Meteor is installed.');
-            await MakaCmd.processAndRunCommand('version:use', [], { latest: true });
-        }
-        else {
-            if (skipMeteorInstall) {
-                throw new Error('Meteor is not installed or cannot be found in your path. Install with `maka install meteor`');
-            }
-            const shouldInstall = await Actions.confirm(`Meteor is not installed, or cannot be found. Would you like to install Meteor now?`, true);
-            if (shouldInstall) {
-                await MakaCmd.processAndRunCommand('install', ['meteor'], { force: true });
-                Log.notice(`Continuing with creating your application...`);
-            }
-            else {
-                throw new Error('Meteor is not installed or cannot be found in your path. Install with `maka install meteor`');
-            }
-        }
         // App name already retrieved and kebab-cased above
         if (!force && this.fsi.isDirectory(name)) {
             throw new Error('Project already exists.');
@@ -455,9 +432,12 @@ Command.create({
         // this is strange, need to do a special handling for the .gitignore file
         fs.renameSync(projectDirectory + path.sep + 'gitignore', projectDirectory + path.sep + '.gitignore');
         spinHandle.start('Preparing Meteor Project');
-        // create an empty meteor project in the app folder
-        const releaseVersion = this.mpi.getMeteorReleaseVersion();
-        await this.scaffold.createEmptyMeteorProject('app', { cwd: projectDirectory, release: releaseVersion, ...opts });
+        // create an empty meteor project in the app folder. release comes
+        // from opts.release (the --release flag) if given, else
+        // createEmptyMeteorProject() falls back to this fork's own shipped
+        // release -- not a real global meteor install's active version,
+        // which has no bearing on what the SDK-backed scaffold can resolve.
+        await this.scaffold.createEmptyMeteorProject('app', { cwd: projectDirectory, ...opts });
         spinHandle.success();
         // copy the meteor app folder template to our new app
         await this.scaffold.copyTemplateDirectory({
@@ -635,10 +615,15 @@ Run \`maka --help\` or \`maka <command> --help\` for the full command reference.
             Log.notice('  Open an administrative PowerShell terminal, then run: ');
             Log.notice(`    Add-MpPreference -ExclusionPath "${path.join(projectDirectory)}"`);
         }
+        // createEmptyMeteorProject()/installMeteorPackage() go through the
+        // SDK now, which opens file-watch resources that keep the process
+        // alive -- see mpi.class.ts's buildViaSdk()/runViaSdk() for the same
+        // issue. hardExit() (process.reallyExit()) sidesteps the hang.
+        hardExit(0);
     }
     catch (e) {
         Log.error(e);
-        process.exit(1);
+        hardExit(1);
     }
 });
 //# sourceMappingURL=create.js.map

package/bundle/typescript/src/commands/create.js.map CHANGED Viewed

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

package/bundle/typescript/src/commands/deploy/_index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
 import './deploy.command.js';
 import './galaxy.sub.cmd.js';
 import './ubuntu.sub.cmd.js';
+import './github.sub.cmd.js';

package/bundle/typescript/src/commands/deploy/_index.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import './deploy.command.js';
 import './galaxy.sub.cmd.js';
 import './ubuntu.sub.cmd.js';
+import './github.sub.cmd.js';
 //# sourceMappingURL=_index.js.map

package/bundle/typescript/src/commands/deploy/_index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"_index.js","sourceRoot":"","sources":["../../../../../src/commands/deploy/_index.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAA;AAC5B,OAAO,qBAAqB,CAAA;AAC5B,OAAO,qBAAqB,CAAA"}
1	+ {"version":3,"file":"_index.js","sourceRoot":"","sources":["../../../../../src/commands/deploy/_index.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAA;AAC5B,OAAO,qBAAqB,CAAA;AAC5B,OAAO,qBAAqB,CAAA;AAC5B,OAAO,qBAAqB,CAAA"}

package/bundle/typescript/src/commands/deploy/deploy.command.js CHANGED Viewed

@@ -16,6 +16,7 @@ const DeployCommand = Command.create({
         'maka deploy:galaxy -e p --plan=professional | essentials',
         'maka deploy:galaxy -e p --delete',
         'maka deploy:ubuntu -e p --mongo --ssl=letsencrypt --domains=www.maka-cli.com --email=admin@maka-cli.com',
+        'maka deploy:github -e p --domains=www.maka-cli.com --email=admin@maka-cli.com',
     ]
 }, async function () {
     throw new UsageError();

package/bundle/typescript/src/commands/deploy/deploy.command.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.command.js","sourceRoot":"","sources":["../../../../../src/commands/deploy/deploy.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IACnC,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,SAAS,EAAE,EAAE;IACb,mBAAmB,EAAE,IAAI;IACzB,SAAS,EAAE,yBAAyB;IACpC,WAAW,EAAE;;oDAEqC;IAClD,QAAQ,EAAE;QACR,+BAA+B;QAC/B,sCAAsC;QACtC,0DAA0D;QAC1D,kCAAkC;QAClC,yGAAyG;~~KAC1G~~;CACF,EAAE,KAAK;IACN,MAAM,IAAI,UAAU,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}
1	+ {"version":3,"file":"deploy.command.js","sourceRoot":"","sources":["../../../../../src/commands/deploy/deploy.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IACnC,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,SAAS,EAAE,EAAE;IACb,mBAAmB,EAAE,IAAI;IACzB,SAAS,EAAE,yBAAyB;IACpC,WAAW,EAAE;;oDAEqC;IAClD,QAAQ,EAAE;QACR,+BAA+B;QAC/B,sCAAsC;QACtC,0DAA0D;QAC1D,kCAAkC;QAClC,yGAAyG;QACzG,+EAA+E;KAChF;CACF,EAAE,KAAK;IACN,MAAM,IAAI,UAAU,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}

package/bundle/typescript/src/commands/deploy/github.sub.cmd.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/bundle/typescript/src/commands/deploy/github.sub.cmd.js ADDED Viewed

@@ -0,0 +1,147 @@
+import path from 'path';
+import fs from 'fs';
+import { Command } from '../../command.js';
+import { Log } from '../../tools/log/log.class.js';
+import { Actions } from '../../tools/actions/actions.class.js';
+import DeployCommand from './deploy.command.js';
+Command.create({
+    name: 'github',
+    usage: 'maka deploy:github --env <env>',
+    aliases: ['gh'],
+    validOpts: [
+        {
+            name: 'env',
+            description: 'Target environment for deployment (required)'
+        },
+        {
+            name: 'domains',
+            description: 'Comma-separated list of domains for the Let\'s Encrypt certificate'
+        },
+        {
+            name: 'email',
+            description: 'Email address for Let\'s Encrypt certificate auto-updates'
+        },
+        {
+            name: 'branch',
+            description: 'Git branch that triggers the deploy workflow (default: main)'
+        },
+        {
+            name: 'force',
+            boolFlag: true,
+            description: 'Overwrite existing generated files without prompting'
+        }
+    ],
+    mustBeInMakaProject: true,
+    requiredOpts: ['env'],
+    shortDesc: 'Scaffold a GitHub Actions CI/CD deploy pipeline',
+    description: `
+  Scaffolds a GitHub Actions workflow (.github/workflows/deploy.yaml) plus a
+  config/<env>/deploy.sh and nginx.conf, wiring up dotenvx-encrypted secrets
+  and Let's Encrypt SSL that survives every redeploy.
+  Requires an existing config/<env>/ssh.json (see "maka aws:create-instance"
+  and "maka aws:set-host") and a config/<env>/process.env that's already been
+  encrypted with dotenvx (see "maka env:set").
+  `,
+    examples: [
+        'maka deploy:github --env production',
+        'maka d:gh -e p --domains=www.example.com --email=admin@example.com',
+    ]
+}, async function (args, opts) {
+    try {
+        const config = this.projectConfig;
+        const env = this.cfg.getEnvFromShorthand(opts.env);
+        const configPath = this.cfg.getAppConfigPath(env);
+        const useForce = opts.force || false;
+        const branch = opts.branch || 'main';
+        const NODE_VER = await this.fsi.getProjectsMeteorNodeVersion();
+        const [major, minor] = NODE_VER.split('.');
+        const FALLBACK_VERSION = `${major}.${minor}`;
+        const sshConfigPath = path.join(configPath, 'ssh.json');
+        if (!this.fsi.isFile(sshConfigPath)) {
+            Log.error(`No ssh.json found for ${env}. Run "maka aws:create-instance --env ${env}" and "maka aws:set-host --env ${env}" first.`);
+            return;
+        }
+        const sshConfig = JSON.parse(fs.readFileSync(sshConfigPath).toString());
+        // Let's Encrypt config: reuse the same env vs. prompt pattern as `deploy:ubuntu`.
+        let domainNames = opts.domains;
+        let emailUpdate = opts.email;
+        const letsencryptPath = path.join(configPath, 'letsencrypt.json');
+        if (this.fsi.isFile(letsencryptPath)) {
+            Log.notice('Using letsencrypt.json');
+            const saved = JSON.parse(fs.readFileSync(letsencryptPath).toString());
+            domainNames = domainNames || saved.domainNames;
+            emailUpdate = emailUpdate || saved.emailUpdate;
+        }
+        else {
+            domainNames = domainNames || await Actions.ask('Domains to register (comma separated): ');
+            emailUpdate = emailUpdate || await Actions.ask('Email to use for auto-updates: ');
+            fs.writeFileSync(letsencryptPath, JSON.stringify({ domainNames, emailUpdate }, null, 2));
+            this.cfg.setEnvSettings(env, 'enforceCSP', true);
+        }
+        const processEnvPath = path.join(configPath, 'process.env');
+        if (!this.fsi.isFile(processEnvPath)) {
+            Log.error(`No config/${env}/process.env found. Run "maka g:config ${env}" first.`);
+            return;
+        }
+        const processEnvContent = fs.readFileSync(processEnvPath).toString();
+        const publicKeyMatch = processEnvContent.match(/DOTENV_PUBLIC_KEY_(\w+)=/);
+        if (!publicKeyMatch) {
+            Log.error(`config/${env}/process.env isn't encrypted with dotenvx yet.`);
+            Log.notice(`Run "maka env:set --env ${env} KEY VALUE" for each of your secrets first -- this encrypts the file in place and creates the sibling .env.keys.`);
+            return;
+        }
+        const dotenvKeyName = publicKeyMatch[1];
+        const envKeysPath = path.join(configPath, '.env.keys');
+        if (!this.fsi.isFile(envKeysPath)) {
+            Log.error(`No config/${env}/.env.keys found alongside the encrypted process.env. Re-run "maka env:set --env ${env} KEY VALUE" to regenerate it.`);
+            return;
+        }
+        const context = {
+            appName: config.appName,
+            branch,
+            envName: env,
+            envUpper: env.toUpperCase(),
+            ec2Host: sshConfig.host,
+            ec2User: sshConfig.user,
+            dotenvKeyName,
+            domainNames,
+            emailUpdate,
+            nodeVersion: NODE_VER,
+            fallbackVersion: FALLBACK_VERSION,
+        };
+        await this.scaffold.template({
+            srcPath: 'config/nginx.conf.template',
+            destPath: path.join(configPath, 'nginx.conf'),
+            context,
+            config,
+            force: useForce
+        });
+        await this.scaffold.template({
+            srcPath: 'config/deploy.sh.template',
+            destPath: path.join(configPath, 'deploy.sh'),
+            context,
+            config,
+            force: useForce
+        });
+        const workflowPath = this.fsi.pathFromProject({ pathParts: ['.github', 'workflows', 'deploy.yaml'] });
+        await this.scaffold.template({
+            srcPath: 'github/workflows/deploy.yaml',
+            destPath: workflowPath,
+            context,
+            config,
+            force: useForce
+        });
+        const pemFileName = path.basename(sshConfig.pem);
+        Log.success('GitHub Actions deploy pipeline scaffolded!');
+        Log.bright(`Before pushing, add these to a GitHub Environment named "${env}" on your repo:`);
+        Log.notice(`  - Secret EC2_${context.envUpper}_PEM = contents of config/${env}/_keys/${pemFileName}`);
+        Log.notice(`  - Secret DOTENV_PRIVATE_KEY_${dotenvKeyName} = contents of config/${env}/.env.keys (the DOTENV_PRIVATE_KEY_${dotenvKeyName}=... line)`);
+        Log.warn('Never commit .env.keys or _keys/ -- both are already gitignored.');
+        Log.notice(`Once the environment and secrets are set up, push to "${branch}" to trigger the first deploy.`);
+    }
+    catch (e) {
+        Log.error(e);
+    }
+}, DeployCommand);
+//# sourceMappingURL=github.sub.cmd.js.map

package/bundle/typescript/src/commands/deploy/github.sub.cmd.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"github.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/deploy/github.sub.cmd.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/game/sideQuest/commands/advance.js CHANGED Viewed

@@ -53,7 +53,7 @@ export class AdvanceCommand extends Command {
         // Incompetent (SR5e p.81): the skill isn't weak, it's ABSENT -- no
         // amount of drilling makes it stick. ("qualities" can buy it off.)
         if (actor.hasQuality(`incompetent-${skill}`)) {
-            return `You've tried. Everyone's tried to teach you ${skill}. It does not take -- it never will. (Incompetent, SR5e p.81 -- "qualities" at home to buy it off.)`;
+            return `You've tried. Everyone's tried to teach you ${skill}. It does not take -- it never will. (Incompetent${hint(', SR5e p.81')} -- "qualities" at home to buy it off.)`;
         }
         const current = actor.skillRating(skill);
         if (current >= AdvanceCommand.MAX_RATING) {
@@ -132,7 +132,7 @@ export class AdvanceCommand extends Command {
     }
     listAdvancement() {
         const actor = this.actor;
-        const lines = [`=== TRAINING (karma: ${actor.karma}) ===`, `Skills (new rating x2):`];
+        const lines = [`=== TRAINING (karma: ${actor.karma}) ===`, `Skills${hint(' (new rating x2)')}:`];
         for (const skill of SKILL_NAMES) {
             const current = actor.skillRating(skill);
             const incompetent = actor.hasQuality(`incompetent-${skill}`);
@@ -140,7 +140,7 @@ export class AdvanceCommand extends Command {
             const cost = (current + 1) * 2;
             lines.push(`  ${skill.padEnd(12)} ${current}${incompetent ? ' (INCOMPETENT -- untrainable)' : capped ? ' (maxed)' : ` -> ${current + 1} costs ${cost} karma${actor.karma >= cost ? '' : ' (short)'}`}`);
         }
-        lines.push(`Attributes (new rating x5):`);
+        lines.push(`Attributes${hint(' (new rating x5)')}:`);
         for (const attr of AdvanceCommand.ATTRIBUTES) {
             if (attr === 'magic' || attr === 'resonance') {
                 const base = attr === 'magic' ? actor.baseMagic : actor.baseResonance;
@@ -156,8 +156,9 @@ export class AdvanceCommand extends Command {
             const cost = (current + 1) * 5;
             lines.push(`  ${attr.padEnd(12)} ${current}${capped ? ' (maxed)' : ` -> ${current + 1} costs ${cost} karma${actor.karma >= cost ? '' : ' (short)'}`}`);
         }
-        lines.push('');
-        lines.push(`"advance <name>" to train. Karma comes from finished jobs.${hint(` ("qualities" trades traits at RAW x2 rates.)`)}`);
+        const footer = hint(`"advance <name>" to train. Karma comes from finished jobs. ("qualities" trades traits at RAW x2 rates.)`);
+        if (footer)
+            lines.push('', footer);
         return lines.join('\n');
     }
 }

package/bundle/typescript/src/commands/game/sideQuest/commands/advance.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"advance.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/commands/advance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAY,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAa,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,cAAe,SAAQ,OAAO;IAC/B,MAAM,CAAC,IAAI,GAAG,SAAS,CAAC;IACxB,MAAM,CAAC,WAAW,GAAG,iJAAiJ,CAAC;IAEzK,MAAM,CAAU,UAAU,GAAG,CAAC,CAAC;IAC/B,MAAM,CAAU,UAAU,GAAG,CAAC,CAAC;IAE/B,MAAM,CAAU,UAAU,GAAG;QACnC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW;QACtD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;KACtD,CAAC;IAEX,KAAK,CAAC,OAAO,CAAC,OAAiB,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,gDAAgD,CAAC;QAC1D,CAAC;QACD,IAAI,KAAK,CAAC,eAAe,EAAE,QAAQ,KAAK,WAAW,EAAE,CAAC;YACpD,OAAO,4EAA4E,CAAC;QACtF,CAAC;QACD,IAAI,KAAK,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;YAC3B,OAAO,uEAAuE,CAAC;QACjF,CAAC;QAED,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,+CAA+C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACvI,CAAC;QAED,IAAK,cAAc,CAAC,UAAgC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACtE,OAAO,IAAI,CAAC,cAAc,CAAC,MAAkD,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAmB,CAAC,CAAC;IAC9C,CAAC;IAEO,UAAU,CAAC,KAAgB;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,mEAAmE;QACnE,mEAAmE;QACnE,IAAI,KAAK,CAAC,UAAU,CAAC,eAAe,KAAK,EAAE,CAAC,EAAE,CAAC;YAC7C,OAAO,+CAA+C,KAAK,~~qGAAqG~~,CAAC;~~QACnK~~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~~yBAAyB~~,CAAC,CAAC;~~QACtF~~,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACzC,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC;YAC7D,MAAM,MAAM,GAAG,OAAO,IAAI,cAAc,CAAC,UAAU,CAAC;YACpD,MAAM,IAAI,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,OAAO,GAAG,CAAC,UAAU,IAAI,SAAS,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC1M,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,~~6BAA6B~~,CAAC,CAAC;~~QAC1C~~,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;YAC7C,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC7C,MAAM,IAAI,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;gBACtE,IAAI,IAAI,IAAI,CAAC;oBAAE,SAAS,CAAC,sCAAsC;gBAC/D,MAAM,MAAM,GAAG,IAAI,IAAI,cAAc,CAAC,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC;gBACzE,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,UAAU,IAAI,SAAS,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBACvL,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5B,MAAM,MAAM,GAAG,OAAO,IAAI,cAAc,CAAC,UAAU,CAAC;YACpD,MAAM,IAAI,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,OAAO,GAAG,CAAC,UAAU,IAAI,SAAS,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACzJ,CAAC;QACD,~~KAAK~~,~~CAAC~~,IAAI,CAAC,~~EAAE~~,CAAC,CAAC;~~QACf~~,~~KAAK~~,~~CAAC~~,~~IAAI~~,CAAC,~~6DAA6D,~~IAAI,CAAC~~,+CAA+C~~,~~CAAC~~,EAAE,CAAC,CAAC;~~QACjI~~,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC"}
1	+ {"version":3,"file":"advance.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/commands/advance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAY,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAa,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,cAAe,SAAQ,OAAO;IAC/B,MAAM,CAAC,IAAI,GAAG,SAAS,CAAC;IACxB,MAAM,CAAC,WAAW,GAAG,iJAAiJ,CAAC;IAEzK,MAAM,CAAU,UAAU,GAAG,CAAC,CAAC;IAC/B,MAAM,CAAU,UAAU,GAAG,CAAC,CAAC;IAE/B,MAAM,CAAU,UAAU,GAAG;QACnC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW;QACtD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;KACtD,CAAC;IAEX,KAAK,CAAC,OAAO,CAAC,OAAiB,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,gDAAgD,CAAC;QAC1D,CAAC;QACD,IAAI,KAAK,CAAC,eAAe,EAAE,QAAQ,KAAK,WAAW,EAAE,CAAC;YACpD,OAAO,4EAA4E,CAAC;QACtF,CAAC;QACD,IAAI,KAAK,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;YAC3B,OAAO,uEAAuE,CAAC;QACjF,CAAC;QAED,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,+CAA+C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACvI,CAAC;QAED,IAAK,cAAc,CAAC,UAAgC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACtE,OAAO,IAAI,CAAC,cAAc,CAAC,MAAkD,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAmB,CAAC,CAAC;IAC9C,CAAC;IAEO,UAAU,CAAC,KAAgB;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,mEAAmE;QACnE,mEAAmE;QACnE,IAAI,KAAK,CAAC,UAAU,CAAC,eAAe,KAAK,EAAE,CAAC,EAAE,CAAC;YAC7C,OAAO,+CAA+C,KAAK,oDAAoD,IAAI,CAAC,aAAa,CAAC,yCAAyC,CAAC;QAC9K,CAAC;QAED,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,OAAO,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;YACzC,OAAO,QAAQ,KAAK,kBAAkB,OAAO,iEAAiE,CAAC;QACjH,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC;QACtB,IAAI,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,CAAC;YACvB,OAAO,WAAW,KAAK,OAAO,IAAI,UAAU,IAAI,sBAAsB,KAAK,CAAC,KAAK,qBAAqB,CAAC;QACzG,CAAC;QAED,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC;QACpB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,aAAa,KAAK,OAAO,IAAI,WAAW,IAAI,WAAW,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;QAC5G,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QAC1B,OAAO,aAAa,KAAK,qBAAqB,OAAO,OAAO,IAAI,MAAM,IAAI,iBAAiB,KAAK,CAAC,KAAK,SAAS,CAAC;IAClH,CAAC;IAEO,cAAc,CAAC,IAA8C;QACnE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,kEAAkE;QAClE,4DAA4D;QAC5D,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;YACtE,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;gBACd,OAAO,IAAI,KAAK,OAAO;oBACrB,CAAC,CAAC,uEAAuE;oBACzE,CAAC,CAAC,mEAAmE,CAAC;YAC1E,CAAC;YACD,oEAAoE;YACpE,MAAM,SAAS,GAAG,cAAc,CAAC,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC;YACpE,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;gBACtB,OAAO,QAAQ,IAAI,kBAAkB,IAAI,kBAAkB,SAAS,UAAU,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,wBAAwB,CAAC;YACvJ,CAAC;YACD,IAAI,KAAK,CAAC,WAAW,GAAG,IAAI,EAAE,CAAC;gBAC7B,OAAO,0CAA0C,IAAI,qDAAqD,CAAC;YAC7G,CAAC;YACD,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,CAAC;gBACvB,OAAO,WAAW,IAAI,OAAO,IAAI,GAAG,CAAC,UAAU,IAAI,sBAAsB,KAAK,CAAC,KAAK,qBAAqB,CAAC;YAC5G,CAAC;YACD,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC;YACpB,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBACrB,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC;gBACrB,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;YACjE,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC;gBACzB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;YACzE,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;YACnE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,aAAa,IAAI,YAAY,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,eAAe,SAAS,WAAW,IAAI,WAAW,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;YAC5L,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAC1B,OAAO,uBAAuB,IAAI,IAAI,IAAI,OAAO,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,SAAS,2BAA2B,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,iBAAiB,KAAK,CAAC,KAAK,SAAS,CAAC;QAC9L,CAAC;QAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,OAAO,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;YACzC,OAAO,QAAQ,IAAI,kBAAkB,OAAO,kDAAkD,CAAC;QACjG,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC;QACtB,IAAI,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,CAAC;YACvB,OAAO,WAAW,IAAI,OAAO,IAAI,UAAU,IAAI,sCAAsC,KAAK,CAAC,KAAK,qBAAqB,CAAC;QACxH,CAAC;QAED,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACnB,mEAAmE;QACnE,qDAAqD;QACrD,IAAI,IAAI,KAAK,MAAM;YAAE,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,aAAa,IAAI,OAAO,IAAI,WAAW,IAAI,WAAW,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;QAC3G,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzI,OAAO,6CAA6C,IAAI,IAAI,OAAO,OAAO,IAAI,MAAM,IAAI,iBAAiB,KAAK,CAAC,KAAK,UAAU,SAAS,EAAE,CAAC;IAC5I,CAAC;IAEO,eAAe;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,KAAK,GAAG,CAAC,wBAAwB,KAAK,CAAC,KAAK,OAAO,EAAE,SAAS,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACjG,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACzC,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC;YAC7D,MAAM,MAAM,GAAG,OAAO,IAAI,cAAc,CAAC,UAAU,CAAC;YACpD,MAAM,IAAI,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,OAAO,GAAG,CAAC,UAAU,IAAI,SAAS,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC1M,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACrD,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;YAC7C,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC7C,MAAM,IAAI,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;gBACtE,IAAI,IAAI,IAAI,CAAC;oBAAE,SAAS,CAAC,sCAAsC;gBAC/D,MAAM,MAAM,GAAG,IAAI,IAAI,cAAc,CAAC,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC;gBACzE,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,UAAU,IAAI,SAAS,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBACvL,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5B,MAAM,MAAM,GAAG,OAAO,IAAI,cAAc,CAAC,UAAU,CAAC;YACpD,MAAM,IAAI,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,OAAO,GAAG,CAAC,UAAU,IAAI,SAAS,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACzJ,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,yGAAyG,CAAC,CAAC;QAC/H,IAAI,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACnC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC"}

package/bundle/typescript/src/commands/game/sideQuest/commands/buy.js CHANGED Viewed

@@ -42,7 +42,7 @@ export class BuyCommand extends Command {
             }
         }
         lines.push('');
-        lines.push(`You're carrying ${this.actor.currency} nuyen. "buy <item>" to make it yours.`);
+        lines.push(`You're carrying ${this.actor.currency} nuyen.${hint(` "buy <item>" to make it yours.`)}`);
         this.logger.write(`BuyCommand: ${this.actor.name} browsed in ${room.name}.`);
         return lines.join('\n');
     }