@spec2ts/openapi-client 2.0.0-beta.1 → 2.0.0-beta.12

package/CHANGELOG.md

@@ -3,6 +3,112 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
+# [2.0.0-beta.8](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.7...@spec2ts/openapi-client@2.0.0-beta.8) (2021-11-03)
+
+**Note:** Version bump only for package @spec2ts/openapi-client
+
+
+
+
+
+# [2.0.0-beta.7](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.6...@spec2ts/openapi-client@2.0.0-beta.7) (2021-10-23)
+
+**Note:** Version bump only for package @spec2ts/openapi-client
+
+
+
+
+
+# [2.0.0-beta.6](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.5...@spec2ts/openapi-client@2.0.0-beta.6) (2021-02-27)
+
+**Note:** Version bump only for package @spec2ts/openapi-client
+
+
+
+
+
+# [2.0.0-beta.5](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.4...@spec2ts/openapi-client@2.0.0-beta.5) (2020-12-21)
+
+
+### Bug Fixes
+
+* **openapi-client:** allow $ and _ in camelCase ([08c244e](https://github.com/touchifyapp/spec2ts/commit/08c244eb6e2c0a6f3ab833faa5159483ca1adda7))
+
+
+
+
+
+# [2.0.0-beta.4](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.3...@spec2ts/openapi-client@2.0.0-beta.4) (2020-12-14)
+
+
+### Bug Fixes
+
+* **openapi-client:** type issue in TS 4.1 ([09da142](https://github.com/touchifyapp/spec2ts/commit/09da1423ce16e1a8ccee81ba0ad160f5f6313a67))
+
+
+
+
+
+# [2.0.0-beta.3](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.2...@spec2ts/openapi-client@2.0.0-beta.3) (2020-11-29)
+
+
+### Bug Fixes
+
+* **openapi:** bad yargs options for enableDate ([cc799cb](https://github.com/touchifyapp/spec2ts/commit/cc799cb14600f5a5388a825932622251ed1df19c))
+
+
+
+
+
+# [2.0.0-beta.2](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.1...@spec2ts/openapi-client@2.0.0-beta.2) (2020-11-29)
+
+
+### Features
+
+* **openapi-client:** add support for new lax date style ([73ac242](https://github.com/touchifyapp/spec2ts/commit/73ac2428cf7195817cc66c41a9e18fa6e9a7abee))
+
+
+
+
+
 # [2.0.0-beta.1](https://github.com/touchifyapp/spec2ts/compare/@spec2ts/openapi-client@2.0.0-beta.0...@spec2ts/openapi-client@2.0.0-beta.1) (2020-11-16)
 
 

package/cli/command.js

@@ -24,15 +24,23 @@ 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",
         describe: "Avoid the `any` type and use `unknown` instead"
     })
-        // .option("enableDate", {
-        //     type: "boolean",
-        //     describe: "Build `Date` for format `date` and `date-time`"
-        // })
+        .option("enableDate", {
+        choices: [true, "strict", "lax"],
+        describe: "Build `Date` for format `date` and `date-time`"
+    })
         .option("inlineRequired", {
         type: "boolean",
         describe: "Create a method argument for each required parameter"
@@ -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/lib/templates/_client.tpl.d.ts

@@ -30,7 +30,7 @@ export declare const _: {
     encodeReserved: (typeof encodeURI)[];
     allowReserved: (typeof encodeURI)[];
     /** Deeply remove all properties with undefined values. */
-    stripUndefined<T>(obj?: T | undefined): T | undefined;
+    stripUndefined<T extends Record<string, U | undefined>, U>(obj?: T | undefined): Record<string, U> | undefined;
     isEmpty(v: unknown): boolean;
     /** Creates a tag-function to encode template strings with the given encoders. */
     encode(encoders: Encoders, delimiter?: string): TagFunction;

package/lib/templates/_client.tpl.ts

@@ -43,7 +43,7 @@ export const _ = {
     allowReserved: [encodeURI, encodeURI],
 
     /** Deeply remove all properties with undefined values. */
-    stripUndefined<T>(obj?: T): T | undefined {
+    stripUndefined<T extends Record<string, U | undefined>, U>(obj?: T): Record<string, U> | undefined {
         return obj && JSON.parse(JSON.stringify(obj));
     },
 

package/lib/util.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.camelCase = void 0;
 function camelCase(str) {
-    const regex = /[A-Z\xC0-\xD6\xD8-\xDE]?[a-z\xDF-\xF6\xF8-\xFF]+|[A-Z\xC0-\xD6\xD8-\xDE]+(?![a-z\xDF-\xF6\xF8-\xFF])|\d+/g;
+    const regex = /[A-Z\xC0-\xD6\xD8-\xDE_$]?[a-z\xDF-\xF6\xF8-\xFF_$]+|[A-Z\xC0-\xD6\xD8-\xDE_$]+(?![a-z\xDF-\xF6\xF8-\xFF_$])|\d+/g;
     const words = str.match(regex);
     if (!words)
         return "";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@spec2ts/openapi-client",
-    "version": "2.0.0-beta.1",
+    "version": "2.0.0-beta.12",
     "description": "Utility to convert OpenAPI v3 specifications to Typescript HTTP client using TypeScript native compiler",
     "author": "Touchify <dev@touchify.co>",
     "license": "MIT",
@@ -40,9 +40,9 @@
         "prepublishOnly": "npm test && npm run build"
     },
     "dependencies": {
-        "@spec2ts/core": "^2.0.0-beta.0",
-        "@spec2ts/jsonschema": "^2.0.0-beta.0",
-        "@spec2ts/openapi": "^2.0.0-beta.0",
+        "@spec2ts/core": "^2.0.0-beta.2",
+        "@spec2ts/jsonschema": "^2.0.0-beta.7",
+        "@spec2ts/openapi": "^2.0.0-beta.7",
         "openapi3-ts": "^1.3.0",
         "yargs": "^15.3.1"
     },
@@ -70,5 +70,5 @@
         "spec2ts",
         "share"
     ],
-    "gitHead": "d8b36dac0efa2756b1284f8977ddf1d405633c9c"
+    "gitHead": "bea7fe666a107170cd32a1f006a9de5bbcc2be4c"
 }