@malloydata/malloy 0.0.288 → 0.0.289

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { isSourceDef, Segment, isBasicAtomic, isJoined, isJoinedSource, isSampli
 export { malloyToQuery, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
 export { Model, Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, PreparedResult, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, InMemoryModelCache, CacheManager, } from './malloy';
-export type { PreparedQuery, Field, AtomicField, ExploreField, QueryField, SortableField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, Loggable, ModelMaterializer, DocumentTablePath, DocumentSymbol, ResultJSON, PreparedResultJSON, PreparedResultMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, ModelCache, CachedModel, DateField, TimestampField, } from './malloy';
+export type { PreparedQuery, Field, AtomicField, ExploreField, QueryField, SortableField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, Loggable, ModelMaterializer, DocumentTablePath, DocumentSymbol, ResultJSON, PreparedResultJSON, PreparedResultMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, ModelCache, CachedModel, DateField, TimestampField, SourceComponentInfo, } from './malloy';
 export type { QueryOptionsReader, RunSQLOptions } from './run_sql_options';
 export type { EventStream, ModelString, ModelURL, QueryString, QueryURL, URLReader, InvalidationKey, } from './runtime_types';
 export type { Connection, ConnectionConfig, ConnectionFactory, ConnectionParameter, ConnectionParameterValue, ConnectionConfigSchema, FetchSchemaOptions, InfoConnection, LookupConnection, PersistSQLResults, PooledConnection, TestableConnection, StreamingConnection, } from './connection/types';

package/dist/malloy.d.ts

@@ -2,7 +2,7 @@ import type { RunSQLOptions } from './run_sql_options';
 import type { DocumentCompletion as DocumentCompletionDefinition, DocumentSymbol as DocumentSymbolDefinition, LogMessage } from './lang';
 import { MalloyTranslator } from './lang';
 import type { DocumentHelpContext } from './lang/parse-tree-walkers/document-help-context-walker';
-import type { CompiledQuery, DocumentLocation, DocumentReference, BooleanFieldDef, JSONFieldDef, NumberFieldDef, StringFieldDef, FilterCondition, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, NativeUnsupportedFieldDef, QueryRunStats, ImportLocation, Annotation, SQLSourceDef, AtomicFieldDef, DateFieldDef, TimestampFieldDef, SourceDef, QueryToMaterialize, Argument } from './model';
+import type { CompiledQuery, DocumentLocation, DocumentReference, BooleanFieldDef, JSONFieldDef, NumberFieldDef, StringFieldDef, FilterCondition, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, NativeUnsupportedFieldDef, QueryRunStats, ImportLocation, Annotation, SQLSourceDef, AtomicFieldDef, DateFieldDef, TimestampFieldDef, SourceDef, QueryToMaterialize, Argument, TableSourceDef } from './model';
 import type { EventStream, InvalidationKey, ModelString, ModelURL, QueryString, QueryURL, URLReader } from './runtime_types';
 import type { Connection, FetchSchemaOptions, InfoConnection, LookupConnection } from './connection/types';
 import type { Tag } from '@malloydata/malloy-tag';
@@ -19,6 +19,15 @@ export interface Loggable {
     warn: (message?: any, ...optionalParams: any[]) => void;
     error: (message?: any, ...optionalParams: any[]) => void;
 }
+export type SourceComponentInfo = {
+    type: 'table';
+    tableName: string;
+    sourceID: string;
+} | {
+    type: 'sql';
+    selectStatement: string;
+    sourceID: string;
+};
 export interface ParseOptions {
     importBaseURL?: URL;
     testEnvironment?: boolean;
@@ -98,7 +107,7 @@ export declare class Malloy {
      * instead of looping forever, but the fix is to correct the dialect.
      */
     static safelyFetchTableSchema(connection: InfoConnection, toFetch: Record<string, string>, opts: FetchSchemaOptions): Promise<{
-        schemas: Record<string, import("./model").TableSourceDef>;
+        schemas: Record<string, TableSourceDef>;
         errors: Record<string, string>;
     }>;
     /**
@@ -618,6 +627,11 @@ export declare class Explore extends Entity implements Taggable {
     toJSON(): SerializedExplore;
     static fromJSON(main_explore: SerializedExplore): Explore;
     get location(): DocumentLocation | undefined;
+    private collectSourceComponents;
+    /**
+     * THIS IS A HIGHLY EXPERIMENTAL API AND MAY VANISH OR CHAGE WITHOUT NOTICE
+     */
+    getSourceComponents(): SourceComponentInfo[];
 }
 export declare enum AtomicFieldType {
     String = "string",

package/dist/malloy.js

@@ -33,6 +33,11 @@ const annotation_1 = require("./annotation");
 const sql_block_1 = require("./model/sql_block");
 const utils_1 = require("./lang/utils");
 const reference_list_1 = require("./lang/reference-list");
+function isSourceComponent(source) {
+    return (source.type === 'table' ||
+        source.type === 'sql_select' ||
+        source.type === 'query_source');
+}
 const MALLOY_INTERNAL_URL = 'internal://internal.malloy';
 class Malloy {
     static get version() {
@@ -499,7 +504,7 @@ class Model {
      */
     getExploreByName(name) {
         const struct = this.modelDef.contents[name];
-        if ((0, model_1.isSourceDef)(struct)) {
+        if (struct && (0, model_1.isSourceDef)(struct)) {
             return new Explore(struct);
         }
         throw new Error("'name' is not an explore");
@@ -1268,6 +1273,82 @@ class Explore extends Entity {
     get location() {
         return this.structDef.location;
     }
+    collectSourceComponents(structDef) {
+        const sources = [];
+        if (structDef.type === 'composite') {
+            for (const source of structDef.sources) {
+                sources.push(...this.collectSourceComponents(source));
+            }
+            return sources;
+        }
+        if (isSourceComponent(structDef)) {
+            if (structDef.type === 'table') {
+                // Generate sourceID based on connection and table name
+                sources.push({
+                    type: 'table',
+                    tableName: structDef.tablePath,
+                    sourceID: `${structDef.connection}:${structDef.tablePath}`,
+                });
+            }
+            else if (structDef.type === 'sql_select') {
+                sources.push({
+                    type: 'sql',
+                    selectStatement: structDef.selectStr,
+                    sourceID: `${structDef.connection}:${structDef.selectStr}`,
+                });
+            }
+            else if (structDef.type === 'query_source') {
+                // For QuerySourceDef, we need to extract the SQL from the query
+                // We need to create a PreparedQuery from the query, then get a PreparedResult
+                // to access the SQL
+                let sql;
+                try {
+                    // Create a PreparedQuery from the query in the QuerySourceDef
+                    const preparedQuery = new PreparedQuery(structDef.query, this.modelDef, []);
+                    // Get the PreparedResult which contains the SQL
+                    const preparedResult = preparedQuery.getPreparedResult();
+                    // Extract the SQL
+                    sql = preparedResult.sql;
+                }
+                catch (error) {
+                    // If we can't compile the query, use a placeholder
+                    sql = `-- Could not compile SQL for query ${structDef.query.name || 'unnamed query'}: ${error instanceof Error ? error.message : String(error)}`;
+                }
+                // Generate sourceID based on connection and SQL
+                const sourceID = `${structDef.connection}:${sql}`;
+                sources.push({
+                    type: 'sql',
+                    selectStatement: sql,
+                    sourceID: sourceID,
+                });
+            }
+        }
+        else {
+            return [];
+        }
+        // Process all fields to find joins
+        for (const field of structDef.fields) {
+            if ((0, model_1.isJoined)(field)) {
+                sources.push(...this.collectSourceComponents(field));
+            }
+        }
+        return sources;
+    }
+    /**
+     * THIS IS A HIGHLY EXPERIMENTAL API AND MAY VANISH OR CHAGE WITHOUT NOTICE
+     */
+    getSourceComponents() {
+        const uniqueSources = {};
+        if ((0, model_1.isSourceDef)(this.structDef)) {
+            const allSources = this.collectSourceComponents(this.structDef);
+            // Deduplicate sources using sourceID as the key
+            for (const source of allSources) {
+                uniqueSources[source.sourceID] = source;
+            }
+        }
+        // Return the deduplicated sources as an array
+        return Object.values(uniqueSources);
+    }
 }
 exports.Explore = Explore;
 var AtomicFieldType;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.288";
+export declare const MALLOY_VERSION = "0.0.289";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.288",
+  "version": "0.0.289",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,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.288",
-    "@malloydata/malloy-interfaces": "0.0.288",
-    "@malloydata/malloy-tag": "0.0.288",
+    "@malloydata/malloy-filter": "0.0.289",
+    "@malloydata/malloy-interfaces": "0.0.289",
+    "@malloydata/malloy-tag": "0.0.289",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",