ts-proto-client 1.0.2 → 1.0.4

package/README.md

@@ -214,4 +214,4 @@ protoc --version
 
 ## License
 
-MIT
+MIT

package/dist/index.js

@@ -1,230 +1,7 @@
 #!/usr/bin/env node
+import{Command as q}from"commander";import b from"fs";import R from"path";import y from"fs";import j from"path";import{Root as P,Service as x}from"protobufjs";import u from"path";import w from"fs";var g=["get","post","put","delete","patch"];function C(t){let o=[t,u.join(t,"/third_party/googleapis")],e=new P;return e.resolvePath=(n,p)=>{for(let s of o){let i=u.join(s,p);if(w.existsSync(i))return i}return p},e}function h(t,o=[]){if(!t.nested)return o;for(let e of Object.values(t.nested))e instanceof x&&o.push(e),h(e,o);return o}function A(t){let o=t.parsedOptions?.find(n=>n["(google.api.http)"])?.["(google.api.http)"];if(!o)return null;let e=g.find(n=>o[n]);return e?{method:e,url:o[e],summary:t.options?.["(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation).summary"]}:null}function v(t,o){let e=u.resolve(process.cwd(),t),n=C(e);n.loadSync(u.join(e,o));let p=h(n),s={};for(let i of p){let a=[];for(let r of Object.values(i.methods)){let m=A(r);m&&a.push({name:r.name,requestType:r.requestType,responseType:r.responseType,...m})}s[i.name]=a}return s}function O(t,o){let e=[];for(let[n,p]of Object.entries(t)){let s=new Set,i=[];for(let r of p){s.add(r.requestType),s.add(r.responseType);let m=r.method==="get"?"params: data":"data",d=[];r.summary&&d.push(`// ${r.summary}`),d.push(`export function ${r.name}(data: ${r.requestType}) {`,`  return service<${r.responseType}>({`,`    url: "${r.url.replace("/api","")}",`,`    method: "${r.method}",`,`    ${m}`,"  })","}"),i.push(d.join(`
+`))}let a=[...s].sort();e.push({[n]:['import { service } from "../..";',"","import type {",`  ${a.join(`,
+  `)}`,`} from "${o}";`,"",i.join(`
 
-// src/index.ts
-import { Command } from "commander";
-
-// src/commands/generate.ts
-import fs4 from "fs";
-import path4 from "path";
-
-// src/generators/api.ts
-import fs2 from "fs";
-import path2 from "path";
-
-// src/utils/index.ts
-import { Root, Service } from "protobufjs";
-import path from "path";
-import fs from "fs";
-
-// src/constants.ts
-var HTTP_METHODS = [
-  "get",
-  "post",
-  "put",
-  "delete",
-  "patch"
-];
-
-// src/utils/index.ts
-function createRoot(rootPath) {
-  const INCLUDE_PATHS = [
-    rootPath,
-    path.join(rootPath, "/third_party/googleapis")
-  ];
-  const root = new Root();
-  root.resolvePath = (_, target) => {
-    for (const includePath of INCLUDE_PATHS) {
-      const filePath = path.join(
-        includePath,
-        target
-      );
-      if (fs.existsSync(filePath)) {
-        return filePath;
-      }
-    }
-    return target;
-  };
-  return root;
-}
-function findServices(namespace, result = []) {
-  if (!namespace.nested) return result;
-  for (const item of Object.values(namespace.nested)) {
-    if (item instanceof Service) {
-      result.push(item);
-    }
-    findServices(item, result);
-  }
-  return result;
-}
-function getHttpInfo(method) {
-  const http = method.parsedOptions?.find(
-    (item) => item["(google.api.http)"]
-  )?.["(google.api.http)"];
-  if (!http) return null;
-  const methodName = HTTP_METHODS.find(
-    (key) => http[key]
-  );
-  if (!methodName) return null;
-  return {
-    method: methodName,
-    url: http[methodName],
-    summary: method.options?.["(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation).summary"]
-  };
-}
-function parseProto(protosPath, protoFilePath) {
-  const rootPath = path.resolve(process.cwd(), protosPath);
-  const root = createRoot(rootPath);
-  root.loadSync(path.join(rootPath, protoFilePath));
-  const services = findServices(root);
-  const apis = {};
-  for (const service of services) {
-    const api = [];
-    for (const method of Object.values(service.methods)) {
-      const httpInfo = getHttpInfo(method);
-      if (!httpInfo) continue;
-      api.push({
-        name: method.name,
-        requestType: method.requestType,
-        responseType: method.responseType,
-        ...httpInfo
-      });
-    }
-    apis[service.name] = api;
-  }
-  return apis;
-}
-function generateApiCode(apis, importTypePath) {
-  const modules = [];
-  for (const [key, api] of Object.entries(apis)) {
-    const types = /* @__PURE__ */ new Set();
-    const functions = [];
-    for (const data of api) {
-      types.add(data.requestType);
-      types.add(data.responseType);
-      const requestField = data.method === "get" ? "params: data" : "data";
-      const lines = [];
-      if (data.summary) lines.push(`// ${data.summary}`);
-      lines.push(
-        `export function ${data.name}(data: ${data.requestType}) {`,
-        `  return service<${data.responseType}>({`,
-        `    url: "${data.url.replace("/api", "")}",`,
-        `    method: "${data.method}",`,
-        `    ${requestField}`,
-        `  })`,
-        `}`
-      );
-      functions.push(
-        lines.join("\n")
-      );
-    }
-    const imports = [...types].sort();
-    modules.push({
-      [key]: [
-        `import { service } from "@/plugins";`,
-        "",
-        "import type {",
-        `  ${imports.join(",\n  ")}`,
-        `} from "${importTypePath}";`,
-        "",
-        functions.join("\n\n")
-      ].join("\n")
-    });
-  }
-  return modules;
-}
-function getOutputPath(baseDir, protoFile) {
-  const normalized = protoFile.replace(/\\/g, "/").replace(/^\.?\//, "").replace(/\.proto$/, "");
-  return path.join(baseDir, normalized);
-}
-
-// src/generators/api.ts
-function generateApi(options) {
-  const outputPath = path2.resolve(process.cwd(), options.apiOutput);
-  if (!fs2.existsSync(outputPath)) {
-    fs2.mkdirSync(outputPath, { recursive: true });
-  }
-  const apis = parseProto(options.root, options.file);
-  const result = getOutputPath(options.typeOutput, options.file);
-  const relativePath = path2.relative(options.apiOutput, result).replace(/\\/g, "/");
-  const codes = generateApiCode(apis, relativePath);
-  for (const code of codes) {
-    for (const [name, content] of Object.entries(code)) {
-      fs2.writeFileSync(`${outputPath}/${name}.ts`, content, "utf8");
-    }
-  }
-  console.log("\u2705 Generate Success");
-}
-
-// src/generators/type.ts
-import { execSync } from "child_process";
-import { createRequire } from "module";
-import fs3 from "fs";
-import path3 from "path";
-function generateTypes(options) {
-  const require2 = createRequire(import.meta.url);
-  const tsProtoPkg = require2.resolve("ts-proto/package.json");
-  const tsProtoRoot = path3.dirname(tsProtoPkg);
-  const pluginName = process.platform === "win32" ? "protoc-gen-ts_proto.cmd" : "protoc-gen-ts_proto";
-  const pluginPath = path3.resolve(tsProtoRoot, `./node_modules/.bin/${pluginName}`);
-  const outputPath = path3.resolve(process.cwd(), options.typeOutput);
-  if (!fs3.existsSync(outputPath)) {
-    fs3.mkdirSync(outputPath, { recursive: true });
-  }
-  const rootPath = path3.resolve(process.cwd(), options.root);
-  const configs = [
-    "protoc",
-    `--plugin=protoc-gen-ts_proto=${pluginPath}`,
-    `--ts_proto_out=${outputPath}`,
-    "--ts_proto_opt=onlyTypes=true",
-    // 仅生成 TypeScript
-    "--ts_proto_opt=useOptionals=messages",
-    // message 字段生成可选属性
-    "--ts_proto_opt=esModuleInterop=true",
-    // 使用 ES Module 风格导入
-    `--proto_path=${rootPath}`,
-    `--proto_path=${path3.join(rootPath, "/third_party/googleapis")}`,
-    // protos 中的 google 依赖
-    path3.join(rootPath, options.file)
-  ];
-  execSync(configs.join(" "), { stdio: "inherit" });
-  fs3.rmSync(
-    path3.join(outputPath, "google"),
-    { recursive: true, force: true }
-  );
-  fs3.rmSync(
-    path3.join(outputPath, "common.ts"),
-    { force: true }
-  );
-}
-
-// src/commands/generate.ts
-async function generate(options) {
-  if (!fs4.existsSync(path4.resolve(process.cwd(), options.root))) {
-    console.log(`proto \u9879\u76EE\u4E0D\u5B58\u5728(${options.root})`);
-    return;
-  }
-  generateTypes(options);
-  generateApi(options);
-}
-
-// src/index.ts
-var program = new Command();
-program.name("proto-gen").description("proto code generator").version("1.0.0");
-program.command("generate").option("--file, --file <path>").option("--root, --root <path>").option("--type-output, --typeOutput <path>").option("--api-output, --apiOutput <path>").action((options) => {
-  if (options.file === void 0) {
-    console.log("proto file \u4E0D\u80FD\u4E3A\u7A7A, \u8BF7\u8F93\u5165 --file ./account.proto");
-    return;
-  }
-  if (options.root === void 0) {
-    console.log("proto \u6587\u4EF6\u7684\u6839\u8DEF\u5F84\u4E0D\u80FD\u4E3A\u7A7A, \u8BF7\u8F93\u5165 --root ../protos");
-    return;
-  }
-  if (options.typeOutput === void 0) {
-    options.typeOutput = "src/protos/type";
-  }
-  if (options.apiOutput === void 0) {
-    options.apiOutput = "src/protos/api";
-  }
-  generate(options);
-});
-program.parse();
+`)].join(`
+`)})}return e}function T(t,o){let e=o.replace(/\\/g,"/").replace(/^\.?\//,"").replace(/\.proto$/,"");return u.join(t,e)}function _(t){let o=j.resolve(process.cwd(),t.apiOutput);y.existsSync(o)||y.mkdirSync(o,{recursive:!0});let e=v(t.root,t.file),n=T(t.typeOutput,t.file),p=j.relative(t.apiOutput,n).replace(/\\/g,"/"),s=O(e,p);for(let i of s)for(let[a,r]of Object.entries(i))y.writeFileSync(`${o}/${a}.ts`,r,"utf8");console.log("\u2705 Generate Success")}import{execSync as H}from"child_process";import f from"fs";import c from"path";function $(t){let o=c.resolve(process.cwd(),t.typeOutput);f.existsSync(o)||f.mkdirSync(o,{recursive:!0});let e=c.resolve(process.cwd(),t.root),n=["protoc",`--ts_proto_out=${o}`,"--ts_proto_opt=onlyTypes=true","--ts_proto_opt=useOptionals=messages","--ts_proto_opt=esModuleInterop=true",`--proto_path=${e}`,`--proto_path=${c.join(e,"/third_party/googleapis")}`,c.join(e,t.file)],p={...process.env,PATH:`${c.join(process.cwd(),"node_modules",".bin")};${process.env.PATH}`};console.log(`${c.join(process.cwd(),"node_modules",".bin")};${process.env.PATH}`),H(n.join(" "),{stdio:"inherit",env:p}),f.rmSync(c.join(o,"google"),{recursive:!0,force:!0}),f.rmSync(c.join(o,"common.ts"),{force:!0})}async function S(t){if(!b.existsSync(R.resolve(process.cwd(),t.root))){console.log(`proto \u9879\u76EE\u4E0D\u5B58\u5728(${t.root})`);return}$(t),_(t)}var l=new q;l.name("proto-gen").description("proto code generator").version("1.0.0");l.command("generate").option("--file, --file <path>").option("--root, --root <path>").option("--type-output, --typeOutput <path>").option("--api-output, --apiOutput <path>").action(t=>{if(t.file===void 0){console.log("proto file \u4E0D\u80FD\u4E3A\u7A7A, \u8BF7\u8F93\u5165 --file ./account.proto");return}if(t.root===void 0){console.log("proto \u6587\u4EF6\u7684\u6839\u8DEF\u5F84\u4E0D\u80FD\u4E3A\u7A7A, \u8BF7\u8F93\u5165 --root ../protos");return}t.typeOutput===void 0&&(t.typeOutput="src/protos/type"),t.apiOutput===void 0&&(t.apiOutput="src/protos/api"),S(t)});l.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto-client",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "description": "",
   "scripts": {
@@ -20,13 +20,11 @@
   "packageManager": "pnpm@10.14.0",
   "dependencies": {
     "commander": "^15.0.0",
-    "prompts": "^2.4.2",
     "protobufjs": "^8.6.3",
     "ts-proto": "^2.11.8"
   },
   "devDependencies": {
     "@types/node": "^25.9.3",
-    "@types/prompts": "^2.4.9",
     "tsup": "^8.5.1",
     "tsx": "^4.22.4",
     "typescript": "^6.0.3"