Use moduleNamespace instead of rootNamespace for externs type

PiperOrigin-RevId: 565372825
angular · Sep 14, 2023 · 06f8d91 · 06f8d91
1 parent b1bf86b
commit 06f8d91
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/externs.ts b/src/externs.ts
@@ -129,7 +129,7 @@ const EXTERNS_HEADER = `/**
  *     to this root.
  */
 export function getGeneratedExterns(
-    externs: {[fileName: string]: {output: string, rootNamespace: string}},
+    externs: {[fileName: string]: {output: string, moduleNamespace: string}},
     rootDir: string): string {
   let allExterns = EXTERNS_HEADER;
   for (const fileName of Object.keys(externs)) {
@@ -159,7 +159,7 @@ function isInGlobalAugmentation(declaration: ts.Declaration): boolean {
 export function generateExterns(
     typeChecker: ts.TypeChecker, sourceFile: ts.SourceFile,
     host: AnnotatorHost&GoogModuleProcessorHost):
-    {output: string, diagnostics: ts.Diagnostic[], rootNamespace: string} {
+    {output: string, diagnostics: ts.Diagnostic[], moduleNamespace: string} {
   let output = '';
   const diagnostics: ts.Diagnostic[] = [];
   const isDts = isDtsFileName(sourceFile.fileName);
@@ -282,7 +282,7 @@ export function generateExterns(
     }
   }
 
-  return {output, diagnostics, rootNamespace};
+  return {output, diagnostics, moduleNamespace};
 
   function emit(str: string) {
     output += str;

diff --git a/src/tsickle.ts b/src/tsickle.ts
@@ -87,7 +87,7 @@ export function mergeEmitResults(emitResults: EmitResult[]): EmitResult {
   let emitSkipped = true;
   const emittedFiles: string[] = [];
   const externs:
-      {[fileName: string]: {output: string, rootNamespace: string}} = {};
+      {[fileName: string]: {output: string, moduleNamespace: string}} = {};
   const modulesManifest = new ModulesManifest();
   const tsMigrationExportsShimFiles = new Map<string, string>();
   for (const er of emitResults) {
@@ -120,7 +120,7 @@ export interface EmitResult extends ts.EmitResult {
    * externs.js files produced by tsickle, if any. module IDs are relative paths
    * from fileNameToModuleId.
    */
-  externs: {[moduleId: string]: {output: string, rootNamespace: string}};
+  externs: {[moduleId: string]: {output: string, moduleNamespace: string}};
 
   /**
    * Content for the generated files, keyed by their intended filename.
@@ -247,7 +247,7 @@ export function emit(
       tsTransformers);
 
   const externs:
-      {[fileName: string]: {output: string, rootNamespace: string}} = {};
+      {[fileName: string]: {output: string, moduleNamespace: string}} = {};
   if (host.transformTypesToClosure) {
     const sourceFiles =
         targetSourceFile ? [targetSourceFile] : program.getSourceFiles();
@@ -256,10 +256,10 @@ export function emit(
       if (isDts && host.shouldSkipTsickleProcessing(sourceFile.fileName)) {
         continue;
       }
-      const {output, diagnostics, rootNamespace} =
+      const {output, diagnostics, moduleNamespace} =
           generateExterns(typeChecker, sourceFile, host);
       if (output) {
-        externs[sourceFile.fileName] = {output, rootNamespace};
+        externs[sourceFile.fileName] = {output, moduleNamespace};
       }
       if (diagnostics) {
         tsickleDiagnostics.push(...diagnostics);

diff --git a/test/golden_tsickle_test.ts b/test/golden_tsickle_test.ts
@@ -226,7 +226,7 @@ testFn('golden tests', () => {
       if (!test.name.endsWith('.no_externs')) {
         // Concatenate externs for the files that are in this tests sources (but
         // not other, shared .d.ts files).
-        const filteredExterns: {[k: string]: { output: string; rootNamespace: string; }} = {};
+        const filteredExterns: {[k: string]: { output: string; moduleNamespace: string; }} = {};
         let anyExternsGenerated = false;
         for (const fileName of tsSources.keys()) {
           if (externs[fileName]) {