Replaced Angular Client Proxy Generation code with Angular Schematics

npm/ng-packs/.gitignore

@@ -1,5 +1,8 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
+# generic ignore files
+*.gitignore.*
+
 # compiled output
 /tmp
 /out-tsc
@@ -46,4 +49,4 @@ testem.log
 Thumbs.db
 
 !**/[Pp]ackages/*
-*.internal.*
+*.internal.*

npm/ng-packs/.vscode/settings.json

@@ -1,4 +1,22 @@
 {
+  "[typescriptreact]": {
+    "editor.formatOnSave": false,
+    "editor.codeActionsOnSave": {
+      "source.fixAll": false,
+      "source.organizeImports": false
+    }
+  },
+  "[xml]": {
+    "editor.formatOnSave": false,
+    "editor.codeActionsOnSave": {
+      "source.fixAll": false,
+      "source.organizeImports": false
+    }
+  },
+  "files.associations": {
+    "*.ts.template": "typescriptreact",
+    "*.html.template": "xml"
+  },
   "search.exclude": {
     "**/dist": true
   },

npm/ng-packs/angular.json

@@ -366,6 +366,29 @@
         }
       }
     },
+    "schematics": {
+      "projectType": "library",
+      "root": "packages/schematics",
+      "sourceRoot": "packages/schematics/src",
+      "prefix": "abp",
+      "architect": {
+        "test": {
+          "builder": "@angular-builders/jest:run",
+          "options": {
+            "tsConfig": "tsconfig.json",
+            "coverage": true,
+            "passWithNoTests": true
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": ["packages/schematics/tsconfig.json"],
+            "exclude": ["**/node_modules/**"]
+          }
+        }
+      }
+    },
     "dev-app": {
       "projectType": "application",
       "schematics": {

npm/ng-packs/apps/dev-app/src/environments/environment.ts

@@ -21,5 +21,8 @@ export const environment = {
     default: {
       url: 'https://localhost:44305',
     },
+    saas: {
+      url: 'https://localhost:44305',
+    },
   },
 } as Config.Environment;

npm/ng-packs/package.json

@@ -13,6 +13,8 @@
     "test": "ng test --watchAll --runInBand",
     "commit": "git-cz",
     "lint": "ng lint",
+    "build:schematics": "cd scripts && yarn && yarn build:schematics && cd ..",
+    "dev:schematics": "tsc -p packages/schematics/tsconfig.json -w",
     "scripts:build": "cd scripts && yarn && yarn build",
     "prepare:workspace": "yarn scripts:build --noInstall",
     "ci": "yarn ng lint && yarn prepare:workspace && yarn ci:test && yarn ci:build",
@@ -57,6 +59,7 @@
     "@ngxs/router-plugin": "^3.6.2",
     "@ngxs/storage-plugin": "^3.6.2",
     "@ngxs/store": "^3.6.2",
+    "@schematics/angular": "~10.0.5",
     "@swimlane/ngx-datatable": "^17.1.0",
     "@types/jest": "^25.2.3",
     "@types/node": "^12.11.1",
@@ -67,9 +70,11 @@
     "conventional-changelog-cli": "^2.0.31",
     "cz-conventional-changelog": "3.0.2",
     "font-awesome": "^4.7.0",
+    "got": "^11.5.2",
     "jest": "^25.0.0",
     "jest-canvas-mock": "^2.2.0",
     "jest-preset-angular": "^8.2.0",
+    "jsonc-parser": "^2.3.0",
     "just-clone": "^3.1.0",
     "just-compare": "^1.3.0",
     "lerna": "^3.19.0",

npm/ng-packs/packages/schematics/.gitignore

@@ -0,0 +1,18 @@
+# Outputs
+src/**/*.js
+src/**/*.js.map
+src/**/*.d.ts
+
+# IDEs
+.idea/
+jsconfig.json
+.vscode/
+
+# Misc
+node_modules/
+npm-debug.log*
+yarn-error.log*
+
+# Mac OSX Finder files.
+**/.DS_Store
+.DS_Store

npm/ng-packs/packages/schematics/.npmignore

@@ -0,0 +1,3 @@
+# Ignores TypeScript files, but keeps definitions.
+*.ts
+!*.d.ts

npm/ng-packs/packages/schematics/README.md

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

npm/ng-packs/packages/schematics/jest.config.js

@@ -0,0 +1,7 @@
+const jestConfig = require('../../jest.config');
+
+module.exports = {
+  ...jestConfig,
+  name: 'schematics',
+  testMatch: ['<rootDir>/packages/schematics/**/+(*.)+(spec).+(ts)'],
+};

npm/ng-packs/packages/schematics/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "@abp/ng.schematics",
+  "version": "3.0.5",
+  "description": "Schematics that works with ABP Suite",
+  "keywords": [
+    "schematics"
+  ],
+  "author": "",
+  "license": "MIT",
+  "schematics": "./src/collection.json",
+  "dependencies": {
+    "@angular-devkit/core": "~10.0.3",
+    "@angular-devkit/schematics": "~10.0.3",
+    "got": "^11.5.2",
+    "typescript": "~3.9.2"
+  },
+  "devDependencies": {
+    "@types/node": "^12.11.1",
+    "@types/jest": "^26.0.0",
+    "jest": "^26.0.0",
+    "jest-preset-angular": "^8.2.0",
+    "@schematics/angular": "~10.0.3"
+  }
+}

npm/ng-packs/packages/schematics/src/collection.json

@@ -0,0 +1,14 @@
+{
+  "schematics": {
+    "proxy": {
+      "description": "ABP Proxy Generator Schematics",
+      "factory": "./commands/proxy",
+      "schema": "./commands/proxy/schema.json"
+    },
+    "api": {
+      "description": "ABP API Generator Schematics",
+      "factory": "./commands/api",
+      "schema": "./commands/api/schema.json"
+    }
+  }
+}

npm/ng-packs/packages/schematics/src/commands/api/files-enum/shared/enums/__namespace@dir__/__name@kebab__.ts.template

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

npm/ng-packs/packages/schematics/src/commands/api/files-model/shared/models/__namespace@dir__/index.ts.template

@@ -0,0 +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 %>;<% } %>
+}
+<% } %>

npm/ng-packs/packages/schematics/src/commands/api/files-service/shared/services/__namespace@dir__/__name@kebab__.service.ts.template

@@ -0,0 +1,23 @@
+<% 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 %>',
+      url: `/<%= body.url %>`,<%
+      if (body.params.length) { %>
+      params: { <%= body.params.join(', ') %> },<% }
+      if (body.body) { %>
+      body: <%= body.body %>,<% } %>
+    },
+    { apiName: this.apiName });<% } %>
+
+  constructor(private restService: RestService) {}
+}

npm/ng-packs/packages/schematics/src/commands/api/index.ts

@@ -0,0 +1,157 @@
+import { normalize, strings } from '@angular-devkit/core';
+import {
+  applyTemplates,
+  branchAndMerge,
+  chain,
+  move,
+  SchematicContext,
+  SchematicsException,
+  Tree,
+  url,
+} from '@angular-devkit/schematics';
+import { Exception } from '../../enums';
+import { ServiceGeneratorParams } from '../../models';
+import {
+  applyWithOverwrite,
+  buildDefaultPath,
+  createApiDefinitionReader,
+  createControllerToServiceMapper,
+  createImportRefsToModelReducer,
+  createImportRefToEnumMapper,
+  EnumGeneratorParams,
+  getEnumNamesFromImports,
+  interpolate,
+  ModelGeneratorParams,
+  resolveProject,
+  serializeParameters,
+} from '../../utils';
+import * as cases from '../../utils/text';
+import { Schema as GenerateProxySchema } from './schema';
+
+export default function(params: GenerateProxySchema) {
+  const solution = params.solution;
+  const moduleName = strings.camelize(params.module || 'app');
+
+  return chain([
+    async (tree: Tree, _context: SchematicContext) => {
+      const target = await resolveProject(tree, params.target!);
+      const targetPath = buildDefaultPath(target.definition);
+      const readApiDefinition = createApiDefinitionReader(
+        `${targetPath}/shared/api-definition.json`,
+      );
+      const data = readApiDefinition(tree);
+      const types = data.types;
+      const definition = data.modules[moduleName];
+      if (!definition)
+        throw new SchematicsException(interpolate(Exception.InvalidModule, moduleName));
+
+      const apiName = definition.remoteServiceName;
+      const controllers = Object.values(definition.controllers || {});
+      const serviceImports: Record<string, string[]> = {};
+      const generateServices = createServiceGenerator({
+        targetPath,
+        solution,
+        types,
+        apiName,
+        controllers,
+        serviceImports,
+      });
+
+      const modelImports: Record<string, string[]> = {};
+      const generateModels = createModelGenerator({
+        targetPath,
+        solution,
+        types,
+        serviceImports,
+        modelImports,
+      });
+
+      const generateEnums = createEnumGenerator({
+        targetPath,
+        solution,
+        types,
+        serviceImports,
+        modelImports,
+      });
+
+      return branchAndMerge(chain([generateServices, generateModels, generateEnums]));
+    },
+  ]);
+}
+
+function createEnumGenerator(params: EnumGeneratorParams) {
+  const { targetPath, serviceImports, modelImports } = params;
+  const mapImportRefToEnum = createImportRefToEnumMapper(params);
+  const enumRefs = [
+    ...new Set([
+      ...getEnumNamesFromImports(serviceImports),
+      ...getEnumNamesFromImports(modelImports),
+    ]),
+  ];
+
+  return chain(
+    enumRefs.map(ref => {
+      return applyWithOverwrite(url('./files-enum'), [
+        applyTemplates({
+          ...cases,
+          ...mapImportRefToEnum(ref),
+        }),
+        move(normalize(targetPath)),
+      ]);
+    }),
+  );
+}
+
+function createModelGenerator(params: ModelGeneratorParams) {
+  const { targetPath, serviceImports, modelImports } = params;
+  const reduceImportRefsToModels = 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 chain(
+    models.map(model =>
+      applyWithOverwrite(url('./files-model'), [
+        applyTemplates({
+          ...cases,
+          ...model,
+        }),
+        move(normalize(targetPath)),
+      ]),
+    ),
+  );
+}
+
+function createServiceGenerator(params: ServiceGeneratorParams) {
+  const { targetPath, controllers, serviceImports } = params;
+  const mapControllerToService = createControllerToServiceMapper(params);
+
+  return 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 applyWithOverwrite(url('./files-service'), [
+        applyTemplates({
+          ...cases,
+          serializeParameters,
+          ...service,
+        }),
+        move(normalize(targetPath)),
+      ]);
+    }),
+  );
+}