Always init
This commit is contained in:
parent
c38b7c9972
commit
70ef5cc0de
4 changed files with 20 additions and 59 deletions
|
|
@ -1,24 +1,11 @@
|
|||
import { init, reconcile, reconcileWithHistory } from './index';
|
||||
import * as fs from 'fs';
|
||||
import { reconcile, reconcileWithHistory } from './index';
|
||||
|
||||
describe('reconcile', () => {
|
||||
it('tries calling functions without init', () => {
|
||||
expect(() => reconcile('Hello', 'Hello world', 'Hi world')).toThrow(/call init()/);
|
||||
|
||||
expect(() => reconcileWithHistory('Hello', 'Hello world', 'Hi world')).toThrow(
|
||||
/call init()/
|
||||
);
|
||||
});
|
||||
|
||||
it('call reconcile without cursors', async () => {
|
||||
await initWasm();
|
||||
|
||||
it('call reconcile without cursors', () => {
|
||||
expect(reconcile('Hello', 'Hello world', 'Hi world').text).toEqual('Hi world');
|
||||
});
|
||||
|
||||
it('call reconcile with cursors', async () => {
|
||||
await initWasm();
|
||||
|
||||
it('call reconcile with cursors', () => {
|
||||
const result = reconcile(
|
||||
'Hello',
|
||||
{
|
||||
|
|
@ -50,17 +37,10 @@ describe('reconcile', () => {
|
|||
]);
|
||||
});
|
||||
|
||||
it('call reconcileWithHistory', async () => {
|
||||
await initWasm();
|
||||
|
||||
it('call reconcileWithHistory', () => {
|
||||
const result = reconcileWithHistory('Hello', 'Hello world', 'Hi world');
|
||||
|
||||
expect(result.text).toEqual('Hi world');
|
||||
expect(result.history.length).toBeGreaterThan(0);
|
||||
});
|
||||
});
|
||||
|
||||
async function initWasm() {
|
||||
const wasmBin = fs.readFileSync('../pkg/reconcile_bg.wasm');
|
||||
await init({ module_or_path: wasmBin });
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,11 @@ import wasmInit, {
|
|||
BuiltinTokenizer,
|
||||
reconcileWithHistory as wasmReconcileWithHistory,
|
||||
History,
|
||||
InitInput,
|
||||
initSync,
|
||||
} from 'reconcile';
|
||||
|
||||
import wasm from 'reconcile/reconcile_bg.wasm';
|
||||
|
||||
export interface TextWithCursors {
|
||||
/** The document's entire content */
|
||||
text: string;
|
||||
|
|
@ -44,32 +46,10 @@ const TOKENIZERS = ['Line', 'Word', 'Character'];
|
|||
|
||||
let isInitialised = false;
|
||||
|
||||
const UNINITIALISED_MODULE_ERROR =
|
||||
'Reconcile module has not been initialized. Please call init() before using any other functions.';
|
||||
|
||||
const UNSUPPORTED_TOKENIZER_ERROR = `Unsupported tokenizer. Only ${TOKENIZERS.join(
|
||||
', '
|
||||
)} are supported.`;
|
||||
|
||||
/**
|
||||
* Initializes the WASM module for text reconciliation.
|
||||
* Must be called before using any other functions.
|
||||
*
|
||||
* The function is idempotent.
|
||||
*
|
||||
* @param content - Optional initialization input for the WASM module during testing.
|
||||
* @returns Promise that resolves when initialization is complete
|
||||
*/
|
||||
export async function init(content?: InitInput) {
|
||||
if (isInitialised) {
|
||||
return;
|
||||
}
|
||||
|
||||
await wasmInit(content);
|
||||
|
||||
isInitialised = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Merges three versions of text (original, left, right) and cursor positions.
|
||||
*
|
||||
|
|
@ -85,9 +65,7 @@ export function reconcile(
|
|||
right: string | TextWithCursors,
|
||||
tokenizer: BuiltinTokenizer = 'Word'
|
||||
): TextWithCursors {
|
||||
if (!isInitialised) {
|
||||
throw new Error(UNINITIALISED_MODULE_ERROR);
|
||||
}
|
||||
init();
|
||||
|
||||
if (!TOKENIZERS.includes(tokenizer)) {
|
||||
throw new Error(UNSUPPORTED_TOKENIZER_ERROR);
|
||||
|
|
@ -124,9 +102,7 @@ export function reconcileWithHistory(
|
|||
right: string | TextWithCursors,
|
||||
tokenizer: BuiltinTokenizer = 'Word'
|
||||
): TextWithCursorsAndHistory {
|
||||
if (!isInitialised) {
|
||||
throw new Error(UNINITIALISED_MODULE_ERROR);
|
||||
}
|
||||
init();
|
||||
|
||||
if (!TOKENIZERS.includes(tokenizer)) {
|
||||
throw new Error(UNSUPPORTED_TOKENIZER_ERROR);
|
||||
|
|
@ -150,6 +126,16 @@ export function reconcileWithHistory(
|
|||
};
|
||||
}
|
||||
|
||||
function init() {
|
||||
if (isInitialised) {
|
||||
return;
|
||||
}
|
||||
|
||||
initSync({ module: (wasm as any).default });
|
||||
|
||||
isInitialised = true;
|
||||
}
|
||||
|
||||
function toWasmTextWithCursors(text: string | TextWithCursors): wasmTextWithCursors {
|
||||
const isInputString = typeof text == 'string';
|
||||
const leftText = isInputString ? text : text.text;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue