@drayman/core 2.9.0 → 3.0.0

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.componentInstances = exports.onDestroyComponentInstance = exports.onDisconnect = exports.onInitializeComponentInstance = exports.saveComponent = exports.handleEventHubEvent = exports.onHandleBrowserCallback = exports.onUpdateComponentInstanceProps = exports.getElementsScriptPaths = exports.handleComponentEvent = void 0;
+exports.onDestroyComponentInstance = exports.onDisconnect = exports.onInitializeComponentInstance = exports.saveComponent = exports.handleEventHubEvent = exports.onHandleBrowserCallback = exports.onUpdateComponentInstanceProps = exports.getElementsScriptPaths = exports.handleComponentEvent = exports.componentInstances = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const shortid_1 = __importDefault(require("shortid"));
@@ -17,24 +17,169 @@ const getNpmPackages = (nodeModulesPath) => {
         });
     });
 };
-const handleComponentEvent = ({ componentInstanceId, eventName, options, files, onSuccess, onError }) => {
-    options = options || {};
-    if (typeof options === 'string') {
-        options = JSON.parse(options);
+const delay = (ms) => {
+    return new Promise(r => setTimeout(r, ms));
+};
+const toMB = (x) => {
+    return Math.round((x / 1048576) * 10) / 10;
+};
+const getPct = (num, den) => {
+    return Math.min(100, Math.round((den > 0 ? (num / den) : 0) * 100));
+};
+const withTimeout = async (p, ms) => {
+    return Promise.race([
+        p,
+        (async () => {
+            await delay(ms);
+            throw new Error(`Timed out after ${ms} ms`);
+        })()
+    ]);
+};
+const safeParse = (value) => {
+    if (typeof value !== 'string') {
+        return value;
+    }
+    try {
+        return JSON.parse(value);
+    }
+    catch {
+        return {};
+    }
+};
+const garbage = {
+    connections: new Set(),
+    componentInstances: new Map(),
+};
+const markConnectionGarbage = (connectionId) => {
+    garbage.connections.add(connectionId);
+    clearGarbage();
+};
+const markComponentGarbage = (componentInstanceId, opts = {}) => {
+    const prev = garbage.componentInstances.get(componentInstanceId) || {};
+    garbage.componentInstances.set(componentInstanceId, {
+        skipOnDestroy: Boolean(prev.skipOnDestroy || opts.skipOnDestroy),
+    });
+    clearGarbage();
+};
+const clearGarbage = () => {
+    const aliveIds = Object.keys(exports.componentInstances);
+    const fromConnections = new Map();
+    for (const id of aliveIds) {
+        const instance = exports.componentInstances[id];
+        if (instance && garbage.connections.has(instance.connectionId)) {
+            fromConnections.set(id, { skipOnDestroy: false });
+        }
+    }
+    const explicit = new Map(garbage.componentInstances);
+    const toTerminate = new Map();
+    for (const [id, opts] of fromConnections) {
+        toTerminate.set(id, { skipOnDestroy: Boolean(opts.skipOnDestroy) });
+    }
+    for (const [id, opts] of explicit) {
+        const prev = toTerminate.get(id) || { skipOnDestroy: false };
+        toTerminate.set(id, { skipOnDestroy: Boolean(prev.skipOnDestroy || opts.skipOnDestroy) });
+    }
+    for (const [id, opts] of toTerminate) {
+        const instance = exports.componentInstances[id];
+        if (!instance || instance.terminatingPromise) {
+            continue;
+        }
+        terminateComponentInstance(id, Boolean(opts.skipOnDestroy));
+    }
+    garbage.componentInstances.clear();
+    garbage.connections.clear();
+};
+async function terminateComponentInstance(componentInstanceId, skipOnDestroy = false) {
+    const instance = exports.componentInstances[componentInstanceId];
+    if (!instance) {
+        return;
     }
+    if (instance.terminatingPromise) {
+        return instance.terminatingPromise;
+    }
+    instance.terminatingPromise = (async () => {
+        for (const requestId of Object.keys(instance.eventRequests)) {
+            try {
+                instance.eventRequests[requestId].onError({ err: `Component instance was destroyed` });
+            }
+            catch { }
+        }
+        if (!skipOnDestroy) {
+            try {
+                await withTimeout(instance.worker.handleDestroyComponentInstance(), 3000);
+            }
+            catch (e) {
+                console.warn(`Handle destroy component instance failed for ${componentInstanceId} (${instance.component})`, e);
+            }
+        }
+        try {
+            await withTimeout(threads_1.Thread.terminate(instance.worker), 1000);
+        }
+        catch (e) {
+            console.warn(`Thread.terminate failed for ${componentInstanceId} (${instance.component})`, e);
+        }
+        try {
+            instance.eventsSub?.unsubscribe?.();
+        }
+        catch (e) {
+            console.warn(`Failed to unsubscribe events for ${componentInstanceId} (${instance.component})`, e);
+        }
+        delete exports.componentInstances[componentInstanceId];
+        try {
+            instance?.emit?.({
+                type: 'componentInstanceDestroyed',
+                payload: {},
+                componentInstanceId,
+            });
+        }
+        catch (e) {
+            console.warn(`Failed to emit componentInstanceDestroyed for ${componentInstanceId} (${instance.component})`, e);
+        }
+    })();
+    return instance.terminatingPromise;
+}
+setInterval(() => {
+    const now = Date.now();
+    for (const [id, instance] of Object.entries(exports.componentInstances)) {
+        if (!instance || instance.terminatingPromise) {
+            continue;
+        }
+        const limit = instance.heartbeatLimitMs;
+        if (now - instance.lastHeartbeat > limit) {
+            console.warn(`Heartbeat limit reached (${limit} ms) — stopping ${id} (${instance.component})`);
+            markComponentGarbage(id, { skipOnDestroy: true });
+        }
+    }
+}, 1000);
+exports.componentInstances = {};
+const handleComponentEvent = ({ componentInstanceId, eventName, options, files, onSuccess, onError }) => {
+    options = safeParse(options);
     const requestId = shortid_1.default.generate();
-    if (Object.keys(exports.componentInstances).includes(componentInstanceId)) {
-        exports.componentInstances[componentInstanceId].eventRequests[requestId] = { onSuccess, onError };
-        exports.componentInstances[componentInstanceId].worker.handleComponentEvent({ eventName, requestId, options, files, });
+    const instance = exports.componentInstances[componentInstanceId];
+    if (instance) {
+        instance.eventRequests[requestId] = { onSuccess, onError, canceled: false };
+        instance.worker.handleComponentEvent({ eventName, requestId, options, files });
     }
     else {
-        onError({ err: `Component instance was not found.` });
+        onError({ err: 'Component instance was not found.' });
     }
     return {
         requestId,
         cancel: () => {
-            if (Object.keys(exports.componentInstances).includes(componentInstanceId)) {
-                exports.componentInstances[componentInstanceId].worker.cancelComponentEvent({ requestId, });
+            const current = exports.componentInstances[componentInstanceId];
+            if (!current) {
+                return;
+            }
+            const req = current.eventRequests[requestId];
+            if (!req) {
+                return;
+            }
+            req.canceled = true;
+            try {
+                current.worker.cancelComponentEvent({ requestId });
+            }
+            catch {
+                console.warn(`Failed to cancel component event ${eventName} (${requestId}) for ${componentInstanceId} (${instance.component})`);
             }
         }
     };
@@ -55,23 +200,44 @@ async function getElementsScriptPaths({ nodeModulesPath = null }) {
     return paths;
 }
 exports.getElementsScriptPaths = getElementsScriptPaths;
-const onUpdateComponentInstanceProps = ({ componentInstanceId, options, }) => {
-    if (typeof options === 'string') {
-        options = JSON.parse(options);
+const onUpdateComponentInstanceProps = ({ componentInstanceId, options }) => {
+    options = safeParse(options);
+    const instance = exports.componentInstances[componentInstanceId];
+    if (!instance || instance.terminatingPromise) {
+        return;
+    }
+    try {
+        instance.worker.updateComponentInstanceProps({ options });
+    }
+    catch {
+        console.warn(`Failed to update props for component instance ${componentInstanceId} (${instance.component})`);
     }
-    exports.componentInstances[componentInstanceId].worker.updateComponentInstanceProps({ options, });
 };
 exports.onUpdateComponentInstanceProps = onUpdateComponentInstanceProps;
-const onHandleBrowserCallback = ({ callbackId, data, }) => {
-    for (const key of Object.keys(exports.componentInstances)) {
-        exports.componentInstances[key].worker.handleBrowserCallback({ callbackId, data, });
+const onHandleBrowserCallback = ({ callbackId, data }) => {
+    for (const [componentInstanceId, instance] of Object.entries(exports.componentInstances)) {
+        if (!instance || instance.terminatingPromise) {
+            continue;
+        }
+        try {
+            instance.worker.handleBrowserCallback({ callbackId, data });
+        }
+        catch {
+            console.warn(`Failed to handle browser callback ${callbackId} for component instance ${componentInstanceId} (${instance.component})`);
+        }
     }
 };
 exports.onHandleBrowserCallback = onHandleBrowserCallback;
 const handleEventHubEvent = async ({ data, groupId = null, type, namespaceId = null }) => {
-    for (const key of Object.keys(exports.componentInstances)) {
-        if (exports.componentInstances[key].namespaceId === namespaceId) {
-            exports.componentInstances[key].worker.handleEventHubEvent({ type, data, groupId });
+    for (const [componentInstanceId, instance] of Object.entries(exports.componentInstances)) {
+        if (!instance || instance.terminatingPromise || instance.namespaceId !== namespaceId) {
+            continue;
+        }
+        try {
+            instance.worker.handleEventHubEvent({ type, data, groupId });
+        }
+        catch {
+            console.warn(`Failed to handle event hub event ${type} for component instance ${componentInstanceId} (${instance.component})`);
         }
     }
 };
@@ -89,21 +255,31 @@ const saveComponent = async ({ script, outputFile, scriptPath }) => {
     await fs_extra_1.default.outputFile(outputFile, transpiledComponentScript.outputText);
 };
 exports.saveComponent = saveComponent;
-const onInitializeComponentInstance = async ({ namespaceId = null, extensionsPath = null, extensionsOptions = null, componentNamePrefix = '', componentName, componentRootDir, componentInstanceId, componentOptions, connectionId, emit, onComponentInstanceConsole, browserCommands, serverCommands, onEventHubEvent = null, }) => {
-    if (componentOptions && typeof componentOptions === 'string') {
-        componentOptions = JSON.parse(componentOptions);
-    }
-    const worker = await threads_1.spawn(new threads_1.Worker(`./component-processor.js`));
+const onInitializeComponentInstance = async ({ namespaceId = null, extensionsPath = null, extensionsOptions = null, componentNamePrefix = '', componentName, componentRootDir, componentInstanceId, componentOptions, connectionId, emit, onComponentInstanceConsole, browserCommands, serverCommands, onEventHubEvent = null, heapLimit = 512, externalLimit = 512, heartbeatLimitMs = 3 * 1000, meta = null, }) => {
+    componentOptions = safeParse(componentOptions);
+    const internalWorker = new threads_1.Worker(`./component-processor.js`, {
+        resourceLimits: {
+            maxOldGenerationSizeMb: heapLimit,
+        }
+    });
+    internalWorker.addEventListener('error', (err) => {
+        markComponentGarbage(componentInstanceId, { skipOnDestroy: true });
+    });
+    const worker = await threads_1.spawn(internalWorker);
     exports.componentInstances[componentInstanceId] = {
+        heartbeatLimitMs,
+        heapLimit,
+        externalLimit,
+        componentName,
         worker,
-        terminate: async () => {
-            for (const requestId of Object.keys(exports.componentInstances[componentInstanceId].eventRequests)) {
-                exports.componentInstances[componentInstanceId].eventRequests[requestId].onError({ err: `Component instance was destroyed.` });
-            }
-            delete exports.componentInstances[componentInstanceId];
-            await threads_1.Thread.terminate(worker);
-            emit({ type: 'componentInstanceDestroyed', payload: {}, componentInstanceId });
-        },
+        emit,
+        lastHeartbeat: Date.now(),
+        heapUsed: 0,
+        externalUsed: 0,
+        terminatingPromise: null,
+        component: `${componentNamePrefix}${componentName}`,
+        startDate: new Date(),
+        meta,
         /**
          * Used to store user event requests (on button click, on input, etc.).
          */
@@ -111,68 +287,98 @@ const onInitializeComponentInstance = async ({ namespaceId = null, extensionsPat
         connectionId,
         namespaceId,
     };
-    worker.events().subscribe(({ type, payload }) => {
-        /**
-         * When there is a response to user event request.
-         */
-        if (type === 'response') {
-            const { requestId, result, err } = payload;
-            if (err) {
-                exports.componentInstances[componentInstanceId].eventRequests[requestId].onError({ err });
+    const subscription = worker.events().subscribe({
+        next: ({ type, payload }) => {
+            /**
+             * When there is a response to user event request.
+             */
+            if (type === 'response') {
+                const { requestId, result, err } = payload;
+                const req = exports.componentInstances[componentInstanceId]?.eventRequests?.[requestId];
+                if (req) {
+                    try {
+                        if (!req.canceled) {
+                            err ? req.onError({ err }) : req.onSuccess({ result });
+                        }
+                    }
+                    catch {
+                        console.warn(`Failed to process response for request ${requestId} in component instance ${componentInstanceId} (${exports.componentInstances[componentInstanceId].component})`);
+                    }
+                    finally {
+                        delete exports.componentInstances[componentInstanceId].eventRequests[requestId];
+                    }
+                }
+                return;
+            }
+            else if (type === 'eventHubEvent') {
+                const { eventPayload, groupId, type: eventType } = payload;
+                exports.handleEventHubEvent({ data: eventPayload, groupId, type: eventType, namespaceId });
+                onEventHubEvent?.({ data: eventPayload, groupId, type: eventType, namespaceId });
+            }
+            else if (type === 'console') {
+                const { text } = payload;
+                onComponentInstanceConsole?.({ text });
+            }
+            else if (type === 'heartbeat') {
+                const instance = exports.componentInstances[componentInstanceId];
+                if (!instance || instance.terminatingPromise) {
+                    return;
+                }
+                const { heapStatistics } = payload;
+                const heapUsedMB = toMB(heapStatistics.used_heap_size);
+                const extUsedMB = toMB(heapStatistics.external_memory);
+                const heapExceeded = heapUsedMB >= instance.heapLimit;
+                const extExceeded = extUsedMB >= instance.externalLimit;
+                instance.heapUsed = heapUsedMB;
+                instance.externalUsed = extUsedMB;
+                instance.lastHeartbeat = Date.now();
+                if (heapExceeded || extExceeded) {
+                    console.warn(`Memory limit exceeded (heap: ${heapExceeded} ${heapUsedMB}/${instance.heapLimit}, external: ${extExceeded} ${extUsedMB}/${instance.externalLimit}) — stopping ${componentInstanceId} (${instance.component})`);
+                    markComponentGarbage(componentInstanceId, { skipOnDestroy: true });
+                }
             }
             else {
-                exports.componentInstances[componentInstanceId].eventRequests[requestId].onSuccess({ result });
+                try {
+                    emit({ type, payload, componentInstanceId });
+                }
+                catch (e) {
+                    console.warn(`Failed to emit event ${type} for ${componentInstanceId} (${exports.componentInstances[componentInstanceId].component})`, e);
+                }
             }
-            delete exports.componentInstances[componentInstanceId].eventRequests[requestId];
-        }
-        else if (type === 'eventHubEvent') {
-            const { eventPayload, groupId, type } = payload;
-            exports.handleEventHubEvent({ data: eventPayload, groupId, type, namespaceId });
-            onEventHubEvent?.({ data: eventPayload, groupId, type, namespaceId });
-        }
-        else if (type === 'console') {
-            const { text } = payload;
-            onComponentInstanceConsole?.({ text });
-        }
-        else {
-            emit({ type, payload, componentInstanceId });
-        }
+        },
+        error: (err) => {
+            markComponentGarbage(componentInstanceId, { skipOnDestroy: true });
+        },
+        complete: () => {
+            markComponentGarbage(componentInstanceId, { skipOnDestroy: true });
+        },
     });
-    worker.initializeComponentInstance({ browserCommands, serverCommands, componentNamePrefix, componentName, componentRootDir, componentOptions, componentInstanceId, extensionsPath, extensionsOptions });
-    await clearGarbage();
+    exports.componentInstances[componentInstanceId].eventsSub = subscription;
+    try {
+        worker.initializeComponentInstance({
+            browserCommands,
+            serverCommands,
+            componentNamePrefix,
+            componentName,
+            componentRootDir,
+            componentOptions,
+            componentInstanceId,
+            extensionsPath,
+            extensionsOptions,
+        });
+    }
+    catch {
+        markComponentGarbage(componentInstanceId, { skipOnDestroy: true });
+    }
+    clearGarbage();
 };
 exports.onInitializeComponentInstance = onInitializeComponentInstance;
 const onDisconnect = async ({ connectionId }) => {
-    garbage.connections.push(connectionId);
-    await clearGarbage();
+    markConnectionGarbage(connectionId);
 };
 exports.onDisconnect = onDisconnect;
-const garbage = {
-    connections: [],
-    componentInstances: [],
-};
 const onDestroyComponentInstance = async ({ componentInstanceId }) => {
-    garbage.componentInstances.push(componentInstanceId);
-    await clearGarbage();
+    markComponentGarbage(componentInstanceId, { skipOnDestroy: false });
 };
 exports.onDestroyComponentInstance = onDestroyComponentInstance;
-exports.componentInstances = {};
-const clearGarbage = async () => {
-    const aliveComponentInstances = Object.keys(exports.componentInstances);
-    const garbageComponentInstanceIds = [
-        ...aliveComponentInstances.filter(x => garbage.connections.includes(exports.componentInstances[x].connectionId)),
-        ...garbage.componentInstances,
-    ];
-    for (const componentInstanceId of garbageComponentInstanceIds) {
-        if (exports.componentInstances[componentInstanceId]) {
-            try {
-                await exports.componentInstances[componentInstanceId].worker.handleDestroyComponentInstance();
-            }
-            catch (err) {
-                console.warn(err);
-            }
-            exports.componentInstances[componentInstanceId].terminate();
-        }
-    }
-};
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,sDAA8B;AAC9B,4DAA4B;AAC5B,qCAAgD;AAChD,iDAAqC;AAErC,MAAM,cAAc,GAAG,CAAC,eAAe,EAAE,EAAE;IACvC,OAAO,IAAI,OAAO,CAAW,CAAC,OAAO,EAAE,EAAE;QACrC,oBAAI,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,eAAe,GAAG,EAAE,UAAU,KAAK,EAAE,MAAM,EAAE,MAAM;YAC3E,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,cAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QACrF,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAA;AAEM,MAAM,oBAAoB,GAAG,CAAC,EAAE,mBAAmB,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;IAC3G,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IACxB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC7B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACjC;IACD,MAAM,SAAS,GAAG,iBAAO,CAAC,QAAQ,EAAE,CAAC;IACrC,IAAI,MAAM,CAAC,IAAI,CAAC,0BAAkB,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;QAC/D,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;QAC1F,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC;KAClH;SAAM;QACH,OAAO,CAAC,EAAE,GAAG,EAAE,mCAAmC,EAAE,CAAC,CAAC;KACzD;IAED,OAAO;QACH,SAAS;QACT,MAAM,EAAE,GAAG,EAAE;YACT,IAAI,MAAM,CAAC,IAAI,CAAC,0BAAkB,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;gBAC/D,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC;aACvF;QACL,CAAC;KACJ,CAAC;AACN,CAAC,CAAA;AArBY,QAAA,oBAAoB,wBAqBhC;AAEM,KAAK,UAAU,sBAAsB,CAAC,EAAE,eAAe,GAAG,IAAI,EAAE;IACnE,eAAe,GAAG,eAAe,IAAI,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;IAC9E,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,eAAe,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACpC,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,WAAW,EAAE,OAAO,EAAE,QAAQ,IAAI,EAAE,CAAC;QACtD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACzC,KAAK,CAAC,OAAO,CAAC,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;SACrE;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAbD,wDAaC;AAEM,MAAM,8BAA8B,GAAG,CAAC,EAAE,mBAAmB,EAAE,OAAO,GAAG,EAAE,EAAE;IAChF,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC7B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACjC;IACD,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,4BAA4B,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC;AAC9F,CAAC,CAAA;AALY,QAAA,8BAA8B,kCAK1C;AAEM,MAAM,uBAAuB,GAAG,CAAC,EAAE,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE;IAC7D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,0BAAkB,CAAC,EAAE;QAC/C,0BAAkB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,UAAU,EAAE,IAAI,GAAG,CAAC,CAAC;KAC/E;AACL,CAAC,CAAA;AAJY,QAAA,uBAAuB,2BAInC;AAEM,MAAM,mBAAmB,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,EAAE,EAAE,EAAE;IAC5F,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,0BAAkB,CAAC,EAAE;QAC/C,IAAI,0BAAkB,CAAC,GAAG,CAAC,CAAC,WAAW,KAAK,WAAW,EAAE;YACrD,0BAAkB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;SAC/E;KACJ;AACL,CAAC,CAAA;AANY,QAAA,mBAAmB,uBAM/B;AAEM,MAAM,aAAa,GAAG,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE;IACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACvB,MAAM,kBAAE,CAAC,QAAQ,CACb,cAAI,CAAC,IAAI,CACL,SAAS,EACT,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,iDAAiD,CAAC,CAAC,CAAC,sCAAsC,CAC/H,EACD,OAAO,CACV,CACJ,CAAC;IACF,IAAI,yBAAyB,GAAG,oBAAE,CAAC,eAAe,CAAC,MAAM,EAAE;QACvD,GAAG,QAAQ;QACX,eAAe,EAAE;YACb,GAAG,QAAQ,CAAC,eAAe;YAC3B,UAAU,EAAE,cAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG;SACzC;QACD,QAAQ,EAAE,GAAG,cAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,MAAM;KACjD,CAAC,CAAC;IACH,MAAM,kBAAE,CAAC,UAAU,CAAC,UAAU,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAC;AAC1E,CAAC,CAAA;AAnBY,QAAA,aAAa,iBAmBzB;AAEM,MAAM,6BAA6B,GAAG,KAAK,EAAE,EAChD,WAAW,GAAG,IAAI,EAClB,cAAc,GAAG,IAAI,EACrB,iBAAiB,GAAG,IAAI,EACxB,mBAAmB,GAAG,EAAE,EACxB,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,IAAI,EACJ,0BAA0B,EAC1B,eAAe,EACf,cAAc,EACd,eAAe,GAAG,IAAI,GACzB,EAAE,EAAE;IACD,IAAI,gBAAgB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;QAC1D,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;KACnD;IACD,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,IAAI,gBAAM,CAAC,0BAA0B,CAAC,CAAC,CAAC;IACnE,0BAAkB,CAAC,mBAAmB,CAAC,GAAG;QACtC,MAAM;QACN,SAAS,EAAE,KAAK,IAAI,EAAE;YAClB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,aAAa,CAAC,EAAE;gBACxF,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,mCAAmC,EAAE,CAAC,CAAC;aAC1H;YACD,OAAO,0BAAkB,CAAC,mBAAmB,CAAC,CAAC;YAC/C,MAAM,gBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAC/B,IAAI,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,OAAO,EAAE,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC;QACnF,CAAC;QACD;;WAEG;QACH,aAAa,EAAE,EAAE;QACjB,YAAY;QACZ,WAAW;KACd,CAAC;IACF,MAAM,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QAC5C;;WAEG;QACH,IAAI,IAAI,KAAK,UAAU,EAAE;YACrB,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;YAC3C,IAAI,GAAG,EAAE;gBACL,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;aACrF;iBAAM;gBACH,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;aAC1F;YACD,OAAO,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;SAC3E;aAAM,IAAI,IAAI,KAAK,eAAe,EAAE;YACjC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YAChD,2BAAmB,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;YACxE,eAAe,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;SACzE;aAAM,IAAI,IAAI,KAAK,SAAS,EAAE;YAC3B,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YACzB,0BAA0B,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1C;aAAM;YACH,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;SAChD;IACL,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,2BAA2B,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACxM,MAAM,YAAY,EAAE,CAAC;AACzB,CAAC,CAAA;AA9DY,QAAA,6BAA6B,iCA8DzC;AAEM,MAAM,YAAY,GAAG,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;IACnD,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,MAAM,YAAY,EAAE,CAAC;AACzB,CAAC,CAAA;AAHY,QAAA,YAAY,gBAGxB;AAED,MAAM,OAAO,GAA4D;IACrE,WAAW,EAAE,EAAE;IACf,kBAAkB,EAAE,EAAE;CACzB,CAAA;AAEM,MAAM,0BAA0B,GAAG,KAAK,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE;IACxE,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACrD,MAAM,YAAY,EAAE,CAAC;AACzB,CAAC,CAAA;AAHY,QAAA,0BAA0B,8BAGtC;AAEY,QAAA,kBAAkB,GAa3B,EAAE,CAAC;AAEP,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;IAC5B,MAAM,uBAAuB,GAAG,MAAM,CAAC,IAAI,CAAC,0BAAkB,CAAC,CAAC;IAChE,MAAM,2BAA2B,GAAG;QAChC,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,0BAAkB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACxG,GAAG,OAAO,CAAC,kBAAkB;KAChC,CAAC;IACF,KAAK,MAAM,mBAAmB,IAAI,2BAA2B,EAAE;QAC3D,IAAI,0BAAkB,CAAC,mBAAmB,CAAC,EAAE;YACzC,IAAI;gBACA,MAAM,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,8BAA8B,EAAE,CAAC;aACzF;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aACpB;YACD,0BAAkB,CAAC,mBAAmB,CAAC,CAAC,SAAS,EAAE,CAAC;SACvD;KACJ;AACL,CAAC,CAAA"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drayman/core",
-  "version": "2.9.0",
+  "version": "3.0.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -22,8 +22,9 @@
     "@babel/preset-env": "^7.13.15",
     "@babel/preset-react": "^7.13.13",
     "@babel/preset-typescript": "^7.13.0",
-    "@drayman/types": "^2.9.0",
+    "@drayman/types": "^3.0.0",
     "@types/jest": "^26.0.22",
+    "@types/lodash": "^4.17.0",
     "@types/node": "^14.14.39",
     "babel-jest": "^26.6.3",
     "jest": "^26.6.3"
@@ -33,6 +34,7 @@
     "consola": "^2.15.3",
     "fast-json-patch": "^3.0.0-1",
     "fs-extra": "^9.1.0",
+    "lodash": "^4.17.21",
     "node-find": "^0.7.2",
     "shortid": "^2.2.16",
     "source-map-support": "^0.5.21",
@@ -40,5 +42,5 @@
     "ts-node": "^9.1.1",
     "typescript": "~4.1.5"
   },
-  "gitHead": "df1629bc8a46ac3ca17d9ff94eba5134c6c46ed1"
+  "gitHead": "381df692bc47e7ae87ec30c332ace3a7cfe1096d"
 }