@malloydata/malloy 0.0.130-dev240311164559 → 0.0.130-dev240311202005

package/dist/dialect/snowflake/functions/string_agg.js

@@ -27,20 +27,28 @@ const util_1 = require("../../functions/util");
 function fnStringAgg() {
     const value = (0, util_1.makeParam)('value', (0, util_1.maxScalar)('string'));
     const separator = (0, util_1.makeParam)('separator', (0, util_1.literal)((0, util_1.maxScalar)('string')));
-    const orderBy = { type: 'aggregate_order_by' };
+    const orderBy = {
+        type: 'aggregate_order_by',
+        prefix: ' WITHIN GROUP(',
+        suffix: ')',
+    };
     return [
-        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `LISTAGG(${value.arg}, ',') WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
-        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `LISTAGG(${value.arg}, ${separator.arg}) WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `LISTAGG(${value.arg}, ',')${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `LISTAGG(${value.arg}, ${separator.arg})${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
     ];
 }
 exports.fnStringAgg = fnStringAgg;
 function fnStringAggDistinct() {
     const value = (0, util_1.makeParam)('value', (0, util_1.maxScalar)('string'));
     const separator = (0, util_1.makeParam)('separator', (0, util_1.literal)((0, util_1.maxScalar)('string')));
-    const orderBy = { type: 'aggregate_order_by' };
+    const orderBy = {
+        type: 'aggregate_order_by',
+        prefix: ' WITHIN GROUP(',
+        suffix: ')',
+    };
     return [
-        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `LISTAGG(DISTINCT ${value.arg}, ',') WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
-        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `LISTAGG(DISTINCT ${value.arg}, ${separator.arg}) WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `LISTAGG(DISTINCT ${value.arg}, ',')${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `LISTAGG(DISTINCT ${value.arg}, ${separator.arg})${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
     ];
 }
 exports.fnStringAggDistinct = fnStringAggDistinct;

package/dist/model/malloy_query.js

@@ -258,6 +258,7 @@ class QueryField extends QueryNode {
             throw new Error(`Function is not defined for dialect ${dialect}`);
         }
         return (0, utils_1.exprMap)(overload.dialect[dialect].e, fragment => {
+            var _a, _b;
             if (typeof fragment === 'string') {
                 return [fragment];
             }
@@ -290,7 +291,9 @@ class QueryField extends QueryNode {
                 }
             }
             else if (fragment.type === 'aggregate_order_by') {
-                return orderBy ? [` ${orderBy}`] : [];
+                return orderBy
+                    ? [` ${(_a = fragment.prefix) !== null && _a !== void 0 ? _a : ''}${orderBy}${(_b = fragment.suffix) !== null && _b !== void 0 ? _b : ''}`]
+                    : [];
             }
             else if (fragment.type === 'aggregate_limit') {
                 return limit ? [` ${limit}`] : [];
@@ -345,7 +348,8 @@ class QueryField extends QueryNode {
         const aggregateLimit = frag.limit ? `LIMIT ${frag.limit}` : undefined;
         if (frag.name === 'string_agg' &&
             distinctKey &&
-            !context.dialect.supportsAggDistinct) {
+            !context.dialect.supportsAggDistinct &&
+            context.dialect.name !== 'snowflake') {
             return this.generateAsymmetricStringAggExpression(resultSet, context, args[0], args[1], distinctKey, frag.orderBy, context.dialect.name, state);
         }
         if (distinctKey) {
@@ -650,6 +654,7 @@ class QueryField extends QueryNode {
                 }
                 if (resultStruct.firstSegment.type === 'reduce') {
                     const orderSQL = orderingField.fif.getAnalyticalSQL(false);
+                    // const orderSQL = this.generateDimFragment(resultSet, context, arg, state)
                     obSQL.push(` ${orderSQL} ${ordering.dir || 'ASC'}`);
                 }
                 else if (resultStruct.firstSegment.type === 'project') {
@@ -1143,6 +1148,11 @@ class FieldInstanceResult {
         for (const [_name, fi] of this.allFields) {
             if (fi instanceof FieldInstanceField) {
                 if (fi.fieldUsage.type === 'result') {
+                    if (fi.f.fieldDef.type === 'turtle' ||
+                        fi.f.fieldDef.type === 'struct' ||
+                        (0, malloy_types_1.expressionIsAnalytic)(fi.f.fieldDef.expressionType)) {
+                        continue;
+                    }
                     firstField || (firstField = fi.fieldUsage.resultIndex);
                     if (['date', 'timestamp'].indexOf(fi.f.fieldDef.type) > -1) {
                         return [{ dir: 'desc', field: fi.fieldUsage.resultIndex }];
@@ -2157,7 +2167,18 @@ class QueryQuery extends QueryField {
       `);
     }
     generateStage0Fields(resultSet, output, stageWriter) {
+        const scalarFields = [];
+        const otherFields = [];
         for (const [name, fi] of resultSet.allFields) {
+            if (fi instanceof FieldInstanceField && isScalarField(fi.f)) {
+                scalarFields.push([name, fi]);
+            }
+            else {
+                otherFields.push([name, fi]);
+            }
+        }
+        const orderedFields = [...scalarFields, ...otherFields];
+        for (const [name, fi] of orderedFields) {
             const outputName = this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultSet.groupSet}`);
             if (fi instanceof FieldInstanceField) {
                 if (fi.fieldUsage.type === 'result') {

package/dist/model/malloy_types.d.ts

@@ -126,6 +126,8 @@ export interface FunctionParameterFragment {
 export declare function isFunctionParameterFragment(f: Fragment): f is FunctionParameterFragment;
 export interface AggregateOrderByFragment {
     type: 'aggregate_order_by';
+    prefix?: string;
+    suffix?: string;
 }
 export interface AggregateLimitFragment {
     type: 'aggregate_limit';

package/dist/model/utils.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/model/utils.spec.js

@@ -0,0 +1,38 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+// eslint-disable-next-line no-restricted-imports
+const utils_1 = require("./utils");
+describe('model/utils', () => {
+    it('should generate deterministic hashes', () => {
+        const hash1 = (0, utils_1.generateHash)('test-content');
+        expect(hash1).toEqual('ab17568f-0362-503d-a9c6-76fb0b203636');
+    });
+    it('should generate unique hashes', () => {
+        const hash1 = (0, utils_1.generateHash)('test-content');
+        const hash2 = (0, utils_1.generateHash)('test-content-different');
+        expect(hash1).not.toEqual(hash2);
+    });
+});
+//# sourceMappingURL=utils.spec.js.map

package/dist/test/index.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="jest" />
+/**
+ * Accepts databases in env, either via comma-separated dialect list
+ * (MALLOY_DATABASES=) or a single database (MALLOY_DATABASE=). returns either
+ *  databases defined in env or a default list that was passed.
+ */
+export declare function databasesFromEnvironmentOr(defaultDatabases: string[]): string[];
+/**
+ * Confirms that one or more of the databases being tested overlaps with
+ * the databases a test suite can accept. If there is overlap, return a tuple
+ * of jest.describe and the dialects to be tested if there is no overlap,
+ * return a tuple if jest.describe.skip and the dialects to be tested
+ */
+export declare function describeIfDatabaseAvailable(acceptableDatabases: string[]): [jest.Describe, string[]];

package/dist/test/index.js

@@ -0,0 +1,60 @@
+"use strict";
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.describeIfDatabaseAvailable = exports.databasesFromEnvironmentOr = void 0;
+/**
+ * Accepts databases in env, either via comma-separated dialect list
+ * (MALLOY_DATABASES=) or a single database (MALLOY_DATABASE=). returns either
+ *  databases defined in env or a default list that was passed.
+ */
+function databasesFromEnvironmentOr(defaultDatabases) {
+    return process.env['MALLOY_DATABASES']
+        ? process.env['MALLOY_DATABASES'].split(',')
+        : process.env['MALLOY_DATABASE']
+            ? [process.env['MALLOY_DATABASE']]
+            : defaultDatabases;
+}
+exports.databasesFromEnvironmentOr = databasesFromEnvironmentOr;
+/**
+ * A replacement for [describe()] that mimics [describe.skip()]
+ */
+const describeSkip = Object.assign((name, fn) => describe.skip(name, fn), {
+    skip: describe.skip,
+    // eslint-disable-next-line no-restricted-properties
+    only: describe.only,
+    each: (() => () => it.skip('skipped', () => { })),
+});
+/**
+ * Confirms that one or more of the databases being tested overlaps with
+ * the databases a test suite can accept. If there is overlap, return a tuple
+ * of jest.describe and the dialects to be tested if there is no overlap,
+ * return a tuple if jest.describe.skip and the dialects to be tested
+ */
+function describeIfDatabaseAvailable(acceptableDatabases) {
+    const currentDatabases = databasesFromEnvironmentOr(acceptableDatabases);
+    const overlap = acceptableDatabases.filter(d => currentDatabases.includes(d));
+    return overlap.length > 0 ? [describe, overlap] : [describeSkip, overlap];
+}
+exports.describeIfDatabaseAvailable = describeIfDatabaseAvailable;
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,7 +1,21 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.130-dev240311164559",
+  "version": "0.0.130-dev240311202005",
   "license": "MIT",
+  "exports": {
+    ".": "./dist/index.js",
+    "./test": "./dist/test/index.js"
+  },
+  "typesVersions": {
+    "*": {
+      "index": [
+        "./dist/index.d.ts"
+      ],
+      "test": [
+        "./dist/test/index.d.ts"
+      ]
+    }
+  },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "homepage": "https://github.com/malloydata/malloy#readme",