@ms-cloudpack/cli 0.31.7 → 0.33.0

package/lib/types.d.ts

@@ -1,69 +1,7 @@
-import type { ImportMap, ResolveMap } from '@ms-cloudpack/package-utilities';
+import type { ImportMap } from '@ms-cloudpack/package-utilities';
 import type { BundleResult, PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
-import type { HttpsConfig } from '@ms-cloudpack/create-express-app';
-export interface Session {
-    /**
-     * The session id, used for identifying
-     */
-    id: string;
-    /**
-     * The primary application path to monitor.
-     */
-    appPath: string;
-    /**
-     * The type of session controls how the code is served via start.
-     * Web apps require app server and asset hosting, while libraries
-     * only need a bundle service.
-     */
-    type: 'web-app' | 'library';
-    /**
-     * The mode of the session controls how the code is bundled. Library
-     * mode bundles each package in isolation, while development and
-     * production modes bundle the full app graph together. Library
-     * mode is fastest but packages must be complaint for loading in
-     * the browser.
-     */
-    mode: 'library' | 'development' | 'production';
-    /**
-     * Used to resolve packages in the dependency graph.
-     */
-    resolveMap: ResolveMap;
-    /**
-     * Reload sequence to ensure that the client is always
-     * up to date with the latest changes.
-     */
-    sequence: number;
-    /**
-     * Get session version.
-     * Used to force a hard refresh on the client.
-     */
-    getSessionVersion: () => number;
-    /**
-     * Used to increment the session version.
-     * If version is undefined, the version will be incremented by 1.
-     * If version is greater than the current version, the version will be set to the new value.
-     */
-    incrementSessionVersion: (version?: number) => void;
-    /**
-     * The name of the project folder.
-     * Used to differentiate between multiple projects.
-     */
-    projectName: string;
-    /**
-     * The version of each target.
-     * Used to force a client cache refresh on a single target.
-     */
-    targetVersions: Record<string, number>;
-    /**
-     * Increments the version for the given target.
-     */
-    incrementTargetVersion: (inputPath: string) => void;
-    /**
-     * The import map for the session.
-     */
-    getImportMap: () => ImportMap | undefined;
-    setImportMap: (newImportMap: ImportMap) => ImportMap;
-}
+import type { Route } from '@ms-cloudpack/config';
+import type { Session } from '@ms-cloudpack/api-server';
 /**
  * Tracks a given bundle request and its result.
  */
@@ -78,6 +16,7 @@ export interface BundleRequest {
     result?: BundleResult;
     resultFromCache?: boolean;
     isRebuildRequired?: boolean;
+    disableSourceMaps?: boolean;
     packages?: PackageDefinitionsCache;
 }
 export interface BundleTaskOptions {
@@ -88,146 +27,14 @@ export interface BundleServer {
     port: number;
     close: () => Promise<void>;
 }
-export interface SessionStats {
-    status: 'idle' | 'pending';
-    remainingTasks: number;
-    totalTasks: number;
-    totalErrors: number;
-    totalWarnings: number;
-}
-export interface ApiServer {
-    url: string;
-    port: number;
-    notifyReload: () => void;
-    addTask: <TReturn>(task: Task<TReturn>, options?: TaskOptions) => Promise<TReturn>;
-    close: () => Promise<void>;
-}
-export interface Watcher {
-    watch: (bundleRequest: BundleRequest) => void;
-}
-export interface TaskError {
-    message: string;
-    pluginName: string;
-    stack: string;
-    fileLocation: string;
-    lineNumber: number;
-    columnNumber: number;
-}
-export interface TaskStartDescription {
-    id: string;
-    name?: string;
-    inputPath?: string;
-    outputPath?: string;
-}
-export interface TaskEndDescription {
-    id: string;
-    errors?: TaskError[];
-    warnings?: TaskError[];
-}
-export interface TaskDescription extends TaskStartDescription, TaskEndDescription {
-    status: 'pending' | 'complete';
-    startTime: number;
-    durationMilliseconds?: number;
-    lastUpdated?: number;
-}
-export interface Task<TReturn> {
-    name: string;
-    id: string;
-    dir?: string;
-    execute: () => Promise<TReturn | undefined>;
-    clear?: () => void;
-    watch?: boolean;
-    dispose?: () => Promise<void>;
-    onDispose?: () => void;
-    getErrors?: () => TaskError[] | undefined;
-    getStartDescription?: () => TaskStartDescription;
-    getEndDescription?: (result: TReturn | undefined) => TaskEndDescription;
-}
-export interface TaskOptions {
-    rerun?: boolean;
-    watch?: () => void;
-}
 export interface PackageOverride {
     name: string;
     versionRequirement: string;
     isInternal?: boolean;
     overrides: PackageJson;
 }
-export interface Route {
-    /**
-     * The url path part to match. Start paths with a leading slash, e.g. `'/my-route'`. You can also
-     * use wildcards (`*`), e.g. `'/my-route/*'` to match all paths starting with `'/my-route'`.
-     */
-    match: string;
-    /**
-     * The path relative to the app root to static assets. If this is provided, renderScript/exportEntry
-     * will be ignored.
-     */
-    staticPath?: string;
-    /**
-     * Path to a .js or .html file used for rendering the route. If a script is provided, it must
-     * export a default function implementing `CreateHtmlFunction` defined in `@ms-cloudpack/cli`.
-     */
-    renderScript?: string;
-    /**
-     * The key in the exports map which represents the entry point app script for this route.
-     * Default is '.', meaning the main package export key.
-     */
-    exportEntry?: string;
-}
-export interface DevServer {
-    /**
-     * The domain name of the server.
-     */
-    domain?: string;
-    /**
-     * The ports to be used by the server.
-     * It can be a number or an array of numbers.
-     * If ports are provided, an error will be thrown if none are available.
-     * If no ports are provided, the server will attempt to find an available port.
-     */
-    port?: number | number[];
-    /**
-     * The config settings for the https server.
-     * Paths to files are accepted for 'ca', 'cert', 'key', and 'pfx' settings.
-     * Everything else is passed directly to the https.createServer() method.
-     * If not provided, the server will use http.
-     */
-    https?: HttpsConfig;
-    /**
-     * If provided, will override where the publicDir is located, relative to the app package folder.
-     * Defaults to `./public`. The same thing can be achieved with `routes`, using route: '*' and
-     * staticPath: './public', so the `publicPath` setting may be removed in the future.
-     */
-    publicPath?: string;
-    /**
-     * If provided, will register routes with the dev server to host various pages.
-     */
-    routes?: Route[];
-}
-export interface TelemetryConfig {
-    /**
-     * Application Insights instrumentation key.
-     */
-    instrumentationKey: string;
-}
-/**
- * Per-application configuration for Cloudpack.
- */
-export interface CloudpackConfig {
-    /**
-     * An array of PackageOverride objects, used to provide overrides for packages without modifying their
-     * definitions directly. This is primarily used for providing exports maps for packages that don't have them.
-     */
-    packageOverrides?: PackageOverride[];
-    /**
-     * A set of options for configuring how the dev server works.
-     */
-    devServer?: DevServer;
-    /**
-     * A set of options for configuring telemetry
-     */
-    telemetry?: TelemetryConfig;
+export interface Watcher {
+    watch: (bundleRequest: BundleRequest) => void;
 }
 /**
  * The input options for a createHtml custom server render function.

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ImportMap, ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { BundleResult, PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { HttpsConfig } from '@ms-cloudpack/create-express-app';\n\nexport interface Session {\n  /**\n   * The session id, used for identifying\n   */\n  id: string;\n\n  /**\n   * The primary application path to monitor.\n   */\n  appPath: string;\n\n  /**\n   * The type of session controls how the code is served via start.\n   * Web apps require app server and asset hosting, while libraries\n   * only need a bundle service.\n   */\n  type: 'web-app' | 'library';\n\n  /**\n   * The mode of the session controls how the code is bundled. Library\n   * mode bundles each package in isolation, while development and\n   * production modes bundle the full app graph together. Library\n   * mode is fastest but packages must be complaint for loading in\n   * the browser.\n   */\n  mode: 'library' | 'development' | 'production';\n\n  /**\n   * Used to resolve packages in the dependency graph.\n   */\n  resolveMap: ResolveMap;\n\n  /**\n   * Reload sequence to ensure that the client is always\n   * up to date with the latest changes.\n   */\n  sequence: number;\n\n  /**\n   * Get session version.\n   * Used to force a hard refresh on the client.\n   */\n  getSessionVersion: () => number;\n\n  /**\n   * Used to increment the session version.\n   * If version is undefined, the version will be incremented by 1.\n   * If version is greater than the current version, the version will be set to the new value.\n   */\n  incrementSessionVersion: (version?: number) => void;\n\n  /**\n   * The name of the project folder.\n   * Used to differentiate between multiple projects.\n   */\n  projectName: string;\n\n  /**\n   * The version of each target.\n   * Used to force a client cache refresh on a single target.\n   */\n  targetVersions: Record<string, number>;\n\n  /**\n   * Increments the version for the given target.\n   */\n  incrementTargetVersion: (inputPath: string) => void;\n\n  /**\n   * The import map for the session.\n   */\n  getImportMap: () => ImportMap | undefined;\n\n  setImportMap: (newImportMap: ImportMap) => ImportMap;\n}\n\n/**\n * Tracks a given bundle request and its result.\n */\nexport interface BundleRequest {\n  id: string;\n  packageName: string;\n  version: string;\n  packagePath: string;\n  outputPath: string;\n  isExternal: boolean;\n  bundlerType?: string;\n  result?: BundleResult;\n  resultFromCache?: boolean;\n  isRebuildRequired?: boolean;\n  packages?: PackageDefinitionsCache;\n}\n\nexport interface BundleTaskOptions {\n  force?: boolean;\n}\n\nexport interface BundleServer {\n  url: string;\n  port: number;\n  close: () => Promise<void>;\n}\n\nexport interface SessionStats {\n  status: 'idle' | 'pending';\n\n  remainingTasks: number;\n  totalTasks: number;\n\n  totalErrors: number;\n  totalWarnings: number;\n}\n\nexport interface ApiServer {\n  url: string;\n  port: number;\n\n  notifyReload: () => void;\n\n  addTask: <TReturn>(task: Task<TReturn>, options?: TaskOptions) => Promise<TReturn>;\n\n  close: () => Promise<void>;\n}\n\nexport interface Watcher {\n  watch: (bundleRequest: BundleRequest) => void;\n}\n\nexport interface TaskError {\n  message: string;\n  pluginName: string;\n  stack: string;\n  fileLocation: string;\n  lineNumber: number;\n  columnNumber: number;\n}\n\nexport interface TaskStartDescription {\n  id: string;\n  name?: string;\n  inputPath?: string;\n  outputPath?: string;\n}\n\nexport interface TaskEndDescription {\n  id: string;\n  errors?: TaskError[];\n  warnings?: TaskError[];\n}\n\nexport interface TaskDescription extends TaskStartDescription, TaskEndDescription {\n  status: 'pending' | 'complete';\n  startTime: number;\n  durationMilliseconds?: number;\n  lastUpdated?: number;\n}\n\nexport interface Task<TReturn> {\n  name: string;\n  id: string;\n  dir?: string;\n  execute: () => Promise<TReturn | undefined>;\n  clear?: () => void;\n  watch?: boolean;\n  dispose?: () => Promise<void>;\n  onDispose?: () => void;\n  getErrors?: () => TaskError[] | undefined;\n  getStartDescription?: () => TaskStartDescription;\n  getEndDescription?: (result: TReturn | undefined) => TaskEndDescription;\n}\n\nexport interface TaskOptions {\n  rerun?: boolean;\n  watch?: () => void;\n}\n\nexport interface PackageOverride {\n  name: string;\n  versionRequirement: string;\n  isInternal?: boolean;\n  overrides: PackageJson;\n}\n\nexport interface Route {\n  /**\n   * The url path part to match. Start paths with a leading slash, e.g. `'/my-route'`. You can also\n   * use wildcards (`*`), e.g. `'/my-route/*'` to match all paths starting with `'/my-route'`.\n   */\n  match: string;\n\n  /**\n   * The path relative to the app root to static assets. If this is provided, renderScript/exportEntry\n   * will be ignored.\n   */\n  staticPath?: string;\n\n  /**\n   * Path to a .js or .html file used for rendering the route. If a script is provided, it must\n   * export a default function implementing `CreateHtmlFunction` defined in `@ms-cloudpack/cli`.\n   */\n  renderScript?: string;\n\n  /**\n   * The key in the exports map which represents the entry point app script for this route.\n   * Default is '.', meaning the main package export key.\n   */\n  exportEntry?: string;\n}\n\nexport interface DevServer {\n  /**\n   * The domain name of the server.\n   */\n  domain?: string;\n\n  /**\n   * The ports to be used by the server.\n   * It can be a number or an array of numbers.\n   * If ports are provided, an error will be thrown if none are available.\n   * If no ports are provided, the server will attempt to find an available port.\n   */\n  port?: number | number[];\n\n  /**\n   * The config settings for the https server.\n   * Paths to files are accepted for 'ca', 'cert', 'key', and 'pfx' settings.\n   * Everything else is passed directly to the https.createServer() method.\n   * If not provided, the server will use http.\n   */\n  https?: HttpsConfig;\n\n  /**\n   * If provided, will override where the publicDir is located, relative to the app package folder.\n   * Defaults to `./public`. The same thing can be achieved with `routes`, using route: '*' and\n   * staticPath: './public', so the `publicPath` setting may be removed in the future.\n   */\n  publicPath?: string;\n\n  /**\n   * If provided, will register routes with the dev server to host various pages.\n   */\n  routes?: Route[];\n}\n\nexport interface TelemetryConfig {\n  /**\n   * Application Insights instrumentation key.\n   */\n  instrumentationKey: string;\n}\n\n/**\n * Per-application configuration for Cloudpack.\n */\nexport interface CloudpackConfig {\n  /**\n   * An array of PackageOverride objects, used to provide overrides for packages without modifying their\n   * definitions directly. This is primarily used for providing exports maps for packages that don't have them.\n   */\n  packageOverrides?: PackageOverride[];\n\n  /**\n   * A set of options for configuring how the dev server works.\n   */\n  devServer?: DevServer;\n\n  /**\n   * A set of options for configuring telemetry\n   */\n  telemetry?: TelemetryConfig;\n}\n\n/**\n * The input options for a createHtml custom server render function.\n */\nexport type CreateHtmlOptions = {\n  session: Session;\n  route: Route;\n  baseUrl: string;\n  definition: PackageJson;\n  importMap: ImportMap;\n  overlayScript: string | undefined;\n  entryScript: string | undefined;\n  inlineScripts: string[];\n};\n\n/**\n * The expected result of the createHtml custom server render function.\n */\nexport type CreateHtmlResult =\n  | string\n  | {\n      html: string;\n      statusCode: number;\n    };\n\n/**\n * A custom server render function that can be used to override the default HTML response.\n */\nexport type CreateHtmlFunction = (options: CreateHtmlOptions) => Promise<CreateHtmlResult> | CreateHtmlResult;\n\n/**\n * The expected shape of the createHtml custom server render function script.\n */\nexport type CreateHtmlScript = { default: CreateHtmlFunction };\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ImportMap } from '@ms-cloudpack/package-utilities';\nimport type { BundleResult, PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { Route } from '@ms-cloudpack/config';\nimport type { Session } from '@ms-cloudpack/api-server';\n\n/**\n * Tracks a given bundle request and its result.\n */\nexport interface BundleRequest {\n  id: string;\n  packageName: string;\n  version: string;\n  packagePath: string;\n  outputPath: string;\n  isExternal: boolean;\n  bundlerType?: string;\n  result?: BundleResult;\n  resultFromCache?: boolean;\n  isRebuildRequired?: boolean;\n  disableSourceMaps?: boolean;\n  packages?: PackageDefinitionsCache;\n}\n\nexport interface BundleTaskOptions {\n  force?: boolean;\n}\n\nexport interface BundleServer {\n  url: string;\n  port: number;\n  close: () => Promise<void>;\n}\n\nexport interface PackageOverride {\n  name: string;\n  versionRequirement: string;\n  isInternal?: boolean;\n  overrides: PackageJson;\n}\n\nexport interface Watcher {\n  watch: (bundleRequest: BundleRequest) => void;\n}\n\n/**\n * The input options for a createHtml custom server render function.\n */\nexport type CreateHtmlOptions = {\n  session: Session;\n  route: Route;\n  baseUrl: string;\n  definition: PackageJson;\n  importMap: ImportMap;\n  overlayScript: string | undefined;\n  entryScript: string | undefined;\n  inlineScripts: string[];\n};\n\n/**\n * The expected result of the createHtml custom server render function.\n */\nexport type CreateHtmlResult =\n  | string\n  | {\n      html: string;\n      statusCode: number;\n    };\n\n/**\n * A custom server render function that can be used to override the default HTML response.\n */\nexport type CreateHtmlFunction = (options: CreateHtmlOptions) => Promise<CreateHtmlResult> | CreateHtmlResult;\n\n/**\n * The expected shape of the createHtml custom server render function script.\n */\nexport type CreateHtmlScript = { default: CreateHtmlFunction };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.31.7",
+  "version": "0.33.0",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -16,16 +16,18 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/bundler": "^0.11.17",
+    "@ms-cloudpack/api-server": "^0.3.0",
+    "@ms-cloudpack/bundler": "^0.11.19",
+    "@ms-cloudpack/config": "^0.3.0",
     "@ms-cloudpack/create-express-app": "^1.3.0",
     "@ms-cloudpack/data-bus": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.0.5",
-    "@ms-cloudpack/overlay": "^0.12.2",
-    "@ms-cloudpack/package-utilities": "^2.3.10",
+    "@ms-cloudpack/overlay": "^0.13.0",
+    "@ms-cloudpack/package-utilities": "^2.3.11",
     "@ms-cloudpack/path-utilities": "^2.1.1",
     "@ms-cloudpack/path-string-parsing": "^1.0.1",
     "@ms-cloudpack/task-reporter": "^0.3.0",
-    "@ms-cloudpack/telemetry": "^0.2.1",
+    "@ms-cloudpack/telemetry": "^0.2.2",
     "chokidar": "^3.5.3",
     "commander": "^10.0.0",
     "es-module-lexer": "^1.0.3",

package/lib/commands/start/TaskRunner.d.ts

@@ -1,40 +0,0 @@
-import type { Task, TaskOptions } from '../../types.js';
-/**
- * TaskRunner class manages the state of Tasks.
- * This class is to be called by the api server.
- */
-export declare class TaskRunner {
-    private _queue;
-    private _pendingTasks;
-    private _completedTasks;
-    private _requiresRerun;
-    private _prevTasks;
-    constructor();
-    /**
-     * The add method enqueues a Task and returns its Promise.
-     * If a Task with the same id has already been processed,
-     * it returns either the result or the promise.
-     * Rerun flag forces the Task to be run again.
-     */
-    add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn>;
-    /**
-     * The reset method removes a task from the TaskRunner
-     * and then adds it again through a previous execute function.
-     *
-     * This is useful for when a task needs to be forcibly rerun.
-     *
-     * It is intented to be used by the api server
-     * to rerun a task when it is stuck or it failed.
-     */
-    reset<TReturn>(id: string): Promise<TReturn>;
-    /**
-     * The remove method disposes a task if available
-     * and then removes it from the TaskRunner.
-     *
-     * This is useful when the state of a task needs to be cleared.
-     *
-     * It is intented to be used by the api server
-     * to clear the TaskRunner's state before reloading the page.
-     */
-    remove(id: string): void;
-}

package/lib/commands/start/TaskRunner.js

@@ -1,119 +0,0 @@
-import PQueue from 'p-queue';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const log = (...messages) => {
-    // console.log(`TaskRunner:`, ...messages);
-};
-/**
- * TaskRunner class manages the state of Tasks.
- * This class is to be called by the api server.
- */
-export class TaskRunner {
-    constructor() {
-        this._queue = new PQueue({ concurrency: 10 });
-        this._pendingTasks = new Map();
-        this._completedTasks = new Map();
-        this._requiresRerun = new Set();
-        this._prevTasks = new Map();
-    }
-    /**
-     * The add method enqueues a Task and returns its Promise.
-     * If a Task with the same id has already been processed,
-     * it returns either the result or the promise.
-     * Rerun flag forces the Task to be run again.
-     */
-    add(task, options) {
-        const { name, id, execute } = task;
-        const { rerun, watch } = options || {};
-        watch?.();
-        if (!this._prevTasks.get(id)) {
-            this._prevTasks.set(id, task);
-        }
-        // Check if we are already completed the task with that id.
-        const action = this._completedTasks.get(id);
-        if (action !== undefined && !rerun) {
-            log(`Previous action found, returning: "${name}:${id}"`);
-            return Promise.resolve(action);
-        }
-        // Check if we are already running the task with that id.
-        const pending = this._pendingTasks.get(id);
-        if (pending !== undefined) {
-            if (rerun) {
-                this._requiresRerun.add(id);
-            }
-            log(`Previous action found, waiting: "${name}:${id}"`);
-            return pending;
-        }
-        const resultPromise = (async () => {
-            let taskResult;
-            let taskError;
-            let completed = false;
-            do {
-                // Delete from rerun list (if present).
-                this._requiresRerun.delete(id);
-                try {
-                    // TODO: possibly remove cast once this issue is resolved
-                    // https://github.com/sindresorhus/p-queue/issues/175
-                    taskResult = (await this._queue.add(execute));
-                    completed = true;
-                }
-                catch (err) {
-                    // Save the error--it will be thrown later if a rerun was not requested.
-                    taskError = err;
-                }
-            } while (this._requiresRerun.has(id));
-            log(`Task finished: "${name}:${id}"`);
-            // Delete from pending list.
-            this._pendingTasks.delete(id);
-            if (completed) {
-                // Update finished Tasks.
-                this._completedTasks.set(id, taskResult);
-                // Resolve the promise.
-                return taskResult;
-            }
-            // If the task never completed successfully, throw the error from earlier.
-            throw taskError;
-        })();
-        this._pendingTasks.set(id, resultPromise);
-        this._completedTasks.delete(id);
-        return resultPromise;
-    }
-    /**
-     * The reset method removes a task from the TaskRunner
-     * and then adds it again through a previous execute function.
-     *
-     * This is useful for when a task needs to be forcibly rerun.
-     *
-     * It is intented to be used by the api server
-     * to rerun a task when it is stuck or it failed.
-     */
-    reset(id) {
-        this.remove(id);
-        const prevTask = this._prevTasks.get(id);
-        if (prevTask === undefined) {
-            throw new Error(`Task not found: ${id}`);
-        }
-        return this.add(prevTask, { rerun: true });
-    }
-    /**
-     * The remove method disposes a task if available
-     * and then removes it from the TaskRunner.
-     *
-     * This is useful when the state of a task needs to be cleared.
-     *
-     * It is intented to be used by the api server
-     * to clear the TaskRunner's state before reloading the page.
-     */
-    remove(id) {
-        this._prevTasks
-            .get(id)
-            ?.dispose?.()
-            .catch(() => {
-            log(`Error disposing task: ${id}`);
-        });
-        this._prevTasks.get(id)?.clear?.();
-        this._requiresRerun.delete(id);
-        this._pendingTasks.delete(id);
-        this._completedTasks.delete(id);
-    }
-}
-//# sourceMappingURL=TaskRunner.js.map

package/lib/commands/start/TaskRunner.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../../src/commands/start/TaskRunner.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAG7B,6DAA6D;AAC7D,MAAM,GAAG,GAAG,CAAC,GAAG,QAAmB,EAAE,EAAE;IACrC,2CAA2C;AAC7C,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,OAAO,UAAU;IAUrB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAU,IAAmB,EAAE,OAAqB;QACrD,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACnC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAEvC,KAAK,EAAE,EAAE,CAAC;QAEV,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;SAC/B;QAED,2DAA2D;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAwB,CAAC;QACnE,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE;YAClC,GAAG,CAAC,sCAAsC,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;YACzD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,yDAAyD;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAiC,CAAC;QAC3E,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC7B;YACD,GAAG,CAAC,oCAAoC,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;YACvD,OAAO,OAAO,CAAC;SAChB;QAED,MAAM,aAAa,GAAG,CAAC,KAAK,IAAI,EAAE;YAChC,IAAI,UAA+B,CAAC;YACpC,IAAI,SAAkB,CAAC;YACvB,IAAI,SAAS,GAAG,KAAK,CAAC;YAEtB,GAAG;gBACD,uCAAuC;gBACvC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC/B,IAAI;oBACF,yDAAyD;oBACzD,qDAAqD;oBACrD,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAwB,CAAC;oBACrE,SAAS,GAAG,IAAI,CAAC;iBAClB;gBAAC,OAAO,GAAG,EAAE;oBACZ,wEAAwE;oBACxE,SAAS,GAAG,GAAG,CAAC;iBACjB;aACF,QAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAEtC,GAAG,CAAC,mBAAmB,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;YAEtC,4BAA4B;YAC5B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAE9B,IAAI,SAAS,EAAE;gBACb,yBAAyB;gBACzB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;gBACzC,uBAAuB;gBACvB,OAAO,UAAqB,CAAC;aAC9B;YAED,0EAA0E;YAC1E,MAAM,SAAS,CAAC;QAClB,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEhC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAU,EAAU;QACvB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;SAC1C;QACD,OAAyB,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAU;QACf,IAAI,CAAC,UAAU;aACZ,GAAG,CAAC,EAAE,CAAC;YACR,EAAE,OAAO,EAAE,EAAE;aACZ,KAAK,CAAC,GAAG,EAAE;YACV,GAAG,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;CACF","sourcesContent":["import PQueue from 'p-queue';\nimport type { Task, TaskOptions } from '../../types.js';\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst log = (...messages: unknown[]) => {\n  // console.log(`TaskRunner:`, ...messages);\n};\n\n/**\n * TaskRunner class manages the state of Tasks.\n * This class is to be called by the api server.\n */\nexport class TaskRunner {\n  private _queue: PQueue;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _pendingTasks: Map<string, Promise<any>>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _completedTasks: Map<string, any>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor() {\n    this._queue = new PQueue({ concurrency: 10 });\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n  }\n\n  /**\n   * The add method enqueues a Task and returns its Promise.\n   * If a Task with the same id has already been processed,\n   * it returns either the result or the promise.\n   * Rerun flag forces the Task to be run again.\n   */\n  add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, watch } = options || {};\n\n    watch?.();\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      log(`Previous action found, returning: \"${name}:${id}\"`);\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      log(`Previous action found, waiting: \"${name}:${id}\"`);\n      return pending;\n    }\n\n    const resultPromise = (async () => {\n      let taskResult: TReturn | undefined;\n      let taskError: unknown;\n      let completed = false;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n        try {\n          // TODO: possibly remove cast once this issue is resolved\n          // https://github.com/sindresorhus/p-queue/issues/175\n          taskResult = (await this._queue.add(execute)) as TReturn | undefined;\n          completed = true;\n        } catch (err) {\n          // Save the error--it will be thrown later if a rerun was not requested.\n          taskError = err;\n        }\n      } while (this._requiresRerun.has(id));\n\n      log(`Task finished: \"${name}:${id}\"`);\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n\n      if (completed) {\n        // Update finished Tasks.\n        this._completedTasks.set(id, taskResult);\n        // Resolve the promise.\n        return taskResult as TReturn;\n      }\n\n      // If the task never completed successfully, throw the error from earlier.\n      throw taskError;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n\n    return resultPromise;\n  }\n\n  /**\n   * The reset method removes a task from the TaskRunner\n   * and then adds it again through a previous execute function.\n   *\n   * This is useful for when a task needs to be forcibly rerun.\n   *\n   * It is intented to be used by the api server\n   * to rerun a task when it is stuck or it failed.\n   */\n  reset<TReturn>(id: string): Promise<TReturn> {\n    this.remove(id);\n    const prevTask = this._prevTasks.get(id);\n    if (prevTask === undefined) {\n      throw new Error(`Task not found: ${id}`);\n    }\n    return <Promise<TReturn>>this.add(prevTask, { rerun: true });\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intented to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        log(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.clear?.();\n    this._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n  }\n}\n"]}

package/lib/commands/start/addOverride.d.ts

@@ -1,7 +0,0 @@
-import type { Session } from '../../types.js';
-export declare function addOverride({ session, packageName, importPath, filename, }: {
-    session: Session;
-    packageName: string;
-    importPath: string;
-    filename?: string;
-}): Promise<void>;

package/lib/commands/start/addOverride.js

@@ -1,63 +0,0 @@
-import semver from 'semver';
-import { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';
-import { addExportsMapEntry, findResolveMapEntry, getExportsMap, PackageDefinitions, } from '@ms-cloudpack/package-utilities';
-import { slash } from '@ms-cloudpack/path-string-parsing';
-import { parseRequestInfo } from './parseRequestInfo.js';
-import { readConfig, writeConfig } from '../../common/config.js';
-export async function addOverride({ session, packageName, importPath, filename, }) {
-    let definition = undefined;
-    if (filename) {
-        const requestPath = slash(new URL(filename).pathname);
-        const { packageName: name, version } = parseRequestInfo(requestPath);
-        definition = { name, version };
-    }
-    const entry = findResolveMapEntry({
-        packageName,
-        resolveMap: session.resolveMap,
-        definition,
-    });
-    if (entry === undefined) {
-        console.error(`Could not find entry of package ${packageName} in resolve map`);
-        return;
-    }
-    const exports = (await getExportsMap(entry.path));
-    await addExportsMapEntry({
-        exports,
-        packagePath: entry.path,
-        importPath,
-    });
-    const packageOverride = {
-        name: packageName,
-        versionRequirement: entry.version,
-        overrides: {
-            exports,
-        },
-    };
-    // Parse config if it exists.
-    const cloudpackConfig = await readConfig(session.appPath);
-    // Add package override to config.
-    if (!cloudpackConfig.packageOverrides) {
-        cloudpackConfig.packageOverrides = [packageOverride];
-    }
-    else {
-        // Check if override already exists.
-        const existingOverride = cloudpackConfig.packageOverrides.find((o) => o.name === packageOverride.name && semver.satisfies(packageOverride.versionRequirement, o.versionRequirement));
-        if (existingOverride) {
-            // Update existing override.
-            existingOverride.overrides = packageOverride.overrides;
-        }
-        else {
-            // Add new override.
-            cloudpackConfig.packageOverrides.push(packageOverride);
-        }
-    }
-    // Write config.
-    await writeConfig(cloudpackConfig, session.appPath);
-    console.debug(`Added override for ${packageName} to cloudpack config`);
-    const override = {
-        packageOverrides: [packageOverride],
-    };
-    // Initialize package overrides.
-    PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(override));
-}
-//# sourceMappingURL=addOverride.js.map

package/lib/commands/start/addOverride.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../../src/commands/start/addOverride.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,kBAAkB,GACnB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAChC,OAAO,EACP,WAAW,EACX,UAAU,EACV,QAAQ,GAMT;IACC,IAAI,UAAU,GAAG,SAAS,CAAC;IAE3B,IAAI,QAAQ,EAAE;QACZ,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACrE,UAAU,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;KAChC;IAED,MAAM,KAAK,GAAG,mBAAmB,CAAC;QAChC,WAAW;QACX,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU;KACX,CAAC,CAAC;IAEH,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,OAAO,CAAC,KAAK,CAAC,mCAAmC,WAAW,iBAAiB,CAAC,CAAC;QAC/E,OAAO;KACR;IAED,MAAM,OAAO,GAAG,CAAC,MAAM,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAA2C,CAAC;IAE5F,MAAM,kBAAkB,CAAC;QACvB,OAAO;QACP,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,eAAe,GAAoB;QACvC,IAAI,EAAE,WAAW;QACjB,kBAAkB,EAAE,KAAK,CAAC,OAAO;QACjC,SAAS,EAAE;YACT,OAAO;SACR;KACF,CAAC;IAEF,6BAA6B;IAC7B,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAE1D,kCAAkC;IAClC,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE;QACrC,eAAe,CAAC,gBAAgB,GAAG,CAAC,eAAe,CAAC,CAAC;KACtD;SAAM;QACL,oCAAoC;QACpC,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAC5D,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAChH,CAAC;QAEF,IAAI,gBAAgB,EAAE;YACpB,4BAA4B;YAC5B,gBAAgB,CAAC,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;SACxD;aAAM;YACL,oBAAoB;YACpB,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACxD;KACF;IAED,gBAAgB;IAChB,MAAM,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,CAAC,KAAK,CAAC,sBAAsB,WAAW,sBAAsB,CAAC,CAAC;IAEvE,MAAM,QAAQ,GAAoB;QAChC,gBAAgB,EAAE,CAAC,eAAe,CAAC;KACpC,CAAC;IAEF,gCAAgC;IAChC,kBAAkB,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC/F,CAAC","sourcesContent":["import semver from 'semver';\nimport { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  getExportsMap,\n  PackageDefinitions,\n} from '@ms-cloudpack/package-utilities';\nimport type { CloudpackConfig, Session, PackageOverride } from '../../types.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport { readConfig, writeConfig } from '../../common/config.js';\n\nexport async function addOverride({\n  session,\n  packageName,\n  importPath,\n  filename,\n}: {\n  session: Session;\n  packageName: string;\n  importPath: string;\n  filename?: string;\n}) {\n  let definition = undefined;\n\n  if (filename) {\n    const requestPath = slash(new URL(filename).pathname);\n    const { packageName: name, version } = parseRequestInfo(requestPath);\n    definition = { name, version };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition,\n  });\n\n  if (entry === undefined) {\n    console.error(`Could not find entry of package ${packageName} in resolve map`);\n    return;\n  }\n\n  const exports = (await getExportsMap(entry.path)) as Record<string, Record<string, string>>;\n\n  await addExportsMapEntry({\n    exports,\n    packagePath: entry.path,\n    importPath,\n  });\n\n  const packageOverride: PackageOverride = {\n    name: packageName,\n    versionRequirement: entry.version,\n    overrides: {\n      exports,\n    },\n  };\n\n  // Parse config if it exists.\n  const cloudpackConfig = await readConfig(session.appPath);\n\n  // Add package override to config.\n  if (!cloudpackConfig.packageOverrides) {\n    cloudpackConfig.packageOverrides = [packageOverride];\n  } else {\n    // Check if override already exists.\n    const existingOverride = cloudpackConfig.packageOverrides.find(\n      (o) =>\n        o.name === packageOverride.name && semver.satisfies(packageOverride.versionRequirement, o.versionRequirement),\n    );\n\n    if (existingOverride) {\n      // Update existing override.\n      existingOverride.overrides = packageOverride.overrides;\n    } else {\n      // Add new override.\n      cloudpackConfig.packageOverrides.push(packageOverride);\n    }\n  }\n\n  // Write config.\n  await writeConfig(cloudpackConfig, session.appPath);\n  console.debug(`Added override for ${packageName} to cloudpack config`);\n\n  const override: CloudpackConfig = {\n    packageOverrides: [packageOverride],\n  };\n\n  // Initialize package overrides.\n  PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(override));\n}\n"]}