@malloydata/malloy 0.0.180-dev240906180931 → 0.0.180-dev240906195755

package/dist/dialect/dialect.d.ts

@@ -60,6 +60,9 @@ export declare abstract class Dialect {
     supportsLeftJoinUnnest: boolean;
     supportsCountApprox: boolean;
     abstract getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    abstract getDialectFunctions(): {
+        [name: string]: DialectFunctionOverloadDef[];
+    };
     abstract quoteTablePath(tablePath: string): string;
     abstract sqlGroupSetTable(groupSetCount: number): string;
     abstract sqlAnyValue(groupSet: number, fieldName: string): string;

package/dist/dialect/duckdb/duckdb.d.ts

@@ -50,6 +50,9 @@ export declare class DuckDBDialect extends PostgresBase {
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    getDialectFunctions(): {
+        [name: string]: DialectFunctionOverloadDef[];
+    };
     malloyTypeToSQLType(malloyType: FieldAtomicTypeDef): string;
     sqlTypeToMalloyType(sqlType: string): FieldAtomicTypeDef | undefined;
     castToString(expression: string): string;

package/dist/dialect/duckdb/duckdb.js

@@ -28,6 +28,7 @@ const utils_1 = require("../../model/utils");
 const functions_1 = require("./functions");
 const dialect_1 = require("../dialect");
 const pg_impl_1 = require("../pg_impl");
+const dialect_functions_1 = require("./functions/dialect_functions");
 // need to refactor runSQL to take a SQLBlock instead of just a sql string.
 const hackSplitComment = '-- hack: split on this';
 const duckDBToMalloyTypes = {
@@ -263,6 +264,9 @@ class DuckDBDialect extends pg_impl_1.PostgresBase {
     getGlobalFunctionDef(name) {
         return functions_1.DUCKDB_FUNCTIONS.get(name);
     }
+    getDialectFunctions() {
+        return dialect_functions_1.DUCKDB_DIALECT_FUNCTIONS;
+    }
     malloyTypeToSQLType(malloyType) {
         if (malloyType.type === 'number') {
             if (malloyType.numberType === 'integer') {

package/dist/dialect/duckdb/functions/dialect_functions.d.ts

@@ -0,0 +1,4 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare const DUCKDB_DIALECT_FUNCTIONS: {
+    [name: string]: DialectFunctionOverloadDef[];
+};

package/dist/dialect/duckdb/functions/dialect_functions.js

@@ -0,0 +1,16 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DUCKDB_DIALECT_FUNCTIONS = void 0;
+const util_1 = require("../../functions/util");
+exports.DUCKDB_DIALECT_FUNCTIONS = {
+    to_timestamp: [
+        (0, util_1.overload)((0, util_1.minScalar)('timestamp'), [(0, util_1.param)('epoch_seconds', (0, util_1.anyExprType)('number'))], (0, util_1.sql) `TO_TIMESTAMP(${(0, util_1.arg)('epoch_seconds')})`),
+    ],
+};
+//# sourceMappingURL=dialect_functions.js.map

package/dist/dialect/postgres/functions/dialect_functions.d.ts

@@ -0,0 +1,4 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare const POSTGRES_DIALECT_FUNCTIONS: {
+    [name: string]: DialectFunctionOverloadDef[];
+};

package/dist/dialect/postgres/functions/dialect_functions.js

@@ -0,0 +1,11 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.POSTGRES_DIALECT_FUNCTIONS = void 0;
+exports.POSTGRES_DIALECT_FUNCTIONS = {};
+//# sourceMappingURL=dialect_functions.js.map

package/dist/dialect/postgres/postgres.d.ts

@@ -53,6 +53,9 @@ export declare class PostgresDialect extends PostgresBase {
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    getDialectFunctions(): {
+        [name: string]: DialectFunctionOverloadDef[];
+    };
     malloyTypeToSQLType(malloyType: FieldAtomicTypeDef): string;
     sqlTypeToMalloyType(sqlType: string): FieldAtomicTypeDef | undefined;
     castToString(expression: string): string;

package/dist/dialect/postgres/postgres.js

@@ -27,6 +27,7 @@ const utils_1 = require("../../model/utils");
 const malloy_types_1 = require("../../model/malloy_types");
 const functions_1 = require("./functions");
 const pg_impl_1 = require("../pg_impl");
+const dialect_functions_1 = require("./functions/dialect_functions");
 const pgMakeIntervalMap = {
     'year': 'years',
     'month': 'months',
@@ -320,6 +321,9 @@ class PostgresDialect extends pg_impl_1.PostgresBase {
     getGlobalFunctionDef(name) {
         return functions_1.POSTGRES_FUNCTIONS.get(name);
     }
+    getDialectFunctions() {
+        return dialect_functions_1.POSTGRES_DIALECT_FUNCTIONS;
+    }
     malloyTypeToSQLType(malloyType) {
         if (malloyType.type === 'number') {
             if (malloyType.numberType === 'integer') {

package/dist/dialect/snowflake/functions/dialect_functions.d.ts

@@ -0,0 +1,4 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare const SNOWFLAKE_DIALECT_FUNCTIONS: {
+    [name: string]: DialectFunctionOverloadDef[];
+};

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

@@ -0,0 +1,11 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SNOWFLAKE_DIALECT_FUNCTIONS = void 0;
+exports.SNOWFLAKE_DIALECT_FUNCTIONS = {};
+//# sourceMappingURL=dialect_functions.js.map

package/dist/dialect/snowflake/snowflake.d.ts

@@ -57,6 +57,9 @@ export declare class SnowflakeDialect extends Dialect {
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    getDialectFunctions(): {
+        [name: string]: DialectFunctionOverloadDef[];
+    };
     malloyTypeToSQLType(malloyType: FieldAtomicTypeDef): string;
     sqlTypeToMalloyType(sqlType: string): FieldAtomicTypeDef | undefined;
     castToString(expression: string): string;

package/dist/dialect/snowflake/snowflake.js

@@ -27,6 +27,7 @@ const utils_1 = require("../../model/utils");
 const malloy_types_1 = require("../../model/malloy_types");
 const functions_1 = require("./functions");
 const dialect_1 = require("../dialect");
+const dialect_functions_1 = require("./functions/dialect_functions");
 const extractionMap = {
     'day_of_week': 'dayofweek',
     'day_of_year': 'dayofyear',
@@ -367,6 +368,9 @@ ${(0, utils_1.indent)(sql)}
     getGlobalFunctionDef(name) {
         return functions_1.SNOWFLAKE_FUNCTIONS.get(name);
     }
+    getDialectFunctions() {
+        return dialect_functions_1.SNOWFLAKE_DIALECT_FUNCTIONS;
+    }
     malloyTypeToSQLType(malloyType) {
         if (malloyType.type === 'number') {
             if (malloyType.numberType === 'integer') {

package/dist/dialect/standardsql/functions/dialect_functions.d.ts

@@ -0,0 +1,4 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare const STANDARDSQL_DIALECT_FUNCTIONS: {
+    [name: string]: DialectFunctionOverloadDef[];
+};

package/dist/dialect/standardsql/functions/dialect_functions.js

@@ -0,0 +1,16 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STANDARDSQL_DIALECT_FUNCTIONS = void 0;
+const util_1 = require("../../functions/util");
+exports.STANDARDSQL_DIALECT_FUNCTIONS = {
+    date_from_unix_date: [
+        (0, util_1.overload)((0, util_1.minScalar)('date'), [(0, util_1.param)('unix_date', (0, util_1.anyExprType)('number'))], (0, util_1.sql) `DATE_FROM_UNIX_DATE(${(0, util_1.arg)('unix_date')})`),
+    ],
+};
+//# sourceMappingURL=dialect_functions.js.map

package/dist/dialect/standardsql/standardsql.d.ts

@@ -54,6 +54,9 @@ export declare class StandardSQLDialect extends Dialect {
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    getDialectFunctions(): {
+        [name: string]: DialectFunctionOverloadDef[];
+    };
     malloyTypeToSQLType(malloyType: FieldAtomicTypeDef): string;
     sqlTypeToMalloyType(sqlType: string): FieldAtomicTypeDef | undefined;
     castToString(expression: string): string;

package/dist/dialect/standardsql/standardsql.js

@@ -27,6 +27,7 @@ const utils_1 = require("../../model/utils");
 const malloy_types_1 = require("../../model/malloy_types");
 const functions_1 = require("./functions");
 const dialect_1 = require("../dialect");
+const dialect_functions_1 = require("./functions/dialect_functions");
 // These are the units that "TIMESTAMP_ADD" "TIMESTAMP_DIFF" accept
 function timestampMeasureable(units) {
     return [
@@ -443,6 +444,9 @@ ${(0, utils_1.indent)(sql)}
     getGlobalFunctionDef(name) {
         return functions_1.STANDARDSQL_FUNCTIONS.get(name);
     }
+    getDialectFunctions() {
+        return dialect_functions_1.STANDARDSQL_DIALECT_FUNCTIONS;
+    }
     malloyTypeToSQLType(malloyType) {
         if (malloyType.type === 'number') {
             if (malloyType.numberType === 'integer') {

package/dist/dialect/trino/functions/dialect_functions.d.ts

@@ -0,0 +1,4 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare const TRINO_DIALECT_FUNCTIONS: {
+    [name: string]: DialectFunctionOverloadDef[];
+};

package/dist/dialect/trino/functions/dialect_functions.js

@@ -0,0 +1,16 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TRINO_DIALECT_FUNCTIONS = void 0;
+const util_1 = require("../../functions/util");
+exports.TRINO_DIALECT_FUNCTIONS = {
+    from_unixtime: [
+        (0, util_1.overload)((0, util_1.minScalar)('timestamp'), [(0, util_1.param)('unixtime', (0, util_1.anyExprType)('number'))], (0, util_1.sql) `FROM_UNIXTIME(${(0, util_1.arg)('unixtime')})`),
+    ],
+};
+//# sourceMappingURL=dialect_functions.js.map

package/dist/dialect/trino/trino.d.ts

@@ -59,6 +59,9 @@ export declare class TrinoDialect extends PostgresBase {
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    getDialectFunctions(): {
+        [name: string]: DialectFunctionOverloadDef[];
+    };
     malloyTypeToSQLType(malloyType: FieldAtomicTypeDef): string;
     sqlTypeToMalloyType(_sqlType: string): FieldAtomicTypeDef | undefined;
     castToString(expression: string): string;

package/dist/dialect/trino/trino.js

@@ -28,6 +28,7 @@ const malloy_types_1 = require("../../model/malloy_types");
 const functions_1 = require("./functions");
 const dialect_1 = require("../dialect");
 const pg_impl_1 = require("../pg_impl");
+const dialect_functions_1 = require("./functions/dialect_functions");
 // These are the units that "TIMESTAMP_ADD" "TIMESTAMP_DIFF" accept
 function timestampMeasureable(units) {
     return [
@@ -420,6 +421,9 @@ ${(0, utils_1.indent)(sql)}
         // TODO: implement
         return functions_1.TRINO_FUNCTIONS.get(name);
     }
+    getDialectFunctions() {
+        return dialect_functions_1.TRINO_DIALECT_FUNCTIONS;
+    }
     malloyTypeToSQLType(malloyType) {
         if (malloyType.type === 'number') {
             if (malloyType.numberType === 'integer') {

package/dist/lang/ast/expressions/expr-func.d.ts

@@ -18,6 +18,7 @@ export declare class ExprFunc extends ExpressionDef {
     canSupportOrderBy(): boolean;
     canSupportLimit(): boolean;
     getExpression(fs: FieldSpace): ExprValue;
+    private findFunctionDef;
     getPropsExpression(fs: FieldSpace, props?: {
         partitionBys?: PartitionBy[];
         orderBys?: FunctionOrdering[];

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

@@ -52,8 +52,30 @@ class ExprFunc extends expression_def_1.ExpressionDef {
     getExpression(fs) {
         return this.getPropsExpression(fs);
     }
+    findFunctionDef(dialect) {
+        var _a, _b, _c;
+        // TODO this makes functions case-insensitive. This is weird that this is the only place
+        // where case insensitivity is thing.
+        const normalizedName = this.name.toLowerCase();
+        const dialectFunc = dialect
+            ? (_b = (_a = this.getDialectNamespace(dialect)) === null || _a === void 0 ? void 0 : _a.getEntry(normalizedName)) === null || _b === void 0 ? void 0 : _b.entry
+            : undefined;
+        const func = dialectFunc !== null && dialectFunc !== void 0 ? dialectFunc : (_c = this.modelEntry(normalizedName)) === null || _c === void 0 ? void 0 : _c.entry;
+        if (func === undefined) {
+            this.log(`Unknown function '${this.name}'. Use '${this.name}!(...)' to call a SQL function directly.`);
+            return { found: undefined, error: 'unknown function' };
+        }
+        else if (func.type !== 'function') {
+            this.log(`Cannot call '${this.name}', which is of type ${func.type}`);
+            return { found: undefined, error: 'called non function' };
+        }
+        if (func.name !== this.name) {
+            this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, 'warn');
+        }
+        return { found: func, error: undefined };
+    }
     getPropsExpression(fs, props) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const argExprsWithoutImplicit = this.args.map(arg => arg.getExpression(fs));
         if (this.isRaw) {
             let expressionType = 'scalar';
@@ -78,19 +100,10 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                 evalSpace: (0, malloy_types_1.mergeEvalSpaces)(...argExprsWithoutImplicit.map(e => e.evalSpace)),
             };
         }
-        // TODO this makes functions case-insensitive. This is weird that this is the only place
-        // where case insensitivity is thing.
-        const func = (_c = this.modelEntry(this.name.toLowerCase())) === null || _c === void 0 ? void 0 : _c.entry;
+        const dialect = (_c = fs.dialectObj()) === null || _c === void 0 ? void 0 : _c.name;
+        const { found: func, error } = this.findFunctionDef(dialect);
         if (func === undefined) {
-            this.log(`Unknown function '${this.name}'. Use '${this.name}!(...)' to call a SQL function directly.`);
-            return (0, ast_utils_1.errorFor)('unknown function');
-        }
-        else if (func.type !== 'function') {
-            this.log(`Cannot call '${this.name}', which is of type ${func.type}`);
-            return (0, ast_utils_1.errorFor)('called non function');
-        }
-        if (func.name !== this.name) {
-            this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, 'warn');
+            return (0, ast_utils_1.errorFor)(error);
         }
         // Find the 'implicit argument' for aggregate functions called like `some_join.some_field.agg(...args)`
         // where the full arg list is `(some_field, ...args)`.
@@ -183,7 +196,6 @@ class ExprFunc extends expression_def_1.ExpressionDef {
             structPath,
         };
         let funcCall = frag;
-        const dialect = (_e = fs.dialectObj()) === null || _e === void 0 ? void 0 : _e.name;
         const dialectOverload = dialect ? overload.dialect[dialect] : undefined;
         // TODO add in an error if you use an asymmetric function in BQ
         // and the function uses joins

package/dist/lang/ast/types/dialect-name-space.d.ts

@@ -0,0 +1,12 @@
+import { Dialect } from '../../../dialect';
+import { ModelEntry } from './model-entry';
+import { NameSpace } from './name-space';
+/**
+ * This is the dialect namespace, which sits below the global namespace.
+ */
+export declare class DialectNameSpace implements NameSpace {
+    private entries;
+    constructor(dialect: Dialect);
+    getEntry(name: string): ModelEntry | undefined;
+    setEntry(_name: string, _value: ModelEntry, _exported: boolean): void;
+}

package/dist/lang/ast/types/dialect-name-space.js

@@ -0,0 +1,57 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DialectNameSpace = void 0;
+/**
+ * This is the dialect namespace, which sits below the global namespace.
+ */
+class DialectNameSpace {
+    constructor(dialect) {
+        this.entries = new Map();
+        const dialectFunctions = dialect.getDialectFunctions();
+        for (const name in dialectFunctions) {
+            const overloads = dialectFunctions[name];
+            this.entries.set(name, {
+                type: 'function',
+                name,
+                overloads: overloads.map(overload => {
+                    return {
+                        returnType: overload.returnType,
+                        params: overload.params,
+                        dialect: {
+                            [dialect.name]: {
+                                e: overload.e,
+                                supportsOrderBy: overload.supportsOrderBy,
+                                defaultOrderByArgIndex: overload.defaultOrderByArgIndex,
+                                supportsLimit: overload.supportsLimit,
+                            },
+                        },
+                        needsWindowOrderBy: overload.needsWindowOrderBy,
+                        between: overload.between,
+                        isSymmetric: overload.isSymmetric,
+                    };
+                }),
+            });
+        }
+    }
+    getEntry(name) {
+        const func = this.entries.get(name);
+        if (func === undefined) {
+            return undefined;
+        }
+        return {
+            entry: func,
+            exported: false,
+        };
+    }
+    setEntry(_name, _value, _exported) {
+        throw new Error('The dialect namespace is immutable!');
+    }
+}
+exports.DialectNameSpace = DialectNameSpace;
+//# sourceMappingURL=dialect-name-space.js.map

package/dist/lang/ast/types/malloy-element.d.ts

@@ -27,6 +27,7 @@ export declare abstract class MalloyElement {
     get code(): string;
     protected document(): Document | undefined;
     protected namespace(): NameSpace | undefined;
+    getDialectNamespace(dialectName: string): NameSpace | undefined;
     modelEntry(reference: string | ModelEntryReference): ModelEntry | undefined;
     private xlate?;
     /**
@@ -140,5 +141,7 @@ export declare class Document extends MalloyElement implements NameSpace {
      * @returns The error message or undefined
      */
     checkExperimentalDialect(me: MalloyElement, dialect: string): void;
+    private readonly dialectNameSpaces;
+    getDialectNamespace(dialectName: string): NameSpace | undefined;
 }
 export {};

package/dist/lang/ast/types/malloy-element.js

@@ -26,6 +26,7 @@ exports.Document = exports.DocStatementList = exports.ListOf = exports.isDocStat
 const dialect_1 = require("../../../dialect");
 const malloy_types_1 = require("../../../model/malloy_types");
 const tags_1 = require("../../../tags");
+const dialect_name_space_1 = require("./dialect-name-space");
 const global_name_space_1 = require("./global-name-space");
 const noteable_1 = require("./noteable");
 const uuid_1 = require("uuid");
@@ -100,6 +101,10 @@ class MalloyElement {
         }
         throw new Error('INTERNAL ERROR: Translation without document scope');
     }
+    getDialectNamespace(dialectName) {
+        var _a;
+        return (_a = this.document()) === null || _a === void 0 ? void 0 : _a.getDialectNamespace(dialectName);
+    }
     modelEntry(reference) {
         var _a;
         const key = reference instanceof ModelEntryReference ? reference.name : reference;
@@ -434,6 +439,7 @@ class Document extends MalloyElement {
         this.annotation = {};
         this.experiments = new tags_1.Tag({});
         this.modelAnnotationTodoList = [];
+        this.dialectNameSpaces = new Map();
         this.statements = new DocStatementList(statements);
         this.has({ statements: statements });
     }
@@ -567,6 +573,15 @@ class Document extends MalloyElement {
             me.log(`Requires compiler flag '##! experimental.dialect.${dialect}'`, 'error');
         }
     }
+    getDialectNamespace(dialectName) {
+        if (this.dialectNameSpaces.has(dialectName)) {
+            return this.dialectNameSpaces.get(dialectName);
+        }
+        const dialect = (0, dialect_1.getDialect)(dialectName);
+        const ns = new dialect_name_space_1.DialectNameSpace(dialect);
+        this.dialectNameSpaces.set(dialectName, ns);
+        return ns;
+    }
 }
 exports.Document = Document;
 //# sourceMappingURL=malloy-element.js.map

package/dist/lang/test/query.spec.js

@@ -593,6 +593,18 @@ describe('query:', () => {
         calculate: a is lag(big_i)
       }`).toTranslate();
         });
+        describe('dialect functions', () => {
+            test('can use function enabled in this dialect (standardsql)', () => {
+                expect(`run: a -> {
+          group_by: d is date_from_unix_date(1000)
+        }`).toTranslate();
+            });
+            test('cannot use function enabled in a different dialect (duckdb)', () => {
+                expect(`run: a -> {
+          group_by: ts is to_timestamp(1000)
+        }`).translationToFailWith(/Unknown function/);
+            });
+        });
     });
     describe('qops', () => {
         test('group by single', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.180-dev240906180931",
+  "version": "0.0.180-dev240906195755",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",