ts-const-value-transformer 0.8.0 → 0.8.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.8.1
+
+- Fix to parenthesize expression with multi-line
+- Reduce mappings to only have position changings
+- Minor changes in development environment
+
 ## v0.8.0
 
 - Add `cacheResult` option (enable by default but disable by default for webpack loader)

package/dist/transform.mjs

@@ -174,10 +174,17 @@ function visitNodeAndReplaceIfNeeded(node, parent, sourceFile, program, options,
         else {
             return node;
         }
-        const result = ts.addSyntheticTrailingComment(newNode, ts.SyntaxKind.MultiLineCommentTrivia, ` ${node.getText(sourceFile)} `);
+        const originalSource = node.getText(sourceFile);
+        const comment = ` ${originalSource.replace(/\/\*/g, ' *').replace(/\*\//g, '* ')} `;
+        let result = ts.addSyntheticTrailingComment(newNode, ts.SyntaxKind.MultiLineCommentTrivia, comment);
+        newSource = `${newSource} /*${comment}*/`;
+        if (/[\r\n]/m.test(originalSource)) {
+            result = ts.factory.createParenthesizedExpression(result);
+            newSource = `(${newSource})`;
+        }
         ts.setTextRange(result, node);
         result[SYMBOL_ORIGINAL_NODE_DATA] = [
-            node.getText(sourceFile),
+            originalSource,
             newSource,
             node.pos,
             node.end,
@@ -438,13 +445,7 @@ function printSourceImpl(tsInstance, sourceFile, originalSourceName, mapGenerato
 function printNode(tsInstance, baseSource, sourceFile, node, posContext, originalSourceName, mapGenerator) {
     const originalNodeData = node[SYMBOL_ORIGINAL_NODE_DATA];
     if (originalNodeData) {
-        let result = originalNodeData[1];
-        const comments = tsInstance.getSyntheticTrailingComments(node);
-        if (comments) {
-            for (const comment of comments) {
-                result += ` /*${comment.text}*/`;
-            }
-        }
+        const result = originalNodeData[1];
         const old = originalNodeData[0];
         const oldFull = baseSource.substring(originalNodeData[2], originalNodeData[3]);
         const i = oldFull.lastIndexOf(old);
@@ -452,22 +453,12 @@ function printNode(tsInstance, baseSource, sourceFile, node, posContext, origina
         const newText = i < 0
             ? result
             : oldFull.substring(0, i) + result + oldFull.substring(i + old.length);
-        if (mapGenerator) {
-            if (posContext.pos < node.pos) {
-                addMappingForCurrent();
-            }
-            posContext.pos = node.pos;
-            if (leadingUnchanged > 0) {
-                addMappingForCurrent();
-            }
-            posContext.pos = node.pos + leadingUnchanged;
-            addMappingForCurrent(old);
-        }
+        posContext.pos = node.pos + leadingUnchanged;
+        addMappingForCurrent(old);
         posContext.diff += result.length - old.length;
         posContext.pos += old.length;
         addMappingForCurrent();
         posContext.pos = node.end;
-        addMappingForCurrent();
         return newText;
     }
     let output = '';
@@ -479,14 +470,12 @@ function printNode(tsInstance, baseSource, sourceFile, node, posContext, origina
             if (child.pos > node.pos) {
                 const text = baseSource.substring(node.pos, child.pos);
                 output += text;
-                addMappingForCurrent();
                 posContext.pos = child.pos;
             }
         }
         else if (child.pos > lastChildPos) {
             const text = baseSource.substring(lastChildPos, child.pos);
             output += text;
-            addMappingForCurrent();
             posContext.pos = child.pos;
         }
         output += printNode(tsInstance, baseSource, sourceFile, child, posContext, originalSourceName, mapGenerator);
@@ -495,29 +484,19 @@ function printNode(tsInstance, baseSource, sourceFile, node, posContext, origina
     }, void 0);
     if (!headPrinted) {
         output = baseSource.substring(node.pos, node.end);
-        addMappingForCurrent();
         posContext.pos = node.end;
     }
     else if (lastChildPos < node.end) {
         const text = baseSource.substring(lastChildPos, node.end);
         output += text;
-        addMappingForCurrent();
         posContext.pos = node.end;
     }
-    addMappingForCurrent();
     return output;
     function addMappingForCurrent(name) {
         const original = positionToLineAndColumn(sourceFile, posContext.pos, 0);
         if (original.line !== posContext.lastLine) {
             posContext.diff = 0;
             posContext.lastLine = original.line;
-            if (mapGenerator && original.column > 0) {
-                mapGenerator.addMapping({
-                    original: { line: original.line, column: 0 },
-                    generated: { line: original.line, column: 0 },
-                    source: originalSourceName,
-                });
-            }
         }
         if (mapGenerator) {
             mapGenerator.addMapping({

package/dist/version.d.mts

@@ -1,2 +1,2 @@
-declare const _default: "0.8.0";
+declare const _default: "0.8.1";
 export default _default;

package/dist/version.mjs

@@ -1 +1 @@
-export default '0.8.0';
+export default '0.8.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-const-value-transformer",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "engines": {
     "node": ">=20.19.3"
   },
@@ -90,10 +90,13 @@
     "version": "node ./tools/updateVersion.mjs ./src/main/version.mts && git add -A ./src/main/version.mts"
   },
   "devDependencies": {
+    "@babel/preset-typescript": "^7.28.5",
+    "@swc/core": "^1.15.10",
     "@types/jest": "^30.0.0",
     "@types/node": "~20.19.22",
     "@typescript-eslint/eslint-plugin": "^8.48.0",
     "@typescript-eslint/parser": "^8.48.0",
+    "babel-loader": "^10.0.0",
     "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import-x": "^4.16.1",
@@ -103,6 +106,7 @@
     "memfs": "^4.51.0",
     "neostandard": "^0.12.2",
     "prettier": "^3.6.2",
+    "swc-loader": "^0.2.7",
     "ts-jest": "^29.4.5",
     "ts-loader": "^9.5.4",
     "ts-patch": "^3.3.0",