@goast/typescript 0.0.2 → 0.0.3

package/README.md

@@ -1,11 +1,11 @@
-# typescript
-
-This library was generated with [Nx](https://nx.dev).
-
-## Building
-
-Run `nx build typescript` to build the library.
-
-## Running unit tests
-
-Run `nx test typescript` to execute the unit tests via [Jest](https://jestjs.io).
+# typescript
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build typescript` to build the library.
+
+## Running unit tests
+
+Run `nx test typescript` to execute the unit tests via [Jest](https://jestjs.io).

package/assets/client/fetch/url-builder.ts

@@ -31,6 +31,7 @@ export class UrlBuilder {
       .map((key) => `${key}=${this.queryParams[key]}`)
       .join('&');
     const path = this.path.replace(/\{([^}]+)\}/g, (_, name) => this.pathParams[name]);
-    return `${this.baseUrl}${path || '/'}${queryString ? '?' + queryString : ''}`;
+    const url = `${this.baseUrl}${path || '/'}${queryString ? '?' + queryString : ''}`;
+    return url.replace(/(?<!:)[\\/]+(?=\/)|[\\/](?=\?)/g, '');
   }
 }

package/cjs/lib/generators/services/fetch-clients/fetch-client-generator.js

@@ -161,7 +161,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
             .append('params: ')
             .parenthesize('{}', (builder) => builder.forEach(params, (builder, parameter) => {
             var _a;
-            return builder.appendLine(`${this.toPropertyName(ctx, parameter.name)}: ${this.getTypeName(ctx, builder, (_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.id)};`);
+            return builder.appendLine(this.toPropertyName(ctx, parameter.name), parameter.required ? ': ' : '?: ', this.getTypeName(ctx, builder, (_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.id), ';');
         }), { indent: true, multiline: true }))
             .appendLineIf(params.length > 0 && !!bodySchemaId, ',')
             .appendIf(!!bodySchemaId, (builder) => builder.append(`body: ${this.getTypeName(ctx, builder, bodySchemaId)}`))

package/esm/lib/generators/services/fetch-clients/fetch-client-generator.js

@@ -158,7 +158,7 @@ export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerat
             .append('params: ')
             .parenthesize('{}', (builder) => builder.forEach(params, (builder, parameter) => {
             var _a;
-            return builder.appendLine(`${this.toPropertyName(ctx, parameter.name)}: ${this.getTypeName(ctx, builder, (_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.id)};`);
+            return builder.appendLine(this.toPropertyName(ctx, parameter.name), parameter.required ? ': ' : '?: ', this.getTypeName(ctx, builder, (_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.id), ';');
         }), { indent: true, multiline: true }))
             .appendLineIf(params.length > 0 && !!bodySchemaId, ',')
             .appendIf(!!bodySchemaId, (builder) => builder.append(`body: ${this.getTypeName(ctx, builder, bodySchemaId)}`))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",