fix: #153 code using a missing dependency lossless-json

josdejong · Sep 29, 2022 · 4a34214 · 4a34214
1 parent 6d8c3f6
commit 4a34214
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/src/lib/plugins/query/javascriptQueryLanguage.ts b/src/lib/plugins/query/javascriptQueryLanguage.ts
@@ -2,7 +2,7 @@ import { createPropertySelector } from '../../utils/pathUtils.js'
 import { parseString } from '../../utils/stringUtils.js'
 import type { QueryLanguage, QueryLanguageOptions } from '../../types'
 import type { JSONValue } from 'immutable-json-patch'
-import { isInteger, isSafeNumber } from 'lossless-json'
+import { isInteger } from '../../utils/typeUtils.js'
 
 const description = `
 <p>
@@ -27,10 +27,11 @@ function createQuery(json: JSONValue, queryOptions: QueryLanguageOptions): strin
     // so a filter value like '5' (text) will match numbers like 5 too.
     const actualValueGetter = `item => item${createPropertySelector(filter.path)}`
 
+    const filterValue = parseString(filter.value)
     const filterValueStr =
-      typeof parseString(filter.value) === 'string'
+      typeof filterValue === 'string'
         ? `'${filter.value}'`
-        : isInteger(filter.value) && !isSafeNumber(filter.value)
+        : isInteger(filter.value) && !Number.isSafeInteger(filterValue)
         ? `${filter.value}n` // bigint
         : filter.value
 

diff --git a/src/lib/plugins/query/lodashQueryLanguage.ts b/src/lib/plugins/query/lodashQueryLanguage.ts
@@ -4,7 +4,7 @@ import { createPropertySelector, stringifyPath } from '../../utils/pathUtils.js'
 import { parseString } from '../../utils/stringUtils.js'
 import type { QueryLanguage, QueryLanguageOptions } from '../../types'
 import type { JSONPath, JSONValue } from 'immutable-json-patch'
-import { isInteger, isSafeNumber } from 'lossless-json'
+import { isInteger } from '../../utils/typeUtils.js'
 
 const description = `
 <p>
@@ -33,10 +33,11 @@ function createQuery(json: JSONValue, queryOptions: QueryLanguageOptions): strin
     // so a filter value like '5' (text) will match numbers like 5 too.
     const actualValueGetter = `item => item${createPropertySelector(filter.path)}`
 
+    const filterValue = parseString(filter.value)
     const filterValueStr =
-      typeof parseString(filter.value) === 'string'
+      typeof filterValue === 'string'
         ? `'${filter.value}'`
-        : isInteger(filter.value) && !isSafeNumber(filter.value)
+        : isInteger(filter.value) && !Number.isSafeInteger(filterValue)
         ? `${filter.value}n` // bigint
         : filter.value
 

diff --git a/src/lib/utils/typeUtils.test.ts b/src/lib/utils/typeUtils.test.ts
@@ -1,5 +1,6 @@
 import { strictEqual } from 'assert'
 import {
+  isInteger,
   isObject,
   isObjectOrArray,
   isStringContainingPrimitiveValue,
@@ -89,4 +90,12 @@ describe('typeUtils', () => {
     strictEqual(isStringContainingPrimitiveValue('false', JSON), true)
     strictEqual(isStringContainingPrimitiveValue('null', JSON), true)
   })
+
+  it('isInteger', () => {
+    strictEqual(isInteger('4250'), true)
+    strictEqual(isInteger('-4250'), true)
+    strictEqual(isInteger('2.345'), false)
+    strictEqual(isInteger('2a'), false)
+    strictEqual(isInteger('abc'), false)
+  })
 })
diff --git a/src/lib/utils/typeUtils.ts b/src/lib/utils/typeUtils.ts
@@ -177,3 +177,12 @@ export function stringConvert(str: string, parser: JSONParser): unknown {
 export function isStringContainingPrimitiveValue(str: unknown, parser: JSONParser): boolean {
   return typeof str === 'string' && typeof stringConvert(str, parser) !== 'string'
 }
+
+/**
+ * Test whether a string contains an integer number
+ */
+export function isInteger(value: string): boolean {
+  return INTEGER_REGEX.test(value)
+}
+
+const INTEGER_REGEX = /^-?[0-9]+$/