From 126cdc2a760b3c0e5844a62c56e2a899ece00b38 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Wed, 10 Mar 2021 19:33:32 +0300 Subject: [PATCH] set url quotes based on template literal placeholder use --- .../__namespace@dir__/__name@kebab__.service.ts.template | 2 +- npm/ng-packs/packages/schematics/src/models/method.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template b/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template index 1d77599e7e..78fb27c33d 100644 --- a/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template +++ b/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template @@ -13,7 +13,7 @@ export class <%= name %>Service { method: '<%= body.method %>',<% if (body.responseType === 'string') { %> responseType: 'text',<% } %> - url: `/<%= body.url %>`,<% + url: <%= body.url %>,<% if (body.params.length) { %> params: { <%= body.params.join(', ') %> },<% } if (body.body) { %> diff --git a/npm/ng-packs/packages/schematics/src/models/method.ts b/npm/ng-packs/packages/schematics/src/models/method.ts index 5a15a3770e..d52e8d5e4f 100644 --- a/npm/ng-packs/packages/schematics/src/models/method.ts +++ b/npm/ng-packs/packages/schematics/src/models/method.ts @@ -70,6 +70,11 @@ export class Body { constructor(options: BodyOptions) { Object.assign(this, options); + this.setUrlQuotes(); + } + + private setUrlQuotes() { + this.url = /{/.test(this.url) ? `\`/${this.url}\`` : `'/${this.url}'`; } }