Merge pull request #27 from launchql/feat/oses

pyramation · web-flow · commit de56423c8d0b · 2025-06-21T02:55:40.000-07:00
OSes
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -6,8 +6,6 @@ on:
 jobs:
   parser-tests:
     runs-on: ubuntu-latest
-    container: node:20.12.0-alpine
-
     steps:
       - name: checkout
         uses: actions/checkout@v3
diff --git a/README.md b/README.md
@@ -150,6 +150,9 @@ Our latest is built with `17-latest` branch from libpg_query
 | PostgreSQL Major Version | libpg_query | Status              | npm tag |
 |--------------------------|-------------|---------------------|---------|
 | 17                       | 17-latest   | Active Development  | `latest` |
+| 16                       | (n/a)       | Not supported       |
+| 15                       | (n/a)       | Not supported       |
+| 14                       | (n/a)       | Not supported       |
 | 13                       | 13-latest   | Only Critical Fixes | `13.16.0` |
 | 12                       | (n/a)       | Not supported       |
 | 11                       | (n/a)       | Not supported       |
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "prettier": "^3.0.2",
     "rimraf": "4.4.1",
     "strip-ansi": "^6",
-    "symlink-workspace": "^1.9.0",
+    "symlink-workspace": "^1.10.0",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.1.6"
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -24,10 +24,10 @@
   },
   "scripts": {
     "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "rimraf dist",
     "prepare": "npm run build",
-    "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
     "dev": "ts-node src/index",
     "lint": "eslint . --fix",
     "test": "jest",
diff --git a/packages/cli/src/commands/protogen/cli.ts b/packages/cli/src/commands/protogen/cli.ts
@@ -44,6 +44,7 @@ export default async (argv: CommandOptions): Promise<CommandOptions> => {
     await replaceTextInProtoJS(argv.outFile, argv.originalPackageName, argv.newPackageName);
     console.log('All operations completed successfully.');
   } catch (error) {
+    // @ts-ignore
     console.error('An error occurred:', error.message);
   }
 
diff --git a/packages/deparser/package.json b/packages/deparser/package.json
@@ -21,10 +21,10 @@
   },
   "scripts": {
     "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "rimraf dist",
     "prepare": "npm run build",
-    "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
     "kitchen-sink": "npm run fixtures && npm run fixtures:kitchen-sink",
     "fixtures:kitchen-sink": "ts-node scripts/make-kitchen-sink.ts",
     "fixtures:ast": "ts-node scripts/make-fixtures-ast.ts",
diff --git a/packages/deparser/scripts/make-fixtures-ast.ts b/packages/deparser/scripts/make-fixtures-ast.ts
@@ -17,7 +17,7 @@ function ensureDir(dir: string) {
 
 ensureDir(OUT_DIR);
 
-const fixtures = globSync(`${FIXTURE_DIR}/**/*.sql`);
+const fixtures = globSync(path.join(FIXTURE_DIR, '**/*.sql'));
 
 async function main() {
   for (const fixturePath of fixtures) {
diff --git a/packages/deparser/scripts/make-fixtures-sql.ts b/packages/deparser/scripts/make-fixtures-sql.ts
@@ -16,7 +16,7 @@ function ensureDir(dir: string) {
 
 ensureDir(OUT_DIR);
 
-const fixtures = globSync(`${FIXTURE_DIR}/**/*.sql`);
+const fixtures = globSync(path.join(FIXTURE_DIR, '**/*.sql'));
 
 async function main() {
   for (const fixturePath of fixtures) {
diff --git a/packages/deparser/scripts/make-fixtures.ts b/packages/deparser/scripts/make-fixtures.ts
@@ -16,7 +16,7 @@ function ensureDir(dir: string) {
 
 ensureDir(OUT_DIR);
 
-const fixtures = globSync(`${FIXTURE_DIR}/**/*.sql`);
+const fixtures = globSync(path.join(FIXTURE_DIR, '**/*.sql'));
 
 async function main() {
   // Collect deparsed SQL in a single JSON
diff --git a/packages/deparser/scripts/make-kitchen-sink.ts b/packages/deparser/scripts/make-kitchen-sink.ts
@@ -27,7 +27,7 @@ it('${name}', async () => {
 `
 };
 
-const fixtures = globSync(`${FIXTURE_DIR}/**/*.sql`);
+const fixtures = globSync(path.join(FIXTURE_DIR, '**/*.sql'));
 
 async function main() {
   for (const fixturePath of fixtures) {
diff --git a/packages/enums/package.json b/packages/enums/package.json
@@ -21,10 +21,10 @@
   },
   "scripts": {
     "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "rimraf dist",
     "prepare": "npm run build",
-    "build": "npm run build:proto && npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "npm run build:proto && npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
     "build:proto": "ts-node scripts/pg-proto-parser",
     "lint": "eslint . --fix",
     "test": "jest",
diff --git a/packages/parser/README.md b/packages/parser/README.md
@@ -150,6 +150,9 @@ Our latest is built with `17-latest` branch from libpg_query
 | PostgreSQL Major Version | libpg_query | Status              | npm tag |
 |--------------------------|-------------|---------------------|---------|
 | 17                       | 17-latest   | Active Development  | `latest` |
+| 16                       | (n/a)       | Not supported       |
+| 15                       | (n/a)       | Not supported       |
+| 14                       | (n/a)       | Not supported       |
 | 13                       | 13-latest   | Only Critical Fixes | `13.16.0` |
 | 12                       | (n/a)       | Not supported       |
 | 11                       | (n/a)       | Not supported       |
diff --git a/packages/parser/package.json b/packages/parser/package.json
@@ -24,10 +24,10 @@
   },
   "scripts": {
     "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "rimraf dist",
     "prepare": "npm run build",
-    "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
     "lint": "eslint . --fix",
     "test": "jest",
     "test:watch": "jest --watch"
diff --git a/packages/proto-parser/package.json b/packages/proto-parser/package.json
@@ -20,10 +20,10 @@
   },
   "scripts": {
     "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "rimraf dist",
     "prepare": "npm run build",
-    "build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
     "lint": "eslint . --fix",
     "test": "jest",
     "test:watch": "jest --watch",
diff --git a/packages/proto-parser/src/options/defaults.ts b/packages/proto-parser/src/options/defaults.ts
@@ -1,10 +1,11 @@
 import deepmerge from 'deepmerge';
+import { join } from 'path';
 
 import { PgProtoParserOptions } from "./types";
 
 // Define default options outside of the class
 export const defaultPgProtoParserOptions: PgProtoParserOptions = {
-    outDir: `${process.cwd()}/out`,
+    outDir: join(process.cwd(), 'out'),
     includeHeader: true,
     exclude: [],
     utils: {
diff --git a/packages/proto-parser/test-utils/index.ts b/packages/proto-parser/test-utils/index.ts
@@ -29,7 +29,7 @@ export const expectAstsCodeToEqual = (testAst: any, expectAst: any) => {
 }
 
 export const readFilesFromDir = (outDir: string) => 
-    glob(outDir + '**/*').map(file => ({ file: basename(file), code: readFileSync(file, 'utf-8') }));
+    glob(join(outDir, '**/*')).map(file => ({ file: basename(file), code: readFileSync(file, 'utf-8') }));
    
 export const FIXTURES_DIR = resolve(join(__dirname, '../../../__fixtures__/'));
 
diff --git a/packages/transform/package.json b/packages/transform/package.json
@@ -21,10 +21,10 @@
   },
   "scripts": {
     "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "rimraf dist",
     "prepare": "npm run build",
-    "build": "npm run build:proto && npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "npm run build:proto && npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
     "build:proto": "ts-node scripts/pg-proto-parser",
     "lint": "eslint . --fix",
     "test": "jest",
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -21,10 +21,10 @@
   },
   "scripts": {
     "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "rimraf dist",
     "prepare": "npm run build",
-    "build": "npm run build:proto && npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "npm run build:proto && npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
     "build:proto": "ts-node scripts/pg-proto-parser",
     "lint": "eslint . --fix",
     "test": "jest",
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -21,10 +21,10 @@
   },
   "scripts": {
     "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist/**",
+    "clean": "rimraf dist",
     "prepare": "npm run build",
-    "build": "npm run build:proto && npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
-    "build:dev": "npm run clean; tsc --declarationMap; tsc -p tsconfig.esm.json; npm run copy",
+    "build": "npm run build:proto && npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
     "build:proto": "ts-node scripts/pg-proto-parser",
     "lint": "eslint . --fix",
     "test": "jest",

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ export default async (argv: CommandOptions): Promise<CommandOptions> => {`
`44`	`44`	`await replaceTextInProtoJS(argv.outFile, argv.originalPackageName, argv.newPackageName);`
`45`	`45`	`console.log('All operations completed successfully.');`
`46`	`46`	`} catch (error) {`
	`47`	`+ // @ts-ignore`
`47`	`48`	`console.error('An error occurred:', error.message);`
`48`	`49`	`}`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ it('${name}', async () => {`
`27`	`27`	`
`28`	`28`	`};`
`29`	`29`
`30`		-const fixtures = globSync(`${FIXTURE_DIR}/*/.sql`);
	`30`	`+const fixtures = globSync(path.join(FIXTURE_DIR, '*/.sql'));`
`31`	`31`
`32`	`32`	`async function main() {`
`33`	`33`	`for (const fixturePath of fixtures) {`