@maka/maka-cli 5.87.0 → 5.89.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.
- package/bundle/typescript/package.json +1 -4
- package/bundle/typescript/src/commands/game/sideQuest/commands/move.d.ts +76 -5
- package/bundle/typescript/src/commands/game/sideQuest/commands/move.js +162 -11
- package/bundle/typescript/src/commands/game/sideQuest/commands/move.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/game.d.ts +71 -1
- package/bundle/typescript/src/commands/game/sideQuest/game.js +106 -17
- package/bundle/typescript/src/commands/game/sideQuest/game.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/headless.js +34 -0
- package/bundle/typescript/src/commands/game/sideQuest/headless.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/models/player.d.ts +46 -0
- package/bundle/typescript/src/commands/game/sideQuest/models/player.js +81 -1
- package/bundle/typescript/src/commands/game/sideQuest/models/player.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-vocab.js +8 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/backlog-vocab.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/bystander.js +2 -12
- package/bundle/typescript/src/commands/game/sideQuest/utilities/bystander.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/combat-exchange.js +13 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/combat-exchange.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/ephemeral.d.ts +73 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/ephemeral.js +210 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/ephemeral.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-view.d.ts +0 -31
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-view.js +21 -75
- package/bundle/typescript/src/commands/game/sideQuest/utilities/room-view.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/shared-run.d.ts +22 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/shared-run.js +69 -2
- package/bundle/typescript/src/commands/game/sideQuest/utilities/shared-run.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/sin.d.ts +19 -2
- package/bundle/typescript/src/commands/game/sideQuest/utilities/sin.js +29 -6
- package/bundle/typescript/src/commands/game/sideQuest/utilities/sin.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.d.ts +47 -3
- package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.js +121 -17
- package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/street-gang.js +2 -14
- package/bundle/typescript/src/commands/game/sideQuest/utilities/street-gang.js.map +1 -1
- package/bundle/typescript/src/tools/sdk-loader/relocate.d.ts +19 -0
- package/bundle/typescript/src/tools/sdk-loader/relocate.js +23 -9
- package/bundle/typescript/src/tools/sdk-loader/relocate.js.map +1 -1
- package/package.json +1 -4
|
@@ -27,7 +27,7 @@ import path from 'path';
|
|
|
27
27
|
import spawn from 'cross-spawn';
|
|
28
28
|
import { Log } from '../log/log.class.js';
|
|
29
29
|
import { cliVersion } from '../version/cli-version.js';
|
|
30
|
-
import { runtimeDir, ensureNode } from './runtime-fetch.js';
|
|
30
|
+
import { runtimeDir, ensureNode, probeEnv } from './runtime-fetch.js';
|
|
31
31
|
// The commands that reach ensureSdkInit(), and nothing else:
|
|
32
32
|
// build -> mpi.buildViaSdk()
|
|
33
33
|
// run -> mpi.runViaSdk()
|
|
@@ -139,6 +139,27 @@ function ensureCliOnDisk() {
|
|
|
139
139
|
fs.writeFileSync(marker, `${cliVersion()}\n`);
|
|
140
140
|
return bundle;
|
|
141
141
|
}
|
|
142
|
+
/** The environment the relocated child -- the real Node running the whole
|
|
143
|
+
* Meteor toolchain -- needs: everything we have, plus MAKA_RELOCATED, minus
|
|
144
|
+
* PKG_EXECPATH. Pure and exported so the contract is unit-testable without a
|
|
145
|
+
* spawn, same shape as selfSpawnEnv/probeEnv.
|
|
146
|
+
*
|
|
147
|
+
* Deliberately NOT tools/self-spawn: this spawns the REAL Node fetched to
|
|
148
|
+
* disk, which is the whole point of relocating, not this executable again.
|
|
149
|
+
* The packager patches child_process and injects PKG_EXECPATH here too, and
|
|
150
|
+
* a real Node ignores it -- which is why `build` and `run` work from the
|
|
151
|
+
* executable while the sideQuest self-spawn did not -- but it is scrubbed
|
|
152
|
+
* anyway via the same probeEnv() runtime-fetch.ts uses for its own node
|
|
153
|
+
* probe: harmless to THIS child, but the child is not a leaf, it is the root
|
|
154
|
+
* of the whole Meteor toolchain, which spawns its own children in turn.
|
|
155
|
+
* Leaving a packager-internal variable in an environment that outlives this
|
|
156
|
+
* one process means every one of those descendants inherits a claim of
|
|
157
|
+
* being packaged that stopped being true one spawn ago. Use spawnSelf only
|
|
158
|
+
* when the child is meant to be this CLI; see its header for what goes
|
|
159
|
+
* wrong when that distinction is missed. */
|
|
160
|
+
export function relocatedChildEnv(env = process.env) {
|
|
161
|
+
return { ...probeEnv(env), [RELOCATED_ENV]: '1' };
|
|
162
|
+
}
|
|
142
163
|
/** Re-execs this command on a real Node and exits with the child's status.
|
|
143
164
|
* Never returns. */
|
|
144
165
|
export async function reexecOnRealNode(args) {
|
|
@@ -147,16 +168,9 @@ export async function reexecOnRealNode(args) {
|
|
|
147
168
|
if (process.env.MAKA_DEV === 'True') {
|
|
148
169
|
Log.notice(`Running on ${node} from ${bundle}`);
|
|
149
170
|
}
|
|
150
|
-
// Deliberately NOT tools/self-spawn: this spawns the REAL Node fetched to
|
|
151
|
-
// disk, which is the whole point of relocating, not this executable again.
|
|
152
|
-
// The packager patches child_process and injects PKG_EXECPATH here too, but
|
|
153
|
-
// a real Node has no idea what that variable is and ignores it -- which is
|
|
154
|
-
// why `build` and `run` work from the executable while the sideQuest
|
|
155
|
-
// self-spawn did not. Use spawnSelf only when the child is meant to be this
|
|
156
|
-
// CLI; see its header for what goes wrong when that distinction is missed.
|
|
157
171
|
const child = spawn(node, [bundle, ...args], {
|
|
158
172
|
stdio: 'inherit',
|
|
159
|
-
env:
|
|
173
|
+
env: relocatedChildEnv(),
|
|
160
174
|
});
|
|
161
175
|
const { code, signal } = await new Promise((resolve) => {
|
|
162
176
|
child.on('close', (c, s) => resolve({ code: c, signal: s }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relocate.js","sourceRoot":"","sources":["../../../../../src/tools/sdk-loader/relocate.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,cAAc;AACd,EAAE;AACF,8EAA8E;AAC9E,8EAA8E;AAC9E,iEAAiE;AACjE,8EAA8E;AAC9E,2EAA2E;AAC3E,sEAAsE;AACtE,wDAAwD;AACxD,EAAE;AACF,6EAA6E;AAC7E,qEAAqE;AACrE,yEAAyE;AACzE,6EAA6E;AAC7E,+EAA+E;AAC/E,mDAAmD;AACnD,EAAE;AACF,+EAA+E;AAC/E,4EAA4E;AAC5E,8EAA8E;AAC9E,8EAA8E;AAC9E,yEAAyE;AACzE,oEAAoE;AACpE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"relocate.js","sourceRoot":"","sources":["../../../../../src/tools/sdk-loader/relocate.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,cAAc;AACd,EAAE;AACF,8EAA8E;AAC9E,8EAA8E;AAC9E,iEAAiE;AACjE,8EAA8E;AAC9E,2EAA2E;AAC3E,sEAAsE;AACtE,wDAAwD;AACxD,EAAE;AACF,6EAA6E;AAC7E,qEAAqE;AACrE,yEAAyE;AACzE,6EAA6E;AAC7E,+EAA+E;AAC/E,mDAAmD;AACnD,EAAE;AACF,+EAA+E;AAC/E,4EAA4E;AAC5E,8EAA8E;AAC9E,8EAA8E;AAC9E,yEAAyE;AACzE,oEAAoE;AACpE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEtE,6DAA6D;AAC7D,iCAAiC;AACjC,+BAA+B;AAC/B,gFAAgF;AAChF,EAAE;AACF,2DAA2D;AAC3D,6EAA6E;AAC7E,wEAAwE;AACxE,2EAA2E;AAC3E,wEAAwE;AACxE,yDAAyD;AACzD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;AAEtE,MAAM,aAAa,GAAG,gBAAgB,CAAC;AAEvC;yDACyD;AACzD,MAAM,UAAU,WAAW;IACzB,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,GAAG,CAAC;AAC5C,CAAC;AAED;;;;;;;;;;;;;;oEAcoE;AACpE,MAAM,UAAU,aAAa,CAC3B,OAAgB;AAChB,0EAA0E;AAC1E,wEAAwE;AACxE,0DAA0D;AAC1D,QAAkE,EAAE;IAEpE,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO;IACd,oEAAoE;IACpE,oBAAoB;IACpB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACtD,CAAC;AAED;;;iBAGiB;AACjB,SAAS,OAAO,CAAC,GAAW,EAAE,IAAY;IACxC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;AACH,CAAC;AAED;yBACyB;AACzB,SAAS,eAAe;IACtB,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC3C,oEAAoE;IACpE,oCAAoC;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE5C,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAExC,6EAA6E;IAC7E,yEAAyE;IACzE,EAAE;IACF,yEAAyE;IACzE,0EAA0E;IAC1E,iEAAiE;IACjE,yEAAyE;IACzE,4EAA4E;IAC5E,sEAAsE;IACtE,4EAA4E;IAC5E,4EAA4E;IAC5E,sCAAsC;IACtC,EAAE;IACF,8EAA8E;IAC9E,0EAA0E;IAC1E,gEAAgE;IAChE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACvE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IAEnD,qEAAqE;IACrE,uEAAuE;IACvE,wEAAwE;IACxE,yEAAyE;IACzE,iCAAiC;IACjC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IACtE,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE,IAAI,CAAC,CAAC;IAC9C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;;;;;;;6CAiB6C;AAC7C,MAAM,UAAU,iBAAiB,CAAC,MAAyB,OAAO,CAAC,GAAG;IACpE,OAAO,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;AACpD,CAAC;AAED;qBACqB;AACrB,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAc;IACnD,MAAM,IAAI,GAAG,MAAM,UAAU,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACpC,GAAG,CAAC,MAAM,CAAC,cAAc,IAAI,SAAS,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE;QAC3C,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,iBAAiB,EAAE;KACzB,CAAC,CAAC;IAEH,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,OAAO,CAEvC,CAAC,OAAO,EAAE,EAAE;QACb,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACtB,GAAG,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAChE,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,yEAAyE;IACzE,sEAAsE;IACtE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;AACjC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.89.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
|
|
6
6
|
"description": "A command line tool for scaffolding Meteor 2.x applications using React.",
|
|
@@ -109,10 +109,7 @@
|
|
|
109
109
|
"overrides": {
|
|
110
110
|
"glob": "^13.0.0",
|
|
111
111
|
"@maka/meteor-sdk": {
|
|
112
|
-
"ws": "7.5.11",
|
|
113
|
-
"underscore": "1.13.8",
|
|
114
112
|
"@babel/runtime": "7.26.10",
|
|
115
|
-
"tar-fs": "2.1.4",
|
|
116
113
|
"tmp": "0.2.7",
|
|
117
114
|
"got": "11.8.5"
|
|
118
115
|
},
|