Skip to content

Commit 9937fbe

Browse files
author
kirsanium
committed
feat: allow comments by removing them
1 parent adb50a2 commit 9937fbe

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

examples/js/endpoints.yaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@
1717

1818
- path: /v1/collections/:collectionId/categories/count
1919
get:
20-
query: >-
20+
query: |-
21+
-- comment
2122
SELECT COUNT(DISTINCT s.category_id) AS counter
23+
-- comment2
2224
FROM collections_series cs
25+
-- comment3
2326
JOIN series s
2427
ON s.id = cs.series_id
2528
WHERE cs.collection_id = :p.collectionId
@@ -30,7 +33,7 @@
3033

3134
- path: /v1/categories
3235
get_list:
33-
query: >-
36+
query: |-
3437
SELECT id
3538
, name
3639
, name_ru
@@ -42,7 +45,7 @@
4245
id:
4346
type: integer
4447
post:
45-
query: >-
48+
query: |-
4649
INSERT
4750
INTO categories
4851
( name
@@ -67,7 +70,7 @@
6770

6871
- path: /v1/categories/:categoryId
6972
get:
70-
query: >-
73+
query: |-
7174
SELECT id
7275
, name
7376
, name_ru
@@ -80,7 +83,7 @@
8083
id:
8184
type: integer
8285
put:
83-
query: >-
86+
query: |-
8487
UPDATE categories
8588
SET name = :b.name
8689
, name_ru = :b.name_ru
@@ -89,7 +92,7 @@
8992
, updated_by = :b.user_id
9093
WHERE id = :p.categoryId
9194
delete:
92-
query: >-
95+
query: |-
9396
DELETE
9497
FROM categories
9598
WHERE id = :p.categoryId

src/cli.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ const createApp = async (destDir, lang) => {
8989
fs.copyFileSync(`${__dirname}/templates/app.${ext}`, resultFile)
9090
};
9191

92+
const removeComments = (query) => query.replace(/--.*\n/g, '');
93+
9294
// "SELECT *\n FROM foo" => "SELECT * FROM foo"
9395
const flattenQuery = (query) => query.replace(/\n[ ]*/g, ' ');
9496

@@ -142,7 +144,7 @@ const createEndpoints = async (destDir, lang, config) => {
142144
queries = Object.values(method.aggregated_queries)
143145
}
144146
queries.forEach(query => {
145-
const sql = removePlaceholders(flattenQuery(query));
147+
const sql = removePlaceholders(flattenQuery(removeComments(query)));
146148
console.log(`\t${sql}`);
147149
})
148150
});
@@ -196,7 +198,7 @@ const createEndpoints = async (destDir, lang, config) => {
196198

197199
// "SELECT *\n FROM foo WHERE id = :p.id" => "SELECT * FROM foo WHERE id = :id"
198200
"formatQuery": (query) => {
199-
return removePlaceholders(flattenQuery(query));
201+
return removePlaceholders(flattenQuery(removeComments(query)));
200202
},
201203

202204
// (used only with Golang)

0 commit comments

Comments
 (0)