@malloydata/malloy 0.0.400 → 0.0.401

package/dist/api/foundation/core.d.ts

@@ -1,5 +1,5 @@
 import type { LogMessage } from '../../lang';
-import type { BuildID, CompiledQuery, ConstantExpr, DocumentLocation, BooleanFieldDef, JSONFieldDef, NumberFieldDef, StringFieldDef, FilterCondition, Given as InternalGiven, GivenID, GivenTypeDef, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQueryDef, StructDef, TurtleDef, NativeUnsupportedFieldDef, ImportLocation, AnnotationsDef, NamedModelObject, AtomicFieldDef, DateFieldDef, ATimestampFieldDef, SourceDef, Argument, SourceComponentInfo, DocumentReference, PersistableSourceDef } from '../../model';
+import type { BuildID, CompiledQuery, ConstantExpr, DocumentLocation, BooleanFieldDef, JSONFieldDef, NumberFieldDef, StringFieldDef, FilterCondition, Given as InternalGiven, GivenID, GivenTypeDef, Query as InternalQuery, Pipeline, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQueryDef, StructDef, TurtleDef, NativeUnsupportedFieldDef, ImportLocation, AnnotationsDef, NamedModelObject, AtomicFieldDef, DateFieldDef, ATimestampFieldDef, SourceDef, Argument, SourceComponentInfo, DocumentReference, PersistableSourceDef } from '../../model';
 import { QueryModel } from '../../model';
 import type { Dialect } from '../../dialect';
 import type { BuildGraph, CompileQueryOptions } from './types';
@@ -90,6 +90,16 @@ export type PreparedResultJSON = {
     query: CompiledQuery;
     modelDef: ModelDef;
 };
+/**
+ * Identifier-only enumeration of a model's top-level queries.
+ * Internal: returned by `Model.queries()`, not exported. Callers pair
+ * the names with `getPreparedQueryByName` and the indices `0..unnamed-1`
+ * with `getPreparedQueryByIndex` to load any one of them.
+ */
+interface ModelQueries {
+    named: string[];
+    unnamed: number;
+}
 export declare class Explore extends Entity implements Taggable {
     protected readonly _structDef: StructDef;
     protected readonly _parentExplore?: Explore;
@@ -202,22 +212,22 @@ export declare class StringField extends AtomicField {
     private fieldStringDef;
     constructor(fieldStringDef: StringFieldDef, parent: Explore, source?: AtomicField);
 }
-export declare class Query extends Entity {
+export declare class Query extends Entity implements Taggable {
     protected turtleDef: TurtleDef;
     private sourceQuery?;
     constructor(turtleDef: TurtleDef, parent?: Explore, source?: Query);
     get source(): Query | undefined;
     isIntrinsic(): boolean;
     get location(): DocumentLocation | undefined;
-}
-export declare class QueryField extends Query implements Taggable {
-    protected parent: Explore;
-    constructor(turtleDef: TurtleDef, parent: Explore, source?: Query);
     /** @deprecated Use `.annotations.parseAsTag(route)`. */
     tagParse(spec?: TagParseSpec): MalloyTagParse;
     /** @deprecated Use `.annotations.texts(route)`. */
     getTaglines(prefix?: RegExp): string[];
     get annotations(): Annotations;
+}
+export declare class QueryField extends Query {
+    protected parent: Explore;
+    constructor(turtleDef: TurtleDef, parent: Explore, source?: Query);
     isQueryField(): this is QueryField;
     isExploreField(): this is ExploreField;
     isAtomicField(): this is AtomicField;
@@ -392,9 +402,18 @@ export declare class Model implements Taggable {
      */
     get explores(): Explore[];
     /**
-     * Get an array of `NamedQueryDef`s contained in the model.
+     * Enumerate the model's top-level queries by identifier.
      *
-     * @return An array of `NamedQueryDef`s contained in the model.
+     * Returns the names of named queries (`query: foo is ...`) and the count
+     * of unnamed `run:` statements. Pair with {@link getPreparedQueryByName}
+     * and {@link getPreparedQueryByIndex} to load any of them — those are the
+     * only path to the query itself; this getter exposes only identifiers,
+     * not IR.
+     */
+    queries(): ModelQueries;
+    /**
+     * @deprecated Leaks IR. Use {@link queries} for enumeration and
+     *   {@link getPreparedQueryByName} to load a named query.
      */
     get namedQueries(): NamedQueryDef[];
     get exportedExplores(): Explore[];
@@ -541,18 +560,29 @@ export declare class Given implements Taggable {
     getTaglines(prefix?: RegExp): string[];
     get annotations(): Annotations;
 }
-export declare class PreparedQuery implements Taggable {
+/**
+ * Internal abstract base for Foundation wrappers around an IR `Pipeline`
+ * (an IR object that has a pipeline, annotations, and a source location).
+ * Owns the four `Taggable` accessors and a `location` getter, all reading
+ * from the wrapped IR. Not exported.
+ */
+declare abstract class PipelineBase implements Taggable {
+    protected pipelineDef: Pipeline;
+    constructor(pipelineDef: Pipeline);
+    get annotations(): Annotations;
+    get location(): DocumentLocation | undefined;
+    /** @deprecated Use `.annotations.parseAsTag(route)`. */
+    tagParse(spec?: TagParseSpec): MalloyTagParse;
+    /** @deprecated Use `.annotations.texts(route)`. */
+    getTaglines(prefix?: RegExp): string[];
+}
+export declare class PreparedQuery extends PipelineBase {
     private _model;
     problems: LogMessage[];
     name?: string | undefined;
-    _query: InternalQuery | NamedQueryDef;
     constructor(query: InternalQuery, _model: Model, problems: LogMessage[], name?: string | undefined);
+    get _query(): InternalQuery | NamedQueryDef;
     get _modelDef(): ModelDef;
-    /** @deprecated Use `.annotations.parseAsTag(route)`. */
-    tagParse(spec?: TagParseSpec): MalloyTagParse;
-    /** @deprecated Use `.annotations.texts(route)`. */
-    getTaglines(prefix?: RegExp): string[];
-    get annotations(): Annotations;
     /**
      * Generate the SQL for this query.
      *

package/dist/api/foundation/core.js

@@ -663,13 +663,6 @@ class Query extends Entity {
     get location() {
         return this.turtleDef.location;
     }
-}
-exports.Query = Query;
-class QueryField extends Query {
-    constructor(turtleDef, parent, source) {
-        super(turtleDef, parent, source);
-        this.parent = parent;
-    }
     /** @deprecated Use `.annotations.parseAsTag(route)`. */
     tagParse(spec) {
         return (0, annotation_1.annotationToTag)(this.turtleDef.annotations, spec);
@@ -681,6 +674,13 @@ class QueryField extends Query {
     get annotations() {
         return new annotation_1.Annotations(this.turtleDef.annotations);
     }
+}
+exports.Query = Query;
+class QueryField extends Query {
+    constructor(turtleDef, parent, source) {
+        super(turtleDef, parent, source);
+        this.parent = parent;
+    }
     isQueryField() {
         return true;
     }
@@ -991,9 +991,26 @@ class Model {
             .map(structDef => new Explore(structDef));
     }
     /**
-     * Get an array of `NamedQueryDef`s contained in the model.
+     * Enumerate the model's top-level queries by identifier.
      *
-     * @return An array of `NamedQueryDef`s contained in the model.
+     * Returns the names of named queries (`query: foo is ...`) and the count
+     * of unnamed `run:` statements. Pair with {@link getPreparedQueryByName}
+     * and {@link getPreparedQueryByIndex} to load any of them — those are the
+     * only path to the query itself; this getter exposes only identifiers,
+     * not IR.
+     */
+    queries() {
+        const named = [];
+        for (const object of Object.values(this.modelDef.contents)) {
+            if (object.type === 'query') {
+                named.push(object.name);
+            }
+        }
+        return { named, unnamed: this.modelDef.queryList.length };
+    }
+    /**
+     * @deprecated Leaks IR. Use {@link queries} for enumeration and
+     *   {@link getPreparedQueryByName} to load a named query.
      */
     get namedQueries() {
         const isNamedQueryDef = (object) => object.type === 'query';
@@ -1259,26 +1276,43 @@ class Given {
     }
 }
 exports.Given = Given;
-class PreparedQuery {
-    constructor(query, _model, problems, name) {
-        this._model = _model;
-        this.problems = problems;
-        this.name = name;
-        this._query = query;
+/**
+ * Internal abstract base for Foundation wrappers around an IR `Pipeline`
+ * (an IR object that has a pipeline, annotations, and a source location).
+ * Owns the four `Taggable` accessors and a `location` getter, all reading
+ * from the wrapped IR. Not exported.
+ */
+class PipelineBase {
+    constructor(pipelineDef) {
+        this.pipelineDef = pipelineDef;
     }
-    get _modelDef() {
-        return this._model._modelDef;
+    get annotations() {
+        return new annotation_1.Annotations(this.pipelineDef.annotations);
+    }
+    get location() {
+        return this.pipelineDef.location;
     }
     /** @deprecated Use `.annotations.parseAsTag(route)`. */
     tagParse(spec) {
-        return (0, annotation_1.annotationToTag)(this._query.annotations, spec);
+        return (0, annotation_1.annotationToTag)(this.pipelineDef.annotations, spec);
     }
     /** @deprecated Use `.annotations.texts(route)`. */
     getTaglines(prefix) {
-        return (0, annotation_1.annotationToTaglines)(this._query.annotations, prefix);
+        return (0, annotation_1.annotationToTaglines)(this.pipelineDef.annotations, prefix);
     }
-    get annotations() {
-        return new annotation_1.Annotations(this._query.annotations);
+}
+class PreparedQuery extends PipelineBase {
+    constructor(query, _model, problems, name) {
+        super(query);
+        this._model = _model;
+        this.problems = problems;
+        this.name = name;
+    }
+    get _query() {
+        return this.pipelineDef;
+    }
+    get _modelDef() {
+        return this._model._modelDef;
     }
     /**
      * Generate the SQL for this query.

package/dist/model/malloy_types.d.ts

@@ -656,10 +656,10 @@ export interface Filtered {
 export interface TurtleSegment extends Filtered {
     name: string;
 }
-export interface Pipeline {
+export interface Pipeline extends HasAnnotations, HasLocation {
     pipeline: PipeSegment[];
 }
-export interface Query extends Pipeline, Filtered, HasLocation, HasAnnotations {
+export interface Query extends Pipeline, Filtered {
     type?: 'query';
     name?: string;
     structRef: StructRef;
@@ -822,7 +822,7 @@ export interface QuerySegment extends Filtered, Ordered, SegmentUsageSummary {
 }
 export type NonDefaultAccessModifierLabel = 'private' | 'internal';
 export type AccessModifierLabel = NonDefaultAccessModifierLabel | 'public';
-export interface TurtleDef extends NamedObject, Pipeline, HasAnnotations {
+export interface TurtleDef extends NamedObject, Pipeline {
     type: 'turtle';
     accessModifier?: NonDefaultAccessModifierLabel | undefined;
     refSummary?: RefSummary;

package/dist/run_sql_options.d.ts

@@ -1,8 +1,4 @@
-import type { AnnotationsDef, NamedObject, SourceComponentInfo } from './model/malloy_types';
-type SourceRefWithMetadata = NamedObject & {
-    annotations?: AnnotationsDef;
-    sourceComponentInfos?: SourceComponentInfo[];
-};
+import type { AnnotationsDef } from './model/malloy_types';
 export interface RunSQLOptions {
     rowLimit?: number;
     abortSignal?: AbortSignal;
@@ -10,9 +6,5 @@ export interface RunSQLOptions {
     modelAnnotations?: AnnotationsDef;
     /** Query annotations forwarded to the adapter. */
     queryAnnotations?: AnnotationsDef;
-    clientMetadata?: {
-        sourceRefWithMetadata?: SourceRefWithMetadata;
-    };
 }
 export type QueryOptionsReader = RunSQLOptions | (() => RunSQLOptions);
-export {};

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.400";
+export declare const MALLOY_VERSION = "0.0.401";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.400",
+  "version": "0.0.401",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -51,9 +51,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.400",
-    "@malloydata/malloy-interfaces": "0.0.400",
-    "@malloydata/malloy-tag": "0.0.400",
+    "@malloydata/malloy-filter": "0.0.401",
+    "@malloydata/malloy-interfaces": "0.0.401",
+    "@malloydata/malloy-tag": "0.0.401",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",