@malloydata/malloy 0.0.318 → 0.0.320

package/dist/lang/test/test-translator.d.ts

@@ -7,7 +7,16 @@ import type { DataRequestResponse, SQLSourceRequest, TranslateResponse } from '.
 import type { ExprValue } from '../ast/types/expr-value';
 import type { LogSeverity, MessageCode, MessageParameterType } from '../parse-log';
 import type { EventStream } from '../../runtime_types';
-export declare function pretty(thing: any): string;
+export declare function pretty(thing: unknown): string;
+/**
+ * For human inspection of IR objects, there is a lot of noise which makes
+ * it diifficult to read. This function makes a deep copy of the object
+ * stripping out location meta data and and fields with undefined values.
+ * Then it pretty-prints the result.
+ * @param value Some IR object
+ * @returns prettified printable version
+ */
+export declare function humanify(value: unknown): string;
 export declare const aTableDef: SourceDef;
 /**
  * When translating partial trees, there will not be a document node

package/dist/lang/test/test-translator.js

@@ -25,6 +25,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.aTableDef = void 0;
 exports.pretty = pretty;
+exports.humanify = humanify;
 exports.getExplore = getExplore;
 exports.getModelQuery = getModelQuery;
 exports.getFieldDef = getFieldDef;
@@ -48,9 +49,88 @@ const parse_malloy_1 = require("../parse-malloy");
 const static_space_1 = require("../ast/field-space/static-space");
 const global_name_space_1 = require("../ast/types/global-name-space");
 const sql_block_1 = require("../../model/sql_block");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/explicit-module-boundary-types
 function pretty(thing) {
-    return (0, util_1.inspect)(thing, { breakLength: 72, depth: Infinity });
+    return (0, util_1.inspect)(thing, { breakLength: 100, depth: Infinity });
+}
+/**
+ * For human inspection of IR objects, there is a lot of noise which makes
+ * it diifficult to read. This function makes a deep copy of the object
+ * stripping out location meta data and and fields with undefined values.
+ * Then it pretty-prints the result.
+ * @param value Some IR object
+ * @returns prettified printable version
+ */
+function humanify(value) {
+    const seen = new WeakMap();
+    function isObject(u) {
+        return typeof u === 'object' && u !== null;
+    }
+    function walk(u) {
+        // primitives & null
+        if (u === null || typeof u !== 'object')
+            return u;
+        // Date
+        if (u instanceof Date)
+            return new Date(u.getTime());
+        // RegExp
+        if (u instanceof RegExp)
+            return new RegExp(u.source, u.flags);
+        // Already visited (handle cycles)
+        if (seen.has(u))
+            return seen.get(u);
+        // Array
+        if (Array.isArray(u)) {
+            const out = [];
+            seen.set(u, out);
+            for (let i = 0; i < u.length; i++) {
+                out[i] = walk(u[i]);
+            }
+            return out;
+        }
+        // Map
+        if (u instanceof Map) {
+            const out = new Map();
+            seen.set(u, out);
+            for (const [k, v] of u.entries()) {
+                out.set(k, walk(v));
+            }
+            return out;
+        }
+        // Set
+        if (u instanceof Set) {
+            const out = new Set();
+            seen.set(u, out);
+            for (const v of u.values()) {
+                out.add(walk(v));
+            }
+            return out;
+        }
+        // Plain object or class instance: copy enumerable own properties,
+        // skipping keys "at" and "location"
+        if (isObject(u)) {
+            const out = {};
+            seen.set(u, out);
+            const src = u;
+            for (const key of Object.keys(src)) {
+                // skip location metadata
+                if (key === 'at' || key === 'location')
+                    continue;
+                const val = src[key];
+                // drop properties that exist but have undefined value
+                if (val === undefined)
+                    continue;
+                const w = walk(val);
+                // if the walked value is undefined, skip adding the property
+                if (w === undefined)
+                    continue;
+                out[key] = w;
+            }
+            return out;
+        }
+        // Fallback
+        return u;
+    }
+    return pretty(walk(value));
 }
 const intType = { type: 'number', numberType: 'integer' };
 const mockSchema = {

package/dist/model/filter_compilers.js

@@ -23,11 +23,8 @@ function invertCompare(no) {
     return '>';
 }
 function unlike(disLiked, x) {
-    const orNull = ` OR ${x} IS NULL`;
-    if (disLiked.length === 1) {
-        return `${disLiked[0]}${orNull}`;
-    }
-    return `(${disLiked.join(' AND ')})${orNull}`;
+    const unlikeSQL = disLiked.length === 1 ? disLiked[0] : `(${disLiked.join(' AND ')})`;
+    return `(${unlikeSQL} OR ${x} IS NULL)`;
 }
 /*
  * These compilers from filter expression to SQL actually belong in malloy-filters but
@@ -63,11 +60,11 @@ exports.FilterCompilers = {
                 const optList = nc.values.join(', ');
                 if (nc.values.length === 1) {
                     if (notEqual)
-                        return `${x} != ${optList} OR ${x} IS NULL`;
+                        return `(${x} != ${optList} OR ${x} IS NULL)`;
                     return `${x} = ${optList}`;
                 }
                 if (notEqual)
-                    return `${x} NOT IN (${optList}) OR ${x} IS NULL`;
+                    return `(${x} NOT IN (${optList}) OR ${x} IS NULL)`;
                 return `${x} IN (${optList})`;
             }
             case '>':
@@ -303,7 +300,7 @@ class TemporalFilterCompiler {
                 const m = this.moment(tc.in);
                 if (m.begin.sql === m.end) {
                     return tc.not
-                        ? `${x} != ${this.time(m.end)} OR ${x} IS NULL`
+                        ? `(${x} != ${this.time(m.end)} OR ${x} IS NULL)`
                         : `${x} = ${this.time(m.end)}`;
                 }
                 return this.isIn(tc.not, m.begin.sql, m.end);

package/dist/model/query_query.js

@@ -1044,7 +1044,8 @@ class QueryQuery extends query_node_1.QueryField {
                         }
                         else {
                             // its a complex
-                            limitComplexClauses[result.groupSet] = `CASE WHEN ${filterClause} THEN 1 ELSE 0 END`;
+                            limitComplexClauses[result.groupSet] =
+                                `CASE WHEN ${filterClause} THEN 1 ELSE 0 END`;
                         }
                     }
                 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.318";
+export declare const MALLOY_VERSION = "0.0.320";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.318';
+exports.MALLOY_VERSION = '0.0.320';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.318",
+  "version": "0.0.320",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.318",
-    "@malloydata/malloy-interfaces": "0.0.318",
-    "@malloydata/malloy-tag": "0.0.318",
+    "@malloydata/malloy-filter": "0.0.320",
+    "@malloydata/malloy-interfaces": "0.0.320",
+    "@malloydata/malloy-tag": "0.0.320",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",