@wireio/protoc-gen-solana 1.0.7 → 1.0.9

package/dist/bundle/protoc-gen-solana.cjs

@@ -1822,9 +1822,9 @@ var require_buffer_from = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/source-map-support@0.5.13/node_modules/source-map-support/source-map-support.js
+// ../../node_modules/.pnpm/source-map-support@0.5.21/node_modules/source-map-support/source-map-support.js
 var require_source_map_support = __commonJS({
-  "../../node_modules/.pnpm/source-map-support@0.5.13/node_modules/source-map-support/source-map-support.js"(exports2) {
+  "../../node_modules/.pnpm/source-map-support@0.5.21/node_modules/source-map-support/source-map-support.js"(exports2, module2) {
     var SourceMapConsumer = require_source_map().SourceMapConsumer;
     var path2 = require("path");
     var fs;
@@ -1836,6 +1836,9 @@ var require_source_map_support = __commonJS({
     } catch (err) {
     }
     var bufferFrom = require_buffer_from();
+    function dynamicRequire(mod2, request) {
+      return mod2.require(request);
+    }
     var errorFormatterInstalled = false;
     var uncaughtShimInstalled = false;
     var emptyCacheBetweenOperations = false;
@@ -1855,6 +1858,23 @@ var require_source_map_support = __commonJS({
     function hasGlobalProcessEventEmitter() {
       return typeof process === "object" && process !== null && typeof process.on === "function";
     }
+    function globalProcessVersion() {
+      if (typeof process === "object" && process !== null) {
+        return process.version;
+      } else {
+        return "";
+      }
+    }
+    function globalProcessStderr() {
+      if (typeof process === "object" && process !== null) {
+        return process.stderr;
+      }
+    }
+    function globalProcessExit(code) {
+      if (typeof process === "object" && process !== null && typeof process.exit === "function") {
+        return process.exit(code);
+      }
+    }
     function handlerExec(list) {
       return function(arg) {
         for (var i = 0; i < list.length; i++) {
@@ -2079,15 +2099,20 @@ var require_source_map_support = __commonJS({
       object.toString = CallSiteToString;
       return object;
     }
-    function wrapCallSite(frame) {
+    function wrapCallSite(frame, state) {
+      if (state === void 0) {
+        state = { nextPosition: null, curPosition: null };
+      }
       if (frame.isNative()) {
+        state.curPosition = null;
         return frame;
       }
       var source = frame.getFileName() || frame.getScriptNameOrSourceURL();
       if (source) {
         var line = frame.getLineNumber();
         var column = frame.getColumnNumber() - 1;
-        var headerLength = 62;
+        var noHeader = /^v(10\.1[6-9]|10\.[2-9][0-9]|10\.[0-9]{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
+        var headerLength = noHeader.test(globalProcessVersion()) ? 0 : 62;
         if (line === 1 && column > headerLength && !isInBrowser() && !frame.isEval()) {
           column -= headerLength;
         }
@@ -2096,10 +2121,14 @@ var require_source_map_support = __commonJS({
           line,
           column
         });
+        state.curPosition = position;
         frame = cloneCallSite(frame);
         var originalFunctionName = frame.getFunctionName;
         frame.getFunctionName = function() {
-          return position.name || originalFunctionName();
+          if (state.nextPosition == null) {
+            return originalFunctionName();
+          }
+          return state.nextPosition.name || originalFunctionName();
         };
         frame.getFileName = function() {
           return position.source;
@@ -2134,9 +2163,14 @@ var require_source_map_support = __commonJS({
       var name = error.name || "Error";
       var message = error.message || "";
       var errorString = name + ": " + message;
-      return errorString + stack.map(function(frame) {
-        return "\n    at " + wrapCallSite(frame);
-      }).join("");
+      var state = { nextPosition: null, curPosition: null };
+      var processedStack = [];
+      for (var i = stack.length - 1; i >= 0; i--) {
+        processedStack.push("\n    at " + wrapCallSite(stack[i], state));
+        state.nextPosition = state.curPosition;
+      }
+      state.curPosition = state.nextPosition = null;
+      return errorString + processedStack.reverse().join("");
     }
     function getErrorSource(error) {
       var match = /\n    at [^(]+ \((.*):(\d+):(\d+)\)/.exec(error.stack);
@@ -2163,15 +2197,16 @@ var require_source_map_support = __commonJS({
     }
     function printErrorAndExit(error) {
       var source = getErrorSource(error);
-      if (process.stderr._handle && process.stderr._handle.setBlocking) {
-        process.stderr._handle.setBlocking(true);
+      var stderr = globalProcessStderr();
+      if (stderr && stderr._handle && stderr._handle.setBlocking) {
+        stderr._handle.setBlocking(true);
       }
       if (source) {
         console.error();
         console.error(source);
       }
       console.error(error.stack);
-      process.exit(1);
+      globalProcessExit(1);
     }
     function shimEmitUncaughtException() {
       var origEmit = process.emit;
@@ -2213,11 +2248,7 @@ var require_source_map_support = __commonJS({
         retrieveMapHandlers.unshift(options.retrieveSourceMap);
       }
       if (options.hookRequire && !isInBrowser()) {
-        var Module;
-        try {
-          Module = require("module");
-        } catch (err) {
-        }
+        var Module = dynamicRequire(module2, "module");
         var $compile = Module.prototype._compile;
         if (!$compile.__sourceMapSupport) {
           Module.prototype._compile = function(content, filename) {
@@ -2237,6 +2268,13 @@ var require_source_map_support = __commonJS({
       }
       if (!uncaughtShimInstalled) {
         var installHandler = "handleUncaughtExceptions" in options ? options.handleUncaughtExceptions : true;
+        try {
+          var worker_threads = dynamicRequire(module2, "worker_threads");
+          if (worker_threads.isMainThread === false) {
+            installHandler = false;
+          }
+        } catch (e) {
+        }
         if (installHandler && hasGlobalProcessEventEmitter()) {
           uncaughtShimInstalled = true;
           shimEmitUncaughtException();
@@ -220855,6 +220893,67 @@ function protoNameToRust(fqn) {
 function toSnakeCase(name) {
   return name.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase();
 }
+var RUST_RESERVED_WORDS = /* @__PURE__ */ new Set([
+  // Strict keywords
+  "as",
+  "async",
+  "await",
+  "break",
+  "const",
+  "continue",
+  "crate",
+  "dyn",
+  "else",
+  "enum",
+  "extern",
+  "false",
+  "fn",
+  "for",
+  "if",
+  "impl",
+  "in",
+  "let",
+  "loop",
+  "match",
+  "mod",
+  "move",
+  "mut",
+  "pub",
+  "ref",
+  "return",
+  "self",
+  "Self",
+  "static",
+  "struct",
+  "super",
+  "trait",
+  "true",
+  "type",
+  "unsafe",
+  "use",
+  "where",
+  "while",
+  // Reserved for future use
+  "abstract",
+  "become",
+  "box",
+  "do",
+  "final",
+  "macro",
+  "override",
+  "priv",
+  "try",
+  "typeof",
+  "unsized",
+  "virtual",
+  "yield"
+]);
+function sanitizeRustFieldName(name) {
+  return RUST_RESERVED_WORDS.has(name) ? `${name}_` : name;
+}
+function toRustFieldName(protoFieldName) {
+  return sanitizeRustFieldName(toSnakeCase(protoFieldName));
+}
 function protoFileToRsFile(protoFile, packageName) {
   const base = protoFile.replace(/\.proto$/, "");
   const parts = base.split("/");
@@ -221064,7 +221163,7 @@ function isMessage(field) {
   return field.type === 11;
 }
 function genStructMember(field) {
-  const rustName = toSnakeCase(field.name);
+  const rustName = toRustFieldName(field.name);
   let rustType = resolveRustType(field.type, field.typeName);
   if (field.mapEntry) {
     const keyType = resolveRustType(field.mapEntry.keyType, void 0);
@@ -221083,7 +221182,7 @@ function genStructMember(field) {
   return `    pub ${rustName}: ${rustType},`;
 }
 function genFieldEncode(field) {
-  const rustName = toSnakeCase(field.name);
+  const rustName = toRustFieldName(field.name);
   const typeInfo = PROTO_TYPE_MAP[field.type];
   if (!typeInfo) {
     log.warn(`Skipping unsupported field type ${field.type} for ${field.name}`);
@@ -221106,7 +221205,7 @@ function genFieldEncode(field) {
   return genScalarEncode(field, rustName, typeInfo, tagHex);
 }
 function genFieldDecode(field) {
-  const rustName = toSnakeCase(field.name);
+  const rustName = toRustFieldName(field.name);
   const typeInfo = PROTO_TYPE_MAP[field.type];
   if (!typeInfo) {
     return `            // TODO: unsupported field type ${field.type} for ${field.name}`;
@@ -221183,7 +221282,7 @@ function genRepeatedEncode(field, rustName, typeInfo, tagHex) {
   return lines.join("\n");
 }
 function genMapEncode(field, tagHex) {
-  const rustName = toSnakeCase(field.name);
+  const rustName = toRustFieldName(field.name);
   const me = field.mapEntry;
   const keyInfo = PROTO_TYPE_MAP[me.keyType];
   const valInfo = PROTO_TYPE_MAP[me.valueType];
@@ -221363,7 +221462,50 @@ function genMapDecode(field, rustName, tag) {
 }
 
 // src/generator/message.ts
-function generateRsFile(messages, protoFileName) {
+function collectExternalTypes(messages, currentProtoPackage) {
+  const localNames = new Set(messages.map((m) => m.fullName));
+  for (const m of messages) {
+    for (const nm of m.nestedMessages) {
+      localNames.add(nm.fullName);
+    }
+  }
+  const external = /* @__PURE__ */ new Set();
+  for (const msg of messages) {
+    for (const field of msg.fields) {
+      if (field.type === 11 && field.typeName) {
+        const fqn = field.typeName.startsWith(".") ? field.typeName : `.${field.typeName}`;
+        if (!localNames.has(fqn)) {
+          external.add(fqn);
+        }
+      }
+    }
+  }
+  return external;
+}
+function genExternalImports(messages, currentProtoPackage) {
+  const external = collectExternalTypes(messages, currentProtoPackage);
+  if (external.size === 0) return [];
+  const currentModulePath = currentProtoPackage ? `crate::${currentProtoPackage.split(".").join("::")}::${currentProtoPackage.split(".").pop()}` : "";
+  const modules = /* @__PURE__ */ new Map();
+  for (const fqn of external) {
+    const parts = fqn.replace(/^\./, "").split(".");
+    if (parts.length < 2) continue;
+    const typeName = parts[parts.length - 1];
+    const packageParts = parts.slice(0, -1);
+    const modulePath = `crate::${packageParts.join("::")}::${packageParts[packageParts.length - 1]}`;
+    if (modulePath === currentModulePath) continue;
+    if (!modules.has(modulePath)) {
+      modules.set(modulePath, /* @__PURE__ */ new Set());
+    }
+    modules.get(modulePath).add(typeName);
+  }
+  const lines = [];
+  for (const [mod2, _types] of modules) {
+    lines.push(`use ${mod2}::*;`);
+  }
+  return lines;
+}
+function generateRsFile(messages, protoFileName, protoPackage) {
   const lines = [];
   lines.push(`// Auto-generated by protoc-gen-solana from ${protoFileName}`);
   lines.push(`// DO NOT EDIT`);
@@ -221371,6 +221513,10 @@ function generateRsFile(messages, protoFileName) {
   lines.push(`#![allow(unused_imports, non_camel_case_types, dead_code)]`);
   lines.push(``);
   lines.push(`use crate::protobuf_runtime::*;`);
+  const externalImports = genExternalImports(messages, protoPackage || "");
+  for (const imp of externalImports) {
+    lines.push(imp);
+  }
   lines.push(``);
   for (const msg of messages) {
     if (msg.isMapEntry) continue;
@@ -221554,7 +221700,7 @@ function processRequest(stdin) {
       continue;
     }
     const rsFileName = protoFileToRsFile(fileName, protoFile.package ?? "");
-    const rsContent = generateRsFile(messages, fileName);
+    const rsContent = generateRsFile(messages, fileName, protoFile.package ?? "");
     files.push({ name: rsFileName, content: rsContent });
     log.info("Generated %s (%d messages)", rsFileName, messages.length);
   }