updates

Author: sinclairzx81

example/index.ts

@@ -142,6 +142,4 @@ console.log(Json)
   })
   console.log(project.parser)   // parser file content
   console.log(project.mapping)  // semantic mapping file content
-}
-
-
+}

example/typebox/interpreted/runtime.ts

@@ -139,10 +139,7 @@ const Reference = Runtime.Ident((result, context) => ReferenceMapping(result, co
 function TemplateTextMapping(input: string) {
   return T.Literal(input)
 }
-const TemplateText = Runtime.Union([
-  Runtime.Until('${'),
-  Runtime.Until('`'),
-], TemplateTextMapping)
+const TemplateText = Runtime.Until(['`', '${'], TemplateTextMapping)
 // ------------------------------------------------------------------
 // TemplateInterpolate
 // ------------------------------------------------------------------

readme.md

@@ -189,20 +189,20 @@ const R3 = Runtime.Parse(T, 'Y Z')                   // const R3 = [[], 'Y Z']
 
 ### Until
 
-The Until combinator parses all characters up to (but not including) the specified string. The specified string remains unconsumed in the input. If the string is not found, parsing fails.
+The Until combinator will parse characters up to (but not including) one of the specified sentinal string values. If a sentinal string value is not found, parsing fails.
 
 **BNF**
 
 ```bnf
-<T> ::= ? any character until 'Z' ?
+<T> ::= ? any character until ['Z'] ?
 ```
 
 **TypeScript**
 
 ```typescript
-const T = Runtime.Until('Z')                        // const T = {
+const T = Runtime.Until(['Z'])                      // const T = {
                                                     //   type: 'Until',
-                                                    //   value: 'Z'
+                                                    //   values: ['Z']
                                                     // }
 
 const R = Runtime.Parse(T, 'X Y Z')                 // const R = ['X Y ', 'Z']

test/__tests__/runtime/parse.ts

@@ -29,7 +29,13 @@ Deno.test('Until', () => {
   Assert(Runtime.Parse(Runtime.Until(['A']), 'A'), ['', 'A'])
   Assert(Runtime.Parse(Runtime.Until(['A']), '  A'), ['  ', 'A'])
   Assert(Runtime.Parse(Runtime.Until(['A']), '  A '), ['  ', 'A '])
+
+  Assert(Runtime.Parse(Runtime.Until(['A', 'B']), ''), [])
+  Assert(Runtime.Parse(Runtime.Until(['A', 'B']), 'BA'), ['', 'BA'])
+  Assert(Runtime.Parse(Runtime.Until(['A', 'B']), '  BA'), ['  ', 'BA'])
+  Assert(Runtime.Parse(Runtime.Until(['A', 'B']), '  BA '), ['  ', 'BA '])
 })
+
 // ----------------------------------------------------------------
 // Ident
 // ----------------------------------------------------------------

test/__tests__/static/parse.ts

@@ -28,6 +28,12 @@ Assert<Static.Parse<Static.Until<['A']>, ''>, []>()
 Assert<Static.Parse<Static.Until<['A']>, 'A'>, ['', 'A']>()
 Assert<Static.Parse<Static.Until<['A']>, '  A'>, ['  ', 'A']>()
 Assert<Static.Parse<Static.Until<['A']>, '  A '>, ['  ', 'A ']>()
+
+Assert<Static.Parse<Static.Until<['A', 'B']>, ''>, []>
+Assert<Static.Parse<Static.Until<['A', 'B']>, 'BA'>, ['', 'BA']>
+Assert<Static.Parse<Static.Until<['A', 'B']>, '  BA'>, ['  ', 'BA']>
+Assert<Static.Parse<Static.Until<['A', 'B']>, '  BA '>, ['  ', 'BA ']>
+
 // ------------------------------------------------------------------
 // Ident
 // ------------------------------------------------------------------