@backtest-kit/pinets 3.0.3 → 3.0.4

package/build/index.cjs

@@ -81,9 +81,11 @@ class LoggerService {
 
 const { provide, inject, init, override } = diKit.createActivator("pine");
 
-const baseServices = {
+const baseServices$1 = {
     loggerService: Symbol("loggerService"),
-    contextService: Symbol("contextService"),
+};
+const contextServices$1 = {
+    exchangeContextService: Symbol("exchangeContextService"),
 };
 const providerServices$1 = {
     axisProviderService: Symbol("axisProviderService"),
@@ -105,7 +107,8 @@ const markdownServices$1 = {
     pineMarkdownService: Symbol("pineMarkdownService"),
 };
 const TYPES = {
-    ...baseServices,
+    ...baseServices$1,
+    ...contextServices$1,
     ...providerServices$1,
     ...jobServices$1,
     ...dataServices$1,
@@ -232,15 +235,15 @@ class AxisProviderService {
     }
 }
 
-const ContextService = diScoped.scoped(class {
+const ExchangeContextService = diScoped.scoped(class {
     constructor(context) {
         this.context = context;
     }
 });
 
 const GET_RAW_CANDLES_FN = async (self, symbol, interval, limit, sDate, eDate) => {
-    if (ContextService.hasContext()) {
-        return await backtestKit.Exchange.getRawCandles(symbol, interval, self.contextService.context, limit, sDate, eDate);
+    if (ExchangeContextService.hasContext()) {
+        return await backtestKit.Exchange.getRawCandles(symbol, interval, self.exchangeContextService.context, limit, sDate, eDate);
     }
     if (!backtestKit.MethodContextService.hasContext()) {
         throw new Error("MethodContextService context is required to get market data for pinets if exchangeName?: string is not specified");
@@ -253,7 +256,7 @@ const GET_RAW_CANDLES_FN = async (self, symbol, interval, limit, sDate, eDate) =
 class CandleProviderService {
     constructor() {
         this.loggerService = inject(TYPES.loggerService);
-        this.contextService = inject(TYPES.contextService);
+        this.exchangeContextService = inject(TYPES.exchangeContextService);
     }
     async getMarketData(tickerId, timeframe, limit, sDate, eDate) {
         this.loggerService.log("candleProviderService getMarketData", {
@@ -574,7 +577,9 @@ class PineMarkdownService {
 
 {
     provide(TYPES.loggerService, () => new LoggerService());
-    provide(TYPES.contextService, () => new ContextService());
+}
+{
+    provide(TYPES.exchangeContextService, () => new ExchangeContextService());
 }
 {
     provide(TYPES.axisProviderService, () => new AxisProviderService());
@@ -596,9 +601,11 @@ class PineMarkdownService {
     provide(TYPES.pineMarkdownService, () => new PineMarkdownService());
 }
 
-const commonServices = {
+const baseServices = {
     loggerService: inject(TYPES.loggerService),
-    contextService: inject(TYPES.contextService),
+};
+const contextServices = {
+    exchangeContextService: inject(TYPES.exchangeContextService),
 };
 const providerServices = {
     axisProviderService: inject(TYPES.axisProviderService),
@@ -620,7 +627,8 @@ const markdownServices = {
     pineMarkdownService: inject(TYPES.pineMarkdownService),
 };
 const pine = {
-    ...commonServices,
+    ...contextServices,
+    ...baseServices,
     ...providerServices,
     ...jobServices,
     ...dataServices,
@@ -649,13 +657,26 @@ const GET_SOURCE_FN$1 = async (source) => {
     }
     throw new Error("Source must be a File or Code instance");
 };
-const RUN_INFERENCE_FN = async (script, symbol, timeframe, limit, exchangeName) => {
+const BASE_RUNNER_FN = async (script, symbol, timeframe, limit) => await pine.pineJobService.run(script, symbol, timeframe, limit);
+const CREATE_INFERENCE_FN = (symbol, exchangeName, when) => {
+    let fn = () => BASE_RUNNER_FN;
     if (exchangeName) {
-        return await ContextService.runInContext(async () => await pine.pineJobService.run(script, symbol, timeframe, limit), { exchangeName });
+        fn = ExchangeContextService.runWithContext(fn, { exchangeName });
     }
-    return await pine.pineJobService.run(script, symbol, timeframe, limit);
+    if (when) {
+        fn = backtestKit.ExecutionContextService.runWithContext(fn, {
+            when,
+            symbol,
+            backtest: true,
+        });
+    }
+    return fn();
+};
+const RUN_INFERENCE_FN = async (script, symbol, timeframe, limit, exchangeName, when) => {
+    const inference = CREATE_INFERENCE_FN(symbol, exchangeName, when);
+    return await inference(script, symbol, timeframe, limit);
 };
-async function run(source, { symbol, timeframe, limit }, exchangeName) {
+async function run(source, { symbol, timeframe, limit }, exchangeName, when) {
     pine.loggerService.info(METHOD_NAME_RUN$2, {
         source,
         symbol,
@@ -663,7 +684,7 @@ async function run(source, { symbol, timeframe, limit }, exchangeName) {
         limit,
     });
     const script = await GET_SOURCE_FN$1(source);
-    const { plots } = await RUN_INFERENCE_FN(script, symbol, timeframe, limit, exchangeName);
+    const { plots } = await RUN_INFERENCE_FN(script, symbol, timeframe, limit, exchangeName, when);
     return plots;
 }
 

package/build/index.mjs

@@ -78,9 +78,11 @@ class LoggerService {
 
 const { provide, inject, init, override } = createActivator("pine");
 
-const baseServices = {
+const baseServices$1 = {
     loggerService: Symbol("loggerService"),
-    contextService: Symbol("contextService"),
+};
+const contextServices$1 = {
+    exchangeContextService: Symbol("exchangeContextService"),
 };
 const providerServices$1 = {
     axisProviderService: Symbol("axisProviderService"),
@@ -102,7 +104,8 @@ const markdownServices$1 = {
     pineMarkdownService: Symbol("pineMarkdownService"),
 };
 const TYPES = {
-    ...baseServices,
+    ...baseServices$1,
+    ...contextServices$1,
     ...providerServices$1,
     ...jobServices$1,
     ...dataServices$1,
@@ -229,15 +232,15 @@ class AxisProviderService {
     }
 }
 
-const ContextService = scoped(class {
+const ExchangeContextService = scoped(class {
     constructor(context) {
         this.context = context;
     }
 });
 
 const GET_RAW_CANDLES_FN = async (self, symbol, interval, limit, sDate, eDate) => {
-    if (ContextService.hasContext()) {
-        return await Exchange.getRawCandles(symbol, interval, self.contextService.context, limit, sDate, eDate);
+    if (ExchangeContextService.hasContext()) {
+        return await Exchange.getRawCandles(symbol, interval, self.exchangeContextService.context, limit, sDate, eDate);
     }
     if (!MethodContextService.hasContext()) {
         throw new Error("MethodContextService context is required to get market data for pinets if exchangeName?: string is not specified");
@@ -250,7 +253,7 @@ const GET_RAW_CANDLES_FN = async (self, symbol, interval, limit, sDate, eDate) =
 class CandleProviderService {
     constructor() {
         this.loggerService = inject(TYPES.loggerService);
-        this.contextService = inject(TYPES.contextService);
+        this.exchangeContextService = inject(TYPES.exchangeContextService);
     }
     async getMarketData(tickerId, timeframe, limit, sDate, eDate) {
         this.loggerService.log("candleProviderService getMarketData", {
@@ -571,7 +574,9 @@ class PineMarkdownService {
 
 {
     provide(TYPES.loggerService, () => new LoggerService());
-    provide(TYPES.contextService, () => new ContextService());
+}
+{
+    provide(TYPES.exchangeContextService, () => new ExchangeContextService());
 }
 {
     provide(TYPES.axisProviderService, () => new AxisProviderService());
@@ -593,9 +598,11 @@ class PineMarkdownService {
     provide(TYPES.pineMarkdownService, () => new PineMarkdownService());
 }
 
-const commonServices = {
+const baseServices = {
     loggerService: inject(TYPES.loggerService),
-    contextService: inject(TYPES.contextService),
+};
+const contextServices = {
+    exchangeContextService: inject(TYPES.exchangeContextService),
 };
 const providerServices = {
     axisProviderService: inject(TYPES.axisProviderService),
@@ -617,7 +624,8 @@ const markdownServices = {
     pineMarkdownService: inject(TYPES.pineMarkdownService),
 };
 const pine = {
-    ...commonServices,
+    ...contextServices,
+    ...baseServices,
     ...providerServices,
     ...jobServices,
     ...dataServices,
@@ -646,13 +654,26 @@ const GET_SOURCE_FN$1 = async (source) => {
     }
     throw new Error("Source must be a File or Code instance");
 };
-const RUN_INFERENCE_FN = async (script, symbol, timeframe, limit, exchangeName) => {
+const BASE_RUNNER_FN = async (script, symbol, timeframe, limit) => await pine.pineJobService.run(script, symbol, timeframe, limit);
+const CREATE_INFERENCE_FN = (symbol, exchangeName, when) => {
+    let fn = () => BASE_RUNNER_FN;
     if (exchangeName) {
-        return await ContextService.runInContext(async () => await pine.pineJobService.run(script, symbol, timeframe, limit), { exchangeName });
+        fn = ExchangeContextService.runWithContext(fn, { exchangeName });
     }
-    return await pine.pineJobService.run(script, symbol, timeframe, limit);
+    if (when) {
+        fn = ExecutionContextService.runWithContext(fn, {
+            when,
+            symbol,
+            backtest: true,
+        });
+    }
+    return fn();
+};
+const RUN_INFERENCE_FN = async (script, symbol, timeframe, limit, exchangeName, when) => {
+    const inference = CREATE_INFERENCE_FN(symbol, exchangeName, when);
+    return await inference(script, symbol, timeframe, limit);
 };
-async function run(source, { symbol, timeframe, limit }, exchangeName) {
+async function run(source, { symbol, timeframe, limit }, exchangeName, when) {
     pine.loggerService.info(METHOD_NAME_RUN$2, {
         source,
         symbol,
@@ -660,7 +681,7 @@ async function run(source, { symbol, timeframe, limit }, exchangeName) {
         limit,
     });
     const script = await GET_SOURCE_FN$1(source);
-    const { plots } = await RUN_INFERENCE_FN(script, symbol, timeframe, limit, exchangeName);
+    const { plots } = await RUN_INFERENCE_FN(script, symbol, timeframe, limit, exchangeName, when);
     return plots;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backtest-kit/pinets",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Run TradingView Pine Script strategies in Node.js self hosted environment. Execute existing Pine Script indicators and generate trading signals with 1:1 syntax compatibility via PineTS runtime.",
   "author": {
     "name": "Petr Tripolsky",
@@ -72,13 +72,13 @@
     "worker-testbed": "1.0.12"
   },
   "peerDependencies": {
-    "backtest-kit": "^3.0.5",
+    "backtest-kit": "^3.0.9",
     "pinets": "^0.8.6",
     "typescript": "^5.0.0"
   },
   "dependencies": {
     "di-kit": "^1.0.18",
-    "di-scoped": "^1.0.20",
+    "di-scoped": "^1.0.21",
     "functools-kit": "^1.0.95",
     "get-moment-stamp": "^1.1.1"
   },

package/types.d.ts

@@ -43,7 +43,7 @@ interface IPine {
 declare function usePine<T = TPineCtor>(ctor: T): void;
 
 type ExchangeName = string;
-interface IContext {
+interface IExchangeContext {
     exchangeName: ExchangeName;
 }
 
@@ -52,7 +52,7 @@ interface IRunParams {
     timeframe: CandleInterval;
     limit: number;
 }
-declare function run(source: File | Code, { symbol, timeframe, limit }: IRunParams, exchangeName?: ExchangeName): Promise<PlotModel>;
+declare function run(source: File | Code, { symbol, timeframe, limit }: IRunParams, exchangeName?: ExchangeName, when?: Date): Promise<PlotModel>;
 
 type PlotExtractConfig<T = number> = {
     plot: string;
@@ -144,8 +144,8 @@ declare class LoggerService implements ILogger {
 
 declare class CandleProviderService implements IProvider {
     readonly loggerService: LoggerService;
-    readonly contextService: {
-        readonly context: IContext;
+    readonly exchangeContextService: {
+        readonly context: IExchangeContext;
     };
     getMarketData(tickerId: string, timeframe: string, limit?: number, sDate?: number, eDate?: number): Promise<any[]>;
     getSymbolInfo(tickerId: string): Promise<any>;
@@ -194,8 +194,8 @@ declare const pine: {
     axisProviderService: AxisProviderService;
     candleProviderService: CandleProviderService;
     loggerService: LoggerService;
-    contextService: {
-        readonly context: IContext;
+    exchangeContextService: {
+        readonly context: IExchangeContext;
     };
 };