@adep/web-container 0.2.1 → 0.2.2

package/dist/web-container.iife.js

@@ -118,6 +118,27 @@ var AdepWebContainer = (() => {
     }
     return abs;
   }
+  function pickConditionTarget(conditions, order, resolveRel, context) {
+    for (const key of order) {
+      const value = conditions[key];
+      if (value === void 0 || value === null) continue;
+      if (typeof value === "string") return resolveRel(value);
+      if (typeof value === "object" && !Array.isArray(value)) {
+        const nested = pickConditionTarget(
+          value,
+          order,
+          resolveRel,
+          context
+        );
+        if (nested !== null) return nested;
+        continue;
+      }
+      throw new ResolveError(
+        `${context}\uFF1Aexports["."]["${key}"] \u5F62\u6001\u4E0D\u652F\u6301\uFF08\u4EC5\u63A5\u53D7\u5B57\u7B26\u4E32 / null / \u6761\u4EF6\u5BF9\u8C61\uFF09`
+      );
+    }
+    return null;
+  }
   function resolvePackageEntry(meta, pkgDirAbs, condition) {
     const context = `\u5305 ${meta.name ?? meta.version ?? pkgDirAbs} \u7684 exports/main \u58F0\u660E`;
     const exp = meta.exports;
@@ -138,20 +159,11 @@ var AdepWebContainer = (() => {
       if (typeof dot !== "object" || Array.isArray(dot)) {
         throw new ResolveError(`${context}\uFF1Aexports["."] \u5F62\u6001\u4E0D\u652F\u6301\uFF08\u4EC5\u63A5\u53D7\u5B57\u7B26\u4E32\u6216\u6761\u4EF6\u5BF9\u8C61\uFF09`);
       }
-      const conditions = dot;
-      const order = condition === "import" ? ["import", "node", "default"] : ["require", "node", "default"];
-      for (const key of order) {
-        const value = conditions[key];
-        if (typeof value === "string") return withinPackage(pkgDirAbs, value, context);
-        if (value !== void 0 && (typeof value !== "object" || value === null)) {
-          throw new ResolveError(
-            `${context}\uFF1Aexports["."]["${key}"] \u5F62\u6001\u4E0D\u652F\u6301\uFF08\u4EC5\u63A5\u53D7\u5B57\u7B26\u4E32\u6216 null\uFF09`
-          );
-        }
-      }
-      throw new ResolveError(
-        `${context}\uFF1Aexports["."] \u6761\u4EF6\u5BF9\u8C61\u91CC\u6CA1\u6709 ${condition}/node/default \u5B57\u7B26\u4E32\u5165\u53E3\uFF08\u5B50\u8DEF\u5F84/\u5D4C\u5957\u6761\u4EF6\u4E0D\u652F\u6301\uFF09`
-      );
+      const order = condition === "import" ? IMPORT_CONDITION_ORDER : REQUIRE_CONDITION_ORDER;
+      const resolveRel = (rel) => withinPackage(pkgDirAbs, rel, context);
+      const hit = pickConditionTarget(dot, order, resolveRel, context);
+      if (hit !== null) return hit;
+      throw new ResolveError(`${context}\uFF1Aexports["."] \u6761\u4EF6\u5BF9\u8C61\u91CC\u6CA1\u6709 ${order.join("/")} \u5165\u53E3`);
     }
     if (meta.main !== void 0) {
       if (typeof meta.main !== "string") {
@@ -249,11 +261,13 @@ var AdepWebContainer = (() => {
       `\u627E\u4E0D\u5230\u5305 "${specifier}"\uFF1A${dirname(fromFileAbs)} \u53CA\u5176\u5404\u7EA7\u7236\u76EE\u5F55\u4E0B\u90FD\u6CA1\u6709 node_modules/${name}\uFF08\u5148\u5728\u7EC8\u7AEF npm install ${name}\uFF09`
     );
   }
-  var RESOLVE_EXTENSIONS, ResolveError;
+  var IMPORT_CONDITION_ORDER, REQUIRE_CONDITION_ORDER, RESOLVE_EXTENSIONS, ResolveError;
   var init_node_resolve = __esm({
     "src/node-resolve.ts"() {
       "use strict";
       init_path();
+      IMPORT_CONDITION_ORDER = ["browser", "import", "module", "default"];
+      REQUIRE_CONDITION_ORDER = ["require", "node", "default"];
       RESOLVE_EXTENSIONS = [".js", ".mjs", ".cjs", ".json"];
       ResolveError = class extends Error {
         constructor(message) {
@@ -528,6 +542,7 @@ var AdepWebContainer = (() => {
               return;
             case "as":
             case "satisfies": {
+              if (this.frames[this.frames.length - 1]?.specifierList === true) return;
               if (this.tokenAt(2) === "*" || this.tokenAt(2) === "type") return;
               const nextChar = this.skipWhitespaceFrom(this.i);
               if (nextChar === null || "=,:]})".includes(this.src[nextChar])) return;
@@ -580,7 +595,8 @@ var AdepWebContainer = (() => {
             const frame = {
               kind: c === "(" ? "paren" : c === "{" ? "brace" : "bracket",
               declare: false,
-              classBody: false
+              classBody: false,
+              specifierList: c === "{" && this.isImportSpecifierBrace()
             };
             if (c === "{" && this.pendingClassBody) {
               frame.classBody = true;
@@ -666,6 +682,15 @@ var AdepWebContainer = (() => {
           this.i = end;
           return true;
         }
+        /**
+         * `{` 是 import / export 的说明符列表吗——`{ a as b }` 覆盖 `import { … }`、
+         * `export { … }` 与 `import def, { … }` 三种写法（后者说明符花括号的前驱 token 是 `,`）。
+         */
+        isImportSpecifierBrace() {
+          const back1 = this.tokenAt(1);
+          if (back1 === "import" || back1 === "export") return true;
+          return back1 === "," && this.tokenAt(3) === "import";
+        }
         /**
          * `(` 是否为参数列表（声明位）：`function f(`、类体里的方法 `m(`、箭头 `=> (`，
          * 以及出现在 `(` `,` `=` `>` `:` `[` `{` `}` `;` 之后（如 `map((v: T) => v)` 的内层括号）。
@@ -677,6 +702,7 @@ var AdepWebContainer = (() => {
           if (this.afterFunctionKeyword) return true;
           if (this.tokenAt(2) === "function" && IDENT_START.test(this.tokenAt(1))) return true;
           if (this.afterArrow) return true;
+          if (this.tokenAt(1) === "return") return true;
           if (this.inClassBody() && IDENT_PART.test(this.prevSignificantChar(at - 1))) return true;
           const prev = this.prevSignificantChar(at - 1);
           return prev === "" || "(,=>:[{};".includes(prev);
@@ -1185,7 +1211,10 @@ var AdepWebContainer = (() => {
           "    }",
           "    var u;",
           "    try { u = new URL(urlStr, document.baseURI); }",
-          "    catch (e) { return ORIGINAL_FETCH(input, init); }",
+          "    catch (e0) {",
+          "      try { u = new URL(urlStr, window.location.origin); }",
+          "      catch (e1) { return ORIGINAL_FETCH(input, init); }",
+          "    }",
           '    if (u.pathname.indexOf("/api/") !== 0 && u.pathname !== "/api") {',
           "      return ORIGINAL_FETCH(input, init);",
           "    }",
@@ -1324,6 +1353,18 @@ var AdepWebContainer = (() => {
       "export default css;"
     ].join("\n");
   }
+  function inlineStyleBlock(css, key) {
+    return [
+      "{",
+      `const css = ${JSON.stringify(css)};`,
+      'const el = document.createElement("style");',
+      'el.setAttribute("data-adep-vite", "");',
+      `el.setAttribute("data-adep-style", ${JSON.stringify(key)});`,
+      "el.textContent = css;",
+      "document.head.appendChild(el);",
+      "}"
+    ].join("\n");
+  }
   function jsonModule(source, abs) {
     try {
       JSON.parse(source);
@@ -1374,6 +1415,17 @@ var AdepWebContainer = (() => {
       } catch {
       }
     };
+    const DEFINES = [
+      [/\bprocess\s*\.\s*env\s*\.\s*NODE_ENV\b/g, JSON.stringify("development")],
+      [/\b__VUE_OPTIONS_API__\b/g, "true"],
+      [/\b__VUE_PROD_DEVTOOLS__\b/g, "false"],
+      [/\b__VUE_PROD_HYDRATION_MISMATCH_DETAILS__\b/g, "false"]
+    ];
+    function applyDefines(code) {
+      let out = code;
+      for (const [pattern, value] of DEFINES) out = out.replace(pattern, value);
+      return out;
+    }
     function transformModule2(abs, source) {
       if (abs.endsWith(".css")) return cssModule(source);
       if (abs.endsWith(".json")) return jsonModule(source, abs);
@@ -1384,21 +1436,27 @@ var AdepWebContainer = (() => {
             `${abs} \u662F Vue SFC\uFF0C\u4F46\u5F53\u524D\u73AF\u5883\u672A\u88C5\u914D SFC \u7F16\u8BD1\u5668\uFF08IDE \u4FA7\u9700\u6CE8\u5165 vue/compiler-sfc\uFF09`
           );
         const compiled = sfcCompiler(source, abs);
-        return [...compiled.styles.map((css) => cssModule(css)), compiled.script].join("\n");
+        return [
+          ...compiled.styles.map((css, index) => inlineStyleBlock(css, `${abs}#${index}`)),
+          applyDefines(stripTypes(compiled.script))
+        ].join("\n");
       }
       if (abs.endsWith(".tsx") || abs.endsWith(".jsx"))
         throw new ViteDevError(
           "JSX_UNSUPPORTED",
           `${abs} \u4F7F\u7528 JSX\uFF1A\u6D4F\u89C8\u5668\u5185 vite \u53EA\u64E6\u9664 TS \u7C7B\u578B\u6807\u6CE8\uFF0C\u4E0D\u8F6C\u8BD1 JSX\uFF08\u8BF7\u7528 h() \u6E32\u67D3\u51FD\u6570\u6216 .vue SFC\uFF09`
         );
-      if (abs.endsWith(".ts") || abs.endsWith(".mts")) return stripTypes(source);
-      return source;
+      if (abs.endsWith(".ts") || abs.endsWith(".mts")) return applyDefines(stripTypes(source));
+      return applyDefines(source);
+    }
+    function absoluteFromRoot(spec) {
+      return join(root, spec.replace(/^\/+/, ""));
     }
     async function resolveSpecifier(spec, importerAbs) {
       if (EXTERNAL_SPECIFIER.test(spec) || DATA_OR_BLOB.test(spec)) return spec;
       let target;
       if (spec.startsWith("./") || spec.startsWith("../") || spec.startsWith("/")) {
-        const base = spec.startsWith("/") ? spec : join(dirname(importerAbs), spec);
+        const base = spec.startsWith("/") ? absoluteFromRoot(spec) : join(dirname(importerAbs), spec);
         target = resolveWithSuffixes(vfs, base);
         if (!vfs.exists(target) || vfs.isDirectory(target))
           throw new ViteDevError(
@@ -1487,7 +1545,7 @@ var AdepWebContainer = (() => {
       html = html.replace(
         MODULE_SCRIPT_SRC_RE,
         (_whole, pre, _q1, mid, _q2, src, post) => {
-          const base = src.startsWith("/") ? normalize(src) : join(dirname(entryAbs), src);
+          const base = src.startsWith("/") ? absoluteFromRoot(src) : join(dirname(entryAbs), src);
           const abs = resolveWithSuffixes(vfs, base);
           if (!vfs.exists(abs) || vfs.isDirectory(abs))
             throw new ViteDevError(
@@ -1495,7 +1553,7 @@ var AdepWebContainer = (() => {
               `\u5165\u53E3 module script \u627E\u4E0D\u5230 "${src}"\uFF08root: ${root}\uFF1B\u8BD5\u8FC7\u6269\u5C55\u540D ${VITE_RESOLVE_SUFFIXES.join("/")} \u4E0E\u76EE\u5F55 index\uFF09`
             );
           entryModuleUrls.push(loadModuleUrl(abs));
-          return `<script${pre}${mid}src="__adep_vite_entry_${entryModuleUrls.length - 1}__"${post}><\/script>`;
+          return `<script${pre}${mid}src="__adep_vite_entry_${entryModuleUrls.length - 1}__"${post} type="module"><\/script>`;
         }
       );
       html = html.replace(
@@ -1505,7 +1563,7 @@ var AdepWebContainer = (() => {
           const abs = `${INLINE_PREFIX}${inlineSeq++}.mjs`;
           inlineSources.set(abs, body);
           entryModuleUrls.push(loadModuleUrl(abs));
-          return `<script${pre}${post}src="__adep_vite_entry_${entryModuleUrls.length - 1}__"><\/script>`;
+          return `<script${pre}${post}src="__adep_vite_entry_${entryModuleUrls.length - 1}__" type="module"><\/script>`;
         }
       );
       const urls = await Promise.all(entryModuleUrls);
@@ -4559,6 +4617,8 @@ self.onmessage = async (event) => {
   var DB_RPC = {
     /** 直通方法（如 query）：`(method=query, args=[sql, params])`。 */
     query: "query",
+    /** 写路径（CF-013）：`(method=writeQuery, args=[sql, params])` → `{ changes }`。 */
+    writeQuery: "writeQuery",
     /** 读取 owned 表变更流（DB-006）：`(method=changes, args=[table, query])`。 */
     changes: "changes",
     /** 开启事务：`begin → txId`。 */
@@ -4635,21 +4695,35 @@ self.onmessage = async (event) => {
   function stripLiterals(sql) {
     return sql.replace(/'[^']*(?:''[^']*)*'/g, "").replace(/"[^"]*(?:""[^"]*)*"/g, "").replace(/--[^\n]*/g, "").replace(/\/\*[\s\S]*?\*\//g, "");
   }
-  function assertReadOnlyQuery(sql) {
+  function sqlHead(sql) {
+    return sql.trim().replace(/^\(+/, "").trim().toUpperCase();
+  }
+  function assertSafeStatement(sql) {
     const stripped = stripLiterals(sql);
     if (stripped.includes(";")) {
       throw unsafeOperation("\u4EC5\u5141\u8BB8\u5355\u6761\u8BED\u53E5\uFF0C\u7981\u6B62\u591A\u8BED\u53E5\u5806\u53E0");
     }
-    const head = stripped.trim().replace(/^\(+/, "").trim().toUpperCase();
-    if (!head.startsWith("SELECT") && !head.startsWith("WITH")) {
-      throw unsafeOperation("cloud.db.query \u4EC5\u5141\u8BB8\u53EA\u8BFB\u67E5\u8BE2\uFF08SELECT / WITH\uFF09");
-    }
     if (/ATTACH|DETACH/.test(stripped.toUpperCase())) {
       throw unsafeOperation("\u7981\u6B62\u8DE8\u5E93\u64CD\u4F5C\uFF08ATTACH / DETACH\uFF09");
     }
     if (/SQLITE_\w+/i.test(stripped)) {
       throw unsafeOperation("\u7981\u6B62\u8BBF\u95EE\u7CFB\u7EDF\u8868\uFF08sqlite_*\uFF09");
     }
+    return sqlHead(stripped);
+  }
+  function assertReadOnlyQuery(sql) {
+    const head = assertSafeStatement(sql);
+    if (!head.startsWith("SELECT") && !head.startsWith("WITH")) {
+      throw unsafeOperation("cloud.db.query \u4EC5\u5141\u8BB8\u53EA\u8BFB\u67E5\u8BE2\uFF08SELECT / WITH\uFF09");
+    }
+  }
+  function assertWriteQuery(sql) {
+    const head = assertSafeStatement(sql);
+    if (!head.startsWith("INSERT") && !head.startsWith("UPDATE") && !head.startsWith("DELETE")) {
+      throw unsafeOperation(
+        "cloud.db.writeQuery \u4EC5\u5141\u8BB8 DML\uFF08INSERT / UPDATE / DELETE\uFF09\uFF0CDDL \u8BF7\u8D70\u63A7\u5236\u53F0"
+      );
+    }
   }
 
   // ../runtime/src/database/builder/owned.ts
@@ -5195,6 +5269,14 @@ self.onmessage = async (event) => {
           assertReadOnlyQuery(sql);
           return driver.all(sql, params);
         },
+        async writeQuery(sql, params) {
+          if (!Array.isArray(params)) {
+            throw unsafeOperation("writeQuery \u7684 params \u5FC5\u987B\u63D0\u4F9B\uFF08\u65E0\u53C2\u4F20 []\uFF09");
+          }
+          guardWrite();
+          assertWriteQuery(sql);
+          return driver.run(sql, params);
+        },
         async changes(table, query = {}) {
           return readChanges(driver, table, query);
         }
@@ -5210,7 +5292,8 @@ self.onmessage = async (event) => {
     rootMethod: "table",
     stepMethods: ["select", "where", "orderBy", "limit", "offset"],
     terminalMethods: ["get", "first", "count", "insert", "insertMany", "update", "delete"],
-    directMethods: ["query", "changes"],
+    // CF-013：writeQuery 是 D1 shim 的写路径（INSERT/UPDATE/DELETE），与 query 并列直通方法。
+    directMethods: ["query", "writeQuery", "changes"],
     transactionMethod: "transaction"
   };
   var WRITE_TERMINALS = /* @__PURE__ */ new Set(["insert", "insertMany", "update", "delete"]);
@@ -5265,6 +5348,10 @@ self.onmessage = async (event) => {
             const [sql, params] = args;
             return await db.query(sql, params);
           }
+          case DB_RPC.writeQuery: {
+            const [sql, params] = args;
+            return await db.writeQuery(sql, params);
+          }
           case DB_RPC.changes: {
             const [table, query] = args;
             return await db.changes(table, query);
@@ -5994,9 +6081,12 @@ self.onmessage = async (event) => {
     const handler = async (method, args) => {
       switch (method) {
         case "upload": {
-          const [path, data] = args;
+          const [path, data, options] = args;
           return toStoredFile(
-            await driver.put(projectId, path, asBytes(data), { visibility: DEFAULT_VISIBILITY })
+            await driver.put(projectId, path, asBytes(data), {
+              visibility: DEFAULT_VISIBILITY,
+              ...options?.contentType === void 0 ? {} : { contentType: options.contentType }
+            })
           );
         }
         case "get": {
@@ -6443,6 +6533,10 @@ self.onmessage = async (event) => {
     realtime: {
       code: "REALTIME_NOT_AVAILABLE",
       message: "\u5B9E\u65F6\u901A\u9053\u672A\u88C5\u914D\uFF1Arealtime \u57DF\u672A\u88C5\u8F7D\uFF08\u68C0\u67E5\u90E8\u7F72\u5F62\u6001\u4E0E Redis \u914D\u7F6E\uFF09\uFF08REALTIME_NOT_AVAILABLE\uFF09"
+    },
+    kv: {
+      code: "KV_NOT_PROVISIONED",
+      message: "\u9879\u76EE KV \u5B58\u50A8\u672A\u53EF\u7528\uFF1Akv \u968F\u9879\u76EE\u6570\u636E\u5E93\u63D0\u4F9B\uFF0C\u8BF7\u5148\u542F\u52A8\u6570\u636E\u5E93\uFF08KV_NOT_PROVISIONED\uFF09"
     }
   };
   var CapabilityNotRegisteredError = class extends Error {
@@ -6755,6 +6849,106 @@ self.onmessage = async (event) => {
     return { run };
   }
 
+  // ../runtime/src/database/sdk/kv.ts
+  var KV_TABLE = "_adep_kv";
+  var KV_RPC = {
+    get: "get",
+    put: "put",
+    delete: "delete",
+    list: "list"
+  };
+  var KV_CAPABILITY_CODES = {
+    invalidMethod: "KV_INVALID_METHOD"
+  };
+  var KV_LIST_DEFAULT_LIMIT = 100;
+  function nowSeconds() {
+    return Math.floor(Date.now() / 1e3);
+  }
+  function errorWithCode2(error) {
+    const code = typeof error === "object" && error !== null && typeof error.code === "string" ? error.code : void 0;
+    if (code !== void 0 && error instanceof Error) {
+      return new Error(`[${code}] ${error.message}`);
+    }
+    return error;
+  }
+  function createKvCapability(driver) {
+    let ensurePromise = null;
+    const ensureTable = () => {
+      if (ensurePromise === null) {
+        ensurePromise = driver.run(
+          `CREATE TABLE IF NOT EXISTS ${KV_TABLE} (key TEXT PRIMARY KEY, value TEXT, expires_at INTEGER)`
+        ).then(() => void 0);
+      }
+      return ensurePromise;
+    };
+    const handler = async (method, args) => {
+      try {
+        await ensureTable();
+        switch (method) {
+          case KV_RPC.get: {
+            const [key] = args;
+            const row = await driver.get(`SELECT value, expires_at FROM ${KV_TABLE} WHERE key = ?`, [
+              key
+            ]);
+            if (row === null || row === void 0) return null;
+            const expiresAt = row.expires_at;
+            if (expiresAt !== null && expiresAt !== void 0 && Number(expiresAt) <= nowSeconds()) {
+              return null;
+            }
+            return row.value;
+          }
+          case KV_RPC.put: {
+            const [key, value, options] = args;
+            const ttl = options?.expirationTtlSeconds;
+            const expiresAt = typeof ttl === "number" && ttl > 0 ? nowSeconds() + Math.floor(ttl) : null;
+            await driver.run(`DELETE FROM ${KV_TABLE} WHERE key = ?`, [key]);
+            await driver.run(`INSERT INTO ${KV_TABLE} (key, value, expires_at) VALUES (?, ?, ?)`, [
+              key,
+              value,
+              expiresAt
+            ]);
+            return void 0;
+          }
+          case KV_RPC.delete: {
+            const [key] = args;
+            await driver.run(`DELETE FROM ${KV_TABLE} WHERE key = ?`, [key]);
+            return void 0;
+          }
+          case KV_RPC.list: {
+            const [options] = args;
+            const prefix = options?.prefix ?? "";
+            const limit = options?.limit ?? KV_LIST_DEFAULT_LIMIT;
+            const rows = prefix === "" ? await driver.all(`SELECT key, expires_at FROM ${KV_TABLE}`) : await driver.all(`SELECT key, expires_at FROM ${KV_TABLE} WHERE key LIKE ?`, [
+              `${prefix}%`
+            ]);
+            const now = nowSeconds();
+            const entries = [];
+            for (const row of rows) {
+              const expiresAt = row.expires_at;
+              if (expiresAt !== null && expiresAt !== void 0 && Number(expiresAt) <= now) continue;
+              entries.push({
+                name: String(row.key),
+                expiration: expiresAt === null || expiresAt === void 0 ? null : Number(expiresAt)
+              });
+              if (entries.length >= limit) break;
+            }
+            return entries;
+          }
+          default:
+            throw new Error(
+              `\u672A\u77E5\u7684 cloud.kv \u65B9\u6CD5 "${String(method)}"\uFF08${KV_CAPABILITY_CODES.invalidMethod}\uFF09`
+            );
+        }
+      } catch (error) {
+        throw errorWithCode2(error);
+      }
+    };
+    return {
+      capabilities: [{ name: "kv", value: { [RPC_CAPABILITY_KEY]: true } }],
+      rpcHandlers: { kv: handler }
+    };
+  }
+
   // src/sim/runtime.ts
   function mergeBundles(bundles) {
     const capabilities = [];
@@ -6789,7 +6983,8 @@ self.onmessage = async (event) => {
       projectId: options.projectId,
       ...options.realtime === void 0 ? {} : options.realtime
     });
-    const bundle = mergeBundles([db.bundle, storage.bundle, realtime.bundle]);
+    const kvBundle = createKvCapability(db.driver);
+    const bundle = mergeBundles([db.bundle, storage.bundle, kvBundle, realtime.bundle]);
     await db.engine.load();
     const runner = createOfflineFunctionRunner(options.runner ?? {});
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adep/web-container",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "private": false,
   "type": "module",
   "sideEffects": false,
@@ -11,8 +11,8 @@
     "dist"
   ],
   "dependencies": {
-    "@adep/runtime": "0.2.1",
-    "@adep/types": "0.2.1"
+    "@adep/runtime": "0.2.2",
+    "@adep/types": "0.2.2"
   },
   "scripts": {
     "test": "vitest run",