ng-packagr 14.0.2 → 14.0.3

package/lib/ngc/ngcc-processor.d.ts

@@ -15,7 +15,7 @@ export declare class NgccProcessor {
     constructor(compilerNgcc: typeof import('@angular/compiler-cli/ngcc'), ngccProcessingCache: NgccProcessingCache, projectPath: string, compilerOptions: ts.CompilerOptions, entryPoints: EntryPointNode[]);
     /** Process the entire node modules tree. */
     process(): Promise<void>;
-    /** Process a module and it's depedencies. */
+    /** Process a module and its dependencies. */
     processModule(moduleName: string, resolvedModule: ts.ResolvedModule | ts.ResolvedTypeReferenceDirective): void;
     /**
      * Try resolve a package.json file from the resolved .d.ts file.

package/lib/ngc/ngcc-processor.js

@@ -48,8 +48,10 @@ class NgccProcessor {
     }
     /** Process the entire node modules tree. */
     async process() {
-        // Under Bazel when running in sandbox mode parts of the filesystem is read-only.
-        if (process.env.BAZEL_TARGET) {
+        // Under Bazel when running in sandbox mode parts of the filesystem is read-only, or when using
+        // Yarn PnP there may not be a node_modules directory. ngcc can't run in those cases, so the
+        // processing is skipped.
+        if (process.env.BAZEL_TARGET || !this._nodeModulesDirectory) {
             return;
         }
         // Only allow running this during the first run.
@@ -140,14 +142,16 @@ class NgccProcessor {
             }
         }
     }
-    /** Process a module and it's depedencies. */
+    /** Process a module and its dependencies. */
     processModule(moduleName, resolvedModule) {
         const resolvedFileName = resolvedModule.resolvedFileName;
-        if (!resolvedFileName ||
+        if (!this._nodeModulesDirectory ||
+            !resolvedFileName ||
             moduleName.startsWith('.') ||
             this.ngccProcessingCache.hasProcessed(moduleName) ||
             this._entryPointsUrl.includes((0, nodes_1.ngUrl)(moduleName))) {
-            // Skip when module is unknown, relative, an entrypoint or already processed.
+            // Skip when module_modules directory is not present, module is unknown, relative, an
+            // entrypoint or already processed.
             return;
         }
         const packageJsonPath = this.tryResolvePackage(moduleName, resolvedFileName);
@@ -201,7 +205,7 @@ class NgccProcessor {
             }
             current = path.dirname(current);
         }
-        throw new Error(`Cannot locate the 'node_modules' directory.`);
+        return null;
     }
 }
 exports.NgccProcessor = NgccProcessor;

package/lib/ngc/ngcc-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ngcc-processor.js","sourceRoot":"","sources":["../../../src/lib/ngc/ngcc-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Logger } from '@angular/compiler-cli/ngcc';\nimport { spawnSync } from 'child_process';\nimport { createHash } from 'crypto';\nimport { accessSync, constants, existsSync } from 'fs';\nimport * as path from 'path';\nimport ts from 'typescript';\nimport { NgccProcessingCache } from '../ng-package/ngcc-cache';\nimport { EntryPointNode, ngUrl } from '../ng-package/nodes';\nimport { defaultTsConfigPath } from '../ts/tsconfig';\nimport { exists, mkdir, readFile, writeFile } from '../utils/fs';\nimport * as log from '../utils/log';\n\n// Transform a package and its typings when NGTSC is resolving a module.\nexport class NgccProcessor {\n  private _logger: NgccLogger;\n  private _nodeModulesDirectory: string;\n  private _entryPointsUrl: string[];\n  private readonly propertiesToConsider = ['es2015', 'browser', 'module', 'main'];\n  private skipProcessing = false;\n\n  constructor(\n    private readonly compilerNgcc: typeof import('@angular/compiler-cli/ngcc'),\n    private readonly ngccProcessingCache: NgccProcessingCache,\n    private readonly projectPath: string,\n    private readonly compilerOptions: ts.CompilerOptions,\n    private readonly entryPoints: EntryPointNode[],\n  ) {\n    this._entryPointsUrl = this.entryPoints.map(({ url }) => ngUrl(url));\n\n    const { baseUrl } = this.compilerOptions;\n    this._nodeModulesDirectory = this.findNodeModulesDirectory(baseUrl);\n  }\n\n  /** Process the entire node modules tree. */\n  async process(): Promise<void> {\n    // Under Bazel when running in sandbox mode parts of the filesystem is read-only.\n    if (process.env.BAZEL_TARGET) {\n      return;\n    }\n\n    // Only allow running this during the first run.\n    if (this.skipProcessing) {\n      return;\n    }\n\n    // Skip if node_modules are read-only\n    const corePackage = this.tryResolvePackage('@angular/core', this._nodeModulesDirectory);\n    if (corePackage && isReadOnlyFile(corePackage)) {\n      return;\n    }\n\n    // Perform a ngcc run check to determine if an initial execution is required.\n    // If a run hash file exists that matches the current package manager lock file and the\n    // project's tsconfig, then an initial ngcc run has already been performed.\n    let runHashFilePath: string | undefined;\n    const runHashBasePath = path.join(this._nodeModulesDirectory, '.ng-packagr-ngcc');\n    const projectBasePath = path.join(this._nodeModulesDirectory, '..');\n    try {\n      let lockData;\n      let lockFile = 'yarn.lock';\n      try {\n        lockData = await readFile(path.join(projectBasePath, lockFile));\n      } catch {\n        lockFile = 'package-lock.json';\n        lockData = await readFile(path.join(projectBasePath, lockFile));\n      }\n\n      let ngccConfigData;\n      try {\n        ngccConfigData = await readFile(path.join(projectBasePath, 'ngcc.config.js'));\n      } catch {\n        ngccConfigData = '';\n      }\n\n      const relativeTsconfigPath = path.relative(projectBasePath, this.projectPath);\n      const tsconfigData = await readFile(this.projectPath);\n\n      // Generate a hash that represents the state of the package lock file and used tsconfig\n      const runHash = createHash('sha256')\n        .update(lockData)\n        .update(lockFile)\n        .update(ngccConfigData)\n        .update(tsconfigData)\n        .update(relativeTsconfigPath)\n        .digest('hex');\n\n      // The hash is used directly in the file name to mitigate potential read/write race\n      // conditions as well as to only require a file existence check\n      runHashFilePath = path.join(runHashBasePath, runHash + '.lock');\n\n      // If the run hash lock file exists, then ngcc was already run against this project state\n      if (await exists(runHashFilePath)) {\n        this.skipProcessing = true;\n\n        return;\n      }\n    } catch {\n      // Any error means an ngcc execution is needed\n    }\n\n    const { status, error } = spawnSync(\n      process.execPath,\n      [\n        this.compilerNgcc.ngccMainFilePath,\n        '--source' /** basePath */,\n        this._nodeModulesDirectory,\n        '--properties' /** propertiesToConsider */,\n        ...this.propertiesToConsider,\n        '--first-only' /** compileAllFormats */,\n        '--create-ivy-entry-points' /** createNewEntryPointFormats */,\n        '--async',\n        '--tsconfig' /** tsConfigPath */,\n        path.normalize(this.projectPath) === defaultTsConfigPath ? '' : this.projectPath,\n        '--use-program-dependencies',\n        '--typings-only' /** typingsOnly */,\n      ],\n      {\n        stdio: ['inherit', process.stderr, process.stderr],\n      },\n    );\n\n    this.skipProcessing = true;\n\n    if (status !== 0) {\n      const errorMessage = error?.message || '';\n      throw new Error(errorMessage + `NGCC failed${errorMessage ? ', see above' : ''}.`);\n    }\n\n    // ngcc was successful so if a run hash was generated, write it for next time\n    if (runHashFilePath) {\n      try {\n        if (!existsSync(runHashBasePath)) {\n          await mkdir(runHashBasePath, { recursive: true });\n        }\n        await writeFile(runHashFilePath, '');\n      } catch {\n        // Errors are non-fatal\n      }\n    }\n  }\n\n  /** Process a module and it's depedencies. */\n  processModule(moduleName: string, resolvedModule: ts.ResolvedModule | ts.ResolvedTypeReferenceDirective): void {\n    const resolvedFileName = resolvedModule.resolvedFileName;\n    if (\n      !resolvedFileName ||\n      moduleName.startsWith('.') ||\n      this.ngccProcessingCache.hasProcessed(moduleName) ||\n      this._entryPointsUrl.includes(ngUrl(moduleName))\n    ) {\n      // Skip when module is unknown, relative, an entrypoint or already processed.\n      return;\n    }\n\n    const packageJsonPath = this.tryResolvePackage(moduleName, resolvedFileName);\n    if (!packageJsonPath) {\n      // add it to processed so the second time round we skip this.\n      this.ngccProcessingCache.markProcessed(moduleName);\n\n      return;\n    }\n\n    // If the package.json is read only we should skip calling NGCC.\n    // With Bazel when running under sandbox the filesystem is read-only.\n    if (isReadOnlyFile(packageJsonPath)) {\n      // add it to processed so the second time round we skip this.\n      this.ngccProcessingCache.markProcessed(moduleName);\n\n      return;\n    }\n\n    this.compilerNgcc.process({\n      basePath: this._nodeModulesDirectory,\n      targetEntryPointPath: path.dirname(packageJsonPath),\n      compileAllFormats: false,\n      typingsOnly: true,\n      propertiesToConsider: this.propertiesToConsider,\n      createNewEntryPointFormats: true,\n      logger: this._logger,\n      tsConfigPath: this.projectPath === defaultTsConfigPath ? undefined : this.projectPath,\n    });\n\n    this.ngccProcessingCache.markProcessed(moduleName);\n  }\n\n  /**\n   * Try resolve a package.json file from the resolved .d.ts file.\n   */\n  private tryResolvePackage(moduleName: string, resolvedFileName: string): string | undefined {\n    try {\n      return require.resolve(`${moduleName}/package.json`, {\n        paths: [resolvedFileName],\n      });\n    } catch {\n      // if it fails this might be a deep import which doesn't have a package.json\n      // Ex: @angular/compiler/src/i18n/i18n_ast/package.json\n      // or local libraries which don't reside in node_modules\n      const packageJsonPath = path.resolve(resolvedFileName, '../package.json');\n\n      return existsSync(packageJsonPath) ? packageJsonPath : undefined;\n    }\n  }\n\n  private findNodeModulesDirectory(startPoint: string): string {\n    let current = startPoint;\n    while (path.dirname(current) !== current) {\n      const nodePath = path.join(current, 'node_modules');\n      if (existsSync(nodePath)) {\n        return nodePath;\n      }\n\n      current = path.dirname(current);\n    }\n\n    throw new Error(`Cannot locate the 'node_modules' directory.`);\n  }\n}\n\nclass NgccLogger implements Logger {\n  level = /** LogLevel.info**/ 1;\n\n  debug(...args: string[]) {\n    log.debug(args.join(' '));\n  }\n\n  info(...args: string[]) {\n    log.info(args.join(' '));\n  }\n\n  warn(...args: string[]) {\n    log.warn(args.join(' '));\n  }\n\n  error(...args: string[]) {\n    log.error(args.join(' '));\n  }\n}\n\nfunction isReadOnlyFile(fileName: string): boolean {\n  try {\n    accessSync(fileName, constants.W_OK);\n\n    return false;\n  } catch {\n    return true;\n  }\n}\n"]}
+{"version":3,"file":"ngcc-processor.js","sourceRoot":"","sources":["../../../src/lib/ngc/ngcc-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Logger } from '@angular/compiler-cli/ngcc';\nimport { spawnSync } from 'child_process';\nimport { createHash } from 'crypto';\nimport { accessSync, constants, existsSync } from 'fs';\nimport * as path from 'path';\nimport ts from 'typescript';\nimport { NgccProcessingCache } from '../ng-package/ngcc-cache';\nimport { EntryPointNode, ngUrl } from '../ng-package/nodes';\nimport { defaultTsConfigPath } from '../ts/tsconfig';\nimport { exists, mkdir, readFile, writeFile } from '../utils/fs';\nimport * as log from '../utils/log';\n\n// Transform a package and its typings when NGTSC is resolving a module.\nexport class NgccProcessor {\n  private _logger: NgccLogger;\n  private _nodeModulesDirectory: string | null;\n  private _entryPointsUrl: string[];\n  private readonly propertiesToConsider = ['es2015', 'browser', 'module', 'main'];\n  private skipProcessing = false;\n\n  constructor(\n    private readonly compilerNgcc: typeof import('@angular/compiler-cli/ngcc'),\n    private readonly ngccProcessingCache: NgccProcessingCache,\n    private readonly projectPath: string,\n    private readonly compilerOptions: ts.CompilerOptions,\n    private readonly entryPoints: EntryPointNode[],\n  ) {\n    this._entryPointsUrl = this.entryPoints.map(({ url }) => ngUrl(url));\n\n    const { baseUrl } = this.compilerOptions;\n    this._nodeModulesDirectory = this.findNodeModulesDirectory(baseUrl);\n  }\n\n  /** Process the entire node modules tree. */\n  async process(): Promise<void> {\n    // Under Bazel when running in sandbox mode parts of the filesystem is read-only, or when using\n    // Yarn PnP there may not be a node_modules directory. ngcc can't run in those cases, so the\n    // processing is skipped.\n    if (process.env.BAZEL_TARGET || !this._nodeModulesDirectory) {\n      return;\n    }\n\n    // Only allow running this during the first run.\n    if (this.skipProcessing) {\n      return;\n    }\n\n    // Skip if node_modules are read-only\n    const corePackage = this.tryResolvePackage('@angular/core', this._nodeModulesDirectory);\n    if (corePackage && isReadOnlyFile(corePackage)) {\n      return;\n    }\n\n    // Perform a ngcc run check to determine if an initial execution is required.\n    // If a run hash file exists that matches the current package manager lock file and the\n    // project's tsconfig, then an initial ngcc run has already been performed.\n    let runHashFilePath: string | undefined;\n    const runHashBasePath = path.join(this._nodeModulesDirectory, '.ng-packagr-ngcc');\n    const projectBasePath = path.join(this._nodeModulesDirectory, '..');\n    try {\n      let lockData;\n      let lockFile = 'yarn.lock';\n      try {\n        lockData = await readFile(path.join(projectBasePath, lockFile));\n      } catch {\n        lockFile = 'package-lock.json';\n        lockData = await readFile(path.join(projectBasePath, lockFile));\n      }\n\n      let ngccConfigData;\n      try {\n        ngccConfigData = await readFile(path.join(projectBasePath, 'ngcc.config.js'));\n      } catch {\n        ngccConfigData = '';\n      }\n\n      const relativeTsconfigPath = path.relative(projectBasePath, this.projectPath);\n      const tsconfigData = await readFile(this.projectPath);\n\n      // Generate a hash that represents the state of the package lock file and used tsconfig\n      const runHash = createHash('sha256')\n        .update(lockData)\n        .update(lockFile)\n        .update(ngccConfigData)\n        .update(tsconfigData)\n        .update(relativeTsconfigPath)\n        .digest('hex');\n\n      // The hash is used directly in the file name to mitigate potential read/write race\n      // conditions as well as to only require a file existence check\n      runHashFilePath = path.join(runHashBasePath, runHash + '.lock');\n\n      // If the run hash lock file exists, then ngcc was already run against this project state\n      if (await exists(runHashFilePath)) {\n        this.skipProcessing = true;\n\n        return;\n      }\n    } catch {\n      // Any error means an ngcc execution is needed\n    }\n\n    const { status, error } = spawnSync(\n      process.execPath,\n      [\n        this.compilerNgcc.ngccMainFilePath,\n        '--source' /** basePath */,\n        this._nodeModulesDirectory,\n        '--properties' /** propertiesToConsider */,\n        ...this.propertiesToConsider,\n        '--first-only' /** compileAllFormats */,\n        '--create-ivy-entry-points' /** createNewEntryPointFormats */,\n        '--async',\n        '--tsconfig' /** tsConfigPath */,\n        path.normalize(this.projectPath) === defaultTsConfigPath ? '' : this.projectPath,\n        '--use-program-dependencies',\n        '--typings-only' /** typingsOnly */,\n      ],\n      {\n        stdio: ['inherit', process.stderr, process.stderr],\n      },\n    );\n\n    this.skipProcessing = true;\n\n    if (status !== 0) {\n      const errorMessage = error?.message || '';\n      throw new Error(errorMessage + `NGCC failed${errorMessage ? ', see above' : ''}.`);\n    }\n\n    // ngcc was successful so if a run hash was generated, write it for next time\n    if (runHashFilePath) {\n      try {\n        if (!existsSync(runHashBasePath)) {\n          await mkdir(runHashBasePath, { recursive: true });\n        }\n        await writeFile(runHashFilePath, '');\n      } catch {\n        // Errors are non-fatal\n      }\n    }\n  }\n\n  /** Process a module and its dependencies. */\n  processModule(moduleName: string, resolvedModule: ts.ResolvedModule | ts.ResolvedTypeReferenceDirective): void {\n    const resolvedFileName = resolvedModule.resolvedFileName;\n    if (\n      !this._nodeModulesDirectory ||\n      !resolvedFileName ||\n      moduleName.startsWith('.') ||\n      this.ngccProcessingCache.hasProcessed(moduleName) ||\n      this._entryPointsUrl.includes(ngUrl(moduleName))\n    ) {\n      // Skip when module_modules directory is not present, module is unknown, relative, an\n      // entrypoint or already processed.\n      return;\n    }\n\n    const packageJsonPath = this.tryResolvePackage(moduleName, resolvedFileName);\n    if (!packageJsonPath) {\n      // add it to processed so the second time round we skip this.\n      this.ngccProcessingCache.markProcessed(moduleName);\n\n      return;\n    }\n\n    // If the package.json is read only we should skip calling NGCC.\n    // With Bazel when running under sandbox the filesystem is read-only.\n    if (isReadOnlyFile(packageJsonPath)) {\n      // add it to processed so the second time round we skip this.\n      this.ngccProcessingCache.markProcessed(moduleName);\n\n      return;\n    }\n\n    this.compilerNgcc.process({\n      basePath: this._nodeModulesDirectory,\n      targetEntryPointPath: path.dirname(packageJsonPath),\n      compileAllFormats: false,\n      typingsOnly: true,\n      propertiesToConsider: this.propertiesToConsider,\n      createNewEntryPointFormats: true,\n      logger: this._logger,\n      tsConfigPath: this.projectPath === defaultTsConfigPath ? undefined : this.projectPath,\n    });\n\n    this.ngccProcessingCache.markProcessed(moduleName);\n  }\n\n  /**\n   * Try resolve a package.json file from the resolved .d.ts file.\n   */\n  private tryResolvePackage(moduleName: string, resolvedFileName: string): string | undefined {\n    try {\n      return require.resolve(`${moduleName}/package.json`, {\n        paths: [resolvedFileName],\n      });\n    } catch {\n      // if it fails this might be a deep import which doesn't have a package.json\n      // Ex: @angular/compiler/src/i18n/i18n_ast/package.json\n      // or local libraries which don't reside in node_modules\n      const packageJsonPath = path.resolve(resolvedFileName, '../package.json');\n\n      return existsSync(packageJsonPath) ? packageJsonPath : undefined;\n    }\n  }\n\n  private findNodeModulesDirectory(startPoint: string): string | null {\n    let current = startPoint;\n    while (path.dirname(current) !== current) {\n      const nodePath = path.join(current, 'node_modules');\n      if (existsSync(nodePath)) {\n        return nodePath;\n      }\n\n      current = path.dirname(current);\n    }\n\n    return null;\n  }\n}\n\nclass NgccLogger implements Logger {\n  level = /** LogLevel.info**/ 1;\n\n  debug(...args: string[]) {\n    log.debug(args.join(' '));\n  }\n\n  info(...args: string[]) {\n    log.info(args.join(' '));\n  }\n\n  warn(...args: string[]) {\n    log.warn(args.join(' '));\n  }\n\n  error(...args: string[]) {\n    log.error(args.join(' '));\n  }\n}\n\nfunction isReadOnlyFile(fileName: string): boolean {\n  try {\n    accessSync(fileName, constants.W_OK);\n\n    return false;\n  } catch {\n    return true;\n  }\n}\n"]}

package/lib/ts/cache-compiler-host.js

@@ -48,8 +48,9 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
         const node = getNode(fileName);
         entryPoint.dependsOn(node);
     };
-    const { flatModuleFile, entryFile } = entryPoint.data.entryPoint;
+    const { flatModuleFile, destinationPath, entryFile } = entryPoint.data.entryPoint;
     const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;
+    const flatModuleFileDtsPath = (0, path_1.ensureUnixPath)(path.join(destinationPath, flatModuleFileDtsFilename));
     const hasIndexEntryFile = path.basename(entryFile.toLowerCase()) === 'index.ts';
     return {
         ...compilerHost,
@@ -71,14 +72,18 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
         },
         writeFile: (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
             if (fileName.endsWith('.d.ts')) {
-                if (hasIndexEntryFile && path.basename(fileName) === flatModuleFileDtsFilename) {
-                    // In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
-                    // Because it will cause a conflict.
-                    return;
+                if (fileName === flatModuleFileDtsPath) {
+                    if (hasIndexEntryFile) {
+                        // In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
+                        // Because it will cause a conflict.
+                        return;
+                    }
+                    else {
+                        // Rename file to index.d.ts so that TypeScript can resolve types without
+                        // them needing to be referenced in the package.json manifest.
+                        fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
+                    }
                 }
-                // Rename file to index.d.ts so that TypeScript can resolve types without
-                // them needing to be referenced in the package.json manifest.
-                fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
                 sourceFiles.forEach(source => {
                     const cache = sourcesFileCache.getOrCreate(source.fileName);
                     if (!cache.declarationFileName) {

package/lib/ts/cache-compiler-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ts/cache-compiler-host.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CompilerHost, CompilerOptions } from '@angular/compiler-cli';\n\nimport { createHash } from 'crypto';\nimport * as path from 'path';\nimport ts from 'typescript';\nimport { NgPackageConfig } from '../../ng-package.schema';\nimport { FileCache } from '../file-system/file-cache';\nimport { BuildGraph } from '../graph/build-graph';\nimport { Node } from '../graph/node';\nimport { EntryPointNode, fileUrl } from '../ng-package/nodes';\nimport { StylesheetProcessor } from '../styles/stylesheet-processor';\nimport { ensureUnixPath } from '../utils/path';\n\nexport function cacheCompilerHost(\n  graph: BuildGraph,\n  entryPoint: EntryPointNode,\n  compilerOptions: CompilerOptions,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor?: StylesheetProcessor,\n  inlineStyleLanguage?: NgPackageConfig['inlineStyleLanguage'],\n  sourcesFileCache: FileCache = entryPoint.cache.sourcesFileCache,\n): CompilerHost {\n  const compilerHost = ts.createIncrementalCompilerHost(compilerOptions);\n\n  const getNode = (fileName: string) => {\n    const nodeUri = fileUrl(ensureUnixPath(fileName));\n    let node = graph.get(nodeUri);\n\n    if (!node) {\n      node = new Node(nodeUri);\n      graph.put(node);\n    }\n\n    return node;\n  };\n\n  const addDependee = (fileName: string) => {\n    const node = getNode(fileName);\n    entryPoint.dependsOn(node);\n  };\n\n  const { flatModuleFile, entryFile } = entryPoint.data.entryPoint;\n  const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;\n  const hasIndexEntryFile = path.basename(entryFile.toLowerCase()) === 'index.ts';\n\n  return {\n    ...compilerHost,\n\n    // ts specific\n    fileExists: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.exists === undefined) {\n        cache.exists = compilerHost.fileExists.call(this, fileName);\n      }\n\n      return cache.exists;\n    },\n\n    getSourceFile: (fileName: string, languageVersion: ts.ScriptTarget) => {\n      addDependee(fileName);\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (!cache.sourceFile) {\n        cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);\n      }\n\n      return cache.sourceFile;\n    },\n\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>,\n    ) => {\n      if (fileName.endsWith('.d.ts')) {\n        if (hasIndexEntryFile && path.basename(fileName) === flatModuleFileDtsFilename) {\n          // In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.\n          // Because it will cause a conflict.\n          return;\n        }\n\n        // Rename file to index.d.ts so that TypeScript can resolve types without\n        // them needing to be referenced in the package.json manifest.\n        fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');\n        sourceFiles.forEach(source => {\n          const cache = sourcesFileCache.getOrCreate(source.fileName);\n          if (!cache.declarationFileName) {\n            cache.declarationFileName = ensureUnixPath(fileName);\n          }\n        });\n      } else {\n        fileName = fileName.replace(/\\.js(\\.map)?$/, '.mjs$1');\n        const outputCache = entryPoint.cache.outputCache;\n\n        outputCache.set(fileName, {\n          content: data,\n          version: createHash('sha256').update(data).digest('hex'),\n        });\n      }\n\n      compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);\n    },\n\n    readFile: (fileName: string) => {\n      addDependee(fileName);\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        cache.content = compilerHost.readFile.call(this, fileName);\n      }\n\n      return cache.content;\n    },\n\n    resolveModuleNames: (moduleNames: string[], containingFile: string) => {\n      return moduleNames.map(moduleName => {\n        const { resolvedModule } = ts.resolveModuleName(\n          moduleName,\n          ensureUnixPath(containingFile),\n          compilerOptions,\n          compilerHost,\n          moduleResolutionCache,\n        );\n\n        return resolvedModule;\n      });\n    },\n\n    resourceNameToFileName: (resourceName: string, containingFilePath: string) => {\n      const resourcePath = path.resolve(path.dirname(containingFilePath), resourceName);\n      const containingNode = getNode(containingFilePath);\n      const resourceNode = getNode(resourcePath);\n      containingNode.dependsOn(resourceNode);\n\n      return resourcePath;\n    },\n\n    readResource: async (fileName: string) => {\n      addDependee(fileName);\n\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        if (/(?:html?|svg)$/.test(path.extname(fileName))) {\n          // template\n          cache.content = compilerHost.readFile.call(this, fileName);\n        } else {\n          // stylesheet\n          cache.content = await stylesheetProcessor.process({\n            filePath: fileName,\n            content: compilerHost.readFile.call(this, fileName),\n          });\n        }\n\n        if (cache.content === undefined) {\n          throw new Error(`Cannot read file ${fileName}.`);\n        }\n\n        cache.exists = true;\n      }\n\n      return cache.content;\n    },\n    transformResource: async (data, context) => {\n      if (context.resourceFile || context.type !== 'style') {\n        return null;\n      }\n\n      if (inlineStyleLanguage) {\n        const key = createHash('sha1').update(data).digest('hex');\n        const fileName = `${context.containingFile}-${key}.${inlineStyleLanguage}`;\n        const cache = sourcesFileCache.getOrCreate(fileName);\n        if (cache.content === undefined) {\n          cache.content = await stylesheetProcessor.process({\n            filePath: fileName,\n            content: data,\n          });\n\n          const virtualFileNode = getNode(fileName);\n          const containingFileNode = getNode(context.containingFile);\n          virtualFileNode.dependsOn(containingFileNode);\n        }\n\n        cache.exists = true;\n\n        return { content: cache.content };\n      }\n\n      return null;\n    },\n  };\n}\n\nexport function augmentProgramWithVersioning(program: ts.Program): void {\n  const baseGetSourceFiles = program.getSourceFiles;\n  program.getSourceFiles = function (...parameters) {\n    const files: readonly (ts.SourceFile & { version?: string })[] = baseGetSourceFiles(...parameters);\n\n    for (const file of files) {\n      if (file.version === undefined) {\n        file.version = createHash('sha256').update(file.text).digest('hex');\n      }\n    }\n\n    return files;\n  };\n}\n"]}
+{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ts/cache-compiler-host.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CompilerHost, CompilerOptions } from '@angular/compiler-cli';\n\nimport { createHash } from 'crypto';\nimport * as path from 'path';\nimport ts from 'typescript';\nimport { NgPackageConfig } from '../../ng-package.schema';\nimport { FileCache } from '../file-system/file-cache';\nimport { BuildGraph } from '../graph/build-graph';\nimport { Node } from '../graph/node';\nimport { EntryPointNode, fileUrl } from '../ng-package/nodes';\nimport { StylesheetProcessor } from '../styles/stylesheet-processor';\nimport { ensureUnixPath } from '../utils/path';\n\nexport function cacheCompilerHost(\n  graph: BuildGraph,\n  entryPoint: EntryPointNode,\n  compilerOptions: CompilerOptions,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor?: StylesheetProcessor,\n  inlineStyleLanguage?: NgPackageConfig['inlineStyleLanguage'],\n  sourcesFileCache: FileCache = entryPoint.cache.sourcesFileCache,\n): CompilerHost {\n  const compilerHost = ts.createIncrementalCompilerHost(compilerOptions);\n\n  const getNode = (fileName: string) => {\n    const nodeUri = fileUrl(ensureUnixPath(fileName));\n    let node = graph.get(nodeUri);\n\n    if (!node) {\n      node = new Node(nodeUri);\n      graph.put(node);\n    }\n\n    return node;\n  };\n\n  const addDependee = (fileName: string) => {\n    const node = getNode(fileName);\n    entryPoint.dependsOn(node);\n  };\n\n  const { flatModuleFile, destinationPath, entryFile } = entryPoint.data.entryPoint;\n  const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;\n  const flatModuleFileDtsPath = ensureUnixPath(path.join(destinationPath, flatModuleFileDtsFilename));\n  const hasIndexEntryFile = path.basename(entryFile.toLowerCase()) === 'index.ts';\n\n  return {\n    ...compilerHost,\n\n    // ts specific\n    fileExists: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.exists === undefined) {\n        cache.exists = compilerHost.fileExists.call(this, fileName);\n      }\n\n      return cache.exists;\n    },\n\n    getSourceFile: (fileName: string, languageVersion: ts.ScriptTarget) => {\n      addDependee(fileName);\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (!cache.sourceFile) {\n        cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);\n      }\n\n      return cache.sourceFile;\n    },\n\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>,\n    ) => {\n      if (fileName.endsWith('.d.ts')) {\n        if (fileName === flatModuleFileDtsPath) {\n          if (hasIndexEntryFile) {\n            // In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.\n            // Because it will cause a conflict.\n            return;\n          } else {\n            // Rename file to index.d.ts so that TypeScript can resolve types without\n            // them needing to be referenced in the package.json manifest.\n            fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');\n          }\n        }\n\n        sourceFiles.forEach(source => {\n          const cache = sourcesFileCache.getOrCreate(source.fileName);\n          if (!cache.declarationFileName) {\n            cache.declarationFileName = ensureUnixPath(fileName);\n          }\n        });\n      } else {\n        fileName = fileName.replace(/\\.js(\\.map)?$/, '.mjs$1');\n        const outputCache = entryPoint.cache.outputCache;\n\n        outputCache.set(fileName, {\n          content: data,\n          version: createHash('sha256').update(data).digest('hex'),\n        });\n      }\n\n      compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);\n    },\n\n    readFile: (fileName: string) => {\n      addDependee(fileName);\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        cache.content = compilerHost.readFile.call(this, fileName);\n      }\n\n      return cache.content;\n    },\n\n    resolveModuleNames: (moduleNames: string[], containingFile: string) => {\n      return moduleNames.map(moduleName => {\n        const { resolvedModule } = ts.resolveModuleName(\n          moduleName,\n          ensureUnixPath(containingFile),\n          compilerOptions,\n          compilerHost,\n          moduleResolutionCache,\n        );\n\n        return resolvedModule;\n      });\n    },\n\n    resourceNameToFileName: (resourceName: string, containingFilePath: string) => {\n      const resourcePath = path.resolve(path.dirname(containingFilePath), resourceName);\n      const containingNode = getNode(containingFilePath);\n      const resourceNode = getNode(resourcePath);\n      containingNode.dependsOn(resourceNode);\n\n      return resourcePath;\n    },\n\n    readResource: async (fileName: string) => {\n      addDependee(fileName);\n\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        if (/(?:html?|svg)$/.test(path.extname(fileName))) {\n          // template\n          cache.content = compilerHost.readFile.call(this, fileName);\n        } else {\n          // stylesheet\n          cache.content = await stylesheetProcessor.process({\n            filePath: fileName,\n            content: compilerHost.readFile.call(this, fileName),\n          });\n        }\n\n        if (cache.content === undefined) {\n          throw new Error(`Cannot read file ${fileName}.`);\n        }\n\n        cache.exists = true;\n      }\n\n      return cache.content;\n    },\n    transformResource: async (data, context) => {\n      if (context.resourceFile || context.type !== 'style') {\n        return null;\n      }\n\n      if (inlineStyleLanguage) {\n        const key = createHash('sha1').update(data).digest('hex');\n        const fileName = `${context.containingFile}-${key}.${inlineStyleLanguage}`;\n        const cache = sourcesFileCache.getOrCreate(fileName);\n        if (cache.content === undefined) {\n          cache.content = await stylesheetProcessor.process({\n            filePath: fileName,\n            content: data,\n          });\n\n          const virtualFileNode = getNode(fileName);\n          const containingFileNode = getNode(context.containingFile);\n          virtualFileNode.dependsOn(containingFileNode);\n        }\n\n        cache.exists = true;\n\n        return { content: cache.content };\n      }\n\n      return null;\n    },\n  };\n}\n\nexport function augmentProgramWithVersioning(program: ts.Program): void {\n  const baseGetSourceFiles = program.getSourceFiles;\n  program.getSourceFiles = function (...parameters) {\n    const files: readonly (ts.SourceFile & { version?: string })[] = baseGetSourceFiles(...parameters);\n\n    for (const file of files) {\n      if (file.version === undefined) {\n        file.version = createHash('sha256').update(file.text).digest('hex');\n      }\n    }\n\n    return files;\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-packagr",
-  "version": "14.0.2",
+  "version": "14.0.3",
   "description": "Compile and package Angular libraries in Angular Package Format (APF)",
   "keywords": [
     "apf",