@malloydata/malloy 0.0.101-dev231110211921 → 0.0.101-dev231114015212

package/dist/lang/parse-malloy.js

@@ -502,7 +502,10 @@ class TranslateStep {
             }
         }
         if (that.root.logger.hasErrors()) {
-            this.response = that.fatalResponse();
+            this.response = {
+                fromSources: that.getDependencies(),
+                ...that.fatalResponse(),
+            };
         }
         else {
             this.response = {

package/dist/malloy.d.ts

@@ -16,6 +16,7 @@ export interface ParseOptions {
 }
 export interface CompileOptions {
     refreshSchemaCache?: boolean | number;
+    noThrowOnError?: boolean;
 }
 export declare class Malloy {
     static get version(): string;
@@ -56,13 +57,12 @@ export declare class Malloy {
      * @param model A compiled model to build upon (optional).
      * @return A (promise of a) compiled `Model`.
      */
-    static compile({ urlReader, connections, parse, model, refreshSchemaCache, }: {
+    static compile({ urlReader, connections, parse, model, refreshSchemaCache, noThrowOnError, }: {
         urlReader: URLReader;
         connections: LookupConnection<InfoConnection>;
         parse: Parse;
         model?: Model;
-        refreshSchemaCache?: boolean | number;
-    }): Promise<Model>;
+    } & CompileOptions): Promise<Model>;
     private static compileSQLBlock;
     /**
      * Run a fully-prepared query.
@@ -158,9 +158,10 @@ export declare class Model implements Taggable {
     private queryList;
     private sqlBlocks;
     readonly problems: LogMessage[];
+    readonly fromSources: string[];
     _referenceAt: (location: ModelDocumentPosition) => DocumentReference | undefined;
     _importAt: (location: ModelDocumentPosition) => ImportLocation | undefined;
-    constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlockStructDef[], problems: LogMessage[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined, importAt?: (location: ModelDocumentPosition) => ImportLocation | undefined);
+    constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlockStructDef[], problems: LogMessage[], fromSources: string[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined, importAt?: (location: ModelDocumentPosition) => ImportLocation | undefined);
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     /**

package/dist/malloy.js

@@ -77,7 +77,8 @@ class Malloy {
      * @param model A compiled model to build upon (optional).
      * @return A (promise of a) compiled `Model`.
      */
-    static async compile({ urlReader, connections, parse, model, refreshSchemaCache, }) {
+    static async compile({ urlReader, connections, parse, model, refreshSchemaCache, noThrowOnError, }) {
+        var _a, _b, _c, _d;
         let refreshTimestamp;
         if (refreshSchemaCache) {
             refreshTimestamp =
@@ -91,7 +92,16 @@ class Malloy {
             const result = translator.translate(model === null || model === void 0 ? void 0 : model._modelDef);
             if (result.final) {
                 if (result.translated) {
-                    return new Model(result.translated.modelDef, result.translated.queryList, result.translated.sqlBlocks, result.problems || [], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
+                    return new Model(result.translated.modelDef, result.translated.queryList, result.translated.sqlBlocks, result.problems || [], [...((_a = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _a !== void 0 ? _a : []), ...((_b = result.fromSources) !== null && _b !== void 0 ? _b : [])], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
+                }
+                else if (noThrowOnError) {
+                    const emptyModel = {
+                        name: 'modelDidNotCompile',
+                        exports: [],
+                        contents: {},
+                    };
+                    const modelFromCompile = (model === null || model === void 0 ? void 0 : model._modelDef) || emptyModel;
+                    return new Model(modelFromCompile, [], [], result.problems || [], [...((_c = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _c !== void 0 ? _c : []), ...((_d = result.fromSources) !== null && _d !== void 0 ? _d : [])], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
                 }
                 else {
                     const errors = result.problems || [];
@@ -333,11 +343,12 @@ exports.MalloyError = MalloyError;
  * A compiled Malloy document.
  */
 class Model {
-    constructor(modelDef, queryList, sqlBlocks, problems, referenceAt = () => undefined, importAt = () => undefined) {
+    constructor(modelDef, queryList, sqlBlocks, problems, fromSources, referenceAt = () => undefined, importAt = () => undefined) {
         this.modelDef = modelDef;
         this.queryList = queryList;
         this.sqlBlocks = sqlBlocks;
         this.problems = problems;
+        this.fromSources = fromSources;
         this._referenceAt = referenceAt;
         this._importAt = importAt;
     }
@@ -967,7 +978,7 @@ class Explore extends Entity {
         };
     }
     getSingleExploreModel() {
-        return new Model(this.modelDef, [], [], []);
+        return new Model(this.modelDef, [], [], [], []);
     }
     get fieldMap() {
         var _a;
@@ -1519,6 +1530,7 @@ class Runtime {
      * or loading further related objects.
      */
     loadModel(source, options) {
+        const { refreshSchemaCache, noThrowOnError } = options || {};
         return new ModelMaterializer(this, async () => {
             const parse = source instanceof URL
                 ? await Malloy.parse({
@@ -1534,7 +1546,8 @@ class Runtime {
                 urlReader: this.urlReader,
                 connections: this.connections,
                 parse,
-                refreshSchemaCache: options === null || options === void 0 ? void 0 : options.refreshSchemaCache,
+                refreshSchemaCache,
+                noThrowOnError,
             });
         });
     }
@@ -1544,7 +1557,7 @@ class Runtime {
     //      be used in tests.
     _loadModelFromModelDef(modelDef) {
         return new ModelMaterializer(this, async () => {
-            return new Model(modelDef, [], [], []);
+            return new Model(modelDef, [], [], [], []);
         });
     }
     /**
@@ -1780,6 +1793,7 @@ class ModelMaterializer extends FluentState {
      * or loading further related objects.
      */
     loadQuery(query, options) {
+        const { refreshSchemaCache, noThrowOnError } = options || {};
         return this.makeQueryMaterializer(async () => {
             const urlReader = this.runtime.urlReader;
             const connections = this.runtime.connections;
@@ -1799,7 +1813,8 @@ class ModelMaterializer extends FluentState {
                 connections,
                 parse,
                 model,
-                refreshSchemaCache: options === null || options === void 0 ? void 0 : options.refreshSchemaCache,
+                refreshSchemaCache,
+                noThrowOnError,
             });
             return queryModel.preparedQuery;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.101-dev231110211921",
+  "version": "0.0.101-dev231114015212",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",