mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-14 01:50:39 +09:00
Merge pull request #2328 from bittoby/fix/project-slug-collision
Fix: project slug collisions for non-English names (#2318)
This commit is contained in:
commit
6c2c63e0f1
4 changed files with 32 additions and 6 deletions
|
|
@ -559,7 +559,7 @@ export {
|
|||
|
||||
export { API_PREFIX, API } from "./api.js";
|
||||
export { normalizeAgentUrlKey, deriveAgentUrlKey, isUuidLike } from "./agent-url-key.js";
|
||||
export { deriveProjectUrlKey, normalizeProjectUrlKey } from "./project-url-key.js";
|
||||
export { deriveProjectUrlKey, normalizeProjectUrlKey, hasNonAsciiContent } from "./project-url-key.js";
|
||||
export {
|
||||
AGENT_MENTION_SCHEME,
|
||||
PROJECT_MENTION_SCHEME,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
const PROJECT_URL_KEY_DELIM_RE = /[^a-z0-9]+/g;
|
||||
const PROJECT_URL_KEY_TRIM_RE = /^-+|-+$/g;
|
||||
const NON_ASCII_RE = /[^\x00-\x7F]/;
|
||||
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
|
||||
|
||||
export function normalizeProjectUrlKey(value: string | null | undefined): string | null {
|
||||
if (typeof value !== "string") return null;
|
||||
|
|
@ -11,6 +13,24 @@ export function normalizeProjectUrlKey(value: string | null | undefined): string
|
|||
return normalized.length > 0 ? normalized : null;
|
||||
}
|
||||
|
||||
export function deriveProjectUrlKey(name: string | null | undefined, fallback?: string | null): string {
|
||||
return normalizeProjectUrlKey(name) ?? normalizeProjectUrlKey(fallback) ?? "project";
|
||||
/** Check whether a string contains non-ASCII characters that normalization would strip. */
|
||||
export function hasNonAsciiContent(value: string | null | undefined): boolean {
|
||||
if (typeof value !== "string") return false;
|
||||
return NON_ASCII_RE.test(value);
|
||||
}
|
||||
|
||||
/** Extract the first 8 hex chars from a valid UUID, or null. */
|
||||
function shortIdFromUuid(value: string | null | undefined): string | null {
|
||||
if (typeof value !== "string" || !UUID_RE.test(value.trim())) return null;
|
||||
return value.trim().replace(/-/g, "").slice(0, 8).toLowerCase();
|
||||
}
|
||||
|
||||
export function deriveProjectUrlKey(name: string | null | undefined, fallback?: string | null): string {
|
||||
const base = normalizeProjectUrlKey(name);
|
||||
if (base && !hasNonAsciiContent(name)) return base;
|
||||
// Non-ASCII content was stripped — append short UUID suffix for uniqueness.
|
||||
const shortId = shortIdFromUuid(fallback);
|
||||
if (base && shortId) return `${base}-${shortId}`;
|
||||
if (shortId) return shortId;
|
||||
return base ?? normalizeProjectUrlKey(fallback) ?? "project";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue