@abp/ng.schematics 5.0.1 → 5.0.2

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/index.d.ts

@@ -1,2 +1,2 @@
-import { GenerateProxySchema } from '../../models';
-export default function (schema: GenerateProxySchema): import("@angular-devkit/schematics").Rule;
+import { GenerateProxySchema } from '../../models';
+export default function (schema: GenerateProxySchema): import("@angular-devkit/schematics").Rule;

package/commands/api/index.js

@@ -1,113 +1,113 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const utils_1 = require("../../utils");
-const cases = require("../../utils/text");
-function default_1(schema) {
-    const params = utils_1.removeDefaultPlaceholders(schema);
-    const moduleName = params.module || 'app';
-    return schematics_1.chain([
-        async (tree, _context) => {
-            const getRootNamespace = utils_1.createRootNamespaceGetter(params);
-            const solution = await getRootNamespace(tree);
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const target = await utils_1.resolveProject(tree, params.target);
-            const targetPath = utils_1.buildDefaultPath(target.definition);
-            const readProxyConfig = utils_1.createProxyConfigReader(targetPath);
-            const createProxyConfigWriter = utils_1.createProxyConfigWriterCreator(targetPath);
-            const data = readProxyConfig(tree);
-            const types = data.types;
-            const modules = data.modules;
-            if (!types || !modules)
-                throw new schematics_1.SchematicsException("[Invalid API Definition] The provided API definition is invalid." /* InvalidApiDefinition */);
-            const definition = data.modules[moduleName];
-            if (!definition)
-                throw new schematics_1.SchematicsException(utils_1.interpolate("[Invalid Module] Backend module \"{0}\" does not exist in API definition." /* InvalidModule */, moduleName));
-            const apiName = definition.remoteServiceName;
-            const controllers = Object.values(definition.controllers || {});
-            const serviceImports = {};
-            const generateServices = createServiceGenerator({
-                targetPath,
-                solution,
-                types,
-                apiName,
-                controllers,
-                serviceImports,
-            });
-            const modelImports = {};
-            const generateModels = createModelGenerator({
-                targetPath,
-                solution,
-                types,
-                serviceImports,
-                modelImports,
-            });
-            const generateEnums = createEnumGenerator({
-                targetPath,
-                solution,
-                types,
-                serviceImports,
-                modelImports,
-            });
-            if (!data.generated.includes(moduleName))
-                data.generated.push(moduleName);
-            data.generated.sort();
-            const json = utils_1.generateProxyConfigJson(data);
-            const overwriteProxyConfig = createProxyConfigWriter('overwrite', json);
-            return schematics_1.branchAndMerge(schematics_1.chain([generateServices, generateModels, generateEnums, overwriteProxyConfig]));
-        },
-    ]);
-}
-exports.default = default_1;
-function createEnumGenerator(params) {
-    const { targetPath, serviceImports, modelImports } = params;
-    const mapImportRefToEnum = utils_1.createImportRefToEnumMapper(params);
-    const enumRefs = [
-        ...new Set([
-            ...utils_1.getEnumNamesFromImports(serviceImports),
-            ...utils_1.getEnumNamesFromImports(modelImports),
-        ]),
-    ];
-    return schematics_1.chain(enumRefs.map(ref => {
-        return utils_1.applyWithOverwrite(schematics_1.url('./files-enum'), [
-            schematics_1.applyTemplates(Object.assign(Object.assign({}, cases), mapImportRefToEnum(ref))),
-            schematics_1.move(core_1.normalize(targetPath)),
-        ]);
-    }));
-}
-function createModelGenerator(params) {
-    const { targetPath, serviceImports, modelImports } = params;
-    const reduceImportRefsToModels = utils_1.createImportRefsToModelReducer(params);
-    const models = Object.values(serviceImports).reduce(reduceImportRefsToModels, []);
-    models.forEach(({ imports }) => imports.forEach(({ refs, path }) => refs.forEach(ref => {
-        if (path === '@abp/ng.core')
-            return;
-        if (!modelImports[path])
-            return (modelImports[path] = [ref]);
-        modelImports[path] = [...new Set([...modelImports[path], ref])];
-    })));
-    return schematics_1.chain(models.map(model => utils_1.applyWithOverwrite(schematics_1.url('./files-model'), [
-        schematics_1.applyTemplates(Object.assign(Object.assign({}, cases), model)),
-        schematics_1.move(core_1.normalize(targetPath)),
-    ])));
-}
-function createServiceGenerator(params) {
-    const { targetPath, controllers, serviceImports } = params;
-    const mapControllerToService = utils_1.createControllerToServiceMapper(params);
-    return schematics_1.chain(controllers.map(controller => {
-        const service = mapControllerToService(controller);
-        service.imports.forEach(({ refs, path }) => refs.forEach(ref => {
-            if (path === '@abp/ng.core')
-                return;
-            if (!serviceImports[path])
-                return (serviceImports[path] = [ref]);
-            serviceImports[path] = [...new Set([...serviceImports[path], ref])];
-        }));
-        return utils_1.applyWithOverwrite(schematics_1.url('./files-service'), [
-            schematics_1.applyTemplates(Object.assign(Object.assign(Object.assign({}, cases), { serializeParameters: utils_1.serializeParameters }), service)),
-            schematics_1.move(core_1.normalize(targetPath)),
-        ]);
-    }));
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@angular-devkit/core");
+const schematics_1 = require("@angular-devkit/schematics");
+const utils_1 = require("../../utils");
+const cases = require("../../utils/text");
+function default_1(schema) {
+    const params = utils_1.removeDefaultPlaceholders(schema);
+    const moduleName = params.module || 'app';
+    return schematics_1.chain([
+        async (tree, _context) => {
+            const getRootNamespace = utils_1.createRootNamespaceGetter(params);
+            const solution = await getRootNamespace(tree);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const target = await utils_1.resolveProject(tree, params.target);
+            const targetPath = utils_1.buildDefaultPath(target.definition);
+            const readProxyConfig = utils_1.createProxyConfigReader(targetPath);
+            const createProxyConfigWriter = utils_1.createProxyConfigWriterCreator(targetPath);
+            const data = readProxyConfig(tree);
+            const types = data.types;
+            const modules = data.modules;
+            if (!types || !modules)
+                throw new schematics_1.SchematicsException("[Invalid API Definition] The provided API definition is invalid." /* InvalidApiDefinition */);
+            const definition = data.modules[moduleName];
+            if (!definition)
+                throw new schematics_1.SchematicsException(utils_1.interpolate("[Invalid Module] Backend module \"{0}\" does not exist in API definition." /* InvalidModule */, moduleName));
+            const apiName = definition.remoteServiceName;
+            const controllers = Object.values(definition.controllers || {});
+            const serviceImports = {};
+            const generateServices = createServiceGenerator({
+                targetPath,
+                solution,
+                types,
+                apiName,
+                controllers,
+                serviceImports,
+            });
+            const modelImports = {};
+            const generateModels = createModelGenerator({
+                targetPath,
+                solution,
+                types,
+                serviceImports,
+                modelImports,
+            });
+            const generateEnums = createEnumGenerator({
+                targetPath,
+                solution,
+                types,
+                serviceImports,
+                modelImports,
+            });
+            if (!data.generated.includes(moduleName))
+                data.generated.push(moduleName);
+            data.generated.sort();
+            const json = utils_1.generateProxyConfigJson(data);
+            const overwriteProxyConfig = createProxyConfigWriter('overwrite', json);
+            return schematics_1.branchAndMerge(schematics_1.chain([generateServices, generateModels, generateEnums, overwriteProxyConfig]));
+        },
+    ]);
+}
+exports.default = default_1;
+function createEnumGenerator(params) {
+    const { targetPath, serviceImports, modelImports } = params;
+    const mapImportRefToEnum = utils_1.createImportRefToEnumMapper(params);
+    const enumRefs = [
+        ...new Set([
+            ...utils_1.getEnumNamesFromImports(serviceImports),
+            ...utils_1.getEnumNamesFromImports(modelImports),
+        ]),
+    ];
+    return schematics_1.chain(enumRefs.map(ref => {
+        return utils_1.applyWithOverwrite(schematics_1.url('./files-enum'), [
+            schematics_1.applyTemplates(Object.assign(Object.assign({}, cases), mapImportRefToEnum(ref))),
+            schematics_1.move(core_1.normalize(targetPath)),
+        ]);
+    }));
+}
+function createModelGenerator(params) {
+    const { targetPath, serviceImports, modelImports } = params;
+    const reduceImportRefsToModels = utils_1.createImportRefsToModelReducer(params);
+    const models = Object.values(serviceImports).reduce(reduceImportRefsToModels, []);
+    models.forEach(({ imports }) => imports.forEach(({ refs, path }) => refs.forEach(ref => {
+        if (path === '@abp/ng.core')
+            return;
+        if (!modelImports[path])
+            return (modelImports[path] = [ref]);
+        modelImports[path] = [...new Set([...modelImports[path], ref])];
+    })));
+    return schematics_1.chain(models.map(model => utils_1.applyWithOverwrite(schematics_1.url('./files-model'), [
+        schematics_1.applyTemplates(Object.assign(Object.assign({}, cases), model)),
+        schematics_1.move(core_1.normalize(targetPath)),
+    ])));
+}
+function createServiceGenerator(params) {
+    const { targetPath, controllers, serviceImports } = params;
+    const mapControllerToService = utils_1.createControllerToServiceMapper(params);
+    return schematics_1.chain(controllers.map(controller => {
+        const service = mapControllerToService(controller);
+        service.imports.forEach(({ refs, path }) => refs.forEach(ref => {
+            if (path === '@abp/ng.core')
+                return;
+            if (!serviceImports[path])
+                return (serviceImports[path] = [ref]);
+            serviceImports[path] = [...new Set([...serviceImports[path], ref])];
+        }));
+        return utils_1.applyWithOverwrite(schematics_1.url('./files-service'), [
+            schematics_1.applyTemplates(Object.assign(Object.assign(Object.assign({}, cases), { serializeParameters: utils_1.serializeParameters }), service)),
+            schematics_1.move(core_1.normalize(targetPath)),
+        ]);
+    }));
+}
 //# sourceMappingURL=index.js.map

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/index.d.ts

@@ -1,2 +1,2 @@
-import { GenerateProxySchema } from '../../models';
-export default function (schema: GenerateProxySchema): import("@angular-devkit/schematics").Rule;
+import { GenerateProxySchema } from '../../models';
+export default function (schema: GenerateProxySchema): import("@angular-devkit/schematics").Rule;

package/commands/proxy-add/index.js

@@ -1,42 +1,42 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const schematics_1 = require("@angular-devkit/schematics");
-const utils_1 = require("../../utils");
-function default_1(schema) {
-    const params = utils_1.removeDefaultPlaceholders(schema);
-    const moduleName = params.module || 'app';
-    return schematics_1.chain([
-        async (host, _context) => {
-            const target = await utils_1.resolveProject(host, params.target);
-            const targetPath = utils_1.buildDefaultPath(target.definition);
-            const readProxyConfig = utils_1.createProxyConfigReader(targetPath);
-            let generated = [];
-            try {
-                generated = readProxyConfig(host).generated;
-                const index = generated.findIndex(m => m === moduleName);
-                if (index < 0)
-                    generated.push(moduleName);
-            }
-            catch (_) {
-                generated.push(moduleName);
-            }
-            const getApiDefinition = utils_1.createApiDefinitionGetter(params);
-            const data = Object.assign({ generated }, (await getApiDefinition(host)));
-            data.generated = [];
-            const clearProxy = utils_1.createProxyClearer(targetPath);
-            const saveProxyConfig = utils_1.createProxyConfigSaver(data, targetPath);
-            const saveProxyWarning = utils_1.createProxyWarningSaver(targetPath);
-            const generateApis = utils_1.createApisGenerator(schema, generated);
-            const generateIndex = utils_1.createProxyIndexGenerator(targetPath);
-            return schematics_1.chain([
-                utils_1.mergeAndAllowDelete(host, clearProxy),
-                saveProxyConfig,
-                saveProxyWarning,
-                generateApis,
-                generateIndex,
-            ]);
-        },
-    ]);
-}
-exports.default = default_1;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular-devkit/schematics");
+const utils_1 = require("../../utils");
+function default_1(schema) {
+    const params = utils_1.removeDefaultPlaceholders(schema);
+    const moduleName = params.module || 'app';
+    return schematics_1.chain([
+        async (host, _context) => {
+            const target = await utils_1.resolveProject(host, params.target);
+            const targetPath = utils_1.buildDefaultPath(target.definition);
+            const readProxyConfig = utils_1.createProxyConfigReader(targetPath);
+            let generated = [];
+            try {
+                generated = readProxyConfig(host).generated;
+                const index = generated.findIndex(m => m === moduleName);
+                if (index < 0)
+                    generated.push(moduleName);
+            }
+            catch (_) {
+                generated.push(moduleName);
+            }
+            const getApiDefinition = utils_1.createApiDefinitionGetter(params);
+            const data = Object.assign({ generated }, (await getApiDefinition(host)));
+            data.generated = [];
+            const clearProxy = utils_1.createProxyClearer(targetPath);
+            const saveProxyConfig = utils_1.createProxyConfigSaver(data, targetPath);
+            const saveProxyWarning = utils_1.createProxyWarningSaver(targetPath);
+            const generateApis = utils_1.createApisGenerator(schema, generated);
+            const generateIndex = utils_1.createProxyIndexGenerator(targetPath);
+            return schematics_1.chain([
+                utils_1.mergeAndAllowDelete(host, clearProxy),
+                saveProxyConfig,
+                saveProxyWarning,
+                generateApis,
+                generateIndex,
+            ]);
+        },
+    ]);
+}
+exports.default = default_1;
 //# sourceMappingURL=index.js.map