ts-const-value-transformer 0.10.0 → 0.10.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.10.1
+
+- Fix for transformation with langage-server
+
 ## v0.10.0
 
 - Fix to avoid hosting parameters

package/dist/createPortalTransformerWithTsLs.mjs

@@ -29,7 +29,8 @@ function createPortalTransformerImpl(options, ts) {
     const cwd = options.cwd ?? process.cwd();
     const cacheBaseSource = options.cacheBaseSource ?? false;
     const cacheResult = options.cacheResult ?? true;
-    const workspaceFolder = path.dirname(path.resolve(cwd, project));
+    const projectFullPath = path.resolve(cwd, project);
+    const workspaceFolder = path.dirname(projectFullPath);
     const client = new TsLspClient(commandArray[0], commandArray.slice(1));
     let isInitialized = false;
     const cache = new Map();
@@ -83,6 +84,10 @@ function createPortalTransformerImpl(options, ts) {
             }
             if (!isInitialized) {
                 client.waitForFirstDiagnosticsReceived();
+                const diag = client.getCachedDiagnostics(projectFullPath);
+                if (diag && diag.length > 0) {
+                    throw new Error('Error for tsconfig:\n' + diag.map((d) => d.message).join('\n'));
+                }
                 isInitialized = true;
             }
             const result = transformAndPrintSourceWithMap(sourceFile, client, getSourceFile, fileName, { ...options, ...individualOptions, ts }, rawSourceMap);

package/dist/lsp/TsLspClient.d.mts

@@ -6,6 +6,7 @@ export default class TsLspClient extends SyncLspClient {
     constructor(command: string, argv: string[], encoding?: BufferEncoding);
     initialize(rootDir: string): void;
     waitForFirstDiagnosticsReceived(): void;
+    getCachedDiagnostics(fileName: string): Diagnostic[] | null;
     openDocument(fileName: string, content: string): void;
     closeDocument(fileName: string): void;
     /** Only returns first string from contents */
@@ -17,13 +18,13 @@ export default class TsLspClient extends SyncLspClient {
         lineEnd: number;
         posEnd: number;
     } | null;
-    getTypeDefitition(fileName: string, line: number, pos: number): {
+    getTypeDefitition(fileName: string, line: number, pos: number): Array<{
         fileName: string;
         lineStart: number;
         posStart: number;
         lineEnd: number;
         posEnd: number;
-    } | null;
+    }>;
     sendReplaceText(fileName: string, lineStart: number, posStart: number, lineEnd: number, posEnd: number, text: string): void;
     exit(): void;
 }

package/dist/lsp/TsLspClient.mjs

@@ -3,7 +3,6 @@ import { fileURLToPath, pathToFileURL } from 'url';
 // @internal
 import version from '../version.mjs';
 import SyncLspClient from './SyncLspClient.mjs';
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 export default class TsLspClient extends SyncLspClient {
     _supportPullDiagnostics;
     _firstDiagnosticsReceived;
@@ -93,6 +92,12 @@ export default class TsLspClient extends SyncLspClient {
             }
         }
     }
+    getCachedDiagnostics(fileName) {
+        const uri = pathToFileURL(fileName).href;
+        return this._fileForDiagnostics.has(uri)
+            ? this._fileForDiagnostics.get(uri)
+            : null;
+    }
     openDocument(fileName, content) {
         const uri = pathToFileURL(fileName).href;
         this._fileForDiagnostics.delete(uri);
@@ -221,24 +226,22 @@ export default class TsLspClient extends SyncLspClient {
         const r = this.receiveMessage(id);
         // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
         if (!r) {
-            return null;
-        }
-        /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-        const loc = r instanceof Array ? r[0] : r;
-        // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-        if (!loc) {
-            return null;
+            return [];
         }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        const defFileName = fileURLToPath(loc.uri);
-        return {
-            fileName: defFileName,
-            lineStart: loc.range.start.line,
-            posStart: loc.range.start.character,
-            lineEnd: loc.range.end.line,
-            posEnd: loc.range.end.character,
-        };
-        /* eslint-enable @typescript-eslint/no-unsafe-assignment */
+        const a = r instanceof Array ? r : [r];
+        return a.map((loc) => {
+            /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+            const defFileName = fileURLToPath(loc.uri);
+            return {
+                fileName: defFileName,
+                lineStart: loc.range.start.line,
+                posStart: loc.range.start.character,
+                lineEnd: loc.range.end.line,
+                posEnd: loc.range.end.character,
+            };
+            /* eslint-enable @typescript-eslint/no-unsafe-assignment */
+        });
     }
     sendReplaceText(fileName, lineStart, posStart, lineEnd, posEnd, text) {
         const uri = pathToFileURL(fileName).href;

package/dist/lsp/lspTransformerUtil.mjs

@@ -1,4 +1,3 @@
-import * as ts from 'typescript';
 const HOVER_CACHE_SYMBOL = Symbol('hover-cache');
 const TYPE_CACHE_SYMBOL = Symbol('type-cache');
 const READONLY_CACHE_SYMBOL = Symbol('read-only-cache');
@@ -22,7 +21,7 @@ function addToPositionByText(pos, text) {
     }
     return r;
 }
-function getNodeFromPosition(sourceFile, line, pos) {
+function getNodeFromPosition(sourceFile, line, pos, tsInstance) {
     const lines = sourceFile.getLineStarts();
     if (line >= lines.length) {
         line = lines.length - 1;
@@ -36,7 +35,7 @@ function getNodeFromPosition(sourceFile, line, pos) {
         if (node.pos <= nodePos && node.end >= nodePos) {
             foundNode = node;
         }
-        ts.visitEachChild(node, (n) => visit(n, node), undefined);
+        tsInstance.visitEachChild(node, (n) => visit(n, node), undefined);
         return node;
     }
 }
@@ -101,7 +100,10 @@ function hoverToTypeString(node, hover, tsInstance) {
             }
         }
     }
-    else if (node && tsInstance.isIdentifier(node) && isFunctionLike(hover)) {
+    else if (
+    // For node is null, always check function-like type string (used by retrieveActualTypeString)
+    (!node || tsInstance.isIdentifier(node)) &&
+        isFunctionLike(hover)) {
         if (hover.startsWith('function')) {
             hover = hover.slice(8);
         }
@@ -197,10 +199,12 @@ function hoverToFunctionReturnTypeString(node, hover, tsInstance) {
     }
 }
 function retrieveActualTypeString(fileName, pos, tsIntance, client) {
-    const def = client.getTypeDefitition(fileName, pos.line, pos.column);
-    if (!def) {
+    const defs = client.getTypeDefitition(fileName, pos.line, pos.column);
+    // For enum types (not enum-literal types), the returned definitons will be multiple
+    if (defs.length !== 1) {
         return ['', ''];
     }
+    const def = defs[0];
     const o = client.hoverForPosition(def.fileName, def.lineEnd, def.posEnd);
     const code = hoverResultToCode(o);
     return [code, hoverToTypeString(null, code, tsIntance)];
@@ -220,7 +224,8 @@ function typeStringToLiteralType(typeString, tsInstance) {
         return tsInstance.TypeFlags.BooleanLiteral;
     }
     // string literal
-    if (/^(["']).*\1$/.test(typeString)) {
+    if (/^"(?:[^"\\]|\\.)*"$/.test(typeString) ||
+        /^'(?:[^'\\]|\\.)*'$/.test(typeString)) {
         return tsInstance.TypeFlags.StringLiteral;
     }
     // number / bigint
@@ -373,7 +378,7 @@ function determineIfPropertyIsReadonly(node, sourceFile, tsInstance, client, get
         return false;
     }
     let def;
-    if (ts.isElementAccessExpression(node)) {
+    if (tsInstance.isElementAccessExpression(node)) {
         def = performActualPropertyForElementAccessExpression(node, sourceFile, tsInstance, client, (pos) => client.getDefinition(sourceFile.fileName, pos.line, pos.column));
     }
     else {
@@ -384,7 +389,7 @@ function determineIfPropertyIsReadonly(node, sourceFile, tsInstance, client, get
         return false;
     }
     const defSource = getSourceFile(def.fileName);
-    const expr = getNodeFromPosition(defSource, def.lineEnd, def.posEnd);
+    const expr = getNodeFromPosition(defSource, def.lineEnd, def.posEnd, tsInstance);
     if (!expr) {
         return false;
     }
@@ -392,28 +397,28 @@ function determineIfPropertyIsReadonly(node, sourceFile, tsInstance, client, get
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
     while (parent) {
         // For interface/type literal
-        if (ts.isPropertySignature(parent)) {
-            if (parent.modifiers?.some((mod) => mod.kind === ts.SyntaxKind.ReadonlyKeyword)) {
+        if (tsInstance.isPropertySignature(parent)) {
+            if (parent.modifiers?.some((mod) => mod.kind === tsInstance.SyntaxKind.ReadonlyKeyword)) {
                 return true;
             }
             break;
         }
-        else if (ts.isAsExpression(parent)) {
+        else if (tsInstance.isAsExpression(parent)) {
             // For definition, 'as const' should be readonly
-            if (parent.type.getText(sourceFile) === 'const') {
+            if (parent.type.getText(defSource) === 'const') {
                 return true;
             }
         }
-        else if (ts.isEnumMember(parent)) {
+        else if (tsInstance.isEnumMember(parent)) {
             // Enum member is readonly
             return true;
         }
-        else if (ts.isVariableDeclaration(parent)) {
+        else if (tsInstance.isVariableDeclaration(parent)) {
             if (isParentNode(parent.name, expr, parent)) {
                 const p = parent.parent;
                 // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-                if (p && ts.isVariableDeclarationList(p)) {
-                    return (p.flags & ts.NodeFlags.Const) !== 0;
+                if (p && tsInstance.isVariableDeclarationList(p)) {
+                    return (p.flags & tsInstance.NodeFlags.Const) !== 0;
                 }
             }
             // Reached to top level
@@ -431,32 +436,36 @@ export function isExpressionReadonly(node, sourceFile, tsInstance, client, getSo
     if (node[READONLY_CACHE_SYMBOL] != null) {
         return node[READONLY_CACHE_SYMBOL];
     }
-    if (!ts.isIdentifier(node) &&
-        !ts.isPropertyAccessExpression(node) &&
-        !ts.isElementAccessExpression(node)) {
+    if (!tsInstance.isIdentifier(node) &&
+        !tsInstance.isPropertyAccessExpression(node) &&
+        !tsInstance.isElementAccessExpression(node)) {
         return null;
     }
-    if (ts.isIdentifier(node)) {
+    let isReadonly;
+    if (tsInstance.isIdentifier(node)) {
         if (
         // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
         node.parent &&
             isUndefinedIdentifier(node, node.parent, sourceFile, tsInstance, client)) {
-            return true;
+            isReadonly = true;
         }
-        let hover = getHoverFromNode(node, sourceFile, tsInstance, client);
-        if (hover.startsWith('(alias)')) {
-            hover = hover.slice(7).trim();
-            const lines = hover.split(/\r?\n/g);
-            if (lines.length >= 2 && /^import\b/.test(lines[1].trim())) {
-                return true;
+        else {
+            const hover = getHoverFromNode(node, sourceFile, tsInstance, client);
+            if (hover.startsWith('(alias)')) {
+                // Aliased symbols should be import-ed symbols, which are readonly
+                isReadonly = true;
+            }
+            else {
+                isReadonly = /^const\b/.test(hover);
             }
         }
-        const isReadonly = /^const\b/.test(hover);
-        node[READONLY_CACHE_SYMBOL] =
-            isReadonly;
-        return isReadonly;
     }
-    return determineIfPropertyIsReadonly(node, sourceFile, tsInstance, client, getSourceFile);
+    else {
+        isReadonly = determineIfPropertyIsReadonly(node, sourceFile, tsInstance, client, getSourceFile);
+    }
+    node[READONLY_CACHE_SYMBOL] =
+        isReadonly;
+    return isReadonly;
     // const typeString = nodeToTypeString(node, sourceFile, tsInstance, client);
     // if (typeStringToLiteralType(typeString, tsInstance) === 0) {
     //   return null;

package/dist/version.d.mts

@@ -1,2 +1,2 @@
-declare const _default: "0.10.0";
+declare const _default: "0.10.1";
 export default _default;

package/dist/version.mjs

@@ -1 +1 @@
-export default '0.10.0';
+export default '0.10.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-const-value-transformer",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "engines": {
     "node": ">=20.19.3"
   },