@malloydata/malloy 0.0.294 → 0.0.296

package/dist/to_stable.js

@@ -5,12 +5,48 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sourceDefToSourceInfo = sourceDefToSourceInfo;
 exports.modelDefToModelInfo = modelDefToModelInfo;
 exports.convertFieldInfos = convertFieldInfos;
 exports.writeLiteralToTag = writeLiteralToTag;
 exports.getResultStructMetadataAnnotation = getResultStructMetadataAnnotation;
+exports.writeMalloyObjectToTag = writeMalloyObjectToTag;
+exports.extractMalloyObjectFromTag = extractMalloyObjectFromTag;
+const Malloy = __importStar(require("@malloydata/malloy-interfaces"));
 const model_1 = require("./model");
 const malloy_query_1 = require("./model/malloy_query");
 const annotation_1 = require("./annotation");
@@ -220,25 +256,23 @@ function getResultMetadataAnnotation(field, resultMetadata) {
         tag.set(['drillable']);
         hasAny = true;
     }
-    if ((0, model_1.isAtomic)(field) || (0, model_1.isTurtle)(field)) {
-        if (field.drillView !== undefined) {
-            tag.set(['drill_view'], field.drillView);
-            hasAny = true;
-        }
-    }
     if (resultMetadata.filterList) {
         addDrillFiltersTag(tag, resultMetadata.filterList);
         hasAny = true;
     }
+    if (resultMetadata.drillExpression) {
+        writeExpressionToTag(tag, ['drill_expression'], resultMetadata.drillExpression);
+        hasAny = true;
+    }
     if (resultMetadata.fieldKind === 'dimension') {
         const dot = '.';
         // If field is joined-in from another table i.e. of type `tableName.columnName`,
         // return sourceField, else return name because this could be a renamed field.
-        const drillExpression = (resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceExpression) ||
+        const drillExpressionCode = (resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceExpression) ||
             ((resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceField.includes(dot))
                 ? resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceField
                 : identifierCode(field.name));
-        tag.set(['drill_expression'], drillExpression);
+        tag.set(['drill_expression', 'code'], drillExpressionCode);
         hasAny = true;
     }
     return hasAny
@@ -248,20 +282,16 @@ function getResultMetadataAnnotation(field, resultMetadata) {
         : undefined;
 }
 function addDrillFiltersTag(tag, drillFilters) {
-    var _a;
     for (let i = 0; i < drillFilters.length; i++) {
         const filter = drillFilters[i];
         if (filter.expressionType !== 'scalar' || filter.isSourceFilter)
             continue;
         tag.set(['drill_filters', i, 'code'], filter.code);
-        if (filter.drillView) {
-            tag.set(['drill_filters', i, 'drill_view'], filter.drillView);
+        if (filter.filterView) {
+            tag.set(['drill_filters', i, 'filter_view'], filter.filterView);
         }
-        if (filter.drillView === undefined && filter.stableFilter !== undefined) {
-            tag.set(['drill_filters', i, 'field_reference'], [
-                ...((_a = filter.stableFilter.field_reference.path) !== null && _a !== void 0 ? _a : []),
-                filter.stableFilter.field_reference.name,
-            ]);
+        if (filter.filterView === undefined && filter.stableFilter !== undefined) {
+            writeExpressionToTag(tag, ['drill_filters', i, 'expression'], filter.stableFilter.expression);
             if (filter.stableFilter.kind === 'filter_string') {
                 tag.set(['drill_filters', i, 'kind'], 'filter_expression');
                 tag.set(['drill_filters', i, 'filter_expression'], filter.stableFilter.filter);
@@ -273,32 +303,11 @@ function addDrillFiltersTag(tag, drillFilters) {
         }
     }
 }
+function writeExpressionToTag(tag, path, expression) {
+    writeMalloyObjectToTag(tag, path, expression, 'Expression');
+}
 function writeLiteralToTag(tag, path, literal) {
-    tag.set([...path, 'kind'], literal.kind);
-    switch (literal.kind) {
-        case 'string_literal':
-            tag.set([...path, 'string_value'], literal.string_value);
-            break;
-        case 'number_literal':
-            tag.set([...path, 'number_value'], literal.number_value);
-            break;
-        case 'boolean_literal':
-            tag.set([...path, 'boolean_value'], literal.boolean_value.toString());
-            break;
-        case 'date_literal':
-            tag.set([...path, 'date_value'], literal.date_value);
-            tag.set([...path, 'timezone'], literal.timezone);
-            tag.set([...path, 'granularity'], literal.granularity);
-            break;
-        case 'timestamp_literal':
-            tag.set([...path, 'timestamp_value'], literal.timestamp_value);
-            tag.set([...path, 'timezone'], literal.timezone);
-            tag.set([...path, 'granularity'], literal.granularity);
-            break;
-        case 'filter_expression_literal':
-            tag.set([...path, 'filter_expression_value'], literal.filter_expression_value);
-            break;
-    }
+    writeMalloyObjectToTag(tag, path, literal, 'LiteralValue');
 }
 function escapeIdentifier(str) {
     return str.replace(/\\/g, '\\\\').replace(/`/g, '\\`');
@@ -469,4 +478,142 @@ function convertTimestampTimeframe(timeframe) {
 function convertJoinType(type) {
     return type;
 }
+/**
+ * Writes a Malloy interface object to a tag at a given path.
+ *
+ * E.g. `writeMalloyObjectToTag(tag, ['expr'], 'Expression', {kind: 'field_reference', name: 'carrier'})`
+ *
+ * produces the tag `#(malloy) expr { kind = field_reference name = carrier }`
+ */
+function writeMalloyObjectToTag(tag, path, obj, type) {
+    if (type === 'string') {
+        tag.set(path, obj);
+        return;
+    }
+    else if (type === 'number') {
+        tag.set(path, obj);
+        return;
+    }
+    else if (type === 'boolean') {
+        tag.set(path, obj.toString());
+        return;
+    }
+    const typelookup = Malloy.MALLOY_INTERFACE_TYPES[type];
+    if (typelookup === undefined) {
+        throw new Error(`Unknown Malloy interface type ${type}`);
+    }
+    if (typelookup.type === 'enum') {
+        if (typeof obj === 'string') {
+            tag.set(path, obj);
+        }
+        else {
+            throw new Error(`Expected string for enum ${type}`);
+        }
+    }
+    else if (typelookup.type === 'struct') {
+        for (const key in typelookup.fields) {
+            const valueType = typelookup.fields[key];
+            const value = obj[key];
+            if (value === undefined) {
+                if (!valueType.optional) {
+                    throw new Error(`Mising value for non-optional field ${key} in type ${type}`);
+                }
+            }
+            else if (valueType.array) {
+                if (Array.isArray(value)) {
+                    for (let i = 0; i < value.length; i++) {
+                        writeMalloyObjectToTag(tag, [...path, key, i], value[i], valueType.type);
+                    }
+                }
+                else {
+                    throw new Error(`Expected array for field ${key} of type ${type} but got ${typeof obj}`);
+                }
+            }
+            else {
+                writeMalloyObjectToTag(tag, [...path, key], value, valueType.type);
+            }
+        }
+    }
+    else {
+        // enum
+        const kind = obj.kind;
+        tag.set([...path, 'kind'], kind);
+        const unionType = typelookup.options[kind];
+        if (unionType === undefined) {
+            throw new Error(`Unknown Malloy interface union kind ${kind} for type ${type}`);
+        }
+        writeMalloyObjectToTag(tag, path, obj, unionType);
+    }
+}
+/**
+ * Extracts a Malloy interface object from a tag at a given path; the inverse of `writeMalloyObjectToTag`.
+ */
+function extractMalloyObjectFromTag(tag, type) {
+    if (type === 'string') {
+        return tag.text();
+    }
+    else if (type === 'number') {
+        return tag.numeric();
+    }
+    else if (type === 'boolean') {
+        return tag.text() === 'true';
+    }
+    const typeDef = Malloy.MALLOY_INTERFACE_TYPES[type];
+    if (typeDef === undefined) {
+        throw new Error(`Unknown Malloy interface type ${type}`);
+    }
+    if (typeDef.type === 'enum') {
+        const value = tag.text();
+        if (value === undefined) {
+            throw new Error(`Missing value for enum ${type}`);
+        }
+        if (value in typeDef.values) {
+            return value;
+        }
+        throw new Error(`Unknown value ${value} for enum ${type}`);
+    }
+    else if (typeDef.type === 'struct') {
+        const result = {};
+        for (const [key, type] of Object.entries(typeDef.fields)) {
+            const valueTag = tag.tag(key);
+            if (valueTag === undefined) {
+                if (type.optional)
+                    continue;
+                else {
+                    throw new Error(`Missing value for key ${key} of type ${type}`);
+                }
+            }
+            if (type.array) {
+                const arr = [];
+                const values = valueTag.array();
+                if (values === undefined) {
+                    throw new Error(`Missing array value for key ${key} of type ${type}`);
+                }
+                for (const value of values) {
+                    arr.push(extractMalloyObjectFromTag(value, type.type));
+                }
+                result[key] = arr;
+            }
+            else {
+                const value = extractMalloyObjectFromTag(valueTag, type.type);
+                if (value !== undefined && value !== null) {
+                    result[key] = value;
+                }
+            }
+        }
+        return result;
+    } /* (typeDef.type === 'union') */
+    else {
+        const kind = tag.text('kind');
+        if (kind === undefined) {
+            throw new Error(`Missing kind for union ${type}`);
+        }
+        const unionType = typeDef.options[kind];
+        if (unionType === undefined) {
+            throw new Error(`Unknown kind ${kind} for union ${type}`);
+        }
+        const value = extractMalloyObjectFromTag(tag, unionType);
+        return { kind, ...value };
+    }
+}
 //# sourceMappingURL=to_stable.js.map

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.294";
+export declare const MALLOY_VERSION = "0.0.296";

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.294';
+exports.MALLOY_VERSION = '0.0.296';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.294",
+  "version": "0.0.296",
   "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.294",
-    "@malloydata/malloy-interfaces": "0.0.294",
-    "@malloydata/malloy-tag": "0.0.294",
+    "@malloydata/malloy-filter": "0.0.296",
+    "@malloydata/malloy-interfaces": "0.0.296",
+    "@malloydata/malloy-tag": "0.0.296",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",