@lokascript/framework 4.7.0 → 4.8.0

package/dist/index.js

@@ -1706,6 +1706,11 @@ function readGreedy(tokens, stopMarkers) {
   }
   return values.length > 0 ? { type: "expression", raw: values.join(" ") } : null;
 }
+function isListedWord(token, words) {
+  if (!token) return false;
+  const forms = [token.value, token.normalized].filter((f) => typeof f === "string");
+  return forms.some((form) => words.some((word) => word.toLowerCase() === form.toLowerCase()));
+}
 var StockValueReader = class {
   constructor(view, profiles = {}) {
     this.view = view;
@@ -1738,6 +1743,11 @@ var StockValueReader = class {
       const token = tokens.peek();
       if (token && this.view.wouldMatch(next, token)) return false;
     }
+    if (slot.words && !isListedWord(tokens.peek(), slot.words)) return slot.optional ?? false;
+    if (slot.optional && !slot.greedy) {
+      const token = tokens.peek();
+      if (token && isStopMarker(token, greedyStopMarkers(this.view.patternRest()))) return true;
+    }
     if (slot.greedy) {
       const value = readGreedy(tokens, greedyStopMarkers(this.view.patternRest()));
       if (value) {
@@ -2143,11 +2153,13 @@ function generateVerbFirstPattern(schema, profile, config = defaultConfig2) {
   const verbToken = keyword.alternatives ? { type: "literal", value: keyword.primary, alternatives: keyword.alternatives } : { type: "literal", value: keyword.primary };
   const roleTokens = requiredRoles.flatMap((r) => {
     const prefix = r.valuePrefixLiteral?.[profile.code];
+    const words = wordsFor(r, profile.code);
     const roleToken = {
       type: "role",
       role: r.role,
       optional: false,
-      expectedTypes: r.expectedTypes
+      expectedTypes: r.expectedTypes,
+      ...words ? { words } : {}
     };
     return prefix ? [{ type: "literal", value: prefix }, roleToken] : [roleToken];
   });
@@ -2317,11 +2329,17 @@ function buildRoleTokens(grammar, schema, profile) {
   }
   return tokens;
 }
+function wordsFor(roleSpec, language) {
+  if (!roleSpec.words) return void 0;
+  const words = [...roleSpec.words["*"] ?? [], ...roleSpec.words[language] ?? []];
+  return words.length > 0 ? words : void 0;
+}
 function buildRoleToken(roleSpec, profile) {
   const tokens = [];
   const overrideMarker = roleSpec.markerOverride?.[profile.code];
   const defaultMarker = profile.roleMarkers[roleSpec.role];
   const suppressMarker = roleSpec.renderOverride?.[profile.code] === "";
+  const words = wordsFor(roleSpec, profile.code);
   const roleValueToken = {
     type: "role",
     role: roleSpec.role,
@@ -2333,7 +2351,9 @@ function buildRoleToken(roleSpec, profile) {
     ...roleSpec.valueShape !== void 0 ? { valueShape: roleSpec.valueShape } : {},
     // A greedy role reads up to the next marker the pattern owes (a domain's
     // SQL condition); its value reader does the reading.
-    ...roleSpec.greedy ? { greedy: true } : {}
+    ...roleSpec.greedy ? { greedy: true } : {},
+    // A role with a word list reads only one of its words.
+    ...words ? { words } : {}
   };
   const prefixLiteral = roleSpec.valuePrefixLiteral?.[profile.code];
   const pushPrefixed = () => {
@@ -3889,12 +3909,15 @@ function readingDifference(source, back) {
 
 // src/api/create-dsl.ts
 var UnreadInputError = class extends Error {
-  constructor(input, language, reading, unread) {
-    super(`"${input}" (${language}) reads as ${reading.action} only by leaving "${unread}" unread`);
+  constructor(input, language, reading, unread, hint) {
+    super(
+      `"${input}" (${language}) reads as ${reading.action} only by leaving "${unread}" unread` + (hint ? `; ${hint}` : "")
+    );
     this.input = input;
     this.language = language;
     this.reading = reading;
     this.unread = unread;
+    this.hint = hint;
     this.code = "unread-input";
     this.name = "UnreadInputError";
   }
@@ -4013,15 +4036,32 @@ var MultilingualDSLImpl = class {
     }
     if (longestPartial) {
       const unread = tokens.tokens.slice(longestPartial.consumedTokens).map((t) => t.value).join(" ");
+      const hint = this.quoteHint(longestPartial, tokens.tokens);
       throw new UnreadInputError(
         input,
         language,
         this.nodeOf(longestPartial, input, language),
-        unread
+        unread,
+        ...hint ? [hint] : []
       );
     }
     throw new Error(`No pattern matched for input: ${input}`);
   }
+  /**
+   * `if "buy milk" is one value, quote it`, where the last token a match read is a bare word it took
+   * as a role's value (a role with no word list) and the first it left is a bare word too.
+   */
+  quoteHint(match, tokens) {
+    const last = tokens[match.consumedTokens - 1];
+    const next = tokens[match.consumedTokens];
+    if (last?.kind !== "identifier" || next?.kind !== "identifier") return void 0;
+    const schema = this.schemaLookup.getSchema(match.pattern.command);
+    const role = [...match.captured].find(
+      ([, v]) => v.raw === last.value
+    )?.[0];
+    if (!role || schema?.roles.find((r) => r.role === role)?.words) return void 0;
+    return `if "${last.value} ${next.value}" is one value, quote it`;
+  }
   nodeOf(match, input, language) {
     return {
       kind: "command",