[pull] master from DefinitelyTyped:master

types/photoshop/Constants.d.ts

@@ -0,0 +1,2 @@
+import * as Constants from "./dom/Constants";
+export default Constants;

types/photoshop/dom/Actions.d.ts

@@ -1,3 +1,13 @@
+/** @ignore */
+export declare function validateActionSet(actionSet: ActionSet): void;
+/**
+ * @ignore
+ */
+export declare function PSActionSet(id: number): ActionSet;
+/**
+ * @ignore
+ */
+export declare function PSAction(id: number): Action;
 /**
  * Photoshop Actions
  *

types/photoshop/dom/Channel.d.ts

@@ -93,3 +93,43 @@ export declare abstract class Channel {
      */
     abstract merge(): Promise<void>;
 }
+/**
+ * @ignore
+ */
+export declare class ComponentChannel extends Channel {
+    private readonly _enumValue;
+    /**
+     * The class name of the referenced object: *"ComponentChannel"*.
+     * @minVersion 24.5
+     */
+    get typename(): "ComponentChannel";
+    get name(): string;
+    set name(name: string);
+    get histogram(): number[];
+    get color(): SolidColor;
+    set color(color: SolidColor);
+    get opacity(): number;
+    set opacity(opacity: number);
+    remove(): Promise<void>;
+    merge(): Promise<void>;
+}
+/**
+ * @ignore
+ */
+export declare class AlphaChannel extends Channel {
+    private readonly _id;
+    /**
+     * The class name of the referenced object: *"AlphaChannel"*.
+     * @minVersion 24.5
+     */
+    get typename(): "AlphaChannel";
+    get name(): string;
+    set name(name: string);
+    get histogram(): number[];
+    get color(): SolidColor;
+    set color(color: SolidColor);
+    get opacity(): number;
+    set opacity(opacity: number);
+    remove(): Promise<void>;
+    merge(): Promise<void>;
+}

types/photoshop/dom/Constants.d.ts

@@ -92,10 +92,23 @@ export declare enum ResampleMethod {
     /**
      * Changes image resolution value without affecting document dimension
      *
-     * Currently unsupported**
+     * **Currently unsupported**
      */
     NONE = "none",
 }
+/**
+ * The generative upscale model to use for AI-powered upscaling.
+ *
+ * Pass to [[Document.generativeUpscale]]()
+ *
+ * @minVersion 25.0
+ */
+export declare enum GenerativeUpscaleModel {
+    /**
+     * Adobe Firefly generative upscale model
+     */
+    FIREFLY = "firefly",
+}
 /**
  * The type of save operation.
  * @minVersion 22.5
@@ -135,7 +148,7 @@ export declare enum SaveOptions {
 /**
  * Number of bits per channel (also called pixel depth or color depth).
  *
- * The number selected indicates the exponent of 2.
+ * The number selected indicates the exponent of 2. With 8 bits per channel, we have 256 possible colors.
  * @minVersion 22.5
  */
 export declare enum BMPDepthType {
@@ -293,15 +306,15 @@ export declare enum AnchorPosition {
  */
 export declare enum TrimType {
     /**
-     * Bottom right pixel color.
+     * The color of the pixel in the bottom right corner of the image.
      */
     BOTTOMRIGHT = "bottom-right",
     /**
-     * Top left pixel color.
+     * The color of the pixel in the top left right corner of the image.
      */
     TOPLEFT = "top-left",
     /**
-     * Transparent pixels.
+     * Fully transparent pixels.
      */
     TRANSPARENT = "transparent",
 }
@@ -513,31 +526,33 @@ export declare enum DocumentFill {
  * @minVersion 22.5
  */
 export declare enum LayerKind {
+    NORMAL = "pixel",
+    GROUP = "group",
+    SMARTOBJECT = "smartObject",
+    GRADIENTFILL = "gradientFill",
+    PATTERNFILL = "pattern",
+    SOLIDFILL = "solidColor",
+    TEXT = "text",
+    LAYER3D = "threeD",
+    VIDEO = "video",
     BLACKANDWHITE = "blackAndWhite",
     BRIGHTNESSCONTRAST = "brightnessContrast",
     CHANNELMIXER = "channelMixer",
     COLORBALANCE = "colorBalance",
+    COLORLOOKUP = "colorLookup",
     CURVES = "curves",
     EXPOSURE = "exposure",
-    GRADIENTFILL = "gradientFill",
     GRADIENTMAP = "gradientMap",
     HUESATURATION = "hueSaturation",
     INVERSION = "inversion",
     LEVELS = "levels",
-    NORMAL = "pixel",
-    PATTERNFILL = "pattern",
     PHOTOFILTER = "photoFilter",
     POSTERIZE = "posterize",
     SELECTIVECOLOR = "selectiveColor",
-    SMARTOBJECT = "smartObject",
-    SOLIDFILL = "solidColor",
-    TEXT = "text",
     THRESHOLD = "threshold",
-    LAYER3D = "threeD",
     VIBRANCE = "vibrance",
-    VIDEO = "video",
-    GROUP = "group",
-    COLORLOOKUP = "colorLookup",
+    CLARITY = "clarity",
+    GRAIN = "grainAdjustment",
 }
 /**
  * Placement modes for Layer.move method