formacao
This commit is contained in:
+24
-23
@@ -62,8 +62,15 @@ var streamHandle = (app) => {
|
||||
var handle = (app, { isContentTypeBinary } = { isContentTypeBinary: void 0 }) => {
|
||||
return async (event, lambdaContext) => {
|
||||
const processor = getProcessor(event);
|
||||
const req = processor.createRequest(event);
|
||||
const requestContext = getRequestContext(event);
|
||||
let req, requestContext;
|
||||
try {
|
||||
req = processor.createRequest(event);
|
||||
requestContext = getRequestContext(event);
|
||||
} catch (error) {
|
||||
console.error("Error processing request:", error);
|
||||
const errorResponse = error instanceof TypeError ? new Response("Invalid request", { status: 400 }) : new Response("Internal Server Error", { status: 500 });
|
||||
return processor.createResult(event, errorResponse, { isContentTypeBinary });
|
||||
}
|
||||
const res = await app.fetch(req, {
|
||||
event,
|
||||
requestContext,
|
||||
@@ -102,7 +109,9 @@ var EventProcessor = class {
|
||||
method
|
||||
};
|
||||
if (event.body) {
|
||||
requestInit.body = event.isBase64Encoded ? decodeBase64(event.body) : event.body;
|
||||
const body = event.isBase64Encoded ? decodeBase64(event.body) : new TextEncoder().encode(event.body);
|
||||
requestInit.body = body;
|
||||
headers.set("content-length", body.length.toString());
|
||||
}
|
||||
return new Request(url, requestInit);
|
||||
}
|
||||
@@ -195,26 +204,22 @@ var EventV1Processor = class extends EventProcessor {
|
||||
return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value || "")}`).join("&");
|
||||
}
|
||||
}
|
||||
getCookies(event, headers) {
|
||||
getCookies(_event, _headers) {
|
||||
}
|
||||
getHeaders(event) {
|
||||
const headers = new Headers();
|
||||
this.getCookies(event, headers);
|
||||
if (event.headers) {
|
||||
for (const [k, v] of Object.entries(event.headers)) {
|
||||
if (v) {
|
||||
headers.set(k, sanitizeHeaderValue(v));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (event.multiValueHeaders) {
|
||||
for (const [k, values] of Object.entries(event.multiValueHeaders)) {
|
||||
if (values) {
|
||||
const foundK = headers.get(k);
|
||||
values.forEach((v) => {
|
||||
const sanitizedValue = sanitizeHeaderValue(v);
|
||||
return (!foundK || !foundK.includes(sanitizedValue)) && headers.append(k, sanitizedValue);
|
||||
});
|
||||
values.forEach((v) => headers.append(k, sanitizeHeaderValue(v)));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (event.headers) {
|
||||
for (const [k, v] of Object.entries(event.headers)) {
|
||||
if (v && !headers.has(k)) {
|
||||
headers.set(k, sanitizeHeaderValue(v));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -274,7 +279,7 @@ var ALBProcessor = class extends EventProcessor {
|
||||
if (result.multiValueHeaders) {
|
||||
result.multiValueHeaders["set-cookie"] = cookies;
|
||||
} else {
|
||||
result.headers["set-cookie"] = cookies.join(", ");
|
||||
result.headers["set-cookie"] = cookies[0];
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -294,11 +299,7 @@ var LatticeV2Processor = class extends EventProcessor {
|
||||
if (event.headers) {
|
||||
for (const [k, values] of Object.entries(event.headers)) {
|
||||
if (values) {
|
||||
const foundK = headers.get(k);
|
||||
values.forEach((v) => {
|
||||
const sanitizedValue = sanitizeHeaderValue(v);
|
||||
return (!foundK || !foundK.includes(sanitizedValue)) && headers.append(k, sanitizedValue);
|
||||
});
|
||||
values.forEach((v) => headers.append(k, sanitizeHeaderValue(v)));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -309,7 +310,7 @@ var LatticeV2Processor = class extends EventProcessor {
|
||||
setCookiesToResult(result, cookies) {
|
||||
result.headers = {
|
||||
...result.headers,
|
||||
"set-cookie": cookies.join(", ")
|
||||
"set-cookie": cookies
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
import { stat } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
|
||||
var serveStatic = (options) => {
|
||||
var serveStatic = (options = {}) => {
|
||||
return async function serveStatic2(c, next) {
|
||||
const getContent = async (path) => {
|
||||
const file = Bun.file(path);
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
// src/adapter/cloudflare-workers/serve-static.ts
|
||||
import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
|
||||
import { getContentFromKVAsset } from "./utils.js";
|
||||
var serveStatic = (options) => {
|
||||
var serveStatic = (options = {}) => {
|
||||
return async function serveStatic2(c, next) {
|
||||
const getContent = async (path) => {
|
||||
return getContentFromKVAsset(path, {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
import { join } from "node:path";
|
||||
import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
|
||||
var { open, lstatSync, errors } = Deno;
|
||||
var serveStatic = (options) => {
|
||||
var serveStatic = (options = {}) => {
|
||||
return async function serveStatic2(c, next) {
|
||||
const getContent = async (path) => {
|
||||
try {
|
||||
|
||||
+5
-1
@@ -4,7 +4,11 @@ var upgradeWebSocket = defineWebSocketHelper(async (c, events, options) => {
|
||||
if (c.req.header("upgrade") !== "websocket") {
|
||||
return;
|
||||
}
|
||||
const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options ?? {});
|
||||
const subprotocol = c.req.header("sec-websocket-protocol")?.split(",")[0]?.trim();
|
||||
const { response, socket } = Deno.upgradeWebSocket(c.req.raw, {
|
||||
...subprotocol ? { protocol: subprotocol } : {},
|
||||
...options
|
||||
});
|
||||
const wsContext = new WSContext({
|
||||
close: (code, reason) => socket.close(code, reason),
|
||||
get protocol() {
|
||||
|
||||
+10
-3
@@ -13,7 +13,8 @@ var convertHeaders = (headers) => {
|
||||
return cfHeaders;
|
||||
};
|
||||
var handle = (app) => {
|
||||
return async (event, context, callback) => {
|
||||
return async (event, ...args) => {
|
||||
const [context, callback] = args;
|
||||
const res = await app.fetch(createRequest(event), {
|
||||
event,
|
||||
context,
|
||||
@@ -44,11 +45,17 @@ var createRequest = (event) => {
|
||||
const url = queryString ? `${urlPath}?${queryString}` : urlPath;
|
||||
const headers = new Headers();
|
||||
Object.entries(event.Records[0].cf.request.headers).forEach(([k, v]) => {
|
||||
v.forEach((header) => headers.set(k, header.value));
|
||||
v.forEach((header) => headers.append(k, header.value));
|
||||
});
|
||||
const requestBody = event.Records[0].cf.request.body;
|
||||
const method = event.Records[0].cf.request.method;
|
||||
const body = createBody(method, requestBody);
|
||||
const rawBody = createBody(method, requestBody);
|
||||
let body = rawBody;
|
||||
if (rawBody !== void 0) {
|
||||
const bytes = typeof rawBody === "string" ? new TextEncoder().encode(rawBody) : rawBody;
|
||||
body = bytes;
|
||||
headers.set("content-length", bytes.length.toString());
|
||||
}
|
||||
return new Request(url, {
|
||||
headers,
|
||||
method,
|
||||
|
||||
+1
-3
@@ -1,8 +1,6 @@
|
||||
// src/adapter/service-worker/index.ts
|
||||
import { handle } from "./handler.js";
|
||||
var fire = (app, options = {
|
||||
fetch: void 0
|
||||
}) => {
|
||||
var fire = (app, options) => {
|
||||
addEventListener("fetch", handle(app, options));
|
||||
};
|
||||
export {
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+24
-24
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -93,8 +92,15 @@ const streamHandle = (app) => {
|
||||
const handle = (app, { isContentTypeBinary } = { isContentTypeBinary: void 0 }) => {
|
||||
return async (event, lambdaContext) => {
|
||||
const processor = getProcessor(event);
|
||||
const req = processor.createRequest(event);
|
||||
const requestContext = getRequestContext(event);
|
||||
let req, requestContext;
|
||||
try {
|
||||
req = processor.createRequest(event);
|
||||
requestContext = getRequestContext(event);
|
||||
} catch (error) {
|
||||
console.error("Error processing request:", error);
|
||||
const errorResponse = error instanceof TypeError ? new Response("Invalid request", { status: 400 }) : new Response("Internal Server Error", { status: 500 });
|
||||
return processor.createResult(event, errorResponse, { isContentTypeBinary });
|
||||
}
|
||||
const res = await app.fetch(req, {
|
||||
event,
|
||||
requestContext,
|
||||
@@ -133,7 +139,9 @@ class EventProcessor {
|
||||
method
|
||||
};
|
||||
if (event.body) {
|
||||
requestInit.body = event.isBase64Encoded ? (0, import_encode.decodeBase64)(event.body) : event.body;
|
||||
const body = event.isBase64Encoded ? (0, import_encode.decodeBase64)(event.body) : new TextEncoder().encode(event.body);
|
||||
requestInit.body = body;
|
||||
headers.set("content-length", body.length.toString());
|
||||
}
|
||||
return new Request(url, requestInit);
|
||||
}
|
||||
@@ -226,26 +234,22 @@ class EventV1Processor extends EventProcessor {
|
||||
return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value || "")}`).join("&");
|
||||
}
|
||||
}
|
||||
getCookies(event, headers) {
|
||||
getCookies(_event, _headers) {
|
||||
}
|
||||
getHeaders(event) {
|
||||
const headers = new Headers();
|
||||
this.getCookies(event, headers);
|
||||
if (event.headers) {
|
||||
for (const [k, v] of Object.entries(event.headers)) {
|
||||
if (v) {
|
||||
headers.set(k, sanitizeHeaderValue(v));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (event.multiValueHeaders) {
|
||||
for (const [k, values] of Object.entries(event.multiValueHeaders)) {
|
||||
if (values) {
|
||||
const foundK = headers.get(k);
|
||||
values.forEach((v) => {
|
||||
const sanitizedValue = sanitizeHeaderValue(v);
|
||||
return (!foundK || !foundK.includes(sanitizedValue)) && headers.append(k, sanitizedValue);
|
||||
});
|
||||
values.forEach((v) => headers.append(k, sanitizeHeaderValue(v)));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (event.headers) {
|
||||
for (const [k, v] of Object.entries(event.headers)) {
|
||||
if (v && !headers.has(k)) {
|
||||
headers.set(k, sanitizeHeaderValue(v));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -305,7 +309,7 @@ class ALBProcessor extends EventProcessor {
|
||||
if (result.multiValueHeaders) {
|
||||
result.multiValueHeaders["set-cookie"] = cookies;
|
||||
} else {
|
||||
result.headers["set-cookie"] = cookies.join(", ");
|
||||
result.headers["set-cookie"] = cookies[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -325,11 +329,7 @@ class LatticeV2Processor extends EventProcessor {
|
||||
if (event.headers) {
|
||||
for (const [k, values] of Object.entries(event.headers)) {
|
||||
if (values) {
|
||||
const foundK = headers.get(k);
|
||||
values.forEach((v) => {
|
||||
const sanitizedValue = sanitizeHeaderValue(v);
|
||||
return (!foundK || !foundK.includes(sanitizedValue)) && headers.append(k, sanitizedValue);
|
||||
});
|
||||
values.forEach((v) => headers.append(k, sanitizeHeaderValue(v)));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -340,7 +340,7 @@ class LatticeV2Processor extends EventProcessor {
|
||||
setCookiesToResult(result, cookies) {
|
||||
result.headers = {
|
||||
...result.headers,
|
||||
"set-cookie": cookies.join(", ")
|
||||
"set-cookie": cookies
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+1
-2
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -24,7 +23,7 @@ module.exports = __toCommonJS(serve_static_exports);
|
||||
var import_promises = require("node:fs/promises");
|
||||
var import_node_path = require("node:path");
|
||||
var import_serve_static = require("../../middleware/serve-static");
|
||||
const serveStatic = (options) => {
|
||||
const serveStatic = (options = {}) => {
|
||||
return async function serveStatic2(c, next) {
|
||||
const getContent = async (path) => {
|
||||
const file = Bun.file(path);
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+1
-2
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -23,7 +22,7 @@ __export(serve_static_exports, {
|
||||
module.exports = __toCommonJS(serve_static_exports);
|
||||
var import_serve_static = require("../../middleware/serve-static");
|
||||
var import_utils = require("./utils");
|
||||
const serveStatic = (options) => {
|
||||
const serveStatic = (options = {}) => {
|
||||
return async function serveStatic2(c, next) {
|
||||
const getContent = async (path) => {
|
||||
return (0, import_utils.getContentFromKVAsset)(path, {
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1 +0,0 @@
|
||||
"use strict";
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+1
-2
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -24,7 +23,7 @@ module.exports = __toCommonJS(serve_static_exports);
|
||||
var import_node_path = require("node:path");
|
||||
var import_serve_static = require("../../middleware/serve-static");
|
||||
const { open, lstatSync, errors } = Deno;
|
||||
const serveStatic = (options) => {
|
||||
const serveStatic = (options = {}) => {
|
||||
return async function serveStatic2(c, next) {
|
||||
const getContent = async (path) => {
|
||||
try {
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+5
-2
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -26,7 +25,11 @@ const upgradeWebSocket = (0, import_websocket.defineWebSocketHelper)(async (c, e
|
||||
if (c.req.header("upgrade") !== "websocket") {
|
||||
return;
|
||||
}
|
||||
const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options ?? {});
|
||||
const subprotocol = c.req.header("sec-websocket-protocol")?.split(",")[0]?.trim();
|
||||
const { response, socket } = Deno.upgradeWebSocket(c.req.raw, {
|
||||
...subprotocol ? { protocol: subprotocol } : {},
|
||||
...options
|
||||
});
|
||||
const wsContext = new import_websocket.WSContext({
|
||||
close: (code, reason) => socket.close(code, reason),
|
||||
get protocol() {
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+10
-4
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __create = Object.create;
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
@@ -47,7 +46,8 @@ const convertHeaders = (headers) => {
|
||||
return cfHeaders;
|
||||
};
|
||||
const handle = (app) => {
|
||||
return async (event, context, callback) => {
|
||||
return async (event, ...args) => {
|
||||
const [context, callback] = args;
|
||||
const res = await app.fetch(createRequest(event), {
|
||||
event,
|
||||
context,
|
||||
@@ -78,11 +78,17 @@ const createRequest = (event) => {
|
||||
const url = queryString ? `${urlPath}?${queryString}` : urlPath;
|
||||
const headers = new Headers();
|
||||
Object.entries(event.Records[0].cf.request.headers).forEach(([k, v]) => {
|
||||
v.forEach((header) => headers.set(k, header.value));
|
||||
v.forEach((header) => headers.append(k, header.value));
|
||||
});
|
||||
const requestBody = event.Records[0].cf.request.body;
|
||||
const method = event.Records[0].cf.request.method;
|
||||
const body = createBody(method, requestBody);
|
||||
const rawBody = createBody(method, requestBody);
|
||||
let body = rawBody;
|
||||
if (rawBody !== void 0) {
|
||||
const bytes = typeof rawBody === "string" ? new TextEncoder().encode(rawBody) : rawBody;
|
||||
body = bytes;
|
||||
headers.set("content-length", bytes.length.toString());
|
||||
}
|
||||
return new Request(url, {
|
||||
headers,
|
||||
method,
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+1
-4
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -23,9 +22,7 @@ __export(service_worker_exports, {
|
||||
});
|
||||
module.exports = __toCommonJS(service_worker_exports);
|
||||
var import_handler = require("./handler");
|
||||
const fire = (app, options = {
|
||||
fetch: void 0
|
||||
}) => {
|
||||
const fire = (app, options) => {
|
||||
addEventListener("fetch", (0, import_handler.handle)(app, options));
|
||||
};
|
||||
// Annotate the CommonJS export names for ESM import in node:
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+59
-9
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -58,6 +57,24 @@ const toHash = (str) => {
|
||||
}
|
||||
return "css-" + out;
|
||||
};
|
||||
const normalizeLabel = (label) => {
|
||||
return label.trim().replace(/\s+/g, "-");
|
||||
};
|
||||
const isValidClassName = (name) => /^-?[_a-zA-Z][_a-zA-Z0-9-]*$/.test(name);
|
||||
const hasUnsafeSelectorChar = (name) => /[<{}]/.test(name);
|
||||
const RESERVED_KEYFRAME_NAMES = /* @__PURE__ */ new Set([
|
||||
"default",
|
||||
"inherit",
|
||||
"initial",
|
||||
"none",
|
||||
"revert",
|
||||
"revert-layer",
|
||||
"unset"
|
||||
]);
|
||||
const isValidKeyframeName = (name) => isValidClassName(name) && !RESERVED_KEYFRAME_NAMES.has(name.toLowerCase());
|
||||
const defaultOnInvalidSlug = (slug) => {
|
||||
console.warn(`Invalid slug: ${slug}`);
|
||||
};
|
||||
const cssStringReStr = [
|
||||
'"(?:(?:\\\\[\\s\\S]|[^"\\\\])*)"',
|
||||
// double quoted string
|
||||
@@ -144,13 +161,26 @@ const buildStyleString = (strings, values) => {
|
||||
}
|
||||
return [label, minify(styleString), selectors, externalClassNames];
|
||||
};
|
||||
const cssCommon = (strings, values) => {
|
||||
const cssCommon = (strings, values, classNameSlug, onInvalidSlug) => {
|
||||
let [label, thisStyleString, selectors, externalClassNames] = buildStyleString(strings, values);
|
||||
const isPseudoGlobal = isPseudoGlobalSelectorRe.exec(thisStyleString);
|
||||
if (isPseudoGlobal) {
|
||||
thisStyleString = isPseudoGlobal[1];
|
||||
}
|
||||
const selector = (isPseudoGlobal ? PSEUDO_GLOBAL_SELECTOR : "") + toHash(label + thisStyleString);
|
||||
const hash = toHash(label + thisStyleString);
|
||||
let customSlug;
|
||||
if (classNameSlug) {
|
||||
const slug = classNameSlug(hash, normalizeLabel(label), thisStyleString);
|
||||
if (slug) {
|
||||
if (isValidClassName(slug)) {
|
||||
customSlug = slug;
|
||||
} else {
|
||||
;
|
||||
(onInvalidSlug || defaultOnInvalidSlug)(slug);
|
||||
}
|
||||
}
|
||||
}
|
||||
const selector = (isPseudoGlobal ? PSEUDO_GLOBAL_SELECTOR : "") + (customSlug || hash);
|
||||
const className = (isPseudoGlobal ? selectors.map((s) => s[CLASS_NAME]) : [selector, ...externalClassNames]).join(" ");
|
||||
return {
|
||||
[SELECTOR]: selector,
|
||||
@@ -169,30 +199,50 @@ const cxCommon = (args) => {
|
||||
[CLASS_NAME]: "",
|
||||
[STYLE_STRING]: "",
|
||||
[SELECTORS]: [],
|
||||
[EXTERNAL_CLASS_NAMES]: [arg]
|
||||
// drop names that are unsafe to emit as a selector
|
||||
[EXTERNAL_CLASS_NAMES]: hasUnsafeSelectorChar(arg) ? [] : [arg]
|
||||
};
|
||||
}
|
||||
}
|
||||
return args;
|
||||
};
|
||||
const keyframesCommon = (strings, ...values) => {
|
||||
const keyframesCommon = (strings, values, classNameSlug, onInvalidSlug) => {
|
||||
const [label, styleString] = buildStyleString(strings, values);
|
||||
const hash = toHash(label + styleString);
|
||||
let customSlug;
|
||||
if (classNameSlug) {
|
||||
const slug = classNameSlug(hash, normalizeLabel(label), styleString);
|
||||
if (slug) {
|
||||
if (isValidKeyframeName(slug)) {
|
||||
customSlug = slug;
|
||||
} else {
|
||||
;
|
||||
(onInvalidSlug || defaultOnInvalidSlug)(slug);
|
||||
}
|
||||
}
|
||||
}
|
||||
return {
|
||||
[SELECTOR]: "",
|
||||
[CLASS_NAME]: `@keyframes ${toHash(label + styleString)}`,
|
||||
[CLASS_NAME]: `@keyframes ${customSlug || hash}`,
|
||||
[STYLE_STRING]: styleString,
|
||||
[SELECTORS]: [],
|
||||
[EXTERNAL_CLASS_NAMES]: []
|
||||
};
|
||||
};
|
||||
let viewTransitionNameIndex = 0;
|
||||
const viewTransitionCommon = ((strings, values) => {
|
||||
const viewTransitionCommon = ((strings, values, classNameSlug, onInvalidSlug) => {
|
||||
if (!strings) {
|
||||
strings = [`/* h-v-t ${viewTransitionNameIndex++} */`];
|
||||
}
|
||||
const content = Array.isArray(strings) ? cssCommon(strings, values) : strings;
|
||||
const content = Array.isArray(strings) ? cssCommon(strings, values, classNameSlug, onInvalidSlug) : strings;
|
||||
const transitionName = content[CLASS_NAME];
|
||||
const res = cssCommon(["view-transition-name:", ""], [transitionName]);
|
||||
const res = cssCommon(
|
||||
["view-transition-name:", ""],
|
||||
// eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
[transitionName],
|
||||
classNameSlug,
|
||||
onInvalidSlug
|
||||
);
|
||||
content[CLASS_NAME] = PSEUDO_GLOBAL_SELECTOR + content[CLASS_NAME];
|
||||
content[STYLE_STRING] = content[STYLE_STRING].replace(
|
||||
/(?<=::view-transition(?:[a-z-]*)\()(?=\))/g,
|
||||
|
||||
+20
-6
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -30,9 +29,14 @@ module.exports = __toCommonJS(css_exports);
|
||||
var import_html = require("../../helper/html");
|
||||
var import_constants = require("../../jsx/constants");
|
||||
var import_css = require("../../jsx/dom/css");
|
||||
var import_html2 = require("../../utils/html");
|
||||
var import_common = require("./common");
|
||||
var import_common2 = require("./common");
|
||||
const createCssContext = ({ id }) => {
|
||||
const createCssContext = ({
|
||||
id,
|
||||
classNameSlug,
|
||||
onInvalidSlug
|
||||
}) => {
|
||||
const [cssJsxDomObject, StyleRenderToDom] = (0, import_css.createCssJsxDomObjects)({ id });
|
||||
const contextMap = /* @__PURE__ */ new WeakMap();
|
||||
const nonceMap = /* @__PURE__ */ new WeakMap();
|
||||
@@ -85,7 +89,14 @@ const createCssContext = ({ id }) => {
|
||||
}
|
||||
return Promise.resolve((0, import_html.raw)("", [appendStyle]));
|
||||
};
|
||||
const className = new String(cssClassName[import_common.CLASS_NAME]);
|
||||
const rawClassName = cssClassName[import_common.CLASS_NAME];
|
||||
let escapedClassName = rawClassName;
|
||||
if (/[&<>'"]/.test(rawClassName)) {
|
||||
const escapedBuffer = [""];
|
||||
(0, import_html2.escapeToBuffer)(rawClassName, escapedBuffer);
|
||||
escapedClassName = escapedBuffer[0];
|
||||
}
|
||||
const className = new String(escapedClassName);
|
||||
Object.assign(className, cssClassName);
|
||||
className.isEscaped = true;
|
||||
className.callbacks = [addClassNameToContext];
|
||||
@@ -95,15 +106,18 @@ const createCssContext = ({ id }) => {
|
||||
return promise;
|
||||
};
|
||||
const css2 = (strings, ...values) => {
|
||||
return newCssClassNameObject((0, import_common.cssCommon)(strings, values));
|
||||
return newCssClassNameObject((0, import_common.cssCommon)(strings, values, classNameSlug, onInvalidSlug));
|
||||
};
|
||||
const cx2 = (...args) => {
|
||||
args = (0, import_common.cxCommon)(args);
|
||||
return css2(Array(args.length).fill(""), ...args);
|
||||
};
|
||||
const keyframes2 = import_common.keyframesCommon;
|
||||
const keyframes2 = (strings, ...values) => (0, import_common.keyframesCommon)(strings, values, classNameSlug, onInvalidSlug);
|
||||
const viewTransition2 = ((strings, ...values) => {
|
||||
return newCssClassNameObject((0, import_common.viewTransitionCommon)(strings, values));
|
||||
return newCssClassNameObject(
|
||||
(0, import_common.viewTransitionCommon)(strings, values, classNameSlug, onInvalidSlug)
|
||||
// eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
);
|
||||
});
|
||||
const Style2 = ({ children, nonce } = {}) => (0, import_html.raw)(
|
||||
`<style id="${id}"${nonce ? ` nonce="${nonce}"` : ""}>${children ? children[import_common.STYLE_STRING] : ""}</style>`,
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+13
-10
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -39,16 +38,18 @@ const DEFAULT_CONTENT_TYPE = "text/plain";
|
||||
const DEFAULT_OUTPUT_DIR = "./static";
|
||||
const generateFilePath = (routePath, outDir, mimeType, extensionMap) => {
|
||||
const extension = determineExtension(mimeType, extensionMap);
|
||||
let filePath;
|
||||
if (routePath.endsWith(`.${extension}`)) {
|
||||
return (0, import_utils2.joinPaths)(outDir, routePath);
|
||||
filePath = (0, import_utils2.joinPaths)(outDir, routePath);
|
||||
} else if (routePath === "/") {
|
||||
filePath = (0, import_utils2.joinPaths)(outDir, `index.${extension}`);
|
||||
} else if (routePath.endsWith("/")) {
|
||||
filePath = (0, import_utils2.joinPaths)(outDir, routePath, `index.${extension}`);
|
||||
} else {
|
||||
filePath = (0, import_utils2.joinPaths)(outDir, `${routePath}.${extension}`);
|
||||
}
|
||||
if (routePath === "/") {
|
||||
return (0, import_utils2.joinPaths)(outDir, `index.${extension}`);
|
||||
}
|
||||
if (routePath.endsWith("/")) {
|
||||
return (0, import_utils2.joinPaths)(outDir, routePath, `index.${extension}`);
|
||||
}
|
||||
return (0, import_utils2.joinPaths)(outDir, `${routePath}.${extension}`);
|
||||
(0, import_utils2.ensureWithinOutDir)(outDir, filePath);
|
||||
return filePath;
|
||||
};
|
||||
const parseResponseContent = async (response) => {
|
||||
const contentType = response.headers.get("Content-Type");
|
||||
@@ -68,6 +69,8 @@ const defaultExtensionMap = {
|
||||
"text/html": "html",
|
||||
"text/xml": "xml",
|
||||
"application/xml": "xml",
|
||||
"application/atom+xml": "xml",
|
||||
"application/rss+xml": "xml",
|
||||
"application/yaml": "yaml"
|
||||
};
|
||||
const determineExtension = (mimeType, userExtensionMap) => {
|
||||
@@ -139,7 +142,7 @@ const fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook,
|
||||
}
|
||||
forGetInfoURLRequest = maybeRequest;
|
||||
}
|
||||
await pool.run(() => app.fetch(forGetInfoURLRequest));
|
||||
await pool.run(() => app.fetch(forGetInfoURLRequest, { [import_middleware.SSG_CONTEXT]: true }));
|
||||
if (!forGetInfoURLRequest.ssgParams) {
|
||||
if ((0, import_utils2.isDynamicRoute)(route.path)) {
|
||||
resolveGetInfo(void 0);
|
||||
|
||||
+9
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -19,6 +18,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
||||
var utils_exports = {};
|
||||
__export(utils_exports, {
|
||||
dirname: () => dirname,
|
||||
ensureWithinOutDir: () => ensureWithinOutDir,
|
||||
filterStaticGenerateRoutes: () => filterStaticGenerateRoutes,
|
||||
isDynamicRoute: () => isDynamicRoute,
|
||||
joinPaths: () => joinPaths
|
||||
@@ -76,9 +76,17 @@ const filterStaticGenerateRoutes = (hono) => {
|
||||
const isDynamicRoute = (path) => {
|
||||
return path.split("/").some((segment) => segment.startsWith(":") || segment.includes("*"));
|
||||
};
|
||||
const ensureWithinOutDir = (outDir, filePath) => {
|
||||
const normalizedOutDir = joinPaths("/", outDir);
|
||||
const normalizedFilePath = joinPaths("/", filePath);
|
||||
if (normalizedFilePath !== normalizedOutDir && !normalizedFilePath.startsWith(`${normalizedOutDir}/`)) {
|
||||
throw new Error(`Path traversal detected: "${filePath}" is outside the output directory`);
|
||||
}
|
||||
};
|
||||
// Annotate the CommonJS export names for ESM import in node:
|
||||
0 && (module.exports = {
|
||||
dirname,
|
||||
ensureWithinOutDir,
|
||||
filterStaticGenerateRoutes,
|
||||
isDynamicRoute,
|
||||
joinPaths
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+9
-5
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -140,7 +139,7 @@ class Hono {
|
||||
handler = async (c, next) => (await (0, import_compose.compose)([], app.errorHandler)(c, () => r.handler(c, next))).res;
|
||||
handler[import_constants.COMPOSED_HANDLER] = r.handler;
|
||||
}
|
||||
subApp.#addRoute(r.method, r.path, handler);
|
||||
subApp.#addRoute(r.method, r.path, handler, r.basePath);
|
||||
});
|
||||
return this;
|
||||
}
|
||||
@@ -264,7 +263,7 @@ class Hono {
|
||||
const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
|
||||
return (request) => {
|
||||
const url = new URL(request.url);
|
||||
url.pathname = url.pathname.slice(pathPrefixLength) || "/";
|
||||
url.pathname = this.getPath(request).slice(pathPrefixLength) || "/";
|
||||
return new Request(url, request);
|
||||
};
|
||||
})();
|
||||
@@ -278,10 +277,15 @@ class Hono {
|
||||
this.#addRoute(import_router.METHOD_NAME_ALL, (0, import_url.mergePath)(path, "*"), handler);
|
||||
return this;
|
||||
}
|
||||
#addRoute(method, path, handler) {
|
||||
#addRoute(method, path, handler, baseRoutePath) {
|
||||
method = method.toUpperCase();
|
||||
path = (0, import_url.mergePath)(this._basePath, path);
|
||||
const r = { basePath: this._basePath, path, method, handler };
|
||||
const r = {
|
||||
basePath: baseRoutePath !== void 0 ? (0, import_url.mergePath)(this._basePath, baseRoutePath) : this._basePath,
|
||||
path,
|
||||
method,
|
||||
handler
|
||||
};
|
||||
this.router.add(method, path, [handler, r]);
|
||||
this.routes.push(r);
|
||||
}
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+3
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -18,11 +17,14 @@ var __copyProps = (to, from, except, desc) => {
|
||||
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
||||
var index_exports = {};
|
||||
__export(index_exports, {
|
||||
Context: () => import_context.Context,
|
||||
Hono: () => import_hono.Hono
|
||||
});
|
||||
module.exports = __toCommonJS(index_exports);
|
||||
var import_hono = require("./hono");
|
||||
var import_context = require("./context");
|
||||
// Annotate the CommonJS export names for ESM import in node:
|
||||
0 && (module.exports = {
|
||||
Context,
|
||||
Hono
|
||||
});
|
||||
|
||||
+15
-16
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __create = Object.create;
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
@@ -126,8 +125,11 @@ class JSXNode {
|
||||
key;
|
||||
children;
|
||||
isEscaped = true;
|
||||
localContexts;
|
||||
suspendedContext;
|
||||
constructor(tag, props, children) {
|
||||
if (typeof tag !== "function" && !(0, import_utils.isValidTagName)(tag)) {
|
||||
throw new Error(`Invalid JSX tag name: ${tag}`);
|
||||
}
|
||||
this.tag = tag;
|
||||
this.props = props;
|
||||
this.children = children;
|
||||
@@ -141,27 +143,24 @@ class JSXNode {
|
||||
return this.props.ref || null;
|
||||
}
|
||||
toString() {
|
||||
const buffer = [""];
|
||||
this.localContexts?.forEach(([context, value]) => {
|
||||
context.values.push(value);
|
||||
});
|
||||
try {
|
||||
const render = () => {
|
||||
const buffer = [""];
|
||||
this.toStringToBuffer(buffer);
|
||||
} finally {
|
||||
this.localContexts?.forEach(([context]) => {
|
||||
context.values.pop();
|
||||
});
|
||||
}
|
||||
return buffer.length === 1 ? "callbacks" in buffer ? (0, import_html2.resolveCallbackSync)((0, import_html.raw)(buffer[0], buffer.callbacks)).toString() : buffer[0] : (0, import_html2.stringBufferToString)(buffer, buffer.callbacks);
|
||||
return buffer.length === 1 ? "callbacks" in buffer ? (0, import_html2.resolveCallbackSync)((0, import_html.raw)(buffer[0], buffer.callbacks)).toString() : buffer[0] : (0, import_html2.stringBufferToString)(buffer, buffer.callbacks);
|
||||
};
|
||||
return this.suspendedContext ? this.suspendedContext(render) : (0, import_context.runWithRenderContext)(render);
|
||||
}
|
||||
toStringToBuffer(buffer) {
|
||||
const tag = this.tag;
|
||||
const props = this.props;
|
||||
let { children } = this;
|
||||
buffer[0] += `<${tag}`;
|
||||
const normalizeKey = nameSpaceContext && (0, import_context.useContext)(nameSpaceContext) === "svg" ? (key) => toSVGAttributeName((0, import_utils.normalizeIntrinsicElementKey)(key)) : (key) => (0, import_utils.normalizeIntrinsicElementKey)(key);
|
||||
const normalizeKey = tag === "svg" || nameSpaceContext && (0, import_context.useContext)(nameSpaceContext) === "svg" ? (key) => toSVGAttributeName((0, import_utils.normalizeIntrinsicElementKey)(key)) : (key) => (0, import_utils.normalizeIntrinsicElementKey)(key);
|
||||
for (let [key, v] of Object.entries(props)) {
|
||||
key = normalizeKey(key);
|
||||
if (!(0, import_utils.isValidAttributeName)(key)) {
|
||||
continue;
|
||||
}
|
||||
if (key === "children") {
|
||||
} else if (key === "style" && typeof v === "object") {
|
||||
let styleStr = "";
|
||||
@@ -225,12 +224,12 @@ class JSXFunctionNode extends JSXNode {
|
||||
if (import_context.globalContexts.length === 0) {
|
||||
buffer.unshift("", res);
|
||||
} else {
|
||||
const currentContexts = import_context.globalContexts.map((c) => [c, c.values.at(-1)]);
|
||||
const suspendedContext = (0, import_context.captureRenderContext)();
|
||||
buffer.unshift(
|
||||
"",
|
||||
res.then((childRes) => {
|
||||
if (childRes instanceof JSXNode) {
|
||||
childRes.localContexts = currentContexts;
|
||||
childRes.suspendedContext = suspendedContext;
|
||||
}
|
||||
return childRes;
|
||||
})
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+41
-22
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -35,8 +34,9 @@ const childrenToString = async (children) => {
|
||||
return children.flat().map((c) => c == null || typeof c === "boolean" ? "" : c.toString());
|
||||
} catch (e) {
|
||||
if (e instanceof Promise) {
|
||||
const resume = (0, import_context.captureRenderContext)();
|
||||
await e;
|
||||
return childrenToString(children);
|
||||
return resume(() => childrenToString(children));
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
@@ -64,51 +64,68 @@ const ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) =>
|
||||
children = [children];
|
||||
}
|
||||
const nonce = (0, import_context.useContext)(import_streaming.StreamingContext)?.scriptNonce;
|
||||
let fallbackStr;
|
||||
const resolveFallbackStr = async () => {
|
||||
let resume;
|
||||
const getResume = () => resume ||= (0, import_context.captureRenderContext)();
|
||||
let fallbackStrPromise;
|
||||
const resolveFallbackStr = () => fallbackStrPromise ||= (async () => {
|
||||
const awaitedFallback = await fallback;
|
||||
if (typeof awaitedFallback === "string") {
|
||||
fallbackStr = awaitedFallback;
|
||||
return awaitedFallback;
|
||||
} else {
|
||||
fallbackStr = await awaitedFallback?.toString();
|
||||
if (typeof fallbackStr === "string") {
|
||||
fallbackStr = (0, import_html.raw)(fallbackStr);
|
||||
const fallbackResult = await getResume()(() => awaitedFallback?.toString());
|
||||
if (typeof fallbackResult === "string") {
|
||||
return (0, import_html.raw)(
|
||||
fallbackResult,
|
||||
fallbackResult.callbacks || awaitedFallback?.callbacks
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
const fallbackRes = (error) => {
|
||||
onError?.(error);
|
||||
return fallbackStr || fallbackRender && (0, import_base.jsx)(import_base.Fragment, {}, fallbackRender(error)) || "";
|
||||
})();
|
||||
const renderFallback = async (error) => {
|
||||
const fallbackStr = await resolveFallbackStr();
|
||||
return getResume()(async () => {
|
||||
onError?.(error);
|
||||
const fallbackRes = fallbackStr !== void 0 ? fallbackStr : fallbackRender && (0, import_base.jsx)(import_base.Fragment, {}, fallbackRender(error)) || "";
|
||||
const fallbackResString = await (0, import_base.Fragment)({
|
||||
children: fallbackRes
|
||||
}).toString();
|
||||
return (0, import_html.raw)(
|
||||
fallbackResString,
|
||||
fallbackResString.callbacks || fallbackRes.callbacks
|
||||
);
|
||||
});
|
||||
};
|
||||
let resArray = [];
|
||||
try {
|
||||
resArray = children.map(resolveChildEarly);
|
||||
} catch (e) {
|
||||
await resolveFallbackStr();
|
||||
const resume2 = getResume();
|
||||
if (e instanceof Promise) {
|
||||
resArray = [
|
||||
e.then(() => childrenToString(children)).catch((e2) => fallbackRes(e2))
|
||||
e.then(() => resume2(() => childrenToString(children))).catch((e2) => renderFallback(e2))
|
||||
];
|
||||
} else {
|
||||
resArray = [fallbackRes(e)];
|
||||
resArray = [await renderFallback(e)];
|
||||
}
|
||||
}
|
||||
if (resArray.some((res) => res instanceof Promise)) {
|
||||
await resolveFallbackStr();
|
||||
getResume();
|
||||
const index = errorBoundaryCounter++;
|
||||
const replaceRe = RegExp(`(<template id="E:${index}"></template>.*?)(.*?)(<!--E:${index}-->)`);
|
||||
const caught = false;
|
||||
let caught = false;
|
||||
const catchCallback = async ({ error: error2, buffer }) => {
|
||||
if (caught) {
|
||||
return "";
|
||||
}
|
||||
const fallbackResString = await (0, import_base.Fragment)({
|
||||
children: fallbackRes(error2)
|
||||
}).toString();
|
||||
caught = true;
|
||||
const fallbackResString = await renderFallback(error2);
|
||||
const fallbackCallbacks = fallbackResString.callbacks;
|
||||
if (buffer) {
|
||||
buffer[0] = buffer[0].replace(replaceRe, fallbackResString);
|
||||
return fallbackCallbacks?.length ? (0, import_html.raw)("", fallbackCallbacks) : "";
|
||||
}
|
||||
return buffer ? "" : `<template data-hono-target="E:${index}">${fallbackResString}</template><script>
|
||||
return (0, import_html.raw)(
|
||||
`<template data-hono-target="E:${index}">${fallbackResString}</template><script>
|
||||
((d,c,n) => {
|
||||
c=d.currentScript.previousSibling
|
||||
d=d.getElementById('E:${index}')
|
||||
@@ -116,7 +133,9 @@ if(!d)return
|
||||
do{n=d.nextSibling;n.remove()}while(n.nodeType!=8||n.nodeValue!='E:${index}')
|
||||
d.replaceWith(c.content)
|
||||
})(document)
|
||||
</script>`;
|
||||
</script>`,
|
||||
fallbackCallbacks
|
||||
);
|
||||
};
|
||||
let error;
|
||||
const promiseAll = Promise.all(resArray).catch((e) => error = e);
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+131
-6
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -18,8 +17,10 @@ var __copyProps = (to, from, except, desc) => {
|
||||
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
||||
var context_exports = {};
|
||||
__export(context_exports, {
|
||||
captureRenderContext: () => captureRenderContext,
|
||||
createContext: () => createContext,
|
||||
globalContexts: () => globalContexts,
|
||||
runWithRenderContext: () => runWithRenderContext,
|
||||
useContext: () => useContext
|
||||
});
|
||||
module.exports = __toCommonJS(context_exports);
|
||||
@@ -28,21 +29,143 @@ var import_base = require("./base");
|
||||
var import_constants = require("./constants");
|
||||
var import_context = require("./dom/context");
|
||||
const globalContexts = [];
|
||||
let alsProbed = false;
|
||||
let asyncLocalStorage;
|
||||
let fallbackStore;
|
||||
let fallbackRendersInFlight = 0;
|
||||
let warnedFallbackDefault = false;
|
||||
const loadAsyncLocalStorage = () => {
|
||||
if (alsProbed) {
|
||||
return asyncLocalStorage;
|
||||
}
|
||||
alsProbed = true;
|
||||
const global = globalThis;
|
||||
let AsyncLocalStorage;
|
||||
for (const probe of [
|
||||
// Node.js >= 20.16, Deno, Bun, Cloudflare Workers (nodejs_compat). Property
|
||||
// access only, so bundlers don't statically resolve `node:async_hooks`.
|
||||
() => global.process?.getBuiltinModule?.("node:async_hooks")?.AsyncLocalStorage,
|
||||
// Node.js < 20.16 has no `process.getBuiltinModule`, but a CJS entrypoint
|
||||
// exposes the main module's `require` here.
|
||||
() => global.process?.mainModule?.require?.("node:async_hooks")?.AsyncLocalStorage
|
||||
]) {
|
||||
try {
|
||||
AsyncLocalStorage = probe();
|
||||
} catch {
|
||||
}
|
||||
if (AsyncLocalStorage) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (AsyncLocalStorage) {
|
||||
asyncLocalStorage = new AsyncLocalStorage();
|
||||
}
|
||||
return asyncLocalStorage;
|
||||
};
|
||||
const getCurrentStore = () => {
|
||||
return loadAsyncLocalStorage()?.getStore() || fallbackStore;
|
||||
};
|
||||
const warnIfStorelessAccess = () => {
|
||||
if (fallbackRendersInFlight > 0 && !warnedFallbackDefault) {
|
||||
warnedFallbackDefault = true;
|
||||
console.warn(
|
||||
"hono/jsx: AsyncLocalStorage is unavailable in this runtime, so useContext() after an await in an async component falls back to the context default value during server-side rendering. To get provided values across await boundaries, use a runtime with AsyncLocalStorage (Node.js >= 20.16, Deno, Bun, or Cloudflare Workers with the nodejs_compat flag)."
|
||||
);
|
||||
}
|
||||
};
|
||||
const getContextValuesIn = (store, context) => {
|
||||
if (!store) {
|
||||
warnIfStorelessAccess();
|
||||
return context.values;
|
||||
}
|
||||
let values = store.get(context);
|
||||
if (!values) {
|
||||
values = [context.values[0]];
|
||||
store.set(context, values);
|
||||
}
|
||||
return values;
|
||||
};
|
||||
const readContextValueIn = (store, context) => {
|
||||
if (!store) {
|
||||
warnIfStorelessAccess();
|
||||
return context.values.at(-1);
|
||||
}
|
||||
const values = store.get(context);
|
||||
return values?.length ? values.at(-1) : context.values[0];
|
||||
};
|
||||
const captureContextValues = (store) => (store ? globalContexts.filter((c) => store.has(c)) : globalContexts).map((c) => [
|
||||
c,
|
||||
readContextValueIn(store, c)
|
||||
]);
|
||||
const resumeWithContextValues = (callback, store, contexts) => runWithRenderContext(() => {
|
||||
const currentStore = getCurrentStore();
|
||||
const valuesPerContext = contexts.map(([context, value]) => {
|
||||
const values = getContextValuesIn(currentStore, context);
|
||||
values.push(value);
|
||||
return values;
|
||||
});
|
||||
const popContextValues = () => {
|
||||
valuesPerContext.forEach((values) => {
|
||||
values.pop();
|
||||
});
|
||||
};
|
||||
try {
|
||||
const result = callback();
|
||||
if (result instanceof Promise) {
|
||||
return result.finally(popContextValues);
|
||||
}
|
||||
popContextValues();
|
||||
return result;
|
||||
} catch (e) {
|
||||
popContextValues();
|
||||
throw e;
|
||||
}
|
||||
}, store);
|
||||
const runWithRenderContext = (callback, resumeStore) => {
|
||||
if (getCurrentStore()) {
|
||||
return callback();
|
||||
}
|
||||
const store = resumeStore ?? /* @__PURE__ */ new WeakMap();
|
||||
const storage = loadAsyncLocalStorage();
|
||||
if (storage) {
|
||||
return storage.run(store, callback);
|
||||
}
|
||||
fallbackStore = store;
|
||||
let result;
|
||||
try {
|
||||
result = callback();
|
||||
} finally {
|
||||
fallbackStore = void 0;
|
||||
}
|
||||
if (!warnedFallbackDefault && result instanceof Promise) {
|
||||
fallbackRendersInFlight++;
|
||||
result = result.finally(() => {
|
||||
fallbackRendersInFlight--;
|
||||
});
|
||||
}
|
||||
return result;
|
||||
};
|
||||
const captureRenderContext = () => {
|
||||
const store = getCurrentStore();
|
||||
const contexts = captureContextValues(store);
|
||||
return (callback) => resumeWithContextValues(callback, store, contexts);
|
||||
};
|
||||
const createContext = (defaultValue) => {
|
||||
const values = [defaultValue];
|
||||
const context = ((props) => {
|
||||
values.push(props.value);
|
||||
const contextValues = getContextValuesIn(getCurrentStore(), context);
|
||||
contextValues.push(props.value);
|
||||
let string;
|
||||
try {
|
||||
string = props.children ? (Array.isArray(props.children) ? new import_base.JSXFragmentNode("", {}, props.children) : props.children).toString() : "";
|
||||
} catch (e) {
|
||||
values.pop();
|
||||
contextValues.pop();
|
||||
throw e;
|
||||
}
|
||||
if (string instanceof Promise) {
|
||||
return string.finally(() => values.pop()).then((resString) => (0, import_html.raw)(resString, resString.callbacks));
|
||||
return string.finally(() => contextValues.pop()).then((resString) => (0, import_html.raw)(resString, resString.callbacks));
|
||||
} else {
|
||||
values.pop();
|
||||
contextValues.pop();
|
||||
return (0, import_html.raw)(string);
|
||||
}
|
||||
});
|
||||
@@ -53,11 +176,13 @@ const createContext = (defaultValue) => {
|
||||
return context;
|
||||
};
|
||||
const useContext = (context) => {
|
||||
return context.values.at(-1);
|
||||
return readContextValueIn(getCurrentStore(), context);
|
||||
};
|
||||
// Annotate the CommonJS export names for ESM import in node:
|
||||
0 && (module.exports = {
|
||||
captureRenderContext,
|
||||
createContext,
|
||||
globalContexts,
|
||||
runWithRenderContext,
|
||||
useContext
|
||||
});
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+11
-5
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -118,22 +117,29 @@ const createCssJsxDomObjects = ({ id }) => {
|
||||
});
|
||||
return [cssObject, Style2];
|
||||
};
|
||||
const createCssContext = ({ id }) => {
|
||||
const createCssContext = ({
|
||||
id,
|
||||
classNameSlug,
|
||||
onInvalidSlug
|
||||
}) => {
|
||||
const [cssObject, Style2] = createCssJsxDomObjects({ id });
|
||||
const newCssClassNameObject = (cssClassName) => {
|
||||
cssClassName.toString = cssObject.toString;
|
||||
return cssClassName;
|
||||
};
|
||||
const css2 = (strings, ...values) => {
|
||||
return newCssClassNameObject((0, import_common.cssCommon)(strings, values));
|
||||
return newCssClassNameObject((0, import_common.cssCommon)(strings, values, classNameSlug, onInvalidSlug));
|
||||
};
|
||||
const cx2 = (...args) => {
|
||||
args = (0, import_common.cxCommon)(args);
|
||||
return css2(Array(args.length).fill(""), ...args);
|
||||
};
|
||||
const keyframes2 = import_common.keyframesCommon;
|
||||
const keyframes2 = (strings, ...values) => (0, import_common.keyframesCommon)(strings, values, classNameSlug, onInvalidSlug);
|
||||
const viewTransition2 = ((strings, ...values) => {
|
||||
return newCssClassNameObject((0, import_common.viewTransitionCommon)(strings, values));
|
||||
return newCssClassNameObject(
|
||||
(0, import_common.viewTransitionCommon)(strings, values, classNameSlug, onInvalidSlug)
|
||||
// eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
);
|
||||
});
|
||||
return {
|
||||
css: css2,
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+40
-10
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -80,11 +79,16 @@ const documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportB
|
||||
let element = null;
|
||||
let created = false;
|
||||
const deDupeKeys = import_common.deDupeKeyMap[tag];
|
||||
const deDupeByKey = (0, import_common.shouldDeDupeByKey)(tag, supportSort);
|
||||
const isDeDupeCandidateLink = (e) => e.getAttribute("rel") === "stylesheet" && e.getAttribute(import_common.dataPrecedenceAttr) !== null;
|
||||
let existingElements = void 0;
|
||||
if (deDupeKeys.length > 0) {
|
||||
if (deDupeByKey) {
|
||||
const tags = head.querySelectorAll(tag);
|
||||
LOOP: for (const e of tags) {
|
||||
for (const key of import_common.deDupeKeyMap[tag]) {
|
||||
if (tag === "link" && !isDeDupeCandidateLink(e)) {
|
||||
continue;
|
||||
}
|
||||
for (const key of deDupeKeys) {
|
||||
if (e.getAttribute(key) === props[key]) {
|
||||
element = e;
|
||||
break LOOP;
|
||||
@@ -103,9 +107,9 @@ const documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportB
|
||||
if (props[key] !== void 0) {
|
||||
e.setAttribute(key, props[key]);
|
||||
}
|
||||
if (props.rel) {
|
||||
e.setAttribute("rel", props.rel);
|
||||
}
|
||||
}
|
||||
if (props.rel) {
|
||||
e.setAttribute("rel", props.rel);
|
||||
}
|
||||
return e;
|
||||
})();
|
||||
@@ -119,7 +123,26 @@ const documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportB
|
||||
}
|
||||
const insert = (0, import_hooks.useCallback)(
|
||||
(e) => {
|
||||
if (deDupeKeys.length > 0) {
|
||||
if (deDupeByKey) {
|
||||
if (tag === "link" && precedence !== void 0) {
|
||||
let found2 = false;
|
||||
for (const existingElement of head.querySelectorAll(tag)) {
|
||||
const existingPrecedence = existingElement.getAttribute(import_common.dataPrecedenceAttr);
|
||||
if (existingPrecedence === null) {
|
||||
head.insertBefore(e, existingElement);
|
||||
return;
|
||||
}
|
||||
if (found2 && existingPrecedence !== precedence) {
|
||||
head.insertBefore(e, existingElement);
|
||||
return;
|
||||
}
|
||||
if (existingPrecedence === precedence) {
|
||||
found2 = true;
|
||||
}
|
||||
}
|
||||
head.appendChild(e);
|
||||
return;
|
||||
}
|
||||
let found = false;
|
||||
for (const existingElement of head.querySelectorAll(tag)) {
|
||||
if (found && existingElement.getAttribute(import_common.dataPrecedenceAttr) !== precedence) {
|
||||
@@ -131,6 +154,10 @@ const documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportB
|
||||
}
|
||||
}
|
||||
head.appendChild(e);
|
||||
} else if (tag === "link") {
|
||||
if (!head.contains(e)) {
|
||||
head.appendChild(e);
|
||||
}
|
||||
} else if (existingElements) {
|
||||
let found = false;
|
||||
for (const existingElement of existingElements) {
|
||||
@@ -148,7 +175,7 @@ const documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportB
|
||||
existingElements = void 0;
|
||||
}
|
||||
},
|
||||
[precedence]
|
||||
[deDupeByKey, precedence, tag]
|
||||
);
|
||||
const ref = composeRef(props.ref, (e) => {
|
||||
const key = deDupeKeys[0];
|
||||
@@ -161,6 +188,9 @@ const documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportB
|
||||
if (!onError && !onLoad) {
|
||||
return;
|
||||
}
|
||||
if (!key) {
|
||||
return;
|
||||
}
|
||||
let promise = blockingPromiseMap[e.getAttribute(key)] ||= new Promise(
|
||||
(resolve, reject) => {
|
||||
e.addEventListener("load", resolve);
|
||||
@@ -178,7 +208,7 @@ const documentMetadataTag = (tag, props, preserveNodeType, supportSort, supportB
|
||||
});
|
||||
if (supportBlocking && blocking === "render") {
|
||||
const key = import_common.deDupeKeyMap[tag][0];
|
||||
if (props[key]) {
|
||||
if (key && props[key]) {
|
||||
const value = props[key];
|
||||
const promise = blockingPromiseMap[value] ||= new Promise((resolve, reject) => {
|
||||
insert(element);
|
||||
@@ -254,7 +284,7 @@ const link = (props) => {
|
||||
ref: props.ref
|
||||
};
|
||||
}
|
||||
return documentMetadataTag("link", props, 1, "precedence" in props, true);
|
||||
return documentMetadataTag("link", props, 1, (0, import_common.isStylesheetLinkWithPrecedence)(props), true);
|
||||
};
|
||||
const meta = (props) => {
|
||||
return documentMetadataTag("meta", props, void 0, false, false);
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __create = Object.create;
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
+39
-18
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
@@ -69,6 +68,17 @@ const getEventSpec = (key) => {
|
||||
};
|
||||
const toAttributeName = (element, key) => nameSpaceContext && element instanceof SVGElement && /[A-Z]/.test(key) && (key in element.style || // Presentation attributes are findable in style object. "clip-path", "font-size", "stroke-width", etc.
|
||||
key.match(/^(?:o|pai|str|u|ve)/)) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
|
||||
const normalizeFormValue = (value) => value === null || value === void 0 || value === false ? null : value;
|
||||
const applySelectValue = (select, props) => {
|
||||
if (!("value" in props)) {
|
||||
return;
|
||||
}
|
||||
select.value = normalizeFormValue(props["value"]);
|
||||
if (!select.multiple && select.selectedIndex === -1) {
|
||||
select.selectedIndex = 0;
|
||||
}
|
||||
};
|
||||
const isIgnorableAttributeError = (error) => error instanceof DOMException && error.name === "InvalidCharacterError";
|
||||
const applyProps = (container, attributes, oldAttributes) => {
|
||||
attributes ||= {};
|
||||
for (let key in attributes) {
|
||||
@@ -112,18 +122,14 @@ const applyProps = (container, attributes, oldAttributes) => {
|
||||
} else {
|
||||
if (key === "value") {
|
||||
const nodeName = container.nodeName;
|
||||
if (nodeName === "INPUT" || nodeName === "TEXTAREA" || nodeName === "SELECT") {
|
||||
if (nodeName === "SELECT") {
|
||||
continue;
|
||||
} else if (nodeName === "INPUT" || nodeName === "TEXTAREA") {
|
||||
;
|
||||
container.value = value === null || value === void 0 || value === false ? null : value;
|
||||
container.value = normalizeFormValue(value);
|
||||
if (nodeName === "TEXTAREA") {
|
||||
container.textContent = value;
|
||||
continue;
|
||||
} else if (nodeName === "SELECT") {
|
||||
if (container.selectedIndex === -1) {
|
||||
;
|
||||
container.selectedIndex = 0;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
} else if (key === "checked" && container.nodeName === "INPUT" || key === "selected" && container.nodeName === "OPTION") {
|
||||
@@ -131,14 +137,20 @@ const applyProps = (container, attributes, oldAttributes) => {
|
||||
container[key] = value;
|
||||
}
|
||||
const k = toAttributeName(container, key);
|
||||
if (value === null || value === void 0 || value === false) {
|
||||
container.removeAttribute(k);
|
||||
} else if (value === true) {
|
||||
container.setAttribute(k, "");
|
||||
} else if (typeof value === "string" || typeof value === "number") {
|
||||
container.setAttribute(k, value);
|
||||
} else {
|
||||
container.setAttribute(k, value.toString());
|
||||
try {
|
||||
if (value === null || value === void 0 || value === false) {
|
||||
container.removeAttribute(k);
|
||||
} else if (value === true) {
|
||||
container.setAttribute(k, "");
|
||||
} else if (typeof value === "string" || typeof value === "number") {
|
||||
container.setAttribute(k, value);
|
||||
} else {
|
||||
container.setAttribute(k, value.toString());
|
||||
}
|
||||
} catch (e) {
|
||||
if (!isIgnorableAttributeError(e)) {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -154,7 +166,13 @@ const applyProps = (container, attributes, oldAttributes) => {
|
||||
} else if (key === "ref") {
|
||||
refCleanupMap.get(container)?.();
|
||||
} else {
|
||||
container.removeAttribute(toAttributeName(container, key));
|
||||
try {
|
||||
container.removeAttribute(toAttributeName(container, key));
|
||||
} catch (e) {
|
||||
if (!isIgnorableAttributeError(e)) {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -292,6 +310,9 @@ const applyNodeObject = (node, container, isNew) => {
|
||||
el = child.e ||= child.n ? document.createElementNS(child.n, child.tag) : document.createElement(child.tag);
|
||||
applyProps(el, child.props, child.pP);
|
||||
applyNodeObject(child, el, isNewLocal);
|
||||
if (child.tag === "select") {
|
||||
applySelectValue(el, child.props);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (child.tag === HONO_PORTAL_ELEMENT) {
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __create = Object.create;
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
"use strict";
|
||||
var __defProp = Object.defineProperty;
|
||||
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
||||
var __getOwnPropNames = Object.getOwnPropertyNames;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user