quidproquo-web-react 0.0.254 → 0.0.255

package/lib/esm/hooks/index.d.ts

@@ -1,8 +1,8 @@
-export * from './asmj';
-export * from './useAsyncEffect';
-export * from './useFastCallback';
-export * from './useMetadata';
-export * from './useOnKeyDownEffect';
-export * from './useQpq';
-export * from './useRunEvery';
-export * from './useThrottledMemo';
+export * from './asmj';
+export * from './useAsyncEffect';
+export * from './useFastCallback';
+export * from './useMetadata';
+export * from './useOnKeyDownEffect';
+export * from './useQpq';
+export * from './useRunEvery';
+export * from './useThrottledMemo';

package/lib/esm/hooks/index.js

@@ -1,8 +1,8 @@
-export * from './asmj';
-export * from './useAsyncEffect';
-export * from './useFastCallback';
-export * from './useMetadata';
-export * from './useOnKeyDownEffect';
-export * from './useQpq';
-export * from './useRunEvery';
-export * from './useThrottledMemo';
+export * from './asmj';
+export * from './useAsyncEffect';
+export * from './useFastCallback';
+export * from './useMetadata';
+export * from './useOnKeyDownEffect';
+export * from './useQpq';
+export * from './useRunEvery';
+export * from './useThrottledMemo';

package/lib/esm/hooks/useAsyncEffect.d.ts

@@ -1,2 +1,2 @@
-import { DependencyList } from 'react';
-export declare const useAsyncEffect: (effect: (isMounted: () => boolean) => Promise<void | (() => void)>, deps?: DependencyList) => void;
+import { DependencyList } from 'react';
+export declare const useAsyncEffect: (effect: (isMounted: () => boolean) => Promise<void | (() => void)>, deps?: DependencyList) => void;

package/lib/esm/hooks/useAsyncEffect.js

@@ -1,23 +1,23 @@
-import { useEffect } from 'react';
-export const useAsyncEffect = (effect, deps) => {
-    useEffect(() => {
-        const mountStatus = { mounted: true };
-        const runEffect = async () => {
-            try {
-                return await effect(() => mountStatus.mounted);
-            }
-            catch (error) {
-                console.error('Error in useAsyncEffect:', error);
-            }
-        };
-        const result = runEffect();
-        return () => {
-            mountStatus.mounted = false;
-            result.then((callback) => {
-                if (callback) {
-                    callback();
-                }
-            });
-        };
-    }, deps);
-};
+import { useEffect } from 'react';
+export const useAsyncEffect = (effect, deps) => {
+    useEffect(() => {
+        const mountStatus = { mounted: true };
+        const runEffect = async () => {
+            try {
+                return await effect(() => mountStatus.mounted);
+            }
+            catch (error) {
+                console.error('Error in useAsyncEffect:', error);
+            }
+        };
+        const result = runEffect();
+        return () => {
+            mountStatus.mounted = false;
+            result.then((callback) => {
+                if (callback) {
+                    callback();
+                }
+            });
+        };
+    }, deps);
+};

package/lib/esm/hooks/useFastCallback.d.ts

@@ -1,2 +1,2 @@
-import { DependencyList } from 'react';
-export declare function useFastCallback<T extends Function>(callback: T, deps?: DependencyList): T;
+import { DependencyList } from 'react';
+export declare function useFastCallback<T extends Function>(callback: T, deps?: DependencyList): T;

package/lib/esm/hooks/useFastCallback.js

@@ -1,16 +1,16 @@
-import { useCallback, useRef } from 'react';
-// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-export function useFastCallback(callback, deps) {
-    const callbackRef = useRef(callback);
-    const depsRef = useRef(deps);
-    // If the deps have changed, update the callback ref
-    // We support undefined deps, which means they are always updated
-    // This is different to [] where its never updated.
-    const hasDepsChanged = !depsRef.current || !deps || depsRef.current.some((dep, index) => dep !== deps[index]);
-    if (hasDepsChanged) {
-        callbackRef.current = callback;
-    }
-    depsRef.current = deps;
-    const memoFunc = useCallback((...args) => callbackRef.current(...args), []);
-    return memoFunc;
-}
+import { useCallback, useRef } from 'react';
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+export function useFastCallback(callback, deps) {
+    const callbackRef = useRef(callback);
+    const depsRef = useRef(deps);
+    // If the deps have changed, update the callback ref
+    // We support undefined deps, which means they are always updated
+    // This is different to [] where its never updated.
+    const hasDepsChanged = !depsRef.current || !deps || depsRef.current.some((dep, index) => dep !== deps[index]);
+    if (hasDepsChanged) {
+        callbackRef.current = callback;
+    }
+    depsRef.current = deps;
+    const memoFunc = useCallback((...args) => callbackRef.current(...args), []);
+    return memoFunc;
+}

package/lib/esm/hooks/useMetadata/index.d.ts

@@ -1 +1 @@
-export * from './useMetadata';
+export * from './useMetadata';

package/lib/esm/hooks/useMetadata/index.js

@@ -1 +1 @@
-export * from './useMetadata';
+export * from './useMetadata';

package/lib/esm/hooks/useMetadata/useMetadata.d.ts

@@ -1,5 +1,5 @@
-type MetadataGetter<M> = () => M | undefined;
-type MetadataSetter<M> = (value: M) => void;
-type UseMetadataReturn<M> = [MetadataGetter<M>, MetadataSetter<M>];
-export declare function useMetadata<M>(key: object): UseMetadataReturn<M>;
-export {};
+type MetadataGetter<M> = () => M | undefined;
+type MetadataSetter<M> = (value: M) => void;
+type UseMetadataReturn<M> = [MetadataGetter<M>, MetadataSetter<M>];
+export declare function useMetadata<M>(key: object): UseMetadataReturn<M>;
+export {};

package/lib/esm/hooks/useMetadata/useMetadata.js

@@ -1,11 +1,11 @@
-import { useMemo } from 'react';
-const metadataStore = new WeakMap();
-export function useMetadata(key) {
-    return useMemo(() => {
-        const getMetadata = () => metadataStore.get(key);
-        const setMetadata = (value) => {
-            metadataStore.set(key, value);
-        };
-        return [getMetadata, setMetadata];
-    }, [key]);
-}
+import { useMemo } from 'react';
+const metadataStore = new WeakMap();
+export function useMetadata(key) {
+    return useMemo(() => {
+        const getMetadata = () => metadataStore.get(key);
+        const setMetadata = (value) => {
+            metadataStore.set(key, value);
+        };
+        return [getMetadata, setMetadata];
+    }, [key]);
+}

package/lib/esm/hooks/useOnKeyDownEffect.d.ts

@@ -1 +1 @@
-export declare function useOnKeyDownEffect(targetKey: KeyboardEvent['key'], isActive: boolean, callback?: () => void): void;
+export declare function useOnKeyDownEffect(targetKey: KeyboardEvent['key'], isActive: boolean, callback?: () => void): void;

package/lib/esm/hooks/useOnKeyDownEffect.js

@@ -1,19 +1,19 @@
-import { useEffect } from 'react';
-export function useOnKeyDownEffect(targetKey, isActive, callback) {
-    useEffect(() => {
-        if (!isActive || !callback) {
-            return () => {
-                // NOOP
-            };
-        }
-        const handleKeyDown = (event) => {
-            if (event.key === targetKey) {
-                callback();
-            }
-        };
-        document.addEventListener('keydown', handleKeyDown);
-        return () => {
-            document.removeEventListener('keydown', handleKeyDown);
-        };
-    }, [targetKey, isActive, callback]);
-}
+import { useEffect } from 'react';
+export function useOnKeyDownEffect(targetKey, isActive, callback) {
+    useEffect(() => {
+        if (!isActive || !callback) {
+            return () => {
+                // NOOP
+            };
+        }
+        const handleKeyDown = (event) => {
+            if (event.key === targetKey) {
+                callback();
+            }
+        };
+        document.addEventListener('keydown', handleKeyDown);
+        return () => {
+            document.removeEventListener('keydown', handleKeyDown);
+        };
+    }, [targetKey, isActive, callback]);
+}

package/lib/esm/hooks/useQpq.d.ts

@@ -1,2 +1,2 @@
-import { ActionProcessorListResolver, StoryResolver } from 'quidproquo-core';
-export declare function useQpq(getActionProcessors?: ActionProcessorListResolver): StoryResolver;
+import { ActionProcessorListResolver, StoryResolver } from 'quidproquo-core';
+export declare function useQpq(getActionProcessors?: ActionProcessorListResolver): StoryResolver;

package/lib/esm/hooks/useQpq.js

@@ -1,34 +1,34 @@
-import { getWebActionProcessors } from 'quidproquo-actionprocessor-web';
-import { createRuntime, defineModule, QpqRuntimeType, } from 'quidproquo-core';
-import { useCallback, useMemo } from 'react';
-import { useQpqContextValues } from './asmj';
-// WIP ~ useFastCallback, wack things like loggers in a context, try to only make once instance of the runtime.
-// Also don't create every refresh.. useMemo / useCallback etc
-const logger = {
-    enableLogs: async () => { },
-    log: async () => { },
-    waitToFinishWriting: async () => { },
-    moveToPermanentStorage: async () => { },
-};
-export function useQpq(getActionProcessors = async () => ({})) {
-    const qpqContextValues = useQpqContextValues();
-    const resolveStory = useMemo(() => createRuntime([defineModule('UI')], {
-        depth: 0,
-        context: qpqContextValues,
-    }, async (qpqConfig, dynamicModuleLoader) => ({
-        ...(await getWebActionProcessors(qpqConfig, dynamicModuleLoader)),
-        ...(await getActionProcessors(qpqConfig, dynamicModuleLoader)),
-    }), () => new Date().toISOString(), logger, `frontend::${'uuid'}`, QpqRuntimeType.UI, async (_runtime) => {
-        // noop
-    }), [qpqContextValues]);
-    const qpq = useCallback(function getStoryExecutor(story) {
-        return async (...args) => {
-            const result = await resolveStory(story, args);
-            if (result.error) {
-                throw new Error(result.error.errorText);
-            }
-            return result.result;
-        };
-    }, [resolveStory]);
-    return qpq;
-}
+import { getWebActionProcessors } from 'quidproquo-actionprocessor-web';
+import { createRuntime, defineModule, QpqRuntimeType, } from 'quidproquo-core';
+import { useCallback, useMemo } from 'react';
+import { useQpqContextValues } from './asmj';
+// WIP ~ useFastCallback, wack things like loggers in a context, try to only make once instance of the runtime.
+// Also don't create every refresh.. useMemo / useCallback etc
+const logger = {
+    enableLogs: async () => { },
+    log: async () => { },
+    waitToFinishWriting: async () => { },
+    moveToPermanentStorage: async () => { },
+};
+export function useQpq(getActionProcessors = async () => ({})) {
+    const qpqContextValues = useQpqContextValues();
+    const resolveStory = useMemo(() => createRuntime([defineModule('UI')], {
+        depth: 0,
+        context: qpqContextValues,
+    }, async (qpqConfig, dynamicModuleLoader) => ({
+        ...(await getWebActionProcessors(qpqConfig, dynamicModuleLoader)),
+        ...(await getActionProcessors(qpqConfig, dynamicModuleLoader)),
+    }), () => new Date().toISOString(), logger, `frontend::${'uuid'}`, QpqRuntimeType.UI, async (_runtime) => {
+        // noop
+    }), [qpqContextValues]);
+    const qpq = useCallback(function getStoryExecutor(story) {
+        return async (...args) => {
+            const result = await resolveStory(story, args);
+            if (result.error) {
+                throw new Error(result.error.errorText);
+            }
+            return result.result;
+        };
+    }, [resolveStory]);
+    return qpq;
+}

package/lib/esm/hooks/useRunEvery.d.ts

@@ -1 +1 @@
-export declare function useRunEvery<T>(func: () => T, intervalSeconds: number): T;
+export declare function useRunEvery<T>(func: () => T, intervalSeconds: number): T;

package/lib/esm/hooks/useRunEvery.js

@@ -1,18 +1,18 @@
-import { useEffect, useRef, useState } from 'react';
-export function useRunEvery(func, intervalSeconds) {
-    const [value, setValue] = useState(func);
-    const intervalRef = useRef(null);
-    useEffect(() => {
-        intervalRef.current = window.setInterval(() => {
-            const newValue = func();
-            setValue(newValue);
-        }, intervalSeconds * 1000);
-        return () => {
-            if (intervalRef.current !== null) {
-                window.clearInterval(intervalRef.current);
-                intervalRef.current = null;
-            }
-        };
-    }, [intervalSeconds]);
-    return value;
-}
+import { useEffect, useRef, useState } from 'react';
+export function useRunEvery(func, intervalSeconds) {
+    const [value, setValue] = useState(func);
+    const intervalRef = useRef(null);
+    useEffect(() => {
+        intervalRef.current = window.setInterval(() => {
+            const newValue = func();
+            setValue(newValue);
+        }, intervalSeconds * 1000);
+        return () => {
+            if (intervalRef.current !== null) {
+                window.clearInterval(intervalRef.current);
+                intervalRef.current = null;
+            }
+        };
+    }, [intervalSeconds]);
+    return value;
+}

package/lib/esm/hooks/useThrottledMemo.d.ts

@@ -1 +1 @@
-export declare function useThrottledMemo<T>(factory: () => T, deps: any[], delaySeconds?: number): T;
+export declare function useThrottledMemo<T>(factory: () => T, deps: any[], delaySeconds?: number): T;

package/lib/esm/hooks/useThrottledMemo.js

@@ -1,28 +1,28 @@
-import { useEffect, useRef, useState } from 'react';
-export function useThrottledMemo(factory, deps, delaySeconds = 1) {
-    const [value, setValue] = useState(factory);
-    const isFirstRun = useRef(true);
-    const timeoutRef = useRef(null);
-    useEffect(() => {
-        // This skips the throttling on the initial mount
-        if (isFirstRun.current) {
-            isFirstRun.current = false;
-            return;
-        }
-        if (timeoutRef.current) {
-            clearTimeout(timeoutRef.current);
-        }
-        timeoutRef.current = setTimeout(() => {
-            setValue(factory);
-            timeoutRef.current = null;
-        }, delaySeconds * 1000);
-        // Cleanup on component unmount or when dependencies change
-        return () => {
-            if (timeoutRef.current) {
-                clearTimeout(timeoutRef.current);
-                timeoutRef.current = null;
-            }
-        };
-    }, [...deps, delaySeconds]);
-    return value;
-}
+import { useEffect, useRef, useState } from 'react';
+export function useThrottledMemo(factory, deps, delaySeconds = 1) {
+    const [value, setValue] = useState(factory);
+    const isFirstRun = useRef(true);
+    const timeoutRef = useRef(null);
+    useEffect(() => {
+        // This skips the throttling on the initial mount
+        if (isFirstRun.current) {
+            isFirstRun.current = false;
+            return;
+        }
+        if (timeoutRef.current) {
+            clearTimeout(timeoutRef.current);
+        }
+        timeoutRef.current = setTimeout(() => {
+            setValue(factory);
+            timeoutRef.current = null;
+        }, delaySeconds * 1000);
+        // Cleanup on component unmount or when dependencies change
+        return () => {
+            if (timeoutRef.current) {
+                clearTimeout(timeoutRef.current);
+                timeoutRef.current = null;
+            }
+        };
+    }, [...deps, delaySeconds]);
+    return value;
+}

package/lib/esm/index.d.ts

@@ -1,10 +1,10 @@
-import 'symbol-observable';
-export * from './api';
-export * from './auth';
-export * from './baseUrl';
-export * from './hooks';
-export * from './state';
-export * from './useFieldBinding';
-export * from './useSharedQueryParams';
-export * from './websocket';
-export * from './webSocketQueue';
+import 'symbol-observable';
+export * from './api';
+export * from './auth';
+export * from './baseUrl';
+export * from './hooks';
+export * from './state';
+export * from './useFieldBinding';
+export * from './useSharedQueryParams';
+export * from './websocket';
+export * from './webSocketQueue';

package/lib/esm/index.js

@@ -1,10 +1,10 @@
-import 'symbol-observable';
-export * from './api';
-export * from './auth';
-export * from './baseUrl';
-export * from './hooks';
-export * from './state';
-export * from './useFieldBinding';
-export * from './useSharedQueryParams';
-export * from './websocket';
-export * from './webSocketQueue';
+import 'symbol-observable';
+export * from './api';
+export * from './auth';
+export * from './baseUrl';
+export * from './hooks';
+export * from './state';
+export * from './useFieldBinding';
+export * from './useSharedQueryParams';
+export * from './websocket';
+export * from './webSocketQueue';

package/lib/esm/state/index.d.ts

@@ -1 +1 @@
-export * from './useStateUpdater';
+export * from './useStateUpdater';

package/lib/esm/state/index.js

@@ -1 +1 @@
-export * from './useStateUpdater';
+export * from './useStateUpdater';

package/lib/esm/state/useStateUpdater.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
-type UpdaterFunction<T> = (property: keyof T) => (value: T[keyof T]) => void;
-export declare const useStateUpdater: <T>(setState: import("react").Dispatch<import("react").SetStateAction<T>>) => UpdaterFunction<T>;
-export {};
+type UpdaterFunction<T> = (property: keyof T) => (value: T[keyof T]) => void;
+export declare const useStateUpdater: <T>(setState: React.Dispatch<React.SetStateAction<T>>) => UpdaterFunction<T>;
+export {};

package/lib/esm/state/useStateUpdater.js

@@ -1,11 +1,11 @@
-import { useFastCallback } from '../hooks';
-export const useStateUpdater = (setState) => {
-    return useFastCallback((property) => {
-        return (value) => {
-            setState((prevState) => ({
-                ...prevState,
-                [property]: value,
-            }));
-        };
-    }, [setState]);
-};
+import { useFastCallback } from '../hooks';
+export const useStateUpdater = (setState) => {
+    return useFastCallback((property) => {
+        return (value) => {
+            setState((prevState) => ({
+                ...prevState,
+                [property]: value,
+            }));
+        };
+    }, [setState]);
+};

package/lib/esm/useFieldBinding/index.d.ts

@@ -1 +1 @@
-export * from './useFieldBinding';
+export * from './useFieldBinding';

package/lib/esm/useFieldBinding/index.js

@@ -1 +1 @@
-export * from './useFieldBinding';
+export * from './useFieldBinding';

package/lib/esm/useFieldBinding/useFieldBinding.d.ts

@@ -1,2 +1,2 @@
-import { QpqRuntimeComputed } from '../hooks';
-export declare const useFieldBinding: <TState, V, E = any>(computedAtom: QpqRuntimeComputed<TState, V>, someSetter: (value: V) => Promise<void> | void, valueExtractor?: ((event: E, ...args: any[]) => V) | undefined) => [V, (event: E, ...args: any[]) => void];
+import { QpqRuntimeComputed } from '../hooks';
+export declare const useFieldBinding: <TState, V, E = any>(computedAtom: QpqRuntimeComputed<TState, V>, someSetter: (value: V) => Promise<void> | void, valueExtractor?: (event: E, ...args: any[]) => V) => [V, (event: E, ...args: any[]) => void];

package/lib/esm/useFieldBinding/useFieldBinding.js

@@ -1,17 +1,17 @@
-import { useEffect, useState } from 'react';
-import { useQpqRuntimeComputed } from '../hooks';
-export const useFieldBinding = (computedAtom, someSetter, valueExtractor) => {
-    const computedValue = useQpqRuntimeComputed(computedAtom);
-    const [value, setValue] = useState(computedValue);
-    const handleChange = (event, ...args) => {
-        const newValue = valueExtractor ? valueExtractor(event, ...args) : event.target.value;
-        setValue(newValue);
-        someSetter(newValue);
-    };
-    useEffect(() => {
-        if (computedValue !== value) {
-            setValue(computedValue);
-        }
-    }, [computedValue]);
-    return [value, handleChange];
-};
+import { useEffect, useState } from 'react';
+import { useQpqRuntimeComputed } from '../hooks';
+export const useFieldBinding = (computedAtom, someSetter, valueExtractor) => {
+    const computedValue = useQpqRuntimeComputed(computedAtom);
+    const [value, setValue] = useState(computedValue);
+    const handleChange = (event, ...args) => {
+        const newValue = valueExtractor ? valueExtractor(event, ...args) : event.target.value;
+        setValue(newValue);
+        someSetter(newValue);
+    };
+    useEffect(() => {
+        if (computedValue !== value) {
+            setValue(computedValue);
+        }
+    }, [computedValue]);
+    return [value, handleChange];
+};

package/lib/esm/useSharedQueryParams/index.d.ts

@@ -1,2 +1,2 @@
-export * from './logic';
-export * from './sharedQueryParamsRuntime';
+export * from './logic';
+export * from './sharedQueryParamsRuntime';

package/lib/esm/useSharedQueryParams/index.js

@@ -1,2 +1,2 @@
-export * from './logic';
-export * from './sharedQueryParamsRuntime';
+export * from './logic';
+export * from './sharedQueryParamsRuntime';

package/lib/esm/useSharedQueryParams/logic/index.d.ts

@@ -1,4 +1,4 @@
-export * from './runtime';
-export * from './sharedQueryParamsActionCreator';
-export * from './sharedQueryParamsReducer';
-export * from './sharedQueryParamsTypes';
+export * from './runtime';
+export * from './sharedQueryParamsActionCreator';
+export * from './sharedQueryParamsReducer';
+export * from './sharedQueryParamsTypes';

package/lib/esm/useSharedQueryParams/logic/index.js

@@ -1,4 +1,4 @@
-export * from './runtime';
-export * from './sharedQueryParamsActionCreator';
-export * from './sharedQueryParamsReducer';
-export * from './sharedQueryParamsTypes';
+export * from './runtime';
+export * from './sharedQueryParamsActionCreator';
+export * from './sharedQueryParamsReducer';
+export * from './sharedQueryParamsTypes';

package/lib/esm/useSharedQueryParams/logic/runtime/askSetParam.d.ts

@@ -1,2 +1,2 @@
-import { AskResponse } from 'quidproquo-core';
-export declare function askSetParam(key: string, values: string[]): AskResponse<void>;
+import { AskResponse } from 'quidproquo-core';
+export declare function askSetParam(key: string, values: string[]): AskResponse<void>;

package/lib/esm/useSharedQueryParams/logic/runtime/askSetParam.js

@@ -1,6 +1,6 @@
-import { askQueryParamsSet } from 'quidproquo-web';
-import { askSharedQueryParamsUISetParam } from '../sharedQueryParamsActionCreator';
-export function* askSetParam(key, values) {
-    yield* askQueryParamsSet(key, values, false);
-    yield* askSharedQueryParamsUISetParam(key, values);
-}
+import { askQueryParamsSet } from 'quidproquo-web';
+import { askSharedQueryParamsUISetParam } from '../sharedQueryParamsActionCreator';
+export function* askSetParam(key, values) {
+    yield* askQueryParamsSet(key, values, false);
+    yield* askSharedQueryParamsUISetParam(key, values);
+}

package/lib/esm/useSharedQueryParams/logic/runtime/askSyncParams.d.ts

@@ -1,2 +1,2 @@
-import { AskResponse } from 'quidproquo-core';
-export declare function askSyncParams(): AskResponse<void>;
+import { AskResponse } from 'quidproquo-core';
+export declare function askSyncParams(): AskResponse<void>;

package/lib/esm/useSharedQueryParams/logic/runtime/askSyncParams.js

@@ -1,8 +1,8 @@
-import { askQueryParamsGetAll } from 'quidproquo-web';
-import { askSharedQueryParamsUISetParam } from '../sharedQueryParamsActionCreator';
-export function* askSyncParams() {
-    const params = yield* askQueryParamsGetAll();
-    for (const key in params) {
-        yield* askSharedQueryParamsUISetParam(key, params[key]);
-    }
-}
+import { askQueryParamsGetAll } from 'quidproquo-web';
+import { askSharedQueryParamsUISetParam } from '../sharedQueryParamsActionCreator';
+export function* askSyncParams() {
+    const params = yield* askQueryParamsGetAll();
+    for (const key in params) {
+        yield* askSharedQueryParamsUISetParam(key, params[key]);
+    }
+}

package/lib/esm/useSharedQueryParams/logic/runtime/index.d.ts

@@ -1,2 +1,2 @@
-export * from './askSyncParams';
-export * from './sharedQueryParamsLogic';
+export * from './askSyncParams';
+export * from './sharedQueryParamsLogic';

package/lib/esm/useSharedQueryParams/logic/runtime/index.js

@@ -1,2 +1,2 @@
-export * from './askSyncParams';
-export * from './sharedQueryParamsLogic';
+export * from './askSyncParams';
+export * from './sharedQueryParamsLogic';