Fix CI failure by restoring original Makefile and adding package management

- Restore original Makefile to root for CI compatibility
- Add Makefile.packages for building both pg17-full and pg17 packages
- Update README to document dual package structure and build process
- Fixes 'Build WASM 🔧' CI failure caused by yarn not found in emscripten container

Co-Authored-By: Dan Lynch <[email protected]>

Author: pyramation

Makefile

@@ -1,31 +1,88 @@
-.PHONY: install build clean test pg17-full pg17
+WASM_OUT_DIR := wasm
+WASM_OUT_NAME := libpg-query
+WASM_MODULE_NAME := PgQueryModule
+LIBPG_QUERY_REPO := https://github.com/pganalyze/libpg_query.git
+LIBPG_QUERY_TAG := 17-6.1.0
 
-# Default target
-all: install build
+CACHE_DIR := .cache
 
-# Install dependencies in both packages
-install:
-	cd pg17-full && yarn install
-	cd pg17 && yarn install
+OS ?= $(shell uname -s)
+ARCH ?= $(shell uname -m)
 
-# Build both packages
-build:
-	cd pg17-full && yarn build
-	cd pg17 && yarn build
+ifdef EMSCRIPTEN
+PLATFORM := emscripten
+else ifeq ($(OS),Darwin)
+PLATFORM := darwin
+else ifeq ($(OS),Linux)
+PLATFORM := linux
+else
+$(error Unsupported platform: $(OS))
+endif
 
-# Clean both packages
-clean:
-	cd pg17-full && yarn clean || true
-	cd pg17 && yarn clean || true
+ifdef EMSCRIPTEN
+ARCH := wasm
+endif
+
+PLATFORM_ARCH := $(PLATFORM)-$(ARCH)
+SRC_FILES := src/wasm_wrapper.c
+LIBPG_QUERY_DIR := $(CACHE_DIR)/$(PLATFORM_ARCH)/libpg_query/$(LIBPG_QUERY_TAG)
+LIBPG_QUERY_ARCHIVE := $(LIBPG_QUERY_DIR)/libpg_query.a
+LIBPG_QUERY_HEADER := $(LIBPG_QUERY_DIR)/pg_query.h
+CXXFLAGS := -O3
+
+ifdef EMSCRIPTEN
+OUT_FILES := $(foreach EXT,.js .wasm,$(WASM_OUT_DIR)/$(WASM_OUT_NAME)$(EXT))
+else
+$(error Native builds are no longer supported. Use EMSCRIPTEN=1 for WASM builds only.)
+endif
+
+# Clone libpg_query source (lives in CACHE_DIR) 
+$(LIBPG_QUERY_DIR):
+	mkdir -p $(CACHE_DIR)
+	git clone -b $(LIBPG_QUERY_TAG) --single-branch $(LIBPG_QUERY_REPO) $(LIBPG_QUERY_DIR)
+	
+$(LIBPG_QUERY_HEADER): $(LIBPG_QUERY_DIR)
+
+# Build libpg_query
+$(LIBPG_QUERY_ARCHIVE): $(LIBPG_QUERY_DIR)
+	cd $(LIBPG_QUERY_DIR); $(MAKE) build
+
+# Build libpg-query-node WASM module
+$(OUT_FILES): $(LIBPG_QUERY_ARCHIVE) $(LIBPG_QUERY_HEADER) $(SRC_FILES)
+ifdef EMSCRIPTEN
+	$(CC) \
+		-v \
+		$(CXXFLAGS) \
+		-I$(LIBPG_QUERY_DIR) \
+		-I$(LIBPG_QUERY_DIR)/vendor \
+		-L$(LIBPG_QUERY_DIR) \
+		-sEXPORTED_FUNCTIONS="['_malloc','_free','_wasm_parse_query','_wasm_parse_query_protobuf','_wasm_get_protobuf_len','_wasm_deparse_protobuf','_wasm_parse_plpgsql','_wasm_fingerprint','_wasm_normalize_query','_wasm_scan','_wasm_parse_query_detailed','_wasm_free_detailed_result','_wasm_free_string']" \
+		-sEXPORTED_RUNTIME_METHODS="['lengthBytesUTF8','stringToUTF8','UTF8ToString','HEAPU8','HEAPU32']" \
+		-sEXPORT_NAME="$(WASM_MODULE_NAME)" \
+		-sENVIRONMENT="web,node" \
+		-sMODULARIZE=1 \
+		-sEXPORT_ES6=1 \
+		-sALLOW_MEMORY_GROWTH=1 \
+		-lpg_query \
+		-o $@ \
+		$(SRC_FILES)
+else
+$(error Native builds are no longer supported. Use EMSCRIPTEN=1 for WASM builds only.)
+endif
 
-# Test both packages
-test:
-	cd pg17-full && yarn test
-	cd pg17 && yarn test
+# Commands
+build: $(OUT_FILES)
+
+build-cache: $(LIBPG_QUERY_ARCHIVE) $(LIBPG_QUERY_HEADER)
+
+rebuild: clean build
+
+rebuild-cache: clean-cache build-cache
+
+clean:
+	-@ rm -r $(OUT_FILES) > /dev/null 2>&1
 
-# Individual package targets
-pg17-full:
-	cd pg17-full && yarn && yarn build
+clean-cache:
+	-@ rm -rf $(LIBPG_QUERY_DIR)
 
-pg17:
-	cd pg17 && yarn && yarn build
+.PHONY: build build-cache rebuild rebuild-cache clean clean-cache

Makefile.packages

@@ -0,0 +1,34 @@
+.PHONY: install build clean test pg17-full pg17
+
+# Package management Makefile for pg17-full and pg17 packages
+# Use this to build both packages: make -f Makefile.packages build
+
+# Default target
+all: install build
+
+# Install dependencies in both packages
+install:
+	cd pg17-full && yarn install
+	cd pg17 && yarn install
+
+# Build both packages using their individual build scripts
+build:
+	cd pg17-full && yarn build
+	cd pg17 && yarn build
+
+# Clean both packages
+clean:
+	cd pg17-full && yarn clean || true
+	cd pg17 && yarn clean || true
+
+# Test both packages
+test:
+	cd pg17-full && yarn test
+	cd pg17 && yarn test
+
+# Individual package targets
+pg17-full:
+	cd pg17-full && yarn && yarn build
+
+pg17:
+	cd pg17 && yarn && yarn build

README.md

@@ -1,4 +1,4 @@
-# libpg-query
+# libpg-query-node
 
 <p align="center" width="100%">
     <img src="https://github.com/launchql/libpg-query-node/assets/545047/5fd420cc-cdc6-4211-9b0f-0eca8321ba72" alt="webincubator" width="100">
@@ -17,28 +17,100 @@
 
 The real PostgreSQL parser for Node.js, powered by **WebAssembly (WASM)** for true cross-platform compatibility.
 
-A WASM-based PostgreSQL query parser that provides the same functionality as the native PostgreSQL parser without requiring native compilation or platform-specific binaries. Primarily used for the node.js parser and deparser [pgsql-parser](https://github.com/pyramation/pgsql-parser).
+This repository provides two distinct packages:
+
+- **pg17-full**: Complete PostgreSQL parser with all functionality including scan, deparse, and protobuf support
+- **pg17**: Minimal PostgreSQL parser focused on core parsing, fingerprinting, and normalization (excludes scan/deparse functionality)
+
+Both packages are WASM-based PostgreSQL query parsers that provide the same core functionality as the native PostgreSQL parser without requiring native compilation or platform-specific binaries.
 
 
 ## Table of Contents
 
-1. [Installation](#installation)
-2. [Usage](#usage)
-3. [Build Instructions](#build-instructions)
-4. [Testing](#testing)
-5. [Versions](#versions)
-6. [Related Projects](#related-projects)
-7. [Credit](#credit)
+1. [Package Structure](#package-structure)
+2. [Installation](#installation)
+3. [Building Both Packages](#building-both-packages)
+4. [Usage](#usage)
+5. [Build Instructions](#build-instructions)
+6. [Testing](#testing)
+7. [Versions](#versions)
+8. [Related Projects](#related-projects)
+9. [Credit](#credit)
+
+## Package Structure
+
+This repository contains two packages:
 
+### pg17-full (Complete Package)
+- Full PostgreSQL parsing functionality
+- Includes scan, deparse, and protobuf support
+- Larger package size due to complete feature set
+- Located in `./pg17-full/`
+
+### pg17 (Minimal Package)  
+- Core PostgreSQL parsing functionality
+- Excludes scan, deparse, and protobuf features
+- Smaller package size optimized for basic parsing needs
+- Located in `./pg17/`
 
 ## Installation
 
-```sh
-npm install libpg-query
+Choose the package that best fits your needs:
+
+**For full functionality:**
+```bash
+cd pg17-full
+npm install
+```
+
+**For minimal parsing:**
+```bash
+cd pg17
+npm install
+```
+
+## Building Both Packages
+
+Use the package management Makefile to build both packages:
+
+```bash
+# Install dependencies for both packages
+make -f Makefile.packages install
+
+# Build both packages
+make -f Makefile.packages build
+
+# Clean both packages
+make -f Makefile.packages clean
+
+# Test both packages
+make -f Makefile.packages test
 ```
 
 ## Usage
 
+### Basic Examples
+
+**pg17-full (Complete Package):**
+```typescript
+import { parse, deparse, scan } from './pg17-full/src/index.js';
+
+const result = await parse('SELECT * FROM users WHERE active = true');
+const sql = await deparse(result);
+const tokens = await scan('SELECT * FROM users');
+console.log(JSON.stringify(result, null, 2));
+```
+
+**pg17 (Minimal Package):**
+```typescript
+import { parse, fingerprint, normalize } from './pg17/src/index.js';
+
+const result = await parse('SELECT * FROM users WHERE active = true');
+const fp = await fingerprint('SELECT * FROM users');
+const norm = await normalize('SELECT * FROM users');
+console.log(JSON.stringify(result, null, 2));
+```
+
 ### `parse(query: string): Promise<ParseResult>`
 
 Parses the SQL and returns a Promise for the parse tree. May reject with a parse error.