simpler options

pyramation · pyramation · commit 8d78fca46d5b · 2024-03-30T23:09:24.000-07:00
diff --git a/packages/enums-json/package.json b/packages/enums-json/package.json
@@ -65,7 +65,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "esprima": "4.0.1",
     "jest": "^29.5.0",
-    "pg-proto-parser": "^1.12.2",
+    "pg-proto-parser": "^1.15.1",
     "prettier": "^2.8.7",
     "rimraf": "5.0.5",
     "ts-jest": "^29.1.0",
diff --git a/packages/enums-json/scripts/pg-proto-parser.ts b/packages/enums-json/scripts/pg-proto-parser.ts
@@ -1,23 +1,17 @@
-import { PgProtoParser } from 'pg-proto-parser';
+import { PgProtoParser, PgProtoParserOptions } from 'pg-proto-parser';
 import { resolve, join } from 'path';
 
 const inFile: string = join(__dirname, '../../../pg_query.proto');
 const outDir: string = resolve(join(__dirname, '../src'));
 
-const parser = new PgProtoParser(inFile, {
+const options: PgProtoParserOptions = {
   outDir,
-  includeAstHelpers: false,
-  includeHeader: true,
-  includeEnums: false,
-  includeEnumsJSON: true,
-  includeEnumTypeUnion: false,
-  includeTypes: false,
-  includeUtils: false,
-  optionalFields: true,
-  removeUndefinedAt0: true,
-  parser: {
-    keepCase: false
+  enums: {
+    json: {
+      enabled: true
+    }
   }
-});
+};
+const parser = new PgProtoParser(inFile, options);
 
 parser.write();
diff --git a/packages/enums/package.json b/packages/enums/package.json
@@ -65,7 +65,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "esprima": "4.0.1",
     "jest": "^29.5.0",
-    "pg-proto-parser": "^1.12.2",
+    "pg-proto-parser": "^1.15.1",
     "prettier": "^2.8.7",
     "rimraf": "5.0.5",
     "ts-jest": "^29.1.0",
diff --git a/packages/enums/scripts/pg-proto-parser.ts b/packages/enums/scripts/pg-proto-parser.ts
@@ -1,23 +1,15 @@
-import { PgProtoParser } from 'pg-proto-parser';
+import { PgProtoParser, PgProtoParserOptions } from 'pg-proto-parser';
 import { resolve, join } from 'path';
 
 const inFile: string = join(__dirname, '../../../pg_query.proto');
 const outDir: string = resolve(join(__dirname, '../src'));
 
-const parser = new PgProtoParser(inFile, {
+const options: PgProtoParserOptions = {
   outDir,
-  includeAstHelpers: false,
-  includeHeader: true,
-  includeEnums: true,
-  includeEnumsJSON: false,
-  includeEnumTypeUnion: false,
-  includeTypes: false,
-  includeUtils: false,
-  optionalFields: true,
-  removeUndefinedAt0: true,
-  parser: {
-    keepCase: false
+  enums: {
+    enabled: true
   }
-});
+};
+const parser = new PgProtoParser(inFile, options);
 
 parser.write();
diff --git a/packages/enums/src/enums.ts b/packages/enums/src/enums.ts
@@ -1,5 +1,5 @@
 /**
-* This file was automatically generated by pg-proto-parser@1.12.2.
+* This file was automatically generated by pg-proto-parser@1.15.1.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
diff --git a/packages/enums/types/enums.d.ts b/packages/enums/types/enums.d.ts
@@ -1,5 +1,5 @@
 /**
-* This file was automatically generated by pg-proto-parser@1.12.2.
+* This file was automatically generated by pg-proto-parser@1.15.1.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -64,7 +64,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "esprima": "4.0.1",
     "jest": "^29.5.0",
-    "pg-proto-parser": "^1.12.2",
+    "pg-proto-parser": "^1.15.1",
     "prettier": "^2.8.7",
     "rimraf": "5.0.5",
     "ts-jest": "^29.1.0",
diff --git a/packages/types/scripts/pg-proto-parser.ts b/packages/types/scripts/pg-proto-parser.ts
@@ -1,23 +1,16 @@
-import { PgProtoParser } from 'pg-proto-parser';
+import { PgProtoParser, PgProtoParserOptions } from 'pg-proto-parser';
 import { resolve, join } from 'path';
 
 const inFile: string = join(__dirname, '../../../pg_query.proto');
 const outDir: string = resolve(join(__dirname, '../src'));
 
-const parser = new PgProtoParser(inFile, {
+const options: PgProtoParserOptions = {
   outDir,
-  includeAstHelpers: false,
-  includeHeader: true,
-  includeEnums: false,
-  includeEnumsJSON: false,
-  includeEnumTypeUnion: true,
-  includeTypes: true,
-  includeUtils: false,
-  optionalFields: true,
-  removeUndefinedAt0: true,
-  parser: {
-    keepCase: false
+  types: {
+    enabled: true,
+    enumsAsTypeUnion: true
   }
-});
+};
+const parser = new PgProtoParser(inFile, options);
 
 parser.write();
diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts
@@ -1,5 +1,5 @@
 /**
-* This file was automatically generated by pg-proto-parser@1.12.2.
+* This file was automatically generated by pg-proto-parser@1.15.1.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
diff --git a/packages/types/src/wrapped.ts b/packages/types/src/wrapped.ts
@@ -1,5 +1,5 @@
 /**
-* This file was automatically generated by pg-proto-parser@1.12.2.
+* This file was automatically generated by pg-proto-parser@1.15.1.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
diff --git a/packages/types/types/types.d.ts b/packages/types/types/types.d.ts
@@ -1,5 +1,5 @@
 /**
-* This file was automatically generated by pg-proto-parser@1.12.2.
+* This file was automatically generated by pg-proto-parser@1.15.1.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
diff --git a/packages/types/types/wrapped.d.ts b/packages/types/types/wrapped.d.ts
@@ -1,5 +1,5 @@
 /**
-* This file was automatically generated by pg-proto-parser@1.12.2.
+* This file was automatically generated by pg-proto-parser@1.15.1.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -65,7 +65,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "esprima": "4.0.1",
     "jest": "^29.5.0",
-    "pg-proto-parser": "^1.12.2",
+    "pg-proto-parser": "^1.15.1",
     "pgsql-deparser": "^13.12.0",
     "prettier": "^2.8.7",
     "rimraf": "5.0.5",
diff --git a/packages/utils/scripts/pg-proto-parser.ts b/packages/utils/scripts/pg-proto-parser.ts
@@ -1,25 +1,18 @@
-import { PgProtoParser } from 'pg-proto-parser';
+import { PgProtoParser, PgProtoParserOptions } from 'pg-proto-parser';
 import { resolve, join } from 'path';
 
 const inFile: string = join(__dirname, '../../../pg_query.proto');
 const outDir: string = resolve(join(__dirname, '../src'));
 
-const parser = new PgProtoParser(inFile, {
+const options: PgProtoParserOptions = {
   outDir,
-  includeAstHelpers: true,
-  astHelperTypeSource: '@pgsql/types/types/wrapped',
-  includeHeader: true,
-  includeEnums: false,
-  includeEnumsJSON: false,
-  includeEnumTypeUnion: false,
-  includeTypes: false,
-  includeUtils: true,
-  optionalFields: true,
-  removeUndefinedAt0: true,
-
-  parser: {
-    keepCase: false
+  utils: {
+    astHelpers: {
+      enabled: true,
+      typeSource: '@pgsql/types/types/wrapped'
+    }
   }
-});
+};
+const parser = new PgProtoParser(inFile, options);
 
 parser.write();
diff --git a/packages/utils/src/asts.ts b/packages/utils/src/asts.ts
@@ -1,5 +1,5 @@
 /**
-* This file was automatically generated by pg-proto-parser@1.12.2.
+* This file was automatically generated by pg-proto-parser@1.15.1.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
diff --git a/packages/utils/types/asts.d.ts b/packages/utils/types/asts.d.ts
@@ -1,5 +1,5 @@
 /**
-* This file was automatically generated by pg-proto-parser@1.12.2.
+* This file was automatically generated by pg-proto-parser@1.15.1.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
diff --git a/yarn.lock b/yarn.lock
@@ -2429,6 +2429,11 @@ deep-is@^0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
+deepmerge@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
 deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
@@ -4843,6 +4848,11 @@ neo-async@^2.6.2:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+nested-obj@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/nested-obj/-/nested-obj-0.0.1.tgz#efe1da127c3d00826fa10ec25673e0f9ec1224fd"
+  integrity sha512-kB1WKTng+IePQhZVs1UXtFaHBx4QEM5a0XKGAzYfCKvdx5DhNjCytNDWMUGpNNpHLotln+tiwcA52kWCIgGq1Q==
+
 node-addon-api@^1.6.3:
   version "1.7.2"
   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
@@ -5438,17 +5448,19 @@ path-type@^4.0.0:
   resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pg-proto-parser@^1.12.2:
-  version "1.12.2"
-  resolved "https://registry.npmjs.org/pg-proto-parser/-/pg-proto-parser-1.12.2.tgz#5406ea3b74cce475710b5f78a91b1f7fe49d00a2"
-  integrity sha512-KfhrfF2xHm39xsc0Ym/9YYnvijfTe32I8hh+t3kqvSWyKG87bVFNv4GVZA1MgBmKFo7Py/WLR2tkvsi+nHwdsg==
+pg-proto-parser@^1.15.1:
+  version "1.15.1"
+  resolved "https://registry.npmjs.org/pg-proto-parser/-/pg-proto-parser-1.15.1.tgz#9eb5df924b4aa90045a22db7dd2b1f36e055f646"
+  integrity sha512-TE0JbOl0J+xnjR+pT8iMmtOxTEtoPFuD3J7xNPhvZ01bPL6KFYqaROx3aAb59jrEaVsLtcV8oBfO3J2l7tkKoA==
   dependencies:
     "@babel/generator" "^7.23.6"
     "@babel/parser" "^7.23.6"
     "@babel/traverse" "7.24.1"
     "@babel/types" "7.24.0"
     "@launchql/protobufjs" "6.11.7"
     case "1.6.3"
+    deepmerge "4.3.1"
+    nested-obj "^0.0.1"
     node-html-parser "6.1.12"
     recast "0.23.6"
 
