test nested attribute expression (#237)

* test nested attribute expression

* update json attribute resolver

* simplify regex

* update json attribute resolver

* simple test nested attribute func

* 2.22.0

Author: kbarbounakis

OnJsonAttribute.js

@@ -1,4 +1,4 @@
-var {QueryField, QueryEntity, QueryUtils, MethodCallExpression, MemberExpression} = require('@themost/query');
+var {QueryField, QueryEntity, QueryUtils, MethodCallExpression, MemberExpression, ObjectNameValidator} = require('@themost/query');
 var {sprintf} = require('sprintf-js');
 var _ = require('lodash');
 var {DataError} = require('@themost/common');
@@ -423,114 +423,33 @@ DataAttributeResolver.prototype.testAggregatedNestedAttribute = function(s) {
 
 /**
  * @param {string} s
- * @returns {*}
+ * @returns {{name: string, property?: string}|null}
  */
 DataAttributeResolver.prototype.testNestedAttribute = function(s) {
     if (typeof s !== 'string')
         return null;
-    /**
-     * @private
-     */
     var matches;
-    /**
-     * nested attribute aggregate function with alias e.g. f(x/b) as a
-     * @ignore
-     */
-    matches = /^(\w+)\((\w+)\/(\w+)\)\sas\s([\u0020-\u007F\u0080-\uFFFF]+)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '(' + matches[2] + '/' + matches[3]  + ')', property:matches[4] };
-    }
-    /**
-     * nested attribute aggregate function with alias e.g. f(x/b/c) as a
-     * @ignore
-     */
-    matches = /^(\w+)\((\w+)\/(\w+)\/(\w+)\)\sas\s([\u0020-\u007F\u0080-\uFFFF]+)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '(' + matches[2] + '/' + matches[3] + '/' + matches[4]  + ')', property:matches[5] };
-    }
-    /**
-     * nested attribute aggregate function with alias e.g. f(x/b/c/d) as a
-     * @ignore
-     */
-    matches = /^(\w+)\((\w+)\/(\w+)\/(\w+)\/(\w+)\)\sas\s([\u0020-\u007F\u0080-\uFFFF]+)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '(' + matches[2] + '/' + matches[3] + '/' + matches[4] + '/' + matches[5]  + ')', property:matches[6] };
-    }
-    /**
-     * nested attribute with alias e.g. x/b as a
-     * @ignore
-     */
-    matches = /^(\w+)\/(\w+)\sas\s([\u0020-\u007F\u0080-\uFFFF]+)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '/' + matches[2], property:matches[3] };
-    }
-    /**
-     * nested attribute with alias e.g. x/b/c as a
-     * @ignore
-     */
-    matches = /^(\w+)\/(\w+)\/(\w+)\sas\s([\u0020-\u007F\u0080-\uFFFF]+)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '/' + matches[2] + '/' + matches[3], property:matches[4] };
-    }
-    /**
-     * nested attribute with alias e.g. x/b/c/d as a
-     * @ignore
-     */
-    matches = /^(\w+)\/(\w+)\/(\w+)\/(\w+)\sas\s([\u0020-\u007F\u0080-\uFFFF]+)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '/' + matches[2] + '/' + matches[3] + '/' + matches[4], property:matches[5] };
-    }
-    /**
-     * nested attribute aggregate function with alias e.g. f(x/b)
-     * @ignore
-     */
-    matches = /^(\w+)\((\w+)\/(\w+)\)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '(' + matches[2] + '/' + matches[3]  + ')' };
-    }
-    /**
-     * nested attribute aggregate function with alias e.g. f(x/b/c)
-     * @ignore
-     */
-    matches = /^(\w+)\((\w+)\/(\w+)\/(\w+)\)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '('  + matches[2] + '/' + matches[3] + '/' + matches[4]  + ')' };
-    }
-    /**
-     * nested attribute aggregate function with alias e.g. f(x/b/c/d)
-     * @ignore
-     */
-    matches = /^(\w+)\((\w+)\/(\w+)\/(\w+)\/(\w+)\)$/i.exec(s);
-    if (matches) {
-        return { name: matches[1] + '('  + matches[2] + '/' + matches[3] + '/' + matches[4] + matches[5]  + ')' };
-    }
-    /**
-     * nested attribute with alias e.g. x/b
-     * @ignore
-     */
-    matches = /^(\w+)\/(\w+)$/.exec(s);
-    if (matches) {
-        return { name: s };
-    }
 
-    /**
-     * nested attribute with alias e.g. x/b/c
-     * @ignore
-     */
-    matches = /^(\w+)\/(\w+)\/(\w+)$/.exec(s);
+    var pattern = (ObjectNameValidator.validator && ObjectNameValidator.validator.pattern) || new RegExp(ObjectNameValidator.Patterns.Default);
+    var exprFuncWithAlias = new RegExp('^(\\w+)\\((\\w+(?:\\/\\w+)+)\\)(?:\\s+as\\s+' + pattern.source + ')?$');
+    matches = exprFuncWithAlias.exec(s);
     if (matches) {
-        return { name: s };
+        // matches[1]: the function name
+        // matches[2]: the nested attribute
+        // matches[3]: the alias (optional)
+        return { name: matches[2], property: matches[3] };
     }
 
+    var exprWithAlias = new RegExp('^(\\w+(?:\\/\\w+)+)(\\s+as\\s+' + pattern.source + ')?$')
     /**
-     * nested attribute with alias e.g. x/b/c/d
-     * @ignore
+     * nested attribute with alias e.g. a/b/../c as a
      */
-    matches = /^(\w+)\/(\w+)\/(\w+)\/(\w+)$/.exec(s);
+    matches = exprWithAlias.exec(s);
     if (matches) {
-        return { name: s };
+        // matches[2]: the nested attribute
+        // matches[3]: the alias (optional)
+        return { name: matches[1], property: matches[3] };
     }
-
 };
 
 /**

data-attribute-resolver.js

@@ -17,7 +17,7 @@ module.exports = {
   // clearMocks: false,
 
   // Indicates whether the coverage information should be collected while executing the test
-  collectCoverage: true,
+  collectCoverage: false,
 
   // An array of glob patterns indicating a set of files for which coverage information should be collected
   // collectCoverageFrom: ["!spec/**/*.ts"],
@@ -128,12 +128,11 @@ module.exports = {
 
   // The paths to modules that run some code to configure or set up the testing environment before each test
   setupFiles: [
-    '<rootDir>/spec/helpers/env.js'
   ],
 
   // A list of paths to modules that run some code to configure or set up the testing framework before each test
   setupFilesAfterEnv: [
-    './jest.setup.js'
+      '<rootDir>/jest.setup.js'
   ],
 
   // The number of seconds after which a test is considered as slow and reported as such in the results.

jest.config.js

@@ -1,6 +1,9 @@
 const {TraceUtils} = require('@themost/common');
-const JestLogger = require('./jest.logger');
+const {JsonLogger} = require('@themost/json-logger');
 // noinspection JSCheckFunctionSignatures
-TraceUtils.useLogger(new JestLogger());
+TraceUtils.useLogger(new JsonLogger({
+    level: 'debug',
+    format: 'raw'
+}));
 /* global jest */
 jest.setTimeout(60000);

jest.setup.js

@@ -1,6 +1,6 @@
 {
   "name": "@themost/data",
-  "version": "2.21.4",
+  "version": "2.22.0",
   "description": "MOST Web Framework Codename Blueshift - Data module",
   "main": "index.js",
   "scripts": {
@@ -45,6 +45,7 @@
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-typescript": "^7.16.7",
     "@themost/common": "^2.12.0",
+    "@themost/json-logger": "^1.3.0",
     "@themost/peers": "^1.0.2",
     "@themost/query": "^2.14.7",
     "@themost/sqlite": "^2.10.1",

package-lock.json

@@ -177,12 +177,16 @@ describe('JsonAttribute', () => {
             }
             await Products.save(item);
             expect(item.dateCreated).toBeTruthy();
-            item = await Products.where('name').equal('Apple MacBook Air (13.3-inch, 2013 Version)')
+            item = await Products
                 .where((x: any) => {
-                    return x.extraAttributes.cpu.brand === 'Intel'
+                    return x.name === 'Apple MacBook Air (13.3-inch, 2013 Version)' && x.extraAttributes.cpu.brand === 'Intel'
                 }).getItem();
             expect(item).toBeTruthy();
             expect(item.name).toBe('Apple MacBook Air (13.3-inch, 2013 Version)');
+            // query again using expressions
+            item = await Products.where('extraAttributes/cpu/brand').equal('Intel').getItem();
+            expect(item).toBeTruthy();
+            expect(item.name).toBe('Apple MacBook Air (13.3-inch, 2013 Version)');
         });
     });
 

package.json

@@ -7,7 +7,7 @@
     "abstract": false,
     "sealed": false,
     "inherits": "Account",
-    "version": "2.0",
+    "version": "2.1.0",
     "fields": [
         {
             "@id": "https://themost.io/schemas/lockoutTime",
@@ -109,6 +109,13 @@
             "@id": "https://themost.io/schemas/userReviews",
             "name": "userReviews",
             "type": "UserReview"
+        },
+        {
+          "@id": "https://themost.io/schemas/metadata",
+          "many": false,
+          "description": "A JSON object that contains additional metadata for the user.",
+          "name": "metadata",
+          "type": "Json"
         }
     ],
     "privileges": [

spec/JsonAttribute.spec.ts

@@ -178,6 +178,7 @@ export declare class DataEventArgs {
     query?: any;
     previous?: any;
     throwError?: boolean;
+    result?: unknown
 }
 
 export declare interface BeforeSaveEventListener {