@nymphjs/nymph 1.0.0-beta.8 → 1.0.0-beta.81

package/dist/driver/NymphDriver.js

@@ -10,25 +10,45 @@ const strtotime_1 = __importDefault(require("locutus/php/datetime/strtotime"));
 const guid_1 = require("@nymphjs/guid");
 const errors_1 = require("../errors");
 const utils_1 = require("../utils");
+// from: https://stackoverflow.com/a/6969486/664915
 function escapeRegExp(string) {
-    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 }
+/**
+ * A Nymph database driver.
+ */
 class NymphDriver {
-    constructor() {
-        this.nymph = new Proxy({}, {
-            get() {
-                throw new Error('Attempted access of Nymph instance before driver initialization!');
-            },
-        });
-        this.entityCache = {};
-        this.entityCount = {};
-        this.putDataCounter = 0;
-    }
+    nymph = new Proxy({}, {
+        get() {
+            throw new Error('Attempted access of Nymph instance before driver initialization!');
+        },
+    });
+    /**
+     * A cache to make entity retrieval faster.
+     */
+    entityCache = {};
+    /**
+     * A counter for the entity cache to determine the most accessed entities.
+     */
+    entityCount = {};
+    /**
+     * Protect against infinite loops.
+     */
+    putDataCounter = 0;
+    /**
+     * Initialize the Nymph driver.
+     *
+     * This is meant to be called internally by Nymph. Don't call this directly.
+     *
+     * @param nymph The Nymph instance.
+     */
     init(nymph) {
         this.nymph = nymph;
     }
     posixRegexMatch(pattern, subject, caseInsensitive = false) {
         const posixClasses = [
+            // '[[:<:]]',
+            // '[[:>:]]',
             '[:alnum:]',
             '[:alpha:]',
             '[:ascii:]',
@@ -45,17 +65,21 @@ class NymphDriver {
             '[:xdigit:]',
         ];
         const jsClasses = [
+            // '\b(?=\w)',
+            // '(?<=\w)\b',
             '[A-Za-z0-9]',
             '[A-Za-z]',
             '[\x00-\x7F]',
-            '[ \t]',
-            '[\x00-\x1F\x7F]',
-            '[0-9]',
-            '[\x21-\x7E]',
+            '[ \t]', // '\s',
+            '[\x00-\x1F\x7F]', // '[\000\001\002\003\004\005\006\007\008\009\010\011\012\013\014'.
+            //   '\015\016\017\018\019\020\021\022\023\024\025\026\027\028\029'.
+            //   '\030\031\032\033\034\035\036\037\177]',
+            '[0-9]', // '\d',
+            '[\x21-\x7E]', // '[A-Za-z0-9!"#$%&\'()*+,\-./:;<=>?@[\\\]^_`{|}\~]',
             '[a-z]',
-            '[\x20-\x7E]',
-            '[!"#$%&\'()*+,-./:;<=>?@[\\\\\\]^_‘{|}~]',
-            '[ \t\r\n\v\f]',
+            '[\x20-\x7E]', // '[A-Za-z0-9!"#$%&\'()*+,\-./:;<=>?@[\\\]^_`{|}\~]',
+            '[!"#$%&\'()*+,-./:;<=>?@[\\\\\\]^_‘{|}~]', // '[!"#$%&\'()*+,\-./:;<=>?@[\\\]^_`{|}\~]',
+            '[ \t\r\n\v\f]', // '[\t\n\x0B\f\r ]',
             '[A-Z]',
             '[A-Za-z0-9_]',
             '[0-9A-Fa-f]',
@@ -73,9 +97,9 @@ class NymphDriver {
             if (!fhandle) {
                 throw new errors_1.InvalidParametersError('Provided filename is not writeable.');
             }
-            await this.exportEntities((line) => {
-                fs_1.default.writeSync(fhandle, `${line}\n`);
-            });
+            for await (let entry of this.exportDataIterator()) {
+                fs_1.default.writeSync(fhandle, entry.content);
+            }
             fs_1.default.closeSync(fhandle);
         }
         catch (e) {
@@ -84,98 +108,135 @@ class NymphDriver {
         return true;
     }
     async exportPrint() {
-        await this.exportEntities((line) => {
-            console.log(line);
-        });
+        for await (let entry of this.exportDataIterator()) {
+            console.log(entry.content);
+        }
         return true;
     }
-    async importFromFile(filename, saveEntityCallback, saveUIDCallback, startTransactionCallback = null, commitTransactionCallback = null) {
-        let rl;
-        try {
-            rl = new n_readlines_1.default(filename);
-        }
-        catch (e) {
-            throw new errors_1.InvalidParametersError('Provided filename is unreadable.');
+    async importDataIterator(lines, transaction) {
+        const first = lines[Symbol.iterator]().next();
+        if (first.done || first.value !== '#nex2') {
+            throw new Error('Tried to import a file that is not a NEX v2 file.');
         }
-        let guid = null;
-        let line = false;
-        let sdata = {};
-        let tags = [];
-        let etype = '__undefined';
-        if (startTransactionCallback) {
-            await startTransactionCallback();
+        if (transaction) {
+            await this.internalTransaction('nymph-import');
         }
-        while ((line = rl.next())) {
-            const text = line.toString('utf8');
-            if (text.match(/^\s*#/)) {
-                continue;
-            }
-            const entityMatch = text.match(/^\s*{([0-9A-Fa-f]+)}<([-\w_]+)>\[([^\]]*)\]\s*$/);
-            const propMatch = text.match(/^\s*([^=]+)\s*=\s*(.*\S)\s*$/);
-            const uidMatch = text.match(/^\s*<([^>]+)>\[(\d+)\]\s*$/);
-            if (uidMatch) {
-                await saveUIDCallback(uidMatch[1], Number(uidMatch[2]));
-            }
-            else if (entityMatch) {
-                if (guid) {
-                    await saveEntityCallback(guid, tags, sdata, etype);
-                    guid = null;
-                    tags = [];
-                    sdata = {};
-                    etype = '__undefined';
+        try {
+            let guid = null;
+            let sdata = {};
+            let tags = [];
+            let etype = '__undefined';
+            for (let line of lines) {
+                if (line.match(/^\s*#/)) {
+                    continue;
                 }
-                guid = entityMatch[1];
-                etype = entityMatch[2];
-                tags = entityMatch[3].split(',');
-            }
-            else if (propMatch) {
-                if (guid) {
-                    sdata[propMatch[1]] = propMatch[2];
+                const entityMatch = line.match(/^\s*{([0-9A-Fa-f]+)}<([-\w_]+)>\[([^\]]*)\]\s*$/);
+                const propMatch = line.match(/^\s*([^=]+)\s*=\s*(.*\S)\s*$/);
+                const uidMatch = line.match(/^\s*<([^>]+)>\[(\d+)\]\s*$/);
+                if (uidMatch) {
+                    // Add the UID.
+                    await this.importUID({
+                        name: uidMatch[1],
+                        value: Number(uidMatch[2]),
+                    });
+                }
+                else if (entityMatch) {
+                    // Save the current entity.
+                    if (guid) {
+                        const cdate = Number(JSON.parse(sdata.cdate));
+                        delete sdata.cdate;
+                        const mdate = Number(JSON.parse(sdata.mdate));
+                        delete sdata.mdate;
+                        await this.importEntity({ guid, cdate, mdate, tags, sdata, etype });
+                        guid = null;
+                        tags = [];
+                        sdata = {};
+                        etype = '__undefined';
+                    }
+                    // Record the new entity's info.
+                    guid = entityMatch[1];
+                    etype = entityMatch[2];
+                    tags = entityMatch[3].split(',');
+                }
+                else if (propMatch) {
+                    // Add the variable to the new entity.
+                    if (guid) {
+                        sdata[propMatch[1]] = propMatch[2];
+                    }
                 }
+                // Clear the entity cache.
+                this.entityCache = {};
+            }
+            // Save the last entity.
+            if (guid) {
+                const cdate = Number(JSON.parse(sdata.cdate));
+                delete sdata.cdate;
+                const mdate = Number(JSON.parse(sdata.mdate));
+                delete sdata.mdate;
+                await this.importEntity({ guid, cdate, mdate, tags, sdata, etype });
+            }
+            if (transaction) {
+                await this.commit('nymph-import');
             }
-            this.entityCache = {};
-        }
-        if (guid) {
-            await saveEntityCallback(guid, tags, sdata, etype);
         }
-        if (commitTransactionCallback) {
-            await commitTransactionCallback();
+        catch (e) {
+            await this.rollback('nymph-import');
+            throw e;
         }
         return true;
     }
-    checkData(data, sdata, selectors, guid = null, tags = null) {
-        const formattedSelectors = this.formatSelectors(selectors).selectors;
-        for (const curSelector of formattedSelectors) {
-            const type = curSelector.type;
-            const typeIsNot = type === '!&' || type === '!|';
-            const typeIsOr = type === '|' || type === '!|';
-            let pass = !typeIsOr;
-            for (const k in curSelector) {
-                const key = k;
-                const value = curSelector[key];
-                if (key === 'type' || value == null) {
-                    continue;
-                }
-                const clauseNot = key.substr(0, 1) === '!';
-                if (key === 'selector' || key === '!selector') {
-                    const tmpArr = (Array.isArray(value) ? value : [value]);
-                    pass = (0, utils_1.xor)(this.checkData(data, sdata, tmpArr, guid, tags), (0, utils_1.xor)(typeIsNot, clauseNot));
+    async importData(text, transaction) {
+        return await this.importDataIterator(text.split('\n'), transaction);
+    }
+    async import(filename, transaction) {
+        let rl;
+        try {
+            rl = new n_readlines_1.default(filename);
+        }
+        catch (e) {
+            throw new errors_1.InvalidParametersError('Provided filename is unreadable.');
+        }
+        const lines = {
+            *[Symbol.iterator]() {
+                let line;
+                while ((line = rl.next())) {
+                    yield line.toString('utf8');
                 }
-                else {
-                    if (key === 'qref' || key === '!qref') {
-                        throw new Error("Can't use checkData on qref clauses.");
+            },
+        };
+        return await this.importDataIterator(lines, transaction);
+    }
+    checkData(data, sdata, selectors, guid = null, tags = null) {
+        try {
+            const formattedSelectors = this.formatSelectors(selectors).selectors;
+            for (const curSelector of formattedSelectors) {
+                const type = curSelector.type;
+                const typeIsNot = type === '!&' || type === '!|';
+                const typeIsOr = type === '|' || type === '!|';
+                let pass = !typeIsOr;
+                for (const k in curSelector) {
+                    const key = k;
+                    const value = curSelector[key];
+                    if (key === 'type' || value == null) {
+                        continue;
+                    }
+                    const clauseNot = key.substring(0, 1) === '!';
+                    if (key === 'selector' || key === '!selector') {
+                        const tmpArr = (Array.isArray(value) ? value : [value]);
+                        pass = (0, utils_1.xor)(this.checkData(data, sdata, tmpArr, guid, tags), (0, utils_1.xor)(typeIsNot, clauseNot));
                     }
                     else {
-                        for (const curValue of value) {
-                            if (curValue == null) {
-                                continue;
-                            }
-                            if (((key === 'guid' || key === '!guid') && guid == null) ||
-                                ((key === 'tag' || key === '!tag') && tags == null)) {
-                                pass = true;
-                            }
-                            else {
+                        if (key === 'qref' || key === '!qref') {
+                            throw new Error("Can't use checkData on qref clauses.");
+                        }
+                        else {
+                            // Check if it doesn't pass any for &, check if it passes any for |.
+                            for (const curValue of value) {
+                                if (curValue == null) {
+                                    continue;
+                                }
                                 const propName = curValue[0];
+                                // Unserialize the data for this variable.
                                 if (propName in sdata) {
                                     data[propName] = JSON.parse(sdata[propName]);
                                     delete sdata[propName];
@@ -229,12 +290,14 @@ class NymphDriver {
                                     case 'match':
                                     case '!match':
                                         const testMatchValue = curValue[1];
+                                        // Convert a POSIX regex to a JS regex.
                                         pass = (0, utils_1.xor)(propName in data &&
                                             this.posixRegexMatch(testMatchValue, data[propName]), (0, utils_1.xor)(typeIsNot, clauseNot));
                                         break;
                                     case 'imatch':
                                     case '!imatch':
                                         const testIMatchValue = curValue[1];
+                                        // Convert a POSIX regex to a JS regex.
                                         pass = (0, utils_1.xor)(propName in data &&
                                             this.posixRegexMatch(testIMatchValue, data[propName], true), (0, utils_1.xor)(typeIsNot, clauseNot));
                                         break;
@@ -259,23 +322,32 @@ class NymphDriver {
                                         pass = (0, utils_1.xor)(propName in data && data[propName] <= testLTEValue, (0, utils_1.xor)(typeIsNot, clauseNot));
                                         break;
                                 }
-                            }
-                            if (!(0, utils_1.xor)(typeIsOr, pass)) {
-                                break;
+                                if (!(0, utils_1.xor)(typeIsOr, pass)) {
+                                    break;
+                                }
                             }
                         }
                     }
+                    if (!(0, utils_1.xor)(typeIsOr, pass)) {
+                        break;
+                    }
                 }
-                if (!(0, utils_1.xor)(typeIsOr, pass)) {
-                    break;
+                if (!pass) {
+                    return false;
                 }
             }
-            if (!pass) {
-                return false;
-            }
+            return true;
+        }
+        catch (e) {
+            this.nymph.config.debugError('nymph', `Failed to check entity data: ${e}`);
+            throw e;
         }
-        return true;
     }
+    /**
+     * Remove all copies of an entity from the cache.
+     *
+     * @param guid The GUID of the entity to remove.
+     */
     cleanCache(guid) {
         delete this.entityCache[guid];
     }
@@ -292,7 +364,15 @@ class NymphDriver {
         }
         return ret;
     }
+    /**
+     * Search through a value for an entity reference.
+     *
+     * @param value Any value to search.
+     * @param entity An entity, GUID, or array of either to search for.
+     * @returns True if the reference is found, false otherwise.
+     */
     entityReferenceSearch(value, entity) {
+        // Get the GUID, if the passed $entity is an object.
         const guids = [];
         if (Array.isArray(entity)) {
             if (entity[0] === 'nymph_entity_reference') {
@@ -323,6 +403,7 @@ class NymphDriver {
             guids.indexOf(value[1]) !== -1) {
             return true;
         }
+        // Search through arrays and objects looking for the reference.
         if (Array.isArray(value) || typeof value === 'object') {
             for (const key in value) {
                 if (this.entityReferenceSearch(value[key], guids)) {
@@ -356,9 +437,9 @@ class NymphDriver {
                     for (let i = 0; i < tmpArr.length; i++) {
                         const name = tmpArr[i][0];
                         const [qrefOptions, ...qrefSelectors] = tmpArr[i][1];
-                        const QrefEntityClass = typeof qrefOptions.class === 'string'
+                        const QrefEntityClass = qrefOptions.class
                             ? this.nymph.getEntityClass(qrefOptions.class)
-                            : qrefOptions.class ?? this.nymph.getEntityClass('Entity');
+                            : this.nymph.getEntityClass('Entity');
                         const newOptions = {
                             ...qrefOptions,
                             class: QrefEntityClass,
@@ -377,19 +458,23 @@ class NymphDriver {
                     qrefs.push(...newSelectors.qrefs);
                 }
                 else if (!Array.isArray(value)) {
+                    // @ts-ignore: ts doesn't know what value is here.
                     newSelector[key] = [[value]];
                 }
                 else if (!Array.isArray(value[0])) {
                     if (value.length === 3 &&
                         value[1] == null &&
                         typeof value[2] === 'string') {
+                        // @ts-ignore: ts doesn't know what value is here.
                         newSelector[key] = [[value[0], (0, strtotime_1.default)(value[2]) * 1000]];
                     }
                     else {
+                        // @ts-ignore: ts doesn't know what value is here.
                         newSelector[key] = [value];
                     }
                 }
                 else {
+                    // @ts-ignore: ts doesn't know what value is here.
                     newSelector[key] = value.map((curValue) => {
                         if (curValue.length === 3 &&
                             curValue[1] == null &&
@@ -416,7 +501,7 @@ class NymphDriver {
                 if (key === 'type') {
                     continue;
                 }
-                let curQuery = callback(key, value, typeIsOr, typeIsNot);
+                let curQuery = callback({ key, value, typeIsOr, typeIsNot });
                 if (curQuery) {
                     if (curSelectorQuery) {
                         curSelectorQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -430,21 +515,7 @@ class NymphDriver {
         }
         return queryParts;
     }
-    getEntitySync(options = {}, ...selectors) {
-        if (typeof selectors[0] === 'string') {
-            selectors = [{ type: '&', guid: selectors[0] }];
-        }
-        options.limit = 1;
-        const entities = this.getEntitiesSync(options, ...selectors);
-        if (options.return === 'count') {
-            return entities;
-        }
-        if (!entities || !entities.length) {
-            return null;
-        }
-        return entities[0];
-    }
-    getEntitesRowLike(options, selectors, performQueryCallback, rowFetchCallback, freeResultCallback, getCountCallback, getGUIDCallback, getTagsAndDatesCallback, getDataNameAndSValueCallback) {
+    getEntitiesRowLike(options, selectors, performQueryCallback, rowFetchCallback, freeResultCallback, getCountCallback, getGUIDCallback, getTagsAndDatesCallback, getDataNameAndSValueCallback) {
         if (!this.isConnected()) {
             throw new errors_1.UnableToConnectError('not connected to DB');
         }
@@ -460,10 +531,14 @@ class NymphDriver {
         let count = 0;
         const EntityClass = options.class ?? this.nymph.getEntityClass('Entity');
         const etype = EntityClass.ETYPE;
+        // Check if the requested entity is cached.
         if (this.nymph.config.cache &&
             !options.skipCache &&
+            selectors.length &&
             'guid' in selectors[0] &&
             typeof selectors[0].guid === 'number') {
+            // Only safe to use the cache option with no other selectors than a GUID
+            // and tags.
             if (selectors.length === 1 &&
                 selectors[0].type === '&' &&
                 (Object.keys(selectors[0]).length === 2 ||
@@ -492,11 +567,16 @@ class NymphDriver {
         try {
             const formattedSelectors = this.formatSelectors(selectors, options);
             this.nymph.runQueryCallbacks(options, formattedSelectors.selectors);
-            for (let qref of formattedSelectors.qrefs) {
-                const [options, ...selectors] = qref;
+            for (let i = 0; i < formattedSelectors.qrefs.length; i++) {
+                const [options, ...selectors] = formattedSelectors.qrefs[i];
                 this.nymph.runQueryCallbacks(options, selectors);
+                formattedSelectors.qrefs[i] = [options, ...selectors];
             }
-            const { result } = performQueryCallback(options, formattedSelectors.selectors, etype);
+            const { result } = performQueryCallback({
+                options,
+                selectors: formattedSelectors.selectors,
+                etype,
+            });
             return {
                 result,
                 process: () => {
@@ -521,9 +601,13 @@ class NymphDriver {
                             const cdate = tagsAndDates.cdate;
                             const mdate = tagsAndDates.mdate;
                             let dataNameAndSValue = getDataNameAndSValueCallback(row);
+                            // Data.
                             const data = {};
+                            // Serialized data.
                             const sdata = {};
                             if (dataNameAndSValue.name !== '') {
+                                // This do will keep going and adding the data until the
+                                // next entity is reached. $row will end on the next entity.
                                 do {
                                     dataNameAndSValue = getDataNameAndSValueCallback(row);
                                     sdata[dataNameAndSValue.name] = dataNameAndSValue.svalue;
@@ -531,6 +615,7 @@ class NymphDriver {
                                 } while (row != null && getGUIDCallback(row) === guid);
                             }
                             else {
+                                // Make sure that $row is incremented :)
                                 row = rowFetchCallback();
                             }
                             const entity = EntityClass.factorySync();
@@ -551,6 +636,7 @@ class NymphDriver {
                             if (this.nymph.config.cache) {
                                 this.pushCache(guid, cdate, mdate, tags, data, sdata);
                             }
+                            // @ts-ignore: ts doesn't know the return type here.
                             entities.push(entity);
                         }
                     }
@@ -569,10 +655,12 @@ class NymphDriver {
         }
     }
     async saveEntityRowLike(entity, saveNewEntityCallback, saveExistingEntityCallback, startTransactionCallback = null, commitTransactionCallback = null) {
+        // Get a modified date.
         const mdate = Date.now();
         const tags = (0, lodash_1.difference)(entity.tags, ['']);
         const data = entity.$getData();
         const sdata = entity.$getSData();
+        const uniques = await entity.$getUniques();
         const EntityClass = entity.constructor;
         const etype = EntityClass.ETYPE;
         if (startTransactionCallback) {
@@ -582,7 +670,16 @@ class NymphDriver {
         if (entity.guid == null) {
             const cdate = mdate;
             const newId = (0, guid_1.guid)();
-            success = await saveNewEntityCallback(entity, newId, tags, data, sdata, cdate, etype);
+            success = await saveNewEntityCallback({
+                entity,
+                guid: newId,
+                tags,
+                data,
+                sdata,
+                uniques,
+                cdate,
+                etype,
+            });
             if (success) {
                 entity.guid = newId;
                 entity.cdate = cdate;
@@ -590,10 +687,20 @@ class NymphDriver {
             }
         }
         else {
+            // Removed any cached versions of this entity.
             if (this.nymph.config.cache) {
                 this.cleanCache(entity.guid);
             }
-            success = await saveExistingEntityCallback(entity, entity.guid, tags, data, sdata, mdate, etype);
+            success = await saveExistingEntityCallback({
+                entity,
+                guid: entity.guid,
+                tags,
+                data,
+                sdata,
+                uniques,
+                mdate,
+                etype,
+            });
             if (success) {
                 entity.mdate = mdate;
             }
@@ -601,12 +708,22 @@ class NymphDriver {
         if (commitTransactionCallback) {
             success = await commitTransactionCallback(success);
         }
+        // Cache the entity.
         if (success && this.nymph.config.cache) {
             this.pushCache(entity.guid, entity.cdate, entity.mdate, entity.tags, data, sdata);
         }
         return success;
     }
+    /**
+     * Pull an entity from the cache.
+     *
+     * @param guid The entity's GUID.
+     * @param className The entity's class.
+     * @param useSkipAc Whether to tell the entity to use skip_ac.
+     * @returns The entity or null if it's not cached.
+     */
     pullCache(guid, className, useSkipAc = false) {
+        // Increment the entity access count.
         if (!(guid in this.entityCount)) {
             this.entityCount[guid] = 0;
         }
@@ -626,17 +743,30 @@ class NymphDriver {
         }
         return null;
     }
+    /**
+     * Push an entity onto the cache.
+     *
+     * @param guid The entity's GUID.
+     * @param cdate The entity's cdate.
+     * @param mdate The entity's mdate.
+     * @param tags The entity's tags.
+     * @param data The entity's data.
+     * @param sdata The entity's sdata.
+     */
     pushCache(guid, cdate, mdate, tags, data, sdata) {
         if (guid == null) {
             return;
         }
+        // Increment the entity access count.
         if (!(guid in this.entityCount)) {
             this.entityCount[guid] = 0;
         }
         this.entityCount[guid]++;
+        // Check the threshold.
         if (this.entityCount[guid] < this.nymph.config.cacheThreshold) {
             return;
         }
+        // Cache the entity.
         this.entityCache[guid] = {
             cdate: cdate,
             mdate: mdate,
@@ -646,12 +776,15 @@ class NymphDriver {
         };
         while (this.nymph.config.cacheLimit &&
             Object.keys(this.entityCache).length >= this.nymph.config.cacheLimit) {
+            // Find which entity has been accessed the least.
             const least = Object.entries(this.entityCount)
-                .sort(([guidA, countA], [guidB, countB]) => countA - countB)
+                .sort(([_guidA, countA], [_guidB, countB]) => countA - countB)
                 .pop()?.[0] ?? null;
             if (least == null) {
+                // This should never happen.
                 return;
             }
+            // Remove it.
             delete this.entityCache[least];
             delete this.entityCount[least];
         }