@codeyam/codeyam-cli 0.1.0-staging.1 → 0.1.0-staging.8aea589

package/analyzer-template/packages/analyze/src/lib/asts/sourceFiles/getAllDeclaredEntityNodes.ts

@@ -0,0 +1,238 @@
+import ts from 'typescript';
+
+interface GetAllDeclaredEntityNodesArgs {
+  sourceFile: ts.SourceFile;
+  possibleIdentifierNode?: ts.Node;
+  entityNode?: ts.Node;
+  entities?: { [key: string]: ts.Node };
+}
+
+/**
+ * Returns all declared entity nodes in a source file.
+ *
+ * Unlike getAllEntityNodes, this function only returns actual declarations
+ * (variables, functions, classes, interfaces, types, enums, exports).
+ * It does NOT include identifier references in initializers or call expressions.
+ *
+ * Use this when you need to find entities that can be replaced/mocked.
+ * Use getAllEntityNodes when you need to track all identifiers (e.g., for dependency analysis).
+ */
+export function getAllDeclaredEntityNodes({
+  sourceFile,
+  possibleIdentifierNode,
+  entityNode,
+  entities = {},
+}: GetAllDeclaredEntityNodesArgs): { [key: string]: ts.Node } {
+  try {
+    if (!possibleIdentifierNode) {
+      possibleIdentifierNode = sourceFile;
+    }
+
+    // Handle direct Identifier (e.g., from declaration.name)
+    if (ts.isIdentifier(possibleIdentifierNode)) {
+      if (!entities[possibleIdentifierNode.text]) {
+        entities[possibleIdentifierNode.text] =
+          entityNode ?? possibleIdentifierNode;
+      }
+      return entities;
+    }
+
+    if (ts.isBindingElement(possibleIdentifierNode)) {
+      const lastChild = possibleIdentifierNode.getChildAt(
+        possibleIdentifierNode.getChildCount(sourceFile) - 1,
+      );
+
+      if (ts.isIdentifier(lastChild)) {
+        entities[lastChild.text] = entityNode;
+      } else if (
+        ts.isObjectBindingPattern(lastChild) ||
+        ts.isArrayBindingPattern(lastChild)
+      ) {
+        entities = {
+          ...entities,
+          ...getAllDeclaredEntityNodes({
+            sourceFile,
+            possibleIdentifierNode: lastChild,
+            entityNode,
+            entities,
+          }),
+        };
+      }
+      return entities;
+    }
+
+    possibleIdentifierNode.forEachChild((child) => {
+      try {
+        const safeEntityNode = entityNode ?? child;
+
+        // For VariableDeclaration, only traverse the name (not the initializer)
+        // This prevents registering identifier references as declarations
+        if (ts.isVariableDeclaration(child)) {
+          entities = {
+            ...getAllDeclaredEntityNodes({
+              sourceFile,
+              possibleIdentifierNode: child.name,
+              entityNode: safeEntityNode,
+              entities,
+            }),
+            ...entities,
+          };
+        } else if (
+          ts.isBindingElement(child) ||
+          ts.isModuleDeclaration(child) ||
+          ts.isNamedExports(child)
+        ) {
+          entities = {
+            ...getAllDeclaredEntityNodes({
+              sourceFile,
+              possibleIdentifierNode: child,
+              entityNode: safeEntityNode,
+              entities,
+            }),
+            ...entities,
+          };
+        }
+
+        if (ts.isVariableDeclarationList(child)) {
+          child.declarations.forEach((declaration) => {
+            entities = {
+              ...getAllDeclaredEntityNodes({
+                sourceFile,
+                possibleIdentifierNode: declaration.name,
+                entityNode: safeEntityNode,
+                entities,
+              }),
+              ...entities,
+            };
+          });
+        }
+
+        if (ts.isVariableStatement(child)) {
+          entities = {
+            ...getAllDeclaredEntityNodes({
+              sourceFile,
+              possibleIdentifierNode: child.declarationList,
+              entityNode: safeEntityNode,
+              entities,
+            }),
+            ...entities,
+          };
+        }
+
+        if (ts.isObjectBindingPattern(child)) {
+          const entityNodes = child.elements.reduce((acc, element) => {
+            return {
+              ...getAllDeclaredEntityNodes({
+                sourceFile,
+                possibleIdentifierNode: element,
+                entityNode: safeEntityNode,
+                entities,
+              }),
+              ...acc,
+            };
+          }, {});
+
+          for (const key in entityNodes) {
+            entities[key] = safeEntityNode;
+          }
+        }
+
+        if (ts.isArrayBindingPattern(child)) {
+          entities = {
+            ...entities,
+            ...child.elements.reduce((acc, element) => {
+              return {
+                ...getAllDeclaredEntityNodes({
+                  sourceFile,
+                  possibleIdentifierNode: element,
+                  entityNode: safeEntityNode,
+                  entities,
+                }),
+                ...acc,
+              };
+            }, {}),
+          };
+        }
+
+        if (
+          ts.isFunctionDeclaration(child) ||
+          ts.isTypeAliasDeclaration(child) ||
+          ts.isInterfaceDeclaration(child) ||
+          ts.isClassDeclaration(child) ||
+          ts.isEnumDeclaration(child)
+        ) {
+          if (!entities[child.name?.text ?? 'default']) {
+            entities[child.name?.text ?? 'default'] = safeEntityNode;
+
+            if (ts.isFunctionDeclaration(child) && child.modifiers) {
+              const isDefaultExport =
+                child.modifiers.some(
+                  (modifier) => modifier.kind === ts.SyntaxKind.DefaultKeyword,
+                ) &&
+                child.modifiers.some(
+                  (modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword,
+                );
+
+              if (isDefaultExport) {
+                entities['default'] = safeEntityNode;
+              }
+            }
+          }
+        }
+
+        if (ts.isExportDeclaration(child)) {
+          if (child.exportClause) {
+            entities = {
+              ...getAllDeclaredEntityNodes({
+                sourceFile,
+                possibleIdentifierNode: child.exportClause,
+                entityNode: safeEntityNode,
+                entities,
+              }),
+              ...entities,
+            };
+          }
+        }
+
+        if (ts.isExportAssignment(child)) {
+          // For declared entities, always point to the export statement itself
+          // (not the original declaration) so mock replacement works correctly.
+          // e.g., for `export default prisma;`, we want to replace the export
+          // statement, not the prisma variable declaration.
+          entities['default'] = safeEntityNode;
+        }
+
+        if (ts.isExportSpecifier(child)) {
+          const nameText = child.name.getText(sourceFile);
+          if (child.propertyName) {
+            const propertyNameText = child.propertyName.getText(sourceFile);
+            entities[nameText] = entities[propertyNameText] ?? safeEntityNode;
+            if (propertyNameText !== 'default' && !entities[propertyNameText]) {
+              entities[propertyNameText] = safeEntityNode;
+            }
+          } else {
+            entities[nameText] = entities[nameText] ?? safeEntityNode;
+          }
+        }
+      } catch (e) {
+        console.log(
+          'CodeYam Error: Error Getting All Declared Entity Nodes Child',
+          ts.SyntaxKind[child.kind],
+          child.getText(sourceFile),
+          e,
+        );
+        throw e;
+      }
+    });
+
+    return entities;
+  } catch (e) {
+    console.log(
+      'CodeYam Error: Error Getting All Declared Entity Nodes',
+      ts.SyntaxKind[possibleIdentifierNode.kind],
+      possibleIdentifierNode.getText(sourceFile),
+      e,
+    );
+    throw e;
+  }
+}

package/analyzer-template/packages/analyze/src/lib/asts/sourceFiles/getDeclaredEntityNode.ts

@@ -0,0 +1,25 @@
+import ts from 'typescript';
+import * as lib from '../../index';
+
+/**
+ * Get the AST node for a declared entity by name.
+ * Unlike getEntityNode, this only finds actual declarations (not identifier references).
+ */
+export function getDeclaredEntityNode({
+  entityName,
+  sourceFile,
+}: {
+  entityName: string;
+  sourceFile: ts.SourceFile;
+}) {
+  const entityNodes = lib.asts.sourceFiles.getAllDeclaredEntityNodes({
+    sourceFile,
+  });
+  const entityNode = entityNodes[entityName];
+
+  if (!entityNode) {
+    throw new Error('getDeclaredEntityNode: Entity not found');
+  }
+
+  return entityNode;
+}

package/analyzer-template/packages/analyze/src/lib/asts/sourceFiles/index.ts

@@ -11,7 +11,9 @@ export { getSourceFilesForAllImports } from './getSourceFilesForAllImports';
 export { getImportMappings } from './getImportMappings';
 export { getAllEntities } from './getAllEntities';
 export { getAllEntityNodes } from './getAllEntityNodes';
+export { getAllDeclaredEntityNodes } from './getAllDeclaredEntityNodes';
 export { getEntityNode } from './getEntityNode';
+export { getDeclaredEntityNode } from './getDeclaredEntityNode';
 export { getAllExports } from './getAllExports';
 export { getAllExportedNodes } from './getAllExportedNodes';
 export { getImportsAnalysis } from './getImportsAnalysis';

package/analyzer-template/packages/github/dist/utils/src/lib/frameworks/getNextRoutePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getNextRoutePath.d.ts","sourceRoot":"","sources":["../../../../../../utils/src/lib/frameworks/getNextRoutePath.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,IAAI,EACJ,OAAO,EACP,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAGxB,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,QAAQ,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7B,UAuBA"}
+{"version":3,"file":"getNextRoutePath.d.ts","sourceRoot":"","sources":["../../../../../../utils/src/lib/frameworks/getNextRoutePath.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,IAAI,EACJ,OAAO,EACP,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAGxB,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,QAAQ,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7B,UA2BA"}

package/analyzer-template/packages/github/dist/utils/src/lib/frameworks/getNextRoutePath.js

@@ -1,11 +1,12 @@
-import { safeFileName } from '~codeyam/utils';
+import { getAppDirectoryForFile, safeFileName } from '~codeyam/utils';
 import { PROJECT_RELATIVE_PATH } from '~codeyam/utils';
 export default function getNextRoutePath({ file, entity, rootAnalysis, project, framework, scenario, }) {
     const routePath = file.path.split('/').slice(1);
     const scenarioSlug = scenario ? safeFileName(scenario.name) : undefined;
+    const appDirectory = getAppDirectoryForFile(file.path, project.metadata?.webapps);
     const pathComponents = [
         PROJECT_RELATIVE_PATH,
-        'app',
+        appDirectory,
         'static',
         project.slug,
         rootAnalysis.id,

package/analyzer-template/packages/github/dist/utils/src/lib/frameworks/getNextRoutePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNextRoutePath.js","sourceRoot":"","sources":["../../../../../../utils/src/lib/frameworks/getNextRoutePath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,QAAQ,GAST;IACC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,MAAM,cAAc,GAAG;QACrB,qBAAqB;QACrB,KAAK;QACL,QAAQ;QACR,OAAO,CAAC,IAAI;QACZ,YAAY,CAAC,EAAE;QACf,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;QACrC,YAAY;QACZ,GAAG,SAAS;KACb,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClB,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,CAAC,GAAG,CACT,iCAAiC,EACjC,IAAI,CAAC,IAAI,EACT,MAAM,CAAC,IAAI,EACX,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"getNextRoutePath.js","sourceRoot":"","sources":["../../../../../../utils/src/lib/frameworks/getNextRoutePath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,QAAQ,GAST;IACC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,MAAM,YAAY,GAAG,sBAAsB,CACzC,IAAI,CAAC,IAAI,EACT,OAAO,CAAC,QAAQ,EAAE,OAAO,CAC1B,CAAC;IACF,MAAM,cAAc,GAAG;QACrB,qBAAqB;QACrB,YAAY;QACZ,QAAQ;QACR,OAAO,CAAC,IAAI;QACZ,YAAY,CAAC,EAAE;QACf,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;QACrC,YAAY;QACZ,GAAG,SAAS;KACb,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClB,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,CAAC,GAAG,CACT,iCAAiC,EACjC,IAAI,CAAC,IAAI,EACT,MAAM,CAAC,IAAI,EACX,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/analyzer-template/packages/utils/dist/utils/src/lib/frameworks/getNextRoutePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getNextRoutePath.d.ts","sourceRoot":"","sources":["../../../../../src/lib/frameworks/getNextRoutePath.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,IAAI,EACJ,OAAO,EACP,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAGxB,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,QAAQ,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7B,UAuBA"}
+{"version":3,"file":"getNextRoutePath.d.ts","sourceRoot":"","sources":["../../../../../src/lib/frameworks/getNextRoutePath.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,cAAc,EACd,IAAI,EACJ,OAAO,EACP,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAGxB,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,QAAQ,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7B,UA2BA"}

package/analyzer-template/packages/utils/dist/utils/src/lib/frameworks/getNextRoutePath.js

@@ -1,11 +1,12 @@
-import { safeFileName } from '~codeyam/utils';
+import { getAppDirectoryForFile, safeFileName } from '~codeyam/utils';
 import { PROJECT_RELATIVE_PATH } from '~codeyam/utils';
 export default function getNextRoutePath({ file, entity, rootAnalysis, project, framework, scenario, }) {
     const routePath = file.path.split('/').slice(1);
     const scenarioSlug = scenario ? safeFileName(scenario.name) : undefined;
+    const appDirectory = getAppDirectoryForFile(file.path, project.metadata?.webapps);
     const pathComponents = [
         PROJECT_RELATIVE_PATH,
-        'app',
+        appDirectory,
         'static',
         project.slug,
         rootAnalysis.id,

package/analyzer-template/packages/utils/dist/utils/src/lib/frameworks/getNextRoutePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNextRoutePath.js","sourceRoot":"","sources":["../../../../../src/lib/frameworks/getNextRoutePath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,QAAQ,GAST;IACC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,MAAM,cAAc,GAAG;QACrB,qBAAqB;QACrB,KAAK;QACL,QAAQ;QACR,OAAO,CAAC,IAAI;QACZ,YAAY,CAAC,EAAE;QACf,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;QACrC,YAAY;QACZ,GAAG,SAAS;KACb,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClB,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,CAAC,GAAG,CACT,iCAAiC,EACjC,IAAI,CAAC,IAAI,EACT,MAAM,CAAC,IAAI,EACX,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"getNextRoutePath.js","sourceRoot":"","sources":["../../../../../src/lib/frameworks/getNextRoutePath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,QAAQ,GAST;IACC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,MAAM,YAAY,GAAG,sBAAsB,CACzC,IAAI,CAAC,IAAI,EACT,OAAO,CAAC,QAAQ,EAAE,OAAO,CAC1B,CAAC;IACF,MAAM,cAAc,GAAG;QACrB,qBAAqB;QACrB,YAAY;QACZ,QAAQ;QACR,OAAO,CAAC,IAAI;QACZ,YAAY,CAAC,EAAE;QACf,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;QACrC,YAAY;QACZ,GAAG,SAAS;KACb,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClB,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,CAAC,GAAG,CACT,iCAAiC,EACjC,IAAI,CAAC,IAAI,EACT,MAAM,CAAC,IAAI,EACX,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/analyzer-template/packages/utils/src/lib/frameworks/getNextRoutePath.ts

@@ -1,4 +1,4 @@
-import { safeFileName } from '~codeyam/utils';
+import { getAppDirectoryForFile, safeFileName } from '~codeyam/utils';
 import {
   Analysis,
   ReadonlyEntity,
@@ -26,9 +26,13 @@ export default function getNextRoutePath({
 }) {
   const routePath = file.path.split('/').slice(1);
   const scenarioSlug = scenario ? safeFileName(scenario.name) : undefined;
+  const appDirectory = getAppDirectoryForFile(
+    file.path,
+    project.metadata?.webapps,
+  );
   const pathComponents = [
     PROJECT_RELATIVE_PATH,
-    'app',
+    appDirectory,
     'static',
     project.slug,
     rootAnalysis.id,

package/analyzer-template/project/writeUniversalMocks.ts

@@ -60,8 +60,12 @@ export default async function writeUniversalMocks({
           universalMock.filePath,
         );
         const fileAnalyzer = projectAnalyzer.getFileAnalyzer(file);
-        if (fileAnalyzer.getAllEntityNodes()[universalMock.entityName]) {
-          const entityCode = fileAnalyzer.getEntityCode(
+
+        // Use getAllDeclaredEntityNodes to avoid incorrectly matching identifier references
+        if (
+          fileAnalyzer.getAllDeclaredEntityNodes()[universalMock.entityName]
+        ) {
+          const entityCode = fileAnalyzer.getDeclaredEntityCode(
             universalMock.entityName,
           );
           mockContent = file.content.replace(entityCode, universalMock.content);

package/background/src/lib/virtualized/project/writeUniversalMocks.js

@@ -24,8 +24,9 @@ export default async function writeUniversalMocks({ analysis, projectAnalyzer, f
                 mockContent = file.content;
                 mockPath = path.join(rootPath ?? PROJECT_RELATIVE_PATH, universalMock.filePath);
                 const fileAnalyzer = projectAnalyzer.getFileAnalyzer(file);
-                if (fileAnalyzer.getAllEntityNodes()[universalMock.entityName]) {
-                    const entityCode = fileAnalyzer.getEntityCode(universalMock.entityName);
+                // Use getAllDeclaredEntityNodes to avoid incorrectly matching identifier references
+                if (fileAnalyzer.getAllDeclaredEntityNodes()[universalMock.entityName]) {
+                    const entityCode = fileAnalyzer.getDeclaredEntityCode(universalMock.entityName);
                     mockContent = file.content.replace(entityCode, universalMock.content);
                 }
             }

package/background/src/lib/virtualized/project/writeUniversalMocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeUniversalMocks.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/writeUniversalMocks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"writeUniversalMocks.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/writeUniversalMocks.ts"],"names":[],"mappings":"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"}