Skip to content

Commit a4ff371

Browse files
Fix version number in CLI to use correct package version
Co-authored-by: jasonblanchard <1238532+jasonblanchard@users.noreply.github.com>
1 parent f81530a commit a4ff371

File tree

3 files changed

+64
-225
lines changed

3 files changed

+64
-225
lines changed

examples/kitchensink/generated-test.ts

Lines changed: 0 additions & 219 deletions
This file was deleted.

packages/openapi-typescript-server/bin/cli/index.cjs

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -648,12 +648,69 @@ var supportsColor = {
648648
};
649649
var supports_color_default = supportsColor;
650650

651+
// package.json
652+
var package_default = {
653+
name: "openapi-typescript-server",
654+
version: "0.0.10",
655+
description: "Codegenerator for OpenAPI server stubs in TypeScript",
656+
author: "jasonblanchard",
657+
license: "MIT",
658+
repository: {
659+
type: "git",
660+
url: "https://github.com/jasonblanchard/openapi-typescript-server.git",
661+
directory: "packages/openapi-typescript-server"
662+
},
663+
keywords: [
664+
"swagger",
665+
"typescript",
666+
"ts",
667+
"dts",
668+
"openapi",
669+
"codegen",
670+
"generation",
671+
"openapi 3",
672+
"node",
673+
"express",
674+
"web",
675+
"http",
676+
"rest",
677+
"restful",
678+
"router",
679+
"app",
680+
"api"
681+
],
682+
type: "module",
683+
bin: "./bin/cli/index.cjs",
684+
exports: {
685+
import: "./dist/index.js",
686+
require: "./dist/index.cjs"
687+
},
688+
main: "dist/index.cjs",
689+
module: "dist/index.js",
690+
types: "dist/index.d.ts",
691+
scripts: {
692+
test: "node --test",
693+
build: "tsup src/cli/index.ts --format cjs --out-dir bin/cli --clean"
694+
},
695+
dependencies: {
696+
commander: "^14.0.0",
697+
"js-yaml": "^4.1.0",
698+
"openapi-typescript-server-runtime": "0.0.10",
699+
"ts-morph": "^26.0.0",
700+
zod: "^4.0.14"
701+
},
702+
devDependencies: {
703+
"@types/js-yaml": "^4.0.9",
704+
tsup: "^8.5.0"
705+
}
706+
};
707+
651708
// src/cli/index.ts
652709
var program = new import_commander.Command();
653710
if (!supports_color_default.stdout || supports_color_default.stdout.hasBasic === false) {
654711
import_ansi_colors.default.enabled = false;
655712
}
656-
program.name("openapi-typescript-server").description("CLI to generate Open API server stub").version(process.env.npm_package_version || "unknown").argument("<spec>", "Path to Open API spec file").description("Output generated code").option(
713+
program.name("openapi-typescript-server").description("CLI to generate Open API server stub").version(package_default.version).argument("<spec>", "Path to Open API spec file").description("Output generated code").option(
657714
"-t, --types <types>",
658715
"Import path (relative to generated output) for type schema generated by open-api-typescript"
659716
).option("-o, --output <dir>", "output directory", "").action((spec, options) => __async(void 0, null, function* () {
@@ -674,11 +731,11 @@ program.name("openapi-typescript-server").description("CLI to generate Open API
674731
validateSpecResponse.data,
675732
options.types,
676733
options.output,
677-
process.env.npm_package_version
734+
package_default.version
678735
);
679736
if (options.output) {
680737
console.log(
681-
`\u{1F916} ${import_ansi_colors.default.bold("openapi-typescript-server")} ${import_ansi_colors.default.dim(process.env.npm_package_version || "unknown")} ${import_ansi_colors.default.green(spec)} \u2192 ${import_ansi_colors.default.green(import_ansi_colors.default.bold(options.output))}`
738+
`\u{1F916} ${import_ansi_colors.default.bold("openapi-typescript-server")} ${import_ansi_colors.default.dim(package_default.version)} ${import_ansi_colors.default.green(spec)} \u2192 ${import_ansi_colors.default.green(import_ansi_colors.default.bold(options.output))}`
682739
);
683740
sourceFile.saveSync();
684741
return;

packages/openapi-typescript-server/src/cli/index.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import yaml from "js-yaml";
77
import generate from "./generate.ts";
88
import c from "ansi-colors";
99
import supportsColor from "supports-color";
10+
import packageJson from "../../package.json" with { type: "json" };
1011

1112
const program = new Command();
1213

@@ -17,7 +18,7 @@ if (!supportsColor.stdout || supportsColor.stdout.hasBasic === false) {
1718
program
1819
.name("openapi-typescript-server")
1920
.description("CLI to generate Open API server stub")
20-
.version(process.env.npm_package_version || "unknown")
21+
.version(packageJson.version)
2122
.argument("<spec>", "Path to Open API spec file")
2223
.description("Output generated code")
2324
.option(
@@ -47,12 +48,12 @@ program
4748
validateSpecResponse.data,
4849
options.types,
4950
options.output,
50-
process.env.npm_package_version,
51+
packageJson.version,
5152
);
5253

5354
if (options.output) {
5455
console.log(
55-
`🤖 ${c.bold("openapi-typescript-server")} ${c.dim(process.env.npm_package_version || "unknown")} ${c.green(spec)}${c.green(c.bold(options.output))}`,
56+
`🤖 ${c.bold("openapi-typescript-server")} ${c.dim(packageJson.version)} ${c.green(spec)}${c.green(c.bold(options.output))}`,
5657
);
5758
sourceFile.saveSync();
5859
return;

0 commit comments

Comments
 (0)