use the entire basename in config file paths

elastic · Nov 19, 2022 · b6541fe · b6541fe
1 parent 0214607
commit b6541fe
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/packages/kbn-es-query/BUILD.bazel b/packages/kbn-es-query/BUILD.bazel
@@ -8,7 +8,7 @@ PKG_REQUIRE_NAME = "@kbn/es-query"
 SOURCE_FILES = glob(
   [
     "**/*.ts",
-    "**/grammar.config.json",
+    "**/grammar.peggy.config.json",
     "**/grammar.peggy",
   ],
   exclude = [

diff --git a/...ery/src/kuery/grammar/grammar.config.json → ...c/kuery/grammar/grammar.peggy.config.json b/...ery/src/kuery/grammar/grammar.config.json → ...c/kuery/grammar/grammar.peggy.config.json
diff --git a/packages/kbn-interpreter/BUILD.bazel b/packages/kbn-interpreter/BUILD.bazel
@@ -9,7 +9,7 @@ SOURCE_FILES = glob(
   [
     "**/*.ts",
     "**/*.js",
-    "**/grammar.config.json",
+    "**/grammar.peggy.config.json",
     "**/grammar.peggy",
   ],
   exclude = [

diff --git a/...preter/src/common/lib/grammar.config.json → .../src/common/lib/grammar.peggy.config.json b/...preter/src/common/lib/grammar.config.json → .../src/common/lib/grammar.peggy.config.json
diff --git a/packages/kbn-peggy/README.mdx b/packages/kbn-peggy/README.mdx
@@ -9,7 +9,7 @@ tags: ['kibana', 'dev', 'contributor', 'operations', 'peggy']
 
 This package wraps the peggy package, exposing a synchronous and async version of the generator which includes two modifications:
 
- 1. When a `path` is provided a `${basename}.config.json` file will be loaded if it exists and it expected to include peggy config options as defined in [the peggy docs](https://peggyjs.org/documentation.html#generating-a-parser-javascript-api). This config will be used when compiling this file
+ 1. When a `path` is provided a `${basename}.config.json` file will be loaded if it exists and is expected to include peggy config options as defined in [the peggy docs](https://peggyjs.org/documentation.html#generating-a-parser-javascript-api). This config will be used when compiling this file
 
 ## Plugins
 These types will automatically be included for plugins.

diff --git a/packages/kbn-peggy/index.ts b/packages/kbn-peggy/index.ts
@@ -65,15 +65,7 @@ export interface Result {
 }
 
 export function findConfigFile(grammarPath: string): Config | undefined {
-  const extname = Path.extname(grammarPath);
-  if (extname !== '.peggy') {
-    throw new Error(`unexpected extension [${extname}], expected ".peggy"`);
-  }
-
-  const path = Path.resolve(
-    Path.dirname(grammarPath),
-    `${Path.basename(grammarPath, extname)}.config.json`
-  );
+  const path = Path.resolve(Path.dirname(grammarPath), `${Path.basename(grammarPath)}.config.json`);
 
   let source;
   let parsed;