Fix CI build failure and add main package publishing support

- Add --disable-thread-safety flag to fix PostgreSQL configure in Emscripten
- Add publishMainPackage function to support @pgsql/parser publishing
- Add CLI options --main and --publish-as for main package publishing
- Add npm scripts for convenient main package publishing
- Update documentation with dual publishing strategy examples
- Support independent versioning for main package vs version packages

Co-Authored-By: Dan Lynch <pyramation@gmail.com>

Author: devin-ai-integration[bot]

PUBLISHING.md

@@ -221,3 +221,73 @@ node scripts/publish-versions.js --versions "16" --set-version "1.9.0"
 ```
 
 This allows different PostgreSQL versions to have different semantic versions while maintaining the dist-tag system.
+
+## Main Package Publishing (@pgsql/parser)
+
+The main libpg-query package can be published as @pgsql/parser with comprehensive functionality including parse, deparse, parsePlPgSQL, scan, fingerprint, and normalize capabilities.
+
+### Publishing Main Package Examples
+
+#### Example 1: Publishing Main Package (Dry Run)
+```bash
+# Test publishing main package as @pgsql/parser
+node scripts/publish-versions.js --dry-run --main
+```
+
+**What happens:**
+1. Script backs up `libpg-query/package.json`
+2. Temporarily changes name from `libpg-query` to `@pgsql/parser`
+3. Keeps existing version (currently 17.3.3)
+4. Runs `pnpm build` in `libpg-query/`
+5. Would publish with `pnpm publish`
+6. Restores original `package.json`
+
+**Result:** Users can install with `npm install @pgsql/parser`
+
+#### Example 2: Publishing with Custom Version
+```bash
+# Publish main package with version 1.0.0
+node scripts/publish-versions.js --main --set-version "1.0.0"
+```
+
+#### Example 3: Publishing with Custom Name
+```bash
+# Publish under different organization
+node scripts/publish-versions.js --main --publish-as "@myorg/pg-parser"
+```
+
+### Dual Publishing Strategy
+
+This setup enables a dual publishing strategy:
+
+1. **Version-specific packages** (parse-only functionality):
+   - `libpg-query@pg13`, `libpg-query@pg14`, etc.
+   - Limited to parsing capabilities
+   - PostgreSQL version-specific
+
+2. **Comprehensive package** (full functionality):
+   - `@pgsql/parser` 
+   - Complete feature set: parse, deparse, parsePlPgSQL, scan, fingerprint, normalize
+   - Latest PostgreSQL version support
+
+### Installation After Publishing
+
+```bash
+# Install comprehensive parser
+npm install @pgsql/parser
+
+# Install version-specific parser
+npm install libpg-query@pg17
+```
+
+### NPM Scripts for Main Package
+
+The following convenience scripts are available for main package publishing:
+
+```bash
+# Test main package publishing (dry-run)
+pnpm publish:main:dry-run
+
+# Publish main package
+pnpm publish:main
+```

package.json

@@ -16,9 +16,11 @@
     "analyze:sizes": "node scripts/analyze-sizes.js",
     "publish:dry-run": "node scripts/publish-versions.js --dry-run",
     "publish:versions": "node scripts/publish-versions.js",
-    "publish:help": "node scripts/publish-versions.js --help"
+    "publish:help": "node scripts/publish-versions.js --help",
+    "publish:main": "node scripts/publish-versions.js --main",
+    "publish:main:dry-run": "node scripts/publish-versions.js --dry-run --main"
   },
   "devDependencies": {
     "@types/node": "^20.0.0"
   }
-}    
+}      

scripts/publish-versions.js

@@ -103,6 +103,71 @@ function publishPackage(packageInfo, options = {}) {
   }
 }
 
+function publishMainPackage(options = {}) {
+  const { dryRun = false, customVersion = null, skipBuild = false, publishAs = '@pgsql/parser' } = options;
+  
+  console.log(`🚀 libpg-query Main Package Publisher (${publishAs})`);
+  console.log('='.repeat(50));
+  
+  if (dryRun) {
+    console.log('🔍 DRY RUN MODE - No actual publishing will occur\n');
+  }
+  
+  const mainPackagePath = './libpg-query';
+  const packageJsonPath = path.join(mainPackagePath, 'package.json');
+  
+  if (!fs.existsSync(packageJsonPath)) {
+    console.log('❌ Main package not found at ./libpg-query');
+    return;
+  }
+  
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  const publishVersion = customVersion || packageJson.version;
+  
+  console.log(`Publishing main package as: ${publishAs}`);
+  console.log(`Version: ${publishVersion}`);
+  console.log(`Original name: ${packageJson.name}`);
+  
+  if (dryRun) {
+    console.log(`[DRY RUN] Would modify package.json: name -> "${publishAs}", version -> "${publishVersion}"`);
+    if (!skipBuild) {
+      console.log(`[DRY RUN] Would run: cd ${mainPackagePath} && pnpm build`);
+    }
+    console.log(`[DRY RUN] Would run: cd ${mainPackagePath} && pnpm publish`);
+    return;
+  }
+  
+  let backupPath;
+  try {
+    backupPath = backupPackageJson(packageJsonPath);
+    
+    const modifiedPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+    modifiedPackageJson.name = publishAs;
+    if (customVersion) {
+      modifiedPackageJson.version = customVersion;
+    }
+    fs.writeFileSync(packageJsonPath, JSON.stringify(modifiedPackageJson, null, 2) + '\n');
+    
+    if (!skipBuild) {
+      console.log(`Building main package...`);
+      execSync('pnpm build', { cwd: mainPackagePath, stdio: 'inherit' });
+    }
+    
+    console.log(`Publishing as ${publishAs}...`);
+    execSync('pnpm publish', { cwd: mainPackagePath, stdio: 'inherit' });
+    
+    console.log(`✅ Successfully published ${publishAs} (${publishVersion})`);
+    
+  } catch (error) {
+    console.error(`❌ Failed to publish main package:`, error.message);
+    throw error;
+  } finally {
+    if (backupPath) {
+      restorePackageJson(packageJsonPath);
+    }
+  }
+}
+
 function publishAllVersions(options = {}) {
   const { dryRun = false, versions = [], customVersion = null, skipBuild = false } = options;
 
@@ -171,7 +236,9 @@ function main() {
     dryRun: args.includes('--dry-run') || args.includes('-d'),
     versions: [],
     customVersion: null,
-    skipBuild: args.includes('--skip-build')
+    skipBuild: args.includes('--skip-build'),
+    publishMain: args.includes('--main'),
+    publishAs: '@pgsql/parser'
   };
 
   const versionIndex = args.findIndex(arg => arg === '--versions' || arg === '-v');
@@ -184,14 +251,19 @@ function main() {
     options.customVersion = args[customVersionIndex + 1];
   }
 
+  const publishAsIndex = args.findIndex(arg => arg === '--publish-as');
+  if (publishAsIndex !== -1 && args[publishAsIndex + 1]) {
+    options.publishAs = args[publishAsIndex + 1];
+  }
+  
   if (args.includes('--help') || args.includes('-h')) {
     console.log(`
 libpg-query Multi-Version Publisher
 
 DESCRIPTION:
   Publishes multiple PostgreSQL version packages under the unified "libpg-query" 
-  name using dist-tags. Handles workspace naming conflicts by temporarily 
-  modifying package.json files during publishing.
+  name using dist-tags, and supports publishing the main package as @pgsql/parser.
+  Handles workspace naming conflicts by temporarily modifying package.json files.
 
 USAGE:
   node scripts/publish-versions.js [options]
@@ -201,6 +273,8 @@ OPTIONS:
   --versions, -v <list>      Comma-separated list of versions to publish (e.g., "13,16,17")
   --set-version <version>    Set custom version for all packages (e.g., "1.2.3")
   --skip-build               Skip the build step (assumes packages are already built)
+  --main                     Publish the main libpg-query package as @pgsql/parser
+  --publish-as <name>        Custom package name for main package (default: @pgsql/parser)
   --help, -h                 Show this help message
 
 EXAMPLES:
@@ -218,6 +292,15 @@ EXAMPLES:
   
   # Skip build step (if already built)
   node scripts/publish-versions.js --versions "17" --skip-build
+  
+  # Publish main package as @pgsql/parser (dry-run)
+  node scripts/publish-versions.js --dry-run --main
+  
+  # Publish main package with custom version
+  node scripts/publish-versions.js --main --set-version "1.0.0"
+  
+  # Publish main package with custom name
+  node scripts/publish-versions.js --main --publish-as "@myorg/pg-parser"
 
 PUBLISHING WORKFLOW:
   1. Script discovers all version packages in versions/ directory
@@ -245,11 +328,15 @@ SAFETY FEATURES:
     return;
   }
 
-  publishAllVersions(options);
+  if (options.publishMain) {
+    publishMainPackage(options);
+  } else {
+    publishAllVersions(options);
+  }
 }
 
 if (require.main === module) {
   main();
 }
 
-module.exports = { publishAllVersions, getVersionPackages };
+module.exports = { publishAllVersions, publishMainPackage, getVersionPackages };

versions/13/patches/emscripten_disable_spinlocks.patch

@@ -5,9 +5,9 @@
 
  override PG_CONFIGURE_FLAGS += -q --without-readline --without-zlib
 +
-+# Disable spinlocks when building with Emscripten
++# Disable spinlocks and thread safety when building with Emscripten
 +ifdef EMSCRIPTEN
-+override PG_CONFIGURE_FLAGS += --disable-spinlocks
++override PG_CONFIGURE_FLAGS += --disable-spinlocks --disable-thread-safety
 +endif
 
  override TEST_CFLAGS += -I. -I./vendor -g
@@ -21,4 +21,4 @@
 +endif
  	echo "#undef PG_INT128_TYPE" >> ./src/postgres/include/pg_config.h
  	# Support gcc earlier than 4.6.0 without reconfiguring
- 	echo "#undef HAVE__STATIC_ASSERT" >> ./src/postgres/include/pg_config.h
+ 	echo "#undef HAVE__STATIC_ASSERT" >> ./src/postgres/include/pg_config.h