@foxglove/schemas 1.7.2 → 1.8.0

package/dist/internal/exportTypeScriptSchemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exportTypeScriptSchemas.d.ts","sourceRoot":"","sources":["../../src/internal/exportTypeScriptSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,yBAAyB,EAG1B,MAAM,sBAAsB,CAAC;AAG9B;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,yBAA8B,GACtC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAyBrB"}
+{"version":3,"file":"exportTypeScriptSchemas.d.ts","sourceRoot":"","sources":["../../src/internal/exportTypeScriptSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAA+B,MAAM,sBAAsB,CAAC;AAM9F;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,yBAA8B,GACtC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CA8BrB"}

package/dist/internal/exportTypeScriptSchemas.js

@@ -10,21 +10,25 @@ const schemas_1 = require("./schemas");
  */
 function exportTypeScriptSchemas(options = {}) {
     const schemas = new Map();
-    for (const schema of Object.values(schemas_1.foxgloveMessageSchemas)) {
+    // Use legacy `Time` instead of `Timestamp`
+    const { Timestamp: _, ...foxgloveMessageSchemas } = schemas_1.foxgloveMessageSchemas;
+    for (const schema of Object.values(foxgloveMessageSchemas)) {
         schemas.set(schema.name, (0, generateTypeScript_1.generateTypeScript)(schema, options));
     }
     for (const schema of Object.values(schemas_1.foxgloveEnumSchemas)) {
         schemas.set(schema.name, (0, generateTypeScript_1.generateTypeScript)(schema, options));
     }
-    schemas.set("Duration", generateTypeScript_1.DURATION_TS);
     schemas.set("Time", generateTypeScript_1.TIME_TS);
     const allSchemaNames = [
-        ...Object.values(schemas_1.foxgloveMessageSchemas),
+        ...Object.values(foxgloveMessageSchemas),
         ...Object.values(schemas_1.foxgloveEnumSchemas),
-    ].sort((a, b) => a.name.localeCompare(b.name));
+    ]
+        .map((schema) => schema.name)
+        .concat(["Time"])
+        .sort((a, b) => a.localeCompare(b));
     let indexTS = "";
-    for (const schema of allSchemaNames) {
-        indexTS += `export * from "./${schema.name}";\n`;
+    for (const schemaName of allSchemaNames) {
+        indexTS += `export * from "./${schemaName}";\n`;
     }
     schemas.set("index", indexTS);
     return schemas;

package/dist/internal/exportTypeScriptSchemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"exportTypeScriptSchemas.js","sourceRoot":"","sources":["../../src/internal/exportTypeScriptSchemas.ts"],"names":[],"mappings":";;AAaA,0DA2BC;AAxCD,6DAK8B;AAC9B,uCAAwE;AAExE;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,UAAqC,EAAE;IAEvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE1C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC,EAAE,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAA,uCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,6BAAmB,CAAC,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAA,uCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,gCAAW,CAAC,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,4BAAO,CAAC,CAAC;IAE7B,MAAM,cAAc,GAAG;QACrB,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC;QACxC,GAAG,MAAM,CAAC,MAAM,CAAC,6BAAmB,CAAC;KACtC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QACpC,OAAO,IAAI,oBAAoB,MAAM,CAAC,IAAI,MAAM,CAAC;IACnD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE9B,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"exportTypeScriptSchemas.js","sourceRoot":"","sources":["../../src/internal/exportTypeScriptSchemas.ts"],"names":[],"mappings":";;AAWA,0DAgCC;AA3CD,6DAA8F;AAC9F,uCAGmB;AAEnB;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,UAAqC,EAAE;IAEvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE1C,2CAA2C;IAC3C,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,GAAG,sBAAsB,EAAE,GAAG,gCAAgC,CAAC;IAErF,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAA,uCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,6BAAmB,CAAC,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAA,uCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,4BAAO,CAAC,CAAC;IAE7B,MAAM,cAAc,GAAG;QACrB,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;QACxC,GAAG,MAAM,CAAC,MAAM,CAAC,6BAAmB,CAAC;KACtC;SACE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;SAC5B,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;SAChB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE,CAAC;QACxC,OAAO,IAAI,oBAAoB,UAAU,MAAM,CAAC;IAClD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE9B,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/internal/generateFlatbufferSchema.d.ts

@@ -1,6 +1,10 @@
-import { FoxgloveEnumSchema, FoxgloveSchema } from "./types";
+import { FoxgloveEnumSchema, FoxgloveMessageSchema, FoxgloveSchema } from "./types";
 export declare const BYTE_VECTOR_FB = "\nnamespace foxglove;\n\n/// Used for nesting byte vectors\ntable ByteVector {\n  data:[uint8] (id: 0);\n}\nroot_type ByteVector;\n";
 export declare const TIME_FB = "\nnamespace foxglove;\n\nstruct Time {\n  /// Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z\n  sec:uint32;\n  /// Nano-second fractions from 0 to 999,999,999 inclusive\n  nsec:uint32;\n}\n";
-export declare const DURATION_FB = "\nnamespace foxglove;\n\nstruct Duration {\n  /// Signed seconds of the span of time. Must be from -315,576,000,000 to +315,576,000,000 inclusive.\n  sec:int32;\n  /// if sec === 0 : -999,999,999 <= nsec <= +999,999,999\n  /// otherwise sign of sec must match sign of nsec or be 0 and abs(nsec) <= 999,999,999\n  nsec:int32;\n}\n";
+export declare const DURATION_FB = "\nnamespace foxglove;\n\nstruct Duration {\n  /// Signed seconds of the span of time.\n  sec:int32;\n  /// if sec === 0 : -999,999,999 <= nsec <= +999,999,999\n  /// otherwise sign of sec must match sign of nsec or be 0 and abs(nsec) <= 999,999,999\n  nsec:int32;\n}\n";
+/**
+ * Time is used instead of Timestamp for backwards compatibility.
+ */
+export declare function flatbufferMessageSchemaName(schema: FoxgloveMessageSchema): string;
 export declare function generateFlatbuffers(schema: FoxgloveSchema, nestedEnums: FoxgloveEnumSchema[]): string;
 //# sourceMappingURL=generateFlatbufferSchema.d.ts.map

package/dist/internal/generateFlatbufferSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateFlatbufferSchema.d.ts","sourceRoot":"","sources":["../../src/internal/generateFlatbufferSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAqB,cAAc,EAAE,MAAM,SAAS,CAAC;AAGhF,eAAO,MAAM,cAAc,wIAQ1B,CAAC;AAGF,eAAO,MAAM,OAAO,wNASnB,CAAC;AAEF,eAAO,MAAM,WAAW,8UAUvB,CAAC;AAiBF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CAqIR"}
+{"version":3,"file":"generateFlatbufferSchema.d.ts","sourceRoot":"","sources":["../../src/internal/generateFlatbufferSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EAErB,cAAc,EACf,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,cAAc,wIAQ1B,CAAC;AAEF,eAAO,MAAM,OAAO,wNASnB,CAAC;AAEF,eAAO,MAAM,WAAW,iRAUvB,CAAC;AAmBF;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAKjF;AAYD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CA4HR"}

package/dist/internal/generateFlatbufferSchema.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DURATION_FB = exports.TIME_FB = exports.BYTE_VECTOR_FB = void 0;
+exports.flatbufferMessageSchemaName = flatbufferMessageSchemaName;
 exports.generateFlatbuffers = generateFlatbuffers;
 // Flatbuffers only supports nested vectors via table
 exports.BYTE_VECTOR_FB = `
@@ -12,7 +13,6 @@ table ByteVector {
 }
 root_type ByteVector;
 `;
-// Same as protobuf wellknown types
 exports.TIME_FB = `
 namespace foxglove;
 
@@ -27,7 +27,7 @@ exports.DURATION_FB = `
 namespace foxglove;
 
 struct Duration {
-  /// Signed seconds of the span of time. Must be from -315,576,000,000 to +315,576,000,000 inclusive.
+  /// Signed seconds of the span of time.
   sec:int32;
   /// if sec === 0 : -999,999,999 <= nsec <= +999,999,999
   /// otherwise sign of sec must match sign of nsec or be 0 and abs(nsec) <= 999,999,999
@@ -36,6 +36,8 @@ struct Duration {
 `;
 function primitiveToFlatbuffers(type) {
     switch (type) {
+        case "int32":
+            return "int32";
         case "uint32":
             return "uint32";
         case "bytes":
@@ -48,6 +50,24 @@ function primitiveToFlatbuffers(type) {
             return "double";
     }
 }
+/**
+ * Time is used instead of Timestamp for backwards compatibility.
+ */
+function flatbufferMessageSchemaName(schema) {
+    if (schema.name === "Timestamp") {
+        return "Time";
+    }
+    return schema.name;
+}
+/**
+ * Time and Duration are not namespaced, for backwards compatibility.
+ */
+function namespacedMessageSchemaName(schema) {
+    if (schema.name === "Timestamp" || schema.name === "Duration") {
+        return flatbufferMessageSchemaName(schema);
+    }
+    return `foxglove.${flatbufferMessageSchemaName(schema)}`;
+}
 function generateFlatbuffers(schema, nestedEnums) {
     const enumDefinitions = [];
     for (const enumSchema of nestedEnums) {
@@ -88,19 +108,11 @@ function generateFlatbuffers(schema, nestedEnums) {
                         type = field.type.enum.name;
                         break;
                     case "nested":
-                        type = `foxglove.${field.type.schema.name}`;
-                        imports.add(field.type.schema.name);
+                        type = namespacedMessageSchemaName(field.type.schema);
+                        imports.add(flatbufferMessageSchemaName(field.type.schema));
                         break;
                     case "primitive":
-                        if (field.type.name === "time") {
-                            type = "Time";
-                            imports.add(`Time`);
-                        }
-                        else if (field.type.name === "duration") {
-                            type = "Duration";
-                            imports.add(`Duration`);
-                        }
-                        else if (field.type.name === "bytes" && isArray) {
+                        if (field.type.name === "bytes" && isArray) {
                             type = "ByteVector";
                             imports.add("ByteVector");
                         }
@@ -116,8 +128,7 @@ function generateFlatbuffers(schema, nestedEnums) {
                 }
                 let defaultValue;
                 if (field.defaultValue != undefined && !isArray) {
-                    if (field.type.type === "primitive" &&
-                        !(field.type.name === "duration" || field.type.name === "time")) {
+                    if (field.type.type === "primitive") {
                         if (typeof field.defaultValue === "string") {
                             defaultValue = `"${field.defaultValue}"`;
                         }

package/dist/internal/generateFlatbufferSchema.js.map

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

package/dist/internal/generateJsonSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateJsonSchema.d.ts","sourceRoot":"","sources":["../../src/internal/generateJsonSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqB,MAAM,SAAS,CAAC;AAiCnE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiDzF"}
+{"version":3,"file":"generateJsonSchema.d.ts","sourceRoot":"","sources":["../../src/internal/generateJsonSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqB,MAAM,SAAS,CAAC;AA8CnE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiDzF"}

package/dist/internal/generateJsonSchema.js

@@ -3,49 +3,61 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateJsonSchema = generateJsonSchema;
 function primitiveToJsonSchema(type) {
     switch (type) {
+        case "bytes":
+            return { type: "string", contentEncoding: "base64" };
         case "string":
             return { type: "string" };
         case "boolean":
             return { type: "boolean" };
         case "float64":
             return { type: "number" };
+        case "int32":
+            return { type: "integer" };
         case "uint32":
             return { type: "integer", minimum: 0 };
-        case "time":
-            return {
-                type: "object",
-                title: "time",
-                properties: {
-                    sec: { type: "integer", minimum: 0 },
-                    nsec: { type: "integer", minimum: 0, maximum: 999_999_999 },
-                },
-            };
-        case "duration":
-            return {
-                type: "object",
-                title: "duration",
-                properties: {
-                    sec: { type: "integer" },
-                    nsec: { type: "integer", minimum: 0, maximum: 999_999_999 },
-                },
-            };
     }
 }
+/**
+ * Applies additional constraints on time and duration types.
+ */
+function timeOrDurationToJsonSchema(schema) {
+    if (schema.name === "Timestamp") {
+        return {
+            type: "object",
+            title: "time",
+            properties: {
+                sec: { type: "integer", minimum: 0 },
+                nsec: { type: "integer", minimum: 0, maximum: 999_999_999 },
+            },
+        };
+    }
+    if (schema.name === "Duration") {
+        return {
+            type: "object",
+            title: "duration",
+            properties: {
+                sec: { type: "integer" },
+                nsec: { type: "integer", minimum: 0, maximum: 999_999_999 },
+            },
+        };
+    }
+    throw new Error(`Unknown time or duration schema: ${schema.name}`);
+}
 function generateJsonSchema(schema) {
     const properties = {};
     for (const field of schema.fields) {
         let fieldType;
         switch (field.type.type) {
             case "primitive":
-                if (field.type.name === "bytes") {
-                    fieldType = { type: "string", contentEncoding: "base64" };
+                fieldType = primitiveToJsonSchema(field.type.name);
+                break;
+            case "nested":
+                if (field.type.schema.name === "Timestamp" || field.type.schema.name === "Duration") {
+                    fieldType = timeOrDurationToJsonSchema(field.type.schema);
                 }
                 else {
-                    fieldType = primitiveToJsonSchema(field.type.name);
+                    fieldType = generateJsonSchema(field.type.schema);
                 }
-                break;
-            case "nested":
-                fieldType = generateJsonSchema(field.type.schema);
                 delete fieldType.$comment;
                 break;
             case "enum":

package/dist/internal/generateJsonSchema.js.map

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

package/dist/internal/generateOmgIdl.d.ts

@@ -1,5 +1,4 @@
-import { FoxgloveSchema } from "./types";
-export declare const TIME_IDL = "module foxglove {\n\nstruct Time {\n  uint32 sec;\n  uint32 nsec;\n};\n\n};\n";
-export declare const DURATION_IDL = "module foxglove {\n\nstruct Duration {\n  int32 sec;\n  uint32 nsec;\n};\n\n};\n";
+import { FoxgloveMessageSchema, FoxgloveSchema } from "./types";
+export declare function omgIdlMessageSchemaName(schema: FoxgloveMessageSchema): string;
 export declare function generateOmgIdl(schema: FoxgloveSchema): string;
 //# sourceMappingURL=generateOmgIdl.d.ts.map

package/dist/internal/generateOmgIdl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateOmgIdl.d.ts","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,cAAc,EAAE,MAAM,SAAS,CAAC;AAiB5D,eAAO,MAAM,QAAQ,kFASpB,CAAC;AAEF,eAAO,MAAM,YAAY,qFASxB,CAAC;AAEF,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAqG7D"}
+{"version":3,"file":"generateOmgIdl.d.ts","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqB,cAAc,EAAE,MAAM,SAAS,CAAC;AAmBnF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAK7E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CA8F7D"}

package/dist/internal/generateOmgIdl.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DURATION_IDL = exports.TIME_IDL = void 0;
+exports.omgIdlMessageSchemaName = omgIdlMessageSchemaName;
 exports.generateOmgIdl = generateOmgIdl;
 function primitiveToIdl(type) {
     switch (type) {
@@ -12,30 +12,18 @@ function primitiveToIdl(type) {
             return "boolean";
         case "float64":
             return "double";
+        case "int32":
+            return "int32";
         case "uint32":
             return "uint32";
     }
 }
-exports.TIME_IDL = `\
-module foxglove {
-
-struct Time {
-  uint32 sec;
-  uint32 nsec;
-};
-
-};
-`;
-exports.DURATION_IDL = `\
-module foxglove {
-
-struct Duration {
-  int32 sec;
-  uint32 nsec;
-};
-
-};
-`;
+function omgIdlMessageSchemaName(schema) {
+    if (schema.name === "Timestamp") {
+        return "Time";
+    }
+    return schema.name;
+}
 function generateOmgIdl(schema) {
     const imports = new Set();
     let definition;
@@ -65,21 +53,14 @@ function generateOmgIdl(schema) {
                         imports.add(field.type.enum.name);
                         break;
                     case "nested":
-                        fieldType = field.type.schema.name;
-                        imports.add(field.type.schema.name);
+                        {
+                            const schemaName = omgIdlMessageSchemaName(field.type.schema);
+                            fieldType = schemaName;
+                            imports.add(schemaName);
+                        }
                         break;
                     case "primitive":
-                        if (field.type.name === "time") {
-                            fieldType = "Time";
-                            imports.add("Time");
-                        }
-                        else if (field.type.name === "duration") {
-                            fieldType = "Duration";
-                            imports.add("Duration");
-                        }
-                        else {
-                            fieldType = primitiveToIdl(field.type.name);
-                        }
+                        fieldType = primitiveToIdl(field.type.name);
                         break;
                 }
                 let arraySize = "";
@@ -112,7 +93,7 @@ function generateOmgIdl(schema) {
                 }
                 return `${comment}\n  ${defaultAnnotation}${fieldType} ${field.name}${arraySize};`;
             });
-            definition = `// ${schema.description}\nstruct ${schema.name} {\n  ${fields.join("\n\n  ")}\n};`;
+            definition = `// ${schema.description}\nstruct ${omgIdlMessageSchemaName(schema)} {\n  ${fields.join("\n\n  ")}\n};`;
             break;
         }
     }

package/dist/internal/generateOmgIdl.js.map

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

package/dist/internal/generateOmgIdl.test.js

@@ -127,14 +127,12 @@ describe("generateOmgIdl", () => {
     `);
     });
     const allIdlFiles = new Map([
-        ["Time", generateOmgIdl_1.TIME_IDL],
-        ["Duration", generateOmgIdl_1.DURATION_IDL],
-        ...Object.entries(schemas_1.foxgloveMessageSchemas).map(([name, schema]) => [
-            name,
+        ...Object.values(schemas_1.foxgloveMessageSchemas).map((schema) => [
+            (0, generateOmgIdl_1.omgIdlMessageSchemaName)(schema),
             (0, generateOmgIdl_1.generateOmgIdl)(schema),
         ]),
-        ...Object.entries(schemas_1.foxgloveEnumSchemas).map(([name, schema]) => [
-            name,
+        ...Object.values(schemas_1.foxgloveEnumSchemas).map((schema) => [
+            schema.name,
             (0, generateOmgIdl_1.generateOmgIdl)(schema),
         ]),
     ]);

package/dist/internal/generateOmgIdl.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateOmgIdl.test.js","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.test.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AAEnD,qDAA0E;AAC1E,uCAAwE;AACxE,iDAA6D;AAE7D,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,MAAM,CAAC,IAAA,+BAAc,EAAC,0BAAW,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;KAkBzD,CAAC,CAAC;QACH,MAAM,CAAC,IAAA,+BAAc,EAAC,6BAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAmG5D,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAiB;QAC1C,CAAC,MAAM,EAAE,yBAAQ,CAAC;QAClB,CAAC,UAAU,EAAE,6BAAY,CAAC;QAC1B,GAAG,MAAM,CAAC,OAAO,CAAC,gCAAsB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAoB,EAAE,CAAC;YAClF,IAAI;YACJ,IAAA,+BAAc,EAAC,MAAM,CAAC;SACvB,CAAC;QACF,GAAG,MAAM,CAAC,OAAO,CAAC,6BAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAoB,EAAE,CAAC;YAC/E,IAAI;YACJ,IAAA,+BAAc,EAAC,MAAM,CAAC;SACvB,CAAC;KACH,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC,CAAC,CAAC,oCAAoC,EAAE,CAAC,MAAM,EAAE,EAAE;QAC9F,MAAM,cAAc,GAAG,oCAAoC,CAAC;QAC5D,IAAI,GAAG,GAAG,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAC;QACjC,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,IAAY,EAAE,EAAE;gBACzD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACnC,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;gBAC7C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,wBAAQ,EAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,CAAC,GAAG,EAAE,CACV,IAAA,+BAAc,EAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,EAAE;YACf,gBAAgB,EAAE,KAAK;YACvB,gBAAgB,EAAE,KAAK;YACvB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;SAClC,CAAC,CACH,CAAC,kCAAkC,CAClC,mFAAmF,CACpF,CAAC;QACF,MAAM,CAAC,GAAG,EAAE,CACV,IAAA,+BAAc,EAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,EAAE;YACf,gBAAgB,EAAE,KAAK;YACvB,gBAAgB,EAAE,KAAK;YACvB,MAAM,EAAE;gBACN,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE;gBACvB,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE;aACxB;SACF,CAAC,CACH,CAAC,kCAAkC,CAClC,mFAAmF,CACpF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"generateOmgIdl.test.js","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.test.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AAEnD,qDAA2E;AAC3E,uCAAwE;AACxE,iDAA6D;AAE7D,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,MAAM,CAAC,IAAA,+BAAc,EAAC,0BAAW,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;KAkBzD,CAAC,CAAC;QACH,MAAM,CAAC,IAAA,+BAAc,EAAC,6BAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAmG5D,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAiB;QAC1C,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAoB,EAAE,CAAC;YACzE,IAAA,wCAAuB,EAAC,MAAM,CAAC;YAC/B,IAAA,+BAAc,EAAC,MAAM,CAAC;SACvB,CAAC;QACF,GAAG,MAAM,CAAC,MAAM,CAAC,6BAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAoB,EAAE,CAAC;YACtE,MAAM,CAAC,IAAI;YACX,IAAA,+BAAc,EAAC,MAAM,CAAC;SACvB,CAAC;KACH,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC,CAAC,CAAC,oCAAoC,EAAE,CAAC,MAAM,EAAE,EAAE;QAC9F,MAAM,cAAc,GAAG,oCAAoC,CAAC;QAC5D,IAAI,GAAG,GAAG,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAC;QACjC,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,IAAY,EAAE,EAAE;gBACzD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACnC,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;gBAC7C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,wBAAQ,EAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,CAAC,GAAG,EAAE,CACV,IAAA,+BAAc,EAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,EAAE;YACf,gBAAgB,EAAE,KAAK;YACvB,gBAAgB,EAAE,KAAK;YACvB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;SAClC,CAAC,CACH,CAAC,kCAAkC,CAClC,mFAAmF,CACpF,CAAC;QACF,MAAM,CAAC,GAAG,EAAE,CACV,IAAA,+BAAc,EAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,EAAE;YACf,gBAAgB,EAAE,KAAK;YACvB,gBAAgB,EAAE,KAAK;YACvB,MAAM,EAAE;gBACN,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE;gBACvB,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE;aACxB;SACF,CAAC,CACH,CAAC,kCAAkC,CAClC,mFAAmF,CACpF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/internal/generateProto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateProto.d.ts","sourceRoot":"","sources":["../../src/internal/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"}
+{"version":3,"file":"generateProto.d.ts","sourceRoot":"","sources":["../../src/internal/generateProto.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EAEtB,MAAM,SAAS,CAAC;AAuCjB,wBAAgB,aAAa,CAC3B,MAAM,EAAE,qBAAqB,EAC7B,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CA4FR"}

package/dist/internal/generateProto.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateProto = generateProto;
 function primitiveToProto(type) {
     switch (type) {
+        case "int32":
+            return "sfixed32";
         case "uint32":
             return "fixed32";
         case "bytes":
@@ -15,6 +17,24 @@ function primitiveToProto(type) {
             return "double";
     }
 }
+/**
+ * The protobuf type name for a message schema (e.g. "foxglove.Pose" or "google.protobuf.Timestamp")
+ */
+function protoName(schema) {
+    if (schema.protoEquivalent != undefined) {
+        return schema.protoEquivalent;
+    }
+    return `foxglove.${schema.name}`;
+}
+/**
+ * The import path for a type (e.g. "foxglove/Pose" or "google/protobuf/timestamp")
+ */
+function protoImportPath(schema) {
+    if (schema.protoEquivalent != undefined) {
+        return schema.protoEquivalent.replace(/\./g, "/").toLowerCase();
+    }
+    return `foxglove/${schema.name}`;
+}
 function generateProto(schema, nestedEnums) {
     const enumDefinitions = [];
     for (const enumSchema of nestedEnums) {
@@ -62,21 +82,11 @@ function generateProto(schema, nestedEnums) {
                 qualifiers.push(field.type.enum.protobufEnumName);
                 break;
             case "nested":
-                qualifiers.push(`foxglove.${field.type.schema.name}`);
-                imports.add(`foxglove/${field.type.schema.name}`);
+                qualifiers.push(protoName(field.type.schema));
+                imports.add(protoImportPath(field.type.schema));
                 break;
             case "primitive":
-                if (field.type.name === "time") {
-                    qualifiers.push("google.protobuf.Timestamp");
-                    imports.add(`google/protobuf/timestamp`);
-                }
-                else if (field.type.name === "duration") {
-                    qualifiers.push("google.protobuf.Duration");
-                    imports.add(`google/protobuf/duration`);
-                }
-                else {
-                    qualifiers.push(primitiveToProto(field.type.name));
-                }
+                qualifiers.push(primitiveToProto(field.type.name));
                 break;
         }
         return `${field.description

package/dist/internal/generateProto.js.map

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

package/dist/internal/generatePyclass.d.ts

@@ -24,11 +24,11 @@ export declare function generateSchemaModuleRegistration(schemas: FoxgloveSchema
  * Generate a concrete `pyclass`-annotated Channel struct for each message schema, since generics
  * can't be exported directly to Python.
  */
-export declare function generateChannelClasses(schemas: FoxgloveMessageSchema[]): string;
+export declare function generateChannelClasses(messageSchemas: FoxgloveMessageSchema[]): string;
 /**
  * Generate a .pyi stub for the given schema channels.
  */
-export declare function generatePyChannelStub(schemas: FoxgloveMessageSchema[]): string;
+export declare function generatePyChannelStub(messageSchemas: FoxgloveMessageSchema[]): string;
 /**
  * Generate a module __init__ file re-exporting all channels to the public API.
  */

package/dist/internal/generatePyclass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generatePyclass.d.ts","sourceRoot":"","sources":["../../src/internal/generatePyclass.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EAErB,cAAc,EACf,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAwB9C;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAE9D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CAwEtE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CAiCxE;AAsVD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CAmBlF;AA6BD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,MAAM,CA0H/E;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAkF9E;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAchF"}
+{"version":3,"file":"generatePyclass.d.ts","sourceRoot":"","sources":["../../src/internal/generatePyclass.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EAErB,cAAc,EACf,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAwB9C;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAK9D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CA4EtE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CA6BxE;AAoXD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CAiBlF;AA6CD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,cAAc,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAmItF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAsFrF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAiBhF"}