@aptre/protobuf-es-lite 0.2.11 → 0.2.12

package/dist/google/protobuf/struct.pb.js

@@ -63,8 +63,18 @@ export const Value = createMessageType({
     typeName: "google.protobuf.Value",
     fields: [
         { no: 1, name: "null_value", kind: "enum", T: NullValue_Enum },
-        { no: 2, name: "number_value", kind: "scalar", T: 1 /* ScalarType.DOUBLE */ },
-        { no: 3, name: "string_value", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+        {
+            no: 2,
+            name: "number_value",
+            kind: "scalar",
+            T: 1 /* ScalarType.DOUBLE */,
+        },
+        {
+            no: 3,
+            name: "string_value",
+            kind: "scalar",
+            T: 9 /* ScalarType.STRING */,
+        },
         { no: 4, name: "bool_value", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
         { no: 5, name: "struct_value", kind: "message", T: () => Struct },
         { no: 6, name: "list_value", kind: "message", T: () => ListValue },
@@ -74,7 +84,13 @@ export const Value = createMessageType({
 export const Struct = createMessageType({
     typeName: "google.protobuf.Struct",
     fields: [
-        { no: 1, name: "fields", kind: "map", K: 9 /* ScalarType.STRING */, V: { kind: "message", T: () => Value } },
+        {
+            no: 1,
+            name: "fields",
+            kind: "map",
+            K: 9 /* ScalarType.STRING */,
+            V: { kind: "message", T: () => Value },
+        },
     ],
     packedByDefault: true,
 });

package/dist/google/protobuf/type.pb.js

@@ -293,9 +293,20 @@ export const Field = createMessageType({
         { no: 6, name: "type_url", kind: "scalar", T: 9 /* ScalarType.STRING */ },
         { no: 7, name: "oneof_index", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
         { no: 8, name: "packed", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
-        { no: 9, name: "options", kind: "message", T: () => Option, repeated: true },
+        {
+            no: 9,
+            name: "options",
+            kind: "message",
+            T: () => Option,
+            repeated: true,
+        },
         { no: 10, name: "json_name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-        { no: 11, name: "default_value", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+        {
+            no: 11,
+            name: "default_value",
+            kind: "scalar",
+            T: 9 /* ScalarType.STRING */,
+        },
     ],
     packedByDefault: true,
 });
@@ -304,8 +315,20 @@ export const Type = createMessageType({
     fields: [
         { no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
         { no: 2, name: "fields", kind: "message", T: () => Field, repeated: true },
-        { no: 3, name: "oneofs", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
-        { no: 4, name: "options", kind: "message", T: () => Option, repeated: true },
+        {
+            no: 3,
+            name: "oneofs",
+            kind: "scalar",
+            T: 9 /* ScalarType.STRING */,
+            repeated: true,
+        },
+        {
+            no: 4,
+            name: "options",
+            kind: "message",
+            T: () => Option,
+            repeated: true,
+        },
         { no: 5, name: "source_context", kind: "message", T: () => SourceContext },
         { no: 6, name: "syntax", kind: "enum", T: Syntax_Enum },
         { no: 7, name: "edition", kind: "scalar", T: 9 /* ScalarType.STRING */ },
@@ -317,7 +340,13 @@ export const EnumValue = createMessageType({
     fields: [
         { no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
         { no: 2, name: "number", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
-        { no: 3, name: "options", kind: "message", T: () => Option, repeated: true },
+        {
+            no: 3,
+            name: "options",
+            kind: "message",
+            T: () => Option,
+            repeated: true,
+        },
     ],
     packedByDefault: true,
 });
@@ -325,8 +354,20 @@ export const Enum = createMessageType({
     typeName: "google.protobuf.Enum",
     fields: [
         { no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-        { no: 2, name: "enumvalue", kind: "message", T: () => EnumValue, repeated: true },
-        { no: 3, name: "options", kind: "message", T: () => Option, repeated: true },
+        {
+            no: 2,
+            name: "enumvalue",
+            kind: "message",
+            T: () => EnumValue,
+            repeated: true,
+        },
+        {
+            no: 3,
+            name: "options",
+            kind: "message",
+            T: () => Option,
+            repeated: true,
+        },
         { no: 4, name: "source_context", kind: "message", T: () => SourceContext },
         { no: 5, name: "syntax", kind: "enum", T: Syntax_Enum },
         { no: 6, name: "edition", kind: "scalar", T: 9 /* ScalarType.STRING */ },

package/dist/json.d.ts

@@ -1,5 +1,4 @@
 import { FieldInfo, FieldList } from "./field.js";
-import { IMessageTypeRegistry } from "./type-registry.js";
 /**
  * Options for parsing JSON data.
  */
@@ -10,10 +9,6 @@ export interface JsonReadOptions {
      * unrecognized enum string representations.
      */
     ignoreUnknownFields: boolean;
-    /**
-     * This option is required to read `google.protobuf.Any`
-     */
-    typeRegistry?: IMessageTypeRegistry;
 }
 /**
  * Options for serializing to JSON.
@@ -40,10 +35,6 @@ export interface JsonWriteOptions {
      * field name.
      */
     useProtoFieldName: boolean;
-    /**
-     * This option is required to write `google.protobuf.Any`
-     */
-    typeRegistry?: IMessageTypeRegistry;
 }
 /**
  * Options for serializing to JSON.

package/dist/json.js

@@ -90,28 +90,6 @@ export function writeMessage(message, fields, options) {
                     jsonValue;
             }
         }
-        // TODO: handle extensions
-        /*
-            const registry = options.typeRegistry;
-            if (registry?.findExtensionFor) {
-              for (const uf of listUnknownFields(message)) {
-                const ext = registry.findExtensionFor(typeName, uf.no);
-                if (ext && hasExtension(message, ext)) {
-                  // We pass on the options as BinaryReadOptions, so that users can bring their own
-                  // binary reader factory if necessary.
-                  const value = getExtension(
-                    message,
-                    ext,
-                    options as Partial<BinaryReadOptions>,
-                  );
-                  const jsonValue = writeField(ext.field, value, options);
-                  if (jsonValue !== undefined) {
-                    json[ext.field.jsonName] = jsonValue;
-                  }
-                }
-              }
-            }
-            */
     }
     catch (e) {
         const m = field ?

package/dist/message.d.ts

@@ -55,15 +55,15 @@ export interface MessageType<T extends Message<T>> {
      * If a message field is already present, it will be merged with the
      * new data.
      */
-    fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): CompleteMessage<T>;
+    fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): T;
     /**
      * Parse a message from a JSON value.
      */
-    fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): CompleteMessage<T>;
+    fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): T;
     /**
      * Parse a message from a JSON string.
      */
-    fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): CompleteMessage<T>;
+    fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): T;
     /**
      * Returns true if the given arguments have equal field values, recursively.
      * Will also return true if both messages are `undefined` or `null`.

package/dist/message.js

@@ -172,13 +172,13 @@ export function createMessageType(params) {
             return cloneMessage(a, fields);
         },
         fromBinary(bytes, options) {
-            const message = this.create();
+            const message = {};
             const opt = makeBinaryReadOptions(options);
             readBinaryMessage(message, fields, opt.readerFactory(bytes), bytes.byteLength, opt, delimitedMessageEncoding);
             return message;
         },
         fromJson(jsonValue, options) {
-            const message = this.create();
+            const message = {};
             const opts = makeJsonReadOptions(options);
             readJsonMessage(fields, typeName, jsonValue, opts, message);
             return message;

package/dist/partial.js

@@ -1,5 +1,4 @@
 import { resolveMessageType } from "./field.js";
-import { isCompleteMessage } from "./is-message.js";
 import { ScalarType } from "./scalar.js";
 // applyPartialMessage applies a partial message to a message.
 export function applyPartialMessage(source, target, fields) {
@@ -9,7 +8,6 @@ export function applyPartialMessage(source, target, fields) {
     for (const member of fields.byMember()) {
         const localName = member.localName, t = target, s = source;
         if (s[localName] === undefined) {
-            // TODO if source is a Message instance, we should use isFieldSet() here to support future field presence
             continue;
         }
         switch (member.kind) {
@@ -21,9 +19,8 @@ export function applyPartialMessage(source, target, fields) {
                 const sourceField = member.findField(sk);
                 let val = s[localName].value;
                 if (sourceField?.kind == "message") {
-                    const messageType = resolveMessageType(sourceField.T);
-                    if (!isCompleteMessage(val, messageType.fields.list())) {
-                        val = messageType.create(val);
+                    if (val === undefined) {
+                        val = {};
                     }
                 }
                 else if (sourceField &&
@@ -62,9 +59,9 @@ export function applyPartialMessage(source, target, fields) {
                         for (const k of Object.keys(s[localName])) {
                             let val = s[localName][k];
                             if (!messageType.fieldWrapper) {
-                                // We only take partial input for messages that are not a wrapper type.
-                                // For those messages, we recursively normalize the partial input.
-                                val = messageType.create(val);
+                                if (val === undefined) {
+                                    val = {};
+                                }
                             }
                             t[localName][k] = val;
                         }
@@ -74,7 +71,7 @@ export function applyPartialMessage(source, target, fields) {
             case "message":
                 const mt = resolveMessageType(member.T);
                 if (member.repeated) {
-                    t[localName] = s[localName].map((val) => isCompleteMessage(val, mt.fields.list()) ? val : mt.create(val));
+                    t[localName] = s[localName].map((val) => val ?? {});
                 }
                 else {
                     const val = s[localName];
@@ -89,9 +86,7 @@ export function applyPartialMessage(source, target, fields) {
                         }
                     }
                     else {
-                        const messageType = mt;
-                        t[localName] =
-                            isCompleteMessage(val, messageType.fields.list()) ? val : (messageType.create(val));
+                        t[localName] = val ?? {};
                     }
                 }
                 break;

package/dist/protoplugin/create-es-plugin.js

@@ -14,7 +14,7 @@
 import { createSchema } from "./ecmascript/schema.js";
 import { transpile } from "./ecmascript/transpile.js";
 import { parseParameter } from "./ecmascript/parameter.js";
-import { CodeGeneratorResponse, CodeGeneratorResponse_Feature, } from "../google/protobuf/compiler/plugin.pb.js";
+import { CodeGeneratorResponse_Feature, } from "../google/protobuf/compiler/plugin.pb.js";
 import { protoInt64 } from "../proto-int64.js";
 /**
  * Create a new code generator plugin for ECMAScript.
@@ -103,7 +103,7 @@ function toResponse(files, supportsEditions) {
         supportedFeatures =
             supportedFeatures | CodeGeneratorResponse_Feature.SUPPORTS_EDITIONS;
     }
-    return CodeGeneratorResponse.create({
+    return {
         supportedFeatures: protoInt64.parse(supportedFeatures),
         file: files.map((f) => {
             if (f.preamble !== undefined) {
@@ -111,5 +111,5 @@ function toResponse(files, supportsEditions) {
             }
             return f;
         }),
-    });
+    };
 }

package/dist/protoplugin/error.js

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 export class PluginOptionError extends Error {
+    name = "PluginOptionError";
     constructor(option, reason) {
         const detail = reason !== undefined ? reasonToString(reason) : "";
         super(detail.length > 0 ?
             `invalid option "${option}": ${detail}`
             : `invalid option "${option}"`);
-        this.name = "PluginOptionError";
     }
 }
 export function reasonToString(reason) {

package/example/example.pb.ts

@@ -1,11 +1,7 @@
-//
-
 // @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file example/example.proto (package example, syntax proto3)
 /* eslint-disable */
 
-//
-
 import type { MessageType, PartialFieldInfo } from "@aptre/protobuf-es-lite";
 import { createEnumType, createMessageType, Message, Timestamp } from "@aptre/protobuf-es-lite";
 
@@ -14,7 +10,6 @@ export const protobufPackage = "example";
 /**
  * ExampleEnum is an example enumeration.
  *
- *
  * @generated from enum example.ExampleEnum
  */
 export enum ExampleEnum {
@@ -44,30 +39,41 @@ export const ExampleEnum_Enum = createEnumType("example.ExampleEnum", [
 /**
  * EchoMsg is the message body for Echo.
  *
- *
  * @generated from message example.EchoMsg
  */
 export type EchoMsg = Message<{
   /**
-   * @generated from field: string body = 1 [packed = false, default = "", jstype = JS_NORMAL];
+   * @generated from field: string body = 1;
    */
   body?: string;
   /**
-   * @generated from field: google.protobuf.Timestamp ts = 2 [packed = false, default = , jstype = JS_NORMAL];
+   * @generated from field: google.protobuf.Timestamp ts = 2;
    */
   ts?: Timestamp;
   /**
-   * @generated from field: example.ExampleEnum example_enum = 3 [packed = false, default = , jstype = JS_NORMAL];
+   * @generated from field: repeated google.protobuf.Timestamp timestamps = 5;
    */
-  exampleEnum?: ExampleEnum;
-  /**
-   * @generated from field: string example_string = 4 [packed = false, default = "", jstype = JS_NORMAL];
-   */
-  exampleString?: string;
+  timestamps?: Timestamp[];
+
   /**
-   * @generated from field: repeated google.protobuf.Timestamp timestamps = 5 [packed = false, default = , jstype = JS_NORMAL];
+   * @generated from oneof example.EchoMsg.demo
    */
-  timestamps?: Timestamp[];
+  demo?: {
+    value?: undefined,
+    case: undefined
+  } | {
+    /**
+     * @generated from field: example.ExampleEnum example_enum = 3;
+     */
+    value: ExampleEnum;
+    case: "exampleEnum";
+  } | {
+    /**
+     * @generated from field: string example_string = 4;
+     */
+    value: string;
+    case: "exampleString";
+  };
 
 }>;
 
@@ -77,8 +83,8 @@ export const EchoMsg: MessageType<EchoMsg> = createMessageType(
     fields: [
         { no: 1, name: "body", kind: "scalar", T: 9 /* ScalarType.STRING */ },
         { no: 2, name: "ts", kind: "message", T: () => Timestamp },
-        { no: 3, name: "example_enum", kind: "enum", T: ExampleEnum_Enum },
-        { no: 4, name: "example_string", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+        { no: 3, name: "example_enum", kind: "enum", T: ExampleEnum_Enum, oneof: "demo" },
+        { no: 4, name: "example_string", kind: "scalar", T: 9 /* ScalarType.STRING */, oneof: "demo" },
         { no: 5, name: "timestamps", kind: "message", T: () => Timestamp, repeated: true },
     ] as readonly PartialFieldInfo[],
     packedByDefault: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aptre/protobuf-es-lite",
   "description": "Lightweight Protobuf codegen for TypeScript and JavaScript.",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "license": "Apache-2.0",
   "repository": {
     "url": "git+ssh://git@github.com/aperturerobotics/protobuf-es-lite.git"

package/tsconfig.base.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "target": "es2020",
-    "module": "ES2020",
-    "moduleResolution": "node",
+    "target": "es2022",
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "esModuleInterop": false,
     "forceConsistentCasingInFileNames": true,
     "strict": true,

package/dist/type-registry.d.ts

@@ -1,43 +0,0 @@
-import type { AnyMessage, Message, MessageType } from "./message.js";
-import type { EnumType } from "./enum.js";
-import type { ServiceType } from "./service-type.js";
-/**
- * IMessageTypeRegistry provides look-up for message types.
- *
- * You can conveniently create a registry using the createRegistry()
- * function:
- *
- * ```ts
- * import { createRegistry } from "@bufbuild/protobuf";
- * import { MyMessage, MyOtherMessage } from "./gen/my_message.pb.js";
- *
- * const reg: IMessageTypeRegistry = createRegistry(
- *   MyMessage,
- *   MyOtherMessage,
- * );
- * ```
- */
-export interface IMessageTypeRegistry {
-    /**
-     * Find a message type by its protobuf type name.
-     */
-    findMessage<T extends Message<T> = AnyMessage>(typeName: string): MessageType<T> | 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;
-}

package/dist/type-registry.js

@@ -1,14 +0,0 @@
-// Copyright 2021-2024 Buf Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-export {};