@tak-ps/node-cot 12.3.0 → 12.4.0

package/CHANGELOG.md

@@ -12,6 +12,11 @@
 
 ### Pending Fixed
 
+### v12.4.0 - 2024-09-30
+
+- :rocket: Use internal XMLDocument class as base for Iconset/Basemap
+- :tada: Add initial Iconset Types
+
 ### v12.3.0 - 2024-09-18
 
 - :bug: Support parsing CoTs with empty/non-populated video tag

package/dist/index.js

@@ -6,6 +6,7 @@ export * from './lib/chat.js';
 export * from './lib/fileshare.js';
 export * from './lib/force-delete.js';
 export * from './lib/data-package.js';
-export * from './lib/basemap.js';
+export * from './lib/xml/basemap.js';
+export * from './lib/xml/iconset.js';
 export default CoT;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAC7C,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAA;AACpD,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,kBAAkB,CAAA;AAEhC,eAAe,GAAG,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAC7C,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAA;AACpD,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AAEpC,eAAe,GAAG,CAAC"}

package/dist/lib/types/basemap.js

@@ -13,7 +13,9 @@ export const BasemapMapSource = Type.Object({
         _text: Type.String()
     }),
     tileUpdate: Type.Optional(Type.Object({
-        _text: Type.String()
+        _text: Type.String({
+            default: 'None'
+        })
     })),
     url: Type.Optional(Type.Object({
         _text: Type.String()

package/dist/lib/types/basemap.js.map

@@ -1 +1 @@
-{"version":3,"file":"basemap.js","sourceRoot":"","sources":["../../../lib/types/basemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC;IACxC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;QACd,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;QACjB,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE;KACxB,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;QACjB,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE;KACxB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC;QAClB,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC;IACF,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC,CAAC;IACH,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAC3B,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC,CAAC;IACH,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QACvC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC,CAAC;CACN,CAAC,CAAA;AAEF,eAAe,IAAI,CAAC,MAAM,CAAC;IACvB,eAAe,EAAE,gBAAgB;CACpC,CAAC,CAAA"}
+{"version":3,"file":"basemap.js","sourceRoot":"","sources":["../../../lib/types/basemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC;IACxC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;QACd,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;QACjB,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE;KACxB,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;QACjB,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE;KACxB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC;QAClB,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC;IACF,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,OAAO,EAAE,MAAM;SAClB,CAAC;KACL,CAAC,CAAC;IACH,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAC3B,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC,CAAC;IACH,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QACvC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;KACvB,CAAC,CAAC;CACN,CAAC,CAAA;AAEF,eAAe,IAAI,CAAC,MAAM,CAAC;IACvB,eAAe,EAAE,gBAAgB;CACpC,CAAC,CAAA"}

package/dist/lib/types/iconset.js

@@ -0,0 +1,18 @@
+import { Type } from '@sinclair/typebox';
+export const IconsetAttributes = Type.Object({
+    uid: Type.String(),
+    version: Type.String(),
+    name: Type.String(),
+    default_group: Type.Optional(Type.String()),
+    default_friendly: Type.Optional(Type.String()),
+    default_hostile: Type.Optional(Type.String()),
+    default_neutral: Type.Optional(Type.String()),
+    default_unknown: Type.Optional(Type.String()),
+    skip_resize: Type.Boolean({ default: false }),
+});
+export default Type.Object({
+    iconset: Type.Object({
+        _attributes: IconsetAttributes
+    })
+});
+//# sourceMappingURL=iconset.js.map

package/dist/lib/types/iconset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"iconset.js","sourceRoot":"","sources":["../../../lib/types/iconset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC;IACzC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;IAClB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;IACtB,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;IACnB,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC3C,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC9C,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC7C,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC7C,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC7C,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;CAChD,CAAC,CAAA;AAEF,eAAe,IAAI,CAAC,MAAM,CAAC;IACvB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;QACjB,WAAW,EAAE,iBAAiB;KACjC,CAAC;CACL,CAAC,CAAA"}

package/dist/lib/xml/basemap.js

@@ -0,0 +1,22 @@
+import XMLDocument from '../xml-document.js';
+import BasemapSchema from '../types/basemap.js';
+import AJV from 'ajv';
+const checkBasemap = (new AJV({
+    allErrors: true,
+    coerceTypes: true,
+    allowUnionTypes: true
+}))
+    .compile(BasemapSchema);
+/**
+ * Helper class for creating and parsing Basemap XML documents
+ */
+export class Basemap extends XMLDocument {
+    /**
+     * Return a Basemap from a string XML representation
+     */
+    static parse(input) {
+        const basemap = super.check(input, checkBasemap);
+        return new Basemap(basemap);
+    }
+}
+//# sourceMappingURL=basemap.js.map

package/dist/lib/xml/basemap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"basemap.js","sourceRoot":"","sources":["../../../lib/xml/basemap.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAE7C,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,YAAY,GAAG,CAAC,IAAI,GAAG,CAAC;IAC1B,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,IAAI;CACxB,CAAC,CAAC;KACE,OAAO,CAAC,aAAa,CAAC,CAAC;AAI5B;;GAEG;AACH,MAAM,OAAO,OAAQ,SAAQ,WAAwB;IACjD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,KAAa;QACtB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAc,KAAK,EAAE,YAAY,CAAC,CAAC;QAC9D,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;CACJ"}

package/dist/lib/xml/iconset.js

@@ -0,0 +1,22 @@
+import XMLDocument from '../xml-document.js';
+import IconsetSchema from '../types/iconset.js';
+import AJV from 'ajv';
+const checkIconset = (new AJV({
+    allErrors: true,
+    coerceTypes: true,
+    allowUnionTypes: true
+}))
+    .compile(IconsetSchema);
+/**
+ * Helper class for creating and parsing Iconset XML documents
+ */
+export class Iconset extends XMLDocument {
+    /**
+     * Return an Iconset from a string XML representation
+     */
+    static parse(input) {
+        const basemap = super.check(input, checkIconset);
+        return new Iconset(basemap);
+    }
+}
+//# sourceMappingURL=iconset.js.map

package/dist/lib/xml/iconset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"iconset.js","sourceRoot":"","sources":["../../../lib/xml/iconset.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAE7C,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,YAAY,GAAG,CAAC,IAAI,GAAG,CAAC;IAC1B,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,IAAI;CACxB,CAAC,CAAC;KACE,OAAO,CAAC,aAAa,CAAC,CAAC;AAI5B;;GAEG;AACH,MAAM,OAAO,OAAQ,SAAQ,WAAwB;IACjD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,KAAa;QACtB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAc,KAAK,EAAE,YAAY,CAAC,CAAC;QAC9D,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;CACJ"}

package/dist/lib/xml-document.js

@@ -0,0 +1,23 @@
+import Err from '@openaddresses/batch-error';
+import xmljs from 'xml-js';
+/**
+ * Core XML Document support used for XML fortatted DataPackages documents
+ * such as Iconsets or Basemaps
+ */
+export default class XMLDocument {
+    raw;
+    constructor(raw) {
+        this.raw = raw;
+    }
+    static check(input, check) {
+        const xml = xmljs.xml2js(input, { compact: true });
+        check(xml);
+        if (check.errors)
+            throw new Err(400, null, `${check.errors[0].message} (${check.errors[0].instancePath})`);
+        return xml;
+    }
+    to_xml() {
+        return xmljs.js2xml(this.raw, { compact: true });
+    }
+}
+//# sourceMappingURL=xml-document.js.map

package/dist/lib/xml-document.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xml-document.js","sourceRoot":"","sources":["../../lib/xml-document.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,KAAK,MAAM,QAAQ,CAAC;AAE3B;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW;IAC5B,GAAG,CAAI;IAEP,YAAY,GAAM;QACd,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,KAAK,CAAI,KAAa,EAAE,KAAgC;QAC3D,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAElD,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,KAAK,CAAC,MAAM;YAAE,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC;QAE3G,OAAO,GAAQ,CAAC;IACpB,CAAC;IAED,MAAM;QACF,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAoB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;CACJ"}

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@tak-ps/node-cot",
     "type": "module",
-    "version": "12.3.0",
+    "version": "12.4.0",
     "description": "Lightweight JavaScript library for parsing and manipulating TAK messages",
     "author": "Nick Ingalls <nick@ingalls.ca>",
     "main": "dist/index.js",

package/dist/test/basemaps.test.js

@@ -7,7 +7,7 @@ for (const fixturename of await fs.readdir(new URL('./basemaps/', import.meta.ur
     test(`Basemap Test: ${fixturename}`, async (t) => {
         const fixture = String(await fs.readFile(path.join(path.parse(fileURLToPath(import.meta.url)).dir, 'basemaps/', fixturename)));
         const container = await Basemap.parse(fixture);
-        t.ok(container.basemap.customMapSource.name._text.length);
+        t.ok(container.raw.customMapSource.name._text.length);
         t.end();
     });
 }

package/dist/test/basemaps.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"basemaps.test.js","sourceRoot":"","sources":["../../test/basemaps.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,KAAK,MAAM,WAAW,IAAI,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAClF,IAAI,CAAC,iBAAiB,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/H,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE/C,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAEzD,CAAC,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"basemaps.test.js","sourceRoot":"","sources":["../../test/basemaps.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,KAAK,MAAM,WAAW,IAAI,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAClF,IAAI,CAAC,iBAAiB,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/H,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE/C,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAErD,CAAC,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../index.ts","../test/basemaps.test.ts","../test/chat.test.ts","../test/cot-fileshare.test.ts","../test/cot-itak.test.ts","../test/cot-mma.test.ts","../test/cot-range-and-bearing.test.ts","../test/cot-routes.test.ts","../test/cot-types.test.ts","../test/cot-uas-tool.test.ts","../test/cot_is.test.ts","../test/data-package.test.ts","../test/diff.test.ts","../test/flow-tags.test.ts","../test/force-delete.ts","../test/from_geojson.test.ts","../test/newlines.test.ts","../test/reversal-geojson.test.ts","../test/reversal-proto.test.ts","../test/stream.ts","../test/taskings-mission.test.ts","../test/util.test.ts","../test/validation.test.ts","../lib/basemap.ts","../lib/chat.ts","../lib/cot.ts","../lib/data-package.ts","../lib/fileshare.ts","../lib/force-delete.ts"],"version":"5.6.2"}
+{"root":["../index.ts","../test/basemaps.test.ts","../test/chat.test.ts","../test/cot-fileshare.test.ts","../test/cot-itak.test.ts","../test/cot-mma.test.ts","../test/cot-range-and-bearing.test.ts","../test/cot-routes.test.ts","../test/cot-types.test.ts","../test/cot-uas-tool.test.ts","../test/cot_is.test.ts","../test/data-package.test.ts","../test/diff.test.ts","../test/flow-tags.test.ts","../test/force-delete.ts","../test/from_geojson.test.ts","../test/newlines.test.ts","../test/reversal-geojson.test.ts","../test/reversal-proto.test.ts","../test/stream.ts","../test/taskings-mission.test.ts","../test/util.test.ts","../test/validation.test.ts","../lib/chat.ts","../lib/cot.ts","../lib/data-package.ts","../lib/fileshare.ts","../lib/force-delete.ts","../lib/xml-document.ts"],"version":"5.6.2"}

package/eslint.config.js

@@ -2,11 +2,11 @@ import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
 export default tseslint.config(
-  eslint.configs.recommended,
-  ...tseslint.configs.recommended,
-  {
-    "rules": {
-        "@typescript-eslint/no-explicit-any": "warn"
+    eslint.configs.recommended,
+    ...tseslint.configs.recommended,
+    {
+        "rules": {
+            "@typescript-eslint/no-explicit-any": "warn"
+        }
     }
-  }
 );

package/index.ts

@@ -6,6 +6,7 @@ export * from './lib/chat.js'
 export * from './lib/fileshare.js'
 export * from './lib/force-delete.js'
 export * from './lib/data-package.js'
-export * from './lib/basemap.js'
+export * from './lib/xml/basemap.js'
+export * from './lib/xml/iconset.js'
 
 export default CoT;

package/lib/types/basemap.ts

@@ -14,7 +14,9 @@ export const BasemapMapSource = Type.Object({
         _text: Type.String()
     }),
     tileUpdate: Type.Optional(Type.Object({
-        _text: Type.String()
+        _text: Type.String({
+            default: 'None'
+        })
     })),
     url: Type.Optional(Type.Object({
         _text: Type.String()

package/lib/types/iconset.ts

@@ -0,0 +1,19 @@
+import { Type } from '@sinclair/typebox';
+
+export const IconsetAttributes = Type.Object({
+    uid: Type.String(),
+    version: Type.String(),
+    name: Type.String(),
+    default_group: Type.Optional(Type.String()),
+    default_friendly: Type.Optional(Type.String()),
+    default_hostile: Type.Optional(Type.String()),
+    default_neutral: Type.Optional(Type.String()),
+    default_unknown: Type.Optional(Type.String()),
+    skip_resize: Type.Boolean({ default: false }),
+})
+
+export default Type.Object({
+    iconset: Type.Object({
+        _attributes: IconsetAttributes
+    })
+})

package/lib/xml/basemap.ts

@@ -0,0 +1,26 @@
+import XMLDocument from '../xml-document.js';
+import type { Static } from '@sinclair/typebox'
+import BasemapSchema from '../types/basemap.js';
+import AJV from 'ajv';
+
+const checkBasemap = (new AJV({
+    allErrors: true,
+    coerceTypes: true,
+    allowUnionTypes: true
+}))
+    .compile(BasemapSchema);
+
+type BasemapType = Static<typeof BasemapSchema>;
+
+/**
+ * Helper class for creating and parsing Basemap XML documents
+ */
+export class Basemap extends XMLDocument<BasemapType> {
+    /**
+     * Return a Basemap from a string XML representation
+     */
+    static parse(input: string): Basemap {
+        const basemap = super.check<BasemapType>(input, checkBasemap);
+        return new Basemap(basemap);
+    }
+}

package/lib/xml/iconset.ts

@@ -0,0 +1,26 @@
+import XMLDocument from '../xml-document.js';
+import type { Static } from '@sinclair/typebox'
+import IconsetSchema from '../types/iconset.js';
+import AJV from 'ajv';
+
+const checkIconset = (new AJV({
+    allErrors: true,
+    coerceTypes: true,
+    allowUnionTypes: true
+}))
+    .compile(IconsetSchema);
+
+type IconsetType = Static<typeof IconsetSchema>;
+
+/**
+ * Helper class for creating and parsing Iconset XML documents
+ */
+export class Iconset extends XMLDocument<IconsetType> {
+    /**
+     * Return an Iconset from a string XML representation
+     */
+    static parse(input: string): Iconset {
+        const basemap = super.check<IconsetType>(input, checkIconset);
+        return new Iconset(basemap);
+    }
+}

package/lib/xml-document.ts

@@ -0,0 +1,28 @@
+import Err from '@openaddresses/batch-error';
+import type { ValidateFunction } from 'ajv';
+import xmljs from 'xml-js';
+
+/**
+ * Core XML Document support used for XML fortatted DataPackages documents
+ * such as Iconsets or Basemaps
+ */
+export default class XMLDocument<T> {
+    raw: T;
+
+    constructor(raw: T) {
+        this.raw = raw;
+    }
+
+    static check<U>(input: string, check: ValidateFunction<unknown>): U {
+        const xml = xmljs.xml2js(input, { compact: true })
+
+        check(xml);
+        if (check.errors) throw new Err(400, null, `${check.errors[0].message} (${check.errors[0].instancePath})`);
+
+        return xml as U;
+    }
+
+    to_xml(): string {
+        return xmljs.js2xml(this.raw as xmljs.Element, { compact: true });
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@tak-ps/node-cot",
     "type": "module",
-    "version": "12.3.0",
+    "version": "12.4.0",
     "description": "Lightweight JavaScript library for parsing and manipulating TAK messages",
     "author": "Nick Ingalls <nick@ingalls.ca>",
     "main": "dist/index.js",

package/test/basemaps.test.ts

@@ -9,7 +9,7 @@ for (const fixturename of await fs.readdir(new URL('./basemaps/', import.meta.ur
         const fixture = String(await fs.readFile(path.join(path.parse(fileURLToPath(import.meta.url)).dir, 'basemaps/', fixturename)));
         const container = await Basemap.parse(fixture);
 
-        t.ok(container.basemap.customMapSource.name._text.length)
+        t.ok(container.raw.customMapSource.name._text.length)
 
         t.end();
     });

package/dist/lib/basemap.js

@@ -1,31 +0,0 @@
-import Err from '@openaddresses/batch-error';
-import BasemapType from './types/basemap.js';
-import xmljs from 'xml-js';
-import AJV from 'ajv';
-const checkBasemap = (new AJV({
-    allErrors: true,
-    coerceTypes: true,
-    allowUnionTypes: true
-}))
-    .compile(BasemapType);
-/**
- * Helper class for creating and parsing Basemap XML documents
- */
-export class Basemap {
-    basemap;
-    constructor(basemap) {
-        this.basemap = basemap;
-    }
-    /**
-     * Return a Basemap from a string XML representation
-     */
-    static async parse(input) {
-        const xml = xmljs.xml2js(input, { compact: true });
-        checkBasemap(xml);
-        if (checkBasemap.errors)
-            throw new Err(400, null, `${checkBasemap.errors[0].message} (${checkBasemap.errors[0].instancePath})`);
-        const basemap = xml;
-        return new Basemap(basemap);
-    }
-}
-//# sourceMappingURL=basemap.js.map

package/dist/lib/basemap.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"basemap.js","sourceRoot":"","sources":["../../lib/basemap.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,MAAM,QAAQ,CAAC;AAC3B,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,YAAY,GAAG,CAAC,IAAI,GAAG,CAAC;IAC1B,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,IAAI;CACxB,CAAC,CAAC;KACE,OAAO,CAAC,WAAW,CAAC,CAAC;AAE1B;;GAEG;AACH,MAAM,OAAO,OAAO;IAChB,OAAO,CAA6B;IAEpC,YAAY,OAAmC;QAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAa;QAC5B,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAElD,YAAY,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,YAAY,CAAC,MAAM;YAAE,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC;QAChI,MAAM,OAAO,GAAG,GAAiC,CAAC;QAElD,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;CACJ"}

package/lib/basemap.ts

@@ -1,36 +0,0 @@
-import type { Static } from '@sinclair/typebox'
-import Err from '@openaddresses/batch-error';
-import BasemapType from './types/basemap.js';
-import xmljs from 'xml-js';
-import AJV from 'ajv';
-
-const checkBasemap = (new AJV({
-    allErrors: true,
-    coerceTypes: true,
-    allowUnionTypes: true
-}))
-    .compile(BasemapType);
-
-/**
- * Helper class for creating and parsing Basemap XML documents
- */
-export class Basemap {
-    basemap: Static<typeof BasemapType>;
-
-    constructor(basemap: Static<typeof BasemapType>) {
-        this.basemap = basemap;
-    }
-
-    /**
-     * Return a Basemap from a string XML representation
-     */
-    static async parse(input: string): Promise<Basemap> {
-        const xml = xmljs.xml2js(input, { compact: true })
-
-        checkBasemap(xml);
-        if (checkBasemap.errors) throw new Err(400, null, `${checkBasemap.errors[0].message} (${checkBasemap.errors[0].instancePath})`);
-        const basemap = xml as Static<typeof BasemapType>;
-
-        return new Basemap(basemap);
-    }
-}