@aptre/protobuf-es-lite 0.5.0 → 0.5.2

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.2",
   "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/tsconfig.json

@@ -5,7 +5,17 @@
     "src/descriptor-set.ts",
     "src/create-descriptor-set.ts",
     "src/protoplugin/index.ts",
-    "src/protoplugin/ecmascript/index.ts"
+    "src/protoplugin/ecmascript/index.ts",
+    "src/google/index.ts",
+    "src/google/protobuf/type.pb.ts",
+    "src/google/protobuf/timestamp.pb.ts",
+    "src/google/protobuf/duration.pb.ts",
+    "src/google/protobuf/any.pb.ts",
+    "src/google/protobuf/empty.pb.ts",
+    "src/google/protobuf/wrappers.pb.ts",
+    "src/google/protobuf/struct.pb.ts",
+    "src/google/protobuf/api.pb.ts",
+    "src/google/protobuf/source_context.pb.ts"
   ],
   "extends": "./tsconfig.base.json",
   "compilerOptions": {