fix(schematics): address review feedback on the prerelease pin

- warn (instead of silently skipping) when the installed version can't be determined
- pin the @angular/fire entry whether it sits in dependencies or devDependencies
- resolve the installed version from a build-written placeholder rather than a
  runtime readFileSync/__dirname traversal; the build fails if the placeholder
  is not substituted, so a broken pin can't ship silently

Author: armando-navarro

src/schematics/common.jasmine.ts

@@ -5,20 +5,22 @@ import 'jasmine';
 
 const context = { logger: new logging.Logger('test') } as unknown as SchematicContext;
 
-const treeWithAngularFire = (declaredVersion: string) => {
+const treeWithAngularFire = (declaredVersion: string, section = 'dependencies') => {
   const tree = new HostTree();
   tree.create('package.json', JSON.stringify({
     name: 'test-app',
-    dependencies: {
+    [section]: {
       '@angular/fire': declaredVersion,
       firebase: '^12.4.0',
     },
   }, null, 2));
   return tree;
 };
 
-const dependenciesIn = (tree: HostTree) =>
-  JSON.parse(tree.readText('package.json')).dependencies;
+const sectionIn = (tree: HostTree, section: string) =>
+  JSON.parse(tree.readText('package.json'))[section];
+
+const dependenciesIn = (tree: HostTree) => sectionIn(tree, 'dependencies');
 
 describe('pinInstalledPrereleaseVersion', () => {
 
@@ -64,12 +66,24 @@ describe('pinInstalledPrereleaseVersion', () => {
     expect(dependenciesIn(tree)['@angular/fire']).toBe('^21.0.0-rc.0');
   });
 
-  it('does not pin when the installed version is not valid semver', () => {
+  it('warns and does not pin when the installed version is not valid semver', () => {
+    const warnSpy = spyOn(context.logger, 'warn');
     const tree = treeWithAngularFire('^21.0.0-rc.0');
     pinInstalledPrereleaseVersion(tree, context, 'ANGULARFIRE2_VERSION');
+    expect(warnSpy).toHaveBeenCalled();
     expect(dependenciesIn(tree)['@angular/fire']).toBe('^21.0.0-rc.0');
   });
 
+  it('does nothing when the @angular/fire entry is not a string', () => {
+    const tree = new HostTree();
+    tree.create('package.json', JSON.stringify({
+      name: 'test-app',
+      dependencies: { '@angular/fire': { version: '^21.0.0-rc.0' } },
+    }));
+    expect(() => pinInstalledPrereleaseVersion(tree, context, '21.0.0-rc.0')).not.toThrow();
+    expect(dependenciesIn(tree)['@angular/fire']).toEqual({ version: '^21.0.0-rc.0' });
+  });
+
   it('does nothing when @angular/fire is not a dependency', () => {
     const tree = new HostTree();
     tree.create('package.json', JSON.stringify({ name: 'test-app', dependencies: {} }));
@@ -82,10 +96,22 @@ describe('pinInstalledPrereleaseVersion', () => {
     expect(() => pinInstalledPrereleaseVersion(tree, context, '21.0.0-rc.0')).not.toThrow();
   });
 
-  it('skips gracefully when the installed version cannot be determined', () => {
-    const tree = treeWithAngularFire('^21.0.0-rc.0');
-    pinInstalledPrereleaseVersion(tree, context, undefined);
-    expect(dependenciesIn(tree)['@angular/fire']).toBe('^21.0.0-rc.0');
+  it('pins a prerelease range found in devDependencies', () => {
+    const tree = treeWithAngularFire('^21.0.0-rc.0', 'devDependencies');
+    pinInstalledPrereleaseVersion(tree, context, '21.0.0-rc.0');
+    expect(sectionIn(tree, 'devDependencies')['@angular/fire']).toBe('21.0.0-rc.0');
+  });
+
+  it('pins the dependencies entry when @angular/fire appears in both sections', () => {
+    const tree = new HostTree();
+    tree.create('package.json', JSON.stringify({
+      name: 'test-app',
+      dependencies: { '@angular/fire': '^21.0.0-rc.0' },
+      devDependencies: { '@angular/fire': '^21.0.0-rc.0' },
+    }, null, 2));
+    pinInstalledPrereleaseVersion(tree, context, '21.0.0-rc.0');
+    expect(dependenciesIn(tree)['@angular/fire']).toBe('21.0.0-rc.0');
+    expect(sectionIn(tree, 'devDependencies')['@angular/fire']).toBe('^21.0.0-rc.0');
   });
 
 });

src/schematics/common.ts

@@ -1,5 +1,3 @@
-import { readFileSync } from 'fs';
-import { join } from 'path';
 import { SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
 import {
   intersects as semverIntersects,
@@ -73,19 +71,9 @@ export const addDependencies = (
   overwriteIfExists(host, 'package.json', stringifyFormatted(packageJson));
 };
 
-/**
- * Reads the exact version of the installed `@angular/fire` package from its own manifest — the
- * compiled schematics run from `<package root>/schematics/<entry>/`, so the manifest sits two
- * directories up. Returns undefined when that layout doesn't hold (e.g. running from source),
- * so callers skip pinning instead of failing the schematic.
- */
-const readInstalledVersion = () => {
-  try {
-    return JSON.parse(readFileSync(join(__dirname, '..', '..', 'package.json')).toString()).version;
-  } catch {
-    return undefined;
-  }
-};
+// The build writes the published version over this placeholder in the compiled schematics
+// (tools/build.ts, replaceSchematicVersions); running from source leaves the placeholder.
+const angularFireVersion = 'ANGULARFIRE2_VERSION';
 
 /**
  * Pins the workspace's `@angular/fire` entry to the exact installed version when `ng add` wrote a
@@ -96,23 +84,31 @@ const readInstalledVersion = () => {
 export const pinInstalledPrereleaseVersion = (
   host: Tree,
   context: SchematicContext,
-  installedVersion = readInstalledVersion(),
+  installedVersion = angularFireVersion,
 ) => {
   if (!host.exists('package.json')) { return; }
   const packageJson = safeReadJSON('package.json', host);
 
-  const declaredAngularFireVersion = packageJson.dependencies?.['@angular/fire'];
-  if (
-    typeof declaredAngularFireVersion !== 'string' ||
-    !(declaredAngularFireVersion.startsWith('^') || declaredAngularFireVersion.startsWith('~'))
-  ) { return; }
+  const dependencySection = ['dependencies', 'devDependencies'].find(
+    section => typeof packageJson[section]?.['@angular/fire'] === 'string',
+  );
+  if (!dependencySection) { return; }
+
+  const declaredAngularFireVersion = packageJson[dependencySection]['@angular/fire'];
+  if (!(declaredAngularFireVersion.startsWith('^') || declaredAngularFireVersion.startsWith('~'))) { return; }
+
+  if (!semverValid(installedVersion)) {
+    context.logger.warn(
+      'Could not determine the installed @angular/fire version; leaving the declared version range as-is.'
+    );
+    return;
+  }
 
   if (
-    semverValid(installedVersion) &&
     semverPrerelease(installedVersion) &&
     semverSatisfies(installedVersion, declaredAngularFireVersion, { includePrerelease: true })
   ) {
-    packageJson.dependencies['@angular/fire'] = installedVersion;
+    packageJson[dependencySection]['@angular/fire'] = installedVersion;
     overwriteIfExists(host, 'package.json', stringifyFormatted(packageJson));
     context.logger.info(
       `Pinned @angular/fire to the exact version ${installedVersion} — a prerelease range like ` +

tools/build.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'cross-spawn';
 import { copy, writeFile } from 'fs-extra';
-import { join } from 'path';
+import { join, sep } from 'path';
 import { keys as tsKeys } from 'ts-transformer-keys';
 import * as esbuild from "esbuild";
 
@@ -273,6 +273,21 @@ async function replacePackageCoreVersion() {
   });
 }
 
+async function writeVersionOverPlaceholder(root: { version: string }) {
+  const replace = require('replace-in-file');
+  const replacements = await replace({
+    // Glob patterns need forward slashes even on Windows.
+    files: `${dest('schematics').split(sep).join('/')}/**/*.js`,
+    from: /ANGULARFIRE2_VERSION/g,
+    to: root.version,
+    // Zero matches should reach the guard below, not replace-in-file's generic rejection.
+    allowEmptyPaths: true,
+  });
+  if (!replacements.some(replacement => replacement.hasChanged)) {
+    throw new Error('No ANGULARFIRE2_VERSION placeholder found in the compiled schematics — the version pin would ship disabled.');
+  }
+}
+
 async function replaceSchematicVersions() {
   const root = await rootPackage;
   const packagesPath = dest('schematics', 'versions.json');
@@ -283,6 +298,7 @@ async function replaceSchematicVersions() {
   Object.keys(dependencies.firebaseFunctionsDependencies).forEach(name => {
     dependencies.firebaseFunctionsDependencies[name].version = root.dependencies[name] || root.devDependencies[name];
   });
+  await writeVersionOverPlaceholder(root);
   return writeFile(packagesPath, JSON.stringify(dependencies, null, 2));
 }