ag-psd 17.0.0 → 17.0.2

package/dist/bundle.js

@@ -346,6 +346,10 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
             rotate: descriptor_1.Ornt.decode(warp.warpRotate),
         },
     };
+    if (text.bounds)
+        target.text.bounds = (0, descriptor_1.descBoundsToBounds)(text.bounds);
+    if (text.boundingBox)
+        target.text.boundingBox = (0, descriptor_1.descBoundsToBounds)(text.boundingBox);
     if (text.EngineData) {
         var engineData = (0, engineData_1.parseEngineData)(text.EngineData);
         var textData = (0, text_1.decodeEngineData)(engineData);
@@ -363,20 +367,13 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
     var text = target.text;
     var warp = text.warp || {};
     var transform = text.transform || [1, 0, 0, 1, 0, 0];
-    var textDescriptor = {
-        'Txt ': (text.text || '').replace(/\r?\n/g, '\r'),
-        textGridding: descriptor_1.textGridding.encode(text.gridding),
-        Ornt: descriptor_1.Ornt.encode(text.orientation),
-        AntA: descriptor_1.Annt.encode(text.antiAlias),
-        TextIndex: text.index || 0,
-        EngineData: (0, engineData_1.serializeEngineData)((0, text_1.encodeEngineData)(text)),
-    };
+    var textDescriptor = __assign(__assign(__assign({ 'Txt ': (text.text || '').replace(/\r?\n/g, '\r'), textGridding: descriptor_1.textGridding.encode(text.gridding), Ornt: descriptor_1.Ornt.encode(text.orientation), AntA: descriptor_1.Annt.encode(text.antiAlias) }, (text.bounds ? { bounds: (0, descriptor_1.boundsToDescBounds)(text.bounds) } : {})), (text.boundingBox ? { boundingBox: (0, descriptor_1.boundsToDescBounds)(text.boundingBox) } : {})), { TextIndex: text.index || 0, EngineData: (0, engineData_1.serializeEngineData)((0, text_1.encodeEngineData)(text)) });
     (0, psdWriter_1.writeInt16)(writer, 1); // version
     for (var i = 0; i < 6; i++) {
         (0, psdWriter_1.writeFloat64)(writer, transform[i]);
     }
     (0, psdWriter_1.writeInt16)(writer, 50); // text version
-    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'TxLr', textDescriptor);
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'TxLr', textDescriptor, 'text');
     (0, psdWriter_1.writeInt16)(writer, 1); // warp version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'warp', encodeWarp(warp));
     (0, psdWriter_1.writeFloat32)(writer, text.left);
@@ -3173,14 +3170,14 @@ addHandler('lfx2', function (target) { return target.effects !== undefined && !h
     if (version !== 0)
         throw new Error("Invalid lfx2 version");
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    // console.log(require('util').inspect(desc, false, 99, true));
+    // console.log('READ', require('util').inspect(desc, false, 99, true));
     // TODO: don't discard if we got it from lmfx
     // discard if read in 'lrFX' section
     target.effects = (0, descriptor_1.parseEffects)(desc, !!options.logMissingFeatures);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target, _, options) {
-    var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, false);
-    // console.log(require('util').inspect(desc, false, 99, true));
+    var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, true);
+    // console.log('WRITE', require('util').inspect(desc, false, 99, true));
     (0, psdWriter_1.writeUint32)(writer, 0); // version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
@@ -3316,8 +3313,8 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strokeStyleLineCapType = exports.ESliceBGColorType = exports.ESliceOrigin = exports.ESliceVertAlign = exports.ESliceHorzAlign = exports.ESliceType = exports.FrFl = exports.FStl = exports.ClrS = exports.gradientInterpolationMethodType = exports.stdTrackID = exports.animInterpStyleEnum = exports.GrdT = exports.IGSr = exports.BETE = exports.BESs = exports.bvlT = exports.BESl = exports.BlnM = exports.warpStyle = exports.Annt = exports.Ornt = exports.textGridding = exports.frac = exports.unitsValue = exports.unitsPercentF = exports.unitsPercent = exports.unitsAngle = exports.parseUnitsToNumber = exports.parseUnitsOrNumber = exports.parseUnits = exports.parsePercentOrAngle = exports.parsePercent = exports.parseAngle = exports.serializeColor = exports.parseColor = exports.serializeVectorContent = exports.parseVectorContent = exports.serializeTrackList = exports.parseTrackList = exports.parseEffects = exports.serializeEffects = exports.xyToHorzVrtc = exports.horzVrtcToXY = exports.writeVersionAndDescriptor = exports.readVersionAndDescriptor = exports.writeDescriptorStructure = exports.readDescriptorStructure = exports.readAsciiStringOrClassId = exports.setLogErrors = void 0;
-exports.prjM = exports.FlMd = exports.IntC = exports.IntE = exports.Drct = exports.WndM = exports.CntE = exports.FlCl = exports.ExtR = exports.ExtT = exports.DfsM = exports.blurType = exports.Lns = exports.MztT = exports.Chnl = exports.Dstr = exports.ZZTy = exports.Wvtp = exports.SphM = exports.RplS = exports.Cnvr = exports.UndA = exports.DspM = exports.SmBQ = exports.SmBM = exports.BlrQ = exports.BlrM = exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = void 0;
+exports.ESliceOrigin = exports.ESliceVertAlign = exports.ESliceHorzAlign = exports.ESliceType = exports.FrFl = exports.FStl = exports.ClrS = exports.gradientInterpolationMethodType = exports.stdTrackID = exports.animInterpStyleEnum = exports.GrdT = exports.IGSr = exports.BETE = exports.BESs = exports.bvlT = exports.BESl = exports.BlnM = exports.warpStyle = exports.Annt = exports.Ornt = exports.textGridding = exports.frac = exports.unitsValue = exports.unitsPercentF = exports.unitsPercent = exports.unitsAngle = exports.parseUnitsToNumber = exports.parseUnitsOrNumber = exports.parseUnits = exports.parsePercentOrAngle = exports.parsePercent = exports.parseAngle = exports.serializeColor = exports.parseColor = exports.serializeVectorContent = exports.parseVectorContent = exports.serializeTrackList = exports.parseTrackList = exports.parseEffects = exports.serializeEffects = exports.boundsToDescBounds = exports.descBoundsToBounds = exports.xyToHorzVrtc = exports.horzVrtcToXY = exports.writeVersionAndDescriptor = exports.readVersionAndDescriptor = exports.writeDescriptorStructure = exports.readDescriptorStructure = exports.readAsciiStringOrClassId = exports.setLogErrors = void 0;
+exports.prjM = exports.FlMd = exports.IntC = exports.IntE = exports.Drct = exports.WndM = exports.CntE = exports.FlCl = exports.ExtR = exports.ExtT = exports.DfsM = exports.blurType = exports.Lns = exports.MztT = exports.Chnl = exports.Dstr = exports.ZZTy = exports.Wvtp = exports.SphM = exports.RplS = exports.Cnvr = exports.UndA = exports.DspM = exports.SmBQ = exports.SmBM = exports.BlrQ = exports.BlrM = exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = exports.strokeStyleLineCapType = exports.ESliceBGColorType = void 0;
 var helpers_1 = require("./helpers");
 var psdReader_1 = require("./psdReader");
 var psdWriter_1 = require("./psdWriter");
@@ -3412,6 +3409,7 @@ var fieldToExtType = {
     sheetStyle: nullType,
     translation: nullType,
     Skew: nullType,
+    boundingBox: makeType('', 'boundingBox'),
     'Lnk ': makeType('', 'ExternalFileLink'),
     frameReader: makeType('', 'FrameReader'),
     effectParams: makeType('', 'motionTrackEffectParams'),
@@ -3684,7 +3682,10 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
             continue;
         var type = getTypeByKey(key, value[key], root, value);
         var extType = fieldToExtType[key];
-        if (key === 'origin') {
+        if (key === 'bounds' && root === 'text') {
+            extType = makeType('', 'bounds');
+        }
+        else if (key === 'origin') {
             type = root === 'slices' ? 'enum' : 'Objc';
         }
         else if ((key === 'Cyn ' || key === 'Mgnt' || key === 'Ylw ' || key === 'Blck') && value._classID === 'CMYC') {
@@ -4099,6 +4100,26 @@ function xyToHorzVrtc(xy) {
     return { Hrzn: xy.x, Vrtc: xy.y };
 }
 exports.xyToHorzVrtc = xyToHorzVrtc;
+function descBoundsToBounds(desc) {
+    return {
+        top: parseUnits(desc['Top ']),
+        left: parseUnits(desc.Left),
+        right: parseUnits(desc.Rght),
+        bottom: parseUnits(desc.Btom),
+    };
+}
+exports.descBoundsToBounds = descBoundsToBounds;
+function boundsToDescBounds(bounds) {
+    var _a;
+    return _a = {
+            Left: unitsValue(bounds.left, 'bounds.left')
+        },
+        _a['Top '] = unitsValue(bounds.top, 'bounds.top'),
+        _a.Rght = unitsValue(bounds.right, 'bounds.right'),
+        _a.Btom = unitsValue(bounds.bottom, 'bounds.bottom'),
+        _a;
+}
+exports.boundsToDescBounds = boundsToDescBounds;
 function parseFxObject(fx) {
     var stroke = {
         enabled: !!fx.enab,
@@ -4147,11 +4168,11 @@ function serializeFxObject(stroke) {
 function serializeEffects(e, log, multi) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     var info = multi ? {
-        'Scl ': unitsPercent((_a = e.scale) !== null && _a !== void 0 ? _a : 1),
+        'Scl ': unitsPercentF((_a = e.scale) !== null && _a !== void 0 ? _a : 1),
         masterFXSwitch: !e.disabled,
     } : {
         masterFXSwitch: !e.disabled,
-        'Scl ': unitsPercent((_b = e.scale) !== null && _b !== void 0 ? _b : 1),
+        'Scl ': unitsPercentF((_b = e.scale) !== null && _b !== void 0 ? _b : 1),
     };
     var arrayKeys = ['dropShadow', 'innerShadow', 'solidFill', 'gradientOverlay', 'stroke'];
     for (var _i = 0, arrayKeys_1 = arrayKeys; _i < arrayKeys_1.length; _i++) {
@@ -4201,6 +4222,9 @@ function serializeEffects(e, log, multi) {
                         info.numModifyingFX++;
                 }
             }
+            else if (value.enabled) {
+                info.numModifyingFX++;
+            }
         }
     }
     return info;
@@ -4590,7 +4614,7 @@ function serializeEffectObject(obj, objName, reportErrors) {
                 result.sdwO = unitsPercent(val);
                 break;
             case 'angle':
-                if (objName === 'gradientOverlay') {
+                if (objName === 'gradientOverlay' || objName === 'patternFill') {
                     result.Angl = unitsAngle(val);
                 }
                 else {
@@ -4860,7 +4884,7 @@ function serializeColor(color) {
         return { _name: '', _classID: 'RGBC', 'Rd  ': color.r || 0, 'Grn ': color.g || 0, 'Bl  ': color.b || 0 };
     }
     else if ('fr' in color) {
-        return { _name: '', _classID: 'XXXX', redFloat: color.fr, greenFloat: color.fg, blueFloat: color.fb };
+        return { _name: '', _classID: 'RGBC', redFloat: color.fr, greenFloat: color.fg, blueFloat: color.fb };
     }
     else if ('h' in color) {
         return { _name: '', _classID: 'HSBC', 'H   ': unitsAngle(color.h * 360), Strt: color.s || 0, Brgh: color.b || 0 };
@@ -6620,6 +6644,15 @@ addHandler(1032, function (target) { return target.gridAndGuidesInformation !==
         (0, psdWriter_1.writeUint8)(writer, g.direction === 'horizontal' ? 1 : 0);
     }
 });
+helpers_1.MOCK_HANDLERS && addHandler(1092, // ???
+function (// ???
+target) { return target._ir1092 !== undefined; }, function (reader, target, left) {
+    LOG_MOCK_HANDLERS && console.log('image resource 1092', left());
+    // 16 bytes, seems to be 4 integers
+    target._ir1092 = (0, psdReader_1.readBytes)(reader, left());
+}, function (writer, target) {
+    (0, psdWriter_1.writeBytes)(writer, target._ir1092);
+});
 // 0 - normal, 7 - multiply, 8 - screen, 23 - difference
 var onionSkinsBlendModes = [
     'normal', undefined, undefined, undefined, undefined, undefined, undefined, 'multiply',
@@ -6830,10 +6863,10 @@ target) { return target.slices ? target.slices.length : 0; }, function (reader,
             var associatedLayerId = origin_1 == 'layer' ? (0, psdReader_1.readUint32)(reader) : 0;
             var name_3 = (0, psdReader_1.readUnicodeString)(reader);
             var type = clamped(sliceTypes, (0, psdReader_1.readUint32)(reader));
-            var top_2 = (0, psdReader_1.readInt32)(reader);
             var left_1 = (0, psdReader_1.readInt32)(reader);
-            var bottom_1 = (0, psdReader_1.readInt32)(reader);
+            var top_2 = (0, psdReader_1.readInt32)(reader);
             var right_1 = (0, psdReader_1.readInt32)(reader);
+            var bottom_1 = (0, psdReader_1.readInt32)(reader);
             var url = (0, psdReader_1.readUnicodeString)(reader);
             var target_1 = (0, psdReader_1.readUnicodeString)(reader);
             var message = (0, psdReader_1.readUnicodeString)(reader);
@@ -6939,10 +6972,10 @@ target) { return target.slices ? target.slices.length : 0; }, function (reader,
             (0, psdWriter_1.writeUint32)(writer, slice.associatedLayerId);
         (0, psdWriter_1.writeUnicodeString)(writer, slice.name);
         (0, psdWriter_1.writeUint32)(writer, sliceTypes.indexOf(slice.type));
-        (0, psdWriter_1.writeInt32)(writer, slice.bounds.top);
         (0, psdWriter_1.writeInt32)(writer, slice.bounds.left);
-        (0, psdWriter_1.writeInt32)(writer, slice.bounds.bottom);
+        (0, psdWriter_1.writeInt32)(writer, slice.bounds.top);
         (0, psdWriter_1.writeInt32)(writer, slice.bounds.right);
+        (0, psdWriter_1.writeInt32)(writer, slice.bounds.bottom);
         (0, psdWriter_1.writeUnicodeString)(writer, slice.url);
         (0, psdWriter_1.writeUnicodeString)(writer, slice.target);
         (0, psdWriter_1.writeUnicodeString)(writer, slice.message);
@@ -8446,6 +8479,7 @@ function writePascalString(writer, text, padTo) {
     writeUint8(writer, length);
     for (var i = 0; i < length; i++) {
         var code = text.charCodeAt(i);
+        // writeUint8(writer, code); // for testing
         writeUint8(writer, code < 128 ? code : '?'.charCodeAt(0));
     }
     while (++length % padTo) {

package/dist/descriptor.d.ts

@@ -1,4 +1,4 @@
-import { AntiAlias, BevelDirection, BevelStyle, BevelTechnique, BlendMode, Color, GlowSource, GlowTechnique, GradientStyle, InterpolationMethod, LayerEffectsInfo, LineAlignment, LineCapType, LineJoinType, Orientation, TextGridding, TimelineKeyInterpolation, TimelineTrack, TimelineTrackType, Units, UnitsValue, VectorContent, WarpStyle } from './psd';
+import { AntiAlias, BevelDirection, BevelStyle, BevelTechnique, BlendMode, Color, GlowSource, GlowTechnique, GradientStyle, InterpolationMethod, LayerEffectsInfo, LineAlignment, LineCapType, LineJoinType, Orientation, TextGridding, TimelineKeyInterpolation, TimelineTrack, TimelineTrackType, Units, UnitsBounds, UnitsValue, VectorContent, WarpStyle } from './psd';
 import { PsdReader } from './psdReader';
 import { PsdWriter } from './psdWriter';
 export declare function setLogErrors(value: boolean): void;
@@ -43,7 +43,7 @@ export type DescriptorColor = {
     'B   ': number;
 } | {
     _name: '';
-    _classID: 'XXXX';
+    _classID: 'RGBC';
     redFloat: number;
     greenFloat: number;
     blueFloat: number;
@@ -121,11 +121,19 @@ export interface StrokeDescriptor {
     strokeStyleContent: DescriptorVectorContent;
     strokeStyleResolution: number;
 }
+export interface BoundsDescriptor {
+    Left: DescriptorUnitsValue;
+    'Top ': DescriptorUnitsValue;
+    Rght: DescriptorUnitsValue;
+    Btom: DescriptorUnitsValue;
+}
 export interface TextDescriptor {
     'Txt ': string;
     textGridding: string;
     Ornt: string;
     AntA: string;
+    bounds?: BoundsDescriptor;
+    boundingBox?: BoundsDescriptor;
     TextIndex: number;
     EngineData?: Uint8Array;
 }
@@ -209,6 +217,8 @@ export declare function xyToHorzVrtc(xy: {
     x: number;
     y: number;
 }): HrznVrtcDescriptor;
+export declare function descBoundsToBounds(desc: BoundsDescriptor): UnitsBounds;
+export declare function boundsToDescBounds(bounds: UnitsBounds): BoundsDescriptor;
 export type TimelineAnimKeyDescriptor = {
     Type: 'keyType.Opct';
     Opct: DescriptorUnitsValue;
@@ -297,17 +307,17 @@ export interface Lfx2Descriptor {
 export interface LmfxDescriptor {
     'Scl '?: DescriptorUnitsValue;
     masterFXSwitch?: boolean;
-    numModifyingFX?: number;
-    OrGl?: EffectDescriptor;
-    IrGl?: EffectDescriptor;
-    ebbl?: EffectDescriptor;
-    ChFX?: EffectDescriptor;
     dropShadowMulti?: EffectDescriptor[];
     innerShadowMulti?: EffectDescriptor[];
+    OrGl?: EffectDescriptor;
     solidFillMulti?: EffectDescriptor[];
     gradientFillMulti?: EffectDescriptor[];
-    frameFXMulti?: EffectDescriptor[];
     patternFill?: EffectDescriptor;
+    frameFXMulti?: EffectDescriptor[];
+    IrGl?: EffectDescriptor;
+    ebbl?: EffectDescriptor;
+    ChFX?: EffectDescriptor;
+    numModifyingFX?: number;
 }
 export declare function serializeEffects(e: LayerEffectsInfo, log: boolean, multi: boolean): Lfx2Descriptor & LmfxDescriptor;
 export declare function parseEffects(info: Lfx2Descriptor & LmfxDescriptor, log: boolean): LayerEffectsInfo;

package/dist/descriptor.js

@@ -11,8 +11,8 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strokeStyleLineCapType = exports.ESliceBGColorType = exports.ESliceOrigin = exports.ESliceVertAlign = exports.ESliceHorzAlign = exports.ESliceType = exports.FrFl = exports.FStl = exports.ClrS = exports.gradientInterpolationMethodType = exports.stdTrackID = exports.animInterpStyleEnum = exports.GrdT = exports.IGSr = exports.BETE = exports.BESs = exports.bvlT = exports.BESl = exports.BlnM = exports.warpStyle = exports.Annt = exports.Ornt = exports.textGridding = exports.frac = exports.unitsValue = exports.unitsPercentF = exports.unitsPercent = exports.unitsAngle = exports.parseUnitsToNumber = exports.parseUnitsOrNumber = exports.parseUnits = exports.parsePercentOrAngle = exports.parsePercent = exports.parseAngle = exports.serializeColor = exports.parseColor = exports.serializeVectorContent = exports.parseVectorContent = exports.serializeTrackList = exports.parseTrackList = exports.parseEffects = exports.serializeEffects = exports.xyToHorzVrtc = exports.horzVrtcToXY = exports.writeVersionAndDescriptor = exports.readVersionAndDescriptor = exports.writeDescriptorStructure = exports.readDescriptorStructure = exports.readAsciiStringOrClassId = exports.setLogErrors = void 0;
-exports.prjM = exports.FlMd = exports.IntC = exports.IntE = exports.Drct = exports.WndM = exports.CntE = exports.FlCl = exports.ExtR = exports.ExtT = exports.DfsM = exports.blurType = exports.Lns = exports.MztT = exports.Chnl = exports.Dstr = exports.ZZTy = exports.Wvtp = exports.SphM = exports.RplS = exports.Cnvr = exports.UndA = exports.DspM = exports.SmBQ = exports.SmBM = exports.BlrQ = exports.BlrM = exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = void 0;
+exports.ESliceOrigin = exports.ESliceVertAlign = exports.ESliceHorzAlign = exports.ESliceType = exports.FrFl = exports.FStl = exports.ClrS = exports.gradientInterpolationMethodType = exports.stdTrackID = exports.animInterpStyleEnum = exports.GrdT = exports.IGSr = exports.BETE = exports.BESs = exports.bvlT = exports.BESl = exports.BlnM = exports.warpStyle = exports.Annt = exports.Ornt = exports.textGridding = exports.frac = exports.unitsValue = exports.unitsPercentF = exports.unitsPercent = exports.unitsAngle = exports.parseUnitsToNumber = exports.parseUnitsOrNumber = exports.parseUnits = exports.parsePercentOrAngle = exports.parsePercent = exports.parseAngle = exports.serializeColor = exports.parseColor = exports.serializeVectorContent = exports.parseVectorContent = exports.serializeTrackList = exports.parseTrackList = exports.parseEffects = exports.serializeEffects = exports.boundsToDescBounds = exports.descBoundsToBounds = exports.xyToHorzVrtc = exports.horzVrtcToXY = exports.writeVersionAndDescriptor = exports.readVersionAndDescriptor = exports.writeDescriptorStructure = exports.readDescriptorStructure = exports.readAsciiStringOrClassId = exports.setLogErrors = void 0;
+exports.prjM = exports.FlMd = exports.IntC = exports.IntE = exports.Drct = exports.WndM = exports.CntE = exports.FlCl = exports.ExtR = exports.ExtT = exports.DfsM = exports.blurType = exports.Lns = exports.MztT = exports.Chnl = exports.Dstr = exports.ZZTy = exports.Wvtp = exports.SphM = exports.RplS = exports.Cnvr = exports.UndA = exports.DspM = exports.SmBQ = exports.SmBM = exports.BlrQ = exports.BlrM = exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = exports.strokeStyleLineCapType = exports.ESliceBGColorType = void 0;
 var helpers_1 = require("./helpers");
 var psdReader_1 = require("./psdReader");
 var psdWriter_1 = require("./psdWriter");
@@ -107,6 +107,7 @@ var fieldToExtType = {
     sheetStyle: nullType,
     translation: nullType,
     Skew: nullType,
+    boundingBox: makeType('', 'boundingBox'),
     'Lnk ': makeType('', 'ExternalFileLink'),
     frameReader: makeType('', 'FrameReader'),
     effectParams: makeType('', 'motionTrackEffectParams'),
@@ -379,7 +380,10 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
             continue;
         var type = getTypeByKey(key, value[key], root, value);
         var extType = fieldToExtType[key];
-        if (key === 'origin') {
+        if (key === 'bounds' && root === 'text') {
+            extType = makeType('', 'bounds');
+        }
+        else if (key === 'origin') {
             type = root === 'slices' ? 'enum' : 'Objc';
         }
         else if ((key === 'Cyn ' || key === 'Mgnt' || key === 'Ylw ' || key === 'Blck') && value._classID === 'CMYC') {
@@ -794,6 +798,26 @@ function xyToHorzVrtc(xy) {
     return { Hrzn: xy.x, Vrtc: xy.y };
 }
 exports.xyToHorzVrtc = xyToHorzVrtc;
+function descBoundsToBounds(desc) {
+    return {
+        top: parseUnits(desc['Top ']),
+        left: parseUnits(desc.Left),
+        right: parseUnits(desc.Rght),
+        bottom: parseUnits(desc.Btom),
+    };
+}
+exports.descBoundsToBounds = descBoundsToBounds;
+function boundsToDescBounds(bounds) {
+    var _a;
+    return _a = {
+            Left: unitsValue(bounds.left, 'bounds.left')
+        },
+        _a['Top '] = unitsValue(bounds.top, 'bounds.top'),
+        _a.Rght = unitsValue(bounds.right, 'bounds.right'),
+        _a.Btom = unitsValue(bounds.bottom, 'bounds.bottom'),
+        _a;
+}
+exports.boundsToDescBounds = boundsToDescBounds;
 function parseFxObject(fx) {
     var stroke = {
         enabled: !!fx.enab,
@@ -842,11 +866,11 @@ function serializeFxObject(stroke) {
 function serializeEffects(e, log, multi) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     var info = multi ? {
-        'Scl ': unitsPercent((_a = e.scale) !== null && _a !== void 0 ? _a : 1),
+        'Scl ': unitsPercentF((_a = e.scale) !== null && _a !== void 0 ? _a : 1),
         masterFXSwitch: !e.disabled,
     } : {
         masterFXSwitch: !e.disabled,
-        'Scl ': unitsPercent((_b = e.scale) !== null && _b !== void 0 ? _b : 1),
+        'Scl ': unitsPercentF((_b = e.scale) !== null && _b !== void 0 ? _b : 1),
     };
     var arrayKeys = ['dropShadow', 'innerShadow', 'solidFill', 'gradientOverlay', 'stroke'];
     for (var _i = 0, arrayKeys_1 = arrayKeys; _i < arrayKeys_1.length; _i++) {
@@ -896,6 +920,9 @@ function serializeEffects(e, log, multi) {
                         info.numModifyingFX++;
                 }
             }
+            else if (value.enabled) {
+                info.numModifyingFX++;
+            }
         }
     }
     return info;
@@ -1285,7 +1312,7 @@ function serializeEffectObject(obj, objName, reportErrors) {
                 result.sdwO = unitsPercent(val);
                 break;
             case 'angle':
-                if (objName === 'gradientOverlay') {
+                if (objName === 'gradientOverlay' || objName === 'patternFill') {
                     result.Angl = unitsAngle(val);
                 }
                 else {
@@ -1555,7 +1582,7 @@ function serializeColor(color) {
         return { _name: '', _classID: 'RGBC', 'Rd  ': color.r || 0, 'Grn ': color.g || 0, 'Bl  ': color.b || 0 };
     }
     else if ('fr' in color) {
-        return { _name: '', _classID: 'XXXX', redFloat: color.fr, greenFloat: color.fg, blueFloat: color.fb };
+        return { _name: '', _classID: 'RGBC', redFloat: color.fr, greenFloat: color.fg, blueFloat: color.fb };
     }
     else if ('h' in color) {
         return { _name: '', _classID: 'HSBC', 'H   ': unitsAngle(color.h * 360), Strt: color.s || 0, Brgh: color.b || 0 };