Skip to content

Commit

Permalink
simplify, now that expr is always defined
Browse files Browse the repository at this point in the history
  • Loading branch information
@dummdidumm
dummdidumm committed Aug 6, 2022
1 parent 7bdebaf commit 4bdfeda
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 90 deletions.
2 changes: 1 addition & 1 deletion packages/migrate/migrations/routes/migrate_page_js/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function migrate_page(content) {
const imports = new Set();

rewrite_returns(fn.body, (expr, node) => {
const nodes = expr && ts.isObjectLiteralExpression(expr) && get_object_nodes(expr);
const nodes = ts.isObjectLiteralExpression(expr) && get_object_nodes(expr);

if (nodes) {
const keys = Object.keys(nodes).sort().join(' ');
Expand Down
2 changes: 1 addition & 1 deletion packages/migrate/migrations/routes/migrate_page_server/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function migrate_page_server(content) {
if (GET?.body) {
// possible TODOs — handle errors and redirects
rewrite_returns(GET.body, (expr, node) => {
const nodes = expr && ts.isObjectLiteralExpression(expr) && get_object_nodes(expr);
const nodes = ts.isObjectLiteralExpression(expr) && get_object_nodes(expr);

if (!nodes || nodes.headers || (nodes.status && nodes.status.getText() !== '200')) {
manual_return_migration(node || GET, file.code, TASKS.PAGE_ENDPOINT);
Expand Down
174 changes: 86 additions & 88 deletions packages/migrate/migrations/routes/migrate_server/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,101 +33,99 @@ export function migrate_server(content) {
const fn = get_function_node(statement, /** @type{string} */ (file.exports.map.get(method)));
if (fn?.body) {
rewrite_returns(fn.body, (expr, node) => {
if (expr) {
// leave `() => new Response(...)` alone
if (is_new(expr, 'Response')) return;

const nodes = ts.isObjectLiteralExpression(expr) && get_object_nodes(expr);

if (nodes) {
const body_is_object_literal = nodes.body && ts.isObjectLiteralExpression(nodes.body);

let safe_headers = !nodes.headers;
if (nodes.headers) {
if (ts.isObjectLiteralExpression(nodes.headers)) {
// if `headers` is an object literal, and it either doesn't contain
// `set-cookie` or `set-cookie` is a string, then the headers
// are safe to use in a `Response`
const set_cookie_value = nodes.headers.properties.find((prop) => {
return (
ts.isPropertyAssignment(prop) &&
ts.isStringLiteral(prop.name) &&
/set-cookie/i.test(prop.name.text)
);
});

if (!set_cookie_value || is_string_like(set_cookie_value)) {
safe_headers = true;
}
} else {
// `headers: new Headers(...)` is also safe, as long as we
// don't need to augment it with `content-type`
safe_headers = is_new(nodes.headers, 'Headers') && !body_is_object_literal;
}
}
// leave `() => new Response(...)` alone
if (is_new(expr, 'Response')) return;

const nodes = ts.isObjectLiteralExpression(expr) && get_object_nodes(expr);

if (nodes) {
const body_is_object_literal = nodes.body && ts.isObjectLiteralExpression(nodes.body);

let safe_headers = !nodes.headers;
if (nodes.headers) {
if (ts.isObjectLiteralExpression(nodes.headers)) {
// if `headers` is an object literal, and it either doesn't contain
// `set-cookie` or `set-cookie` is a string, then the headers
// are safe to use in a `Response`
const set_cookie_value = nodes.headers.properties.find((prop) => {
return (
ts.isPropertyAssignment(prop) &&
ts.isStringLiteral(prop.name) &&
/set-cookie/i.test(prop.name.text)
);
});

const safe_body =
!nodes.body ||
is_string_like(nodes.body) ||
body_is_object_literal ||
(ts.isCallExpression(nodes.body) &&
nodes.body.expression.getText() === 'JSON.stringify');

if (safe_headers) {
let status = nodes.status ? nodes.status.getText() : '200';
let headers = nodes.headers?.getText();
let body = dedent(nodes.body?.getText() || 'undefined');

const multiline = /\n/.test(headers);

if (body_is_object_literal || (nodes.body && ts.isIdentifier(nodes.body))) {
// `return { body: {...} }` is safe to convert to a JSON response,
// but we probably need to add a `content-type` header
body = `JSON.stringify(${body})`;
const header = `'content-type': 'application/json; charset=utf-8'`;
if (
nodes.headers &&
ts.isObjectLiteralExpression(nodes.headers) &&
nodes.headers.properties.length > 0
) {
const join = multiline
? `,\n${indent_at_line(content, nodes.headers.properties[0].getStart())}`
: `, `;
headers = headers.replace(/[{\s]/, header + join);
} else {
headers = `{ ${header} }`;
}
if (!set_cookie_value || is_string_like(set_cookie_value)) {
safe_headers = true;
}
} else {
// `headers: new Headers(...)` is also safe, as long as we
// don't need to augment it with `content-type`
safe_headers = is_new(nodes.headers, 'Headers') && !body_is_object_literal;
}
}

const init = [
status !== '200' && `status: ${status}`,
headers && `headers: ${headers}`
].filter(Boolean);

const indent = indent_at_line(content, expr.getStart());
const end_whitespace = multiline ? `\n${indent}` : ' ';
const join_whitespace = multiline ? end_whitespace + guess_indent(content) : ' ';

const response =
init.length > 0
? `new Response(${body}, {${join_whitespace}${init.join(
`,${join_whitespace}`
)}${end_whitespace}})`
: `new Response(${body})`;

if (safe_body) {
automigration(expr, file.code, response);
const safe_body =
!nodes.body ||
is_string_like(nodes.body) ||
body_is_object_literal ||
(ts.isCallExpression(nodes.body) &&
nodes.body.expression.getText() === 'JSON.stringify');

if (safe_headers) {
let status = nodes.status ? nodes.status.getText() : '200';
let headers = nodes.headers?.getText();
let body = dedent(nodes.body?.getText() || 'undefined');

const multiline = /\n/.test(headers);

if (body_is_object_literal || (nodes.body && ts.isIdentifier(nodes.body))) {
// `return { body: {...} }` is safe to convert to a JSON response,
// but we probably need to add a `content-type` header
body = `JSON.stringify(${body})`;
const header = `'content-type': 'application/json; charset=utf-8'`;
if (
nodes.headers &&
ts.isObjectLiteralExpression(nodes.headers) &&
nodes.headers.properties.length > 0
) {
const join = multiline
? `,\n${indent_at_line(content, nodes.headers.properties[0].getStart())}`
: `, `;
headers = headers.replace(/[{\s]/, header + join);
} else {
manual_return_migration(
node || fn,
file.code,
TASKS.STANDALONE_ENDPOINT,
`return ${response};`
);
headers = `{ ${header} }`;
}
}

return;
const init = [
status !== '200' && `status: ${status}`,
headers && `headers: ${headers}`
].filter(Boolean);

const indent = indent_at_line(content, expr.getStart());
const end_whitespace = multiline ? `\n${indent}` : ' ';
const join_whitespace = multiline ? end_whitespace + guess_indent(content) : ' ';

const response =
init.length > 0
? `new Response(${body}, {${join_whitespace}${init.join(
`,${join_whitespace}`
)}${end_whitespace}})`
: `new Response(${body})`;

if (safe_body) {
automigration(expr, file.code, response);
} else {
manual_return_migration(
node || fn,
file.code,
TASKS.STANDALONE_ENDPOINT,
`return ${response};`
);
}

return;
}
}

Expand Down

0 comments on commit 4bdfeda

Please sign in to comment.