@malloydata/malloy 0.0.315 → 0.0.317

package/dist/lang/ast/expressions/expr-coalesce.js

@@ -59,6 +59,7 @@ exports.ExprCoalesce = void 0;
 const model_1 = require("../../../model");
 const TDU = __importStar(require("../typedesc-utils"));
 const expression_def_1 = require("../types/expression-def");
+const composite_source_utils_1 = require("../../composite-source-utils");
 class ExprCoalesce extends expression_def_1.ExpressionDef {
     constructor(expr, altExpr) {
         super({ expr, altExpr });
@@ -68,6 +69,7 @@ class ExprCoalesce extends expression_def_1.ExpressionDef {
         this.legalChildTypes = TDU.anyAtomicT;
     }
     getExpression(fs) {
+        var _a;
         const maybeNull = this.expr.getExpression(fs);
         const whenNull = this.altExpr.getExpression(fs);
         if (maybeNull.type === 'null') {
@@ -93,6 +95,7 @@ class ExprCoalesce extends expression_def_1.ExpressionDef {
                 kids: { left: maybeNull.value, right: whenNull.value },
             },
             evalSpace: (0, model_1.mergeEvalSpaces)(maybeNull.evalSpace, whenNull.evalSpace),
+            fieldUsage: (_a = (0, composite_source_utils_1.mergeFieldUsage)(maybeNull.fieldUsage, whenNull.fieldUsage)) !== null && _a !== void 0 ? _a : [],
         };
     }
 }

package/dist/lang/ast/field-space/query-spaces.d.ts

@@ -20,7 +20,6 @@ type TranslatedQueryField = {
  * created and paired when a QueryOperationSpace is created.
  */
 export declare abstract class QueryOperationSpace extends RefinedSpace implements QueryFieldSpace {
-    readonly queryInputSpace: SourceFieldSpace;
     readonly nestParent: QueryOperationSpace | undefined;
     readonly astEl: MalloyElement;
     protected exprSpace: QueryInputSpace;

package/dist/lang/ast/field-space/query-spaces.js

@@ -83,7 +83,6 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
     }
     constructor(queryInputSpace, refineThis, nestParent, astEl) {
         super(queryInputSpace.emptyStructDef());
-        this.queryInputSpace = queryInputSpace;
         this.nestParent = nestParent;
         this.astEl = astEl;
         this.expandedWild = {};
@@ -260,7 +259,7 @@ class QuerySpace extends QueryOperationSpace {
         if (typeDesc.type === 'turtle') {
             const pipeline = typeDesc.pipeline;
             const lastSegment = pipeline[pipeline.length - 1];
-            const outputStruct = (_b = lastSegment === null || lastSegment === void 0 ? void 0 : lastSegment.outputStruct) !== null && _b !== void 0 ? _b : error_factory_1.ErrorFactory.structDef;
+            const outputStruct = (_b = lastSegment === null || lastSegment === void 0 ? void 0 : lastSegment.outputStruct) !== null && _b !== void 0 ? _b : this.exprSpace.emptyStructDef();
             const isRepeated = lastSegment
                 ? model.isQuerySegment(lastSegment)
                     ? lastSegment.isRepeated

package/dist/lang/ast/view-elements/refine-utils.js

@@ -71,22 +71,36 @@ function refine(logTo, refineTo, refineFrom) {
                 : undefined;
         if ((0, model_1.isQuerySegment)(from) && (0, model_1.isQuerySegment)(to)) {
             const overlappingFields = [];
-            const nonOverlappingFields = [];
+            const missingOut = [];
             const existingNames = new Map(to.queryFields.map((f) => [
                 (0, field_utils_1.nameFromDef)(f),
                 f,
             ]));
+            const outputFields = [...to.outputStruct.fields];
+            const queryFields = [...to.queryFields];
             for (const field of from.queryFields) {
-                if (existingNames.has((0, field_utils_1.nameFromDef)(field))) {
-                    overlappingFields.push(field);
+                const fieldName = (0, field_utils_1.nameFromDef)(field);
+                if (existingNames.has(fieldName)) {
+                    overlappingFields.push(fieldName);
                 }
                 else {
-                    nonOverlappingFields.push(field);
+                    queryFields.push(field);
+                    const outField = from.outputStruct.fields.find(f => f.name === fieldName);
+                    if (outField) {
+                        outputFields.push(outField);
+                    }
+                    else {
+                        missingOut.push(fieldName);
+                    }
                 }
             }
-            to.queryFields = [...to.queryFields, ...nonOverlappingFields];
+            to.queryFields = queryFields;
+            to.outputStruct.fields = outputFields;
             if (overlappingFields.length > 0) {
-                logTo.logError('name-conflict-in-refinement', `overlapping fields in refinement: ${overlappingFields.map(field_utils_1.nameFromDef)}`);
+                logTo.logError('name-conflict-in-refinement', `overlapping fields in refinement: ${overlappingFields.join(', ')}`);
+            }
+            if (missingOut.length > 0) {
+                logTo.logError('name-conflict-in-refinement', `missing output fields in refinement: ${missingOut.join(', ')}`);
             }
             to.fieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(to.fieldUsage, from.fieldUsage);
         }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.315";
+export declare const MALLOY_VERSION = "0.0.317";

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

package/package.json

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