@foxglove/schemas 0.4.0 → 0.6.1

package/dist/cjs/schemas/typescript/index.js

@@ -1,18 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./ArrowPrimitive"), exports);
 tslib_1.__exportStar(require("./CameraCalibration"), exports);
 tslib_1.__exportStar(require("./CircleAnnotation"), exports);
 tslib_1.__exportStar(require("./Color"), exports);
 tslib_1.__exportStar(require("./CompressedImage"), exports);
+tslib_1.__exportStar(require("./CubePrimitive"), exports);
+tslib_1.__exportStar(require("./CylinderPrimitive"), exports);
 tslib_1.__exportStar(require("./FrameTransform"), exports);
 tslib_1.__exportStar(require("./GeoJSON"), exports);
 tslib_1.__exportStar(require("./Grid"), exports);
 tslib_1.__exportStar(require("./ImageAnnotations"), exports);
+tslib_1.__exportStar(require("./KeyValuePair"), exports);
 tslib_1.__exportStar(require("./LaserScan"), exports);
+tslib_1.__exportStar(require("./LinePrimitive"), exports);
+tslib_1.__exportStar(require("./LineType"), exports);
 tslib_1.__exportStar(require("./LocationFix"), exports);
 tslib_1.__exportStar(require("./Log"), exports);
 tslib_1.__exportStar(require("./LogLevel"), exports);
+tslib_1.__exportStar(require("./ModelPrimitive"), exports);
 tslib_1.__exportStar(require("./NumericType"), exports);
 tslib_1.__exportStar(require("./PackedElementField"), exports);
 tslib_1.__exportStar(require("./Point2"), exports);
@@ -26,6 +33,13 @@ tslib_1.__exportStar(require("./PosesInFrame"), exports);
 tslib_1.__exportStar(require("./PositionCovarianceType"), exports);
 tslib_1.__exportStar(require("./Quaternion"), exports);
 tslib_1.__exportStar(require("./RawImage"), exports);
+tslib_1.__exportStar(require("./SceneEntity"), exports);
+tslib_1.__exportStar(require("./SceneEntityDeletion"), exports);
+tslib_1.__exportStar(require("./SceneEntityDeletionType"), exports);
+tslib_1.__exportStar(require("./SceneUpdate"), exports);
+tslib_1.__exportStar(require("./SpherePrimitive"), exports);
+tslib_1.__exportStar(require("./TextPrimitive"), exports);
+tslib_1.__exportStar(require("./TriangleListPrimitive"), exports);
 tslib_1.__exportStar(require("./Vector2"), exports);
 tslib_1.__exportStar(require("./Vector3"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/schemas/typescript/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schemas/typescript/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,6DAAmC;AACnC,kDAAwB;AACxB,4DAAkC;AAClC,2DAAiC;AACjC,oDAA0B;AAC1B,iDAAuB;AACvB,6DAAmC;AACnC,sDAA4B;AAC5B,wDAA8B;AAC9B,gDAAsB;AACtB,qDAA2B;AAC3B,wDAA8B;AAC9B,+DAAqC;AACrC,mDAAyB;AACzB,mDAAyB;AACzB,uDAA6B;AAC7B,6DAAmC;AACnC,iEAAuC;AACvC,iDAAuB;AACvB,wDAA8B;AAC9B,yDAA+B;AAC/B,mEAAyC;AACzC,uDAA6B;AAC7B,qDAA2B;AAC3B,oDAA0B;AAC1B,oDAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schemas/typescript/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,8DAAoC;AACpC,6DAAmC;AACnC,kDAAwB;AACxB,4DAAkC;AAClC,0DAAgC;AAChC,8DAAoC;AACpC,2DAAiC;AACjC,oDAA0B;AAC1B,iDAAuB;AACvB,6DAAmC;AACnC,yDAA+B;AAC/B,sDAA4B;AAC5B,0DAAgC;AAChC,qDAA2B;AAC3B,wDAA8B;AAC9B,gDAAsB;AACtB,qDAA2B;AAC3B,2DAAiC;AACjC,wDAA8B;AAC9B,+DAAqC;AACrC,mDAAyB;AACzB,mDAAyB;AACzB,uDAA6B;AAC7B,6DAAmC;AACnC,iEAAuC;AACvC,iDAAuB;AACvB,wDAA8B;AAC9B,yDAA+B;AAC/B,mEAAyC;AACzC,uDAA6B;AAC7B,qDAA2B;AAC3B,wDAA8B;AAC9B,gEAAsC;AACtC,oEAA0C;AAC1C,wDAA8B;AAC9B,4DAAkC;AAClC,0DAAgC;AAChC,kEAAwC;AACxC,oDAA0B;AAC1B,oDAA0B"}

package/dist/cjs/src/generateJsonSchema.test.js

@@ -8,46 +8,46 @@ const testFixtures_1 = require("./testFixtures");
 describe("generateJsonSchema", () => {
     it("generates expected JSON Schema", () => {
         expect((0, generateJsonSchema_1.generateJsonSchema)(testFixtures_1.exampleMessage)).toMatchInlineSnapshot(`
-      Object {
+      {
         "$comment": "Generated by https://github.com/foxglove/schemas",
         "description": "An example type",
-        "properties": Object {
-          "field_boolean": Object {
+        "properties": {
+          "field_boolean": {
             "description": "boolean field",
             "type": "boolean",
           },
-          "field_boolean_array": Object {
+          "field_boolean_array": {
             "description": "boolean array field",
-            "items": Object {
+            "items": {
               "type": "boolean",
             },
             "type": "array",
           },
-          "field_boolean_fixed_array": Object {
+          "field_boolean_fixed_array": {
             "description": "boolean fixed-length array field",
-            "items": Object {
+            "items": {
               "type": "boolean",
             },
             "maxItems": 3,
             "minItems": 3,
             "type": "array",
           },
-          "field_bytes": Object {
+          "field_bytes": {
             "contentEncoding": "base64",
             "description": "bytes field",
             "type": "string",
           },
-          "field_bytes_array": Object {
+          "field_bytes_array": {
             "description": "bytes array field",
-            "items": Object {
+            "items": {
               "contentEncoding": "base64",
               "type": "string",
             },
             "type": "array",
           },
-          "field_bytes_fixed_array": Object {
+          "field_bytes_fixed_array": {
             "description": "bytes fixed-length array field",
-            "items": Object {
+            "items": {
               "contentEncoding": "base64",
               "type": "string",
             },
@@ -55,31 +55,31 @@ describe("generateJsonSchema", () => {
             "minItems": 3,
             "type": "array",
           },
-          "field_duration": Object {
+          "field_duration": {
             "description": "duration field",
-            "properties": Object {
-              "nsec": Object {
+            "properties": {
+              "nsec": {
                 "maximum": 999999999,
                 "minimum": 0,
                 "type": "integer",
               },
-              "sec": Object {
+              "sec": {
                 "type": "integer",
               },
             },
             "title": "duration",
             "type": "object",
           },
-          "field_duration_array": Object {
+          "field_duration_array": {
             "description": "duration array field",
-            "items": Object {
-              "properties": Object {
-                "nsec": Object {
+            "items": {
+              "properties": {
+                "nsec": {
                   "maximum": 999999999,
                   "minimum": 0,
                   "type": "integer",
                 },
-                "sec": Object {
+                "sec": {
                   "type": "integer",
                 },
               },
@@ -88,16 +88,16 @@ describe("generateJsonSchema", () => {
             },
             "type": "array",
           },
-          "field_duration_fixed_array": Object {
+          "field_duration_fixed_array": {
             "description": "duration fixed-length array field",
-            "items": Object {
-              "properties": Object {
-                "nsec": Object {
+            "items": {
+              "properties": {
+                "nsec": {
                   "maximum": 999999999,
                   "minimum": 0,
                   "type": "integer",
                 },
-                "sec": Object {
+                "sec": {
                   "type": "integer",
                 },
               },
@@ -108,15 +108,15 @@ describe("generateJsonSchema", () => {
             "minItems": 3,
             "type": "array",
           },
-          "field_enum": Object {
+          "field_enum": {
             "description": "An enum field",
-            "oneOf": Array [
-              Object {
+            "oneOf": [
+              {
                 "const": 1,
                 "description": "Value A",
                 "title": "A",
               },
-              Object {
+              {
                 "const": 2,
                 "description": "Value B",
                 "title": "B",
@@ -124,17 +124,17 @@ describe("generateJsonSchema", () => {
             ],
             "title": "foxglove.ExampleEnum",
           },
-          "field_enum_array": Object {
+          "field_enum_array": {
             "description": "An enum array field",
-            "items": Object {
+            "items": {
               "description": "An enum array field",
-              "oneOf": Array [
-                Object {
+              "oneOf": [
+                {
                   "const": 1,
                   "description": "Value A",
                   "title": "A",
                 },
-                Object {
+                {
                   "const": 2,
                   "description": "Value B",
                   "title": "B",
@@ -144,30 +144,30 @@ describe("generateJsonSchema", () => {
             },
             "type": "array",
           },
-          "field_float64": Object {
+          "field_float64": {
             "description": "float64 field",
             "type": "number",
           },
-          "field_float64_array": Object {
+          "field_float64_array": {
             "description": "float64 array field",
-            "items": Object {
+            "items": {
               "type": "number",
             },
             "type": "array",
           },
-          "field_float64_fixed_array": Object {
+          "field_float64_fixed_array": {
             "description": "float64 fixed-length array field",
-            "items": Object {
+            "items": {
               "type": "number",
             },
             "maxItems": 3,
             "minItems": 3,
             "type": "array",
           },
-          "field_nested": Object {
+          "field_nested": {
             "description": "A nested field",
-            "properties": Object {
-              "field_enum": Object {
+            "properties": {
+              "field_enum": {
                 "description": "An enum field",
                 "minimum": 0,
                 "type": "integer",
@@ -176,17 +176,17 @@ describe("generateJsonSchema", () => {
             "title": "foxglove.NestedMessage",
             "type": "object",
           },
-          "field_nested_array": Object {
+          "field_nested_array": {
             "description": "A nested array field
       With
       a
       very
       long
       description",
-            "items": Object {
+            "items": {
               "description": "An example nested message",
-              "properties": Object {
-                "field_enum": Object {
+              "properties": {
+                "field_enum": {
                   "description": "An enum field",
                   "minimum": 0,
                   "type": "integer",
@@ -197,35 +197,35 @@ describe("generateJsonSchema", () => {
             },
             "type": "array",
           },
-          "field_string": Object {
+          "field_string": {
             "description": "string field",
             "type": "string",
           },
-          "field_string_array": Object {
+          "field_string_array": {
             "description": "string array field",
-            "items": Object {
+            "items": {
               "type": "string",
             },
             "type": "array",
           },
-          "field_string_fixed_array": Object {
+          "field_string_fixed_array": {
             "description": "string fixed-length array field",
-            "items": Object {
+            "items": {
               "type": "string",
             },
             "maxItems": 3,
             "minItems": 3,
             "type": "array",
           },
-          "field_time": Object {
+          "field_time": {
             "description": "time field",
-            "properties": Object {
-              "nsec": Object {
+            "properties": {
+              "nsec": {
                 "maximum": 999999999,
                 "minimum": 0,
                 "type": "integer",
               },
-              "sec": Object {
+              "sec": {
                 "minimum": 0,
                 "type": "integer",
               },
@@ -233,16 +233,16 @@ describe("generateJsonSchema", () => {
             "title": "time",
             "type": "object",
           },
-          "field_time_array": Object {
+          "field_time_array": {
             "description": "time array field",
-            "items": Object {
-              "properties": Object {
-                "nsec": Object {
+            "items": {
+              "properties": {
+                "nsec": {
                   "maximum": 999999999,
                   "minimum": 0,
                   "type": "integer",
                 },
-                "sec": Object {
+                "sec": {
                   "minimum": 0,
                   "type": "integer",
                 },
@@ -252,16 +252,16 @@ describe("generateJsonSchema", () => {
             },
             "type": "array",
           },
-          "field_time_fixed_array": Object {
+          "field_time_fixed_array": {
             "description": "time fixed-length array field",
-            "items": Object {
-              "properties": Object {
-                "nsec": Object {
+            "items": {
+              "properties": {
+                "nsec": {
                   "maximum": 999999999,
                   "minimum": 0,
                   "type": "integer",
                 },
-                "sec": Object {
+                "sec": {
                   "minimum": 0,
                   "type": "integer",
                 },
@@ -273,22 +273,22 @@ describe("generateJsonSchema", () => {
             "minItems": 3,
             "type": "array",
           },
-          "field_uint32": Object {
+          "field_uint32": {
             "description": "uint32 field",
             "minimum": 0,
             "type": "integer",
           },
-          "field_uint32_array": Object {
+          "field_uint32_array": {
             "description": "uint32 array field",
-            "items": Object {
+            "items": {
               "minimum": 0,
               "type": "integer",
             },
             "type": "array",
           },
-          "field_uint32_fixed_array": Object {
+          "field_uint32_fixed_array": {
             "description": "uint32 fixed-length array field",
-            "items": Object {
+            "items": {
               "minimum": 0,
               "type": "integer",
             },

package/dist/cjs/src/generateProto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateProto.d.ts","sourceRoot":"","sources":["../../../src/generateProto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAqB,MAAM,SAAS,CAAC;AAiBvF,wBAAgB,aAAa,CAC3B,MAAM,EAAE,qBAAqB,EAC7B,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CA4ER"}
+{"version":3,"file":"generateProto.d.ts","sourceRoot":"","sources":["../../../src/generateProto.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EAEtB,MAAM,SAAS,CAAC;AAiBjB,wBAAgB,aAAa,CAC3B,MAAM,EAAE,qBAAqB,EAC7B,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CAoGR"}

package/dist/cjs/src/generateProto.js

@@ -28,9 +28,27 @@ function generateProto(schema, nestedEnums) {
         });
         enumDefinitions.push(`  // ${enumSchema.description}\n  enum ${enumSchema.protobufEnumName} {\n    ${fields.join("\n\n    ")}\n  }\n`);
     }
-    let fieldNumber = 1;
+    const explicitFieldNumbers = new Set();
+    for (const field of schema.fields) {
+        if (field.protobufFieldNumber != undefined) {
+            if (explicitFieldNumbers.has(field.protobufFieldNumber)) {
+                throw new Error(`More than one field with protobufFieldNumber ${field.protobufFieldNumber}`);
+            }
+            explicitFieldNumbers.add(field.protobufFieldNumber);
+        }
+    }
+    let nextFieldNumber = 1;
+    const numberedFields = schema.fields.map((field) => {
+        if (field.protobufFieldNumber != undefined) {
+            return { ...field, protobufFieldNumber: field.protobufFieldNumber };
+        }
+        while (explicitFieldNumbers.has(nextFieldNumber)) {
+            ++nextFieldNumber;
+        }
+        return { ...field, protobufFieldNumber: nextFieldNumber++ };
+    });
     const imports = new Set();
-    const fields = schema.fields.map((field) => {
+    const fields = numberedFields.map((field) => {
         const lineComments = [];
         const qualifiers = [];
         if (field.array != undefined) {
@@ -65,7 +83,7 @@ function generateProto(schema, nestedEnums) {
             .trim()
             .split("\n")
             .map((line) => `  // ${line}\n`)
-            .join("")}  ${qualifiers.join(" ")} ${field.name} = ${fieldNumber++};${lineComments.length > 0 ? " // " + lineComments.join(", ") : ""}`;
+            .join("")}  ${qualifiers.join(" ")} ${field.name} = ${field.protobufFieldNumber};${lineComments.length > 0 ? " // " + lineComments.join(", ") : ""}`;
     });
     const definition = `// ${schema.description}\nmessage ${schema.name} {\n${enumDefinitions.join("\n\n")}${fields.join("\n\n")}\n}`;
     const outputSections = [

package/dist/cjs/src/generateProto.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateProto.js","sourceRoot":"","sources":["../../../src/generateProto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generateProto.js","sourceRoot":"","sources":["../../../src/generateProto.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/generateProto.test.js

@@ -10,11 +10,11 @@ describe("generateProto", () => {
         expect((0, generateProto_1.generateProto)(testFixtures_1.exampleMessage, [testFixtures_1.exampleEnum])).toMatchInlineSnapshot(`
       "// Generated by https://github.com/foxglove/schemas
 
-      syntax = \\"proto3\\";
+      syntax = "proto3";
 
-      import \\"foxglove/NestedMessage.proto\\";
-      import \\"google/protobuf/duration.proto\\";
-      import \\"google/protobuf/timestamp.proto\\";
+      import "foxglove/NestedMessage.proto";
+      import "google/protobuf/duration.proto";
+      import "google/protobuf/timestamp.proto";
 
       package foxglove;
 
@@ -38,67 +38,67 @@ describe("generateProto", () => {
         bool field_boolean = 3;
 
         // bytes field
-        bytes field_bytes = 4;
+        bytes field_bytes = 5;
 
         // float64 field
-        double field_float64 = 5;
+        double field_float64 = 6;
 
         // uint32 field
-        fixed32 field_uint32 = 6;
+        fixed32 field_uint32 = 7;
 
         // string field
-        string field_string = 7;
+        string field_string = 8;
 
         // duration array field
-        repeated google.protobuf.Duration field_duration_array = 8;
+        repeated google.protobuf.Duration field_duration_array = 9;
 
         // time array field
-        repeated google.protobuf.Timestamp field_time_array = 9;
+        repeated google.protobuf.Timestamp field_time_array = 10;
 
         // boolean array field
-        repeated bool field_boolean_array = 10;
+        repeated bool field_boolean_array = 11;
 
         // bytes array field
-        repeated bytes field_bytes_array = 11;
+        repeated bytes field_bytes_array = 12;
 
         // float64 array field
-        repeated double field_float64_array = 12;
+        repeated double field_float64_array = 13;
 
         // uint32 array field
-        repeated fixed32 field_uint32_array = 13;
+        repeated fixed32 field_uint32_array = 14;
 
         // string array field
-        repeated string field_string_array = 14;
+        repeated string field_string_array = 15;
 
         // duration fixed-length array field
-        repeated google.protobuf.Duration field_duration_fixed_array = 15; // length 3
+        repeated google.protobuf.Duration field_duration_fixed_array = 16; // length 3
 
         // time fixed-length array field
-        repeated google.protobuf.Timestamp field_time_fixed_array = 16; // length 3
+        repeated google.protobuf.Timestamp field_time_fixed_array = 17; // length 3
 
         // boolean fixed-length array field
-        repeated bool field_boolean_fixed_array = 17; // length 3
+        repeated bool field_boolean_fixed_array = 18; // length 3
 
         // bytes fixed-length array field
-        repeated bytes field_bytes_fixed_array = 18; // length 3
+        repeated bytes field_bytes_fixed_array = 19; // length 3
 
         // float64 fixed-length array field
-        repeated double field_float64_fixed_array = 19; // length 3
+        repeated double field_float64_fixed_array = 20; // length 3
 
         // uint32 fixed-length array field
-        repeated fixed32 field_uint32_fixed_array = 20; // length 3
+        repeated fixed32 field_uint32_fixed_array = 21; // length 3
 
         // string fixed-length array field
-        repeated string field_string_fixed_array = 21; // length 3
+        repeated string field_string_fixed_array = 22; // length 3
 
         // An enum field
-        ExampleProtoEnum field_enum = 22;
+        ExampleProtoEnum field_enum = 23;
 
         // An enum array field
-        repeated ExampleProtoEnum field_enum_array = 23;
+        repeated ExampleProtoEnum field_enum_array = 24;
 
         // A nested field
-        foxglove.NestedMessage field_nested = 24;
+        foxglove.NestedMessage field_nested = 25;
 
         // A nested array field
         // With
@@ -106,7 +106,7 @@ describe("generateProto", () => {
         // very
         // long
         // description
-        repeated foxglove.NestedMessage field_nested_array = 25;
+        repeated foxglove.NestedMessage field_nested_array = 4;
       }
       "
     `);

package/dist/cjs/src/generateRos.js

@@ -58,7 +58,7 @@ function* getSchemaDependencies(schema) {
         if (field.type.type === "nested") {
             if (field.type.schema.rosEquivalent != undefined) {
                 yield { type: "ros", name: field.type.schema.rosEquivalent };
-                yield* getRosDependencies(rosmsg_msgs_common_1.definitions[field.type.schema.rosEquivalent]);
+                yield* getRosDependencies(rosmsg_msgs_common_1.ros1[field.type.schema.rosEquivalent]);
             }
             else {
                 yield { type: "foxglove", schema: field.type.schema };
@@ -71,7 +71,7 @@ function* getRosDependencies(schema) {
     for (const field of schema.definitions) {
         if (field.isComplex === true) {
             yield { type: "ros", name: field.type };
-            yield* getRosDependencies(rosmsg_msgs_common_1.definitions[field.type]);
+            yield* getRosDependencies(rosmsg_msgs_common_1.ros1[field.type]);
         }
     }
 }
@@ -174,7 +174,7 @@ function generateRosMsgMergedSchema(schema, { rosVersion }) {
                 originalName: dep.name,
                 rosMsgInterfaceName: dep.name,
                 rosFullInterfaceName: dep.name,
-                fields: rosmsg_msgs_common_1.definitions[dep.name].definitions,
+                fields: rosmsg_msgs_common_1.ros1[dep.name].definitions,
             });
         }
         else {

package/dist/cjs/src/generateRos.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateRos.js","sourceRoot":"","sources":["../../../src/generateRos.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generateRos.js","sourceRoot":"","sources":["../../../src/generateRos.ts"],"names":[],"mappings":"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"}