@malloydata/malloy 0.0.263-dev250414184158 → 0.0.263-dev250414204152

package/dist/api/core.d.ts

@@ -18,7 +18,7 @@ export type CompileResponse = {
     compilerNeeds?: undefined;
     logs: LogMessage[];
 };
-export declare function compileQuery(request: Malloy.CompileQueryRequest, state?: CompileModelState): Malloy.CompileQueryResponse;
+export declare function compileQuery(request: Malloy.CompileQueryRequest, state?: CompileQueryState): Malloy.CompileQueryResponse;
 export interface CompileModelState {
     extending?: CompileModelState;
     translator: MalloyTranslator;
@@ -34,5 +34,8 @@ export declare function _statedCompileModel(state: CompileModelState): CompileRe
 export declare function compileModel(request: Malloy.CompileModelRequest, state?: CompileModelState): Malloy.CompileModelResponse;
 export declare function compileSource(request: Malloy.CompileSourceRequest): Malloy.CompileSourceResponse;
 export declare function hasErrors(log: Malloy.LogMessage[] | undefined): boolean;
-export declare function newCompileQueryState(request: Malloy.CompileQueryRequest): CompileModelState;
-export declare function statedCompileQuery(state: CompileModelState): Malloy.CompileQueryResponse;
+export interface CompileQueryState extends CompileModelState {
+    defaultRowLimit?: number;
+}
+export declare function newCompileQueryState(request: Malloy.CompileQueryRequest): CompileQueryState;
+export declare function statedCompileQuery(state: CompileQueryState): Malloy.CompileQueryResponse;

package/dist/api/core.js

@@ -384,10 +384,6 @@ function hasErrors(log) {
     return (_a = log === null || log === void 0 ? void 0 : log.some(m => m.severity === 'error')) !== null && _a !== void 0 ? _a : false;
 }
 exports.hasErrors = hasErrors;
-// Given a StableQueryDef and the URL to a model, run it and return a StableResult
-// Given a StableQueryDef and the URL to a model, compile it and return a StableResultDef
-// Given a StableQueryDef and the URL to a model, validate it and return a list of StableErrors
-// Given a URL to a model and the name of a source, run the indexing query
 function newCompileQueryState(request) {
     var _a, _b;
     const queryMalloy = Malloy.queryToMalloy(request.query);
@@ -402,7 +398,10 @@ function newCompileQueryState(request) {
         },
         ...((_b = needs.files) !== null && _b !== void 0 ? _b : []),
     ];
-    return _newCompileModelState(queryURL, needs, request.model_url);
+    return {
+        ..._newCompileModelState(queryURL, needs, request.model_url),
+        defaultRowLimit: request.default_row_limit,
+    };
 }
 exports.newCompileQueryState = newCompileQueryState;
 function statedCompileQuery(state) {
@@ -432,7 +431,9 @@ function statedCompileQuery(state) {
         const annotations = (_a = result.model.anonymous_queries[index].annotations) !== null && _a !== void 0 ? _a : [];
         try {
             const queryModel = new model_1.QueryModel(result.modelDef);
-            const translatedQuery = queryModel.compileQuery(query);
+            const translatedQuery = queryModel.compileQuery(query, {
+                defaultRowLimit: state.defaultRowLimit,
+            });
             const modelAnnotations = (0, annotation_1.annotationToTaglines)(result.modelDef.annotation).map(l => ({
                 value: l,
             }));
@@ -457,6 +458,7 @@ function statedCompileQuery(state) {
                     model_annotations: modelAnnotations.length > 0 ? modelAnnotations : undefined,
                     query_timezone: translatedQuery.queryTimezone,
                 },
+                default_row_limit_added: translatedQuery.defaultRowLimitAdded,
             };
         }
         catch (error) {

package/dist/model/malloy_query.d.ts

@@ -377,7 +377,10 @@ export declare class QueryModel {
     getStructByName(name: string): QueryStruct;
     getStructFromRef(structRef: StructRef, sourceArguments: Record<string, Argument> | undefined, prepareResultOptions?: PrepareResultOptions): QueryStruct;
     loadQuery(query: Query, stageWriter: StageWriter | undefined, prepareResultOptions?: PrepareResultOptions, emitFinalStage?: boolean, isJoinedSubquery?: boolean): QueryResults;
-    addDefaultRowLimit(query: Query, defaultRowLimit?: number): Query;
+    addDefaultRowLimit(query: Query, defaultRowLimit?: number): {
+        query: Query;
+        addedDefaultRowLimit?: number;
+    };
     compileQuery(query: Query, prepareResultOptions?: PrepareResultOptions, finalize?: boolean): CompiledQuery;
     exploreSearchSQLMap: Map<any, any>;
     searchIndex(connection: Connection, explore: string, searchValue: string, limit?: number, searchField?: string | undefined): Promise<SearchIndexResult[] | undefined>;

package/dist/model/malloy_query.js

@@ -3760,28 +3760,34 @@ class QueryModel {
         };
     }
     addDefaultRowLimit(query, defaultRowLimit) {
+        const nope = { query, addedDefaultRowLimit: undefined };
         if (defaultRowLimit === undefined)
-            return query;
+            return nope;
         const lastSegment = query.pipeline[query.pipeline.length - 1];
         if (lastSegment.type === 'raw')
-            return query;
+            return nope;
         if (lastSegment.limit !== undefined)
-            return query;
+            return nope;
         return {
-            ...query,
-            pipeline: [
-                ...query.pipeline.slice(0, -1),
-                {
-                    ...lastSegment,
-                    limit: defaultRowLimit,
-                },
-            ],
+            query: {
+                ...query,
+                pipeline: [
+                    ...query.pipeline.slice(0, -1),
+                    {
+                        ...lastSegment,
+                        limit: defaultRowLimit,
+                    },
+                ],
+            },
+            addedDefaultRowLimit: defaultRowLimit,
         };
     }
     compileQuery(query, prepareResultOptions, finalize = true) {
         var _a, _b;
         let newModel;
-        query = this.addDefaultRowLimit(query, prepareResultOptions === null || prepareResultOptions === void 0 ? void 0 : prepareResultOptions.defaultRowLimit);
+        const addDefaultRowLimit = this.addDefaultRowLimit(query, prepareResultOptions === null || prepareResultOptions === void 0 ? void 0 : prepareResultOptions.defaultRowLimit);
+        query = addDefaultRowLimit.query;
+        const addedDefaultRowLimit = addDefaultRowLimit.addedDefaultRowLimit;
         const m = newModel || this;
         const ret = m.loadQuery(query, undefined, prepareResultOptions, finalize, false);
         const structRef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : query.structRef;
@@ -3809,6 +3815,7 @@ class QueryModel {
             connectionName: ret.connectionName,
             annotation: query.annotation,
             queryTimezone: ret.structs[0].queryTimezone,
+            defaultRowLimitAdded: addedDefaultRowLimit,
         };
     }
     async searchIndex(connection, explore, searchValue, limit = 1000, searchField = undefined) {

package/dist/model/malloy_types.d.ts

@@ -839,6 +839,7 @@ export interface CompiledQuery extends DrillSource {
     annotation?: Annotation;
     dependenciesToMaterialize?: Record<string, QueryToMaterialize>;
     materialization?: QueryToMaterialize;
+    defaultRowLimitAdded?: number;
 }
 /** Result type for running a Malloy query. */
 export interface QueryResult extends CompiledQuery {

package/package.json

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