@saltify/milky-generator 0.2.0 → 0.3.0

package/dist/cli.mjs

@@ -58,9 +58,7 @@ function getApiTypeNames(endpoint) {
 	return {
 		pascalEndpoint,
 		inputName: `${pascalEndpoint}Input`,
-		outputName: `${pascalEndpoint}Output`,
-		requestName: `${pascalEndpoint}Request`,
-		responseName: `${pascalEndpoint}Response`
+		outputName: `${pascalEndpoint}Output`
 	};
 }
 function isSameField(first, second) {
@@ -24919,26 +24917,42 @@ function generateTypeScriptStaticSpec(ir) {
 			const typeNames = getApiTypeNames(api.endpoint);
 			l(`/** ${api.description} API 请求参数 */`);
 			if (api.requestFields !== void 0) {
-				l(`export interface ${typeNames.requestName} {`);
+				l(`export interface ${typeNames.inputName} {`);
 				api.requestFields.forEach((field) => {
 					l(`  /** ${field.description} */`);
 					l(`  ${field.name}${field.isOptional ? "?" : ""}: ${getTypeScriptTypeProjection(field)};`);
 				});
 				l("}");
-			} else l(`export type ${typeNames.requestName} = {};`);
+			} else l(`export type ${typeNames.inputName} = {};`);
 			l();
 			l(`/** ${api.description} API 响应数据 */`);
 			if (api.responseFields !== void 0) {
-				l(`export interface ${typeNames.responseName} {`);
+				l(`export interface ${typeNames.outputName} {`);
 				api.responseFields.forEach((field) => {
 					l(`  /** ${field.description} */`);
 					l(`  ${field.name}${field.isOptional ? "?" : ""}: ${getTypeScriptTypeProjection(field)};`);
 				});
 				l("}");
-			} else l(`export type ${typeNames.responseName} = {};`);
+			} else l(`export type ${typeNames.outputName} = {};`);
 			l();
 		});
 	});
+	l("export interface ApiCategories {");
+	ir.apiCategories.forEach((category) => {
+		l(`  /** ${category.name} */`);
+		l(`  ${category.key}: {`);
+		category.apis.forEach((api) => {
+			const typeNames = getApiTypeNames(api.endpoint);
+			l(`    /** ${api.description} */`);
+			l(`    ${api.endpoint}: {`);
+			l(`      request: ${typeNames.inputName};`);
+			l(`      response: ${typeNames.outputName};`);
+			l("    };");
+		});
+		l("  };");
+	});
+	l("}");
+	l();
 	return writer.toString();
 }
 //#endregion
@@ -25679,7 +25693,7 @@ const apiCategories = [
 ];
 //#endregion
 //#region ../protocol/package.json
-var version$1 = "1.2.1-rc.2";
+var version$1 = "1.2.1";
 //#endregion
 //#region ../protocol/src/index.ts
 const ir = {
@@ -29447,7 +29461,7 @@ var import_cjs = (/* @__PURE__ */ __commonJSMin(((exports) => {
 		}
 	});
 })))();
-var version = "0.2.0";
+var version = "0.3.0";
 var description = "Milky codegen CLI";
 //#endregion
 //#region src/cli.ts
@@ -29485,11 +29499,24 @@ const generators = [
 		generate: generateTypeScriptZodSpec
 	}
 ];
-async function resolveProtocolOfVersion(version) {
-	if (version === "latest") return await fetch("https://cdn.jsdelivr.net/npm/@saltify/milky-protocol/dist/protocol.json").then((res) => res.json());
-	else if (version === "local") return ir;
+const cdns = [
+	{
+		name: "unpkg",
+		generateUrl: (packageName, version) => `https://unpkg.com/${packageName}@${version}/dist/protocol.json`
+	},
+	{
+		name: "esmsh",
+		generateUrl: (packageName, version) => `https://esm.sh/${packageName}@${version}/dist/protocol.json`
+	},
+	{
+		name: "jsdelivr",
+		generateUrl: (packageName, version) => `https://cdn.jsdelivr.net/npm/${packageName}@${version}/dist/protocol.json`
+	}
+];
+async function resolveProtocolOfVersion(version, cdn) {
+	if (version === "local") return ir;
 	else {
-		const response = await fetch(`https://cdn.jsdelivr.net/npm/@saltify/milky-protocol@${version}/dist/protocol.json`);
+		const response = await fetch(cdn.generateUrl("@saltify/milky-protocol", version));
 		if (!response.ok) throw new Error(`Failed to fetch protocol of version ${version}: ${response.status} ${response.statusText}`);
 		return await response.json();
 	}
@@ -29507,22 +29534,29 @@ function serializeOutput(output) {
 			description: "Generate a spec from Milky IR.",
 			args: {
 				generator: (0, import_cjs.positional)({
+					displayName: "generator",
 					type: import_cjs.string,
-					description: "The canonical name of the generator to run. Use \"list\" to see all available generators."
+					description: "Name of the generator to run. Use \"list\" for all available generators."
 				}),
 				output: (0, import_cjs.option)({
 					type: import_cjs.string,
 					long: "output",
 					short: "o",
-					description: "The output file path. If not specified, the generated spec will be printed to stdout.",
+					description: "The output file path. The generator writes to stdout if not provided.",
 					defaultValue: () => ""
 				}),
 				version: (0, import_cjs.option)({
 					type: import_cjs.string,
 					long: "version",
 					short: "v",
-					description: "The version of the Milky IR to use. If not specified, the latest version (the version published with `latest` tag on npm) will be used.",
+					description: "The version of the Milky IR to use. Latest stable version if not specified.",
 					defaultValue: () => "latest"
+				}),
+				cdn: (0, import_cjs.option)({
+					type: import_cjs.string,
+					long: "cdn",
+					description: `The CDN to fetch the protocol definition from. "${cdns[0].name}" if not specified.`,
+					defaultValue: () => cdns[0].name
 				})
 			},
 			handler: async (args) => {
@@ -29532,7 +29566,13 @@ function serializeOutput(output) {
 					console.error("Use \"milkygen list\" to see all available generators.");
 					process.exit(1);
 				}
-				const protocol = await resolveProtocolOfVersion(args.version);
+				const cdnSpec = cdns.find((c) => c.name === args.cdn);
+				if (!cdnSpec) {
+					console.error(`Unknown CDN: ${args.cdn}`);
+					console.error(`Use "milkygen list-cdns" to see all supported CDNs.`);
+					process.exit(1);
+				}
+				const protocol = await resolveProtocolOfVersion(args.version, cdnSpec);
 				const content = serializeOutput(await spec.generate(protocol));
 				if (args.output.length === 0) {
 					process.stdout.write(content);
@@ -29558,6 +29598,17 @@ function serializeOutput(output) {
 				});
 			}
 		}),
+		"list-cdns": (0, import_cjs.command)({
+			name: "list-cdns",
+			description: "List all supported CDNs to fetch protocol definitions from.",
+			args: {},
+			handler: () => {
+				console.log("Supported CDNs:");
+				cdns.forEach((cdn) => {
+					console.log(`  - ${cdn.name}`);
+				});
+			}
+		}),
 		version: (0, import_cjs.command)({
 			name: "version",
 			description: "Print the version of milkygen.",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltify/milky-generator",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Milky codegen CLI",
   "bin": {
     "milkygen": "dist/cli.mjs"