@spec2ts/openapi-client 2.0.0-beta.9 → 2.0.0

package/CHANGELOG.md

@@ -3,6 +3,52 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.13...@spec2ts/openapi-client@2.0.0) (2023-09-07)
+
+**Note:** Version bump only for package @spec2ts/openapi-client
+
+
+
+
+
+# [2.0.0-beta.13](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.12...@spec2ts/openapi-client@2.0.0-beta.13) (2022-09-21)
+
+**Note:** Version bump only for package @spec2ts/openapi-client
+
+
+
+
+
+# [2.0.0-beta.12](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.11...@spec2ts/openapi-client@2.0.0-beta.12) (2022-08-23)
+
+
+### Features
+
+* allow url & prefix override ([9139ccb](https://github.com/touchifyapp/spec2ts/commit/9139ccbb89329972e45e8d813adfd81648a01bb7))
+
+
+
+
+
+# [2.0.0-beta.11](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.10...@spec2ts/openapi-client@2.0.0-beta.11) (2022-07-29)
+
+**Note:** Version bump only for package @spec2ts/openapi-client
+
+
+
+
+
+# [2.0.0-beta.10](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.9...@spec2ts/openapi-client@2.0.0-beta.10) (2022-06-27)
+
+
+### Bug Fixes
+
+* **openapi-client:** upgrade to typescript 4 ([932877f](https://github.com/touchifyapp/spec2ts/commit/932877f83915a953400b41fc74ea921aeaed3b1d))
+
+
+
+
+
 # [2.0.0-beta.9](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.8...@spec2ts/openapi-client@2.0.0-beta.9) (2022-01-27)
 
 **Note:** Version bump only for package @spec2ts/openapi-client

package/cli/command.js

@@ -24,6 +24,14 @@ function builder(argv) {
         type: "string",
         alias: "c",
         describe: "Root directory for resolving $refs"
+    })
+        .option("baseUrl", {
+        type: "string",
+        describe: "Base url of the server"
+    })
+        .option("prefix", {
+        type: "string",
+        describe: "Only generate paths with this prefix"
     })
         .option("avoidAny", {
         type: "boolean",
@@ -140,12 +148,12 @@ async function generatePackage(output, options) {
         main: main.replace(/\.ts$/, ".js"),
         files: ["*.js", "*.d.ts"],
         scripts: {
-            build: `tsc ${main} --strict --target ${options.packageBuildTarget || "ES2018"} --module ${options.packageBuildModule || "UMD"} --moduleResolution node`,
+            build: `tsc ${main} --strict --target ${options.packageBuildTarget || "ES2018"} --module ${options.packageBuildModule || "UMD"} --moduleResolution node --skipLibCheck`,
             prepublishOnly: "npm run build"
         },
         dependencies: {},
         devDependencies: {
-            typescript: "^3.0.0"
+            typescript: "^4.2.0"
         }
     };
     if (options.importFetch) {

package/lib/core-generator.d.ts

@@ -2,6 +2,6 @@ import * as ts from "typescript";
 import type { OpenAPIObject } from "openapi3-ts";
 import { OApiGeneratorContext } from "./core-parser";
 export declare type Formatter = "space" | "pipe" | "deep" | "explode" | "form";
-export declare function generateServers(file: ts.SourceFile, { servers }: OpenAPIObject): ts.SourceFile;
+export declare function generateServers(file: ts.SourceFile, { servers }: OpenAPIObject, context: OApiGeneratorContext): ts.SourceFile;
 export declare function generateDefaults(file: ts.SourceFile, context: OApiGeneratorContext): ts.SourceFile;
 export declare function generateFunctions(file: ts.SourceFile, spec: OpenAPIObject, context: OApiGeneratorContext): ts.SourceFile;

package/lib/core-generator.js

@@ -8,8 +8,10 @@ const server_parser_1 = require("./server-parser");
 const core_parser_2 = require("./core-parser");
 const util_1 = require("./util");
 //#region Public
-function generateServers(file, { servers }) {
+function generateServers(file, { servers }, context) {
     servers = servers || [];
+    if (context.options.baseUrl)
+        servers = [{ url: context.options.baseUrl }];
     const serversConst = core.findFirstVariableStatement(file.statements, "servers");
     const defaultsConst = core.findFirstVariableStatement(file.statements, "defaults");
     if (!serversConst || !defaultsConst) {
@@ -41,7 +43,10 @@ function generateDefaults(file, context) {
 exports.generateDefaults = generateDefaults;
 function generateFunctions(file, spec, context) {
     const functions = [];
-    for (const path in spec.paths) {
+    const paths = Object.entries(spec.paths)
+        .filter(([path]) => !context.options.prefix || path.startsWith(context.options.prefix))
+        .reduce((acc, [path, pathSpec]) => ({ ...acc, [path]: pathSpec }), {});
+    for (const path in paths) {
         const item = core_parser_1.resolveReference(spec.paths[path], context);
         for (const verb in item) {
             const method = verb.toUpperCase();

package/lib/openapi-generator.d.ts

@@ -5,6 +5,8 @@ export interface OApiGeneratorOptions extends ParserOptions {
     inlineRequired?: boolean;
     importFetch?: "node-fetch" | "cross-fetch" | "isomorphic-fetch";
     typesPath?: string;
+    baseUrl?: string;
+    prefix?: string;
 }
 export declare function generateClientFromFile(file: string, options: OApiGeneratorOptions & {
     typesPath: string;

package/lib/openapi-generator.js

@@ -25,7 +25,7 @@ async function generateClient(spec, options = {}) {
     if (context.options.typesPath) {
         context.typesFile = ts.createSourceFile("types.ts", "", ts.ScriptTarget.Latest, false, ts.ScriptKind.TS);
     }
-    file = core_generator_1.generateServers(file, spec);
+    file = core_generator_1.generateServers(file, spec, context);
     file = core_generator_1.generateDefaults(file, context);
     file = core_generator_1.generateFunctions(file, spec, context);
     if (context.options.typesPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@spec2ts/openapi-client",
-    "version": "2.0.0-beta.9",
+    "version": "2.0.0",
     "description": "Utility to convert OpenAPI v3 specifications to Typescript HTTP client using TypeScript native compiler",
     "author": "Touchify <dev@touchify.co>",
     "license": "MIT",
@@ -36,20 +36,20 @@
         "lint:ts": "eslint \"*.ts\" \"{bin,cli,lib}/**/*.ts\"",
         "lint:fix": "npm run lint -- -- --fix",
         "clean": "npm run clean:ts",
-        "clean:ts": "rimraf *.{js,d.ts} {bin,cli,lib}/**/*.{js,d.ts}",
+        "clean:ts": "del *.{js,d.ts} {bin,cli,lib}/**/*.{js,d.ts}",
         "prepublishOnly": "npm test && npm run build"
     },
     "dependencies": {
-        "@spec2ts/core": "^2.0.0-beta.2",
-        "@spec2ts/jsonschema": "^2.0.0-beta.6",
-        "@spec2ts/openapi": "^2.0.0-beta.6",
+        "@spec2ts/core": "^2.0.0",
+        "@spec2ts/jsonschema": "^2.0.0",
+        "@spec2ts/openapi": "^2.0.0",
         "openapi3-ts": "^1.3.0",
         "yargs": "^15.3.1"
     },
     "devDependencies": {
+        "del-cli": "^5.0.0",
         "eslint": "^7.11.0",
         "jest": "^26.5.3",
-        "rimraf": "^3.0.2",
         "typescript": "^4.0.0"
     },
     "keywords": [
@@ -70,5 +70,5 @@
         "spec2ts",
         "share"
     ],
-    "gitHead": "5717dc6d2eb06bdcebea9eff4339f5d4bd6ac140"
+    "gitHead": "34fe406a4701ba1b7c173d3580e85f65e2950012"
 }