Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

docs(website): load typescript libs in playground#4765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
bradzacher merged 3 commits intomainfromfix/website-play-libs
Mar 31, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 50 additions & 6 deletionspackages/website-eslint/src/linter/CompilerHost.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,43 @@
import { getDefaultLibFileName } from 'typescript';
import {
getDefaultLibFileName,
ScriptKind,
createSourceFile,
ScriptTarget,
} from 'typescript';

function getScriptKind(isJsx, filePath) {
const extension = (/(\.[a-z]+)$/.exec(filePath)?.[0] || '').toLowerCase();

switch (extension) {
case '.ts':
return ScriptKind.TS;
case '.tsx':
return ScriptKind.TSX;
case '.js':
return ScriptKind.JS;

case '.jsx':
return ScriptKind.JSX;

case '.json':
return ScriptKind.JSON;

default:
// unknown extension, force typescript to ignore the file extension, and respect the user's setting
return isJsx ? ScriptKind.TSX : ScriptKind.TS;
}
}

export class CompilerHost {
constructor(files, sourceFiles) {
this.files = files;
this.sourceFiles = sourceFiles;
constructor(libs, isJsx) {
this.files = [];
this.isJsx = isJsx || false;

if (libs) {
for (const [key, value] of libs) {
this.files[key] = value;
}
}
}

fileExists(name) {
Expand DownExpand Up@@ -39,10 +73,20 @@ export class CompilerHost {
}

readFile(name) {
return this.files[name];
if (this.fileExists(name)) {
return this.files[name];
} else {
return ''; // fallback, in case if file is not available
}
}

getSourceFile(name) {
return this.sourceFiles[name];
return createSourceFile(
name,
this.readFile(name),
ScriptTarget.Latest,
/* setParentNodes */ true,
getScriptKind(this.isJsx, name),
);
}
}
44 changes: 0 additions & 44 deletionspackages/website-eslint/src/linter/create-ast-program.js
View file
Open in desktop

This file was deleted.

11 changes: 8 additions & 3 deletionspackages/website-eslint/src/linter/linter.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,20 @@ import rules from '@typescript-eslint/eslint-plugin/dist/rules';

const PARSER_NAME = '@typescript-eslint/parser';

export function loadLinter() {
export function loadLinter(libs, compilerOptions) {
const linter = new Linter();
let storedAST;
let storedTsAST;
let storedScope;

linter.defineParser(PARSER_NAME, {
parseForESLint(code, options) {
const toParse = parseForESLint(code, options);
parseForESLint(code, eslintOptions) {
const toParse = parseForESLint(
code,
eslintOptions,
compilerOptions,
libs,
);
storedAST = toParse.ast;
storedTsAST = toParse.tsAst;
storedScope = toParse.scopeManager;
Expand Down
65 changes: 39 additions & 26 deletionspackages/website-eslint/src/linter/parser.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,55 @@
import { analyze } from '@typescript-eslint/scope-manager/dist/analyze';
import { visitorKeys } from '@typescript-eslint/visitor-keys/dist/visitor-keys';
import { astConverter } from '@typescript-eslint/typescript-estree/dist/ast-converter';
import { createASTProgram } from './create-ast-program.js';
import { extra } from './config.js';
import { CompilerHost } from './CompilerHost';
import { createProgram } from 'typescript';

function parseAndGenerateServices(code, options) {
const { ast, program } = createASTProgram(code, options);
const { estree, astMaps } = astConverter(
ast,
{ ...extra, code, jsx: options.jsx ?? false },
true,
);
export function createASTProgram(code, isJsx, compilerOptions, libs) {
const fileName = isJsx ? '/demo.tsx' : '/demo.ts';
const compilerHost = new CompilerHost(libs, isJsx);
Copy link
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

ideally we would like to use watch compiler host, but that can come latter


compilerHost.files[fileName] = code;
const program = createProgram(
Object.keys(compilerHost.files),
compilerOptions,
compilerHost,
);
const ast = program.getSourceFile(fileName);
return {
ast: estree,
tsAst: ast,
services: {
hasFullTypeInformation: true,
program,
esTreeNodeToTSNodeMap: astMaps.esTreeNodeToTSNodeMap,
tsNodeToESTreeNodeMap: astMaps.tsNodeToESTreeNodeMap,
},
ast,
program,
};
}

export function parseForESLint(code, parserOptions) {
const { ast, tsAst, services } = parseAndGenerateServices(code, {
...parserOptions,
jsx: parserOptions.ecmaFeatures?.jsx ?? false,
useJSXTextNode: true,
projectFolderIgnoreList: [],
});
export function parseForESLint(code, eslintOptions, compilerOptions, libs) {
const isJsx = eslintOptions.ecmaFeatures?.jsx ?? false;

const { ast: tsAst, program } = createASTProgram(
code,
isJsx,
compilerOptions,
libs,
);

const { estree: ast, astMaps } = astConverter(
tsAst,
{ ...extra, code, jsx: isJsx },
true,
);

const services = {
hasFullTypeInformation: true,
program,
esTreeNodeToTSNodeMap: astMaps.esTreeNodeToTSNodeMap,
tsNodeToESTreeNodeMap: astMaps.tsNodeToESTreeNodeMap,
};

const scopeManager = analyze(ast, {
ecmaVersion:
parserOptions.ecmaVersion === 'latest' ? 1e8 :parserOptions.ecmaVersion,
globalReturn:parserOptions.ecmaFeatures?.globalReturn ?? false,
sourceType:parserOptions.sourceType ?? 'script',
eslintOptions.ecmaVersion === 'latest' ? 1e8 :eslintOptions.ecmaVersion,
globalReturn:eslintOptions.ecmaFeatures?.globalReturn ?? false,
sourceType:eslintOptions.sourceType ?? 'script',
});

return {
Expand Down
7 changes: 5 additions & 2 deletionspackages/website-eslint/types/index.d.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import type { ParserOptions } from '@typescript-eslint/types';
import type { SourceFile } from 'typescript';
import type { SourceFile, CompilerOptions } from 'typescript';

export type LintMessage = TSESLint.Linter.LintMessage;
export type RuleFix = TSESLint.RuleFix;
Expand All@@ -22,7 +22,10 @@ export interface WebLinter {
}

export interface LinterLoader {
loadLinter(): WebLinter;
loadLinter(
libMap: Map<string, string>,
compilerOptions: CompilerOptions,
): WebLinter;
}

export type {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ export const propsToFilter = [
'transformFlags',
'resolvedModules',
'imports',
'antecedent',
'antecedents',
];

function isTsNode(value: unknown): value is Node {
Expand Down
30 changes: 19 additions & 11 deletionspackages/website/src/components/editor/useSandboxServices.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,16 @@ export const useSandboxServices = (
setLoadedTs(props.ts);

sandboxSingleton(props.ts)
.then(({ main, sandboxFactory, ts, linter }) => {
.then(async ({ main, sandboxFactory, ts, linter }) => {
const compilerOptions = {
noResolve: true,
strict: true,
target: main.languages.typescript.ScriptTarget.ESNext,
jsx: props.jsx ? main.languages.typescript.JsxEmit.React : undefined,
lib: ['ESNext'],
module: main.languages.typescript.ModuleKind.ESNext,
};

const sandboxConfig: Partial<SandboxConfig> = {
text: '',
monacoSettings: {
Expand All@@ -57,15 +66,7 @@ export const useSandboxServices = (
scrollBeyondLastLine: false,
smoothScrolling: true,
},
compilerOptions: {
noResolve: true,
strict: true,
target: main.languages.typescript.ScriptTarget.ESNext,
jsx: props.jsx
? main.languages.typescript.JsxEmit.React
: undefined,
module: main.languages.typescript.ModuleKind.ESNext,
},
compilerOptions: compilerOptions,
domID: editorEmbedId,
};

Expand All@@ -75,7 +76,14 @@ export const useSandboxServices = (
ts,
);

const webLinter = linter.loadLinter();
const libMap = await sandboxInstance.tsvfs.createDefaultMapFromCDN(
sandboxInstance.getCompilerOptions(),
props.ts,
true,
window.ts,
);

const webLinter = linter.loadLinter(libMap, compilerOptions);

props.onLoaded(webLinter.ruleNames, sandboxInstance.supportedVersions);

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp