@payloadcms/transformer-sharp 4.0.0-beta.1 → 4.0.0-beta.10

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.
Files changed (36) hide show
  1. package/dist/createTransformUpload.d.ts +14 -0
  2. package/dist/createTransformUpload.d.ts.map +1 -0
  3. package/dist/{prepareLegacyUpload.js → createTransformUpload.js} +15 -24
  4. package/dist/createTransformUpload.js.map +1 -0
  5. package/dist/{prepareLegacyUpload.spec.js → createTransformUpload.spec.js} +12 -24
  6. package/dist/createTransformUpload.spec.js.map +1 -0
  7. package/dist/initSharpCollections.d.ts +6 -6
  8. package/dist/initSharpCollections.d.ts.map +1 -1
  9. package/dist/initSharpCollections.js +14 -58
  10. package/dist/initSharpCollections.js.map +1 -1
  11. package/dist/initSharpCollections.spec.js +20 -7
  12. package/dist/initSharpCollections.spec.js.map +1 -1
  13. package/dist/readSavedTransforms.d.ts +14 -0
  14. package/dist/readSavedTransforms.d.ts.map +1 -0
  15. package/dist/readSavedTransforms.js +42 -0
  16. package/dist/readSavedTransforms.js.map +1 -0
  17. package/dist/sharpTransformer.d.ts.map +1 -1
  18. package/dist/sharpTransformer.js +14 -6
  19. package/dist/sharpTransformer.js.map +1 -1
  20. package/dist/sharpTransformer.spec.js +30 -0
  21. package/dist/sharpTransformer.spec.js.map +1 -1
  22. package/dist/transformFile.d.ts +4 -4
  23. package/dist/transformFile.d.ts.map +1 -1
  24. package/dist/transformFile.js +31 -16
  25. package/dist/transformFile.js.map +1 -1
  26. package/dist/transformFile.spec.js +210 -24
  27. package/dist/transformFile.spec.js.map +1 -1
  28. package/dist/types.d.ts +23 -13
  29. package/dist/types.d.ts.map +1 -1
  30. package/dist/types.js +3 -2
  31. package/dist/types.js.map +1 -1
  32. package/package.json +17 -19
  33. package/dist/prepareLegacyUpload.d.ts +0 -14
  34. package/dist/prepareLegacyUpload.d.ts.map +0 -1
  35. package/dist/prepareLegacyUpload.js.map +0 -1
  36. package/dist/prepareLegacyUpload.spec.js.map +0 -1
@@ -1,9 +1,9 @@
1
1
  import { getUploadTransformerInternal, uploadTransformerInternal } from 'payload/internal';
2
2
  import bundledSharp from 'sharp';
3
+ import { createTransformUpload } from './createTransformUpload.js';
3
4
  import { createHandleRequest } from './handleRequest.js';
4
5
  import { initSharpCollections } from './initSharpCollections.js';
5
6
  import { parseDynamicResize } from './parseDynamicResize.js';
6
- import { createPrepareLegacyUpload } from './prepareLegacyUpload.js';
7
7
  import { createTransformFile } from './transformFile.js';
8
8
  const DEFAULT_MIME_TYPES = [
9
9
  'image/jpeg',
@@ -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 true;
50
+ return {
51
+ canTransform: true,
52
+ handledTransformKeys: [
53
+ 'crop',
54
+ 'focalPoint'
55
+ ]
56
+ };
51
57
  }
52
- if (!dynamicOptions || dynamicOptions.collections && !dynamicOptions.collections.includes(args.collectionSlug)) {
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,18 +81,19 @@ 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,
81
89
  [uploadTransformerInternal]: {
82
90
  handlesCollection,
83
- prepareUpload: createPrepareLegacyUpload({
91
+ transformUpload: createTransformUpload({
84
92
  collections,
85
93
  sharpDependency
86
94
  })
87
95
  },
88
- // `options` here is always what this transformer computed via `prepareUpload`'s
96
+ // `options` here is always what this transformer computed via `transformUpload`'s
89
97
  // `transform` callback; the public contract's `unknown` just reflects that core never inspects it.
90
98
  transformFile: createTransformFile({
91
99
  sharpDependency
@@ -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":"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"}
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 { createTransformUpload } from './createTransformUpload.js'\nimport { createHandleRequest } from './handleRequest.js'\nimport { initSharpCollections } from './initSharpCollections.js'\nimport { parseDynamicResize } from './parseDynamicResize.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 transformUpload: createTransformUpload({ collections, sharpDependency }),\n },\n // `options` here is always what this transformer computed via `transformUpload`'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","createTransformUpload","createHandleRequest","initSharpCollections","parseDynamicResize","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","transformUpload","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,qBAAqB,QAAQ,6BAA4B;AAClE,SAASC,mBAAmB,QAAQ,qBAAoB;AACxD,SAASC,oBAAoB,QAAQ,4BAA2B;AAChE,SAASC,kBAAkB,QAAQ,0BAAyB;AAC5D,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;oBAAEF,cAAc;oBAAMG,sBAAsB;wBAAC;wBAAQ;qBAAa;gBAAC;YAC5E;YAEA,2FAA2F;YAC3F,IACE,CAACd,kBACDY,KAAKG,OAAO,KAAK,uBAChBf,eAAeK,WAAW,IAAI,CAACL,eAAeK,WAAW,CAACW,QAAQ,CAACJ,KAAKL,cAAc,GACvF;gBACA,OAAO;YACT;YAEA,MAAMU,SAAShC,mBAAmB;gBAChCiC,QAAQjB;gBACRkB,cAAcP,KAAKQ,GAAG,CAACD,YAAY,IAAI,IAAIE;YAC7C;YAEA,OAAOJ,OAAOK,QAAQ;QACxB;QACAC,eAAexC,oBAAoB;YAAEkB;YAAiBE;QAAgB;QACtEqB,MAAM,CAACC;YACLC,8BAA8B;gBAAED;gBAAQzB;YAAe;YACvD2B,2BAA2B;gBAAEtB;gBAAaoB;gBAAQhB;YAAY;YAE9D,OAAOzB,qBAAqB;gBAAEqB;gBAAaoB;gBAAQG,iBAAiBnB,YAAYC,IAAI;YAAC;QACvF;QACAmB,WAAW1C;QACX,CAACP,0BAA0B,EAAE;YAC3B0B;YACAwB,iBAAiBhD,sBAAsB;gBAAEuB;gBAAaF;YAAgB;QACxE;QACA,kFAAkF;QAClF,mGAAmG;QACnG4B,eAAe7C,oBAAoB;YAAEiB;QAAgB;IAGvD;IAEA,OAAOM;AACT;AAEA;;;CAGC,GACD,SAASkB,2BAA2B,EAClCtB,WAAW,EACXoB,MAAM,EACNhB,WAAW,EAKZ;IACC,KAAK,MAAM,CAACF,gBAAgByB,iBAAiB,IAAIC,OAAOC,OAAO,CAAC7B,aAAc;QAC5E,IAAI,CAAC2B,kBAAkB;YACrB;QACF;QAEA,MAAMG,SAAS,AAACV,CAAAA,OAAOW,MAAM,EAAEC,gBAAgB,EAAE,AAAD,EAAGC,MAAM,CACvD,CAACC,YACCA,cAAc9B,eACd9B,6BAA6B4D,YAAYjC,oBAAoB;gBAAEC;YAAe;QAGlF,IAAI4B,OAAOK,MAAM,GAAG,GAAG;YACrB,MAAM,IAAIC,MACR,CAAC,yEAAyE,EAAElC,eAAe,0DAA0D,EAAE4B,OAAOO,GAAG,CAAC,CAACC,QAAU,CAAC,CAAC,EAAEA,MAAMjC,IAAI,CAAC,CAAC,CAAC,EAAEkC,IAAI,CAAC,MAAM,oDAAoD,CAAC;QAEpQ;IACF;AACF;AAEA,SAASlB,8BAA8B,EACrCD,MAAM,EACNzB,cAAc,EAIf;IACC,IAAI,CAACA,kBAAkB,CAACA,eAAeK,WAAW,EAAE;QAClD;IACF;IAEA,MAAMwC,eAAe7C,eAAeK,WAAW,CAACiC,MAAM,CACpD,CAAC5B,OACC,CAACe,OAAOpB,WAAW,EAAEyC,KAAK,CAACC,aAAeA,WAAWrC,IAAI,KAAKA,QAAQqC,WAAWX,MAAM;IAG3F,IAAIS,aAAaL,MAAM,GAAG,GAAG;QAC3B,MAAM,IAAIC,MACR,CAAC,4GAA4G,EAAEI,aAAaH,GAAG,CAAC,CAAChC,OAAS,CAAC,CAAC,EAAEA,KAAK,CAAC,CAAC,EAAEkC,IAAI,CAAC,MAAM,CAAC,CAAC;IAExK;AACF"}
@@ -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","dynamic","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,oFAAoF;QACrF,MAAMK,SAAS;YACbC,aAAa;gBACX;oBAAEC,MAAM;oBAASC,QAAQ,EAAE;oBAAEC,QAAQ;gBAAK;gBAC1C;oBAAEF,MAAM;oBAASC,QAAQ,EAAE;gBAAC;aAC7B;QACH;QACA,MAAME,cAAcR,iBAAiB;YACnCS,SAAS;gBAAEL,aAAa;oBAAC;oBAAS;iBAAU;YAAsC;QACpF;QAEAP,OAAO,IAAMW,YAAYE,IAAI,CAAEP,SAASQ,OAAO,CAC7C;IAEJ;IAEAb,GAAG,qGAAqG;QACtG,MAAMc,QAAQZ,iBAAiB;YAAEI,aAAa;gBAAES,OAAO;oBAAEC,UAAU,EAAE;gBAAC;YAAE;QAAE;QAC1E,MAAMC,SAASf,iBAAiB;YAAEK,MAAM;YAAgBD,aAAa;gBAAES,OAAO,CAAC;YAAE;QAAE;QACnF,MAAMV,SAAS;YACbC,aAAa;gBAAC;oBAAEC,MAAM;oBAASC,QAAQ,EAAE;oBAAEC,QAAQ;gBAAK;aAAE;YAC1DA,QAAQ;gBAAES,cAAc;oBAACJ;oBAAOG;iBAAO;YAAC;QAC1C;QAEAlB,OAAO,IAAMkB,OAAOL,IAAI,CAAEP,SAASQ,OAAO,CACxC;IAEJ;IAEAb,GAAG,wEAAwE;QACzE,MAAMc,QAAQZ,iBAAiB;YAAEI,aAAa;gBAAES,OAAO,CAAC;YAAE;QAAE;QAC5D,MAAME,SAASf,iBAAiB;YAAEK,MAAM;YAAgBD,aAAa;gBAAEa,QAAQ,CAAC;YAAE;QAAE;QACpF,MAAMd,SAAS;YACbC,aAAa;gBACX;oBAAEC,MAAM;oBAASC,QAAQ,EAAE;oBAAEC,QAAQ;gBAAK;gBAC1C;oBAAEF,MAAM;oBAAUC,QAAQ,EAAE;oBAAEC,QAAQ;gBAAK;aAC5C;YACDA,QAAQ;gBAAES,cAAc;oBAACJ;oBAAOG;iBAAO;YAAC;QAC1C;QAEAlB,OAAO,IAAMkB,OAAOL,IAAI,CAAEP,SAASe,GAAG,CAACP,OAAO;IAChD;AACF;AAEAf,SAAS,+BAA+B;IACtCE,GAAG,+HAA+H;QAChID,OAAOE,+BAA+BG,OAAO,CAAC;YAC5CiB,KAAK;YACLC,WAAW;YACXC,WAAW;YACXC,UAAU;YACVC,UAAU;YACVC,oBAAoB;QACtB;IACF;AACF"}
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"}
@@ -2,11 +2,11 @@ import type { TransformFileArgs, TransformFileResult } from 'payload';
2
2
  import type { SharpDependency, SharpUploadTaskOptions } from './types.js';
3
3
  /**
4
4
  * The Sharp package's public one-file-in/one-file-out upload primitive.
5
- * `options.kind` selects which legacy task to run: the main file (optionally
6
- * cropped, with `resizeOptions` re-applied to the crop output), or one named
7
- * legacy image size. Never writes to storage.
5
+ * `options.kind` selects which legacy task to run: the main file (cropped by the
6
+ * crop saved in `doc._transforms`, with `resizeOptions` re-applied to the crop
7
+ * output), or one named legacy image size. Never writes to storage.
8
8
  */
9
9
  export declare function createTransformFile({ sharpDependency }: {
10
10
  sharpDependency: SharpDependency;
11
- }): ({ file, options, req, }: TransformFileArgs<SharpUploadTaskOptions>) => Promise<TransformFileResult>;
11
+ }): ({ doc, file, options, req, }: TransformFileArgs<SharpUploadTaskOptions>) => Promise<TransformFileResult>;
12
12
  //# sourceMappingURL=transformFile.d.ts.map
@@ -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;AASzE;;;;;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"}
1
+ {"version":3,"file":"transformFile.d.ts","sourceRoot":"","sources":["../src/transformFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAQzE;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,eAAe,EAAE,EAAE;IAAE,eAAe,EAAE,eAAe,CAAA;CAAE,kCAMxF,iBAAiB,CAAC,sBAAsB,CAAC,KAAG,OAAO,CAAC,mBAAmB,CAAC,CAO5E"}
@@ -1,20 +1,21 @@
1
1
  import { createSharpFromFile } from './createSharpFromFile.js';
2
2
  import { optionallyAppendMetadata } from './optionallyAppendMetadata.js';
3
+ import { getSavedCrop, getSavedFocalPoint } from './readSavedTransforms.js';
3
4
  const ANIMATED_MIME_TYPES = [
4
5
  'image/avif',
5
6
  'image/gif',
6
7
  'image/webp'
7
8
  ];
8
- const percentToPixel = (value, dimension)=>Math.floor(value / 100 * dimension);
9
9
  /**
10
10
  * The Sharp package's public one-file-in/one-file-out upload primitive.
11
- * `options.kind` selects which legacy task to run: the main file (optionally
12
- * cropped, with `resizeOptions` re-applied to the crop output), or one named
13
- * legacy image size. Never writes to storage.
11
+ * `options.kind` selects which legacy task to run: the main file (cropped by the
12
+ * crop saved in `doc._transforms`, with `resizeOptions` re-applied to the crop
13
+ * output), or one named legacy image size. Never writes to storage.
14
14
  */ export function createTransformFile({ sharpDependency }) {
15
- return async function transformFile({ file, options, req }) {
15
+ return async function transformFile({ doc, file, options, req }) {
16
16
  if (options.kind === 'main') {
17
17
  return transformMain({
18
+ doc,
18
19
  file,
19
20
  options,
20
21
  req,
@@ -22,6 +23,7 @@ const percentToPixel = (value, dimension)=>Math.floor(value / 100 * dimension);
22
23
  });
23
24
  }
24
25
  return transformSize({
26
+ doc,
25
27
  file,
26
28
  options,
27
29
  req,
@@ -29,16 +31,26 @@ const percentToPixel = (value, dimension)=>Math.floor(value / 100 * dimension);
29
31
  });
30
32
  };
31
33
  }
32
- async function transformMain({ file, options, req, sharpDependency }) {
33
- const { collectionUpload, crop } = options;
34
+ async function transformMain({ doc, file, options, req, sharpDependency }) {
35
+ const { collectionUpload, cropSize, originalDimensions } = options;
36
+ // A full-image selection saves no crop, but a request crop size still extracts from the corner.
37
+ const crop = getSavedCrop({
38
+ doc
39
+ }) ?? (cropSize ? {
40
+ ...cropSize,
41
+ x: 0,
42
+ y: 0
43
+ } : undefined);
34
44
  const { constructorOptions, formatOptions, resizeOptions, trimOptions, withMetadata } = collectionUpload;
35
45
  const fileIsAnimatedType = ANIMATED_MIME_TYPES.includes(file.type);
36
46
  const fileHasAdjustments = Boolean(resizeOptions || formatOptions || trimOptions || constructorOptions);
37
- if (crop) {
47
+ if (crop && originalDimensions) {
38
48
  return transformCrop({
39
49
  crop,
50
+ cropSize,
40
51
  file,
41
52
  fileIsAnimatedType,
53
+ originalDimensions,
42
54
  req,
43
55
  resizeOptions,
44
56
  sharpDependency,
@@ -88,20 +100,20 @@ async function transformMain({ file, options, req, sharpDependency }) {
88
100
  status: 'continue'
89
101
  };
90
102
  }
91
- async function transformCrop({ crop, file, fileIsAnimatedType, req, resizeOptions, sharpDependency, withMetadata }) {
92
- const { cropData, heightInPixels, originalDimensions, widthInPixels } = crop;
103
+ async function transformCrop({ crop, cropSize, file, fileIsAnimatedType, originalDimensions, req, resizeOptions, sharpDependency, withMetadata }) {
93
104
  const sharpOptions = fileIsAnimatedType ? {
94
105
  animated: true
95
106
  } : {};
96
- const newWidth = Number(widthInPixels);
97
- const newHeight = Number(heightInPixels);
107
+ const newWidth = Number(cropSize?.width ?? crop.width);
108
+ const newHeight = Number(cropSize?.height ?? crop.height);
98
109
  const dimensionsChanged = originalDimensions.width !== newWidth || originalDimensions.height !== newHeight;
99
110
  let croppedFile = file;
100
111
  if (dimensionsChanged) {
101
112
  const formattedCropData = {
102
113
  height: newHeight,
103
- left: percentToPixel(cropData.x, originalDimensions.width),
104
- top: percentToPixel(cropData.y, originalDimensions.height),
114
+ // A request crop size larger than the saved crop could pass the far edge.
115
+ left: Math.min(crop.x, originalDimensions.width - newWidth),
116
+ top: Math.min(crop.y, originalDimensions.height - newHeight),
105
117
  width: newWidth
106
118
  };
107
119
  let cropped = (await createSharpFromFile({
@@ -150,8 +162,11 @@ async function transformCrop({ crop, file, fileIsAnimatedType, req, resizeOption
150
162
  status: 'continue'
151
163
  };
152
164
  }
153
- async function transformSize({ file, options, req, sharpDependency }) {
154
- const { collectionUpload, focalPoint, imageResizeConfig, originalDimensions } = options;
165
+ async function transformSize({ doc, file, options, req, sharpDependency }) {
166
+ const { canUseFocalPoint, collectionUpload, imageResizeConfig, originalDimensions } = options;
167
+ const focalPoint = canUseFocalPoint ? getSavedFocalPoint({
168
+ doc
169
+ }) : undefined;
155
170
  const { withMetadata } = collectionUpload;
156
171
  const fileIsAnimatedType = ANIMATED_MIME_TYPES.includes(file.type);
157
172
  const sharpOptions = fileIsAnimatedType ? {
@@ -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 {\n Crop,\n Document,\n PayloadRequest,\n TransformFileArgs,\n TransformFileResult,\n} 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'\nimport { getSavedCrop, getSavedFocalPoint } from './readSavedTransforms.js'\n\nconst ANIMATED_MIME_TYPES = ['image/avif', 'image/gif', 'image/webp']\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 (cropped by the\n * crop saved in `doc._transforms`, with `resizeOptions` re-applied to the crop\n * output), or one named legacy image size. Never writes to storage.\n */\nexport function createTransformFile({ sharpDependency }: { sharpDependency: SharpDependency }) {\n return async function transformFile({\n doc,\n file,\n options,\n req,\n }: TransformFileArgs<SharpUploadTaskOptions>): Promise<TransformFileResult> {\n if (options.kind === 'main') {\n return transformMain({ doc, file, options, req, sharpDependency })\n }\n\n return transformSize({ doc, file, options, req, sharpDependency })\n }\n}\n\nasync function transformMain({\n doc,\n file,\n options,\n req,\n sharpDependency,\n}: {\n doc: Document\n file: File\n options: Extract<SharpUploadTaskOptions, { kind: 'main' }>\n req: PayloadRequest\n sharpDependency: SharpDependency\n}): Promise<TransformFileResult> {\n const { collectionUpload, cropSize, originalDimensions } = options\n // A full-image selection saves no crop, but a request crop size still extracts from the corner.\n const crop = getSavedCrop({ doc }) ?? (cropSize ? { ...cropSize, x: 0, y: 0 } : undefined)\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 && originalDimensions) {\n return transformCrop({\n crop,\n cropSize,\n file,\n fileIsAnimatedType,\n originalDimensions,\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 cropSize,\n file,\n fileIsAnimatedType,\n originalDimensions,\n req,\n resizeOptions,\n sharpDependency,\n withMetadata,\n}: {\n crop: Omit<Crop, 'unit'>\n cropSize: Extract<SharpUploadTaskOptions, { kind: 'main' }>['cropSize']\n file: File\n fileIsAnimatedType: boolean\n originalDimensions: { height: number; width: number }\n req: PayloadRequest\n resizeOptions: ResizeOptions | undefined\n sharpDependency: SharpDependency\n withMetadata: SharpUploadTaskOptions['collectionUpload']['withMetadata']\n}): Promise<TransformFileResult> {\n const sharpOptions: SharpOptions = fileIsAnimatedType ? { animated: true } : {}\n\n const newWidth = Number(cropSize?.width ?? crop.width)\n const newHeight = Number(cropSize?.height ?? crop.height)\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 // A request crop size larger than the saved crop could pass the far edge.\n left: Math.min(crop.x, originalDimensions.width - newWidth),\n top: Math.min(crop.y, originalDimensions.height - newHeight),\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 doc,\n file,\n options,\n req,\n sharpDependency,\n}: {\n doc: Document\n file: File\n options: Extract<SharpUploadTaskOptions, { kind: 'size' }>\n req: PayloadRequest\n sharpDependency: SharpDependency\n}): Promise<TransformFileResult> {\n const { canUseFocalPoint, collectionUpload, imageResizeConfig, originalDimensions } = options\n const focalPoint = canUseFocalPoint ? getSavedFocalPoint({ doc }) : undefined\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","getSavedCrop","getSavedFocalPoint","ANIMATED_MIME_TYPES","createTransformFile","sharpDependency","transformFile","doc","file","options","req","kind","transformMain","transformSize","collectionUpload","cropSize","originalDimensions","crop","x","y","undefined","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","newWidth","Number","width","newHeight","height","dimensionsChanged","croppedFile","formattedCropData","left","Math","min","top","cropped","extract","withoutEnlargement","resizedBuffer","fit","position","canUseFocalPoint","imageResizeConfig","focalPoint","sharpBase","originalImageMeta","metadata","adjustedDimensions","orientation","resized","clone","resizeHeight","resizeWidth","originalAspectRatio","round","resizeAspectRatio","prioritizeHeight","fastShrinkOnLoad","metadataAppended","info","resizedHeight","pages","resizedWidth","halfResizeX","xFocalCenter","leftBound","halfResizeY","yFocalCenter","topBound","floor"],"mappings":"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"}