@ms-cloudpack/api-server 0.42.0 → 0.43.0

package/lib/utilities/createBundleTask.d.ts

@@ -1,26 +1,10 @@
-import type { BundleTaskOptions } from '../types/BundleTaskOptions.js';
 import type { BundleRequest } from '../types/BundleRequest.js';
 import type { Task } from '../types/Task.js';
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
-import type { Session } from '../types/Session.js';
-import type { TelemetryClient } from '@ms-cloudpack/telemetry';
-import type { PackageImportPaths } from '@ms-cloudpack/import-map';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-import type { PackageHashes } from '@ms-cloudpack/package-hashes';
+import { type BundleTaskInternalContext, type BundleTaskInternalOptions } from './bundleTask.js';
+import type { PartialContext } from '../types/Context.js';
 /**
- * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked
- * remotely (e.g. in the browser) and allows the user to cancel tasks.
+ * Create a bundle task (internally calls `bundleTask()`) that can be executed by the server's TaskRunner.
+ * This allows active tasks to be tracked remotely (e.g. in the browser) and allows the user to cancel tasks.
  */
-export declare function createBundleTask(params: {
-    bundleRequest: BundleRequest;
-    context: {
-        session: Session;
-        packages: PackageDefinitionsCache;
-        packageHashes: PackageHashes;
-        packageImportPaths: PackageImportPaths;
-        reporter?: TaskReporter;
-        telemetryClient?: TelemetryClient;
-    };
-    options?: BundleTaskOptions;
-}): Task<BundleRequest>;
+export declare function createBundleTask(options: BundleTaskInternalOptions, context: BundleTaskInternalContext & PartialContext<'packageHashes' | 'packageImportPaths', keyof BundleTaskInternalContext['session'] | 'importMap' | 'urls'>): Task<BundleRequest>;
 //# sourceMappingURL=createBundleTask.d.ts.map

package/lib/utilities/createBundleTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,uBAAuB,CAAC;QAClC,aAAa,EAAE,aAAa,CAAC;QAC7B,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;QACxB,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,CAAC;IACF,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,GAAG,IAAI,CAAC,aAAa,CAAC,CAuEtB"}
+{"version":3,"file":"createBundleTask.d.ts","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAc,KAAK,yBAAyB,EAAE,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC7G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,yBAAyB,GAChC,cAAc,CACZ,eAAe,GAAG,oBAAoB,EACtC,MAAM,yBAAyB,CAAC,SAAS,CAAC,GAAG,WAAW,GAAG,MAAM,CAClE,GACF,IAAI,CAAC,aAAa,CAAC,CA8DrB"}

package/lib/utilities/createBundleTask.js

@@ -1,16 +1,15 @@
-import path from 'path';
+import { addImportMapHash } from '@ms-cloudpack/import-map';
 import fs from 'fs';
+import path from 'path';
 import { bundleTask } from './bundleTask.js';
-import { addImportMapHash } from '@ms-cloudpack/import-map';
 /**
- * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked
- * remotely (e.g. in the browser) and allows the user to cancel tasks.
+ * Create a bundle task (internally calls `bundleTask()`) that can be executed by the server's TaskRunner.
+ * This allows active tasks to be tracked remotely (e.g. in the browser) and allows the user to cancel tasks.
  */
-export function createBundleTask(params) {
-    const { bundleRequest, context, options = {} } = params;
+export function createBundleTask(options, context) {
+    const { bundleRequest } = options;
     const { id, packageName, version, packagePath, isExternal } = bundleRequest;
-    const { session, reporter, telemetryClient, packageImportPaths, packages, packageHashes } = context;
-    const { config, resolveMap } = session;
+    const { packageHashes, session } = context;
     const { hash, sourceHash } = options;
     const name = `Bundle ${packageName}@${version}`;
     return {
@@ -20,23 +19,16 @@ export function createBundleTask(params) {
         dir: `${path.join(packagePath, 'src')}`,
         watch: !isExternal,
         async execute() {
-            await bundleTask({
-                bundleRequest,
-                options,
-                context: {
-                    packages,
-                    config,
-                    resolveMap,
-                    packageHashes,
-                    reporter,
-                    telemetryClient,
-                },
-            });
+            await bundleTask(options, context);
             try {
-                const importMapHash = sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));
-                addImportMapHash({ packageName, version, importMap: session.importMap, resolveMap, hash: importMapHash }, {
-                    packageImportPaths,
-                });
+                // Add a hash to the import map for this package.
+                // (Read the session properties here rather than above because they might not be set yet.)
+                const importMap = session.importMap;
+                const bundleServer = session.urls.bundleServer;
+                if (importMap && bundleServer) {
+                    const importMapHash = sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));
+                    addImportMapHash({ packageName, version, hash: importMapHash }, { ...context, ...session, importMap, urls: { bundleServer } });
+                }
             }
             catch (e) {
                 console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, e.stack || e);

package/lib/utilities/createBundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleTaskOptions } from '../types/BundleTaskOptions.js';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport path from 'path';\nimport fs from 'fs';\nimport { bundleTask } from './bundleTask.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport { addImportMapHash } from '@ms-cloudpack/import-map';\nimport type { Session } from '../types/Session.js';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\n/**\n * Creates a bundle task tracked in the task runner of the api server. This allows active tasks to be tracked\n * remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(params: {\n  bundleRequest: BundleRequest;\n  context: {\n    session: Session;\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n    packageImportPaths: PackageImportPaths;\n    reporter?: TaskReporter;\n    telemetryClient?: TelemetryClient;\n  };\n  options?: BundleTaskOptions;\n}): Task<BundleRequest> {\n  const { bundleRequest, context, options = {} } = params;\n  const { id, packageName, version, packagePath, isExternal } = bundleRequest;\n  const { session, reporter, telemetryClient, packageImportPaths, packages, packageHashes } = context;\n  const { config, resolveMap } = session;\n  const { hash, sourceHash } = options;\n  const name = `Bundle ${packageName}@${version}`;\n\n  return {\n    // Name for task runner logging.\n    name,\n    id,\n    dir: `${path.join(packagePath, 'src')}`,\n    watch: !isExternal,\n    async execute(): Promise<BundleRequest> {\n      await bundleTask({\n        bundleRequest,\n        options,\n        context: {\n          packages,\n          config,\n          resolveMap,\n          packageHashes,\n          reporter,\n          telemetryClient,\n        },\n      });\n      try {\n        const importMapHash =\n          sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));\n        addImportMapHash(\n          { packageName, version, importMap: session.importMap, resolveMap, hash: importMapHash },\n          {\n            packageImportPaths,\n          },\n        );\n      } catch (e) {\n        console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, (e as Error).stack || e);\n      }\n      return bundleRequest;\n    },\n    clear: () => {\n      if (!bundleRequest.result) {\n        return;\n      }\n\n      bundleRequest.result.dispose?.();\n\n      // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem -- this function can't be async\n      fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });\n\n      bundleRequest.result = undefined;\n    },\n    onDispose: () => {\n      bundleRequest.result?.dispose?.();\n    },\n    getErrors: () => bundleRequest.result?.errors,\n    getStartDescription: () => ({\n      id,\n      // Name to display in the overlay.\n      name,\n      inputPath: packagePath || '',\n    }),\n    getEndDescription: (taskResult) =>\n      ({\n        id,\n        errors: taskResult?.result?.errors,\n        warnings: taskResult?.result?.warnings,\n        outputPath: bundleRequest.result?.outputPath || '',\n      }) as TaskEndDescription,\n  };\n}\n"]}
+{"version":3,"file":"createBundleTask.js","sourceRoot":"","sources":["../../src/utilities/createBundleTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,UAAU,EAAkE,MAAM,iBAAiB,CAAC;AAG7G;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAkC,EAClC,OAIG;IAEH,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAC5E,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,IAAI,GAAG,UAAU,WAAW,IAAI,OAAO,EAAE,CAAC;IAEhD,OAAO;QACL,gCAAgC;QAChC,IAAI;QACJ,EAAE;QACF,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE;QACvC,KAAK,EAAE,CAAC,UAAU;QAClB,KAAK,CAAC,OAAO;YACX,MAAM,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACnC,IAAI,CAAC;gBACH,iDAAiD;gBACjD,0FAA0F;gBAC1F,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;gBACpC,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC/C,IAAI,SAAS,IAAI,YAAY,EAAE,CAAC;oBAC9B,MAAM,aAAa,GACjB,UAAU,IAAI,IAAI,IAAI,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;oBACxG,gBAAgB,CACd,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAC7C,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,CAC9D,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,uCAAuC,aAAa,CAAC,WAAW,GAAG,EAAG,CAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;YAC9G,CAAC;YACD,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,KAAK,EAAE,GAAG,EAAE;YACV,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YAEjC,qGAAqG;YACrG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAE7E,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;QACnC,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACd,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;QACpC,CAAC;QACD,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM;QAC7C,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1B,EAAE;YACF,kCAAkC;YAClC,IAAI;YACJ,SAAS,EAAE,WAAW,IAAI,EAAE;SAC7B,CAAC;QACF,iBAAiB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAClC,EAAE;YACF,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM;YAClC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ;YACtC,UAAU,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU,IAAI,EAAE;SACnD,CAAC;KACH,CAAC;AACJ,CAAC","sourcesContent":["import { addImportMapHash } from '@ms-cloudpack/import-map';\nimport fs from 'fs';\nimport path from 'path';\nimport type { BundleRequest } from '../types/BundleRequest.js';\nimport type { Task } from '../types/Task.js';\nimport { bundleTask, type BundleTaskInternalContext, type BundleTaskInternalOptions } from './bundleTask.js';\nimport type { PartialContext } from '../types/Context.js';\n\n/**\n * Create a bundle task (internally calls `bundleTask()`) that can be executed by the server's TaskRunner.\n * This allows active tasks to be tracked remotely (e.g. in the browser) and allows the user to cancel tasks.\n */\nexport function createBundleTask(\n  options: BundleTaskInternalOptions,\n  context: BundleTaskInternalContext &\n    PartialContext<\n      'packageHashes' | 'packageImportPaths',\n      keyof BundleTaskInternalContext['session'] | 'importMap' | 'urls'\n    >,\n): Task<BundleRequest> {\n  const { bundleRequest } = options;\n  const { id, packageName, version, packagePath, isExternal } = bundleRequest;\n  const { packageHashes, session } = context;\n  const { hash, sourceHash } = options;\n  const name = `Bundle ${packageName}@${version}`;\n\n  return {\n    // Name for task runner logging.\n    name,\n    id,\n    dir: `${path.join(packagePath, 'src')}`,\n    watch: !isExternal,\n    async execute(): Promise<BundleRequest> {\n      await bundleTask(options, context);\n      try {\n        // Add a hash to the import map for this package.\n        // (Read the session properties here rather than above because they might not be set yet.)\n        const importMap = session.importMap;\n        const bundleServer = session.urls.bundleServer;\n        if (importMap && bundleServer) {\n          const importMapHash =\n            sourceHash || hash || (await packageHashes.get({ packagePath, isSourceHashingEnabled: !isExternal }));\n          addImportMapHash(\n            { packageName, version, hash: importMapHash },\n            { ...context, ...session, importMap, urls: { bundleServer } },\n          );\n        }\n      } catch (e) {\n        console.error(`Error adding hash to import map for ${bundleRequest.packagePath}:`, (e as Error).stack || e);\n      }\n      return bundleRequest;\n    },\n    clear: () => {\n      if (!bundleRequest.result) {\n        return;\n      }\n\n      bundleRequest.result.dispose?.();\n\n      // eslint-disable-next-line @ms-cloudpack/internal/no-sync-filesystem -- this function can't be async\n      fs.rmSync(bundleRequest.result.outputPath, { recursive: true, force: true });\n\n      bundleRequest.result = undefined;\n    },\n    onDispose: () => {\n      bundleRequest.result?.dispose?.();\n    },\n    getErrors: () => bundleRequest.result?.errors,\n    getStartDescription: () => ({\n      id,\n      // Name to display in the overlay.\n      name,\n      inputPath: packagePath || '',\n    }),\n    getEndDescription: (taskResult) => ({\n      id,\n      errors: taskResult?.result?.errors,\n      warnings: taskResult?.result?.warnings,\n      outputPath: bundleRequest.result?.outputPath || '',\n    }),\n  };\n}\n"]}

package/lib/utilities/getDefaultTaskStats.d.ts

@@ -0,0 +1,3 @@
+import type { TaskStats } from '../types/TaskStats.js';
+export declare const getDefaultTaskStats: () => TaskStats;
+//# sourceMappingURL=getDefaultTaskStats.d.ts.map

package/lib/utilities/getDefaultTaskStats.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDefaultTaskStats.d.ts","sourceRoot":"","sources":["../../src/utilities/getDefaultTaskStats.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,eAAO,MAAM,mBAAmB,EAAE,MAAM,SAMtC,CAAC"}

package/lib/utilities/getDefaultTaskStats.js

@@ -0,0 +1,8 @@
+export const getDefaultTaskStats = () => ({
+    status: 'idle',
+    remainingTasks: 0,
+    totalTasks: 0,
+    totalErrors: 0,
+    totalWarnings: 0,
+});
+//# sourceMappingURL=getDefaultTaskStats.js.map

package/lib/utilities/getDefaultTaskStats.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDefaultTaskStats.js","sourceRoot":"","sources":["../../src/utilities/getDefaultTaskStats.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,mBAAmB,GAAoB,GAAG,EAAE,CAAC,CAAC;IACzD,MAAM,EAAE,MAAM;IACd,cAAc,EAAE,CAAC;IACjB,UAAU,EAAE,CAAC;IACb,WAAW,EAAE,CAAC;IACd,aAAa,EAAE,CAAC;CACjB,CAAC,CAAC","sourcesContent":["import type { TaskStats } from '../types/TaskStats.js';\n\nexport const getDefaultTaskStats: () => TaskStats = () => ({\n  status: 'idle',\n  remainingTasks: 0,\n  totalTasks: 0,\n  totalErrors: 0,\n  totalWarnings: 0,\n});\n"]}

package/lib/utilities/resolveDependenciesTask.d.ts

@@ -1,6 +1,5 @@
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
 import type { LinkedPath, ResolveMap } from '@ms-cloudpack/package-utilities';
-import { type TaskReporter } from '@ms-cloudpack/task-reporter';
+import type { Context } from '../types/Context.js';
 /**
  * Resolves the locations of dependencies and returns the resolve map, logging results
  * to the task reporter. Throws if dependencies could not be resolved.
@@ -9,8 +8,5 @@ export declare function resolveDependenciesTask(options: {
     appPath: string;
     additionalPaths?: string[];
     linkedPaths?: LinkedPath[];
-}, context: {
-    reporter: TaskReporter;
-    packages: PackageDefinitionsCache;
-}): Promise<ResolveMap>;
+}, context: Pick<Context, 'reporter' | 'packages'>): Promise<ResolveMap>;
 //# sourceMappingURL=resolveDependenciesTask.d.ts.map

package/lib/utilities/resolveDependenciesTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDependenciesTask.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAmB,MAAM,iCAAiC,CAAC;AAE/F,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAElG;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GACrE,OAAO,CAAC,UAAU,CAAC,CAkDrB"}
+{"version":3,"file":"resolveDependenciesTask.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAmB,MAAM,iCAAiC,CAAC;AAG/F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B,EACD,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,CAAC,GAC9C,OAAO,CAAC,UAAU,CAAC,CAyCrB"}

package/lib/utilities/resolveDependenciesTask.js

@@ -11,13 +11,7 @@ export async function resolveDependenciesTask(options, context) {
     // Grab the installed dependency locations.
     const task = reporter.addTask('Resolving dependencies');
     try {
-        resolveMap = await createResolveMap({
-            appPath,
-            additionalPaths,
-            linkedPaths,
-        }, {
-            packages,
-        });
+        resolveMap = await createResolveMap({ appPath, additionalPaths, linkedPaths }, { packages });
         const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);
         const message = `Found ${cyan(allPackages.size)} total packages, ${duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`}`;
         const extended = bulletedList(Array.from(duplicatedPackages.entries()).map(([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`));

package/lib/utilities/resolveDependenciesTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDependenciesTask.js","sourceRoot":"","sources":["../../src/utilities/resolveDependenciesTask.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { LinkedPath, ResolveMap, ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { createResolveMap } from '@ms-cloudpack/package-utilities';\nimport { bold, bulletedList, cyan, yellow, type TaskReporter } from '@ms-cloudpack/task-reporter';\n\n/**\n * Resolves the locations of dependencies and returns the resolve map, logging results\n * to the task reporter. Throws if dependencies could not be resolved.\n */\nexport async function resolveDependenciesTask(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: LinkedPath[];\n  },\n  context: { reporter: TaskReporter; packages: PackageDefinitionsCache },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths, linkedPaths } = options;\n  const { reporter, packages } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  // Grab the installed dependency locations.\n  const task = reporter.addTask('Resolving dependencies');\n\n  try {\n    resolveMap = await createResolveMap(\n      {\n        appPath,\n        additionalPaths,\n        linkedPaths,\n      },\n      {\n        packages,\n      },\n    );\n\n    const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);\n    const message = `Found ${cyan(allPackages.size)} total packages, ${\n      duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`\n    }`;\n    const extended = bulletedList(\n      Array.from(duplicatedPackages.entries()).map(\n        ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`,\n      ),\n    );\n\n    task.complete({ message, extended, forceShow: true });\n\n    return resolveMap;\n  } catch (err) {\n    task.complete({\n      status: 'fail',\n      message: 'Failed to resolve dependencies',\n      errors: [String(err)],\n      forceShow: true,\n      // Don't use the message as \"details\" because this will cause the message to be logged twice\n      extended: (err as Error).stack,\n    });\n\n    if (err instanceof Error) {\n      // Remove the call stack because we already logged it in the extended details of the task\n      err.stack = undefined;\n    }\n\n    throw err;\n  }\n}\n\n/**\n * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.\n * This is used to log the results of the resolve task.\n */\nfunction getPackagesFromResolveMap(resolveMap: ResolveMap) {\n  const allPackages = new Map<string, ResolveMapEntry>();\n  const duplicatedPackages = new Map<string, Set<string>>();\n\n  function addEntry(entry: ResolveMapEntry) {\n    const existingEntry = allPackages.get(entry.name);\n    if (existingEntry) {\n      let dupeSet = duplicatedPackages.get(entry.name);\n      if (!dupeSet) {\n        dupeSet = new Set([existingEntry.version]);\n        duplicatedPackages.set(entry.name, dupeSet);\n      }\n      dupeSet.add(entry.version);\n    } else {\n      allPackages.set(entry.name, entry);\n    }\n  }\n\n  for (const currentEntry of Object.values(resolveMap)) {\n    addEntry(currentEntry);\n\n    if (currentEntry.scopedVersions) {\n      for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {\n        addEntry(scopedEntry);\n      }\n    }\n  }\n\n  return {\n    allPackages,\n    duplicatedPackages,\n  };\n}\n"]}
+{"version":3,"file":"resolveDependenciesTask.js","sourceRoot":"","sources":["../../src/utilities/resolveDependenciesTask.ts"],"names":[],"mappings":"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","sourcesContent":["import type { LinkedPath, ResolveMap, ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { createResolveMap } from '@ms-cloudpack/package-utilities';\nimport { bold, bulletedList, cyan, yellow } from '@ms-cloudpack/task-reporter';\nimport type { Context } from '../types/Context.js';\n\n/**\n * Resolves the locations of dependencies and returns the resolve map, logging results\n * to the task reporter. Throws if dependencies could not be resolved.\n */\nexport async function resolveDependenciesTask(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: LinkedPath[];\n  },\n  context: Pick<Context, 'reporter' | 'packages'>,\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths, linkedPaths } = options;\n  const { reporter, packages } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  // Grab the installed dependency locations.\n  const task = reporter.addTask('Resolving dependencies');\n\n  try {\n    resolveMap = await createResolveMap({ appPath, additionalPaths, linkedPaths }, { packages });\n\n    const { allPackages, duplicatedPackages } = getPackagesFromResolveMap(resolveMap);\n    const message = `Found ${cyan(allPackages.size)} total packages, ${\n      duplicatedPackages.size ? `${yellow(duplicatedPackages.size)} with multiple versions.` : `no duplicates.`\n    }`;\n    const extended = bulletedList(\n      Array.from(duplicatedPackages.entries()).map(\n        ([name, versions]) => `${bold(name)}: ${Array.from(versions).join(', ')}`,\n      ),\n    );\n\n    task.complete({ message, extended, forceShow: true });\n\n    return resolveMap;\n  } catch (err) {\n    task.complete({\n      status: 'fail',\n      message: 'Failed to resolve dependencies',\n      errors: [String(err)],\n      forceShow: true,\n      // Don't use the message as \"details\" because this will cause the message to be logged twice\n      extended: (err as Error).stack,\n    });\n\n    if (err instanceof Error) {\n      // Remove the call stack because we already logged it in the extended details of the task\n      err.stack = undefined;\n    }\n\n    throw err;\n  }\n}\n\n/**\n * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.\n * This is used to log the results of the resolve task.\n */\nfunction getPackagesFromResolveMap(resolveMap: ResolveMap) {\n  const allPackages = new Map<string, ResolveMapEntry>();\n  const duplicatedPackages = new Map<string, Set<string>>();\n\n  function addEntry(entry: ResolveMapEntry) {\n    const existingEntry = allPackages.get(entry.name);\n    if (existingEntry) {\n      let dupeSet = duplicatedPackages.get(entry.name);\n      if (!dupeSet) {\n        dupeSet = new Set([existingEntry.version]);\n        duplicatedPackages.set(entry.name, dupeSet);\n      }\n      dupeSet.add(entry.version);\n    } else {\n      allPackages.set(entry.name, entry);\n    }\n  }\n\n  for (const currentEntry of Object.values(resolveMap)) {\n    addEntry(currentEntry);\n\n    if (currentEntry.scopedVersions) {\n      for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {\n        addEntry(scopedEntry);\n      }\n    }\n  }\n\n  return {\n    allPackages,\n    duplicatedPackages,\n  };\n}\n"]}

package/lib/utilities/validateOverride.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,UAAU,CAAC,GAC7C,OAAO,CAAC,OAAO,CAAC,CA6BlB"}
+{"version":3,"file":"validateOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,UAAU,CAAC,GAC7C,OAAO,CAAC,OAAO,CAAC,CA6BlB"}

package/lib/utilities/validateOverride.js

@@ -1,5 +1,6 @@
-import { parseRequestUrl } from '@ms-cloudpack/import-map';
+import { parseRequestInfo } from '@ms-cloudpack/import-map';
 import { findFileInPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';
+import { makeUrl } from '@ms-cloudpack/path-string-parsing';
 /**
  * Given a package name, import path, and optional issuerUrl, returns a boolean indicating if the given
  * override is valid.
@@ -9,7 +10,7 @@ export async function validateOverride(options, context) {
     const { session, packages } = context;
     let definition = undefined;
     if (issuerUrl) {
-        const { packageName: name, version } = parseRequestUrl(issuerUrl);
+        const { packageName: name, version } = parseRequestInfo(makeUrl(issuerUrl).pathname);
         definition = { name, version };
     }
     const entry = findResolveMapEntry({

package/lib/utilities/validateOverride.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateOverride.js","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAIzF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAwB,EACxB,OAA8C;IAE9C,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,UAAU,GAA4B,SAAS,CAAC;IAEpD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAClE,UAAU,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,KAAK,GAAG,mBAAmB,CAAC;QAChC,WAAW;QACX,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,iBAAiB,CAC1C;QACE,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,QAAQ,EAAE,UAAU;KACrB,EACD,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CACrC,CAAC;IAEF,OAAO,CAAC,CAAC,QAAQ,CAAC;AACpB,CAAC","sourcesContent":["import type { PackageJson } from '@ms-cloudpack/common-types';\nimport { parseRequestUrl } from '@ms-cloudpack/import-map';\nimport { findFileInPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\n\n/**\n * Given a package name, import path, and optional issuerUrl, returns a boolean indicating if the given\n * override is valid.\n */\nexport async function validateOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'session' | 'packages'>,\n): Promise<boolean> {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session, packages } = context;\n  let definition: PackageJson | undefined = undefined;\n\n  if (issuerUrl) {\n    const { packageName: name, version } = parseRequestUrl(issuerUrl);\n    definition = { name, version };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition,\n  });\n\n  if (!entry) {\n    return false;\n  }\n\n  const { filePath } = await findFileInPackage(\n    {\n      packagePath: entry.path,\n      filePath: importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  return !!filePath;\n}\n"]}
+{"version":3,"file":"validateOverride.js","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAI5D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAwB,EACxB,OAA8C;IAE9C,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,UAAU,GAA4B,SAAS,CAAC;IAEpD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;QACrF,UAAU,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,KAAK,GAAG,mBAAmB,CAAC;QAChC,WAAW;QACX,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,iBAAiB,CAC1C;QACE,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,QAAQ,EAAE,UAAU;KACrB,EACD,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CACrC,CAAC;IAEF,OAAO,CAAC,CAAC,QAAQ,CAAC;AACpB,CAAC","sourcesContent":["import type { PackageJson } from '@ms-cloudpack/common-types';\nimport { parseRequestInfo } from '@ms-cloudpack/import-map';\nimport { findFileInPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport type { Context } from '../types/Context.js';\nimport type { OverrideOptions } from '../types/OverrideOptions.js';\n\n/**\n * Given a package name, import path, and optional issuerUrl, returns a boolean indicating if the given\n * override is valid.\n */\nexport async function validateOverride(\n  options: OverrideOptions,\n  context: Pick<Context, 'session' | 'packages'>,\n): Promise<boolean> {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session, packages } = context;\n  let definition: PackageJson | undefined = undefined;\n\n  if (issuerUrl) {\n    const { packageName: name, version } = parseRequestInfo(makeUrl(issuerUrl).pathname);\n    definition = { name, version };\n  }\n\n  const entry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n    definition,\n  });\n\n  if (!entry) {\n    return false;\n  }\n\n  const { filePath } = await findFileInPackage(\n    {\n      packagePath: entry.path,\n      filePath: importPath,\n    },\n    { packages, config: session.config },\n  );\n\n  return !!filePath;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -23,22 +23,22 @@
     }
   },
   "dependencies": {
-    "@lage-run/hasher": "^1.0.5",
+    "@lage-run/hasher": "^1.1.1",
     "@lage-run/logger": "^1.3.0",
-    "@lage-run/scheduler": "^1.1.9",
+    "@lage-run/scheduler": "^1.2.1",
     "@lage-run/target-graph": "^0.8.9",
-    "@ms-cloudpack/bundler": "^0.20.5",
-    "@ms-cloudpack/common-types": "^0.5.0",
-    "@ms-cloudpack/config": "^0.20.2",
-    "@ms-cloudpack/create-express-app": "^1.6.9",
+    "@ms-cloudpack/bundler": "^0.20.7",
+    "@ms-cloudpack/common-types": "^0.5.1",
+    "@ms-cloudpack/config": "^0.20.4",
+    "@ms-cloudpack/create-express-app": "^1.6.11",
     "@ms-cloudpack/data-bus": "^0.4.2",
     "@ms-cloudpack/file-watcher": "^0.1.2",
-    "@ms-cloudpack/import-map": "^0.3.3",
+    "@ms-cloudpack/import-map": "^0.5.0",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-hashes": "^0.5.13",
-    "@ms-cloudpack/package-utilities": "^7.4.1",
-    "@ms-cloudpack/path-string-parsing": "^1.2.1",
-    "@ms-cloudpack/path-utilities": "^2.7.6",
+    "@ms-cloudpack/package-hashes": "^0.5.15",
+    "@ms-cloudpack/package-utilities": "^7.4.3",
+    "@ms-cloudpack/path-string-parsing": "^1.2.2",
+    "@ms-cloudpack/path-utilities": "^2.7.8",
     "@ms-cloudpack/remote-cache": "^0.7.2",
     "@ms-cloudpack/task-reporter": "^0.14.0",
     "@ms-cloudpack/telemetry": "^0.5.1",