🐛 Fixed ng add schematic of api-token-interceptor project

SwabianCoder · Aug 20, 2022 · b542e3a · b542e3a
1 parent 6cfcd2e
commit b542e3a
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 65 deletions.
diff --git a/projects/api-token-interceptor/CHANGELOG.md b/projects/api-token-interceptor/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.0-rc.10] - 2022-08-20
+
+### Fixed
+
+- ng add schematic
+
 ## [1.0.0-rc.9] - 2022-08-20
 
 ### Added

diff --git a/projects/api-token-interceptor/package.json b/projects/api-token-interceptor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngx-toolset/api-token-interceptor",
-  "version": "1.0.0-rc.9",
+  "version": "1.0.0-rc.10",
   "scripts": {
     "build": "tsc -p tsconfig.schematics.json",
     "postbuild": "copyfiles schematics/*/schema.json schematics/*/files/** schematics/collection.json ../../dist/api-token-interceptor/"

diff --git a/projects/api-token-interceptor/schematics/ng-add/index.ts b/projects/api-token-interceptor/schematics/ng-add/index.ts
@@ -6,81 +6,74 @@ import {
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { applyToUpdateRecorder } from '@schematics/angular/utility/change';
-import { addSymbolToNgModuleMetadata } from '../utility/ast-utils';
 import * as ts from 'typescript';
+import { addSymbolToNgModuleMetadata } from '../utility/ast-utils';
 
 export function ngAdd(): Rule {
   return (tree: Tree, context: SchematicContext) => {
-    addModuleAndInjectionTokens(tree, context);
-    installDependencies(context);
+    context.logger.info('Installing dependencies...');
+    context.addTask(new NodePackageInstallTask());
 
-    return tree;
-  };
-}
+    context.logger.info('Adding ApiTokenInterceptorModule to the app...');
+    const appModulePath = './src/app/app.module.ts';
 
-function addModuleAndInjectionTokens(
-  tree: Tree,
-  context: SchematicContext
-): void {
-  context.logger.info('Adding ApiTokenInterceptorModule to the app...');
-  const appModulePath = '/src/app/app.module.ts';
+    if (!tree.exists(appModulePath)) {
+      throw new SchematicsException(
+        `The file ${appModulePath} doesn't exist...`
+      );
+    }
 
-  if (!tree.exists(appModulePath)) {
-    throw new SchematicsException(`The file ${appModulePath} doesn't exist...`);
-  }
+    const recorder = tree.beginUpdate(appModulePath);
+    const appModuleFileContent = tree.read(appModulePath);
 
-  const recorder = tree.beginUpdate(appModulePath);
-  const appModuleFileContent = tree.read(appModulePath);
+    if (appModuleFileContent === null) {
+      throw new SchematicsException(
+        `The content of ${appModulePath} couldn't be read...`
+      );
+    }
 
-  if (appModuleFileContent === null) {
-    throw new SchematicsException(
-      `The content of ${appModulePath} couldn't be read...`
+    const appModuleFileText = appModuleFileContent.toString('utf-8');
+    const sourceFile = ts.createSourceFile(
+      appModulePath,
+      appModuleFileText,
+      ts.ScriptTarget.Latest,
+      true
     );
-  }
+    const importPath = '@ngx-toolset/api-token-interceptor';
 
-  const sourceFile = ts.createSourceFile(
-    appModulePath,
-    appModuleFileContent.toString(),
-    ts.ScriptTarget.ES2020
-  );
-  const importPath = '@ngx-toolset/api-token-interceptor';
+    for (const symbol of [
+      {
+        metadataField: 'imports',
+        symbolName: 'ApiTokenInterceptorModule',
+        importText: 'ApiTokenInterceptorModule.forRoot()',
+      },
+      {
+        metadataField: 'providers',
+        symbolName: 'API_URL_REGEX',
+        importText: '{ provide: API_URL_REGEX, useValue: /^/ },',
+      },
+      {
+        metadataField: 'providers',
+        symbolName: 'BEARER_TOKEN_CALLBACK_FN',
+        importText:
+          "{ provide: BEARER_TOKEN_CALLBACK_FN, useValue: (): string => 'sampleToken', },",
+      },
+    ]) {
+      applyToUpdateRecorder(
+        recorder,
+        addSymbolToNgModuleMetadata(
+          sourceFile,
+          appModulePath,
+          symbol.metadataField,
+          symbol.symbolName,
+          importPath,
+          symbol.importText
+        )
+      );
+    }
 
-  for (const symbol of [
-    {
-      metadataField: 'imports',
-      symbolName: 'ApiTokenInterceptorModule',
-      importText: 'ApiTokenInterceptorModule.forRoot()',
-    },
-    {
-      metadataField: 'providers',
-      symbolName: 'API_URL_REGEX',
-      importText:
-        '{ provide: API_URL_REGEX, useValue: /^https://sample-regex.com/ }',
-    },
-    {
-      metadataField: 'providers',
-      symbolName: 'BEARER_TOKEN_CALLBACK_FN',
-      importText:
-        "{ provide: BEARER_TOKEN_CALLBACK_FN, useValue: (): string => 'sampleToken', }",
-    },
-  ]) {
-    applyToUpdateRecorder(
-      recorder,
-      addSymbolToNgModuleMetadata(
-        sourceFile,
-        appModulePath,
-        symbol.metadataField,
-        symbol.symbolName,
-        importPath,
-        symbol.importText
-      )
-    );
-  }
-
-  tree.commitUpdate(recorder);
-}
+    tree.commitUpdate(recorder);
 
-function installDependencies(context: SchematicContext): void {
-  context.logger.info('Installing dependencies...');
-  context.addTask(new NodePackageInstallTask());
+    return tree;
+  };
 }