@unchainedshop/core-files 2.13.0 → 3.0.0-alpha2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureFilesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureFilesModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAmB,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAQ,WAAW,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AASxF,eAAO,MAAM,oBAAoB,mCAG9B,WAAW,CAAC,oBAAoB,CAAC,KAAG,OAAO,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"configureFilesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureFilesModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAmB,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAQ,WAAW,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AASxF,eAAO,MAAM,oBAAoB,mCAG9B,WAAW,CAAC,oBAAoB,CAAC,KAAG,OAAO,CAAC,WAAW,CAwDzD,CAAC"}
|
|
@@ -17,22 +17,15 @@ export const configureFilesModule = async ({ db, options: filesOptions = {}, })
|
|
|
17
17
|
if (!file?.url)
|
|
18
18
|
return null;
|
|
19
19
|
const transformedURLString = filesSettings.transformUrl(file.url, params);
|
|
20
|
-
|
|
21
|
-
// If the url is absolute, return
|
|
20
|
+
if (URL.canParse(transformedURLString)) {
|
|
22
21
|
const finalURL = new URL(transformedURLString);
|
|
23
22
|
return finalURL.href;
|
|
24
23
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const finalURL = new URL(transformedURLString, process.env.ROOT_URL);
|
|
29
|
-
return finalURL.href;
|
|
30
|
-
}
|
|
31
|
-
catch (e2) {
|
|
32
|
-
// else return the transformed string because it's not an URL
|
|
33
|
-
return transformedURLString;
|
|
34
|
-
}
|
|
24
|
+
else if (URL.canParse(transformedURLString, process.env.ROOT_URL)) {
|
|
25
|
+
const finalURL = new URL(transformedURLString, process.env.ROOT_URL);
|
|
26
|
+
return finalURL.href;
|
|
35
27
|
}
|
|
28
|
+
return transformedURLString;
|
|
36
29
|
},
|
|
37
30
|
findFile: async ({ fileId }, options) => {
|
|
38
31
|
return Files.findOne(generateDbFilterById(fileId), options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureFilesModule.js","sourceRoot":"","sources":["../../src/module/configureFilesModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,GAAa,CAAC,aAAa,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;AAE5E,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,EAAE,EACF,OAAO,EAAE,YAAY,GAAG,EAAE,GACQ,EAAwB,EAAE;IAC5D,cAAc,CAAC,WAAW,CAAC,CAAC;IAE5B,WAAW;IACX,MAAM,aAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,sBAAsB,CAAC,EAAE,CAAC,CAAC;IAE/C,MAAM,SAAS,GAAG,mBAAmB,CAAO,KAAK,EAAE,kBAAkB,EAAE;QACrE,0BAA0B,EAAE,IAAI;KACjC,CAA0B,CAAC;IAE5B,OAAO;QACL,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACvB,IAAI,CAAC,IAAI,EAAE,GAAG;gBAAE,OAAO,IAAI,CAAC;YAC5B,MAAM,oBAAoB,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC1E,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"configureFilesModule.js","sourceRoot":"","sources":["../../src/module/configureFilesModule.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-files",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0-alpha2",
|
|
4
4
|
"main": "lib/files-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/files-index.js",
|
|
@@ -31,16 +31,16 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@unchainedshop/events": "^
|
|
35
|
-
"@unchainedshop/file-upload": "^
|
|
36
|
-
"@unchainedshop/logger": "^
|
|
37
|
-
"@unchainedshop/utils": "^
|
|
34
|
+
"@unchainedshop/events": "^3.0.0-alpha2",
|
|
35
|
+
"@unchainedshop/file-upload": "^3.0.0-alpha2",
|
|
36
|
+
"@unchainedshop/logger": "^3.0.0-alpha2",
|
|
37
|
+
"@unchainedshop/utils": "^3.0.0-alpha2",
|
|
38
38
|
"mime-types": "^2.1.35",
|
|
39
39
|
"simpl-schema": "^3.4.6"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/node": "^20.14.12",
|
|
43
|
-
"@unchainedshop/types": "^
|
|
43
|
+
"@unchainedshop/types": "^3.0.0-alpha2",
|
|
44
44
|
"jest": "^29.7.0",
|
|
45
45
|
"ts-jest": "^29.2.3",
|
|
46
46
|
"typescript": "^5.5.4"
|
|
@@ -27,20 +27,14 @@ export const configureFilesModule = async ({
|
|
|
27
27
|
getUrl: (file, params) => {
|
|
28
28
|
if (!file?.url) return null;
|
|
29
29
|
const transformedURLString = filesSettings.transformUrl(file.url, params);
|
|
30
|
-
|
|
31
|
-
// If the url is absolute, return
|
|
30
|
+
if (URL.canParse(transformedURLString)) {
|
|
32
31
|
const finalURL = new URL(transformedURLString);
|
|
33
32
|
return finalURL.href;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
const finalURL = new URL(transformedURLString, process.env.ROOT_URL);
|
|
38
|
-
return finalURL.href;
|
|
39
|
-
} catch (e2) {
|
|
40
|
-
// else return the transformed string because it's not an URL
|
|
41
|
-
return transformedURLString;
|
|
42
|
-
}
|
|
33
|
+
} else if (URL.canParse(transformedURLString, process.env.ROOT_URL)) {
|
|
34
|
+
const finalURL = new URL(transformedURLString, process.env.ROOT_URL);
|
|
35
|
+
return finalURL.href;
|
|
43
36
|
}
|
|
37
|
+
return transformedURLString;
|
|
44
38
|
},
|
|
45
39
|
|
|
46
40
|
findFile: async ({ fileId }, options) => {
|