latticesql 4.3.1 → 4.3.2

package/dist/cli.js

@@ -29084,12 +29084,12 @@ var getNodeModulesParentDirs;
 var init_getNodeModulesParentDirs = __esm({
   "node_modules/@aws-sdk/core/dist-es/submodules/client/util-user-agent-node/getNodeModulesParentDirs.js"() {
     "use strict";
-    getNodeModulesParentDirs = (dirname19) => {
+    getNodeModulesParentDirs = (dirname20) => {
       const cwd = process.cwd();
-      if (!dirname19) {
+      if (!dirname20) {
         return [cwd];
       }
-      const normalizedPath = normalize(dirname19);
+      const normalizedPath = normalize(dirname20);
       const parts = normalizedPath.split(sep6);
       const nodeModulesIndex = parts.indexOf("node_modules");
       const parentDir = nodeModulesIndex !== -1 ? parts.slice(0, nodeModulesIndex).join(sep6) : normalizedPath;
@@ -29167,8 +29167,8 @@ var init_getTypeScriptUserAgentPair = __esm({
         tscVersion = null;
         return void 0;
       }
-      const dirname19 = typeof __dirname !== "undefined" ? __dirname : void 0;
-      const nodeModulesParentDirs = getNodeModulesParentDirs(dirname19);
+      const dirname20 = typeof __dirname !== "undefined" ? __dirname : void 0;
+      const nodeModulesParentDirs = getNodeModulesParentDirs(dirname20);
       let versionFromApp;
       for (const nodeModulesParentDir of nodeModulesParentDirs) {
         try {
@@ -57954,8 +57954,8 @@ var init_dist_es22 = __esm({
 });
 
 // src/cli.ts
-import { resolve as resolve17, dirname as dirname18 } from "path";
-import { readFileSync as readFileSync26, existsSync as existsSync33 } from "fs";
+import { resolve as resolve17, dirname as dirname19 } from "path";
+import { readFileSync as readFileSync26, existsSync as existsSync34 } from "fs";
 import { execSync } from "child_process";
 import { parse as parse3 } from "yaml";
 
@@ -58222,9 +58222,9 @@ function installLatest(ctx, version, opts = {}) {
 init_http();
 import { createServer } from "http";
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync32 } from "fs";
+import { existsSync as existsSync33 } from "fs";
 import { WebSocketServer, WebSocket } from "ws";
-import { dirname as dirname17, resolve as resolve16 } from "path";
+import { dirname as dirname18, resolve as resolve16 } from "path";
 
 // src/gui/active-db.ts
 init_adapter();
@@ -76758,8 +76758,16 @@ async function dispatchIngestRoute(req, res, ctx) {
 
 // src/gui/sources-routes.ts
 init_user_config();
-import { statSync as statSync9, readdirSync as readdirSync8, readFileSync as readFileSync23, writeFileSync as writeFileSync10 } from "fs";
-import { resolve as resolve12, join as join29, basename as basename12, sep as sep8 } from "path";
+import {
+  statSync as statSync9,
+  readdirSync as readdirSync8,
+  readFileSync as readFileSync23,
+  writeFileSync as writeFileSync10,
+  existsSync as existsSync27,
+  mkdirSync as mkdirSync12,
+  rmSync
+} from "fs";
+import { resolve as resolve12, join as join29, basename as basename12, sep as sep8, dirname as dirname16 } from "path";
 import { execFile } from "child_process";
 import { randomUUID as randomUUID4 } from "crypto";
 init_http();
@@ -76767,20 +76775,49 @@ var MAX_LIST_ENTRIES = 2e3;
 var MAX_INGEST_FILES = 500;
 var MAX_INGEST_DEPTH = 8;
 var SKIP_DIRS = /* @__PURE__ */ new Set([".git", "node_modules", ".DS_Store", "__pycache__", ".venv", "venv"]);
-function rootsFile() {
-  return join29(configDir(), "sources.json");
+function rootsFile(configPath) {
+  return join29(dirname16(configPath), "sources.json");
+}
+function migrateGlobalRootsIfNeeded(configPath) {
+  const wsFile = rootsFile(configPath);
+  if (existsSync27(wsFile)) return;
+  const globalFile = join29(configDir(), "sources.json");
+  if (globalFile === wsFile || !existsSync27(globalFile)) return;
+  let roots;
+  try {
+    const parsed = JSON.parse(readFileSync23(globalFile, "utf8"));
+    if (!Array.isArray(parsed.roots) || parsed.roots.length === 0) return;
+    roots = parsed.roots;
+  } catch {
+    return;
+  }
+  try {
+    mkdirSync12(dirname16(wsFile), { recursive: true });
+    writeFileSync10(wsFile, JSON.stringify({ roots }, null, 2), "utf8");
+  } catch {
+    return;
+  }
+  try {
+    rmSync(globalFile, { force: true });
+  } catch {
+    try {
+      writeFileSync10(globalFile, JSON.stringify({ roots: [] }, null, 2), "utf8");
+    } catch {
+    }
+  }
 }
-function readRoots() {
+function readRoots(configPath) {
+  migrateGlobalRootsIfNeeded(configPath);
   try {
-    const raw = readFileSync23(rootsFile(), "utf8");
+    const raw = readFileSync23(rootsFile(configPath), "utf8");
     const parsed = JSON.parse(raw);
     return Array.isArray(parsed.roots) ? parsed.roots : [];
   } catch {
     return [];
   }
 }
-function writeRoots(roots) {
-  writeFileSync10(rootsFile(), JSON.stringify({ roots }, null, 2), "utf8");
+function writeRoots(configPath, roots) {
+  writeFileSync10(rootsFile(configPath), JSON.stringify({ roots }, null, 2), "utf8");
 }
 function safeResolveInside2(target, roots) {
   const abs = resolve12(target);
@@ -76870,14 +76907,14 @@ async function ingestFolder(abs, ingestFile) {
   return { ingested, skipped };
 }
 async function dispatchSourcesRoute(req, res, deps) {
-  const { pathname, method, ingestFile } = deps;
+  const { pathname, method, ingestFile, configPath } = deps;
   if (!pathname.startsWith("/api/sources/")) return false;
   if (!localFileOpenEnabled()) {
     sendJson(res, { enabled: false });
     return true;
   }
   if (pathname === "/api/sources/roots" && method === "GET") {
-    sendJson(res, { enabled: true, roots: readRoots() });
+    sendJson(res, { enabled: true, roots: readRoots(configPath) });
     return true;
   }
   if (pathname === "/api/sources/roots" && method === "POST") {
@@ -76903,12 +76940,12 @@ async function dispatchSourcesRoute(req, res, deps) {
       sendJson(res, { error: `path not found: ${abs}` }, 400);
       return true;
     }
-    const roots = readRoots();
+    const roots = readRoots(configPath);
     let root6 = roots.find((r6) => resolve12(r6.path) === abs);
     if (!root6) {
       root6 = { id: randomUUID4(), path: abs, kind, name: basename12(abs) || abs };
       roots.push(root6);
-      writeRoots(roots);
+      writeRoots(configPath, roots);
     }
     let result;
     if (kind === "folder") result = await ingestFolder(abs, ingestFile);
@@ -76919,8 +76956,8 @@ async function dispatchSourcesRoute(req, res, deps) {
   const delMatch = /^\/api\/sources\/roots\/([^/]+)$/.exec(pathname);
   if (delMatch && method === "DELETE") {
     const id = decodeURIComponent(delMatch[1] ?? "");
-    const roots = readRoots().filter((r6) => r6.id !== id);
-    writeRoots(roots);
+    const roots = readRoots(configPath).filter((r6) => r6.id !== id);
+    writeRoots(configPath, roots);
     sendJson(res, { ok: true });
     return true;
   }
@@ -76938,7 +76975,7 @@ async function dispatchSourcesRoute(req, res, deps) {
       sendJson(res, { error: "path is required" }, 400);
       return true;
     }
-    const abs = safeResolveInside2(target, readRoots());
+    const abs = safeResolveInside2(target, readRoots(configPath));
     if (!abs) {
       sendJson(res, { error: "path is outside any registered source root" }, 403);
       return true;
@@ -76953,7 +76990,7 @@ async function dispatchSourcesRoute(req, res, deps) {
   if (pathname === "/api/sources/ingest-folder" && method === "POST") {
     const body = await readJson(req).catch(() => ({}));
     const target = typeof body.path === "string" ? body.path : "";
-    const abs = safeResolveInside2(target, readRoots());
+    const abs = safeResolveInside2(target, readRoots(configPath));
     if (!abs) {
       sendJson(res, { error: "path is outside any registered source root" }, 403);
       return true;
@@ -76967,7 +77004,7 @@ async function dispatchSourcesRoute(req, res, deps) {
 // src/gui/import-routes.ts
 init_adapter();
 init_http();
-import { existsSync as existsSync27, readFileSync as readFileSync24, statSync as statSync10 } from "fs";
+import { existsSync as existsSync28, readFileSync as readFileSync24, statSync as statSync10 } from "fs";
 import { isAbsolute as isAbsolute4, join as join30 } from "path";
 init_native_entities();
 function badRequest(message) {
@@ -77001,7 +77038,7 @@ async function readImportSourceFromFile(db, fileId, latticeRoot) {
   );
   if (!row) throw badRequest("Unknown import file: " + fileId);
   const path3 = localPathOf2(row, latticeRoot);
-  if (!path3 || !existsSync27(path3)) {
+  if (!path3 || !existsSync28(path3)) {
     throw badRequest("The import file\u2019s bytes are not available locally.");
   }
   const sizeBytes = statSync10(path3).size;
@@ -79142,7 +79179,7 @@ init_dispatch();
 init_column_descriptions();
 init_mutations();
 init_native_entities();
-import { createReadStream as createReadStream3, existsSync as existsSync28, realpathSync as realpathSync2, statSync as statSync11 } from "fs";
+import { createReadStream as createReadStream3, existsSync as existsSync29, realpathSync as realpathSync2, statSync as statSync11 } from "fs";
 import { extname as extname3, join as join31, normalize as normalize2, sep as sep9 } from "path";
 
 // src/gui/count-many.ts
@@ -79350,7 +79387,7 @@ async function handleReadRoutes(req, res, ctx, deps) {
     const base = deps.guiAssetsDir.replace(/[/\\]+$/, "");
     const target = normalize2(join31(base, rel));
     const within = target === base || target.startsWith(base + sep9);
-    if (!within || !existsSync28(target) || !statSync11(target).isFile()) {
+    if (!within || !existsSync29(target) || !statSync11(target).isFile()) {
       sendJson(res, { error: "asset not found" }, 404);
       return true;
     }
@@ -80558,16 +80595,16 @@ async function handleHistoryRoutes(req, res, ctx, deps) {
 // src/gui/workspaces-routes.ts
 init_http();
 import { resolve as resolve13 } from "path";
-import { existsSync as existsSync29, rmSync } from "fs";
+import { existsSync as existsSync30, rmSync as rmSync2 } from "fs";
 init_workspace();
 init_lattice_root();
 init_user_config();
 function cleanupWorkspaceFiles(root6, ws) {
   if (!ws.configPath && ws.kind === "local") {
-    rmSync(workspaceDir(root6, ws.dir), { recursive: true, force: true });
+    rmSync2(workspaceDir(root6, ws.dir), { recursive: true, force: true });
   } else if (ws.kind === "cloud") {
-    if (ws.configPath && existsSync29(ws.configPath)) {
-      rmSync(ws.configPath, { force: true });
+    if (ws.configPath && existsSync30(ws.configPath)) {
+      rmSync2(ws.configPath, { force: true });
     }
     const labelMatch = /^\$\{LATTICE_DB:([A-Za-z0-9._-]+)\}$/.exec(ws.db.trim());
     const label = labelMatch?.[1];
@@ -80770,15 +80807,15 @@ async function handleWorkspacesRoutes(req, res, ctx, deps) {
 // src/gui/databases-routes.ts
 init_http();
 import { basename as basename14, resolve as resolve15 } from "path";
-import { existsSync as existsSync31 } from "fs";
+import { existsSync as existsSync32 } from "fs";
 init_parser();
 
 // src/gui/config-paths.ts
 init_parser();
-import { basename as basename13, dirname as dirname16, join as join32, resolve as resolve14 } from "path";
+import { basename as basename13, dirname as dirname17, join as join32, resolve as resolve14 } from "path";
 import {
-  existsSync as existsSync30,
-  mkdirSync as mkdirSync12,
+  existsSync as existsSync31,
+  mkdirSync as mkdirSync13,
   readFileSync as readFileSync25,
   readdirSync as readdirSync9,
   unlinkSync as unlinkSync5,
@@ -80786,10 +80823,10 @@ import {
 } from "fs";
 import { parseDocument as parseDocument7 } from "yaml";
 function resolveOutputDirForConfig(configPath) {
-  const base = dirname16(resolve14(configPath));
+  const base = dirname17(resolve14(configPath));
   for (const dir of ["context", ".", "generated"]) {
     const abs = resolve14(base, dir);
-    if (existsSync30(join32(abs, ".lattice", "manifest.json"))) return abs;
+    if (existsSync31(join32(abs, ".lattice", "manifest.json"))) return abs;
   }
   return resolve14(base, "context");
 }
@@ -80798,7 +80835,7 @@ function friendlyConfigName(parsedName, configPath) {
   return basename13(configPath).replace(/\.(ya?ml)$/, "");
 }
 function listConfigs(activeConfigPath) {
-  const dir = dirname16(activeConfigPath);
+  const dir = dirname17(activeConfigPath);
   const entries = [];
   for (const fname of readdirSync9(dir)) {
     if (!fname.endsWith(".yml") && !fname.endsWith(".yaml")) continue;
@@ -80827,17 +80864,17 @@ function listConfigs(activeConfigPath) {
   return entries.sort((a6, b6) => a6.label.localeCompare(b6.label));
 }
 function createBlankConfig(activeConfigPath, dbName) {
-  const dir = dirname16(activeConfigPath);
+  const dir = dirname17(activeConfigPath);
   const slug = dbName.toLowerCase().replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
   if (!slug) throw new Error("Workspace name must contain at least one alphanumeric character");
   const configPath = join32(dir, `${slug}.config.yml`);
-  if (existsSync30(configPath)) throw new Error(`Config already exists: ${slug}.config.yml`);
+  if (existsSync31(configPath)) throw new Error(`Config already exists: ${slug}.config.yml`);
   const yaml = `db: ./data/${slug}.db
 
 entities: {}
 `;
   writeFileSync11(configPath, yaml, "utf8");
-  mkdirSync12(join32(dir, "data"), { recursive: true });
+  mkdirSync13(join32(dir, "data"), { recursive: true });
   return configPath;
 }
 function sqliteFileForConfig(configPath) {
@@ -80846,18 +80883,18 @@ function sqliteFileForConfig(configPath) {
   if (!raw) return null;
   if (isPostgresUrl(raw) || raw.startsWith("${LATTICE_DB:")) return null;
   if (raw === ":memory:" || raw.startsWith("file:")) return null;
-  return resolve14(dirname16(configPath), raw);
+  return resolve14(dirname17(configPath), raw);
 }
 function deleteDatabaseFiles(targetConfigPath) {
   const sqliteFile = sqliteFileForConfig(targetConfigPath);
   unlinkSync5(targetConfigPath);
   let deletedDbFile = null;
-  if (sqliteFile && existsSync30(sqliteFile)) {
+  if (sqliteFile && existsSync31(sqliteFile)) {
     unlinkSync5(sqliteFile);
     deletedDbFile = sqliteFile;
     for (const suffix of ["-wal", "-shm", "-journal"]) {
       const sidecar = sqliteFile + suffix;
-      if (existsSync30(sidecar)) unlinkSync5(sidecar);
+      if (existsSync31(sidecar)) unlinkSync5(sidecar);
     }
   }
   return { deletedConfig: basename13(targetConfigPath), deletedDbFile };
@@ -80891,7 +80928,7 @@ async function handleDatabasesRoutes(req, res, ctx, deps) {
       return true;
     }
     const newPath = resolve15(body.path);
-    if (!existsSync31(newPath)) {
+    if (!existsSync32(newPath)) {
       sendJson(res, { error: `Config not found: ${newPath}` }, 400);
       return true;
     }
@@ -80997,8 +81034,8 @@ async function handleDatabasesRoutes(req, res, ctx, deps) {
 // src/gui/server.ts
 init_user_config();
 function resolveDefaultGuiAssetsDir() {
-  const bundleSibling = process.argv[1] ? resolve16(dirname17(process.argv[1]), "gui-assets") : null;
-  if (bundleSibling && existsSync32(bundleSibling)) return bundleSibling;
+  const bundleSibling = process.argv[1] ? resolve16(dirname18(process.argv[1]), "gui-assets") : null;
+  if (bundleSibling && existsSync33(bundleSibling)) return bundleSibling;
   return resolve16(process.cwd(), "dist", "gui-assets");
 }
 function sendText(res, body, status = 200, contentType = "text/plain; charset=utf-8") {
@@ -81055,7 +81092,7 @@ async function startGuiServer(options) {
   const sessionId = crypto.randomUUID();
   let updateService = null;
   let activeRef = bootConfigPath && bootOutputDir ? await openConfig(bootConfigPath, bootOutputDir, autoRender, options.realtimeWatchdogMs) : null;
-  const latticeRoot = (bootConfigPath ? findLatticeRoot(dirname17(bootConfigPath)) : null) ?? (options.latticeRoot ? resolve16(options.latticeRoot) : null);
+  const latticeRoot = (bootConfigPath ? findLatticeRoot(dirname18(bootConfigPath)) : null) ?? (options.latticeRoot ? resolve16(options.latticeRoot) : null);
   let currentWorkspaceId = null;
   if (latticeRoot && bootConfigPath) {
     const launched = listWorkspaces(latticeRoot).find(
@@ -81409,7 +81446,7 @@ async function startGuiServer(options) {
                 createJunction: (otherTable) => createFileJunction(active, otherTable, sessionId),
                 createEntity: (entity, columns) => createUserEntity(active, entity, columns, sessionId),
                 aggressiveness: getAggressiveness(),
-                latticeRoot: dirname17(active.configPath),
+                latticeRoot: dirname18(active.configPath),
                 configPath: active.configPath,
                 outputDir: active.outputDir,
                 sessionId,
@@ -81434,7 +81471,7 @@ async function startGuiServer(options) {
                 createJunction: (otherTable) => createFileJunction(active, otherTable, sessionId),
                 createEntity: (entity, columns) => createUserEntity(active, entity, columns, sessionId),
                 aggressiveness: getAggressiveness(),
-                latticeRoot: dirname17(active.configPath),
+                latticeRoot: dirname18(active.configPath),
                 configPath: active.configPath,
                 outputDir: active.outputDir,
                 sessionId,
@@ -81445,6 +81482,7 @@ async function startGuiServer(options) {
               return await dispatchSourcesRoute(req2, res2, {
                 db: active.db,
                 ingestFile: (p3) => ingestLocalFile(ingestCtx, mctx, p3, false),
+                configPath: active.configPath,
                 pathname,
                 method
               });
@@ -81460,7 +81498,7 @@ async function startGuiServer(options) {
               return await dispatchImportRoute(req2, res2, {
                 db: active.db,
                 configPath: active.configPath,
-                latticeRoot: dirname17(active.configPath),
+                latticeRoot: dirname18(active.configPath),
                 validTables: active.validTables,
                 softDeletable: active.softDeletable
               });
@@ -81489,7 +81527,7 @@ async function startGuiServer(options) {
               if (!pathname.startsWith("/api/files/")) return false;
               return await dispatchFilesRoute(req2, res2, {
                 db: active.db,
-                latticeRoot: dirname17(active.configPath),
+                latticeRoot: dirname18(active.configPath),
                 configPath: active.configPath,
                 pathname,
                 method
@@ -81982,7 +82020,7 @@ function printHelp() {
   );
 }
 function getVersion() {
-  if (true) return "4.3.1";
+  if (true) return "4.3.2";
   try {
     const pkgPath = new URL("../package.json", import.meta.url).pathname;
     const pkg = JSON.parse(readFileSync26(pkgPath, "utf-8"));
@@ -81996,7 +82034,7 @@ function printVersion() {
 }
 function getGuiAssetsDir() {
   const fromBundle = new URL("./gui-assets", import.meta.url).pathname;
-  if (existsSync33(fromBundle)) return fromBundle;
+  if (existsSync34(fromBundle)) return fromBundle;
   return new URL("../dist/gui-assets", import.meta.url).pathname;
 }
 async function runUpdate() {
@@ -82040,7 +82078,7 @@ function runGenerate(args) {
     console.error('Error: config must have an "entities" key');
     process.exit(1);
   }
-  const configDir2 = dirname18(configPath);
+  const configDir2 = dirname19(configPath);
   const outDir = resolve17(args.out);
   try {
     const result = generateAll({ config, configDir: configDir2, outDir, scaffold: args.scaffold });