@fictjs/vite-plugin 0.16.0 → 0.17.1

package/README.md

@@ -9,13 +9,17 @@ Vite plugin for Fict
 ## Usage
 
 ```bash
+npm install fict
 npm install -D @fictjs/vite-plugin
 # or
+yarn add fict
 yarn add -D @fictjs/vite-plugin
 ```
 
 You can visit [Fict](https://github.com/fictjs/fict) for more documentation.
 
+Use `fict` as the runtime dependency for standard Fict apps. If you intentionally build directly on `@fictjs/runtime`, keep your source imports on that package family consistently.
+
 ## Options
 
 ```ts

package/dist/index.cjs

@@ -36,6 +36,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_node_crypto = require("crypto");
 var import_node_fs = require("fs");
+var import_node_module = require("module");
 var import_node_path = __toESM(require("path"), 1);
 var import_node_url = require("url");
 var import_core = require("@babel/core");
@@ -44,9 +45,14 @@ var import_parser = require("@babel/parser");
 var import_traverse = __toESM(require("@babel/traverse"), 1);
 var t = __toESM(require("@babel/types"), 1);
 var import_compiler = require("@fictjs/compiler");
+var import_meta = {};
 var traverse = typeof import_traverse.default === "function" ? import_traverse.default : import_traverse.default.default;
 var generate = typeof import_generator.default === "function" ? import_generator.default : import_generator.default.default;
-var CACHE_VERSION = 1;
+var CACHE_VERSION = 3;
+var require2 = (0, import_node_module.createRequire)(import_meta.url);
+var TRANSFORM_CACHE_FINGERPRINT = hashString(
+  [getCompilerCacheFingerprint(), String(extractAndRewriteHandlers)].join("|")
+);
 var MODULE_EXTENSIONS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"];
 var VIRTUAL_HANDLER_PREFIX = "\0fict-handler:";
 var VIRTUAL_HANDLER_RESOLVE_PREFIX = "virtual:fict-handler:";
@@ -162,6 +168,9 @@ function fict(options = {}) {
         "fict",
         "fict/plus",
         "fict/advanced",
+        "fict/internal",
+        "fict/internal/list",
+        "fict/loader",
         "fict/slim",
         "fict/jsx-runtime",
         "fict/jsx-dev-runtime",
@@ -182,7 +191,12 @@ function fict(options = {}) {
         include2.delete(dep);
         exclude2.add(dep);
       }
-      const dedupePackages = ["fict", "@fictjs/runtime", "@fictjs/runtime/internal"];
+      const dedupePackages = [
+        "fict",
+        "fict/internal",
+        "@fictjs/runtime",
+        "@fictjs/runtime/internal"
+      ];
       for (const dep of dedupePackages) {
         dedupe.add(dep);
       }
@@ -301,16 +315,34 @@ function fict(options = {}) {
       }
       const cacheStore = ensureCache();
       const cacheKey = cacheStore.enabled ? buildCacheKey(filename, code, fictOptions, tsProject2) : null;
+      const shouldSplit = options.functionSplitting ?? (config?.command === "build" && (compilerOptions.resumable || !config?.build?.ssr));
       if (cacheKey) {
         const cached = await cacheStore.get(cacheKey);
         if (cached) {
-          return cached;
+          if (shouldSplit && cached.extractedHandlers?.length) {
+            for (const handler of cached.extractedHandlers) {
+              const handlerId = createHandlerId(handler.sourceModule, handler.exportName);
+              extractedHandlers.set(handlerId, handler);
+              if (config?.command === "build" && !config?.build?.ssr) {
+                this.emitFile({
+                  type: "chunk",
+                  id: `${VIRTUAL_HANDLER_RESOLVE_PREFIX}${handlerId}`,
+                  name: `handler-${handler.exportName}`
+                });
+              }
+            }
+          }
+          return {
+            code: cached.code,
+            map: cached.map
+          };
         }
       }
       try {
         const precompiledInput = isPrecompiledFictModule(code);
         let finalCode;
         let finalMap;
+        let splitResult = null;
         if (precompiledInput) {
           finalCode = code;
           finalMap = null;
@@ -332,7 +364,6 @@ function fict(options = {}) {
           finalCode = result.code;
           finalMap = result.map;
         }
-        const shouldSplit = options.functionSplitting ?? (config?.command === "build" && (compilerOptions.resumable || !config?.build?.ssr));
         debugLog("Function split decision", {
           shouldSplit,
           ssr: config?.build?.ssr,
@@ -340,7 +371,6 @@ function fict(options = {}) {
           file: filename
         });
         if (shouldSplit) {
-          let splitResult = null;
           try {
             splitResult = extractAndRewriteHandlers(finalCode, filename, extractedHandlers);
           } catch (error) {
@@ -374,7 +404,14 @@ function fict(options = {}) {
           map: finalMap
         };
         if (cacheKey) {
-          await cacheStore.set(cacheKey, transformed);
+          const cachedTransform = {
+            code: finalCode,
+            map: finalMap
+          };
+          if (shouldSplit && splitResult?.handlers.length) {
+            cachedTransform.extractedHandlers = splitResult.handlers.map((handlerName) => extractedHandlers.get(createHandlerId(filename, handlerName))).filter((handler) => !!handler);
+          }
+          await cacheStore.set(cacheKey, cachedTransform);
         }
         return transformed;
       } catch (error) {
@@ -539,6 +576,14 @@ function applyAlias(source, aliases) {
 function hashString(value) {
   return (0, import_node_crypto.createHash)("sha256").update(value).digest("hex");
 }
+function getCompilerCacheFingerprint() {
+  try {
+    const compilerEntry = require2.resolve("@fictjs/compiler");
+    return hashString((0, import_node_fs.readFileSync)(compilerEntry, "utf8"));
+  } catch {
+    return hashString(String(import_compiler.createFictPlugin));
+  }
+}
 function stableStringify(value) {
   if (value === null || typeof value !== "object") {
     return JSON.stringify(value);
@@ -570,7 +615,9 @@ function buildCacheKey(filename, code, options, tsProject) {
   const codeHash = hashString(code);
   const optionsHash = hashString(stableStringify(normalizeOptionsForCache(options)));
   const tsKey = tsProject ? `${tsProject.configHash}:${tsProject.projectVersion}` : "";
-  return hashString([CACHE_VERSION, filename, codeHash, optionsHash, tsKey].join("|"));
+  return hashString(
+    [CACHE_VERSION, TRANSFORM_CACHE_FINGERPRINT, filename, codeHash, optionsHash, tsKey].join("|")
+  );
 }
 var TransformCache = class {
   constructor(options) {
@@ -719,6 +766,30 @@ async function createTypeScriptProject(ts, rootDir, configPath) {
 function createHandlerId(sourceModule, exportName) {
   return `${sourceModule}$$${exportName}`;
 }
+function detectRuntimeImportFamilyFromCode(body) {
+  let sawFictFamily = false;
+  let sawStandaloneRuntimeFamily = false;
+  for (const stmt of body) {
+    const source = stmt && typeof stmt === "object" && "source" in stmt ? stmt.source?.value : void 0;
+    if (typeof source !== "string") continue;
+    if (source === "fict" || source === "fict/advanced" || source === "fict/internal" || source === "fict/internal/list" || source === "fict/jsx-runtime" || source === "fict/jsx-dev-runtime" || source === "fict/loader" || source === "fict/plus" || source === "fict/slim") {
+      sawFictFamily = true;
+      continue;
+    }
+    if (source === "@fictjs/runtime" || source === "@fictjs/runtime/advanced" || source === "@fictjs/runtime/internal" || source === "@fictjs/runtime/internal/list" || source === "@fictjs/runtime/jsx-runtime" || source === "@fictjs/runtime/jsx-dev-runtime" || source === "@fictjs/runtime/loader") {
+      sawStandaloneRuntimeFamily = true;
+    }
+  }
+  if (sawFictFamily) return "fict";
+  if (sawStandaloneRuntimeFamily) return "runtime";
+  return "fict";
+}
+function getRuntimeHelperModule(helperName, family) {
+  if (helperName === "keyedList") {
+    return family === "runtime" ? "@fictjs/runtime/internal/list" : "fict/internal/list";
+  }
+  return family === "runtime" ? "@fictjs/runtime/internal" : "fict/internal";
+}
 function generateHandlerModule(handler) {
   if (!handler.code) {
     return `export { ${handler.exportName} as default } from '${handler.sourceModule}';
@@ -728,11 +799,12 @@ function generateHandlerModule(handler) {
   for (const helperName of handler.helpersUsed) {
     const helper = RUNTIME_HELPERS[helperName];
     if (!helper) continue;
-    const existing = importsByModule.get(helper.from) ?? [];
+    const moduleSource = getRuntimeHelperModule(helperName, handler.runtimeImportFamily);
+    const existing = importsByModule.get(moduleSource) ?? [];
     if (!existing.includes(helper.import)) {
       existing.push(helper.import);
     }
-    importsByModule.set(helper.from, existing);
+    importsByModule.set(moduleSource, existing);
   }
   const imports = [];
   for (const [module2, names] of importsByModule) {
@@ -753,20 +825,21 @@ function registerExtractedHandler(sourceModule, exportName, helpersUsed, code, l
     exportName,
     helpersUsed,
     localDeps,
-    code
+    code,
+    runtimeImportFamily: "fict"
   });
   return `${VIRTUAL_HANDLER_RESOLVE_PREFIX}${handlerId}`;
 }
 var RUNTIME_HELPERS = {
-  __fictUseLexicalScope: { import: "__fictUseLexicalScope", from: "@fictjs/runtime/internal" },
-  __fictGetScopeProps: { import: "__fictGetScopeProps", from: "@fictjs/runtime/internal" },
-  __fictGetSSRScope: { import: "__fictGetSSRScope", from: "@fictjs/runtime/internal" },
-  __fictEnsureScope: { import: "__fictEnsureScope", from: "@fictjs/runtime/internal" },
-  __fictPrepareContext: { import: "__fictPrepareContext", from: "@fictjs/runtime/internal" },
-  __fictPushContext: { import: "__fictPushContext", from: "@fictjs/runtime/internal" },
-  __fictPopContext: { import: "__fictPopContext", from: "@fictjs/runtime/internal" },
-  hydrateComponent: { import: "hydrateComponent", from: "@fictjs/runtime/internal" },
-  __fictQrl: { import: "__fictQrl", from: "@fictjs/runtime/internal" }
+  __fictUseLexicalScope: { import: "__fictUseLexicalScope", from: "fict/internal" },
+  __fictGetScopeProps: { import: "__fictGetScopeProps", from: "fict/internal" },
+  __fictGetSSRScope: { import: "__fictGetSSRScope", from: "fict/internal" },
+  __fictEnsureScope: { import: "__fictEnsureScope", from: "fict/internal" },
+  __fictPrepareContext: { import: "__fictPrepareContext", from: "fict/internal" },
+  __fictPushContext: { import: "__fictPushContext", from: "fict/internal" },
+  __fictPopContext: { import: "__fictPopContext", from: "fict/internal" },
+  hydrateComponent: { import: "hydrateComponent", from: "fict/internal" },
+  __fictQrl: { import: "__fictQrl", from: "fict/internal" }
 };
 var GLOBAL_IDENTIFIERS = /* @__PURE__ */ new Set([
   // JavaScript globals
@@ -1039,6 +1112,7 @@ function extractAndRewriteHandlers(code, sourceModule, handlerRegistry) {
   const handlerNames = [];
   const nodesToRemove = /* @__PURE__ */ new Set();
   const allLocalDeps = /* @__PURE__ */ new Set();
+  const runtimeImportFamily = detectRuntimeImportFamilyFromCode(ast.program.body);
   traverse(ast, {
     ExportNamedDeclaration(path2) {
       const declaration = path2.node.declaration;
@@ -1071,7 +1145,8 @@ function extractAndRewriteHandlers(code, sourceModule, handlerRegistry) {
             exportName: name,
             helpersUsed,
             localDeps,
-            code: handlerCode
+            code: handlerCode,
+            runtimeImportFamily
           });
           nodesToRemove.add(path2.node);
         }
@@ -1106,7 +1181,8 @@ function extractAndRewriteHandlers(code, sourceModule, handlerRegistry) {
           exportName: name,
           helpersUsed,
           localDeps,
-          code: handlerCode
+          code: handlerCode,
+          runtimeImportFamily
         });
         nodesToRemove.add(path2.node);
       }