@inseefr/lunatic 2.7.0-rc.5 → 2.7.1

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.
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports["default"] = void 0;
7
- var _createWorkerTs = require("../../../utils/suggester-workers/create-worker-ts");
8
- var _workerPath = require("../../../utils/suggester-workers/worker-path");
7
+ var _createWorker = require("../../../utils/suggester-workers/create-worker");
9
8
  // @ts-ignore
10
9
 
10
+ var WORKER_PATH = process.env.LUNATIC_LABEL_WORKER_PATH || process.env.REACT_APP_LUNATIC_LABEL_WORKER_PATH || '';
11
11
  var WORKER;
12
12
  var TASKS = new Map();
13
13
  function getIdTask() {
@@ -19,7 +19,7 @@ function getIdTask() {
19
19
  }
20
20
  function getWorker() {
21
21
  if (!WORKER) {
22
- WORKER = (0, _createWorkerTs.createWorker)((0, _workerPath.getWorkerPath)(_workerPath.WorkerEnum.LABEL));
22
+ WORKER = (0, _createWorker.createWorker)(WORKER_PATH);
23
23
  WORKER.addEventListener('message', function (e) {
24
24
  var data = e.data;
25
25
  var response = data.response,
@@ -6,37 +6,60 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports["default"] = void 0;
8
8
  exports.isWorkerCompatible = isWorkerCompatible;
9
- var _createWorkerTs = require("../../../utils/suggester-workers/create-worker-ts");
10
- var _workerPath = require("../../../utils/suggester-workers/worker-path");
9
+ var _createWorker = require("../../../utils/suggester-workers/create-worker");
11
10
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
12
11
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
13
12
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } // @ts-ignore
13
+ var WORKER_PATH =
14
+ // @ts-ignore
15
+ import.meta.env.LUNATIC_SEARCH_WORKER_PATH ||
16
+ // @ts-ignore
17
+ import.meta.env.REACT_APP_LUNATIC_SEARCH_WORKER_PATH;
14
18
  function isWorkerCompatible() {
15
19
  return !!window.Worker;
16
20
  }
17
- function getWorker(resolve) {
18
- var WORKER = (0, _createWorkerTs.createWorker)((0, _workerPath.getWorkerPath)(_workerPath.WorkerEnum.SEARCH));
19
- WORKER.addEventListener('message', function (e) {
20
- var data = e.data;
21
- resolve(data);
22
- WORKER === null || WORKER === void 0 || WORKER.terminate();
23
- });
24
- return WORKER;
25
- }
21
+ var searching = function searching(worker) {
22
+ return function (search, name, version) {
23
+ if (!WORKER_PATH) {
24
+ throw new Error("Worker path is required for suggester's searches.");
25
+ }
26
+ if (isWorkerCompatible()) {
27
+ return new Promise(function (resolve) {
28
+ try {
29
+ if (worker) {
30
+ worker.terminate();
31
+ }
32
+ worker = (0, _createWorker.createWorker)(WORKER_PATH);
33
+ worker.postMessage({
34
+ search: search,
35
+ name: name,
36
+ version: version
37
+ });
38
+ worker.addEventListener('message', function (e) {
39
+ var _worker;
40
+ var data = e.data;
41
+ resolve(data);
42
+ (_worker = worker) === null || _worker === void 0 || _worker.terminate();
43
+ worker = undefined;
44
+ });
45
+ } catch (e) {
46
+ //TODO
47
+ }
48
+ });
49
+ }
50
+ // TODO
51
+ return Promise.reject('No worker found');
52
+ };
53
+ };
26
54
  function createSearching(name, version) {
55
+ var worker = undefined;
56
+ var searching_ = searching(worker);
27
57
  return /*#__PURE__*/function () {
28
58
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
29
59
  return _regeneratorRuntime().wrap(function _callee$(_context) {
30
60
  while (1) switch (_context.prev = _context.next) {
31
61
  case 0:
32
- return _context.abrupt("return", new Promise(function (resolve) {
33
- var worker = getWorker(resolve);
34
- worker.postMessage({
35
- search: search,
36
- name: name,
37
- version: version
38
- });
39
- }));
62
+ return _context.abrupt("return", searching_(search, name, version));
40
63
  case 1:
41
64
  case "end":
42
65
  return _context.stop();
@@ -1,8 +1,8 @@
1
1
  import { type FunctionComponent } from 'react';
2
2
  import type { LunaticData, LunaticState } from './type';
3
- import type { LunaticComponentType } from '../components/type';
4
3
  import type { LunaticSource } from './type-source';
5
- declare function useLunatic(source: LunaticSource, data: LunaticData | undefined, { features, preferences, savingType, onChange, management, shortcut, initialPage, lastReachedPage, autoSuggesterLoading, activeControls, getReferentiel, custom, withOverview, missing, missingStrategy, missingShortcut, dontKnowButton, refusedButton, trackChanges, workersBasePath, }: {
4
+ import type { LunaticComponentType } from '../components/type';
5
+ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined, { features, preferences, savingType, onChange, management, shortcut, initialPage, lastReachedPage, autoSuggesterLoading, activeControls, getReferentiel, custom, withOverview, missing, missingStrategy, missingShortcut, dontKnowButton, refusedButton, trackChanges, }: {
6
6
  features?: LunaticState['features'];
7
7
  preferences?: LunaticState['preferences'];
8
8
  savingType?: LunaticState['savingType'];
@@ -25,7 +25,6 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
25
25
  dontKnowButton?: string;
26
26
  refusedButton?: string;
27
27
  trackChanges?: boolean;
28
- workersBasePath?: string;
29
28
  }): {
30
29
  getComponents: ({ only, except, }?: {
31
30
  only?: (keyof {
@@ -0,0 +1 @@
1
+ export declare function getWorkerPath(): string;
@@ -30,6 +30,8 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
30
30
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
31
31
  // Interpret counter, used for testing purpose
32
32
  var interpretCount = 0;
33
+ // Special variable that will take the current iteration value
34
+ var iterationVariableName = 'GLOBAL_ITERATION_INDEX';
33
35
  var LunaticVariablesStore = exports.LunaticVariablesStore = /*#__PURE__*/function () {
34
36
  function LunaticVariablesStore() {
35
37
  _classCallCheck(this, LunaticVariablesStore);
@@ -303,6 +305,9 @@ var LunaticVariable = /*#__PURE__*/function () {
303
305
  try {
304
306
  return Object.fromEntries(this.getDependencies().map(function (dep) {
305
307
  var _this2$dictionary;
308
+ if (dep === iterationVariableName && iteration) {
309
+ return [dep, iteration[0]];
310
+ }
306
311
  var dependencyIteration = (0, _number.isNumber)(_this2.iterationDepth) && Array.isArray(iteration) ? [iteration[_this2.iterationDepth]] : iteration;
307
312
  return [dep, (_this2$dictionary = _this2.dictionary) === null || _this2$dictionary === void 0 || (_this2$dictionary = _this2$dictionary.get(dep)) === null || _this2$dictionary === void 0 ? void 0 : _this2$dictionary.getValue(dependencyIteration)];
308
313
  }));
@@ -131,6 +131,12 @@ var _missingBehaviour = require("./behaviours/missing-behaviour");
131
131
  iteration: [1]
132
132
  })).toEqual('Jane Doe');
133
133
  });
134
+ (0, _vitest.it)('should handle global iteration variable', function () {
135
+ variables.set('FIRSTNAME', ['John', 'Jane']);
136
+ variables.setCalculated('FULLNAME', 'FIRSTNAME || " " || cast(GLOBAL_ITERATION_INDEX, string)');
137
+ (0, _vitest.expect)(variables.get('FULLNAME', [0])).toEqual('John 0');
138
+ (0, _vitest.expect)(variables.get('FULLNAME', [1])).toEqual('Jane 1');
139
+ });
134
140
  });
135
141
  (0, _vitest.describe)('resizing', function () {
136
142
  (0, _vitest.it)('should resize variables', function () {
@@ -8,17 +8,17 @@ exports["default"] = void 0;
8
8
  var _react = require("react");
9
9
  var actions = _interopRequireWildcard(require("./actions"));
10
10
  var _commons = require("./commons");
11
- var _useTrackChanges2 = require("../hooks/use-track-changes");
12
11
  var _i18n = _interopRequireDefault(require("../i18n"));
13
12
  var _constants = require("../utils/constants");
13
+ var _initialState = _interopRequireDefault(require("./initial-state"));
14
+ var _lunaticContext = require("./lunatic-context");
14
15
  var _compileControls = require("./commons/compile-controls");
15
16
  var _getOverview = require("./commons/getOverview");
16
- var _getQuestionnaireData = require("./commons/variables/get-questionnaire-data");
17
17
  var _useLoopVariables = require("./hooks/use-loop-variables");
18
- var _initialState = _interopRequireDefault(require("./initial-state"));
19
- var _lunaticContext = require("./lunatic-context");
20
18
  var _reducer = _interopRequireDefault(require("./reducer"));
21
19
  var _useSuggesters = require("./use-suggesters");
20
+ var _getQuestionnaireData = require("./commons/variables/get-questionnaire-data");
21
+ var _useTrackChanges2 = require("../hooks/use-track-changes");
22
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
23
23
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
24
24
  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 && Object.prototype.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; }
@@ -79,9 +79,7 @@ function useLunatic(source) {
79
79
  _ref$refusedButton = _ref.refusedButton,
80
80
  refusedButton = _ref$refusedButton === void 0 ? DEFAULT_REFUSED : _ref$refusedButton,
81
81
  _ref$trackChanges = _ref.trackChanges,
82
- trackChanges = _ref$trackChanges === void 0 ? false : _ref$trackChanges,
83
- _ref$workersBasePath = _ref.workersBasePath,
84
- workersBasePath = _ref$workersBasePath === void 0 ? undefined : _ref$workersBasePath;
82
+ trackChanges = _ref$trackChanges === void 0 ? false : _ref$trackChanges;
85
83
  var _useReducer = (0, _react.useReducer)(_reducer["default"], _initialState["default"]),
86
84
  _useReducer2 = _slicedToArray(_useReducer, 2),
87
85
  state = _useReducer2[0],
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.getWorkerPath = getWorkerPath;
7
+ function getWorkerPath() {
8
+ var _ref, _import$meta$env$LUNA;
9
+ if ('LUNATIC_WORKER_PATH' in window) {
10
+ return window.LUNATIC_WORKER_PATH;
11
+ }
12
+ return (_ref = (_import$meta$env$LUNA = import.meta.env.LUNATIC_LOADER_WORKER_PATH) !== null && _import$meta$env$LUNA !== void 0 ? _import$meta$env$LUNA : import.meta.env.REACT_APP_LUNATIC_LOADER_WORKER_PATH) !== null && _ref !== void 0 ? _ref : 'workers/lunatic-loader-worker-0.1.0.js';
13
+ }
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.createAppendTask = createAppendTask;
7
- var _logger = require("../../logger");
8
7
  var _createWorkerTs = require("../create-worker-ts");
9
- var _workerPath = require("../worker-path");
8
+ var _workerPath = require("../../store-tools/worker-path");
9
+ var _logger = require("../../logger");
10
10
  function consoleLogging() {
11
11
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
12
12
  args[_key] = arguments[_key];
@@ -25,7 +25,7 @@ function createAppendTask(info, version) {
25
25
  fields = info.fields,
26
26
  stopWords = info.stopWords,
27
27
  meloto = info.meloto;
28
- var worker = (0, _createWorkerTs.createWorker)((0, _workerPath.getWorkerPath)(_workerPath.WorkerEnum.LOADER));
28
+ var worker = (0, _createWorkerTs.createWorker)((0, _workerPath.getWorkerPath)());
29
29
  var start = false;
30
30
  var stop = false;
31
31
  function launch(entities) {
@@ -0,0 +1,54 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.createWorker = void 0;
7
+ var _logger = require("../logger");
8
+ // Enable cross domain workers
9
+
10
+ var testSameOrigin = function testSameOrigin(url) {
11
+ var loc = window.location;
12
+ var a = document.createElement('a');
13
+ a.href = url;
14
+ return a.hostname === loc.hostname && a.port === loc.port && a.protocol === loc.protocol;
15
+ };
16
+ var createWorkerFallback = function createWorkerFallback(workerUrl) {
17
+ _logger.Logger.info('Create worker for MFE');
18
+ var worker = null;
19
+ try {
20
+ var blob;
21
+ try {
22
+ blob = new Blob(["importScripts('".concat(workerUrl, "');")], {
23
+ type: 'application/javascript'
24
+ });
25
+ } catch (e) {
26
+ var blobBuilder = new (window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder)();
27
+ blobBuilder.append("importScripts('".concat(workerUrl, "');"));
28
+ blob = blobBuilder.getBlob('application/javascript');
29
+ }
30
+ var url = window.URL || window.webkitURL;
31
+ var blobUrl = url.createObjectURL(blob);
32
+ worker = new Worker(blobUrl);
33
+ } catch (e1) {
34
+ console.error("Lunatic-worker : Failed to load web worker : ".concat(workerUrl));
35
+ }
36
+ return worker;
37
+ };
38
+ var createWorker = exports.createWorker = function createWorker(workerUrl) {
39
+ var worker = null;
40
+ try {
41
+ if (testSameOrigin(workerUrl)) {
42
+ worker = new Worker(workerUrl);
43
+ worker.onerror = function (event) {
44
+ event.preventDefault();
45
+ worker = createWorkerFallback(workerUrl);
46
+ };
47
+ } else {
48
+ worker = createWorkerFallback(workerUrl);
49
+ }
50
+ } catch (e) {
51
+ worker = createWorkerFallback(workerUrl);
52
+ }
53
+ return worker;
54
+ };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@inseefr/lunatic",
3
- "version": "2.7.0-rc.5",
4
- "workersVersion": "0.3.0-experimental",
3
+ "version": "2.7.1",
4
+ "workersVersion": "0.2.5-experimental",
5
5
  "description": "Library of questionnaire components",
6
6
  "repository": {
7
7
  "type": "git",
@@ -26,16 +26,14 @@
26
26
  "main": "lib/index.js",
27
27
  "types": "lib/src/index.d.ts",
28
28
  "files": [
29
- "lib",
30
- "workers-release",
31
- "scripts/build/workers-paths.js"
29
+ "lib"
32
30
  ],
33
31
  "scripts": {
34
- "test": "npm run prepare-workers && vitest run",
35
- "test:e2e": "npm run prepare-workers && playwright test",
36
- "test:e2e:visual": "npm run prepare-workers && playwright test --headed --debug e2e/pairwise.spec.ts",
37
- "test:e2e:codegen": "npm run prepare-workers && playwright codegen http://localhost:9999/iframe.html?viewMode=story&id=",
38
- "test:storybook": "npm run prepare-workers && test-storybook --url http://localhost:9999 --maxWorkers=4 --no-cache",
32
+ "test": "vitest run",
33
+ "test:e2e": "playwright test",
34
+ "test:e2e:visual": "playwright test --headed --debug e2e/pairwise.spec.ts",
35
+ "test:e2e:codegen": "playwright codegen http://localhost:9999/iframe.html?viewMode=story&id=",
36
+ "test:storybook": "test-storybook --url http://localhost:9999 --maxWorkers=4 --no-cache",
39
37
  "test-watch": "vitest",
40
38
  "check": "tsc",
41
39
  "lint": "eslint ./src",
@@ -44,14 +42,13 @@
44
42
  "format": "npm run _format -- --write",
45
43
  "format:check": "npm run _format -- --list-different",
46
44
  "test-coverage": "vitest run --coverage",
47
- "build-workers": "node ./scripts/build/build-workers.js",
48
- "prepare-workers": "npm run build-workers && node ./scripts/build/add-workers-to-public.js",
49
- "build": "babel src --out-dir lib --extensions \".ts,.js,.tsx,.jsx\" --copy-files && tsc --project tsconfig.prod.json && npm run build-workers",
50
- "storybook": "npm run prepare-workers && storybook dev -p 9999 --no-open",
51
- "build-storybook": "npm run prepare-workers && storybook build"
52
- },
53
- "bin": {
54
- "add-lunatic-workes": "./scripts/build/add-workers-to-public.js"
45
+ "build": "babel src --out-dir lib --extensions \".ts,.js,.tsx,.jsx\" --copy-files && tsc --project tsconfig.prod.json",
46
+ "build-append-worker": "webpack --config ./webpack-append-worker.config.js",
47
+ "build-searching-worker": "webpack --config ./webpack-searching-worker.config.js",
48
+ "build-label-worker": "webpack --config ./webpack-label-worker.config.js",
49
+ "build-workers": "yarn build-append-worker && yarn build-searching-worker && yarn build-label-worker",
50
+ "storybook": "storybook dev -p 9999 --no-open",
51
+ "build-storybook": "storybook build"
55
52
  },
56
53
  "keywords": [
57
54
  "react",
@@ -1,6 +0,0 @@
1
- export declare enum WorkerEnum {
2
- LOADER = "LOADER",
3
- SEARCH = "SEARCH",
4
- LABEL = "LABEL"
5
- }
6
- export declare function getWorkerPath(workerType: WorkerEnum, workersBasePath?: string): string;
@@ -1,28 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.WorkerEnum = void 0;
7
- exports.getWorkerPath = getWorkerPath;
8
- var _package = _interopRequireDefault(require("../../../package.json"));
9
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
10
- var WorkerEnum = exports.WorkerEnum = /*#__PURE__*/function (WorkerEnum) {
11
- WorkerEnum["LOADER"] = "LOADER";
12
- WorkerEnum["SEARCH"] = "SEARCH";
13
- WorkerEnum["LABEL"] = "LABEL";
14
- return WorkerEnum;
15
- }({});
16
- var DEFAULT_BASE_PATH = 'workers';
17
- var WORKER_PATH = {
18
- LOADER: "lunatic-append-worker-".concat(_package["default"].workersVersion, ".js"),
19
- SEARCH: "lunatic-searching-worker-".concat(_package["default"].workersVersion, ".js"),
20
- LABEL: "lunatic-label-worker-".concat(_package["default"].workersVersion, ".js")
21
- };
22
- function getWorkerPath(workerType, workersBasePath) {
23
- if (workersBasePath) {
24
- return "".concat(workersBasePath, "/").concat(WORKER_PATH[workerType]);
25
- } else {
26
- return "".concat(DEFAULT_BASE_PATH, "/").concat(WORKER_PATH[workerType]);
27
- }
28
- }
@@ -1,44 +0,0 @@
1
- #!/usr/bin/env node
2
- const fs = require('fs');
3
- const { currentPublicFolder, workersPath } = require('./workers-paths');
4
-
5
- /**
6
- * Copy worker only if not exists
7
- */
8
- const copyWorkerToPublicFolder = () => {
9
- if (!fs.existsSync(currentPublicFolder)) {
10
- fs.mkdirSync(currentPublicFolder, { recursive: true });
11
- }
12
- const isAppendWorkerExists = fs.existsSync(workersPath.append.dest);
13
- const isLabelWorkerExists = fs.existsSync(workersPath.label.dest);
14
- const isSearchingWorkerExists = fs.existsSync(workersPath.searching.dest);
15
-
16
- if (!isAppendWorkerExists) {
17
- console.log(`Copy : ${workersPath.append.name} to ${currentPublicFolder}`);
18
- fs.copyFileSync(workersPath.append.source, workersPath.append.dest);
19
- } else {
20
- console.log(
21
- `${workersPath.append.name} is already in ${currentPublicFolder} -> Skipped`
22
- );
23
- }
24
- if (!isLabelWorkerExists) {
25
- console.log(`Copy : ${workersPath.label.name} to ${currentPublicFolder}`);
26
- fs.copyFileSync(workersPath.label.source, workersPath.label.dest);
27
- } else {
28
- console.log(
29
- `${workersPath.label.name} is already in ${currentPublicFolder} -> Skipped`
30
- );
31
- }
32
- if (!isSearchingWorkerExists) {
33
- console.log(
34
- `Copy : ${workersPath.searching.name} to ${currentPublicFolder}`
35
- );
36
- fs.copyFileSync(workersPath.searching.source, workersPath.searching.dest);
37
- } else {
38
- console.log(
39
- `${workersPath.searching.name} is already in ${currentPublicFolder} -> Skipped`
40
- );
41
- }
42
- };
43
-
44
- copyWorkerToPublicFolder();
@@ -1,34 +0,0 @@
1
- var PACKAGE = require('../../package.json');
2
- const path = require('path');
3
-
4
- var version = PACKAGE.workersVersion;
5
-
6
- const currentPublicFolder = path.resolve(`${process.cwd()}/public/workers`);
7
- const workersReleaseFolder = path.resolve(__dirname, '../../workers-release');
8
-
9
- const workersPath = {
10
- append: {
11
- name: 'Append worker',
12
- source: `${workersReleaseFolder}/lunatic-append-worker-${version}.js`,
13
- dest: `${currentPublicFolder}/lunatic-append-worker-${version}.js`,
14
- webpack: `${path.resolve(__dirname)}/webpack-append-worker.config.js`,
15
- },
16
- label: {
17
- name: 'Label worker',
18
- source: `${workersReleaseFolder}/lunatic-label-worker-${version}.js`,
19
- dest: `${currentPublicFolder}/lunatic-label-worker-${version}.js`,
20
- webpack: `${path.resolve(__dirname)}/webpack-label-worker.config.js`,
21
- },
22
- searching: {
23
- name: 'Searching worker',
24
- source: `${workersReleaseFolder}/lunatic-searching-worker-${version}.js`,
25
- dest: `${currentPublicFolder}/lunatic-searching-worker-${version}.js`,
26
- webpack: `${path.resolve(__dirname)}/webpack-searching-worker.config.js`,
27
- },
28
- };
29
-
30
- module.exports = {
31
- currentPublicFolder: currentPublicFolder,
32
- workersReleaseFolder: workersReleaseFolder,
33
- workersPath: workersPath,
34
- };