chore: fix up test configs

Author: crutchcorn

angular.json

@@ -27,6 +27,9 @@
         "test": {
           "builder": "@angular-devkit/build-angular:jest",
           "options": {
+            "exclude": [
+              "**/schematics/ng-add/*.spec.ts"
+            ],
             "tsConfig": "projects/angular-redux/tsconfig.spec.json",
             "polyfills": [
               "zone.js",

package.json

@@ -6,7 +6,9 @@
     "start": "ng serve",
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
-    "test": "ng test"
+    "test": "yarn test:ng && yarn test:schematics",
+    "test:ng": "ng test",
+    "test:schematics": "cd projects/angular-redux/schematics && jest"
   },
   "workspaces": {
     "packages": [
@@ -44,6 +46,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "ng-packagr": "^18.2.0",
+    "ts-jest": "^29.2.5",
     "typescript": "~5.5.2"
   },
   "packageManager": "yarn@4.1.0"

projects/angular-redux/package.json

@@ -13,14 +13,14 @@
   "peerDependencies": {
     "@angular/common": ">=17.3.0",
     "@angular/core": ">=17.3.0",
-    "redux": "^5.0.0",
-    "@reduxjs/toolkit": "^2.2.7"
+    "@reduxjs/toolkit": "^2.2.7",
+    "redux": "^5.0.0"
   },
   "peerDependenciesMeta": {
-    "redux": {
+    "@reduxjs/toolkit": {
       "optional": true
     },
-    "@reduxjs/toolkit": {
+    "redux": {
       "optional": true
     }
   },

projects/angular-redux/schematics-core/index.ts

@@ -69,8 +69,6 @@ export const stringUtils = {
   pluralize,
 };
 
-export { updatePackage } from './utility/update';
-
 export { parseName } from './utility/parse-name';
 
 export { addPackageToPackageJson } from './utility/package';

projects/angular-redux/schematics-core/utility/project.ts

@@ -1,12 +1,13 @@
-import { TargetDefinition } from '@angular-devkit/core/src/workspace';
+// import { TargetDefinition } from '@angular-devkit/core/src/workspace';
 import { getWorkspace } from './config';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 
 export interface WorkspaceProject {
   root: string;
   projectType: string;
   architect: {
-    [key: string]: TargetDefinition;
+    // [key: string]: TargetDefinition;
+    [key: string]: any;
   };
 }
 

projects/angular-redux/schematics/jest.config.mjs

@@ -0,0 +1,13 @@
+export default {
+  displayName: 'Schematics',
+  coverageDirectory: '../../coverage/modules/schematics',
+  transform: {
+    '^.+\\.(ts|mjs|js)$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json'
+      },
+    ],
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)']
+};

projects/angular-redux/schematics/ng-add/files/__statePath__/counter-slice.ts.template renamed to projects/angular-redux/schematics/ng-add/files/__storePath__/counter-slice.ts.template

@@ -1,6 +1,5 @@
 import * as fs from "fs";
 import * as path from "path";
-import { fileURLToPath } from 'url';
 import * as ts from 'typescript';
 import {
   Rule,
@@ -95,10 +94,7 @@ function addImportToNgModule(options: AngularReduxOptions): Rule {
   };
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const angularReduxPackageMeta = fs.readFile(path.resolve(__dirname, '../../package.json')) as {
+const angularReduxPackageMeta = fs.readFileSync(path.resolve(__dirname, '../../package.json')) as unknown as {
   version: string;
   peerDependencies: {
     [key: string]: string;

projects/angular-redux/schematics/ng-add/files/__statePath__/index.ts.template renamed to projects/angular-redux/schematics/ng-add/files/__storePath__/index.ts.template

@@ -0,0 +1,15 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/spec",
+    "emitDecoratorMetadata": true,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}