npm - @caspertech/node-metaverse - Versions diffs - 0.6.4 → 0.6.6 - Mend

@caspertech/node-metaverse 0.6.4 → 0.6.6

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.

Files changed (69) hide show

package/dist/lib/classes/public/GameObject.spec.js ADDED Viewed

@@ -0,0 +1,148 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const GameObject_1 = require("./GameObject");
+const TextureEntry_1 = require("../TextureEntry");
+const LLGLTFMaterialOverride_1 = require("../LLGLTFMaterialOverride");
+const TextureEntryFace_1 = require("../TextureEntryFace");
+const UUID_1 = require("../UUID");
+const Color4_1 = require("../Color4");
+const assert = require("assert");
+describe('GameObject', () => {
+    it('Can serialize and unserialize GLTF override data to xml', () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
+        const go = new GameObject_1.GameObject();
+        const te = new TextureEntry_1.TextureEntry();
+        te.defaultTexture = new TextureEntryFace_1.TextureEntryFace(null);
+        te.defaultTexture.textureID = new UUID_1.UUID('3f268e01-7368-7002-e5fb-cd7af0a3931c');
+        te.defaultTexture.rgba = new Color4_1.Color4(1.0, 1.0, 1.0, 1.0);
+        te.defaultTexture.glow = 1.0;
+        te.defaultTexture.rotation = 0.5;
+        te.defaultTexture.media = 0;
+        te.defaultTexture.mappingType = 0;
+        te.defaultTexture.materialID = new UUID_1.UUID('00000000-0000-0000-0000-000000000000');
+        go.TextureEntry = te;
+        te.gltfMaterialOverrides = new Map();
+        const override = new LLGLTFMaterialOverride_1.LLGLTFMaterialOverride();
+        te.gltfMaterialOverrides.set(0, override);
+        override.doubleSided = true;
+        override.alphaCutoff = 0.5;
+        override.alphaMode = 2;
+        override.roughnessFactor = 0.2;
+        override.metallicFactor = 0.6;
+        override.textures = [
+            'c9eca1db-8f2f-4d53-930e-77e6f06d9f37',
+            'ec3cfa77-bc40-4fc3-9e81-ce9d51e86b77',
+            '1e079cce-eeca-4e05-9a4f-e58d8398ecf1',
+            '03573ae5-4c1a-44f7-9cd3-8b49028f9e48'
+        ];
+        override.emissiveColor = [0.2, 0.5, 0.6];
+        override.baseColor = [0.1, 0.2, 0.3, 0.4];
+        override.textureTransforms = [
+            {
+                offset: [0.1, 0.2],
+                scale: [0.5, 0.5],
+                rotation: 1
+            },
+            {
+                offset: [0.1, 0.2],
+                scale: [0.5, 0.5],
+                rotation: 2
+            },
+            {
+                offset: [0.1, 0.2],
+                scale: [0.5, 0.5],
+                rotation: 3
+            },
+            {
+                offset: [0.1, 0.2],
+                scale: [0.5, 0.5],
+                rotation: 4
+            }
+        ];
+        te.gltfMaterialOverrides.set(1, override);
+        const xml = yield go.exportXML();
+        const obj = yield GameObject_1.GameObject.fromXML(xml);
+        assert.notEqual(obj, undefined);
+        assert.notEqual(obj.TextureEntry, undefined);
+        assert.notEqual((_a = obj.TextureEntry) === null || _a === void 0 ? void 0 : _a.gltfMaterialOverrides, undefined);
+        const overrides = (_b = obj.TextureEntry) === null || _b === void 0 ? void 0 : _b.gltfMaterialOverrides;
+        if (overrides) {
+            const entry = overrides.get(0);
+            if (entry === undefined) {
+                assert(false, 'Failed to get material override');
+            }
+            else {
+                assert.equal(entry.doubleSided, true);
+                assert.equal(entry.alphaCutoff, 0.5);
+                assert.equal(entry.alphaMode, 2);
+                assert.equal(entry.roughnessFactor, 0.2);
+                assert.equal(entry.metallicFactor, 0.6);
+                if (Array.isArray(entry.textures)) {
+                    assert.equal(entry.textures.length, 4);
+                    assert.equal(entry.textures[0], 'c9eca1db-8f2f-4d53-930e-77e6f06d9f37');
+                    assert.equal(entry.textures[1], 'ec3cfa77-bc40-4fc3-9e81-ce9d51e86b77');
+                    assert.equal(entry.textures[2], '1e079cce-eeca-4e05-9a4f-e58d8398ecf1');
+                    assert.equal(entry.textures[3], '03573ae5-4c1a-44f7-9cd3-8b49028f9e48');
+                }
+                else {
+                    assert(false, 'Textures is not an array');
+                }
+                if (Array.isArray(entry.emissiveColor)) {
+                    assert.equal(entry.emissiveColor.length, 3);
+                    assert.equal(entry.emissiveColor[0], 0.2);
+                    assert.equal(entry.emissiveColor[1], 0.5);
+                    assert.equal(entry.emissiveColor[2], 0.6);
+                }
+                else {
+                    assert(false, 'EmissiveColor is not an array');
+                }
+                if (Array.isArray(entry.baseColor)) {
+                    assert.equal(entry.baseColor.length, 4);
+                    assert.equal(entry.baseColor[0], 0.1);
+                    assert.equal(entry.baseColor[1], 0.2);
+                    assert.equal(entry.baseColor[2], 0.3);
+                    assert.equal(entry.baseColor[3], 0.4);
+                }
+                else {
+                    assert(false, 'BaseColor is not an array');
+                }
+                if (Array.isArray(entry.textureTransforms)) {
+                    assert.equal(entry.textureTransforms.length, 4);
+                    for (let x = 0; x < 4; x++) {
+                        const transform = entry.textureTransforms[x];
+                        if (Array.isArray(transform.scale)) {
+                            assert.equal(transform.scale.length, 2);
+                            assert.equal(transform.scale[0], 0.5);
+                            assert.equal(transform.scale[1], 0.5);
+                        }
+                        else {
+                            assert(false, 'Scale is not an array');
+                        }
+                        if (Array.isArray(transform.offset)) {
+                            assert.equal(transform.offset.length, 2);
+                            assert.equal(transform.offset[0], 0.1);
+                            assert.equal(transform.offset[1], 0.2);
+                        }
+                        else {
+                            assert(false, 'Offset is not an array');
+                        }
+                        assert.equal(transform.rotation, x + 1);
+                    }
+                }
+                else {
+                    assert(false, 'BaseColor is not an array');
+                }
+            }
+        }
+    }));
+});
+//# sourceMappingURL=GameObject.spec.js.map

package/dist/lib/classes/public/GameObject.spec.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"GameObject.spec.js","sourceRoot":"","sources":["../../../../lib/classes/public/GameObject.spec.ts"],"names":[],"mappings":"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"}

package/dist/lib/classes/python/PythonDict.js CHANGED Viewed

@@ -20,6 +20,7 @@ class PythonDict extends PythonObject_1.PythonObject {
                 case PythonTokenType_1.PythonTokenType.BRACE_END:
                     {
                         if (isKey) {
+                            // The last token is a key, which is invalid
                             throw new Error('Unexpected end of dictionary: Expected a key-value pair.');
                         }
                         container.index++;
@@ -46,16 +47,19 @@ class PythonDict extends PythonObject_1.PythonObject {
                 default:
                     {
                         if (isKey) {
+                            // Parse the key and check its type
                             key = PythonParser_1.PythonParser.parseValueToken(container);
                             if (typeof key !== 'string' &&
                                 typeof key !== 'number' &&
                                 typeof key !== 'boolean' &&
-                                !(key instanceof PythonTuple_1.PythonTuple) &&
-                                typeof key !== 'object') {
+                                !(key instanceof PythonTuple_1.PythonTuple) && // Check if it's a PythonTuple
+                                typeof key !== 'object' // Allow floats
+                            ) {
                                 throw new Error('Invalid key type in a dictionary.');
                             }
                         }
                         else {
+                            // Parse the value
                             if (key === null) {
                                 throw new Error('Key cannot be null in a dictionary.');
                             }

package/dist/lib/classes/python/PythonDict.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PythonDict.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonDict.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,uDAAoD;AAEpD,iDAA8C;AAC9C,+CAA4C;AAK5C,MAAa,UAAW,SAAQ,2BAAY;IAA5C;;QAEW,SAAI,GAA+B,IAAI,GAAG,EAAyB,CAAC;IAgG/E,CAAC;IA9FU,MAAM,CAAC,KAAK,CAAC,SAA+B;QAE/C,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QAE9B,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,IAAI,GAAG,GAAqB,IAAI,CAAC;QAEjC,OAAO,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAChD;YACI,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAEhD,QAAQ,KAAK,CAAC,IAAI,EAClB;gBACI,KAAK,iCAAe,CAAC,SAAS;oBAC9B;wBACI,IAAI,KAAK,EACT;~~4BAEI~~,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;yBAC/E;wBAED,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,OAAO,IAAI,CAAC;qBACf;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,CAAC,KAAK,EACV;4BACI,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;yBACvE;wBACD,KAAK,GAAG,KAAK,CAAC;wBACd,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,KAAK,EACT;4BACI,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;yBAC5D;wBACD,KAAK,GAAG,IAAI,CAAC;wBACb,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD;oBACA;wBACI,IAAI,KAAK,EACT;~~4BAEI~~,GAAG,GAAG,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAc,CAAC;4BAE3D,IACI,OAAO,GAAG,KAAK,QAAQ;gCACvB,OAAO,GAAG,KAAK,QAAQ;gCACvB,OAAO,GAAG,KAAK,SAAS;gCACxB,CAAC,CAAC,GAAG,YAAY,yBAAW,CAAC;~~gCAC7B~~,OAAO,GAAG,KAAK,QAAQ,~~EAE3B~~;gCACI,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;6BACxD;yBACJ;6BAED;~~4BAEI~~,IAAI,GAAG,KAAK,IAAI,EAChB;gCACI,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;6BAC1D;4BACD,MAAM,KAAK,GAAG,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;4BACtD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;4BAC1B,GAAG,GAAG,IAAI,CAAC;yBACd;qBACJ;aACJ;SACJ;QAED,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,MAAM;QAEN,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IACzC,CAAC;IAEM,GAAG,CAAC,GAAc;QAErB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM;QAET,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CACJ;AAlGD,gCAkGC"}
1	+ {"version":3,"file":"PythonDict.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonDict.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAC9C,uDAAoD;AAEpD,iDAA8C;AAC9C,+CAA4C;AAK5C,MAAa,UAAW,SAAQ,2BAAY;IAA5C;;QAEW,SAAI,GAA+B,IAAI,GAAG,EAAyB,CAAC;IAgG/E,CAAC;IA9FU,MAAM,CAAC,KAAK,CAAC,SAA+B;QAE/C,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QAE9B,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,IAAI,GAAG,GAAqB,IAAI,CAAC;QAEjC,OAAO,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAChD;YACI,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAEhD,QAAQ,KAAK,CAAC,IAAI,EAClB;gBACI,KAAK,iCAAe,CAAC,SAAS;oBAC9B;wBACI,IAAI,KAAK,EACT;4BACI,4CAA4C;4BAC5C,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;yBAC/E;wBAED,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,OAAO,IAAI,CAAC;qBACf;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,CAAC,KAAK,EACV;4BACI,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;yBACvE;wBACD,KAAK,GAAG,KAAK,CAAC;wBACd,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,KAAK,EACT;4BACI,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;yBAC5D;wBACD,KAAK,GAAG,IAAI,CAAC;wBACb,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD;oBACA;wBACI,IAAI,KAAK,EACT;4BACI,mCAAmC;4BACnC,GAAG,GAAG,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAc,CAAC;4BAE3D,IACI,OAAO,GAAG,KAAK,QAAQ;gCACvB,OAAO,GAAG,KAAK,QAAQ;gCACvB,OAAO,GAAG,KAAK,SAAS;gCACxB,CAAC,CAAC,GAAG,YAAY,yBAAW,CAAC,IAAI,8BAA8B;gCAC/D,OAAO,GAAG,KAAK,QAAQ,CAAC,eAAe;8BAE3C;gCACI,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;6BACxD;yBACJ;6BAED;4BACI,kBAAkB;4BAClB,IAAI,GAAG,KAAK,IAAI,EAChB;gCACI,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;6BAC1D;4BACD,MAAM,KAAK,GAAG,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;4BACtD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;4BAC1B,GAAG,GAAG,IAAI,CAAC;yBACd;qBACJ;aACJ;SACJ;QAED,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,MAAM;QAEN,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IACzC,CAAC;IAEM,GAAG,CAAC,GAAc;QAErB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM;QAET,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CACJ;AAlGD,gCAkGC"}

package/dist/lib/classes/python/PythonParser.js CHANGED Viewed

@@ -12,7 +12,7 @@ class PythonParser {
         while (index < input.length) {
             const currentInput = input.slice(index);
             if (currentInput.length === 0) {
-                return;
+                return; // End of input
             }
             let matched = false;
             for (const { regex, type } of PythonParser.tokenSpecs) {
@@ -23,8 +23,9 @@ class PythonParser {
                     if (tokenMatch.length > 1) {
                         value = tokenMatch[tokenMatch.length - 1];
                     }
-                    index += tokenMatch[0].length;
-                    if (type !== PythonTokenType_1.PythonTokenType.UNKNOWN) {
+                    index += tokenMatch[0].length; // Move past this token
+                    if (type !== PythonTokenType_1.PythonTokenType.UNKNOWN) // WHITESPACE is UNKNOWN and not yielded
+                     {
                         yield { type, value };
                     }
                     break;
@@ -133,6 +134,6 @@ PythonParser.tokenSpecs = [
     { regex: /^r"([^"\n]*?)"/, type: PythonTokenType_1.PythonTokenType.RAW_STRING },
     { regex: /^-?\d+\.?\d*[eE][-+]?\d+/, type: PythonTokenType_1.PythonTokenType.FLOAT },
     { regex: /^\d+(_\d+)*\b/, type: PythonTokenType_1.PythonTokenType.INTEGER },
-    { regex: /^[^\s:{},"'\[\]\(\)]+/, type: PythonTokenType_1.PythonTokenType.UNKNOWN }
+    { regex: /^[^\s:{},"'\[\]\(\)]+/, type: PythonTokenType_1.PythonTokenType.UNKNOWN } // Catch all for other non-structured sequences
 ];
 //# sourceMappingURL=PythonParser.js.map

package/dist/lib/classes/python/PythonParser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PythonParser.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonParser.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAEpD,2CAAwC;AACxC,iEAA8D;AAE9D,6CAA0C;AAC1C,+CAA4C;AAQ5C,MAAa,YAAY;IAuCb,MAAM,CAAA,CAAE,QAAQ,CAAC,KAAa;QAElC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,KAAK,GAAG,KAAK,CAAC,MAAM,EAC3B;YACI,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAExC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAC7B;gBACI,OAAO;~~aACV~~;YAED,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,YAAY,CAAC,UAAU,EACrD;gBACI,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC7C,IAAI,UAAU,EACd;oBACI,OAAO,GAAG,IAAI,CAAC;oBACf,IAAI,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oBAC1B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EACzB;wBACI,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;qBAC7C;oBACD,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;~~oBAE9B~~,IAAI,IAAI,KAAK,iCAAe,CAAC,OAAO,~~EACpC~~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~~CACpE~~,CAAC"}
1	+ {"version":3,"file":"PythonParser.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonParser.ts"],"names":[],"mappings":"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"}

package/dist/lib/classes/python/PythonParser.spec.js CHANGED Viewed

@@ -108,6 +108,14 @@ double-quoted string"""
             assert.equal(parsed.get('string_double'), 'double-quoted \\" string');
             assert.equal(parsed.get('string_triple_single'), 'triple-quoted\'\nsingle-quoted string');
             assert.equal(parsed.get('string_triple_double'), 'triple-quoted\"\ndouble-quoted string');
+            /*
+            raw_string_single": r'raw single-quoted\ string',
+    "raw_string_double": r"raw double-quoted\ string",
+    "raw_string_triple_single": r'''raw triple\''-quoted
+single-quoted string''',
+    "raw_string_triple_double": r"""raw triple\''-quoted
+double-quoted string"""
+             */
             assert.equal(parsed.get('raw_string_single'), 'raw single-quoted\\ string');
             assert.equal(parsed.get('raw_string_double'), 'raw double-quoted\\ string');
             assert.equal(parsed.get('raw_string_triple_single'), 'raw triple\\\'\'-quoted\nsingle-quoted string');

package/dist/lib/classes/python/PythonParser.spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PythonParser.spec.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonParser.spec.ts"],"names":[],"mappings":"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~~YAU1F~~,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,4BAA4B,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,4BAA4B,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,+CAA+C,CAAC,CAAC;YACtG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,6CAA6C,CAAC,CAAC;QACxG,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"PythonParser.spec.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonParser.spec.ts"],"names":[],"mappings":";;AAAA,iDAA8C;AAE9C,iCAAiC;AACjC,6CAA0C;AAC1C,6CAA0C;AAC1C,+CAA4C;AAE5C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAE1B,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QAEnB,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YAEtD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2B9B,CAAC;YACS,MAAM,MAAM,GAAG,2BAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC/C,IAAI,CAAC,CAAC,MAAM,YAAY,uBAAU,CAAC,EACnC;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;gBACd,OAAO;aACV;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACzC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,CAAC,MAAM,YAAY,uBAAU,CAAC,EACnC;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;iBAED;gBACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAChC,IAAI,CAAC,CAAC,IAAI,YAAY,uBAAU,CAAC,EACjC;oBACI,MAAM,CAAC,KAAK,CAAC,CAAC;iBACjB;qBAED;oBACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,CAAC;iBACtD;aACJ;YAED,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,CAAC,CAAC,IAAI,YAAY,uBAAU,CAAC,EACjC;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;iBAED;gBACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,CAAC,UAAU,YAAY,uBAAU,CAAC,EACvC;oBACI,MAAM,CAAC,KAAK,CAAC,CAAC;iBACjB;qBAED;oBACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACnC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACtC;gBACD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;aACxC;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;YAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAClC,IAAI,CAAC,CAAC,KAAK,YAAY,yBAAW,CAAC,EACnC;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;iBAED;gBACI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,CAAC,CAAC,WAAW,YAAY,yBAAW,CAAC,EACzC;oBACI,MAAM,CAAC,KAAK,CAAC,CAAC;iBACjB;qBAED;oBACI,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;oBACjD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACvC;gBACD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;aACzC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,GAAG,YAAY,MAAM,EACzB;gBACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;aAChE;iBAED;gBACI,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;YACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,0BAA0B,CAAC,CAAC;YACtE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,0BAA0B,CAAC,CAAC;YACtE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE,uCAAuC,CAAC,CAAC;YAC1F,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE,uCAAuC,CAAC,CAAC;YAE1F;;;;;;;eAOG;YACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,4BAA4B,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,4BAA4B,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,+CAA+C,CAAC,CAAC;YACtG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,6CAA6C,CAAC,CAAC;QACxG,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/lib/classes/python/PythonSet.js CHANGED Viewed

@@ -20,6 +20,7 @@ class PythonSet extends PythonObject_1.PythonObject {
                 case PythonTokenType_1.PythonTokenType.BRACE_END:
                     {
                         if (container.index === startIndex) {
+                            // Empty braces, this is an empty PythonDict
                             return new PythonDict_1.PythonDict();
                         }
                         else {
@@ -38,6 +39,7 @@ class PythonSet extends PythonObject_1.PythonObject {
                     }
                 case PythonTokenType_1.PythonTokenType.COLON:
                     {
+                        // This is a dictionary, not a set, start again..
                         container.index = startIndex;
                         return PythonDict_1.PythonDict.parse(container);
                     }

package/dist/lib/classes/python/PythonSet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PythonSet.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonSet.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,6CAA0C;AAC1C,iDAA8C;AAE9C,iDAA8C;AAE9C,MAAa,SAAU,SAAQ,2BAAY;IAA3C;;QAEW,SAAI,GAAG,IAAI,GAAG,EAAc,CAAC;IA4DxC,CAAC;IA1DU,MAAM,CAAC,KAAK,CAAC,SAA+B;QAE/C,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;QACnC,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,GACA;YACI,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAChD,QAAQ,KAAK,CAAC,IAAI,EAClB;gBACI,KAAK,iCAAe,CAAC,SAAS;oBAC9B;wBACI,IAAI,SAAS,CAAC,KAAK,KAAK,UAAU,EAClC;~~4BAEI~~,OAAO,IAAI,uBAAU,EAAE,CAAC;yBAC3B;6BAED;4BACI,SAAS,CAAC,KAAK,EAAE,CAAC;4BAClB,OAAO,GAAG,CAAC;yBACd;qBACJ;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,CAAC,cAAc,EACnB;4BACI,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;yBAC/C;wBACD,cAAc,GAAG,KAAK,CAAC;wBACvB,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;~~wBAEI~~,SAAS,CAAC,KAAK,GAAG,UAAU,CAAC;wBAC7B,OAAO,uBAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;qBACtC;gBACD;oBACA;wBACI,IAAI,cAAc,EAClB;4BACI,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;yBACtC;wBACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;wBACtD,cAAc,GAAG,IAAI,CAAC;qBACzB;aACJ;SACJ,QACM,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE;QAClD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IAEM,MAAM;QAET,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACJ;AA9DD,8BA8DC"}
1	+ {"version":3,"file":"PythonSet.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonSet.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,6CAA0C;AAC1C,iDAA8C;AAE9C,iDAA8C;AAE9C,MAAa,SAAU,SAAQ,2BAAY;IAA3C;;QAEW,SAAI,GAAG,IAAI,GAAG,EAAc,CAAC;IA4DxC,CAAC;IA1DU,MAAM,CAAC,KAAK,CAAC,SAA+B;QAE/C,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;QACnC,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,GACA;YACI,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAChD,QAAQ,KAAK,CAAC,IAAI,EAClB;gBACI,KAAK,iCAAe,CAAC,SAAS;oBAC9B;wBACI,IAAI,SAAS,CAAC,KAAK,KAAK,UAAU,EAClC;4BACI,4CAA4C;4BAC5C,OAAO,IAAI,uBAAU,EAAE,CAAC;yBAC3B;6BAED;4BACI,SAAS,CAAC,KAAK,EAAE,CAAC;4BAClB,OAAO,GAAG,CAAC;yBACd;qBACJ;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,IAAI,CAAC,cAAc,EACnB;4BACI,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;yBAC/C;wBACD,cAAc,GAAG,KAAK,CAAC;wBACvB,SAAS,CAAC,KAAK,EAAE,CAAC;wBAClB,MAAM;qBACT;gBACD,KAAK,iCAAe,CAAC,KAAK;oBAC1B;wBACI,iDAAiD;wBACjD,SAAS,CAAC,KAAK,GAAG,UAAU,CAAC;wBAC7B,OAAO,uBAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;qBACtC;gBACD;oBACA;wBACI,IAAI,cAAc,EAClB;4BACI,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;yBACtC;wBACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,2BAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;wBACtD,cAAc,GAAG,IAAI,CAAC;qBACzB;aACJ;SACJ,QACM,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE;QAClD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IAEM,MAAM;QAET,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACJ;AA9DD,8BA8DC"}

package/dist/lib/classes/python/PythonTokenType.js CHANGED Viewed

@@ -20,6 +20,6 @@ var PythonTokenType;
     PythonTokenType[PythonTokenType["TUPLE_END"] = 14] = "TUPLE_END";
     PythonTokenType[PythonTokenType["HEX"] = 15] = "HEX";
     PythonTokenType[PythonTokenType["OCTAL"] = 16] = "OCTAL";
-    PythonTokenType[PythonTokenType["UNKNOWN"] = 17] = "UNKNOWN";
-})(PythonTokenType = exports.PythonTokenType || (exports.PythonTokenType = {}));
+    PythonTokenType[PythonTokenType["UNKNOWN"] = 17] = "UNKNOWN"; // Catch all for other sequences
+})(PythonTokenType || (exports.PythonTokenType = PythonTokenType = {}));
 //# sourceMappingURL=PythonTokenType.js.map

package/dist/lib/classes/python/PythonTokenType.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PythonTokenType.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonTokenType.ts"],"names":[],"mappings":";;;AAAA,IAAY,eAoBX;AApBD,WAAY,eAAe;IAEvB,qDAAI,CAAA;IACJ,mEAAW,CAAA;IACX,+DAAS,CAAA;IACT,uDAAK,CAAA;IACL,uDAAK,CAAA;IACL,2DAAO,CAAA;IACP,2DAAO,CAAA;IACP,uDAAK,CAAA;IACL,yDAAM,CAAA;IACN,uEAAa,CAAA;IACb,kEAAU,CAAA;IACV,kEAAU,CAAA;IACV,8DAAQ,CAAA;IACR,oEAAW,CAAA;IACX,gEAAS,CAAA;IACT,oDAAG,CAAA;IACH,wDAAK,CAAA;IACL,4DAAO,CAAA;~~AACX~~,CAAC,EApBW,eAAe,~~GAAf~~,~~uBAAe,KAAf,uBAAe,~~QAoB1B"}
1	+ {"version":3,"file":"PythonTokenType.js","sourceRoot":"","sources":["../../../../lib/classes/python/PythonTokenType.ts"],"names":[],"mappings":";;;AAAA,IAAY,eAoBX;AApBD,WAAY,eAAe;IAEvB,qDAAI,CAAA;IACJ,mEAAW,CAAA;IACX,+DAAS,CAAA;IACT,uDAAK,CAAA;IACL,uDAAK,CAAA;IACL,2DAAO,CAAA;IACP,2DAAO,CAAA;IACP,uDAAK,CAAA;IACL,yDAAM,CAAA;IACN,uEAAa,CAAA;IACb,kEAAU,CAAA;IACV,kEAAU,CAAA;IACV,8DAAQ,CAAA;IACR,oEAAW,CAAA;IACX,gEAAS,CAAA;IACT,oDAAG,CAAA;IACH,wDAAK,CAAA;IACL,4DAAO,CAAA,CAAC,gCAAgC;AAC5C,CAAC,EApBW,eAAe,+BAAf,eAAe,QAoB1B"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@caspertech/node-metaverse",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "A node.js interface for Second Life.",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",