Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions esbuild.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,5 @@ const nodeBuildOptions = {
},
};

// Client/Browser build - runs in React/React-Native apps
const clientBuildOptions = {
bundle: true,
sourcemap: false,
platform: "browser",
format: "esm",
minify: true,
metafile: false,
keepNames: true,
external,
target: ["es2020"],
logLevel: "info",
define: {
"process.env.NODE_ENV": `"production"`,
},
};

await build({ ...nodeBuildOptions, entryPoints: ["./src/sh.ts"], outfile: "./dist/sh.js" });
await build({ ...nodeBuildOptions, entryPoints: ["./src/generator.ts"], outfile: "./dist/generator.js" });
await build({ ...clientBuildOptions, entryPoints: ["./src/index.ts"], outfile: "./dist/index.js" });
await build({ ...clientBuildOptions, entryPoints: ["./src/acl.ts"], outfile: "./dist/acl.js" });
20 changes: 12 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@povio/openapi-codegen-cli",
"version": "2.0.2",
"version": "2.0.3",
"keywords": [
"codegen",
"openapi",
Expand All @@ -24,13 +24,13 @@
"src/assets/**",
"src/generators/templates/**"
],
"main": "./dist/index.js",
"main": "./dist/index.mjs",
"types": "./dist/index.d.ts",
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.js",
"require": "./dist/index.js"
"import": "./dist/index.mjs",
"require": "./dist/index.mjs"
},
"./generator": {
"types": "./dist/generator.d.ts",
Expand All @@ -39,17 +39,18 @@
},
"./acl": {
"types": "./dist/acl.d.ts",
"import": "./dist/acl.js",
"require": "./dist/acl.js"
"import": "./dist/acl.mjs",
"require": "./dist/acl.mjs"
}
},
"scripts": {
"start": "node --import tsx ./src/sh.ts",
"test": "vitest run",
"test:watch": "vitest",
"build:clean": "rm -rf ./dist",
"build:types": "tsc --project . --declaration --emitDeclarationOnly",
"build": "yarn build:clean && yarn build:types && node ./esbuild.mjs && chmod +x ./dist/sh.js",
"build:client": "vite build",
"build:cli": "node ./esbuild.mjs && chmod +x ./dist/sh.js",
"build": "yarn build:clean && yarn build:cli && yarn build:client",
"start:dist": "node ./dist/sh.js",
"typecheck": "tsc --noEmit",
"lint": "oxlint --type-aware --fix",
Expand All @@ -74,6 +75,7 @@
"@types/prompt-sync": "^4.2.3",
"@types/react": "^19.1.0",
"@types/yargs": "^17.0.32",
"@vitejs/plugin-react": "^5.1.3",
"axios": "^1.13.1",
"esbuild": "0.25.0",
"handlebars": "^4.7.8",
Expand All @@ -89,6 +91,8 @@
"tsx": "^4.10.5",
"type-fest": "^4.26.0",
"typescript": "^5.9.3",
"vite": "^7.3.1",
"vite-plugin-dts": "^4.5.4",
"vitest": "^2.0.5",
"yargs": "^17.7.2",
"zod": "^4.1.12"
Expand Down
6 changes: 3 additions & 3 deletions src/commands/check.command.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { logBanner } from "src/helpers/cli.helper";
import { getVersion } from "src/helpers/version.helper";
import { getBuilder, YargOption } from "src/helpers/yargs.helper";
import { logBanner } from "@/helpers/cli.helper";
import { getVersion } from "@/helpers/version.helper";
import { getBuilder, YargOption } from "@/helpers/yargs.helper";
import yargs from "yargs";

import { check, CheckParams } from "./check";
Expand Down
10 changes: 5 additions & 5 deletions src/commands/check.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { OpenAPIV3 } from "openapi-types";
import { checkOpenAPIDoc } from "src/generators/checkOpenAPIDoc";
import { resolveConfig } from "src/generators/core/resolveConfig";
import { GenerateOptions } from "src/generators/types/options";
import { logInfo, logSuccess } from "src/helpers/cli.helper";
import { loadConfig } from "src/helpers/config.helper";
import { checkOpenAPIDoc } from "@/generators/checkOpenAPIDoc";
import { resolveConfig } from "@/generators/core/resolveConfig";
import { GenerateOptions } from "@/generators/types/options";
import { logInfo, logSuccess } from "@/helpers/cli.helper";
import { loadConfig } from "@/helpers/config.helper";

import SwaggerParser from "@apidevtools/swagger-parser";

Expand Down
6 changes: 3 additions & 3 deletions src/commands/generate.command.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { logBanner } from "src/helpers/cli.helper";
import { getVersion } from "src/helpers/version.helper";
import { getBuilder, YargOption } from "src/helpers/yargs.helper";
import { logBanner } from "@/helpers/cli.helper";
import { getVersion } from "@/helpers/version.helper";
import { getBuilder, YargOption } from "@/helpers/yargs.helper";
import yargs from "yargs";

import { generate, GenerateParams } from "./generate";
Expand Down
12 changes: 6 additions & 6 deletions src/commands/generate.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { exec } from "child_process";

import { OpenAPIV3 } from "openapi-types";
import { resolveConfig } from "src/generators/core/resolveConfig";
import { generateCodeFromOpenAPIDoc } from "src/generators/generateCodeFromOpenAPIDoc";
import { GenerateOptions } from "src/generators/types/options";
import { writeGenerateFileData } from "src/generators/utils/file.utils";
import { logError, logInfo, logSuccess } from "src/helpers/cli.helper";
import { loadConfig } from "src/helpers/config.helper";
import { resolveConfig } from "@/generators/core/resolveConfig";
import { generateCodeFromOpenAPIDoc } from "@/generators/generateCodeFromOpenAPIDoc";
import { GenerateOptions } from "@/generators/types/options";
import { writeGenerateFileData } from "@/generators/utils/file.utils";
import { logError, logInfo, logSuccess } from "@/helpers/cli.helper";
import { loadConfig } from "@/helpers/config.helper";

import SwaggerParser from "@apidevtools/swagger-parser";

Expand Down
2 changes: 1 addition & 1 deletion src/generators/checkOpenAPIDoc.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { OpenAPIV3 } from "openapi-types";
import { styleText } from 'node:util';
import { log } from "src/helpers/cli.helper";
import { log } from "@/helpers/cli.helper";

import { VALIDATION_ERROR_TYPE_TITLE } from "./const/validation.const";
import { getDataFromOpenAPIDoc } from "./core/getDataFromOpenAPIDoc";
Expand Down
2 changes: 1 addition & 1 deletion src/generators/const/acl.const.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GenerateFile, Import } from "src/generators/types/generate";
import { GenerateFile, Import } from "@/generators/types/generate";

export const ACL_APP_ABILITY_FILE: GenerateFile = { fileName: "acl/app.ability", extension: "ts" };
export const ACL_APP_ABILITIES = "AppAbilities";
Expand Down
2 changes: 1 addition & 1 deletion src/generators/const/deps.const.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GenerateFile, Import } from "src/generators/types/generate";
import { GenerateFile, Import } from "@/generators/types/generate";

import { ACL_PACKAGE_IMPORT_PATH, PACKAGE_IMPORT_PATH } from "./package.const";

Expand Down
2 changes: 1 addition & 1 deletion src/generators/const/endpoints.const.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Import } from "src/generators/types/generate";
import { Import } from "@/generators/types/generate";

export const JSON_APPLICATION_FORMAT = "application/json";
export const DEFAULT_HEADERS = {
Expand Down
4 changes: 2 additions & 2 deletions src/generators/const/options.const.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { GenerateType } from "src/generators/types/generate";
import { GenerateOptions } from "src/generators/types/options";
import { GenerateType } from "@/generators/types/generate";
import { GenerateOptions } from "@/generators/types/options";

import { PACKAGE_IMPORT_PATH } from "./package.const";
import { ENUM_SUFFIX, SCHEMA_SUFFIX } from "./zod.const";
Expand Down
2 changes: 1 addition & 1 deletion src/generators/const/queries.const.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Import } from "src/generators/types/generate";
import { Import } from "@/generators/types/generate";

export const QUERY_HOOKS = {
query: "useQuery",
Expand Down
2 changes: 1 addition & 1 deletion src/generators/const/validation.const.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ValidationErrorType } from "src/generators/types/validation";
import { ValidationErrorType } from "@/generators/types/validation";

export const HTTP_STATUS_CODES = {
"100": "Continue",
Expand Down
2 changes: 1 addition & 1 deletion src/generators/const/zod.const.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Import } from "src/generators/types/generate";
import { Import } from "@/generators/types/generate";

export const SCHEMA_SUFFIX = "Schema";
export const ENUM_SUFFIX = "Enum";
Expand Down
24 changes: 12 additions & 12 deletions src/generators/core/SchemaResolver.class.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
import { OpenAPIV3 } from "openapi-types";
import { ALLOWED_METHODS } from "src/generators/const/openapi.const";
import { OperationObject } from "src/generators/types/openapi";
import { GenerateOptions } from "src/generators/types/options";
import { ValidationError } from "src/generators/types/validation";
import { getUniqueArray } from "src/generators/utils/array.utils";
import { pick } from "src/generators/utils/object.utils";
import { isReferenceObject } from "src/generators/utils/openapi-schema.utils";
import { ALLOWED_METHODS } from "@/generators/const/openapi.const";
import { OperationObject } from "@/generators/types/openapi";
import { GenerateOptions } from "@/generators/types/options";
import { ValidationError } from "@/generators/types/validation";
import { getUniqueArray } from "@/generators/utils/array.utils";
import { pick } from "@/generators/utils/object.utils";
import { isReferenceObject } from "@/generators/utils/openapi-schema.utils";
import {
autocorrectRef,
getSchemaNameByRef,
getSchemaRef,
isMediaTypeAllowed,
isParamMediaTypeAllowed,
isPathExcluded,
} from "src/generators/utils/openapi.utils";
} from "@/generators/utils/openapi.utils";
import {
getOperationsByTag,
getUniqueOperationName,
getUniqueOperationNamesWithoutSplitByTags,
isOperationExcluded,
} from "src/generators/utils/operation.utils";
import { snakeToCamel } from "src/generators/utils/string.utils";
import { formatTag, getOperationTag } from "src/generators/utils/tag.utils";
} from "@/generators/utils/operation.utils";
import { snakeToCamel } from "@/generators/utils/string.utils";
import { formatTag, getOperationTag } from "@/generators/utils/tag.utils";
import {
getBodyZodSchemaName,
getResponseZodSchemaName,
getZodSchemaName,
getZodSchemaOperationName,
} from "src/generators/utils/zod-schema.utils";
} from "@/generators/utils/zod-schema.utils";

import { DependencyGraph, getOpenAPISchemaDependencyGraph } from "./openapi/getOpenAPISchemaDependencyGraph";
import { getDeepSchemaRefObjs, getSchemaRefObjs } from "./openapi/getSchemaRefObjs";
Expand Down
16 changes: 8 additions & 8 deletions src/generators/core/endpoints/getEndpointAcl.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { OpenAPIV3 } from "openapi-types";
import { SchemaResolver } from "src/generators/core/SchemaResolver.class";
import { AclConditionsPropertyType, Endpoint, EndpointAclInfo } from "src/generators/types/endpoint";
import { OperationAclInfo, OperationObject } from "src/generators/types/openapi";
import { isReferenceObject } from "src/generators/utils/openapi-schema.utils";
import { isParamMediaTypeAllowed } from "src/generators/utils/openapi.utils";
import { isQuery } from "src/generators/utils/query.utils";
import { decapitalize } from "src/generators/utils/string.utils";
import { getMissingAclConditionPropertyError } from "src/generators/utils/validation.utils";
import { SchemaResolver } from "@/generators/core/SchemaResolver.class";
import { AclConditionsPropertyType, Endpoint, EndpointAclInfo } from "@/generators/types/endpoint";
import { OperationAclInfo, OperationObject } from "@/generators/types/openapi";
import { isReferenceObject } from "@/generators/utils/openapi-schema.utils";
import { isParamMediaTypeAllowed } from "@/generators/utils/openapi.utils";
import { isQuery } from "@/generators/utils/query.utils";
import { decapitalize } from "@/generators/utils/string.utils";
import { getMissingAclConditionPropertyError } from "@/generators/utils/validation.utils";

export function getEndpointAcl({
resolver,
Expand Down
18 changes: 9 additions & 9 deletions src/generators/core/endpoints/getEndpointBody.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { BODY_PARAMETER_NAME } from "src/generators/const/endpoints.const";
import { SchemaResolver } from "src/generators/core/SchemaResolver.class";
import { getZodChain } from "src/generators/core/zod/getZodChain";
import { getZodSchema } from "src/generators/core/zod/getZodSchema";
import { resolveZodSchemaName } from "src/generators/core/zod/resolveZodSchemaName";
import { EndpointParameter } from "src/generators/types/endpoint";
import { OperationObject } from "src/generators/types/openapi";
import { isParamMediaTypeAllowed } from "src/generators/utils/openapi.utils";
import { getBodyZodSchemaName, getZodSchemaOperationName } from "src/generators/utils/zod-schema.utils";
import { BODY_PARAMETER_NAME } from "@/generators/const/endpoints.const";
import { SchemaResolver } from "@/generators/core/SchemaResolver.class";
import { getZodChain } from "@/generators/core/zod/getZodChain";
import { getZodSchema } from "@/generators/core/zod/getZodSchema";
import { resolveZodSchemaName } from "@/generators/core/zod/resolveZodSchemaName";
import { EndpointParameter } from "@/generators/types/endpoint";
import { OperationObject } from "@/generators/types/openapi";
import { isParamMediaTypeAllowed } from "@/generators/utils/openapi.utils";
import { getBodyZodSchemaName, getZodSchemaOperationName } from "@/generators/utils/zod-schema.utils";

export function getEndpointBody({
resolver,
Expand Down
18 changes: 9 additions & 9 deletions src/generators/core/endpoints/getEndpointParameter.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { OpenAPIV3 } from "openapi-types";
import { ALLOWED_PATH_IN } from "src/generators/const/openapi.const";
import { SchemaResolver } from "src/generators/core/SchemaResolver.class";
import { getZodChain } from "src/generators/core/zod/getZodChain";
import { getEnumZodSchemaCodeFromEnumNames, getZodSchema } from "src/generators/core/zod/getZodSchema";
import { resolveZodSchemaName } from "src/generators/core/zod/resolveZodSchemaName";
import { EndpointParameter } from "src/generators/types/endpoint";
import { ParameterObject } from "src/generators/types/openapi";
import { ALLOWED_PATH_IN } from "@/generators/const/openapi.const";
import { SchemaResolver } from "@/generators/core/SchemaResolver.class";
import { getZodChain } from "@/generators/core/zod/getZodChain";
import { getEnumZodSchemaCodeFromEnumNames, getZodSchema } from "@/generators/core/zod/getZodSchema";
import { resolveZodSchemaName } from "@/generators/core/zod/resolveZodSchemaName";
import { EndpointParameter } from "@/generators/types/endpoint";
import { ParameterObject } from "@/generators/types/openapi";
import {
isParamMediaTypeAllowed,
isSortingParameterObject,
pathParamToVariableName,
} from "src/generators/utils/openapi.utils";
} from "@/generators/utils/openapi.utils";
import {
getEnumZodSchemaName,
getParamZodSchemaName,
getZodSchemaOperationName,
} from "src/generators/utils/zod-schema.utils";
} from "@/generators/utils/zod-schema.utils";
import { match } from "ts-pattern";

export function getEndpointParameter({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { OpenAPIV3 } from "openapi-types";
import { JSON_APPLICATION_FORMAT } from "src/generators/const/endpoints.const";
import { DEFAULT_GENERATE_OPTIONS } from "src/generators/const/options.const";
import { SchemaResolver } from "src/generators/core/SchemaResolver.class";
import { GenerateOptions } from "src/generators/types/options";
import { JSON_APPLICATION_FORMAT } from "@/generators/const/endpoints.const";
import { DEFAULT_GENERATE_OPTIONS } from "@/generators/const/options.const";
import { SchemaResolver } from "@/generators/core/SchemaResolver.class";
import { GenerateOptions } from "@/generators/types/options";
import { describe, expect, test } from "vitest";

import SwaggerParser from "@apidevtools/swagger-parser";
Expand Down
36 changes: 18 additions & 18 deletions src/generators/core/endpoints/getEndpointsFromOpenAPIDoc.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
import { OpenAPIV3 } from "openapi-types";
import { JSON_APPLICATION_FORMAT } from "src/generators/const/endpoints.const";
import { ALLOWED_METHODS } from "src/generators/const/openapi.const";
import { HttpStatusCode } from "src/generators/const/validation.const";
import { STRING_SCHEMA, VOID_SCHEMA } from "src/generators/const/zod.const";
import { SchemaResolver } from "src/generators/core/SchemaResolver.class";
import { getZodChain } from "src/generators/core/zod/getZodChain";
import { getZodSchema } from "src/generators/core/zod/getZodSchema";
import { resolveZodSchemaName } from "src/generators/core/zod/resolveZodSchemaName";
import { Endpoint, EndpointParameter } from "src/generators/types/endpoint";
import { OperationObject } from "src/generators/types/openapi";
import { invalidVariableNameCharactersToCamel } from "src/generators/utils/js.utils";
import { pick } from "src/generators/utils/object.utils";
import { isReferenceObject } from "src/generators/utils/openapi-schema.utils";
import { JSON_APPLICATION_FORMAT } from "@/generators/const/endpoints.const";
import { ALLOWED_METHODS } from "@/generators/const/openapi.const";
import { HttpStatusCode } from "@/generators/const/validation.const";
import { STRING_SCHEMA, VOID_SCHEMA } from "@/generators/const/zod.const";
import { SchemaResolver } from "@/generators/core/SchemaResolver.class";
import { getZodChain } from "@/generators/core/zod/getZodChain";
import { getZodSchema } from "@/generators/core/zod/getZodSchema";
import { resolveZodSchemaName } from "@/generators/core/zod/resolveZodSchemaName";
import { Endpoint, EndpointParameter } from "@/generators/types/endpoint";
import { OperationObject } from "@/generators/types/openapi";
import { invalidVariableNameCharactersToCamel } from "@/generators/utils/js.utils";
import { pick } from "@/generators/utils/object.utils";
import { isReferenceObject } from "@/generators/utils/openapi-schema.utils";
import {
isErrorStatus,
isMainResponseStatus,
isMediaTypeAllowed,
isPathExcluded,
replaceHyphenatedPath,
} from "src/generators/utils/openapi.utils";
import { getUniqueOperationName, isOperationExcluded } from "src/generators/utils/operation.utils";
import { formatTag, getOperationTag } from "src/generators/utils/tag.utils";
} from "@/generators/utils/openapi.utils";
import { getUniqueOperationName, isOperationExcluded } from "@/generators/utils/operation.utils";
import { formatTag, getOperationTag } from "@/generators/utils/tag.utils";
import {
getInvalidOperationIdError,
getInvalidStatusCodeError,
getMissingPathParameterError,
getMissingStatusCodeError,
getMultipleSuccessStatusCodesError,
} from "src/generators/utils/validation.utils";
import { getResponseZodSchemaName } from "src/generators/utils/zod-schema.utils";
} from "@/generators/utils/validation.utils";
import { getResponseZodSchemaName } from "@/generators/utils/zod-schema.utils";

import { getEndpointAcl } from "./getEndpointAcl";
import { getEndpointBody } from "./getEndpointBody";
Expand Down
8 changes: 4 additions & 4 deletions src/generators/core/getDataFromOpenAPIDoc.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { OpenAPIV3 } from "openapi-types";
import { Endpoint } from "src/generators/types/endpoint";
import { GenerateData } from "src/generators/types/generate";
import { GenerateOptions } from "src/generators/types/options";
import { getEndpointTag } from "src/generators/utils/tag.utils";
import { Endpoint } from "@/generators/types/endpoint";
import { GenerateData } from "@/generators/types/generate";
import { GenerateOptions } from "@/generators/types/options";
import { getEndpointTag } from "@/generators/utils/tag.utils";

import { getEndpointsFromOpenAPIDoc } from "./endpoints/getEndpointsFromOpenAPIDoc";
import { SchemaResolver } from "./SchemaResolver.class";
Expand Down
Loading