@malloydata/malloy 0.0.239-dev250226010331 → 0.0.239-dev250227145856

package/dist/api/sessioned.js

@@ -0,0 +1,210 @@
+"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.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileQuery = exports.compileSource = exports.compileModel = void 0;
+const Malloy = __importStar(require("@malloydata/malloy-interfaces"));
+const Core = __importStar(require("./core"));
+function sessionInfosMatch(a, b) {
+    if (a.type === 'compile_model') {
+        if (b.type !== 'compile_model')
+            return false;
+        return a.modelURL === b.modelURL && a.extendModelURL === b.extendModelURL;
+    }
+    else if (a.type === 'compile_source') {
+        if (b.type !== 'compile_source')
+            return false;
+        return (a.modelURL === b.modelURL &&
+            a.extendModelURL === b.extendModelURL &&
+            a.name === b.name);
+    }
+    else {
+        if (b.type !== 'compile_query')
+            return false;
+        return a.modelURL === b.modelURL && a.queryString === b.queryString;
+    }
+}
+class SessionManager {
+    constructor() {
+        this.sessions = [];
+    }
+    purgeExpired(except) {
+        const now = new Date();
+        this.sessions = this.sessions.filter(s => (except && sessionInfosMatch(s.sessionInfo, except)) ||
+            s.expires === undefined ||
+            s.expires > now);
+    }
+    findSession(sessionInfo) {
+        const session = this.sessions.find(s => sessionInfosMatch(s.sessionInfo, sessionInfo));
+        this.purgeExpired(sessionInfo);
+        return session;
+    }
+    getExpires(ttl) {
+        if (ttl instanceof Date) {
+            return ttl;
+        }
+        else {
+            // TODO is this how you do this?
+            return new Date(Date.now() + ttl.seconds * 1000);
+        }
+    }
+    newCompileModelSession(request, sessionInfo, options) {
+        const expires = (options === null || options === void 0 ? void 0 : options.ttl) ? this.getExpires(options.ttl) : undefined;
+        const state = Core.newCompileModelState(request);
+        return {
+            type: 'compile_model',
+            sessionInfo,
+            state,
+            expires,
+        };
+    }
+    newCompileSourceSession(request, sessionInfo, options) {
+        const expires = (options === null || options === void 0 ? void 0 : options.ttl) ? this.getExpires(options.ttl) : undefined;
+        const state = Core.newCompileSourceState(request);
+        return {
+            type: 'compile_source',
+            sessionInfo,
+            state,
+            expires,
+        };
+    }
+    newCompileQuerySession(request, sessionInfo, options) {
+        const expires = (options === null || options === void 0 ? void 0 : options.ttl) ? this.getExpires(options.ttl) : undefined;
+        const state = Core.newCompileQueryState(request);
+        return {
+            type: 'compile_query',
+            sessionInfo,
+            state,
+            expires,
+        };
+    }
+    findCompileModelSession(sessionInfo) {
+        const session = this.findSession(sessionInfo);
+        if ((session === null || session === void 0 ? void 0 : session.type) === 'compile_model') {
+            return session;
+        }
+    }
+    killSession(sessionInfo) {
+        this.sessions = this.sessions.filter(s => !sessionInfosMatch(s.sessionInfo, sessionInfo));
+    }
+    hasErrors(log) {
+        var _a;
+        return (_a = log === null || log === void 0 ? void 0 : log.some(m => m.severity === 'error')) !== null && _a !== void 0 ? _a : false;
+    }
+    compileModel(request, options) {
+        const sessionInfo = {
+            type: 'compile_model',
+            modelURL: request.model_url,
+            extendModelURL: request.extend_model_url,
+        };
+        let session = this.findCompileModelSession(sessionInfo);
+        if (session) {
+            Core.updateCompileModelState(session.state, request.compiler_needs);
+        }
+        else {
+            session = this.newCompileModelSession(request, sessionInfo, options);
+            this.sessions.push(session);
+        }
+        const result = Core.statedCompileModel(session.state);
+        if (result.model || this.hasErrors(result.logs)) {
+            this.killSession(sessionInfo);
+        }
+        return result;
+    }
+    findCompileSourceSession(sessionInfo) {
+        const session = this.findSession(sessionInfo);
+        if ((session === null || session === void 0 ? void 0 : session.type) === 'compile_source') {
+            return session;
+        }
+    }
+    compileSource(request, options) {
+        const sessionInfo = {
+            type: 'compile_source',
+            modelURL: request.model_url,
+            name: request.name,
+            extendModelURL: request.extend_model_url,
+        };
+        let session = this.findCompileSourceSession(sessionInfo);
+        if (session) {
+            Core.updateCompileModelState(session.state, request.compiler_needs);
+        }
+        else {
+            session = this.newCompileSourceSession(request, sessionInfo, options);
+            this.sessions.push(session);
+        }
+        const result = Core.statedCompileSource(session.state, request.name);
+        if (result.source || this.hasErrors(result.logs)) {
+            this.killSession(sessionInfo);
+        }
+        return result;
+    }
+    findCompileQuerySession(sessionInfo) {
+        const session = this.findSession(sessionInfo);
+        if ((session === null || session === void 0 ? void 0 : session.type) === 'compile_query') {
+            return session;
+        }
+    }
+    compileQuery(request, options) {
+        const queryString = Malloy.queryToMalloy(request.query);
+        const sessionInfo = {
+            type: 'compile_query',
+            modelURL: request.model_url,
+            queryString,
+            query: request.query,
+        };
+        let session = this.findCompileQuerySession(sessionInfo);
+        if (session) {
+            Core.updateCompileModelState(session.state, request.compiler_needs);
+        }
+        else {
+            session = this.newCompileQuerySession(request, sessionInfo, options);
+            this.sessions.push(session);
+        }
+        const result = Core.statedCompileQuery(session.state);
+        if (result.result || this.hasErrors(result.logs)) {
+            this.killSession(sessionInfo);
+        }
+        return result;
+    }
+}
+const SESSION_MANAGER = new SessionManager();
+function compileModel(request, options) {
+    return SESSION_MANAGER.compileModel(request, options);
+}
+exports.compileModel = compileModel;
+function compileSource(request, options) {
+    return SESSION_MANAGER.compileSource(request, options);
+}
+exports.compileSource = compileSource;
+function compileQuery(request, options) {
+    return SESSION_MANAGER.compileQuery(request, options);
+}
+exports.compileQuery = compileQuery;
+//# sourceMappingURL=sessioned.js.map

package/dist/api/sessioned.spec.d.ts

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

package/dist/api/sessioned.spec.js

@@ -0,0 +1,417 @@
+"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 });
+const sessioned_1 = require("./sessioned");
+describe('api', () => {
+    describe('compile model', () => {
+        test('compile model with table dependency', () => {
+            let result = (0, sessioned_1.compileModel)({
+                model_url: 'file://test.malloy',
+            });
+            let expected = {
+                compiler_needs: {
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                        },
+                    ],
+                },
+            };
+            expect(result).toMatchObject(expected);
+            result = (0, sessioned_1.compileModel)({
+                model_url: 'file://test.malloy',
+                compiler_needs: {
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                            contents: "source: flights is connection.table('flights')",
+                        },
+                    ],
+                },
+            });
+            expected = {
+                compiler_needs: {
+                    table_schemas: [
+                        {
+                            connection_name: 'connection',
+                            name: 'flights',
+                        },
+                    ],
+                    connections: [{ name: 'connection' }],
+                },
+            };
+            expect(result).toMatchObject(expected);
+            result = (0, sessioned_1.compileModel)({
+                model_url: 'file://test.malloy',
+                compiler_needs: {
+                    table_schemas: [
+                        {
+                            connection_name: 'connection',
+                            name: 'flights',
+                            schema: {
+                                fields: [
+                                    {
+                                        kind: 'dimension',
+                                        name: 'carrier',
+                                        type: { kind: 'string_type' },
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                    connections: [{ name: 'connection', dialect: 'duckdb' }],
+                },
+            });
+            expected = {
+                model: {
+                    entries: [
+                        {
+                            kind: 'source',
+                            name: 'flights',
+                            schema: {
+                                fields: [
+                                    {
+                                        kind: 'dimension',
+                                        name: 'carrier',
+                                        type: { kind: 'string_type' },
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                    anonymous_queries: [],
+                },
+            };
+            expect(result).toMatchObject(expected);
+        });
+        test('compile source basic test', () => {
+            let result = (0, sessioned_1.compileSource)({
+                model_url: 'file://test.malloy',
+                name: 'flights',
+                compiler_needs: {
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                            contents: "source: flights is connection.table('flights')",
+                        },
+                    ],
+                },
+            });
+            let expected = {
+                compiler_needs: {
+                    table_schemas: [
+                        {
+                            connection_name: 'connection',
+                            name: 'flights',
+                        },
+                    ],
+                    connections: [{ name: 'connection' }],
+                },
+            };
+            expect(result).toMatchObject(expected);
+            result = (0, sessioned_1.compileSource)({
+                model_url: 'file://test.malloy',
+                name: 'flights',
+                compiler_needs: {
+                    table_schemas: [
+                        {
+                            connection_name: 'connection',
+                            name: 'flights',
+                            schema: {
+                                fields: [
+                                    {
+                                        kind: 'dimension',
+                                        name: 'carrier',
+                                        type: { kind: 'string_type' },
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                    connections: [{ name: 'connection', dialect: 'duckdb' }],
+                },
+            });
+            expected = {
+                source: {
+                    name: 'flights',
+                    schema: {
+                        fields: [
+                            {
+                                kind: 'dimension',
+                                name: 'carrier',
+                                type: { kind: 'string_type' },
+                            },
+                        ],
+                    },
+                },
+            };
+            expect(result).toMatchObject(expected);
+        });
+    });
+    describe('compile query', () => {
+        test('compile query with table dependency', () => {
+            const query = {
+                definition: {
+                    kind: 'arrow',
+                    source_reference: { name: 'flights' },
+                    view: {
+                        kind: 'segment',
+                        operations: [
+                            {
+                                kind: 'group_by',
+                                field: {
+                                    expression: { kind: 'field_reference', name: 'carrier' },
+                                },
+                            },
+                        ],
+                    },
+                },
+            };
+            let result = (0, sessioned_1.compileQuery)({
+                model_url: 'file://test.malloy',
+                query,
+            });
+            let expected = {
+                compiler_needs: {
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                        },
+                    ],
+                },
+            };
+            expect(result).toMatchObject(expected);
+            result = (0, sessioned_1.compileQuery)({
+                model_url: 'file://test.malloy',
+                query,
+                compiler_needs: {
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                            contents: "source: flights is connection.table('flights')",
+                        },
+                    ],
+                },
+            });
+            expected = {
+                compiler_needs: {
+                    table_schemas: [
+                        {
+                            connection_name: 'connection',
+                            name: 'flights',
+                        },
+                    ],
+                    connections: [{ name: 'connection' }],
+                },
+            };
+            expect(result).toMatchObject(expected);
+            result = (0, sessioned_1.compileQuery)({
+                model_url: 'file://test.malloy',
+                query,
+                compiler_needs: {
+                    table_schemas: [
+                        {
+                            connection_name: 'connection',
+                            name: 'flights',
+                            schema: {
+                                fields: [
+                                    {
+                                        kind: 'dimension',
+                                        name: 'carrier',
+                                        type: { kind: 'string_type' },
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                    connections: [{ name: 'connection', dialect: 'duckdb' }],
+                },
+            });
+            expected = {
+                result: {
+                    connection_name: 'connection',
+                    sql: `SELECT \n\
+   base."carrier" as "carrier"
+FROM flights as base
+GROUP BY 1
+ORDER BY 1 asc NULLS LAST
+`,
+                    schema: {
+                        fields: [
+                            {
+                                kind: 'dimension',
+                                name: 'carrier',
+                                type: { kind: 'string_type' },
+                            },
+                        ],
+                    },
+                },
+            };
+            expect(result).toMatchObject(expected);
+        });
+    });
+    describe('sessions', () => {
+        describe('ttl', () => {
+            test('making a different request should purge expired sessions', () => {
+                let result = (0, sessioned_1.compileModel)({
+                    model_url: 'file://test.malloy',
+                }, {
+                    // This is in the past...
+                    ttl: new Date(Date.now() - 1000),
+                });
+                let expected = {
+                    compiler_needs: {
+                        files: [
+                            {
+                                url: 'file://test.malloy',
+                            },
+                        ],
+                    },
+                };
+                expect(result).toMatchObject(expected);
+                (0, sessioned_1.compileModel)({
+                    model_url: 'file://some_other_model.malloy',
+                });
+                result = (0, sessioned_1.compileModel)({
+                    model_url: 'file://test.malloy',
+                });
+                expected = {
+                    compiler_needs: {
+                        files: [
+                            {
+                                url: 'file://test.malloy',
+                            },
+                        ],
+                    },
+                };
+                expect(result).toMatchObject(expected);
+            });
+        });
+        test('getting an error should kill session', () => {
+            let result = (0, sessioned_1.compileModel)({
+                model_url: 'file://test.malloy',
+                compiler_needs: {
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                            contents: "source: flights is connection.table('flights') extend { dimension: x is does_not_exist }",
+                        },
+                    ],
+                    table_schemas: [
+                        {
+                            connection_name: 'connection',
+                            name: 'flights',
+                            schema: {
+                                fields: [
+                                    {
+                                        kind: 'dimension',
+                                        name: 'carrier',
+                                        type: { kind: 'string_type' },
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                    connections: [{ name: 'connection', dialect: 'duckdb' }],
+                },
+            });
+            let expected = {
+                logs: [
+                    {
+                        url: 'file://test.malloy',
+                        severity: 'error',
+                        message: "'does_not_exist' is not defined",
+                        range: {
+                            start: { line: 0, character: 72 },
+                            end: { line: 0, character: 86 },
+                        },
+                    },
+                ],
+            };
+            expect(result).toMatchObject(expected);
+            result = (0, sessioned_1.compileModel)({
+                model_url: 'file://test.malloy',
+            });
+            expected = {
+                compiler_needs: {
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                        },
+                    ],
+                },
+            };
+            expect(result).toMatchObject(expected);
+        });
+        test('sessions should be cleared when they successfully return a result', () => {
+            let result = (0, sessioned_1.compileModel)({
+                model_url: 'file://test.malloy',
+                compiler_needs: {
+                    table_schemas: [
+                        {
+                            connection_name: 'connection',
+                            name: 'flights',
+                            schema: {
+                                fields: [
+                                    {
+                                        kind: 'dimension',
+                                        name: 'carrier',
+                                        type: { kind: 'string_type' },
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                            contents: "source: flights is connection.table('flights')",
+                        },
+                    ],
+                    connections: [{ name: 'connection', dialect: 'duckdb' }],
+                },
+            });
+            let expected = {
+                model: {
+                    entries: [
+                        {
+                            kind: 'source',
+                            name: 'flights',
+                            schema: {
+                                fields: [
+                                    {
+                                        kind: 'dimension',
+                                        name: 'carrier',
+                                        type: { kind: 'string_type' },
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                    anonymous_queries: [],
+                },
+            };
+            expect(result).toMatchObject(expected);
+            result = (0, sessioned_1.compileModel)({
+                model_url: 'file://test.malloy',
+            });
+            // Compiler should not know the contents of this file anymore because the session was cleared
+            expected = {
+                compiler_needs: {
+                    files: [
+                        {
+                            url: 'file://test.malloy',
+                        },
+                    ],
+                },
+            };
+            expect(result).toMatchObject(expected);
+        });
+    });
+});
+//# sourceMappingURL=sessioned.spec.js.map

package/dist/api/stateless.d.ts

@@ -0,0 +1,4 @@
+import * as Malloy from '@malloydata/malloy-interfaces';
+export declare function compileModel(request: Malloy.CompileModelRequest): Malloy.CompileModelResponse;
+export declare function compileSource(request: Malloy.CompileSourceRequest): Malloy.CompileSourceResponse;
+export declare function compileQuery(request: Malloy.CompileQueryRequest): Malloy.CompileQueryResponse;

package/dist/api/stateless.js

@@ -0,0 +1,46 @@
+"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.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileQuery = exports.compileSource = exports.compileModel = void 0;
+const Core = __importStar(require("./core"));
+function compileModel(request) {
+    return Core.compileModel(request);
+}
+exports.compileModel = compileModel;
+function compileSource(request) {
+    return Core.compileSource(request);
+}
+exports.compileSource = compileSource;
+function compileQuery(request) {
+    return Core.compileQuery(request);
+}
+exports.compileQuery = compileQuery;
+//# sourceMappingURL=stateless.js.map

package/dist/api/stateless.spec.d.ts

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