@alwatr/resolve-url 5.5.4 → 5.5.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/main.cjs +3 -2
- package/dist/main.cjs.map +2 -2
- package/dist/main.d.ts.map +1 -1
- package/dist/main.mjs +3 -2
- package/dist/main.mjs.map +2 -2
- package/package.json +7 -7
- package/src/main.test.js +46 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [5.5.6](https://github.com/Alwatr/nanolib/compare/@alwatr/resolve-url@5.5.5...@alwatr/resolve-url@5.5.6) (2025-08-23)
|
|
7
|
+
|
|
8
|
+
### Code Refactoring
|
|
9
|
+
|
|
10
|
+
* Updated all package.json files in the project to change dependency version specifiers from "workspace:^" to "workspace:*" for consistency and to allow for more flexible version resolution. ([db6a4f7](https://github.com/Alwatr/nanolib/commit/db6a4f76deec2d1d8039978144e4bc51b6f1a0e3)) by @alimd
|
|
11
|
+
|
|
12
|
+
## [5.5.5](https://github.com/Alwatr/nanolib/compare/@alwatr/resolve-url@5.5.4...@alwatr/resolve-url@5.5.5) (2025-04-20)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
* **resolve-url:** ensure only non-empty string parts are processed in resolveUrl function ([dcd4009](https://github.com/Alwatr/nanolib/commit/dcd400973ec42cbb81b20e8f3d37dbbee57ea498)) by @alimd
|
|
17
|
+
|
|
6
18
|
## <small>5.5.4 (2025-04-15)</small>
|
|
7
19
|
|
|
8
20
|
**Note:** Version bump only for package @alwatr/resolve-url
|
package/dist/main.cjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* @alwatr/resolve-url v5.5.
|
|
1
|
+
/* @alwatr/resolve-url v5.5.6 */
|
|
2
2
|
"use strict";
|
|
3
3
|
var __defProp = Object.defineProperty;
|
|
4
4
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
@@ -25,8 +25,9 @@ __export(main_exports, {
|
|
|
25
25
|
});
|
|
26
26
|
module.exports = __toCommonJS(main_exports);
|
|
27
27
|
var import_package_tracer = require("@alwatr/package-tracer");
|
|
28
|
-
__dev_mode__: import_package_tracer.packageTracer.add("@alwatr/resolve-url", "5.5.
|
|
28
|
+
__dev_mode__: import_package_tracer.packageTracer.add("@alwatr/resolve-url", "5.5.6");
|
|
29
29
|
function resolveUrl(...parts) {
|
|
30
|
+
parts = parts.filter((part) => typeof part === "string" && part.length > 0);
|
|
30
31
|
if (parts.length === 0) {
|
|
31
32
|
return "";
|
|
32
33
|
}
|
package/dist/main.cjs.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/main.ts"],
|
|
4
|
-
"sourcesContent": ["import {packageTracer} from '@alwatr/package-tracer';\n\n__dev_mode__: packageTracer.add(__package_name__, __package_version__);\n\nexport function resolveUrl(...parts: string[]): string {\n if (parts.length === 0) {\n return ''
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA4B;AAE5B,aAAc,qCAAc,IAAI,uBAAkB,OAAmB;AAE9D,SAAS,cAAc,OAAyB;AACrD,MAAI,MAAM,WAAW,GAAG;AACtB,WAAO;AAAA,EACT;AAEA,QAAM,iBAAiB;AACvB,QAAM,kBAAkB;AACxB,QAAM,kBAAkB;AAExB,QAAM,SAAS,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,IAAI,MAAM;AAEnD,SACE,SACA,MACG,IAAI,CAAC,SAAS,KAAK,QAAQ,gBAAgB,EAAE,EAAE,QAAQ,iBAAiB,EAAE,CAAC,EAC3E,OAAO,CAAC,SAAS,IAAI,EACrB,KAAK,GAAG,EAER,QAAQ,OAAO,oBAAoB,EACnC,QAAQ,iBAAiB,GAAG,EAC5B,QAAQ,sBAAsB,KAAK;AAE1C;",
|
|
4
|
+
"sourcesContent": ["import {packageTracer} from '@alwatr/package-tracer';\n\n__dev_mode__: packageTracer.add(__package_name__, __package_version__);\n\nexport function resolveUrl(...parts: string[]): string {\n parts = parts.filter((part: string): part is string => typeof part === 'string' && part.length > 0);\n\n if (parts.length === 0) {\n return '';\n }\n\n const leadingSlashes = /^\\/+/;\n const trailingSlashes = /\\/+$/;\n const multipleSlashes = /\\/{2,}/g;\n\n const prefix = parts[0].indexOf('/') === 0 ? '/' : ''; // Add leading slash if the first part has it\n\n return (\n prefix +\n parts\n .map((part) => part.replace(leadingSlashes, '').replace(trailingSlashes, '')) // Remove leading and trailing slashes\n .filter((part) => part) // Remove empty parts\n .join('/')\n // Replace multiple slashes with a single slash, except for protocol\n .replace('://', '{{PROTOCOL_SLASH}}')\n .replace(multipleSlashes, '/')\n .replace('{{PROTOCOL_SLASH}}', '://')\n );\n}\n\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA4B;AAE5B,aAAc,qCAAc,IAAI,uBAAkB,OAAmB;AAE9D,SAAS,cAAc,OAAyB;AACrD,UAAQ,MAAM,OAAO,CAAC,SAAiC,OAAO,SAAS,YAAY,KAAK,SAAS,CAAC;AAElG,MAAI,MAAM,WAAW,GAAG;AACtB,WAAO;AAAA,EACT;AAEA,QAAM,iBAAiB;AACvB,QAAM,kBAAkB;AACxB,QAAM,kBAAkB;AAExB,QAAM,SAAS,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,IAAI,MAAM;AAEnD,SACE,SACA,MACG,IAAI,CAAC,SAAS,KAAK,QAAQ,gBAAgB,EAAE,EAAE,QAAQ,iBAAiB,EAAE,CAAC,EAC3E,OAAO,CAAC,SAAS,IAAI,EACrB,KAAK,GAAG,EAER,QAAQ,OAAO,oBAAoB,EACnC,QAAQ,iBAAiB,GAAG,EAC5B,QAAQ,sBAAsB,KAAK;AAE1C;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAIA,wBAAgB,UAAU,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAIA,wBAAgB,UAAU,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAwBrD"}
|
package/dist/main.mjs
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
/* @alwatr/resolve-url v5.5.
|
|
1
|
+
/* @alwatr/resolve-url v5.5.6 */
|
|
2
2
|
|
|
3
3
|
// src/main.ts
|
|
4
4
|
import { packageTracer } from "@alwatr/package-tracer";
|
|
5
|
-
__dev_mode__: packageTracer.add("@alwatr/resolve-url", "5.5.
|
|
5
|
+
__dev_mode__: packageTracer.add("@alwatr/resolve-url", "5.5.6");
|
|
6
6
|
function resolveUrl(...parts) {
|
|
7
|
+
parts = parts.filter((part) => typeof part === "string" && part.length > 0);
|
|
7
8
|
if (parts.length === 0) {
|
|
8
9
|
return "";
|
|
9
10
|
}
|
package/dist/main.mjs.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/main.ts"],
|
|
4
|
-
"sourcesContent": ["import {packageTracer} from '@alwatr/package-tracer';\n\n__dev_mode__: packageTracer.add(__package_name__, __package_version__);\n\nexport function resolveUrl(...parts: string[]): string {\n if (parts.length === 0) {\n return ''
|
|
5
|
-
"mappings": ";;;AAAA,SAAQ,qBAAoB;AAE5B,aAAc,eAAc,IAAI,uBAAkB,OAAmB;AAE9D,SAAS,cAAc,OAAyB;AACrD,MAAI,MAAM,WAAW,GAAG;AACtB,WAAO;AAAA,EACT;AAEA,QAAM,iBAAiB;AACvB,QAAM,kBAAkB;AACxB,QAAM,kBAAkB;AAExB,QAAM,SAAS,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,IAAI,MAAM;AAEnD,SACE,SACA,MACG,IAAI,CAAC,SAAS,KAAK,QAAQ,gBAAgB,EAAE,EAAE,QAAQ,iBAAiB,EAAE,CAAC,EAC3E,OAAO,CAAC,SAAS,IAAI,EACrB,KAAK,GAAG,EAER,QAAQ,OAAO,oBAAoB,EACnC,QAAQ,iBAAiB,GAAG,EAC5B,QAAQ,sBAAsB,KAAK;AAE1C;",
|
|
4
|
+
"sourcesContent": ["import {packageTracer} from '@alwatr/package-tracer';\n\n__dev_mode__: packageTracer.add(__package_name__, __package_version__);\n\nexport function resolveUrl(...parts: string[]): string {\n parts = parts.filter((part: string): part is string => typeof part === 'string' && part.length > 0);\n\n if (parts.length === 0) {\n return '';\n }\n\n const leadingSlashes = /^\\/+/;\n const trailingSlashes = /\\/+$/;\n const multipleSlashes = /\\/{2,}/g;\n\n const prefix = parts[0].indexOf('/') === 0 ? '/' : ''; // Add leading slash if the first part has it\n\n return (\n prefix +\n parts\n .map((part) => part.replace(leadingSlashes, '').replace(trailingSlashes, '')) // Remove leading and trailing slashes\n .filter((part) => part) // Remove empty parts\n .join('/')\n // Replace multiple slashes with a single slash, except for protocol\n .replace('://', '{{PROTOCOL_SLASH}}')\n .replace(multipleSlashes, '/')\n .replace('{{PROTOCOL_SLASH}}', '://')\n );\n}\n\n"],
|
|
5
|
+
"mappings": ";;;AAAA,SAAQ,qBAAoB;AAE5B,aAAc,eAAc,IAAI,uBAAkB,OAAmB;AAE9D,SAAS,cAAc,OAAyB;AACrD,UAAQ,MAAM,OAAO,CAAC,SAAiC,OAAO,SAAS,YAAY,KAAK,SAAS,CAAC;AAElG,MAAI,MAAM,WAAW,GAAG;AACtB,WAAO;AAAA,EACT;AAEA,QAAM,iBAAiB;AACvB,QAAM,kBAAkB;AACxB,QAAM,kBAAkB;AAExB,QAAM,SAAS,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,IAAI,MAAM;AAEnD,SACE,SACA,MACG,IAAI,CAAC,SAAS,KAAK,QAAQ,gBAAgB,EAAE,EAAE,QAAQ,iBAAiB,EAAE,CAAC,EAC3E,OAAO,CAAC,SAAS,IAAI,EACrB,KAAK,GAAG,EAER,QAAQ,OAAO,oBAAoB,EACnC,QAAQ,iBAAiB,GAAG,EAC5B,QAAQ,sBAAsB,KAAK;AAE1C;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alwatr/resolve-url",
|
|
3
|
-
"version": "5.5.
|
|
3
|
+
"version": "5.5.6",
|
|
4
4
|
"description": "A tiny TypeScript library to resolve URLs.",
|
|
5
5
|
"author": "S. Ali Mihandoost <ali.mihandoost@gmail.com>",
|
|
6
6
|
"keywords": [
|
|
@@ -67,15 +67,15 @@
|
|
|
67
67
|
"clean": "rm -rfv dist *.tsbuildinfo"
|
|
68
68
|
},
|
|
69
69
|
"dependencies": {
|
|
70
|
-
"@alwatr/package-tracer": "
|
|
70
|
+
"@alwatr/package-tracer": "5.5.4"
|
|
71
71
|
},
|
|
72
72
|
"devDependencies": {
|
|
73
|
-
"@alwatr/nano-build": "
|
|
74
|
-
"@alwatr/prettier-config": "
|
|
75
|
-
"@alwatr/tsconfig-base": "
|
|
76
|
-
"@alwatr/type-helper": "
|
|
73
|
+
"@alwatr/nano-build": "5.5.4",
|
|
74
|
+
"@alwatr/prettier-config": "5.0.0",
|
|
75
|
+
"@alwatr/tsconfig-base": "5.0.0",
|
|
76
|
+
"@alwatr/type-helper": "5.4.2",
|
|
77
77
|
"jest": "^29.7.0",
|
|
78
78
|
"typescript": "^5.8.3"
|
|
79
79
|
},
|
|
80
|
-
"gitHead": "
|
|
80
|
+
"gitHead": "dd749e0b9adecdefa8e906669858c014b53bdab0"
|
|
81
81
|
}
|
package/src/main.test.js
CHANGED
|
@@ -92,10 +92,53 @@ describe('@alwatr/resolve-url - resolveUrl', () => {
|
|
|
92
92
|
expect(resolveUrl('http://example.com/path/to/resource')).toBe('http://example.com/path/to/resource');
|
|
93
93
|
});
|
|
94
94
|
|
|
95
|
-
// it('should handle complex url 1', () => {
|
|
96
|
-
// expect(resolveUrl('http:////ali/', '///md////', '/65/////')).toBe('http://ali/md/65');
|
|
97
|
-
// });
|
|
98
95
|
it('should handle complex url 2', () => {
|
|
99
96
|
expect(resolveUrl('//no-protocol/', '/path////test/')).toBe('/no-protocol/path/test');
|
|
100
97
|
});
|
|
98
|
+
|
|
99
|
+
// Tests moved from main.test.ts
|
|
100
|
+
it('should resolve parts correctly', () => {
|
|
101
|
+
expect(resolveUrl('a', 'b', 'c')).toBe('a/b/c');
|
|
102
|
+
expect(resolveUrl('/a/', '/b/', '/c/')).toBe('/a/b/c');
|
|
103
|
+
expect(resolveUrl('a//b', '//c')).toBe('a/b/c');
|
|
104
|
+
expect(resolveUrl('http://example.com', 'a')).toBe('http://example.com/a');
|
|
105
|
+
expect(resolveUrl('http://example.com/', '/a/')).toBe('http://example.com/a');
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
it('should handle empty parts', () => {
|
|
109
|
+
expect(resolveUrl('a', '', 'c')).toBe('a/c');
|
|
110
|
+
expect(resolveUrl('', 'b', 'c')).toBe('b/c');
|
|
111
|
+
expect(resolveUrl('a', 'b', '')).toBe('a/b');
|
|
112
|
+
expect(resolveUrl('', '', '')).toBe('');
|
|
113
|
+
});
|
|
114
|
+
|
|
115
|
+
it('should handle single part', () => {
|
|
116
|
+
expect(resolveUrl('a')).toBe('a');
|
|
117
|
+
expect(resolveUrl('/a/')).toBe('/a');
|
|
118
|
+
expect(resolveUrl('')).toBe('');
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
it('should handle no parts', () => {
|
|
122
|
+
expect(resolveUrl()).toBe('');
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
it('should handle leading/trailing slashes correctly', () => {
|
|
126
|
+
expect(resolveUrl('/a', 'b')).toBe('/a/b');
|
|
127
|
+
expect(resolveUrl('a', '/b')).toBe('a/b');
|
|
128
|
+
expect(resolveUrl('//a', 'b//')).toBe('/a/b');
|
|
129
|
+
});
|
|
130
|
+
|
|
131
|
+
it('should handle protocol correctly', () => {
|
|
132
|
+
expect(resolveUrl('https://example.com//', '//api/', '/v1')).toBe('https://example.com/api/v1');
|
|
133
|
+
expect(resolveUrl('ftp://test.com', 'path')).toBe('ftp://test.com/path');
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
// Test case for the original error
|
|
137
|
+
it('should handle null or undefined parts', () => {
|
|
138
|
+
expect(resolveUrl('a', undefined, 'c')).toBe('a/c');
|
|
139
|
+
expect(resolveUrl(null, 'b', 'c')).toBe('b/c');
|
|
140
|
+
expect(resolveUrl('a', 'b', null)).toBe('a/b');
|
|
141
|
+
expect(resolveUrl(undefined, undefined, undefined)).toBe('');
|
|
142
|
+
expect(resolveUrl('/a', null, 'b', undefined, '/c/')).toBe('/a/b/c');
|
|
143
|
+
});
|
|
101
144
|
});
|