ag-psd 16.0.0 → 17.0.1

package/dist/descriptor.js

@@ -11,7 +11,8 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = 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.unitsValue = 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.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");
@@ -106,6 +107,7 @@ var fieldToExtType = {
     sheetStyle: nullType,
     translation: nullType,
     Skew: nullType,
+    boundingBox: makeType('', 'boundingBox'),
     'Lnk ': makeType('', 'ExternalFileLink'),
     frameReader: makeType('', 'FrameReader'),
     effectParams: makeType('', 'motionTrackEffectParams'),
@@ -113,11 +115,15 @@ var fieldToExtType = {
     Anch: makeType('', 'Pnt '),
     'Fwd ': makeType('', 'Pnt '),
     'Bwd ': makeType('', 'Pnt '),
+    FlrC: makeType('', 'Pnt '),
     meshBoundaryPath: makeType('', 'pathClass'),
     filterFX: makeType('', 'filterFXStyle'),
     Fltr: makeType('', 'rigidTransform'),
     FrgC: makeType('', 'RGBC'),
     BckC: makeType('', 'RGBC'),
+    sdwM: makeType('Parameters', 'adaptCorrectTones'),
+    hglM: makeType('Parameters', 'adaptCorrectTones'),
+    customShape: makeType('', 'customShape'),
 };
 var fieldToArrayExtType = {
     'Crv ': makeType('', 'CrPt'),
@@ -146,15 +152,20 @@ var fieldToArrayExtType = {
     pathComponents: makeType('', 'PaCm'),
     filterFXList: makeType('', 'filterFX'),
     puppetShapeList: makeType('', 'puppetShape'),
+    channelDenoise: makeType('', 'channelDenoiseParams'),
+    ShrP: makeType('', 'Pnt '),
 };
 var typeToField = {
     'TEXT': [
         'Txt ', 'printerName', 'Nm  ', 'Idnt', 'blackAndWhitePresetFileName', 'LUT3DFileName',
         'presetFileName', 'curvesPresetFileName', 'mixerPresetFileName', 'placed', 'description', 'reason',
         'artboardPresetName', 'json', 'clipID', 'relPath', 'fullPath', 'mediaDescriptor', 'Msge',
-        'altTag', 'url', 'cellText',
+        'altTag', 'url', 'cellText', 'preset', 'KnNm', 'FPth',
+    ],
+    'tdta': [
+        'EngineData', 'LUT3DFileData', 'indexArray', 'originalVertexArray', 'deformedVertexArray',
+        'LqMe',
     ],
-    'tdta': ['EngineData', 'LUT3DFileData', 'indexArray', 'originalVertexArray', 'deformedVertexArray'],
     'long': [
         'TextIndex', 'RndS', 'Mdpn', 'Smth', 'Lctn', 'strokeStyleVersion', 'LaID', 'Vrsn', 'Cnt ',
         'Brgh', 'Cntr', 'means', 'vibrance', 'Strt', 'bwPresetKind', 'presetKind', 'comp', 'compID', 'originalCompID',
@@ -165,16 +176,19 @@ var typeToField = {
         'numBefore', 'numAfter', 'Spcn', 'minOpacity', 'maxOpacity', 'BlnM', 'sheetID', 'gblA', 'globalAltitude',
         'descVersion', 'frameReaderType', 'LyrI', 'zoomOrigin', 'fontSize', 'Rds ', 'sliceID',
         'topOutset', 'leftOutset', 'bottomOutset', 'rightOutset', 'filterID', 'meshQuality',
-        'meshExpansion', 'meshRigidity', 'VrsM', 'VrsN',
+        'meshExpansion', 'meshRigidity', 'VrsM', 'VrsN', 'NmbG', 'WLMn', 'WLMx', 'AmMn', 'AmMx', 'SclH', 'SclV',
+        'Lvl ', 'TlNm', 'TlOf', 'FlRs', 'Thsh', 'ShrS', 'ShrE', 'FlRs', 'Vrnc', 'Strg', 'ExtS', 'ExtD',
+        'HrzS', 'VrtS', 'NmbR', 'EdgF', 'Ang1', 'Ang2', 'Ang3', 'Ang4',
     ],
     'enum': [
-        'textGridding', 'Ornt', 'warpStyle', 'warpRotate', 'Inte', 'Bltn', 'ClrS',
-        'sdwM', 'hglM', 'bvlT', 'bvlS', 'bvlD', 'Md  ', 'glwS', 'GrdF', 'GlwT',
+        'textGridding', 'Ornt', 'warpStyle', 'warpRotate', 'Inte', 'Bltn', 'ClrS', 'BlrQ',
+        'bvlT', 'bvlS', 'bvlD', 'Md  ', 'glwS', 'GrdF', 'GlwT', 'RplS', 'BlrM', 'SmBM',
         'strokeStyleLineCapType', 'strokeStyleLineJoinType', 'strokeStyleLineAlignment',
         'strokeStyleBlendMode', 'PntT', 'Styl', 'lookupType', 'LUTFormat', 'dataOrder',
         'tableOrder', 'enableCompCore', 'enableCompCoreGPU', 'compCoreSupport', 'compCoreGPUSupport', 'Engn',
         'enableCompCoreThreads', 'gs99', 'FrDs', 'trackID', 'animInterpStyle', 'horzAlign',
-        'vertAlign', 'bgColorType', 'shapeOperation',
+        'vertAlign', 'bgColorType', 'shapeOperation', 'UndA', 'Wvtp', 'Drct', 'WndM', 'Edg ', 'FlCl', 'IntE',
+        'IntC', 'Cnvr', 'Fl  ', 'Dstr', 'MztT', 'Lns ', 'ExtT', 'DspM', 'ExtR', 'ZZTy', 'SphM', 'SmBQ',
     ],
     'bool': [
         'PstS', 'printSixteenBit', 'masterFXSwitch', 'enab', 'uglg', 'antialiasGloss',
@@ -186,7 +200,8 @@ var typeToField = {
         'present', 'showInDialog', 'overprint', 'sheetDisclosed', 'lightsDisclosed', 'meshesDisclosed',
         'materialsDisclosed', 'hasMotion', 'muted', 'Effc', 'selected', 'autoScope', 'fillCanvas',
         'cellTextIsHTML', 'Smoo', 'Clsp', 'validAtPosition', 'rigidType', 'hasoptions', 'filterMaskEnable',
-        'filterMaskLinked', 'filterMaskExtendWithWhite',
+        'filterMaskLinked', 'filterMaskExtendWithWhite', 'removeJPEGArtifact', 'Mnch', 'ExtF', 'ExtM',
+        'moreAccurate', 'GpuY', 'LIWy',
     ],
     'doub': [
         'warpValue', 'warpPerspective', 'warpPerspectiveOther', 'Intr', 'Wdth', 'Hght',
@@ -196,10 +211,10 @@ var typeToField = {
         'PuX0', 'PuX1', 'PuX2', 'PuX3', 'PuY0', 'PuY1', 'PuY2', 'PuY3'
     ],
     'UntF': [
-        'Scl ', 'sdwO', 'hglO', 'lagl', 'Lald', 'srgR', 'blur', 'Sftn', 'Opct', 'Dstn', 'Angl',
+        'sdwO', 'hglO', 'lagl', 'Lald', 'srgR', 'blur', 'Sftn', 'Opct', 'Dstn', 'Angl',
         'Ckmt', 'Nose', 'Inpr', 'ShdN', 'strokeStyleLineWidth', 'strokeStyleLineDashOffset',
         'strokeStyleOpacity', 'H   ', 'Top ', 'Left', 'Btom', 'Rght', 'Rslt',
-        'topRight', 'topLeft', 'bottomLeft', 'bottomRight',
+        'topRight', 'topLeft', 'bottomLeft', 'bottomRight', 'ClNs', 'Shrp',
     ],
     'VlLs': [
         'Crv ', 'Clrs', 'Mnm ', 'Mxm ', 'Trns', 'pathList', 'strokeStyleLineDashSet', 'FrLs', 'slices',
@@ -207,10 +222,12 @@ var typeToField = {
         'solidFillMulti', 'frameFXMulti', 'innerShadowMulti', 'dropShadowMulti', 'FrIn', 'FSts', 'FsFr',
         'sheetTimelineOptions', 'audioClipList', 'trackList', 'globalTrackList', 'keyList', 'audioClipList',
         'warpValues', 'selectedPin', 'Pts ', 'SbpL', 'pathComponents', 'pinOffsets', 'posFinalPins',
-        'pinVertexIndices', 'PinP', 'PnRt', 'PnOv', 'PnDp', 'filterFXList', 'puppetShapeList',
+        'pinVertexIndices', 'PinP', 'PnRt', 'PnOv', 'PnDp', 'filterFXList', 'puppetShapeList', 'ShrP',
+        'channelDenoise', 'Mtrx',
     ],
     'ObAr': ['meshPoints', 'quiltSliceX', 'quiltSliceY'],
-    'obj ': ['null'],
+    'obj ': ['null', 'Chnl'],
+    'Pth ': ['DspF'],
 };
 var channels = [
     'Rd  ', 'Grn ', 'Bl  ', 'Yllw', 'Ylw ', 'Cyn ', 'Mgnt', 'Blck', 'Gry ', 'Lmnc', 'A   ', 'B   ',
@@ -249,6 +266,9 @@ var fieldToArrayType = {
     PnDp: 'doub',
     filterFXList: 'Objc',
     puppetShapeList: 'Objc',
+    ShrP: 'Objc',
+    channelDenoise: 'Objc',
+    Mtrx: 'long',
 };
 var fieldToType = {};
 for (var _i = 0, _a = Object.keys(typeToField); _i < _a.length; _i++) {
@@ -324,11 +344,12 @@ function writeAsciiStringOrClassId(writer, value) {
     }
 }
 function readDescriptorStructure(reader) {
-    var object = {};
-    // object.__struct =
+    // const struct =
     readClassStructure(reader);
+    // const object: any = { _name: struct.name, _classID: struct.classID };
+    var object = {};
+    // console.log('>> ', struct);
     var itemsCount = (0, psdReader_1.readUint32)(reader);
-    // console.log('//', object.__struct);
     for (var i = 0; i < itemsCount; i++) {
         var key = readAsciiStringOrClassId(reader);
         var type = (0, psdReader_1.readSignature)(reader);
@@ -347,21 +368,63 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
     (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, name);
     writeAsciiStringOrClassId(writer, classId);
     var keys = Object.keys(value);
-    (0, psdWriter_1.writeUint32)(writer, keys.length);
+    var keyCount = keys.length;
+    if ('_name' in value)
+        keyCount--;
+    if ('_classID' in value)
+        keyCount--;
+    (0, psdWriter_1.writeUint32)(writer, keyCount);
     for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
         var key = keys_1[_i];
+        if (key === '_name' || key === '_classID')
+            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') {
+            type = 'doub';
+        }
+        else if (/^PN[a-z][a-z]$/.test(key)) {
+            type = 'TEXT';
+        }
+        else if (/^PT[a-z][a-z]$/.test(key)) {
+            type = 'long';
+        }
+        else if (/^PF[a-z][a-z]$/.test(key)) {
+            type = 'doub';
+        }
+        else if (key === 'ClSz' || key === 'Rds ' || key === 'Amnt') {
+            type = typeof value[key] === 'number' ? 'long' : 'UntF';
+        }
+        else if ((key === 'sdwM' || key === 'hglM') && typeof value[key] === 'string') {
+            type = 'enum';
+        }
+        else if (key === 'blur' && typeof value[key] === 'string') {
+            type = 'enum';
+        }
+        else if (key === 'Angl' && typeof value[key] === 'number') {
+            type = 'doub'; // ???
+        }
         else if (key === 'bounds' && root === 'slices') {
             type = 'Objc';
             extType = makeType('', 'Rct1');
         }
-        else if (key === 'Scl ' && 'Hrzn' in value[key]) {
-            type = 'Objc';
-            extType = nullType;
+        else if (key === 'Scl ') {
+            if (typeof value[key] === 'object' && 'Hrzn' in value[key]) {
+                type = 'Objc';
+                extType = nullType;
+            }
+            else if (typeof value[key] === 'number') {
+                type = 'long';
+            }
+            else {
+                type = 'UntF';
+            }
         }
         else if (key === 'audioClipGroupList' && keys.length === 1) {
             type = 'VlLs';
@@ -369,7 +432,13 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
         else if ((key === 'Strt' || key === 'Brgh') && 'H   ' in value) {
             type = 'doub';
         }
-        else if (key === 'Strt') {
+        else if (key === 'Wdth' && typeof value[key] === 'object') {
+            type = 'UntF';
+        }
+        else if (key === 'Ofst' && typeof value[key] === 'number') {
+            type = 'long';
+        }
+        else if (key === 'Strt' && typeof value[key] === 'object') {
             type = 'Objc';
             extType = nullType;
         }
@@ -489,11 +558,11 @@ function readOSType(reader, type) {
             return items;
         }
         case 'Pth ': { // File path
-            /*const length =*/ (0, psdReader_1.readInt32)(reader);
+            /*const length =*/ (0, psdReader_1.readInt32)(reader); // total size of all fields below
             var sig = (0, psdReader_1.readSignature)(reader);
-            /*const pathSize =*/ (0, psdReader_1.readInt32LE)(reader);
+            /*const pathSize =*/ (0, psdReader_1.readInt32LE)(reader); // the same as length
             var charsCount = (0, psdReader_1.readInt32LE)(reader);
-            var path = (0, psdReader_1.readUnicodeStringWithLength)(reader, charsCount);
+            var path = (0, psdReader_1.readUnicodeStringWithLengthLE)(reader, charsCount);
             return { sig: sig, path: path };
         }
         default:
@@ -511,12 +580,19 @@ function writeOSType(writer, type, value, key, extType, root) {
             writeReferenceStructure(writer, key, value);
             break;
         case 'Objc': // Descriptor
-        case 'GlbO': // GlobalObject same as Descriptor
+        case 'GlbO': { // GlobalObject same as Descriptor
+            if (typeof value !== 'object')
+                throw new Error("Invalid struct value: ".concat(JSON.stringify(value), ", key: ").concat(key));
             if (!extType)
                 throw new Error("Missing ext type for: '".concat(key, "' (").concat(JSON.stringify(value), ")"));
-            writeDescriptorStructure(writer, extType.name, extType.classID, value, root);
+            var name_1 = value._name || extType.name;
+            var classID = value._classID || extType.classID;
+            writeDescriptorStructure(writer, name_1, classID, value, root);
             break;
+        }
         case 'VlLs': // List
+            if (!Array.isArray(value))
+                throw new Error("Invalid list value: ".concat(JSON.stringify(value), ", key: ").concat(key));
             (0, psdWriter_1.writeInt32)(writer, value.length);
             for (var i = 0; i < value.length; i++) {
                 var type_3 = fieldToArrayType[key];
@@ -527,6 +603,8 @@ function writeOSType(writer, type, value, key, extType, root) {
             }
             break;
         case 'doub': // Double
+            if (typeof value !== 'number')
+                throw new Error("Invalid number value: ".concat(JSON.stringify(value), ", key: ").concat(key));
             (0, psdWriter_1.writeFloat64)(writer, value);
             break;
         case 'UntF': // Unit double
@@ -545,17 +623,23 @@ function writeOSType(writer, type, value, key, extType, root) {
             (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, value);
             break;
         case 'enum': { // Enumerated
+            if (typeof value !== 'string')
+                throw new Error("Invalid enum value: ".concat(JSON.stringify(value), ", key: ").concat(key));
             var _a = value.split('.'), _type = _a[0], val = _a[1];
             writeAsciiStringOrClassId(writer, _type);
             writeAsciiStringOrClassId(writer, val);
             break;
         }
         case 'long': // Integer
+            if (typeof value !== 'number')
+                throw new Error("Invalid integer value: ".concat(JSON.stringify(value), ", key: ").concat(key));
             (0, psdWriter_1.writeInt32)(writer, value);
             break;
         // case 'comp': // Large Integer
         // 	writeLargeInteger(reader);
         case 'bool': // Boolean
+            if (typeof value !== 'boolean')
+                throw new Error("Invalid boolean value: ".concat(JSON.stringify(value), ", key: ").concat(key));
             (0, psdWriter_1.writeUint8)(writer, value ? 1 : 0);
             break;
         // case 'type': // Class
@@ -586,8 +670,15 @@ function writeOSType(writer, type, value, key, extType, root) {
             }
             break;
         }
-        // case 'Pth ': // File path
-        // 	writeFilePath(reader);
+        case 'Pth ': { // File path
+            var length_5 = 4 + 4 + 4 + value.path.length * 2;
+            (0, psdWriter_1.writeInt32)(writer, length_5);
+            (0, psdWriter_1.writeSignature)(writer, value.sig);
+            (0, psdWriter_1.writeInt32LE)(writer, length_5);
+            (0, psdWriter_1.writeInt32LE)(writer, value.path.length);
+            (0, psdWriter_1.writeUnicodeStringWithoutLengthLE)(writer, value.path);
+            break;
+        }
         default:
             throw new Error("Not implemented descriptor OSType: ".concat(type));
     }
@@ -678,7 +769,6 @@ function writeReferenceStructure(writer, _key, items) {
 function readClassStructure(reader) {
     var name = (0, psdReader_1.readUnicodeString)(reader);
     var classID = readAsciiStringOrClassId(reader);
-    // console.log({ name, classID });
     return { name: name, classID: classID };
 }
 function writeClassStructure(writer, name, classID) {
@@ -708,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,
@@ -858,7 +968,8 @@ function parseKeyList(keyList, logMissingFeatures) {
     var keys = [];
     for (var j = 0; j < keyList.length; j++) {
         var key = keyList[j];
-        var time = key.time, selected = key.selected, animKey = key.animKey;
+        var _a = key.time, denominator = _a.denominator, numerator = _a.numerator, selected = key.selected, animKey = key.animKey;
+        var time = { numerator: numerator, denominator: denominator };
         var interpolation = exports.animInterpStyleEnum.decode(key.animInterpStyle);
         switch (animKey.Type) {
             case 'keyType.Opct':
@@ -1107,6 +1218,9 @@ function parseEffectObject(obj, reportErrors) {
             case 'antialiasGloss':
                 result[key] = val;
                 break;
+            case '_name':
+            case '_classID':
+                break;
             default:
                 reportErrors && console.log("Invalid effect key: '".concat(key, "', value:"), val);
         }
@@ -1459,25 +1573,25 @@ function parseColor(color) {
 exports.parseColor = parseColor;
 function serializeColor(color) {
     if (!color) {
-        return { 'Rd  ': 0, 'Grn ': 0, 'Bl  ': 0 };
+        return { _name: '', _classID: 'RGBC', 'Rd  ': 0, 'Grn ': 0, 'Bl  ': 0 };
     }
     else if ('r' in color) {
-        return { 'Rd  ': color.r || 0, 'Grn ': color.g || 0, 'Bl  ': color.b || 0 };
+        return { _name: '', _classID: 'RGBC', 'Rd  ': color.r || 0, 'Grn ': color.g || 0, 'Bl  ': color.b || 0 };
     }
     else if ('fr' in color) {
-        return { redFloat: color.fr, greenFloat: color.fg, blueFloat: color.fb };
+        return { _name: '', _classID: 'XXXX', redFloat: color.fr, greenFloat: color.fg, blueFloat: color.fb };
     }
     else if ('h' in color) {
-        return { 'H   ': unitsAngle(color.h * 360), Strt: color.s || 0, Brgh: color.b || 0 };
+        return { _name: '', _classID: 'HSBC', 'H   ': unitsAngle(color.h * 360), Strt: color.s || 0, Brgh: color.b || 0 };
     }
     else if ('c' in color) {
-        return { 'Cyn ': color.c || 0, Mgnt: color.m || 0, 'Ylw ': color.y || 0, Blck: color.k || 0 };
+        return { _name: '', _classID: 'CMYC', 'Cyn ': color.c || 0, Mgnt: color.m || 0, 'Ylw ': color.y || 0, Blck: color.k || 0 };
     }
     else if ('l' in color) {
-        return { Lmnc: color.l || 0, 'A   ': color.a || 0, 'B   ': color.b || 0 };
+        return { _name: '', _classID: 'LABC', Lmnc: color.l || 0, 'A   ': color.a || 0, 'B   ': color.b || 0 };
     }
     else if ('k' in color) {
-        return { 'Gry ': color.k };
+        return { _name: '', _classID: 'GRYC', 'Gry ': color.k };
     }
     else {
         throw new Error('Invalid color value');
@@ -1541,6 +1655,10 @@ function unitsPercent(value) {
     return { units: 'Percent', value: Math.round((value || 0) * 100) };
 }
 exports.unitsPercent = unitsPercent;
+function unitsPercentF(value) {
+    return { units: 'Percent', value: (value || 0) * 100 };
+}
+exports.unitsPercentF = unitsPercentF;
 function unitsValue(x, key) {
     if (x == null)
         return { units: 'Pixels', value: 0 };
@@ -1556,6 +1674,11 @@ function unitsValue(x, key) {
     return { units: units, value: value };
 }
 exports.unitsValue = unitsValue;
+function frac(_a) {
+    var numerator = _a.numerator, denominator = _a.denominator;
+    return { numerator: numerator, denominator: denominator };
+}
+exports.frac = frac;
 exports.textGridding = (0, helpers_1.createEnum)('textGridding', 'none', {
     none: 'None',
     round: 'Rnd ',
@@ -1677,6 +1800,7 @@ exports.ClrS = (0, helpers_1.createEnum)('ClrS', 'rgb', {
     rgb: 'RGBC',
     hsb: 'HSBl',
     lab: 'LbCl',
+    hsl: 'HSLC',
 });
 exports.FStl = (0, helpers_1.createEnum)('FStl', 'outside', {
     outside: 'OutF',
@@ -1723,4 +1847,140 @@ exports.strokeStyleLineAlignment = (0, helpers_1.createEnum)('strokeStyleLineAli
     center: 'strokeStyleAlignCenter',
     outside: 'strokeStyleAlignOutside',
 });
+exports.BlrM = (0, helpers_1.createEnum)('BlrM', 'ispinmage', {
+    spin: 'Spn ',
+    zoom: 'Zm  ',
+});
+exports.BlrQ = (0, helpers_1.createEnum)('BlrQ', 'good', {
+    draft: 'Drft',
+    good: 'Gd  ',
+    best: 'Bst ',
+});
+exports.SmBM = (0, helpers_1.createEnum)('SmBM', 'normal', {
+    normal: 'SBMN',
+    'edge only': 'SBME',
+    'overlay edge': 'SBMO',
+});
+exports.SmBQ = (0, helpers_1.createEnum)('SmBQ', 'medium', {
+    low: 'SBQL',
+    medium: 'SBQM',
+    high: 'SBQH',
+});
+exports.DspM = (0, helpers_1.createEnum)('DspM', 'stretch to fit', {
+    'stretch to fit': 'StrF',
+    'tile': 'Tile',
+});
+exports.UndA = (0, helpers_1.createEnum)('UndA', 'repeat edge pixels', {
+    'wrap around': 'WrpA',
+    'repeat edge pixels': 'RptE',
+});
+exports.Cnvr = (0, helpers_1.createEnum)('Cnvr', 'rectangular to polar', {
+    'rectangular to polar': 'RctP',
+    'polar to rectangular': 'PlrR',
+});
+exports.RplS = (0, helpers_1.createEnum)('RplS', 'medium', {
+    small: 'Sml ',
+    medium: 'Mdm ',
+    large: 'Lrg ',
+});
+exports.SphM = (0, helpers_1.createEnum)('SphM', 'normal', {
+    'normal': 'Nrml',
+    'horizontal only': 'HrzO',
+    'vertical only': 'VrtO',
+});
+exports.Wvtp = (0, helpers_1.createEnum)('Wvtp', 'sine', {
+    sine: 'WvSn',
+    triangle: 'WvTr',
+    square: 'WvSq',
+});
+exports.ZZTy = (0, helpers_1.createEnum)('ZZTy', 'pond ripples', {
+    'around center': 'ArnC',
+    'out from center': 'OtFr',
+    'pond ripples': 'PndR',
+});
+exports.Dstr = (0, helpers_1.createEnum)('Dstr', 'uniform', {
+    uniform: 'Unfr',
+    gaussian: 'Gsn ',
+});
+exports.Chnl = (0, helpers_1.createEnum)('Chnl', 'composite', {
+    red: 'Rd  ',
+    green: 'Grn ',
+    blue: 'Bl  ',
+    composite: 'Cmps',
+});
+exports.MztT = (0, helpers_1.createEnum)('MztT', 'fine dots', {
+    'fine dots': 'FnDt',
+    'medium dots': 'MdmD',
+    'grainy dots': 'GrnD',
+    'coarse dots': 'CrsD',
+    'short lines': 'ShrL',
+    'medium lines': 'MdmL',
+    'long lines': 'LngL',
+    'short strokes': 'ShSt',
+    'medium strokes': 'MdmS',
+    'long strokes': 'LngS',
+});
+exports.Lns = (0, helpers_1.createEnum)('Lns ', '50-300mm zoom', {
+    '50-300mm zoom': 'Zm  ',
+    '32mm prime': 'Nkn ',
+    '105mm prime': 'Nkn1',
+    'movie prime': 'PnVs',
+});
+exports.blurType = (0, helpers_1.createEnum)('blurType', 'gaussian blur', {
+    'gaussian blur': 'GsnB',
+    'lens blur': 'lensBlur',
+    'motion blur': 'MtnB',
+});
+exports.DfsM = (0, helpers_1.createEnum)('DfsM', 'normal', {
+    'normal': 'Nrml',
+    'darken only': 'DrkO',
+    'lighten only': 'LghO',
+    'anisotropic': 'anisotropic',
+});
+exports.ExtT = (0, helpers_1.createEnum)('ExtT', 'blocks', {
+    blocks: 'Blks',
+    pyramids: 'Pyrm',
+});
+exports.ExtR = (0, helpers_1.createEnum)('ExtR', 'random', {
+    random: 'Rndm',
+    'level-based': 'LvlB',
+});
+exports.FlCl = (0, helpers_1.createEnum)('FlCl', 'background color', {
+    'background color': 'FlBc',
+    'foreground color': 'FlFr',
+    'inverse image': 'FlIn',
+    'unaltered image': 'FlSm',
+});
+exports.CntE = (0, helpers_1.createEnum)('CntE', 'upper', {
+    lower: 'Lwr ',
+    upper: 'Upr ',
+});
+exports.WndM = (0, helpers_1.createEnum)('WndM', 'wind', {
+    wind: 'Wnd ',
+    blast: 'Blst',
+    stagger: 'Stgr',
+});
+exports.Drct = (0, helpers_1.createEnum)('Drct', 'from the right', {
+    left: 'Left',
+    right: 'Rght',
+});
+exports.IntE = (0, helpers_1.createEnum)('IntE', 'odd lines', {
+    'odd lines': 'ElmO',
+    'even lines': 'ElmE',
+});
+exports.IntC = (0, helpers_1.createEnum)('IntC', 'interpolation', {
+    duplication: 'CrtD',
+    interpolation: 'CrtI',
+});
+exports.FlMd = (0, helpers_1.createEnum)('FlMd', 'wrap around', {
+    'set to transparent': 'Bckg',
+    'repeat edge pixels': 'Rpt ',
+    'wrap around': 'Wrp ',
+});
+exports.prjM = (0, helpers_1.createEnum)('prjM', 'fisheye', {
+    'fisheye': 'fisP',
+    'perspective': 'perP',
+    'auto': 'auto',
+    'full spherical': 'fusP',
+});
 //# sourceMappingURL=descriptor.js.map