@ms-cloudpack/api-server 0.41.0 → 0.42.1

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,uBAmDvE"}
+{"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

@@ -2,7 +2,7 @@ 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.
+ * to the task reporter. Throws if dependencies could not be resolved.
  */
 export async function resolveDependenciesTask(options, context) {
     const { appPath, additionalPaths, linkedPaths } = options;
@@ -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.\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  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 { findResolveMapEntry, findFileInPackage } from '@ms-cloudpack/package-utilities';
-import { parseRequestUrl } from './parseRequestUrl.js';
+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":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAKvD;;;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 { findResolveMapEntry, findFileInPackage } from '@ms-cloudpack/package-utilities';\nimport { parseRequestUrl } from './parseRequestUrl.js';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\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.41.0",
+  "version": "0.42.1",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -27,18 +27,18 @@
     "@lage-run/logger": "^1.3.0",
     "@lage-run/scheduler": "^1.1.9",
     "@lage-run/target-graph": "^0.8.9",
-    "@ms-cloudpack/bundler": "^0.20.4",
-    "@ms-cloudpack/common-types": "^0.4.0",
-    "@ms-cloudpack/config": "^0.20.1",
-    "@ms-cloudpack/create-express-app": "^1.6.8",
+    "@ms-cloudpack/bundler": "^0.20.6",
+    "@ms-cloudpack/common-types": "^0.5.0",
+    "@ms-cloudpack/config": "^0.20.3",
+    "@ms-cloudpack/create-express-app": "^1.6.10",
     "@ms-cloudpack/data-bus": "^0.4.2",
     "@ms-cloudpack/file-watcher": "^0.1.2",
-    "@ms-cloudpack/import-map": "^0.3.2",
+    "@ms-cloudpack/import-map": "^0.4.0",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-hashes": "^0.5.12",
-    "@ms-cloudpack/package-utilities": "^7.4.0",
-    "@ms-cloudpack/path-string-parsing": "^1.2.1",
-    "@ms-cloudpack/path-utilities": "^2.7.5",
+    "@ms-cloudpack/package-hashes": "^0.5.14",
+    "@ms-cloudpack/package-utilities": "^7.4.2",
+    "@ms-cloudpack/path-string-parsing": "^1.2.2",
+    "@ms-cloudpack/path-utilities": "^2.7.7",
     "@ms-cloudpack/remote-cache": "^0.7.2",
     "@ms-cloudpack/task-reporter": "^0.14.0",
     "@ms-cloudpack/telemetry": "^0.5.1",

package/lib/utilities/parseRequestInfo.d.ts

@@ -1,30 +0,0 @@
-/**
- * Parse a request for package file from the bundle server, such as
- * `/@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 property `missing` (defaults to false)
- * - Optional file path with leading slash (empty if no path)
- *
- * @param requestPath Pathname (server-relative URL) of the requested file.
- * @returns Info about the requested file. If `requestPath` doesn't follow the expected format,
- * the object will contain empty strings.
- */
-export declare function parseRequestInfo(requestPath: string): {
-    /** Package name (empty string if invalid request) */
-    packageName: string;
-    /** Optional package version (default: empty string) */
-    version: string;
-    /** Optional hash (default: empty string) */
-    hash: string;
-    /** Whether the bundled version is requested (default: false) */
-    bundled: boolean;
-    /** Optional file path (default: empty string) */
-    filePath: string;
-    /** Whether the file is missing (default: false) */
-    missing: boolean;
-};
-//# 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;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG;IACrD,qDAAqD;IACrD,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,gEAAgE;IAChE,OAAO,EAAE,OAAO,CAAC;IACjB,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,OAAO,EAAE,OAAO,CAAC;CAClB,CAoBA"}

package/lib/utilities/parseRequestInfo.js

@@ -1,34 +0,0 @@
-/**
- * Parse a request for package file from the bundle server, such as
- * `/@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 property `missing` (defaults to false)
- * - Optional file path with leading slash (empty if no path)
- *
- * @param requestPath Pathname (server-relative URL) of the requested file.
- * @returns Info about the requested file. If `requestPath` doesn't follow the expected format,
- * the object will contain empty strings.
- */
-export function parseRequestInfo(requestPath) {
-    // This is a hot path, and the following things appear to make the regex faster:
-    // - /(?:Non-capturing groups)/ where capturing isn't needed
-    // - /(Indexed capturing groups)/ instead of /(?<namedGroups>...)/
-    // - For character classes containing - , putting the - at the beginning
-    // - Anchoring to the beginning of the string with ^
-    const matches = requestPath.match(
-    //   1 package name              2 hash       3 version refresh                 4 bundled or missing          4 file path   end or query
-    /^\/?((?:@[-\w.]+\/)?[-\w.]+)(?:@([-\w.]+))?(?:\/h-([-0-9a-z.]+))?(?:\/v[\d.]+)?(?:\/(bundled|unbundled|missing))?(\/[-@\w.+/]+)?(?:\?|$)/) || [];
-    return {
-        packageName: matches[1] || '',
-        version: matches[2] || '',
-        hash: matches[3] || '',
-        bundled: matches[4] === 'bundled',
-        filePath: matches[5] || '',
-        missing: matches[4] === 'missing',
-    };
-}
-//# 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;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,gBAAgB,CAAC,WAAmB;IAclD,gFAAgF;IAChF,4DAA4D;IAC5D,kEAAkE;IAClE,wEAAwE;IACxE,oDAAoD;IACpD,MAAM,OAAO,GACX,WAAW,CAAC,KAAK;IACf,wIAAwI;IACxI,0IAA0I,CAC3I,IAAI,EAAE,CAAC;IAEV,OAAO;QACL,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;QAC7B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;QACzB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;QACtB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,SAAS;QACjC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE;QAC1B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,SAAS;KAClC,CAAC;AACJ,CAAC","sourcesContent":["/**\n * Parse a request for package file from the bundle server, such as\n * `/@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 property `missing` (defaults to false)\n * - Optional file path with leading slash (empty if no path)\n *\n * @param requestPath Pathname (server-relative URL) of the requested file.\n * @returns Info about the requested file. If `requestPath` doesn't follow the expected format,\n * the object will contain empty strings.\n */\nexport function parseRequestInfo(requestPath: string): {\n  /** Package name (empty string if invalid request) */\n  packageName: string;\n  /** Optional package version (default: empty string) */\n  version: string;\n  /** Optional hash (default: empty string) */\n  hash: string;\n  /** Whether the bundled version is requested (default: false) */\n  bundled: boolean;\n  /** Optional file path (default: empty string) */\n  filePath: string;\n  /** Whether the file is missing (default: false) */\n  missing: boolean;\n} {\n  // This is a hot path, and the following things appear to make the regex faster:\n  // - /(?:Non-capturing groups)/ where capturing isn't needed\n  // - /(Indexed capturing groups)/ instead of /(?<namedGroups>...)/\n  // - For character classes containing - , putting the - at the beginning\n  // - Anchoring to the beginning of the string with ^\n  const matches =\n    requestPath.match(\n      //   1 package name              2 hash       3 version refresh                 4 bundled or missing          4 file path   end or query\n      /^\\/?((?:@[-\\w.]+\\/)?[-\\w.]+)(?:@([-\\w.]+))?(?:\\/h-([-0-9a-z.]+))?(?:\\/v[\\d.]+)?(?:\\/(bundled|unbundled|missing))?(\\/[-@\\w.+/]+)?(?:\\?|$)/,\n    ) || [];\n\n  return {\n    packageName: matches[1] || '',\n    version: matches[2] || '',\n    hash: matches[3] || '',\n    bundled: matches[4] === 'bundled',\n    filePath: matches[5] || '',\n    missing: matches[4] === 'missing',\n  };\n}\n"]}

package/lib/utilities/parseRequestUrl.d.ts

@@ -1,14 +0,0 @@
-import { parseRequestInfo } from './parseRequestInfo.js';
-/**
- * Parse a complete package file request URL, such as
- * `http://localhost/@scope/package@version/v3.2/bundled/path/to/file.js`.
- * See `parseRequestInfo` for more details.
- *
- * Throws an error if `requestUrl` is not a syntactically valid complete URL.
- *
- * @param requestUrl Full URL of the requested file.
- * @returns Info about the requested file. If `requestUrl` doesn't follow the expected format,
- * the object will contain empty strings.
- */
-export declare function parseRequestUrl(requestUrl: string): ReturnType<typeof parseRequestInfo>;
-//# sourceMappingURL=parseRequestUrl.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"parseRequestUrl.d.ts","sourceRoot":"","sources":["../../src/utilities/parseRequestUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAUvF"}

package/lib/utilities/parseRequestUrl.js

@@ -1,24 +0,0 @@
-import { parseRequestInfo } from './parseRequestInfo.js';
-/**
- * Parse a complete package file request URL, such as
- * `http://localhost/@scope/package@version/v3.2/bundled/path/to/file.js`.
- * See `parseRequestInfo` for more details.
- *
- * Throws an error if `requestUrl` is not a syntactically valid complete URL.
- *
- * @param requestUrl Full URL of the requested file.
- * @returns Info about the requested file. If `requestUrl` doesn't follow the expected format,
- * the object will contain empty strings.
- */
-export function parseRequestUrl(requestUrl) {
-    let pathname;
-    try {
-        pathname = new URL(requestUrl).pathname;
-    }
-    catch (err) {
-        // The error for URL parsing failure doesn't include the string, so throw a more helpful error.
-        throw new Error(`Invalid URL: ${requestUrl}`);
-    }
-    return parseRequestInfo(pathname);
-}
-//# sourceMappingURL=parseRequestUrl.js.map

package/lib/utilities/parseRequestUrl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"parseRequestUrl.js","sourceRoot":"","sources":["../../src/utilities/parseRequestUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC;IAC1C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,+FAA+F;QAC/F,MAAM,IAAI,KAAK,CAAC,gBAAgB,UAAU,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;AACpC,CAAC","sourcesContent":["import { parseRequestInfo } from './parseRequestInfo.js';\n\n/**\n * Parse a complete package file request URL, such as\n * `http://localhost/@scope/package@version/v3.2/bundled/path/to/file.js`.\n * See `parseRequestInfo` for more details.\n *\n * Throws an error if `requestUrl` is not a syntactically valid complete URL.\n *\n * @param requestUrl Full URL of the requested file.\n * @returns Info about the requested file. If `requestUrl` doesn't follow the expected format,\n * the object will contain empty strings.\n */\nexport function parseRequestUrl(requestUrl: string): ReturnType<typeof parseRequestInfo> {\n  let pathname: string;\n  try {\n    pathname = new URL(requestUrl).pathname;\n  } catch (err) {\n    // The error for URL parsing failure doesn't include the string, so throw a more helpful error.\n    throw new Error(`Invalid URL: ${requestUrl}`);\n  }\n\n  return parseRequestInfo(pathname);\n}\n"]}