oakscriptjs 0.11.1 → 0.11.3

package/dist/cjs/script/index.js

@@ -130,7 +130,7 @@ var import_resample = require("../security/resample.js");
 var import_other = require("../security/other.js");
 var import_types = require("../types/index.js");
 var import_strategy = require("../strategy/index.js");
-var import_session = require("../time/session.js");
+var import_context = require("../session/context.js");
 var import_strategy2 = require("../strategy/index.js");
 var compare = __toESM(require("../compare/index.js"), 1);
 var import_input_active = require("../runtime/input-active.js");
@@ -1134,23 +1134,6 @@ function sessionBars() {
   }
   return sessionCache;
 }
-function calendarFor(session2, timezone, dayPlacement = false) {
-  const { bars: bars2 } = sessionBars();
-  if (!session2 && !timezone) return { bars: bars2, test: false };
-  const tz = timezone ?? exchangeTimezone();
-  if (session2 !== void 0 && (0, import_session.parsePineSession)(session2) === null) {
-    const name = session2.trim();
-    const symbol = name === "regular" && chartCtx.regularSession ? chartCtx.regularSession : chartCtx.session;
-    return { bars: new import_bars.SessionBars(new import_calendar.TradingCalendar(tz, { session: toSpec(symbol).session }, "symbol"), bars2.chart.period), test: true };
-  }
-  const spec = session2 ? { session: session2 } : { session: toSpec(chartCtx.session).session };
-  return {
-    bars: new import_bars.SessionBars(new import_calendar.TradingCalendar(tz, spec, session2 ? "pine" : "symbol", dayPlacement), bars2.chart.period),
-    test: true,
-    // a PineScript session string: the rules of time.inSession (runs ending at 0000, days around a clock change)
-    inside: session2 ? (time2) => timeCore.inSession(time2, session2, tz, timeframeCore.in_seconds(bars2.chart.period) * 1e3) : void 0
-  };
-}
 function perBar(fn) {
   const times = ctxBars.bars.map(barTime);
   return import_series.Series.fromArray(ctxBars, times.map((t, i) => fn(t, i, times)));
@@ -1160,46 +1143,18 @@ function callableSeries(series, fn) {
   Object.assign(fn, series);
   return fn;
 }
-function sessionPeriods(timeframeString, session2, timezone) {
-  const tf = timeframeCore.info(timeframeString);
-  const { bars: bars2, test, inside } = calendarFor(session2, timezone, !tf.isintraday);
-  const open2 = (t) => bars2.timeOf(t, timeframeString);
-  const close2 = (t) => bars2.closeOf(t, timeframeString);
-  if (!test) return { open: open2, close: close2 };
-  if (tf.isintraday) {
-    if (session2 !== void 0 && (0, import_session.parsePineSession)(session2) !== null && !bars2.chart.isdwm) {
-      const tz = timezone ?? exchangeTimezone();
-      const barMs = timeframeCore.in_seconds(bars2.chart.period) * 1e3;
-      const ms = timeframeCore.in_seconds(tf.period) * 1e3;
-      const run = (t) => (0, import_session.sessionRun)(t, session2, tz, barMs);
-      const start = (t, r) => r[0] + Math.floor((t - r[0]) / ms) * ms;
-      return {
-        open: (t) => {
-          const r = run(t);
-          return r ? start(t, r) : NaN;
-        },
-        close: (t) => {
-          const r = run(t);
-          return r ? Math.min(start(t, r) + ms, r[1]) : NaN;
-        }
-      };
-    }
-    const isIn = (t) => inside ? inside(t) : bars2.inside(t);
-    return { open: (t) => isIn(t) ? open2(t) : NaN, close: (t) => isIn(t) ? close2(t) : NaN };
-  }
-  if (tf.isdaily && tf.multiplier === 1) {
-    return { open: (t) => bars2.inside(t) ? open2(t) : NaN, close: (t) => bars2.inside(t) ? close2(t) : NaN };
-  }
-  return { open: open2, close: close2 };
+function chartSessionPeriods(timeframeString, session2, timezone) {
+  const { bars: bars2 } = sessionBars();
+  return (0, import_context.sessionPeriods)(bars2, { ...chartCtx, timezone: exchangeTimezone() }, timeframeString, session2, timezone);
 }
 function timeFunction(tf, session2, timezone) {
   collector();
-  const { open: open2 } = sessionPeriods(tf || chartTimeframe().period, session2, timezone);
+  const { open: open2 } = chartSessionPeriods(tf || chartTimeframe().period, session2, timezone);
   return perBar((t) => open2(t));
 }
 function timeCloseFunction(tf, session2, timezone) {
   collector();
-  const { close: close2 } = sessionPeriods(tf || chartTimeframe().period, session2, timezone);
+  const { close: close2 } = chartSessionPeriods(tf || chartTimeframe().period, session2, timezone);
   return perBar((t) => close2(t));
 }
 let runNow = NaN;