@aptre/protobuf-es-lite 0.5.0 → 0.5.1

package/dist/index.d.ts

@@ -10,7 +10,6 @@ export { int64FromString, int64ToString, uInt64ToString } from "./varint.js";
 export { protoInt64 } from "./proto-int64.js";
 export { protoBase64 } from "./proto-base64.js";
 export { protoDouble } from "./proto-double.js";
-export { Timestamp, Duration, Any, Empty, DoubleValue, FloatValue, Int64Value, UInt64Value, Int32Value, UInt32Value, BoolValue, StringValue, BytesValue, Value, NullValue, ListValue, Struct, } from "./google/index.js";
 export { DescComments, AnyDesc, DescEnum, DescEnumValue, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescOneof, DescService, DescriptorSet, } from "./descriptor-set.js";
 export { jsonReadEnum, jsonReadField, jsonReadMapKey, jsonReadScalar, jsonReadMessage, jsonWriteEnum, jsonWriteField, jsonWriteScalar, jsonWriteMessage, jsonDebugValue, JsonValue, JsonObject, JsonReadOptions, jsonMakeReadOptions, JsonWriteOptions, JsonWriteStringOptions, jsonMakeWriteOptions, } from "./json.js";
 export { binaryReadField, binaryReadMapEntry, binaryReadScalar, binaryReadScalarLTString, binaryReadMessage, binaryWriteField, binaryWriteScalar, binaryWritePacked, binaryWriteMapEntry, binaryWriteMessage, binaryMakeReadOptions, binaryMakeWriteOptions, BinaryReadOptions, BinaryWriteOptions, } from "./binary.js";

package/dist/index.js

@@ -10,7 +10,6 @@ export { int64FromString, int64ToString, uInt64ToString } from "./varint.js";
 export { protoInt64 } from "./proto-int64.js";
 export { protoBase64 } from "./proto-base64.js";
 export { protoDouble } from "./proto-double.js";
-export { Timestamp, Duration, Any, Empty, DoubleValue, FloatValue, Int64Value, UInt64Value, Int32Value, UInt32Value, BoolValue, StringValue, BytesValue, Value, NullValue, ListValue, Struct, } from "./google/index.js";
 export { jsonReadEnum, jsonReadField, jsonReadMapKey, jsonReadScalar, jsonReadMessage, jsonWriteEnum, jsonWriteField, jsonWriteScalar, jsonWriteMessage, jsonDebugValue, jsonMakeReadOptions, jsonMakeWriteOptions, } from "./json.js";
 export { binaryReadField, binaryReadMapEntry, binaryReadScalar, binaryReadScalarLTString, binaryReadMessage, binaryWriteField, binaryWriteScalar, binaryWritePacked, binaryWriteMapEntry, binaryWriteMessage, binaryMakeReadOptions, binaryMakeWriteOptions, } from "./binary.js";
 export { compareFieldZeroValue, isMessageZeroValue, getFieldZeroValue, } from "./zero-value.js";

package/dist/protoplugin/ecmascript/generated-file.d.ts

@@ -49,10 +49,6 @@ export interface GeneratedFile {
      * See print(Printable[]) for behavior when printing Printable items.
      */
     print(fragments: TemplateStringsArray, ...printables: Printable[]): void;
-    /**
-     * @deprecated Please use createImportSymbol() from @bufbuild/protoplugin/ecmascript instead
-     */
-    export(name: string): ImportSymbol;
     /**
      * Create a string literal.
      */

package/dist/protoplugin/ecmascript/generated-file.js

@@ -40,9 +40,6 @@ export function createGeneratedFile(name, importPath, jsImportStyle, rewriteImpo
             printableToEl(printables, el, createTypeImport, runtimeImports);
             el.push("\n");
         },
-        export(name) {
-            return createImportSymbol(name, importPath);
-        },
         exportDecl(declaration, name) {
             return {
                 kind: "es_export_decl",

package/dist/protoplugin/ecmascript/import-path.js

@@ -96,7 +96,7 @@ export function makeImportPath(file, bootstrapWkt, filesToGenerate) {
     if (!bootstrapWkt &&
         !filesToGenerate.includes(file) &&
         codegenInfo.wktSourceFiles.includes(file.name + ".proto")) {
-        return codegenInfo.packageName;
+        return codegenInfo.packageName + "/" + file.name;
     }
     return "./" + file.name + ".pb.js";
 }

package/example/example.pb.ts

@@ -3,12 +3,8 @@
 /* eslint-disable */
 
 import type { MessageType, PartialFieldInfo } from "../src/index.js";
-import {
-  createEnumType,
-  createMessageType,
-  ScalarType,
-  Timestamp,
-} from "../src/index.js";
+import { createEnumType, createMessageType, ScalarType } from "../src/index.js";
+import { Timestamp } from "../src/google/protobuf/timestamp.pb.js";
 
 export const protobufPackage = "example";
 

package/example/tsconfig.json

@@ -7,6 +7,9 @@
       "@aptre/protobuf-es-lite": [
         "../src",
       ],
+      "@aptre/protobuf-es-lite/google/*": [
+        "../src/google/*",
+      ]
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aptre/protobuf-es-lite",
   "description": "Lightweight Protobuf codegen for TypeScript and JavaScript.",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "license": "Apache-2.0",
   "repository": {
     "url": "git+ssh://git@github.com/aperturerobotics/protobuf-es-lite.git"
@@ -23,34 +23,79 @@
   "type": "module",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.js"
     },
     "./descriptor-set": {
+      "types": "./dist/descriptor-set.d.ts",
       "import": "./dist/descriptor-set.js",
-      "require": "./dist/descriptor-set.js",
-      "types": "./dist/descriptor-set.d.ts"
+      "require": "./dist/descriptor-set.js"
     },
     "./create-descriptor-set": {
+      "types": "./dist/create-descriptor-set.d.ts",
       "import": "./dist/create-descriptor-set.js",
-      "require": "./dist/create-descriptor-set.js",
-      "types": "./dist/create-descriptor-set.d.ts"
+      "require": "./dist/create-descriptor-set.js"
     },
     "./protoplugin": {
+      "types": "./dist/protoplugin/index.d.ts",
       "import": "./dist/protoplugin/index.js",
-      "require": "./dist/protoplugin/index.js",
-      "types": "./dist/protoplugin/index.d.ts"
+      "require": "./dist/protoplugin/index.js"
     },
     "./protoplugin/ecmascript": {
+      "types": "./dist/protoplugin/ecmascript/index.d.ts",
       "import": "./dist/protoplugin/ecmascript/index.js",
-      "require": "./dist/protoplugin/ecmascript/index.js",
-      "types": "./dist/protoplugin/ecmascript/index.d.ts"
+      "require": "./dist/protoplugin/ecmascript/index.js"
     },
     "./google": {
+      "types": "./dist/google/index.d.ts",
       "import": "./dist/google/index.js",
-      "require": "./dist/google/index.js",
-      "types": "./dist/google/index.d.ts"
+      "require": "./dist/google/index.js"
+    },
+    "./google/protobuf/type": {
+      "types": "./dist/google/protobuf/type.pb.d.ts",
+      "import": "./dist/google/protobuf/type.pb.js",
+      "require": "./dist/google/protobuf/type.pb.js"
+    },
+    "./google/protobuf/timestamp": {
+      "types": "./dist/google/protobuf/timestamp.pb.d.ts",
+      "import": "./dist/google/protobuf/timestamp.pb.js",
+      "require": "./dist/google/protobuf/timestamp.pb.js"
+    },
+    "./google/protobuf/duration": {
+      "types": "./dist/google/protobuf/duration.pb.d.ts",
+      "import": "./dist/google/protobuf/duration.pb.js",
+      "require": "./dist/google/protobuf/duration.pb.js"
+    },
+    "./google/protobuf/any": {
+      "types": "./dist/google/protobuf/any.pb.d.ts",
+      "import": "./dist/google/protobuf/any.pb.js",
+      "require": "./dist/google/protobuf/any.pb.js"
+    },
+    "./google/protobuf/empty": {
+      "types": "./dist/google/protobuf/empty.pb.d.ts",
+      "import": "./dist/google/protobuf/empty.pb.js",
+      "require": "./dist/google/protobuf/empty.pb.js"
+    },
+    "./google/protobuf/wrappers": {
+      "types": "./dist/google/protobuf/wrappers.pb.d.ts",
+      "import": "./dist/google/protobuf/wrappers.pb.js",
+      "require": "./dist/google/protobuf/wrappers.pb.js"
+    },
+    "./google/protobuf/struct": {
+      "types": "./dist/google/protobuf/struct.pb.d.ts",
+      "import": "./dist/google/protobuf/struct.pb.js",
+      "require": "./dist/google/protobuf/struct.pb.js"
+    },
+    "./google/protobuf/api": {
+      "types": "./dist/google/protobuf/api.pb.d.ts",
+      "import": "./dist/google/protobuf/api.pb.js",
+      "require": "./dist/google/protobuf/api.pb.js"
+    },
+    "./google/protobuf/source_context": {
+      "types": "./dist/google/protobuf/source_context.pb.d.ts",
+      "import": "./dist/google/protobuf/source_context.pb.js",
+      "require": "./dist/google/protobuf/source_context.pb.js"
     }
   },
   "engines": {

package/dist/google/index.d.ts

@@ -1,9 +0,0 @@
-export { Type, Field, Field_Kind, Field_Cardinality, Enum, EnumValue, Option, Syntax, } from "./protobuf/type.pb.js";
-export { Timestamp } from "./protobuf/timestamp.pb.js";
-export { Duration } from "./protobuf/duration.pb.js";
-export { Any } from "./protobuf/any.pb.js";
-export { Empty } from "./protobuf/empty.pb.js";
-export { DoubleValue, FloatValue, Int64Value, UInt64Value, Int32Value, UInt32Value, BoolValue, StringValue, BytesValue, } from "./protobuf/wrappers.pb.js";
-export { Value, NullValue, ListValue, Struct } from "./protobuf/struct.pb.js";
-export { Api, Method, Mixin } from "./protobuf/api.pb.js";
-export { SourceContext } from "./protobuf/source_context.pb.js";

package/dist/google/index.js

@@ -1,9 +0,0 @@
-export { Type, Field, Field_Kind, Field_Cardinality, Enum, EnumValue, Option, Syntax, } from "./protobuf/type.pb.js";
-export { Timestamp } from "./protobuf/timestamp.pb.js";
-export { Duration } from "./protobuf/duration.pb.js";
-export { Any } from "./protobuf/any.pb.js";
-export { Empty } from "./protobuf/empty.pb.js";
-export { DoubleValue, FloatValue, Int64Value, UInt64Value, Int32Value, UInt32Value, BoolValue, StringValue, BytesValue, } from "./protobuf/wrappers.pb.js";
-export { Value, NullValue, ListValue, Struct } from "./protobuf/struct.pb.js";
-export { Api, Method, Mixin } from "./protobuf/api.pb.js";
-export { SourceContext } from "./protobuf/source_context.pb.js";

package/dist/google/protobuf/any.pb.d.ts

@@ -1,148 +0,0 @@
-import type { IMessageTypeRegistry, JsonReadOptions, JsonValue, JsonWriteOptions, MessageType } from "../../index.js";
-import { Message } from "../../index.js";
-export declare const protobufPackage = "google.protobuf";
-/**
- * `Any` contains an arbitrary serialized protocol buffer message along with a
- * URL that describes the type of the serialized message.
- *
- * Protobuf library provides support to pack/unpack Any values in the form
- * of utility functions or additional generated methods of the Any type.
- *
- * Example 1: Pack and unpack a message in C++.
- *
- *     Foo foo = ...;
- *     Any any;
- *     any.PackFrom(foo);
- *     ...
- *     if (any.UnpackTo(&foo)) {
- *       ...
- *     }
- *
- * Example 2: Pack and unpack a message in Java.
- *
- *     Foo foo = ...;
- *     Any any = Any.pack(foo);
- *     ...
- *     if (any.is(Foo.class)) {
- *       foo = any.unpack(Foo.class);
- *     }
- *     // or ...
- *     if (any.isSameTypeAs(Foo.getDefaultInstance())) {
- *       foo = any.unpack(Foo.getDefaultInstance());
- *     }
- *
- *  Example 3: Pack and unpack a message in Python.
- *
- *     foo = Foo(...)
- *     any = Any()
- *     any.Pack(foo)
- *     ...
- *     if any.Is(Foo.DESCRIPTOR):
- *       any.Unpack(foo)
- *       ...
- *
- *  Example 4: Pack and unpack a message in Go
- *
- *      foo := &pb.Foo{...}
- *      any, err := anypb.New(foo)
- *      if err != nil {
- *        ...
- *      }
- *      ...
- *      foo := &pb.Foo{}
- *      if err := any.UnmarshalTo(foo); err != nil {
- *        ...
- *      }
- *
- * The pack methods provided by protobuf library will by default use
- * 'type.googleapis.com/full.type.name' as the type URL and the unpack
- * methods only use the fully qualified type name after the last '/'
- * in the type URL, for example "foo.bar.com/x/y.z" will yield type
- * name "y.z".
- *
- * JSON
- * ====
- * The JSON representation of an `Any` value uses the regular
- * representation of the deserialized, embedded message, with an
- * additional field `@type` which contains the type URL. Example:
- *
- *     package google.profile;
- *     message Person {
- *       string first_name = 1;
- *       string last_name = 2;
- *     }
- *
- *     {
- *       "@type": "type.googleapis.com/google.profile.Person",
- *       "firstName": <string>,
- *       "lastName": <string>
- *     }
- *
- * If the embedded message type is well-known and has a custom JSON
- * representation, that representation will be embedded adding a field
- * `value` which holds the custom JSON in addition to the `@type`
- * field. Example (for message [google.protobuf.Duration][]):
- *
- *     {
- *       "@type": "type.googleapis.com/google.protobuf.Duration",
- *       "value": "1.212s"
- *     }
- *
- *
- * @generated from message google.protobuf.Any
- */
-export interface Any {
-    /**
-     * A URL/resource name that uniquely identifies the type of the serialized
-     * protocol buffer message. This string must contain at least
-     * one "/" character. The last segment of the URL's path must represent
-     * the fully qualified name of the type (as in
-     * `path/google.protobuf.Duration`). The name should be in a canonical form
-     * (e.g., leading "." is not accepted).
-     *
-     * In practice, teams usually precompile into the binary all types that they
-     * expect it to use in the context of Any. However, for URLs which use the
-     * scheme `http`, `https`, or no scheme, one can optionally set up a type
-     * server that maps type URLs to message definitions as follows:
-     *
-     * * If no scheme is provided, `https` is assumed.
-     * * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-     *   value in binary format, or produce an error.
-     * * Applications are allowed to cache lookup results based on the
-     *   URL, or have them precompiled into a binary to avoid any
-     *   lookup. Therefore, binary compatibility needs to be preserved
-     *   on changes to types. (Use versioned type names to manage
-     *   breaking changes.)
-     *
-     * Note: this functionality is not currently available in the official
-     * protobuf release, and it is not used for type URLs beginning with
-     * type.googleapis.com. As of May 2023, there are no widely used type server
-     * implementations and no plans to implement one.
-     *
-     * Schemes other than `http`, `https` (or the empty scheme) might be
-     * used with implementation specific semantics.
-     *
-     *
-     * @generated from field: string type_url = 1;
-     */
-    typeUrl?: string;
-    /**
-     * Must be a valid serialized protocol buffer of the above specified type.
-     *
-     * @generated from field: bytes value = 2;
-     */
-    value?: Uint8Array;
-}
-declare const Any_Wkt: {
-    toJson(msg: Any, options?: Partial<JsonWriteOptions>): JsonValue;
-    fromJson(json: JsonValue, options?: Partial<JsonReadOptions>): Any;
-    packFrom<T extends Message<T>>(out: Any, message: Message<T>, messageType: MessageType<T>): void;
-    unpackTo<T extends Message<T>>(msg: Any, target: Message<T>, targetMessageType: MessageType<T>): boolean;
-    unpack<T extends Message<T>>(msg: Any, registry: IMessageTypeRegistry): {
-        message: Message<T>;
-        messageType: MessageType<T>;
-    } | undefined;
-    is(msg: Any, msgType: MessageType | string): boolean;
-};
-export declare const Any: MessageType<Any> & typeof Any_Wkt;
-export {};

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

@@ -1,120 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import { applyPartialMessage, createMessageType, ScalarType, } from "../../index.js";
-export const protobufPackage = "google.protobuf";
-// Any_Wkt contains the well-known-type overrides for Any.
-const Any_Wkt = {
-    toJson(msg, options) {
-        const typeName = msg?.typeUrl;
-        if (!typeName) {
-            return {};
-        }
-        const messageType = options?.typeRegistry?.findMessage(typeName);
-        if (!messageType) {
-            throw new Error(`cannot encode message google.protobuf.Any to JSON: "${typeName}" is not in the type registry`);
-        }
-        const message = messageType.fromBinary(msg.value);
-        let json = messageType.toJson(message, options);
-        if (typeName.startsWith("google.protobuf.") ||
-            json === null ||
-            Array.isArray(json) ||
-            typeof json !== "object") {
-            json = { value: json };
-        }
-        json["@type"] = typeName;
-        return json;
-    },
-    fromJson(json, options) {
-        if (json === null || Array.isArray(json) || typeof json != "object") {
-            throw new Error(`cannot decode message google.protobuf.Any from JSON: expected object but got ${json === null ? "null"
-                : Array.isArray(json) ? "array"
-                    : typeof json}`);
-        }
-        if (Object.keys(json).length == 0) {
-            return {};
-        }
-        const typeUrl = json["@type"];
-        if (typeof typeUrl != "string" || typeUrl == "") {
-            throw new Error(`cannot decode message google.protobuf.Any from JSON: "@type" is empty`);
-        }
-        const typeName = typeUrl, messageType = options?.typeRegistry?.findMessage(typeName);
-        if (!messageType) {
-            throw new Error(`cannot decode message google.protobuf.Any from JSON: ${typeUrl} is not in the type registry`);
-        }
-        let message;
-        if (typeName.startsWith("google.protobuf.") &&
-            Object.prototype.hasOwnProperty.call(json, "value")) {
-            message = messageType.fromJson(json["value"], options);
-        }
-        else {
-            const copy = Object.assign({}, json);
-            delete copy["@type"];
-            message = messageType.fromJson(copy, options);
-        }
-        const out = {};
-        Any.packFrom(out, message, messageType);
-        return out;
-    },
-    packFrom(out, message, messageType) {
-        out.value = messageType.toBinary(message);
-        out.typeUrl = messageType.typeName;
-    },
-    unpackTo(msg, target, targetMessageType) {
-        if (!Any.is(msg, targetMessageType)) {
-            return false;
-        }
-        const partial = targetMessageType.fromBinary(msg.value);
-        applyPartialMessage(partial, target, targetMessageType.fields);
-        return true;
-    },
-    unpack(msg, registry) {
-        const typeUrl = msg.typeUrl;
-        const messageType = !!typeUrl && registry.findMessage(typeUrl);
-        return messageType ?
-            { message: messageType.fromBinary(msg.value), messageType }
-            : undefined;
-    },
-    is(msg, msgType) {
-        const name = msg.typeUrl;
-        return (!!name &&
-            (typeof msgType === "string" ?
-                name === msgType
-                : name === msgType.typeName));
-    },
-};
-// Any contains the message type declaration for Any.
-export const Any = createMessageType({
-    typeName: "google.protobuf.Any",
-    fields: [
-        { no: 1, name: "type_url", kind: "scalar", T: ScalarType.STRING },
-        { no: 2, name: "value", kind: "scalar", T: ScalarType.BYTES },
-    ],
-    packedByDefault: true,
-}, Any_Wkt);