isotone 1.1.2 → 1.1.3

package/dist/serve.js

@@ -11,12 +11,12 @@ import {
 import {
   UPDATE_ENDPOINT,
   startUpdateCheck
-} from "./chunk-I7CZUPDO.js";
+} from "./chunk-YTEUMO3O.js";
 import {
   NOTES_ENDPOINT,
   ensureFileIgnored,
   notesResponse
-} from "./chunk-X6V2AKJL.js";
+} from "./chunk-LXW6WFOC.js";
 import "./chunk-A4DX2V4C.js";
 
 // src/serve/index.ts

package/dist/server.js

@@ -10,10 +10,10 @@ import {
   readActive,
   variantsResponse,
   writeActive
-} from "./chunk-TGAU3WTF.js";
+} from "./chunk-BRBXIGZP.js";
 import {
   VARIANTS_ENDPOINT
-} from "./chunk-PUXQGUMQ.js";
+} from "./chunk-RKZWO37H.js";
 import {
   NOTES_ENDPOINT,
   PAYLOAD_MAX,
@@ -22,7 +22,7 @@ import {
   readNotes,
   updateNotes,
   writeNotes
-} from "./chunk-X6V2AKJL.js";
+} from "./chunk-LXW6WFOC.js";
 import "./chunk-A4DX2V4C.js";
 
 // src/server/index.ts

package/dist/vite-plugin.js

@@ -6,6 +6,10 @@ import {
   readNodeJson,
   sendFailure
 } from "./chunk-DDMHJ23I.js";
+import {
+  isRouteModule,
+  scanExports
+} from "./chunk-BDTB3DFR.js";
 import {
   ACTIVE_FILE,
   listVariants,
@@ -17,21 +21,21 @@ import {
   variantDir,
   variantsDir,
   variantsResponse
-} from "./chunk-TGAU3WTF.js";
+} from "./chunk-BRBXIGZP.js";
 import {
   VARIANTS_ENDPOINT,
   overlayGroups
-} from "./chunk-PUXQGUMQ.js";
+} from "./chunk-RKZWO37H.js";
 import {
   UPDATE_ENDPOINT,
   startUpdateCheck
-} from "./chunk-I7CZUPDO.js";
+} from "./chunk-YTEUMO3O.js";
 import {
   NOTES_ENDPOINT,
   ensureDirIgnored,
   ensureFileIgnored,
   notesResponse
-} from "./chunk-X6V2AKJL.js";
+} from "./chunk-LXW6WFOC.js";
 import "./chunk-A4DX2V4C.js";
 
 // src/vite/index.ts
@@ -41,101 +45,6 @@ import {
   normalizePath
 } from "vite";
 
-// src/vite/exports.ts
-var ROUTE_EXPORTS = /* @__PURE__ */ new Set([
-  "loader",
-  "action",
-  "clientLoader",
-  "clientAction",
-  "headers",
-  "links",
-  "meta",
-  "handle",
-  "shouldRevalidate",
-  "middleware",
-  "clientMiddleware",
-  "unstable_middleware",
-  "unstable_clientMiddleware",
-  "HydrateFallback"
-]);
-var IDENT = /^[A-Za-z_$][\w$]*$/;
-function scanExports(code) {
-  const names = /* @__PURE__ */ new Set();
-  const lines = code.split("\n");
-  for (let i = 0; i < lines.length; i++) {
-    const line = (lines[i] ?? "").replace(/^(?:\/\*.*?\*\/\s*)+/, "");
-    if (!line.startsWith("export")) continue;
-    const rest = line.slice("export".length);
-    if (rest !== "" && !/^[\s{*]/.test(rest)) continue;
-    const body = rest.trim();
-    if (body.startsWith("{") || body.startsWith("type {")) {
-      if (body.startsWith("type")) continue;
-      let clause = body;
-      while (!clause.includes("}") && i + 1 < lines.length) clause += ` ${lines[++i]}`;
-      const inner = clause.slice(clause.indexOf("{") + 1, clause.indexOf("}"));
-      for (const raw of inner.split(",")) {
-        const spec = raw.replace(/\/\/.*$/, "").trim();
-        if (!spec || spec.startsWith("type ")) continue;
-        const as = spec.split(/\s+as\s+/);
-        const name = (as[1] ?? as[0] ?? "").trim().replace(/^["']|["']$/g, "");
-        if (!name) return null;
-        names.add(name);
-      }
-      continue;
-    }
-    if (/^type\s*\*/.test(body)) continue;
-    const star = body.match(/^\*\s+as\s+([A-Za-z_$][\w$]*)/);
-    if (star?.[1]) {
-      names.add(star[1]);
-      continue;
-    }
-    if (body.startsWith("*")) return null;
-    if (/^default\b/.test(body)) {
-      names.add("default");
-      continue;
-    }
-    if (/^(?:declare\s|type\s|interface\s)/.test(body)) continue;
-    if (/^(?:=|import\s|namespace\s|module\s|as\s)/.test(body)) return null;
-    const decl = body.match(
-      /^(?:async\s+)?function\s*\*?\s*([A-Za-z_$][\w$]*)|^(?:abstract\s+)?class\s+([A-Za-z_$][\w$]*)|^(?:const\s+)?enum\s+([A-Za-z_$][\w$]*)/
-    );
-    const declared = decl?.[1] ?? decl?.[2] ?? decl?.[3];
-    if (declared) {
-      names.add(declared);
-      continue;
-    }
-    const variable = body.match(/^(?:const|let|var)\s+(.*)$/);
-    if (variable) {
-      const target = (variable[1] ?? "").trim();
-      if (target.startsWith("{") || target.startsWith("[")) return null;
-      const name = target.match(/^([A-Za-z_$][\w$]*)/)?.[1];
-      if (!name) return null;
-      if (hasSecondDeclarator(target)) return null;
-      names.add(name);
-      continue;
-    }
-    return null;
-  }
-  for (const name of names) if (name !== "default" && !IDENT.test(name)) return null;
-  return [...names];
-}
-function isRouteModule(names) {
-  return names.includes("default") && names.some((name) => ROUTE_EXPORTS.has(name));
-}
-function hasSecondDeclarator(declaration) {
-  const text = declaration.replace(/\/\/.*$/, "").replace(/'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*`/g, '""');
-  let depth = 0;
-  let initialized = false;
-  for (let i = 0; i < text.length; i++) {
-    const ch = text[i];
-    if (ch === "(" || ch === "[" || ch === "{" || ch === "<") depth++;
-    else if (ch === ")" || ch === "]" || ch === "}" || ch === ">" && text[i - 1] !== "=") depth = Math.max(0, depth - 1);
-    else if (depth === 0 && ch === "=" && text[i + 1] !== "=" && text[i + 1] !== ">" && text[i - 1] !== "=") initialized = true;
-    else if (depth === 0 && ch === "," && initialized) return true;
-  }
-  return depth === 0 && /,\s*$/.test(text);
-}
-
 // src/vite/live.ts
 var VERSION_QUERY = "isotone";
 var BASE_VERSION = "_base";
@@ -768,20 +677,23 @@ function iteration(options = {}) {
       if (variantsOptions) {
         activeIds = readActive(vopts);
         live = (variantsOptions.live ?? hasReact) && server.environments !== void 0;
-        const clientGraph = () => server.environments?.client?.moduleGraph ?? server.moduleGraph;
+        const graphs = () => server.environments ? Object.values(server.environments).map((env) => env.moduleGraph) : [server.moduleGraph];
+        const covered = /* @__PURE__ */ new Set();
         const signature = () => JSON.stringify(readManifests().map((v) => [v.id, v.group ?? "", Object.keys(v.files).sort()]));
-        let listed = live ? signature() : "";
+        let listed = signature();
         reloadPage = () => {
           if (reloadTimer) clearTimeout(reloadTimer);
           reloadTimer = setTimeout(() => {
             reloadTimer = null;
-            const graph = clientGraph();
-            const paths = /* @__PURE__ */ new Set([...dispatched.keys(), ...versionsByFile().keys()]);
-            for (const path of paths) {
-              for (const mod of graph.getModulesByFile(path) ?? []) graph.invalidateModule(mod);
+            const paths = /* @__PURE__ */ new Set([...dispatched.keys(), ...versionsByFile().keys(), ...covered]);
+            for (const graph of graphs()) {
+              for (const path of paths) {
+                for (const mod of graph.getModulesByFile(path) ?? []) graph.invalidateModule(mod);
+              }
+              const runtime = graph.getModuleById(RESOLVED_LIVE_MODULE);
+              if (runtime) graph.invalidateModule(runtime);
             }
-            const runtime = graph.getModuleById(RESOLVED_LIVE_MODULE);
-            if (runtime) graph.invalidateModule(runtime);
+            covered.clear();
             dispatched.clear();
             server.ws.send({ type: "full-reload", path: "*" });
           }, 50);
@@ -881,13 +793,17 @@ function iteration(options = {}) {
           if (path === activeFile) {
             void activate(readActive(vopts));
           } else if (isInside(vDir, path)) {
+            for (const variant of manifests ?? []) {
+              for (const key of Object.keys(variant.files)) covered.add(normalizePath(join(vopts.root, key)));
+            }
             forgetManifests();
-            if (live) {
-              const now = signature();
-              if (now !== listed) {
-                listed = now;
-                reloadPage();
-              }
+            const stillActive = readActive(vopts);
+            const activeChanged = stillActive.join() !== currentActive().join();
+            if (activeChanged) void activate(stillActive);
+            const now = signature();
+            if (now !== listed) {
+              listed = now;
+              if (live || activeChanged || stillActive.length > 0) reloadPage();
             }
           }
         });