@sharpee/stdlib 0.9.110 → 0.9.113
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/actions/base/snapshot-utils.d.ts +0 -2
- package/actions/base/snapshot-utils.d.ts.map +1 -1
- package/actions/base/snapshot-utils.js +0 -4
- package/actions/base/snapshot-utils.js.map +1 -1
- package/actions/capability-dispatch.d.ts.map +1 -1
- package/actions/capability-dispatch.js +5 -3
- package/actions/capability-dispatch.js.map +1 -1
- package/actions/constants.d.ts +2 -0
- package/actions/constants.d.ts.map +1 -1
- package/actions/constants.js +3 -0
- package/actions/constants.js.map +1 -1
- package/actions/enhanced-types.d.ts +1 -1
- package/actions/standard/attacking/attacking.d.ts.map +1 -1
- package/actions/standard/attacking/attacking.js +22 -14
- package/actions/standard/attacking/attacking.js.map +1 -1
- package/actions/standard/climbing/climbing.d.ts.map +1 -1
- package/actions/standard/climbing/climbing.js +8 -4
- package/actions/standard/climbing/climbing.js.map +1 -1
- package/actions/standard/closing/closing.d.ts.map +1 -1
- package/actions/standard/closing/closing.js +12 -11
- package/actions/standard/closing/closing.js.map +1 -1
- package/actions/standard/drinking/drinking.d.ts.map +1 -1
- package/actions/standard/drinking/drinking.js +8 -5
- package/actions/standard/drinking/drinking.js.map +1 -1
- package/actions/standard/dropping/dropping-data.d.ts.map +1 -1
- package/actions/standard/dropping/dropping-data.js +7 -5
- package/actions/standard/dropping/dropping-data.js.map +1 -1
- package/actions/standard/dropping/dropping.d.ts.map +1 -1
- package/actions/standard/dropping/dropping.js +20 -18
- package/actions/standard/dropping/dropping.js.map +1 -1
- package/actions/standard/eating/eating.d.ts.map +1 -1
- package/actions/standard/eating/eating.js +10 -7
- package/actions/standard/eating/eating.js.map +1 -1
- package/actions/standard/entering/entering.d.ts.map +1 -1
- package/actions/standard/entering/entering.js +15 -17
- package/actions/standard/entering/entering.js.map +1 -1
- package/actions/standard/examining/examining-data.d.ts.map +1 -1
- package/actions/standard/examining/examining-data.js +4 -3
- package/actions/standard/examining/examining-data.js.map +1 -1
- package/actions/standard/examining/examining.d.ts.map +1 -1
- package/actions/standard/examining/examining.js +4 -1
- package/actions/standard/examining/examining.js.map +1 -1
- package/actions/standard/exiting/exiting.d.ts.map +1 -1
- package/actions/standard/exiting/exiting.js +7 -3
- package/actions/standard/exiting/exiting.js.map +1 -1
- package/actions/standard/giving/giving.d.ts.map +1 -1
- package/actions/standard/giving/giving.js +12 -9
- package/actions/standard/giving/giving.js.map +1 -1
- package/actions/standard/going/going-data.d.ts +1 -2
- package/actions/standard/going/going-data.d.ts.map +1 -1
- package/actions/standard/going/going-data.js +2 -5
- package/actions/standard/going/going-data.js.map +1 -1
- package/actions/standard/going/going-events.d.ts +26 -0
- package/actions/standard/going/going-events.d.ts.map +1 -1
- package/actions/standard/going/going.d.ts +3 -1
- package/actions/standard/going/going.d.ts.map +1 -1
- package/actions/standard/going/going.js +34 -13
- package/actions/standard/going/going.js.map +1 -1
- package/actions/standard/hiding/concealment-break.d.ts +30 -0
- package/actions/standard/hiding/concealment-break.d.ts.map +1 -0
- package/actions/standard/hiding/concealment-break.js +63 -0
- package/actions/standard/hiding/concealment-break.js.map +1 -0
- package/actions/standard/hiding/hiding-events.d.ts +31 -0
- package/actions/standard/hiding/hiding-events.d.ts.map +1 -0
- package/actions/standard/hiding/hiding-events.js +9 -0
- package/actions/standard/hiding/hiding-events.js.map +1 -0
- package/actions/standard/hiding/hiding.d.ts +21 -0
- package/actions/standard/hiding/hiding.d.ts.map +1 -0
- package/actions/standard/hiding/hiding.js +110 -0
- package/actions/standard/hiding/hiding.js.map +1 -0
- package/actions/standard/hiding/index.d.ts +8 -0
- package/actions/standard/hiding/index.d.ts.map +1 -0
- package/actions/standard/hiding/index.js +13 -0
- package/actions/standard/hiding/index.js.map +1 -0
- package/actions/standard/hiding/revealing.d.ts +21 -0
- package/actions/standard/hiding/revealing.d.ts.map +1 -0
- package/actions/standard/hiding/revealing.js +66 -0
- package/actions/standard/hiding/revealing.js.map +1 -0
- package/actions/standard/index.d.ts +1 -0
- package/actions/standard/index.d.ts.map +1 -1
- package/actions/standard/index.js +8 -0
- package/actions/standard/index.js.map +1 -1
- package/actions/standard/inserting/inserting.d.ts.map +1 -1
- package/actions/standard/inserting/inserting.js +11 -6
- package/actions/standard/inserting/inserting.js.map +1 -1
- package/actions/standard/listening/listening.d.ts.map +1 -1
- package/actions/standard/listening/listening.js +4 -2
- package/actions/standard/listening/listening.js.map +1 -1
- package/actions/standard/lock-shared.d.ts.map +1 -1
- package/actions/standard/lock-shared.js +10 -9
- package/actions/standard/lock-shared.js.map +1 -1
- package/actions/standard/locking/locking.d.ts.map +1 -1
- package/actions/standard/locking/locking.js +11 -7
- package/actions/standard/locking/locking.js.map +1 -1
- package/actions/standard/looking/looking-data.d.ts.map +1 -1
- package/actions/standard/looking/looking-data.js +8 -4
- package/actions/standard/looking/looking-data.js.map +1 -1
- package/actions/standard/looking/looking.d.ts.map +1 -1
- package/actions/standard/looking/looking.js +7 -1
- package/actions/standard/looking/looking.js.map +1 -1
- package/actions/standard/opening/opening.d.ts.map +1 -1
- package/actions/standard/opening/opening.js +9 -7
- package/actions/standard/opening/opening.js.map +1 -1
- package/actions/standard/pulling/pulling.d.ts.map +1 -1
- package/actions/standard/pulling/pulling.js +10 -5
- package/actions/standard/pulling/pulling.js.map +1 -1
- package/actions/standard/pushing/pushing.d.ts.map +1 -1
- package/actions/standard/pushing/pushing.js +15 -15
- package/actions/standard/pushing/pushing.js.map +1 -1
- package/actions/standard/putting/putting.d.ts.map +1 -1
- package/actions/standard/putting/putting.js +26 -28
- package/actions/standard/putting/putting.js.map +1 -1
- package/actions/standard/reading/reading.d.ts.map +1 -1
- package/actions/standard/reading/reading.js +7 -4
- package/actions/standard/reading/reading.js.map +1 -1
- package/actions/standard/removing/removing.d.ts.map +1 -1
- package/actions/standard/removing/removing.js +27 -26
- package/actions/standard/removing/removing.js.map +1 -1
- package/actions/standard/searching/searching.d.ts.map +1 -1
- package/actions/standard/searching/searching.js +4 -2
- package/actions/standard/searching/searching.js.map +1 -1
- package/actions/standard/searching-helpers.d.ts.map +1 -1
- package/actions/standard/searching-helpers.js +3 -1
- package/actions/standard/searching-helpers.js.map +1 -1
- package/actions/standard/showing/showing.d.ts.map +1 -1
- package/actions/standard/showing/showing.js +9 -6
- package/actions/standard/showing/showing.js.map +1 -1
- package/actions/standard/smelling/smelling.d.ts.map +1 -1
- package/actions/standard/smelling/smelling.js +5 -3
- package/actions/standard/smelling/smelling.js.map +1 -1
- package/actions/standard/switching_off/switching_off.d.ts.map +1 -1
- package/actions/standard/switching_off/switching_off.js +8 -5
- package/actions/standard/switching_off/switching_off.js.map +1 -1
- package/actions/standard/switching_on/switching_on.d.ts.map +1 -1
- package/actions/standard/switching_on/switching_on.js +16 -10
- package/actions/standard/switching_on/switching_on.js.map +1 -1
- package/actions/standard/taking/taking.d.ts.map +1 -1
- package/actions/standard/taking/taking.js +25 -18
- package/actions/standard/taking/taking.js.map +1 -1
- package/actions/standard/taking_off/taking-off.d.ts.map +1 -1
- package/actions/standard/taking_off/taking-off.js +12 -10
- package/actions/standard/taking_off/taking-off.js.map +1 -1
- package/actions/standard/talking/talking.d.ts.map +1 -1
- package/actions/standard/talking/talking.js +8 -4
- package/actions/standard/talking/talking.js.map +1 -1
- package/actions/standard/throwing/throwing.d.ts.map +1 -1
- package/actions/standard/throwing/throwing.js +13 -14
- package/actions/standard/throwing/throwing.js.map +1 -1
- package/actions/standard/touching/touching.d.ts.map +1 -1
- package/actions/standard/touching/touching.js +6 -2
- package/actions/standard/touching/touching.js.map +1 -1
- package/actions/standard/unlocking/unlocking.d.ts.map +1 -1
- package/actions/standard/unlocking/unlocking.js +10 -6
- package/actions/standard/unlocking/unlocking.js.map +1 -1
- package/actions/standard/wearable-shared.d.ts.map +1 -1
- package/actions/standard/wearable-shared.js +3 -1
- package/actions/standard/wearable-shared.js.map +1 -1
- package/actions/standard/wearing/wearing.d.ts.map +1 -1
- package/actions/standard/wearing/wearing.js +7 -5
- package/actions/standard/wearing/wearing.js.map +1 -1
- package/index.d.ts +1 -0
- package/index.d.ts.map +1 -1
- package/index.js +1 -0
- package/index.js.map +1 -1
- package/package.json +6 -6
- package/sharpee-stdlib-0.9.109.tgz +0 -0
- package/sharpee-stdlib-0.9.110.tgz +0 -0
- package/utils/entity-info.d.ts +45 -0
- package/utils/entity-info.d.ts.map +1 -0
- package/utils/entity-info.js +68 -0
- package/utils/entity-info.js.map +1 -0
- package/utils/index.d.ts +9 -0
- package/utils/index.d.ts.map +1 -0
- package/utils/index.js +13 -0
- package/utils/index.js.map +1 -0
|
@@ -9,6 +9,7 @@ exports.validateKeyRequirements = validateKeyRequirements;
|
|
|
9
9
|
exports.createLockErrorEvent = createLockErrorEvent;
|
|
10
10
|
exports.determineLockMessage = determineLockMessage;
|
|
11
11
|
const world_model_1 = require("../../../world-model/index.js");
|
|
12
|
+
const utils_1 = require("../../utils");
|
|
12
13
|
/**
|
|
13
14
|
* Shared message constants for lock/unlock validation
|
|
14
15
|
* These are message IDs, not English strings - lang-en-us resolves them
|
|
@@ -60,7 +61,7 @@ function validateKeyRequirements(context, target, key, isLocking) {
|
|
|
60
61
|
return {
|
|
61
62
|
valid: false,
|
|
62
63
|
error: exports.LOCK_MESSAGES.KEY_NOT_HELD,
|
|
63
|
-
params: { key: key
|
|
64
|
+
params: { key: (0, utils_1.entityInfoFrom)(key) }
|
|
64
65
|
};
|
|
65
66
|
}
|
|
66
67
|
// Check if it's the right key
|
|
@@ -72,8 +73,8 @@ function validateKeyRequirements(context, target, key, isLocking) {
|
|
|
72
73
|
valid: false,
|
|
73
74
|
error: exports.LOCK_MESSAGES.WRONG_KEY,
|
|
74
75
|
params: {
|
|
75
|
-
key: key
|
|
76
|
-
item: target
|
|
76
|
+
key: (0, utils_1.entityInfoFrom)(key),
|
|
77
|
+
item: (0, utils_1.entityInfoFrom)(target)
|
|
77
78
|
}
|
|
78
79
|
};
|
|
79
80
|
}
|
|
@@ -90,7 +91,7 @@ function createLockErrorEvent(context, result, target, key, isLocking) {
|
|
|
90
91
|
actionId,
|
|
91
92
|
messageId: 'already_locked',
|
|
92
93
|
reason: 'already_locked',
|
|
93
|
-
params: { item: target
|
|
94
|
+
params: { item: (0, utils_1.entityInfoFrom)(target) }
|
|
94
95
|
});
|
|
95
96
|
}
|
|
96
97
|
if (result.notClosed) {
|
|
@@ -98,7 +99,7 @@ function createLockErrorEvent(context, result, target, key, isLocking) {
|
|
|
98
99
|
actionId,
|
|
99
100
|
messageId: 'not_closed',
|
|
100
101
|
reason: 'not_closed',
|
|
101
|
-
params: { item: target
|
|
102
|
+
params: { item: (0, utils_1.entityInfoFrom)(target) }
|
|
102
103
|
});
|
|
103
104
|
}
|
|
104
105
|
}
|
|
@@ -108,7 +109,7 @@ function createLockErrorEvent(context, result, target, key, isLocking) {
|
|
|
108
109
|
actionId,
|
|
109
110
|
messageId: 'already_unlocked',
|
|
110
111
|
reason: 'already_unlocked',
|
|
111
|
-
params: { item: target
|
|
112
|
+
params: { item: (0, utils_1.entityInfoFrom)(target) }
|
|
112
113
|
});
|
|
113
114
|
}
|
|
114
115
|
}
|
|
@@ -126,8 +127,8 @@ function createLockErrorEvent(context, result, target, key, isLocking) {
|
|
|
126
127
|
messageId: 'wrong_key',
|
|
127
128
|
reason: 'wrong_key',
|
|
128
129
|
params: {
|
|
129
|
-
key: key
|
|
130
|
-
item: target
|
|
130
|
+
key: key ? (0, utils_1.entityInfoFrom)(key) : { name: 'key' },
|
|
131
|
+
item: (0, utils_1.entityInfoFrom)(target)
|
|
131
132
|
}
|
|
132
133
|
});
|
|
133
134
|
}
|
|
@@ -136,7 +137,7 @@ function createLockErrorEvent(context, result, target, key, isLocking) {
|
|
|
136
137
|
actionId,
|
|
137
138
|
messageId: isLocking ? 'cannot_lock' : 'cannot_unlock',
|
|
138
139
|
reason: isLocking ? 'cannot_lock' : 'cannot_unlock',
|
|
139
|
-
params: { item: target
|
|
140
|
+
params: { item: (0, utils_1.entityInfoFrom)(target) }
|
|
140
141
|
});
|
|
141
142
|
}
|
|
142
143
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock-shared.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/lock-shared.ts"],"names":[],"mappings":";AAAA;;GAEG;;;
|
|
1
|
+
{"version":3,"file":"lock-shared.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/lock-shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locking.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/locking/locking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"locking.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/locking/locking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAgCrD,eAAO,MAAM,aAAa,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAiO9D,CAAC"}
|
|
@@ -17,6 +17,7 @@ const constants_1 = require("../../constants");
|
|
|
17
17
|
const scope_1 = require("../../../scope");
|
|
18
18
|
const lock_shared_1 = require("../lock-shared");
|
|
19
19
|
const locking_messages_1 = require("./locking-messages");
|
|
20
|
+
const utils_1 = require("../../../utils");
|
|
20
21
|
function getLockingSharedData(context) {
|
|
21
22
|
return context.sharedData;
|
|
22
23
|
}
|
|
@@ -65,7 +66,7 @@ exports.lockingAction = {
|
|
|
65
66
|
return {
|
|
66
67
|
valid: false,
|
|
67
68
|
error: locking_messages_1.MESSAGES.NOT_LOCKABLE,
|
|
68
|
-
params: { item: noun
|
|
69
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
69
70
|
};
|
|
70
71
|
}
|
|
71
72
|
// Use behavior's canLock method for validation
|
|
@@ -75,14 +76,14 @@ exports.lockingAction = {
|
|
|
75
76
|
return {
|
|
76
77
|
valid: false,
|
|
77
78
|
error: locking_messages_1.MESSAGES.ALREADY_LOCKED,
|
|
78
|
-
params: { item: noun
|
|
79
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
79
80
|
};
|
|
80
81
|
}
|
|
81
82
|
if (noun.has(world_model_1.TraitType.OPENABLE) && world_model_1.OpenableBehavior.isOpen(noun)) {
|
|
82
83
|
return {
|
|
83
84
|
valid: false,
|
|
84
85
|
error: locking_messages_1.MESSAGES.NOT_CLOSED,
|
|
85
|
-
params: { item: noun
|
|
86
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
86
87
|
};
|
|
87
88
|
}
|
|
88
89
|
}
|
|
@@ -146,10 +147,11 @@ exports.lockingAction = {
|
|
|
146
147
|
if (result.lockSound) {
|
|
147
148
|
sharedData.sound = result.lockSound;
|
|
148
149
|
}
|
|
149
|
-
// Determine success message
|
|
150
|
+
// Determine success message — params carry EntityInfo for the
|
|
151
|
+
// formatter chain (ADR-158); domain fields stay as separate strings.
|
|
150
152
|
sharedData.messageId = (0, lock_shared_1.determineLockMessage)(true, !!withKey);
|
|
151
153
|
sharedData.params = {
|
|
152
|
-
item: noun
|
|
154
|
+
item: (0, utils_1.entityInfoFrom)(noun)
|
|
153
155
|
};
|
|
154
156
|
// Add container/door info
|
|
155
157
|
if (analysis.isContainer) {
|
|
@@ -159,7 +161,7 @@ exports.lockingAction = {
|
|
|
159
161
|
sharedData.params.isDoor = true;
|
|
160
162
|
}
|
|
161
163
|
if (withKey) {
|
|
162
|
-
sharedData.params.key = withKey
|
|
164
|
+
sharedData.params.key = (0, utils_1.entityInfoFrom)(withKey);
|
|
163
165
|
}
|
|
164
166
|
},
|
|
165
167
|
/**
|
|
@@ -169,11 +171,13 @@ exports.lockingAction = {
|
|
|
169
171
|
*/
|
|
170
172
|
report(context) {
|
|
171
173
|
const sharedData = getLockingSharedData(context);
|
|
174
|
+
const noun = context.command.directObject?.entity;
|
|
172
175
|
// Check if behavior failed (safety net for edge cases)
|
|
173
176
|
if (sharedData.failed) {
|
|
174
177
|
return [context.event('if.event.lock_blocked', {
|
|
175
178
|
messageId: `${context.action.id}.${sharedData.errorMessageId}`,
|
|
176
|
-
params
|
|
179
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
180
|
+
params: { item: noun ? (0, utils_1.entityInfoFrom)(noun) : { name: sharedData.targetName } },
|
|
177
181
|
targetId: sharedData.targetId,
|
|
178
182
|
targetName: sharedData.targetName,
|
|
179
183
|
reason: sharedData.errorMessageId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locking.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/locking/locking.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAKH,sDAAkG;AAClG,+CAA4C;AAC5C,0CAA4C;AAE5C,gDAAmG;AACnG,yDAA8C;
|
|
1
|
+
{"version":3,"file":"locking.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/locking/locking.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAKH,sDAAkG;AAClG,+CAA4C;AAC5C,0CAA4C;AAE5C,gDAAmG;AACnG,yDAA8C;AAC9C,0CAAgD;AAoBhD,SAAS,oBAAoB,CAAC,OAAsB;IAClD,OAAO,OAAO,CAAC,UAA+B,CAAC;AACjD,CAAC;AAEY,QAAA,aAAa,GAA0C;IAClE,EAAE,EAAE,qBAAS,CAAC,OAAO;IAErB,qDAAqD;IACrD,YAAY,EAAE;QACZ,MAAM,EAAE,kBAAU,CAAC,SAAS;QAC5B,GAAG,EAAE,kBAAU,CAAC,OAAO;KACxB;IAED,gBAAgB,EAAE;QAChB,WAAW;QACX,cAAc;QACd,QAAQ;QACR,WAAW;QACX,gBAAgB;QAChB,YAAY;QACZ,QAAQ;QACR,aAAa;QACb,YAAY;QACZ,cAAc;KACf;IACD,KAAK,EAAE,mBAAmB;IAE1B;;;OAGG;IACH,QAAQ,CAAC,OAAsB;QAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAClD,8FAA8F;QAC9F,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC;QAE7F,4BAA4B;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,2BAAQ,CAAC,SAAS;aAC1B,CAAC;QACJ,CAAC;QAED,iDAAiD;QACjD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,kBAAU,CAAC,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,OAAO,UAAU,CAAC,KAAM,CAAC;QAC3B,CAAC;QAED,yBAAyB;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,uBAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,2BAAQ,CAAC,YAAY;gBAC5B,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;aACvC,CAAC;QACJ,CAAC;QAED,+CAA+C;QAC/C,IAAI,CAAC,8BAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,+CAA+C;YAC/C,IAAI,8BAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpC,OAAO;oBACL,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,2BAAQ,CAAC,cAAc;oBAC9B,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;iBACvC,CAAC;YACJ,CAAC;YACD,IAAI,IAAI,CAAC,GAAG,CAAC,uBAAS,CAAC,QAAQ,CAAC,IAAI,8BAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClE,OAAO;oBACL,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,2BAAQ,CAAC,UAAU;oBAC1B,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;iBACvC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,gDAAgD;QAChD,MAAM,aAAa,GAAG,IAAA,qCAAuB,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC5E,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,OAAsB;QAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,MAAO,CAAC;QACnD,gEAAgE;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC;QAC7F,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAEjD,8BAA8B;QAC9B,MAAM,QAAQ,GAAG,IAAA,gCAAkB,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,oDAAoD;QACpD,MAAM,MAAM,GAAgB,8BAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEjE,mBAAmB;QACnB,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;QAC9B,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;QAElC,yCAAyC;QACzC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC;YACzB,wCAAwC;YACxC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,UAAU,CAAC,cAAc,GAAG,WAAW,CAAC;YAC1C,CAAC;iBAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACxB,UAAU,CAAC,cAAc,GAAG,QAAQ,CAAC;YACvC,CAAC;iBAAM,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;gBAChC,UAAU,CAAC,cAAc,GAAG,gBAAgB,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,cAAc,GAAG,WAAW,CAAC;YAC1C,CAAC;YACD,OAAO;QACT,CAAC;QAED,oBAAoB;QACpB,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC;QAE1B,qCAAqC;QACrC,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC;QAChC,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC;QAC3B,CAAC;QAED,sBAAsB;QACtB,IAAI,OAAO,EAAE,CAAC;YACZ,UAAU,CAAC,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;YAC9B,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;QACpC,CAAC;QAED,oCAAoC;QACpC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,UAAU,CAAC,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC;QACtC,CAAC;QAED,8DAA8D;QAC9D,qEAAqE;QACrE,UAAU,CAAC,SAAS,GAAG,IAAA,kCAAoB,EAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC7D,UAAU,CAAC,MAAM,GAAG;YAClB,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC;SAC3B,CAAC;QAEF,0BAA0B;QAC1B,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,UAAU,CAAC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC;QACvC,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;QAClC,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,UAAU,CAAC,MAAM,CAAC,GAAG,GAAG,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAsB;QAC3B,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAElD,uDAAuD;QACvD,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE;oBAC7C,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,UAAU,CAAC,cAAc,EAAE;oBAC9D,4DAA4D;oBAC5D,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,EAAE;oBAC/E,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,UAAU,EAAE,UAAU,CAAC,UAAU;oBACjC,MAAM,EAAE,UAAU,CAAC,cAAc;iBAClC,CAAC,CAAC,CAAC;QACN,CAAC;QAED,kEAAkE;QAClE,OAAO;YACL,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE;gBAC/B,uDAAuD;gBACvD,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,UAAU,CAAC,SAAS,EAAE;gBACzD,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,8CAA8C;gBAC9C,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC1B,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,KAAK,EAAE,UAAU,CAAC,KAAK;aACxB,CAAC;SACH,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,OAAsB,EAAE,MAAwB;QACtD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE;gBAC7C,iBAAiB;gBACjB,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE;gBACjD,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;gBAC3B,cAAc;gBACd,QAAQ,EAAE,IAAI,EAAE,EAAE;gBAClB,UAAU,EAAE,IAAI,EAAE,IAAI;gBACtB,MAAM,EAAE,MAAM,CAAC,KAAK;aACrB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,QAAQ,EAAE;QACR,oBAAoB,EAAE,IAAI;QAC1B,sBAAsB,EAAE,KAAK;QAC7B,iBAAiB,EAAE,kBAAU,CAAC,SAAS;KACxC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"looking-data.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/looking/looking-data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"looking-data.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/looking/looking-data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAerD;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgD5E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkD/E,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgG5E,CAAC;AAEF;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,OAAO,GACd;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CA8FpD;AAED;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG5E,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG/E,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG5E,CAAC"}
|
|
@@ -10,6 +10,7 @@ exports.listContentsDataConfig = exports.roomDescriptionDataConfig = exports.loo
|
|
|
10
10
|
exports.determineLookingMessage = determineLookingMessage;
|
|
11
11
|
const world_model_1 = require("../../../../world-model/index.js");
|
|
12
12
|
const snapshot_utils_1 = require("../../base/snapshot-utils");
|
|
13
|
+
const utils_1 = require("../../../utils");
|
|
13
14
|
/**
|
|
14
15
|
* Check if a location is dark (needs light but has none).
|
|
15
16
|
* Delegates to VisibilityBehavior.isDark() as the single source of truth.
|
|
@@ -204,21 +205,24 @@ function determineLookingMessage(context, isDark) {
|
|
|
204
205
|
}
|
|
205
206
|
// Check if we're in a closed container/vehicle (can't see the room)
|
|
206
207
|
// This only happens when getDescribableLocation returns the container itself
|
|
208
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
207
209
|
if (!immediateContainer && location.hasTrait(world_model_1.TraitType.CONTAINER)) {
|
|
210
|
+
const info = (0, utils_1.entityInfoFrom)(location);
|
|
208
211
|
return {
|
|
209
212
|
messageId: 'in_container',
|
|
210
213
|
params: {
|
|
211
|
-
container:
|
|
212
|
-
location:
|
|
214
|
+
container: info,
|
|
215
|
+
location: info
|
|
213
216
|
}
|
|
214
217
|
};
|
|
215
218
|
}
|
|
216
219
|
else if (!immediateContainer && location.hasTrait(world_model_1.TraitType.SUPPORTER)) {
|
|
220
|
+
const info = (0, utils_1.entityInfoFrom)(location);
|
|
217
221
|
return {
|
|
218
222
|
messageId: 'on_supporter',
|
|
219
223
|
params: {
|
|
220
|
-
supporter:
|
|
221
|
-
location:
|
|
224
|
+
supporter: info,
|
|
225
|
+
location: info
|
|
222
226
|
}
|
|
223
227
|
};
|
|
224
228
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"looking-data.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/looking/looking-data.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;
|
|
1
|
+
{"version":3,"file":"looking-data.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/looking/looking-data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"looking.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/looking/looking.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAI/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"looking.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/looking/looking.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAI/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAcrD,eAAO,MAAM,aAAa,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAoI9D,CAAC"}
|
|
@@ -14,6 +14,7 @@ const world_model_1 = require("../../../../world-model/index.js");
|
|
|
14
14
|
const constants_1 = require("../../constants");
|
|
15
15
|
const emit_illustrations_1 = require("../../helpers/emit-illustrations");
|
|
16
16
|
const data_builder_types_1 = require("../../data-builder-types");
|
|
17
|
+
const utils_1 = require("../../../utils");
|
|
17
18
|
const looking_data_1 = require("./looking-data");
|
|
18
19
|
exports.lookingAction = {
|
|
19
20
|
id: constants_1.IFActions.LOOKING,
|
|
@@ -91,10 +92,15 @@ exports.lookingAction = {
|
|
|
91
92
|
? 'container_contents'
|
|
92
93
|
: 'surface_contents';
|
|
93
94
|
const containerKey = containerInfo.preposition === 'in' ? 'container' : 'surface';
|
|
95
|
+
// params carry EntityInfo for the formatter chain (ADR-158);
|
|
96
|
+
// top-level event fields stay strings for handler consumption.
|
|
97
|
+
const containerEntity = context.world.getEntity(containerInfo.containerId);
|
|
94
98
|
events.push(context.event('if.event.list.contents', {
|
|
95
99
|
messageId: `${context.action.id}.${contentsMessageId}`,
|
|
96
100
|
params: {
|
|
97
|
-
[containerKey]:
|
|
101
|
+
[containerKey]: containerEntity
|
|
102
|
+
? (0, utils_1.entityInfoFrom)(containerEntity)
|
|
103
|
+
: { name: containerInfo.containerName },
|
|
98
104
|
items: containerInfo.itemNames.join(', ')
|
|
99
105
|
},
|
|
100
106
|
containerId: containerInfo.containerId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"looking.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/looking/looking.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAIH,sDAA4D;AAC5D,+CAA4C;AAG5C,yEAAqE;AACrE,iEAA0D;AAC1D,iDAMwB;AAGX,QAAA,aAAa,GAA0C;IAClE,EAAE,EAAE,qBAAS,CAAC,OAAO;IACrB,gBAAgB,EAAE;QAChB,kBAAkB;QAClB,wBAAwB;QACxB,WAAW;QACX,eAAe;QACf,iBAAiB;QACjB,cAAc;QACd,cAAc;QACd,kBAAkB;QAClB,aAAa;QACb,sBAAsB;KACvB;IAED,QAAQ,CAAC,OAAsB;QAC7B,wDAAwD;QACxD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,OAAsB;QAC5B,sCAAsC;QACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC;QACzC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEhE,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,uBAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,uBAAS,CAAC,CAAC;YAC3C,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBACpC,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,qDAAqD;IACvD,CAAC;IAED,MAAM,CAAC,OAAsB;QAC3B,+DAA+D;QAC/D,MAAM,MAAM,GAAqB,EAAE,CAAC;QAEpC,0BAA0B;QAC1B,MAAM,eAAe,GAAG,IAAA,mCAAc,EAAC,qCAAsB,EAAE,OAAO,CAAC,CAAC;QAExE,+BAA+B;QAC/B,MAAM,MAAM,GAAG,eAAe,CAAC,MAAiB,CAAC;QACjD,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAA,sCAAuB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAEvE,kEAAkE;QAClE,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE;gBAC3C,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,SAAS,EAAE;gBAC9C,MAAM;gBACN,GAAG,eAAe;aACnB,CAAC,CAAC,CAAC;YACJ,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,kGAAkG;QAClG,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEzB,2EAA2E;QAC3E,MAAM,YAAY,GAAG,IAAA,mCAAc,EAAC,wCAAyB,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,YAAY,CAAC,CAAC,CAAC;QAEtE,kDAAkD;QAClD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,sCAAiB,EAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED,2BAA2B;QAC3B,MAAM,QAAQ,GAAG,IAAA,mCAAc,EAAC,qCAAsB,EAAE,OAAO,CAAC,CAAC;QAEjE,2DAA2D;QAC3D,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE;gBAClD,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,gBAAgB;gBAC/C,MAAM;gBACN,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QAED,iDAAiD;QACjD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,qBAA4D,CAAC;QACpG,IAAI,qBAAqB,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9D,KAAK,MAAM,aAAa,IAAI,qBAAqB,EAAE,CAAC;gBAClD,MAAM,iBAAiB,GAAG,aAAa,CAAC,WAAW,KAAK,IAAI;oBAC1D,CAAC,CAAC,oBAAoB;oBACtB,CAAC,CAAC,kBAAkB,CAAC;gBACvB,MAAM,YAAY,GAAG,aAAa,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;gBAElF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE;oBAClD,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,iBAAiB,EAAE;oBACtD,MAAM,EAAE;wBACN,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"looking.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/looking/looking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opening.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/opening/opening.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAM/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"opening.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/opening/opening.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAM/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAqBrD,eAAO,MAAM,aAAa,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CA6M9D,CAAC"}
|
|
@@ -17,6 +17,7 @@ const world_model_1 = require("../../../../world-model/index.js");
|
|
|
17
17
|
const constants_1 = require("../../constants");
|
|
18
18
|
const types_1 = require("../../../scope/types");
|
|
19
19
|
const opening_messages_1 = require("./opening-messages");
|
|
20
|
+
const utils_1 = require("../../../utils");
|
|
20
21
|
function getOpeningSharedData(context) {
|
|
21
22
|
return context.sharedData;
|
|
22
23
|
}
|
|
@@ -85,7 +86,7 @@ exports.openingAction = {
|
|
|
85
86
|
return {
|
|
86
87
|
valid: false,
|
|
87
88
|
error: opening_messages_1.OpeningMessages.NOT_OPENABLE,
|
|
88
|
-
params: { item: noun
|
|
89
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
89
90
|
};
|
|
90
91
|
}
|
|
91
92
|
// Use behavior's canOpen method for validation
|
|
@@ -93,7 +94,7 @@ exports.openingAction = {
|
|
|
93
94
|
return {
|
|
94
95
|
valid: false,
|
|
95
96
|
error: opening_messages_1.OpeningMessages.ALREADY_OPEN,
|
|
96
|
-
params: { item: noun
|
|
97
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
97
98
|
};
|
|
98
99
|
}
|
|
99
100
|
// Check lock status using behavior
|
|
@@ -101,7 +102,7 @@ exports.openingAction = {
|
|
|
101
102
|
return {
|
|
102
103
|
valid: false,
|
|
103
104
|
error: opening_messages_1.OpeningMessages.LOCKED,
|
|
104
|
-
params: { item: noun
|
|
105
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
105
106
|
};
|
|
106
107
|
}
|
|
107
108
|
return { valid: true };
|
|
@@ -137,11 +138,12 @@ exports.openingAction = {
|
|
|
137
138
|
const isContainer = noun.has(world_model_1.TraitType.CONTAINER);
|
|
138
139
|
const contents = isContainer ? context.world.getContents(noun.id) : [];
|
|
139
140
|
let messageKey = opening_messages_1.OpeningMessages.OPENED;
|
|
140
|
-
|
|
141
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
142
|
+
let params = { item: (0, utils_1.entityInfoFrom)(noun) };
|
|
141
143
|
// Special message for empty containers
|
|
142
144
|
if (isContainer && contents.length === 0) {
|
|
143
145
|
messageKey = opening_messages_1.OpeningMessages.ITS_EMPTY;
|
|
144
|
-
params = { container: noun
|
|
146
|
+
params = { container: (0, utils_1.entityInfoFrom)(noun) };
|
|
145
147
|
}
|
|
146
148
|
// 1. Primary domain event with messageId (simplified pattern - ADR-097)
|
|
147
149
|
events.push(context.event('if.event.opened', {
|
|
@@ -183,11 +185,11 @@ exports.openingAction = {
|
|
|
183
185
|
// If error already contains dots (e.g., story interceptor ID), use as-is; otherwise prefix with action ID
|
|
184
186
|
const messageId = error.includes('.') ? error : `${context.action.id}.${error}`;
|
|
185
187
|
return [context.event('if.event.open_blocked', {
|
|
186
|
-
// Rendering data
|
|
188
|
+
// Rendering data — EntityInfo for the formatter chain (ADR-158)
|
|
187
189
|
messageId,
|
|
188
190
|
params: {
|
|
189
191
|
...result.params,
|
|
190
|
-
item: noun
|
|
192
|
+
item: noun ? (0, utils_1.entityInfoFrom)(noun) : undefined
|
|
191
193
|
},
|
|
192
194
|
// Domain data
|
|
193
195
|
targetId: noun?.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opening.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/opening/opening.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,sDAAqK;AAErK,+CAA4C;AAG5C,gDAAkD;AAElD,yDAAqD;
|
|
1
|
+
{"version":3,"file":"opening.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/opening/opening.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pulling.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/pulling/pulling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAK/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"pulling.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/pulling/pulling.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAK/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAkBrD,eAAO,MAAM,aAAa,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAyH9D,CAAC"}
|
|
@@ -16,6 +16,7 @@ exports.pullingAction = void 0;
|
|
|
16
16
|
const world_model_1 = require("../../../../world-model/index.js");
|
|
17
17
|
const constants_1 = require("../../constants");
|
|
18
18
|
const types_1 = require("../../../scope/types");
|
|
19
|
+
const utils_1 = require("../../../utils");
|
|
19
20
|
function getPullingSharedData(context) {
|
|
20
21
|
return context.sharedData;
|
|
21
22
|
}
|
|
@@ -54,19 +55,19 @@ exports.pullingAction = {
|
|
|
54
55
|
}
|
|
55
56
|
// Check if object is pullable
|
|
56
57
|
if (!target.has(world_model_1.TraitType.PULLABLE)) {
|
|
57
|
-
return { valid: false, error: 'cant_pull_that', params: { target: target
|
|
58
|
+
return { valid: false, error: 'cant_pull_that', params: { target: (0, utils_1.entityInfoFrom)(target) } };
|
|
58
59
|
}
|
|
59
60
|
// Can't pull worn items
|
|
60
61
|
if (target.has(world_model_1.TraitType.WEARABLE)) {
|
|
61
62
|
const wearable = target.getTrait(world_model_1.WearableTrait);
|
|
62
63
|
if (wearable?.isWorn) {
|
|
63
|
-
return { valid: false, error: 'worn', params: { target: target
|
|
64
|
+
return { valid: false, error: 'worn', params: { target: (0, utils_1.entityInfoFrom)(target) } };
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
67
|
// Check state of pullable
|
|
67
68
|
const pullable = target.get(world_model_1.TraitType.PULLABLE);
|
|
68
69
|
if (pullable.state === 'pulled') {
|
|
69
|
-
return { valid: false, error: 'already_pulled', params: { target: target
|
|
70
|
+
return { valid: false, error: 'already_pulled', params: { target: (0, utils_1.entityInfoFrom)(target) } };
|
|
70
71
|
}
|
|
71
72
|
return { valid: true };
|
|
72
73
|
},
|
|
@@ -95,7 +96,9 @@ exports.pullingAction = {
|
|
|
95
96
|
return [context.event('if.event.pulled', {
|
|
96
97
|
blocked: true,
|
|
97
98
|
messageId: `${context.action.id}.${result.error}`,
|
|
98
|
-
params
|
|
99
|
+
// params carry EntityInfo for the formatter chain (ADR-158);
|
|
100
|
+
// top-level fields stay strings for handlers.
|
|
101
|
+
params: { target: target ? (0, utils_1.entityInfoFrom)(target) : undefined, ...result.params },
|
|
99
102
|
reason: result.error,
|
|
100
103
|
targetId: target?.id,
|
|
101
104
|
targetName: target?.name
|
|
@@ -107,10 +110,12 @@ exports.pullingAction = {
|
|
|
107
110
|
report(context) {
|
|
108
111
|
const events = [];
|
|
109
112
|
const sharedData = getPullingSharedData(context);
|
|
113
|
+
const target = context.command.directObject?.entity;
|
|
110
114
|
// Emit pulled event with messageId for text rendering
|
|
111
115
|
events.push(context.event('if.event.pulled', {
|
|
112
116
|
messageId: `${context.action.id}.pulled`,
|
|
113
|
-
params
|
|
117
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
118
|
+
params: { target: target ? (0, utils_1.entityInfoFrom)(target) : { name: sharedData.targetName } },
|
|
114
119
|
target: sharedData.targetId,
|
|
115
120
|
targetName: sharedData.targetName,
|
|
116
121
|
pullCount: sharedData.pullCount,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pulling.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/pulling/pulling.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,sDAA+E;AAC/E,+CAA4C;AAG5C,gDAAkD;
|
|
1
|
+
{"version":3,"file":"pulling.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/pulling/pulling.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,sDAA+E;AAC/E,+CAA4C;AAG5C,gDAAkD;AAClD,0CAAgD;AAYhD,SAAS,oBAAoB,CAAC,OAAsB;IAClD,OAAO,OAAO,CAAC,UAA+B,CAAC;AACjD,CAAC;AAEY,QAAA,aAAa,GAA0C;IAClE,EAAE,EAAE,qBAAS,CAAC,OAAO;IAErB,qDAAqD;IACrD,YAAY,EAAE;QACZ,MAAM,EAAE,kBAAU,CAAC,SAAS;KAC7B;IAED,KAAK,EAAE,aAAa;IAEpB,QAAQ,EAAE;QACR,oBAAoB,EAAE,IAAI;QAC1B,sBAAsB,EAAE,KAAK;QAC7B,iBAAiB,EAAE,kBAAU,CAAC,SAAS;KACxC;IAED,gBAAgB,EAAE;QAChB,WAAW;QACX,aAAa;QACb,eAAe;QACf,gBAAgB;QAChB,MAAM;QACN,QAAQ;QACR,iBAAiB;QACjB,gBAAgB;KACjB;IAED,QAAQ,CAAC,OAAsB;QAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAEpD,8BAA8B;QAC9B,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;QAC9C,CAAC;QAED,iDAAiD;QACjD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAU,CAAC,SAAS,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,OAAO,UAAU,CAAC,KAAM,CAAC;QAC3B,CAAC;QAED,8BAA8B;QAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAC/F,CAAC;QAED,wBAAwB;QACxB,IAAI,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,2BAAa,CAAC,CAAC;YAChD,IAAI,QAAQ,EAAE,MAAM,EAAE,CAAC;gBACrB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACrF,CAAC;QACH,CAAC;QAED,0BAA0B;QAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,QAAQ,CAAkB,CAAC;QACjE,IAAI,QAAQ,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAA,sBAAc,EAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAC/F,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,OAAsB;QAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,MAAO,CAAC;QACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,QAAQ,CAAkB,CAAC;QACjE,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAEjD,gDAAgD;QAChD,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;QAChC,UAAU,CAAC,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QACpC,UAAU,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,IAAI,CAAC,CAAC;QAC/C,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAExC,uBAAuB;QACvB,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC;QAC1B,QAAQ,CAAC,SAAS,GAAG,CAAC,QAAQ,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,OAAsB,EAAE,MAAwB;QACtD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QACpD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE;gBACvC,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE;gBACjD,6DAA6D;gBAC7D,8CAA8C;gBAC9C,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE;gBACjF,MAAM,EAAE,MAAM,CAAC,KAAK;gBACpB,QAAQ,EAAE,MAAM,EAAE,EAAE;gBACpB,UAAU,EAAE,MAAM,EAAE,IAAI;aACzB,CAAC,CAAC,CAAC;IACN,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,OAAsB;QAC3B,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAEpD,sDAAsD;QACtD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE;YAC3C,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS;YACxC,4DAA4D;YAC5D,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,EAAE;YACrF,MAAM,EAAE,UAAU,CAAC,QAAQ;YAC3B,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAC9B,CAAC,CAAC,CAAC;QAEJ,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pushing.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/pushing/pushing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"pushing.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/pushing/pushing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAiBrD,eAAO,MAAM,aAAa,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAuT9D,CAAC"}
|