@ms-cloudpack/api-server 0.21.10 → 0.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.21.10",
+  "version": "0.22.0",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -28,14 +28,14 @@
     "@lage-run/scheduler": "^1.1.9",
     "@lage-run/target-graph": "^0.8.7",
     "@lage-run/hasher": "^1.0.5",
-    "@ms-cloudpack/bundler": "^0.15.1",
+    "@ms-cloudpack/bundler": "^0.15.2",
     "@ms-cloudpack/bundler-types": "^0.19.4",
-    "@ms-cloudpack/config": "^0.14.3",
+    "@ms-cloudpack/config": "^0.14.4",
     "@ms-cloudpack/create-express-app": "^1.3.12",
     "@ms-cloudpack/data-bus": "^0.4.1",
     "@ms-cloudpack/file-watcher": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.0.8",
-    "@ms-cloudpack/package-utilities": "^5.1.13",
+    "@ms-cloudpack/package-utilities": "^5.1.14",
     "@ms-cloudpack/path-string-parsing": "^1.1.1",
     "@ms-cloudpack/path-utilities": "^2.3.5",
     "@ms-cloudpack/task-reporter": "^0.10.0",
@@ -43,7 +43,6 @@
     "@ms-cloudpack/remote-cache": "^0.1.14",
     "@trpc/client": "^10.40.0",
     "@trpc/server": "^10.40.0",
-    "chokidar": "^3.5.3",
     "cors": "^2.8.5",
     "es-module-lexer": "^1.0.3",
     "fast-glob": "^3.2.12",

package/lib/utilities/getBundleDetails.d.ts

@@ -1,16 +0,0 @@
-import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
-import type { CloudpackConfig } from '@ms-cloudpack/config';
-export declare function getBundleDetails(options: {
-    packagePath: string;
-}, context: {
-    packages: PackageDefinitionsCache;
-    config?: CloudpackConfig;
-}): Promise<{
-    bundleId: string;
-    isExternal: boolean;
-    outputLocation: {
-        path: string;
-        folderName: string;
-    };
-}>;
-//# sourceMappingURL=getBundleDetails.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getBundleDetails.d.ts","sourceRoot":"","sources":["../../src/utilities/getBundleDetails.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,EAChC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAC;IAAC,MAAM,CAAC,EAAE,eAAe,CAAA;CAAE;;;;;;;GAmCzE"}

package/lib/utilities/getBundleDetails.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBundleDetails.js","sourceRoot":"","sources":["../../src/utilities/getBundleDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAgC,EAChC,OAAwE;IAExE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,4DAA4D,WAAW,GAAG,CAAC,CAAC;KAC7F;IAED,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAElD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,sDAAsD,WAAW,GAAG,CAAC,CAAC;KACvF;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,EAAE,WAAW;QACjB,GAAG,UAAU;QACb,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,WAAW;KAC7D,CAAC,CAAC;IAEH,qCAAqC;IACrC,MAAM,UAAU,GAAG,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;IACvE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,UAAU,CAAC,CAAC;IAEzD,OAAO;QACL,QAAQ;QACR,UAAU;QACV,cAAc,EAAE;YACd,IAAI,EAAE,UAAU;YAChB,UAAU;SACX;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { isExternalPackage } from '@ms-cloudpack/package-utilities';\nimport hash from 'object-hash';\nimport filenamify from 'filenamify';\nimport path from 'path';\nimport { getCachePath } from './getCachePath.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\nexport async function getBundleDetails(\n  options: { packagePath: string },\n  context: { packages: PackageDefinitionsCache; config?: CloudpackConfig },\n) {\n  const { packagePath } = options;\n  const { packages } = 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  const { name: packageName, version } = definition;\n\n  if (!packageName) {\n    throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n  }\n\n  const isExternal = isExternalPackage(packagePath);\n  const bundleId = hash({\n    name: packageName,\n    ...definition,\n    version: (isExternal ? version : packagePath) || packagePath,\n  });\n\n  // Derive where the output should be.\n  const folderName = `${filenamify(packageName)}-${version}-${bundleId}`;\n  const outputPath = path.join(getCachePath(), folderName);\n\n  return {\n    bundleId,\n    isExternal,\n    outputLocation: {\n      path: outputPath,\n      folderName,\n    },\n  };\n}\n"]}

package/lib/utilities/startWatcher.d.ts

@@ -1,9 +0,0 @@
-import type { Task } from '../types/Task.js';
-import type { ApiServer } from '../types/ApiServer.js';
-export declare function startWatcher(addTask: ApiServer['addTask']): {
-    watch: <TReturn>(task: Task<TReturn>, options?: {
-        onSuccess?: () => void;
-        onDispose?: () => void;
-    }) => void;
-};
-//# sourceMappingURL=startWatcher.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"startWatcher.d.ts","sourceRoot":"","sources":["../../src/utilities/startWatcher.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,wBAAgB,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC;oDAIN;QAAE,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;KAAE;EAiDrG"}

package/lib/utilities/startWatcher.js

@@ -1,51 +0,0 @@
-import chokidar from 'chokidar';
-export function startWatcher(addTask) {
-    const watched = new Set();
-    return {
-        watch: (task, options) => {
-            const { id, name, dir } = task;
-            // Have a single watcher per bundle request.
-            if (watched.has(id) || !dir) {
-                return;
-            }
-            watched.add(id);
-            console.debug(`Initializing file watcher for ${name}`);
-            // TODO: This is a bit of a hack. We should be able to use the watch API, but it doesn't seem to work.
-            const watcher = chokidar.watch(dir).on('change', (event) => {
-                console.debug(`Detected change "${event}", rebuilding "${name}"`);
-                (async () => {
-                    // Start tracking work.
-                    let rebuilt = false;
-                    try {
-                        await addTask(task, { rerun: true });
-                        rebuilt = true;
-                    }
-                    catch (err) {
-                        console.error(`Error rebuilding "${name}":`, err?.stack || err);
-                    }
-                    const errors = task.getErrors?.();
-                    if (rebuilt && !errors?.length) {
-                        console.debug(`Notifying rebuild: ${name}`);
-                        options?.onSuccess?.();
-                    }
-                    else if (errors) {
-                        console.debug(`${name} ${errors.length} errors`);
-                    }
-                })().catch(() => {
-                    // no-op
-                });
-            });
-            task.dispose = async () => {
-                try {
-                    await watcher.close();
-                }
-                catch {
-                    // ignore
-                }
-                task.onDispose?.();
-                watched.delete(id);
-            };
-        },
-    };
-}
-//# sourceMappingURL=startWatcher.js.map

package/lib/utilities/startWatcher.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"startWatcher.js","sourceRoot":"","sources":["../../src/utilities/startWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAIhC,MAAM,UAAU,YAAY,CAAC,OAA6B;IACxD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,OAAO;QACL,KAAK,EAAE,CAAU,IAAmB,EAAE,OAA4D,EAAE,EAAE;YACpG,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YAC/B,4CAA4C;YAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC3B,OAAO;aACR;YAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAEhB,OAAO,CAAC,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;YAEvD,sGAAsG;YACtG,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;gBACjE,OAAO,CAAC,KAAK,CAAC,oBAAoB,KAAK,kBAAkB,IAAI,GAAG,CAAC,CAAC;gBAElE,CAAC,KAAK,IAAI,EAAE;oBACV,uBAAuB;oBACvB,IAAI,OAAO,GAAG,KAAK,CAAC;oBACpB,IAAI;wBACF,MAAM,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;wBACrC,OAAO,GAAG,IAAI,CAAC;qBAChB;oBAAC,OAAO,GAAG,EAAE;wBACZ,OAAO,CAAC,KAAK,CAAC,qBAAqB,IAAI,IAAI,EAAG,GAAa,EAAE,KAAK,IAAI,GAAG,CAAC,CAAC;qBAC5E;oBACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;oBAClC,IAAI,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE;wBAC9B,OAAO,CAAC,KAAK,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;wBAC5C,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC;qBACxB;yBAAM,IAAI,MAAM,EAAE;wBACjB,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;qBAClD;gBACH,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;oBACd,QAAQ;gBACV,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE;gBACxB,IAAI;oBACF,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;iBACvB;gBAAC,MAAM;oBACN,SAAS;iBACV;gBAED,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBAEnB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrB,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import chokidar from 'chokidar';\nimport type { Task } from '../types/Task.js';\nimport type { ApiServer } from '../types/ApiServer.js';\n\nexport function startWatcher(addTask: ApiServer['addTask']) {\n  const watched = new Set<string>();\n\n  return {\n    watch: <TReturn>(task: Task<TReturn>, options?: { onSuccess?: () => void; onDispose?: () => void }) => {\n      const { id, name, dir } = task;\n      // Have a single watcher per bundle request.\n      if (watched.has(id) || !dir) {\n        return;\n      }\n\n      watched.add(id);\n\n      console.debug(`Initializing file watcher for ${name}`);\n\n      // TODO: This is a bit of a hack. We should be able to use the watch API, but it doesn't seem to work.\n      const watcher = chokidar.watch(dir).on('change', (event: string) => {\n        console.debug(`Detected change \"${event}\", rebuilding \"${name}\"`);\n\n        (async () => {\n          // Start tracking work.\n          let rebuilt = false;\n          try {\n            await addTask(task, { rerun: true });\n            rebuilt = true;\n          } catch (err) {\n            console.error(`Error rebuilding \"${name}\":`, (err as Error)?.stack || err);\n          }\n          const errors = task.getErrors?.();\n          if (rebuilt && !errors?.length) {\n            console.debug(`Notifying rebuild: ${name}`);\n            options?.onSuccess?.();\n          } else if (errors) {\n            console.debug(`${name} ${errors.length} errors`);\n          }\n        })().catch(() => {\n          // no-op\n        });\n      });\n\n      task.dispose = async () => {\n        try {\n          await watcher.close();\n        } catch {\n          // ignore\n        }\n\n        task.onDispose?.();\n\n        watched.delete(id);\n      };\n    },\n  };\n}\n"]}