@malloy-publisher/server 0.4.0 → 0.5.0

package/dist/app/index.html

@@ -16,7 +16,7 @@ SPDX-License-Identifier: MIT
          href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap"
       />
       <title>Malloy Publisher</title>
-     <script type="module" crossorigin src="/assets/index-DKvKsj6c.js"></script>
+     <script type="module" crossorigin src="/assets/index-DycyDIlK.js"></script>
      <link rel="stylesheet" crossorigin href="/assets/index-DUqldpo0.css">
    </head>
    <body>

package/dist/package_load_worker.mjs

@@ -14351,7 +14351,8 @@ var init_filter = __esm(() => {
 // src/service/source_extraction.ts
 import {
   isJoined as isJoined2,
-  isSourceDef as isSourceDef4
+  isSourceDef as isSourceDef4,
+  modelDefToModelInfo
 } from "@malloydata/malloy";
 function joinFieldNamesUnresolvableDeclaration(field, modelDef) {
   const ids = [field.referenceID, field.sourceID].filter((id) => !!id);
@@ -14370,7 +14371,7 @@ function joinFieldNamesUnresolvableDeclaration(field, modelDef) {
 function isEarlierPosition(a, b) {
   return a.line < b.line || a.line === b.line && a.character < b.character;
 }
-function considerAuthorizeNoteOwner(declaredBy, note, candidate) {
+function considerNoteOwner(declaredBy, note, candidate) {
   const location = candidate.location;
   if (!location || location.url !== note.at.url)
     return;
@@ -14379,6 +14380,11 @@ function considerAuthorizeNoteOwner(declaredBy, note, candidate) {
     declaredBy.set(note, candidate);
   }
 }
+function collectSourceInfos(modelDef) {
+  const names = Object.keys(modelDef.contents).filter((name) => isSourceDef4(modelDef.contents[name]));
+  const exports = [...new Set([...modelDef.exports, ...names])];
+  return modelDefToModelInfo({ ...modelDef, exports }).entries.filter((entry) => entry.kind === "source");
+}
 function extractSourcesFromModelDef(modelDef, givens, onParseError) {
   const filterMap = new Map;
   const authorizeMap = new Map;
@@ -14395,7 +14401,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
     for (const note of ownLevelNotes(struct.annotations)) {
       if (containsAuthorizeAnnotationTag([note.text])) {
         gatedSourceOwnAuthorizeNotes.add(note);
-        considerAuthorizeNoteOwner(authorizeNoteDeclaredBy, note, struct);
+        considerNoteOwner(authorizeNoteDeclaredBy, note, struct);
       }
     }
     nearMissAuthorize.push(...collectAuthorizeNearMisses([
@@ -14413,7 +14419,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
     for (const note of ownLevelNotes(entry.annotations)) {
       if (containsAuthorizeAnnotationTag([note.text])) {
         gatedSourceOwnAuthorizeNotes.add(note);
-        considerAuthorizeNoteOwner(authorizeNoteDeclaredBy, note, entry);
+        considerNoteOwner(authorizeNoteDeclaredBy, note, entry);
       }
     }
     nearMissAuthorize.push(...collectAuthorizeNearMisses(ownLevelNotes(entry.annotations).map((note) => note.text)));
@@ -15009,7 +15015,7 @@ import {
   isSourceDef as isSourceDef6,
   MalloyConfig,
   MalloyError as MalloyError2,
-  modelDefToModelInfo,
+  modelDefToModelInfo as modelDefToModelInfo2,
   Runtime
 } from "@malloydata/malloy";
 import {
@@ -15407,39 +15413,11 @@ async function readPackageMetadata(packagePath) {
 }
 async function listPackageFiles(packagePath) {
   const files = await import_recursive_readdir.default(packagePath, [ignoreDotfiles]);
-  return files.map((full) => path2.relative(packagePath, full).replace(/\\/g, "/"));
+  return files.map((full) => path2.relative(packagePath, full).replace(/\\/g, "/")).sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
 }
 function filterModelPaths(allRelative) {
   return allRelative.filter((p) => p.endsWith(MODEL_FILE_SUFFIX) || p.endsWith(NOTEBOOK_FILE_SUFFIX));
 }
-async function collectImportedSourceInfos(modelDef, runtime, importBaseURL) {
-  const sourceInfos = [];
-  const importedNames = new Set;
-  const imports = modelDef.imports ?? [];
-  for (const importLocation of imports) {
-    try {
-      const modelString = await runtime.urlReader.readURL(new URL(importLocation.importURL));
-      const importedModelDef = (await runtime.loadModel(modelString, { importBaseURL }).getModel())._modelDef;
-      const importedInfo = modelDefToModelInfo(importedModelDef);
-      const importedSources = importedInfo.entries.filter((entry) => entry.kind === "source");
-      for (const source of importedSources) {
-        if (!importedNames.has(source.name)) {
-          sourceInfos.push(source);
-          importedNames.add(source.name);
-        }
-      }
-    } catch {}
-  }
-  return { sourceInfos, importedNames };
-}
-function appendLocalSourceInfos(modelDef, target, importedNames) {
-  const localInfo = modelDefToModelInfo(modelDef);
-  const localSources = localInfo.entries.filter((entry) => entry.kind === "source");
-  for (const source of localSources) {
-    if (!importedNames.has(source.name))
-      target.push(source);
-  }
-}
 function extractSources(modelDef, givens) {
   const {
     sources,
@@ -15474,8 +15452,24 @@ function extractQueries(modelDef) {
     misplacedAuthorize
   };
 }
+function captureReadText(inner) {
+  const texts = new Map;
+  return {
+    reader: {
+      readURL: async (url) => {
+        const contents = await inner.readURL(url);
+        const key = url.toString();
+        if (!texts.has(key))
+          texts.set(key, contents);
+        return contents;
+      }
+    },
+    textFor: (url) => texts.get(url.toString())
+  };
+}
 function buildRuntimeForModel(job, malloyConfig) {
-  const urlReader = new HackyDataStylesAccumulator(makeWorkerUrlReader(job));
+  const { reader, textFor } = captureReadText(makeWorkerUrlReader(job));
+  const urlReader = new HackyDataStylesAccumulator(reader);
   const runtime = new Runtime({
     urlReader,
     config: malloyConfig,
@@ -15484,21 +15478,20 @@ function buildRuntimeForModel(job, malloyConfig) {
       strict: false
     } : undefined
   });
-  return { runtime, urlReader };
+  return { runtime, urlReader, textFor };
 }
 async function compileMalloyModel(job, malloyConfig, modelPath) {
   const compileStart = performance.now();
   const fullPath = path2.join(job.packagePath, modelPath);
   const modelURL = pathToFileURL(fullPath);
   const importBaseURL = new URL(".", modelURL);
-  const { runtime, urlReader } = buildRuntimeForModel(job, malloyConfig);
+  const { runtime, urlReader, textFor } = buildRuntimeForModel(job, malloyConfig);
   const mm = runtime.loadModel(modelURL, { importBaseURL });
   const compiled = await mm.getModel();
   const modelDef = compiled._modelDef;
   const malloyGivens = Array.from(compiled.givens.values());
   const givens = malloyGivens.length > 0 ? malloyGivens.map((g) => malloyGivenToApi(g)) : undefined;
-  const { sourceInfos, importedNames } = await collectImportedSourceInfos(modelDef, runtime, importBaseURL);
-  appendLocalSourceInfos(modelDef, sourceInfos, importedNames);
+  const sourceInfos = collectSourceInfos(modelDef);
   const {
     sources,
     filterMap,
@@ -15539,12 +15532,13 @@ async function compileMalloyModel(job, malloyConfig, modelPath) {
     modelPath,
     modelType: "model",
     modelDef,
-    modelInfo: modelDefToModelInfo(modelDef),
+    modelInfo: modelDefToModelInfo2(modelDef),
     sourceInfos,
     sources,
     queries,
     filterMap: Array.from(filterMap.entries()),
     givens,
+    modelSourceText: textFor(modelURL),
     dataStyles: urlReader.getHackyAccumulatedDataStyles(),
     compileDurationMs: performance.now() - compileStart,
     problems: job.collectProblems ? compiled.problems : undefined,
@@ -15567,7 +15561,6 @@ async function compileNotebookModel(job, malloyConfig, modelPath) {
     }
     return mm;
   });
-  const oldImports = [];
   const oldSources = {};
   const notebookCells = [];
   for (let i = 0;i < parse.statements.length; i++) {
@@ -15583,21 +15576,8 @@ async function compileNotebookModel(job, malloyConfig, modelPath) {
       continue;
     }
     const currentModelDef = (await localMM.getModel())._modelDef;
-    let newSources = [];
-    const newImports = currentModelDef.imports?.slice(oldImports.length);
-    if (newImports) {
-      for (const importLocation of newImports) {
-        try {
-          const modelString = await runtime.urlReader.readURL(new URL(importLocation.importURL));
-          const importModel = (await runtime.loadModel(modelString, { importBaseURL }).getModel())._modelDef;
-          const importInfo = modelDefToModelInfo(importModel);
-          newSources = importInfo.entries.filter((e) => e.kind === "source").filter((s) => !(s.name in oldSources));
-          oldImports.push(importLocation.importURL.toString());
-        } catch {}
-      }
-    }
-    const currentInfo = modelDefToModelInfo(currentModelDef);
-    newSources = newSources.concat(currentInfo.entries.filter((e) => e.kind === "source").filter((s) => !(s.name in oldSources)));
+    const currentInfo = modelDefToModelInfo2(currentModelDef);
+    const newSources = collectSourceInfos(currentModelDef).filter((s) => !(s.name in oldSources));
     for (const s of newSources)
       oldSources[s.name] = s;
     const runnable = localMM.loadFinalQuery();
@@ -15641,9 +15621,7 @@ async function compileNotebookModel(job, malloyConfig, modelPath) {
     finalModelDef = compiled._modelDef;
     const malloyGivens = Array.from(compiled.givens.values());
     finalGivens = malloyGivens.length > 0 ? malloyGivens.map((g) => malloyGivenToApi(g)) : undefined;
-    const collected = await collectImportedSourceInfos(finalModelDef, runtime, importBaseURL);
-    appendLocalSourceInfos(finalModelDef, collected.sourceInfos, collected.importedNames);
-    finalSourceInfos = collected.sourceInfos;
+    finalSourceInfos = collectSourceInfos(finalModelDef);
     const extracted = extractSources(finalModelDef, finalGivens);
     finalSources = extracted.sources;
     attachSuggestGivenNames(finalGivens, suggestGivenLookup(finalModelDef, (name) => extracted.sources.find((source) => source.name === name)?.authorize, new Set((finalGivens ?? []).map((given) => given.name))));
@@ -15680,7 +15658,7 @@ async function compileNotebookModel(job, malloyConfig, modelPath) {
     modelPath,
     modelType: "notebook",
     modelDef: finalModelDef,
-    modelInfo: finalModelDef ? modelDefToModelInfo(finalModelDef) : undefined,
+    modelInfo: finalModelDef ? modelDefToModelInfo2(finalModelDef) : undefined,
     sourceInfos: finalSourceInfos,
     sources: finalSources,
     queries: finalQueries,