@hyperfixi/vite-plugin 2.7.2 → 2.8.0

package/dist/index.d.cts

@@ -209,6 +209,11 @@ interface HtmxUsage {
     urlManagement: Set<string>;
     /** Whether hx-confirm is used */
     usesConfirm: boolean;
+    /**
+     * `hx-swap` carries a `swap:`/`settle:` timing modifier, which the translator
+     * emits as `wait <n>ms`. Optional so older fixture literals stay valid.
+     */
+    needsSwapTiming?: boolean;
     /**
      * htmx v4 reactive/streaming surface detected. Each flag pulls in the
      * corresponding bundle module; collectively they're what makes
@@ -625,6 +630,16 @@ declare function getOptimalRegion(languages: Set<SupportedLanguage>): 'western'
  * ```
  */
 
+/**
+ * Compute a hash of the current usage for dev-server cache invalidation.
+ *
+ * Every input that influences bundle SELECTION must be part of this hash.
+ * The htmx/reactivity flags route to the hybrid-hx / hx-v4 tiers; before they
+ * were hashed, adding or removing an hx-live/sse-connect/ws-send attribute —
+ * without touching any command/block/language — left the cached dev bundle at
+ * the wrong tier. Exported for tests.
+ */
+declare function computeUsageHash(usage: AggregatedUsage): string;
 /**
  * Create the HyperFixi Vite plugin
  *
@@ -633,4 +648,4 @@ declare function getOptimalRegion(languages: Set<SupportedLanguage>): 'western'
  */
 declare function hyperfixi(options?: HyperfixiPluginOptions): Plugin;
 
-export { type AggregatedUsage, type CompileOptions, type CompiledHandler, type CustomLanguageKeywords, type DomainAggregatedUsage, DomainAggregator, type DomainFileUsage, type DomainScanRule, DomainScanner, type FileUsage, type HyperfixiPluginOptions, REGIONS, SUPPORTED_LANGUAGES, type ServerBridgeOptions, type SupportedLanguage, clearCustomKeywords, clearSemanticParser, hyperfixi as default, descriptorToScanRule, detectLanguages, getAllLanguageCodes, getKeywordsForLanguage, getOptimalRegion, hasSemanticParser, hyperfixi, isNonLatinLanguage, registerCustomKeywords, setSemanticParser };
+export { type AggregatedUsage, type CompileOptions, type CompiledHandler, type CustomLanguageKeywords, type DomainAggregatedUsage, DomainAggregator, type DomainFileUsage, type DomainScanRule, DomainScanner, type FileUsage, type HyperfixiPluginOptions, REGIONS, SUPPORTED_LANGUAGES, type ServerBridgeOptions, type SupportedLanguage, clearCustomKeywords, clearSemanticParser, computeUsageHash, hyperfixi as default, descriptorToScanRule, detectLanguages, getAllLanguageCodes, getKeywordsForLanguage, getOptimalRegion, hasSemanticParser, hyperfixi, isNonLatinLanguage, registerCustomKeywords, setSemanticParser };

package/dist/index.d.ts

@@ -209,6 +209,11 @@ interface HtmxUsage {
     urlManagement: Set<string>;
     /** Whether hx-confirm is used */
     usesConfirm: boolean;
+    /**
+     * `hx-swap` carries a `swap:`/`settle:` timing modifier, which the translator
+     * emits as `wait <n>ms`. Optional so older fixture literals stay valid.
+     */
+    needsSwapTiming?: boolean;
     /**
      * htmx v4 reactive/streaming surface detected. Each flag pulls in the
      * corresponding bundle module; collectively they're what makes
@@ -625,6 +630,16 @@ declare function getOptimalRegion(languages: Set<SupportedLanguage>): 'western'
  * ```
  */
 
+/**
+ * Compute a hash of the current usage for dev-server cache invalidation.
+ *
+ * Every input that influences bundle SELECTION must be part of this hash.
+ * The htmx/reactivity flags route to the hybrid-hx / hx-v4 tiers; before they
+ * were hashed, adding or removing an hx-live/sse-connect/ws-send attribute —
+ * without touching any command/block/language — left the cached dev bundle at
+ * the wrong tier. Exported for tests.
+ */
+declare function computeUsageHash(usage: AggregatedUsage): string;
 /**
  * Create the HyperFixi Vite plugin
  *
@@ -633,4 +648,4 @@ declare function getOptimalRegion(languages: Set<SupportedLanguage>): 'western'
  */
 declare function hyperfixi(options?: HyperfixiPluginOptions): Plugin;
 
-export { type AggregatedUsage, type CompileOptions, type CompiledHandler, type CustomLanguageKeywords, type DomainAggregatedUsage, DomainAggregator, type DomainFileUsage, type DomainScanRule, DomainScanner, type FileUsage, type HyperfixiPluginOptions, REGIONS, SUPPORTED_LANGUAGES, type ServerBridgeOptions, type SupportedLanguage, clearCustomKeywords, clearSemanticParser, hyperfixi as default, descriptorToScanRule, detectLanguages, getAllLanguageCodes, getKeywordsForLanguage, getOptimalRegion, hasSemanticParser, hyperfixi, isNonLatinLanguage, registerCustomKeywords, setSemanticParser };
+export { type AggregatedUsage, type CompileOptions, type CompiledHandler, type CustomLanguageKeywords, type DomainAggregatedUsage, DomainAggregator, type DomainFileUsage, type DomainScanRule, DomainScanner, type FileUsage, type HyperfixiPluginOptions, REGIONS, SUPPORTED_LANGUAGES, type ServerBridgeOptions, type SupportedLanguage, clearCustomKeywords, clearSemanticParser, computeUsageHash, hyperfixi as default, descriptorToScanRule, detectLanguages, getAllLanguageCodes, getKeywordsForLanguage, getOptimalRegion, hasSemanticParser, hyperfixi, isNonLatinLanguage, registerCustomKeywords, setSemanticParser };

package/dist/index.js

@@ -1,3 +1,6 @@
+// src/scanner.ts
+import { AVAILABLE_COMMANDS, FULL_RUNTIME_ONLY_COMMANDS } from "@hyperfixi/core/bundle-generator";
+
 // src/language-keywords.ts
 var SUPPORTED_LANGUAGES = [
   "en",
@@ -369,6 +372,7 @@ var INDONESIAN_KEYWORDS = /* @__PURE__ */ new Set([
   "kalau",
   "bila",
   "selainnya",
+  "lainnya",
   "ulangi",
   "tunggu",
   "selama"
@@ -505,6 +509,7 @@ var VIETNAMESE_KEYWORDS = /* @__PURE__ */ new Set([
   "l\u1EB7p l\u1EA1i",
   "ch\u1EDD",
   "\u0111\u1EE3i",
+  "ch\u1EDD \u0111\u1EE3i",
   "trong khi"
 ]);
 var POLISH_KEYWORDS = /* @__PURE__ */ new Set([
@@ -911,6 +916,17 @@ var SSE_NS_PATTERN = /\bsse-[\w\-\p{L}]+\s*=\s*["']/u;
 var WS_NS_PATTERN = /\bws-[\w\-\p{L}]+\s*=\s*["']/u;
 
 // src/scanner.ts
+var SCANNABLE_COMMANDS = [
+  .../* @__PURE__ */ new Set([...AVAILABLE_COMMANDS, ...FULL_RUNTIME_ONLY_COMMANDS])
+].filter(
+  (cmd) => /^[A-Za-z]+$/.test(cmd) && // `unless` is handled by the block detection below (it compiles to the
+  // lite-capable `if` block — flagging it as a full-runtime-only COMMAND
+  // would needlessly bump every unless-user to a full-runtime bundle).
+  // `bind` is handled by the dedicated reactivity detection below, which
+  // routes to the hx-v4 bundle (the tier that actually ships reactivity).
+  cmd !== "unless" && cmd !== "bind"
+);
+var COMMAND_PATTERN_SOURCE = `\\b(${SCANNABLE_COMMANDS.join("|")})\\b`;
 var HTMX_REQUEST_PATTERN = /\b(hx-get|hx-post|hx-put|hx-patch|hx-delete)\s*=\s*["']([^"']+)["']/gi;
 var FIXI_ACTION_PATTERN = /\bfx-action\s*=\s*["']([^"']+)["']/gi;
 var FIXI_METHOD_PATTERN = /\bfx-method\s*=\s*["'](GET|POST|PUT|PATCH|DELETE)["']/gi;
@@ -1019,7 +1035,7 @@ var Scanner = class {
    * Analyze a hyperscript snippet for commands, blocks, and expressions
    */
   analyzeScript(script, usage) {
-    const commandPattern = /\b(toggle|add|remove|removeClass|show|hide|set|get|put|append|take|increment|decrement|log|send|trigger|wait|transition|go|call|focus|blur|return)\b/g;
+    const commandPattern = new RegExp(COMMAND_PATTERN_SOURCE, "g");
     let match;
     while (match = commandPattern.exec(script)) {
       usage.commands.add(match[1]);
@@ -1058,6 +1074,7 @@ var Scanner = class {
       triggerModifiers: /* @__PURE__ */ new Set(),
       urlManagement: /* @__PURE__ */ new Set(),
       usesConfirm: false,
+      needsSwapTiming: false,
       needsHxLive: false,
       needsSSE: false,
       needsWS: false,
@@ -1083,7 +1100,14 @@ var Scanner = class {
     const swapPattern = new RegExp(HTMX_SWAP_PATTERN.source, "gi");
     while (match = swapPattern.exec(code)) {
       usage.hasHtmxAttributes = true;
-      usage.swapStrategies.add(match[2].split(/\s+/)[0]);
+      const spec = match[2].trim();
+      const head = spec.split(/\s+/)[0];
+      if (head.startsWith("morph") || !/^\S*:/.test(spec)) {
+        usage.swapStrategies.add(head);
+      }
+      if (/\b(swap|settle):/.test(spec)) {
+        usage.needsSwapTiming = true;
+      }
     }
     const triggerPattern = new RegExp(HTMX_TRIGGER_PATTERN.source, "gi");
     while (match = triggerPattern.exec(code)) {
@@ -1151,17 +1175,19 @@ var Scanner = class {
       usage.commands.add("put");
     }
     for (const swap of htmx.swapStrategies) {
-      switch (swap.toLowerCase()) {
-        case "morph":
-          usage.commands.add("morph");
-          break;
-        case "delete":
-          usage.commands.add("remove");
-          break;
-        default:
-          usage.commands.add("put");
+      const strategy = swap.toLowerCase();
+      if (strategy.startsWith("morph")) {
+        usage.commands.add("morph");
+        if (strategy === "morph:innerhtml") usage.commands.add("put");
+      } else if (strategy === "delete") {
+        usage.commands.add("remove");
+      } else {
+        usage.commands.add("put");
       }
     }
+    if (htmx.needsSwapTiming) {
+      usage.commands.add("wait");
+    }
     if (htmx.usesConfirm) {
       usage.blocks.add("if");
     }
@@ -1256,6 +1282,7 @@ var Aggregator = class {
       triggerModifiers: /* @__PURE__ */ new Set(),
       urlManagement: /* @__PURE__ */ new Set(),
       usesConfirm: false,
+      needsSwapTiming: false,
       needsHxLive: false,
       needsSSE: false,
       needsWS: false,
@@ -1280,6 +1307,7 @@ var Aggregator = class {
         for (const modifier of usage.htmx.triggerModifiers) htmx.triggerModifiers.add(modifier);
         for (const url of usage.htmx.urlManagement) htmx.urlManagement.add(url);
         if (usage.htmx.usesConfirm) htmx.usesConfirm = true;
+        if (usage.htmx.needsSwapTiming) htmx.needsSwapTiming = true;
         if (usage.htmx.needsHxLive) htmx.needsHxLive = true;
         if (usage.htmx.needsSSE) htmx.needsSSE = true;
         if (usage.htmx.needsWS) htmx.needsWS = true;
@@ -1352,7 +1380,15 @@ var Aggregator = class {
   htmxUsageEqual(a, b) {
     if (!a && !b) return true;
     if (!a || !b) return false;
-    return a.hasHtmxAttributes === b.hasHtmxAttributes && a.hasFixiAttributes === b.hasFixiAttributes && this.setsEqual(a.httpMethods, b.httpMethods) && this.setsEqual(a.swapStrategies, b.swapStrategies) && this.setsEqual(a.triggerModifiers, b.triggerModifiers) && this.setsEqual(a.urlManagement, b.urlManagement) && a.usesConfirm === b.usesConfirm;
+    return a.hasHtmxAttributes === b.hasHtmxAttributes && a.hasFixiAttributes === b.hasFixiAttributes && this.setsEqual(a.httpMethods, b.httpMethods) && this.setsEqual(a.swapStrategies, b.swapStrategies) && this.setsEqual(a.triggerModifiers, b.triggerModifiers) && this.setsEqual(a.urlManagement, b.urlManagement) && a.usesConfirm === b.usesConfirm && !!a.needsSwapTiming === !!b.needsSwapTiming && // htmx v4 / reactivity flags: these drive selection of the hx-v4 tier,
+    // so a change must count as "usage changed" or HMR serves a stale
+    // bundle. They were omitted when the v4 surface landed (#623).
+    !!a.needsHxLive === !!b.needsHxLive && !!a.needsSSE === !!b.needsSSE && !!a.needsWS === !!b.needsWS && !!a.needsBindToProperty === !!b.needsBindToProperty && !!a.needsReactivity === !!b.needsReactivity && this.arraysEqual(a.onHandlers, b.onHandlers);
+  }
+  arraysEqual(a, b) {
+    const aa = a ?? [];
+    const bb = b ?? [];
+    return aa.length === bb.length && aa.every((v, i) => v === bb[i]);
   }
 };
 
@@ -1366,7 +1402,7 @@ import {
   LITE_PARSER_TEMPLATE,
   HYBRID_PARSER_TEMPLATE,
   canUseLiteParser,
-  FULL_RUNTIME_ONLY_COMMANDS,
+  FULL_RUNTIME_ONLY_COMMANDS as FULL_RUNTIME_ONLY_COMMANDS2,
   isAvailableCommand
 } from "@hyperfixi/core/bundle-generator";
 
@@ -2460,7 +2496,7 @@ ${additionalApiProps}`
   getUnsupportedCommands(commands) {
     const unsupported = [];
     for (const cmd of commands) {
-      if (FULL_RUNTIME_ONLY_COMMANDS.includes(cmd)) {
+      if (FULL_RUNTIME_ONLY_COMMANDS2.includes(cmd)) {
         unsupported.push(cmd);
       } else if (!isAvailableCommand(cmd) && !COMMAND_IMPLEMENTATIONS[cmd]) {
         unsupported.push(cmd);
@@ -3751,6 +3787,22 @@ var DomainAggregator = class {
 var VIRTUAL_MODULE_ID = "virtual:hyperfixi";
 var RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 var IMPORT_ALIASES = ["hyperfixi", "@hyperfixi/core", "virtual:hyperfixi"];
+function computeUsageHash(usage) {
+  const commands = [...usage.commands].sort().join(",");
+  const blocks = [...usage.blocks].sort().join(",");
+  const languages = [...usage.detectedLanguages].sort().join(",");
+  const htmx = usage.htmx ? [
+    usage.htmx.hasHtmxAttributes,
+    usage.htmx.hasFixiAttributes,
+    usage.htmx.needsHxLive,
+    usage.htmx.needsSSE,
+    usage.htmx.needsWS,
+    usage.htmx.needsBindToProperty,
+    usage.htmx.needsReactivity
+  ].map((f) => f ? "1" : "0").join("") : "none";
+  const reactivity = `${usage.needsReactivity ? 1 : 0}${usage.needsBindToProperty ? 1 : 0}`;
+  return `${commands}|${blocks}|${usage.positional}|${languages}|${htmx}|${reactivity}`;
+}
 function hyperfixi(options = {}) {
   const mode = options.mode ?? "interpret";
   const scanner = new Scanner(options);
@@ -3767,12 +3819,6 @@ function hyperfixi(options = {}) {
   const fallbackScripts = /* @__PURE__ */ new Set();
   let needsLocals = false;
   let needsGlobals = false;
-  function computeUsageHash(usage) {
-    const commands = [...usage.commands].sort().join(",");
-    const blocks = [...usage.blocks].sort().join(",");
-    const languages = [...usage.detectedLanguages].sort().join(",");
-    return `${commands}|${blocks}|${usage.positional}|${languages}`;
-  }
   function invalidateVirtualModule() {
     if (!server) return;
     const mod = server.moduleGraph.getModuleById(RESOLVED_VIRTUAL_MODULE_ID);
@@ -4072,6 +4118,7 @@ export {
   SUPPORTED_LANGUAGES,
   clearCustomKeywords,
   clearSemanticParser,
+  computeUsageHash,
   index_default as default,
   descriptorToScanRule,
   detectLanguages,