@abp/ng.schematics 5.0.0-beta.3 → 5.0.0

package/README.md

@@ -1,3 +1,3 @@
-# ABP Suite Schematics
-
-TODO: Add usage and development information
+# ABP Suite Schematics
+
+TODO: Add usage and development information

package/collection.json

@@ -1,29 +1,29 @@
-{
-  "schematics": {
-    "proxy-add": {
-      "description": "ABP Proxy Generator Add Schematics",
-      "factory": "./commands/proxy-add",
-      "schema": "./commands/proxy-add/schema.json"
-    },
-    "proxy-index": {
-      "description": "ABP Proxy Generator Index Schematics",
-      "factory": "./commands/proxy-index",
-      "schema": "./commands/proxy-index/schema.json"
-    },
-    "proxy-refresh": {
-      "description": "ABP Proxy Generator Refresh Schematics",
-      "factory": "./commands/proxy-refresh",
-      "schema": "./commands/proxy-refresh/schema.json"
-    },
-    "proxy-remove": {
-      "description": "ABP Proxy Generator Remove Schematics",
-      "factory": "./commands/proxy-remove",
-      "schema": "./commands/proxy-remove/schema.json"
-    },
-    "api": {
-      "description": "ABP API Generator Schematics",
-      "factory": "./commands/api",
-      "schema": "./commands/api/schema.json"
-    }
-  }
-}
+{
+  "schematics": {
+    "proxy-add": {
+      "description": "ABP Proxy Generator Add Schematics",
+      "factory": "./commands/proxy-add",
+      "schema": "./commands/proxy-add/schema.json"
+    },
+    "proxy-index": {
+      "description": "ABP Proxy Generator Index Schematics",
+      "factory": "./commands/proxy-index",
+      "schema": "./commands/proxy-index/schema.json"
+    },
+    "proxy-refresh": {
+      "description": "ABP Proxy Generator Refresh Schematics",
+      "factory": "./commands/proxy-refresh",
+      "schema": "./commands/proxy-refresh/schema.json"
+    },
+    "proxy-remove": {
+      "description": "ABP Proxy Generator Remove Schematics",
+      "factory": "./commands/proxy-remove",
+      "schema": "./commands/proxy-remove/schema.json"
+    },
+    "api": {
+      "description": "ABP API Generator Schematics",
+      "factory": "./commands/api",
+      "schema": "./commands/api/schema.json"
+    }
+  }
+}

package/commands/api/files-enum/proxy/__namespace@dir__/__name@kebab__.enum.ts.template

@@ -1,8 +1,8 @@
-import { mapEnumToOptions } from '@abp/ng.core';
-
-export enum <%= name %> {<%
-  for (let member of members) { %>
-  <%= member.key %> = <%= quote(member.value) %>,<% } %>
-}
-
-export const <%= camel(name) %>Options = mapEnumToOptions(<%= name %>);
+import { mapEnumToOptions } from '@abp/ng.core';
+
+export enum <%= name %> {<%
+  for (let member of members) { %>
+  <%= member.key %> = <%= quote(member.value) %>,<% } %>
+}
+
+export const <%= camel(name) %>Options = mapEnumToOptions(<%= name %>);

package/commands/api/files-model/proxy/__namespace@dir__/models.ts.template

@@ -1,10 +1,10 @@
-<%
-for (const {keyword, specifiers, path} of imports) {
-%><%= keyword %> { <%= specifiers.join(', ') %> } from '<%= path %>';
-<% }
-for (let {base, identifier, properties} of interfaces) { %>
-export interface <%= identifier %> <%= base ? `extends ${base} ` : '' %>{<%
-  for (let {name, optional, type} of properties) { %>
-  <%= name + optional %>: <%= type %>;<% } %>
-}
+<%
+for (const {keyword, specifiers, path} of imports) {
+%><%= keyword %> { <%= specifiers.join(', ') %> } from '<%= path %>';
+<% }
+for (let {base, identifier, properties} of interfaces) { %>
+export interface <%= identifier %> <%= base ? `extends ${base} ` : '' %>{<%
+  for (let {name, optional, type} of properties) { %>
+  <%= name + optional %>: <%= type %>;<% } %>
+}
 <% } %>

package/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template

@@ -1,25 +1,25 @@
-<% for (const {keyword, specifiers, path} of imports) {
-%><%= keyword %> { <%= specifiers.join(', ') %> } from '<%= path %>';
-<% } %>
-@Injectable({
-  providedIn: 'root',
-})
-export class <%= name %>Service {
-  apiName = '<%= apiName %>';<%
-  for (let {body, signature} of methods) { %>
-
-  <%= camel(signature.name) %> = (<%= serializeParameters(signature.parameters) %>) =>
-    this.restService.request<<%= body.requestType %>, <%= body.responseType %>>({
-      method: '<%= body.method %>',<% 
-      if (body.responseType === 'string') { %>
-      responseType: 'text',<% } %>
-      url: <%= body.url %>,<%
-      if (body.params.length) { %>
-      params: { <%= body.params.join(', ') %> },<% }
-      if (body.body) { %>
-      body: <%= body.body %>,<% } %>
-    },
-    { apiName: this.apiName });<% } %>
-
-  constructor(private restService: RestService) {}
-}
+<% for (const {keyword, specifiers, path} of imports) {
+%><%= keyword %> { <%= specifiers.join(', ') %> } from '<%= path %>';
+<% } %>
+@Injectable({
+  providedIn: 'root',
+})
+export class <%= name %>Service {
+  apiName = '<%= apiName %>';<%
+  for (let {body, signature} of methods) { %>
+
+  <%= camel(signature.name) %> = (<%= serializeParameters(signature.parameters) %>) =>
+    this.restService.request<<%= body.requestType %>, <%= body.responseType %>>({
+      method: '<%= body.method %>',<% 
+      if (body.responseType === 'string') { %>
+      responseType: 'text',<% } %>
+      url: <%= body.url %>,<%
+      if (body.params.length) { %>
+      params: { <%= body.params.join(', ') %> },<% }
+      if (body.body) { %>
+      body: <%= body.body %>,<% } %>
+    },
+    { apiName: this.apiName });<% } %>
+
+  constructor(private restService: RestService) {}
+}

package/commands/api/schema.json

@@ -1,45 +1,45 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAbpGenerateAPI",
-  "title": "ABP Generate API Schema",
-  "type": "object",
-  "properties": {
-    "module": {
-      "description": "Backend module name",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "Please enter backend module name. (default: \"app\")"
-    },
-    "apiName": {
-      "description": "Backend api name, a.k.a. remoteServiceName",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 1
-      },
-      "x-prompt": "Please enter backend api name, a.k.a. remoteServiceName. (default: \"default\")"
-    },
-    "source": {
-      "description": "Source Angular project for API definition URL & root namespace resolution",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 2
-      },
-      "x-prompt": "Please enter source Angular project for API definition URL & root namespace resolution. (default: workspace \"defaultProject\")"
-    },
-    "target": {
-      "description": "Target Angular project to place the generated code",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 3
-      },
-      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAbpGenerateAPI",
+  "title": "ABP Generate API Schema",
+  "type": "object",
+  "properties": {
+    "module": {
+      "description": "Backend module name",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Please enter backend module name. (default: \"app\")"
+    },
+    "apiName": {
+      "description": "Backend api name, a.k.a. remoteServiceName",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      },
+      "x-prompt": "Please enter backend api name, a.k.a. remoteServiceName. (default: \"default\")"
+    },
+    "source": {
+      "description": "Source Angular project for API definition URL & root namespace resolution",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "x-prompt": "Please enter source Angular project for API definition URL & root namespace resolution. (default: workspace \"defaultProject\")"
+    },
+    "target": {
+      "description": "Target Angular project to place the generated code",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 3
+      },
+      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
+    }
+  },
+  "required": []
+}

package/commands/proxy-add/schema.json

@@ -1,45 +1,45 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAbpGenerateProxy",
-  "title": "ABP Generate Proxy Schema",
-  "type": "object",
-  "properties": {
-    "module": {
-      "description": "Backend module name",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "Please enter backend module name. (default: \"app\")"
-    },
-    "apiName": {
-      "description": "Backend api name, a.k.a. remoteServiceName",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 1
-      },
-      "x-prompt": "Please enter backend api name, a.k.a. remoteServiceName. (default: \"default\")"
-    },
-    "source": {
-      "description": "Source Angular project for API definition URL & root namespace resolution",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 2
-      },
-      "x-prompt": "Please enter source Angular project for API definition URL & root namespace resolution. (default: workspace \"defaultProject\")"
-    },
-    "target": {
-      "description": "Target Angular project to place the generated code",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 3
-      },
-      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAbpGenerateProxy",
+  "title": "ABP Generate Proxy Schema",
+  "type": "object",
+  "properties": {
+    "module": {
+      "description": "Backend module name",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Please enter backend module name. (default: \"app\")"
+    },
+    "apiName": {
+      "description": "Backend api name, a.k.a. remoteServiceName",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      },
+      "x-prompt": "Please enter backend api name, a.k.a. remoteServiceName. (default: \"default\")"
+    },
+    "source": {
+      "description": "Source Angular project for API definition URL & root namespace resolution",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "x-prompt": "Please enter source Angular project for API definition URL & root namespace resolution. (default: workspace \"defaultProject\")"
+    },
+    "target": {
+      "description": "Target Angular project to place the generated code",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 3
+      },
+      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
+    }
+  },
+  "required": []
+}

package/commands/proxy-index/schema.json

@@ -1,18 +1,18 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAbpIndexProxy",
-  "title": "ABP Index Proxy Schema",
-  "type": "object",
-  "properties": {
-    "target": {
-      "description": "Target Angular project to place the generated code",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAbpIndexProxy",
+  "title": "ABP Index Proxy Schema",
+  "type": "object",
+  "properties": {
+    "target": {
+      "description": "Target Angular project to place the generated code",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
+    }
+  },
+  "required": []
+}

package/commands/proxy-refresh/schema.json

@@ -1,45 +1,45 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAbpGenerateProxy",
-  "title": "ABP Generate Proxy Schema",
-  "type": "object",
-  "properties": {
-    "module": {
-      "description": "Backend module name",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "Please enter backend module name. (default: \"app\")"
-    },
-    "apiName": {
-      "description": "Backend api name, a.k.a. remoteServiceName",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 1
-      },
-      "x-prompt": "Please enter backend api name, a.k.a. remoteServiceName. (default: \"default\")"
-    },
-    "source": {
-      "description": "Source Angular project for API definition URL & root namespace resolution",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 2
-      },
-      "x-prompt": "Please enter source Angular project for API definition URL & root namespace resolution. (default: workspace \"defaultProject\")"
-    },
-    "target": {
-      "description": "Target Angular project to place the generated code",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 3
-      },
-      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAbpGenerateProxy",
+  "title": "ABP Generate Proxy Schema",
+  "type": "object",
+  "properties": {
+    "module": {
+      "description": "Backend module name",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Please enter backend module name. (default: \"app\")"
+    },
+    "apiName": {
+      "description": "Backend api name, a.k.a. remoteServiceName",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      },
+      "x-prompt": "Please enter backend api name, a.k.a. remoteServiceName. (default: \"default\")"
+    },
+    "source": {
+      "description": "Source Angular project for API definition URL & root namespace resolution",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "x-prompt": "Please enter source Angular project for API definition URL & root namespace resolution. (default: workspace \"defaultProject\")"
+    },
+    "target": {
+      "description": "Target Angular project to place the generated code",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 3
+      },
+      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
+    }
+  },
+  "required": []
+}

package/commands/proxy-remove/schema.json

@@ -1,45 +1,45 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAbpGenerateProxy",
-  "title": "ABP Generate Proxy Schema",
-  "type": "object",
-  "properties": {
-    "module": {
-      "description": "Backend module name",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "Please enter backend module name. (default: \"app\")"
-    },
-    "apiName": {
-      "description": "Backend api name, a.k.a. remoteServiceName",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 1
-      },
-      "x-prompt": "Please enter backend api name, a.k.a. remoteServiceName. (default: \"default\")"
-    },
-    "source": {
-      "description": "Source Angular project for API definition URL & root namespace resolution",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 2
-      },
-      "x-prompt": "Please enter source Angular project for API definition URL & root namespace resolution. (default: workspace \"defaultProject\")"
-    },
-    "target": {
-      "description": "Target Angular project to place the generated code",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 3
-      },
-      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
-    }
-  },
-  "required": []
-}
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAbpGenerateProxy",
+  "title": "ABP Generate Proxy Schema",
+  "type": "object",
+  "properties": {
+    "module": {
+      "description": "Backend module name",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Please enter backend module name. (default: \"app\")"
+    },
+    "apiName": {
+      "description": "Backend api name, a.k.a. remoteServiceName",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      },
+      "x-prompt": "Please enter backend api name, a.k.a. remoteServiceName. (default: \"default\")"
+    },
+    "source": {
+      "description": "Source Angular project for API definition URL & root namespace resolution",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "x-prompt": "Please enter source Angular project for API definition URL & root namespace resolution. (default: workspace \"defaultProject\")"
+    },
+    "target": {
+      "description": "Target Angular project to place the generated code",
+      "type": "string",
+      "$default": {
+        "$source": "argv",
+        "index": 3
+      },
+      "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
+    }
+  },
+  "required": []
+}

package/constants/proxy.js

@@ -4,22 +4,22 @@ exports.PROXY_WARNING = exports.PROXY_WARNING_PATH = exports.PROXY_CONFIG_PATH =
 exports.PROXY_PATH = '/proxy';
 exports.PROXY_CONFIG_PATH = `${exports.PROXY_PATH}/generate-proxy.json`;
 exports.PROXY_WARNING_PATH = `${exports.PROXY_PATH}/README.md`;
-exports.PROXY_WARNING = `# Proxy Generation Output
-
-This directory includes the output of the latest proxy generation.
-The files and folders in it will be overwritten when proxy generation is run again.
-Therefore, please do not place your own content in this folder.
-
-In addition, \`generate-proxy.json\` works like a lock file.
-It includes information used by the proxy generator, so please do not delete or modify it.
-
-Finally, the name of the files and folders should not be changed for two reasons:
-- Proxy generator will keep creating them at those paths and you will have multiple copies of the same content.
-- ABP Suite generates files which include imports from this folder.
-
-> **Important Notice:** If you are building a module and are planning to publish to npm,
-> some of the generated proxies are likely to be exported from public-api.ts file. In such a case,
-> please make sure you export files directly and not from barrel exports. In other words,
-> do not include index.ts exports in your public-api.ts exports.
+exports.PROXY_WARNING = `# Proxy Generation Output
+
+This directory includes the output of the latest proxy generation.
+The files and folders in it will be overwritten when proxy generation is run again.
+Therefore, please do not place your own content in this folder.
+
+In addition, \`generate-proxy.json\` works like a lock file.
+It includes information used by the proxy generator, so please do not delete or modify it.
+
+Finally, the name of the files and folders should not be changed for two reasons:
+- Proxy generator will keep creating them at those paths and you will have multiple copies of the same content.
+- ABP Suite generates files which include imports from this folder.
+
+> **Important Notice:** If you are building a module and are planning to publish to npm,
+> some of the generated proxies are likely to be exported from public-api.ts file. In such a case,
+> please make sure you export files directly and not from barrel exports. In other words,
+> do not include index.ts exports in your public-api.ts exports.
 `;
 //# sourceMappingURL=proxy.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.schematics",
-  "version": "5.0.0-beta.3",
+  "version": "5.0.0",
   "description": "Schematics that works with ABP Backend",
   "keywords": [
     "schematics"

package/utils/angular/validation.js

@@ -12,7 +12,7 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 function validateName(name) {
     if (name && /^\d/.test(name)) {
-        throw new schematics_1.SchematicsException(core_1.tags.oneLine `name (${name})
+        throw new schematics_1.SchematicsException(core_1.tags.oneLine `name (${name})
         can not start with a digit.`);
     }
 }
@@ -22,7 +22,7 @@ exports.validateName = validateName;
 exports.htmlSelectorRe = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
 function validateHtmlSelector(selector) {
     if (selector && !exports.htmlSelectorRe.test(selector)) {
-        throw new schematics_1.SchematicsException(core_1.tags.oneLine `Selector (${selector})
+        throw new schematics_1.SchematicsException(core_1.tags.oneLine `Selector (${selector})
         is invalid.`);
     }
 }
@@ -32,15 +32,15 @@ function validateProjectName(projectName) {
     const unsupportedProjectNames = [];
     const packageNameRegex = /^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$/;
     if (errorIndex !== null) {
-        const firstMessage = core_1.tags.oneLine `
-    Project name "${projectName}" is not valid. New project names must
-    start with a letter, and must contain only alphanumeric characters or dashes.
-    When adding a dash the segment after the dash must also start with a letter.
+        const firstMessage = core_1.tags.oneLine `
+    Project name "${projectName}" is not valid. New project names must
+    start with a letter, and must contain only alphanumeric characters or dashes.
+    When adding a dash the segment after the dash must also start with a letter.
     `;
-        const msg = core_1.tags.stripIndent `
-    ${firstMessage}
-    ${projectName}
-    ${Array(errorIndex + 1).join(' ') + '^'}
+        const msg = core_1.tags.stripIndent `
+    ${firstMessage}
+    ${projectName}
+    ${Array(errorIndex + 1).join(' ') + '^'}
     `;
         throw new schematics_1.SchematicsException(msg);
     }

package/utils/barrel.js

@@ -26,19 +26,19 @@ exports.generateBarrelFromPath = generateBarrelFromPath;
 function generateBarrelContent(asterisk, named) {
     const namedImports = !named.imports.length
         ? ''
-        : named.imports.join(`
+        : named.imports.join(`
 `) +
-            `
+            `
 `;
     const namedExports = !named.exports.length
         ? ''
-        : `export { ${named.exports.join(', ')} };
+        : `export { ${named.exports.join(', ')} };
 `;
     const asteriskExports = !asterisk.exports.length
         ? ''
-        : asterisk.exports.join(`
+        : asterisk.exports.join(`
 `) +
-            `
+            `
 `;
     return namedImports + asteriskExports + namedExports;
 }