@ms-cloudpack/api-server 0.15.0 → 0.17.0

package/lib/utilities/parseRequestUrl.js

@@ -0,0 +1,48 @@
+/**
+ * Parse a request for a package file from the bundle server, such as
+ * `http://bundleServerDomain/@scope/package@version/v3.2/bundled/path/to/file.js`.
+ *
+ * Segments:
+ * - Package name (and optionally `@version`)
+ * - Optional refresh version `v#.#`
+ * - Optional type `bundled` or `unbundled` (defaults to unbundled)
+ * - Optional file path with leading slash (empty if no path)
+ *
+ * @returns Info about the requested package/file.
+ */
+export function parseRequestUrl(requestUrl) {
+    let packageName = '';
+    let version = '';
+    let bundled = false;
+    let filePath = '';
+    // get the path segments and remove leading and trailing slashes
+    const segments = new URL(requestUrl).pathname.split('/');
+    segments.shift(); // URL's pathname always starts with a slash
+    if (segments[segments.length - 1] === '')
+        segments.pop();
+    if (segments.length) {
+        // if the first segment starts with an `@`, it's a scope
+        const scope = segments[0].match(/^@[\w.-]+$/) ? segments.shift() + '/' : '';
+        // the next segment is the package name, optionally followed by `@version`
+        // (the regex uses named capture groups)
+        const packageMatch = segments.shift()?.match(/^(?<unscopedName>[\w.-]+)(@(?<version>[\w.-]+))?$/);
+        if (packageMatch?.groups) {
+            packageName = scope + packageMatch.groups.unscopedName;
+            version = packageMatch.groups.version || '';
+            // remove the optional refresh version segment, e.g. v3.2
+            if (/^v[\d.]+$/.test(segments[0] || '')) {
+                segments.shift();
+            }
+            // optional bundled/unbundled segment
+            if (segments[0] === 'bundled' || segments[0] === 'unbundled') {
+                bundled = segments.shift() === 'bundled';
+            }
+            // the rest is the file path
+            if (segments.length) {
+                filePath = '/' + segments.join('/');
+            }
+        }
+    }
+    return { packageName, version, bundled, filePath };
+}
+//# sourceMappingURL=parseRequestUrl.js.map

package/lib/utilities/parseRequestUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseRequestUrl.js","sourceRoot":"","sources":["../../src/utilities/parseRequestUrl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,eAAe,CAAC,UAAkB;IAUhD,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,gEAAgE;IAChE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzD,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,4CAA4C;IAC9D,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,CAAC;IAEzD,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnB,wDAAwD;QACxD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,0EAA0E;QAC1E,wCAAwC;QACxC,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,mDAAmD,CAAC,CAAC;QAElG,IAAI,YAAY,EAAE,MAAM,EAAE;YACxB,WAAW,GAAG,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC;YACvD,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;YAE5C,yDAAyD;YACzD,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE;gBACvC,QAAQ,CAAC,KAAK,EAAE,CAAC;aAClB;YAED,qCAAqC;YACrC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE;gBAC5D,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,SAAS,CAAC;aAC1C;YAED,4BAA4B;YAC5B,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,QAAQ,GAAG,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACrC;SACF;KACF;IAED,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AACrD,CAAC","sourcesContent":["/**\n * Parse a request for a package file from the bundle server, such as\n * `http://bundleServerDomain/@scope/package@version/v3.2/bundled/path/to/file.js`.\n *\n * Segments:\n * - Package name (and optionally `@version`)\n * - Optional refresh version `v#.#`\n * - Optional type `bundled` or `unbundled` (defaults to unbundled)\n * - Optional file path with leading slash (empty if no path)\n *\n * @returns Info about the requested package/file.\n */\nexport function parseRequestUrl(requestUrl: string): {\n  /** Package name */\n  packageName: string;\n  /** Optional package version (default: empty string) */\n  version: string;\n  /** Whether the bundled version is requested (default: false) */\n  bundled: boolean;\n  /** Optional file path (default: empty string) */\n  filePath: string;\n} {\n  let packageName = '';\n  let version = '';\n  let bundled = false;\n  let filePath = '';\n\n  // get the path segments and remove leading and trailing slashes\n  const segments = new URL(requestUrl).pathname.split('/');\n  segments.shift(); // URL's pathname always starts with a slash\n  if (segments[segments.length - 1] === '') segments.pop();\n\n  if (segments.length) {\n    // if the first segment starts with an `@`, it's a scope\n    const scope = segments[0].match(/^@[\\w.-]+$/) ? segments.shift() + '/' : '';\n    // the next segment is the package name, optionally followed by `@version`\n    // (the regex uses named capture groups)\n    const packageMatch = segments.shift()?.match(/^(?<unscopedName>[\\w.-]+)(@(?<version>[\\w.-]+))?$/);\n\n    if (packageMatch?.groups) {\n      packageName = scope + packageMatch.groups.unscopedName;\n      version = packageMatch.groups.version || '';\n\n      // remove the optional refresh version segment, e.g. v3.2\n      if (/^v[\\d.]+$/.test(segments[0] || '')) {\n        segments.shift();\n      }\n\n      // optional bundled/unbundled segment\n      if (segments[0] === 'bundled' || segments[0] === 'unbundled') {\n        bundled = segments.shift() === 'bundled';\n      }\n\n      // the rest is the file path\n      if (segments.length) {\n        filePath = '/' + segments.join('/');\n      }\n    }\n  }\n\n  return { packageName, version, bundled, filePath };\n}\n"]}

package/lib/utilities/resolveDependenciesTask.d.ts

@@ -0,0 +1,16 @@
+import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
+import type { LinkedPath, ResolveMap } from '@ms-cloudpack/package-utilities';
+import { type TaskReporter } from '@ms-cloudpack/task-reporter';
+/**
+ * Resolves the locations of dependencies and returns the resolve map, logging results
+ * to the task reporter.
+ */
+export declare function resolveDependenciesTask(options: {
+    appPath: string;
+    additionalPaths?: string[];
+    linkedPaths?: LinkedPath[];
+}, context: {
+    reporter: TaskReporter;
+    packages: PackageDefinitionsCache;
+}): Promise<ResolveMap>;
+//# sourceMappingURL=resolveDependenciesTask.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"resolveDependenciesTask.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveDependenciesTask.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,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,uBAsCvE"}

package/lib/utilities/resolveDependenciesTask.js

@@ -0,0 +1,65 @@
+import { createResolveMap } from '@ms-cloudpack/package-utilities';
+import { bold, bulletedList, cyan, yellow } from '@ms-cloudpack/task-reporter';
+/**
+ * Resolves the locations of dependencies and returns the resolve map, logging results
+ * to the task reporter.
+ */
+export async function resolveDependenciesTask(options, context) {
+    const { appPath, additionalPaths, linkedPaths } = options;
+    const { reporter, packages } = context;
+    let resolveMap;
+    // Grab the installed dependency locations.
+    await reporter.runTask('Resolving dependencies', async () => {
+        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(', ')}`));
+        return {
+            message,
+            extended,
+            forceShow: true,
+        };
+    });
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- will be defined after the task runs
+    return resolveMap;
+}
+/**
+ * Given a resolveMap, returns a map of all packages and a map of packages with multiple versions.
+ * This is used to log the results of the resolve task.
+ */
+function getPackagesFromResolveMap(resolveMap) {
+    const allPackages = new Map();
+    const duplicatedPackages = new Map();
+    function addEntry(entry) {
+        if (allPackages.has(entry.name)) {
+            if (!duplicatedPackages.has(entry.name)) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                duplicatedPackages.set(entry.name, new Set([allPackages.get(entry.name).version]));
+            }
+            const dupeSet = duplicatedPackages.get(entry.name);
+            dupeSet?.add(entry.version);
+        }
+        else {
+            allPackages.set(entry.name, entry);
+        }
+    }
+    for (const currentEntry of Object.values(resolveMap)) {
+        addEntry(currentEntry);
+        if (currentEntry.scopedVersions) {
+            for (const scopedEntry of Object.values(currentEntry.scopedVersions)) {
+                addEntry(scopedEntry);
+            }
+        }
+    }
+    return {
+        allPackages,
+        duplicatedPackages,
+    };
+}
+//# sourceMappingURL=resolveDependenciesTask.js.map

package/lib/utilities/resolveDependenciesTask.js.map

@@ -0,0 +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/bundler-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.\n */\nexport async function resolveDependenciesTask(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: LinkedPath[];\n  },\n  context: { reporter: TaskReporter; packages: PackageDefinitionsCache },\n) {\n  const { appPath, additionalPaths, linkedPaths } = options;\n  const { reporter, packages } = context;\n  let resolveMap: ResolveMap | undefined;\n\n  // Grab the installed dependency locations.\n  await reporter.runTask('Resolving dependencies', async () => {\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    return {\n      message,\n      extended,\n      forceShow: true,\n    };\n  });\n\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- will be defined after the task runs\n  return resolveMap!;\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    if (allPackages.has(entry.name)) {\n      if (!duplicatedPackages.has(entry.name)) {\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        duplicatedPackages.set(entry.name, new Set([allPackages.get(entry.name)!.version]));\n      }\n      const dupeSet = duplicatedPackages.get(entry.name);\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

@@ -1,11 +1,15 @@
 import type { Context } from '../types/Context.js';
+export interface ValidateOverrideOptions {
+    /** The package name the override applies to. */
+    packageName: string;
+    /** The import path overridden for the package. */
+    importPath: string;
+    /** URL that issued the import. */
+    issuerUrl?: string;
+}
 /**
  * Given a package name, import path, and optional issuerUrl, returns a boolean indicating if the given
  * override is valid.
  */
-export declare function validateOverride(options: {
-    packageName: string;
-    importPath: string;
-    issuerUrl?: string;
-}, context: Pick<Context, 'session' | 'packages'>): Promise<boolean>;
+export declare function validateOverride(options: ValidateOverrideOptions, context: Pick<Context, 'session' | 'packages'>): Promise<boolean>;
 //# sourceMappingURL=validateOverride.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"validateOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,EACD,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,UAAU,CAAC,oBA+B/C"}
+{"version":3,"file":"validateOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,WAAW,uBAAuB;IACtC,gDAAgD;IAChD,WAAW,EAAE,MAAM,CAAC;IAEpB,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;IAEnB,kCAAkC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,UAAU,CAAC,oBA8B/C"}

package/lib/utilities/validateOverride.js

@@ -1,6 +1,5 @@
 import { findResolveMapEntry, findFileInPackage } from '@ms-cloudpack/package-utilities';
-import { slash } from '@ms-cloudpack/path-string-parsing';
-import { parseRequestInfo } from './parseRequestInfo.js';
+import { parseRequestUrl } from './parseRequestUrl.js';
 /**
  * Given a package name, import path, and optional issuerUrl, returns a boolean indicating if the given
  * override is valid.
@@ -10,8 +9,7 @@ export async function validateOverride(options, context) {
     const { session } = context;
     let definition = undefined;
     if (issuerUrl) {
-        const requestPath = slash(new URL(issuerUrl).pathname);
-        const { packageName: name, version } = parseRequestInfo(requestPath);
+        const { packageName: name, version } = parseRequestUrl(issuerUrl);
         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":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzF,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAIC,EACD,OAA8C;IAE9C,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,IAAI,UAAU,GAA4B,SAAS,CAAC;IAEpD,IAAI,SAAS,EAAE;QACb,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvD,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,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,iBAAiB,CAC1C;QACE,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,QAAQ,EAAE,UAAU;KACrB,EACD,OAAO,CACR,CAAC;IAEF,OAAO,CAAC,CAAC,QAAQ,CAAC;AACpB,CAAC","sourcesContent":["import { findResolveMapEntry, findFileInPackage } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport type { Context } from '../types/Context.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: {\n    packageName: string;\n    importPath: string;\n    issuerUrl?: string;\n  },\n  context: Pick<Context, 'session' | 'packages'>,\n) {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session } = context;\n  let definition: PackageJson | undefined = undefined;\n\n  if (issuerUrl) {\n    const requestPath = slash(new URL(issuerUrl).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) {\n    return false;\n  }\n\n  const { filePath } = await findFileInPackage(\n    {\n      packagePath: entry.path,\n      filePath: importPath,\n    },\n    context,\n  );\n\n  return !!filePath;\n}\n"]}
+{"version":3,"file":"validateOverride.js","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAevD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAgC,EAChC,OAA8C;IAE9C,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,IAAI,UAAU,GAA4B,SAAS,CAAC;IAEpD,IAAI,SAAS,EAAE;QACb,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAClE,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,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,iBAAiB,CAC1C;QACE,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,QAAQ,EAAE,UAAU;KACrB,EACD,OAAO,CACR,CAAC;IAEF,OAAO,CAAC,CAAC,QAAQ,CAAC;AACpB,CAAC","sourcesContent":["import { findResolveMapEntry, findFileInPackage } from '@ms-cloudpack/package-utilities';\nimport { parseRequestUrl } from './parseRequestUrl.js';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport type { Context } from '../types/Context.js';\n\nexport interface ValidateOverrideOptions {\n  /** The package name the override applies to. */\n  packageName: string;\n\n  /** The import path overridden for the package. */\n  importPath: string;\n\n  /** URL that issued the import. */\n  issuerUrl?: string;\n}\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: ValidateOverrideOptions,\n  context: Pick<Context, 'session' | 'packages'>,\n) {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session } = 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    context,\n  );\n\n  return !!filePath;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -16,8 +16,8 @@
       "import": "./lib/client.js"
     },
     "./apis": {
-      "types": "./lib/apis/index.d.ts",
-      "import": "./lib/apis/index.js"
+      "types": "./lib/apis.d.ts",
+      "import": "./lib/apis.js"
     }
   },
   "dependencies": {
@@ -25,18 +25,18 @@
     "@lage-run/scheduler": "^1.0.0",
     "@lage-run/target-graph": "^0.8.6",
     "@lage-run/hasher": "^1.0.0",
-    "@ms-cloudpack/bundler": "^0.14.11",
-    "@ms-cloudpack/bundler-types": "^0.18.0",
-    "@ms-cloudpack/config": "^0.12.1",
+    "@ms-cloudpack/bundler": "^0.14.12",
+    "@ms-cloudpack/bundler-types": "^0.18.1",
+    "@ms-cloudpack/config": "^0.12.2",
     "@ms-cloudpack/create-express-app": "^1.3.9",
     "@ms-cloudpack/data-bus": "^0.4.0",
     "@ms-cloudpack/file-watcher": "^0.1.0",
     "@ms-cloudpack/json-utilities": "^0.0.7",
-    "@ms-cloudpack/package-utilities": "^5.1.3",
+    "@ms-cloudpack/package-utilities": "^5.1.4",
     "@ms-cloudpack/path-string-parsing": "^1.0.3",
     "@ms-cloudpack/path-utilities": "^2.3.2",
     "@ms-cloudpack/task-reporter": "^0.7.2",
-    "@ms-cloudpack/telemetry": "^0.3.7",
+    "@ms-cloudpack/telemetry": "^0.3.8",
     "@ms-cloudpack/remote-cache": "^0.1.6",
     "@trpc/client": "^10.21.1",
     "@trpc/server": "^10.21.1",
@@ -51,6 +51,7 @@
     "p-queue": "^7.3.0",
     "object-hash": "^3.0.0",
     "semver": "^7.3.7",
+    "uuid": "^9.0.0",
     "ws": "^8.9.0",
     "zod": "^3.21.4"
   },

package/lib/types/TaskError.d.ts

@@ -1,25 +0,0 @@
-import z from 'zod';
-export declare const ZodTaskError: z.ZodObject<{
-    message: z.ZodString;
-    pluginName: z.ZodString;
-    stack: z.ZodString;
-    fileLocation: z.ZodString;
-    lineNumber: z.ZodNumber;
-    columnNumber: z.ZodNumber;
-}, "strip", z.ZodTypeAny, {
-    message: string;
-    pluginName: string;
-    stack: string;
-    fileLocation: string;
-    lineNumber: number;
-    columnNumber: number;
-}, {
-    message: string;
-    pluginName: string;
-    stack: string;
-    fileLocation: string;
-    lineNumber: number;
-    columnNumber: number;
-}>;
-export type TaskError = z.infer<typeof ZodTaskError>;
-//# sourceMappingURL=TaskError.d.ts.map

package/lib/types/TaskError.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TaskError.d.ts","sourceRoot":"","sources":["../../src/types/TaskError.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;EAOvB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC"}

package/lib/types/TaskError.js

@@ -1,10 +0,0 @@
-import z from 'zod';
-export const ZodTaskError = z.object({
-    message: z.string(),
-    pluginName: z.string(),
-    stack: z.string(),
-    fileLocation: z.string(),
-    lineNumber: z.number(),
-    columnNumber: z.number(),
-});
-//# sourceMappingURL=TaskError.js.map

package/lib/types/TaskError.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TaskError.js","sourceRoot":"","sources":["../../src/types/TaskError.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;IACxB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;CACzB,CAAC,CAAC","sourcesContent":["import z from 'zod';\n\nexport const ZodTaskError = z.object({\n  message: z.string(),\n  pluginName: z.string(),\n  stack: z.string(),\n  fileLocation: z.string(),\n  lineNumber: z.number(),\n  columnNumber: z.number(),\n});\n\nexport type TaskError = z.infer<typeof ZodTaskError>;\n"]}

package/lib/utilities/parseRequestInfo.d.ts

@@ -1,7 +0,0 @@
-export declare function parseRequestInfo(requestPath: string): {
-    packageName: string;
-    version: string;
-    bundled: boolean;
-    filePath: string;
-};
-//# sourceMappingURL=parseRequestInfo.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"parseRequestInfo.d.ts","sourceRoot":"","sources":["../../src/utilities/parseRequestInfo.ts"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM;;;;;EAiBnD"}

package/lib/utilities/parseRequestInfo.js

@@ -1,14 +0,0 @@
-export function parseRequestInfo(requestPath) {
-    const matches = requestPath.match(/[/]?(@[-_a-z-A-Z0-9.]+\/[-_a-z-A-Z0-9.]+|[a-zA-Z-0-9.]+)(@([-_a-zA-Z-0-9.]+))?(\/v([0-9.]+))?(\/(bundled|unbundled))?(\/[-_/a-zA-Z0-9.+]+)?/) || [];
-    const packageName = matches[1] || '';
-    const version = matches[3] || '';
-    const bundled = (matches.length > 8 && matches[7]) === 'bundled';
-    const filePath = (matches.length > 8 && matches[8]) || '';
-    return {
-        packageName,
-        version,
-        bundled,
-        filePath,
-    };
-}
-//# sourceMappingURL=parseRequestInfo.js.map

package/lib/utilities/parseRequestInfo.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"parseRequestInfo.js","sourceRoot":"","sources":["../../src/utilities/parseRequestInfo.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,gBAAgB,CAAC,WAAmB;IAClD,MAAM,OAAO,GACX,WAAW,CAAC,KAAK,CACf,6IAA6I,CAC9I,IAAI,EAAE,CAAC;IAEV,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACrC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;IACjE,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAE1D,OAAO;QACL,WAAW;QACX,OAAO;QACP,OAAO;QACP,QAAQ;KACT,CAAC;AACJ,CAAC","sourcesContent":["export function parseRequestInfo(requestPath: string) {\n  const matches =\n    requestPath.match(\n      /[/]?(@[-_a-z-A-Z0-9.]+\\/[-_a-z-A-Z0-9.]+|[a-zA-Z-0-9.]+)(@([-_a-zA-Z-0-9.]+))?(\\/v([0-9.]+))?(\\/(bundled|unbundled))?(\\/[-_/a-zA-Z0-9.+]+)?/,\n    ) || [];\n\n  const packageName = matches[1] || '';\n  const version = matches[3] || '';\n  const bundled = (matches.length > 8 && matches[7]) === 'bundled';\n  const filePath = (matches.length > 8 && matches[8]) || '';\n\n  return {\n    packageName,\n    version,\n    bundled,\n    filePath,\n  };\n}\n"]}