@duplojs/lang 0.0.1-beta.1 → 0.0.1-beta.10

package/dist/path/computeRelative.cjs

@@ -1,13 +1,12 @@
-const require_fix = require("./fix.cjs");
 //#region scripts/path/computeRelative.ts
 function computeRelative(source, destination) {
-	const sourceSegments = require_fix.fix(source).split("/");
-	const destinationSegments = require_fix.fix(destination).split("/");
-	let commonIndex = 1;
+	const sourceSegments = source === "/" ? [] : source.slice(1).split("/");
+	const destinationSegments = destination === "/" ? [] : destination.slice(1).split("/");
+	let commonIndex = 0;
 	while (commonIndex < sourceSegments.length && commonIndex < destinationSegments.length && sourceSegments[commonIndex] === destinationSegments[commonIndex]) commonIndex++;
 	let result = "";
-	for (let index = commonIndex; index < sourceSegments.length; index++) result += result === "" ? ".." : "/..";
-	for (let index = commonIndex; index < destinationSegments.length; index++) result += result === "" ? destinationSegments[index] : `/${destinationSegments[index]}`;
+	for (let index = commonIndex; index < sourceSegments.length; index++) result += result ? "/.." : "..";
+	for (let index = commonIndex; index < destinationSegments.length; index++) result += result ? `/${destinationSegments[index]}` : destinationSegments[index];
 	return result || ".";
 }
 //#endregion

package/dist/path/computeRelative.d.ts

@@ -1,2 +1,2 @@
 import { Absolute, Path } from './constraints';
-export declare function computeRelative<GenericSourcePath extends string & Path & Absolute, GenericDestinationPath extends string & Path & Absolute>(source: GenericSourcePath, destination: GenericDestinationPath): string & Path;
+export declare function computeRelative<GenericSourcePath extends string & Absolute, GenericDestinationPath extends string & Absolute>(source: GenericSourcePath, destination: GenericDestinationPath): string & Path;

package/dist/path/computeRelative.mjs

@@ -1,13 +1,12 @@
-import { fix } from "./fix.mjs";
 //#region scripts/path/computeRelative.ts
 function computeRelative(source, destination) {
-	const sourceSegments = fix(source).split("/");
-	const destinationSegments = fix(destination).split("/");
-	let commonIndex = 1;
+	const sourceSegments = source === "/" ? [] : source.slice(1).split("/");
+	const destinationSegments = destination === "/" ? [] : destination.slice(1).split("/");
+	let commonIndex = 0;
 	while (commonIndex < sourceSegments.length && commonIndex < destinationSegments.length && sourceSegments[commonIndex] === destinationSegments[commonIndex]) commonIndex++;
 	let result = "";
-	for (let index = commonIndex; index < sourceSegments.length; index++) result += result === "" ? ".." : "/..";
-	for (let index = commonIndex; index < destinationSegments.length; index++) result += result === "" ? destinationSegments[index] : `/${destinationSegments[index]}`;
+	for (let index = commonIndex; index < sourceSegments.length; index++) result += result ? "/.." : "..";
+	for (let index = commonIndex; index < destinationSegments.length; index++) result += result ? `/${destinationSegments[index]}` : destinationSegments[index];
 	return result || ".";
 }
 //#endregion

package/dist/path/constraints/absolute.d.ts

@@ -1,3 +1,3 @@
 import type * as DCommon from '../../common';
-export interface Absolute extends DCommon.Constraint<"path" | "path-absolute"> {
+export interface Absolute extends DCommon.Constraint<"path-absolute"> {
 }

package/dist/path/constraints/index.d.ts

@@ -1,2 +1,3 @@
-export type * from './path';
 export type * from './absolute';
+export type * from './path';
+export type * from './segment';

package/dist/path/constraints/segment.d.ts

@@ -0,0 +1,3 @@
+import type * as DCommon from '../../common';
+export interface Segment extends DCommon.Constraint<"path-segment"> {
+}

package/dist/path/getBaseName.cjs

@@ -1,12 +1,12 @@
+const require_isSegment = require("./isSegment.cjs");
 //#region scripts/path/getBaseName.ts
-const baseNameRegex = /\/?([^/]+)$/;
-const extensionNameRegex = /\.([^./]+)$/;
-const segmentTrailingRegex = /\/+$/;
+const baseNameRegex = /([^/]+)$/;
+const extensionNameRegex = /(?<!^)\.[^./]+$/;
 function getBaseName(path, params) {
-	const fixedPath = path.replace(segmentTrailingRegex, "");
-	const baseName = baseNameRegex.exec(fixedPath)?.[1] ?? "";
-	if (params?.removeExtension) return baseName.replace(extensionNameRegex, "");
-	return baseName;
+	const baseName = baseNameRegex.exec(path)?.[1];
+	if (baseName === void 0) return null;
+	const result = params?.removeExtension ? baseName.replace(extensionNameRegex, "") : baseName;
+	return require_isSegment.isSegment(result) ? result : null;
 }
 //#endregion
 exports.getBaseName = getBaseName;

package/dist/path/getBaseName.d.ts

@@ -1,5 +1,5 @@
-import { Path } from './constraints';
+import { Absolute, Path, Segment } from './constraints';
 export interface GetBaseNameParams {
     removeExtension?: boolean;
 }
-export declare function getBaseName<GenericPath extends string & Path>(path: GenericPath, params?: GetBaseNameParams): string;
+export declare function getBaseName<GenericPath extends string & (Path | Absolute | Segment)>(path: GenericPath, params?: GetBaseNameParams): (string & Segment) | null;

package/dist/path/getBaseName.mjs

@@ -1,12 +1,12 @@
+import { isSegment } from "./isSegment.mjs";
 //#region scripts/path/getBaseName.ts
-const baseNameRegex = /\/?([^/]+)$/;
-const extensionNameRegex = /\.([^./]+)$/;
-const segmentTrailingRegex = /\/+$/;
+const baseNameRegex = /([^/]+)$/;
+const extensionNameRegex = /(?<!^)\.[^./]+$/;
 function getBaseName(path, params) {
-	const fixedPath = path.replace(segmentTrailingRegex, "");
-	const baseName = baseNameRegex.exec(fixedPath)?.[1] ?? "";
-	if (params?.removeExtension) return baseName.replace(extensionNameRegex, "");
-	return baseName;
+	const baseName = baseNameRegex.exec(path)?.[1];
+	if (baseName === void 0) return null;
+	const result = params?.removeExtension ? baseName.replace(extensionNameRegex, "") : baseName;
+	return isSegment(result) ? result : null;
 }
 //#endregion
 export { getBaseName };

package/dist/path/getExtensionName.cjs

@@ -1,9 +1,14 @@
+const require_isSegment = require("./isSegment.cjs");
 //#region scripts/path/getExtensionName.ts
-const extensionNameRegex = /\.([^./]+)$/;
+const basenameRegex = /([^/]+)$/;
 function getExtensionName(path, params) {
-	const match = extensionNameRegex.exec(path);
-	if (match) return params?.withDot ? `.${match[1]}` : match[1];
-	return "";
+	const baseName = basenameRegex.exec(path)?.[1];
+	if (!baseName || baseName === "." || baseName === "..") return null;
+	const dotIndex = baseName.lastIndexOf(".");
+	if (dotIndex <= 0 || dotIndex === baseName.length - 1) return null;
+	const extension = baseName.slice(dotIndex + 1);
+	const result = params?.withDot ? `.${extension}` : extension;
+	return require_isSegment.isSegment(result) ? result : null;
 }
 //#endregion
 exports.getExtensionName = getExtensionName;

package/dist/path/getExtensionName.d.ts

@@ -1,5 +1,5 @@
-import { Path } from './constraints';
+import { Absolute, Path, Segment } from './constraints';
 export interface GetExtensionNameParams {
     withDot?: boolean;
 }
-export declare function getExtensionName<GenericPath extends string & Path>(path: GenericPath, params?: GetExtensionNameParams): string;
+export declare function getExtensionName<GenericPath extends string & (Path | Absolute | Segment)>(path: GenericPath, params?: GetExtensionNameParams): (string & Segment) | null;

package/dist/path/getExtensionName.mjs

@@ -1,9 +1,14 @@
+import { isSegment } from "./isSegment.mjs";
 //#region scripts/path/getExtensionName.ts
-const extensionNameRegex = /\.([^./]+)$/;
+const basenameRegex = /([^/]+)$/;
 function getExtensionName(path, params) {
-	const match = extensionNameRegex.exec(path);
-	if (match) return params?.withDot ? `.${match[1]}` : match[1];
-	return "";
+	const baseName = basenameRegex.exec(path)?.[1];
+	if (!baseName || baseName === "." || baseName === "..") return null;
+	const dotIndex = baseName.lastIndexOf(".");
+	if (dotIndex <= 0 || dotIndex === baseName.length - 1) return null;
+	const extension = baseName.slice(dotIndex + 1);
+	const result = params?.withDot ? `.${extension}` : extension;
+	return isSegment(result) ? result : null;
 }
 //#endregion
 export { getExtensionName };

package/dist/path/getParentFolderPath.cjs

@@ -1,9 +1,14 @@
 //#region scripts/path/getParentFolderPath.ts
-const folderNameRegex = /([^]+)\/[^/]+\/?$/;
+const parentFolderPathRegex = /^([^]*)\/[^/]+$/;
+const onlyParentSegmentsRegex = /^(?:\.\.)(?:\/\.\.)*$/;
 function getParentFolderPath(path) {
-	const match = path.match(folderNameRegex);
-	if (!match) return "";
-	return match[1];
+	if (path === "/") return null;
+	if (path === ".") return "..";
+	if (onlyParentSegmentsRegex.test(path)) return `${path}/..`;
+	const parent = parentFolderPathRegex.exec(path)?.[1];
+	if (parent === void 0) return ".";
+	if (parent === "") return "/";
+	return parent;
 }
 //#endregion
 exports.getParentFolderPath = getParentFolderPath;

package/dist/path/getParentFolderPath.d.ts

@@ -1,3 +1,2 @@
 import { Absolute, Path } from './constraints';
-export declare function getParentFolderPath<GenericPath extends string & Path & Absolute>(path: GenericPath): string;
-export declare function getParentFolderPath<GenericPath extends string & Path>(path: GenericPath): string;
+export declare function getParentFolderPath<GenericPath extends string & (Path | Absolute)>(path: GenericPath): (string & Path) | null;

package/dist/path/getParentFolderPath.mjs

@@ -1,9 +1,14 @@
 //#region scripts/path/getParentFolderPath.ts
-const folderNameRegex = /([^]+)\/[^/]+\/?$/;
+const parentFolderPathRegex = /^([^]*)\/[^/]+$/;
+const onlyParentSegmentsRegex = /^(?:\.\.)(?:\/\.\.)*$/;
 function getParentFolderPath(path) {
-	const match = path.match(folderNameRegex);
-	if (!match) return "";
-	return match[1];
+	if (path === "/") return null;
+	if (path === ".") return "..";
+	if (onlyParentSegmentsRegex.test(path)) return `${path}/..`;
+	const parent = parentFolderPathRegex.exec(path)?.[1];
+	if (parent === void 0) return ".";
+	if (parent === "") return "/";
+	return parent;
 }
 //#endregion
 export { getParentFolderPath };

package/dist/path/index.cjs

@@ -1,33 +1,36 @@
 const require_runtime = require("../_virtual/_rolldown/runtime.cjs");
-const require_fix = require("./fix.cjs");
 const require_computeRelative = require("./computeRelative.cjs");
+const require_isSegment = require("./isSegment.cjs");
 const require_getBaseName = require("./getBaseName.cjs");
 const require_getExtensionName = require("./getExtensionName.cjs");
 const require_getParentFolderPath = require("./getParentFolderPath.cjs");
 const require_is = require("./is.cjs");
 const require_isAbsolute = require("./isAbsolute.cjs");
+const require_normalize = require("./normalize.cjs");
 const require_resolveRelative = require("./resolveRelative.cjs");
 const require_resolveFrom = require("./resolveFrom.cjs");
 //#region scripts/path/index.ts
 var path_exports = /* @__PURE__ */ require_runtime.__exportAll({
 	computeRelative: () => require_computeRelative.computeRelative,
-	fix: () => require_fix.fix,
 	getBaseName: () => require_getBaseName.getBaseName,
 	getExtensionName: () => require_getExtensionName.getExtensionName,
 	getParentFolderPath: () => require_getParentFolderPath.getParentFolderPath,
 	is: () => require_is.is,
 	isAbsolute: () => require_isAbsolute.isAbsolute,
+	isSegment: () => require_isSegment.isSegment,
+	normalize: () => require_normalize.normalize,
 	resolveFrom: () => require_resolveFrom.resolveFrom,
 	resolveRelative: () => require_resolveRelative.resolveRelative
 });
 //#endregion
 exports.computeRelative = require_computeRelative.computeRelative;
-exports.fix = require_fix.fix;
 exports.getBaseName = require_getBaseName.getBaseName;
 exports.getExtensionName = require_getExtensionName.getExtensionName;
 exports.getParentFolderPath = require_getParentFolderPath.getParentFolderPath;
 exports.is = require_is.is;
 exports.isAbsolute = require_isAbsolute.isAbsolute;
+exports.isSegment = require_isSegment.isSegment;
+exports.normalize = require_normalize.normalize;
 Object.defineProperty(exports, "path_exports", {
 	enumerable: true,
 	get: function() {

package/dist/path/index.d.ts

@@ -1,11 +1,12 @@
-export type * from './constraints';
 export * from './computeRelative';
-export * from './fix';
+export type * from './constraints';
 export * from './getBaseName';
 export * from './getExtensionName';
 export * from './getParentFolderPath';
 export * from './is';
 export * from './isAbsolute';
+export * from './isSegment';
+export * from './normalize';
 export * from './resolveFrom';
 export * from './resolveRelative';
 export type * from './types';

package/dist/path/index.mjs

@@ -1,24 +1,26 @@
 import { __exportAll } from "../_virtual/_rolldown/runtime.mjs";
-import { fix } from "./fix.mjs";
 import { computeRelative } from "./computeRelative.mjs";
+import { isSegment } from "./isSegment.mjs";
 import { getBaseName } from "./getBaseName.mjs";
 import { getExtensionName } from "./getExtensionName.mjs";
 import { getParentFolderPath } from "./getParentFolderPath.mjs";
 import { is } from "./is.mjs";
 import { isAbsolute } from "./isAbsolute.mjs";
+import { normalize } from "./normalize.mjs";
 import { resolveRelative } from "./resolveRelative.mjs";
 import { resolveFrom } from "./resolveFrom.mjs";
 //#region scripts/path/index.ts
 var path_exports = /* @__PURE__ */ __exportAll({
 	computeRelative: () => computeRelative,
-	fix: () => fix,
 	getBaseName: () => getBaseName,
 	getExtensionName: () => getExtensionName,
 	getParentFolderPath: () => getParentFolderPath,
 	is: () => is,
 	isAbsolute: () => isAbsolute,
+	isSegment: () => isSegment,
+	normalize: () => normalize,
 	resolveFrom: () => resolveFrom,
 	resolveRelative: () => resolveRelative
 });
 //#endregion
-export { computeRelative, fix, getBaseName, getExtensionName, getParentFolderPath, is, isAbsolute, path_exports, resolveFrom, resolveRelative };
+export { computeRelative, getBaseName, getExtensionName, getParentFolderPath, is, isAbsolute, isSegment, normalize, path_exports, resolveFrom, resolveRelative };

package/dist/path/is.cjs

@@ -1,8 +1,13 @@
 //#region scripts/path/is.ts
-const nullCharacter = String.fromCharCode(0);
-const posixPathRegex = /^(?:\/|\/?[^/]+(?:\/[^/]+)*(?:\/+)?)$/;
-function is(path) {
-	return !path.includes(nullCharacter) && posixPathRegex.test(path);
+const dotSegmentRegExp = /(^|\/)\.(\/|$)/;
+const endsWithSlash = /[^]+\/$/;
+const dotDotRegExp = /(^|\/)\.\.(\/|$)/;
+const invalidDotDotRegExp = /(^|\/)(?!\.\.(?:\/|$))[^/]+\/\.\.(?:\/|$)/;
+function is(value) {
+	if (value === ".") return true;
+	if (value === "" || value.includes("\0") || value.includes("//") || endsWithSlash.test(value) || dotSegmentRegExp.test(value)) return false;
+	if (value.startsWith("/")) return !dotDotRegExp.test(value);
+	return !invalidDotDotRegExp.test(value);
 }
 //#endregion
 exports.is = is;

package/dist/path/is.d.ts

@@ -1,2 +1,4 @@
-import { Path } from './constraints';
-export declare function is<GenericPath extends string>(path: GenericPath): path is GenericPath & Path;
+import { Absolute, Path } from './constraints';
+import { IsLiteralPath } from './types';
+import type * as DString from '../string';
+export declare function is<GenericPath extends string>(value: GenericPath): value is (GenericPath extends (Path | Absolute) ? GenericPath : IsLiteralPath<GenericPath> extends true ? GenericPath : DString.IsLiteral<GenericPath> extends true ? never : GenericPath & Path);

package/dist/path/is.mjs

@@ -1,8 +1,13 @@
 //#region scripts/path/is.ts
-const nullCharacter = String.fromCharCode(0);
-const posixPathRegex = /^(?:\/|\/?[^/]+(?:\/[^/]+)*(?:\/+)?)$/;
-function is(path) {
-	return !path.includes(nullCharacter) && posixPathRegex.test(path);
+const dotSegmentRegExp = /(^|\/)\.(\/|$)/;
+const endsWithSlash = /[^]+\/$/;
+const dotDotRegExp = /(^|\/)\.\.(\/|$)/;
+const invalidDotDotRegExp = /(^|\/)(?!\.\.(?:\/|$))[^/]+\/\.\.(?:\/|$)/;
+function is(value) {
+	if (value === ".") return true;
+	if (value === "" || value.includes("\0") || value.includes("//") || endsWithSlash.test(value) || dotSegmentRegExp.test(value)) return false;
+	if (value.startsWith("/")) return !dotDotRegExp.test(value);
+	return !invalidDotDotRegExp.test(value);
 }
 //#endregion
 export { is };

package/dist/path/isAbsolute.cjs

@@ -1,9 +1,7 @@
+const require_is = require("./is.cjs");
 //#region scripts/path/isAbsolute.ts
-const containBackPathRegex = /(^|\/)\.\.(?=\/|$)/;
-const nullCharacter = String.fromCharCode(0);
-const posixAbsolutePathRegex = /^\/(?:$|[^/]+(?:\/[^/]+)*(?:\/+)?$)/;
-function isAbsolute(path) {
-	return !path.includes(nullCharacter) && posixAbsolutePathRegex.test(path) && !containBackPathRegex.test(path);
+function isAbsolute(value) {
+	return value.startsWith("/") && require_is.is(value);
 }
 //#endregion
 exports.isAbsolute = isAbsolute;

package/dist/path/isAbsolute.d.ts

@@ -1,2 +1,4 @@
-import { Absolute, Path } from './constraints';
-export declare function isAbsolute<GenericPath extends string>(path: GenericPath): path is GenericPath & Path & Absolute;
+import { Absolute } from './constraints';
+import { IsLiteralAbsolutePath } from './types';
+import type * as DString from '../string';
+export declare function isAbsolute<GenericPath extends string>(value: GenericPath): value is (GenericPath extends Absolute ? GenericPath : IsLiteralAbsolutePath<GenericPath> extends true ? GenericPath : DString.IsLiteral<GenericPath> extends true ? never : GenericPath & Absolute);

package/dist/path/isAbsolute.mjs

@@ -1,9 +1,7 @@
+import { is } from "./is.mjs";
 //#region scripts/path/isAbsolute.ts
-const containBackPathRegex = /(^|\/)\.\.(?=\/|$)/;
-const nullCharacter = String.fromCharCode(0);
-const posixAbsolutePathRegex = /^\/(?:$|[^/]+(?:\/[^/]+)*(?:\/+)?$)/;
-function isAbsolute(path) {
-	return !path.includes(nullCharacter) && posixAbsolutePathRegex.test(path) && !containBackPathRegex.test(path);
+function isAbsolute(value) {
+	return value.startsWith("/") && is(value);
 }
 //#endregion
 export { isAbsolute };

package/dist/path/isSegment.cjs

@@ -0,0 +1,6 @@
+//#region scripts/path/isSegment.ts
+function isSegment(value) {
+	return value !== "" && value !== "." && value !== ".." && !value.includes("/") && !value.includes("\0");
+}
+//#endregion
+exports.isSegment = isSegment;

package/dist/path/isSegment.d.ts

@@ -0,0 +1,4 @@
+import { Segment } from './constraints';
+import { IsLiteralSegmentPath } from './types';
+import type * as DString from '../string';
+export declare function isSegment<GenericValue extends string>(value: GenericValue): value is (GenericValue extends Segment ? GenericValue : IsLiteralSegmentPath<GenericValue> extends true ? GenericValue : DString.IsLiteral<GenericValue> extends true ? never : GenericValue & Segment);

package/dist/path/isSegment.mjs

@@ -0,0 +1,6 @@
+//#region scripts/path/isSegment.ts
+function isSegment(value) {
+	return value !== "" && value !== "." && value !== ".." && !value.includes("/") && !value.includes("\0");
+}
+//#endregion
+export { isSegment };

package/dist/path/normalize.cjs

@@ -0,0 +1,18 @@
+//#region scripts/path/normalize.ts
+function normalize(path) {
+	if (path.includes("\0")) return null;
+	const absolute = path.startsWith("/");
+	const result = [];
+	for (const segment of path.split("/")) {
+		if (segment === "" || segment === ".") continue;
+		if (segment === "..") {
+			if (result.length !== 0 && result.at(-1) !== "..") result.pop();
+			else if (!absolute) result.push("..");
+			continue;
+		}
+		result.push(segment);
+	}
+	return absolute ? `/${result.join("/")}` : result.join("/") || ".";
+}
+//#endregion
+exports.normalize = normalize;

package/dist/path/normalize.d.ts

@@ -0,0 +1,2 @@
+import { Path } from './constraints';
+export declare function normalize(path: string): (string & Path) | null;

package/dist/path/normalize.mjs

@@ -0,0 +1,18 @@
+//#region scripts/path/normalize.ts
+function normalize(path) {
+	if (path.includes("\0")) return null;
+	const absolute = path.startsWith("/");
+	const result = [];
+	for (const segment of path.split("/")) {
+		if (segment === "" || segment === ".") continue;
+		if (segment === "..") {
+			if (result.length !== 0 && result.at(-1) !== "..") result.pop();
+			else if (!absolute) result.push("..");
+			continue;
+		}
+		result.push(segment);
+	}
+	return absolute ? `/${result.join("/")}` : result.join("/") || ".";
+}
+//#endregion
+export { normalize };

package/dist/path/resolveFrom.cjs

@@ -1,10 +1,9 @@
 const require_resolveRelative = require("./resolveRelative.cjs");
 //#region scripts/path/resolveFrom.ts
-const aboveRootRegex = /^(?:\.\.\/)+/;
-function resolveFrom(origin, segments) {
-	const result = require_resolveRelative.resolveRelative([origin, ...segments]);
-	if (!result.startsWith("../")) return result;
-	return `/${result.replace(aboveRootRegex, "")}`;
+function resolveFrom(origin, segments, params) {
+	const resultRelative = require_resolveRelative.resolveRelative(segments);
+	if (params?.stayInOrigin && (resultRelative === ".." || resultRelative.startsWith("../") || resultRelative.startsWith("/"))) return null;
+	return require_resolveRelative.resolveRelative([origin, resultRelative]);
 }
 //#endregion
 exports.resolveFrom = resolveFrom;

package/dist/path/resolveFrom.d.ts

@@ -1,3 +1,11 @@
-import { Absolute, Path } from './constraints';
+import { Absolute, Path, Segment } from './constraints';
 import { RequireSegments } from './types';
-export declare function resolveFrom<const GenericSegments extends readonly (string & Path)[]>(origin: string & Path & Absolute, segments: GenericSegments & RequireSegments<GenericSegments>): string & Path & Absolute;
+import type * as DCommon from '../common';
+export interface ResolveFromParams {
+    stayInOrigin?: boolean;
+}
+export declare function resolveFrom<const GenericSegments extends readonly (string & (Path | Absolute | Segment))[], const GenericParams extends ResolveFromParams>(origin: string & Absolute, segments: GenericSegments & RequireSegments<GenericSegments>, params?: GenericParams): (string & Absolute) | (DCommon.BreakGenericLink<DCommon.Or<[
+    DCommon.IsEqual<GenericParams["stayInOrigin"], ResolveFromParams["stayInOrigin"]>,
+    DCommon.IsEqual<GenericParams["stayInOrigin"], false>,
+    DCommon.IsEqual<GenericParams["stayInOrigin"], unknown>
+]> extends true ? never : null>);

package/dist/path/resolveFrom.mjs

@@ -1,10 +1,9 @@
 import { resolveRelative } from "./resolveRelative.mjs";
 //#region scripts/path/resolveFrom.ts
-const aboveRootRegex = /^(?:\.\.\/)+/;
-function resolveFrom(origin, segments) {
-	const result = resolveRelative([origin, ...segments]);
-	if (!result.startsWith("../")) return result;
-	return `/${result.replace(aboveRootRegex, "")}`;
+function resolveFrom(origin, segments, params) {
+	const resultRelative = resolveRelative(segments);
+	if (params?.stayInOrigin && (resultRelative === ".." || resultRelative.startsWith("../") || resultRelative.startsWith("/"))) return null;
+	return resolveRelative([origin, resultRelative]);
 }
 //#endregion
 export { resolveFrom };

package/dist/path/resolveRelative.cjs

@@ -1,26 +1,23 @@
 //#region scripts/path/resolveRelative.ts
-const segmentTrailingRegex = /\/$/;
-const segmentRelativeRegex = /^(.\/)/;
-function resolveRelative(segments) {
-	let clearedPath = "";
-	for (const segment of segments) {
-		if (segment.length === 0) continue;
-		else if (segment === "/") {
-			clearedPath = segment;
-			continue;
+function resolveRelative(paths) {
+	let absolute = false;
+	const result = [];
+	for (const path of paths) {
+		if (path === ".") continue;
+		if (path.startsWith("/")) {
+			absolute = true;
+			result.length = 0;
+		}
+		for (const segment of path.split("/")) {
+			if (segment === "") continue;
+			if (segment === "..") {
+				if (result.length && result.at(-1) !== "..") result.pop();
+				else if (!absolute) result.push("..");
+			} else result.push(segment);
 		}
-		const formattedSegment = segment.replace(segmentTrailingRegex, "").replace(segmentRelativeRegex, "");
-		if (formattedSegment.startsWith("/") || clearedPath === "") clearedPath = formattedSegment;
-		else if (clearedPath === "/") clearedPath += formattedSegment;
-		else clearedPath += `/${formattedSegment}`;
 	}
-	const dotResult = [];
-	const result = [];
-	for (const element of clearedPath.split("/")) if (element === "..") {
-		if (!result.pop()) dotResult.push(element);
-	} else result.push(element);
-	if (dotResult.length === 0) return result.join("/");
-	return `${dotResult.join("/")}/${result.join("/")}`;
+	if (absolute) return `/${result.join("/")}`;
+	return result.join("/") || ".";
 }
 //#endregion
 exports.resolveRelative = resolveRelative;

package/dist/path/resolveRelative.d.ts

@@ -1,3 +1,10 @@
-import { Path } from './constraints';
+import { Absolute, Path, Segment } from './constraints';
 import { RequireSegments } from './types';
-export declare function resolveRelative<const GenericSegments extends readonly (string & Path)[]>(segments: GenericSegments & RequireSegments<GenericSegments>): string & Path;
+import type * as DCommon from '../common';
+type HasAbsolutePath<GenericSegments extends readonly (string & (Path | Absolute | Segment))[]> = DCommon.ContainExtends<{
+    [Prop in keyof GenericSegments]: [DCommon.IsExtends<GenericSegments[Prop], Absolute>];
+}[Extract<keyof GenericSegments, number>], [
+    true
+]>;
+export declare function resolveRelative<const GenericSegments extends readonly (string & (Path | Absolute | Segment))[]>(segments: GenericSegments & RequireSegments<GenericSegments>): string & Path & (DCommon.BreakGenericLink<HasAbsolutePath<GenericSegments> extends true ? Absolute : unknown>);
+export {};

package/dist/path/resolveRelative.mjs

@@ -1,26 +1,23 @@
 //#region scripts/path/resolveRelative.ts
-const segmentTrailingRegex = /\/$/;
-const segmentRelativeRegex = /^(.\/)/;
-function resolveRelative(segments) {
-	let clearedPath = "";
-	for (const segment of segments) {
-		if (segment.length === 0) continue;
-		else if (segment === "/") {
-			clearedPath = segment;
-			continue;
+function resolveRelative(paths) {
+	let absolute = false;
+	const result = [];
+	for (const path of paths) {
+		if (path === ".") continue;
+		if (path.startsWith("/")) {
+			absolute = true;
+			result.length = 0;
+		}
+		for (const segment of path.split("/")) {
+			if (segment === "") continue;
+			if (segment === "..") {
+				if (result.length && result.at(-1) !== "..") result.pop();
+				else if (!absolute) result.push("..");
+			} else result.push(segment);
 		}
-		const formattedSegment = segment.replace(segmentTrailingRegex, "").replace(segmentRelativeRegex, "");
-		if (formattedSegment.startsWith("/") || clearedPath === "") clearedPath = formattedSegment;
-		else if (clearedPath === "/") clearedPath += formattedSegment;
-		else clearedPath += `/${formattedSegment}`;
 	}
-	const dotResult = [];
-	const result = [];
-	for (const element of clearedPath.split("/")) if (element === "..") {
-		if (!result.pop()) dotResult.push(element);
-	} else result.push(element);
-	if (dotResult.length === 0) return result.join("/");
-	return `${dotResult.join("/")}/${result.join("/")}`;
+	if (absolute) return `/${result.join("/")}`;
+	return result.join("/") || ".";
 }
 //#endregion
 export { resolveRelative };

package/dist/path/types/index.d.ts

@@ -1 +1,7 @@
+export type * from './isLiteralAbsolutePath';
+export type * from './isLiteralPath';
+export type * from './isLiteralSegmentPath';
+export type * from './requireLiteralAbsolutePath';
+export type * from './requireLiteralPath';
+export type * from './requireLiteralSegmentPath';
 export type * from './requireSegments';

package/dist/path/types/isLiteralAbsolutePath.d.ts

@@ -0,0 +1,2 @@
+import { IsLiteralPath } from './isLiteralPath';
+export type IsLiteralAbsolutePath<GenericValue extends string> = IsLiteralPath<GenericValue> extends true ? GenericValue extends `/${string}` ? true : false : false;