@maka/maka-cli 5.108.0 → 5.109.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 -1
- package/bundle/typescript/src/command.js +13 -0
- package/bundle/typescript/src/command.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/factories/room-factory.d.ts +30 -2
- package/bundle/typescript/src/commands/game/sideQuest/factories/room-factory.js +39 -0
- package/bundle/typescript/src/commands/game/sideQuest/factories/room-factory.js.map +1 -1
- package/bundle/typescript/src/commands/game/sideQuest/utilities/condition-report.js +18 -0
- package/bundle/typescript/src/commands/game/sideQuest/utilities/condition-report.js.map +1 -1
- package/bundle/typescript/src/commands/registry.js +1 -1
- package/bundle/typescript/src/commands/registry.js.map +1 -1
- package/bundle/typescript/src/commands/update.js +29 -6
- package/bundle/typescript/src/commands/update.js.map +1 -1
- package/bundle/typescript/src/tool.d.ts +21 -0
- package/bundle/typescript/src/tool.js.map +1 -1
- package/bundle/typescript/src/tools/mpi/shared-verb.d.ts +20 -0
- package/bundle/typescript/src/tools/mpi/shared-verb.js +36 -0
- package/bundle/typescript/src/tools/mpi/shared-verb.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.109.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.",
|
|
@@ -6,6 +6,7 @@ import Maka from './commands/maka.cmd.js';
|
|
|
6
6
|
import { ensureCommandLoaded, ensureAllCommandsLoaded } from './commands/registry.js';
|
|
7
7
|
import { Log, ColorMode } from './tools/log/log.class.js';
|
|
8
8
|
import { Tool } from './tool.js';
|
|
9
|
+
import { shouldProxyToMeteor } from './tools/mpi/shared-verb.js';
|
|
9
10
|
import { UsageError, UsageErrorWithSubs, MustBeInProjectError, NoMeteorAppFoundError, NoMeteorFoundError, MustBeLoggedIn } from './error.js';
|
|
10
11
|
let _prevCmd = '';
|
|
11
12
|
async function inside(dir = '.', func) {
|
|
@@ -234,6 +235,18 @@ export class Command extends Tool {
|
|
|
234
235
|
}
|
|
235
236
|
}
|
|
236
237
|
if (cmd) {
|
|
238
|
+
// A SHARED VERB THAT THIS INVOCATION DOES NOT CLAIM goes to
|
|
239
|
+
// Meteor, exactly as it did before a maka command took the name.
|
|
240
|
+
// Checked here rather than inside the handler because the handler
|
|
241
|
+
// runs AFTER argument and option validation, and validating a
|
|
242
|
+
// Meteor invocation against maka's own option list is what breaks
|
|
243
|
+
// it: `maka update --release 3.5.1` dies on "Invalid option:
|
|
244
|
+
// release" before any handler could hand it on.
|
|
245
|
+
const flags = opts;
|
|
246
|
+
if (shouldProxyToMeteor(cmd.options.meteorProxyUnlessArg, args[0], Boolean(flags.help || flags.h))) {
|
|
247
|
+
await this.mpi.maybeProxyCommandToMeteor();
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
237
250
|
const result = await cmd.run(args, opts);
|
|
238
251
|
return result;
|
|
239
252
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,0EAA0E;AAC1E,qDAAqD;AACrD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEnD,OAAO,IAAI,MAAM,wBAAwB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,34 @@
|
|
|
1
|
-
import { Room } from '../models/_index.js';
|
|
1
|
+
import { Room, IRoomConstructorConfig } from '../models/_index.js';
|
|
2
2
|
import { IRoomSeedJson } from '../types/seed/room-seed.js';
|
|
3
|
+
import type { IRoomGrid } from '../utilities/room-grid.js';
|
|
3
4
|
export declare class RoomFactory {
|
|
4
5
|
createRoomFromJson(config: IRoomSeedJson): Promise<Room>;
|
|
5
|
-
|
|
6
|
+
convertToRoomConfigFromJson(roomJson: IRoomSeedJson): IRoomConstructorConfig;
|
|
6
7
|
}
|
|
8
|
+
/**
|
|
9
|
+
* THE ONE-ASSEMBLER GRID EXPORT (maka-cli.com contract, 2026-09-01).
|
|
10
|
+
*
|
|
11
|
+
* The web sheet renders a room's true geometry from the save's embedded
|
|
12
|
+
* hub seed. Grid synthesis is deterministic (room-grid.ts's contract),
|
|
13
|
+
* but the INPUT ASSEMBLY is not trivially so -- ensureGrid resolves
|
|
14
|
+
* declared exit bindings and kind-matched doorways, and this engine has
|
|
15
|
+
* already paid twice for a second assembler drifting (the direction-
|
|
16
|
+
* blind doorway bug, the centroid hub bug -- both documented in
|
|
17
|
+
* ensureGrid). So the web calls THIS, which builds the room from its
|
|
18
|
+
* seed exactly as the scene factory does -- same whitelist, same
|
|
19
|
+
* declared-binding rule (scene-factory.ts:202) -- and asks the room's
|
|
20
|
+
* OWN ensureGrid. One assembler; a wrapper, not a re-implementation.
|
|
21
|
+
*
|
|
22
|
+
* Exit values are the seed's target-room NAMES (Room.exits accepts
|
|
23
|
+
* strings; ensureGrid only reads the direction keys), so no Door
|
|
24
|
+
* machinery and no neighbor rooms are needed. terrainHints stay
|
|
25
|
+
* whatever the Room ctor derives -- a fresh-from-seed room has no
|
|
26
|
+
* device-opened regions, which matches a fresh boot; a mid-session
|
|
27
|
+
* device unlock changes walkability, not walls/spots/doors, so the
|
|
28
|
+
* rendered geometry stays honest either way.
|
|
29
|
+
*
|
|
30
|
+
* Caller must be inside a session context (Room construction resolves
|
|
31
|
+
* the ambient logger) -- the web's runInSession wrapper, as with the
|
|
32
|
+
* character factory.
|
|
33
|
+
*/
|
|
34
|
+
export declare function roomGridFromSeed(seed: IRoomSeedJson): IRoomGrid | undefined;
|
|
@@ -5,6 +5,8 @@ export class RoomFactory {
|
|
|
5
5
|
const room = new Room(roomConfig);
|
|
6
6
|
return room;
|
|
7
7
|
}
|
|
8
|
+
// Public since the roomGridFromSeed export below reuses it -- the same
|
|
9
|
+
// whitelist building the same config, which is the whole point.
|
|
8
10
|
convertToRoomConfigFromJson(roomJson) {
|
|
9
11
|
return {
|
|
10
12
|
name: roomJson.name,
|
|
@@ -31,4 +33,41 @@ export class RoomFactory {
|
|
|
31
33
|
};
|
|
32
34
|
}
|
|
33
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* THE ONE-ASSEMBLER GRID EXPORT (maka-cli.com contract, 2026-09-01).
|
|
38
|
+
*
|
|
39
|
+
* The web sheet renders a room's true geometry from the save's embedded
|
|
40
|
+
* hub seed. Grid synthesis is deterministic (room-grid.ts's contract),
|
|
41
|
+
* but the INPUT ASSEMBLY is not trivially so -- ensureGrid resolves
|
|
42
|
+
* declared exit bindings and kind-matched doorways, and this engine has
|
|
43
|
+
* already paid twice for a second assembler drifting (the direction-
|
|
44
|
+
* blind doorway bug, the centroid hub bug -- both documented in
|
|
45
|
+
* ensureGrid). So the web calls THIS, which builds the room from its
|
|
46
|
+
* seed exactly as the scene factory does -- same whitelist, same
|
|
47
|
+
* declared-binding rule (scene-factory.ts:202) -- and asks the room's
|
|
48
|
+
* OWN ensureGrid. One assembler; a wrapper, not a re-implementation.
|
|
49
|
+
*
|
|
50
|
+
* Exit values are the seed's target-room NAMES (Room.exits accepts
|
|
51
|
+
* strings; ensureGrid only reads the direction keys), so no Door
|
|
52
|
+
* machinery and no neighbor rooms are needed. terrainHints stay
|
|
53
|
+
* whatever the Room ctor derives -- a fresh-from-seed room has no
|
|
54
|
+
* device-opened regions, which matches a fresh boot; a mid-session
|
|
55
|
+
* device unlock changes walkability, not walls/spots/doors, so the
|
|
56
|
+
* rendered geometry stays honest either way.
|
|
57
|
+
*
|
|
58
|
+
* Caller must be inside a session context (Room construction resolves
|
|
59
|
+
* the ambient logger) -- the web's runInSession wrapper, as with the
|
|
60
|
+
* character factory.
|
|
61
|
+
*/
|
|
62
|
+
export function roomGridFromSeed(seed) {
|
|
63
|
+
const room = new Room(new RoomFactory().convertToRoomConfigFromJson(seed));
|
|
64
|
+
for (const exit of seed.exits ?? []) {
|
|
65
|
+
const dir = exit.direction.toLowerCase();
|
|
66
|
+
room.exits.set(dir, exit.targetRoom);
|
|
67
|
+
const atSpot = exit.atSpot;
|
|
68
|
+
if (atSpot)
|
|
69
|
+
room.exitSpots.set(dir, atSpot);
|
|
70
|
+
}
|
|
71
|
+
return room.ensureGrid();
|
|
72
|
+
}
|
|
34
73
|
//# sourceMappingURL=room-factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room-factory.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/factories/room-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0B,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"room-factory.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/factories/room-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0B,MAAM,qBAAqB,CAAC;AAKnE,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,kBAAkB,CAAC,MAAqB;QAC5C,MAAM,UAAU,GAA2B,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;QACpF,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uEAAuE;IACvE,gEAAgE;IAChE,2BAA2B,CAAC,QAAuB;QACjD,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,EAAE;YACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,gEAAgE;YAChE,+DAA+D;YAC/D,iCAAiC;YACjC,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,+DAA+D;YAC/D,6DAA6D;YAC7D,2CAA2C;YAC3C,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB;SAClD,CAAC;IACJ,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAmB;IAClD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3E,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAe,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACrC,MAAM,MAAM,GAAI,IAA4B,CAAC,MAAM,CAAC;QACpD,IAAI,MAAM;YAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;AAC3B,CAAC"}
|
|
@@ -64,6 +64,24 @@ export function reportConditionSoon(player) {
|
|
|
64
64
|
// The ONE honest AR answer (2026-09-01): muted, cut, and no-rig
|
|
65
65
|
// all collapse into arSightUp, computed at fire time.
|
|
66
66
|
ar: arSightUp(player),
|
|
67
|
+
// THE ROOM'S OTHER DOTS (user: the map becomes a tactical
|
|
68
|
+
// readout). Current room only, read at fire time; spot-seated
|
|
69
|
+
// actors carry `spot` and the web places them on the grid it
|
|
70
|
+
// synthesizes itself (roomGridFromSeed). `kind` is derived from
|
|
71
|
+
// the engine's real fields, never a new taxonomy: allyOf = a
|
|
72
|
+
// companion shell riding with someone; hostile is the stance
|
|
73
|
+
// machinery's own flag. Incapacitated actors are the room's
|
|
74
|
+
// BODIES, a different rendering problem -- skipped here.
|
|
75
|
+
actors: [...(player.currentLocation?.getActors() ?? [])]
|
|
76
|
+
.filter(a => a !== player && !a.isIncapacitated())
|
|
77
|
+
.slice(0, 24)
|
|
78
|
+
.map(a => ({
|
|
79
|
+
name: a.name,
|
|
80
|
+
kind: a.allyOf ? 'ally'
|
|
81
|
+
: a.hostile ? 'hostile' : 'neutral',
|
|
82
|
+
spot: a.atSpot,
|
|
83
|
+
cell: a.atCell,
|
|
84
|
+
})),
|
|
67
85
|
});
|
|
68
86
|
})().catch(() => undefined);
|
|
69
87
|
}, COALESCE_MS);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"condition-report.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/condition-report.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,IAAI,OAAmC,CAAC;AAExC,wEAAwE;AACxE,MAAM,CAAC,MAAM,aAAa,GAAG,gCAAgC,CAAC;AAE9D,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,sEAAsE;IACtE,4DAA4D;IAC5D,sEAAsE;IACtE,mEAAmE;IACnE,qBAAqB;IACrB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,GAAG;QAAE,OAAO;IAC5C,IAAI,OAAO;QAAE,OAAO,CAAC,8BAA8B;IACnD,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QACxB,OAAO,GAAG,SAAS,CAAC;QACpB,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACnE,MAAM,CAAC,iBAAiB,CAAC;gBACzB,MAAM,CAAC,kBAAkB,CAAC;gBAC1B,MAAM,CAAC,SAAS,CAAC;aAClB,CAAC,CAAC;YACH,+DAA+D;YAC/D,kEAAkE;YAClE,gEAAgE;YAChE,kEAAkE;YAClE,mDAAmD;YACnD,+DAA+D;YAC/D,iEAAiE;YACjE,kEAAkE;YAClE,yDAAyD;YACzD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxD,MAAM,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE;gBAChC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,MAAM,CAAC,eAAe,EAAE,IAAI;gBAClC,IAAI,EAAE,MAAM,CAAC,MAAM;gBACnB,IAAI,EAAE,MAAM,CAAC,MAAM;gBACnB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAM,CAAC,UAAU;gBACzB,KAAK,EAAE,MAAM,CAAC,WAAW;gBACzB,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS;gBACxE,SAAS,EAAE,MAAM,CAAC,cAAc,EAAE;gBAClC,YAAY,EAAE,IAAI,EAAE,cAAc,IAAI,EAAE;gBACxC,gEAAgE;gBAChE,sDAAsD;gBACtD,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"condition-report.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/condition-report.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ export const topLevelCommands = [
|
|
|
39
39
|
{ name: 'undo', aliases: ['u'], shortDesc: "Read the project's history and attempt to undo the last action", experimental: true, load: () => import('./undo.js') },
|
|
40
40
|
{ name: 'profile', aliases: [], shortDesc: 'Profile a Meteor app for performance', experimental: true, load: () => import('./profile.js') },
|
|
41
41
|
{ name: 'uninstall', aliases: ['rm'], shortDesc: 'Uninstall a specific Meteor version', experimental: false, load: () => import('./uninstall.js') },
|
|
42
|
-
{ name: 'update', aliases: [], shortDesc: 'Updates the maka CLI itself
|
|
42
|
+
{ name: 'update', aliases: [], shortDesc: 'Updates the maka CLI itself; any other target is passed to Meteor.', experimental: false, load: () => import('./update.js') },
|
|
43
43
|
{ name: 'login', aliases: [], shortDesc: 'Logs in to www.maka-cli.com', experimental: false, load: () => import('./login.js') },
|
|
44
44
|
{ name: 'logout', aliases: [], shortDesc: 'Logs out of all user sessions (CLI and browser).', experimental: false, load: () => import('./logout.js') },
|
|
45
45
|
{ name: 'register', aliases: [], shortDesc: 'Registers a new user on www.maka-cli.com', experimental: false, load: () => import('./register.js') },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/commands/registry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/commands/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,48 @@
|
|
|
1
1
|
import { Command } from '../command.js';
|
|
2
2
|
import { Log } from '../tools/log/log.class.js';
|
|
3
|
+
import { UsageError } from '../error.js';
|
|
3
4
|
Command.create({
|
|
4
5
|
name: 'update',
|
|
5
6
|
validOpts: [
|
|
6
7
|
{ name: 'binary', boolFlag: true, description: 'Switch to the standalone release binary, unlinking or removing the npm install once the binary is verified on PATH' },
|
|
7
8
|
{ name: 'npm', boolFlag: true, description: 'Switch back to the npm install, removing the standalone binary once the npm install is verified on PATH (needs Node.js)' },
|
|
8
9
|
],
|
|
9
|
-
validArgs
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
// NOT validArgs/minArgLength. Those validate what reaches this handler,
|
|
11
|
+
// and by then the routing decision has already been made -- pinning them
|
|
12
|
+
// here would only re-refuse an invocation the router has already sent to
|
|
13
|
+
// Meteor. meteorProxyUnlessArg is the same rule stated where it can act.
|
|
14
|
+
meteorProxyUnlessArg: ['maka'],
|
|
15
|
+
usage: 'maka update maka [--binary|--npm] -- any other form is passed to Meteor (`meteor update --help` for its flags)',
|
|
16
|
+
shortDesc: 'Updates the maka CLI itself; any other target is passed to Meteor.',
|
|
13
17
|
examples: [
|
|
14
18
|
'maka update maka',
|
|
15
19
|
'maka update maka --binary',
|
|
16
20
|
'maka update maka --npm',
|
|
21
|
+
'maka update --release 3.5.1',
|
|
17
22
|
]
|
|
18
23
|
}, async function (args, opts) {
|
|
24
|
+
// `maka update maka --help` PRINTS HELP RATHER THAN UPDATING. The
|
|
25
|
+
// generic help gate in Command.invoke() only fires for a bare command
|
|
26
|
+
// (`args.length === 0`), so a command whose help you ask for BY its
|
|
27
|
+
// argument slips past it and runs -- and this is the one command where
|
|
28
|
+
// that means a self-update instead of a paragraph of text. Handled here,
|
|
29
|
+
// for this command, rather than by widening a gate every command shares.
|
|
30
|
+
//
|
|
31
|
+
// OUTSIDE the try, deliberately: invoke()'s catch is what renders usage,
|
|
32
|
+
// and the try below swallows everything into "Update failed: <message>"
|
|
33
|
+
// -- which for a UsageError reads "Update failed: Usage error" and
|
|
34
|
+
// prints no usage at all.
|
|
35
|
+
if (opts.help || opts.h) {
|
|
36
|
+
throw new UsageError();
|
|
37
|
+
}
|
|
19
38
|
try {
|
|
39
|
+
// The router only sends `maka update maka` here, so this is a guard
|
|
40
|
+
// against a future caller reaching the handler another way, not the
|
|
41
|
+
// check that does the work. It says where the other path went rather
|
|
42
|
+
// than refusing outright, because the other path is not an error.
|
|
20
43
|
if (args[0] !== 'maka') {
|
|
21
|
-
Log.error('
|
|
22
|
-
Log.notice('
|
|
44
|
+
Log.error('This command updates the maka CLI itself: `maka update maka`.');
|
|
45
|
+
Log.notice('`maka update` with anything else is Meteor\'s -- `maka update --release <x.y.z>` passes straight through to it.');
|
|
23
46
|
process.exit(1);
|
|
24
47
|
}
|
|
25
48
|
const { updateMakaCli } = await import('../tools/self-update/update-maka.js');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAuDzC,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE;QACT,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,oHAAoH,EAAE;QACrK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,yHAAyH,EAAE;KACxK;IACD,wEAAwE;IACxE,yEAAyE;IACzE,yEAAyE;IACzE,yEAAyE;IACzE,oBAAoB,EAAE,CAAC,MAAM,CAAC;IAC9B,KAAK,EAAE,kHAAkH;IACzH,SAAS,EAAE,oEAAoE;IAC/E,QAAQ,EAAE;QACR,kBAAkB;QAClB,2BAA2B;QAC3B,wBAAwB;QACxB,6BAA6B;KAC9B;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAiB;IAClD,kEAAkE;IAClE,sEAAsE;IACtE,oEAAoE;IACpE,uEAAuE;IACvE,yEAAyE;IACzE,yEAAyE;IACzE,EAAE;IACF,yEAAyE;IACzE,wEAAwE;IACxE,mEAAmE;IACnE,0BAA0B;IAC1B,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,UAAU,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,CAAC;QACH,oEAAoE;QACpE,oEAAoE;QACpE,qEAAqE;QACrE,kEAAkE;QAClE,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;YACvB,GAAG,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAC;YAC3E,GAAG,CAAC,MAAM,CAAC,iHAAiH,CAAC,CAAC;YAC9H,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,qCAAqC,CAAC,CAAC;QAC9E,MAAM,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,kBAAmB,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -26,6 +26,27 @@ export interface IOpts {
|
|
|
26
26
|
requiredOpts?: string[] | NamedParam[];
|
|
27
27
|
validOpts: string[] | NamedParam[];
|
|
28
28
|
validArgs?: string[];
|
|
29
|
+
/**
|
|
30
|
+
* SHARED VERBS: the first arguments this maka command owns. Any other
|
|
31
|
+
* first argument -- including none at all -- means the invocation
|
|
32
|
+
* belongs to Meteor, and the router proxies it there untouched instead
|
|
33
|
+
* of dispatching here.
|
|
34
|
+
*
|
|
35
|
+
* `update` is the case this exists for. It is a Meteor verb
|
|
36
|
+
* (`meteor update --release 3.5.1`) that maka has always forwarded via
|
|
37
|
+
* mpi.maybeProxyCommandToMeteor(), and it became a maka command too when
|
|
38
|
+
* the CLI learned to update itself. Registering it captured the NAME,
|
|
39
|
+
* which silently took the project update away: the router matched
|
|
40
|
+
* `update` to the new command and the forward it used to reach stopped
|
|
41
|
+
* being reachable at all.
|
|
42
|
+
*
|
|
43
|
+
* The check runs in the ROUTER, before argument and option validation,
|
|
44
|
+
* because that validation is exactly what must not happen to a Meteor
|
|
45
|
+
* invocation -- maka would otherwise have to keep its own list of
|
|
46
|
+
* Meteor's flags current, and reject `--release` for the crime of not
|
|
47
|
+
* being in it.
|
|
48
|
+
*/
|
|
49
|
+
meteorProxyUnlessArg?: string[];
|
|
29
50
|
resourceNameRequired?: boolean;
|
|
30
51
|
mustBeInMakaProject?: boolean;
|
|
31
52
|
mustHaveMeteorInstalled?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../src/tool.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAiBvC,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EACL,UAAU,EACV,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAKpB,wEAAwE;AACxE,0EAA0E;AAC1E,yEAAyE;AACzE,0EAA0E;AAC1E,kDAAkD;AAClD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEnD,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../src/tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Whether a matched command should hand this invocation to Meteor instead
|
|
3
|
+
* of running its own handler. See IOpts.meteorProxyUnlessArg for the
|
|
4
|
+
* problem; this is only the decision.
|
|
5
|
+
*
|
|
6
|
+
* WHAT IT PROTECTS IS A WHOLE VERB DISAPPEARING QUIETLY. `update` has
|
|
7
|
+
* always been forwarded to Meteor -- not because a command handled it,
|
|
8
|
+
* but because NO command matched the name and the router fell through to
|
|
9
|
+
* the proxy. When `maka update maka` was added it captured the name, the
|
|
10
|
+
* fall-through stopped being reachable, and `maka update --release 3.5.1`
|
|
11
|
+
* began printing usage and exiting 1. Nothing failed; it just read like a
|
|
12
|
+
* typo, and it took a person noticing they could no longer update their
|
|
13
|
+
* project to find it.
|
|
14
|
+
*
|
|
15
|
+
* `owned` undefined means the command is not shared and always runs.
|
|
16
|
+
* A help request is always maka's: proxying it would make maka's own
|
|
17
|
+
* usage for a shared verb unreachable, and that usage is where the split
|
|
18
|
+
* between the two is written down.
|
|
19
|
+
*/
|
|
20
|
+
export declare function shouldProxyToMeteor(owned: string[] | undefined, firstArg: string | undefined, wantsHelp: boolean): boolean;
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
// SHARED VERBS: names that are both a maka command and a Meteor one.
|
|
2
|
+
//
|
|
3
|
+
// A file of its own, with no imports, for a reason that is not
|
|
4
|
+
// organisational: this decision belongs to command.ts's router, but
|
|
5
|
+
// command.ts imports maka.cmd.ts which imports command.ts back, so
|
|
6
|
+
// anything exported from there cannot be reached by a test without
|
|
7
|
+
// evaluating that cycle ("Cannot access 'Command' before
|
|
8
|
+
// initialization"). It sits next to mpi.class.ts because
|
|
9
|
+
// maybeProxyCommandToMeteor() is where a `true` here ends up.
|
|
10
|
+
/**
|
|
11
|
+
* Whether a matched command should hand this invocation to Meteor instead
|
|
12
|
+
* of running its own handler. See IOpts.meteorProxyUnlessArg for the
|
|
13
|
+
* problem; this is only the decision.
|
|
14
|
+
*
|
|
15
|
+
* WHAT IT PROTECTS IS A WHOLE VERB DISAPPEARING QUIETLY. `update` has
|
|
16
|
+
* always been forwarded to Meteor -- not because a command handled it,
|
|
17
|
+
* but because NO command matched the name and the router fell through to
|
|
18
|
+
* the proxy. When `maka update maka` was added it captured the name, the
|
|
19
|
+
* fall-through stopped being reachable, and `maka update --release 3.5.1`
|
|
20
|
+
* began printing usage and exiting 1. Nothing failed; it just read like a
|
|
21
|
+
* typo, and it took a person noticing they could no longer update their
|
|
22
|
+
* project to find it.
|
|
23
|
+
*
|
|
24
|
+
* `owned` undefined means the command is not shared and always runs.
|
|
25
|
+
* A help request is always maka's: proxying it would make maka's own
|
|
26
|
+
* usage for a shared verb unreachable, and that usage is where the split
|
|
27
|
+
* between the two is written down.
|
|
28
|
+
*/
|
|
29
|
+
export function shouldProxyToMeteor(owned, firstArg, wantsHelp) {
|
|
30
|
+
if (!owned)
|
|
31
|
+
return false;
|
|
32
|
+
if (wantsHelp)
|
|
33
|
+
return false;
|
|
34
|
+
return !owned.includes(firstArg);
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=shared-verb.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared-verb.js","sourceRoot":"","sources":["../../../../../src/tools/mpi/shared-verb.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,+DAA+D;AAC/D,oEAAoE;AACpE,mEAAmE;AACnE,mEAAmE;AACnE,yDAAyD;AACzD,yDAAyD;AACzD,8DAA8D;AAE9D;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAA2B,EAC3B,QAA4B,EAC5B,SAAkB;IAElB,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,SAAS;QAAE,OAAO,KAAK,CAAC;IAC5B,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAkB,CAAC,CAAC;AAC7C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.109.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.",
|