@expofp/utils 3.0.0-alpha.10 → 3.0.0-alpha.12

package/dist/index.d.ts

@@ -1,14 +1,14 @@
-export * from './lib/buildZipArchive.js';
+export * from './lib/build-zip-archive.js';
 export * from './lib/clone.js';
-export * from './lib/deepFreeze.js';
-export * from './lib/importFsPromises.js';
-export * from './lib/importJsonModule.js';
-export * from './lib/importNodeModule.js';
-export * from './lib/importRuntimeJsonModule.js';
-export * from './lib/loadScript.js';
-export * from './lib/makeLocalPath.js';
-export * from './lib/niceFetch.js';
-export * from './lib/readFileFromUrl.js';
-export * from './lib/sha256Base62Truncated.js';
-export * from './lib/slugifyFilesystemUnique.js';
+export * from './lib/deep-freeze.js';
+export * from './lib/fetch-with-retry.js';
+export * from './lib/import-fs-promises.js';
+export * from './lib/import-json.js';
+export * from './lib/import-node-module.js';
+export * from './lib/import-runtime-json.js';
+export * from './lib/load-script.js';
+export * from './lib/make-local-path.js';
+export * from './lib/read-file-from-url.js';
+export * from './lib/safe-slugify.js';
+export * from './lib/short-hash.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,13 +1,13 @@
-export * from './lib/buildZipArchive.js';
+export * from './lib/build-zip-archive.js';
 export * from './lib/clone.js';
-export * from './lib/deepFreeze.js';
-export * from './lib/importFsPromises.js';
-export * from './lib/importJsonModule.js';
-export * from './lib/importNodeModule.js';
-export * from './lib/importRuntimeJsonModule.js';
-export * from './lib/loadScript.js';
-export * from './lib/makeLocalPath.js';
-export * from './lib/niceFetch.js';
-export * from './lib/readFileFromUrl.js';
-export * from './lib/sha256Base62Truncated.js';
-export * from './lib/slugifyFilesystemUnique.js';
+export * from './lib/deep-freeze.js';
+export * from './lib/fetch-with-retry.js';
+export * from './lib/import-fs-promises.js';
+export * from './lib/import-json.js';
+export * from './lib/import-node-module.js';
+export * from './lib/import-runtime-json.js';
+export * from './lib/load-script.js';
+export * from './lib/make-local-path.js';
+export * from './lib/read-file-from-url.js';
+export * from './lib/safe-slugify.js';
+export * from './lib/short-hash.js';

package/dist/lib/{buildZipArchive.d.ts → build-zip-archive.d.ts}

@@ -2,4 +2,4 @@ export declare function buildZipArchive(files: AsyncIterable<{
     path: string;
     data: Uint8Array;
 }>): Promise<Blob>;
-//# sourceMappingURL=buildZipArchive.d.ts.map
+//# sourceMappingURL=build-zip-archive.d.ts.map

package/dist/lib/{deepFreeze.d.ts → deep-freeze.d.ts}

@@ -1,2 +1,2 @@
 export declare function deepFreeze<T>(obj: T): T;
-//# sourceMappingURL=deepFreeze.d.ts.map
+//# sourceMappingURL=deep-freeze.d.ts.map

package/dist/lib/{niceFetch.d.ts → fetch-with-retry.d.ts}

@@ -4,5 +4,5 @@
  * In Node.js environments, it uses the `fetch-retry` library to add retry capabilities.
  * Node.js are more prone to transient network errors, so retries can help improve reliability.
  */
-export declare const niceFetch: (...args: Parameters<typeof window.fetch>) => ReturnType<typeof window.fetch>;
-//# sourceMappingURL=niceFetch.d.ts.map
+export declare const fetchWithRetry: (...args: Parameters<typeof window.fetch>) => ReturnType<typeof window.fetch>;
+//# sourceMappingURL=fetch-with-retry.d.ts.map

package/dist/lib/{niceFetch.js → fetch-with-retry.js}

@@ -6,15 +6,15 @@ let fn;
  * In Node.js environments, it uses the `fetch-retry` library to add retry capabilities.
  * Node.js are more prone to transient network errors, so retries can help improve reliability.
  */
-export const niceFetch = async function fetch(...args) {
+export const fetchWithRetry = async function fetch(...args) {
     if (!fn) {
         if (typeof window !== 'undefined' && typeof document !== 'undefined') {
             fn = window.fetch.bind(window);
         }
         else {
             const fr = await import('fetch-retry');
-            const fetchWithRetry = fr.default(globalThis.fetch);
-            fn = fetchWithRetry;
+            const wrappedFetch = fr.default(globalThis.fetch);
+            fn = wrappedFetch;
         }
     }
     return fn(...args);

package/dist/lib/{importFsPromises.d.ts → import-fs-promises.d.ts}

@@ -1,2 +1,2 @@
 export declare function importFsPromises(): Promise<typeof import("node:fs/promises")>;
-//# sourceMappingURL=importFsPromises.d.ts.map
+//# sourceMappingURL=import-fs-promises.d.ts.map

package/dist/lib/{importFsPromises.js → import-fs-promises.js}

@@ -1,4 +1,4 @@
-import { importNodeModule } from './importNodeModule.js';
+import { importNodeModule } from './import-node-module.js';
 export async function importFsPromises() {
     return importNodeModule('node:fs/promises');
 }

package/dist/lib/{importJsonModule.d.ts → import-json.d.ts}

@@ -1,4 +1,4 @@
-export interface ImportJsonModuleOptions {
+export interface ImportJsonOptions {
     forceFetch?: boolean;
     fetchCache?: Map<string, Promise<unknown>>;
     /**
@@ -7,5 +7,5 @@ export interface ImportJsonModuleOptions {
     importCallback?: (url: string) => void;
     signal?: AbortSignal | null;
 }
-export declare function importJsonModule<T = unknown>(url: string, options?: ImportJsonModuleOptions): Promise<T>;
-//# sourceMappingURL=importJsonModule.d.ts.map
+export declare function importJson<T = unknown>(url: string, options?: ImportJsonOptions): Promise<T>;
+//# sourceMappingURL=import-json.d.ts.map

package/dist/lib/{importJsonModule.js → import-json.js}

@@ -1,15 +1,15 @@
 import debug from 'debug';
-import { deepFreeze } from './deepFreeze.js';
-import { importFsPromises } from './importFsPromises.js';
-import { niceFetch } from './niceFetch.js';
-const log = debug('efp:utils:importJsonModule');
+import { deepFreeze } from './deep-freeze.js';
+import { fetchWithRetry } from './fetch-with-retry.js';
+import { importFsPromises } from './import-fs-promises.js';
+const log = debug('efp:utils:importJson');
 let importJsonNotAvailable;
 const jsonFrozen = new WeakSet();
 // ET: this is a workaround for Vite that analyzes dynamic imports and removes 'with' option
 // to be removed when Vite supports it properly
 // Cons: can have CSP issues in some environments
 const importJsonNative = new Function('url', 'return import(url, { with: { type: "json" } });');
-export async function importJsonModule(url, options) {
+export async function importJson(url, options) {
     const opts = {
         forceFetch: options?.forceFetch || false,
         fetchCache: options?.fetchCache || new Map(),
@@ -59,7 +59,7 @@ async function loadJson(url, fetchCache, signal) {
     }
     const dataPromise = (async function loadJsonInner() {
         // in browser just use fetch, for node - fetch-retry
-        const response = await niceFetch(url, { signal });
+        const response = await fetchWithRetry(url, { signal });
         if (!response.ok) {
             throw new Error(`Failed to fetch JSON from ${url}`);
         }

package/dist/lib/{importNodeModule.d.ts → import-node-module.d.ts}

@@ -1,2 +1,2 @@
 export declare function importNodeModule<T>(moduleName: string): Promise<T>;
-//# sourceMappingURL=importNodeModule.d.ts.map
+//# sourceMappingURL=import-node-module.d.ts.map

package/dist/lib/import-runtime-json.d.ts

@@ -0,0 +1,2 @@
+export declare function importRuntimeJson<T = unknown>(fileName: string): Promise<T>;
+//# sourceMappingURL=import-runtime-json.d.ts.map

package/dist/lib/{importRuntimeJsonModule.js → import-runtime-json.js}

@@ -1,10 +1,10 @@
 import debug from 'debug';
-import { importJsonModule } from './importJsonModule.js';
-const log = debug('efp:utils:importRuntimeJsonModule');
-export async function importRuntimeJsonModule(fileName) {
+import { importJson } from './import-json.js';
+const log = debug('efp:utils:importRuntimeJson');
+export async function importRuntimeJson(fileName) {
     // ignore because vite may rewrite '.' to data:...
     const baseUrl = new URL(/* @vite-ignore */ '.', import.meta.url).href;
     const url = new URL(fileName, baseUrl);
     log('Loading runtime JSON from', url.href);
-    return await importJsonModule(url.href);
+    return await importJson(url.href);
 }

package/dist/lib/{loadScript.d.ts → load-script.d.ts}

@@ -1,3 +1,3 @@
 /** @deprecated we should never load/eval scripts */
 export declare function loadScript(scriptUrl: string, signal?: AbortSignal): Promise<void>;
-//# sourceMappingURL=loadScript.d.ts.map
+//# sourceMappingURL=load-script.d.ts.map

package/dist/lib/{loadScript.js → load-script.js}

@@ -1,6 +1,6 @@
 /// <reference lib="dom" />
 import debug from 'debug';
-import { niceFetch } from './niceFetch.js';
+import { fetchWithRetry } from './fetch-with-retry.js';
 const log = debug('efp:utils:loadScript');
 function isBrowser() {
     return typeof window !== 'undefined' && typeof document !== 'undefined';
@@ -59,7 +59,7 @@ async function loadInNode(scriptUrl, signal) {
     }
     let res;
     try {
-        res = await niceFetch(scriptUrl, { signal });
+        res = await fetchWithRetry(scriptUrl, { signal });
     }
     catch (err) {
         // Node / WHATWG fetch uses AbortError on abort

package/dist/lib/{makeLocalPath.d.ts → make-local-path.d.ts}

@@ -34,4 +34,4 @@
  * ```
  */
 export declare function makeLocalPath(url: URL, filenameSuffix?: string): Promise<string>;
-//# sourceMappingURL=makeLocalPath.d.ts.map
+//# sourceMappingURL=make-local-path.d.ts.map

package/dist/lib/{makeLocalPath.js → make-local-path.js}

@@ -1,6 +1,6 @@
 import debug from 'debug';
-import { sha256Base62Truncated } from './sha256Base62Truncated.js';
-import { slugifyFilesystemUnique } from './slugifyFilesystemUnique.js';
+import { safeSlugify } from './safe-slugify.js';
+import { shortHash } from './short-hash.js';
 const log = debug('efp:utils:makeLocalPath');
 /**
  * Makes a local file path from a URL, preserving extension and automatically adding hash for files.
@@ -52,17 +52,17 @@ export async function makeLocalPath(url, filenameSuffix) {
         throw new Error('filenameSuffix is not allowed for directory paths');
     }
     // Create hash if requested (using full URL)
-    const hash = addHash ? await sha256Base62Truncated(url.href) : null;
+    const hash = addHash ? await shortHash(url.href) : null;
     // Slugify protocol and domain (e.g., "http-demo-expofp-com")
-    const protocol = slugifyFilesystemUnique(url.protocol.replace(':', ''));
-    const domain = slugifyFilesystemUnique(url.hostname);
+    const protocol = safeSlugify(url.protocol.replace(':', ''));
+    const domain = safeSlugify(url.hostname);
     const port = url.port ? `-${url.port}` : '';
     const protocolDomain = `${protocol}-${domain}${port}`;
     // Parse the path
     const pathParts = url.pathname.split('/').filter(Boolean);
     if (isDirectory) {
         // For directories, all parts are directory parts
-        const slugifiedDirs = pathParts.map((part) => slugifyFilesystemUnique(part));
+        const slugifiedDirs = pathParts.map((part) => safeSlugify(part));
         // Build the full local path with trailing /
         const pathSegments = hash
             ? [protocolDomain, ...slugifiedDirs, hash]
@@ -73,13 +73,13 @@ export async function makeLocalPath(url, filenameSuffix) {
     const filename = pathParts.pop() || '';
     const directoryParts = pathParts;
     // Slugify directory parts
-    const slugifiedDirs = directoryParts.map((part) => slugifyFilesystemUnique(part));
+    const slugifiedDirs = directoryParts.map((part) => safeSlugify(part));
     // Extract extension and base filename
     const lastDotIndex = filename.lastIndexOf('.');
     const extension = lastDotIndex !== -1 ? filename.slice(lastDotIndex) : '';
     const baseFilename = lastDotIndex !== -1 ? filename.slice(0, lastDotIndex) : filename;
     // Slugify the base filename
-    let slugifiedFilename = slugifyFilesystemUnique(baseFilename);
+    let slugifiedFilename = safeSlugify(baseFilename);
     // Ensure filename is max 50 characters (not including extension)
     const maxFilenameLength = 50;
     if (slugifiedFilename.length > maxFilenameLength) {

package/dist/lib/{readFileFromUrl.d.ts → read-file-from-url.d.ts}

@@ -8,4 +8,4 @@ export declare function readFileFromUrl(url: URL, options?: {
     signal?: AbortSignal;
 }): Promise<ReadFileFromUrlResult>;
 export {};
-//# sourceMappingURL=readFileFromUrl.d.ts.map
+//# sourceMappingURL=read-file-from-url.d.ts.map

package/dist/lib/{readFileFromUrl.js → read-file-from-url.js}

@@ -1,5 +1,5 @@
-import { importFsPromises } from './importFsPromises.js';
-import { niceFetch } from './niceFetch.js';
+import { fetchWithRetry } from './fetch-with-retry.js';
+import { importFsPromises } from './import-fs-promises.js';
 export async function readFileFromUrl(url, options) {
     if (url.protocol === 'file:') {
         const { readFile } = await importFsPromises();
@@ -7,7 +7,7 @@ export async function readFileFromUrl(url, options) {
         return { ok: true, data };
     }
     else {
-        const response = await niceFetch(url, { signal: options?.signal });
+        const response = await fetchWithRetry(url, { signal: options?.signal });
         if (!response.ok) {
             return { ok: false };
         }

package/dist/lib/safe-slugify.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Generates a filesystem-safe slug from input string, ensuring uniqueness.
+ * @param input
+ * @returns
+ */
+export declare function safeSlugify(input: string): string;
+//# sourceMappingURL=safe-slugify.d.ts.map

package/dist/lib/{slugifyFilesystemUnique.js → safe-slugify.js}

@@ -53,7 +53,7 @@ function makeBaseSlug(input) {
  * @param input
  * @returns
  */
-export function slugifyFilesystemUnique(input) {
+export function safeSlugify(input) {
     // If we've seen this exact input before, return the same slug
     const existing = inputToSlug.get(input);
     if (existing)

package/dist/lib/short-hash.d.ts

@@ -0,0 +1,2 @@
+export declare function shortHash(input: string, bytes?: number): Promise<string>;
+//# sourceMappingURL=short-hash.d.ts.map

package/dist/lib/{sha256Base62Truncated.js → short-hash.js}

@@ -1,4 +1,4 @@
-export async function sha256Base62Truncated(input, bytes = 16) {
+export async function shortHash(input, bytes = 16) {
     const data = new TextEncoder().encode(input);
     const digest = await crypto.subtle.digest('SHA-256', data);
     const full = new Uint8Array(digest);

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@expofp/utils",
-  "version": "3.0.0-alpha.10",
+  "version": "3.0.0-alpha.12",
   "type": "module",
   "description": "ExpoFP SDK internal: shared utilities",
   "license": "MIT",
+  "sideEffects": false,
   "publishConfig": {
     "access": "public"
   },

package/dist/lib/importRuntimeJsonModule.d.ts

@@ -1,2 +0,0 @@
-export declare function importRuntimeJsonModule<T = unknown>(fileName: string): Promise<T>;
-//# sourceMappingURL=importRuntimeJsonModule.d.ts.map

package/dist/lib/sha256Base62Truncated.d.ts

@@ -1,2 +0,0 @@
-export declare function sha256Base62Truncated(input: string, bytes?: number): Promise<string>;
-//# sourceMappingURL=sha256Base62Truncated.d.ts.map

package/dist/lib/slugifyFilesystemUnique.d.ts

@@ -1,7 +0,0 @@
-/**
- * Generates a filesystem-safe slug from input string, ensuring uniqueness.
- * @param input
- * @returns
- */
-export declare function slugifyFilesystemUnique(input: string): string;
-//# sourceMappingURL=slugifyFilesystemUnique.d.ts.map