@loaders.gl/geotiff 4.0.0-alpha.12 → 4.0.0-alpha.14
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.
|
@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.fromString = fromString;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
-
var _fastXmlParser =
|
|
9
|
+
var _fastXmlParser = require("fast-xml-parser");
|
|
10
10
|
var _tiffUtils = require("../utils/tiff-utils");
|
|
11
11
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
12
12
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
13
|
-
var
|
|
13
|
+
var xmlParser = new _fastXmlParser.XMLParser({
|
|
14
14
|
attributeNamePrefix: '',
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
attributesGroupName: 'attr',
|
|
16
|
+
parseTagValue: true,
|
|
17
17
|
parseAttributeValue: true,
|
|
18
18
|
ignoreAttributes: false
|
|
19
|
-
};
|
|
19
|
+
});
|
|
20
20
|
var parse = function parse(str) {
|
|
21
|
-
return
|
|
21
|
+
return xmlParser.parse(str);
|
|
22
22
|
};
|
|
23
23
|
function fromString(str) {
|
|
24
24
|
var res = parse(str);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"omexml.js","names":["_fastXmlParser","
|
|
1
|
+
{"version":3,"file":"omexml.js","names":["_fastXmlParser","require","_tiffUtils","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","xmlParser","XMLParser","attributeNamePrefix","attributesGroupName","parseTagValue","parseAttributeValue","ignoreAttributes","parse","str","fromString","res","OME","Error","ensureArray","Image","map","img","Channels","Pixels","Channel","c","attr","Color","intToRgba","_img$AquisitionDate","AquisitionDate","_img$Description","Description","image","format","sizes","name","size","concat","unit","join","SizeX","SizeY","Type","SizeZ","SizeT","SizeC"],"sources":["../../../../src/lib/ome/omexml.ts"],"sourcesContent":["import {XMLParser} from 'fast-xml-parser';\nimport {ensureArray, intToRgba} from '../utils/tiff-utils';\n\n// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.\nconst xmlParser = new XMLParser({\n // Nests attributes withtout prefix under 'attr' key for each node\n attributeNamePrefix: '',\n attributesGroupName: 'attr',\n\n // Parses numbers for both attributes and nodes\n parseTagValue: true,\n parseAttributeValue: true,\n\n // Forces attributes to be parsed\n ignoreAttributes: false\n});\n\nconst parse = (str: string): Root => xmlParser.parse(str);\n\nexport function fromString(str: string) {\n const res = parse(str);\n if (!res.OME) {\n throw Error('Failed to parse OME-XML metadata.');\n }\n return ensureArray(res.OME.Image).map((img) => {\n const Channels = ensureArray(img.Pixels.Channel).map((c) => {\n if ('Color' in c.attr) {\n return {...c.attr, Color: intToRgba(c.attr.Color)};\n }\n return {...c.attr};\n });\n const {AquisitionDate = '', Description = ''} = img;\n const image = {\n ...img.attr,\n AquisitionDate,\n Description,\n Pixels: {\n ...img.Pixels.attr,\n Channels\n }\n };\n return {\n ...image,\n format() {\n const {Pixels} = image;\n\n const sizes = (['X', 'Y', 'Z'] as const)\n .map((name) => {\n const size = Pixels[`PhysicalSize${name}` as const];\n const unit = Pixels[`PhysicalSize${name}Unit` as const];\n return size && unit ? `${size} ${unit}` : '-';\n })\n .join(' x ');\n\n return {\n 'Acquisition Date': image.AquisitionDate,\n 'Dimensions (XY)': `${Pixels.SizeX} x ${Pixels.SizeY}`,\n 'Pixels Type': Pixels.Type,\n 'Pixels Size (XYZ)': sizes,\n 'Z-sections/Timepoints': `${Pixels.SizeZ} x ${Pixels.SizeT}`,\n Channels: Pixels.SizeC\n };\n }\n };\n });\n}\n\nexport type OMEXML = ReturnType<typeof fromString>;\nexport type DimensionOrder = 'XYZCT' | 'XYZTC' | 'XYCTZ' | 'XYCZT' | 'XYTCZ' | 'XYTZC';\n\n// Structure of node is determined by the PARSER_OPTIONS.\ntype Node<T, A> = T & {attr: A};\ntype Attrs<Fields extends string, T = string> = {[K in Fields]: T};\n\ntype OMEAttrs = Attrs<'xmlns' | 'xmlns:xsi' | 'xsi:schemaLocation'>;\ntype OME = Node<{Insturment: Insturment; Image: Image | Image[]}, OMEAttrs>;\n\ntype Insturment = Node<\n {Objective: Node<{}, Attrs<'ID' | 'Model' | 'NominalMagnification'>>},\n Attrs<'ID'>\n>;\n\ninterface ImageNodes {\n AquisitionDate?: string;\n Description?: string;\n Pixels: Pixels;\n InstrumentRef: Node<{}, {ID: string}>;\n ObjectiveSettings: Node<{}, {ID: string}>;\n}\ntype Image = Node<ImageNodes, Attrs<'ID' | 'Name'>>;\n\ntype PixelType =\n | 'int8'\n | 'int16'\n | 'int32'\n | 'uint8'\n | 'uint16'\n | 'uint32'\n | 'float'\n | 'bit'\n | 'double'\n | 'complex'\n | 'double-complex';\n\nexport type UnitsLength =\n | 'Ym'\n | 'Zm'\n | 'Em'\n | 'Pm'\n | 'Tm'\n | 'Gm'\n | 'Mm'\n | 'km'\n | 'hm'\n | 'dam'\n | 'm'\n | 'dm'\n | 'cm'\n | 'mm'\n | 'µm'\n | 'nm'\n | 'pm'\n | 'fm'\n | 'am'\n | 'zm'\n | 'ym'\n | 'Å'\n | 'thou'\n | 'li'\n | 'in'\n | 'ft'\n | 'yd'\n | 'mi'\n | 'ua'\n | 'ly'\n | 'pc'\n | 'pt'\n | 'pixel'\n | 'reference frame';\n\ntype PhysicalSize<Name extends string> = `PhysicalSize${Name}`;\ntype PhysicalSizeUnit<Name extends string> = `PhysicalSize${Name}Unit`;\ntype Size<Names extends string> = `Size${Names}`;\n\ntype PixelAttrs = Attrs<\n PhysicalSize<'X' | 'Y' | 'Z'> | 'SignificantBits' | Size<'T' | 'C' | 'Z' | 'Y' | 'X'>,\n number\n> &\n Attrs<PhysicalSizeUnit<'X' | 'Y' | 'Z'>, UnitsLength> &\n Attrs<'BigEndian' | 'Interleaved', boolean> & {\n ID: string;\n DimensionOrder: DimensionOrder;\n Type: PixelType;\n };\n\ntype Pixels = Node<\n {\n Channel: Channel | Channel[];\n TiffData: Node<{}, Attrs<'IFD' | 'PlaneCount'>>;\n },\n PixelAttrs\n>;\n\ntype ChannelAttrs =\n | {\n ID: string;\n SamplesPerPixel: number;\n Name?: string;\n }\n | {\n ID: string;\n SamplesPerPixel: number;\n Name?: string;\n Color: number;\n };\n\ntype Channel = Node<{}, ChannelAttrs>;\n\ntype Root = {OME: OME};\n"],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { XMLParser } from 'fast-xml-parser';
|
|
2
2
|
import { ensureArray, intToRgba } from '../utils/tiff-utils';
|
|
3
|
-
const
|
|
3
|
+
const xmlParser = new XMLParser({
|
|
4
4
|
attributeNamePrefix: '',
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
attributesGroupName: 'attr',
|
|
6
|
+
parseTagValue: true,
|
|
7
7
|
parseAttributeValue: true,
|
|
8
8
|
ignoreAttributes: false
|
|
9
|
-
};
|
|
10
|
-
const parse = str =>
|
|
9
|
+
});
|
|
10
|
+
const parse = str => xmlParser.parse(str);
|
|
11
11
|
export function fromString(str) {
|
|
12
12
|
const res = parse(str);
|
|
13
13
|
if (!res.OME) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"omexml.js","names":["
|
|
1
|
+
{"version":3,"file":"omexml.js","names":["XMLParser","ensureArray","intToRgba","xmlParser","attributeNamePrefix","attributesGroupName","parseTagValue","parseAttributeValue","ignoreAttributes","parse","str","fromString","res","OME","Error","Image","map","img","Channels","Pixels","Channel","c","attr","Color","AquisitionDate","Description","image","format","sizes","name","size","concat","unit","join","SizeX","SizeY","Type","SizeZ","SizeT","SizeC"],"sources":["../../../../src/lib/ome/omexml.ts"],"sourcesContent":["import {XMLParser} from 'fast-xml-parser';\nimport {ensureArray, intToRgba} from '../utils/tiff-utils';\n\n// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.\nconst xmlParser = new XMLParser({\n // Nests attributes withtout prefix under 'attr' key for each node\n attributeNamePrefix: '',\n attributesGroupName: 'attr',\n\n // Parses numbers for both attributes and nodes\n parseTagValue: true,\n parseAttributeValue: true,\n\n // Forces attributes to be parsed\n ignoreAttributes: false\n});\n\nconst parse = (str: string): Root => xmlParser.parse(str);\n\nexport function fromString(str: string) {\n const res = parse(str);\n if (!res.OME) {\n throw Error('Failed to parse OME-XML metadata.');\n }\n return ensureArray(res.OME.Image).map((img) => {\n const Channels = ensureArray(img.Pixels.Channel).map((c) => {\n if ('Color' in c.attr) {\n return {...c.attr, Color: intToRgba(c.attr.Color)};\n }\n return {...c.attr};\n });\n const {AquisitionDate = '', Description = ''} = img;\n const image = {\n ...img.attr,\n AquisitionDate,\n Description,\n Pixels: {\n ...img.Pixels.attr,\n Channels\n }\n };\n return {\n ...image,\n format() {\n const {Pixels} = image;\n\n const sizes = (['X', 'Y', 'Z'] as const)\n .map((name) => {\n const size = Pixels[`PhysicalSize${name}` as const];\n const unit = Pixels[`PhysicalSize${name}Unit` as const];\n return size && unit ? `${size} ${unit}` : '-';\n })\n .join(' x ');\n\n return {\n 'Acquisition Date': image.AquisitionDate,\n 'Dimensions (XY)': `${Pixels.SizeX} x ${Pixels.SizeY}`,\n 'Pixels Type': Pixels.Type,\n 'Pixels Size (XYZ)': sizes,\n 'Z-sections/Timepoints': `${Pixels.SizeZ} x ${Pixels.SizeT}`,\n Channels: Pixels.SizeC\n };\n }\n };\n });\n}\n\nexport type OMEXML = ReturnType<typeof fromString>;\nexport type DimensionOrder = 'XYZCT' | 'XYZTC' | 'XYCTZ' | 'XYCZT' | 'XYTCZ' | 'XYTZC';\n\n// Structure of node is determined by the PARSER_OPTIONS.\ntype Node<T, A> = T & {attr: A};\ntype Attrs<Fields extends string, T = string> = {[K in Fields]: T};\n\ntype OMEAttrs = Attrs<'xmlns' | 'xmlns:xsi' | 'xsi:schemaLocation'>;\ntype OME = Node<{Insturment: Insturment; Image: Image | Image[]}, OMEAttrs>;\n\ntype Insturment = Node<\n {Objective: Node<{}, Attrs<'ID' | 'Model' | 'NominalMagnification'>>},\n Attrs<'ID'>\n>;\n\ninterface ImageNodes {\n AquisitionDate?: string;\n Description?: string;\n Pixels: Pixels;\n InstrumentRef: Node<{}, {ID: string}>;\n ObjectiveSettings: Node<{}, {ID: string}>;\n}\ntype Image = Node<ImageNodes, Attrs<'ID' | 'Name'>>;\n\ntype PixelType =\n | 'int8'\n | 'int16'\n | 'int32'\n | 'uint8'\n | 'uint16'\n | 'uint32'\n | 'float'\n | 'bit'\n | 'double'\n | 'complex'\n | 'double-complex';\n\nexport type UnitsLength =\n | 'Ym'\n | 'Zm'\n | 'Em'\n | 'Pm'\n | 'Tm'\n | 'Gm'\n | 'Mm'\n | 'km'\n | 'hm'\n | 'dam'\n | 'm'\n | 'dm'\n | 'cm'\n | 'mm'\n | 'µm'\n | 'nm'\n | 'pm'\n | 'fm'\n | 'am'\n | 'zm'\n | 'ym'\n | 'Å'\n | 'thou'\n | 'li'\n | 'in'\n | 'ft'\n | 'yd'\n | 'mi'\n | 'ua'\n | 'ly'\n | 'pc'\n | 'pt'\n | 'pixel'\n | 'reference frame';\n\ntype PhysicalSize<Name extends string> = `PhysicalSize${Name}`;\ntype PhysicalSizeUnit<Name extends string> = `PhysicalSize${Name}Unit`;\ntype Size<Names extends string> = `Size${Names}`;\n\ntype PixelAttrs = Attrs<\n PhysicalSize<'X' | 'Y' | 'Z'> | 'SignificantBits' | Size<'T' | 'C' | 'Z' | 'Y' | 'X'>,\n number\n> &\n Attrs<PhysicalSizeUnit<'X' | 'Y' | 'Z'>, UnitsLength> &\n Attrs<'BigEndian' | 'Interleaved', boolean> & {\n ID: string;\n DimensionOrder: DimensionOrder;\n Type: PixelType;\n };\n\ntype Pixels = Node<\n {\n Channel: Channel | Channel[];\n TiffData: Node<{}, Attrs<'IFD' | 'PlaneCount'>>;\n },\n PixelAttrs\n>;\n\ntype ChannelAttrs =\n | {\n ID: string;\n SamplesPerPixel: number;\n Name?: string;\n }\n | {\n ID: string;\n SamplesPerPixel: number;\n Name?: string;\n Color: number;\n };\n\ntype Channel = Node<{}, ChannelAttrs>;\n\ntype Root = {OME: OME};\n"],"mappings":"AAAA,SAAQA,SAAS,QAAO,iBAAiB;AACzC,SAAQC,WAAW,EAAEC,SAAS,QAAO,qBAAqB;AAG1D,MAAMC,SAAS,GAAG,IAAIH,SAAS,CAAC;EAE9BI,mBAAmB,EAAE,EAAE;EACvBC,mBAAmB,EAAE,MAAM;EAG3BC,aAAa,EAAE,IAAI;EACnBC,mBAAmB,EAAE,IAAI;EAGzBC,gBAAgB,EAAE;AACpB,CAAC,CAAC;AAEF,MAAMC,KAAK,GAAIC,GAAW,IAAWP,SAAS,CAACM,KAAK,CAACC,GAAG,CAAC;AAEzD,OAAO,SAASC,UAAUA,CAACD,GAAW,EAAE;EACtC,MAAME,GAAG,GAAGH,KAAK,CAACC,GAAG,CAAC;EACtB,IAAI,CAACE,GAAG,CAACC,GAAG,EAAE;IACZ,MAAMC,KAAK,CAAC,mCAAmC,CAAC;EAClD;EACA,OAAOb,WAAW,CAACW,GAAG,CAACC,GAAG,CAACE,KAAK,CAAC,CAACC,GAAG,CAAEC,GAAG,IAAK;IAC7C,MAAMC,QAAQ,GAAGjB,WAAW,CAACgB,GAAG,CAACE,MAAM,CAACC,OAAO,CAAC,CAACJ,GAAG,CAAEK,CAAC,IAAK;MAC1D,IAAI,OAAO,IAAIA,CAAC,CAACC,IAAI,EAAE;QACrB,OAAO;UAAC,GAAGD,CAAC,CAACC,IAAI;UAAEC,KAAK,EAAErB,SAAS,CAACmB,CAAC,CAACC,IAAI,CAACC,KAAK;QAAC,CAAC;MACpD;MACA,OAAO;QAAC,GAAGF,CAAC,CAACC;MAAI,CAAC;IACpB,CAAC,CAAC;IACF,MAAM;MAACE,cAAc,GAAG,EAAE;MAAEC,WAAW,GAAG;IAAE,CAAC,GAAGR,GAAG;IACnD,MAAMS,KAAK,GAAG;MACZ,GAAGT,GAAG,CAACK,IAAI;MACXE,cAAc;MACdC,WAAW;MACXN,MAAM,EAAE;QACN,GAAGF,GAAG,CAACE,MAAM,CAACG,IAAI;QAClBJ;MACF;IACF,CAAC;IACD,OAAO;MACL,GAAGQ,KAAK;MACRC,MAAMA,CAAA,EAAG;QACP,MAAM;UAACR;QAAM,CAAC,GAAGO,KAAK;QAEtB,MAAME,KAAK,GAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAC3BZ,GAAG,CAAEa,IAAI,IAAK;UACb,MAAMC,IAAI,GAAGX,MAAM,gBAAAY,MAAA,CAAgBF,IAAI,EAAY;UACnD,MAAMG,IAAI,GAAGb,MAAM,gBAAAY,MAAA,CAAgBF,IAAI,UAAgB;UACvD,OAAOC,IAAI,IAAIE,IAAI,MAAAD,MAAA,CAAMD,IAAI,OAAAC,MAAA,CAAIC,IAAI,IAAK,GAAG;QAC/C,CAAC,CAAC,CACDC,IAAI,CAAC,KAAK,CAAC;QAEd,OAAO;UACL,kBAAkB,EAAEP,KAAK,CAACF,cAAc;UACxC,iBAAiB,KAAAO,MAAA,CAAKZ,MAAM,CAACe,KAAK,SAAAH,MAAA,CAAMZ,MAAM,CAACgB,KAAK,CAAE;UACtD,aAAa,EAAEhB,MAAM,CAACiB,IAAI;UAC1B,mBAAmB,EAAER,KAAK;UAC1B,uBAAuB,KAAAG,MAAA,CAAKZ,MAAM,CAACkB,KAAK,SAAAN,MAAA,CAAMZ,MAAM,CAACmB,KAAK,CAAE;UAC5DpB,QAAQ,EAAEC,MAAM,CAACoB;QACnB,CAAC;MACH;IACF,CAAC;EACH,CAAC,CAAC;AACJ"}
|
package/dist/lib/ome/omexml.js
CHANGED
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.fromString = void 0;
|
|
7
|
-
const fast_xml_parser_1 =
|
|
4
|
+
const fast_xml_parser_1 = require("fast-xml-parser");
|
|
8
5
|
const tiff_utils_1 = require("../utils/tiff-utils");
|
|
9
6
|
// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.
|
|
10
|
-
const
|
|
7
|
+
const xmlParser = new fast_xml_parser_1.XMLParser({
|
|
11
8
|
// Nests attributes withtout prefix under 'attr' key for each node
|
|
12
9
|
attributeNamePrefix: '',
|
|
13
|
-
|
|
10
|
+
attributesGroupName: 'attr',
|
|
14
11
|
// Parses numbers for both attributes and nodes
|
|
15
|
-
|
|
12
|
+
parseTagValue: true,
|
|
16
13
|
parseAttributeValue: true,
|
|
17
14
|
// Forces attributes to be parsed
|
|
18
15
|
ignoreAttributes: false
|
|
19
|
-
};
|
|
20
|
-
const parse = (str) =>
|
|
16
|
+
});
|
|
17
|
+
const parse = (str) => xmlParser.parse(str);
|
|
21
18
|
function fromString(str) {
|
|
22
19
|
const res = parse(str);
|
|
23
20
|
if (!res.OME) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/geotiff",
|
|
3
|
-
"version": "4.0.0-alpha.
|
|
3
|
+
"version": "4.0.0-alpha.14",
|
|
4
4
|
"description": "Framework-independent loaders for tiff and geotiff",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"geotiff": "ilan-gold/geotiff.js#ilan-gold/viv_094"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"fast-xml-parser": "^
|
|
39
|
+
"fast-xml-parser": "^4.2.5",
|
|
40
40
|
"geotiff": "^1.0.4"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "dd885592142ad9c26fc38e0eb0a711cf4806345a"
|
|
43
43
|
}
|
package/src/lib/ome/omexml.ts
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {XMLParser} from 'fast-xml-parser';
|
|
2
2
|
import {ensureArray, intToRgba} from '../utils/tiff-utils';
|
|
3
3
|
|
|
4
4
|
// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.
|
|
5
|
-
const
|
|
5
|
+
const xmlParser = new XMLParser({
|
|
6
6
|
// Nests attributes withtout prefix under 'attr' key for each node
|
|
7
7
|
attributeNamePrefix: '',
|
|
8
|
-
|
|
8
|
+
attributesGroupName: 'attr',
|
|
9
9
|
|
|
10
10
|
// Parses numbers for both attributes and nodes
|
|
11
|
-
|
|
11
|
+
parseTagValue: true,
|
|
12
12
|
parseAttributeValue: true,
|
|
13
13
|
|
|
14
14
|
// Forces attributes to be parsed
|
|
15
15
|
ignoreAttributes: false
|
|
16
|
-
};
|
|
16
|
+
});
|
|
17
17
|
|
|
18
|
-
const parse = (str: string): Root =>
|
|
18
|
+
const parse = (str: string): Root => xmlParser.parse(str);
|
|
19
19
|
|
|
20
20
|
export function fromString(str: string) {
|
|
21
21
|
const res = parse(str);
|