@malloydata/malloy 0.0.183-dev240916205710 → 0.0.183-dev240917170343

package/dist/lang/ast/types/expression-def.js

@@ -263,8 +263,13 @@ function equality(fs, left, op, right) {
             case '~':
             case '!~': {
                 if (lhs.dataType !== 'string' || rhs.dataType !== 'string') {
-                    const regexCmp = regexEqual(lhs, rhs);
-                    if (regexCmp === undefined) {
+                    let regexCmp = regexEqual(lhs, rhs);
+                    if (regexCmp) {
+                        if (op[0] === '!') {
+                            regexCmp = { node: 'not', e: { ...regexCmp } };
+                        }
+                    }
+                    else {
                         throw new TypeMismatch("Incompatible types for match('~') operator");
                     }
                     value = regexCmp;

package/dist/lang/test/expressions.spec.js

@@ -112,6 +112,12 @@ describe('expressions', () => {
         test('not match', () => {
             expect("'forty-two' !~ 'fifty-four'").compilesTo('{"forty-two" !like "fifty-four"}');
         });
+        test('regexp-match', () => {
+            expect("'forty-two' ~ r'fifty-four'").compilesTo('{"forty-two" regex-match /fifty-four/}');
+        });
+        test('not regexp-match', () => {
+            expect("'forty-two' !~ r'fifty-four'").compilesTo('{not {"forty-two" regex-match /fifty-four/}}');
+        });
         test('apply as equality', () => {
             expect("'forty-two' ? 'fifty-four'").compilesTo('{"forty-two" = "fifty-four"}');
         });

package/dist/lang/test/parse-expects.js

@@ -161,6 +161,8 @@ function eToStr(e, symbols) {
             return `"${e.literal}"`;
         case 'timeLiteral':
             return `@${e.literal}`;
+        case 'regexpLiteral':
+            return `/${e.literal}/`;
         case 'trunc':
             return `{timeTrunc-${e.units} ${subExpr(e.e)}}`;
         case 'delta':
@@ -168,6 +170,8 @@ function eToStr(e, symbols) {
         case 'true':
         case 'false':
             return e.node;
+        case 'regexpMatch':
+            return `{${subExpr(e.kids.expr)} regex-match ${subExpr(e.kids.regex)}}`;
     }
     if ((0, model_1.exprHasKids)(e) && e.kids['left'] && e.kids['right']) {
         return `{${subExpr(e.kids['left'])} ${e.node} ${subExpr(e.kids['right'])}}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.183-dev240916205710",
+  "version": "0.0.183-dev240917170343",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",