@magda/typescript-common 3.0.0-alpha.1 → 3.0.0

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.
@@ -28,7 +28,7 @@ export function removeInvalidChars(input) {
28
28
  if (!input || typeof input !== "string") {
29
29
  return "";
30
30
  }
31
- return input.replace(InvalidCharsRegEx, "").replace(/\.+$/, "");
31
+ return input.replace(/[^a-zA-Z0-9\-_.]/g, "").replace(/\.+$/, "");
32
32
  }
33
33
  /**
34
34
  * a valid s3 object key should be no more than 1024 char and only contains char as per:
@@ -93,21 +93,21 @@ export function getValidS3ObjectKey(datasetId, distId, fileName) {
93
93
  const extNameIdx = processedFileName.lastIndexOf(".");
94
94
  if (extNameIdx === -1) {
95
95
  //there is no extension name, just simply cut the file name to make object key length fall under MAX_KEY_LENGTH
96
- return `${processedDatasetId}/${processedDistId}/${processedFileName}`.substr(0, MAX_KEY_LENGTH);
96
+ return `${processedDatasetId}/${processedDistId}/${processedFileName}`.substring(0, MAX_KEY_LENGTH);
97
97
  }
98
98
  // file extension name length (including `.`)
99
99
  const extNameLength = processedFileName.length - extNameIdx;
100
100
  const extNameLengthDiff = extNameLength - 32;
101
101
  if (extNameLengthDiff > 0) {
102
102
  // cut the extName to 32 chars long
103
- processedFileName = processedFileName.substr(0, processedFileName.length - extNameLengthDiff);
103
+ processedFileName = processedFileName.substring(0, processedFileName.length - extNameLengthDiff);
104
104
  if (totalLength - extNameLengthDiff < MAX_KEY_LENGTH) {
105
105
  return `${processedDatasetId}/${processedDistId}/${processedFileName}`;
106
106
  }
107
107
  }
108
108
  // still too long after cut file extension name, will have to shorten the portion before `.` of the file name
109
109
  const newExtNameIdx = processedFileName.lastIndexOf(".");
110
- const newExtName = processedFileName.substr(newExtNameIdx);
110
+ const newExtName = processedFileName.substring(newExtNameIdx);
111
111
  const newFileNameNoExtName = processedFileName.substring(0, newExtNameIdx);
112
112
  // cut newFileNameNoExtName to make total length fall under MAX_KEY_LENGTH
113
113
  const excessLength = processedDatasetId.length +
@@ -115,7 +115,7 @@ export function getValidS3ObjectKey(datasetId, distId, fileName) {
115
115
  processedFileName.length +
116
116
  2 -
117
117
  MAX_KEY_LENGTH;
118
- return `${processedDatasetId}/${processedDistId}/${newFileNameNoExtName.substr(0, newFileNameNoExtName.length - excessLength)}${newExtName}`;
118
+ return `${processedDatasetId}/${processedDistId}/${newFileNameNoExtName.substring(0, newFileNameNoExtName.length - excessLength)}${newExtName}`;
119
119
  }
120
120
  export default function getStorageUrl(datasetId, distId, fileName) {
121
121
  const validObjectKey = getValidS3ObjectKey(datasetId, distId, fileName);
@@ -1 +1 @@
1
- {"version":3,"file":"getStorageUrl.js","sourceRoot":"","sources":["../src/getStorageUrl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getStorageUrl.js","sourceRoot":"","sources":["../src/getStorageUrl.ts"],"names":[],"mappings":"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"}
@@ -41,6 +41,12 @@ describe("getStorageUrl", function () {
41
41
  verifyUrl("ds-" + generateStr(32), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) => expect(storageUrl.indexOf("test.exe")).not.equal(-1)) &&
42
42
  verifyUrl("ds-" + Array(99999).fill("a").join(""), "dis-" + Array(99999).fill("a").join(""), "test.exe", (storageUrl) => expect(storageUrl.indexOf("test.exe")).not.equal(-1)));
43
43
  });
44
+ it("should generate storage url without html entities", () => {
45
+ const fileName = "Genotype by environment studies across Australia reveal the importance\nof phenology for chickpea (Cicer arietinum L.) improvement.pdf";
46
+ verifyUrl("ds-" + generateStr(32), "dis-" + generateStr(32), fileName, (url) => {
47
+ expect(url).not.contain("%");
48
+ });
49
+ });
44
50
  });
45
51
  describe("isValidS3ObjectKey", () => {
46
52
  it("should return false for `sds//sds`", () => {
@@ -1 +1 @@
1
- {"version":3,"file":"getStorageUrl.spec.js","sourceRoot":"","sources":["../../src/test/getStorageUrl.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getStorageUrl.spec.js","sourceRoot":"","sources":["../../src/test/getStorageUrl.spec.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@magda/typescript-common",
3
3
  "description": "Common TypeScript code shared between components.",
4
- "version": "3.0.0-alpha.1",
4
+ "version": "3.0.0",
5
5
  "license": "Apache-2.0",
6
6
  "type": "module",
7
7
  "exports": {
@@ -23,8 +23,8 @@
23
23
  },
24
24
  "devDependencies": {
25
25
  "@magda/esm-utils": "^1.0.1",
26
- "@magda/registry-aspects": "^3.0.0-alpha.1",
27
- "@magda/scripts": "^3.0.0-alpha.1",
26
+ "@magda/registry-aspects": "^3.0.0",
27
+ "@magda/scripts": "^3.0.0",
28
28
  "@types/chai": "^4.3.11",
29
29
  "@types/chai-as-promised": "^7.1.0",
30
30
  "@types/cross-spawn": "^6.0.1",
@@ -62,7 +62,7 @@
62
62
  "@types/vfile-message": "^2.0.0",
63
63
  "caller-path": "^4.0.0",
64
64
  "cross-fetch": "^4.0.0",
65
- "crypto-js": "^4.1.1",
65
+ "crypto-js": "^4.2.0",
66
66
  "dompurify": "^2.3.0",
67
67
  "express": "^4.17.2",
68
68
  "jsonwebtoken": "^9.0.2",