@bufbuild/protoplugin 1.8.0 → 2.0.0-alpha.1

package/dist/cjs/create-es-plugin.d.ts

@@ -1,7 +1,7 @@
-import { Schema } from "./ecmascript/schema.js";
+import type { SupportedEdition } from "@bufbuild/protobuf";
+import type { Schema } from "./ecmascript/schema.js";
 import type { FileInfo } from "./ecmascript/generated-file.js";
 import type { Plugin } from "./plugin.js";
-import type { FeatureSetDefaults } from "@bufbuild/protobuf";
 interface PluginInit {
     /**
      * Name of this code generator plugin.
@@ -17,19 +17,15 @@ interface PluginInit {
      */
     parseOption?: (key: string, value: string) => void;
     /**
-     * Whether the plugin supports editions.
+     * The earliest edition supported by this plugin. Defaults to the minimum
+     * edition supported by @bufbuild/protobuf.
      */
-    supportsEditions?: boolean;
+    minimumEdition?: SupportedEdition;
     /**
-     * By default, plugins support all editions supported by createDescriptorSet()
-     * from @bufbuild/protobuf, if supportsEditions is enabled.
-     *
-     * This option can be used to limit support for specific editions, by providing
-     * your own google.protobuf.FeatureSetDefaults generated by protoc with the
-     * flags --experimental_edition_defaults_out, --experimental_edition_defaults_minimum,
-     * and --experimental_edition_defaults_maximum.
+     * The latest edition supported by this plugin. Defaults to the maximum
+     * edition supported by @bufbuild/protobuf.
      */
-    featureSetDefaults?: FeatureSetDefaults;
+    maximumEdition?: SupportedEdition;
     /**
      * A function which will generate TypeScript files based on proto input.
      * This function will be invoked by the plugin framework when the plugin runs.

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

@@ -14,10 +14,12 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEcmaScriptPlugin = void 0;
+const protobuf_1 = require("@bufbuild/protobuf");
+const reflect_1 = require("@bufbuild/protobuf/reflect");
+const wkt_1 = require("@bufbuild/protobuf/wkt");
 const schema_js_1 = require("./ecmascript/schema.js");
 const transpile_js_1 = require("./ecmascript/transpile.js");
 const parameter_js_1 = require("./ecmascript/parameter.js");
-const protobuf_1 = require("@bufbuild/protobuf");
 /**
  * Create a new code generator plugin for ECMAScript.
  * The plugin can generate JavaScript, TypeScript, or TypeScript declaration
@@ -30,9 +32,11 @@ function createEcmaScriptPlugin(init) {
         name: init.name,
         version: init.version,
         run(req) {
-            var _a, _b;
+            var _a, _b, _c;
+            const minimumEdition = (_a = init.minimumEdition) !== null && _a !== void 0 ? _a : reflect_1.minimumEdition;
+            const maximumEdition = (_b = init.maximumEdition) !== null && _b !== void 0 ? _b : reflect_1.maximumEdition;
             const parameter = (0, parameter_js_1.parseParameter)(req.parameter, init.parseOption);
-            const schema = (0, schema_js_1.createSchema)(req, parameter, init.name, init.version, init.featureSetDefaults);
+            const schema = (0, schema_js_1.createSchema)(req, parameter, init.name, init.version, minimumEdition, maximumEdition);
             const targetTs = schema.targets.includes("ts");
             const targetJs = schema.targets.includes("js");
             const targetDts = schema.targets.includes("dts");
@@ -91,24 +95,22 @@ function createEcmaScriptPlugin(init) {
             // but no generate function was provided.  This also means that we will
             // have generated .ts files above.
             if (transpileJs || transpileDts) {
-                const transpileFn = (_a = init.transpile) !== null && _a !== void 0 ? _a : transpile_js_1.transpile;
+                const transpileFn = (_c = init.transpile) !== null && _c !== void 0 ? _c : transpile_js_1.transpile;
                 // Transpile the TypeScript files and add to the master list of files
                 const transpiledFiles = transpileFn(tsFiles, transpileJs, transpileDts, parameter.jsImportStyle);
                 files.push(...transpiledFiles);
             }
-            return toResponse(files, (_b = init.supportsEditions) !== null && _b !== void 0 ? _b : false);
+            return toResponse(files, minimumEdition, maximumEdition);
         },
     };
 }
 exports.createEcmaScriptPlugin = createEcmaScriptPlugin;
-function toResponse(files, supportsEditions) {
-    let supportedFeatures = protobuf_1.CodeGeneratorResponse_Feature.PROTO3_OPTIONAL;
-    if (supportsEditions) {
-        supportedFeatures =
-            supportedFeatures | protobuf_1.CodeGeneratorResponse_Feature.SUPPORTS_EDITIONS;
-    }
-    return new protobuf_1.CodeGeneratorResponse({
-        supportedFeatures: protobuf_1.protoInt64.parse(supportedFeatures),
+function toResponse(files, minimumEdition, maximumEdition) {
+    return (0, protobuf_1.create)(wkt_1.CodeGeneratorResponseDesc, {
+        supportedFeatures: protobuf_1.protoInt64.parse(wkt_1.CodeGeneratorResponse_Feature.PROTO3_OPTIONAL |
+            wkt_1.CodeGeneratorResponse_Feature.SUPPORTS_EDITIONS),
+        minimumEdition,
+        maximumEdition,
         file: files.map((f) => {
             if (f.preamble !== undefined) {
                 f.content = f.preamble + "\n" + f.content;

package/dist/cjs/ecmascript/file-preamble.js

@@ -14,7 +14,8 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeFilePreamble = void 0;
-const protobuf_1 = require("@bufbuild/protobuf");
+const wkt_1 = require("@bufbuild/protobuf/wkt");
+const source_code_info_js_1 = require("../source-code-info.js");
 function makeFilePreamble(file, pluginName, pluginVersion, parameter, tsNoCheck) {
     const builder = [];
     const trimSuffix = (str, suffix) => str.endsWith(suffix) ? str.substring(0, str.length - suffix.length) : str;
@@ -34,25 +35,25 @@ function makeFilePreamble(file, pluginName, pluginVersion, parameter, tsNoCheck)
             builder.push("\n");
         }
     };
-    writeLeadingComments(file.getSyntaxComments());
+    writeLeadingComments((0, source_code_info_js_1.getSyntaxComments)(file));
     builder.push(`// @generated by ${pluginName} ${pluginVersion}`);
     if (parameter !== "") {
         builder.push(` with parameter "${parameter}"`);
     }
     builder.push("\n");
     builder.push(`// @generated from file ${file.name}.proto (`);
-    if (file.proto.package !== undefined) {
+    if (file.proto.package.length > 0) {
         builder.push(`package ${file.proto.package}, `);
     }
     switch (file.edition) {
-        case protobuf_1.Edition.EDITION_PROTO2:
+        case wkt_1.Edition.EDITION_PROTO2:
             builder.push(`syntax proto2)\n`);
             break;
-        case protobuf_1.Edition.EDITION_PROTO3:
+        case wkt_1.Edition.EDITION_PROTO3:
             builder.push(`syntax proto3)\n`);
             break;
         default: {
-            const editionString = protobuf_1.Edition[file.edition];
+            const editionString = wkt_1.Edition[file.edition];
             if (typeof editionString == "string") {
                 const e = editionString.replace("EDITION_", "").toLowerCase();
                 builder.push(`edition ${e})\n`);
@@ -68,7 +69,7 @@ function makeFilePreamble(file, pluginName, pluginVersion, parameter, tsNoCheck)
         builder.push("// @ts-nocheck\n");
     }
     builder.push("\n");
-    writeLeadingComments(file.getPackageComments());
+    writeLeadingComments((0, source_code_info_js_1.getPackageComments)(file));
     return trimSuffix(builder.join(""), "\n");
 }
 exports.makeFilePreamble = makeFilePreamble;

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

@@ -1,12 +1,7 @@
-import { AnyDesc, DescEnum, DescExtension, DescFile, DescMessage } from "@bufbuild/protobuf";
+import type { AnyDesc, DescEnum, DescExtension, DescFile, DescMessage, DescService } from "@bufbuild/protobuf";
 import type { ImportSymbol } from "./import-symbol.js";
+import type { Printable } from "./printable.js";
 import type { RuntimeImports } from "./runtime-imports.js";
-import type { JSDocBlock } from "./jsdoc.js";
-import { ExportDeclaration, LiteralProtoInt64, LiteralString, RefDescEnum, RefDescMessage } from "./opaque-printables.js";
-/**
- * All types that can be passed to GeneratedFile.print()
- */
-export type Printable = string | number | boolean | bigint | Uint8Array | ImportSymbol | ExportDeclaration | JSDocBlock | LiteralString | LiteralProtoInt64 | RefDescMessage | RefDescEnum | DescMessage | DescEnum | DescExtension | Printable[];
 /**
  * FileInfo represents an intermediate type using for transpiling TypeScript internally.
  */
@@ -49,10 +44,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.
      */
@@ -61,13 +52,13 @@ export interface GeneratedFile {
      * Create a JSDoc comment block with the given text. Line breaks and white-space
      * stay intact.
      */
-    jsDoc(text: string, indentation?: string): JSDocBlock;
+    jsDoc(text: string, indentation?: string): Printable;
     /**
      * Create a JSDoc comment block for the given message, enumeration, or other
      * descriptor. The comment block will contain the original comments from the
      * protobuf source, and annotations such as `@generated from message MyMessage`.
      */
-    jsDoc(desc: Exclude<AnyDesc, DescFile>, indentation?: string): JSDocBlock;
+    jsDoc(desc: Exclude<AnyDesc, DescFile>, indentation?: string): Printable;
     /**
      * Create a printable export statement. For example:
      *
@@ -84,11 +75,15 @@ export interface GeneratedFile {
      * statement. If the plugin option `js_import_style=legacy_commonjs` is set,
      * exports will automatically be generated for CommonJS.
      */
-    exportDecl(declaration: string, name: string | DescMessage | DescEnum | DescExtension): Printable;
+    exportDecl(declaration: string, name: string): Printable;
     /**
      * Import a message or enumeration generated by protoc-gen-es.
      */
-    import(type: DescMessage | DescEnum | DescExtension): ImportSymbol;
+    importShape(desc: DescMessage | DescEnum): ImportSymbol;
+    /**
+     * Import a descriptor generated by protoc-gen-es.
+     */
+    importDesc(desc: DescMessage | DescEnum | DescExtension | DescService | DescFile, typeOnly?: boolean): ImportSymbol;
     /**
      * Import any symbol from a file or package.
      *
@@ -105,12 +100,16 @@ export interface GeneratedFile {
      * formulate your own imports and exports based on this property.
      */
     readonly jsImportStyle: "module" | "legacy_commonjs";
+    /**
+     * Provides some symbols from the runtime library @bufbuild/protobuf.
+     */
+    readonly runtime: RuntimeImports;
 }
 export interface GeneratedFileController extends GeneratedFile {
     getFileInfo(): FileInfo;
 }
-type CreateTypeImportFn = (desc: DescMessage | DescEnum | DescExtension) => ImportSymbol;
-type RewriteImportPathFn = (path: string) => string;
-type CreatePreambleFn = (descFile: DescFile) => string;
-export declare function createGeneratedFile(name: string, importPath: string, jsImportStyle: "module" | "legacy_commonjs", rewriteImportPath: RewriteImportPathFn, createTypeImport: CreateTypeImportFn, runtimeImports: RuntimeImports, createPreamble: CreatePreambleFn): GeneratedFileController;
-export {};
+export type ResolveDescImportFn = (desc: DescMessage | DescEnum | DescExtension | DescService | DescFile, typeOnly?: boolean) => ImportSymbol;
+export type ResolveShapeImportFn = (desc: DescMessage | DescEnum) => ImportSymbol;
+export type RewriteImportFn = (path: string) => string;
+export type CreatePreambleFn = (descFile: DescFile) => string;
+export declare function createGeneratedFile(name: string, importPath: string, jsImportStyle: "module" | "legacy_commonjs", rewriteImport: RewriteImportFn, resolveDescImport: ResolveDescImportFn, resolveShapeImport: ResolveShapeImportFn, createPreamble: CreatePreambleFn, runtime: RuntimeImports): GeneratedFileController;

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

@@ -15,10 +15,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGeneratedFile = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
+const reflect_1 = require("@bufbuild/protobuf/reflect");
 const import_symbol_js_1 = require("./import-symbol.js");
 const import_path_js_1 = require("./import-path.js");
 const jsdoc_js_1 = require("./jsdoc.js");
-function createGeneratedFile(name, importPath, jsImportStyle, rewriteImportPath, createTypeImport, runtimeImports, createPreamble) {
+function createGeneratedFile(name, importPath, jsImportStyle, rewriteImport, resolveDescImport, resolveShapeImport, createPreamble, runtime) {
     let preamble;
     const el = [];
     return {
@@ -39,38 +40,51 @@ function createGeneratedFile(name, importPath, jsImportStyle, rewriteImportPath,
                         ? [printableOrFragments, ...rest]
                         : rest;
             }
-            printableToEl(printables, el, createTypeImport, runtimeImports);
+            printableToEl({
+                el,
+                runtime,
+                resolveDescImport,
+                resolveShapeImport,
+            }, printables);
             el.push("\n");
         },
-        export(name) {
-            return (0, import_symbol_js_1.createImportSymbol)(name, importPath);
-        },
         exportDecl(declaration, name) {
             return {
-                kind: "es_export_decl",
-                declaration,
+                kind: "es_export_stmt",
                 name,
+                declaration,
             };
         },
         string(string) {
-            // We do not use LiteralString, which was added later, to maintain backwards compatibility
-            return escapeString(string);
+            return {
+                kind: "es_string",
+                value: string,
+            };
         },
         jsDoc(textOrDesc, indentation) {
-            return (0, jsdoc_js_1.createJsDocBlock)(textOrDesc, indentation);
+            return {
+                kind: "es_jsdoc",
+                text: typeof textOrDesc == "string"
+                    ? textOrDesc
+                    : (0, jsdoc_js_1.createJsDocTextFromDesc)(textOrDesc),
+                indentation,
+            };
         },
-        import(typeOrName, from) {
-            if (typeof typeOrName == "string") {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                return (0, import_symbol_js_1.createImportSymbol)(typeOrName, from);
-            }
-            return createTypeImport(typeOrName);
+        importDesc(desc, typeOnly = false) {
+            return resolveDescImport(desc, typeOnly);
+        },
+        importShape(desc) {
+            return resolveShapeImport(desc);
+        },
+        import(name, from) {
+            return (0, import_symbol_js_1.createImportSymbol)(name, from);
         },
         jsImportStyle,
+        runtime,
         getFileInfo() {
             return {
                 name,
-                content: elToContent(el, importPath, rewriteImportPath, jsImportStyle == "legacy_commonjs"),
+                content: elToContent(el, importPath, rewriteImport, jsImportStyle == "legacy_commonjs"),
                 preamble,
             };
         },
@@ -146,10 +160,11 @@ function elToContent(el, importerPath, rewriteImportPath, legacyCommonJs) {
     }
     return c.join("");
 }
-function printableToEl(printables, el, createTypeImport, runtimeImports) {
+function printableToEl(opt, printables) {
+    const { el } = opt;
     for (const p of printables) {
         if (Array.isArray(p)) {
-            printableToEl(p, el, createTypeImport, runtimeImports);
+            printableToEl(opt, p);
         }
         else {
             switch (typeof p) {
@@ -157,52 +172,88 @@ function printableToEl(printables, el, createTypeImport, runtimeImports) {
                     el.push(p);
                     break;
                 case "number":
-                    elNumber(el, p, runtimeImports);
+                    if (Number.isNaN(p)) {
+                        el.push("globalThis.NaN");
+                    }
+                    else if (p === Number.POSITIVE_INFINITY) {
+                        el.push("globalThis.Infinity");
+                    }
+                    else if (p === Number.NEGATIVE_INFINITY) {
+                        el.push("-globalThis.Infinity");
+                    }
+                    else {
+                        el.push(p.toString(10));
+                    }
                     break;
                 case "boolean":
                     el.push(p.toString());
                     break;
                 case "bigint":
-                    elBigint(el, p, runtimeImports);
+                    if (p == protobuf_1.protoInt64.zero) {
+                        // Loose comparison will match between 0n and 0.
+                        el.push(opt.runtime.protoInt64, ".zero");
+                    }
+                    else {
+                        el.push(opt.runtime.protoInt64, p > 0 ? ".uParse(" : ".parse(", escapeString(p.toString()), ")");
+                    }
                     break;
                 case "object":
                     if (p instanceof Uint8Array) {
-                        elUint8Array(el, p);
+                        if (p.length === 0) {
+                            el.push("new Uint8Array(0)");
+                        }
+                        else {
+                            el.push("new Uint8Array([");
+                            const strings = [];
+                            for (const n of p) {
+                                strings.push("0x" + n.toString(16).toUpperCase().padStart(2, "0"));
+                            }
+                            el.push(strings.join(", "));
+                            el.push("])");
+                        }
                         break;
                     }
                     switch (p.kind) {
                         case "es_symbol":
+                        case "es_export_stmt":
                             el.push(p);
                             break;
+                        case "es_desc_ref":
+                            el.push(opt.resolveDescImport(p.desc, p.typeOnly));
+                            break;
+                        case "es_shape_ref":
+                            el.push(opt.resolveShapeImport(p.desc));
+                            break;
                         case "es_jsdoc":
-                            el.push(p.toString());
+                            el.push((0, jsdoc_js_1.formatJsDocBlock)(p.text, p.indentation));
                             break;
                         case "es_string":
                             el.push(escapeString(p.value));
                             break;
                         case "es_proto_int64":
-                            elProtoInt64(el, p, runtimeImports);
-                            break;
-                        case "es_export_decl":
-                            el.push({
-                                kind: "es_export_stmt",
-                                declaration: p.declaration,
-                                name: typeof p.name == "string"
-                                    ? p.name
-                                    : createTypeImport(p.name).name,
-                            });
-                            break;
-                        case "es_ref_message":
-                        case "es_ref_enum":
-                            el.push(p.typeOnly
-                                ? createTypeImport(p.type).toTypeOnly()
-                                : createTypeImport(p.type));
-                            break;
-                        case "message":
-                        case "extension":
-                        case "enum":
-                            el.push(createTypeImport(p));
+                            switch (p.longType) {
+                                case reflect_1.LongType.STRING:
+                                    el.push(escapeString(p.value.toString()));
+                                    break;
+                                case reflect_1.LongType.BIGINT:
+                                    if (p.value == protobuf_1.protoInt64.zero) {
+                                        // Loose comparison will match between 0n and 0.
+                                        el.push(opt.runtime.protoInt64, ".zero");
+                                        break;
+                                    }
+                                    switch (p.type) {
+                                        case reflect_1.ScalarType.UINT64:
+                                        case reflect_1.ScalarType.FIXED64:
+                                            el.push(opt.runtime.protoInt64, ".uParse(", escapeString(p.value.toString()), ")");
+                                            break;
+                                        default:
+                                            el.push(opt.runtime.protoInt64, ".parse(", escapeString(p.value.toString()), ")");
+                                            break;
+                                    }
+                            }
                             break;
+                        default:
+                            throw `cannot print ${typeof p}`;
                     }
                     break;
                 default:
@@ -327,70 +378,6 @@ function processImports(el, importerPath, rewriteImportPath, makeImportStatement
     }
     return symbolToIdentifier;
 }
-function elBigint(el, value, runtimeImports) {
-    if (value == protobuf_1.protoInt64.zero) {
-        // Loose comparison will match between 0n and 0.
-        el.push(runtimeImports.protoInt64, ".zero");
-    }
-    else {
-        el.push(runtimeImports.protoInt64, value > 0 ? ".uParse(" : ".parse(", escapeString(value.toString()), ")");
-    }
-}
-function elNumber(el, value, runtimeImports) {
-    if (Number.isNaN(value)) {
-        el.push(runtimeImports.protoDouble, ".NaN");
-    }
-    else if (value === Number.POSITIVE_INFINITY) {
-        el.push(runtimeImports.protoDouble, ".POSITIVE_INFINITY");
-    }
-    else if (value === Number.NEGATIVE_INFINITY) {
-        el.push(runtimeImports.protoDouble, ".NEGATIVE_INFINITY");
-    }
-    else {
-        el.push(value.toString(10));
-    }
-}
-function elUint8Array(el, value) {
-    if (value.length === 0) {
-        el.push("new Uint8Array(0)");
-        return;
-    }
-    el.push("new Uint8Array([");
-    const strings = [];
-    for (const n of value) {
-        strings.push("0x" + n.toString(16).toUpperCase().padStart(2, "0"));
-    }
-    el.push(strings.join(", "));
-    el.push("])");
-}
-function elProtoInt64(el, literal, runtimeImports) {
-    switch (literal.longType) {
-        case protobuf_1.LongType.STRING:
-            el.push(escapeString(literal.value.toString()));
-            break;
-        case protobuf_1.LongType.BIGINT:
-            if (literal.value == protobuf_1.protoInt64.zero) {
-                // Loose comparison will match between 0n and 0.
-                el.push(runtimeImports.protoInt64, ".zero");
-                break;
-            }
-            switch (literal.type) {
-                case protobuf_1.ScalarType.UINT64:
-                case protobuf_1.ScalarType.FIXED64:
-                    el.push(runtimeImports.protoInt64);
-                    el.push(".uParse(");
-                    el.push(escapeString(literal.value.toString()));
-                    el.push(")");
-                    break;
-                default:
-                    el.push(runtimeImports.protoInt64);
-                    el.push(".parse(");
-                    el.push(escapeString(literal.value.toString()));
-                    el.push(")");
-                    break;
-            }
-    }
-}
 function escapeString(value) {
     return ('"' +
         value

package/dist/cjs/ecmascript/import-path.d.ts

@@ -1,4 +1,3 @@
-import { DescFile } from "@bufbuild/protobuf";
 /**
  * A configuration for rewriting import paths, a feature mainly used for
  * remote code generation in the BSR npm registry, which makes it possible
@@ -44,11 +43,6 @@ export type RewriteImports = {
  * to the given import extension.
  */
 export declare function rewriteImportPath(importPath: string, rewriteImports: RewriteImports, importExtension: string): string;
-/**
- * Returns the import path for files generated by the base type generator
- * protoc-gen-es.
- */
-export declare function makeImportPath(file: DescFile, bootstrapWkt: boolean, filesToGenerate: DescFile[]): string;
 export declare const relativePathRE: RegExp;
 /**
  * Derives an ECMAScript module import path from a file path. For example,

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

@@ -13,8 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeImportPathRelative = exports.deriveImportPath = exports.relativePathRE = exports.makeImportPath = exports.rewriteImportPath = void 0;
-const protobuf_1 = require("@bufbuild/protobuf");
+exports.makeImportPathRelative = exports.deriveImportPath = exports.relativePathRE = exports.rewriteImportPath = void 0;
 const cache = new WeakMap();
 /**
  * Apply import rewrites to the given import path, and change all .js extensions
@@ -85,26 +84,6 @@ function starToRegExp(star) {
     r.push("$");
     return new RegExp(r.join(""));
 }
-/**
- * Returns the import path for files generated by the base type generator
- * protoc-gen-es.
- */
-function makeImportPath(file, bootstrapWkt, filesToGenerate) {
-    // Well-known types are published with the runtime package. We usually want
-    // the generated code to import them from the runtime package, with the
-    // following exceptions:
-    // 1. We are bootstrapping the runtime package via the plugin option
-    //    "bootstrap_wkt". In that case, we cannot refer to the runtime package
-    //    itself.
-    // 2. We were explicitly asked to generate the well-known type.
-    if (!bootstrapWkt &&
-        !filesToGenerate.includes(file) &&
-        protobuf_1.codegenInfo.wktSourceFiles.includes(file.name + ".proto")) {
-        return protobuf_1.codegenInfo.packageName;
-    }
-    return "./" + file.name + "_pb.js";
-}
-exports.makeImportPath = makeImportPath;
 exports.relativePathRE = /^\.{1,2}\//;
 /**
  * Derives an ECMAScript module import path from a file path. For example,

package/dist/cjs/ecmascript/import-symbol.d.ts

@@ -29,11 +29,9 @@ export type ImportSymbol = {
     /**
      * The unique ID based on name and from, disregarding typeOnly.
      */
-    readonly id: EsSymbolId;
+    readonly id: `import("${string}").${string}`;
 };
 /**
  * Create a new import symbol.
  */
 export declare function createImportSymbol(name: string, from: string, typeOnly?: boolean): ImportSymbol;
-type EsSymbolId = string;
-export {};

package/dist/cjs/ecmascript/import-symbol.js

@@ -18,17 +18,15 @@ exports.createImportSymbol = void 0;
  * Create a new import symbol.
  */
 function createImportSymbol(name, from, typeOnly) {
-    const id = `import("${from}").${name}`;
-    const s = {
+    return {
         kind: "es_symbol",
         name,
         from,
-        typeOnly: false,
-        id,
+        typeOnly: typeOnly !== null && typeOnly !== void 0 ? typeOnly : false,
+        id: `import("${from}").${name}`,
         toTypeOnly() {
             return Object.assign(Object.assign({}, this), { typeOnly: true });
         },
     };
-    return typeOnly === true ? s.toTypeOnly() : s;
 }
 exports.createImportSymbol = createImportSymbol;

package/dist/cjs/ecmascript/index.d.ts

@@ -1,20 +1,7 @@
-import { AnyDesc, DescExtension, DescFile } from "@bufbuild/protobuf";
-import { Printable } from "./generated-file.js";
-export { reifyWkt } from "./reify-wkt.js";
 export type { Target } from "./target.js";
 export type { Schema } from "./schema.js";
-export type { RuntimeImports } from "./runtime-imports.js";
-export type { GeneratedFile, FileInfo, Printable } from "./generated-file.js";
+export type { GeneratedFile, FileInfo } from "./generated-file.js";
 export type { ImportSymbol } from "./import-symbol.js";
 export { createImportSymbol } from "./import-symbol.js";
-export declare const localName: (desc: import("@bufbuild/protobuf").DescEnum | import("@bufbuild/protobuf").DescMessage | import("@bufbuild/protobuf").DescService | DescExtension | import("@bufbuild/protobuf").DescEnumValue | import("@bufbuild/protobuf").DescField | import("@bufbuild/protobuf").DescOneof | import("@bufbuild/protobuf").DescMethod) => string;
-export { getFieldExplicitDefaultValue, getFieldIntrinsicDefaultValue, getFieldTyping, literalString, } from "./legacy-gencommon.js";
-export { findCustomScalarOption, findCustomMessageOption, findCustomEnumOption, } from "./legacy-custom-options.js";
-/**
- * @deprecated Please use GeneratedFile.jsDoc() instead
- */
-export declare function makeJsDoc(desc: Exclude<AnyDesc, DescFile | DescExtension>, indentation?: string): Printable;
-/**
- * @deprecated Please use GeneratedFile.jsDoc() instead
- */
-export declare function createJsDocBlock(text: string, indentation?: string): Printable;
+export type { Printable } from "./printable.js";
+export { safeIdentifier } from "./safe-identifier.js";