@dimina-kit/devkit 0.1.2-dev.20260702175315 → 0.1.2-dev.20260703051110

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzD,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAyCzE,MAAM,WAAW,OAAO;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,cAAc;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IAClC,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;OAIG;IACH,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAA;IAC5E,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,oFAAoF;IACpF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC;;;;OAIG;IACH,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAA;CACxC;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,CAgLnF;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CACnC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAClC;IAAE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CA+CtD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAgB,eAAe,EAAiB,MAAM,qBAAqB,CAAA;AAEvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzD,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAyCzE,MAAM,WAAW,OAAO;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,cAAc;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IAClC,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;OAIG;IACH,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAA;IAC5E,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,oFAAoF;IACpF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC;;;;OAIG;IACH,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAA;CACxC;AAuFD,wBAAsB,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,CAqInF;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CACnC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAClC;IAAE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CA+CtD"}

package/dist/index.js

@@ -38,6 +38,81 @@ function getRandomPort() {
         srv.on('error', reject);
     });
 }
+/**
+ * Best-effort fallback when the compiler returns no AppInfo (e.g. a build
+ * racing against a just-closed project in the same Electron process): reads
+ * the canonical appid from project.config.json so storage prefixing (which
+ * keys off appInfo.appId) still lines up with the runtime instead of
+ * silently falling to 'unknown'.
+ */
+function resolveAppInfoFallback(projectPath) {
+    try {
+        const configRaw = fs.readFileSync(path.join(projectPath, 'project.config.json'), 'utf8');
+        const config = JSON.parse(configRaw);
+        if (!config.appid || typeof config.appid !== 'string' || config.appid.length === 0)
+            return null;
+        return {
+            appId: config.appid,
+            name: config.projectname ?? path.basename(projectPath),
+            path: projectPath,
+        };
+    }
+    catch {
+        // best-effort — fall through to the 'unknown' fallback in the caller
+        return null;
+    }
+}
+/** Insert or replace `rebuilt` in the session's app list, keyed by appId. */
+function upsertSessionApp(sessionApps, rebuilt) {
+    const idx = sessionApps.findIndex(a => a.appId === rebuilt.appId);
+    if (idx === -1)
+        sessionApps.push(rebuilt);
+    else
+        sessionApps[idx] = rebuilt;
+}
+/**
+ * Run one watcher-triggered rebuild. `getReload` is read at call time (not
+ * captured eagerly) because `reload` is only assigned once the dev server has
+ * started, after this runner is wired into the rebuild scheduler.
+ */
+async function runRebuild(compileWorker, buildRequest, sessionApps, getReload, onRebuild, onBuildError) {
+    try {
+        const rebuilt = (await compileWorker.build(buildRequest));
+        if (rebuilt)
+            upsertSessionApp(sessionApps, rebuilt);
+        getReload()?.();
+        onRebuild?.();
+    }
+    catch (e) {
+        onBuildError?.(e);
+    }
+}
+/**
+ * Tear down whatever partially started before `openProject` failed: the
+ * watcher, the forked compile worker, and the dev server if it was already
+ * listening. Every step is best-effort so a secondary failure here never
+ * masks the primary error the caller is about to rethrow.
+ */
+async function cleanupFailedOpen(watcher, compileWorker, server) {
+    try {
+        await watcher?.close();
+    }
+    catch {
+        // best-effort — the open is already failing with the primary error
+    }
+    try {
+        await compileWorker.close();
+    }
+    catch {
+        // best-effort — never mask the primary error
+    }
+    if (server) {
+        ;
+        server.closeAllConnections?.();
+        const listening = server;
+        await new Promise(resolve => listening.close(() => resolve()));
+    }
+}
 export async function openProject(opts) {
     const { projectPath: rawProjectPath, port = 0, sourcemap = false, fileTypes, simulatorDir, containerDir: overrideContainerDir, outputDir, watch = true, onRebuild, onBuildError, onLog, } = opts;
     const projectPath = path.resolve(rawProjectPath);
@@ -78,20 +153,7 @@ export async function openProject(opts) {
     // `'unknown'` is only used as a last resort when the manifest itself
     // is missing/unreadable, preserving the original error path.
     if (!initialAppInfo) {
-        try {
-            const configRaw = fs.readFileSync(path.join(projectPath, 'project.config.json'), 'utf8');
-            const config = JSON.parse(configRaw);
-            if (config.appid && typeof config.appid === 'string' && config.appid.length > 0) {
-                initialAppInfo = {
-                    appId: config.appid,
-                    name: config.projectname ?? path.basename(projectPath),
-                    path: projectPath,
-                };
-            }
-        }
-        catch {
-            // best-effort — fall through to the 'unknown' fallback below
-        }
+        initialAppInfo = resolveAppInfoFallback(projectPath);
     }
     if (!initialAppInfo) {
         // Both the compile (null AppInfo) and the project.config.json fallback
@@ -114,23 +176,6 @@ export async function openProject(opts) {
     let server = null;
     let reload;
     let watcher = null;
-    async function rebuild() {
-        try {
-            const rebuilt = (await compileWorker.build(buildRequest));
-            if (rebuilt) {
-                const idx = sessionApps.findIndex(a => a.appId === rebuilt.appId);
-                if (idx === -1)
-                    sessionApps.push(rebuilt);
-                else
-                    sessionApps[idx] = rebuilt;
-            }
-            reload?.();
-            onRebuild?.();
-        }
-        catch (e) {
-            onBuildError?.(e);
-        }
-    }
     try {
         process.env.DIMINA_NO_OPEN_BROWSER = '1';
         const fe = await import('../fe/index.js');
@@ -148,7 +193,7 @@ export async function openProject(opts) {
         // Watcher events are routed through the scheduler so a save landing while
         // a build is in flight is never dropped: it coalesces into exactly one
         // trailing rebuild once the current run settles.
-        const rebuildScheduler = createRebuildScheduler(rebuild);
+        const rebuildScheduler = createRebuildScheduler(() => runRebuild(compileWorker, buildRequest, sessionApps, () => reload, onRebuild, onBuildError));
         watcher = watch ? createProjectWatcher(projectPath, () => rebuildScheduler.schedule()) : null;
         // Don't resolve until the watcher's initial scan is done: a save landing
         // in the gap between `openProject` resolving and chokidar going live
@@ -159,24 +204,7 @@ export async function openProject(opts) {
         await watcher?.ready;
     }
     catch (err) {
-        try {
-            await watcher?.close();
-        }
-        catch {
-            // best-effort — the open is already failing with the primary error
-        }
-        try {
-            await compileWorker.close();
-        }
-        catch {
-            // best-effort — never mask the primary error
-        }
-        if (server) {
-            ;
-            server.closeAllConnections?.();
-            const listening = server;
-            await new Promise(resolve => listening.close(() => resolve()));
-        }
+        await cleanupFailedOpen(watcher, compileWorker, server);
         throw err;
     }
     // `server` is always assigned when the try block completes without throwing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dimina-kit/devkit",
-  "version": "0.1.2-dev.20260702175315",
+  "version": "0.1.2-dev.20260703051110",
   "description": "Development toolkit for Dimina mini-apps with H5 container preview",
   "keywords": [
     "dimina",
@@ -53,8 +53,8 @@
     "eslint": "^10.2.1",
     "typescript": "5.9.2",
     "vitest": "^4.1.4",
-    "@dimina-kit/typescript-config": "0.1.0",
-    "@dimina-kit/eslint-config": "0.1.0"
+    "@dimina-kit/eslint-config": "0.1.0",
+    "@dimina-kit/typescript-config": "0.1.0"
   },
   "dependencies": {
     "axios": "^1.15.0",
@@ -62,7 +62,7 @@
     "cors": "^2.8.6",
     "express": "^5.2.1",
     "open": "^11.0.0",
-    "@dimina-kit/compiler": "0.0.1-dev.20260702175315"
+    "@dimina-kit/compiler": "0.0.1-dev.20260703051110"
   },
   "publishConfig": {
     "access": "public"