@malloydata/malloy 0.0.356 → 0.0.358

package/dist/lang/ast/field-space/rename-space-field.js

@@ -33,6 +33,7 @@ class RenameSpaceField extends space_field_1.SpaceField {
         this.note = note;
     }
     fieldDef() {
+        var _a;
         const returnFieldDef = this.otherField.fieldDef();
         if (returnFieldDef === undefined) {
             return undefined;
@@ -52,6 +53,15 @@ class RenameSpaceField extends space_field_1.SpaceField {
             ...returnFieldDef,
             as: this.newName,
             location: this.location,
+            fieldUsage: (_a = returnFieldDef.fieldUsage) === null || _a === void 0 ? void 0 : _a.map(u => {
+                var _a;
+                return ({
+                    ...u,
+                    path: u.path[0] === ((_a = returnFieldDef.as) !== null && _a !== void 0 ? _a : returnFieldDef.name)
+                        ? [this.newName, ...u.path.slice(1)]
+                        : u.path,
+                });
+            }),
         };
     }
     typeDesc() {

package/dist/lang/ast/query-builders/index-builder.js

@@ -105,6 +105,13 @@ class IndexBuilder {
             ? (_a = from.fieldUsage) !== null && _a !== void 0 ? _a : (0, composite_source_utils_1.emptyFieldUsage)()
             : (0, composite_source_utils_1.emptyFieldUsage)();
         indexSegment.fieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(fromFieldUsage, this.fieldUsage);
+        // Index queries always compute an aggregate for weight (at minimum COUNT(*)).
+        // The compiler needs a uniqueKeyRequirement on the base path so that
+        // symmetric aggregation is enabled when joins are present.
+        indexSegment.fieldUsage.push({
+            path: [],
+            uniqueKeyRequirement: { isCount: true },
+        });
         return indexSegment;
     }
 }

package/dist/lang/ast/statements/import-statement.js

@@ -109,14 +109,17 @@ class ImportStatement extends malloy_element_1.ListOf {
                             importOne.logError('name-conflict-on-selective-import', `Cannot redefine '${dstName}'`);
                         }
                         else {
-                            explicitImport[srcName] = dstName;
+                            if (explicitImport[srcName] === undefined) {
+                                explicitImport[srcName] = [];
+                            }
+                            explicitImport[srcName].push(dstName);
                         }
                     }
                     const neededSourceIDs = new Set();
                     for (const srcName of importedModel.exports) {
-                        const picked = explicitImport[srcName];
-                        const dstName = picked || srcName;
-                        if (importAll || picked) {
+                        const pickedNames = explicitImport[srcName];
+                        const dstNames = pickedNames || (importAll ? [srcName] : []);
+                        for (const dstName of dstNames) {
                             const importMe = {
                                 ...(0, malloy_types_1.safeRecordGet)(importedModel.contents, srcName),
                             };

package/dist/lang/composite-source-utils.js

@@ -335,16 +335,34 @@ function findActiveJoins(dependencies) {
  * - `activeJoins`: Topologically sorted list of joins needed to resolve these uses
  */
 function expandFieldUsage(fieldUsage, fields) {
-    var _a, _b, _c;
+    var _a;
     const seen = {};
     const missingFields = [];
     const toProcess = [];
     const activeJoinGraph = {};
     const ungroupings = [];
+    function mergeIntoSeen(usage) {
+        var _a;
+        const key = (0, utils_2.pathToKey)('field', usage.path);
+        if (!seen[key]) {
+            seen[key] = { ...usage };
+            return true;
+        }
+        const existing = seen[key];
+        if (usage.uniqueKeyRequirement) {
+            existing.uniqueKeyRequirement = {
+                isCount: ((_a = existing.uniqueKeyRequirement) === null || _a === void 0 ? void 0 : _a.isCount) ||
+                    usage.uniqueKeyRequirement.isCount,
+            };
+        }
+        if (usage.analyticFunctionUse) {
+            existing.analyticFunctionUse = true;
+        }
+        return false;
+    }
     // Initialize: mark original inputs and add them to processing queue
     for (const usage of fieldUsage) {
-        const seenKey = (0, utils_2.pathToKey)('field', usage.path);
-        seen[seenKey] = usage;
+        mergeIntoSeen(usage);
         toProcess.push(usage);
     }
     // Process the expanding queue
@@ -363,16 +381,9 @@ function expandFieldUsage(fieldUsage, fields) {
             // Add the atomic field's dependencies to the queue
             const refPath = reference.path.slice(0, -1);
             for (const usage of joinedFieldUsage(refPath, fieldUsage)) {
-                const key = (0, utils_2.pathToKey)('field', usage.path);
-                if (!seen[key]) {
-                    seen[key] = usage;
+                if (mergeIntoSeen(usage)) {
                     toProcess.push(usage);
                 }
-                else if (usage.uniqueKeyRequirement) {
-                    seen[key].uniqueKeyRequirement = {
-                        isCount: (_b = usage.uniqueKeyRequirement.isCount) !== null && _b !== void 0 ? _b : (_c = seen[key].uniqueKeyRequirement) === null || _c === void 0 ? void 0 : _c.isCount,
-                    };
-                }
             }
             if (def.ungroupings) {
                 ungroupings.push(...joinedUngroupings(refPath, def.ungroupings));

package/dist/model/query_query.js

@@ -121,7 +121,6 @@ class QueryQuery extends query_node_1.QueryField {
                     resultRoot.isComplexQuery = true;
                     resultRoot.queryUsesPartitioning = true;
                 }
-                continue;
             }
             if (usage.uniqueKeyRequirement) {
                 if (usage.path.length === 0) {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.356";
+export declare const MALLOY_VERSION = "0.0.358";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.356",
+  "version": "0.0.358",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -47,9 +47,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.356",
-    "@malloydata/malloy-interfaces": "0.0.356",
-    "@malloydata/malloy-tag": "0.0.356",
+    "@malloydata/malloy-filter": "0.0.358",
+    "@malloydata/malloy-interfaces": "0.0.358",
+    "@malloydata/malloy-tag": "0.0.358",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",