jest-preset-angular 12.2.0 → 12.2.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [12.2.1](https://github.com/thymikee/jest-preset-angular/compare/v12.2.0...v12.2.1) (2022-08-28)
+
+
+### Bug Fixes
+
+* **transformers:** adopt ts 4.8 changes for `replace-resource` ([#1739](https://github.com/thymikee/jest-preset-angular/issues/1739)) ([aea7205](https://github.com/thymikee/jest-preset-angular/commit/aea7205afb9622f2ba09a032505b8dbf5c7105c1)), closes [#1732](https://github.com/thymikee/jest-preset-angular/issues/1732)
+
+
+
 # [12.2.0](https://github.com/thymikee/jest-preset-angular/compare/v12.1.0...v12.2.0) (2022-07-14)
 
 

package/build/ngtsc/reflection/src/type_to_value.js

@@ -160,7 +160,9 @@ function entityNameToValue(node) {
         return left !== null ? typescript_1.default.factory.createPropertyAccessExpression(left, node.right) : null;
     }
     else if (typescript_1.default.isIdentifier(node)) {
-        return typescript_1.default.getMutableClone(node);
+        const clone = typescript_1.default.setOriginalNode(typescript_1.default.factory.createIdentifier(node.text), node);
+        clone.parent = node.parent;
+        return clone;
     }
     else {
         return null;

package/build/ngtsc/reflection/src/typescript.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reflectObjectLiteral = exports.findMember = exports.filterToMembersWithDecorator = exports.reflectTypeEntityToDeclaration = exports.reflectIdentifierOfDeclaration = exports.reflectNameOfDeclaration = exports.TypeScriptReflectionHost = void 0;
 const tslib_1 = require("tslib");
 const typescript_1 = tslib_1.__importDefault(require("typescript"));
+const ts_compatibility_1 = require("../../ts_compatibility");
 const host_1 = require("./host");
 const type_to_value_1 = require("./type_to_value");
 const util_1 = require("./util");
@@ -11,11 +12,11 @@ class TypeScriptReflectionHost {
         this.checker = checker;
     }
     getDecoratorsOfDeclaration(declaration) {
-        if (declaration.decorators === undefined || declaration.decorators.length === 0) {
-            return null;
-        }
-        return declaration.decorators.map(decorator => this._reflectDecorator(decorator))
-            .filter((dec) => dec !== null);
+        const decorators = (0, ts_compatibility_1.getDecorators)(declaration);
+        return decorators !== undefined && decorators.length ?
+            decorators.map(decorator => this._reflectDecorator(decorator))
+                .filter((dec) => dec !== null) :
+            null;
     }
     getMembersOfClass(clazz) {
         const tsClazz = castDeclarationToClassOrDie(clazz);
@@ -149,8 +150,9 @@ class TypeScriptReflectionHost {
         if (typescript_1.default.isVariableDeclaration(decl) && typescript_1.default.isVariableDeclarationList(decl.parent)) {
             topLevel = decl.parent.parent;
         }
-        if (topLevel.modifiers !== undefined &&
-            topLevel.modifiers.some(modifier => modifier.kind === typescript_1.default.SyntaxKind.ExportKeyword)) {
+        const modifiers = (0, ts_compatibility_1.getModifiers)(topLevel);
+        if (modifiers !== undefined &&
+            modifiers.some(modifier => modifier.kind === typescript_1.default.SyntaxKind.ExportKeyword)) {
             return true;
         }
         if (topLevel.parent === undefined || !typescript_1.default.isSourceFile(topLevel.parent)) {
@@ -310,8 +312,8 @@ class TypeScriptReflectionHost {
             return null;
         }
         const decorators = this.getDecoratorsOfDeclaration(node);
-        const isStatic = node.modifiers !== undefined &&
-            node.modifiers.some(mod => mod.kind === typescript_1.default.SyntaxKind.StaticKeyword);
+        const modifiers = (0, ts_compatibility_1.getModifiers)(node);
+        const isStatic = modifiers !== undefined && modifiers.some(mod => mod.kind === typescript_1.default.SyntaxKind.StaticKeyword);
         return {
             node,
             implementation: node,
@@ -499,7 +501,8 @@ function getFarLeftIdentifier(propertyAccess) {
 }
 function getContainingImportDeclaration(node) {
     return typescript_1.default.isImportSpecifier(node) ? node.parent.parent.parent :
-        typescript_1.default.isNamespaceImport(node) ? node.parent.parent : null;
+        typescript_1.default.isNamespaceImport(node) ? node.parent.parent :
+            null;
 }
 function getExportedName(decl, originalId) {
     return typescript_1.default.isImportSpecifier(decl) ?

package/build/ngtsc/ts_compatibility/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./src/ts_cross_version_utils"), exports);

package/build/transformers/downlevel_decorators_transform/downlevel_decorators_transform.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDownlevelDecoratorsTransform = void 0;
 const tslib_1 = require("tslib");
 const typescript_1 = tslib_1.__importDefault(require("typescript"));
+const ts_compatibility_1 = require("../../ngtsc/ts_compatibility");
 const patch_alias_reference_resolution_1 = require("./patch_alias_reference_resolution");
 function isAngularDecorator(decorator, isCore) {
     return isCore || (decorator.import !== null && decorator.import.from === '@angular/core');
@@ -61,7 +62,7 @@ function createCtorParametersClassProperty(diagnostics, entityNameToExpression,
         params.push(typescript_1.default.factory.createObjectLiteralExpression(members));
     }
     const initializer = typescript_1.default.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createArrayLiteralExpression(params, true));
-    const ctorProp = typescript_1.default.factory.createPropertyDeclaration(undefined, [typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], 'ctorParameters', undefined, undefined, initializer);
+    const ctorProp = (0, ts_compatibility_1.createPropertyDeclaration)([typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], 'ctorParameters', undefined, undefined, initializer);
     if (isClosureCompilerEnabled) {
         typescript_1.default.setSyntheticLeadingComments(ctorProp, [
             {
@@ -145,7 +146,7 @@ function getDownlevelDecoratorsTransform(typeChecker, host, diagnostics, isCore,
     function createDecoratorClassProperty(decoratorList) {
         const modifier = typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.StaticKeyword);
         const initializer = typescript_1.default.factory.createArrayLiteralExpression(decoratorList, true);
-        const prop = typescript_1.default.factory.createPropertyDeclaration(undefined, [modifier], 'decorators', undefined, undefined, initializer);
+        const prop = (0, ts_compatibility_1.createPropertyDeclaration)([modifier], 'decorators', undefined, undefined, initializer);
         addJSDocTypeAnnotation(prop, DECORATOR_INVOCATION_JSDOC_TYPE);
         return prop;
     }
@@ -155,7 +156,7 @@ function getDownlevelDecoratorsTransform(typeChecker, host, diagnostics, isCore,
             entries.push(typescript_1.default.factory.createPropertyAssignment(name, typescript_1.default.factory.createArrayLiteralExpression(decorators.map(deco => extractMetadataFromSingleDecorator(deco, diagnostics)))));
         }
         const initializer = typescript_1.default.factory.createObjectLiteralExpression(entries, true);
-        const prop = typescript_1.default.factory.createPropertyDeclaration(undefined, [typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], 'propDecorators', undefined, undefined, initializer);
+        const prop = (0, ts_compatibility_1.createPropertyDeclaration)([typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], 'propDecorators', undefined, undefined, initializer);
         addJSDocTypeAnnotation(prop, `!Object<string, ${DECORATOR_INVOCATION_JSDOC_TYPE}>`);
         return prop;
     }
@@ -178,10 +179,10 @@ function getDownlevelDecoratorsTransform(typeChecker, host, diagnostics, isCore,
             if ((0, patch_alias_reference_resolution_1.isAliasImportDeclaration)(decl)) {
                 referencedParameterTypes.add(decl);
                 if (decl.name !== undefined) {
-                    return typescript_1.default.getMutableClone(decl.name);
+                    return typescript_1.default.setOriginalNode(typescript_1.default.factory.createIdentifier(decl.name.text), decl.name);
                 }
             }
-            return typescript_1.default.getMutableClone(name);
+            return typescript_1.default.setOriginalNode(typescript_1.default.factory.createIdentifier(name.text), name);
         }
         function transformClassElement(element) {
             element = typescript_1.default.visitEachChild(element, decoratorDownlevelVisitor, context);
@@ -209,12 +210,10 @@ function getDownlevelDecoratorsTransform(typeChecker, host, diagnostics, isCore,
                 });
                 return [undefined, element, []];
             }
-            const name = element.name.text;
-            const mutable = typescript_1.default.getMutableClone(element);
-            mutable.decorators = decoratorsToKeep.length ?
-                typescript_1.default.setTextRange(typescript_1.default.factory.createNodeArray(decoratorsToKeep), mutable.decorators) :
-                undefined;
-            return [name, mutable, toLower];
+            const modifiers = decoratorsToKeep.length ?
+                typescript_1.default.setTextRange(typescript_1.default.factory.createNodeArray((0, ts_compatibility_1.combineModifiers)(decoratorsToKeep, (0, ts_compatibility_1.getModifiers)(element))), element.modifiers) :
+                (0, ts_compatibility_1.getModifiers)(element);
+            return [element.name.text, cloneClassElementWithModifiers(element, modifiers), toLower];
         }
         function transformConstructor(ctor) {
             ctor = typescript_1.default.visitEachChild(ctor, decoratorDownlevelVisitor, context);
@@ -237,14 +236,13 @@ function getDownlevelDecoratorsTransform(typeChecker, host, diagnostics, isCore,
                     paramInfo.type = param.type;
                 }
                 parametersInfo.push(paramInfo);
-                const newParam = typescript_1.default.factory.updateParameterDeclaration(param, decoratorsToKeep.length ? decoratorsToKeep : undefined, param.modifiers, param.dotDotDotToken, param.name, param.questionToken, param.type, param.initializer);
+                const newParam = (0, ts_compatibility_1.updateParameterDeclaration)(param, (0, ts_compatibility_1.combineModifiers)(decoratorsToKeep.length ? decoratorsToKeep : undefined, (0, ts_compatibility_1.getModifiers)(param)), param.dotDotDotToken, param.name, param.questionToken, param.type, param.initializer);
                 newParameters.push(newParam);
             }
-            const updated = typescript_1.default.factory.updateConstructorDeclaration(ctor, ctor.decorators, ctor.modifiers, newParameters, ctor.body);
+            const updated = (0, ts_compatibility_1.updateConstructorDeclaration)(ctor, (0, ts_compatibility_1.getModifiers)(ctor), newParameters, ctor.body);
             return [updated, parametersInfo];
         }
         function transformClassDeclaration(classDecl) {
-            classDecl = typescript_1.default.getMutableClone(classDecl);
             const newMembers = [];
             const decoratedProperties = new Map();
             let classParameters = null;
@@ -274,7 +272,7 @@ function getDownlevelDecoratorsTransform(typeChecker, host, diagnostics, isCore,
                 }
                 newMembers.push(typescript_1.default.visitEachChild(member, decoratorDownlevelVisitor, context));
             }
-            const decoratorsToKeep = new Set(classDecl.decorators);
+            const decoratorsToKeep = new Set((0, ts_compatibility_1.getDecorators)(classDecl));
             const possibleAngularDecorators = host.getDecoratorsOfDeclaration(classDecl) || [];
             let hasAngularDecorator = false;
             const decoratorsToLower = [];
@@ -301,7 +299,7 @@ function getDownlevelDecoratorsTransform(typeChecker, host, diagnostics, isCore,
                 newMembers.push(createPropDecoratorsClassProperty(diagnostics, decoratedProperties));
             }
             const members = typescript_1.default.setTextRange(typescript_1.default.factory.createNodeArray(newMembers, classDecl.members.hasTrailingComma), classDecl.members);
-            return typescript_1.default.factory.updateClassDeclaration(classDecl, decoratorsToKeep.size ? Array.from(decoratorsToKeep) : undefined, classDecl.modifiers, classDecl.name, classDecl.typeParameters, classDecl.heritageClauses, members);
+            return (0, ts_compatibility_1.createClassDeclaration)((0, ts_compatibility_1.combineModifiers)(decoratorsToKeep.size ? Array.from(decoratorsToKeep) : undefined, (0, ts_compatibility_1.getModifiers)(classDecl)), classDecl.name, classDecl.typeParameters, classDecl.heritageClauses, members);
         }
         function decoratorDownlevelVisitor(node) {
             if (typescript_1.default.isClassDeclaration(node)) {
@@ -315,3 +313,23 @@ function getDownlevelDecoratorsTransform(typeChecker, host, diagnostics, isCore,
     };
 }
 exports.getDownlevelDecoratorsTransform = getDownlevelDecoratorsTransform;
+function cloneClassElementWithModifiers(node, modifiers) {
+    let clone;
+    if (typescript_1.default.isMethodDeclaration(node)) {
+        clone = (0, ts_compatibility_1.createMethodDeclaration)(modifiers, node.asteriskToken, node.name, node.questionToken, node.typeParameters, node.parameters, node.type, node.body);
+    }
+    else if (typescript_1.default.isPropertyDeclaration(node)) {
+        clone = (0, ts_compatibility_1.createPropertyDeclaration)(modifiers, node.name, node.questionToken, node.type, node.initializer);
+    }
+    else if (typescript_1.default.isGetAccessor(node)) {
+        clone =
+            (0, ts_compatibility_1.createGetAccessorDeclaration)(modifiers, node.name, node.parameters, node.type, node.body);
+    }
+    else if (typescript_1.default.isSetAccessor(node)) {
+        clone = (0, ts_compatibility_1.createSetAccessorDeclaration)(modifiers, node.name, node.parameters, node.body);
+    }
+    else {
+        throw new Error(`Unsupported decorated member with kind ${typescript_1.default.SyntaxKind[node.kind]}`);
+    }
+    return typescript_1.default.setOriginalNode(clone, node);
+}

package/build/transformers/replace-resources.js

@@ -4,6 +4,19 @@ exports.replaceResources = void 0;
 const tslib_1 = require("tslib");
 const typescript_1 = tslib_1.__importDefault(require("typescript"));
 const constants_1 = require("../constants");
+const isAfterVersion = (targetMajor, targetMinor) => {
+    const [major, minor] = typescript_1.default.versionMajorMinor.split('.').map((part) => parseInt(part));
+    if (major < targetMajor) {
+        return false;
+    }
+    else if (major > targetMajor) {
+        return true;
+    }
+    else {
+        return minor >= targetMinor;
+    }
+};
+const IS_TS_48 = isAfterVersion(4, 8);
 const shouldTransform = (fileName) => !fileName.endsWith('.ngfactory.ts') && !fileName.endsWith('.ngstyle.ts');
 function replaceResources({ program }) {
     return (context) => {
@@ -13,10 +26,7 @@ function replaceResources({ program }) {
         const nodeFactory = context.factory;
         const visitNode = (node) => {
             if (typescript_1.default.isClassDeclaration(node)) {
-                const decorators = typescript_1.default.visitNodes(node.decorators, (node) => typescript_1.default.isDecorator(node)
-                    ? visitDecorator(nodeFactory, node, typeChecker, resourceImportDeclarations, moduleKind)
-                    : node);
-                return nodeFactory.updateClassDeclaration(node, decorators, node.modifiers, node.name, node.typeParameters, node.heritageClauses, node.members);
+                return visitClassDeclaration(nodeFactory, typeChecker, node, resourceImportDeclarations, moduleKind);
             }
             return typescript_1.default.visitEachChild(node, visitNode, context);
         };
@@ -33,6 +43,34 @@ function replaceResources({ program }) {
     };
 }
 exports.replaceResources = replaceResources;
+function visitClassDeclaration(nodeFactory, typeChecker, node, resourceImportDeclarations, moduleKind) {
+    var _a;
+    let decorators;
+    let modifiers;
+    if (IS_TS_48) {
+        (_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.forEach((modifier) => {
+            if (typescript_1.default.isDecorator(modifier)) {
+                decorators !== null && decorators !== void 0 ? decorators : (decorators = []);
+                decorators.push(modifier);
+            }
+            else {
+                modifiers = modifiers !== null && modifiers !== void 0 ? modifiers : (modifiers = []);
+                modifiers.push(modifier);
+            }
+        });
+    }
+    else {
+        decorators = node.decorators;
+        modifiers = node.modifiers;
+    }
+    if (!decorators || !decorators.length) {
+        return node;
+    }
+    decorators = decorators.map((current) => visitDecorator(nodeFactory, current, typeChecker, resourceImportDeclarations, moduleKind));
+    return IS_TS_48
+        ? nodeFactory.updateClassDeclaration(node, [...decorators, ...(modifiers !== null && modifiers !== void 0 ? modifiers : [])], node.name, node.typeParameters, node.heritageClauses, node.members)
+        : nodeFactory.updateClassDeclaration(node, decorators, modifiers, node.name, node.typeParameters, node.heritageClauses, node.members);
+}
 function visitDecorator(nodeFactory, node, typeChecker, resourceImportDeclarations, moduleKind) {
     if (!isComponentDecorator(node, typeChecker)) {
         return node;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-preset-angular",
-  "version": "12.2.0",
+  "version": "12.2.1",
   "description": "Jest preset configuration for Angular projects",
   "license": "MIT",
   "engines": {
@@ -62,31 +62,31 @@
     "typescript": ">=4.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^14.0.6",
-    "@angular/animations": "^14.0.6",
-    "@angular/common": "^14.0.6",
-    "@angular/compiler": "^14.0.6",
-    "@angular/compiler-cli": "~14.0.6",
-    "@angular/core": "^14.0.6",
-    "@angular/platform-browser": "^14.0.6",
-    "@angular/platform-browser-dynamic": "^14.0.6",
+    "@angular-devkit/build-angular": "^14.2.1",
+    "@angular/animations": "^14.2.0",
+    "@angular/common": "^14.2.0",
+    "@angular/compiler": "^14.2.0",
+    "@angular/compiler-cli": "~14.2.0",
+    "@angular/core": "^14.2.0",
+    "@angular/platform-browser": "^14.2.0",
+    "@angular/platform-browser-dynamic": "^14.2.0",
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-angular": "^17.0.3",
     "@jest/transform": "^28.1.3",
     "@jest/types": "^28.1.3",
-    "@types/jest": "^28.1.5",
-    "@types/node": "^16.11.44",
-    "@types/semver": "^7.3.10",
-    "@typescript-eslint/eslint-plugin": "^5.30.6",
-    "@typescript-eslint/parser": "^5.30.6",
+    "@types/jest": "^28.1.8",
+    "@types/node": "^16.11.56",
+    "@types/semver": "^7.3.12",
+    "@typescript-eslint/eslint-plugin": "^5.35.1",
+    "@typescript-eslint/parser": "^5.35.1",
     "chalk": "^4.1.2",
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.19.0",
+    "eslint": "^8.23.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.5.3",
-    "eslint-plugin-jsdoc": "^39.3.3",
+    "eslint-plugin-jest": "^26.9.0",
+    "eslint-plugin-jsdoc": "^39.3.6",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint-plugin-prettier": "^4.2.1",
     "execa": "5.1.1",
@@ -101,8 +101,8 @@
     "rimraf": "^3.0.2",
     "rxjs": "^7.5.6",
     "tslib": "^2.4.0",
-    "typescript": "^4.7.4",
-    "zone.js": "^0.11.6"
+    "typescript": "^4.8.2",
+    "zone.js": "^0.11.8"
   },
-  "packageManager": "yarn@3.2.1"
+  "packageManager": "yarn@3.2.3"
 }