@jplorg/jpl 1.1.0 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,7 +11,7 @@ var internals = _interopRequireWildcard(require("./internals"));
11
11
  var native = _interopRequireWildcard(require("./native"));
12
12
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
13
13
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
15
15
  const builtins = `
16
16
  # There are additional builtins that are implemented directly in the corresponding languages.
17
17
  # Also the functions in the "internals" namespace are not exposed to the public and are only to be used by the builtins below.
@@ -161,4 +161,4 @@ Object.keys(_math).forEach(function (key) {
161
161
  }
162
162
  });
163
163
  });
164
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
164
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
package/lib/index.js CHANGED
@@ -45,7 +45,7 @@ var _program = require("./program");
45
45
  var _runtime = require("./runtime");
46
46
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
47
47
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
48
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
48
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
49
49
  const getGlobalOptions = exports.getOptions = (0, _createSingleton.default)(async () => ({
50
50
  interpreter: {},
51
51
  program: {},
@@ -12,7 +12,7 @@ var _runtime = require("../runtime");
12
12
  var _parse = require("./parse");
13
13
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
14
14
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
15
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
16
16
  const defaultOptions = {};
17
17
  function applyInterpreterDefaults(options = {}, defaults = {}) {
18
18
  return (0, _applyDefaults.default)(options, defaults);
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  var _library = require("../library");
8
8
  var _system = _interopRequireDefault(require("./system"));
9
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
9
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
10
10
  /**
11
11
  * Create an orphan JPL function from the specified source program string.
12
12
  *
@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _ = _interopRequireDefault(require("."));
8
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
8
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
9
9
  const systemInterpreter = new _.default();
10
10
  var _default = exports.default = systemInterpreter;
@@ -333,7 +333,7 @@ function errorUnexpectedToken(src, i, c, {
333
333
  if (operator) errorMessage += ` while parsing ${operator}`;
334
334
  if (message) errorMessage += `: ${message}`;
335
335
  errorMessage += `\n${highlightLocation(src, i, c).value}`;
336
- throw new _library.JPLSyntaxError(errorMessage);
336
+ throw new _library.JPLSyntaxError(errorMessage, src, i);
337
337
  }
338
338
 
339
339
  /** Throw an error caused by a generic parser error at i */
@@ -345,5 +345,5 @@ function errorGeneric(src, i, c, {
345
345
  if (operator) errorMessage += ` while parsing ${operator}`;
346
346
  if (message) errorMessage += `: ${message}`;
347
347
  errorMessage += `\n${highlightLocation(src, i, c).value}`;
348
- throw new _library.JPLSyntaxError(errorMessage);
348
+ throw new _library.JPLSyntaxError(errorMessage, src, i);
349
349
  }
@@ -8,7 +8,7 @@ exports.adaptErrorsAsync = adaptErrorsAsync;
8
8
  exports.default = void 0;
9
9
  var _error = _interopRequireDefault(require("./error"));
10
10
  var _execution = _interopRequireDefault(require("./execution"));
11
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
12
12
  /** Wrap occuring errors in a JPLExecutionError if they are not already a JPLError */
13
13
  function adaptErrors(cb) {
14
14
  try {
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _error = _interopRequireDefault(require("./error"));
8
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
8
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
9
9
  /** JPL error type for wrapping errors that should be handled elsewhere */
10
10
  class JPLErrorEnclosure extends _error.default {
11
11
  constructor(inner) {
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _error = _interopRequireDefault(require("./error"));
8
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
8
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
9
9
  /**
10
10
  * JPL error type for execution errors.
11
11
  *
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _error = _interopRequireDefault(require("./error"));
8
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
8
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
9
9
  /* JPL error type used for unrecoverable errors */
10
10
  class JPLFatalError extends _error.default {
11
11
  constructor(error) {
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = exports.JPLZeroDivisionError = exports.JPLTypeError = exports.JPLTypeConversionError = exports.JPLReferenceError = void 0;
7
7
  var _types = require("../types");
8
8
  var _execution = _interopRequireDefault(require("./execution"));
9
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
9
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
10
10
  function format(value, replacements) {
11
11
  return replacements.length > 0 ? (0, _types.template)(value, ...replacements) : (0, _types.displayValue)(value);
12
12
  }
@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _error = _interopRequireDefault(require("./error"));
8
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
8
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
9
9
  /** JPL error type for syntax errors */
10
10
  class JPLSyntaxError extends _error.default {
11
- constructor(message) {
11
+ constructor(message, src = '', at = 0) {
12
12
  super(message, 'JPLSyntaxError');
13
+ this.src = src;
14
+ this.at = at;
13
15
  }
14
16
  }
15
17
  var _default = exports.default = JPLSyntaxError;
@@ -7,7 +7,7 @@ exports.nativeFunction = nativeFunction;
7
7
  exports.orphanFunction = orphanFunction;
8
8
  exports.scopedFunction = scopedFunction;
9
9
  var _runtimeScope = _interopRequireDefault(require("./runtimeScope"));
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
10
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
11
11
  function jplEnclosure(runtime, signal, next, input, ...args) {
12
12
  const {
13
13
  argNames,
@@ -331,6 +331,6 @@ Object.keys(_ops).forEach(function (key) {
331
331
  });
332
332
  var _runtimeScope = _interopRequireDefault(require("./runtimeScope"));
333
333
  var _types = require("./types");
334
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
334
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
335
335
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
336
336
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  var _apply = require("./apply");
8
8
  var _runtimeSignal = _interopRequireDefault(require("./runtimeSignal"));
9
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
9
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
10
10
  /**
11
11
  * Runtime scope for managing contextual runtime information.
12
12
  *
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _fatal = _interopRequireDefault(require("./errors/fatal"));
8
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
8
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
9
9
  /** Runtime signal for managing execution lifecycle */
10
10
  class JPLRuntimeSignal {
11
11
  constructor(parent) {
@@ -22,7 +22,7 @@ exports.unwrap = unwrap;
22
22
  var _apply = require("./apply");
23
23
  var _adaptErrors = _interopRequireWildcard(require("./errors/adaptErrors"));
24
24
  var _fatal = _interopRequireDefault(require("./errors/fatal"));
25
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
26
26
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
27
27
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
28
28
  /**
@@ -11,7 +11,7 @@ var _runtime = _interopRequireWildcard(require("../runtime"));
11
11
  var _ops = _interopRequireDefault(require("./ops"));
12
12
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
13
13
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
15
15
  const defaultOptions = {};
16
16
  function applyProgramDefaults(options = {}, defaults = {}) {
17
17
  return (0, _applyDefaults.default)(options, defaults);
@@ -68,5 +68,35 @@ class JPLProgram {
68
68
  const outputs = await runtime.execute(normalizedInputs);
69
69
  return runtime.stripJSON(outputs);
70
70
  };
71
+
72
+ /**
73
+ * Return a new program with the provided definition's instructions prepended to the program.
74
+ */
75
+ prepend = programDefinition => {
76
+ validateDefinition(programDefinition);
77
+ const mergedDefinition = {
78
+ version: _library.DEFINITION_VERSION,
79
+ instructions: [...programDefinition.instructions, ...this.definition.instructions]
80
+ };
81
+ return new JPLProgram(mergedDefinition, {
82
+ program: this._options,
83
+ runtime: this._runtimeOptions
84
+ });
85
+ };
86
+
87
+ /**
88
+ * Return a new program with the provided definition's instructions appended to the program.
89
+ */
90
+ append = programDefinition => {
91
+ validateDefinition(programDefinition);
92
+ const mergedDefinition = {
93
+ version: _library.DEFINITION_VERSION,
94
+ instructions: [...this.definition.instructions, ...programDefinition.instructions]
95
+ };
96
+ return new JPLProgram(mergedDefinition, {
97
+ program: this._options,
98
+ runtime: this._runtimeOptions
99
+ });
100
+ };
71
101
  }
72
102
  var _default = exports.default = JPLProgram;
@@ -30,7 +30,7 @@ var _opTry = _interopRequireDefault(require("./opTry"));
30
30
  var _opVariable = _interopRequireDefault(require("./opVariable"));
31
31
  var _opVariableDefinition = _interopRequireDefault(require("./opVariableDefinition"));
32
32
  var _opVoid = _interopRequireDefault(require("./opVoid"));
33
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
33
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
34
34
  const ops = {
35
35
  [_library.OP_ACCESS]: _opAccess.default,
36
36
  [_library.OP_AND]: _opAnd.default,
@@ -10,7 +10,7 @@ var _opaField = _interopRequireDefault(require("./opaField"));
10
10
  var _opaFunction = _interopRequireDefault(require("./opaFunction"));
11
11
  var _opaIter = _interopRequireDefault(require("./opaIter"));
12
12
  var _opaSlice = _interopRequireDefault(require("./opaSlice"));
13
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
14
14
  var _default = exports.default = {
15
15
  /** { pipe: [op], selectors: [opa] } */
16
16
  op(runtime, input, params, scope, next) {
@@ -17,7 +17,7 @@ var _opuRemainder = _interopRequireDefault(require("./opuRemainder"));
17
17
  var _opuSet = _interopRequireDefault(require("./opuSet"));
18
18
  var _opuSubtraction = _interopRequireDefault(require("./opuSubtraction"));
19
19
  var _opuUpdate = _interopRequireDefault(require("./opuUpdate"));
20
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
20
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
21
21
  var _default = exports.default = {
22
22
  /** { pipe: [op], selectors: [opa], assignment: [opu] } */
23
23
  op(runtime, input, params, scope, next) {
@@ -11,7 +11,7 @@ var _opmDivision = _interopRequireDefault(require("./opmDivision"));
11
11
  var _opmMultiplication = _interopRequireDefault(require("./opmMultiplication"));
12
12
  var _opmRemainder = _interopRequireDefault(require("./opmRemainder"));
13
13
  var _opmSubtraction = _interopRequireDefault(require("./opmSubtraction"));
14
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
15
15
  var _default = exports.default = {
16
16
  /** { pipe: [op], operations: [opm] } */
17
17
  op(runtime, input, params, scope, next) {
@@ -12,7 +12,7 @@ var _opcGreaterEqual = _interopRequireDefault(require("./opcGreaterEqual"));
12
12
  var _opcLess = _interopRequireDefault(require("./opcLess"));
13
13
  var _opcLessEqual = _interopRequireDefault(require("./opcLessEqual"));
14
14
  var _opcUnequal = _interopRequireDefault(require("./opcUnequal"));
15
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
16
16
  var _default = exports.default = {
17
17
  /** { pipe: [op], comparisons: [opc] } */
18
18
  op(runtime, input, params, scope, next) {
@@ -7,7 +7,7 @@ exports.applyRuntimeDefaults = applyRuntimeDefaults;
7
7
  exports.default = void 0;
8
8
  var _applyDefaults = _interopRequireDefault(require("../applyDefaults"));
9
9
  var _library = require("../library");
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
10
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
11
11
  const defaultOptions = {
12
12
  vars: {}
13
13
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jplorg/jpl",
3
- "version": "1.1.0",
3
+ "version": "1.3.0",
4
4
  "description": "JPL interpreter",
5
5
  "main": "./lib/index.js",
6
6
  "exports": {
@@ -47,21 +47,20 @@
47
47
  },
48
48
  "homepage": "https://github.com/jplorg/jpl",
49
49
  "devDependencies": {
50
- "@babel/cli": "^7.22.15",
51
- "@babel/core": "^7.24.4",
52
- "@babel/eslint-parser": "^7.22.15",
53
- "@babel/preset-env": "^7.24.4",
54
- "@babel/preset-react": "^7.18.6",
50
+ "@babel/cli": "^7.24.8",
51
+ "@babel/core": "^7.25.2",
52
+ "@babel/eslint-parser": "^7.25.1",
53
+ "@babel/preset-env": "^7.25.3",
54
+ "@babel/preset-react": "^7.24.7",
55
55
  "cross-env": "^7.0.3",
56
- "eslint": "^8.53.0",
56
+ "eslint": "^8.57.0",
57
57
  "eslint-config-prettier": "^9.0.0",
58
58
  "eslint-plugin-import": "^2.29.0",
59
- "eslint-plugin-prettier": "^5.0.1",
60
- "eslint-plugin-react": "^7.33.2",
59
+ "eslint-plugin-prettier": "^5.2.1",
60
+ "eslint-plugin-react": "^7.35.0",
61
61
  "eslint-plugin-react-hooks": "^4.6.0",
62
- "eslint-plugin-unused-imports": "^3.0.0",
63
- "prettier": "^3.2.5",
64
- "rimraf": "^5.0.5"
65
- },
66
- "dependencies": {}
62
+ "eslint-plugin-unused-imports": "^3.2.0",
63
+ "prettier": "^3.3.3",
64
+ "rimraf": "^6.0.1"
65
+ }
67
66
  }
package/repl.js CHANGED
@@ -9,17 +9,23 @@ const pkg = require('@jplorg/jpl/package.json');
9
9
 
10
10
  const replKeys = [':', '!'];
11
11
  const defaultReplKey = replKeys[0];
12
+ const defaultPrompt = '> ';
13
+ const multilinePrompt = '… ';
14
+
15
+ let multilineInput;
12
16
 
13
17
  const homeDir = os.homedir();
14
18
  const historyFile = homeDir ? path.join(homeDir, '.jpl_repl_history') : undefined;
15
19
 
20
+ const muted = !process.stdin.isTTY;
21
+
16
22
  const rl = readline.createInterface({
17
23
  input: process.stdin,
18
- output: process.stdout,
24
+ output: muted ? undefined : process.stdout,
19
25
  history: readHistory(),
20
26
  historySize: 50,
21
27
  removeHistoryDuplicates: true,
22
- prompt: '> ',
28
+ prompt: defaultPrompt,
23
29
  });
24
30
 
25
31
  function readHistory() {
@@ -53,6 +59,13 @@ rl.on('close', () => {
53
59
  });
54
60
 
55
61
  rl.on('SIGINT', () => {
62
+ if (multilineInput != null) {
63
+ multilineInput = null;
64
+ rl.clearLine();
65
+ rl.setPrompt(defaultPrompt);
66
+ rl.prompt();
67
+ return undefined;
68
+ }
56
69
  if (rl.cursor === 0) return process.exit(0);
57
70
  process.stdout.write(`\nTo exit, press Ctrl+C again or type ${defaultReplKey}e`);
58
71
  rl.clearLine();
@@ -67,8 +80,10 @@ let measureTime;
67
80
  main();
68
81
 
69
82
  async function main() {
70
- console.log(`Welcome to JPL v${pkg.version}.`);
71
- console.log(`Type "${defaultReplKey}h" for more information.\n`);
83
+ if (!muted) {
84
+ console.log(`Welcome to JPL v${pkg.version}.`);
85
+ console.log(`Type "${defaultReplKey}h" for more information.\n`);
86
+ }
72
87
 
73
88
  const options = await jpl.getOptions();
74
89
  options.runtime.vars.exit = jpl.nativeFunction(() => {
@@ -81,7 +96,6 @@ async function main() {
81
96
 
82
97
  rl.prompt();
83
98
 
84
- // eslint-disable-next-line no-restricted-syntax
85
99
  for await (const line of rl) {
86
100
  rl.pause();
87
101
  await handle(line);
@@ -92,7 +106,8 @@ async function main() {
92
106
  async function handle(input) {
93
107
  if (!keep || inputs.length === 0) inputs = [null];
94
108
 
95
- let line = input;
109
+ const fullLine = (multilineInput ?? '') + input;
110
+ let line = fullLine;
96
111
  const t = line.trimStart();
97
112
 
98
113
  if (!t) {
@@ -119,17 +134,28 @@ async function handle(input) {
119
134
  break;
120
135
 
121
136
  case 'k':
122
- keep = parseBool(line, !keep) ?? keep;
137
+ keep = parseBool(line, !keep, 'keep') ?? keep;
123
138
  break;
124
139
 
125
140
  case 't':
126
- measureTime = parseBool(line, !measureTime) ?? measureTime;
141
+ measureTime = parseBool(line, !measureTime, 'time') ?? measureTime;
127
142
  break;
128
143
 
129
144
  case 'i':
145
+ // reset prompt after potential previous multiline input
146
+ multilineInput = null;
147
+ rl.setPrompt(defaultPrompt);
130
148
  try {
131
- console.log(JSON.stringify((await jpl.parse(line)).definition, null, 2));
149
+ const program = await jpl.parse(line);
150
+ console.log(JSON.stringify(program.definition, null, 2));
132
151
  } catch (err) {
152
+ if (jpl.JPLSyntaxError.is(err) && err.at >= err.src.length) {
153
+ // program is incomplete -> request additional input
154
+ multilineInput = fullLine + '\n';
155
+ rl.setPrompt(multilinePrompt);
156
+ rl.prompt();
157
+ return undefined;
158
+ }
133
159
  if (jpl.JPLSyntaxError.is(err)) console.log(`${err.name ?? 'JPLError'}: ${err.message}`);
134
160
  else console.log(err.stack);
135
161
  }
@@ -145,6 +171,9 @@ async function handle(input) {
145
171
  printHelp();
146
172
  }
147
173
  } else {
174
+ // reset prompt after potential previous multiline input
175
+ multilineInput = null;
176
+ rl.setPrompt(defaultPrompt);
148
177
  try {
149
178
  const program = await jpl.parse(line);
150
179
  let before;
@@ -153,8 +182,15 @@ async function handle(input) {
153
182
  inputs = await program.run(inputs);
154
183
  if (measureTime) diff = Date.now() - before;
155
184
  console.log(inputs.map((output) => JSON.stringify(output, null, 2)).join(', '));
156
- if (measureTime) console.log(`-> took ${diff / 1000}s`);
185
+ if (measureTime) console.log(` -> took ${diff / 1000}s`);
157
186
  } catch (err) {
187
+ if (jpl.JPLSyntaxError.is(err) && err.at >= err.src.length) {
188
+ // program is incomplete -> request additional input
189
+ multilineInput = fullLine + '\n';
190
+ rl.setPrompt(multilinePrompt);
191
+ rl.prompt();
192
+ return undefined;
193
+ }
158
194
  if (jpl.JPLSyntaxError.is(err) || jpl.JPLExecutionError.is(err))
159
195
  console.log(`${err.name ?? 'JPLError'}: ${err.message}`);
160
196
  else console.log(err.stack);
@@ -165,14 +201,14 @@ async function handle(input) {
165
201
  return undefined;
166
202
  }
167
203
 
168
- function parseBool(input, defaultValue) {
204
+ function parseBool(input, defaultValue, label) {
169
205
  const b = input.trim().toLowerCase();
170
206
  let v;
171
207
  if (b.length === 0) v = defaultValue;
172
208
  else if (b === 'on' || ['true', 'yes', 'enabled'].some((e) => e.startsWith(b))) v = true;
173
209
  else if (b === 'off' || ['false', 'no', 'disabled'].some((e) => e.startsWith(b))) v = false;
174
210
  if (typeof v === 'boolean') {
175
- console.log(` -> ${v ? 'on' : 'off'}`);
211
+ console.log(` -> ${label} ${v ? 'on' : 'off'}`);
176
212
  return v;
177
213
  }
178
214
  console.log(`Error: invalid boolean ${b}`);
@@ -224,7 +224,7 @@ export function errorUnexpectedToken(src, i, c, { operator, message } = {}) {
224
224
  if (operator) errorMessage += ` while parsing ${operator}`;
225
225
  if (message) errorMessage += `: ${message}`;
226
226
  errorMessage += `\n${highlightLocation(src, i, c).value}`;
227
- throw new JPLSyntaxError(errorMessage);
227
+ throw new JPLSyntaxError(errorMessage, src, i);
228
228
  }
229
229
 
230
230
  /** Throw an error caused by a generic parser error at i */
@@ -233,5 +233,5 @@ export function errorGeneric(src, i, c, { operator, message } = {}) {
233
233
  if (operator) errorMessage += ` while parsing ${operator}`;
234
234
  if (message) errorMessage += `: ${message}`;
235
235
  errorMessage += `\n${highlightLocation(src, i, c).value}`;
236
- throw new JPLSyntaxError(errorMessage);
236
+ throw new JPLSyntaxError(errorMessage, src, i);
237
237
  }
@@ -2,8 +2,10 @@ import JPLError from './error';
2
2
 
3
3
  /** JPL error type for syntax errors */
4
4
  class JPLSyntaxError extends JPLError {
5
- constructor(message) {
5
+ constructor(message, src = '', at = 0) {
6
6
  super(message, 'JPLSyntaxError');
7
+ this.src = src;
8
+ this.at = at;
7
9
  }
8
10
  }
9
11
 
@@ -17,7 +17,7 @@ export function applyProgramDefaults(options = {}, defaults = {}) {
17
17
  function validateDefinition(programDefinition) {
18
18
  const version = programDefinition?.version;
19
19
  const [, major, minor] =
20
- typeof version === 'string' ? /^(\d+)\.(\d+)?$/g.exec(version) ?? [] : [];
20
+ typeof version === 'string' ? (/^(\d+)\.(\d+)?$/g.exec(version) ?? []) : [];
21
21
 
22
22
  if (!major || !minor || !Array.isArray(programDefinition.instructions)) {
23
23
  throw new JPLFatalError('invalid program definition');
@@ -75,6 +75,40 @@ class JPLProgram {
75
75
  const outputs = await runtime.execute(normalizedInputs);
76
76
  return runtime.stripJSON(outputs);
77
77
  };
78
+
79
+ /**
80
+ * Return a new program with the provided definition's instructions prepended to the program.
81
+ */
82
+ prepend = (programDefinition) => {
83
+ validateDefinition(programDefinition);
84
+
85
+ const mergedDefinition = {
86
+ version: DEFINITION_VERSION,
87
+ instructions: [...programDefinition.instructions, ...this.definition.instructions],
88
+ };
89
+
90
+ return new JPLProgram(mergedDefinition, {
91
+ program: this._options,
92
+ runtime: this._runtimeOptions,
93
+ });
94
+ };
95
+
96
+ /**
97
+ * Return a new program with the provided definition's instructions appended to the program.
98
+ */
99
+ append = (programDefinition) => {
100
+ validateDefinition(programDefinition);
101
+
102
+ const mergedDefinition = {
103
+ version: DEFINITION_VERSION,
104
+ instructions: [...this.definition.instructions, ...programDefinition.instructions],
105
+ };
106
+
107
+ return new JPLProgram(mergedDefinition, {
108
+ program: this._options,
109
+ runtime: this._runtimeOptions,
110
+ });
111
+ };
78
112
  }
79
113
 
80
114
  export default JPLProgram;