resolved conflicts

Author: strausr

.code-generation/config.js

@@ -44,6 +44,7 @@ module.exports = {
       'assetType': 'set_asset_type',
       'signature': 'setSignature',
     },
+    canGenerateSignature:false,
     classNameMap: {},
     childTransformations: {
       image: {

__TESTS__/unit/actions/Delivery.test.ts

@@ -310,4 +310,11 @@ describe('Tests for Transformation Action -- Delivery', () => {
 
     expect(url).toContain('f_jpg,fl_progressive:none');
   });
+
+  it('Can use shortened format notation', () => {
+    // f_jpg,fl_progressive
+    const url = createNewImage('sample').delivery(format('jpg')).toString();
+
+    expect(url).toContain('f_jpg');
+  });
 });

__TESTS__/unit/actions/Transcode.test.ts

@@ -1,7 +1,7 @@
 import {AnimatedFormat} from "../../../src/qualifiers/animatedFormat";
 import {createNewVideo} from "../../TestUtils/createCloudinaryVideo";
 import {AudioFrequency} from "../../../src/qualifiers/audioFrequency";
-import {Transcode} from "../../../src/actions/transcode";
+import {audioCodec, Transcode} from "../../../src/actions/transcode";
 import {AudioCodec} from "../../../src/qualifiers/audioCodec";
 import {StreamingProfile} from "../../../src/qualifiers/streamingProfile";
 import {VideoCodec} from "../../../src/qualifiers/videoCodec";
@@ -19,6 +19,15 @@ describe('Tests for Transformation Action -- Transcode', () => {
     expect(url).toBe('https://res.cloudinary.com/demo/video/upload/ac_aac/sample');
   });
 
+  it('Can use shortened audioCodec notation', () => {
+    const url = createNewVideo('sample')
+      .transcode(audioCodec('aac'))
+      .setPublicID('sample')
+      .toURL();
+
+    expect(url).toBe('https://res.cloudinary.com/demo/video/upload/ac_aac/sample');
+  });
+
   it('Creates a cloudinaryURL with bitrate', () => {
     const url = createNewVideo('sample')
       .transcode(Transcode.bitRate('500k'))
@@ -120,6 +129,16 @@ describe('Tests for Transformation Action -- Transcode', () => {
     expect(url).toBe('https://res.cloudinary.com/demo/video/upload/f_webp,fl_animated,fl_awebp/sample');
   });
 
+  it('Can use shortened toAnimated webp', () => {
+    const url = createNewVideo('sample')
+      .transcode(Transcode
+        .toAnimated('webp'))
+      .setPublicID('sample')
+      .toURL();
+
+    expect(url).toBe('https://res.cloudinary.com/demo/video/upload/f_webp,fl_animated,fl_awebp/sample');
+  });
+
   it('Creates a cloudinaryURL with toAnimated and delay', () => {
     const url = createNewVideo('sample')
       .transcode(Transcode

src/actions/delivery.ts

@@ -13,10 +13,10 @@ import {toFloatAsString} from "../internal/utils/toFloatAsString";
 import {DeliveryColorSpaceFromICC} from "./delivery/DeliveryColorSpaceFromICC";
 import {DeliveryAction} from "./delivery/DeliveryAction";
 import {QualityTypes} from "../types/types";
+import {ImageFormatType, VideoFormatType} from "../types/types";
 
 export type IDeliveryAction = DeliveryAction | DeliveryColorSpaceFromICC;
 
-
 /**
  * @summary action
  * @description Defines the format of the delivered asset.
@@ -40,7 +40,7 @@ export type IDeliveryAction = DeliveryAction | DeliveryColorSpaceFromICC;
  * );
  *
  */
-function format(format:FormatQualifier | string) :DeliveryFormat {
+function format(format:FormatQualifier | ImageFormatType | VideoFormatType | string) :DeliveryFormat {
   return new DeliveryFormat('f', format);
 }
 

src/actions/transcode.ts

@@ -9,7 +9,7 @@ import ToAnimatedAction from "./transcode/ToAnimatedAction";
 import {AnimatedFormatQualifierValue} from "../qualifiers/animatedFormat/AnimatedFormatQualifierValue";
 import {AdvVideoCodecType, VideoCodecType} from "../qualifiers/videoCodecType/VideoCodecType";
 import {VideoCodecAction} from "./transcode/VideoCodecAction";
-
+import {AnimatedFormatType, AudioCodecType} from "../types/types";
 
 export type ITranscodeAction = BitRateAction
   | AudioCodecAction
@@ -57,7 +57,7 @@ function audioFrequency(freq: string|number): AudioFrequencyAction{
  * @summary action
  * @memberOf Actions.Transcode
  * @description Sets the audio codec or removes the audio channel.
- * @param {string} codec The audio codec or "none".
+ * @param {AudioCodecType | string} codec The audio codec or "none".
  * @example
  * import {Cloudinary} from "@cloudinary/base/instance/Cloudinary";
  * import {aac} from '@cloudinary/base/qualifiers/audioCodec'
@@ -69,7 +69,7 @@ function audioFrequency(freq: string|number): AudioFrequencyAction{
  * video.transcode( audioCodec( aac() ) );
  * @return {Actions.Transcode.AudioCodecAction}
  */
-function audioCodec(codec: string): AudioCodecAction{
+function audioCodec(codec: AudioCodecType | string): AudioCodecAction{
   return new AudioCodecAction(codec);
 }
 /**
@@ -183,7 +183,7 @@ function streamingProfile(profile: string): StreamingProfileAction {
  * @summary action
  * @memberOf Actions.Transcode
  * @description Converts a video to animated image.
- * @param {string} animatedFormat The streaming profile.
+ * @param {string | AnimatedFormatType} animatedFormat The streaming profile.
  * @example
  * import {Cloudinary} from "@cloudinary/base/instance/Cloudinary";
  * import {gif} from '@cloudinary/base/qualifiers/animatedFormat'
@@ -195,7 +195,7 @@ function streamingProfile(profile: string): StreamingProfileAction {
  * video.transcode( toAnimated( gif() ) );
  * @return {Actions.Transcode.ToAnimatedAction}
  */
-function toAnimated(animatedFormat: AnimatedFormatQualifierValue | string = ''): ToAnimatedAction {
+function toAnimated(animatedFormat: AnimatedFormatQualifierValue | AnimatedFormatType | string = ''): ToAnimatedAction {
   return new ToAnimatedAction(animatedFormat);
 }
 

src/types/types.ts

@@ -110,7 +110,7 @@ export type ImageEffect =
   | "improve";
 
 export type VideoEffect = string | "accelerate" | "reverse" | "boomerang" | "loop" | "make_transparent" | "transition";
-export type AudioCodec = string | "none" | "aac" | "vorbis" | "mp3";
+export type AudioCodecType = string | "none" | "aac" | "vorbis" | "mp3";
 export type AudioFrequency =
   string
   | number
@@ -202,34 +202,74 @@ export type DeliveryType =
   | "dailymotion";
 /****************************** URL *************************************/
 export type ResourceType = string | "image" | "raw" | "video";
-export type ImageFormat =
-  string
-  | "gif"
-  | "png"
-  | "jpg"
-  | "bmp"
-  | "ico"
-  | "pdf"
-  | "tiff"
-  | "eps"
-  | "jpc"
-  | "jp2"
-  | "psd"
-  | "webp"
-  | "zip"
-  | "svg"
-  | "webm"
-  | "wdp"
-  | "hpx"
-  | "djvu"
-  | "ai"
-  | "flif"
-  | "bpg"
-  | "miff"
-  | "tga"
-  | "heic"
+export type ImageFormatType =
+  string |
+  'usdz'|
+  'jp2'|
+  'ai'|
+  'auto'|
+  'bmp'|
+  'eps'|
+  'flif'|
+  'gif'|
+  'heic'|
+  'ico'|
+  'jpc'|
+  'jpg'|
+  'pdf'|
+  'png'|
+  'psd'|
+  'svg'|
+  'tiff'|
+  'wdp'|
+  'webp'|
+  'arw'|
+  'aac'|
+  'aiff'|
+  'amr'|
+  'flac'|
+  'm4a'|
+  'mp3'|
+  'ogg'|
+  'opus'|
+  'wav'|
+  'avif'|
+  'cr2'|
+  'djvu'|
+  'eps3'|
+  'ept'|
+  'fxb'|
+  'gltf'|
+  'hdp'|
+  'heif'|
+  'indd'|
+  'jpe'|
+  'jpeg'|
+  'jxr'|
+  'ps'|
+  'spd'|
+  'tga'|
+  'tif'|
+  '3g2'|
+  '3gp'|
+  'avi'|
+  'flv'|
+  'm2ts'|
+  'm3u8'|
+  'mkv'|
+  'mov'|
+  'mp4'|
+  'mpd'|
+  'mpeg'|
+  'mts'|
+  'mxf'|
+  'ogv'|
+  'ts'|
+  'webm'|
+  'wmv'|
+  'glb';
 
-export type VideoFormat =
+export type VideoFormatType =
   string
   | "auto"
   | "flv"
@@ -242,6 +282,7 @@ export type VideoFormat =
   | "ogv"
   | "webm"
 
+export type AnimatedFormatType = "auto" | "gif" | "webp" | "png";
 
 export interface LegacyITransforamtionOptions {
   transformation?: LegacyITransforamtionOptions | string;
@@ -278,12 +319,12 @@ export interface LegacyITransforamtionOptions {
   } | string;
   default_image?: string;
   density?: stringOrNumber;
-  format?: ImageFormat;
-  fetch_format?: ImageFormat;
+  format?: ImageFormatType;
+  fetch_format?: ImageFormatType;
   effect?: string | Array<stringOrNumber> | ImageEffect;
   page?: stringOrNumber;
   flags?: ImageFlags | [] | string;
-  audio_codec?: AudioCodec;
+  audio_codec?: AudioCodecType;
   audio_frequency?: AudioFrequency;
   // eslint-disable-next-line @typescript-eslint/ban-types
   video_codec?: string | Object;