@payloadcms/transformer-sharp 4.0.0-internal.5e065b3 → 4.0.0-internal.6e89a16
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/initSharpCollections.d.ts +6 -6
- package/dist/initSharpCollections.d.ts.map +1 -1
- package/dist/initSharpCollections.js +14 -58
- package/dist/initSharpCollections.js.map +1 -1
- package/dist/initSharpCollections.spec.js +20 -7
- package/dist/initSharpCollections.spec.js.map +1 -1
- package/dist/prepareLegacyUpload.d.ts.map +1 -1
- package/dist/prepareLegacyUpload.js +3 -11
- package/dist/prepareLegacyUpload.js.map +1 -1
- package/dist/sharpTransformer.d.ts.map +1 -1
- package/dist/sharpTransformer.js +11 -3
- package/dist/sharpTransformer.js.map +1 -1
- package/dist/sharpTransformer.spec.js +30 -0
- package/dist/sharpTransformer.spec.js.map +1 -1
- package/dist/transformFile.d.ts.map +1 -1
- package/dist/transformFile.js +5 -3
- package/dist/transformFile.js.map +1 -1
- package/dist/transformFile.spec.js +99 -0
- package/dist/transformFile.spec.js.map +1 -1
- package/package.json +17 -19
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import type { Config } from 'payload';
|
|
2
2
|
import type { SharpCollectionConfig } from './types.js';
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
* `
|
|
7
|
-
*
|
|
8
|
-
* generation and Admin UI keep working without knowing about Sharp.
|
|
4
|
+
* Registers the `variants` of `sharpTransformer({ collections })` with `registerUploadVariants`,
|
|
5
|
+
* which checks each collection and size name. Then writes `crop`/`focalPoint`/
|
|
6
|
+
* `hasImageAdjustments` onto each targeted collection's sanitized `upload` config, so core's own
|
|
7
|
+
* field generation and Admin UI keep working without knowing about Sharp.
|
|
9
8
|
*/
|
|
10
|
-
export declare function initSharpCollections({ collections, config, }: {
|
|
9
|
+
export declare function initSharpCollections({ collections, config, transformerSlug, }: {
|
|
11
10
|
collections: Partial<Record<string, SharpCollectionConfig>>;
|
|
12
11
|
config: Config;
|
|
12
|
+
transformerSlug: string;
|
|
13
13
|
}): Config;
|
|
14
14
|
//# sourceMappingURL=initSharpCollections.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSharpCollections.d.ts","sourceRoot":"","sources":["../src/initSharpCollections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAyB,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"initSharpCollections.d.ts","sourceRoot":"","sources":["../src/initSharpCollections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAyB,MAAM,SAAS,CAAA;AAI5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAEvD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,WAAW,EACX,MAAM,EACN,eAAe,GAChB,EAAE;IACD,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAC3D,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,EAAE,MAAM,CAAA;CACxB,GAAG,MAAM,CAqCT"}
|
|
@@ -1,57 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
'filename',
|
|
3
|
-
'mimeType',
|
|
4
|
-
'filesize',
|
|
5
|
-
'width',
|
|
6
|
-
'height',
|
|
7
|
-
'url',
|
|
8
|
-
'thumbnailURL',
|
|
9
|
-
'variants',
|
|
10
|
-
'focalX',
|
|
11
|
-
'focalY'
|
|
12
|
-
];
|
|
1
|
+
import { registerUploadVariants } from 'payload';
|
|
13
2
|
/**
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
* `
|
|
17
|
-
*
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
const collection = config.collections?.find((candidate)=>candidate.slug === slug);
|
|
26
|
-
if (!collection) {
|
|
27
|
-
errors.push(`sharpTransformer collections."${slug}" does not match any configured collection slug.`);
|
|
28
|
-
continue;
|
|
29
|
-
}
|
|
30
|
-
if (!collection.upload) {
|
|
31
|
-
errors.push(`sharpTransformer collections."${slug}" targets a collection whose \`upload\` option is not set. Enable uploads on "${slug}" first.`);
|
|
32
|
-
continue;
|
|
33
|
-
}
|
|
34
|
-
const seenSizeNames = new Set();
|
|
35
|
-
for (const size of sharpConfig.variants ?? []){
|
|
36
|
-
if (typeof size.name !== 'string' || size.name.trim().length === 0) {
|
|
37
|
-
errors.push(`sharpTransformer collections."${slug}".variants has an entry missing a valid \`name\`.`);
|
|
38
|
-
continue;
|
|
39
|
-
}
|
|
40
|
-
if (seenSizeNames.has(size.name)) {
|
|
41
|
-
errors.push(`sharpTransformer collections."${slug}".variants has a duplicate size name: "${size.name}".`);
|
|
42
|
-
}
|
|
43
|
-
seenSizeNames.add(size.name);
|
|
44
|
-
if (RESERVED_IMAGE_SIZE_NAMES.includes(size.name)) {
|
|
45
|
-
errors.push(`sharpTransformer collections."${slug}".variants uses reserved name "${size.name}", which collides with a built-in upload field. Choose a different name.`);
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
if (errors.length > 0) {
|
|
50
|
-
throw new Error(`Invalid \`sharpTransformer({ collections })\` configuration:\n${errors.join('\n')}`);
|
|
51
|
-
}
|
|
3
|
+
* Registers the `variants` of `sharpTransformer({ collections })` with `registerUploadVariants`,
|
|
4
|
+
* which checks each collection and size name. Then writes `crop`/`focalPoint`/
|
|
5
|
+
* `hasImageAdjustments` onto each targeted collection's sanitized `upload` config, so core's own
|
|
6
|
+
* field generation and Admin UI keep working without knowing about Sharp.
|
|
7
|
+
*/ export function initSharpCollections({ collections, config, transformerSlug }) {
|
|
8
|
+
const registeredConfig = registerUploadVariants({
|
|
9
|
+
collections,
|
|
10
|
+
config,
|
|
11
|
+
transformerSlug
|
|
12
|
+
});
|
|
52
13
|
// Write onto copies, never the caller's config or collection objects: a rebuilt config (e.g. on
|
|
53
14
|
// a dev reload) would otherwise see `upload.variants` on the collection and reject it as authored.
|
|
54
|
-
const sanitizedCollections =
|
|
15
|
+
const sanitizedCollections = registeredConfig.collections?.map((collection)=>{
|
|
55
16
|
const sharpConfig = collections[collection.slug];
|
|
56
17
|
if (!sharpConfig || !collection.upload) {
|
|
57
18
|
return collection;
|
|
@@ -63,12 +24,7 @@ const RESERVED_IMAGE_SIZE_NAMES = [
|
|
|
63
24
|
// unset Sharp option can't silently re-enable a collection's `crop: false`.
|
|
64
25
|
crop: sharpConfig.crop ?? authoredUpload.crop,
|
|
65
26
|
focalPoint: sharpConfig.focalPoint ?? authoredUpload.focalPoint,
|
|
66
|
-
hasImageAdjustments: Boolean(sharpConfig.resizeOptions || sharpConfig.formatOptions || sharpConfig.trimOptions || sharpConfig.constructorOptions || sharpConfig.withMetadata)
|
|
67
|
-
variants: sharpConfig.variants?.map(({ name, admin, generateImageName })=>({
|
|
68
|
-
name,
|
|
69
|
-
admin,
|
|
70
|
-
generateImageName
|
|
71
|
-
}))
|
|
27
|
+
hasImageAdjustments: Boolean(sharpConfig.resizeOptions || sharpConfig.formatOptions || sharpConfig.trimOptions || sharpConfig.constructorOptions || sharpConfig.withMetadata)
|
|
72
28
|
};
|
|
73
29
|
return {
|
|
74
30
|
...collection,
|
|
@@ -76,7 +32,7 @@ const RESERVED_IMAGE_SIZE_NAMES = [
|
|
|
76
32
|
};
|
|
77
33
|
});
|
|
78
34
|
return {
|
|
79
|
-
...
|
|
35
|
+
...registeredConfig,
|
|
80
36
|
collections: sanitizedCollections
|
|
81
37
|
};
|
|
82
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/initSharpCollections.ts"],"sourcesContent":["import type { Config, SanitizedUploadConfig } from 'payload'\n\nimport
|
|
1
|
+
{"version":3,"sources":["../src/initSharpCollections.ts"],"sourcesContent":["import type { Config, SanitizedUploadConfig } from 'payload'\n\nimport { registerUploadVariants } from 'payload'\n\nimport type { SharpCollectionConfig } from './types.js'\n\n/**\n * Registers the `variants` of `sharpTransformer({ collections })` with `registerUploadVariants`,\n * which checks each collection and size name. Then writes `crop`/`focalPoint`/\n * `hasImageAdjustments` onto each targeted collection's sanitized `upload` config, so core's own\n * field generation and Admin UI keep working without knowing about Sharp.\n */\nexport function initSharpCollections({\n collections,\n config,\n transformerSlug,\n}: {\n collections: Partial<Record<string, SharpCollectionConfig>>\n config: Config\n transformerSlug: string\n}): Config {\n const registeredConfig = registerUploadVariants({\n collections,\n config,\n transformerSlug,\n })\n\n // Write onto copies, never the caller's config or collection objects: a rebuilt config (e.g. on\n // a dev reload) would otherwise see `upload.variants` on the collection and reject it as authored.\n const sanitizedCollections = registeredConfig.collections?.map((collection) => {\n const sharpConfig = collections[collection.slug]\n\n if (!sharpConfig || !collection.upload) {\n return collection\n }\n\n const authoredUpload = typeof collection.upload === 'object' ? collection.upload : {}\n\n const upload: Partial<SanitizedUploadConfig> = {\n ...authoredUpload,\n // Sharp's setting wins when given; otherwise keep the collection's own, so an\n // unset Sharp option can't silently re-enable a collection's `crop: false`.\n crop: sharpConfig.crop ?? authoredUpload.crop,\n focalPoint: sharpConfig.focalPoint ?? authoredUpload.focalPoint,\n hasImageAdjustments: Boolean(\n sharpConfig.resizeOptions ||\n sharpConfig.formatOptions ||\n sharpConfig.trimOptions ||\n sharpConfig.constructorOptions ||\n sharpConfig.withMetadata,\n ),\n }\n\n return { ...collection, upload }\n })\n\n return { ...registeredConfig, collections: sanitizedCollections }\n}\n"],"names":["registerUploadVariants","initSharpCollections","collections","config","transformerSlug","registeredConfig","sanitizedCollections","map","collection","sharpConfig","slug","upload","authoredUpload","crop","focalPoint","hasImageAdjustments","Boolean","resizeOptions","formatOptions","trimOptions","constructorOptions","withMetadata"],"mappings":"AAEA,SAASA,sBAAsB,QAAQ,UAAS;AAIhD;;;;;CAKC,GACD,OAAO,SAASC,qBAAqB,EACnCC,WAAW,EACXC,MAAM,EACNC,eAAe,EAKhB;IACC,MAAMC,mBAAmBL,uBAAuB;QAC9CE;QACAC;QACAC;IACF;IAEA,gGAAgG;IAChG,mGAAmG;IACnG,MAAME,uBAAuBD,iBAAiBH,WAAW,EAAEK,IAAI,CAACC;QAC9D,MAAMC,cAAcP,WAAW,CAACM,WAAWE,IAAI,CAAC;QAEhD,IAAI,CAACD,eAAe,CAACD,WAAWG,MAAM,EAAE;YACtC,OAAOH;QACT;QAEA,MAAMI,iBAAiB,OAAOJ,WAAWG,MAAM,KAAK,WAAWH,WAAWG,MAAM,GAAG,CAAC;QAEpF,MAAMA,SAAyC;YAC7C,GAAGC,cAAc;YACjB,8EAA8E;YAC9E,4EAA4E;YAC5EC,MAAMJ,YAAYI,IAAI,IAAID,eAAeC,IAAI;YAC7CC,YAAYL,YAAYK,UAAU,IAAIF,eAAeE,UAAU;YAC/DC,qBAAqBC,QACnBP,YAAYQ,aAAa,IACzBR,YAAYS,aAAa,IACzBT,YAAYU,WAAW,IACvBV,YAAYW,kBAAkB,IAC9BX,YAAYY,YAAY;QAE5B;QAEA,OAAO;YAAE,GAAGb,UAAU;YAAEG;QAAO;IACjC;IAEA,OAAO;QAAE,GAAGN,gBAAgB;QAAEH,aAAaI;IAAqB;AAClE"}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
import { describe, expect, it } from 'vitest';
|
|
2
2
|
import { initSharpCollections } from './initSharpCollections.js';
|
|
3
3
|
const makeConfig = (collections)=>({
|
|
4
|
-
collections
|
|
4
|
+
collections,
|
|
5
|
+
upload: {
|
|
6
|
+
transformers: [
|
|
7
|
+
{
|
|
8
|
+
slug: 'sharp'
|
|
9
|
+
}
|
|
10
|
+
]
|
|
11
|
+
}
|
|
5
12
|
});
|
|
6
13
|
const uploadCollection = ({ slug, upload = {} })=>({
|
|
7
14
|
slug,
|
|
@@ -12,7 +19,8 @@ describe('initSharpCollections', ()=>{
|
|
|
12
19
|
const config = makeConfig(undefined);
|
|
13
20
|
expect(()=>initSharpCollections({
|
|
14
21
|
collections: {},
|
|
15
|
-
config
|
|
22
|
+
config,
|
|
23
|
+
transformerSlug: 'sharp'
|
|
16
24
|
})).not.toThrow();
|
|
17
25
|
});
|
|
18
26
|
it.each([
|
|
@@ -47,7 +55,8 @@ describe('initSharpCollections', ()=>{
|
|
|
47
55
|
collections: {
|
|
48
56
|
media: sharpConfig
|
|
49
57
|
},
|
|
50
|
-
config
|
|
58
|
+
config,
|
|
59
|
+
transformerSlug: 'sharp'
|
|
51
60
|
});
|
|
52
61
|
expect(result.collections?.[0]?.upload).toMatchObject(expected);
|
|
53
62
|
});
|
|
@@ -73,7 +82,8 @@ describe('initSharpCollections', ()=>{
|
|
|
73
82
|
]
|
|
74
83
|
}
|
|
75
84
|
},
|
|
76
|
-
config
|
|
85
|
+
config,
|
|
86
|
+
transformerSlug: 'sharp'
|
|
77
87
|
});
|
|
78
88
|
expect(result.collections?.[0]?.upload).toMatchObject({
|
|
79
89
|
variants: [
|
|
@@ -112,7 +122,8 @@ describe('initSharpCollections', ()=>{
|
|
|
112
122
|
collections: {
|
|
113
123
|
[slug]: {}
|
|
114
124
|
},
|
|
115
|
-
config
|
|
125
|
+
config,
|
|
126
|
+
transformerSlug: 'sharp'
|
|
116
127
|
})).toThrow(new RegExp(`"${slug}"`));
|
|
117
128
|
});
|
|
118
129
|
it.each([
|
|
@@ -158,7 +169,8 @@ describe('initSharpCollections', ()=>{
|
|
|
158
169
|
variants: variants
|
|
159
170
|
}
|
|
160
171
|
},
|
|
161
|
-
config
|
|
172
|
+
config,
|
|
173
|
+
transformerSlug: 'sharp'
|
|
162
174
|
})).toThrow(error);
|
|
163
175
|
});
|
|
164
176
|
it('should allow a variants entry with neither width nor height (format-only/pass-through size)', ()=>{
|
|
@@ -177,7 +189,8 @@ describe('initSharpCollections', ()=>{
|
|
|
177
189
|
]
|
|
178
190
|
}
|
|
179
191
|
},
|
|
180
|
-
config
|
|
192
|
+
config,
|
|
193
|
+
transformerSlug: 'sharp'
|
|
181
194
|
})).not.toThrow();
|
|
182
195
|
});
|
|
183
196
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/initSharpCollections.spec.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport type { SharpCollectionConfig } from './types.js'\n\nimport { initSharpCollections } from './initSharpCollections.js'\n\nconst makeConfig = (collections: Config['collections']): Config =>\n ({\n collections,\n }) as unknown as Config\n\nconst uploadCollection = ({\n slug,\n upload = {},\n}: {\n slug: string\n upload?: boolean | Record<string, unknown>\n}) => ({ slug, upload }) as unknown as NonNullable<Config['collections']>[number]\n\ndescribe('initSharpCollections', () => {\n it('should not throw when the config has no collections', () => {\n const config = makeConfig(undefined)\n\n expect(()
|
|
1
|
+
{"version":3,"sources":["../src/initSharpCollections.spec.ts"],"sourcesContent":["import type { Config } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport type { SharpCollectionConfig } from './types.js'\n\nimport { initSharpCollections } from './initSharpCollections.js'\n\nconst makeConfig = (collections: Config['collections']): Config =>\n ({\n collections,\n upload: { transformers: [{ slug: 'sharp' }] },\n }) as unknown as Config\n\nconst uploadCollection = ({\n slug,\n upload = {},\n}: {\n slug: string\n upload?: boolean | Record<string, unknown>\n}) => ({ slug, upload }) as unknown as NonNullable<Config['collections']>[number]\n\ndescribe('initSharpCollections', () => {\n it('should not throw when the config has no collections', () => {\n const config = makeConfig(undefined)\n\n expect(() =>\n initSharpCollections({ collections: {}, config, transformerSlug: 'sharp' }),\n ).not.toThrow()\n })\n\n it.each([\n { expected: { crop: false, focalPoint: false }, sharpConfig: {} },\n { expected: { crop: true, focalPoint: true }, sharpConfig: { crop: true, focalPoint: true } },\n ])(\n \"should let Sharp's crop and focalPoint override the collection's only when set (%#)\",\n ({ expected, sharpConfig }) => {\n const config = makeConfig([\n uploadCollection({ slug: 'media', upload: { crop: false, focalPoint: false } }),\n ])\n\n const result = initSharpCollections({\n collections: { media: sharpConfig },\n config,\n transformerSlug: 'sharp',\n })\n\n expect(result.collections?.[0]?.upload).toMatchObject(expected)\n },\n )\n\n it('should write variants onto a copy, leaving the caller config untouched', () => {\n const authoredCollection = uploadCollection({ slug: 'media', upload: { staticDir: 'media' } })\n const authoredCollections = [authoredCollection]\n const config = makeConfig(authoredCollections)\n\n const result = initSharpCollections({\n collections: { media: { variants: [{ name: 'thumbnail', width: 100 }] } },\n config,\n transformerSlug: 'sharp',\n })\n\n expect(result.collections?.[0]?.upload).toMatchObject({\n variants: [{ name: 'thumbnail' }],\n staticDir: 'media',\n })\n expect(result).not.toBe(config)\n expect(result.collections?.[0]).not.toBe(authoredCollection)\n expect(config.collections).toBe(authoredCollections)\n expect(authoredCollection.upload).toEqual({ staticDir: 'media' })\n })\n\n it.each([\n { collection: uploadCollection({ slug: 'media' }), slug: 'missing' },\n { collection: uploadCollection({ slug: 'posts', upload: false }), slug: 'posts' },\n ])(\n 'should throw when the configured collection \"$slug\" is missing or not upload-enabled',\n ({ collection, slug }) => {\n const config = makeConfig([collection])\n\n expect(() =>\n initSharpCollections({ collections: { [slug]: {} }, config, transformerSlug: 'sharp' }),\n ).toThrow(new RegExp(`\"${slug}\"`))\n },\n )\n\n it.each([\n {\n error: /duplicate/i,\n variants: [\n { name: 'square', width: 100 },\n { name: 'square', width: 200 },\n ],\n },\n { error: /reserved/i, variants: [{ name: 'filename', width: 100 }] },\n { error: /name/i, variants: [{ width: 100 }] },\n ])('should reject invalid variants ($error)', ({ error, variants }) => {\n const config = makeConfig([uploadCollection({ slug: 'media' })])\n\n expect(() =>\n initSharpCollections({\n collections: { media: { variants: variants as SharpCollectionConfig['variants'] } },\n config,\n transformerSlug: 'sharp',\n }),\n ).toThrow(error)\n })\n\n it('should allow a variants entry with neither width nor height (format-only/pass-through size)', () => {\n const config = makeConfig([uploadCollection({ slug: 'media' })])\n\n expect(() =>\n initSharpCollections({\n collections: { media: { variants: [{ name: 'noDimensions' }] } },\n config,\n transformerSlug: 'sharp',\n }),\n ).not.toThrow()\n })\n})\n"],"names":["describe","expect","it","initSharpCollections","makeConfig","collections","upload","transformers","slug","uploadCollection","config","undefined","transformerSlug","not","toThrow","each","expected","crop","focalPoint","sharpConfig","result","media","toMatchObject","authoredCollection","staticDir","authoredCollections","variants","name","width","toBe","toEqual","collection","RegExp","error"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareLegacyUpload.d.ts","sourceRoot":"","sources":["../src/prepareLegacyUpload.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAgC,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AAI/F,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAA0B,MAAM,YAAY,CAAA;AAsBhG;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,eAAe,GAChB,EAAE;IACD,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAC3D,eAAe,EAAE,eAAe,CAAA;CACjC,GAAG,WAAW,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"prepareLegacyUpload.d.ts","sourceRoot":"","sources":["../src/prepareLegacyUpload.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAgC,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AAI/F,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAA0B,MAAM,YAAY,CAAA;AAsBhG;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,WAAW,EACX,eAAe,GAChB,EAAE;IACD,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAC3D,eAAe,EAAE,eAAe,CAAA;CACjC,GAAG,WAAW,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAqG1D"}
|
|
@@ -65,18 +65,11 @@ import { sanitizeResizeConfig } from './sanitizeResizeConfig.js';
|
|
|
65
65
|
const results = [
|
|
66
66
|
mainResult
|
|
67
67
|
];
|
|
68
|
-
// A cropped upload derives its sizes from the crop output, not the original.
|
|
69
|
-
const isCropped = Boolean(crop && mainResult.width && mainResult.height);
|
|
70
|
-
const sizeSourceFile = isCropped ? mainResultFile : undefined;
|
|
71
|
-
const sizeSourceDimensions = isCropped ? {
|
|
72
|
-
height: mainResult.height,
|
|
73
|
-
width: mainResult.width
|
|
74
|
-
} : originalDimensions;
|
|
75
68
|
// Same precedence `init()` applies: Sharp's setting, else the collection's own `focalPoint`.
|
|
76
69
|
const effectiveFocalPoint = collectionUpload.focalPoint ?? req.payload.collections[collectionSlug]?.config.upload?.focalPoint;
|
|
77
70
|
const focalPointEnabled = effectiveFocalPoint !== false;
|
|
78
71
|
const variants = collectionUpload.variants;
|
|
79
|
-
if (canProcessAsImage && Array.isArray(variants) &&
|
|
72
|
+
if (canProcessAsImage && Array.isArray(variants) && originalDimensions) {
|
|
80
73
|
const focalPoint = focalPointEnabled && uploadEdits?.focalPoint ? {
|
|
81
74
|
x: isNumber(uploadEdits.focalPoint.x) ? Math.round(uploadEdits.focalPoint.x) : 50,
|
|
82
75
|
y: isNumber(uploadEdits.focalPoint.y) ? Math.round(uploadEdits.focalPoint.y) : 50
|
|
@@ -85,7 +78,7 @@ import { sanitizeResizeConfig } from './sanitizeResizeConfig.js';
|
|
|
85
78
|
const imageResizeConfig = sanitizeResizeConfig(rawConfig);
|
|
86
79
|
const fieldPath = `variants.${imageResizeConfig.name}`;
|
|
87
80
|
const resizeAction = getImageResizeAction({
|
|
88
|
-
dimensions:
|
|
81
|
+
dimensions: originalDimensions,
|
|
89
82
|
hasFocalPoint: Boolean(focalPoint),
|
|
90
83
|
imageResizeConfig
|
|
91
84
|
});
|
|
@@ -96,13 +89,12 @@ import { sanitizeResizeConfig } from './sanitizeResizeConfig.js';
|
|
|
96
89
|
}
|
|
97
90
|
const sizeResultFile = await transform({
|
|
98
91
|
fieldPath,
|
|
99
|
-
file: sizeSourceFile,
|
|
100
92
|
options: {
|
|
101
93
|
collectionUpload,
|
|
102
94
|
focalPoint: resizeAction === 'resizeWithFocalPoint' ? focalPoint : undefined,
|
|
103
95
|
imageResizeConfig,
|
|
104
96
|
kind: 'size',
|
|
105
|
-
originalDimensions
|
|
97
|
+
originalDimensions
|
|
106
98
|
}
|
|
107
99
|
});
|
|
108
100
|
return describeResult({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/prepareLegacyUpload.ts"],"sourcesContent":["import type { FocalPoint, ProbedImageSize } from 'payload'\nimport type { PreparedUploadTransformation, UploadTransformerInternal } from 'payload/internal'\n\nimport { isNumber } from 'payload/shared'\n\nimport type { SharpCollectionConfig, SharpDependency, SharpUploadTaskOptions } from './types.js'\n\nimport { canResizeImage } from './canResizeImage.js'\nimport { createSharpFromFile } from './createSharpFromFile.js'\nimport { getImageResizeAction } from './getImageResizeAction.js'\nimport { mapWithBoundedConcurrency } from './mapWithBoundedConcurrency.js'\nimport { sanitizeResizeConfig } from './sanitizeResizeConfig.js'\n\n/**\n * Sharp throws on truncated/header-only files. Returns `undefined` instead —\n * matching core's dependency-free probe — since unreadable dimensions shouldn't fail the upload.\n */\nasync function tryProbe(file: File, sharpDependency: SharpDependency) {\n try {\n const sharpFile = await createSharpFromFile({ file, sharpDependency })\n const metadata = await sharpFile.metadata()\n return metadata.width && metadata.height ? metadata : undefined\n } catch {\n return undefined\n }\n}\n\n/**\n * Computes the legacy upload tasks (the main file, optionally cropped, and every\n * configured legacy image size) and hands each to the injected `transform` callback\n * exactly once. Reads the Sharp-owned config from `sharpTransformer({ collections })`\n * at factory-construction time — not from the sanitized collection, which only gets\n * the narrowed projection `init()` writes back.\n */\nexport function createPrepareLegacyUpload({\n collections,\n sharpDependency,\n}: {\n collections: Partial<Record<string, SharpCollectionConfig>>\n sharpDependency: SharpDependency\n}): NonNullable<UploadTransformerInternal['prepareUpload']> {\n return async ({ collectionSlug, file, req, transform, uploadEdits }) => {\n const collectionUpload = collections[collectionSlug] ?? {}\n\n const fileSupportsResize = canResizeImage(file.type)\n\n const cropData =\n uploadEdits && typeof uploadEdits === 'object' && 'crop' in uploadEdits\n ? uploadEdits.crop\n : undefined\n\n let originalDimensions: ProbedImageSize | undefined\n\n if (fileSupportsResize) {\n const originalMeta = await tryProbe(file, sharpDependency)\n if (originalMeta) {\n originalDimensions = { height: originalMeta.height, width: originalMeta.width }\n }\n }\n\n // Unreadable dimensions can't be cropped/resized — treat as non-resizable rather than failing the upload.\n const canProcessAsImage = fileSupportsResize && originalDimensions !== undefined\n\n const crop =\n cropData && originalDimensions\n ? {\n cropData,\n heightInPixels: uploadEdits.heightInPixels!,\n originalDimensions,\n widthInPixels: uploadEdits.widthInPixels!,\n }\n : undefined\n\n const mainResultFile = await transform({\n fieldPath: 'filename',\n options: { collectionUpload, crop, kind: 'main' } satisfies SharpUploadTaskOptions,\n })\n\n const mainResult = await describeResult({\n fieldPath: 'filename',\n fileSupportsResize: canProcessAsImage,\n resultFile: mainResultFile,\n sharpDependency,\n })\n\n const results: PreparedUploadTransformation[] = [mainResult]\n\n // A cropped upload derives its sizes from the crop output, not the original.\n const isCropped = Boolean(crop && mainResult.width && mainResult.height)\n const sizeSourceFile = isCropped ? mainResultFile : undefined\n const sizeSourceDimensions: ProbedImageSize | undefined = isCropped\n ? { height: mainResult.height!, width: mainResult.width! }\n : originalDimensions\n\n // Same precedence `init()` applies: Sharp's setting, else the collection's own `focalPoint`.\n const effectiveFocalPoint =\n collectionUpload.focalPoint ??\n req.payload.collections[collectionSlug]?.config.upload?.focalPoint\n const focalPointEnabled = effectiveFocalPoint !== false\n const variants = collectionUpload.variants\n\n if (canProcessAsImage && Array.isArray(variants) && sizeSourceDimensions) {\n const focalPoint: FocalPoint | undefined =\n focalPointEnabled && uploadEdits?.focalPoint\n ? {\n x: isNumber(uploadEdits.focalPoint.x) ? Math.round(uploadEdits.focalPoint.x) : 50,\n y: isNumber(uploadEdits.focalPoint.y) ? Math.round(uploadEdits.focalPoint.y) : 50,\n }\n : undefined\n\n const sizeResults = await mapWithBoundedConcurrency(variants, async (rawConfig) => {\n const imageResizeConfig = sanitizeResizeConfig(rawConfig)\n const fieldPath = `variants.${imageResizeConfig.name}` as const\n\n const resizeAction = getImageResizeAction({\n dimensions: sizeSourceDimensions,\n hasFocalPoint: Boolean(focalPoint),\n imageResizeConfig,\n })\n\n if (resizeAction === 'omit') {\n return { fieldPath } satisfies PreparedUploadTransformation\n }\n\n const sizeResultFile = await transform({\n fieldPath,\n file: sizeSourceFile,\n options: {\n collectionUpload,\n focalPoint: resizeAction === 'resizeWithFocalPoint' ? focalPoint : undefined,\n imageResizeConfig,\n kind: 'size',\n originalDimensions: sizeSourceDimensions,\n } satisfies SharpUploadTaskOptions,\n })\n\n return describeResult({\n fieldPath,\n fileSupportsResize: true,\n resultFile: sizeResultFile,\n sharpDependency,\n })\n })\n\n results.push(...sizeResults)\n }\n\n return results\n }\n}\n\nasync function describeResult({\n fieldPath,\n fileSupportsResize,\n resultFile,\n sharpDependency,\n}: {\n fieldPath: PreparedUploadTransformation['fieldPath']\n fileSupportsResize: boolean\n resultFile: File\n sharpDependency: SharpDependency\n}): Promise<PreparedUploadTransformation> {\n if (!fileSupportsResize) {\n return { fieldPath, file: resultFile, mimeType: resultFile.type }\n }\n\n const meta = await tryProbe(resultFile, sharpDependency)\n\n if (!meta) {\n return { fieldPath, file: resultFile, mimeType: resultFile.type }\n }\n\n // `tryProbe` never sets `animated: true`, so `meta.height` is already the\n // single-frame height — do not divide by page count here.\n return {\n fieldPath,\n file: resultFile,\n height: meta.height,\n mimeType: resultFile.type,\n width: meta.width,\n }\n}\n"],"names":["isNumber","canResizeImage","createSharpFromFile","getImageResizeAction","mapWithBoundedConcurrency","sanitizeResizeConfig","tryProbe","file","sharpDependency","sharpFile","metadata","width","height","undefined","createPrepareLegacyUpload","collections","collectionSlug","req","transform","uploadEdits","collectionUpload","fileSupportsResize","type","cropData","crop","originalDimensions","originalMeta","canProcessAsImage","heightInPixels","widthInPixels","mainResultFile","fieldPath","options","kind","mainResult","describeResult","resultFile","results","isCropped","Boolean","sizeSourceFile","sizeSourceDimensions","effectiveFocalPoint","focalPoint","payload","config","upload","focalPointEnabled","variants","Array","isArray","x","Math","round","y","sizeResults","rawConfig","imageResizeConfig","name","resizeAction","dimensions","hasFocalPoint","sizeResultFile","push","mimeType","meta"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../src/prepareLegacyUpload.ts"],"sourcesContent":["import type { FocalPoint, ProbedImageSize } from 'payload'\nimport type { PreparedUploadTransformation, UploadTransformerInternal } from 'payload/internal'\n\nimport { isNumber } from 'payload/shared'\n\nimport type { SharpCollectionConfig, SharpDependency, SharpUploadTaskOptions } from './types.js'\n\nimport { canResizeImage } from './canResizeImage.js'\nimport { createSharpFromFile } from './createSharpFromFile.js'\nimport { getImageResizeAction } from './getImageResizeAction.js'\nimport { mapWithBoundedConcurrency } from './mapWithBoundedConcurrency.js'\nimport { sanitizeResizeConfig } from './sanitizeResizeConfig.js'\n\n/**\n * Sharp throws on truncated/header-only files. Returns `undefined` instead —\n * matching core's dependency-free probe — since unreadable dimensions shouldn't fail the upload.\n */\nasync function tryProbe(file: File, sharpDependency: SharpDependency) {\n try {\n const sharpFile = await createSharpFromFile({ file, sharpDependency })\n const metadata = await sharpFile.metadata()\n return metadata.width && metadata.height ? metadata : undefined\n } catch {\n return undefined\n }\n}\n\n/**\n * Computes the legacy upload tasks (the main file, optionally cropped, and every\n * configured legacy image size) and hands each to the injected `transform` callback\n * exactly once. Reads the Sharp-owned config from `sharpTransformer({ collections })`\n * at factory-construction time — not from the sanitized collection, which only gets\n * the narrowed projection `init()` writes back.\n */\nexport function createPrepareLegacyUpload({\n collections,\n sharpDependency,\n}: {\n collections: Partial<Record<string, SharpCollectionConfig>>\n sharpDependency: SharpDependency\n}): NonNullable<UploadTransformerInternal['prepareUpload']> {\n return async ({ collectionSlug, file, req, transform, uploadEdits }) => {\n const collectionUpload = collections[collectionSlug] ?? {}\n\n const fileSupportsResize = canResizeImage(file.type)\n\n const cropData =\n uploadEdits && typeof uploadEdits === 'object' && 'crop' in uploadEdits\n ? uploadEdits.crop\n : undefined\n\n let originalDimensions: ProbedImageSize | undefined\n\n if (fileSupportsResize) {\n const originalMeta = await tryProbe(file, sharpDependency)\n if (originalMeta) {\n originalDimensions = { height: originalMeta.height, width: originalMeta.width }\n }\n }\n\n // Unreadable dimensions can't be cropped/resized — treat as non-resizable rather than failing the upload.\n const canProcessAsImage = fileSupportsResize && originalDimensions !== undefined\n\n const crop =\n cropData && originalDimensions\n ? {\n cropData,\n heightInPixels: uploadEdits.heightInPixels!,\n originalDimensions,\n widthInPixels: uploadEdits.widthInPixels!,\n }\n : undefined\n\n const mainResultFile = await transform({\n fieldPath: 'filename',\n options: { collectionUpload, crop, kind: 'main' } satisfies SharpUploadTaskOptions,\n })\n\n const mainResult = await describeResult({\n fieldPath: 'filename',\n fileSupportsResize: canProcessAsImage,\n resultFile: mainResultFile,\n sharpDependency,\n })\n\n const results: PreparedUploadTransformation[] = [mainResult]\n\n // Same precedence `init()` applies: Sharp's setting, else the collection's own `focalPoint`.\n const effectiveFocalPoint =\n collectionUpload.focalPoint ??\n req.payload.collections[collectionSlug]?.config.upload?.focalPoint\n const focalPointEnabled = effectiveFocalPoint !== false\n const variants = collectionUpload.variants\n\n if (canProcessAsImage && Array.isArray(variants) && originalDimensions) {\n const focalPoint: FocalPoint | undefined =\n focalPointEnabled && uploadEdits?.focalPoint\n ? {\n x: isNumber(uploadEdits.focalPoint.x) ? Math.round(uploadEdits.focalPoint.x) : 50,\n y: isNumber(uploadEdits.focalPoint.y) ? Math.round(uploadEdits.focalPoint.y) : 50,\n }\n : undefined\n\n const sizeResults = await mapWithBoundedConcurrency(variants, async (rawConfig) => {\n const imageResizeConfig = sanitizeResizeConfig(rawConfig)\n const fieldPath = `variants.${imageResizeConfig.name}` as const\n\n const resizeAction = getImageResizeAction({\n dimensions: originalDimensions,\n hasFocalPoint: Boolean(focalPoint),\n imageResizeConfig,\n })\n\n if (resizeAction === 'omit') {\n return { fieldPath } satisfies PreparedUploadTransformation\n }\n\n const sizeResultFile = await transform({\n fieldPath,\n options: {\n collectionUpload,\n focalPoint: resizeAction === 'resizeWithFocalPoint' ? focalPoint : undefined,\n imageResizeConfig,\n kind: 'size',\n originalDimensions,\n } satisfies SharpUploadTaskOptions,\n })\n\n return describeResult({\n fieldPath,\n fileSupportsResize: true,\n resultFile: sizeResultFile,\n sharpDependency,\n })\n })\n\n results.push(...sizeResults)\n }\n\n return results\n }\n}\n\nasync function describeResult({\n fieldPath,\n fileSupportsResize,\n resultFile,\n sharpDependency,\n}: {\n fieldPath: PreparedUploadTransformation['fieldPath']\n fileSupportsResize: boolean\n resultFile: File\n sharpDependency: SharpDependency\n}): Promise<PreparedUploadTransformation> {\n if (!fileSupportsResize) {\n return { fieldPath, file: resultFile, mimeType: resultFile.type }\n }\n\n const meta = await tryProbe(resultFile, sharpDependency)\n\n if (!meta) {\n return { fieldPath, file: resultFile, mimeType: resultFile.type }\n }\n\n // `tryProbe` never sets `animated: true`, so `meta.height` is already the\n // single-frame height — do not divide by page count here.\n return {\n fieldPath,\n file: resultFile,\n height: meta.height,\n mimeType: resultFile.type,\n width: meta.width,\n }\n}\n"],"names":["isNumber","canResizeImage","createSharpFromFile","getImageResizeAction","mapWithBoundedConcurrency","sanitizeResizeConfig","tryProbe","file","sharpDependency","sharpFile","metadata","width","height","undefined","createPrepareLegacyUpload","collections","collectionSlug","req","transform","uploadEdits","collectionUpload","fileSupportsResize","type","cropData","crop","originalDimensions","originalMeta","canProcessAsImage","heightInPixels","widthInPixels","mainResultFile","fieldPath","options","kind","mainResult","describeResult","resultFile","results","effectiveFocalPoint","focalPoint","payload","config","upload","focalPointEnabled","variants","Array","isArray","x","Math","round","y","sizeResults","rawConfig","imageResizeConfig","name","resizeAction","dimensions","hasFocalPoint","Boolean","sizeResultFile","push","mimeType","meta"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sharpTransformer.d.ts","sourceRoot":"","sources":["../src/sharpTransformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkD,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChG,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAKrE,OAAO,KAAK,EAAE,oBAAoB,EAAuB,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAiBpG,wBAAgB,2BAA2B,CACzC,SAAS,CAAC,EAAE,oBAAoB,GAC/B,QAAQ,CAAC,oBAAoB,CAAC,CAShC;AAgBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,GAAE,uBAA4B,GACpC,6BAA6B,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"sharpTransformer.d.ts","sourceRoot":"","sources":["../src/sharpTransformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkD,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChG,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAKrE,OAAO,KAAK,EAAE,oBAAoB,EAAuB,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAiBpG,wBAAgB,2BAA2B,CACzC,SAAS,CAAC,EAAE,oBAAoB,GAC/B,QAAQ,CAAC,oBAAoB,CAAC,CAShC;AAgBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,GAAE,uBAA4B,GACpC,6BAA6B,GAAG,iBAAiB,CAqDnD"}
|
package/dist/sharpTransformer.js
CHANGED
|
@@ -47,9 +47,16 @@ export function resolveSharpDynamicDefaults(overrides) {
|
|
|
47
47
|
// Upload-time eligibility is already decided by the MIME match that ran
|
|
48
48
|
// before `canTransform`; only dynamic request routing needs the query.
|
|
49
49
|
if (args.operation === 'upload') {
|
|
50
|
-
return
|
|
50
|
+
return {
|
|
51
|
+
canTransform: true,
|
|
52
|
+
handledTransformKeys: [
|
|
53
|
+
'crop',
|
|
54
|
+
'focalPoint'
|
|
55
|
+
]
|
|
56
|
+
};
|
|
51
57
|
}
|
|
52
|
-
|
|
58
|
+
// Sharp applies saved transforms at upload time, so it resizes only for the request phase.
|
|
59
|
+
if (!dynamicOptions || args.purpose === 'persisted-default' || dynamicOptions.collections && !dynamicOptions.collections.includes(args.collectionSlug)) {
|
|
53
60
|
return false;
|
|
54
61
|
}
|
|
55
62
|
const result = parseDynamicResize({
|
|
@@ -74,7 +81,8 @@ export function resolveSharpDynamicDefaults(overrides) {
|
|
|
74
81
|
});
|
|
75
82
|
return initSharpCollections({
|
|
76
83
|
collections,
|
|
77
|
-
config
|
|
84
|
+
config,
|
|
85
|
+
transformerSlug: transformer.slug
|
|
78
86
|
});
|
|
79
87
|
},
|
|
80
88
|
mimeTypes: DEFAULT_MIME_TYPES,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/sharpTransformer.ts"],"sourcesContent":["import type { Config, TransformFileArgs, TransformFileResult, UploadTransformer } from 'payload'\nimport type { TransformerWithInternalBridge } from 'payload/internal'\n\nimport { getUploadTransformerInternal, uploadTransformerInternal } from 'payload/internal'\nimport bundledSharp from 'sharp'\n\nimport type { SharpDynamicDefaults, SharpDynamicOptions, SharpTransformerOptions } from './types.js'\n\nimport { createHandleRequest } from './handleRequest.js'\nimport { initSharpCollections } from './initSharpCollections.js'\nimport { parseDynamicResize } from './parseDynamicResize.js'\nimport { createPrepareLegacyUpload } from './prepareLegacyUpload.js'\nimport { createTransformFile } from './transformFile.js'\n\nconst DEFAULT_MIME_TYPES = [\n 'image/jpeg',\n 'image/png',\n 'image/gif',\n 'image/webp',\n 'image/tiff',\n 'image/avif',\n]\n\nexport function resolveSharpDynamicDefaults(\n overrides?: SharpDynamicDefaults,\n): Required<SharpDynamicDefaults> {\n return {\n fit: overrides?.fit ?? 'cover',\n maxHeight: overrides?.maxHeight ?? 4096,\n maxPixels: overrides?.maxPixels ?? 16_777_216,\n maxWidth: overrides?.maxWidth ?? 4096,\n position: overrides?.position ?? 'center',\n withoutEnlargement: overrides?.withoutEnlargement ?? false,\n }\n}\n\n/**\n * Normalizes the `dynamic` option: `false`/omitted disables request-time\n * resizing, `true` enables it with defaults for every upload collection.\n */\nfunction resolveSharpDynamicOptions(\n dynamic: SharpTransformerOptions['dynamic'],\n): false | SharpDynamicOptions {\n if (!dynamic) {\n return false\n }\n\n return dynamic === true ? {} : dynamic\n}\n\n/**\n * Payload's official Sharp-based file transformer: upload-time image processing,\n * plus opt-in (`dynamic`) request-time width/height/`withoutEnlargement` resizing.\n */\nexport function sharpTransformer(\n options: SharpTransformerOptions = {},\n): TransformerWithInternalBridge & UploadTransformer {\n const dynamicOptions = resolveSharpDynamicOptions(options.dynamic)\n const dynamicDefaults = resolveSharpDynamicDefaults(dynamicOptions || undefined)\n const sharpDependency = options.sharp ?? bundledSharp\n const collections = options.collections ?? {}\n const handlesCollection = ({ collectionSlug }: { collectionSlug: string }) =>\n Boolean(collections[collectionSlug])\n\n const transformer: TransformerWithInternalBridge & UploadTransformer = {\n slug: options.slug ?? 'sharp',\n canTransform: (args) => {\n // Upload-time eligibility is already decided by the MIME match that ran\n // before `canTransform`; only dynamic request routing needs the query.\n if (args.operation === 'upload') {\n return true\n }\n\n if (\n !dynamicOptions ||\n (dynamicOptions.collections && !dynamicOptions.collections.includes(args.collectionSlug))\n ) {\n return false\n }\n\n const result = parseDynamicResize({\n limits: dynamicDefaults,\n searchParams: args.req.searchParams ?? new URLSearchParams(),\n })\n\n return result.isRouted\n },\n handleRequest: createHandleRequest({ dynamicDefaults, sharpDependency }),\n init: (config) => {\n assertDynamicCollectionsExist({ config, dynamicOptions })\n assertCollectionsOwnedOnce({ collections, config, transformer })\n\n return initSharpCollections({ collections, config })\n },\n mimeTypes: DEFAULT_MIME_TYPES,\n [uploadTransformerInternal]: {\n handlesCollection,\n prepareUpload: createPrepareLegacyUpload({ collections, sharpDependency }),\n },\n // `options` here is always what this transformer computed via `prepareUpload`'s\n // `transform` callback; the public contract's `unknown` just reflects that core never inspects it.\n transformFile: createTransformFile({ sharpDependency }) as (\n args: TransformFileArgs,\n ) => Promise<TransformFileResult>,\n }\n\n return transformer\n}\n\n/**\n * Core drives each upload through a single Sharp instance, so a collection's upload settings\n * split across instances would silently lose all but one of them.\n */\nfunction assertCollectionsOwnedOnce({\n collections,\n config,\n transformer,\n}: {\n collections: NonNullable<SharpTransformerOptions['collections']>\n config: Config\n transformer: UploadTransformer\n}): void {\n for (const [collectionSlug, collectionConfig] of Object.entries(collections)) {\n if (!collectionConfig) {\n continue\n }\n\n const owners = (config.upload?.transformers ?? []).filter(\n (candidate) =>\n candidate === transformer ||\n getUploadTransformerInternal(candidate)?.handlesCollection?.({ collectionSlug }),\n )\n\n if (owners.length > 1) {\n throw new Error(\n `Invalid \\`sharpTransformer({ collections })\\` configuration: collection \"${collectionSlug}\" has upload settings on more than one Sharp transformer: ${owners.map((owner) => `\"${owner.slug}\"`).join(', ')}. Configure each collection on exactly one instance.`,\n )\n }\n }\n}\n\nfunction assertDynamicCollectionsExist({\n config,\n dynamicOptions,\n}: {\n config: Config\n dynamicOptions: false | SharpDynamicOptions\n}): void {\n if (!dynamicOptions || !dynamicOptions.collections) {\n return\n }\n\n const invalidSlugs = dynamicOptions.collections.filter(\n (slug) =>\n !config.collections?.some((collection) => collection.slug === slug && collection.upload),\n )\n\n if (invalidSlugs.length > 0) {\n throw new Error(\n `Invalid \\`sharpTransformer({ dynamic: { collections } })\\` configuration: not an upload-enabled collection: ${invalidSlugs.map((slug) => `\"${slug}\"`).join(', ')}.`,\n )\n }\n}\n"],"names":["getUploadTransformerInternal","uploadTransformerInternal","bundledSharp","createHandleRequest","initSharpCollections","parseDynamicResize","createPrepareLegacyUpload","createTransformFile","DEFAULT_MIME_TYPES","resolveSharpDynamicDefaults","overrides","fit","maxHeight","maxPixels","maxWidth","position","withoutEnlargement","resolveSharpDynamicOptions","dynamic","sharpTransformer","options","dynamicOptions","dynamicDefaults","undefined","sharpDependency","sharp","collections","handlesCollection","collectionSlug","Boolean","transformer","slug","canTransform","args","operation","includes","result","limits","searchParams","req","URLSearchParams","isRouted","handleRequest","init","config","assertDynamicCollectionsExist","assertCollectionsOwnedOnce","mimeTypes","prepareUpload","transformFile","collectionConfig","Object","entries","owners","upload","transformers","filter","candidate","length","Error","map","owner","join","invalidSlugs","some","collection"],"mappings":"AAGA,SAASA,4BAA4B,EAAEC,yBAAyB,QAAQ,mBAAkB;AAC1F,OAAOC,kBAAkB,QAAO;AAIhC,SAASC,mBAAmB,QAAQ,qBAAoB;AACxD,SAASC,oBAAoB,QAAQ,4BAA2B;AAChE,SAASC,kBAAkB,QAAQ,0BAAyB;AAC5D,SAASC,yBAAyB,QAAQ,2BAA0B;AACpE,SAASC,mBAAmB,QAAQ,qBAAoB;AAExD,MAAMC,qBAAqB;IACzB;IACA;IACA;IACA;IACA;IACA;CACD;AAED,OAAO,SAASC,4BACdC,SAAgC;IAEhC,OAAO;QACLC,KAAKD,WAAWC,OAAO;QACvBC,WAAWF,WAAWE,aAAa;QACnCC,WAAWH,WAAWG,aAAa;QACnCC,UAAUJ,WAAWI,YAAY;QACjCC,UAAUL,WAAWK,YAAY;QACjCC,oBAAoBN,WAAWM,sBAAsB;IACvD;AACF;AAEA;;;CAGC,GACD,SAASC,2BACPC,OAA2C;IAE3C,IAAI,CAACA,SAAS;QACZ,OAAO;IACT;IAEA,OAAOA,YAAY,OAAO,CAAC,IAAIA;AACjC;AAEA;;;CAGC,GACD,OAAO,SAASC,iBACdC,UAAmC,CAAC,CAAC;IAErC,MAAMC,iBAAiBJ,2BAA2BG,QAAQF,OAAO;IACjE,MAAMI,kBAAkBb,4BAA4BY,kBAAkBE;IACtE,MAAMC,kBAAkBJ,QAAQK,KAAK,IAAIvB;IACzC,MAAMwB,cAAcN,QAAQM,WAAW,IAAI,CAAC;IAC5C,MAAMC,oBAAoB,CAAC,EAAEC,cAAc,EAA8B,GACvEC,QAAQH,WAAW,CAACE,eAAe;IAErC,MAAME,cAAiE;QACrEC,MAAMX,QAAQW,IAAI,IAAI;QACtBC,cAAc,CAACC;YACb,wEAAwE;YACxE,uEAAuE;YACvE,IAAIA,KAAKC,SAAS,KAAK,UAAU;gBAC/B,OAAO;
|
|
1
|
+
{"version":3,"sources":["../src/sharpTransformer.ts"],"sourcesContent":["import type { Config, TransformFileArgs, TransformFileResult, UploadTransformer } from 'payload'\nimport type { TransformerWithInternalBridge } from 'payload/internal'\n\nimport { getUploadTransformerInternal, uploadTransformerInternal } from 'payload/internal'\nimport bundledSharp from 'sharp'\n\nimport type { SharpDynamicDefaults, SharpDynamicOptions, SharpTransformerOptions } from './types.js'\n\nimport { createHandleRequest } from './handleRequest.js'\nimport { initSharpCollections } from './initSharpCollections.js'\nimport { parseDynamicResize } from './parseDynamicResize.js'\nimport { createPrepareLegacyUpload } from './prepareLegacyUpload.js'\nimport { createTransformFile } from './transformFile.js'\n\nconst DEFAULT_MIME_TYPES = [\n 'image/jpeg',\n 'image/png',\n 'image/gif',\n 'image/webp',\n 'image/tiff',\n 'image/avif',\n]\n\nexport function resolveSharpDynamicDefaults(\n overrides?: SharpDynamicDefaults,\n): Required<SharpDynamicDefaults> {\n return {\n fit: overrides?.fit ?? 'cover',\n maxHeight: overrides?.maxHeight ?? 4096,\n maxPixels: overrides?.maxPixels ?? 16_777_216,\n maxWidth: overrides?.maxWidth ?? 4096,\n position: overrides?.position ?? 'center',\n withoutEnlargement: overrides?.withoutEnlargement ?? false,\n }\n}\n\n/**\n * Normalizes the `dynamic` option: `false`/omitted disables request-time\n * resizing, `true` enables it with defaults for every upload collection.\n */\nfunction resolveSharpDynamicOptions(\n dynamic: SharpTransformerOptions['dynamic'],\n): false | SharpDynamicOptions {\n if (!dynamic) {\n return false\n }\n\n return dynamic === true ? {} : dynamic\n}\n\n/**\n * Payload's official Sharp-based file transformer: upload-time image processing,\n * plus opt-in (`dynamic`) request-time width/height/`withoutEnlargement` resizing.\n */\nexport function sharpTransformer(\n options: SharpTransformerOptions = {},\n): TransformerWithInternalBridge & UploadTransformer {\n const dynamicOptions = resolveSharpDynamicOptions(options.dynamic)\n const dynamicDefaults = resolveSharpDynamicDefaults(dynamicOptions || undefined)\n const sharpDependency = options.sharp ?? bundledSharp\n const collections = options.collections ?? {}\n const handlesCollection = ({ collectionSlug }: { collectionSlug: string }) =>\n Boolean(collections[collectionSlug])\n\n const transformer: TransformerWithInternalBridge & UploadTransformer = {\n slug: options.slug ?? 'sharp',\n canTransform: (args) => {\n // Upload-time eligibility is already decided by the MIME match that ran\n // before `canTransform`; only dynamic request routing needs the query.\n if (args.operation === 'upload') {\n return { canTransform: true, handledTransformKeys: ['crop', 'focalPoint'] }\n }\n\n // Sharp applies saved transforms at upload time, so it resizes only for the request phase.\n if (\n !dynamicOptions ||\n args.purpose === 'persisted-default' ||\n (dynamicOptions.collections && !dynamicOptions.collections.includes(args.collectionSlug))\n ) {\n return false\n }\n\n const result = parseDynamicResize({\n limits: dynamicDefaults,\n searchParams: args.req.searchParams ?? new URLSearchParams(),\n })\n\n return result.isRouted\n },\n handleRequest: createHandleRequest({ dynamicDefaults, sharpDependency }),\n init: (config) => {\n assertDynamicCollectionsExist({ config, dynamicOptions })\n assertCollectionsOwnedOnce({ collections, config, transformer })\n\n return initSharpCollections({ collections, config, transformerSlug: transformer.slug })\n },\n mimeTypes: DEFAULT_MIME_TYPES,\n [uploadTransformerInternal]: {\n handlesCollection,\n prepareUpload: createPrepareLegacyUpload({ collections, sharpDependency }),\n },\n // `options` here is always what this transformer computed via `prepareUpload`'s\n // `transform` callback; the public contract's `unknown` just reflects that core never inspects it.\n transformFile: createTransformFile({ sharpDependency }) as (\n args: TransformFileArgs,\n ) => Promise<TransformFileResult>,\n }\n\n return transformer\n}\n\n/**\n * Core drives each upload through a single Sharp instance, so a collection's upload settings\n * split across instances would silently lose all but one of them.\n */\nfunction assertCollectionsOwnedOnce({\n collections,\n config,\n transformer,\n}: {\n collections: NonNullable<SharpTransformerOptions['collections']>\n config: Config\n transformer: UploadTransformer\n}): void {\n for (const [collectionSlug, collectionConfig] of Object.entries(collections)) {\n if (!collectionConfig) {\n continue\n }\n\n const owners = (config.upload?.transformers ?? []).filter(\n (candidate) =>\n candidate === transformer ||\n getUploadTransformerInternal(candidate)?.handlesCollection?.({ collectionSlug }),\n )\n\n if (owners.length > 1) {\n throw new Error(\n `Invalid \\`sharpTransformer({ collections })\\` configuration: collection \"${collectionSlug}\" has upload settings on more than one Sharp transformer: ${owners.map((owner) => `\"${owner.slug}\"`).join(', ')}. Configure each collection on exactly one instance.`,\n )\n }\n }\n}\n\nfunction assertDynamicCollectionsExist({\n config,\n dynamicOptions,\n}: {\n config: Config\n dynamicOptions: false | SharpDynamicOptions\n}): void {\n if (!dynamicOptions || !dynamicOptions.collections) {\n return\n }\n\n const invalidSlugs = dynamicOptions.collections.filter(\n (slug) =>\n !config.collections?.some((collection) => collection.slug === slug && collection.upload),\n )\n\n if (invalidSlugs.length > 0) {\n throw new Error(\n `Invalid \\`sharpTransformer({ dynamic: { collections } })\\` configuration: not an upload-enabled collection: ${invalidSlugs.map((slug) => `\"${slug}\"`).join(', ')}.`,\n )\n }\n}\n"],"names":["getUploadTransformerInternal","uploadTransformerInternal","bundledSharp","createHandleRequest","initSharpCollections","parseDynamicResize","createPrepareLegacyUpload","createTransformFile","DEFAULT_MIME_TYPES","resolveSharpDynamicDefaults","overrides","fit","maxHeight","maxPixels","maxWidth","position","withoutEnlargement","resolveSharpDynamicOptions","dynamic","sharpTransformer","options","dynamicOptions","dynamicDefaults","undefined","sharpDependency","sharp","collections","handlesCollection","collectionSlug","Boolean","transformer","slug","canTransform","args","operation","handledTransformKeys","purpose","includes","result","limits","searchParams","req","URLSearchParams","isRouted","handleRequest","init","config","assertDynamicCollectionsExist","assertCollectionsOwnedOnce","transformerSlug","mimeTypes","prepareUpload","transformFile","collectionConfig","Object","entries","owners","upload","transformers","filter","candidate","length","Error","map","owner","join","invalidSlugs","some","collection"],"mappings":"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"}
|
|
@@ -11,6 +11,36 @@ describe('sharpTransformer', ()=>{
|
|
|
11
11
|
'image/avif'
|
|
12
12
|
]);
|
|
13
13
|
});
|
|
14
|
+
it('should claim crop and focalPoint at upload time', async ()=>{
|
|
15
|
+
const args = {
|
|
16
|
+
collectionSlug: 'media',
|
|
17
|
+
mimeType: 'image/png',
|
|
18
|
+
operation: 'upload'
|
|
19
|
+
};
|
|
20
|
+
expect(await sharpTransformer().canTransform(args)).toEqual({
|
|
21
|
+
canTransform: true,
|
|
22
|
+
handledTransformKeys: [
|
|
23
|
+
'crop',
|
|
24
|
+
'focalPoint'
|
|
25
|
+
]
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
it('should not resize in the saved-state phase of a request', async ()=>{
|
|
29
|
+
const result = await sharpTransformer({
|
|
30
|
+
dynamic: true
|
|
31
|
+
}).canTransform({
|
|
32
|
+
collectionSlug: 'media',
|
|
33
|
+
doc: {},
|
|
34
|
+
mimeType: 'image/png',
|
|
35
|
+
operation: 'request',
|
|
36
|
+
originalDoc: {},
|
|
37
|
+
purpose: 'persisted-default',
|
|
38
|
+
req: {
|
|
39
|
+
searchParams: new URLSearchParams('width=10')
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
expect(result).toBe(false);
|
|
43
|
+
});
|
|
14
44
|
it('should reject dynamic.collections that are unknown or not upload-enabled on init', ()=>{
|
|
15
45
|
const config = {
|
|
16
46
|
collections: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/sharpTransformer.spec.ts"],"sourcesContent":["import type { Config, UploadCollectionSlug } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport { resolveSharpDynamicDefaults, sharpTransformer } from './sharpTransformer.js'\n\ndescribe('sharpTransformer', () => {\n it(\"should default mimeTypes to canResizeImage's allow-list exactly, excluding jxl\", () => {\n expect(sharpTransformer().mimeTypes).toEqual([\n 'image/jpeg',\n 'image/png',\n 'image/gif',\n 'image/webp',\n 'image/tiff',\n 'image/avif',\n ])\n })\n\n it('should reject dynamic.collections that are unknown or not upload-enabled on init', () => {\n const config = {\n collections: [\n { slug: 'media', fields: [], upload: true },\n { slug: 'posts', fields: [] },\n ],\n } as unknown as Config\n const transformer = sharpTransformer({\n dynamic: { collections: ['posts', 'missing'] as unknown as UploadCollectionSlug[] },\n })\n\n expect(() => transformer.init!(config)).toThrow(\n /not an upload-enabled collection: \"posts\", \"missing\"/,\n )\n })\n\n it('should reject a collection whose upload settings are configured on more than one instance on init', () => {\n const first = sharpTransformer({ collections: { media: { variants: [] } } })\n const second = sharpTransformer({ slug: 'sharp-second', collections: { media: {} } })\n const config = {\n collections: [{ slug: 'media', fields: [], upload: true }],\n upload: { transformers: [first, second] },\n } as unknown as Config\n\n expect(() => second.init!(config)).toThrow(\n /\"media\" has upload settings on more than one Sharp transformer: \"sharp\", \"sharp-second\"/,\n )\n })\n\n it('should allow different collections configured on different instances', () => {\n const first = sharpTransformer({ collections: { media: {} } })\n const second = sharpTransformer({ slug: 'sharp-second', collections: { photos: {} } })\n const config = {\n collections: [\n { slug: 'media', fields: [], upload: true },\n { slug: 'photos', fields: [], upload: true },\n ],\n upload: { transformers: [first, second] },\n } as unknown as Config\n\n expect(() => second.init!(config)).not.toThrow()\n })\n})\n\ndescribe('resolveSharpDynamicDefaults', () => {\n it('should default to fit=cover, position=center, maxWidth=4096, maxHeight=4096, maxPixels=16_777_216, withoutEnlargement=false', () => {\n expect(resolveSharpDynamicDefaults()).toEqual({\n fit: 'cover',\n maxHeight: 4096,\n maxPixels: 16_777_216,\n maxWidth: 4096,\n position: 'center',\n withoutEnlargement: false,\n })\n })\n})\n"],"names":["describe","expect","it","resolveSharpDynamicDefaults","sharpTransformer","mimeTypes","toEqual","config","collections","slug","fields","upload","transformer","
|
|
1
|
+
{"version":3,"sources":["../src/sharpTransformer.spec.ts"],"sourcesContent":["import type { Config, UploadCollectionSlug } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport { resolveSharpDynamicDefaults, sharpTransformer } from './sharpTransformer.js'\n\ndescribe('sharpTransformer', () => {\n it(\"should default mimeTypes to canResizeImage's allow-list exactly, excluding jxl\", () => {\n expect(sharpTransformer().mimeTypes).toEqual([\n 'image/jpeg',\n 'image/png',\n 'image/gif',\n 'image/webp',\n 'image/tiff',\n 'image/avif',\n ])\n })\n\n it('should claim crop and focalPoint at upload time', async () => {\n const args = { collectionSlug: 'media', mimeType: 'image/png', operation: 'upload' } as const\n\n expect(await sharpTransformer().canTransform!(args as never)).toEqual({\n canTransform: true,\n handledTransformKeys: ['crop', 'focalPoint'],\n })\n })\n\n it('should not resize in the saved-state phase of a request', async () => {\n const result = await sharpTransformer({ dynamic: true }).canTransform!({\n collectionSlug: 'media',\n doc: {},\n mimeType: 'image/png',\n operation: 'request',\n originalDoc: {},\n purpose: 'persisted-default',\n req: { searchParams: new URLSearchParams('width=10') } as never,\n })\n\n expect(result).toBe(false)\n })\n\n it('should reject dynamic.collections that are unknown or not upload-enabled on init', () => {\n const config = {\n collections: [\n { slug: 'media', fields: [], upload: true },\n { slug: 'posts', fields: [] },\n ],\n } as unknown as Config\n const transformer = sharpTransformer({\n dynamic: { collections: ['posts', 'missing'] as unknown as UploadCollectionSlug[] },\n })\n\n expect(() => transformer.init!(config)).toThrow(\n /not an upload-enabled collection: \"posts\", \"missing\"/,\n )\n })\n\n it('should reject a collection whose upload settings are configured on more than one instance on init', () => {\n const first = sharpTransformer({ collections: { media: { variants: [] } } })\n const second = sharpTransformer({ slug: 'sharp-second', collections: { media: {} } })\n const config = {\n collections: [{ slug: 'media', fields: [], upload: true }],\n upload: { transformers: [first, second] },\n } as unknown as Config\n\n expect(() => second.init!(config)).toThrow(\n /\"media\" has upload settings on more than one Sharp transformer: \"sharp\", \"sharp-second\"/,\n )\n })\n\n it('should allow different collections configured on different instances', () => {\n const first = sharpTransformer({ collections: { media: {} } })\n const second = sharpTransformer({ slug: 'sharp-second', collections: { photos: {} } })\n const config = {\n collections: [\n { slug: 'media', fields: [], upload: true },\n { slug: 'photos', fields: [], upload: true },\n ],\n upload: { transformers: [first, second] },\n } as unknown as Config\n\n expect(() => second.init!(config)).not.toThrow()\n })\n})\n\ndescribe('resolveSharpDynamicDefaults', () => {\n it('should default to fit=cover, position=center, maxWidth=4096, maxHeight=4096, maxPixels=16_777_216, withoutEnlargement=false', () => {\n expect(resolveSharpDynamicDefaults()).toEqual({\n fit: 'cover',\n maxHeight: 4096,\n maxPixels: 16_777_216,\n maxWidth: 4096,\n position: 'center',\n withoutEnlargement: false,\n })\n })\n})\n"],"names":["describe","expect","it","resolveSharpDynamicDefaults","sharpTransformer","mimeTypes","toEqual","args","collectionSlug","mimeType","operation","canTransform","handledTransformKeys","result","dynamic","doc","originalDoc","purpose","req","searchParams","URLSearchParams","toBe","config","collections","slug","fields","upload","transformer","init","toThrow","first","media","variants","second","transformers","photos","not","fit","maxHeight","maxPixels","maxWidth","position","withoutEnlargement"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAE7C,SAASC,2BAA2B,EAAEC,gBAAgB,QAAQ,wBAAuB;AAErFJ,SAAS,oBAAoB;IAC3BE,GAAG,kFAAkF;QACnFD,OAAOG,mBAAmBC,SAAS,EAAEC,OAAO,CAAC;YAC3C;YACA;YACA;YACA;YACA;YACA;SACD;IACH;IAEAJ,GAAG,mDAAmD;QACpD,MAAMK,OAAO;YAAEC,gBAAgB;YAASC,UAAU;YAAaC,WAAW;QAAS;QAEnFT,OAAO,MAAMG,mBAAmBO,YAAY,CAAEJ,OAAgBD,OAAO,CAAC;YACpEK,cAAc;YACdC,sBAAsB;gBAAC;gBAAQ;aAAa;QAC9C;IACF;IAEAV,GAAG,2DAA2D;QAC5D,MAAMW,SAAS,MAAMT,iBAAiB;YAAEU,SAAS;QAAK,GAAGH,YAAY,CAAE;YACrEH,gBAAgB;YAChBO,KAAK,CAAC;YACNN,UAAU;YACVC,WAAW;YACXM,aAAa,CAAC;YACdC,SAAS;YACTC,KAAK;gBAAEC,cAAc,IAAIC,gBAAgB;YAAY;QACvD;QAEAnB,OAAOY,QAAQQ,IAAI,CAAC;IACtB;IAEAnB,GAAG,oFAAoF;QACrF,MAAMoB,SAAS;YACbC,aAAa;gBACX;oBAAEC,MAAM;oBAASC,QAAQ,EAAE;oBAAEC,QAAQ;gBAAK;gBAC1C;oBAAEF,MAAM;oBAASC,QAAQ,EAAE;gBAAC;aAC7B;QACH;QACA,MAAME,cAAcvB,iBAAiB;YACnCU,SAAS;gBAAES,aAAa;oBAAC;oBAAS;iBAAU;YAAsC;QACpF;QAEAtB,OAAO,IAAM0B,YAAYC,IAAI,CAAEN,SAASO,OAAO,CAC7C;IAEJ;IAEA3B,GAAG,qGAAqG;QACtG,MAAM4B,QAAQ1B,iBAAiB;YAAEmB,aAAa;gBAAEQ,OAAO;oBAAEC,UAAU,EAAE;gBAAC;YAAE;QAAE;QAC1E,MAAMC,SAAS7B,iBAAiB;YAAEoB,MAAM;YAAgBD,aAAa;gBAAEQ,OAAO,CAAC;YAAE;QAAE;QACnF,MAAMT,SAAS;YACbC,aAAa;gBAAC;oBAAEC,MAAM;oBAASC,QAAQ,EAAE;oBAAEC,QAAQ;gBAAK;aAAE;YAC1DA,QAAQ;gBAAEQ,cAAc;oBAACJ;oBAAOG;iBAAO;YAAC;QAC1C;QAEAhC,OAAO,IAAMgC,OAAOL,IAAI,CAAEN,SAASO,OAAO,CACxC;IAEJ;IAEA3B,GAAG,wEAAwE;QACzE,MAAM4B,QAAQ1B,iBAAiB;YAAEmB,aAAa;gBAAEQ,OAAO,CAAC;YAAE;QAAE;QAC5D,MAAME,SAAS7B,iBAAiB;YAAEoB,MAAM;YAAgBD,aAAa;gBAAEY,QAAQ,CAAC;YAAE;QAAE;QACpF,MAAMb,SAAS;YACbC,aAAa;gBACX;oBAAEC,MAAM;oBAASC,QAAQ,EAAE;oBAAEC,QAAQ;gBAAK;gBAC1C;oBAAEF,MAAM;oBAAUC,QAAQ,EAAE;oBAAEC,QAAQ;gBAAK;aAC5C;YACDA,QAAQ;gBAAEQ,cAAc;oBAACJ;oBAAOG;iBAAO;YAAC;QAC1C;QAEAhC,OAAO,IAAMgC,OAAOL,IAAI,CAAEN,SAASc,GAAG,CAACP,OAAO;IAChD;AACF;AAEA7B,SAAS,+BAA+B;IACtCE,GAAG,+HAA+H;QAChID,OAAOE,+BAA+BG,OAAO,CAAC;YAC5C+B,KAAK;YACLC,WAAW;YACXC,WAAW;YACXC,UAAU;YACVC,UAAU;YACVC,oBAAoB;QACtB;IACF;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformFile.d.ts","sourceRoot":"","sources":["../src/transformFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAGrF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"transformFile.d.ts","sourceRoot":"","sources":["../src/transformFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAGrF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAUzE;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,eAAe,EAAE,EAAE;IAAE,eAAe,EAAE,eAAe,CAAA;CAAE,6BAKxF,iBAAiB,CAAC,sBAAsB,CAAC,KAAG,OAAO,CAAC,mBAAmB,CAAC,CAO5E"}
|
package/dist/transformFile.js
CHANGED
|
@@ -5,7 +5,8 @@ const ANIMATED_MIME_TYPES = [
|
|
|
5
5
|
'image/gif',
|
|
6
6
|
'image/webp'
|
|
7
7
|
];
|
|
8
|
-
|
|
8
|
+
// Rounds, as core does when it saves the crop in pixels. Flooring loses 1px to float error.
|
|
9
|
+
const percentToPixel = (value, dimension)=>Math.round(value / 100 * dimension);
|
|
9
10
|
/**
|
|
10
11
|
* The Sharp package's public one-file-in/one-file-out upload primitive.
|
|
11
12
|
* `options.kind` selects which legacy task to run: the main file (optionally
|
|
@@ -100,8 +101,9 @@ async function transformCrop({ crop, file, fileIsAnimatedType, req, resizeOption
|
|
|
100
101
|
if (dimensionsChanged) {
|
|
101
102
|
const formattedCropData = {
|
|
102
103
|
height: newHeight,
|
|
103
|
-
|
|
104
|
-
|
|
104
|
+
// Rounding up can push the crop 1px past the far edge.
|
|
105
|
+
left: Math.min(percentToPixel(cropData.x, originalDimensions.width), originalDimensions.width - newWidth),
|
|
106
|
+
top: Math.min(percentToPixel(cropData.y, originalDimensions.height), originalDimensions.height - newHeight),
|
|
105
107
|
width: newWidth
|
|
106
108
|
};
|
|
107
109
|
let cropped = (await createSharpFromFile({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/transformFile.ts"],"sourcesContent":["import type { PayloadRequest, TransformFileArgs, TransformFileResult } from 'payload'\nimport type { ResizeOptions, SharpOptions } from 'sharp'\n\nimport type { SharpDependency, SharpUploadTaskOptions } from './types.js'\n\nimport { createSharpFromFile } from './createSharpFromFile.js'\nimport { optionallyAppendMetadata } from './optionallyAppendMetadata.js'\n\nconst ANIMATED_MIME_TYPES = ['image/avif', 'image/gif', 'image/webp']\n\nconst percentToPixel = (value: number, dimension: number) => Math.floor((value / 100) * dimension)\n\n/**\n * The Sharp package's public one-file-in/one-file-out upload primitive.\n * `options.kind` selects which legacy task to run: the main file (optionally\n * cropped, with `resizeOptions` re-applied to the crop output), or one named\n * legacy image size. Never writes to storage.\n */\nexport function createTransformFile({ sharpDependency }: { sharpDependency: SharpDependency }) {\n return async function transformFile({\n file,\n options,\n req,\n }: TransformFileArgs<SharpUploadTaskOptions>): Promise<TransformFileResult> {\n if (options.kind === 'main') {\n return transformMain({ file, options, req, sharpDependency })\n }\n\n return transformSize({ file, options, req, sharpDependency })\n }\n}\n\nasync function transformMain({\n file,\n options,\n req,\n sharpDependency,\n}: {\n file: File\n options: Extract<SharpUploadTaskOptions, { kind: 'main' }>\n req: PayloadRequest\n sharpDependency: SharpDependency\n}): Promise<TransformFileResult> {\n const { collectionUpload, crop } = options\n const { constructorOptions, formatOptions, resizeOptions, trimOptions, withMetadata } =\n collectionUpload\n\n const fileIsAnimatedType = ANIMATED_MIME_TYPES.includes(file.type)\n const fileHasAdjustments = Boolean(\n resizeOptions || formatOptions || trimOptions || constructorOptions,\n )\n\n if (crop) {\n return transformCrop({\n crop,\n file,\n fileIsAnimatedType,\n req,\n resizeOptions,\n sharpDependency,\n withMetadata,\n })\n }\n\n if (!fileIsAnimatedType && !fileHasAdjustments) {\n return { status: 'continue' }\n }\n\n const sharpOptions: SharpOptions = { ...constructorOptions }\n\n if (fileIsAnimatedType) {\n sharpOptions.animated = true\n }\n\n // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081\n let sharpFile = (\n await createSharpFromFile({ file, options: sharpOptions, sharpDependency })\n ).rotate()\n\n if (resizeOptions) {\n sharpFile = sharpFile.resize(resizeOptions)\n }\n if (formatOptions) {\n sharpFile = sharpFile.toFormat(formatOptions.format, formatOptions.options)\n }\n if (trimOptions) {\n sharpFile = sharpFile.trim(trimOptions)\n }\n\n sharpFile = await optionallyAppendMetadata({ req, sharpFile, withMetadata })\n const { data: outputData } = await sharpFile.toBuffer({ resolveWithObject: true })\n\n return {\n file: new File([outputData], file.name, { type: file.type }),\n status: 'continue',\n }\n}\n\nasync function transformCrop({\n crop,\n file,\n fileIsAnimatedType,\n req,\n resizeOptions,\n sharpDependency,\n withMetadata,\n}: {\n crop: NonNullable<Extract<SharpUploadTaskOptions, { kind: 'main' }>['crop']>\n file: File\n fileIsAnimatedType: boolean\n req: PayloadRequest\n resizeOptions: ResizeOptions | undefined\n sharpDependency: SharpDependency\n withMetadata: SharpUploadTaskOptions['collectionUpload']['withMetadata']\n}): Promise<TransformFileResult> {\n const { cropData, heightInPixels, originalDimensions, widthInPixels } = crop\n\n const sharpOptions: SharpOptions = fileIsAnimatedType ? { animated: true } : {}\n\n const newWidth = Number(widthInPixels)\n const newHeight = Number(heightInPixels)\n const dimensionsChanged =\n originalDimensions.width !== newWidth || originalDimensions.height !== newHeight\n\n let croppedFile = file\n\n if (dimensionsChanged) {\n const formattedCropData = {\n height: newHeight,\n left: percentToPixel(cropData.x, originalDimensions.width),\n top: percentToPixel(cropData.y, originalDimensions.height),\n width: newWidth,\n }\n\n let cropped = (\n await createSharpFromFile({ file, options: sharpOptions, sharpDependency })\n ).extract(formattedCropData)\n cropped = await optionallyAppendMetadata({ req, sharpFile: cropped, withMetadata })\n const { data } = await cropped.toBuffer({ resolveWithObject: true })\n croppedFile = new File([data], file.name, { type: file.type })\n }\n\n if (resizeOptions && !resizeOptions.withoutEnlargement) {\n const sharpFile = await createSharpFromFile({ file: croppedFile, sharpDependency })\n const { data: resizedBuffer } = await sharpFile\n .resize({\n fit: resizeOptions.fit || 'cover',\n height: resizeOptions.height,\n position: resizeOptions.position || 'center',\n width: resizeOptions.width,\n })\n .toBuffer({ resolveWithObject: true })\n\n return {\n file: new File([resizedBuffer], file.name, { type: file.type }),\n status: 'continue',\n }\n }\n\n return {\n file: croppedFile,\n status: 'continue',\n }\n}\n\nasync function transformSize({\n file,\n options,\n req,\n sharpDependency,\n}: {\n file: File\n options: Extract<SharpUploadTaskOptions, { kind: 'size' }>\n req: PayloadRequest\n sharpDependency: SharpDependency\n}): Promise<TransformFileResult> {\n const { collectionUpload, focalPoint, imageResizeConfig, originalDimensions } = options\n const { withMetadata } = collectionUpload\n\n const fileIsAnimatedType = ANIMATED_MIME_TYPES.includes(file.type)\n const sharpOptions: SharpOptions = fileIsAnimatedType ? { animated: true } : {}\n\n const sharpBase = (\n await createSharpFromFile({ file, options: sharpOptions, sharpDependency })\n ).rotate()\n const originalImageMeta = await sharpBase.metadata()\n\n let adjustedDimensions = { ...originalDimensions }\n\n if ([5, 6, 7, 8].includes(originalImageMeta.orientation!)) {\n adjustedDimensions = {\n height: originalDimensions.width,\n width: originalDimensions.height,\n }\n }\n\n let resized = sharpBase.clone()\n\n if (focalPoint) {\n let { height: resizeHeight, width: resizeWidth } = imageResizeConfig\n\n const originalAspectRatio = adjustedDimensions.width / adjustedDimensions.height\n\n if (resizeHeight && !resizeWidth) {\n resizeWidth = Math.round(resizeHeight * originalAspectRatio)\n }\n if (resizeWidth && !resizeHeight) {\n resizeHeight = Math.round(resizeWidth / originalAspectRatio)\n }\n if (!resizeHeight) {\n resizeHeight = originalImageMeta.height\n }\n if (!resizeWidth) {\n resizeWidth = originalImageMeta.width\n }\n\n const resizeAspectRatio = resizeWidth / resizeHeight\n const prioritizeHeight = resizeAspectRatio < originalAspectRatio\n\n resized = resized.resize({\n fastShrinkOnLoad: false,\n height: prioritizeHeight ? resizeHeight : undefined,\n width: prioritizeHeight ? undefined : resizeWidth,\n })\n\n const metadataAppended = await optionallyAppendMetadata({\n req,\n sharpFile: resized,\n withMetadata,\n })\n const { info } = await metadataAppended.toBuffer({ resolveWithObject: true })\n\n const resizedHeight = originalImageMeta.pages\n ? info.height / originalImageMeta.pages\n : info.height\n const resizedWidth = info.width\n\n const halfResizeX = resizeWidth / 2\n const xFocalCenter = resizedWidth * (focalPoint.x / 100)\n let leftBound = xFocalCenter - halfResizeX\n if (xFocalCenter + halfResizeX > resizedWidth) {\n leftBound = resizedWidth - resizeWidth\n }\n if (leftBound < 0) {\n leftBound = 0\n }\n\n const halfResizeY = resizeHeight / 2\n const yFocalCenter = resizedHeight * (focalPoint.y / 100)\n let topBound = yFocalCenter - halfResizeY\n if (yFocalCenter + halfResizeY > resizedHeight) {\n topBound = resizedHeight - resizeHeight\n }\n if (topBound < 0) {\n topBound = 0\n }\n\n resized = resized.extract({\n height: resizeHeight,\n left: Math.floor(leftBound),\n top: Math.floor(topBound),\n width: resizeWidth,\n })\n } else {\n resized = resized.resize(imageResizeConfig)\n }\n\n if (imageResizeConfig.formatOptions) {\n resized = resized.toFormat(\n imageResizeConfig.formatOptions.format,\n imageResizeConfig.formatOptions.options,\n )\n }\n if (imageResizeConfig.trimOptions) {\n resized = resized.trim(imageResizeConfig.trimOptions)\n }\n\n resized = await optionallyAppendMetadata({ req, sharpFile: resized, withMetadata })\n const { data: outputData } = await resized.toBuffer({ resolveWithObject: true })\n\n return {\n file: new File([outputData], file.name, { type: file.type }),\n status: 'continue',\n }\n}\n"],"names":["createSharpFromFile","optionallyAppendMetadata","ANIMATED_MIME_TYPES","percentToPixel","value","dimension","Math","floor","createTransformFile","sharpDependency","transformFile","file","options","req","kind","transformMain","transformSize","collectionUpload","crop","constructorOptions","formatOptions","resizeOptions","trimOptions","withMetadata","fileIsAnimatedType","includes","type","fileHasAdjustments","Boolean","transformCrop","status","sharpOptions","animated","sharpFile","rotate","resize","toFormat","format","trim","data","outputData","toBuffer","resolveWithObject","File","name","cropData","heightInPixels","originalDimensions","widthInPixels","newWidth","Number","newHeight","dimensionsChanged","width","height","croppedFile","formattedCropData","left","x","top","y","cropped","extract","withoutEnlargement","resizedBuffer","fit","position","focalPoint","imageResizeConfig","sharpBase","originalImageMeta","metadata","adjustedDimensions","orientation","resized","clone","resizeHeight","resizeWidth","originalAspectRatio","round","resizeAspectRatio","prioritizeHeight","fastShrinkOnLoad","undefined","metadataAppended","info","resizedHeight","pages","resizedWidth","halfResizeX","xFocalCenter","leftBound","halfResizeY","yFocalCenter","topBound"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../src/transformFile.ts"],"sourcesContent":["import type { PayloadRequest, TransformFileArgs, TransformFileResult } from 'payload'\nimport type { ResizeOptions, SharpOptions } from 'sharp'\n\nimport type { SharpDependency, SharpUploadTaskOptions } from './types.js'\n\nimport { createSharpFromFile } from './createSharpFromFile.js'\nimport { optionallyAppendMetadata } from './optionallyAppendMetadata.js'\n\nconst ANIMATED_MIME_TYPES = ['image/avif', 'image/gif', 'image/webp']\n\n// Rounds, as core does when it saves the crop in pixels. Flooring loses 1px to float error.\nconst percentToPixel = (value: number, dimension: number) => Math.round((value / 100) * dimension)\n\n/**\n * The Sharp package's public one-file-in/one-file-out upload primitive.\n * `options.kind` selects which legacy task to run: the main file (optionally\n * cropped, with `resizeOptions` re-applied to the crop output), or one named\n * legacy image size. Never writes to storage.\n */\nexport function createTransformFile({ sharpDependency }: { sharpDependency: SharpDependency }) {\n return async function transformFile({\n file,\n options,\n req,\n }: TransformFileArgs<SharpUploadTaskOptions>): Promise<TransformFileResult> {\n if (options.kind === 'main') {\n return transformMain({ file, options, req, sharpDependency })\n }\n\n return transformSize({ file, options, req, sharpDependency })\n }\n}\n\nasync function transformMain({\n file,\n options,\n req,\n sharpDependency,\n}: {\n file: File\n options: Extract<SharpUploadTaskOptions, { kind: 'main' }>\n req: PayloadRequest\n sharpDependency: SharpDependency\n}): Promise<TransformFileResult> {\n const { collectionUpload, crop } = options\n const { constructorOptions, formatOptions, resizeOptions, trimOptions, withMetadata } =\n collectionUpload\n\n const fileIsAnimatedType = ANIMATED_MIME_TYPES.includes(file.type)\n const fileHasAdjustments = Boolean(\n resizeOptions || formatOptions || trimOptions || constructorOptions,\n )\n\n if (crop) {\n return transformCrop({\n crop,\n file,\n fileIsAnimatedType,\n req,\n resizeOptions,\n sharpDependency,\n withMetadata,\n })\n }\n\n if (!fileIsAnimatedType && !fileHasAdjustments) {\n return { status: 'continue' }\n }\n\n const sharpOptions: SharpOptions = { ...constructorOptions }\n\n if (fileIsAnimatedType) {\n sharpOptions.animated = true\n }\n\n // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081\n let sharpFile = (\n await createSharpFromFile({ file, options: sharpOptions, sharpDependency })\n ).rotate()\n\n if (resizeOptions) {\n sharpFile = sharpFile.resize(resizeOptions)\n }\n if (formatOptions) {\n sharpFile = sharpFile.toFormat(formatOptions.format, formatOptions.options)\n }\n if (trimOptions) {\n sharpFile = sharpFile.trim(trimOptions)\n }\n\n sharpFile = await optionallyAppendMetadata({ req, sharpFile, withMetadata })\n const { data: outputData } = await sharpFile.toBuffer({ resolveWithObject: true })\n\n return {\n file: new File([outputData], file.name, { type: file.type }),\n status: 'continue',\n }\n}\n\nasync function transformCrop({\n crop,\n file,\n fileIsAnimatedType,\n req,\n resizeOptions,\n sharpDependency,\n withMetadata,\n}: {\n crop: NonNullable<Extract<SharpUploadTaskOptions, { kind: 'main' }>['crop']>\n file: File\n fileIsAnimatedType: boolean\n req: PayloadRequest\n resizeOptions: ResizeOptions | undefined\n sharpDependency: SharpDependency\n withMetadata: SharpUploadTaskOptions['collectionUpload']['withMetadata']\n}): Promise<TransformFileResult> {\n const { cropData, heightInPixels, originalDimensions, widthInPixels } = crop\n\n const sharpOptions: SharpOptions = fileIsAnimatedType ? { animated: true } : {}\n\n const newWidth = Number(widthInPixels)\n const newHeight = Number(heightInPixels)\n const dimensionsChanged =\n originalDimensions.width !== newWidth || originalDimensions.height !== newHeight\n\n let croppedFile = file\n\n if (dimensionsChanged) {\n const formattedCropData = {\n height: newHeight,\n // Rounding up can push the crop 1px past the far edge.\n left: Math.min(\n percentToPixel(cropData.x, originalDimensions.width),\n originalDimensions.width - newWidth,\n ),\n top: Math.min(\n percentToPixel(cropData.y, originalDimensions.height),\n originalDimensions.height - newHeight,\n ),\n width: newWidth,\n }\n\n let cropped = (\n await createSharpFromFile({ file, options: sharpOptions, sharpDependency })\n ).extract(formattedCropData)\n cropped = await optionallyAppendMetadata({ req, sharpFile: cropped, withMetadata })\n const { data } = await cropped.toBuffer({ resolveWithObject: true })\n croppedFile = new File([data], file.name, { type: file.type })\n }\n\n if (resizeOptions && !resizeOptions.withoutEnlargement) {\n const sharpFile = await createSharpFromFile({ file: croppedFile, sharpDependency })\n const { data: resizedBuffer } = await sharpFile\n .resize({\n fit: resizeOptions.fit || 'cover',\n height: resizeOptions.height,\n position: resizeOptions.position || 'center',\n width: resizeOptions.width,\n })\n .toBuffer({ resolveWithObject: true })\n\n return {\n file: new File([resizedBuffer], file.name, { type: file.type }),\n status: 'continue',\n }\n }\n\n return {\n file: croppedFile,\n status: 'continue',\n }\n}\n\nasync function transformSize({\n file,\n options,\n req,\n sharpDependency,\n}: {\n file: File\n options: Extract<SharpUploadTaskOptions, { kind: 'size' }>\n req: PayloadRequest\n sharpDependency: SharpDependency\n}): Promise<TransformFileResult> {\n const { collectionUpload, focalPoint, imageResizeConfig, originalDimensions } = options\n const { withMetadata } = collectionUpload\n\n const fileIsAnimatedType = ANIMATED_MIME_TYPES.includes(file.type)\n const sharpOptions: SharpOptions = fileIsAnimatedType ? { animated: true } : {}\n\n const sharpBase = (\n await createSharpFromFile({ file, options: sharpOptions, sharpDependency })\n ).rotate()\n const originalImageMeta = await sharpBase.metadata()\n\n let adjustedDimensions = { ...originalDimensions }\n\n if ([5, 6, 7, 8].includes(originalImageMeta.orientation!)) {\n adjustedDimensions = {\n height: originalDimensions.width,\n width: originalDimensions.height,\n }\n }\n\n let resized = sharpBase.clone()\n\n if (focalPoint) {\n let { height: resizeHeight, width: resizeWidth } = imageResizeConfig\n\n const originalAspectRatio = adjustedDimensions.width / adjustedDimensions.height\n\n if (resizeHeight && !resizeWidth) {\n resizeWidth = Math.round(resizeHeight * originalAspectRatio)\n }\n if (resizeWidth && !resizeHeight) {\n resizeHeight = Math.round(resizeWidth / originalAspectRatio)\n }\n if (!resizeHeight) {\n resizeHeight = originalImageMeta.height\n }\n if (!resizeWidth) {\n resizeWidth = originalImageMeta.width\n }\n\n const resizeAspectRatio = resizeWidth / resizeHeight\n const prioritizeHeight = resizeAspectRatio < originalAspectRatio\n\n resized = resized.resize({\n fastShrinkOnLoad: false,\n height: prioritizeHeight ? resizeHeight : undefined,\n width: prioritizeHeight ? undefined : resizeWidth,\n })\n\n const metadataAppended = await optionallyAppendMetadata({\n req,\n sharpFile: resized,\n withMetadata,\n })\n const { info } = await metadataAppended.toBuffer({ resolveWithObject: true })\n\n const resizedHeight = originalImageMeta.pages\n ? info.height / originalImageMeta.pages\n : info.height\n const resizedWidth = info.width\n\n const halfResizeX = resizeWidth / 2\n const xFocalCenter = resizedWidth * (focalPoint.x / 100)\n let leftBound = xFocalCenter - halfResizeX\n if (xFocalCenter + halfResizeX > resizedWidth) {\n leftBound = resizedWidth - resizeWidth\n }\n if (leftBound < 0) {\n leftBound = 0\n }\n\n const halfResizeY = resizeHeight / 2\n const yFocalCenter = resizedHeight * (focalPoint.y / 100)\n let topBound = yFocalCenter - halfResizeY\n if (yFocalCenter + halfResizeY > resizedHeight) {\n topBound = resizedHeight - resizeHeight\n }\n if (topBound < 0) {\n topBound = 0\n }\n\n resized = resized.extract({\n height: resizeHeight,\n left: Math.floor(leftBound),\n top: Math.floor(topBound),\n width: resizeWidth,\n })\n } else {\n resized = resized.resize(imageResizeConfig)\n }\n\n if (imageResizeConfig.formatOptions) {\n resized = resized.toFormat(\n imageResizeConfig.formatOptions.format,\n imageResizeConfig.formatOptions.options,\n )\n }\n if (imageResizeConfig.trimOptions) {\n resized = resized.trim(imageResizeConfig.trimOptions)\n }\n\n resized = await optionallyAppendMetadata({ req, sharpFile: resized, withMetadata })\n const { data: outputData } = await resized.toBuffer({ resolveWithObject: true })\n\n return {\n file: new File([outputData], file.name, { type: file.type }),\n status: 'continue',\n }\n}\n"],"names":["createSharpFromFile","optionallyAppendMetadata","ANIMATED_MIME_TYPES","percentToPixel","value","dimension","Math","round","createTransformFile","sharpDependency","transformFile","file","options","req","kind","transformMain","transformSize","collectionUpload","crop","constructorOptions","formatOptions","resizeOptions","trimOptions","withMetadata","fileIsAnimatedType","includes","type","fileHasAdjustments","Boolean","transformCrop","status","sharpOptions","animated","sharpFile","rotate","resize","toFormat","format","trim","data","outputData","toBuffer","resolveWithObject","File","name","cropData","heightInPixels","originalDimensions","widthInPixels","newWidth","Number","newHeight","dimensionsChanged","width","height","croppedFile","formattedCropData","left","min","x","top","y","cropped","extract","withoutEnlargement","resizedBuffer","fit","position","focalPoint","imageResizeConfig","sharpBase","originalImageMeta","metadata","adjustedDimensions","orientation","resized","clone","resizeHeight","resizeWidth","originalAspectRatio","resizeAspectRatio","prioritizeHeight","fastShrinkOnLoad","undefined","metadataAppended","info","resizedHeight","pages","resizedWidth","halfResizeX","xFocalCenter","leftBound","halfResizeY","yFocalCenter","topBound","floor"],"mappings":"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"}
|
|
@@ -161,6 +161,105 @@ describe('createTransformFile', ()=>{
|
|
|
161
161
|
expect(metadata.height).toBe(expectedSize);
|
|
162
162
|
});
|
|
163
163
|
});
|
|
164
|
+
describe('main crop', ()=>{
|
|
165
|
+
const cropMain = async ({ cropData, image })=>{
|
|
166
|
+
const transformFile = createTransformFile({
|
|
167
|
+
sharpDependency: sharp
|
|
168
|
+
});
|
|
169
|
+
const result = await transformFile({
|
|
170
|
+
file: new File([
|
|
171
|
+
image
|
|
172
|
+
], 'photo.png', {
|
|
173
|
+
type: 'image/png'
|
|
174
|
+
}),
|
|
175
|
+
options: {
|
|
176
|
+
collectionUpload: {},
|
|
177
|
+
crop: {
|
|
178
|
+
cropData,
|
|
179
|
+
heightInPixels: 10,
|
|
180
|
+
originalDimensions: {
|
|
181
|
+
height: 10,
|
|
182
|
+
width: 100
|
|
183
|
+
},
|
|
184
|
+
widthInPixels: cropData.width
|
|
185
|
+
},
|
|
186
|
+
kind: 'main'
|
|
187
|
+
},
|
|
188
|
+
req: makeReq()
|
|
189
|
+
});
|
|
190
|
+
return sharp(await toBuffer(result.file));
|
|
191
|
+
};
|
|
192
|
+
it('should start the crop at the saved pixel, not 1px before it', async ()=>{
|
|
193
|
+
// Red columns 0-28, blue from column 29. Core saves x = 29px and sends it as 29 / 100 * 100,
|
|
194
|
+
// which is 28.999…%, so flooring it starts the crop on the last red column.
|
|
195
|
+
const blue = await makeImageBuffer({
|
|
196
|
+
background: {
|
|
197
|
+
b: 255,
|
|
198
|
+
g: 0,
|
|
199
|
+
r: 0
|
|
200
|
+
},
|
|
201
|
+
height: 10,
|
|
202
|
+
width: 71
|
|
203
|
+
});
|
|
204
|
+
const image = await sharp({
|
|
205
|
+
create: {
|
|
206
|
+
background: {
|
|
207
|
+
b: 0,
|
|
208
|
+
g: 0,
|
|
209
|
+
r: 255
|
|
210
|
+
},
|
|
211
|
+
channels: 3,
|
|
212
|
+
height: 10,
|
|
213
|
+
width: 100
|
|
214
|
+
}
|
|
215
|
+
}).composite([
|
|
216
|
+
{
|
|
217
|
+
input: blue,
|
|
218
|
+
left: 29,
|
|
219
|
+
top: 0
|
|
220
|
+
}
|
|
221
|
+
]).png().toBuffer();
|
|
222
|
+
const cropped = await cropMain({
|
|
223
|
+
cropData: {
|
|
224
|
+
height: 100,
|
|
225
|
+
unit: '%',
|
|
226
|
+
width: 10,
|
|
227
|
+
x: 29 / 100 * 100,
|
|
228
|
+
y: 0
|
|
229
|
+
},
|
|
230
|
+
image
|
|
231
|
+
});
|
|
232
|
+
const raw = await cropped.raw().toBuffer({
|
|
233
|
+
resolveWithObject: true
|
|
234
|
+
});
|
|
235
|
+
expect(sampleRawPixel({
|
|
236
|
+
...raw,
|
|
237
|
+
x: 0,
|
|
238
|
+
y: 0
|
|
239
|
+
})).toEqual({
|
|
240
|
+
b: 255,
|
|
241
|
+
g: 0,
|
|
242
|
+
r: 0
|
|
243
|
+
});
|
|
244
|
+
});
|
|
245
|
+
it('should keep a rounded crop inside the image', async ()=>{
|
|
246
|
+
// 30.5% rounds up to 31px, and 31 + 70 would pass the right edge of a 100px image.
|
|
247
|
+
const cropped = await cropMain({
|
|
248
|
+
cropData: {
|
|
249
|
+
height: 100,
|
|
250
|
+
unit: '%',
|
|
251
|
+
width: 70,
|
|
252
|
+
x: 30.5,
|
|
253
|
+
y: 0
|
|
254
|
+
},
|
|
255
|
+
image: await makeImageBuffer({
|
|
256
|
+
height: 10,
|
|
257
|
+
width: 100
|
|
258
|
+
})
|
|
259
|
+
});
|
|
260
|
+
expect((await cropped.metadata()).width).toBe(70);
|
|
261
|
+
});
|
|
262
|
+
});
|
|
164
263
|
describe('size (transformSize)', ()=>{
|
|
165
264
|
// Each original forces one resize-priority branch, and a focal point at 80% pushes the
|
|
166
265
|
// 50px extract window against the clamped far edge, so a correct crop is entirely blue.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/transformFile.spec.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport sharp from 'sharp'\nimport { describe, expect, it } from 'vitest'\n\nimport type { SharpUploadTaskOptions } from './types.js'\n\nimport { createTransformFile } from './transformFile.js'\n\nconst makeReq = (): PayloadRequest => ({}) as PayloadRequest\n\nconst toBuffer = async (file: File): Promise<Buffer> => Buffer.from(await file.arrayBuffer())\n\nconst makeImageBuffer = async ({\n background = { b: 0, g: 128, r: 255 },\n height,\n width,\n}: {\n background?: { b: number; g: number; r: number }\n height: number\n width: number\n}): Promise<Buffer> =>\n sharp({ create: { background, channels: 3, height, width } })\n .png()\n .toBuffer()\n\n/**\n * A two-colour image split along `splitAxis` (red/blue halves) — proves the\n * focal-point extract region in `transformSize` lands where the math says,\n * not just that the output dimensions are right.\n */\nconst makeTwoColorImage = async ({\n height,\n splitAxis,\n width,\n}: {\n height: number\n splitAxis: 'x' | 'y'\n width: number\n}): Promise<Buffer> => {\n const raw = Buffer.alloc(width * height * 3)\n\n for (let y = 0; y < height; y++) {\n for (let x = 0; x < width; x++) {\n const idx = (y * width + x) * 3\n const isFirstHalf = splitAxis === 'x' ? x < width / 2 : y < height / 2\n\n if (isFirstHalf) {\n raw[idx] = 255 // red\n } else {\n raw[idx + 2] = 255 // blue\n }\n }\n }\n\n return sharp(raw, { raw: { channels: 3, height, width } })\n .png()\n .toBuffer()\n}\n\nconst sampleRawPixel = ({\n data,\n info,\n x,\n y,\n}: {\n data: Buffer\n info: { channels: number; width: number }\n x: number\n y: number\n}): { b: number; g: number; r: number } => {\n const idx = (y * info.width + x) * info.channels\n return { b: data[idx + 2]!, g: data[idx + 1]!, r: data[idx]! }\n}\n\ndescribe('createTransformFile', () => {\n describe('main (transformMain)', () => {\n it('should trim uniform-colour padding from the main file', async () => {\n const square = await makeImageBuffer({\n background: { b: 0, g: 0, r: 0 },\n height: 20,\n width: 20,\n })\n const framed = await sharp({\n create: { background: { b: 255, g: 255, r: 255 }, channels: 3, height: 60, width: 60 },\n })\n .composite([{ input: square, left: 20, top: 20 }])\n .png()\n .toBuffer()\n const file = new File([framed], 'photo.png', { type: 'image/png' })\n const transformFile = createTransformFile({ sharpDependency: sharp })\n\n const result = await transformFile({\n file,\n options: {\n collectionUpload: { trimOptions: {} },\n kind: 'main',\n } satisfies SharpUploadTaskOptions,\n req: makeReq(),\n })\n\n const metadata = await sharp(await toBuffer(result.file!)).metadata()\n expect(metadata.width).toBe(20)\n expect(metadata.height).toBe(20)\n })\n\n it.each([\n // Re-applied by default, so the 40x40 crop is resized down to 20x20.\n { expectedSize: 20, resizeOptions: { fit: 'cover' as const, height: 20, width: 20 } },\n { expectedSize: 40, resizeOptions: { height: 20, width: 20, withoutEnlargement: true } },\n ])(\n 'should re-apply resizeOptions to the crop output unless withoutEnlargement is set (%#)',\n async ({ expectedSize, resizeOptions }) => {\n const buffer = await makeImageBuffer({ height: 100, width: 100 })\n const file = new File([buffer], 'photo.png', { type: 'image/png' })\n const transformFile = createTransformFile({ sharpDependency: sharp })\n\n const result = await transformFile({\n file,\n options: {\n collectionUpload: { resizeOptions },\n crop: {\n cropData: { height: 40, unit: '%', width: 40, x: 25, y: 25 },\n heightInPixels: 40,\n originalDimensions: { height: 100, width: 100 },\n widthInPixels: 40,\n },\n kind: 'main',\n } satisfies SharpUploadTaskOptions,\n req: makeReq(),\n })\n\n const metadata = await sharp(await toBuffer(result.file!)).metadata()\n expect(metadata.width).toBe(expectedSize)\n expect(metadata.height).toBe(expectedSize)\n },\n )\n })\n\n describe('size (transformSize)', () => {\n // Each original forces one resize-priority branch, and a focal point at 80% pushes the\n // 50px extract window against the clamped far edge, so a correct crop is entirely blue.\n it.each([\n {\n focalPoint: { x: 80, y: 50 },\n original: { height: 100, splitAxis: 'x' as const, width: 200 },\n samples: [\n { x: 10, y: 25 },\n { x: 40, y: 25 },\n ],\n },\n {\n focalPoint: { x: 50, y: 80 },\n original: { height: 200, splitAxis: 'y' as const, width: 100 },\n samples: [\n { x: 25, y: 10 },\n { x: 25, y: 40 },\n ],\n },\n ])(\n 'should extract the focal-point region along the $original.splitAxis axis',\n async ({ focalPoint, original, samples }) => {\n const buffer = await makeTwoColorImage(original)\n const file = new File([buffer], 'photo.png', { type: 'image/png' })\n const transformFile = createTransformFile({ sharpDependency: sharp })\n\n const result = await transformFile({\n file,\n options: {\n collectionUpload: {},\n focalPoint,\n imageResizeConfig: { name: 'thumb', height: 50, width: 50 },\n kind: 'size',\n originalDimensions: { height: original.height, width: original.width },\n } satisfies SharpUploadTaskOptions,\n req: makeReq(),\n })\n\n const { data, info } = await sharp(await toBuffer(result.file!))\n .raw()\n .toBuffer({ resolveWithObject: true })\n expect(info.width).toBe(50)\n expect(info.height).toBe(50)\n for (const { x, y } of samples) {\n expect(sampleRawPixel({ data, info, x, y })).toEqual({ b: 255, g: 0, r: 0 })\n }\n },\n )\n })\n})\n"],"names":["sharp","describe","expect","it","createTransformFile","makeReq","toBuffer","file","Buffer","from","arrayBuffer","makeImageBuffer","background","b","g","r","height","width","create","channels","png","makeTwoColorImage","splitAxis","raw","alloc","y","x","idx","isFirstHalf","sampleRawPixel","data","info","square","framed","composite","input","left","top","File","type","transformFile","sharpDependency","result","options","collectionUpload","trimOptions","kind","req","metadata","toBe","each","expectedSize","resizeOptions","fit","withoutEnlargement","buffer","crop","cropData","unit","heightInPixels","originalDimensions","widthInPixels","focalPoint","original","samples","imageResizeConfig","name","resolveWithObject","toEqual"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../src/transformFile.spec.ts"],"sourcesContent":["import type { PayloadRequest, UploadEdits } from 'payload'\n\nimport sharp from 'sharp'\nimport { describe, expect, it } from 'vitest'\n\nimport type { SharpUploadTaskOptions } from './types.js'\n\nimport { createTransformFile } from './transformFile.js'\n\nconst makeReq = (): PayloadRequest => ({}) as PayloadRequest\n\nconst toBuffer = async (file: File): Promise<Buffer> => Buffer.from(await file.arrayBuffer())\n\nconst makeImageBuffer = async ({\n background = { b: 0, g: 128, r: 255 },\n height,\n width,\n}: {\n background?: { b: number; g: number; r: number }\n height: number\n width: number\n}): Promise<Buffer> =>\n sharp({ create: { background, channels: 3, height, width } })\n .png()\n .toBuffer()\n\n/**\n * A two-colour image split along `splitAxis` (red/blue halves) — proves the\n * focal-point extract region in `transformSize` lands where the math says,\n * not just that the output dimensions are right.\n */\nconst makeTwoColorImage = async ({\n height,\n splitAxis,\n width,\n}: {\n height: number\n splitAxis: 'x' | 'y'\n width: number\n}): Promise<Buffer> => {\n const raw = Buffer.alloc(width * height * 3)\n\n for (let y = 0; y < height; y++) {\n for (let x = 0; x < width; x++) {\n const idx = (y * width + x) * 3\n const isFirstHalf = splitAxis === 'x' ? x < width / 2 : y < height / 2\n\n if (isFirstHalf) {\n raw[idx] = 255 // red\n } else {\n raw[idx + 2] = 255 // blue\n }\n }\n }\n\n return sharp(raw, { raw: { channels: 3, height, width } })\n .png()\n .toBuffer()\n}\n\nconst sampleRawPixel = ({\n data,\n info,\n x,\n y,\n}: {\n data: Buffer\n info: { channels: number; width: number }\n x: number\n y: number\n}): { b: number; g: number; r: number } => {\n const idx = (y * info.width + x) * info.channels\n return { b: data[idx + 2]!, g: data[idx + 1]!, r: data[idx]! }\n}\n\ndescribe('createTransformFile', () => {\n describe('main (transformMain)', () => {\n it('should trim uniform-colour padding from the main file', async () => {\n const square = await makeImageBuffer({\n background: { b: 0, g: 0, r: 0 },\n height: 20,\n width: 20,\n })\n const framed = await sharp({\n create: { background: { b: 255, g: 255, r: 255 }, channels: 3, height: 60, width: 60 },\n })\n .composite([{ input: square, left: 20, top: 20 }])\n .png()\n .toBuffer()\n const file = new File([framed], 'photo.png', { type: 'image/png' })\n const transformFile = createTransformFile({ sharpDependency: sharp })\n\n const result = await transformFile({\n file,\n options: {\n collectionUpload: { trimOptions: {} },\n kind: 'main',\n } satisfies SharpUploadTaskOptions,\n req: makeReq(),\n })\n\n const metadata = await sharp(await toBuffer(result.file!)).metadata()\n expect(metadata.width).toBe(20)\n expect(metadata.height).toBe(20)\n })\n\n it.each([\n // Re-applied by default, so the 40x40 crop is resized down to 20x20.\n { expectedSize: 20, resizeOptions: { fit: 'cover' as const, height: 20, width: 20 } },\n { expectedSize: 40, resizeOptions: { height: 20, width: 20, withoutEnlargement: true } },\n ])(\n 'should re-apply resizeOptions to the crop output unless withoutEnlargement is set (%#)',\n async ({ expectedSize, resizeOptions }) => {\n const buffer = await makeImageBuffer({ height: 100, width: 100 })\n const file = new File([buffer], 'photo.png', { type: 'image/png' })\n const transformFile = createTransformFile({ sharpDependency: sharp })\n\n const result = await transformFile({\n file,\n options: {\n collectionUpload: { resizeOptions },\n crop: {\n cropData: { height: 40, unit: '%', width: 40, x: 25, y: 25 },\n heightInPixels: 40,\n originalDimensions: { height: 100, width: 100 },\n widthInPixels: 40,\n },\n kind: 'main',\n } satisfies SharpUploadTaskOptions,\n req: makeReq(),\n })\n\n const metadata = await sharp(await toBuffer(result.file!)).metadata()\n expect(metadata.width).toBe(expectedSize)\n expect(metadata.height).toBe(expectedSize)\n },\n )\n })\n\n describe('main crop', () => {\n const cropMain = async ({\n cropData,\n image,\n }: {\n cropData: NonNullable<UploadEdits['crop']>\n image: Buffer\n }) => {\n const transformFile = createTransformFile({ sharpDependency: sharp })\n\n const result = await transformFile({\n file: new File([image], 'photo.png', { type: 'image/png' }),\n options: {\n collectionUpload: {},\n crop: {\n cropData,\n heightInPixels: 10,\n originalDimensions: { height: 10, width: 100 },\n widthInPixels: cropData.width,\n },\n kind: 'main',\n } satisfies SharpUploadTaskOptions,\n req: makeReq(),\n })\n\n return sharp(await toBuffer(result.file!))\n }\n\n it('should start the crop at the saved pixel, not 1px before it', async () => {\n // Red columns 0-28, blue from column 29. Core saves x = 29px and sends it as 29 / 100 * 100,\n // which is 28.999…%, so flooring it starts the crop on the last red column.\n const blue = await makeImageBuffer({\n background: { b: 255, g: 0, r: 0 },\n height: 10,\n width: 71,\n })\n const image = await sharp({\n create: { background: { b: 0, g: 0, r: 255 }, channels: 3, height: 10, width: 100 },\n })\n .composite([{ input: blue, left: 29, top: 0 }])\n .png()\n .toBuffer()\n\n const cropped = await cropMain({\n cropData: { height: 100, unit: '%', width: 10, x: (29 / 100) * 100, y: 0 },\n image,\n })\n\n const raw = await cropped.raw().toBuffer({ resolveWithObject: true })\n expect(sampleRawPixel({ ...raw, x: 0, y: 0 })).toEqual({ b: 255, g: 0, r: 0 })\n })\n\n it('should keep a rounded crop inside the image', async () => {\n // 30.5% rounds up to 31px, and 31 + 70 would pass the right edge of a 100px image.\n const cropped = await cropMain({\n cropData: { height: 100, unit: '%', width: 70, x: 30.5, y: 0 },\n image: await makeImageBuffer({ height: 10, width: 100 }),\n })\n\n expect((await cropped.metadata()).width).toBe(70)\n })\n })\n\n describe('size (transformSize)', () => {\n // Each original forces one resize-priority branch, and a focal point at 80% pushes the\n // 50px extract window against the clamped far edge, so a correct crop is entirely blue.\n it.each([\n {\n focalPoint: { x: 80, y: 50 },\n original: { height: 100, splitAxis: 'x' as const, width: 200 },\n samples: [\n { x: 10, y: 25 },\n { x: 40, y: 25 },\n ],\n },\n {\n focalPoint: { x: 50, y: 80 },\n original: { height: 200, splitAxis: 'y' as const, width: 100 },\n samples: [\n { x: 25, y: 10 },\n { x: 25, y: 40 },\n ],\n },\n ])(\n 'should extract the focal-point region along the $original.splitAxis axis',\n async ({ focalPoint, original, samples }) => {\n const buffer = await makeTwoColorImage(original)\n const file = new File([buffer], 'photo.png', { type: 'image/png' })\n const transformFile = createTransformFile({ sharpDependency: sharp })\n\n const result = await transformFile({\n file,\n options: {\n collectionUpload: {},\n focalPoint,\n imageResizeConfig: { name: 'thumb', height: 50, width: 50 },\n kind: 'size',\n originalDimensions: { height: original.height, width: original.width },\n } satisfies SharpUploadTaskOptions,\n req: makeReq(),\n })\n\n const { data, info } = await sharp(await toBuffer(result.file!))\n .raw()\n .toBuffer({ resolveWithObject: true })\n expect(info.width).toBe(50)\n expect(info.height).toBe(50)\n for (const { x, y } of samples) {\n expect(sampleRawPixel({ data, info, x, y })).toEqual({ b: 255, g: 0, r: 0 })\n }\n },\n )\n })\n})\n"],"names":["sharp","describe","expect","it","createTransformFile","makeReq","toBuffer","file","Buffer","from","arrayBuffer","makeImageBuffer","background","b","g","r","height","width","create","channels","png","makeTwoColorImage","splitAxis","raw","alloc","y","x","idx","isFirstHalf","sampleRawPixel","data","info","square","framed","composite","input","left","top","File","type","transformFile","sharpDependency","result","options","collectionUpload","trimOptions","kind","req","metadata","toBe","each","expectedSize","resizeOptions","fit","withoutEnlargement","buffer","crop","cropData","unit","heightInPixels","originalDimensions","widthInPixels","cropMain","image","blue","cropped","resolveWithObject","toEqual","focalPoint","original","samples","imageResizeConfig","name"],"mappings":"AAEA,OAAOA,WAAW,QAAO;AACzB,SAASC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAI7C,SAASC,mBAAmB,QAAQ,qBAAoB;AAExD,MAAMC,UAAU,IAAuB,CAAA,CAAC,CAAA;AAExC,MAAMC,WAAW,OAAOC,OAAgCC,OAAOC,IAAI,CAAC,MAAMF,KAAKG,WAAW;AAE1F,MAAMC,kBAAkB,OAAO,EAC7BC,aAAa;IAAEC,GAAG;IAAGC,GAAG;IAAKC,GAAG;AAAI,CAAC,EACrCC,MAAM,EACNC,KAAK,EAKN,GACCjB,MAAM;QAAEkB,QAAQ;YAAEN;YAAYO,UAAU;YAAGH;YAAQC;QAAM;IAAE,GACxDG,GAAG,GACHd,QAAQ;AAEb;;;;CAIC,GACD,MAAMe,oBAAoB,OAAO,EAC/BL,MAAM,EACNM,SAAS,EACTL,KAAK,EAKN;IACC,MAAMM,MAAMf,OAAOgB,KAAK,CAACP,QAAQD,SAAS;IAE1C,IAAK,IAAIS,IAAI,GAAGA,IAAIT,QAAQS,IAAK;QAC/B,IAAK,IAAIC,IAAI,GAAGA,IAAIT,OAAOS,IAAK;YAC9B,MAAMC,MAAM,AAACF,CAAAA,IAAIR,QAAQS,CAAAA,IAAK;YAC9B,MAAME,cAAcN,cAAc,MAAMI,IAAIT,QAAQ,IAAIQ,IAAIT,SAAS;YAErE,IAAIY,aAAa;gBACfL,GAAG,CAACI,IAAI,GAAG,KAAI,MAAM;YACvB,OAAO;gBACLJ,GAAG,CAACI,MAAM,EAAE,GAAG,KAAI,OAAO;YAC5B;QACF;IACF;IAEA,OAAO3B,MAAMuB,KAAK;QAAEA,KAAK;YAAEJ,UAAU;YAAGH;YAAQC;QAAM;IAAE,GACrDG,GAAG,GACHd,QAAQ;AACb;AAEA,MAAMuB,iBAAiB,CAAC,EACtBC,IAAI,EACJC,IAAI,EACJL,CAAC,EACDD,CAAC,EAMF;IACC,MAAME,MAAM,AAACF,CAAAA,IAAIM,KAAKd,KAAK,GAAGS,CAAAA,IAAKK,KAAKZ,QAAQ;IAChD,OAAO;QAAEN,GAAGiB,IAAI,CAACH,MAAM,EAAE;QAAGb,GAAGgB,IAAI,CAACH,MAAM,EAAE;QAAGZ,GAAGe,IAAI,CAACH,IAAI;IAAE;AAC/D;AAEA1B,SAAS,uBAAuB;IAC9BA,SAAS,wBAAwB;QAC/BE,GAAG,yDAAyD;YAC1D,MAAM6B,SAAS,MAAMrB,gBAAgB;gBACnCC,YAAY;oBAAEC,GAAG;oBAAGC,GAAG;oBAAGC,GAAG;gBAAE;gBAC/BC,QAAQ;gBACRC,OAAO;YACT;YACA,MAAMgB,SAAS,MAAMjC,MAAM;gBACzBkB,QAAQ;oBAAEN,YAAY;wBAAEC,GAAG;wBAAKC,GAAG;wBAAKC,GAAG;oBAAI;oBAAGI,UAAU;oBAAGH,QAAQ;oBAAIC,OAAO;gBAAG;YACvF,GACGiB,SAAS,CAAC;gBAAC;oBAAEC,OAAOH;oBAAQI,MAAM;oBAAIC,KAAK;gBAAG;aAAE,EAChDjB,GAAG,GACHd,QAAQ;YACX,MAAMC,OAAO,IAAI+B,KAAK;gBAACL;aAAO,EAAE,aAAa;gBAAEM,MAAM;YAAY;YACjE,MAAMC,gBAAgBpC,oBAAoB;gBAAEqC,iBAAiBzC;YAAM;YAEnE,MAAM0C,SAAS,MAAMF,cAAc;gBACjCjC;gBACAoC,SAAS;oBACPC,kBAAkB;wBAAEC,aAAa,CAAC;oBAAE;oBACpCC,MAAM;gBACR;gBACAC,KAAK1C;YACP;YAEA,MAAM2C,WAAW,MAAMhD,MAAM,MAAMM,SAASoC,OAAOnC,IAAI,GAAIyC,QAAQ;YACnE9C,OAAO8C,SAAS/B,KAAK,EAAEgC,IAAI,CAAC;YAC5B/C,OAAO8C,SAAShC,MAAM,EAAEiC,IAAI,CAAC;QAC/B;QAEA9C,GAAG+C,IAAI,CAAC;YACN,qEAAqE;YACrE;gBAAEC,cAAc;gBAAIC,eAAe;oBAAEC,KAAK;oBAAkBrC,QAAQ;oBAAIC,OAAO;gBAAG;YAAE;YACpF;gBAAEkC,cAAc;gBAAIC,eAAe;oBAAEpC,QAAQ;oBAAIC,OAAO;oBAAIqC,oBAAoB;gBAAK;YAAE;SACxF,EACC,0FACA,OAAO,EAAEH,YAAY,EAAEC,aAAa,EAAE;YACpC,MAAMG,SAAS,MAAM5C,gBAAgB;gBAAEK,QAAQ;gBAAKC,OAAO;YAAI;YAC/D,MAAMV,OAAO,IAAI+B,KAAK;gBAACiB;aAAO,EAAE,aAAa;gBAAEhB,MAAM;YAAY;YACjE,MAAMC,gBAAgBpC,oBAAoB;gBAAEqC,iBAAiBzC;YAAM;YAEnE,MAAM0C,SAAS,MAAMF,cAAc;gBACjCjC;gBACAoC,SAAS;oBACPC,kBAAkB;wBAAEQ;oBAAc;oBAClCI,MAAM;wBACJC,UAAU;4BAAEzC,QAAQ;4BAAI0C,MAAM;4BAAKzC,OAAO;4BAAIS,GAAG;4BAAID,GAAG;wBAAG;wBAC3DkC,gBAAgB;wBAChBC,oBAAoB;4BAAE5C,QAAQ;4BAAKC,OAAO;wBAAI;wBAC9C4C,eAAe;oBACjB;oBACAf,MAAM;gBACR;gBACAC,KAAK1C;YACP;YAEA,MAAM2C,WAAW,MAAMhD,MAAM,MAAMM,SAASoC,OAAOnC,IAAI,GAAIyC,QAAQ;YACnE9C,OAAO8C,SAAS/B,KAAK,EAAEgC,IAAI,CAACE;YAC5BjD,OAAO8C,SAAShC,MAAM,EAAEiC,IAAI,CAACE;QAC/B;IAEJ;IAEAlD,SAAS,aAAa;QACpB,MAAM6D,WAAW,OAAO,EACtBL,QAAQ,EACRM,KAAK,EAIN;YACC,MAAMvB,gBAAgBpC,oBAAoB;gBAAEqC,iBAAiBzC;YAAM;YAEnE,MAAM0C,SAAS,MAAMF,cAAc;gBACjCjC,MAAM,IAAI+B,KAAK;oBAACyB;iBAAM,EAAE,aAAa;oBAAExB,MAAM;gBAAY;gBACzDI,SAAS;oBACPC,kBAAkB,CAAC;oBACnBY,MAAM;wBACJC;wBACAE,gBAAgB;wBAChBC,oBAAoB;4BAAE5C,QAAQ;4BAAIC,OAAO;wBAAI;wBAC7C4C,eAAeJ,SAASxC,KAAK;oBAC/B;oBACA6B,MAAM;gBACR;gBACAC,KAAK1C;YACP;YAEA,OAAOL,MAAM,MAAMM,SAASoC,OAAOnC,IAAI;QACzC;QAEAJ,GAAG,+DAA+D;YAChE,6FAA6F;YAC7F,4EAA4E;YAC5E,MAAM6D,OAAO,MAAMrD,gBAAgB;gBACjCC,YAAY;oBAAEC,GAAG;oBAAKC,GAAG;oBAAGC,GAAG;gBAAE;gBACjCC,QAAQ;gBACRC,OAAO;YACT;YACA,MAAM8C,QAAQ,MAAM/D,MAAM;gBACxBkB,QAAQ;oBAAEN,YAAY;wBAAEC,GAAG;wBAAGC,GAAG;wBAAGC,GAAG;oBAAI;oBAAGI,UAAU;oBAAGH,QAAQ;oBAAIC,OAAO;gBAAI;YACpF,GACGiB,SAAS,CAAC;gBAAC;oBAAEC,OAAO6B;oBAAM5B,MAAM;oBAAIC,KAAK;gBAAE;aAAE,EAC7CjB,GAAG,GACHd,QAAQ;YAEX,MAAM2D,UAAU,MAAMH,SAAS;gBAC7BL,UAAU;oBAAEzC,QAAQ;oBAAK0C,MAAM;oBAAKzC,OAAO;oBAAIS,GAAG,AAAC,KAAK,MAAO;oBAAKD,GAAG;gBAAE;gBACzEsC;YACF;YAEA,MAAMxC,MAAM,MAAM0C,QAAQ1C,GAAG,GAAGjB,QAAQ,CAAC;gBAAE4D,mBAAmB;YAAK;YACnEhE,OAAO2B,eAAe;gBAAE,GAAGN,GAAG;gBAAEG,GAAG;gBAAGD,GAAG;YAAE,IAAI0C,OAAO,CAAC;gBAAEtD,GAAG;gBAAKC,GAAG;gBAAGC,GAAG;YAAE;QAC9E;QAEAZ,GAAG,+CAA+C;YAChD,mFAAmF;YACnF,MAAM8D,UAAU,MAAMH,SAAS;gBAC7BL,UAAU;oBAAEzC,QAAQ;oBAAK0C,MAAM;oBAAKzC,OAAO;oBAAIS,GAAG;oBAAMD,GAAG;gBAAE;gBAC7DsC,OAAO,MAAMpD,gBAAgB;oBAAEK,QAAQ;oBAAIC,OAAO;gBAAI;YACxD;YAEAf,OAAO,AAAC,CAAA,MAAM+D,QAAQjB,QAAQ,EAAC,EAAG/B,KAAK,EAAEgC,IAAI,CAAC;QAChD;IACF;IAEAhD,SAAS,wBAAwB;QAC/B,uFAAuF;QACvF,wFAAwF;QACxFE,GAAG+C,IAAI,CAAC;YACN;gBACEkB,YAAY;oBAAE1C,GAAG;oBAAID,GAAG;gBAAG;gBAC3B4C,UAAU;oBAAErD,QAAQ;oBAAKM,WAAW;oBAAcL,OAAO;gBAAI;gBAC7DqD,SAAS;oBACP;wBAAE5C,GAAG;wBAAID,GAAG;oBAAG;oBACf;wBAAEC,GAAG;wBAAID,GAAG;oBAAG;iBAChB;YACH;YACA;gBACE2C,YAAY;oBAAE1C,GAAG;oBAAID,GAAG;gBAAG;gBAC3B4C,UAAU;oBAAErD,QAAQ;oBAAKM,WAAW;oBAAcL,OAAO;gBAAI;gBAC7DqD,SAAS;oBACP;wBAAE5C,GAAG;wBAAID,GAAG;oBAAG;oBACf;wBAAEC,GAAG;wBAAID,GAAG;oBAAG;iBAChB;YACH;SACD,EACC,4EACA,OAAO,EAAE2C,UAAU,EAAEC,QAAQ,EAAEC,OAAO,EAAE;YACtC,MAAMf,SAAS,MAAMlC,kBAAkBgD;YACvC,MAAM9D,OAAO,IAAI+B,KAAK;gBAACiB;aAAO,EAAE,aAAa;gBAAEhB,MAAM;YAAY;YACjE,MAAMC,gBAAgBpC,oBAAoB;gBAAEqC,iBAAiBzC;YAAM;YAEnE,MAAM0C,SAAS,MAAMF,cAAc;gBACjCjC;gBACAoC,SAAS;oBACPC,kBAAkB,CAAC;oBACnBwB;oBACAG,mBAAmB;wBAAEC,MAAM;wBAASxD,QAAQ;wBAAIC,OAAO;oBAAG;oBAC1D6B,MAAM;oBACNc,oBAAoB;wBAAE5C,QAAQqD,SAASrD,MAAM;wBAAEC,OAAOoD,SAASpD,KAAK;oBAAC;gBACvE;gBACA8B,KAAK1C;YACP;YAEA,MAAM,EAAEyB,IAAI,EAAEC,IAAI,EAAE,GAAG,MAAM/B,MAAM,MAAMM,SAASoC,OAAOnC,IAAI,GAC1DgB,GAAG,GACHjB,QAAQ,CAAC;gBAAE4D,mBAAmB;YAAK;YACtChE,OAAO6B,KAAKd,KAAK,EAAEgC,IAAI,CAAC;YACxB/C,OAAO6B,KAAKf,MAAM,EAAEiC,IAAI,CAAC;YACzB,KAAK,MAAM,EAAEvB,CAAC,EAAED,CAAC,EAAE,IAAI6C,QAAS;gBAC9BpE,OAAO2B,eAAe;oBAAEC;oBAAMC;oBAAML;oBAAGD;gBAAE,IAAI0C,OAAO,CAAC;oBAAEtD,GAAG;oBAAKC,GAAG;oBAAGC,GAAG;gBAAE;YAC5E;QACF;IAEJ;AACF"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/transformer-sharp",
|
|
3
|
-
"version": "4.0.0-internal.
|
|
3
|
+
"version": "4.0.0-internal.6e89a16",
|
|
4
4
|
"description": "Official Sharp-based file transformer for Payload: request-time image resizing and upload-time image processing",
|
|
5
5
|
"homepage": "https://payloadcms.com",
|
|
6
|
-
"repository": {
|
|
7
|
-
"type": "git",
|
|
8
|
-
"url": "https://github.com/payloadcms/payload.git",
|
|
9
|
-
"directory": "packages/transformer-sharp"
|
|
10
|
-
},
|
|
11
6
|
"license": "MIT",
|
|
12
7
|
"author": "Payload <dev@payloadcms.com> (https://payloadcms.com)",
|
|
13
8
|
"maintainers": [
|
|
@@ -17,8 +12,18 @@
|
|
|
17
12
|
"url": "https://payloadcms.com"
|
|
18
13
|
}
|
|
19
14
|
],
|
|
20
|
-
"
|
|
15
|
+
"repository": {
|
|
16
|
+
"type": "git",
|
|
17
|
+
"url": "https://github.com/payloadcms/payload.git",
|
|
18
|
+
"directory": "packages/transformer-sharp"
|
|
19
|
+
},
|
|
20
|
+
"files": [
|
|
21
|
+
"dist"
|
|
22
|
+
],
|
|
21
23
|
"type": "module",
|
|
24
|
+
"sideEffects": false,
|
|
25
|
+
"main": "./dist/index.js",
|
|
26
|
+
"types": "./dist/index.d.ts",
|
|
22
27
|
"exports": {
|
|
23
28
|
".": {
|
|
24
29
|
"import": "./dist/index.js",
|
|
@@ -26,22 +31,17 @@
|
|
|
26
31
|
"default": "./dist/index.js"
|
|
27
32
|
}
|
|
28
33
|
},
|
|
29
|
-
"main": "./dist/index.js",
|
|
30
|
-
"types": "./dist/index.d.ts",
|
|
31
|
-
"files": [
|
|
32
|
-
"dist"
|
|
33
|
-
],
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"sharp": "0.35.
|
|
35
|
+
"sharp": "0.35.5"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"payload": "4.0.0-internal.
|
|
38
|
+
"payload": "4.0.0-internal.6e89a16"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"payload": "4.0.0-internal.
|
|
41
|
+
"payload": "4.0.0-internal.6e89a16"
|
|
42
42
|
},
|
|
43
43
|
"engines": {
|
|
44
|
-
"node": ">=24.
|
|
44
|
+
"node": ">=24.22.1"
|
|
45
45
|
},
|
|
46
46
|
"scripts": {
|
|
47
47
|
"build": "pnpm build:types && pnpm build:swc",
|
|
@@ -49,8 +49,6 @@
|
|
|
49
49
|
"build:debug": "pnpm build",
|
|
50
50
|
"build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
|
|
51
51
|
"build:types": "tsc --emitDeclarationOnly --outDir dist",
|
|
52
|
-
"clean": "rimraf -g {dist,*.tsbuildinfo}"
|
|
53
|
-
"lint": "eslint .",
|
|
54
|
-
"lint:fix": "eslint . --fix"
|
|
52
|
+
"clean": "rimraf -g {dist,*.tsbuildinfo}"
|
|
55
53
|
}
|
|
56
54
|
}
|