refactor: rename functions

unjs · Jun 7, 2023 · 84b3324 · 84b3324
1 parent 462b260
commit 84b3324
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/src/rollup/plugins/public-assets.ts b/src/rollup/plugins/public-assets.ts
@@ -104,20 +104,11 @@ ${
 
 export const publicAssetBases = ${JSON.stringify(publicAssetBases)}
 
-export function isPublicAssetURL(id = '') {
-  if (assets[id]) {
-    return true
-  }
-  for (const base in publicAssetBases) {
-    if (id.startsWith(base)) { return true }
-  }
-  return false
-}
 
 const keyStartsWith = (literalObj, needle) => Object.keys(literalObj).some((k) => k.startsWith(needle));
 const findKey = (literalObj, needle) => Object.keys(literalObj).find((k) => k.startsWith(needle));
 
-export const isInKv = (id = "") => {
+export const isPublicAssetURL = (id = "") => {
   if (
     assets[id] ||
     keyStartsWith(assets, id) ||
@@ -128,7 +119,7 @@ export const isInKv = (id = "") => {
   return false
 }
 
-export const getKVMatch = (id = "") => {
+export const getPublicAssetMatch = (id = "") => {
   const assetMatch = findKey(assets, id)
   if(assetMatch) return [assetMatch, assets[assetMatch]]
 

diff --git a/src/runtime/entries/cloudflare-module.ts b/src/runtime/entries/cloudflare-module.ts
@@ -12,9 +12,9 @@ import { requestHasBody } from "../utils";
 import { nitroApp } from "#internal/nitro/app";
 import { useRuntimeConfig } from "#internal/nitro";
 import {
-  getKVMatch,
+  getPublicAssetMatch,
   getPublicAssetMeta,
-  isInKv,
+  isPublicAssetURL,
 } from "#internal/nitro/virtual/public-assets";
 
 interface CFModuleEnv {
@@ -29,8 +29,8 @@ export default {
   ) {
     const url = new URL(request.url);
     try {
-      if (isInKv(url.pathname)) {
-        const [match] = getKVMatch(url.pathname);
+      if (isPublicAssetURL(url.pathname)) {
+        const [match] = getPublicAssetMatch(url.pathname);
         // https://github.com/cloudflare/kv-asset-handler#es-modules
         return await getAssetFromKV(
           {

diff --git a/src/runtime/entries/cloudflare-pages.ts b/src/runtime/entries/cloudflare-pages.ts
@@ -5,7 +5,10 @@ import type {
 } from "@cloudflare/workers-types";
 import { requestHasBody } from "#internal/nitro/utils";
 import { nitroApp } from "#internal/nitro/app";
-import { isInKv, getKVMatch } from "#internal/nitro/virtual/public-assets";
+import {
+  isPublicAssetURL,
+  getPublicAssetMatch,
+} from "#internal/nitro/virtual/public-assets";
 
 /**
  * Reference: https://developers.cloudflare.com/workers/runtime-apis/fetch-event/#parameters
@@ -27,9 +30,9 @@ export default {
     context: EventContext<CFPagesEnv, string, any>
   ) {
     const url = new URL(request.url);
-    if (isInKv(url.pathname)) {
+    if (isPublicAssetURL(url.pathname)) {
       try {
-        const [match] = getKVMatch(url.pathname);
+        const [match] = getPublicAssetMatch(url.pathname);
         return await env.ASSETS.fetch(
           new Request(new URL("http://localhost" + match))
         );

diff --git a/src/runtime/entries/cloudflare.ts b/src/runtime/entries/cloudflare.ts
@@ -9,7 +9,7 @@ import { nitroApp } from "#internal/nitro/app";
 import { useRuntimeConfig } from "#internal/nitro";
 import {
   getPublicAssetMeta,
-  isInKv,
+  isPublicAssetURL,
 } from "#internal/nitro/virtual/public-assets";
 
 addEventListener("fetch", (event: any) => {
@@ -19,7 +19,7 @@ addEventListener("fetch", (event: any) => {
 async function handleEvent(event: FetchEvent) {
   const url = new URL(event.request.url);
   try {
-    if (isInKv(url.pathname)) {
+    if (isPublicAssetURL(url.pathname)) {
       return await getAssetFromKV(event, {
         cacheControl: assetsCacheControl,
         mapRequestToAsset: baseURLModifier,

diff --git a/src/runtime/virtual/public-assets.d.ts b/src/runtime/virtual/public-assets.d.ts
@@ -3,5 +3,4 @@ export const isPublicAssetURL: (id: string) => boolean;
 export const getPublicAssetMeta: (id: string) => { maxAge?: number };
 export const readAsset: (id: string) => Promise<Buffer>;
 export const getAsset: (id: string) => any;
-export const isInKv: (id: string) => boolean;
-export const getKVMatch: (id: string) => [string, string] | null;
+export const getPublicAssetMatch: (id: string) => [string, string] | null;