@malloydata/malloy 0.0.94-dev231013165652 → 0.0.94-dev231018002545
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/malloy.d.ts +2 -1
- package/dist/malloy.js +8 -7
- package/package.json +1 -1
package/dist/malloy.d.ts
CHANGED
|
@@ -229,10 +229,11 @@ export declare class Model implements Taggable {
|
|
|
229
229
|
* A prepared query which has all the necessary information to produce its SQL.
|
|
230
230
|
*/
|
|
231
231
|
export declare class PreparedQuery implements Taggable {
|
|
232
|
+
problems: LogMessage[];
|
|
232
233
|
name?: string | undefined;
|
|
233
234
|
_modelDef: ModelDef;
|
|
234
235
|
_query: InternalQuery | NamedQuery;
|
|
235
|
-
constructor(query: InternalQuery, model: ModelDef, name?: string | undefined);
|
|
236
|
+
constructor(query: InternalQuery, model: ModelDef, problems: LogMessage[], name?: string | undefined);
|
|
236
237
|
tagParse(spec?: TagParseSpec): TagParse;
|
|
237
238
|
getTaglines(prefix?: RegExp): string[];
|
|
238
239
|
/**
|
package/dist/malloy.js
CHANGED
|
@@ -365,7 +365,7 @@ class Model {
|
|
|
365
365
|
getPreparedQueryByName(queryName) {
|
|
366
366
|
const query = this.modelDef.contents[queryName];
|
|
367
367
|
if ((query === null || query === void 0 ? void 0 : query.type) === 'query') {
|
|
368
|
-
return new PreparedQuery(query, this.modelDef, queryName);
|
|
368
|
+
return new PreparedQuery(query, this.modelDef, this.problems, queryName);
|
|
369
369
|
}
|
|
370
370
|
throw new Error('Given query name does not refer to a named query.');
|
|
371
371
|
}
|
|
@@ -382,7 +382,7 @@ class Model {
|
|
|
382
382
|
else if (index >= this.queryList.length) {
|
|
383
383
|
throw new Error(`Query index ${index} is out of bounds.`);
|
|
384
384
|
}
|
|
385
|
-
return new PreparedQuery(this.queryList[index], this.modelDef);
|
|
385
|
+
return new PreparedQuery(this.queryList[index], this.modelDef, this.problems);
|
|
386
386
|
}
|
|
387
387
|
/**
|
|
388
388
|
* Retrieve a prepared query by the name of a query at the top level of the model.
|
|
@@ -419,7 +419,7 @@ class Model {
|
|
|
419
419
|
if (this.queryList.length === 0) {
|
|
420
420
|
throw new Error('Model has no queries.');
|
|
421
421
|
}
|
|
422
|
-
return new PreparedQuery(this.queryList[this.queryList.length - 1], this.modelDef);
|
|
422
|
+
return new PreparedQuery(this.queryList[this.queryList.length - 1], this.modelDef, this.problems);
|
|
423
423
|
}
|
|
424
424
|
/**
|
|
425
425
|
* Retrieve an `Explore` from the model by name.
|
|
@@ -461,7 +461,8 @@ exports.Model = Model;
|
|
|
461
461
|
* A prepared query which has all the necessary information to produce its SQL.
|
|
462
462
|
*/
|
|
463
463
|
class PreparedQuery {
|
|
464
|
-
constructor(query, model, name) {
|
|
464
|
+
constructor(query, model, problems, name) {
|
|
465
|
+
this.problems = problems;
|
|
465
466
|
this.name = name;
|
|
466
467
|
this._query = query;
|
|
467
468
|
this._modelDef = model;
|
|
@@ -510,7 +511,7 @@ class PreparedQuery {
|
|
|
510
511
|
type: 'query',
|
|
511
512
|
name: 'as' in this._query ? this._query.as || this._query.name : defaultName,
|
|
512
513
|
});
|
|
513
|
-
return new PreparedQuery({ ...turtleDef, structRef, type: 'query' }, this._modelDef, this.name || turtleDef.as || turtleDef.name);
|
|
514
|
+
return new PreparedQuery({ ...turtleDef, structRef, type: 'query' }, this._modelDef, this.problems, this.name || turtleDef.as || turtleDef.name);
|
|
514
515
|
}
|
|
515
516
|
}
|
|
516
517
|
exports.PreparedQuery = PreparedQuery;
|
|
@@ -945,7 +946,7 @@ class Explore extends Entity {
|
|
|
945
946
|
},
|
|
946
947
|
],
|
|
947
948
|
};
|
|
948
|
-
return new PreparedQuery(internalQuery, this.modelDef, name);
|
|
949
|
+
return new PreparedQuery(internalQuery, this.modelDef, [], name);
|
|
949
950
|
}
|
|
950
951
|
get modelDef() {
|
|
951
952
|
return {
|
|
@@ -1932,7 +1933,7 @@ class ModelMaterializer extends FluentState {
|
|
|
1932
1933
|
_loadQueryFromQueryDef(query) {
|
|
1933
1934
|
return this.makeQueryMaterializer(async () => {
|
|
1934
1935
|
const model = await this.materialize();
|
|
1935
|
-
return new PreparedQuery(query, model._modelDef);
|
|
1936
|
+
return new PreparedQuery(query, model._modelDef, model.problems);
|
|
1936
1937
|
});
|
|
1937
1938
|
}
|
|
1938
1939
|
/**
|