Skip to content

WIP: Add Lucy support in TypeScript files #1

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules/
lib/
MyTypeScriptLog.txt
10 changes: 10 additions & 0 deletions contributing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

# Contributing

Run the build:

```
npm run build
```

Use this test project for development: https://gist.github.com/matthewp/f5033180c65a0e6075aa2aff37f9a6ba
14 changes: 14 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,25 @@
"name": "@lucy/typescript-plugin",
"version": "0.0.1",
"description": "TypeScript Language Service plugin for Lucy",
"main": "index.js",
"main": "./lib/index.js",
"scripts": {
"build": "tsc",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/lucydsl/typescript-plugin.git"
},
"keywords": ["lucy"],
"keywords": [
"lucy"
],
"author": "Matthew Phillips",
"license": "BSD-2-Clause",
"bugs": {
"url": "https://github.com/lucydsl/typescript-plugin/issues"
},
"homepage": "https://github.com/lucydsl/typescript-plugin#readme"
"homepage": "https://github.com/lucydsl/typescript-plugin#readme",
"devDependencies": {
"typescript": "^4.3.2"
}
}
2 changes: 2 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
> *Note*: This is a work-in-progress and doesn't work yet.

# TypeScript Language Service Plugin for Lucy

## Installation
Expand Down
15 changes: 15 additions & 0 deletions src/file.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export function isLucyFilePath(filePath: string) {
return filePath.endsWith('.lucy');
}

export function isVirtualLucyFilePath(filePath: string) {
return filePath.endsWith('.lucy.ts');
}

export function toRealLucyFilePath(filePath: string) {
return filePath.slice(0, -'.ts'.length);
}

export function ensureRealLucyFilePath(filePath: string) {
return isVirtualLucyFilePath(filePath) ? toRealLucyFilePath(filePath) : filePath;
}
28 changes: 28 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { createProgramState } from './state.js';
import { createResolveModuleNames } from './module_names.js';
import { createHostReadFile } from './project_service.js';

function init(modules: { typescript: typeof import("typescript/lib/tsserverlibrary") }) {
const ts = modules.typescript;

type LanguageServiceKeys = Array<keyof ts.LanguageService>;

function create(info: ts.server.PluginCreateInfo) {
const state = createProgramState(ts, info);

const proxy: ts.LanguageService = Object.create(null);
for (let k of Object.keys(info.languageService) as LanguageServiceKeys) {
const x = info.languageService[k];
proxy[k] = (...args: Array<{}>) => x.apply(info.languageService, args);
}

info.languageServiceHost.resolveModuleNames = createResolveModuleNames(state);
info.project.projectService.host.readFile = createHostReadFile(state);

return proxy;
}

return { create };
}

export = init;
20 changes: 20 additions & 0 deletions src/logger.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import * as ts from 'typescript/lib/tsserverlibrary';

function stringify(args: any[]): string {
return args
.map((arg) => {
if (typeof arg === 'object') {
try {
return JSON.stringify(arg);
} catch (e) {
return '[object that cannot by stringified]';
}
}
return arg;
})
.join(' ');
}

export function info(logger: ts.server.Logger, ...args: any[]) {
logger.info(`lucytsplugin: ${stringify(args)}`);
}
28 changes: 28 additions & 0 deletions src/lucy-sys.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import * as ts from 'typescript';
import { ensureRealLucyFilePath, isVirtualLucyFilePath, toRealLucyFilePath } from './file.js';

export function createLucySys() {
const lucySys: ts.System = {
...ts.sys,
fileExists(path: string) {
return ts.sys.fileExists(ensureRealLucyFilePath(path));
},
readDirectory(path, extensions, exclude, include, depth) {
const extensionsWithLucy = (extensions ?? []).concat('.lucy');

return ts.sys.readDirectory(path, extensionsWithLucy, exclude, include, depth);
}
};

if (ts.sys.realpath) {
const realpath = ts.sys.realpath;
lucySys.realpath = function (path) {
if (isVirtualLucyFilePath(path)) {
return realpath(toRealLucyFilePath(path)) + '.ts';
}
return realpath(path);
};
}

return lucySys;
}
80 changes: 80 additions & 0 deletions src/module_names.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import type { ProgramState } from './state';
import { ensureRealLucyFilePath, isVirtualLucyFilePath } from './file.js';
import { info } from './logger.js';
import * as ts from 'typescript/lib/tsserverlibrary';

export function createResolveModuleNames(state: ProgramState) {
const { languageServiceHost, logger, projectService, sys, typescript } = state;
const resolveModuleNames: typeof languageServiceHost.resolveModuleNames = languageServiceHost.resolveModuleNames.bind(languageServiceHost);

function resolveModuleName(
name: string,
containingFile: string,
compilerOptions: ts.CompilerOptions
): ts.ResolvedModule | undefined {
const lucyResolvedModule = typescript.resolveModuleName(
name,
containingFile,
compilerOptions,
sys
).resolvedModule;
if (
!lucyResolvedModule ||
!isVirtualLucyFilePath(lucyResolvedModule.resolvedFileName)
) {
return lucyResolvedModule;
}

const resolvedFileName = ensureRealLucyFilePath(lucyResolvedModule.resolvedFileName);
info(logger, 'Resolved', name, 'to Lucy file', resolvedFileName);

// This will trigger projectService.host.readFile which is patched
const scriptInfo = projectService.getOrCreateScriptInfoForNormalizedPath(
typescript.server.toNormalizedPath(resolvedFileName),
false
);

if(!scriptInfo) {
info(logger, 'Was able to create scriptInfo');
return;
}

const snapshot = scriptInfo.getSnapshot();
if(!snapshot) {
return undefined;
}

const resolvedLucyModule: ts.ResolvedModuleFull = {
extension: ts.Extension.Dts,
resolvedFileName
};
return resolvedLucyModule;
}

return function resolveLucyModuleNames(
moduleNames: string[],
containingFile: string,
reusedNames: string[] | undefined,
redirectedReference: ts.ResolvedProjectReference | undefined,
compilerOptions: ts.CompilerOptions
): Array<ts.ResolvedModule | undefined> {
info(logger, `Resolving ${moduleNames.join(',')}`);
const r = resolveModuleNames(
moduleNames,
containingFile,
reusedNames,
redirectedReference,
compilerOptions
) || Array.from<undefined>(Array(moduleNames.length));

return r.map((moduleName, idx) => {
const fileName = moduleNames[idx];
if (moduleName || !ensureRealLucyFilePath(fileName).endsWith('.lucy')) {
return moduleName;
}

const resolvedModule = resolveModuleName(fileName, containingFile, compilerOptions);
return resolvedModule;
});
};
}
29 changes: 29 additions & 0 deletions src/project_service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import type { ProgramState } from './state';
import { isLucyFilePath } from './file.js';
import { info } from './logger.js';

export function createHostReadFile(state: ProgramState) {
const { logger, projectService } = state;

const readFile = projectService.host.readFile;
return function(path: string) {
if(!isLucyFilePath(path)) {
return readFile(path);
}

const lucyCode = readFile(path) || '';
try {
// TODO compile

return `
interface CreateMachineRet {
one: string;
}
export function createMachine(): CreateMachineRet
`.trim();
} catch(err) {
info(logger, `Error loading Lucy file ${path}`);
// TODO debug(logger, err)
}
}
}
25 changes: 25 additions & 0 deletions src/state.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import * as ts from 'typescript/lib/tsserverlibrary';
import { createLucySys } from './lucy-sys.js';

export interface ProgramState {
languageServiceHost: ts.LanguageServiceHost;
logger: ts.server.Logger;
moduleCache: Map<string, ts.ResolvedModule>;
projectService: ts.server.ProjectService;
sys: ts.System;
typescript: typeof ts;
}

export function createProgramState(typescript: typeof ts, info: ts.server.PluginCreateInfo): ProgramState {
info.project.projectService
const state: ProgramState = {
moduleCache: new Map<string, ts.ResolvedModule>(),
languageServiceHost: info.languageServiceHost,
logger: info.project.projectService.logger,
projectService: info.project.projectService,
sys: createLucySys(),
typescript
};

return state;
}
13 changes: 13 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"compilerOptions": {
"target": "ES2020",
"module": "CommonJS",
"preserveConstEnums": true,
"outDir": "lib",
"sourceMap": true,
"declaration": true,
"moduleResolution": "node"
},
"include": ["src/**/*"],
"exclude": ["node_modules"]
}