add evalScope + deprecate extend

This commit is contained in:
Felix Roos 2022-05-17 00:31:20 +02:00
parent aa3db09f22
commit 2a618b42b7
3 changed files with 18 additions and 3 deletions

View File

@ -11,6 +11,8 @@ npm i @strudel.cycles/eval --save
## Example ## Example
TODO: -extend +evalScope
```js ```js
import { evaluate, extend } from '@strudel.cycles/eval'; import { evaluate, extend } from '@strudel.cycles/eval';
import * as strudel from '@strudel.cycles/core'; import * as strudel from '@strudel.cycles/core';

View File

@ -7,19 +7,31 @@ This program is free software: you can redistribute it and/or modify it under th
import shapeshifter from './shapeshifter.mjs'; import shapeshifter from './shapeshifter.mjs';
import * as strudel from '@strudel.cycles/core'; import * as strudel from '@strudel.cycles/core';
const { isPattern } = strudel; const { isPattern, Pattern } = strudel;
export const extend = (...args) => { export const extend = (...args) => {
// TODO: find a way to make args available to eval without adding it to global scope... console.warn('@strudel.cycles/eval extend is deprecated, please use evalScopep instead');
// sadly, "with" does not work in strict mode
Object.assign(globalThis, ...args); Object.assign(globalThis, ...args);
}; };
let scoped = false;
export const evalScope = async (...args) => {
if (scoped) {
console.warn('@strudel.cycles/eval evalScope was called more than once.');
}
scoped = true;
const modules = await Promise.all(args);
Object.assign(globalThis, ...modules, Pattern.prototype.bootstrap());
};
function safeEval(str) { function safeEval(str) {
return Function('"use strict";return (' + str + ')')(); return Function('"use strict";return (' + str + ')')();
} }
export const evaluate = async (code) => { export const evaluate = async (code) => {
if (!scoped) {
await evalScope(); // at least scope Pattern.prototype.boostrap
}
const shapeshifted = shapeshifter(code); // transform syntactically correct js code to semantically usable code const shapeshifted = shapeshifter(code); // transform syntactically correct js code to semantically usable code
let evaluated = await safeEval(shapeshifted); let evaluated = await safeEval(shapeshifted);
if (!isPattern(evaluated)) { if (!isPattern(evaluated)) {

View File

@ -12,6 +12,7 @@ import * as strudel from '@strudel.cycles/core';
const { fastcat } = strudel; const { fastcat } = strudel;
extend({ mini }, strudel); extend({ mini }, strudel);
// TODO: test evalScope
describe('evaluate', () => { describe('evaluate', () => {
const ev = async (code) => (await evaluate(code)).pattern._firstCycleValues; const ev = async (code) => (await evaluate(code)).pattern._firstCycleValues;