ts-const-value-transformer 0.7.0 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 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
+
 ## v0.7.0
 
 - Fix for printing 'minus numeric value' and 'void 0', and remove using `ts.createPrinter`

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;
         },
     };
@@ -133,7 +144,9 @@ export default async function createPortalTransformer(options = {}) {
     let ts;
     if (options.typescript != null) {
         if (typeof options.typescript === 'string') {
-            ts = (await import(options.typescript));
+            // Use eval to avoid webpack warnings
+            // eslint-disable-next-line no-eval
+            ts = (await eval('import(options.typescript)'));
         }
         else {
             ts = options.typescript;

package/dist/loader.mjs

@@ -1,19 +1,22 @@
 import * as path from 'path';
-import { createPortalTransformerSync, } from './createPortalTransformer.mjs';
+import createPortalTransformer, {} from './createPortalTransformer.mjs';
 const transformerMap = new Map();
 const loader = function (content, sourceMap) {
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions, @typescript-eslint/strict-boolean-expressions
     this.cacheable && this.cacheable();
     this.async();
-    void Promise.resolve().then(() => {
+    void (async () => {
         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 = createPortalTransformerSync({
+                transformer = await createPortalTransformer({
                     cwd: path.dirname(this.resourcePath),
                     ...options,
+                    cacheResult,
                 });
                 transformerMap.set(project, transformer);
             }
@@ -23,6 +26,6 @@ const loader = function (content, sourceMap) {
         catch (e) {
             this.callback(e);
         }
-    });
+    })();
 };
 export default loader;

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) {
@@ -252,10 +251,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 +260,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,13 +433,7 @@ 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];

package/dist/version.d.mts

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

package/dist/version.mjs

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

package/package.json

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