@phosart/common 0.4.35 → 0.4.36

package/dist/util/index.d.ts

@@ -7,7 +7,7 @@ export { formatDate } from './date.ts';
 export { markdown } from './markdown.ts';
 export { smoothScroll } from './smoothscroll.ts';
 export { setLibraryConfig, type LibraryConfig } from './phosart_config.svelte.ts';
-export { asRecord, multiRecordBy, deduplicateBy } from './util.ts';
+export { asRecord, multiRecordBy, deduplicateBy, sveltekitAbsolutePath, sveltekitAnchoredPath } from './util.ts';
 export { asTree, pathView } from './tree.ts';
 export type { FolderElement, GalleryElement, GalleryTree, TreeElement } from './tree.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAClF,YAAY,EACX,QAAQ,EACR,MAAM,EACN,SAAS,EACT,YAAY,EACZ,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,OAAO,EACP,MAAM,EACN,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,aAAa,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC7C,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAClF,YAAY,EACX,QAAQ,EACR,MAAM,EACN,SAAS,EACT,YAAY,EACZ,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,OAAO,EACP,MAAM,EACN,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,aAAa,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EACN,QAAQ,EACR,aAAa,EACb,aAAa,EACb,qBAAqB,EACrB,qBAAqB,EACrB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC7C,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC"}

package/dist/util/index.js

@@ -6,5 +6,5 @@ export { formatDate } from "./date.js";
 export { markdown } from "./markdown.js";
 export { smoothScroll } from "./smoothscroll.js";
 export { setLibraryConfig } from "./phosart_config.svelte.js";
-export { asRecord, multiRecordBy, deduplicateBy } from "./util.js";
+export { asRecord, multiRecordBy, deduplicateBy, sveltekitAbsolutePath, sveltekitAnchoredPath } from "./util.js";
 export { asTree, pathView } from "./tree.js";

package/dist/util/util.d.ts

@@ -1,4 +1,6 @@
 export declare function asRecord<T>(arr: T[], key: (el: T) => string, combine?: (a: T, b: T) => T): Record<string, T>;
 export declare function multiRecordBy<T>(arr: T[], key: (el: T) => string): Record<string, T[]>;
 export declare function deduplicateBy<T>(arr: T[], key: (el: T) => string, combine?: (a: T, b: T) => T): T[];
+export declare function sveltekitAbsolutePath(resolveRelative: (s: string) => string, getCurrentPath: () => string): (s: string) => string;
+export declare function sveltekitAnchoredPath(origin: string, resolveRelative: (s: string) => string, getCurrentPath: () => string): (s: string) => string;
 //# sourceMappingURL=util.d.ts.map

package/dist/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/lib/util/util.ts"],"names":[],"mappings":"AAIA,wBAAgB,QAAQ,CAAC,CAAC,EACzB,GAAG,EAAE,CAAC,EAAE,EACR,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,MAAM,EACtB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,GACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAYnB;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAMtF;AAED,wBAAgB,aAAa,CAAC,CAAC,EAC9B,GAAG,EAAE,CAAC,EAAE,EACR,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,MAAM,EACtB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,GACzB,CAAC,EAAE,CAEL"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/lib/util/util.ts"],"names":[],"mappings":"AAIA,wBAAgB,QAAQ,CAAC,CAAC,EACzB,GAAG,EAAE,CAAC,EAAE,EACR,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,MAAM,EACtB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,GACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAYnB;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAMtF;AAED,wBAAgB,aAAa,CAAC,CAAC,EAC9B,GAAG,EAAE,CAAC,EAAE,EACR,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,MAAM,EACtB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,GACzB,CAAC,EAAE,CAEL;AAED,wBAAgB,qBAAqB,CACpC,eAAe,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EACtC,cAAc,EAAE,MAAM,MAAM,GAC1B,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAmBvB;AAED,wBAAgB,qBAAqB,CACpC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EACtC,cAAc,EAAE,MAAM,MAAM,GAC1B,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAGvB"}

package/dist/util/util.js

@@ -20,3 +20,23 @@ export function multiRecordBy(arr, key) {
 export function deduplicateBy(arr, key, combine) {
     return Object.values(asRecord(arr, key, combine));
 }
+export function sveltekitAbsolutePath(resolveRelative, getCurrentPath) {
+    return (s) => {
+        const pagepath = getCurrentPath().split('/').slice(0, -1);
+        const rel = resolveRelative(s).split('/');
+        if (rel[0]?.length === 0) {
+            // It's absolute
+            return rel.join('/');
+        }
+        const backs = rel.filter((r) => r == '..').length;
+        const resolved = pagepath
+            .slice(0, pagepath.length - backs)
+            .concat(rel.slice(backs))
+            .join('/');
+        return resolved;
+    };
+}
+export function sveltekitAnchoredPath(origin, resolveRelative, getCurrentPath) {
+    const abspath = sveltekitAbsolutePath(resolveRelative, getCurrentPath);
+    return (s) => `${origin}${abspath(s)}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phosart/common",
-  "version": "0.4.35",
+  "version": "0.4.36",
   "files": [
     "dist",
     "!dist/**/*.test.*",

package/src/lib/util/index.ts

@@ -25,6 +25,12 @@ export { formatDate } from './date.ts';
 export { markdown } from './markdown.ts';
 export { smoothScroll } from './smoothscroll.ts';
 export { setLibraryConfig, type LibraryConfig } from './phosart_config.svelte.ts';
-export { asRecord, multiRecordBy, deduplicateBy } from './util.ts';
+export {
+	asRecord,
+	multiRecordBy,
+	deduplicateBy,
+	sveltekitAbsolutePath,
+	sveltekitAnchoredPath
+} from './util.ts';
 export { asTree, pathView } from './tree.ts';
 export type { FolderElement, GalleryElement, GalleryTree, TreeElement } from './tree.ts';

package/src/lib/util/util.ts

@@ -35,3 +35,36 @@ export function deduplicateBy<T>(
 ): T[] {
 	return Object.values(asRecord(arr, key, combine));
 }
+
+export function sveltekitAbsolutePath(
+	resolveRelative: (s: string) => string,
+	getCurrentPath: () => string
+): (s: string) => string {
+	return (s) => {
+		const pagepath = getCurrentPath().split('/').slice(0, -1);
+		const rel = resolveRelative(s).split('/');
+
+		if (rel[0]?.length === 0) {
+			// It's absolute
+			return rel.join('/');
+		}
+
+		const backs = rel.filter((r) => r == '..').length;
+
+		const resolved = pagepath
+			.slice(0, pagepath.length - backs)
+			.concat(rel.slice(backs))
+			.join('/');
+
+		return resolved;
+	};
+}
+
+export function sveltekitAnchoredPath(
+	origin: string,
+	resolveRelative: (s: string) => string,
+	getCurrentPath: () => string
+): (s: string) => string {
+	const abspath = sveltekitAbsolutePath(resolveRelative, getCurrentPath);
+	return (s) => `${origin}${abspath(s)}`;
+}