any types and LICENSE

Author: pyramation

packages/deparser/config/deparser-versions.json

@@ -35,7 +35,7 @@
     "types": "index.d.ts",
     "description": "PostgreSQL AST Deparser",
     "scripts": {
-      "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
+      "copy": "copyfiles -f ../../../../LICENSE README.md package.json dist",
       "clean": "rimraf dist",
       "prepare": "npm run build",
       "build": "npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy"

packages/deparser/scripts/strip-direct-transformer-types.ts

@@ -19,7 +19,6 @@ const OUTPUT_DIR = 'versions/direct';
 // Types to strip and replace with 'any'
 const TYPES_TO_STRIP = [
   'PG13', 'PG14', 'PG15', 'PG16', 'PG17',
-  'V13Types', 'V14Types', 'V15Types', 'V16Types', 'V17Types',
   'TransformerContext'
 ];
 

packages/deparser/scripts/strip-transformer-types.ts

@@ -19,10 +19,17 @@ const OUTPUT_DIR = 'versions';
 // Types to strip and replace with 'any'
 const TYPES_TO_STRIP = [
   'PG13', 'PG14', 'PG15', 'PG16', 'PG17',
-  'V13Types', 'V14Types', 'V15Types', 'V16Types', 'V17Types',
   'TransformerContext'
 ];
 
+// Check if a type text contains any of the types to strip
+function shouldStripType(typeText: string): boolean {
+  return TYPES_TO_STRIP.some(type => {
+    // Check for exact match or namespace usage (e.g., PG13.Something)
+    return typeText === type || typeText.startsWith(type + '.') || typeText.includes('.' + type);
+  });
+}
+
 function stripTypes(sourceFile: ts.SourceFile): string {
   const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
 
@@ -60,8 +67,8 @@ function stripTypes(sourceFile: ts.SourceFile): string {
 
       // Replace parameter type annotations
       if (ts.isParameter(node) && node.type) {
-        const typeText = node.type.getText();
-        if (TYPES_TO_STRIP.some(type => typeText.includes(type))) {
+        const typeText = node.type.getText(sourceFile);
+        if (shouldStripType(typeText)) {
           return ts.factory.updateParameterDeclaration(
             node,
             node.modifiers,
@@ -77,7 +84,7 @@ function stripTypes(sourceFile: ts.SourceFile): string {
       // Replace variable type annotations
       if (ts.isVariableDeclaration(node) && node.type) {
         const typeText = node.type.getText();
-        if (TYPES_TO_STRIP.some(type => typeText.includes(type))) {
+        if (shouldStripType(typeText)) {
           return ts.factory.updateVariableDeclaration(
             node,
             node.name,
@@ -91,7 +98,7 @@ function stripTypes(sourceFile: ts.SourceFile): string {
       // Replace return type annotations
       if ((ts.isMethodDeclaration(node) || ts.isFunctionDeclaration(node) || ts.isArrowFunction(node)) && node.type) {
         const typeText = node.type.getText();
-        if (TYPES_TO_STRIP.some(type => typeText.includes(type))) {
+        if (shouldStripType(typeText)) {
           if (ts.isMethodDeclaration(node)) {
             return ts.factory.updateMethodDeclaration(
               node,
@@ -131,16 +138,20 @@ function stripTypes(sourceFile: ts.SourceFile): string {
 
       // Replace type assertions
       if (ts.isAsExpression(node)) {
-        const typeText = node.type.getText();
-        if (TYPES_TO_STRIP.some(type => typeText.includes(type))) {
-          return node.expression; // Remove the assertion entirely
+        const typeText = node.type.getText(sourceFile);
+        if (shouldStripType(typeText)) {
+          // Replace with 'as any' instead of removing entirely
+          return ts.factory.createAsExpression(
+            node.expression,
+            ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)
+          );
         }
       }
 
       // Handle property declarations with types
       if (ts.isPropertyDeclaration(node) && node.type) {
         const typeText = node.type.getText();
-        if (TYPES_TO_STRIP.some(type => typeText.includes(type))) {
+        if (shouldStripType(typeText)) {
           return ts.factory.updatePropertyDeclaration(
             node,
             node.modifiers,
@@ -155,15 +166,15 @@ function stripTypes(sourceFile: ts.SourceFile): string {
       // Handle interface declarations - remove them entirely
       if (ts.isInterfaceDeclaration(node)) {
         const name = node.name.getText();
-        if (TYPES_TO_STRIP.some(type => name.includes(type))) {
+        if (shouldStripType(name)) {
           return undefined;
         }
       }
 
       // Handle type alias declarations - remove them entirely
       if (ts.isTypeAliasDeclaration(node)) {
         const name = node.name.getText();
-        if (TYPES_TO_STRIP.some(type => name.includes(type))) {
+        if (shouldStripType(name)) {
           return undefined;
         }
       }
@@ -183,9 +194,24 @@ function stripTypes(sourceFile: ts.SourceFile): string {
  * DO NOT EDIT - Generated by strip-transformer-types.ts
  */
 
+  // @ts-nocheck
 `;
 
-  return headerComment + printer.printFile(transformedSourceFile);
+  let output = headerComment + printer.printFile(transformedSourceFile);
+  
+  // Post-process to catch any remaining type references
+  // This is a fallback for cases where the AST visitor might miss some nodes
+  
+  // Replace type assertions (e.g., "as PG14.ParseResult")
+  output = output.replace(/\bas\s+PG\d+\.[A-Za-z_][A-Za-z0-9_]*\b/g, 'as any');
+  
+  // Replace parameter types (e.g., "node: PG13.ParseResult")
+  output = output.replace(/:\s*PG\d+\.[A-Za-z_][A-Za-z0-9_]*\b/g, ': any');
+  
+  // Replace TransformerContext type
+  output = output.replace(/:\s*TransformerContext\b/g, ': any');
+  
+  return output;
 }
 
 function processFile(filePath: string): void {