@bufbuild/protobuf 0.0.4 → 0.0.5

package/dist/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/dist/cjs/type-registry.js

@@ -15,7 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeRegistry = void 0;
 /**
- * TypeRegistry is a basic type registry
+ * TypeRegistry is a simple registry for all message, enum, or service types.
  */
 class TypeRegistry {
     constructor() {
@@ -23,35 +23,80 @@ class TypeRegistry {
         this.enums = {};
         this.services = {};
     }
+    /**
+     * Find a message type by its protobuf type name.
+     */
     findMessage(typeName) {
         return this.messages[typeName];
     }
+    /**
+     * Find an enum type by its protobuf type name.
+     */
     findEnum(typeName) {
         return this.enums[typeName];
     }
+    /**
+     * Find a service type by its protobuf type name.
+     */
     findService(typeName) {
         return this.services[typeName];
     }
+    /**
+     * Create a new TypeRegistry from the given types.
+     */
+    static from(...types) {
+        const registry = new TypeRegistry();
+        for (const type of types) {
+            registry.add(type);
+        }
+        return registry;
+    }
+    /**
+     * @deprecated use TypeRegistry.from()
+     */
+    static fromIterable(types) {
+        return TypeRegistry.from(...types);
+    }
+    /**
+     * @deprecated use TypeRegistry.from()
+     */
+    static fromTypes(...types) {
+        return TypeRegistry.from(...types);
+    }
+    /**
+     * Add a type to the registry. For messages, the types used in message
+     * fields are added recursively. For services, the message types used
+     * for requests and responses are added recursively.
+     */
     add(type) {
         if ("fields" in type) {
-            this.messages[type.typeName] = type;
+            if (!this.findMessage(type.typeName)) {
+                this.messages[type.typeName] = type;
+                for (const field of type.fields.list()) {
+                    if (field.kind == "message") {
+                        this.add(field.T);
+                    }
+                    else if (field.kind == "map" && field.V.kind == "message") {
+                        this.add(field.V.T);
+                    }
+                    else if (field.kind == "enum") {
+                        this.add(field.T);
+                    }
+                }
+            }
         }
         else if ("methods" in type) {
-            this.services[type.typeName] = type;
+            if (!this.findService(type.typeName)) {
+                this.services[type.typeName] = type;
+                for (const method of Object.values(type.methods)) {
+                    this.add(method.I);
+                    this.add(method.O);
+                }
+            }
         }
         else {
             this.enums[type.typeName] = type;
         }
     }
-    static fromIterable(types) {
-        const r = new TypeRegistry();
-        for (const t of types) {
-            r.add(t);
-        }
-        return r;
-    }
-    static fromTypes(...types) {
-        return TypeRegistry.fromIterable(types);
-    }
 }
 exports.TypeRegistry = TypeRegistry;

package/dist/esm/type-registry.js

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 /**
- * TypeRegistry is a basic type registry
+ * TypeRegistry is a simple registry for all message, enum, or service types.
  */
 export class TypeRegistry {
     constructor() {
@@ -20,34 +20,79 @@ export class TypeRegistry {
         this.enums = {};
         this.services = {};
     }
+    /**
+     * Find a message type by its protobuf type name.
+     */
     findMessage(typeName) {
         return this.messages[typeName];
     }
+    /**
+     * Find an enum type by its protobuf type name.
+     */
     findEnum(typeName) {
         return this.enums[typeName];
     }
+    /**
+     * Find a service type by its protobuf type name.
+     */
     findService(typeName) {
         return this.services[typeName];
     }
+    /**
+     * Create a new TypeRegistry from the given types.
+     */
+    static from(...types) {
+        const registry = new TypeRegistry();
+        for (const type of types) {
+            registry.add(type);
+        }
+        return registry;
+    }
+    /**
+     * @deprecated use TypeRegistry.from()
+     */
+    static fromIterable(types) {
+        return TypeRegistry.from(...types);
+    }
+    /**
+     * @deprecated use TypeRegistry.from()
+     */
+    static fromTypes(...types) {
+        return TypeRegistry.from(...types);
+    }
+    /**
+     * Add a type to the registry. For messages, the types used in message
+     * fields are added recursively. For services, the message types used
+     * for requests and responses are added recursively.
+     */
     add(type) {
         if ("fields" in type) {
-            this.messages[type.typeName] = type;
+            if (!this.findMessage(type.typeName)) {
+                this.messages[type.typeName] = type;
+                for (const field of type.fields.list()) {
+                    if (field.kind == "message") {
+                        this.add(field.T);
+                    }
+                    else if (field.kind == "map" && field.V.kind == "message") {
+                        this.add(field.V.T);
+                    }
+                    else if (field.kind == "enum") {
+                        this.add(field.T);
+                    }
+                }
+            }
         }
         else if ("methods" in type) {
-            this.services[type.typeName] = type;
+            if (!this.findService(type.typeName)) {
+                this.services[type.typeName] = type;
+                for (const method of Object.values(type.methods)) {
+                    this.add(method.I);
+                    this.add(method.O);
+                }
+            }
         }
         else {
             this.enums[type.typeName] = type;
         }
     }
-    static fromIterable(types) {
-        const r = new TypeRegistry();
-        for (const t of types) {
-            r.add(t);
-        }
-        return r;
-    }
-    static fromTypes(...types) {
-        return TypeRegistry.fromIterable(types);
-    }
 }

package/dist/types/type-registry.d.ts

@@ -5,31 +5,64 @@ import type { ServiceType } from "./service-type.js";
  * IMessageTypeRegistry provides look-up for message types.
  */
 export interface IMessageTypeRegistry {
+    /**
+     * Find a message type by its protobuf type name.
+     */
     findMessage(typeName: string): MessageType | undefined;
 }
 /**
  * IEnumTypeRegistry provides look-up for enum types.
  */
 export interface IEnumTypeRegistry {
+    /**
+     * Find an enum type by its protobuf type name.
+     */
     findEnum(typeName: string): EnumType | undefined;
 }
 /**
  * IServiceTypeRegistry provides look-up for service types.
  */
 export interface IServiceTypeRegistry {
+    /**
+     * Find a service type by its protobuf type name.
+     */
     findService(typeName: string): ServiceType | undefined;
 }
 /**
- * TypeRegistry is a basic type registry
+ * TypeRegistry is a simple registry for all message, enum, or service types.
  */
 export declare class TypeRegistry implements IMessageTypeRegistry, IEnumTypeRegistry, IServiceTypeRegistry {
     private readonly messages;
     private readonly enums;
     private readonly services;
+    /**
+     * Find a message type by its protobuf type name.
+     */
     findMessage(typeName: string): MessageType | undefined;
+    /**
+     * Find an enum type by its protobuf type name.
+     */
     findEnum(typeName: string): EnumType | undefined;
+    /**
+     * Find a service type by its protobuf type name.
+     */
     findService(typeName: string): ServiceType | undefined;
-    private add;
+    /**
+     * Create a new TypeRegistry from the given types.
+     */
+    static from(...types: Array<MessageType | EnumType | ServiceType>): TypeRegistry;
+    /**
+     * @deprecated use TypeRegistry.from()
+     */
     static fromIterable(types: Iterable<MessageType>): TypeRegistry;
+    /**
+     * @deprecated use TypeRegistry.from()
+     */
     static fromTypes(...types: MessageType[]): TypeRegistry;
+    /**
+     * Add a type to the registry. For messages, the types used in message
+     * fields are added recursively. For services, the message types used
+     * for requests and responses are added recursively.
+     */
+    add(type: MessageType | EnumType | ServiceType): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "A complete implementation of protocol buffers in TypeScript, suitable for web browsers and Node.js.",
   "repository": {
@@ -12,7 +12,7 @@
   "scripts": {
     "clean": "rm -rf ./dist/cjs/* ./dist/esm/* ./dist/types/*",
     "build": "npm run build:cjs && npm run build:esm+types",
-    "build:cjs": "npx tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs",
+    "build:cjs": "npx tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
     "build:esm+types": "npx tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/types"
   },
   "type": "module",
@@ -23,7 +23,7 @@
     "default": "./dist/esm/index.js"
   },
   "devDependencies": {
-    "typescript": "^4.6.4"
+    "typescript": "^4.7.3"
   },
   "files": [
     "dist/**/"