@paroicms/server 4.6.1 → 4.6.2
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/dist/helpers/url-helpers.d.ts.map +1 -1
- package/dist/helpers/url-helpers.js +6 -1
- package/dist/helpers/url-helpers.js.map +1 -1
- package/dist/running-server/media-api.d.ts.map +1 -1
- package/dist/running-server/media-api.js +3 -2
- package/dist/running-server/media-api.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-helpers.d.ts","sourceRoot":"","sources":["../../src/helpers/url-helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGxE,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,oBAAoB,GAC3B,MAAM,CAAC;AACV,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"url-helpers.d.ts","sourceRoot":"","sources":["../../src/helpers/url-helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGxE,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,oBAAoB,GAC3B,MAAM,CAAC;AACV,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAoBrC,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,QAAQ,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAAC;AACV,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,uBAAuB,EAC/B,OAAO,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAiBrC,MAAM,WAAW,kCAAkC;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,kCAAkC,GACzC,MAAM,CAAC;AACV,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,kCAAkC,EAC1C,OAAO,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAqBrC,wBAAgB,WAAW,CACzB,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,YAAY,GAAG,SAAS,CAAC,EAC7D,QAAQ,EAAE,MAAM,GACf,MAAM,CAKR;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAM5F"}
|
|
@@ -2,11 +2,16 @@ import { toAbsoluteUrl } from "@paroicms/internal-server-lib";
|
|
|
2
2
|
import mime from "mime";
|
|
3
3
|
export function makeUrlOfMediaFile(service, values, options) {
|
|
4
4
|
const { mediaId, mediaType, originalName, absoluteUrl } = values;
|
|
5
|
-
const filename =
|
|
5
|
+
const filename = appendMissingExtension(originalName ?? "unamed", fileExtensionOf(mediaType));
|
|
6
6
|
const relUrl = `/medias/${encodeURIComponent(mediaId)}/file/${encodeURIComponent(filename)}`;
|
|
7
7
|
const url = absoluteUrl ? toAbsoluteUrl(service, relUrl) : relUrl;
|
|
8
8
|
return options?.returnObj ? { url, filename } : url;
|
|
9
9
|
}
|
|
10
|
+
function appendMissingExtension(filename, extension) {
|
|
11
|
+
if (filename.toLowerCase().endsWith(extension.toLowerCase()))
|
|
12
|
+
return filename;
|
|
13
|
+
return `${filename}${extension}`;
|
|
14
|
+
}
|
|
10
15
|
export function makeUrlOfImageVariant(service, values, options) {
|
|
11
16
|
const { mediaId, mediaType, rawSizeName, slug, resourceVersion, absoluteUrl } = values;
|
|
12
17
|
const filename = `${slug ?? "unamed"}-${rawSizeName}${fileExtensionOf(mediaType)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/helpers/url-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAG9D,OAAO,IAAI,MAAM,MAAM,CAAC;AAkBxB,MAAM,UAAU,kBAAkB,CAChC,OAA8C,EAC9C,MAA4B,EAC5B,OAAiC;IAEjC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IACjE,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/helpers/url-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-api.d.ts","sourceRoot":"","sources":["../../src/running-server/media-api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,YAAY,EAAc,MAAM,+BAA+B,CAAC;AAC7F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"media-api.d.ts","sourceRoot":"","sources":["../../src/running-server/media-api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,YAAY,EAAc,MAAM,+BAA+B,CAAC;AAC7F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AASjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC,YAAY,CAAC,CAcvB;AAsCD,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAC1C,OAAO,CAAC,MAAM,EAAE,CAAC,CAQnB"}
|
|
@@ -6,6 +6,7 @@ import { addMediaToNode } from "../admin-backend/media/add-media-to-node.js";
|
|
|
6
6
|
import { getTypeNameOf } from "../admin-backend/node/node.queries.js";
|
|
7
7
|
import { extractNodeIdFromHandle, getNodeIdFromHandle } from "../common/media-handles.helpers.js";
|
|
8
8
|
import { invalidateMultipleDocumentsInCache } from "../common/text-cache.js";
|
|
9
|
+
import { removeExtensionFromFileName } from "../helpers/utils-helper.js";
|
|
9
10
|
export async function setMediaProgrammaticApi(siteContext, mediaInput) {
|
|
10
11
|
const { handle, filePath, attachedData, replace } = mediaInput;
|
|
11
12
|
const nodeId = getNodeIdFromHandle(siteContext, handle);
|
|
@@ -22,7 +23,7 @@ export async function setMediaProgrammaticApi(siteContext, mediaInput) {
|
|
|
22
23
|
}
|
|
23
24
|
async function addMediaFile(siteContext, options) {
|
|
24
25
|
const { nodeId, nodeType, path, handle, attachedData, replace } = options;
|
|
25
|
-
const
|
|
26
|
+
const originalName = removeExtensionFromFileName(basename(path));
|
|
26
27
|
const binaryFile = await readFile(path);
|
|
27
28
|
const mediaType = mime.getType(path);
|
|
28
29
|
if (!mediaType) {
|
|
@@ -30,7 +31,7 @@ async function addMediaFile(siteContext, options) {
|
|
|
30
31
|
}
|
|
31
32
|
return await addMediaToNode(siteContext, {
|
|
32
33
|
binaryFile,
|
|
33
|
-
originalName
|
|
34
|
+
originalName,
|
|
34
35
|
weightB: binaryFile.byteLength,
|
|
35
36
|
mediaType,
|
|
36
37
|
}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-api.js","sourceRoot":"","sources":["../../src/running-server/media-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAGpE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAClG,OAAO,EAAE,kCAAkC,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"media-api.js","sourceRoot":"","sources":["../../src/running-server/media-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAGpE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAClG,OAAO,EAAE,kCAAkC,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAGzE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,WAAwB,EACxB,UAAyB;IAEzB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAC/D,MAAM,MAAM,GAAG,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAErE,OAAO,MAAM,YAAY,CAAC,WAAW,EAAE;QACrC,MAAM;QACN,QAAQ;QACR,MAAM;QACN,IAAI,EAAE,QAAQ;QACd,YAAY;QACZ,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,WAAwB,EACxB,OAOC;IAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC1E,MAAM,YAAY,GAAG,2BAA2B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,MAAM,cAAc,CACzB,WAAW,EACX;QACE,UAAU;QACV,YAAY;QACZ,OAAO,EAAE,UAAU,CAAC,UAAU;QAC9B,SAAS;KACV,EACD;QACE,MAAM;QACN,QAAQ;QACR,MAAM;QACN,YAAY;QACZ,OAAO;KACR,CACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,WAAwB,EACxB,KAA2C;IAE3C,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACrE,MAAM,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,uBAAuB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrD,IAAI,MAAM,KAAK,SAAS;QAAE,MAAM,kCAAkC,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE5F,OAAO,UAAU,CAAC;AACpB,CAAC"}
|