Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions builder/test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ const CASES = {
wide.app.examples = [{ request: `closed push 0 ${'v0 '.repeat(5).trim()}`, response: 'open' }];
const wm = deriveModel(wide).machine;
ok(!wm.exhaustive && wm.unreachable.length === 0 && wm.derived.length === 1, 'a partial sample claims only the final state');
// A request takes up to sixteen fields (the prism-code-wide-requests patch, UOR-Foundation/PrismPM#679).
const pad = (p, n) => ({ ...p, app: { ...p.app, fields: [...p.app.fields, ...Array.from({ length: n - p.app.fields.length }, (_, i) => ({ name: `pad${i}`, kind: 'choice', values: ['a', 'b'] }))], examples: p.app.examples.map((e) => ({ ...e, request: `${e.request}${' a'.repeat(n - p.app.fields.length)}` })) } });
ok(deriveModel(pad(rule30(), 16)).spec.fields.length === 16, 'a decision of sixteen fields is built');
await refused(async () => deriveModel(pad(rule30(), 17)), /at most sixteen fields/, 'a seventeenth field is refused');
const d = door();
await refused(async () => deriveModel({ ...d, app: { ...d.app, outcomes: [...d.app.outcomes, 'ajar'] } }), /answers are exactly the states/, 'answers that are not the states are refused');
await refused(async () => deriveModel({ ...d, machine: { ...d.machine, initial: 'ajar' } }), /not a state/, 'an initial state that is not a state is refused');
Expand Down
2 changes: 1 addition & 1 deletion builder/tool.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const SPEC_INPUT = {
fields: {
type: 'array',
minItems: 1,
maxItems: 8,
maxItems: 16,
description: 'One request is these values in order, separated by spaces.',
items: {
type: 'object',
Expand Down
11 changes: 7 additions & 4 deletions builder/vendor/prism-code/VENDOR.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Vendored prism-code journey

These files are byte copies from the npm package `prism-code` 0.7.2, under its
MIT license (`LICENSE`). The builder imports `spec.mjs`, `session.mjs`,
MIT license (`LICENSE`), with one patch recorded in `upstream.toml`
(`prism-code-wide-requests`): a request has at most sixteen fields, not eight
(`spec.mjs` refuses past sixteen, `render.mjs` reserves `decodeField1` to
`decodeField16`, and `mcp.mjs` declares `maxItems: 16`). The builder imports `spec.mjs`, `session.mjs`,
`render.mjs` and `template.mjs` as they are. It reads `mcp.mjs` only to check
that the `app` input of `prism_prompt` equals the `prism_spec` input that
prism-code declares (register row DR-12).
Expand All @@ -16,9 +19,9 @@ SHA-256 of each file, checked by `node builder/test.mjs DR-12`:

| File | SHA-256 |
| --- | --- |
| `src/journey/mcp.mjs` | `4da58794e4f5c1609ffaf2902419cb05300be39a21f69f05f55a64417c002740` |
| `src/journey/render.mjs` | `55f784df40a34f36992cf397c4ff0ba55a5b89b498eca397cd910238e2def64f` |
| `src/journey/mcp.mjs` | `fc21ba9d27eb3b7bb1f41a41007cd1111b2e4c8bed908a5c47fc1cbbd7e6b8eb` |
| `src/journey/render.mjs` | `af7e2abc99139eb4c5fa64eb69d1e1ba51483588e2f05091f6a3f01c6ffd186a` |
| `src/journey/session.mjs` | `73b2f266120a52d2951b5973afd664336748bb7c5693748207abcdd6c055a582` |
| `src/journey/spec.mjs` | `80f22a5ddd3f018d3711c067c1a93bd48b9f5627b459dac5710540c83c01104f` |
| `src/journey/spec.mjs` | `dd1e437a4ccc8c94c246b97015e6ab2b313e9b7a7a10c72ca0207b1633eebf68` |
| `src/journey/template.mjs` | `97885e092443ae6eb46060c976d9c6ee9ca9e138d8914e4f4ae32c0b9dad6ead` |
| `LICENSE` | `93f252866c651e9713b577c6f1d993709311557efe109050252f2fbc48ff0ff8` |
2 changes: 1 addition & 1 deletion builder/vendor/prism-code/src/journey/mcp.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const SPEC_INPUT = {
fields: {
type: 'array',
minItems: 1,
maxItems: 8,
maxItems: 16,
description: 'One request is these values in order, separated by spaces.',
items: {
type: 'object',
Expand Down
2 changes: 1 addition & 1 deletion builder/vendor/prism-code/src/journey/render.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const quote = (text) => `"${String(text).replace(/[^\x20-\x7e]/g, '').replace(/[

/** Every identifier the model uses, derived once so the model, the vectors and SPEC.md agree. */
export function names(spec) {
const used = new Set(['Request', 'byteAt', 'digitsValue', 'parseDigits', 'parseNumber', 'sliceOf', 'fieldEnd', 'decodeField1', 'decodeField2', 'decodeField3', 'decodeField4', 'decodeField5', 'decodeField6', 'decodeField7', 'decodeField8', 'judge', 'encodeAnswer', 'dispatch', 'application']);
const used = new Set(['Request', 'byteAt', 'digitsValue', 'parseDigits', 'parseNumber', 'sliceOf', 'fieldEnd', 'decodeField1', 'decodeField2', 'decodeField3', 'decodeField4', 'decodeField5', 'decodeField6', 'decodeField7', 'decodeField8', 'decodeField9', 'decodeField10', 'decodeField11', 'decodeField12', 'decodeField13', 'decodeField14', 'decodeField15', 'decodeField16', 'judge', 'encodeAnswer', 'dispatch', 'application']);
const claim = (base) => {
let name = base;
for (let i = 2; used.has(name) || LEAN_RESERVED.has(name); i++) name = `${base}${i}`;
Expand Down
2 changes: 1 addition & 1 deletion builder/vendor/prism-code/src/journey/spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export function validateSpec(input) {

const fields = spec.fields ?? [];
if (!Array.isArray(fields) || fields.length === 0) refuse('Name at least one field.', 'fields');
if (fields.length > 8) refuse('A request has at most eight fields.', 'fields');
if (fields.length > 16) refuse('A request has at most sixteen fields.', 'fields');
const seen = new Set();
for (const f of fields) {
if (!WORD.test(f.name ?? '')) refuse(`Field name \`${f.name}\` must be a lower-case word.`, 'fields');
Expand Down
9 changes: 9 additions & 0 deletions upstream.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,12 @@ repository = "UOR-Foundation/template"
pull = 62
release = { kind = "branch" }
repin = "frame"

[[patch]]
id = "prism-code-wide-requests"
what = "builder/vendor/prism-code takes a request of up to sixteen fields, not eight: spec.mjs refuses past sixteen, render.mjs reserves decodeField1 to decodeField16, mcp.mjs declares maxItems 16 (VENDOR.md)."
pinned = "builder/vendor/prism-code"
repository = "UOR-Foundation/PrismPM"
pull = 679
release = { kind = "npm", package = "prism-code" }
repin = "issue"
Loading