@noctuatech/uswds 1.5.0 → 1.5.1
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/package.json +1 -1
- package/src/lib/file-input/filename.test.ts +24 -0
- package/src/lib/file-input/filename.ts +1 -1
- package/target/lib/file-input/filename.js +1 -1
- package/target/lib/file-input/filename.js.map +1 -1
- package/target/lib/file-input/filename.test.js +18 -0
- package/target/lib/file-input/filename.test.js.map +1 -1
package/package.json
CHANGED
|
@@ -25,4 +25,28 @@ describe('filenameFromResponse', () => {
|
|
|
25
25
|
const res = new Response(null, { headers: { 'content-disposition': 'attachment; foo=bar' } });
|
|
26
26
|
assert.equal(filenameFromResponse(res), 'downloaded-file');
|
|
27
27
|
});
|
|
28
|
+
|
|
29
|
+
it('correctly decodes URI-encoded filenames with special characters', () => {
|
|
30
|
+
const res = new Response(null, {
|
|
31
|
+
headers: { 'content-disposition': "attachment; filename*=UTF-8''report%20final%20(v2).pdf" },
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
assert.equal(filenameFromResponse(res), 'report final (v2).pdf');
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it('correctly decodes URI-encoded simple quoted filename', () => {
|
|
38
|
+
const res = new Response(null, {
|
|
39
|
+
headers: { 'content-disposition': 'attachment; filename="document%20(final).pdf"' },
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
assert.equal(filenameFromResponse(res), 'document (final).pdf');
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
it('correctly decodes URI-encoded simple unquoted filename', () => {
|
|
46
|
+
const res = new Response(null, {
|
|
47
|
+
headers: { 'content-disposition': 'attachment; filename=data%20file.csv' },
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
assert.equal(filenameFromResponse(res), 'data file.csv');
|
|
51
|
+
});
|
|
28
52
|
});
|
|
@@ -43,7 +43,7 @@ export function filenameFromResponse(response: Response): string {
|
|
|
43
43
|
contentDisposition.match(/filename\s*=\s*"([^"]+)"/i) || contentDisposition.match(/filename\s*=\s*([^;]+)/i);
|
|
44
44
|
|
|
45
45
|
if (filenameMatch) {
|
|
46
|
-
return filenameMatch[1].trim().replace(/^"|"$/g, '');
|
|
46
|
+
return decodeURIComponent(filenameMatch[1].trim().replace(/^"|"$/g, ''));
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
return fallback;
|
|
@@ -32,7 +32,7 @@ export function filenameFromResponse(response) {
|
|
|
32
32
|
// Try simple filename="file.jpg" or filename=file.jpg
|
|
33
33
|
const filenameMatch = contentDisposition.match(/filename\s*=\s*"([^"]+)"/i) || contentDisposition.match(/filename\s*=\s*([^;]+)/i);
|
|
34
34
|
if (filenameMatch) {
|
|
35
|
-
return filenameMatch[1].trim().replace(/^"|"$/g, '');
|
|
35
|
+
return decodeURIComponent(filenameMatch[1].trim().replace(/^"|"$/g, ''));
|
|
36
36
|
}
|
|
37
37
|
return fallback;
|
|
38
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filename.js","sourceRoot":"","sources":["../../../src/lib/file-input/filename.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAkB;IACrD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACvE,4FAA4F;IAE5F,IAAI,GAAG,GAAe,IAAI,CAAC;IAE3B,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,iBAAiB,CAAC;IAErE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,2DAA2D;IAC3D,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEhF,IAAI,iBAAiB,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,IAAI,KAAK,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAE9D,8DAA8D;YAC9D,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEpC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;YAED,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,sDAAsD;IACtD,MAAM,aAAa,GACjB,kBAAkB,CAAC,KAAK,CAAC,2BAA2B,CAAC,IAAI,kBAAkB,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAE/G,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"filename.js","sourceRoot":"","sources":["../../../src/lib/file-input/filename.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAkB;IACrD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACvE,4FAA4F;IAE5F,IAAI,GAAG,GAAe,IAAI,CAAC;IAE3B,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,iBAAiB,CAAC;IAErE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,2DAA2D;IAC3D,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEhF,IAAI,iBAAiB,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,IAAI,KAAK,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAE9D,8DAA8D;YAC9D,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEpC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;YAED,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,sDAAsD;IACtD,MAAM,aAAa,GACjB,kBAAkB,CAAC,KAAK,CAAC,2BAA2B,CAAC,IAAI,kBAAkB,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAE/G,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -19,5 +19,23 @@ describe('filenameFromResponse', () => {
|
|
|
19
19
|
const res = new Response(null, { headers: { 'content-disposition': 'attachment; foo=bar' } });
|
|
20
20
|
assert.equal(filenameFromResponse(res), 'downloaded-file');
|
|
21
21
|
});
|
|
22
|
+
it('correctly decodes URI-encoded filenames with special characters', () => {
|
|
23
|
+
const res = new Response(null, {
|
|
24
|
+
headers: { 'content-disposition': "attachment; filename*=UTF-8''report%20final%20(v2).pdf" },
|
|
25
|
+
});
|
|
26
|
+
assert.equal(filenameFromResponse(res), 'report final (v2).pdf');
|
|
27
|
+
});
|
|
28
|
+
it('correctly decodes URI-encoded simple quoted filename', () => {
|
|
29
|
+
const res = new Response(null, {
|
|
30
|
+
headers: { 'content-disposition': 'attachment; filename="document%20(final).pdf"' },
|
|
31
|
+
});
|
|
32
|
+
assert.equal(filenameFromResponse(res), 'document (final).pdf');
|
|
33
|
+
});
|
|
34
|
+
it('correctly decodes URI-encoded simple unquoted filename', () => {
|
|
35
|
+
const res = new Response(null, {
|
|
36
|
+
headers: { 'content-disposition': 'attachment; filename=data%20file.csv' },
|
|
37
|
+
});
|
|
38
|
+
assert.equal(filenameFromResponse(res), 'data file.csv');
|
|
39
|
+
});
|
|
22
40
|
});
|
|
23
41
|
//# sourceMappingURL=filename.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filename.test.js","sourceRoot":"","sources":["../../../src/lib/file-input/filename.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC7B,OAAO,EAAE,EAAE,qBAAqB,EAAE,8CAA8C,EAAE;SACnF,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,qBAAqB,EAAE,kCAAkC,EAAE,EAAE,CAAC,CAAC;QAC3G,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,qBAAqB,EAAE,gCAAgC,EAAE,EAAE,CAAC,CAAC;QACzG,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;QAC9F,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"filename.test.js","sourceRoot":"","sources":["../../../src/lib/file-input/filename.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC7B,OAAO,EAAE,EAAE,qBAAqB,EAAE,8CAA8C,EAAE;SACnF,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,qBAAqB,EAAE,kCAAkC,EAAE,EAAE,CAAC,CAAC;QAC3G,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,qBAAqB,EAAE,gCAAgC,EAAE,EAAE,CAAC,CAAC;QACzG,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;QAC9F,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC7B,OAAO,EAAE,EAAE,qBAAqB,EAAE,wDAAwD,EAAE;SAC7F,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,uBAAuB,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC7B,OAAO,EAAE,EAAE,qBAAqB,EAAE,+CAA+C,EAAE;SACpF,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,sBAAsB,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC7B,OAAO,EAAE,EAAE,qBAAqB,EAAE,sCAAsC,EAAE;SAC3E,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|