@malloydata/malloy-filter 0.0.237-dev250224215546 → 0.0.237-dev250225015031

package/SERIALIZE_SAMPLES.md

@@ -20,7 +20,16 @@ Input:  !=5
 Output: !=5
 
 Input:  1, 3, 5, null
-Output: 1, 3, 5, NULL
+Output: 1, 3, 5, null
+
+Input:  1, 3, , 5,
+Output: 1, 3, 5
+Logs:    {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 6,
+  endIndex: 7
+}
 
 Input:  <1, >=100
 Output: <1, >=100
@@ -32,10 +41,10 @@ Input:   <= 10
 Output: <=10
 
 Input:  NULL
-Output: NULL
+Output: null
 
 Input:   -NULL
-Output: -NULL
+Output: -null
 
 Input:  (1, 7)
 Output: (1, 7)
@@ -53,17 +62,82 @@ Input:  [0,9],[20,29]
 Output: [0, 9], [20, 29]
 
 Input:  [0,10], 20, NULL, ( 72, 82 ]
-Output: [0, 10], 20, NULL, (72, 82]
+Output: [0, 10], 20, null, (72, 82]
 
 Input:  , notanumber,, "null", apple pear orange, nulle, nnull, >=,
-Errors:  { message: 'Invalid expression', startIndex: 2, endIndex: 12 } { message: 'Invalid expression', startIndex: 15, endIndex: 21 } { message: 'Invalid expression', startIndex: 23, endIndex: 28 } { message: 'Invalid expression', startIndex: 29, endIndex: 33 } { message: 'Invalid expression', startIndex: 34, endIndex: 40 } { message: 'Invalid expression', startIndex: 42, endIndex: 47 } { message: 'Invalid expression', startIndex: 49, endIndex: 54 } { message: 'Invalid expression', startIndex: 56, endIndex: 58 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid expression: notanumber',
+  startIndex: 2,
+  endIndex: 12
+} {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 13,
+  endIndex: 14
+} {
+  severity: 'error',
+  message: 'Invalid expression: "null"',
+  startIndex: 15,
+  endIndex: 21
+} {
+  severity: 'error',
+  message: 'Invalid expression: apple',
+  startIndex: 23,
+  endIndex: 28
+} {
+  severity: 'error',
+  message: 'Invalid expression: pear',
+  startIndex: 29,
+  endIndex: 33
+} {
+  severity: 'error',
+  message: 'Invalid expression: orange',
+  startIndex: 34,
+  endIndex: 40
+} {
+  severity: 'error',
+  message: 'Invalid expression: nulle',
+  startIndex: 42,
+  endIndex: 47
+} {
+  severity: 'error',
+  message: 'Invalid expression: nnull',
+  startIndex: 49,
+  endIndex: 54
+} {
+  severity: 'error',
+  message: 'Invalid expression: >=',
+  startIndex: 56,
+  endIndex: 58
+}
 
 Input:  [cat, 100], <cat
-Errors:  { message: 'Invalid number', startIndex: 1, endIndex: 4 } { message: 'Invalid expression', startIndex: 12, endIndex: 13 } { message: 'Invalid expression', startIndex: 13, endIndex: 16 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid number',
+  startIndex: 1,
+  endIndex: 4
+} {
+  severity: 'error',
+  message: 'Invalid expression: <',
+  startIndex: 12,
+  endIndex: 13
+} {
+  severity: 'error',
+  message: 'Invalid expression: cat',
+  startIndex: 13,
+  endIndex: 16
+}
 
 Input:  -5.5 to 10
 Output: -5.5, 10
-Errors:  { message: 'Invalid expression', startIndex: 5, endIndex: 7 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid expression: to',
+  startIndex: 5,
+  endIndex: 7
+}
 ```
 
 -------------------------------------------------------------------------
@@ -83,11 +157,16 @@ Input:  -CAT,-DOG,mouse, bird, zebra, -horse, -goat
 Output: -CAT, -DOG, mouse, bird, zebra, -horse, -goat
 
 Input:  Missing ,NULL
-Output: Missing, NULL
+Output: Missing, null
 
 Input:  CAT%, D%OG, %ous%, %ira_f%, %_oat,
 Output: CAT%, D%OG, %ous%, %ira_f%, %_oat
-Errors:  { message: 'Invalid expression', startIndex: 34, endIndex: 35 }
+Logs:    {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 34,
+  endIndex: 35
+}
 
 Input:  -CAT%,-D%OG,-%mouse,-%zebra%
 Output: -CAT%, -D%OG, -%mouse, -%zebra%
@@ -111,22 +190,40 @@ Input:  \_CAT,D\%G,\mouse
 Output: \_CAT, D\%G, mouse
 
 Input:  CAT,-NULL
-Output: CAT, -NULL
+Output: CAT, -null
 
 Input:  CAT,-"NULL"
 Output: CAT, -"NULL"
 
 Input:  CAT,NULL
-Output: CAT, NULL
+Output: CAT, null
+
+Input:  CAT,,
+Output: CAT
+Logs:    {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 4,
+  endIndex: 5
+}
+
+Input:  CAT, , DOG
+Output: CAT, DOG
+Logs:    {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 4,
+  endIndex: 5
+}
 
 Input:  EMPTY
-Output: EMPTY
+Output: empty
 
 Input:  -EMPTY
-Output: -EMPTY
+Output: -empty
 
 Input:  CAT,-EMPTY
-Output: CAT, -EMPTY
+Output: CAT, -empty
 
 Input:  "CAT,DOG',mo`use,zeb'''ra,g"""t,g\"ir\`af\'e
 Output: "CAT, DOG', mo`use, zeb'''ra, g"""t, g"ir`af'e
@@ -139,7 +236,12 @@ Output: CAT, DOG, -, -
 
 Input:  --CAT,DOG,\
 Output: --CAT, DOG
-Errors:  { message: 'Invalid expression', startIndex: 10, endIndex: 11 }
+Logs:    {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 10,
+  endIndex: 11
+}
 
 Input:  CAT\ DOG
 Output: CAT DOG
@@ -148,13 +250,13 @@ Input:  _\_CAT
 Output: _\\_CAT
 
 Input:  \NULL
-Output: \NULL
+Output: NULL
 
 Input:  \-NULL
-Output: \-NULL
+Output: -NULL
 
 Input:  -N\ULL
-Output: -\NULL
+Output: -NULL
 
 Input:  CA--,D-G
 Output: CA--, D-G
@@ -163,7 +265,7 @@ Input:   hello world, foo="bar baz" , qux=quux
 Output: hello world, foo="bar baz", qux=quux
 
 Input:  one ,Null ,  Empty,E M P T Y Y,EEmpty,        emptIEs
-Output: one, NULL, EMPTY, E M P T Y Y, EEmpty, emptIEs
+Output: one, null, empty, E M P T Y Y, EEmpty, emptIEs
 
 Input:
 
@@ -174,34 +276,63 @@ Input:
 
 ```code
 Input:  true
-Output: TRUE
+Output: true
 
 Input:  FALSE
-Output: FALSE
+Output: false
 
 Input:  =false
-Output: =FALSE
+Output: =false
 
 Input:  null
-Output: NULL
+Output: null
 
 Input:  -NULL
-Output: -NULL
+Output: -null
 
-Input:   True , faLSE,=false,NULl,-null
-Output: TRUE, FALSE, =FALSE, NULL, -NULL
+Input:  null,
+Output: null
+
+Input:   True , , faLSE,=false,NULl,-null
+Output: true, false, =false, null, -null
+Logs:    {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 8,
+  endIndex: 9
+}
 
 Input:  -'null'
-Errors:  { message: "Invalid token -'null'", startIndex: 0, endIndex: 7 }
+Logs:    {
+  severity: 'error',
+  message: "Invalid token -'null'",
+  startIndex: 0,
+  endIndex: 7
+}
 
 Input:  10
-Errors:  { message: 'Invalid token 10', startIndex: 0, endIndex: 2 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token 10',
+  startIndex: 0,
+  endIndex: 2
+}
 
 Input:  nnull
-Errors:  { message: 'Invalid token nnull', startIndex: 0, endIndex: 5 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token nnull',
+  startIndex: 0,
+  endIndex: 5
+}
 
 Input:   truee
-Errors:  { message: 'Invalid token truee', startIndex: 1, endIndex: 6 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token truee',
+  startIndex: 1,
+  endIndex: 6
+}
 
 ```
 
@@ -210,103 +341,176 @@ Errors:  { message: 'Invalid token truee', startIndex: 1, endIndex: 6 }
 
 ```code
 Input:  this month
-Output: THIS MONTH
+Output: this month
 
 Input:  3 days
-Output: 3 DAYS
+Output: 3 days
 
 Input:  3 days ago
-Output: 3 DAYS AGO
+Output: 3 days ago
 
 Input:  3 months ago for 2 days
-Output: 3 MONTHS AGO FOR 2 DAYS
+Output: 3 months ago for 2 days
 
 Input:  2025 weeks ago
-Output: 2025 WEEKS AGO
+Output: 2025 weeks ago
 
 Input:  before 3 days ago
-Output: BEFORE 3 DAYS AGO
+Output: before 3 days ago
 
 Input:  before 2025-08-30 08:30:20
-Output: BEFORE 2025-08-30 08:30:20
+Output: before 2025-08-30 08:30:20
 
 Input:  after 2025-10-05
-Output: AFTER 2025-10-05
+Output: after 2025-10-05
 
 Input:  2025-08-30 12:00 to 2025-09-18 14:30
-Output: 2025-08-30 12:00 TO 2025-09-18 14:30
+Output: 2025-08-30 12:00 to 2025-09-18 14:30
 
 Input:  this year
-Output: THIS YEAR
+Output: this year
 
 Input:  next tuesday
-Output: NEXT TUESDAY
+Output: next tuesday
 
 Input:  7 years from now
-Output: 7 YEARS FROM NOW
+Output: 7 years from now
 
 Input:  2025-01-01 12:00:00 for 3 days
-Output: 2025-01-01 12:00:00 FOR 3 DAYS
+Output: 2025-01-01 12:00:00 for 3 days
+
+Input:  2020-08-12 03:12:56.57
+Output: 2020-08-12 03:12:56.57
+
+Input:  2020-08-12T03:12:56[PST]
+Output: 2020-08-12T03:12:56[PST]
+
+Input:  2020-08-12 03:12:56
+Output: 2020-08-12 03:12:56
+
+Input:  2020-08-12 03:22
+Output: 2020-08-12 03:22
+
+Input:  2020-08-12 03
+Output: 2020-08-12 03
 
 Input:  2020-08-12
 Output: 2020-08-12
 
+Input:  2020-Q3
+Output: 2020-Q3
+
+Input:  2020-08-07-wK
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token 2020-08-07-wk',
+  startIndex: 0,
+  endIndex: 13
+}
+
 Input:  2020-08
 Output: 2020-08
 
 Input:  today
-Output: TODAY
+Output: today
 
 Input:  yesterday
-Output: YESTERDAY
+Output: yesterday
 
 Input:  tomorrow
-Output: TOMORROW
+Output: tomorrow
 
 Input:  TODay,Yesterday, TOMORROW , ,TODay ,,
-Output: TODAY, YESTERDAY, TOMORROW, TODAY
+Output: today, yesterday, tomorrow, today
+Logs:    {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 28,
+  endIndex: 29
+} {
+  severity: 'warn',
+  message: 'Empty clause',
+  startIndex: 36,
+  endIndex: 37
+}
 
 Input:  2010 to 2011, 2015 to 2016 , 2018, 2020
-Output: 2010 TO 2011, 2015 TO 2016, 2018, 2020
+Output: 2010 to 2011, 2015 to 2016, 2018, 2020
 
 Input:  next week
-Output: NEXT WEEK
+Output: next week
 
 Input:  now
-Output: NOW
+Output: now
 
 Input:  now to next month
-Output: NOW TO NEXT MONTH
+Output: now to next month
 
 Input:  null
-Output: NULL
-Errors:  { message: 'Invalid token NULL', startIndex: 0, endIndex: 4 }
+Output: null
 
 Input:  -null,
-Output: -NULL
-Errors:  { message: 'Invalid token -NULL', startIndex: 0, endIndex: 5 }
+Output: -null
 
 Input:   yyesterday
-Errors:  { message: 'Invalid token yyesterday', startIndex: 1, endIndex: 11 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token yyesterday',
+  startIndex: 1,
+  endIndex: 11
+}
 
 Input:  before
 
 Input:  for
-Errors:  { message: 'Invalid token FOR', startIndex: 0, endIndex: 3 }
-
-Input:  7
-Errors:  { message: 'Invalid token 7', startIndex: 0, endIndex: 1 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token for',
+  startIndex: 0,
+  endIndex: 3
+}
+
+Input:  12
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token 12',
+  startIndex: 0,
+  endIndex: 2
+}
 
 Input:  from now
-Output: NOW
-Errors:  { message: 'Invalid token FROM', startIndex: 0, endIndex: 4 }
+Output: now
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token from',
+  startIndex: 0,
+  endIndex: 4
+}
 
 Input:  2025-12-25 12:32:
 Output: 2025-12-25
-Errors:  { message: 'Invalid token 12:32:', startIndex: 11, endIndex: 17 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token 12:32:',
+  startIndex: 11,
+  endIndex: 17
+}
+
+Input:  12:22
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token 12:22',
+  startIndex: 0,
+  endIndex: 5
+}
 
 Input:  after 2025 seconds
-Errors:  { message: 'Invalid token ', startIndex: 6, endIndex: 18 }
+Logs:    {
+  severity: 'error',
+  message: 'Invalid token ',
+  startIndex: 6,
+  endIndex: 18
+}
 
 Input:
 

package/dist/a_simple_parser.js

@@ -1,4 +1,10 @@
 "use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 const boolean_parser_1 = require("./boolean_parser");
 const string_parser_1 = require("./string_parser");

package/dist/a_simple_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"a_simple_parser.js","sourceRoot":"","sources":["../src/a_simple_parser.ts"],"names":[],"mappings":";;AAAA,qDAA+C;AAC/C,mDAA6C;AAC7C,mDAA6C;AAC7C,+CAAyC;AAEzC,+BAA+B;AAC/B,SAAS,aAAa;IACpB,IAAI,GAAG,GAAG,SAAS,CAAC;IACpB,MAAM,cAAc,GAAG,IAAI,4BAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAExD,GAAG,GAAG,iBAAiB,CAAC;IACxB,MAAM,cAAc,GAAG,IAAI,4BAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAExD,GAAG,GAAG,aAAa,CAAC;IACpB,MAAM,eAAe,GAAG,IAAI,8BAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEzD,GAAG,GAAG,kBAAkB,CAAC;IACzB,MAAM,YAAY,GAAG,IAAI,wBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC;AAED,aAAa,EAAE,CAAC"}
+{"version":3,"file":"a_simple_parser.js","sourceRoot":"","sources":["../src/a_simple_parser.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,qDAA+C;AAC/C,mDAA6C;AAC7C,mDAA6C;AAC7C,+CAAyC;AAEzC,+BAA+B;AAC/B,SAAS,aAAa;IACpB,IAAI,GAAG,GAAG,SAAS,CAAC;IACpB,MAAM,cAAc,GAAG,IAAI,4BAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAExD,GAAG,GAAG,iBAAiB,CAAC;IACxB,MAAM,cAAc,GAAG,IAAI,4BAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAExD,GAAG,GAAG,aAAa,CAAC;IACpB,MAAM,eAAe,GAAG,IAAI,8BAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEzD,GAAG,GAAG,kBAAkB,CAAC;IACzB,MAAM,YAAY,GAAG,IAAI,wBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC;AAED,aAAa,EAAE,CAAC"}

package/dist/base_parser.js

@@ -1,4 +1,10 @@
 "use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseParser = void 0;
 class BaseParser {

package/dist/base_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"base_parser.js","sourceRoot":"","sources":["../src/base_parser.ts"],"names":[],"mappings":";;;AAEA,MAAsB,UAAU;IAK9B,YAAY,WAAmB;QAC7B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAES,OAAO;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAES,MAAM,CAAC,eAAe,CAC9B,UAAoB,EACpB,KAAa,EACb,MAAe;QAEf,MAAM,QAAQ,GAAG,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3C,IAAI,KAAK,GAAG,CAAC,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE;YACzC,OAAO,KAAK,CAAC;SACd;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,EAAE;gBAC5C,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAvCD,gCAuCC"}
+{"version":3,"file":"base_parser.js","sourceRoot":"","sources":["../src/base_parser.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,MAAsB,UAAU;IAK9B,YAAY,WAAmB;QAC7B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAES,OAAO;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAES,MAAM,CAAC,eAAe,CAC9B,UAAoB,EACpB,KAAa,EACb,MAAe;QAEf,MAAM,QAAQ,GAAG,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3C,IAAI,KAAK,GAAG,CAAC,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE;YACzC,OAAO,KAAK,CAAC;SACd;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,EAAE;gBAC5C,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAvCD,gCAuCC"}

package/dist/boolean_parser.js

@@ -1,4 +1,10 @@
 "use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BooleanParser = void 0;
 const tokenizer_1 = require("./tokenizer");
@@ -10,11 +16,11 @@ class BooleanParser extends base_parser_1.BaseParser {
     tokenize() {
         const specialSubstrings = [{ type: ',', value: ',' }];
         const specialWords = [
-            { type: 'NULL', value: 'null', ignoreCase: true },
-            { type: 'NOTNULL', value: '-null', ignoreCase: true },
-            { type: 'TRUE', value: 'true', ignoreCase: true },
-            { type: 'FALSE', value: '=false', ignoreCase: true },
-            { type: 'FALSEORNULL', value: 'false', ignoreCase: true },
+            { type: 'null', value: 'null', ignoreCase: true },
+            { type: 'not_null', value: '-null', ignoreCase: true },
+            { type: 'true', value: 'true', ignoreCase: true },
+            { type: 'false', value: '=false', ignoreCase: true },
+            { type: 'false_or_null', value: 'false', ignoreCase: true },
         ];
         const params = {
             trimWordWhitespace: true,
@@ -30,23 +36,32 @@ class BooleanParser extends base_parser_1.BaseParser {
         this.index = 0;
         this.tokenize();
         const clauses = [];
-        const errors = [];
+        const logs = [];
         while (this.index < this.tokens.length) {
             const token = this.getNext();
             if (token.type === ',') {
+                if (this.index > 0 && this.tokens[this.index - 1].type === ',') {
+                    logs.push({
+                        severity: 'warn',
+                        message: 'Empty clause',
+                        startIndex: token.startIndex,
+                        endIndex: token.endIndex,
+                    });
+                }
                 this.index++;
             }
-            else if (token.type === 'NULL' ||
-                token.type === 'TRUE' ||
-                token.type === 'FALSE' ||
-                token.type === 'FALSEORNULL' ||
-                token.type === 'NOTNULL') {
+            else if (token.type === 'null' ||
+                token.type === 'true' ||
+                token.type === 'false' ||
+                token.type === 'false_or_null' ||
+                token.type === 'not_null') {
                 const clause = { operator: token.type };
                 clauses.push(clause);
                 this.index++;
             }
             else {
-                errors.push({
+                logs.push({
+                    severity: 'error',
                     message: 'Invalid token ' + token.value,
                     startIndex: token.startIndex,
                     endIndex: token.endIndex,
@@ -54,7 +69,7 @@ class BooleanParser extends base_parser_1.BaseParser {
                 this.index++;
             }
         }
-        return { clauses, errors };
+        return { clauses, logs };
     }
 }
 exports.BooleanParser = BooleanParser;

package/dist/boolean_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"boolean_parser.js","sourceRoot":"","sources":["../src/boolean_parser.ts"],"names":[],"mappings":";;;AAAA,2CAAqE;AAMrE,+CAAyC;AAEzC,MAAa,aAAc,SAAQ,wBAAU;IAC3C,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAEO,QAAQ;QACd,MAAM,iBAAiB,GAAmB,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC;QACpE,MAAM,YAAY,GAAmB;YACnC,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAC;YAC/C,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC;YACnD,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAC;YAC/C,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAC;YAClD,EAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC;SACxD,CAAC;QACF,MAAM,MAAM,GAAoB;YAC9B,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,IAAI;YACvB,iBAAiB;YACjB,YAAY,EAAE,YAAY;SAC3B,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,qBAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,MAAM,OAAO,GAAoB,EAAE,CAAC;QACpC,MAAM,MAAM,GAAkB,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE;gBACtB,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;iBAAM,IACL,KAAK,CAAC,IAAI,KAAK,MAAM;gBACrB,KAAK,CAAC,IAAI,KAAK,MAAM;gBACrB,KAAK,CAAC,IAAI,KAAK,OAAO;gBACtB,KAAK,CAAC,IAAI,KAAK,aAAa;gBAC5B,KAAK,CAAC,IAAI,KAAK,SAAS,EACxB;gBACA,MAAM,MAAM,GAAkB,EAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAC,CAAC;gBACrD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACrB,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC;oBACV,OAAO,EAAE,gBAAgB,GAAG,KAAK,CAAC,KAAK;oBACvC,UAAU,EAAE,KAAK,CAAC,UAAU;oBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB,CAAC,CAAC;gBACH,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;SACF;QACD,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,CAAC;IAC3B,CAAC;CACF;AAxDD,sCAwDC"}
+{"version":3,"file":"boolean_parser.js","sourceRoot":"","sources":["../src/boolean_parser.ts"],"names":[],"mappings":"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"}

package/dist/boolean_serializer.js

@@ -1,4 +1,10 @@
 "use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BooleanSerializer = void 0;
 class BooleanSerializer {
@@ -12,12 +18,12 @@ class BooleanSerializer {
     }
     static booleanClauseToString(clause) {
         switch (clause.operator) {
-            case 'NOTNULL':
-                return '-NULL';
-            case 'FALSEORNULL':
-                return 'FALSE';
-            case 'FALSE':
-                return '=FALSE';
+            case 'not_null':
+                return '-null';
+            case 'false_or_null':
+                return 'false';
+            case 'false':
+                return '=false';
         }
         return clause.operator;
     }

package/dist/boolean_serializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"boolean_serializer.js","sourceRoot":"","sources":["../src/boolean_serializer.ts"],"names":[],"mappings":";;;AAEA,MAAa,iBAAiB;IAC5B,YAAoB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,SAAS;QACd,MAAM,MAAM,GAAG,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,MAAqB;QACxD,QAAQ,MAAM,CAAC,QAAQ,EAAE;YACvB,KAAK,SAAS;gBACZ,OAAO,OAAO,CAAC;YACjB,KAAK,aAAa;gBAChB,OAAO,OAAO,CAAC;YACjB,KAAK,OAAO;gBACV,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,OAAwB;QACpD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,UAAU,IAAI,MAAM,EAAE;gBACxB,MAAM,IAAI,iBAAiB,CAAC,qBAAqB,CAC/C,MAAuB,CACxB,CAAC;aACH;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;aACrE;YACD,MAAM,IAAI,IAAI,CAAC;SAChB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AApCD,8CAoCC"}
+{"version":3,"file":"boolean_serializer.js","sourceRoot":"","sources":["../src/boolean_serializer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,MAAa,iBAAiB;IAC5B,YAAoB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,SAAS;QACd,MAAM,MAAM,GAAG,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,MAAqB;QACxD,QAAQ,MAAM,CAAC,QAAQ,EAAE;YACvB,KAAK,UAAU;gBACb,OAAO,OAAO,CAAC;YACjB,KAAK,eAAe;gBAClB,OAAO,OAAO,CAAC;YACjB,KAAK,OAAO;gBACV,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,OAAwB;QACpD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,UAAU,IAAI,MAAM,EAAE;gBACxB,MAAM,IAAI,iBAAiB,CAAC,qBAAqB,CAC/C,MAAuB,CACxB,CAAC;aACH;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;aACrE;YACD,MAAM,IAAI,IAAI,CAAC;SAChB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AApCD,8CAoCC"}