diff --git a/lib/classes/Color4.ts b/lib/classes/Color4.ts index 2030167..d95ed0b 100644 --- a/lib/classes/Color4.ts +++ b/lib/classes/Color4.ts @@ -1,12 +1,12 @@ -import {XMLElementOrXMLNode} from 'xmlbuilder'; import {Utils} from './Utils'; +import {XMLNode} from 'xmlbuilder'; export class Color4 { static black: Color4 = new Color4(0.0, 0.0, 0.0, 1.0); static white: Color4 = new Color4(1.0, 1.0, 1.0, 1.0); - static getXML(doc: XMLElementOrXMLNode, c?: Color4) + static getXML(doc: XMLNode, c?: Color4) { if (c === undefined) { diff --git a/lib/classes/Quaternion.ts b/lib/classes/Quaternion.ts index 1ba6385..8bc2e0d 100644 --- a/lib/classes/Quaternion.ts +++ b/lib/classes/Quaternion.ts @@ -1,6 +1,5 @@ import {quat} from '../tsm/quat'; -import {XMLElementOrXMLNode} from 'xmlbuilder'; - +import {XMLNode} from 'xmlbuilder'; export class Quaternion extends quat { static getIdentity(): Quaternion @@ -10,7 +9,7 @@ export class Quaternion extends quat return q; } - static getXML(doc: XMLElementOrXMLNode, v?: Quaternion) + static getXML(doc: XMLNode, v?: Quaternion) { if (v === undefined) { diff --git a/lib/classes/UUID.ts b/lib/classes/UUID.ts index 0364378..fe77a57 100644 --- a/lib/classes/UUID.ts +++ b/lib/classes/UUID.ts @@ -1,7 +1,6 @@ import * as validator from 'validator'; -import * as builder from 'xmlbuilder'; -import {XMLElementOrXMLNode} from 'xmlbuilder'; import * as Long from 'long'; +import {XMLNode} from 'xmlbuilder'; const uuid = require('uuid'); export class UUID @@ -30,7 +29,7 @@ export class UUID } } - static getXML(doc: XMLElementOrXMLNode, u?: UUID) + static getXML(doc: XMLNode, u?: UUID) { const str = UUID.getString(u); doc.ele('UUID', str); diff --git a/lib/classes/Vector2.ts b/lib/classes/Vector2.ts index d9334f1..010f91b 100644 --- a/lib/classes/Vector2.ts +++ b/lib/classes/Vector2.ts @@ -1,5 +1,5 @@ import {vec2} from '../tsm/vec2'; -import {XMLElementOrXMLNode} from 'xmlbuilder'; +import {XMLNode} from 'xmlbuilder'; export class Vector2 extends vec2 { @@ -8,7 +8,7 @@ export class Vector2 extends vec2 return new Vector2(); } - static getXML(doc: XMLElementOrXMLNode, v?: Vector2) + static getXML(doc: XMLNode, v?: Vector2) { if (v === undefined) { diff --git a/lib/classes/Vector3.ts b/lib/classes/Vector3.ts index ef84238..4d65ee6 100644 --- a/lib/classes/Vector3.ts +++ b/lib/classes/Vector3.ts @@ -1,5 +1,5 @@ import {vec3} from '../tsm/vec3'; -import {XMLElementOrXMLNode} from 'xmlbuilder'; +import {XMLNode} from 'xmlbuilder'; export class Vector3 extends vec3 { @@ -8,15 +8,15 @@ export class Vector3 extends vec3 return new Vector3(); } - static getXML(doc: XMLElementOrXMLNode, v?: Vector3) + static getXML(doc: XMLNode, v?: Vector3) { if (v === undefined) { v = Vector3.getZero(); } - doc.ele('X', v.x); - doc.ele('Y', v.y); - doc.ele('Z', v.z); + //doc.ele('X', v.x); + //doc.ele('Y', v.y); + //doc.ele('Z', v.z); } static fromXMLJS(obj: any, param: string): Vector3 | false diff --git a/lib/classes/Vector4.ts b/lib/classes/Vector4.ts index ee3f01b..8cb68f3 100644 --- a/lib/classes/Vector4.ts +++ b/lib/classes/Vector4.ts @@ -1,5 +1,5 @@ import {vec4} from '../tsm/vec4'; -import {XMLElementOrXMLNode} from 'xmlbuilder'; +import {XMLNode} from 'xmlbuilder'; export class Vector4 extends vec4 { @@ -8,7 +8,7 @@ export class Vector4 extends vec4 return new Vector4(); } - static getXML(doc: XMLElementOrXMLNode, v?: Vector4) + static getXML(doc: XMLNode, v?: Vector4) { if (v === undefined) { diff --git a/lib/classes/public/GameObject.ts b/lib/classes/public/GameObject.ts index 4e534b3..7d1ba41 100644 --- a/lib/classes/public/GameObject.ts +++ b/lib/classes/public/GameObject.ts @@ -22,7 +22,6 @@ import { Utils } from '../..'; import * as builder from 'xmlbuilder'; -import {XMLElementOrXMLNode} from 'xmlbuilder'; import * as xml2js from 'xml2js'; import {Region} from '../Region'; import {InventoryItem} from '../InventoryItem'; @@ -35,11 +34,11 @@ import {ExtraParamType} from '../../enums/ExtraParamType'; import {ObjectImageMessage} from '../messages/ObjectImage'; import {ObjectNameMessage} from '../messages/ObjectName'; import {ObjectDescriptionMessage} from '../messages/ObjectDescription'; -import {ObjectPositionMessage} from '../messages/ObjectPosition'; import {MultipleObjectUpdateMessage} from '../messages/MultipleObjectUpdate'; import {UpdateType} from '../../enums/UpdateType'; import {ObjectLinkMessage} from '../messages/ObjectLink'; import {ObjectShapeMessage} from '../messages/ObjectShape'; +import {XMLNode} from 'xmlbuilder'; export class GameObject implements IGameObjectData { @@ -995,7 +994,7 @@ export class GameObject implements IGameObjectData } } - private async getInventoryXML(xml: XMLElementOrXMLNode, inv: InventoryItem) + private async getInventoryXML(xml: XMLNode, inv: InventoryItem) { if (!inv.assetID.equals(UUID.zero())) { @@ -1044,7 +1043,7 @@ export class GameObject implements IGameObjectData } } - private async getXML(xml: XMLElementOrXMLNode, rootPrim: GameObject, linkNum: number) + private async getXML(xml: XMLNode, rootPrim: GameObject, linkNum: number) { const sceneObjectPart = xml.ele('SceneObjectPart').att('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance').att('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema'); sceneObjectPart.ele('AllowedDrop', (this.Flags !== undefined && (this.Flags & PrimFlags.AllowInventoryDrop) !== 0) ? 'true' : 'false'); diff --git a/lib/classes/public/RegionEnvironment.ts b/lib/classes/public/RegionEnvironment.ts index f405fb8..268ed52 100644 --- a/lib/classes/public/RegionEnvironment.ts +++ b/lib/classes/public/RegionEnvironment.ts @@ -2,10 +2,9 @@ import {UUID} from '../UUID'; import {Vector4} from '../Vector4'; import {Color4} from '../Color4'; import {Vector2} from '../Vector2'; -import {Vector3} from '../Vector3'; -import {XMLElementOrXMLNode} from 'xmlbuilder'; import {SkyPreset} from './interfaces/SkyPreset'; import {WaterPreset} from './interfaces/WaterPreset'; +import {XMLNode} from 'xmlbuilder'; export class RegionEnvironment { @@ -19,7 +18,7 @@ export class RegionEnvironment } = {}; water: WaterPreset; - getXML(xml: XMLElementOrXMLNode) + getXML(xml: XMLNode) { const env = xml.ele('Environment'); const dayCycle = env.ele('DayCycle'); diff --git a/package-lock.json b/package-lock.json index 039a01f..d7569ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,8 +43,7 @@ "@types/long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz", - "integrity": "sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==", - "dev": true + "integrity": "sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==" }, "@types/micromatch": { "version": "3.1.0", @@ -62,9 +61,9 @@ "dev": true }, "@types/node": { - "version": "10.11.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.6.tgz", - "integrity": "sha512-fnA7yvqg3oKQDb3skBif9w5RRKVKAaeKeNuLzZL37XcSiWL4IoSXQnnbchR3UnBu2EMLHBip7ZVEkqoIVBP8QQ==" + "version": "10.14.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.19.tgz", + "integrity": "sha512-j6Sqt38ssdMKutXBUuAcmWF8QtHW1Fwz/mz4Y+Wd9mzpBiVFirjpNQf363hG5itkG+yGaD+oiLyb50HxJ36l9Q==" }, "@types/request": { "version": "2.47.1", @@ -132,12 +131,6 @@ "@types/node": "*" } }, - "@types/xmlbuilder": { - "version": "0.0.34", - "resolved": "https://registry.npmjs.org/@types/xmlbuilder/-/xmlbuilder-0.0.34.tgz", - "integrity": "sha512-yVsHfYqJblSEg3DvUhGndpCZBZz2GiGVmqMa04fbGro2xzxRj85Q7MQ4os+MaXmKcpCDD42MXuxUWfoUKTuVdQ==", - "dev": true - }, "@types/xmlrpc": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/xmlrpc/-/xmlrpc-1.3.5.tgz", @@ -1962,9 +1955,9 @@ "optional": true }, "typescript": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.2.tgz", - "integrity": "sha512-gOoGJWbNnFAfP9FlrSV63LYD5DJqYJHG5ky1kOXSl3pCImn4rqWy/flyq1BRd4iChQsoCqjbQaqtmXO4yCVPCA==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz", + "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", "dev": true }, "union-value": { @@ -2077,9 +2070,9 @@ } }, "xmlbuilder": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.0.tgz", - "integrity": "sha512-In21jFWiaulS7Cmw1fPT1Lm7g7L6ml/uwZNAaKlDZc78szm3pn5oH9gizH7sh1h2GGRb3OkL5kLCeMEENEnZwA==" + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz", + "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==" }, "xmldom": { "version": "0.1.27", diff --git a/package.json b/package.json index 33af581..9393b8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@caspertech/node-metaverse", - "version": "0.5.1", + "version": "0.5.2", "description": "A node.js interface for Second Life.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -23,27 +23,26 @@ "url": "git+https://github.com/CasperTech/node-metaverse.git" }, "devDependencies": { - "@types/long": "^4.0.0", "@types/micromatch": "^3.1.0", "@types/mocha": "^5.2.5", - "@types/node": "^10.11.6", + "@types/node": "^10.14.19", "@types/request": "^2.47.1", "@types/tiny-async-pool": "^1.0.0", "@types/uuid": "^3.4.4", "@types/validator": "^9.4.2", "@types/xml": "^1.0.2", "@types/xml2js": "^0.4.3", - "@types/xmlbuilder": "0.0.34", "@types/xmlrpc": "^1.3.5", "mocha": "^5.2.0", "source-map-support": "^0.5.9", "ts-node": "^7.0.1", "tslint": "^5.11.0", "tslint-eslint-rules": "^5.4.0", - "typescript": "^3.1.2" + "typescript": "^3.6.3" }, "dependencies": { "@caspertech/llsd": "^1.0.0", + "@types/long": "^4.0.0", "ipaddr.js": "^1.8.1", "long": "^4.0.0", "micromatch": "^3.1.10", @@ -57,7 +56,7 @@ "validator": "^10.8.0", "xml": "^1.0.1", "xml2js": "^0.4.19", - "xmlbuilder": "^10.1.0", + "xmlbuilder": "^13.0.2", "xmlrpc": "^1.3.2" } } diff --git a/tsconfig.json b/tsconfig.json index d029063..b5867b2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,15 +6,13 @@ "outDir": "dist", "sourceMap": true, "strict": true, - "strictPropertyInitialization": false + "strictPropertyInitialization": false, + "types": ["node"] }, - "files": [ - "./node_modules/@types/node/index.d.ts" - ], "include": [ "lib/**/*.ts" ], "exclude": [ "node_modules" ] -} \ No newline at end of file +}