@travetto/model-query-language 6.0.0-rc.1 → 6.0.0

package/README.md

@@ -25,6 +25,7 @@ This module provides a textual query language for the [Data Model Querying](http
    *  `in`, `not-in` - Supports checking if a field is in a list of literal values
    *  `and`, `&&` - Intersection of clauses
    *  `or`, `||` - Union of clauses
+
 All sub fields are dot separated for access, e.g. `user.address.city`.A query language version of the previous query could look like:
 
 **Code: Query language with boolean checks and exists check**

package/__index__.ts

@@ -1,2 +1,3 @@
-export * from './src/parser';
-export * from './src/model-query';
+export * from './src/parser.ts';
+export * from './src/tokenizer.ts';
+export * from './src/model-query.ts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-query-language",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.0",
   "description": "Datastore query language.",
   "keywords": [
     "datastore",
@@ -26,12 +26,12 @@
     "directory": "module/model-query"
   },
   "dependencies": {
-    "@travetto/model": "^6.0.0-rc.1",
-    "@travetto/model-query": "^6.0.0-rc.1",
-    "@travetto/schema": "^6.0.0-rc.1"
+    "@travetto/model": "^6.0.0",
+    "@travetto/model-query": "^6.0.0",
+    "@travetto/schema": "^6.0.0"
   },
   "peerDependencies": {
-    "@travetto/test": "^6.0.0-rc.1"
+    "@travetto/test": "^6.0.0"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/model-query.ts

@@ -1,12 +1,9 @@
 import { Schema } from '@travetto/schema';
 import { PageableModelQuery } from '@travetto/model-query';
 
-import { QueryLanguageParser } from './parser';
+import { QueryLanguageParser } from './parser.ts';
 
-const convert = <T>(k?: string, query?: boolean): T | undefined =>
-  !k || typeof k !== 'string' ? undefined : (/^[\{\[]/.test(k) ?
-    JSON.parse(k) :
-    (query ? QueryLanguageParser.parseToQuery(k) : undefined));
+const parse = <T>(k: string): T | undefined => !k || typeof k !== 'string' || !/^[\{\[]/.test(k) ? undefined : JSON.parse(k);
 
 @Schema()
 export class QueryLanguageModelQuery {
@@ -14,8 +11,11 @@ export class QueryLanguageModelQuery {
     return {
       ...(self.limit ? { limit: self.limit } : {}),
       ...(self.offset ? { offset: self.offset } : {}),
-      ...(self.sort ? { sort: convert(self.sort) } : {}),
-      ...(self.where ? { where: convert(self.where, true) } : {}),
+      ...(self.sort ? { sort: parse(self.sort) } : {}),
+      ...(self.where ? {
+        where: parse(self.where) ??
+          QueryLanguageParser.parseToQuery(self.where)
+      } : {}),
     };
   }
 

package/src/parser.ts

@@ -1,8 +1,8 @@
 import { castTo } from '@travetto/runtime';
 import { WhereClauseRaw } from '@travetto/model-query';
 
-import { QueryLanguageTokenizer } from './tokenizer';
-import { Token, Literal, GroupNode, OP_TRANSLATION, ArrayNode, AllNode } from './types';
+import { QueryLanguageTokenizer } from './tokenizer.ts';
+import { Token, Literal, GroupNode, OP_TRANSLATION, ArrayNode, AllNode } from './types.ts';
 
 /**
  * Determine if a token is boolean

package/src/tokenizer.ts

@@ -1,5 +1,5 @@
 import { TimeUtil } from '@travetto/runtime';
-import { Token, TokenizeState, TokenType } from './types';
+import { Token, TokenizeState, TokenType } from './types.ts';
 
 const OPEN_PARENS = 0x28, CLOSE_PARENS = 0x29, OPEN_BRACKET = 0x5b, CLOSE_BRACKET = 0x5d, COMMA = 0x2c;
 const GREATER_THAN = 0x3e, LESS_THAN = 0x3c, EQUAL = 0x3d, NOT = 0x21, MODULO = 0x25, TILDE = 0x7e, AND = 0x26, OR = 0x7c;