@nx/cypress 22.4.0-canary.20260113-246d4fd → 22.4.0-canary.20260115-21d1555

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "22.4.0-canary.20260113-246d4fd",
+  "version": "22.4.0-canary.20260115-21d1555",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -36,17 +36,17 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.4.0-canary.20260113-246d4fd",
-    "@nx/eslint": "22.4.0-canary.20260113-246d4fd",
-    "@nx/js": "22.4.0-canary.20260113-246d4fd",
-    "@phenomnomnominal/tsquery": "~5.0.1",
+    "@nx/devkit": "22.4.0-canary.20260115-21d1555",
+    "@nx/eslint": "22.4.0-canary.20260115-21d1555",
+    "@nx/js": "22.4.0-canary.20260115-21d1555",
+    "@phenomnomnominal/tsquery": "~6.1.4",
     "detect-port": "^1.5.1",
     "semver": "^7.6.3",
     "tree-kill": "1.2.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.4.0-canary.20260113-246d4fd"
+    "nx": "22.4.0-canary.20260115-21d1555"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"

package/src/generators/convert-to-inferred/lib/add-dev-server-target-to-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-dev-server-target-to-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/cypress/src/generators/convert-to-inferred/lib/add-dev-server-target-to-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzC,iBAAiB,CAAC,EAAE,MAAM,QA8H3B"}
+{"version":3,"file":"add-dev-server-target-to-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/cypress/src/generators/convert-to-inferred/lib/add-dev-server-target-to-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzC,iBAAiB,CAAC,EAAE,MAAM,QA0H3B"}

package/src/generators/convert-to-inferred/lib/add-dev-server-target-to-config.js

@@ -14,20 +14,16 @@ const tsquery_1 = require("@phenomnomnominal/tsquery");
  */
 function addDevServerTargetToConfig(tree, configFilePath, webServerCommands, ciDevServerTarget) {
     let configFileContents = tree.read(configFilePath, 'utf-8');
-    let ast = tsquery_1.tsquery.ast(configFileContents);
+    let sourceFile = (0, tsquery_1.ast)(configFileContents);
     const NX_E2E_PRESET_SELECTOR = 'PropertyAssignment:has(Identifier[name=e2e]) CallExpression:has(Identifier[name=nxE2EPreset])';
-    const nxE2ePresetOptionsNodes = (0, tsquery_1.tsquery)(ast, NX_E2E_PRESET_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const nxE2ePresetOptionsNodes = (0, tsquery_1.query)(sourceFile, NX_E2E_PRESET_SELECTOR);
     if (nxE2ePresetOptionsNodes.length !== 0) {
         const NX_E2E_PRESET_OPTIONS_SELECTOR = 'PropertyAssignment:has(Identifier[name=e2e]) CallExpression:has(Identifier[name=nxE2EPreset]) > ObjectLiteralExpression';
-        const optionsObjectNodes = (0, tsquery_1.tsquery)(ast, NX_E2E_PRESET_OPTIONS_SELECTOR, {
-            visitAllChildren: true,
-        });
+        const optionsObjectNodes = (0, tsquery_1.query)(sourceFile, NX_E2E_PRESET_OPTIONS_SELECTOR);
         const hasObjectDefinition = optionsObjectNodes?.length > 0;
         let nxE2ePresetOptionsNode = nxE2ePresetOptionsNodes[0];
         const WEB_SERVER_COMMANDS_SELECTOR = 'PropertyAssignment:has(Identifier[name=webServerCommands])';
-        const webServerCommandsNodes = (0, tsquery_1.tsquery)(nxE2ePresetOptionsNode, WEB_SERVER_COMMANDS_SELECTOR, { visitAllChildren: true });
+        const webServerCommandsNodes = (0, tsquery_1.query)(nxE2ePresetOptionsNode, WEB_SERVER_COMMANDS_SELECTOR);
         if (webServerCommandsNodes.length !== 0) {
             // Already exists, replace it
             tree.write(configFilePath, `${configFileContents.slice(0, webServerCommandsNodes[0].getStart())}webServerCommands: ${JSON.stringify(webServerCommands)}${configFileContents.slice(webServerCommandsNodes[0].getEnd())}`);
@@ -42,17 +38,13 @@ function addDevServerTargetToConfig(tree, configFilePath, webServerCommands, ciD
         }
         if (ciDevServerTarget) {
             configFileContents = tree.read(configFilePath, 'utf-8');
-            ast = tsquery_1.tsquery.ast(configFileContents);
-            nxE2ePresetOptionsNode = (0, tsquery_1.tsquery)(ast, NX_E2E_PRESET_SELECTOR, {
-                visitAllChildren: true,
-            })[0];
+            sourceFile = (0, tsquery_1.ast)(configFileContents);
+            nxE2ePresetOptionsNode = (0, tsquery_1.query)(sourceFile, NX_E2E_PRESET_SELECTOR)[0];
             const NX_E2E_PRESET_OPTIONS_SELECTOR = 'PropertyAssignment:has(Identifier[name=e2e]) CallExpression:has(Identifier[name=nxE2EPreset]) > ObjectLiteralExpression';
-            const optionsObjectNodes = (0, tsquery_1.tsquery)(ast, NX_E2E_PRESET_OPTIONS_SELECTOR, {
-                visitAllChildren: true,
-            });
+            const optionsObjectNodes = (0, tsquery_1.query)(sourceFile, NX_E2E_PRESET_OPTIONS_SELECTOR);
             const hasObjectDefinition = optionsObjectNodes?.length > 0;
             const CI_WEB_SERVER_COMMANDS_SELECTOR = 'PropertyAssignment:has(Identifier[name=ciWebServerCommand])';
-            const ciWebServerCommandsNodes = (0, tsquery_1.tsquery)(nxE2ePresetOptionsNode, CI_WEB_SERVER_COMMANDS_SELECTOR, { visitAllChildren: true });
+            const ciWebServerCommandsNodes = (0, tsquery_1.query)(nxE2ePresetOptionsNode, CI_WEB_SERVER_COMMANDS_SELECTOR);
             if (ciWebServerCommandsNodes.length !== 0) {
                 const ciWebServerCommandNode = ciWebServerCommandsNodes[0].getChildAt(2);
                 const ciWebServerCommand = ciWebServerCommandNode

package/src/generators/convert-to-inferred/lib/add-exclude-spec-pattern.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-exclude-spec-pattern.d.ts","sourceRoot":"","sources":["../../../../../../../packages/cypress/src/generators/convert-to-inferred/lib/add-exclude-spec-pattern.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,GAAG,MAAM,EAAE,QAiDtC"}
+{"version":3,"file":"add-exclude-spec-pattern.d.ts","sourceRoot":"","sources":["../../../../../../../packages/cypress/src/generators/convert-to-inferred/lib/add-exclude-spec-pattern.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,GAAG,MAAM,EAAE,QA8CtC"}

package/src/generators/convert-to-inferred/lib/add-exclude-spec-pattern.js

@@ -4,15 +4,13 @@ exports.addExcludeSpecPattern = addExcludeSpecPattern;
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 function addExcludeSpecPattern(tree, configFilePath, excludeSpecPattern) {
     let configFileContents = tree.read(configFilePath, 'utf-8');
-    let ast = tsquery_1.tsquery.ast(configFileContents);
+    let sourceFile = (0, tsquery_1.ast)(configFileContents);
     const E2E_CONFIG_SELECTOR = 'PropertyAssignment:has(Identifier[name=e2e]) > ObjectLiteralExpression';
-    const e2eConfigNodes = (0, tsquery_1.tsquery)(ast, E2E_CONFIG_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const e2eConfigNodes = (0, tsquery_1.query)(sourceFile, E2E_CONFIG_SELECTOR);
     if (e2eConfigNodes.length !== 0) {
         const e2eConfigNode = e2eConfigNodes[0];
         const EXCLUDE_SPEC_PATTERN_SELECTOR = 'PropertyAssignment:has(Identifier[name="excludeSpecPattern"])';
-        const excludeSpecPatternNodes = (0, tsquery_1.tsquery)(e2eConfigNode, EXCLUDE_SPEC_PATTERN_SELECTOR, { visitAllChildren: true });
+        const excludeSpecPatternNodes = (0, tsquery_1.query)(e2eConfigNode, EXCLUDE_SPEC_PATTERN_SELECTOR);
         if (excludeSpecPatternNodes.length !== 0) {
             const excludeSpecPatternNode = excludeSpecPatternNodes[0];
             let updatedExcludePattern = Array.isArray(excludeSpecPattern)

package/src/generators/convert-to-inferred/lib/upsert-baseUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upsert-baseUrl.d.ts","sourceRoot":"","sources":["../../../../../../../packages/cypress/src/generators/convert-to-inferred/lib/upsert-baseUrl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,qBAAqB,EAAE,MAAM,QAgD9B"}
+{"version":3,"file":"upsert-baseUrl.d.ts","sourceRoot":"","sources":["../../../../../../../packages/cypress/src/generators/convert-to-inferred/lib/upsert-baseUrl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,qBAAqB,EAAE,MAAM,QA4C9B"}

package/src/generators/convert-to-inferred/lib/upsert-baseUrl.js

@@ -4,11 +4,9 @@ exports.upsertBaseUrl = upsertBaseUrl;
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 function upsertBaseUrl(tree, configFilePath, baseUrlValueInProject) {
     const configFileContents = tree.read(configFilePath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(configFileContents);
+    const sourceFile = (0, tsquery_1.ast)(configFileContents);
     const BASE_URL_SELECTOR = 'PropertyAssignment:has(Identifier[name=e2e]) PropertyAssignment:has(Identifier[name="baseUrl"])';
-    const baseUrlNodes = (0, tsquery_1.tsquery)(ast, BASE_URL_SELECTOR, {
-        visitAllChildren: true,
-    });
+    const baseUrlNodes = (0, tsquery_1.query)(sourceFile, BASE_URL_SELECTOR);
     if (baseUrlNodes.length !== 0) {
         // The property exists in the config
         const baseUrlValueNode = baseUrlNodes[0].getChildAt(2);
@@ -20,9 +18,7 @@ function upsertBaseUrl(tree, configFilePath, baseUrlValueInProject) {
     }
     else {
         const E2E_OBJECT_SELECTOR = 'PropertyAssignment:has(Identifier[name=e2e]) ObjectLiteralExpression';
-        const e2eConfigNodes = (0, tsquery_1.tsquery)(ast, E2E_OBJECT_SELECTOR, {
-            visitAllChildren: true,
-        });
+        const e2eConfigNodes = (0, tsquery_1.query)(sourceFile, E2E_OBJECT_SELECTOR);
         if (e2eConfigNodes.length !== 0) {
             const e2eConfigNode = e2eConfigNodes[0];
             tree.write(configFilePath, `${configFileContents.slice(0, e2eConfigNode.getEnd() - 1)}baseUrl: "${baseUrlValueInProject}",

package/src/migrations/update-20-8-0/remove-experimental-fetch-polyfill.js

@@ -29,7 +29,7 @@ function removeExperimentalFetchPolyfill(cypressConfig) {
         // couldn't find the config object, leave as is
         return cypressConfig;
     }
-    const sourceFile = tsquery_1.tsquery.ast(cypressConfig);
+    const sourceFile = (0, tsquery_1.ast)(cypressConfig);
     const updatedConfig = ts.factory.updateObjectLiteralExpression(config, config.properties
         // remove the experimentalFetchPolyfill property from the top level config object
         .filter((p) => !ts.isPropertyAssignment(p) ||

package/src/migrations/update-20-8-0/replace-experimental-just-in-time-compile.js

@@ -35,7 +35,7 @@ async function updateCtJustInTimeCompile(tree, cypressConfigPath) {
     }
     ts ??= (0, ensure_typescript_1.ensureTypescript)();
     printer ??= ts.createPrinter();
-    const sourceFile = tsquery_1.tsquery.ast(cypressConfig);
+    const sourceFile = (0, tsquery_1.ast)(cypressConfig);
     let updatedConfig = config;
     const bundler = await resolveBundler(updatedConfig, cypressConfigPath);
     const isViteBundler = bundler === 'vite';
@@ -77,7 +77,7 @@ async function updateCtJustInTimeCompile(tree, cypressConfigPath) {
     return cypressConfig.replace(config.getText(), printer.printNode(ts.EmitHint.Unspecified, updatedConfig, sourceFile));
 }
 async function resolveBundler(config, cypressConfigPath) {
-    const bundlerProperty = tsquery_1.tsquery.query(config, 'PropertyAssignment:has(Identifier[name=component]) PropertyAssignment:has(Identifier[name=devServer]) PropertyAssignment:has(Identifier[name=bundler])')[0];
+    const bundlerProperty = (0, tsquery_1.query)(config, 'PropertyAssignment:has(Identifier[name=component]) PropertyAssignment:has(Identifier[name=devServer]) PropertyAssignment:has(Identifier[name=bundler])')[0];
     if (bundlerProperty) {
         return ts.isStringLiteral(bundlerProperty.initializer)
             ? bundlerProperty.initializer.getText().replace(/['"`]/g, '')

package/src/migrations/update-20-8-0/set-inject-document-domain.js

@@ -30,7 +30,7 @@ function setInjectDocumentDomain(cypressConfig) {
         // couldn't find the config object, leave as is
         return cypressConfig;
     }
-    const sourceFile = tsquery_1.tsquery.ast(cypressConfig);
+    const sourceFile = (0, tsquery_1.ast)(cypressConfig);
     let e2eProperty = (0, migrations_1.getObjectProperty)(config, 'e2e');
     let hasOtherTopLevelProperties = config.properties.some((p) => ts.isPropertyAssignment(p) &&
         p.name.getText() !== 'e2e' &&

package/src/migrations/update-20-8-0/update-component-testing-mount-imports.js

@@ -67,7 +67,7 @@ function parseMigrationInfo(tree, cypressConfigPath, projectName, projectGraph)
     return null;
 }
 function resolveFramework(cypressConfig, config, projectName, projectGraph) {
-    const frameworkProperty = tsquery_1.tsquery.query(config, 'PropertyAssignment:has(Identifier[name=component]) PropertyAssignment:has(Identifier[name=devServer]) PropertyAssignment:has(Identifier[name=framework])')[0];
+    const frameworkProperty = (0, tsquery_1.query)(config, 'PropertyAssignment:has(Identifier[name=component]) PropertyAssignment:has(Identifier[name=devServer]) PropertyAssignment:has(Identifier[name=framework])')[0];
     if (frameworkProperty) {
         return ts.isStringLiteral(frameworkProperty.initializer)
             ? frameworkProperty.initializer.getText().replace(/['"`]/g, '')
@@ -75,7 +75,7 @@ function resolveFramework(cypressConfig, config, projectName, projectGraph) {
     }
     // component might be assigned to an Nx preset function call, so we try to
     // infer the framework from the Nx preset import
-    const sourceFile = tsquery_1.tsquery.ast(cypressConfig);
+    const sourceFile = (0, tsquery_1.ast)(cypressConfig);
     const nxPresetModuleSpecifiers = [
         '@nx/angular/plugins/component-testing',
         '@nx/react/plugins/component-testing',
@@ -111,7 +111,7 @@ function migrateAngularFramework(tree, projectConfig, isLegacyVersion) {
         let updatedFileContent;
         if (isLegacyVersion) {
             let needPackage = false;
-            updatedFileContent = tsquery_1.tsquery.replace(content, 'ImportDeclaration', importTransformerFactory(content, 'cypress/angular', '@cypress/angular', () => {
+            updatedFileContent = (0, tsquery_1.replace)(content, 'ImportDeclaration', importTransformerFactory(content, 'cypress/angular', '@cypress/angular', () => {
                 needPackage = true;
             }));
             if (needPackage) {
@@ -119,7 +119,7 @@ function migrateAngularFramework(tree, projectConfig, isLegacyVersion) {
             }
         }
         else {
-            updatedFileContent = tsquery_1.tsquery.replace(content, 'ImportDeclaration', importTransformerFactory(content, 'cypress/angular-signals', 'cypress/angular'));
+            updatedFileContent = (0, tsquery_1.replace)(content, 'ImportDeclaration', importTransformerFactory(content, 'cypress/angular-signals', 'cypress/angular'));
         }
         tree.write(filePath, updatedFileContent);
     });
@@ -131,7 +131,7 @@ function migrateReactFramework(tree, projectConfig) {
             return;
         }
         const content = tree.read(filePath, 'utf-8');
-        const updatedContent = tsquery_1.tsquery.replace(content, 'ImportDeclaration', importTransformerFactory(content, 'cypress/react18', 'cypress/react'));
+        const updatedContent = (0, tsquery_1.replace)(content, 'ImportDeclaration', importTransformerFactory(content, 'cypress/react18', 'cypress/react'));
         tree.write(filePath, updatedContent);
     });
 }
@@ -141,7 +141,7 @@ function importTransformerFactory(fileContent, sourceModuleSpecifier, targetModu
             sourceModuleSpecifier) {
             matchImportCallback?.();
             const updatedImport = ts.factory.updateImportDeclaration(node, node.modifiers, node.importClause, ts.factory.createStringLiteral(targetModuleSpecifier), node.attributes);
-            return printer.printNode(ts.EmitHint.Unspecified, updatedImport, tsquery_1.tsquery.ast(fileContent));
+            return printer.printNode(ts.EmitHint.Unspecified, updatedImport, (0, tsquery_1.ast)(fileContent));
         }
         return node.getText();
     };

package/src/migrations/update-22-1-0/rename-cy-exec-code-property.js

@@ -29,9 +29,9 @@ function updateCyExecItsCalls(fileContent) {
         return fileContent;
     }
     ts ??= (0, ensure_typescript_1.ensureTypescript)();
-    const sourceFile = tsquery_1.tsquery.ast(fileContent);
+    const sourceFile = (0, tsquery_1.ast)(fileContent);
     const updates = [];
-    const callExpressions = tsquery_1.tsquery.query(sourceFile, 'CallExpression:has(PropertyAccessExpression > Identifier[name="its"])');
+    const callExpressions = (0, tsquery_1.query)(sourceFile, 'CallExpression:has(PropertyAccessExpression > Identifier[name="its"])');
     for (const callExpression of callExpressions) {
         if (!shouldUpdateCallExpression(callExpression)) {
             continue;

package/src/migrations/update-22-1-0/update-angular-component-testing-support.js

@@ -61,8 +61,8 @@ function migrateProject(tree, projectConfig) {
             return;
         }
         const originalContent = tree.read(filePath, 'utf-8');
-        const sourceFile = tsquery_1.tsquery.ast(originalContent);
-        const updatedContent = tsquery_1.tsquery.replace(originalContent, 'ImportDeclaration', (node) => {
+        const sourceFile = (0, tsquery_1.ast)(originalContent);
+        const updatedContent = (0, tsquery_1.replace)(originalContent, 'ImportDeclaration', (node) => {
             if (!ts.isStringLiteral(node.moduleSpecifier) ||
                 node.moduleSpecifier.text !== 'cypress/angular') {
                 return node.getText();
@@ -77,20 +77,20 @@ function migrateProject(tree, projectConfig) {
 }
 function resolveFramework(cypressConfig, config, projectName, projectGraph) {
     ts ??= (0, ensure_typescript_1.ensureTypescript)();
-    const frameworkProperty = tsquery_1.tsquery.query(config, 'PropertyAssignment:has(Identifier[name=component]) PropertyAssignment:has(Identifier[name=devServer]) PropertyAssignment:has(Identifier[name=framework])')[0];
+    const frameworkProperty = (0, tsquery_1.query)(config, 'PropertyAssignment:has(Identifier[name=component]) PropertyAssignment:has(Identifier[name=devServer]) PropertyAssignment:has(Identifier[name=framework])')[0];
     if (frameworkProperty) {
         return ts.isStringLiteral(frameworkProperty.initializer)
             ? frameworkProperty.initializer.text
             : null;
     }
-    const sourceFile = tsquery_1.tsquery.ast(cypressConfig);
+    const sourceFile = (0, tsquery_1.ast)(cypressConfig);
     const nxPresetModuleSpecifiers = [
         '@nx/angular/plugins/component-testing',
         '@nx/react/plugins/component-testing',
         '@nx/next/plugins/component-testing',
         '@nx/remix/plugins/component-testing',
     ];
-    const imports = tsquery_1.tsquery.query(sourceFile, 'ImportDeclaration');
+    const imports = (0, tsquery_1.query)(sourceFile, 'ImportDeclaration');
     const nxPresetImport = imports.find((decl) => {
         const moduleSpec = decl.moduleSpecifier.getText().replace(/['"`]/g, '');
         return nxPresetModuleSpecifiers.includes(moduleSpec);

package/src/migrations/update-22-1-0/update-selector-playground-api.js

@@ -33,9 +33,9 @@ function migrateSelectorPlaygroundApi(fileContent) {
     }
     ts ??= (0, ensure_typescript_1.ensureTypescript)();
     printer ??= ts.createPrinter();
-    const sourceFile = tsquery_1.tsquery.ast(updated);
+    const sourceFile = (0, tsquery_1.ast)(updated);
     let hasChanges = false;
-    const result = tsquery_1.tsquery.replace(updated, 'CallExpression:has(Identifier[name="defaults"])', (node) => {
+    const result = (0, tsquery_1.replace)(updated, 'CallExpression:has(Identifier[name="defaults"])', (node) => {
         if (!ts.isPropertyAccessExpression(node.expression)) {
             return node.getText();
         }