@vendure/core 1.4.7 → 1.5.0

package/cli/job-queue/polling-job-queue-strategy.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PollingJobQueueStrategy = void 0;
+const generated_types_1 = require("@vendure/common/lib/generated-types");
+const shared_utils_1 = require("@vendure/common/lib/shared-utils");
+const rxjs_1 = require("rxjs");
+const internal_compatibility_1 = require("rxjs/internal-compatibility");
+const operators_1 = require("rxjs/operators");
+const vendure_logger_1 = require("../config/logger/vendure-logger");
+const injectable_job_queue_strategy_1 = require("./injectable-job-queue-strategy");
+const job_1 = require("./job");
+const queue_name_process_storage_1 = require("./queue-name-process-storage");
+const STOP_SIGNAL = Symbol('STOP_SIGNAL');
+class ActiveQueue {
+    constructor(queueName, process, jobQueueStrategy) {
+        this.queueName = queueName;
+        this.process = process;
+        this.jobQueueStrategy = jobQueueStrategy;
+        this.running = false;
+        this.activeJobs = [];
+        this.errorNotifier$ = new rxjs_1.Subject();
+        this.queueStopped$ = new rxjs_1.Subject();
+        this.subscription = this.errorNotifier$.pipe(operators_1.throttleTime(3000)).subscribe(([message, stack]) => {
+            vendure_logger_1.Logger.error(message);
+            vendure_logger_1.Logger.debug(stack);
+        });
+        this.pollInterval =
+            typeof this.jobQueueStrategy.pollInterval === 'function'
+                ? this.jobQueueStrategy.pollInterval(queueName)
+                : this.jobQueueStrategy.pollInterval;
+    }
+    start() {
+        vendure_logger_1.Logger.debug(`Starting JobQueue "${this.queueName}"`);
+        this.running = true;
+        const runNextJobs = async () => {
+            try {
+                const runningJobsCount = this.activeJobs.length;
+                for (let i = runningJobsCount; i < this.jobQueueStrategy.concurrency; i++) {
+                    const nextJob = await this.jobQueueStrategy.next(this.queueName);
+                    if (nextJob) {
+                        this.activeJobs.push(nextJob);
+                        await this.jobQueueStrategy.update(nextJob);
+                        const onProgress = (job) => this.jobQueueStrategy.update(job);
+                        nextJob.on('progress', onProgress);
+                        const cancellationSignal$ = rxjs_1.interval(this.pollInterval * 5).pipe(operators_1.switchMap(() => this.jobQueueStrategy.findOne(nextJob.id)), operators_1.filter(job => (job === null || job === void 0 ? void 0 : job.state) === generated_types_1.JobState.CANCELLED), operators_1.take(1));
+                        const stopSignal$ = this.queueStopped$.pipe(operators_1.take(1));
+                        rxjs_1.race(internal_compatibility_1.fromPromise(this.process(nextJob)), cancellationSignal$, stopSignal$)
+                            .toPromise()
+                            .then(result => {
+                            if (result === STOP_SIGNAL) {
+                                nextJob.defer();
+                            }
+                            else if (result instanceof job_1.Job && result.state === generated_types_1.JobState.CANCELLED) {
+                                nextJob.cancel();
+                            }
+                            else {
+                                nextJob.complete(result);
+                            }
+                        }, err => {
+                            nextJob.fail(err);
+                        })
+                            .finally(() => {
+                            if (!this.running && nextJob.state !== generated_types_1.JobState.PENDING) {
+                                return;
+                            }
+                            nextJob.off('progress', onProgress);
+                            return this.onFailOrComplete(nextJob);
+                        })
+                            .catch(err => {
+                            vendure_logger_1.Logger.warn(`Error updating job info: ${err}`);
+                        });
+                    }
+                }
+            }
+            catch (e) {
+                this.errorNotifier$.next([
+                    `Job queue "${this.queueName}" encountered an error (set log level to Debug for trace): ${e.message}`,
+                    e.stack,
+                ]);
+            }
+            if (this.running) {
+                this.timer = setTimeout(runNextJobs, this.pollInterval);
+            }
+        };
+        runNextJobs();
+    }
+    stop() {
+        this.running = false;
+        this.queueStopped$.next(STOP_SIGNAL);
+        clearTimeout(this.timer);
+        const start = +new Date();
+        const maxTimeout = 2000;
+        let pollTimer;
+        return new Promise(resolve => {
+            const pollActiveJobs = async () => {
+                const timedOut = +new Date() - start > maxTimeout;
+                if (this.activeJobs.length === 0 || timedOut) {
+                    clearTimeout(pollTimer);
+                    resolve();
+                }
+                else {
+                    pollTimer = setTimeout(pollActiveJobs, 50);
+                }
+            };
+            pollActiveJobs();
+        });
+    }
+    async onFailOrComplete(job) {
+        await this.jobQueueStrategy.update(job);
+        this.removeJobFromActive(job);
+    }
+    removeJobFromActive(job) {
+        const index = this.activeJobs.indexOf(job);
+        this.activeJobs.splice(index, 1);
+    }
+}
+class PollingJobQueueStrategy extends injectable_job_queue_strategy_1.InjectableJobQueueStrategy {
+    constructor(concurrencyOrConfig, maybePollInterval) {
+        var _a, _b, _c, _d;
+        super();
+        this.activeQueues = new queue_name_process_storage_1.QueueNameProcessStorage();
+        if (concurrencyOrConfig && shared_utils_1.isObject(concurrencyOrConfig)) {
+            this.concurrency = (_a = concurrencyOrConfig.concurrency) !== null && _a !== void 0 ? _a : 1;
+            this.pollInterval = (_b = concurrencyOrConfig.pollInterval) !== null && _b !== void 0 ? _b : 200;
+            this.backOffStrategy = (_c = concurrencyOrConfig.backoffStrategy) !== null && _c !== void 0 ? _c : (() => 1000);
+            this.setRetries = (_d = concurrencyOrConfig.setRetries) !== null && _d !== void 0 ? _d : ((_, job) => job.retries);
+        }
+        else {
+            this.concurrency = concurrencyOrConfig !== null && concurrencyOrConfig !== void 0 ? concurrencyOrConfig : 1;
+            this.pollInterval = maybePollInterval !== null && maybePollInterval !== void 0 ? maybePollInterval : 200;
+            this.setRetries = (_, job) => job.retries;
+        }
+    }
+    async start(queueName, process) {
+        if (!this.hasInitialized) {
+            this.started.set(queueName, process);
+            return;
+        }
+        if (this.activeQueues.has(queueName, process)) {
+            return;
+        }
+        const active = new ActiveQueue(queueName, process, this);
+        active.start();
+        this.activeQueues.set(queueName, process, active);
+    }
+    async stop(queueName, process) {
+        const active = this.activeQueues.getAndDelete(queueName, process);
+        if (!active) {
+            return;
+        }
+        await active.stop();
+    }
+    async cancelJob(jobId) {
+        const job = await this.findOne(jobId);
+        if (job) {
+            job.cancel();
+            await this.update(job);
+            return job;
+        }
+    }
+}
+exports.PollingJobQueueStrategy = PollingJobQueueStrategy;
+//# sourceMappingURL=polling-job-queue-strategy.js.map

package/cli/job-queue/polling-job-queue-strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"polling-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/polling-job-queue-strategy.ts"],"names":[],"mappings":"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"}

package/cli/job-queue/queue-name-process-storage.d.ts

@@ -0,0 +1,7 @@
+import { Job } from './job';
+export declare class QueueNameProcessStorage<T> {
+    private items;
+    set(queueName: string, process: (job: Job) => Promise<any>, listener: T): void;
+    has(queueName: string, process: (job: Job) => Promise<any>): boolean;
+    getAndDelete(queueName: string, process: (job: Job) => Promise<any>): T | undefined;
+}

package/cli/job-queue/queue-name-process-storage.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueueNameProcessStorage = void 0;
+class QueueNameProcessStorage {
+    constructor() {
+        this.items = new Map();
+    }
+    set(queueName, process, listener) {
+        let items = this.items.get(queueName);
+        if (!items) {
+            items = new Map();
+            this.items.set(queueName, items);
+        }
+        items.set(process, listener);
+    }
+    has(queueName, process) {
+        const items = this.items.get(queueName);
+        if (!items) {
+            return false;
+        }
+        return items.has(process);
+    }
+    getAndDelete(queueName, process) {
+        const items = this.items.get(queueName);
+        if (!items) {
+            return;
+        }
+        const item = items.get(process);
+        if (!item) {
+            return;
+        }
+        items.delete(process);
+        if (items.size === 0) {
+            this.items.delete(queueName);
+        }
+        return item;
+    }
+}
+exports.QueueNameProcessStorage = QueueNameProcessStorage;
+//# sourceMappingURL=queue-name-process-storage.js.map

package/cli/job-queue/queue-name-process-storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue-name-process-storage.js","sourceRoot":"","sources":["../../src/job-queue/queue-name-process-storage.ts"],"names":[],"mappings":";;;AAEA,MAAa,uBAAuB;IAApC;QACY,UAAK,GAAG,IAAI,GAAG,EAA8C,CAAC;IAkC1E,CAAC;IAhCG,GAAG,CAAC,SAAiB,EAAE,OAAmC,EAAE,QAAW;QACnE,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,EAAE;YACR,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SACpC;QACD,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAC,SAAiB,EAAE,OAAmC;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,YAAY,CAAC,SAAiB,EAAE,OAAmC;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO;SACV;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI,EAAE;YACP,OAAO;SACV;QACD,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtB,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAnCD,0DAmCC"}

package/cli/job-queue/subscribable-job.d.ts

@@ -0,0 +1,13 @@
+import { Observable } from 'rxjs';
+import { JobQueueStrategy } from '../config/job-queue/job-queue-strategy';
+import { Job } from './job';
+import { JobData } from './types';
+export declare type JobUpdate<T extends JobData<T>> = Pick<Job<T>, 'id' | 'state' | 'progress' | 'result' | 'error' | 'data'>;
+export declare class SubscribableJob<T extends JobData<T> = any> extends Job<T> {
+    private readonly jobQueueStrategy;
+    constructor(job: Job<T>, jobQueueStrategy: JobQueueStrategy);
+    updates(options?: {
+        pollInterval?: number;
+        timeoutMs?: number;
+    }): Observable<JobUpdate<T>>;
+}

package/cli/job-queue/subscribable-job.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubscribableJob = void 0;
+const generated_types_1 = require("@vendure/common/lib/generated-types");
+const pick_1 = require("@vendure/common/lib/pick");
+const shared_utils_1 = require("@vendure/common/lib/shared-utils");
+const ms_1 = __importDefault(require("ms"));
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const errors_1 = require("../common/error/errors");
+const inspectable_job_queue_strategy_1 = require("../config/job-queue/inspectable-job-queue-strategy");
+const job_1 = require("./job");
+class SubscribableJob extends job_1.Job {
+    constructor(job, jobQueueStrategy) {
+        const config = Object.assign(Object.assign({}, job), { state: job.state, data: job.data, id: job.id || undefined });
+        super(config);
+        this.jobQueueStrategy = jobQueueStrategy;
+    }
+    updates(options) {
+        var _a, _b;
+        const pollInterval = Math.max(50, (_a = options === null || options === void 0 ? void 0 : options.pollInterval) !== null && _a !== void 0 ? _a : 200);
+        const timeoutMs = Math.max(pollInterval, (_b = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _b !== void 0 ? _b : ms_1.default('1h'));
+        const strategy = this.jobQueueStrategy;
+        if (!inspectable_job_queue_strategy_1.isInspectableJobQueueStrategy(strategy)) {
+            throw new errors_1.InternalServerError(`The configured JobQueueStrategy (${strategy.constructor.name}) is not inspectable, so Job updates cannot be subscribed to`);
+        }
+        else {
+            return rxjs_1.interval(pollInterval).pipe(operators_1.tap(i => {
+                if (timeoutMs < i * pollInterval) {
+                    throw new Error(`Job ${this.id} SubscribableJob update polling timed out after ${timeoutMs}ms. The job may still be running.`);
+                }
+            }), operators_1.switchMap(() => {
+                const id = this.id;
+                if (!id) {
+                    throw new Error(`Cannot subscribe to update: Job does not have an ID`);
+                }
+                return strategy.findOne(id);
+            }), operators_1.filter(shared_utils_1.notNullOrUndefined), operators_1.distinctUntilChanged((a, b) => (a === null || a === void 0 ? void 0 : a.progress) === (b === null || b === void 0 ? void 0 : b.progress) || (a === null || a === void 0 ? void 0 : a.state) === (b === null || b === void 0 ? void 0 : b.state)), operators_1.takeWhile(job => (job === null || job === void 0 ? void 0 : job.state) !== generated_types_1.JobState.FAILED &&
+                job.state !== generated_types_1.JobState.COMPLETED &&
+                job.state !== generated_types_1.JobState.CANCELLED, true), operators_1.tap(job => {
+                if (job.state === generated_types_1.JobState.FAILED) {
+                    throw new Error(job.error);
+                }
+            }), operators_1.map(job => pick_1.pick(job, ['id', 'state', 'progress', 'result', 'error', 'data'])));
+        }
+    }
+}
+exports.SubscribableJob = SubscribableJob;
+//# sourceMappingURL=subscribable-job.js.map

package/cli/job-queue/subscribable-job.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subscribable-job.js","sourceRoot":"","sources":["../../src/job-queue/subscribable-job.ts"],"names":[],"mappings":"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"}

package/cli/job-queue/types.d.ts

@@ -0,0 +1,22 @@
+import { JobState } from '@vendure/common/lib/generated-types';
+import { ID, JsonCompatible } from '@vendure/common/lib/shared-types';
+import { Job } from './job';
+export interface CreateQueueOptions<T extends JobData<T>> {
+    name: string;
+    process: (job: Job<T>) => Promise<any>;
+}
+export declare type JobData<T> = JsonCompatible<T>;
+export interface JobConfig<T extends JobData<T>> {
+    queueName: string;
+    data: T;
+    retries?: number;
+    attempts?: number;
+    id?: ID;
+    state?: JobState;
+    progress?: number;
+    result?: any;
+    error?: any;
+    createdAt?: Date;
+    startedAt?: Date;
+    settledAt?: Date;
+}

package/cli/job-queue/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/cli/job-queue/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/job-queue/types.ts"],"names":[],"mappings":""}

package/cli/populate.d.ts

@@ -1,5 +1,5 @@
 import { INestApplicationContext } from '@nestjs/common';
-export declare function populate<T extends INestApplicationContext>(bootstrapFn: () => Promise<T | undefined>, initialDataPathOrObject: string | object, productsCsvPath?: string): Promise<T>;
-export declare function populateInitialData(app: INestApplicationContext, initialData: import('@vendure/core').InitialData, loggingFn?: (message: string) => void): Promise<void>;
-export declare function populateCollections(app: INestApplicationContext, initialData: import('@vendure/core').InitialData, loggingFn?: (message: string) => void): Promise<void>;
-export declare function importProductsFromCsv(app: INestApplicationContext, productsCsvPath: string, languageCode: import('@vendure/core').LanguageCode): Promise<import('@vendure/core').ImportProgress>;
+export declare function populate<T extends INestApplicationContext>(bootstrapFn: () => Promise<T | undefined>, initialDataPathOrObject: string | object, productsCsvPath?: string, channelOrToken?: string | import('@vendure/core').Channel): Promise<T>;
+export declare function populateInitialData(app: INestApplicationContext, initialData: import('@vendure/core').InitialData, channel?: import('@vendure/core').Channel): Promise<void>;
+export declare function populateCollections(app: INestApplicationContext, initialData: import('@vendure/core').InitialData, channel?: import('@vendure/core').Channel): Promise<void>;
+export declare function importProductsFromCsv(app: INestApplicationContext, productsCsvPath: string, languageCode: import('@vendure/core').LanguageCode, channel?: import('@vendure/core').Channel): Promise<import('@vendure/core').ImportProgress>;

package/cli/populate.js

@@ -25,65 +25,78 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.importProductsFromCsv = exports.populateCollections = exports.populateInitialData = exports.populate = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const cli_utils_1 = require("./cli-utils");
-async function populate(bootstrapFn, initialDataPathOrObject, productsCsvPath) {
+const loggerCtx = 'Populate';
+async function populate(bootstrapFn, initialDataPathOrObject, productsCsvPath, channelOrToken) {
     const app = await bootstrapFn();
     if (!app) {
         throw new Error('Could not bootstrap the Vendure app');
     }
+    let channel;
+    const { ChannelService, Channel, Logger } = await Promise.resolve().then(() => __importStar(require('@vendure/core')));
+    if (typeof channelOrToken === 'string') {
+        channel = await app.get(ChannelService).getChannelFromToken(channelOrToken);
+        if (!channel) {
+            Logger.warn(`Warning: channel with token "${channelOrToken}" was not found. Using default Channel instead.`, loggerCtx);
+        }
+    }
+    else if (channelOrToken instanceof Channel) {
+        channel = channelOrToken;
+    }
     const initialData = typeof initialDataPathOrObject === 'string'
         ? require(initialDataPathOrObject)
         : initialDataPathOrObject;
-    await populateInitialData(app, initialData, cli_utils_1.logColored);
+    await populateInitialData(app, initialData, channel);
     if (productsCsvPath) {
-        const importResult = await importProductsFromCsv(app, productsCsvPath, initialData.defaultLanguage);
+        const importResult = await importProductsFromCsv(app, productsCsvPath, initialData.defaultLanguage, channel);
         if (importResult.errors && importResult.errors.length) {
             const errorFile = path_1.default.join(process.cwd(), 'vendure-import-error.log');
-            console.log(`${importResult.errors.length} errors encountered when importing product data. See: ${errorFile}`);
+            Logger.error(`${importResult.errors.length} errors encountered when importing product data. See: ${errorFile}`, loggerCtx);
             await fs_extra_1.default.writeFile(errorFile, importResult.errors.join('\n'));
         }
-        cli_utils_1.logColored(`\nImported ${importResult.imported} products`);
-        await populateCollections(app, initialData, cli_utils_1.logColored);
+        Logger.info(`Imported ${importResult.imported} products`, loggerCtx);
+        await populateCollections(app, initialData, channel);
     }
-    cli_utils_1.logColored('\nDone!');
+    Logger.info('Done!', loggerCtx);
     return app;
 }
 exports.populate = populate;
-async function populateInitialData(app, initialData, loggingFn) {
-    const { Populator } = await Promise.resolve().then(() => __importStar(require('@vendure/core')));
+async function populateInitialData(app, initialData, channel) {
+    const { Populator, Logger } = await Promise.resolve().then(() => __importStar(require('@vendure/core')));
     const populator = app.get(Populator);
     try {
-        await populator.populateInitialData(initialData);
-        if (typeof loggingFn === 'function') {
-            loggingFn(`Populated initial data`);
-        }
+        await populator.populateInitialData(initialData, channel);
+        Logger.info(`Populated initial data`, loggerCtx);
     }
     catch (err) {
-        console.log(err.message);
+        Logger.error(err.message, loggerCtx);
     }
 }
 exports.populateInitialData = populateInitialData;
-async function populateCollections(app, initialData, loggingFn) {
-    const { Populator } = await Promise.resolve().then(() => __importStar(require('@vendure/core')));
+async function populateCollections(app, initialData, channel) {
+    const { Populator, Logger } = await Promise.resolve().then(() => __importStar(require('@vendure/core')));
     const populator = app.get(Populator);
     try {
         if (initialData.collections.length) {
-            await populator.populateCollections(initialData);
-            if (typeof loggingFn === 'function') {
-                loggingFn(`Created ${initialData.collections.length} Collections`);
-            }
+            await populator.populateCollections(initialData, channel);
+            Logger.info(`Created ${initialData.collections.length} Collections`, loggerCtx);
         }
     }
     catch (err) {
-        console.log(err.message);
+        Logger.info(err.message, loggerCtx);
     }
 }
 exports.populateCollections = populateCollections;
-async function importProductsFromCsv(app, productsCsvPath, languageCode) {
-    const { Importer } = await Promise.resolve().then(() => __importStar(require('@vendure/core')));
+async function importProductsFromCsv(app, productsCsvPath, languageCode, channel) {
+    const { Importer, RequestContextService } = await Promise.resolve().then(() => __importStar(require('@vendure/core')));
     const importer = app.get(Importer);
+    const requestContextService = app.get(RequestContextService);
     const productData = await fs_extra_1.default.readFile(productsCsvPath, 'utf-8');
-    return importer.parseAndImport(productData, languageCode, true).toPromise();
+    const ctx = await requestContextService.create({
+        apiType: 'admin',
+        languageCode,
+        channelOrToken: channel,
+    });
+    return importer.parseAndImport(productData, ctx, true).toPromise();
 }
 exports.importProductsFromCsv = importProductsFromCsv;
 //# sourceMappingURL=populate.js.map

package/cli/populate.js.map

@@ -1 +1 @@
-{"version":3,"file":"populate.js","sourceRoot":"","sources":["../src/cli/populate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"populate.js","sourceRoot":"","sources":["../src/cli/populate.ts"],"names":[],"mappings":"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"}

package/cli/process-context/process-context.d.ts

@@ -0,0 +1,7 @@
+declare type ProcessContextType = 'server' | 'worker';
+export declare class ProcessContext {
+    get isServer(): boolean;
+    get isWorker(): boolean;
+}
+export declare function setProcessContext(context: ProcessContextType): void;
+export {};

package/cli/process-context/process-context.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setProcessContext = exports.ProcessContext = void 0;
+let currentContext = 'server';
+class ProcessContext {
+    get isServer() {
+        return currentContext === 'server';
+    }
+    get isWorker() {
+        return currentContext === 'worker';
+    }
+}
+exports.ProcessContext = ProcessContext;
+function setProcessContext(context) {
+    currentContext = context;
+}
+exports.setProcessContext = setProcessContext;
+//# sourceMappingURL=process-context.js.map

package/cli/process-context/process-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-context.js","sourceRoot":"","sources":["../../src/process-context/process-context.ts"],"names":[],"mappings":";;;AAGA,IAAI,cAAc,GAAuB,QAAQ,CAAC;AA2BlD,MAAa,cAAc;IACvB,IAAI,QAAQ;QACR,OAAO,cAAc,KAAK,QAAQ,CAAC;IACvC,CAAC;IACD,IAAI,QAAQ;QACR,OAAO,cAAc,KAAK,QAAQ,CAAC;IACvC,CAAC;CACJ;AAPD,wCAOC;AASD,SAAgB,iBAAiB,CAAC,OAA2B;IACzD,cAAc,GAAG,OAAO,CAAC;AAC7B,CAAC;AAFD,8CAEC"}

package/cli/service/helpers/config-arg/config-arg.service.d.ts

@@ -0,0 +1,31 @@
+import { ConfigurableOperation, ConfigurableOperationInput } from '@vendure/common/lib/generated-types';
+import { CollectionFilter } from '../../../config/catalog/collection-filter';
+import { ConfigService } from '../../../config/config.service';
+import { FulfillmentHandler } from '../../../config/fulfillment/fulfillment-handler';
+import { PaymentMethodEligibilityChecker } from '../../../config/payment/payment-method-eligibility-checker';
+import { PaymentMethodHandler } from '../../../config/payment/payment-method-handler';
+import { PromotionAction } from '../../../config/promotion/promotion-action';
+import { PromotionCondition } from '../../../config/promotion/promotion-condition';
+import { ShippingCalculator } from '../../../config/shipping-method/shipping-calculator';
+import { ShippingEligibilityChecker } from '../../../config/shipping-method/shipping-eligibility-checker';
+export declare type ConfigDefTypeMap = {
+    CollectionFilter: CollectionFilter;
+    FulfillmentHandler: FulfillmentHandler;
+    PaymentMethodEligibilityChecker: PaymentMethodEligibilityChecker;
+    PaymentMethodHandler: PaymentMethodHandler;
+    PromotionAction: PromotionAction;
+    PromotionCondition: PromotionCondition;
+    ShippingCalculator: ShippingCalculator;
+    ShippingEligibilityChecker: ShippingEligibilityChecker;
+};
+export declare type ConfigDefType = keyof ConfigDefTypeMap;
+export declare class ConfigArgService {
+    private configService;
+    private readonly definitionsByType;
+    constructor(configService: ConfigService);
+    getDefinitions<T extends ConfigDefType>(defType: T): Array<ConfigDefTypeMap[T]>;
+    getByCode<T extends ConfigDefType>(defType: T, code: string): ConfigDefTypeMap[T];
+    parseInput(defType: ConfigDefType, input: ConfigurableOperationInput): ConfigurableOperation;
+    private parseOperationArgs;
+    private validateRequiredFields;
+}

package/cli/service/helpers/config-arg/config-arg.service.js

@@ -0,0 +1,88 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigArgService = void 0;
+const common_1 = require("@nestjs/common");
+const errors_1 = require("../../../common/error/errors");
+const config_service_1 = require("../../../config/config.service");
+let ConfigArgService = class ConfigArgService {
+    constructor(configService) {
+        this.configService = configService;
+        this.definitionsByType = {
+            CollectionFilter: this.configService.catalogOptions.collectionFilters,
+            FulfillmentHandler: this.configService.shippingOptions.fulfillmentHandlers,
+            PaymentMethodEligibilityChecker: this.configService.paymentOptions.paymentMethodEligibilityCheckers || [],
+            PaymentMethodHandler: this.configService.paymentOptions.paymentMethodHandlers,
+            PromotionAction: this.configService.promotionOptions.promotionActions,
+            PromotionCondition: this.configService.promotionOptions.promotionConditions,
+            ShippingCalculator: this.configService.shippingOptions.shippingCalculators,
+            ShippingEligibilityChecker: this.configService.shippingOptions.shippingEligibilityCheckers,
+        };
+    }
+    getDefinitions(defType) {
+        return this.definitionsByType[defType];
+    }
+    getByCode(defType, code) {
+        const defsOfType = this.getDefinitions(defType);
+        const match = defsOfType.find(def => def.code === code);
+        if (!match) {
+            throw new errors_1.UserInputError(`error.no-configurable-operation-def-with-code-found`, {
+                code,
+                type: defType,
+            });
+        }
+        return match;
+    }
+    parseInput(defType, input) {
+        const match = this.getByCode(defType, input.code);
+        this.validateRequiredFields(input, match);
+        return {
+            code: input.code,
+            args: input.arguments,
+        };
+    }
+    parseOperationArgs(input, checkerOrCalculator) {
+        const output = {
+            code: input.code,
+            args: input.arguments,
+        };
+        return output;
+    }
+    validateRequiredFields(input, def) {
+        for (const [name, argDef] of Object.entries(def.args)) {
+            if (argDef.required) {
+                const inputArg = input.arguments.find(a => a.name === name);
+                let valid = false;
+                try {
+                    if (['string', 'ID', 'datetime'].includes(argDef.type)) {
+                        valid = !!inputArg && inputArg.value !== '' && inputArg.value != null;
+                    }
+                    else {
+                        valid = !!inputArg && JSON.parse(inputArg.value) != null;
+                    }
+                }
+                catch (e) {
+                }
+                if (!valid) {
+                    throw new errors_1.UserInputError('error.configurable-argument-is-required', {
+                        name,
+                    });
+                }
+            }
+        }
+    }
+};
+ConfigArgService = __decorate([
+    common_1.Injectable(),
+    __metadata("design:paramtypes", [config_service_1.ConfigService])
+], ConfigArgService);
+exports.ConfigArgService = ConfigArgService;
+//# sourceMappingURL=config-arg.service.js.map

package/cli/service/helpers/config-arg/config-arg.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-arg.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/config-arg/config-arg.service.ts"],"names":[],"mappings":"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"}