@bufbuild/protoplugin 0.3.0 → 0.4.0

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

@@ -30,8 +30,8 @@ function createEcmaScriptPlugin(init) {
         version: init.version,
         run(req) {
             var _a;
-            const { targets, tsNocheck, bootstrapWkt, rewriteImports, keepEmptyFiles, } = parseParameter(req.parameter, init.parseOption);
-            const { schema, getFileInfo } = (0, schema_js_1.createSchema)(req, targets, init.name, init.version, tsNocheck, bootstrapWkt, rewriteImports, keepEmptyFiles);
+            const { targets, tsNocheck, bootstrapWkt, rewriteImports, importExtension, keepEmptyFiles, } = parseParameter(req.parameter, init.parseOption);
+            const { schema, getFileInfo } = (0, schema_js_1.createSchema)(req, targets, init.name, init.version, tsNocheck, bootstrapWkt, rewriteImports, importExtension, keepEmptyFiles);
             const targetTs = schema.targets.includes("ts");
             const targetJs = schema.targets.includes("js");
             const targetDts = schema.targets.includes("dts");
@@ -103,6 +103,7 @@ function parseParameter(parameter, parseOption) {
     let bootstrapWkt = false;
     let keepEmptyFiles = false;
     const rewriteImports = [];
+    let importExtension = ".js";
     for (const { key, value } of splitParameter(parameter)) {
         switch (key) {
             case "target":
@@ -159,6 +160,10 @@ function parseParameter(parameter, parseOption) {
                 rewriteImports.push({ pattern, target });
                 break;
             }
+            case "import_extension": {
+                importExtension = value === "none" ? "" : value;
+                break;
+            }
             case "keep_empty_files": {
                 switch (value) {
                     case "true":
@@ -187,7 +192,14 @@ function parseParameter(parameter, parseOption) {
                 break;
         }
     }
-    return { targets, tsNocheck, bootstrapWkt, rewriteImports, keepEmptyFiles };
+    return {
+        targets,
+        tsNocheck,
+        bootstrapWkt,
+        rewriteImports,
+        importExtension,
+        keepEmptyFiles,
+    };
 }
 function splitParameter(parameter) {
     if (parameter == undefined) {

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

@@ -17,7 +17,7 @@ exports.createGeneratedFile = void 0;
 const import_symbol_js_1 = require("./import-symbol.js");
 const gencommon_js_1 = require("./gencommon.js");
 const import_path_js_1 = require("./import-path.js");
-function createGeneratedFile(name, importPath, createTypeImport, runtimeImports, preambleSettings, keepEmpty) {
+function createGeneratedFile(name, importPath, rewriteImportPath, createTypeImport, runtimeImports, preambleSettings, keepEmpty) {
     let preamble;
     const el = [];
     return {
@@ -52,7 +52,7 @@ function createGeneratedFile(name, importPath, createTypeImport, runtimeImports,
             return createTypeImport(typeOrName);
         },
         getFileInfo() {
-            const content = elToContent(el, importPath);
+            const content = elToContent(el, importPath, rewriteImportPath);
             if (!keepEmpty && content.length === 0) {
                 return;
             }
@@ -65,9 +65,9 @@ function createGeneratedFile(name, importPath, createTypeImport, runtimeImports,
     };
 }
 exports.createGeneratedFile = createGeneratedFile;
-function elToContent(el, importerPath) {
+function elToContent(el, importerPath, rewriteImportPath) {
     const c = [];
-    const symbolToIdentifier = processImports(el, importerPath, (typeOnly, from, names) => {
+    const symbolToIdentifier = processImports(el, importerPath, rewriteImportPath, (typeOnly, from, names) => {
         const p = names.map(({ name, alias }) => alias == undefined ? name : `${name} as ${alias}`);
         const what = `{ ${p.join(", ")} }`;
         if (typeOnly) {
@@ -142,7 +142,7 @@ function buildPrintablesFromFragments(fragments, values) {
     });
     return printables;
 }
-function processImports(el, importerPath, makeImportStatement) {
+function processImports(el, importerPath, rewriteImportPath, makeImportStatement) {
     // identifiers to use in the output
     const symbolToIdentifier = new Map();
     // symbols that need a value import (as opposed to a type-only import)
@@ -231,7 +231,7 @@ function processImports(el, importerPath, makeImportStatement) {
             // should never happen
             continue;
         }
-        const from = (0, import_path_js_1.makeImportPathRelative)(importerPath, s.from);
+        const from = (0, import_path_js_1.makeImportPathRelative)(importerPath, rewriteImportPath(s.from));
         if (i.types.size > 0) {
             makeImportStatement(true, from, buildNames(i.types));
         }

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

@@ -17,9 +17,10 @@ exports.makeImportPathRelative = exports.deriveImportPath = exports.relativePath
 const protobuf_1 = require("@bufbuild/protobuf");
 const cache = new WeakMap();
 /**
- * Apply import rewrites to the given path.
+ * Apply import rewrites to the given import path, and change all .js extensions
+ * to the given import extension.
  */
-function rewriteImportPath(importPath, rewriteImports) {
+function rewriteImportPath(importPath, rewriteImports, importExtension) {
     let ri = cache.get(rewriteImports);
     if (ri === undefined) {
         ri = rewriteImports.map(({ pattern, target }) => {
@@ -32,9 +33,20 @@ function rewriteImportPath(importPath, rewriteImports) {
     }
     for (const { pattern, target } of ri) {
         if (pattern.test(importPath)) {
-            return (target.replace(/\/$/, "") + importPath.replace(exports.relativePathRE, "/"));
+            if (exports.relativePathRE.test(importPath)) {
+                importPath =
+                    target.replace(/\/$/, "") + importPath.replace(exports.relativePathRE, "/");
+            }
+            else {
+                importPath = target;
+            }
+            break;
         }
     }
+    if (importExtension != ".js" && importPath.endsWith(".js")) {
+        importPath =
+            importPath.substring(0, importPath.length - 3) + importExtension;
+    }
     return importPath;
 }
 exports.rewriteImportPath = rewriteImportPath;

package/dist/cjs/ecmascript/schema.js

@@ -19,13 +19,13 @@ const generated_file_js_1 = require("./generated-file.js");
 const runtime_imports_js_1 = require("./runtime-imports.js");
 const import_symbol_js_1 = require("./import-symbol.js");
 const import_path_js_1 = require("./import-path.js");
-function createSchema(request, targets, pluginName, pluginVersion, tsNocheck, bootstrapWkt, rewriteImports, keepEmptyFiles) {
+function createSchema(request, targets, pluginName, pluginVersion, tsNocheck, bootstrapWkt, rewriteImports, importExtension, keepEmptyFiles) {
     const descriptorSet = (0, protobuf_1.createDescriptorSet)(request.protoFile);
     const filesToGenerate = findFilesToGenerate(descriptorSet, request);
     const runtime = (0, runtime_imports_js_1.createRuntimeImports)(bootstrapWkt);
     const createTypeImport = (desc) => {
         const name = protobuf_1.codegenInfo.localName(desc);
-        const from = (0, import_path_js_1.rewriteImportPath)((0, import_path_js_1.makeImportPath)(desc.file, bootstrapWkt, filesToGenerate), rewriteImports);
+        const from = (0, import_path_js_1.makeImportPath)(desc.file, bootstrapWkt, filesToGenerate);
         return (0, import_symbol_js_1.createImportSymbol)(name, from);
     };
     const generatedFiles = [];
@@ -36,8 +36,7 @@ function createSchema(request, targets, pluginName, pluginVersion, tsNocheck, bo
         files: filesToGenerate,
         allFiles: descriptorSet.files,
         generateFile(name) {
-            const importPath = (0, import_path_js_1.rewriteImportPath)((0, import_path_js_1.deriveImportPath)(name), rewriteImports);
-            const genFile = (0, generated_file_js_1.createGeneratedFile)(name, importPath, createTypeImport, runtime, {
+            const genFile = (0, generated_file_js_1.createGeneratedFile)(name, (0, import_path_js_1.deriveImportPath)(name), (importPath) => (0, import_path_js_1.rewriteImportPath)(importPath, rewriteImports, importExtension), createTypeImport, runtime, {
                 pluginName,
                 pluginVersion,
                 parameter: request.parameter,

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

@@ -27,8 +27,8 @@ export function createEcmaScriptPlugin(init) {
         version: init.version,
         run(req) {
             var _a;
-            const { targets, tsNocheck, bootstrapWkt, rewriteImports, keepEmptyFiles, } = parseParameter(req.parameter, init.parseOption);
-            const { schema, getFileInfo } = createSchema(req, targets, init.name, init.version, tsNocheck, bootstrapWkt, rewriteImports, keepEmptyFiles);
+            const { targets, tsNocheck, bootstrapWkt, rewriteImports, importExtension, keepEmptyFiles, } = parseParameter(req.parameter, init.parseOption);
+            const { schema, getFileInfo } = createSchema(req, targets, init.name, init.version, tsNocheck, bootstrapWkt, rewriteImports, importExtension, keepEmptyFiles);
             const targetTs = schema.targets.includes("ts");
             const targetJs = schema.targets.includes("js");
             const targetDts = schema.targets.includes("dts");
@@ -99,6 +99,7 @@ function parseParameter(parameter, parseOption) {
     let bootstrapWkt = false;
     let keepEmptyFiles = false;
     const rewriteImports = [];
+    let importExtension = ".js";
     for (const { key, value } of splitParameter(parameter)) {
         switch (key) {
             case "target":
@@ -155,6 +156,10 @@ function parseParameter(parameter, parseOption) {
                 rewriteImports.push({ pattern, target });
                 break;
             }
+            case "import_extension": {
+                importExtension = value === "none" ? "" : value;
+                break;
+            }
             case "keep_empty_files": {
                 switch (value) {
                     case "true":
@@ -183,7 +188,14 @@ function parseParameter(parameter, parseOption) {
                 break;
         }
     }
-    return { targets, tsNocheck, bootstrapWkt, rewriteImports, keepEmptyFiles };
+    return {
+        targets,
+        tsNocheck,
+        bootstrapWkt,
+        rewriteImports,
+        importExtension,
+        keepEmptyFiles,
+    };
 }
 function splitParameter(parameter) {
     if (parameter == undefined) {

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

@@ -14,7 +14,7 @@
 import { createImportSymbol } from "./import-symbol.js";
 import { literalString, makeFilePreamble } from "./gencommon.js";
 import { makeImportPathRelative } from "./import-path.js";
-export function createGeneratedFile(name, importPath, createTypeImport, runtimeImports, preambleSettings, keepEmpty) {
+export function createGeneratedFile(name, importPath, rewriteImportPath, createTypeImport, runtimeImports, preambleSettings, keepEmpty) {
     let preamble;
     const el = [];
     return {
@@ -49,7 +49,7 @@ export function createGeneratedFile(name, importPath, createTypeImport, runtimeI
             return createTypeImport(typeOrName);
         },
         getFileInfo() {
-            const content = elToContent(el, importPath);
+            const content = elToContent(el, importPath, rewriteImportPath);
             if (!keepEmpty && content.length === 0) {
                 return;
             }
@@ -61,9 +61,9 @@ export function createGeneratedFile(name, importPath, createTypeImport, runtimeI
         },
     };
 }
-function elToContent(el, importerPath) {
+function elToContent(el, importerPath, rewriteImportPath) {
     const c = [];
-    const symbolToIdentifier = processImports(el, importerPath, (typeOnly, from, names) => {
+    const symbolToIdentifier = processImports(el, importerPath, rewriteImportPath, (typeOnly, from, names) => {
         const p = names.map(({ name, alias }) => alias == undefined ? name : `${name} as ${alias}`);
         const what = `{ ${p.join(", ")} }`;
         if (typeOnly) {
@@ -138,7 +138,7 @@ function buildPrintablesFromFragments(fragments, values) {
     });
     return printables;
 }
-function processImports(el, importerPath, makeImportStatement) {
+function processImports(el, importerPath, rewriteImportPath, makeImportStatement) {
     // identifiers to use in the output
     const symbolToIdentifier = new Map();
     // symbols that need a value import (as opposed to a type-only import)
@@ -227,7 +227,7 @@ function processImports(el, importerPath, makeImportStatement) {
             // should never happen
             continue;
         }
-        const from = makeImportPathRelative(importerPath, s.from);
+        const from = makeImportPathRelative(importerPath, rewriteImportPath(s.from));
         if (i.types.size > 0) {
             makeImportStatement(true, from, buildNames(i.types));
         }

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

@@ -14,9 +14,10 @@
 import { codegenInfo } from "@bufbuild/protobuf";
 const cache = new WeakMap();
 /**
- * Apply import rewrites to the given path.
+ * Apply import rewrites to the given import path, and change all .js extensions
+ * to the given import extension.
  */
-export function rewriteImportPath(importPath, rewriteImports) {
+export function rewriteImportPath(importPath, rewriteImports, importExtension) {
     let ri = cache.get(rewriteImports);
     if (ri === undefined) {
         ri = rewriteImports.map(({ pattern, target }) => {
@@ -29,9 +30,20 @@ export function rewriteImportPath(importPath, rewriteImports) {
     }
     for (const { pattern, target } of ri) {
         if (pattern.test(importPath)) {
-            return (target.replace(/\/$/, "") + importPath.replace(relativePathRE, "/"));
+            if (relativePathRE.test(importPath)) {
+                importPath =
+                    target.replace(/\/$/, "") + importPath.replace(relativePathRE, "/");
+            }
+            else {
+                importPath = target;
+            }
+            break;
         }
     }
+    if (importExtension != ".js" && importPath.endsWith(".js")) {
+        importPath =
+            importPath.substring(0, importPath.length - 3) + importExtension;
+    }
     return importPath;
 }
 function starToRegExp(star) {

package/dist/esm/ecmascript/schema.js

@@ -11,18 +11,18 @@
 // 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.
-import { codegenInfo, CodeGeneratorResponse, CodeGeneratorResponse_Feature, createDescriptorSet, protoInt64, } from "@bufbuild/protobuf";
+import { CodeGeneratorResponse, CodeGeneratorResponse_Feature, codegenInfo, createDescriptorSet, protoInt64, } from "@bufbuild/protobuf";
 import { createGeneratedFile } from "./generated-file.js";
 import { createRuntimeImports } from "./runtime-imports.js";
 import { createImportSymbol } from "./import-symbol.js";
 import { deriveImportPath, makeImportPath, rewriteImportPath, } from "./import-path.js";
-export function createSchema(request, targets, pluginName, pluginVersion, tsNocheck, bootstrapWkt, rewriteImports, keepEmptyFiles) {
+export function createSchema(request, targets, pluginName, pluginVersion, tsNocheck, bootstrapWkt, rewriteImports, importExtension, keepEmptyFiles) {
     const descriptorSet = createDescriptorSet(request.protoFile);
     const filesToGenerate = findFilesToGenerate(descriptorSet, request);
     const runtime = createRuntimeImports(bootstrapWkt);
     const createTypeImport = (desc) => {
         const name = codegenInfo.localName(desc);
-        const from = rewriteImportPath(makeImportPath(desc.file, bootstrapWkt, filesToGenerate), rewriteImports);
+        const from = makeImportPath(desc.file, bootstrapWkt, filesToGenerate);
         return createImportSymbol(name, from);
     };
     const generatedFiles = [];
@@ -33,8 +33,7 @@ export function createSchema(request, targets, pluginName, pluginVersion, tsNoch
         files: filesToGenerate,
         allFiles: descriptorSet.files,
         generateFile(name) {
-            const importPath = rewriteImportPath(deriveImportPath(name), rewriteImports);
-            const genFile = createGeneratedFile(name, importPath, createTypeImport, runtime, {
+            const genFile = createGeneratedFile(name, deriveImportPath(name), (importPath) => rewriteImportPath(importPath, rewriteImports, importExtension), createTypeImport, runtime, {
                 pluginName,
                 pluginVersion,
                 parameter: request.parameter,

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

@@ -67,7 +67,8 @@ export interface GenerateFileToFileInfo {
     getFileInfo(): FileInfo | undefined;
 }
 declare type CreateTypeImportFn = (desc: DescMessage | DescEnum) => ImportSymbol;
-export declare function createGeneratedFile(name: string, importPath: string, createTypeImport: CreateTypeImportFn, runtimeImports: RuntimeImports, preambleSettings: {
+declare type RewriteImportPathFn = (path: string) => string;
+export declare function createGeneratedFile(name: string, importPath: string, rewriteImportPath: RewriteImportPathFn, createTypeImport: CreateTypeImportFn, runtimeImports: RuntimeImports, preambleSettings: {
     pluginName: string;
     pluginVersion: string;
     parameter: string | undefined;

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

@@ -40,9 +40,10 @@ export declare type RewriteImports = {
     target: string;
 }[];
 /**
- * Apply import rewrites to the given path.
+ * Apply import rewrites to the given import path, and change all .js extensions
+ * to the given import extension.
  */
-export declare function rewriteImportPath(importPath: string, rewriteImports: RewriteImports): string;
+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.

package/dist/types/ecmascript/schema.d.ts

@@ -1,6 +1,6 @@
 import type { CodeGeneratorRequest, DescFile } from "@bufbuild/protobuf";
 import { CodeGeneratorResponse } from "@bufbuild/protobuf";
-import type { GeneratedFile, FileInfo } from "./generated-file.js";
+import type { FileInfo, GeneratedFile } from "./generated-file.js";
 import { RuntimeImports } from "./runtime-imports.js";
 import type { Target } from "./target.js";
 import { RewriteImports } from "./import-path.js";
@@ -38,6 +38,6 @@ interface SchemaController {
     schema: Schema;
     getFileInfo: () => FileInfo[];
 }
-export declare function createSchema(request: CodeGeneratorRequest, targets: Target[], pluginName: string, pluginVersion: string, tsNocheck: boolean, bootstrapWkt: boolean, rewriteImports: RewriteImports, keepEmptyFiles: boolean): SchemaController;
+export declare function createSchema(request: CodeGeneratorRequest, targets: Target[], pluginName: string, pluginVersion: string, tsNocheck: boolean, bootstrapWkt: boolean, rewriteImports: RewriteImports, importExtension: string, keepEmptyFiles: boolean): SchemaController;
 export declare function toResponse(files: FileInfo[]): CodeGeneratorResponse;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protoplugin",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "Helps to create your own Protocol Buffers code generators.",
   "repository": {
@@ -35,7 +35,7 @@
     }
   },
   "dependencies": {
-    "@bufbuild/protobuf": "0.3.0",
+    "@bufbuild/protobuf": "0.4.0",
     "@typescript/vfs": "^1.4.0",
     "typescript": "4.5.2"
   },