@ms-cloudpack/api-server 0.35.0 → 0.36.0

package/lib/utilities/getBundleLocation.js

@@ -2,7 +2,7 @@ import filenamify from 'filenamify';
 import path from 'path';
 import { getCachePath } from './getCachePath.js';
 export async function getBundleLocation(options, context) {
-    const { packagePath, shouldRecalculate } = options;
+    const { packagePath, shouldRecalculate, hash } = options;
     const { packages, packageHashes } = context;
     const definition = await packages.get(packagePath);
     if (!definition) {
@@ -12,15 +12,16 @@ export async function getBundleLocation(options, context) {
         throw new Error(`Package definition (package.json) missing name at "${packagePath}"`);
     }
     const { name, version } = definition;
-    const hashResult = await packageHashes.get({
-        packagePath,
-        /**
-         *  We don't use source hashing for location,
-         *  because we do not want to create a new folder for each change in a package.
-         */
-        isSourceHashingEnabled: false,
-        shouldRecalculate,
-    });
+    const hashResult = hash ||
+        (await packageHashes.get({
+            packagePath,
+            /**
+             *  We don't use source hashing for location,
+             *  because we do not want to create a new folder for each change in a package.
+             */
+            isSourceHashingEnabled: false,
+            shouldRecalculate,
+        }));
     // Derive where the output should be.
     const folderName = `${filenamify(name, { replacement: '^' })}-${version}-${hashResult}`;
     const outputPath = path.join(getCachePath(), folderName);

package/lib/utilities/getBundleLocation.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleLocation.js","sourceRoot":"","sources":["../../src/utilities/getBundleLocation.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAA6D,EAC7D,OAGC;IAED,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,4DAA4D,WAAW,GAAG,CAAC,CAAC;IAC9F,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sDAAsD,WAAW,GAAG,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC;QACzC,WAAW;QACX;;;WAGG;QACH,sBAAsB,EAAE,KAAK;QAC7B,iBAAiB;KAClB,CAAC,CAAC;IACH,qCAAqC;IACrC,MAAM,UAAU,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;IACxF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,UAAU,CAAC,CAAC;IAEzD,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,UAAU;KACX,CAAC;AACJ,CAAC","sourcesContent":["import filenamify from 'filenamify';\nimport path from 'path';\nimport { getCachePath } from './getCachePath.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport async function getBundleLocation(\n  options: { packagePath: string; shouldRecalculate?: boolean },\n  context: {\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n  },\n) {\n  const { packagePath, shouldRecalculate } = options;\n  const { packages, packageHashes } = context;\n  const definition = await packages.get(packagePath);\n\n  if (!definition) {\n    throw new Error(`Package definition (package.json) missing or invalid at \"${packagePath}\"`);\n  }\n\n  if (!definition.name) {\n    throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n  }\n\n  const { name, version } = definition;\n\n  const hashResult = await packageHashes.get({\n    packagePath,\n    /**\n     *  We don't use source hashing for location,\n     *  because we do not want to create a new folder for each change in a package.\n     */\n    isSourceHashingEnabled: false,\n    shouldRecalculate,\n  });\n  // Derive where the output should be.\n  const folderName = `${filenamify(name, { replacement: '^' })}-${version}-${hashResult}`;\n  const outputPath = path.join(getCachePath(), folderName);\n\n  return {\n    path: outputPath,\n    folderName,\n  };\n}\n"]}
+{"version":3,"file":"getBundleLocation.js","sourceRoot":"","sources":["../../src/utilities/getBundleLocation.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAA4E,EAC5E,OAGC;IAED,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzD,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,4DAA4D,WAAW,GAAG,CAAC,CAAC;IAC9F,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sDAAsD,WAAW,GAAG,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAErC,MAAM,UAAU,GACd,IAAI;QACJ,CAAC,MAAM,aAAa,CAAC,GAAG,CAAC;YACvB,WAAW;YACX;;;eAGG;YACH,sBAAsB,EAAE,KAAK;YAC7B,iBAAiB;SAClB,CAAC,CAAC,CAAC;IACN,qCAAqC;IACrC,MAAM,UAAU,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;IACxF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,UAAU,CAAC,CAAC;IAEzD,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,UAAU;KACX,CAAC;AACJ,CAAC","sourcesContent":["import filenamify from 'filenamify';\nimport path from 'path';\nimport { getCachePath } from './getCachePath.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport async function getBundleLocation(\n  options: { packagePath: string; shouldRecalculate?: boolean; hash?: string },\n  context: {\n    packages: PackageDefinitionsCache;\n    packageHashes: PackageHashes;\n  },\n) {\n  const { packagePath, shouldRecalculate, hash } = options;\n  const { packages, packageHashes } = context;\n  const definition = await packages.get(packagePath);\n\n  if (!definition) {\n    throw new Error(`Package definition (package.json) missing or invalid at \"${packagePath}\"`);\n  }\n\n  if (!definition.name) {\n    throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n  }\n\n  const { name, version } = definition;\n\n  const hashResult =\n    hash ||\n    (await packageHashes.get({\n      packagePath,\n      /**\n       *  We don't use source hashing for location,\n       *  because we do not want to create a new folder for each change in a package.\n       */\n      isSourceHashingEnabled: false,\n      shouldRecalculate,\n    }));\n  // Derive where the output should be.\n  const folderName = `${filenamify(name, { replacement: '^' })}-${version}-${hashResult}`;\n  const outputPath = path.join(getCachePath(), folderName);\n\n  return {\n    path: outputPath,\n    folderName,\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -27,20 +27,20 @@
     "@lage-run/logger": "^1.3.0",
     "@lage-run/scheduler": "^1.1.9",
     "@lage-run/target-graph": "^0.8.9",
-    "@ms-cloudpack/bundler": "^0.19.1",
-    "@ms-cloudpack/common-types": "^0.2.0",
-    "@ms-cloudpack/config": "^0.18.1",
-    "@ms-cloudpack/create-express-app": "^1.6.1",
+    "@ms-cloudpack/bundler": "^0.19.2",
+    "@ms-cloudpack/common-types": "^0.2.1",
+    "@ms-cloudpack/config": "^0.19.0",
+    "@ms-cloudpack/create-express-app": "^1.6.2",
     "@ms-cloudpack/data-bus": "^0.4.2",
     "@ms-cloudpack/file-watcher": "^0.1.2",
-    "@ms-cloudpack/import-map": "^0.2.1",
+    "@ms-cloudpack/import-map": "^0.2.2",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-hashes": "^0.5.1",
-    "@ms-cloudpack/package-utilities": "^7.1.1",
+    "@ms-cloudpack/package-hashes": "^0.5.2",
+    "@ms-cloudpack/package-utilities": "^7.1.2",
     "@ms-cloudpack/path-string-parsing": "^1.2.1",
     "@ms-cloudpack/path-utilities": "^2.6.1",
-    "@ms-cloudpack/remote-cache": "^0.6.2",
-    "@ms-cloudpack/task-reporter": "^0.11.3",
+    "@ms-cloudpack/remote-cache": "^0.6.3",
+    "@ms-cloudpack/task-reporter": "^0.12.0",
     "@ms-cloudpack/telemetry": "^0.5.1",
     "@trpc/client": "^10.45.0",
     "@trpc/server": "^10.45.0",