@wzyjs/utils 0.3.22 → 0.3.24

package/dist/common/base/number.d.ts

@@ -1,5 +1,5 @@
 export declare const getRandomNum: (min: number, max: number) => number;
 export declare const limitDecimals: (v: string, num: number, isForce: boolean) => string;
-export declare const getFileSize: (size: number) => string;
+export declare const formatFileSize: (bytes?: number) => string;
 export declare const isValidNumber: (value: any) => boolean;
 export declare const numberWithCommas: (x?: number | string) => string;

package/dist/common/index.d.ts

@@ -2,4 +2,5 @@ export * as ai from './ai';
 export * from './base';
 export * from './enum';
 export * from './image';
+export * from './other';
 export { default as dayjs, type Dayjs, Timezone, initChinaDayjs, chinaDayjs } from './dayjs';

package/dist/common/other/index.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 拼接 Cloudflare R2 文件的公开访问 URL
+ * @param objectKey - 文件在 R2 中的 Key
+ * @returns 文件的完整访问 URL
+ */
+export declare function getPublicUrl(objectKey: string): string;

package/dist/node/oss/cloudflare.d.ts

@@ -11,12 +11,6 @@ interface UploadFile {
 export declare function uploadFile(params: UploadFile): Promise<{
     objectKey: string;
 }>;
-/**
- * 拼接 Cloudflare R2 文件的公开访问 URL
- * @param objectKey - 文件在 R2 中的 Key
- * @returns 文件的完整访问 URL
- */
-export declare function getPublicUrl(objectKey: string): string;
 /**
  * 从 Cloudflare R2 删除文件
  * @param objectKey - 文件在 S3 中的 Key

package/dist/node.cjs.js

@@ -31554,10 +31554,10 @@ __export(exports_node, {
   getRandomString: () => getRandomString,
   getRandomNum: () => getRandomNum,
   getRandomColor: () => getRandomColor,
+  getPublicUrl: () => getPublicUrl,
   getProxyUrl: () => getProxyUrl,
   getParsedType: () => getParsedType,
   getLength: () => getLength,
-  getFileSize: () => getFileSize,
   getErrorMap: () => getErrorMap,
   getCookie: () => getCookie,
   getChineseByStr: () => getChineseByStr,
@@ -31565,6 +31565,7 @@ __export(exports_node, {
   generateUniqueFileName: () => generateUniqueFileName,
   generateAlphabetArray: () => generateAlphabetArray,
   function: () => functionType,
+  formatFileSize: () => formatFileSize,
   findItem: () => findItem,
   filterParams: () => filterParams,
   file: () => exports_file,
@@ -38728,14 +38729,14 @@ var limitDecimals = (v, num = 2, isForce) => {
   }
   return value.toFixed(num).toString();
 };
-var getFileSize = (size) => {
-  let d = "G";
-  let s = size / 1024 / 1024 / 1024;
-  if (s < 1) {
-    d = "M";
-    s *= 1024;
-  }
-  return `${(s.toFixed(1) / 1).toString()}${d}`;
+var formatFileSize = (bytes) => {
+  if (!bytes || bytes === 0) {
+    return "0 B";
+  }
+  const base = 1024;
+  const sizes = ["B", "KB", "MB", "GB"];
+  const index = Math.floor(Math.log(bytes) / Math.log(base));
+  return `${(bytes / Math.pow(base, index)).toFixed(1).replace(/\.0$/, "")} ${sizes[index]}`;
 };
 var isValidNumber = (value) => {
   if (typeof value !== "number") {
@@ -38887,6 +38888,19 @@ async function imageToBase64(url2) {
     throw error;
   }
 }
+// src/common/other/index.ts
+function getPublicUrl(objectKey) {
+  if (!objectKey) {
+    return "";
+  }
+  const publicUrl = process.env.CLOUDFLARE_PUBLIC_URL || process.env.NEXT_PUBLIC_CLOUDFLARE_PUBLIC_URL;
+  if (!publicUrl) {
+    throw new Error("CLOUDFLARE_PUBLIC_URL environment variable is not set");
+  }
+  const baseUrl = publicUrl.endsWith("/") ? publicUrl.slice(0, -1) : publicUrl;
+  const key2 = objectKey.startsWith("/") ? objectKey : `/${objectKey}`;
+  return `${baseUrl}${key2}`;
+}
 // src/common/dayjs/index.ts
 var import_dayjs = __toESM(require("dayjs"));
 var import_isBetween = __toESM(require("dayjs/plugin/isBetween"));
@@ -38978,7 +38992,6 @@ var uploadFileToOss = async (params) => {
 var exports_cloudflare = {};
 __export(exports_cloudflare, {
   uploadFile: () => uploadFile,
-  getPublicUrl: () => getPublicUrl,
   deleteFile: () => deleteFile
 });
 var import_client_s3 = require("@aws-sdk/client-s3");
@@ -39033,18 +39046,6 @@ async function uploadFile(params) {
     throw new Error(`上传到 Cloudflare 失败: ${error}`);
   }
 }
-function getPublicUrl(objectKey) {
-  if (!objectKey) {
-    return "";
-  }
-  const publicUrl = process.env.CLOUDFLARE_PUBLIC_URL;
-  if (!publicUrl) {
-    throw new Error("CLOUDFLARE_PUBLIC_URL environment variable is not set");
-  }
-  const baseUrl = publicUrl.endsWith("/") ? publicUrl.slice(0, -1) : publicUrl;
-  const key2 = objectKey.startsWith("/") ? objectKey : `/${objectKey}`;
-  return `${baseUrl}${key2}`;
-}
 async function deleteFile(objectKey) {
   const client = getS3Client();
   try {

package/dist/node.esm.js

@@ -37825,14 +37825,14 @@ var limitDecimals = (v, num = 2, isForce) => {
   }
   return value.toFixed(num).toString();
 };
-var getFileSize = (size) => {
-  let d = "G";
-  let s = size / 1024 / 1024 / 1024;
-  if (s < 1) {
-    d = "M";
-    s *= 1024;
-  }
-  return `${(s.toFixed(1) / 1).toString()}${d}`;
+var formatFileSize = (bytes) => {
+  if (!bytes || bytes === 0) {
+    return "0 B";
+  }
+  const base = 1024;
+  const sizes = ["B", "KB", "MB", "GB"];
+  const index = Math.floor(Math.log(bytes) / Math.log(base));
+  return `${(bytes / Math.pow(base, index)).toFixed(1).replace(/\.0$/, "")} ${sizes[index]}`;
 };
 var isValidNumber = (value) => {
   if (typeof value !== "number") {
@@ -37984,6 +37984,19 @@ async function imageToBase64(url2) {
     throw error;
   }
 }
+// src/common/other/index.ts
+function getPublicUrl(objectKey) {
+  if (!objectKey) {
+    return "";
+  }
+  const publicUrl = process.env.CLOUDFLARE_PUBLIC_URL || process.env.NEXT_PUBLIC_CLOUDFLARE_PUBLIC_URL;
+  if (!publicUrl) {
+    throw new Error("CLOUDFLARE_PUBLIC_URL environment variable is not set");
+  }
+  const baseUrl = publicUrl.endsWith("/") ? publicUrl.slice(0, -1) : publicUrl;
+  const key2 = objectKey.startsWith("/") ? objectKey : `/${objectKey}`;
+  return `${baseUrl}${key2}`;
+}
 // src/common/dayjs/index.ts
 import dayjs from "dayjs";
 import isBetween from "dayjs/plugin/isBetween";
@@ -38075,7 +38088,6 @@ var uploadFileToOss = async (params) => {
 var exports_cloudflare = {};
 __export(exports_cloudflare, {
   uploadFile: () => uploadFile,
-  getPublicUrl: () => getPublicUrl,
   deleteFile: () => deleteFile
 });
 import { S3Client, PutObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";
@@ -38803,18 +38815,6 @@ async function uploadFile(params) {
     throw new Error(`上传到 Cloudflare 失败: ${error}`);
   }
 }
-function getPublicUrl(objectKey) {
-  if (!objectKey) {
-    return "";
-  }
-  const publicUrl = process.env.CLOUDFLARE_PUBLIC_URL;
-  if (!publicUrl) {
-    throw new Error("CLOUDFLARE_PUBLIC_URL environment variable is not set");
-  }
-  const baseUrl = publicUrl.endsWith("/") ? publicUrl.slice(0, -1) : publicUrl;
-  const key2 = objectKey.startsWith("/") ? objectKey : `/${objectKey}`;
-  return `${baseUrl}${key2}`;
-}
 async function deleteFile(objectKey) {
   const client = getS3Client();
   try {
@@ -39133,10 +39133,10 @@ export {
   getRandomString,
   getRandomNum,
   getRandomColor,
+  getPublicUrl,
   getProxyUrl,
   getParsedType,
   getLength,
-  getFileSize,
   getErrorMap,
   getCookie,
   getChineseByStr,
@@ -39144,6 +39144,7 @@ export {
   generateUniqueFileName,
   generateAlphabetArray,
   functionType as function,
+  formatFileSize,
   findItem,
   filterParams,
   exports_file as file,