transone-cli 0.6.0 → 0.6.3

package/dist/{index-pg5v7h1t.js → index-8k9x2k6m.js}

@@ -740,6 +740,7 @@ var MP_WEIXIN_DIALECT = {
     backgroundTextStyle: "light"
   }),
   appJsonExtras: () => ({
+    lazyCodeLoading: "requiredComponents",
     style: "v2",
     sitemapLocation: "sitemap.json"
   }),
@@ -853,7 +854,7 @@ class MpTarget {
     if (!config.mp) {
       throw new Error("Mini program build requires config.mp\uFF08\u8BF7\u5728 transone.config.ts \u914D\u7F6E mp \u5B57\u6BB5\uFF0C" + "\u5982 appId / pages / outDir\uFF09");
     }
-    const { buildMiniProgram } = await import("./build-mp-004pd4h0.js");
+    const { buildMiniProgram } = await import("./build-mp-vk5ap2cw.js");
     return buildMiniProgram(config, this.dialect);
   }
 }
@@ -1368,7 +1369,7 @@ async function runTsc(root, tsconfig) {
 import { existsSync as existsSync4, mkdirSync, writeFileSync } from "fs";
 import { basename as basename2, join as join2 } from "path";
 var TRANSONE_FRAMEWORK_VERSION = "0.4.0";
-var TRANSONE_CLI_VERSION = "0.6.0";
+var TRANSONE_CLI_VERSION = "0.6.3";
 var GITHUB_URL = "https://github.com/geektech-team/transone";
 function createProject(options = {}) {
   const root = options.root ?? process.cwd();
@@ -1522,6 +1523,7 @@ app.mount();
 
 // src/server.ts
 import { randomUUID } from "crypto";
+import { rm as rm4 } from "fs/promises";
 import {
   basename as basename3,
   extname,
@@ -1765,6 +1767,7 @@ function isRecursiveWatchUnsupported(error) {
 var DEVELOPMENT_URL_PREFIX = "/dev";
 var INVALID_DEVELOPMENT_DIRECTORY_MESSAGE = "Development output must be a subdirectory of the project root";
 var LIVE_RELOAD_PATH = "/__transone/reload";
+var DEVELOPMENT_OUTPUT_RETENTION_MS = 5000;
 var WATCHED_EXTENSIONS = new Set([
   ".ts",
   ".js",
@@ -1793,7 +1796,9 @@ async function startDevServer(options = {}) {
     return startWatchingDevServer(options);
   }
   const instance = await createServerInstance(options, false);
-  return instance.server;
+  return createServerHandle(() => instance, () => {
+    return;
+  });
 }
 async function startWatchingDevServer(options) {
   let instance = await createServerInstance(options, true);
@@ -1821,7 +1826,8 @@ async function startWatchingDevServer(options) {
   }
   async function restart() {
     watcher.dispose();
-    instance.server.stop(true);
+    await instance.server.stop(true);
+    await instance.dispose();
     instance = await createServerInstance(options, true);
     watcher = createProjectWatcher(instance, onChange);
     console.log(`TransOne dev server restarted at http://${instance.server.hostname}:${instance.server.port}`);
@@ -1849,16 +1855,18 @@ async function createServerInstance(options, watch2) {
   const sessionId = createGenerationId();
   const sessionOutDir = resolve6(developmentOutDir, sessionId);
   const artifacts = new Map;
-  const buildProject = createDevelopmentBuilder(sessionId, sessionOutDir);
+  const buildProject = createDevelopmentBuilder(sessionId, sessionOutDir, artifacts);
   const liveReload = watch2 ? createLiveReloadHub() : undefined;
   const bundles = new Map;
   const dirtyEntries = new Set;
-  const getBundle = async (entry) => {
+  const getBundle = async (entry, acquire = false) => {
     const cached = bundles.get(entry);
     if (watch2 && cached !== undefined && !dirtyEntries.has(entry)) {
+      if (acquire)
+        cached.activeRequests += 1;
       return cached;
     }
-    const bundle = await buildProject(entry);
+    const bundle = await buildProject.build(entry);
     if (bundle instanceof Response) {
       if (watch2) {
         dirtyEntries.add(entry);
@@ -1869,6 +1877,8 @@ async function createServerInstance(options, watch2) {
       bundles.set(entry, bundle);
       dirtyEntries.delete(entry);
     }
+    if (acquire)
+      bundle.activeRequests += 1;
     return bundle;
   };
   const server = Bun.serve({
@@ -1889,6 +1899,7 @@ async function createServerInstance(options, watch2) {
     markDirty: (entries) => {
       entries.forEach((entry) => dirtyEntries.add(entry));
     },
+    dispose: buildProject.dispose,
     liveReload
   };
 }
@@ -1896,9 +1907,11 @@ function createServerHandle(getInstance, disposeWatcher) {
   return new Proxy({}, {
     get(_target, property) {
       if (property === "stop") {
-        return (closeActiveConnections) => {
+        return async (closeActiveConnections) => {
           disposeWatcher();
-          getInstance().server.stop(closeActiveConnections);
+          const instance = getInstance();
+          await instance.server.stop(closeActiveConnections);
+          await instance.dispose();
         };
       }
       const server = getInstance().server;
@@ -1912,7 +1925,7 @@ async function serveProjectRequest(request, config, pages, getBundle, artifacts,
   const route = pageRouteForPathname(pages, pathname);
   if (route !== undefined) {
     const entry = pages[route];
-    const bundle = await getBundle(entry);
+    const bundle = await getBundle(entry, true);
     if (bundle instanceof Response) {
       return bundle;
     }
@@ -1935,10 +1948,12 @@ async function serveProjectRequest(request, config, pages, getBundle, artifacts,
     } catch (error) {
       console.error(error);
       return buildFailureResponse();
+    } finally {
+      releaseDevelopmentBundle(bundle);
     }
   }
   if (pathname === "/bundle.js") {
-    const bundle = await getBundle(config.entry);
+    const bundle = await getBundle(config.entry, true);
     if (bundle instanceof Response) {
       return bundle;
     }
@@ -1954,6 +1969,8 @@ async function serveProjectRequest(request, config, pages, getBundle, artifacts,
     } catch (error) {
       console.error(error);
       return buildFailureResponse();
+    } finally {
+      releaseDevelopmentBundle(bundle);
     }
   }
   const artifact = artifacts.get(pathname);
@@ -1966,7 +1983,7 @@ async function serveProjectRequest(request, config, pages, getBundle, artifacts,
     });
   }
   if (pathname !== "/" && !pathname.startsWith("/api/") && !/\.[a-zA-Z0-9]+$/.test(pathname)) {
-    const bundle = await getBundle(config.entry);
+    const bundle = await getBundle(config.entry, true);
     if (!(bundle instanceof Response)) {
       try {
         const { renderProjectHtml } = await import("./project-ybacfze8.js");
@@ -1987,6 +2004,8 @@ async function serveProjectRequest(request, config, pages, getBundle, artifacts,
       } catch (error) {
         console.error(error);
         return buildFailureResponse();
+      } finally {
+        releaseDevelopmentBundle(bundle);
       }
     }
   }
@@ -2099,17 +2118,73 @@ function isWithinOrEqual(parent, candidate) {
   const pathFromParent = relative4(parent, candidate);
   return pathFromParent === "" || pathFromParent !== ".." && !pathFromParent.startsWith(`..${sep3}`) && !isAbsolute4(pathFromParent);
 }
-function createDevelopmentBuilder(sessionId, sessionOutDir) {
+function createDevelopmentBuilder(sessionId, sessionOutDir, artifacts) {
   let queue = Promise.resolve();
-  return (entry) => {
-    const result = queue.then(() => buildProjectBundle(entry, sessionId, sessionOutDir));
+  let disposed = false;
+  let disposal;
+  const latestBundles = new Map;
+  const retirementTimers = new Map;
+  function retire(bundle) {
+    bundle.retire = () => {
+      const previousTimer = retirementTimers.get(bundle.outDir);
+      if (previousTimer)
+        clearTimeout(previousTimer);
+      retirementTimers.delete(bundle.outDir);
+      if (disposed || bundle.activeRequests > 0)
+        return;
+      const timer = setTimeout(() => {
+        retirementTimers.delete(bundle.outDir);
+        removeDevelopmentBundle(bundle, artifacts).catch((error) => console.error(error));
+      }, DEVELOPMENT_OUTPUT_RETENTION_MS);
+      timer.unref();
+      retirementTimers.set(bundle.outDir, timer);
+    };
+    bundle.retire();
+  }
+  function build2(entry) {
+    const result = queue.then(async () => {
+      if (disposed)
+        return buildFailureResponse();
+      const bundle = await buildProjectBundle(entry, sessionId, sessionOutDir);
+      if (!(bundle instanceof Response)) {
+        const previous = latestBundles.get(entry);
+        latestBundles.set(entry, bundle);
+        if (previous)
+          retire(previous);
+      }
+      return bundle;
+    });
     queue = result.then(() => {
       return;
     }, () => {
       return;
     });
     return result;
-  };
+  }
+  function dispose() {
+    if (disposal)
+      return disposal;
+    disposed = true;
+    retirementTimers.forEach((timer) => clearTimeout(timer));
+    retirementTimers.clear();
+    disposal = queue.then(async () => {
+      await rm4(sessionOutDir, { recursive: true, force: true });
+      latestBundles.clear();
+      artifacts.clear();
+    });
+    return disposal;
+  }
+  return { build: build2, dispose };
+}
+function releaseDevelopmentBundle(bundle) {
+  bundle.activeRequests -= 1;
+  bundle.retire?.();
+}
+async function removeDevelopmentBundle(bundle, artifacts) {
+  await rm4(bundle.outDir, { recursive: true, force: true });
+  for (const pathname of bundle.artifacts.keys()) {
+    artifacts.delete(pathname);
+  }
 }
 async function buildProjectBundle(entry, sessionId, sessionOutDir) {
   const generationId = createGenerationId();
@@ -2130,6 +2205,7 @@ async function buildProjectBundle(entry, sessionId, sessionOutDir) {
       asset: "assets/[name]-[hash].[ext]"
     }
   };
+  let success = false;
   try {
     const result = await Bun.build(buildOptions);
     const entryArtifact = result.outputs.find(isEntryJavaScriptOutput);
@@ -2154,7 +2230,10 @@ async function buildProjectBundle(entry, sessionId, sessionOutDir) {
     if (!entry2) {
       throw new Error("Development entry output was not indexed");
     }
+    success = true;
     return {
+      outDir: generationOutDir,
+      activeRequests: 0,
       entry: entry2,
       stylesheets: result.outputs.filter(isStylesheetOutput).map((output) => outputs.get(output)).filter((output) => output !== undefined),
       artifacts: pendingArtifacts
@@ -2162,6 +2241,10 @@ async function buildProjectBundle(entry, sessionId, sessionOutDir) {
   } catch (error) {
     console.error(error);
     return buildFailureResponse();
+  } finally {
+    if (!success) {
+      await rm4(generationOutDir, { recursive: true, force: true });
+    }
   }
 }
 function publishDevelopmentBundle(bundle, artifacts) {
@@ -2201,5 +2284,5 @@ function buildFailureResponse() {
 
 export { TARGET_TYPES, isTargetType, MP_TARGET_TYPES, isMpTargetType, defineConfig, resolveConfig, WebTarget, MpTarget, mpWeixinTarget, mpAlipayTarget, mpBytedanceTarget, mpXiaohongshuTarget, TargetRegistry, targetRegistry, build, createProject, startDevServer };
 
-//# debugId=635285A08AF2FAAB64756E2164756E21
-//# sourceMappingURL=index-pg5v7h1t.js.map
+//# debugId=8A1F36BF60A5A63464756E2164756E21
+//# sourceMappingURL=index-8k9x2k6m.js.map