@malloydata/render 0.0.123-dev240205203120 → 0.0.123-dev240207164302

package/dist/bundle/bundled_renderer.js

@@ -1355,6 +1355,9 @@
               case "function_parameter":
               case "parameter":
               case "outputField":
+              case "source-reference":
+              case "aggregate_limit":
+              case "aggregate_order_by":
                 return fragment2;
               case "sql-string":
                 return {
@@ -1461,6 +1464,9 @@
             case "function_parameter":
             case "parameter":
             case "outputField":
+            case "source-reference":
+            case "aggregate_limit":
+            case "aggregate_order_by":
               return fragment;
             case "function_call":
               return {
@@ -1534,7 +1540,7 @@
               }
             }
             default:
-              throw new Error("unexpected");
+              throw new Error(`unexpected fragment type ${fragment.type}`);
           }
         });
       }
@@ -4386,7 +4392,7 @@ $$ LANGUAGE SQL;
           return `__udf${Math.floor(Math.random() * 1e5)}`;
         }
         quoteTablePath(tableName) {
-          return tableName.match(/\//) ? `'${tableName}'` : tableName;
+          return tableName.match(/[/*:]/) ? `'${tableName}'` : tableName;
         }
         sqlGroupSetTable(groupSetCount) {
           return `CROSS JOIN (SELECT UNNEST(GENERATE_SERIES(0,${groupSetCount},1)) as group_set  ) as group_set`;
@@ -53832,6 +53838,18 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         static eq(good, checkThis) {
           return checkThis !== void 0 && good.dataType === checkThis.dataType && good.expressionType === checkThis.expressionType;
         }
+        /**
+         * Checks if a given type is in a list, ignoring aggregate
+         * @param check The type to check (can be undefined)
+         * @param from List of types which are OK
+         */
+        static typeIn(check, from) {
+          if (check) {
+            const found = from.find((okType) => _FT.typeEq(okType, check));
+            return found !== void 0;
+          }
+          return false;
+        }
         /**
          * Checks if the base types, ignoring aggregate, are equal
          * @param left Left type
@@ -55314,7 +55332,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                 };
                 structPath = this.source.path;
                 const joinUsage = this.getJoinUsage(inputFS);
-                const allUsagesSame = joinUsage.length === 1 || joinUsage.slice(1).every((p3) => joinPathEq(p3, joinUsage[0]));
+                const allUsagesSame = joinUsage.length === 1 || joinUsage.length > 1 && joinUsage.slice(1).every((p3) => joinPathEq(p3, joinUsage[0]));
                 if (allUsagesSame) {
                   structPath = joinUsage[0].map((p3) => p3.name);
                   sourceRelationship = joinUsage[0];
@@ -55456,6 +55474,13 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                   result.push(def2.relationship);
                 }
               }
+            } else if (frag.type === "source-reference") {
+              if (frag.path) {
+                const def2 = lookup6(fs, frag.path);
+                result.push(def2.relationship);
+              } else {
+                result.push([]);
+              }
             }
           }
         });
@@ -56313,7 +56338,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         }
         getExpression(fs) {
           const expr2 = this.expr.getExpression(fs);
-          if (this.typeCheck(this.expr, expr2)) {
+          if (fragtype_utils_1.FT.typeIn(expr2, this.legalChildTypes)) {
             if (expr2.value.length > 1) {
               return { ...expr2, dataType: "number", value: ["-(", ...expr2.value, ")"] };
             }