@malloydata/malloy 0.0.285 → 0.0.287

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { DuckDBDialect, StandardSQLDialect, TrinoDialect, PostgresDialect, SnowflakeDialect, MySQLDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, param, variadicParam, literal, spread, Dialect, TinyParser, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, MalloyStandardFunctionImplementations, DefinitionBlueprint, DefinitionBlueprintMap, OverloadedDefinitionBlueprint, TinyToken, } from './dialect';
-export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, } from './model';
+export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, } from './model';
 export { isSourceDef, Segment, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, } from './model';
 export { malloyToQuery, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';

package/dist/lang/ast/query-properties/drill.js

@@ -281,6 +281,7 @@ class Drill extends filters_1.Filter {
         const exprCond = {
             node: 'filterCondition',
             code: filter.exprSrc,
+            isSourceFilter: false,
             e: collectedWheres === undefined
                 ? fExpr.value
                 : {

package/dist/lang/ast/query-properties/filters.js

@@ -75,6 +75,7 @@ class FilterElement extends malloy_element_1.MalloyElement {
                 e: { node: 'false' },
                 expressionType: 'scalar',
                 fieldUsage: exprVal.fieldUsage,
+                isSourceFilter: false,
             };
         }
         const stableFilter = this.getStableFilter();
@@ -85,6 +86,7 @@ class FilterElement extends malloy_element_1.MalloyElement {
             expressionType: exprVal.expressionType,
             fieldUsage: exprVal.fieldUsage,
             stableFilter,
+            isSourceFilter: false,
         };
         return exprCond;
     }

package/dist/lang/ast/source-elements/refined-source.js

@@ -147,7 +147,10 @@ class RefinedSource extends source_1.Source {
                     el.logError('aggregate-in-source-filter', "Can't use aggregate computations in top level filters");
                 }
                 else {
-                    filterList.push(fc);
+                    filterList.push({
+                        ...fc,
+                        isSourceFilter: true,
+                    });
                     moreFilters = true;
                 }
             }

package/dist/lang/malloy-to-ast.js

@@ -530,7 +530,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return new ast.Filter(pcx.fieldExpr().map(f => this.getFilterElement(f)));
     }
     visitDrillClauseList(pcx) {
-        this.inExperiment('drill', pcx);
         return new ast.Drill(pcx.fieldExpr().map(f => this.getFilterElement(f)));
     }
     visitWhereStatement(pcx) {

package/dist/model/malloy_types.d.ts

@@ -62,6 +62,7 @@ export interface FilterCondition extends ExprE {
     fieldUsage?: FieldUsage[];
     drillView?: string;
     stableFilter?: Filter;
+    isSourceFilter?: boolean;
 }
 export interface FilteredExpr extends ExprWithKids {
     node: 'filteredExpr';

package/dist/to_stable.js

@@ -206,7 +206,6 @@ function convertFieldInfos(source, fields) {
     return result;
 }
 function getResultMetadataAnnotation(field, resultMetadata) {
-    var _a;
     const tag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
     let hasAny = false;
     if (resultMetadata.referenceId !== undefined) {
@@ -227,9 +226,8 @@ function getResultMetadataAnnotation(field, resultMetadata) {
             hasAny = true;
         }
     }
-    const drillFilters = (_a = resultMetadata.filterList) === null || _a === void 0 ? void 0 : _a.filter(f => f.expressionType === 'scalar');
-    if (drillFilters) {
-        addDrillFiltersTag(tag, drillFilters);
+    if (resultMetadata.filterList) {
+        addDrillFiltersTag(tag, resultMetadata.filterList);
         hasAny = true;
     }
     if (resultMetadata.fieldKind === 'dimension') {
@@ -253,6 +251,8 @@ 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);
@@ -309,16 +309,15 @@ function identifierCode(name) {
     return `\`${escapeIdentifier(name)}\``;
 }
 function getResultStructMetadataAnnotation(field, resultMetadata) {
-    var _a, _b, _c;
+    var _a, _b;
     const tag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
     let hasAny = false;
     if (resultMetadata.limit !== undefined) {
         tag.set(['limit'], resultMetadata.limit);
         hasAny = true;
     }
-    const drillFilters = (_a = resultMetadata.filterList) === null || _a === void 0 ? void 0 : _a.filter(f => f.expressionType === 'scalar');
-    if (drillFilters) {
-        addDrillFiltersTag(tag, drillFilters);
+    if (resultMetadata.filterList) {
+        addDrillFiltersTag(tag, resultMetadata.filterList);
         hasAny = true;
     }
     if (resultMetadata.drillable) {
@@ -329,9 +328,9 @@ function getResultStructMetadataAnnotation(field, resultMetadata) {
         for (let i = 0; i < resultMetadata.orderBy.length; i++) {
             const orderBy = resultMetadata.orderBy[i];
             const orderByField = typeof orderBy.field === 'number'
-                ? (_b = field.fields[orderBy.field - 1].as) !== null && _b !== void 0 ? _b : field.fields[orderBy.field - 1].name
+                ? (_a = field.fields[orderBy.field - 1].as) !== null && _a !== void 0 ? _a : field.fields[orderBy.field - 1].name
                 : orderBy.field;
-            const direction = (_c = orderBy.dir) !== null && _c !== void 0 ? _c : null;
+            const direction = (_b = orderBy.dir) !== null && _b !== void 0 ? _b : null;
             tag.set(['ordered_by', i, orderByField], direction);
         }
         hasAny = true;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.285";
+export declare const MALLOY_VERSION = "0.0.287";

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

package/package.json

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