{"action":"created","comment":{"url":"https://api.github.com/repos/angular/angular/pulls/comments/88527753","pull_request_review_id":9089909,"id":88527753,"diff_hunk":"@@ -150,43 +150,69 @@ export class NgHost implements AotCompilerHost {\n     if (DTS.test(filePath)) {\n       const metadataPath = filePath.replace(DTS, '.metadata.json');\n       if (this.context.fileExists(metadataPath)) {\n-        const metadata = this.readMetadata(metadataPath);\n-        return (Array.isArray(metadata) && metadata.length == 0) ? undefined : metadata;\n+        return this.readMetadata(metadataPath, filePath);\n       }\n     } else {\n       const sf = this.program.getSourceFile(filePath);\n       if (!sf) {\n         if (this.context.fileExists(filePath)) {\n           const sourceText = this.context.readFile(filePath);\n-          return this.metadataCollector.getMetadata(\n+          const metadata = this.metadataCollector.getMetadata(\n               ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true));\n+          return metadata ? [metadata] : [];\n         }\n \n         throw new Error(`Source file ${filePath} not present in program.`);\n       }\n-      return this.metadataCollector.getMetadata(sf);\n+      const metadata = this.metadataCollector.getMetadata(sf);\n+      return metadata ? [metadata] : [];\n     }\n   }\n \n-  readMetadata(filePath: string) {\n+  readMetadata(filePath: string, dtsFilePath: string): ModuleMetadata[] {\n+    let metadatas = this.resolverCache.get(filePath);\n+    if (metadatas) {\n+      return metadatas;\n+    }\n     try {\n-      return this.resolverCache.get(filePath) || JSON.parse(this.context.readFile(filePath));\n+      const metadataOrMetadatas = JSON.parse(this.context.readFile(filePath));\n+      const metadatas = metadataOrMetadatas ?\n+          (Array.isArray(metadataOrMetadatas) ? metadataOrMetadatas : [metadataOrMetadatas]) :\n+          [];\n+      const v1Metadata = metadatas.find(m => m['version'] === 1);\n+      let v2Metadata = metadatas.find(m => m['version'] === 2);\n+      if (!v2Metadata && v1Metadata) {\n+        // patch up v1 to v2 by merging the metadata with metadata collected from the d.ts file\n+        // as the only difference between the versions is whether all exports are contained in\n+        // the metadata\n+        v2Metadata = {'__symbolic': 'module', 'version': 2, 'metadata': {}};\n+        if (v1Metadata.exports) {\n+          v2Metadata.exports = v1Metadata.exports;\n+        }\n+        for (let prop in v1Metadata.metadata) {\n+          v2Metadata.metadata[prop] = v1Metadata.metadata[prop];\n+        }\n+        const sourceText = this.context.readFile(dtsFilePath);\n+        const exports = this.metadataCollector.getMetadata(\n+            ts.createSourceFile(dtsFilePath, sourceText, ts.ScriptTarget.Latest, true));","path":"modules/@angular/compiler-cli/src/ng_host.ts","position":197,"original_position":74,"commit_id":"08a6079512c82ea78ff0442ed132a8b0d595a91c","original_commit_id":"08a6079512c82ea78ff0442ed132a8b0d595a91c","user":{"login":"alexeagle","id":47395,"avatar_url":"https://avatars.githubusercontent.com/u/47395?v=3","gravatar_id":"","url":"https://api.github.com/users/alexeagle","html_url":"https://github.com/alexeagle","followers_url":"https://api.github.com/users/alexeagle/followers","following_url":"https://api.github.com/users/alexeagle/following{/other_user}","gists_url":"https://api.github.com/users/alexeagle/gists{/gist_id}","starred_url":"https://api.github.com/users/alexeagle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alexeagle/subscriptions","organizations_url":"https://api.github.com/users/alexeagle/orgs","repos_url":"https://api.github.com/users/alexeagle/repos","events_url":"https://api.github.com/users/alexeagle/events{/privacy}","received_events_url":"https://api.github.com/users/alexeagle/received_events","type":"User","site_admin":false},"body":"first look for it in the program?","created_at":"2016-11-17T19:29:13Z","updated_at":"2016-11-17T19:31:28Z","html_url":"https://github.com/angular/angular/pull/12902#discussion_r88527753","pull_request_url":"https://api.github.com/repos/angular/angular/pulls/12902","_links":{"self":{"href":"https://api.github.com/repos/angular/angular/pulls/comments/88527753"},"html":{"href":"https://github.com/angular/angular/pull/12902#discussion_r88527753"},"pull_request":{"href":"https://api.github.com/repos/angular/angular/pulls/12902"}}},"pull_request":{"url":"https://api.github.com/repos/angular/angular/pulls/12902","id":93856751,"html_url":"https://github.com/angular/angular/pull/12902","diff_url":"https://github.com/angular/angular/pull/12902.diff","patch_url":"https://github.com/angular/angular/pull/12902.patch","issue_url":"https://api.github.com/repos/angular/angular/issues/12902","number":12902,"state":"open","locked":false,"title":"Aot watch","user":{"login":"tbosch","id":690815,"avatar_url":"https://avatars.githubusercontent.com/u/690815?v=3","gravatar_id":"","url":"https://api.github.com/users/tbosch","html_url":"https://github.com/tbosch","followers_url":"https://api.github.com/users/tbosch/followers","following_url":"https://api.github.com/users/tbosch/following{/other_user}","gists_url":"https://api.github.com/users/tbosch/gists{/gist_id}","starred_url":"https://api.github.com/users/tbosch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tbosch/subscriptions","organizations_url":"https://api.github.com/users/tbosch/orgs","repos_url":"https://api.github.com/users/tbosch/repos","events_url":"https://api.github.com/users/tbosch/events{/privacy}","received_events_url":"https://api.github.com/users/tbosch/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-11-15T21:57:55Z","updated_at":"2016-11-17T19:31:28Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f5b97930f592573b3cedb0f55fd5210c4ba1e39b","assignee":{"login":"alexeagle","id":47395,"avatar_url":"https://avatars.githubusercontent.com/u/47395?v=3","gravatar_id":"","url":"https://api.github.com/users/alexeagle","html_url":"https://github.com/alexeagle","followers_url":"https://api.github.com/users/alexeagle/followers","following_url":"https://api.github.com/users/alexeagle/following{/other_user}","gists_url":"https://api.github.com/users/alexeagle/gists{/gist_id}","starred_url":"https://api.github.com/users/alexeagle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alexeagle/subscriptions","organizations_url":"https://api.github.com/users/alexeagle/orgs","repos_url":"https://api.github.com/users/alexeagle/repos","events_url":"https://api.github.com/users/alexeagle/events{/privacy}","received_events_url":"https://api.github.com/users/alexeagle/received_events","type":"User","site_admin":false},"assignees":[{"login":"alexeagle","id":47395,"avatar_url":"https://avatars.githubusercontent.com/u/47395?v=3","gravatar_id":"","url":"https://api.github.com/users/alexeagle","html_url":"https://github.com/alexeagle","followers_url":"https://api.github.com/users/alexeagle/followers","following_url":"https://api.github.com/users/alexeagle/following{/other_user}","gists_url":"https://api.github.com/users/alexeagle/gists{/gist_id}","starred_url":"https://api.github.com/users/alexeagle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alexeagle/subscriptions","organizations_url":"https://api.github.com/users/alexeagle/orgs","repos_url":"https://api.github.com/users/alexeagle/repos","events_url":"https://api.github.com/users/alexeagle/events{/privacy}","received_events_url":"https://api.github.com/users/alexeagle/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/angular/angular/pulls/12902/commits","review_comments_url":"https://api.github.com/repos/angular/angular/pulls/12902/comments","review_comment_url":"https://api.github.com/repos/angular/angular/pulls/comments{/number}","comments_url":"https://api.github.com/repos/angular/angular/issues/12902/comments","statuses_url":"https://api.github.com/repos/angular/angular/statuses/08a6079512c82ea78ff0442ed132a8b0d595a91c","head":{"label":"tbosch:aot_watch1","ref":"aot_watch1","sha":"08a6079512c82ea78ff0442ed132a8b0d595a91c","user":{"login":"tbosch","id":690815,"avatar_url":"https://avatars.githubusercontent.com/u/690815?v=3","gravatar_id":"","url":"https://api.github.com/users/tbosch","html_url":"https://github.com/tbosch","followers_url":"https://api.github.com/users/tbosch/followers","following_url":"https://api.github.com/users/tbosch/following{/other_user}","gists_url":"https://api.github.com/users/tbosch/gists{/gist_id}","starred_url":"https://api.github.com/users/tbosch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tbosch/subscriptions","organizations_url":"https://api.github.com/users/tbosch/orgs","repos_url":"https://api.github.com/users/tbosch/repos","events_url":"https://api.github.com/users/tbosch/events{/privacy}","received_events_url":"https://api.github.com/users/tbosch/received_events","type":"User","site_admin":false},"repo":{"id":24733374,"name":"angular","full_name":"tbosch/angular","owner":{"login":"tbosch","id":690815,"avatar_url":"https://avatars.githubusercontent.com/u/690815?v=3","gravatar_id":"","url":"https://api.github.com/users/tbosch","html_url":"https://github.com/tbosch","followers_url":"https://api.github.com/users/tbosch/followers","following_url":"https://api.github.com/users/tbosch/following{/other_user}","gists_url":"https://api.github.com/users/tbosch/gists{/gist_id}","starred_url":"https://api.github.com/users/tbosch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tbosch/subscriptions","organizations_url":"https://api.github.com/users/tbosch/orgs","repos_url":"https://api.github.com/users/tbosch/repos","events_url":"https://api.github.com/users/tbosch/events{/privacy}","received_events_url":"https://api.github.com/users/tbosch/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/tbosch/angular","description":null,"fork":true,"url":"https://api.github.com/repos/tbosch/angular","forks_url":"https://api.github.com/repos/tbosch/angular/forks","keys_url":"https://api.github.com/repos/tbosch/angular/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tbosch/angular/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tbosch/angular/teams","hooks_url":"https://api.github.com/repos/tbosch/angular/hooks","issue_events_url":"https://api.github.com/repos/tbosch/angular/issues/events{/number}","events_url":"https://api.github.com/repos/tbosch/angular/events","assignees_url":"https://api.github.com/repos/tbosch/angular/assignees{/user}","branches_url":"https://api.github.com/repos/tbosch/angular/branches{/branch}","tags_url":"https://api.github.com/repos/tbosch/angular/tags","blobs_url":"https://api.github.com/repos/tbosch/angular/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tbosch/angular/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tbosch/angular/git/refs{/sha}","trees_url":"https://api.github.com/repos/tbosch/angular/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tbosch/angular/statuses/{sha}","languages_url":"https://api.github.com/repos/tbosch/angular/languages","stargazers_url":"https://api.github.com/repos/tbosch/angular/stargazers","contributors_url":"https://api.github.com/repos/tbosch/angular/contributors","subscribers_url":"https://api.github.com/repos/tbosch/angular/subscribers","subscription_url":"https://api.github.com/repos/tbosch/angular/subscription","commits_url":"https://api.github.com/repos/tbosch/angular/commits{/sha}","git_commits_url":"https://api.github.com/repos/tbosch/angular/git/commits{/sha}","comments_url":"https://api.github.com/repos/tbosch/angular/comments{/number}","issue_comment_url":"https://api.github.com/repos/tbosch/angular/issues/comments{/number}","contents_url":"https://api.github.com/repos/tbosch/angular/contents/{+path}","compare_url":"https://api.github.com/repos/tbosch/angular/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tbosch/angular/merges","archive_url":"https://api.github.com/repos/tbosch/angular/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tbosch/angular/downloads","issues_url":"https://api.github.com/repos/tbosch/angular/issues{/number}","pulls_url":"https://api.github.com/repos/tbosch/angular/pulls{/number}","milestones_url":"https://api.github.com/repos/tbosch/angular/milestones{/number}","notifications_url":"https://api.github.com/repos/tbosch/angular/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tbosch/angular/labels{/name}","releases_url":"https://api.github.com/repos/tbosch/angular/releases{/id}","deployments_url":"https://api.github.com/repos/tbosch/angular/deployments","created_at":"2014-10-02T19:30:59Z","updated_at":"2015-06-02T21:15:59Z","pushed_at":"2016-11-17T18:33:01Z","git_url":"git://github.com/tbosch/angular.git","ssh_url":"git@github.com:tbosch/angular.git","clone_url":"https://github.com/tbosch/angular.git","svn_url":"https://github.com/tbosch/angular","homepage":null,"size":33273,"stargazers_count":0,"watchers_count":0,"language":"TypeScript","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"angular:master","ref":"master","sha":"f340e1a4144ff09882daaf6266b34bd866fdb0b7","user":{"login":"angular","id":139426,"avatar_url":"https://avatars.githubusercontent.com/u/139426?v=3","gravatar_id":"","url":"https://api.github.com/users/angular","html_url":"https://github.com/angular","followers_url":"https://api.github.com/users/angular/followers","following_url":"https://api.github.com/users/angular/following{/other_user}","gists_url":"https://api.github.com/users/angular/gists{/gist_id}","starred_url":"https://api.github.com/users/angular/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/angular/subscriptions","organizations_url":"https://api.github.com/users/angular/orgs","repos_url":"https://api.github.com/users/angular/repos","events_url":"https://api.github.com/users/angular/events{/privacy}","received_events_url":"https://api.github.com/users/angular/received_events","type":"Organization","site_admin":false},"repo":{"id":24195339,"name":"angular","full_name":"angular/angular","owner":{"login":"angular","id":139426,"avatar_url":"https://avatars.githubusercontent.com/u/139426?v=3","gravatar_id":"","url":"https://api.github.com/users/angular","html_url":"https://github.com/angular","followers_url":"https://api.github.com/users/angular/followers","following_url":"https://api.github.com/users/angular/following{/other_user}","gists_url":"https://api.github.com/users/angular/gists{/gist_id}","starred_url":"https://api.github.com/users/angular/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/angular/subscriptions","organizations_url":"https://api.github.com/users/angular/orgs","repos_url":"https://api.github.com/users/angular/repos","events_url":"https://api.github.com/users/angular/events{/privacy}","received_events_url":"https://api.github.com/users/angular/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/angular/angular","description":null,"fork":false,"url":"https://api.github.com/repos/angular/angular","forks_url":"https://api.github.com/repos/angular/angular/forks","keys_url":"https://api.github.com/repos/angular/angular/keys{/key_id}","collaborators_url":"https://api.github.com/repos/angular/angular/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/angular/angular/teams","hooks_url":"https://api.github.com/repos/angular/angular/hooks","issue_events_url":"https://api.github.com/repos/angular/angular/issues/events{/number}","events_url":"https://api.github.com/repos/angular/angular/events","assignees_url":"https://api.github.com/repos/angular/angular/assignees{/user}","branches_url":"https://api.github.com/repos/angular/angular/branches{/branch}","tags_url":"https://api.github.com/repos/angular/angular/tags","blobs_url":"https://api.github.com/repos/angular/angular/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/angular/angular/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/angular/angular/git/refs{/sha}","trees_url":"https://api.github.com/repos/angular/angular/git/trees{/sha}","statuses_url":"https://api.github.com/repos/angular/angular/statuses/{sha}","languages_url":"https://api.github.com/repos/angular/angular/languages","stargazers_url":"https://api.github.com/repos/angular/angular/stargazers","contributors_url":"https://api.github.com/repos/angular/angular/contributors","subscribers_url":"https://api.github.com/repos/angular/angular/subscribers","subscription_url":"https://api.github.com/repos/angular/angular/subscription","commits_url":"https://api.github.com/repos/angular/angular/commits{/sha}","git_commits_url":"https://api.github.com/repos/angular/angular/git/commits{/sha}","comments_url":"https://api.github.com/repos/angular/angular/comments{/number}","issue_comment_url":"https://api.github.com/repos/angular/angular/issues/comments{/number}","contents_url":"https://api.github.com/repos/angular/angular/contents/{+path}","compare_url":"https://api.github.com/repos/angular/angular/compare/{base}...{head}","merges_url":"https://api.github.com/repos/angular/angular/merges","archive_url":"https://api.github.com/repos/angular/angular/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/angular/angular/downloads","issues_url":"https://api.github.com/repos/angular/angular/issues{/number}","pulls_url":"https://api.github.com/repos/angular/angular/pulls{/number}","milestones_url":"https://api.github.com/repos/angular/angular/milestones{/number}","notifications_url":"https://api.github.com/repos/angular/angular/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/angular/angular/labels{/name}","releases_url":"https://api.github.com/repos/angular/angular/releases{/id}","deployments_url":"https://api.github.com/repos/angular/angular/deployments","created_at":"2014-09-18T16:12:01Z","updated_at":"2016-11-17T16:15:18Z","pushed_at":"2016-11-17T19:05:45Z","git_url":"git://github.com/angular/angular.git","ssh_url":"git@github.com:angular/angular.git","clone_url":"https://github.com/angular/angular.git","svn_url":"https://github.com/angular/angular","homepage":"https://angular.io","size":651624,"stargazers_count":18201,"watchers_count":18201,"language":"TypeScript","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":4639,"mirror_url":null,"open_issues_count":885,"forks":4639,"open_issues":885,"watchers":18201,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/angular/angular/pulls/12902"},"html":{"href":"https://github.com/angular/angular/pull/12902"},"issue":{"href":"https://api.github.com/repos/angular/angular/issues/12902"},"comments":{"href":"https://api.github.com/repos/angular/angular/issues/12902/comments"},"review_comments":{"href":"https://api.github.com/repos/angular/angular/pulls/12902/comments"},"review_comment":{"href":"https://api.github.com/repos/angular/angular/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/angular/angular/pulls/12902/commits"},"statuses":{"href":"https://api.github.com/repos/angular/angular/statuses/08a6079512c82ea78ff0442ed132a8b0d595a91c"}}}}
{"actor":{"display_login":"alexeagle"}}