ts-const-value-transformer 0.7.1 → 0.8.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # 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)
+- Fix for treating `as` expression (don't see parent expression)
+- Fix some codes
+
 ## v0.7.1
 
 - Fix to wrap import() with eval to prevent from static analysis

package/README.md

@@ -279,7 +279,7 @@ See [Transform options](#transform-options).
 Creates 'portal transformer', which can be used the transformer easily from the code which does not use TypeScript Compiler API.  
 The return object has `transform` method with signature: `(content: string, fileName: string, sourceMap?: string | RawSourceMap | null, options?: TransformOptions) => [newSource: string, newSourceMap: RawSourceMap | undefined]`. You can call to transform TypeScript source code. (Note that this API does not transpile to JavaScript; the output code is still TypeScript code.)
 
-`CreatePortalTransformerOptions` has a following signature. Also, `ignoreFiles` of `TransformOptions` can be used.
+`CreatePortalTransformerOptions` has a following signature. Also, `TransformOptions` fields, including `ignoreFiles`, can be used.
 
 ```ts
 interface CreatePortalTransformerOptions extends TransformOptions {
@@ -297,6 +297,8 @@ interface CreatePortalTransformerOptions extends TransformOptions {
   recreateProgramOnTransformCount?: number;
   /** Specifies to cache base (original) source code for check if the input is changed. Default is false. */
   cacheBaseSource?: boolean;
+  /** Specifies to cache result source code. Default is true (false for webpack loader). If the latter process has cache system, specifies false to reduce memory usage. */
+  cacheResult?: boolean;
 }
 ```
 

package/dist/createPortalTransformer.d.mts

@@ -16,6 +16,8 @@ export interface CreatePortalTransformerOptions extends TransformOptions {
     recreateProgramOnTransformCount?: number;
     /** Specifies to cache base (original) source code for check if the input is changed. Default is false. */
     cacheBaseSource?: boolean;
+    /** Specifies to cache result source code. Default is true (false for webpack loader). If the latter process has cache system, specifies false to reduce memory usage. */
+    cacheResult?: boolean;
 }
 export type PortalTransformerResult = [
     newSource: string | null,

package/dist/createPortalTransformer.mjs

@@ -21,6 +21,7 @@ function createPortalTransformerImpl(options, ts) {
     const cwd = options.cwd ?? process.cwd();
     const recreateProgramOnTransformCount = options.recreateProgramOnTransformCount ?? 0;
     const cacheBaseSource = options.cacheBaseSource ?? false;
+    const cacheResult = options.cacheResult ?? true;
     // eslint-disable-next-line @typescript-eslint/unbound-method
     const foundConfigPath = ts.findConfigFile(cwd, ts.sys.fileExists, project);
     if (foundConfigPath == null) {
@@ -72,11 +73,13 @@ function createPortalTransformerImpl(options, ts) {
         recreateProgram,
         transform: (content, fileName, sourceMap, individualOptions) => {
             const individualOptionsJson = optionsToString(individualOptions ?? {});
-            const cachedData = cache.get(fileName);
-            if (cachedData &&
-                (!cacheBaseSource || cachedData.content === content) &&
-                cachedData.optJson === individualOptionsJson) {
-                return cachedData.result;
+            if (cacheResult) {
+                const cachedData = cache.get(fileName);
+                if (cachedData &&
+                    (!cacheBaseSource || cachedData.content === content) &&
+                    cachedData.optJson === individualOptionsJson) {
+                    return cachedData.result;
+                }
             }
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const rawSourceMap = typeof sourceMap === 'string'
@@ -115,11 +118,19 @@ function createPortalTransformerImpl(options, ts) {
             else {
                 result = printSourceWithMap(transformedSource, fileName, rawSourceMap, ts);
             }
-            cache.set(fileName, {
-                content: cacheBaseSource ? content : '',
-                optJson: individualOptionsJson,
-                result,
-            });
+            if (cacheResult) {
+                // This forces to concatenate strings into flatten one, to reduce object trees for ConsString
+                void (result[0] | 0);
+                const json = result[1];
+                if (json) {
+                    void (json.mappings | 0);
+                }
+                cache.set(fileName, {
+                    content: cacheBaseSource ? content : '',
+                    optJson: individualOptionsJson,
+                    result,
+                });
+            }
             return result;
         },
     };

package/dist/loader.mjs

@@ -9,11 +9,14 @@ const loader = function (content, sourceMap) {
         try {
             const options = this.getOptions() || {};
             const project = options.project ?? 'tsconfig.json';
+            // Use webpack's cache system by default
+            const cacheResult = options.cacheResult ?? false;
             let transformer = transformerMap.get(project);
             if (!transformer) {
                 transformer = await createPortalTransformer({
                     cwd: path.dirname(this.resourcePath),
                     ...options,
+                    cacheResult,
                 });
                 transformerMap.set(project, transformer);
             }

package/dist/transform.mjs

@@ -41,11 +41,11 @@ export function getIgnoreFilesFunction(ignoreFiles) {
 ////////////////////////////////////////////////////////////////////////////////
 export function transformSource(sourceFile, program, context, options) {
     const requiredOptions = assignDefaultValues(options);
-    return requiredOptions.ts.visitEachChild(sourceFile, (node) => visitNodeChildren(node, sourceFile, sourceFile, program, requiredOptions), context);
+    return requiredOptions.ts.visitEachChild(sourceFile, (node) => visitNodeChildren(node, sourceFile, sourceFile, program, requiredOptions, context), context);
 }
-function visitNodeChildren(node, parent, sourceFile, program, options) {
+function visitNodeChildren(node, parent, sourceFile, program, options, context) {
     const ts = options.ts;
-    const newNode = visitNodeAndReplaceIfNeeded(node, parent, sourceFile, program, options);
+    const newNode = visitNodeAndReplaceIfNeeded(node, parent, sourceFile, program, options, context);
     if (newNode[SYMBOL_ORIGINAL_NODE_DATA]) {
         return newNode;
     }
@@ -57,9 +57,9 @@ function visitNodeChildren(node, parent, sourceFile, program, options) {
         ts.isTypeOnlyExportDeclaration(newNode)) {
         return newNode;
     }
-    return ts.visitEachChild(newNode, (node) => visitNodeChildren(node, newNode, sourceFile, program, options), void 0);
+    return ts.visitEachChild(newNode, (node) => visitNodeChildren(node, newNode, sourceFile, program, options, context), context);
 }
-function visitNodeAndReplaceIfNeeded(node, parent, sourceFile, program, options) {
+function visitNodeAndReplaceIfNeeded(node, parent, sourceFile, program, options, context) {
     const ts = options.ts;
     if (ts.isCallLikeExpression(node)) {
         if (!ts.isExpression(node) ||
@@ -108,8 +108,7 @@ function visitNodeAndReplaceIfNeeded(node, parent, sourceFile, program, options)
         isExternalReference(node, program, options.externalNames, ts)) {
         return node;
     }
-    if (!options.unsafeHoistAsExpresion &&
-        (hasAsExpression(node, ts) || hasParentAsExpression(parent, ts))) {
+    if (!options.unsafeHoistAsExpresion && hasAsExpression(node, ts, context)) {
         return node;
     }
     if (!options.unsafeHoistWritableValues) {
@@ -175,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,
@@ -252,10 +258,7 @@ function isExternalReference(node, program, externalNames, tsInstance) {
     }
     return false;
 }
-function isAsConstExpression(node) {
-    return node.type.getText() === 'const';
-}
-function hasAsExpression(node, tsInstance) {
+function hasAsExpression(node, tsInstance, context) {
     const ts = tsInstance;
     // including 'as const'
     if (ts.isAsExpression(node)) {
@@ -264,29 +267,12 @@ function hasAsExpression(node, tsInstance) {
     let found = false;
     ts.visitEachChild(node, (node) => {
         if (!found) {
-            found = hasAsExpression(node, ts);
+            found = hasAsExpression(node, ts, context);
         }
         return node;
-    }, void 0);
+    }, context);
     return found;
 }
-function hasParentAsExpression(node, tsInstance) {
-    const ts = tsInstance;
-    if (node == null) {
-        return false;
-    }
-    // excluding 'as const'
-    if (ts.isAsExpression(node) && !isAsConstExpression(node)) {
-        return true;
-    }
-    if (ts.isPropertyAccessExpression(node) ||
-        ts.isElementAccessExpression(node)) {
-        if (hasAsExpression(node.expression, ts)) {
-            return true;
-        }
-    }
-    return hasParentAsExpression(node.parent, ts);
-}
 function hasPureAnnotation(node, sourceFile, tsInstance) {
     const ts = tsInstance;
     const fullText = node.getFullText(sourceFile);
@@ -454,24 +440,12 @@ function positionToLineAndColumn(sourceFile, pos, generatedDiff) {
 function printSourceImpl(tsInstance, sourceFile, originalSourceName, mapGenerator) {
     const ts = tsInstance ?? tsNamespace;
     const r = printNode(ts, sourceFile.getFullText(), sourceFile, sourceFile, { pos: 0, diff: 0, lastLine: 0 }, originalSourceName, mapGenerator);
-    // This forces to concatenate strings into flatten one to reduce object trees for ConsString
-    void (r | 0);
-    const json = mapGenerator?.toJSON();
-    if (json) {
-        void (json.mappings | 0);
-    }
-    return [r, json];
+    return [r, mapGenerator?.toJSON()];
 }
 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);
@@ -479,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 = '';
@@ -506,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);
@@ -522,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.7.1";
+declare const _default: "0.8.1";
 export default _default;

package/dist/version.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-const-value-transformer",
-  "version": "0.7.1",
+  "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",