@malloydata/malloy 0.0.293 → 0.0.294

package/dist/api/util.js

@@ -216,11 +216,15 @@ function wrapResult(result) {
             .set(['query_name'], result.resultExplore.name)
             .toString(),
     });
+    const modelAnnotations = (0, annotation_1.annotationToTaglines)(result._modelDef.annotation).map(l => ({
+        value: l,
+    }));
     return {
         schema,
         data: mapData(result.data.toObject(), schema),
         connection_name: result.connectionName,
         annotations: annotations.length > 0 ? annotations : undefined,
+        model_annotations: modelAnnotations.length > 0 ? modelAnnotations : undefined,
         query_timezone: result.data.field.queryTimezone,
         sql: result.sql,
     };

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 export { DuckDBDialect, StandardSQLDialect, TrinoDialect, PostgresDialect, SnowflakeDialect, MySQLDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, param, variadicParam, literal, spread, Dialect, TinyParser, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, MalloyStandardFunctionImplementations, DefinitionBlueprint, DefinitionBlueprintMap, OverloadedDefinitionBlueprint, TinyToken, } from './dialect';
-export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, } from './model';
+export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, } from './model';
 export { isSourceDef, Segment, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, } from './model';
 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, SourceComponentInfo, } 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 { 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, TableSourceDef } 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, SourceComponentInfo } 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,15 +19,6 @@ 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;
@@ -629,7 +620,7 @@ export declare class Explore extends Entity implements Taggable {
     get location(): DocumentLocation | undefined;
     private collectSourceComponents;
     /**
-     * THIS IS A HIGHLY EXPERIMENTAL API AND MAY VANISH OR CHAGE WITHOUT NOTICE
+     * THIS IS A HIGHLY EXPERIMENTAL API AND MAY VANISH OR CHANGE WITHOUT NOTICE
      */
     getSourceComponents(): SourceComponentInfo[];
 }

package/dist/malloy.js

@@ -1283,10 +1283,11 @@ class Explore extends Entity {
         }
         if (isSourceComponent(structDef)) {
             if (structDef.type === 'table') {
-                // Generate sourceID based on connection and table name
+                // Generate componentID based on connection and table name
                 sources.push({
                     type: 'table',
                     tableName: structDef.tablePath,
+                    componentID: `${structDef.connection}:${structDef.tablePath}`,
                     sourceID: `${structDef.connection}:${structDef.tablePath}`,
                 });
             }
@@ -1294,6 +1295,7 @@ class Explore extends Entity {
                 sources.push({
                     type: 'sql',
                     selectStatement: structDef.selectStr,
+                    componentID: `${structDef.connection}:${structDef.selectStr}`,
                     sourceID: `${structDef.connection}:${structDef.selectStr}`,
                 });
             }
@@ -1314,12 +1316,13 @@ class Explore extends Entity {
                     // 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}`;
+                // Generate componentID based on connection and SQL
+                const componentID = `${structDef.connection}:${sql}`;
                 sources.push({
                     type: 'sql',
                     selectStatement: sql,
-                    sourceID: sourceID,
+                    componentID: componentID,
+                    sourceID: componentID,
                 });
             }
         }
@@ -1335,15 +1338,20 @@ class Explore extends Entity {
         return sources;
     }
     /**
-     * THIS IS A HIGHLY EXPERIMENTAL API AND MAY VANISH OR CHAGE WITHOUT NOTICE
+     * THIS IS A HIGHLY EXPERIMENTAL API AND MAY VANISH OR CHANGE 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
+            // Deduplicate sources using componentID as the key
             for (const source of allSources) {
-                uniqueSources[source.sourceID] = source;
+                if (source.componentID) {
+                    uniqueSources[source.componentID] = source;
+                }
+                else if (source.sourceID) {
+                    uniqueSources[source.sourceID] = source;
+                }
             }
         }
         // Return the deduplicated sources as an array

package/dist/model/malloy_types.d.ts

@@ -665,6 +665,17 @@ export type SourceDef = TableSourceDef | SQLSourceDef | QuerySourceDef | QueryRe
 /** Is this the "FROM" table of a query tree */
 export declare function isBaseTable(def: StructDef): def is SourceDef;
 export type StructDef = SourceDef | RecordDef | ArrayDef;
+export type SourceComponentInfo = {
+    type: 'table';
+    tableName: string;
+    componentID?: string;
+    sourceID?: string;
+} | {
+    type: 'sql';
+    selectStatement: string;
+    componentID?: string;
+    sourceID?: string;
+};
 export type NonAtomicType = Exclude<JoinElementType, 'array' | 'record'> | 'turtle' | 'null' | 'duration' | 'regular expression' | 'filter expression';
 export interface NonAtomicTypeDef {
     type: NonAtomicType;

package/dist/run_sql_options.d.ts

@@ -1,9 +1,17 @@
-import type { Annotation } from './model/malloy_types';
+import type { Annotation, NamedObject, SourceComponentInfo } from './model/malloy_types';
+type SourceRefWithMetadata = NamedObject & {
+    annotation?: Annotation;
+    sourceComponentInfos?: SourceComponentInfo[];
+};
 export interface RunSQLOptions {
     rowLimit?: number;
     abortSignal?: AbortSignal;
     modelAnnotation?: Annotation;
     queryAnnotation?: Annotation;
     replaceMaterializedReferences?: boolean;
+    clientMetadata?: {
+        sourceRefWithMetadata?: SourceRefWithMetadata;
+    };
 }
 export type QueryOptionsReader = RunSQLOptions | (() => RunSQLOptions);
+export {};

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.293";
+export declare const MALLOY_VERSION = "0.0.294";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.293",
+  "version": "0.0.294",
   "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.293",
-    "@malloydata/malloy-interfaces": "0.0.293",
-    "@malloydata/malloy-tag": "0.0.293",
+    "@malloydata/malloy-filter": "0.0.294",
+    "@malloydata/malloy-interfaces": "0.0.294",
+    "@malloydata/malloy-tag": "0.0.294",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",