nesoi 3.0.18 → 3.0.20

package/lib/engine/util/parse.js

@@ -21,224 +21,195 @@ const decimal_1 = require("../data/decimal");
 const datetime_1 = require("../data/datetime");
 const file_1 = require("../data/file");
 const duration_1 = require("../data/duration");
-// TODO: check the performance of this wild thing below
-async function parse(type, field, value, array, fn) {
-    if (array) {
-        if (!Array.isArray(value)) {
-            throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value, type: `${type}[]` });
-        }
-        const parsed = [];
-        for (const v of value) {
-            parsed.push(await fn(v));
-        }
-        return parsed;
+function parseBoolean(field, value) {
+    if (value === 'true' || value === 1) {
+        return true;
     }
-    return fn(value);
-}
-function parseBoolean(field, value, array) {
-    return parse('boolean', field, value, array, (v) => {
-        if (v === 'true' || v === 1) {
-            return true;
-        }
-        if (v === 'false' || v === 0) {
-            return false;
-        }
-        if (typeof v === 'boolean') {
-            return v;
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'boolean' });
-    });
+    if (value === 'false' || value === 0) {
+        return false;
+    }
+    if (typeof value === 'boolean') {
+        return value;
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'boolean' });
 }
-function parseDate(field, value, array) {
-    return parse('date', field, value, array, (v) => {
-        // TODO: limit to date
-        if (typeof v === 'string') {
-            return date_1.NesoiDate.fromISO(v);
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'date' });
-    });
+function parseDate(field, value) {
+    // TODO: limit to date
+    if (typeof value === 'string') {
+        return date_1.NesoiDate.fromISO(value);
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'date' });
 }
-function parseDatetime(field, value, array) {
-    return parse('datetime', field, value, array, (v) => {
-        if (typeof v === 'string') {
-            return datetime_1.NesoiDatetime.fromISO(v);
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'datetime' });
-    });
+function parseDatetime(field, value) {
+    if (typeof value === 'string') {
+        return datetime_1.NesoiDatetime.fromISO(value);
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'datetime' });
 }
-function parseDuration(field, value, array) {
-    return parse('duration', field, value, array, (v) => {
-        if (typeof v === 'string') {
-            return duration_1.NesoiDuration.fromString(v);
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'duration' });
-    });
+function parseDuration(field, value) {
+    if (typeof value === 'string') {
+        return duration_1.NesoiDuration.fromString(value);
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'duration' });
 }
-function parseDecimal(field, value, array) {
-    return parse('decimal', field, value, array, (v) => {
-        if (typeof v === 'string') {
-            return new decimal_1.NesoiDecimal(v);
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'decimal' });
-    });
+function parseDecimal(field, value) {
+    if (typeof value === 'string') {
+        return new decimal_1.NesoiDecimal(value);
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'decimal' });
 }
-function parseEnum(raw, field, value, array, options, trx) {
-    return parse('enum', field, value, array, (v) => {
-        if (typeof v === 'string') {
-            if (typeof options === 'string') {
-                let enumName = options;
-                const enumPath = enumName.match(/(.*)\.\{(.*)\}$/);
-                let _enum;
-                if (enumPath) {
-                    enumName += enumPath[1] + '.' + enumPath[2];
-                    try {
-                        _enum = trx.enum(enumName);
-                    }
-                    catch {
-                        const v = tree_1.Tree.get(raw, enumPath[2]);
-                        throw error_1.NesoiError.Message.InvalidEnumScope({ name: field.name, alias: field.alias, value: v, fieldpath: enumPath[2] });
-                    }
-                }
-                else {
+function parseEnum(raw, field, value, options, trx) {
+    if (typeof value === 'string') {
+        if (typeof options === 'string') {
+            let enumName = options;
+            const enumPath = enumName.match(/(.*)\.\{(.*)\}$/);
+            let _enum;
+            if (enumPath) {
+                enumName += enumPath[1] + '.' + enumPath[2];
+                try {
                     _enum = trx.enum(enumName);
                 }
-                const keys = _enum.keys();
-                if (keys.includes(v)) {
-                    return v;
-                }
-                else {
-                    throw error_1.NesoiError.Message.InvalidFieldEnumValue({ field: field.alias, value: v, type: 'enum', options: keys });
+                catch {
+                    const v = tree_1.Tree.get(raw, enumPath[2]);
+                    throw error_1.NesoiError.Message.InvalidEnumScope({ path: field.path_raw, name: field.name, alias: field.alias, value: v, fieldpath: enumPath[2] });
                 }
             }
-            else if (Array.isArray(options)) {
-                if (options.includes(v)) {
-                    return v;
-                }
-                else {
-                    throw error_1.NesoiError.Message.InvalidFieldEnumValue({ field: field.alias, value: v, type: 'enum', options });
-                }
+            else {
+                _enum = trx.enum(enumName);
             }
-            else if (typeof options === 'object') {
-                if (v in options) {
-                    return options[v];
-                }
-                else {
-                    throw error_1.NesoiError.Message.InvalidFieldEnumValue({ field: field.alias, value: v, type: 'enum', options: Object.keys(options) });
-                }
+            const keys = _enum.keys();
+            if (keys.includes(value)) {
+                return value;
+            }
+            else {
+                throw error_1.NesoiError.Message.InvalidFieldEnumValue({ field: field.alias, path: field.path_raw, value, type: 'enum', options: keys });
             }
         }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'string' });
-    });
-}
-function parseFile(field, value, array, options) {
-    return parse('file', field, value, array, (v) => {
-        if (!(v instanceof file_1.NesoiFile)) {
-            throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'file' });
-        }
-        if (options?.maxsize) {
-            if (v.size > options?.maxsize) {
-                throw error_1.NesoiError.Message.FileTooBig({
-                    name: field.name,
-                    alias: field.alias,
-                    maxsize: options?.maxsize
-                });
+        else if (Array.isArray(options)) {
+            if (options.includes(value)) {
+                return value;
+            }
+            else {
+                throw error_1.NesoiError.Message.InvalidFieldEnumValue({ field: field.alias, path: field.path_raw, value, type: 'enum', options });
             }
         }
-        if (options?.extnames) {
-            if (!options?.extnames.includes(v.extname)) {
-                throw error_1.NesoiError.Message.FileExtNotAllowed({ name: field.name, alias: field.alias, options: options?.extnames });
+        else if (typeof options === 'object') {
+            if (value in options) {
+                return options[value];
+            }
+            else {
+                throw error_1.NesoiError.Message.InvalidFieldEnumValue({ field: field.alias, path: field.path_raw, value, type: 'enum', options: Object.keys(options) });
             }
         }
-        return v;
-    });
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'string' });
 }
-function parseFloat_(field, value, array) {
-    return parse('float', field, value, array, (v) => {
-        if (typeof v === 'string') {
-            const val = parseFloat(v);
-            if (!Number.isNaN(val)) {
-                return val;
-            }
+function parseFile(field, value, options) {
+    if (!(value instanceof file_1.NesoiFile)) {
+        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'file' });
+    }
+    if (options?.maxsize) {
+        if (value.size > options?.maxsize) {
+            throw error_1.NesoiError.Message.FileTooBig({
+                path: field.path_raw,
+                name: field.name,
+                alias: field.alias,
+                maxsize: options?.maxsize
+            });
         }
-        else if (typeof v === 'number') {
-            if (!Number.isNaN(v)) {
-                return v;
-            }
+    }
+    if (options?.extnames) {
+        if (!options?.extnames.includes(value.extname)) {
+            throw error_1.NesoiError.Message.FileExtNotAllowed({ path: field.path_raw, name: field.name, alias: field.alias, options: options?.extnames });
         }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'float' });
-    });
+    }
+    return value;
 }
-async function parseId(field, value, array, trx, bucket, type, view) {
+function parseFloat_(field, value) {
+    if (typeof value === 'string') {
+        const val = parseFloat(value);
+        if (!Number.isNaN(val)) {
+            return val;
+        }
+    }
+    else if (typeof value === 'number') {
+        if (!Number.isNaN(value)) {
+            return value;
+        }
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'float' });
+}
+async function parseId(field, value, trx, bucket, type, view) {
     let val;
     if (type === 'string') {
-        val = await parseString(field, value, array);
+        val = parseString(field, value);
     }
     else {
-        val = await parseInt_(field, value, array);
-    }
-    return parse('id', field, val, array, (async (v) => {
-        return {
-            id: v,
-            obj: view
-                ? await trx.bucket(bucket).viewOneOrFail(v, view)
-                : await trx.bucket(bucket).readOneOrFail(v)
-        };
-    })); // type only required on query parsers
+        val = parseInt_(field, value);
+    }
+    return {
+        id: val,
+        obj: view
+            ? await trx.bucket(bucket).viewOneOrFail(val, view)
+            : await trx.bucket(bucket).readOneOrFail(val)
+    };
 }
-function parseInt_(field, value, array) {
-    return parse('int', field, value, array, (v) => {
-        if (typeof v === 'string') {
-            const val = parseInt(v);
-            if (!Number.isNaN(val)) {
-                return val;
-            }
+function parseInt_(field, value) {
+    if (typeof value === 'string') {
+        const val = parseInt(value);
+        if (!Number.isNaN(val)) {
+            return val;
         }
-        else if (typeof v === 'number') {
-            const val = Math.floor(v);
-            if (!Number.isNaN(val)) {
-                return val;
-            }
+    }
+    else if (typeof value === 'number') {
+        const val = Math.floor(value);
+        if (!Number.isNaN(val)) {
+            return val;
         }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'integer' });
-    });
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'integer' });
 }
-function parseString(field, value, array) {
-    return parse('string', field, value, array, (v) => {
-        if (typeof v === 'string') {
-            return v;
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'string' });
-    });
+function parseString(field, value) {
+    if (typeof value === 'string') {
+        return value;
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'string' });
 }
-function parseStringOrNumber(field, value, array) {
-    return parse('string_or_number', field, value, array, (v) => {
-        if (typeof v === 'string' || typeof v === 'number') {
-            return v;
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'string_or_number' });
-    });
+function parseStringOrNumber(field, value) {
+    if (typeof value === 'string' || typeof value === 'number') {
+        return value;
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'string_or_number' });
 }
-async function parseDict(field, value, array, trx, parseFields) {
-    return parse('dict', field, value, array, (async (v) => {
-        if (typeof v === 'object') {
-            const parsed = {};
-            for (const k in v) {
-                const pv = await parseFields(trx, field.children, { __dict: v[k] });
-                parsed[k] = pv['__dict'];
-            }
-            return parsed;
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'dict' });
-    }));
+function parseDict(field, value) {
+    if (typeof value === 'object') {
+        const children = {};
+        for (const key in value) {
+            const _field = field.children['__dict'];
+            children[key] = {
+                field: _field,
+                value: value[key]
+            };
+        }
+        return children;
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'dict' });
 }
-async function parseObj(field, value, array, trx, parseFields) {
-    return parse('obj', field, value, array, (async (v) => {
-        if (typeof v === 'object') {
-            if (field.children) {
-                return await parseFields(trx, field.children, v);
-            }
-            return v;
-        }
-        throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, value: v, type: 'object' });
-    }));
+function parseObj(field, value, path_idx) {
+    if (typeof value === 'object') {
+        if (!field.children)
+            return {};
+        const children = {};
+        for (const key in field.children) {
+            const _field = field.children[key];
+            const key_raw = _field.path_raw.split('.')[path_idx + 1];
+            const key_parsed = _field.path_parsed.split('.')[path_idx + 1];
+            children[key_parsed] = {
+                field: _field,
+                value: value[key_raw]
+            };
+        }
+        return children;
+    }
+    throw error_1.NesoiError.Message.InvalidFieldType({ field: field.alias, path: field.path_raw, value, type: 'object' });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nesoi",
-    "version": "3.0.18",
+    "version": "3.0.20",
     "description": "Declarative framework for data-driven applications",
     "repository": {
         "type": "git",