Add vue.d.ts and typescript support #94
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| import * as ts from 'typescript'; | ||
| import path = require('path'); | ||
| import { parseComponent } from "vue-template-compiler"; | ||
|
|
||
| export function isVue(filename: string): boolean { | ||
| return path.extname(filename) === '.vue'; | ||
| } | ||
|
|
||
| export function parseVue(text: string): string { | ||
| const output = parseComponent(text, { pad: 'space' }); | ||
| if (output && output.script && output.script.content) { | ||
| return output.script.content; | ||
| } | ||
| else { | ||
| return text; | ||
| } | ||
| } | ||
|
|
||
| export function createUpdater() { | ||
| const clssf = ts.createLanguageServiceSourceFile; | ||
|
There was a problem hiding this comment. these should be added to the LanguageServiceHost API in TS 2.3, I would also add a comment here with that to allow removing this global function hijacking. There was a problem hiding this comment. added comment where the hijacking happens. This part of the code may remain the same since it's basically the same way that the plugin API allows users to wrap the language service. |
||
| const ulssf = ts.updateLanguageServiceSourceFile; | ||
| return { | ||
| createLanguageServiceSourceFile(fileName: string, scriptSnapshot: ts.IScriptSnapshot, scriptTarget: ts.ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ts.ScriptKind): ts.SourceFile { | ||
| let sourceFile = clssf(fileName, scriptSnapshot, scriptTarget, version, setNodeParents, scriptKind); | ||
| if (isVue(fileName)) { | ||
| modifyVueSource(sourceFile); | ||
| } | ||
| return sourceFile; | ||
| }, | ||
| updateLanguageServiceSourceFile(sourceFile: ts.SourceFile, scriptSnapshot: ts.IScriptSnapshot, version: string, textChangeRange: ts.TextChangeRange, aggressiveChecks?: boolean): ts.SourceFile { | ||
| sourceFile = ulssf(sourceFile, scriptSnapshot, version, textChangeRange, aggressiveChecks); | ||
| if (isVue(sourceFile.fileName)) { | ||
| modifyVueSource(sourceFile); | ||
| } | ||
| return sourceFile; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** Works like Array.prototype.find, returning `undefined` if no element satisfying the predicate is found. */ | ||
| function find<T>(array: T[], predicate: (element: T, index: number) => boolean): T | undefined { | ||
| for (let i = 0; i < array.length; i++) { | ||
| const value = array[i]; | ||
| if (predicate(value, i)) { | ||
| return value; | ||
| } | ||
| } | ||
| return undefined; | ||
| } | ||
|
|
||
| function modifyVueSource(sourceFile: ts.SourceFile): void { | ||
| const exportDefaultObject = find(sourceFile.statements, st => st.kind === ts.SyntaxKind.ExportAssignment && | ||
| (st as ts.ExportAssignment).expression.kind === ts.SyntaxKind.ObjectLiteralExpression); | ||
| if (exportDefaultObject) { | ||
| // 1. add `import Vue from './vue' | ||
| // (the span of the statement is (0,0) to avoid overlapping existing statements) | ||
| const zero = <T extends ts.Node>(n: T) => ts.setTextRange(n, { pos: 0, end: 0 }); | ||
| const vueImport = zero(ts.createImportDeclaration(undefined, | ||
| undefined, | ||
| zero(ts.createImportClause(undefined, | ||
| zero(ts.createNamedImports([ | ||
| zero(ts.createImportSpecifier( | ||
| zero(ts.createIdentifier('Vue')), | ||
| zero(ts.createIdentifier('Vue'))))])))), | ||
| zero(ts.createLiteral('vue')))); | ||
| sourceFile.statements.unshift(vueImport); | ||
|
|
||
| // 2. find the export default and wrap it in `new Vue(...)` if it exists and is an object literal | ||
| // (the span of the construct call is the same as the object literal) | ||
| const objectLiteral = (exportDefaultObject as ts.ExportAssignment).expression as ts.ObjectLiteralExpression; | ||
| const o = <T extends ts.TextRange>(n: T) => ts.setTextRange(n, objectLiteral); | ||
| const vue = ts.setTextRange(ts.createIdentifier('Vue'), { pos: objectLiteral.pos, end: objectLiteral.pos + 1 }); | ||
|
There was a problem hiding this comment. Would you mind giving |
||
| (exportDefaultObject as ts.ExportAssignment).expression = o(ts.createNew(vue, undefined, [objectLiteral])); | ||
| o(((exportDefaultObject as ts.ExportAssignment).expression as ts.NewExpression).arguments); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For this i would defere to
ts.getDefaultCompilerOptionsand just set:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I take that back..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"esnext" didn't ship as a lib target in 2.2, so I'll use "es2017" for now.
(It was committed Dec 30, but I guess it was part of a PR that got merged later.)