barkql 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.cjs +21 -9
  2. package/dist/index.js +21 -9
  3. package/package.json +9 -1
package/dist/index.cjs CHANGED
@@ -46,8 +46,11 @@ function formatValue(value) {
46
46
  function formatArrayValue(values) {
47
47
  return `(${values.map(formatValue).join(" OR ")})`;
48
48
  }
49
- function isQueryChain(value) {
50
- return Array.isArray(value);
49
+ function isBaseQuery(value) {
50
+ return value !== null && typeof value === "object" && !Array.isArray(value);
51
+ }
52
+ function isQueryValue(value) {
53
+ return typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null;
51
54
  }
52
55
  function isOperator(value) {
53
56
  return value === "AND" || value === "OR" || value === "AND NOT" || value === "OR NOT";
@@ -60,24 +63,33 @@ function compileBaseQuery(query2) {
60
63
  if (Array.isArray(value)) {
61
64
  return `${key}:${formatArrayValue(value)}`;
62
65
  }
63
- return `${key}:${formatValue(value)}`;
66
+ if (isQueryValue(value)) {
67
+ return `${key}:${formatValue(value)}`;
68
+ }
69
+ return "";
64
70
  }).join(" AND ");
65
71
  }
66
- function compileDatadogQuery(query2) {
67
- if (isQueryChain(query2)) {
72
+ function compileQueryInternal(query2) {
73
+ if (Array.isArray(query2)) {
68
74
  const parts = [];
69
75
  for (const element of query2) {
70
76
  if (isOperator(element)) {
71
77
  parts.push(element);
72
- } else if (isQueryChain(element)) {
73
- parts.push(compileDatadogQuery(element));
74
- } else {
78
+ } else if (Array.isArray(element)) {
79
+ parts.push(compileQueryInternal(element));
80
+ } else if (isBaseQuery(element)) {
75
81
  parts.push(compileBaseQuery(element));
76
82
  }
77
83
  }
78
84
  return `(${parts.join(" ")})`;
79
85
  }
80
- return compileBaseQuery(query2);
86
+ if (isBaseQuery(query2)) {
87
+ return compileBaseQuery(query2);
88
+ }
89
+ return "";
90
+ }
91
+ function compileDatadogQuery(query2) {
92
+ return compileQueryInternal(query2);
81
93
  }
82
94
  function queryBuilder(initialQuery) {
83
95
  const wrapIfNeeded = (q) => Array.isArray(q) ? q : [q];
package/dist/index.js CHANGED
@@ -11,8 +11,11 @@ function formatValue(value) {
11
11
  function formatArrayValue(values) {
12
12
  return `(${values.map(formatValue).join(" OR ")})`;
13
13
  }
14
- function isQueryChain(value) {
15
- return Array.isArray(value);
14
+ function isBaseQuery(value) {
15
+ return value !== null && typeof value === "object" && !Array.isArray(value);
16
+ }
17
+ function isQueryValue(value) {
18
+ return typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null;
16
19
  }
17
20
  function isOperator(value) {
18
21
  return value === "AND" || value === "OR" || value === "AND NOT" || value === "OR NOT";
@@ -25,24 +28,33 @@ function compileBaseQuery(query2) {
25
28
  if (Array.isArray(value)) {
26
29
  return `${key}:${formatArrayValue(value)}`;
27
30
  }
28
- return `${key}:${formatValue(value)}`;
31
+ if (isQueryValue(value)) {
32
+ return `${key}:${formatValue(value)}`;
33
+ }
34
+ return "";
29
35
  }).join(" AND ");
30
36
  }
31
- function compileDatadogQuery(query2) {
32
- if (isQueryChain(query2)) {
37
+ function compileQueryInternal(query2) {
38
+ if (Array.isArray(query2)) {
33
39
  const parts = [];
34
40
  for (const element of query2) {
35
41
  if (isOperator(element)) {
36
42
  parts.push(element);
37
- } else if (isQueryChain(element)) {
38
- parts.push(compileDatadogQuery(element));
39
- } else {
43
+ } else if (Array.isArray(element)) {
44
+ parts.push(compileQueryInternal(element));
45
+ } else if (isBaseQuery(element)) {
40
46
  parts.push(compileBaseQuery(element));
41
47
  }
42
48
  }
43
49
  return `(${parts.join(" ")})`;
44
50
  }
45
- return compileBaseQuery(query2);
51
+ if (isBaseQuery(query2)) {
52
+ return compileBaseQuery(query2);
53
+ }
54
+ return "";
55
+ }
56
+ function compileDatadogQuery(query2) {
57
+ return compileQueryInternal(query2);
46
58
  }
47
59
  function queryBuilder(initialQuery) {
48
60
  const wrapIfNeeded = (q) => Array.isArray(q) ? q : [q];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "barkql",
3
- "version": "0.1.1",
3
+ "version": "0.1.2",
4
4
  "description": "Type-safe query builder for Datadog metrics",
5
5
  "license": "MIT",
6
6
  "author": "eli0shin",
@@ -45,15 +45,23 @@
45
45
  "type:check": "tsc --noEmit",
46
46
  "format": "prettier --write .",
47
47
  "format:check": "prettier --check .",
48
+ "lint": "eslint .",
49
+ "lint:fix": "eslint . --fix",
48
50
  "prepare": "husky"
49
51
  },
50
52
  "devDependencies": {
51
53
  "@changesets/changelog-github": "^0.5.2",
52
54
  "@changesets/cli": "^2.29.7",
53
55
  "@types/bun": "latest",
56
+ "@typescript-eslint/parser": "^8.50.1",
57
+ "@typescript-eslint/utils": "^8.50.1",
58
+ "eslint": "^9.39.2",
59
+ "eslint-for-ai": "^1.0.8",
60
+ "eslint-import-resolver-typescript": "^4.4.4",
54
61
  "husky": "^9.1.7",
55
62
  "lint-staged": "^16.2.7",
56
63
  "prettier": "^3.6.2",
64
+ "typescript-eslint": "^8.50.1",
57
65
  "vitest": "^4.0.13"
58
66
  },
59
67
  "peerDependencies": {