@ms-cloudpack/api-server 0.6.20 → 0.7.0

package/lib/startApiServer.js

@@ -10,9 +10,6 @@ import { TaskRunner } from './utilities/TaskRunner.js';
 import { getCachePath } from './utilities/getCachePath.js';
 import fsExtra from 'fs-extra';
 import { startWatcher } from './utilities/startWatcher.js';
-import { PackageDefinitions } from '@ms-cloudpack/package-utilities';
-import { createPackageOverrideTransform } from './utilities/createPackageOverrideTransform.js';
-import { readConfigSync } from '@ms-cloudpack/config';
 import { addOverride } from './utilities/addOverride.js';
 import { validateOverride } from './utilities/validateOverride.js';
 import { parseHttpsConfig } from '@ms-cloudpack/create-express-app';
@@ -32,7 +29,7 @@ import { editCloudpackConfig } from './utilities/editCloudpackConfig.js';
  * javascript can connect and subscribe to page changes.
  */
 export async function startApiServer(params) {
-    const { session, rootSpan, reporter, appPath } = params;
+    const { session, rootSpan, reporter, packages } = params;
     const host = session.config?.devServer?.domain || 'localhost';
     const port = await getPort({ port: [9890, 9891, 9892, 9893] });
     const bus = createDataBus();
@@ -157,6 +154,7 @@ export async function startApiServer(params) {
         socket
             .on('message', (rawData) => {
             try {
+                // eslint-disable-next-line @typescript-eslint/no-base-to-string
                 const request = JSON.parse(rawData.toString());
                 switch (request.type) {
                     /**
@@ -221,7 +219,7 @@ export async function startApiServer(params) {
                         // TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.
                         const { packageName, importPath } = request.data;
                         (async () => {
-                            await addOverride({ session, packageName, importPath });
+                            await addOverride({ packageName, importPath }, { session, packages });
                             session.incrementSessionVersion();
                             notifyReload();
                         })().catch(() => {
@@ -234,7 +232,7 @@ export async function startApiServer(params) {
                         const { requestId, data } = request;
                         const { packageName, importPath } = data;
                         (async () => {
-                            const fixable = await validateOverride({ session, packageName, importPath });
+                            const fixable = await validateOverride({ packageName, importPath }, { session, packages });
                             sendMessage({ type: 'validateOverride', requestId, data: { fixable } });
                         })().catch(() => {
                             // no-op
@@ -250,10 +248,6 @@ export async function startApiServer(params) {
                         allTasks.forEach((_, id) => {
                             taskRunner.remove(id);
                         });
-                        // Parse config if it exists.
-                        const cloudpackConfig = readConfigSync(appPath);
-                        // Initialize package overrides.
-                        PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(cloudpackConfig));
                         // Update session version.
                         session.incrementSessionVersion();
                         notifyReload();
@@ -278,6 +272,7 @@ export async function startApiServer(params) {
             catch (err) {
                 console.error('ApiServer: error handling message');
                 console.error('Error:', err);
+                // eslint-disable-next-line @typescript-eslint/no-base-to-string
                 console.error('Message:', rawData.toString());
             }
         })

package/lib/startApiServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../src/startApiServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,SAAS,EAAE,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAO3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,8BAA8B,EAAE,MAAM,+CAA+C,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAIzE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAKpC;IACC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACxD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,IAAI,WAAW,CAAC;IAC9D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,MAAM,YAAY,GAAiB;QACjC,MAAM,EAAE,MAAM;QAEd,cAAc,EAAE,CAAC;QACjB,UAAU,EAAE,CAAC;QAEb,WAAW,EAAE,CAAC;QACd,aAAa,EAAE,CAAC;KACjB,CAAC;IAEF,MAAM,QAAQ,GAAiC,IAAI,GAAG,EAAE,CAAC;IACzD,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;IAEpC,SAAS,WAAW,CAAC,SAA+B;QAClD,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEjC,IAAI,CAAC,cAAc,EAAE;YACnB,YAAY,CAAC,UAAU,EAAE,CAAC;SAC3B;QAED,IAAI,cAAc,EAAE,MAAM,KAAK,UAAU,EAAE;YACzC,YAAY,CAAC,WAAW,IAAI,cAAc,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC;YAC/D,YAAY,CAAC,aAAa,IAAI,cAAc,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC;SACpE;QAED,YAAY,CAAC,cAAc,EAAE,CAAC;QAC9B,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC;QAEhC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE;YACzB,GAAG,SAAS;YACZ,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QAEH,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;QAClD,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IACxF,CAAC;IAED,SAAS,SAAS,CAAC,OAA2B;QAC5C,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEjC,IAAI,cAAc,EAAE;YAClB,YAAY,CAAC,cAAc,EAAE,CAAC;YAC9B,YAAY,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC;YACxD,YAAY,CAAC,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC;YAE5D,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE;gBACvB,GAAG,cAAc;gBACjB,GAAG,OAAO;gBACV,MAAM,EAAE,UAAU;gBAClB,oBAAoB,EAAE,GAAG,GAAG,cAAc,CAAC,SAAS;gBACpD,WAAW,EAAE,GAAG;aACjB,CAAC,CAAC;YAEH,IAAI,YAAY,CAAC,cAAc,KAAK,CAAC,EAAE;gBACrC,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC;aAC9B;YAED,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;YAClD,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;SACvF;IACH,CAAC;IAED,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;IAElD,MAAM,OAAO,GAAyB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACtD,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE;gBACnB,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;YACnD,CAAC,CAAC;SACH;QAED,OAAO,UAAU,CAAC,GAAG,CACnB;YACE,GAAG,IAAI;YACP,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,WAAW,CAAC;oBACV,GAAG,IAAI,CAAC,mBAAmB,EAAE,EAAE;oBAC/B,EAAE,EAAE,IAAI,CAAC,EAAE;iBACZ,CAAC,CAAC;gBAEH,IAAI,UAAU,CAAC;gBAEf,IAAI;oBACF,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;iBACnC;gBAAC,OAAO,GAAG,EAAE;oBACZ,QAAQ;iBACT;gBAED,SAAS,CAAC;oBACR,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,UAAU,CAAC;oBACvC,EAAE,EAAE,IAAI,CAAC,EAAE;iBACU,CAAC,CAAC;gBAEzB,OAAO,UAAU,CAAC;YACpB,CAAC;SACF,EACD,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEtC,gCAAgC;IAChC,IAAI,MAAkC,CAAC;IACvC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC;IACrD,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAE5C,IAAI,WAAW,EAAE;QACf,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAEhE,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,kFAAkF,CAAC,CAAC;YAElG,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SAC1C;QAED,MAAM,GAAG,KAAK;aACX,YAAY,CACX;YACE,GAAG;YACH,IAAI;YACJ,UAAU;SACX,EACD,GAAG,EAAE;YACH,WAAW;QACb,CAAC,CACF;aACA,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;KACvB;SAAM;QACL,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;KACjD;IAED,+EAA+E;IAC/E,oDAAoD;IACpD,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE;QACxD,qDAAqD;IACvD,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAiB,EAAE,EAAE;QACxC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC;QAElD,8DAA8D;QAC9D,SAAS,WAAW,CAAC,OAAY;YAC/B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,CAAC,IAAI,CACT,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CACH,CAAC;QAEF,MAAM;aACH,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;YACzB,IAAI;gBACF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAI5C,CAAC;gBAEF,QAAQ,OAAO,CAAC,IAAI,EAAE;oBACpB;;uBAEG;oBACH,KAAK,WAAW,CAAC,CAAC;wBAChB,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;wBAEpD,WAAW,CAAC,GAAG,CACb,EAAY,EACZ,GAAG,CAAC,SAAS,CACX,gBAA4B;wBAC5B,uGAAuG;wBACvG,CAAC,IAAS,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CACjF,CACF,CAAC;wBAEF,MAAM;qBACP;oBAED;;uBAEG;oBACH,KAAK,aAAa,CAAC,CAAC;wBAClB,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,EAAwB,CAAC;wBACjD,IAAI,EAAE,EAAE;4BACN,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;4BAEpC,IAAI,OAAO,EAAE;gCACX,OAAO,EAAE,CAAC;gCACV,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;6BACxB;yBACF;wBAED,MAAM;qBACP;oBAED;;uBAEG;oBACH,KAAK,YAAY,CAAC,CAAC;wBACjB,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;wBACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAkB,EAAE,YAAsB,CAAC,CAAC;wBAEvE,OAAO,CAAC,GAAG,CAAC,6BAA6B,QAAQ,EAAE,CAAC,CAAC;wBACrD,QAAQ,CAAC,eAAe,QAAQ,IAAI,IAAI,IAAI,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;wBAC9E,MAAM;qBACP;oBAED;;uBAEG;oBACH,KAAK,MAAM,CAAC,CAAC;wBACX,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;wBACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAkB,EAAE,YAAsB,CAAC,CAAC;wBAEvE,OAAO,CAAC,GAAG,CAAC,iBAAiB,QAAQ,EAAE,CAAC,CAAC;wBACzC,MAAM,WAAW,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;wBAEhE,QAAQ,CAAC,GAAG,WAAW,IAAI,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;wBAC/D,MAAM;qBACP;oBAED;;;uBAGG;oBACH,KAAK,YAAY,CAAC,CAAC;wBACjB,mBAAmB,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;4BAC/B,WAAW;wBACb,CAAC,CAAC,CAAC;wBACH,MAAM;qBACP;oBAED;;uBAEG;oBACH,KAAK,aAAa,CAAC,CAAC;wBAClB,qGAAqG;wBACrG,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAA8B,CAAC;wBAC3E,CAAC,KAAK,IAAI,EAAE;4BACV,MAAM,WAAW,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;4BACxD,OAAO,CAAC,uBAAuB,EAAE,CAAC;4BAClC,YAAY,EAAE,CAAC;wBACjB,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;4BACd,QAAQ;wBACV,CAAC,CAAC,CAAC;wBACH,MAAM;qBACP;oBAED,KAAK,kBAAkB,CAAC,CAAC;wBACvB,6EAA6E;wBAC7E,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,OAA8D,CAAC;wBAC3F,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;wBACzC,CAAC,KAAK,IAAI,EAAE;4BACV,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;4BAC7E,WAAW,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;wBAC1E,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;4BACd,QAAQ;wBACV,CAAC,CAAC,CAAC;wBACH,MAAM;qBACP;oBAED,KAAK,iBAAiB,CAAC,CAAC;wBACtB,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;wBAE/C,4BAA4B;wBAC5B,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC;wBAErC,6CAA6C;wBAC7C,gDAAgD;wBAChD,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;4BACzB,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBACxB,CAAC,CAAC,CAAC;wBAEH,6BAA6B;wBAC7B,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;wBAEhD,gCAAgC;wBAChC,kBAAkB,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,eAAe,CAAC,CAAC,CAAC;wBAEpG,0BAA0B;wBAC1B,OAAO,CAAC,uBAAuB,EAAE,CAAC;wBAElC,YAAY,EAAE,CAAC;wBACf,MAAM;qBACP;oBAED,KAAK,aAAa,CAAC,CAAC;wBAClB,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAA8B,CAAC;wBACjE,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;wBAChD,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBACtB,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;wBAC1C,YAAY,EAAE,CAAC;wBACf,MAAM;qBACP;oBAED,KAAK,cAAc,CAAC,CAAC;wBACnB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,IAAyC,CAAC;wBAC5E,OAAO,CAAC,KAAK,CAAC,+BAA+B,MAAM,YAAY,KAAK,EAAE,CAAC,CAAC;wBACxE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;wBAClC,MAAM;qBACP;iBACF;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACnD,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAC7B,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAChB,KAAK,MAAM,CAAC,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE;gBACpC,CAAC,EAAE,CAAC;aACL;QACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAiB,EAAE,EAAE;YACjD,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE;gBACxC,MAAM,CAAC,IAAI,CACT,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE;iBAChC,CAAC,CACH,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,SAAoC,CAAC;IAEzC,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE;QACvC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QAE5E,SAAS,GAAG,IAAI,aAAa,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;KACpE;IAED,OAAO;QACL,GAAG,EAAE,GAAG,QAAQ,MAAM,IAAI,IAAI,IAAI,EAAE;QACpC,IAAI;QAEJ,YAAY;QAEZ,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YACzB,OAAO,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,CAAC;QAED,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YACtD,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;aAC7D;YAED,WAAW,CAAC;gBACV,EAAE,EAAE,aAAa,CAAC,EAAE;gBACpB,SAAS,EAAE,aAAa,CAAC,WAAW;gBACpC,UAAU,EAAE,aAAa,CAAC,UAAU;gBACpC,IAAI,EAAE,aAAa,CAAC,WAAW;aAChC,CAAC,CAAC;YAEH,MAAM,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAE9D,SAAS,CAAC;gBACR,EAAE,EAAE,aAAa,CAAC,EAAE;aACrB,CAAC,CAAC;QACL,CAAC;QAED,KAAK,EAAE,GAAG,EAAE,CACV,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAiB,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;YACxE,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC;KACL,CAAC;AACJ,CAAC","sourcesContent":["import os from 'os';\nimport getPort from 'get-port';\nimport path from 'path';\nimport http from 'http';\nimport https from 'https';\nimport WebSocket, { WebSocketServer } from 'ws';\nimport { createDataBus } from '@ms-cloudpack/data-bus';\nimport { execSync } from 'child_process';\nimport { TaskRunner } from './utilities/TaskRunner.js';\nimport { getCachePath } from './utilities/getCachePath.js';\nimport fsExtra from 'fs-extra';\nimport { startWatcher } from './utilities/startWatcher.js';\nimport type { TaskDescription } from './types/TaskDescription.js';\nimport type { TaskEndDescription } from './types/TaskEndDescription.js';\nimport type { TaskStartDescription } from './types/TaskStartDescription.js';\nimport type { ApiServer } from './types/ApiServer.js';\nimport type { SessionStats } from './types/SessionStats.js';\nimport type { Session } from './types/Session.js';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport { createPackageOverrideTransform } from './utilities/createPackageOverrideTransform.js';\nimport { readConfigSync } from '@ms-cloudpack/config';\nimport { addOverride } from './utilities/addOverride.js';\nimport { validateOverride } from './utilities/validateOverride.js';\nimport { parseHttpsConfig } from '@ms-cloudpack/create-express-app';\nimport type { Span } from '@ms-cloudpack/telemetry';\nimport { editCloudpackConfig } from './utilities/editCloudpackConfig.js';\nimport type { TaskScheduler } from './task-scheduler/TaskScheduler.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\n\n/**\n * The api server handles the data pub/sub (for things like reporting build status)\n * and hosting the dashboard verb backend (for executing actions like loading vscode,\n * changing dependencies, connecting new projects to the running session, etc.)\n *\n * Each time `cloudpack start` is run, an api server will start up for that session. The\n * hosted web page will have a \"cloudpack-api-server\" header which points\n * to the websocket server.\n *\n * The bundle server will call the api server to publish build status updates.\n *\n * The app server will burn the api server url on the host html, so that client-side\n * javascript can connect and subscribe to page changes.\n */\nexport async function startApiServer(params: {\n  session: Session;\n  rootSpan: Span | undefined;\n  reporter: TaskReporter;\n  appPath: string;\n}): Promise<ApiServer> {\n  const { session, rootSpan, reporter, appPath } = params;\n  const host = session.config?.devServer?.domain || 'localhost';\n  const port = await getPort({ port: [9890, 9891, 9892, 9893] });\n  const bus = createDataBus();\n  const sessionStats: SessionStats = {\n    status: 'idle',\n\n    remainingTasks: 0,\n    totalTasks: 0,\n\n    totalErrors: 0,\n    totalWarnings: 0,\n  };\n\n  const allTasks: Map<string, TaskDescription> = new Map();\n  const taskRunner = new TaskRunner();\n\n  function reportStart(taskStart: TaskStartDescription): void {\n    const previousResult = allTasks.get(taskStart.id);\n    const now = new Date().getTime();\n\n    if (!previousResult) {\n      sessionStats.totalTasks++;\n    }\n\n    if (previousResult?.status === 'complete') {\n      sessionStats.totalErrors -= previousResult.errors?.length || 0;\n      sessionStats.totalWarnings -= previousResult.warnings?.length || 0;\n    }\n\n    sessionStats.remainingTasks++;\n    sessionStats.status = 'pending';\n\n    allTasks.set(taskStart.id, {\n      ...taskStart,\n      status: 'pending',\n      startTime: now,\n    });\n\n    bus.publish([session.id, 'status'], sessionStats);\n    bus.publish([session.id, 'status-details'], { tasks: Array.from(allTasks.values()) });\n  }\n\n  function reportEnd(taskEnd: TaskEndDescription): void {\n    const previousResult = allTasks.get(taskEnd.id);\n    const now = new Date().getTime();\n\n    if (previousResult) {\n      sessionStats.remainingTasks--;\n      sessionStats.totalErrors += taskEnd.errors?.length || 0;\n      sessionStats.totalWarnings += taskEnd.warnings?.length || 0;\n\n      allTasks.set(taskEnd.id, {\n        ...previousResult,\n        ...taskEnd,\n        status: 'complete',\n        durationMilliseconds: now - previousResult.startTime,\n        lastUpdated: now,\n      });\n\n      if (sessionStats.remainingTasks === 0) {\n        sessionStats.status = 'idle';\n      }\n\n      bus.publish([session.id, 'status'], sessionStats);\n      bus.publish([session.id, 'status-details'], { tasks: Array.from(allTasks.values()) });\n    }\n  }\n\n  bus.publish([session.id, 'status'], sessionStats);\n\n  const addTask: ApiServer['addTask'] = (task, options) => {\n    if (task.watch) {\n      options = options || {};\n      options.watch = () => {\n        watcher.watch(task, { onSuccess: notifyReload });\n      };\n    }\n\n    return taskRunner.add(\n      {\n        ...task,\n        execute: async () => {\n          reportStart({\n            ...task.getStartDescription?.(),\n            id: task.id,\n          });\n\n          let taskResult;\n\n          try {\n            taskResult = await task.execute();\n          } catch (err) {\n            // no-op\n          }\n\n          reportEnd({\n            ...task.getEndDescription?.(taskResult),\n            id: task.id,\n          } as TaskEndDescription);\n\n          return taskResult;\n        },\n      },\n      options,\n    );\n  };\n\n  const watcher = startWatcher(addTask);\n\n  // Create a node http(s) server.\n  let server: http.Server | https.Server;\n  const httpsConfig = session.config?.devServer?.https;\n  const protocol = httpsConfig ? 'wss' : 'ws';\n\n  if (httpsConfig) {\n    const { key, cert, passphrase } = parseHttpsConfig(httpsConfig);\n\n    if (!key || !cert) {\n      console.error('Invalid https config in cloudpack.config.json. Make sure key and cert are valid.');\n\n      throw new Error('Invalid https config.');\n    }\n\n    server = https\n      .createServer(\n        {\n          key,\n          cert,\n          passphrase,\n        },\n        () => {\n          /* no-op */\n        },\n      )\n      .listen(port, host);\n  } else {\n    server = http.createServer().listen(port, host);\n  }\n\n  // Create a websocket server which listens for subscriptions and verb requests,\n  // and broadcasts the data to all connected clients.\n  const socketServer = new WebSocketServer({ server }, () => {\n    // console.log(`ApiServer: Started on port ${port}`);\n  }).on('connection', (socket: WebSocket) => {\n    const disposables = new Map<number, () => void>();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    function sendMessage(message: any) {\n      socket.send(JSON.stringify(message, null, 2));\n    }\n\n    socket.send(\n      JSON.stringify({\n        type: 'sequence',\n        sequence: session.sequence,\n      }),\n    );\n\n    socket\n      .on('message', (rawData) => {\n        try {\n          const request = JSON.parse(rawData.toString()) as {\n            type: string;\n            requestId?: string;\n            data: Record<string, unknown>;\n          };\n\n          switch (request.type) {\n            /**\n             * Subscribe to a data subscription.\n             */\n            case 'subscribe': {\n              const { path: subscriptionPath, id } = request.data;\n\n              disposables.set(\n                id as number,\n                bus.subscribe(\n                  subscriptionPath as string[],\n                  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment\n                  (data: any) => sendMessage({ type: 'notify', id, path: subscriptionPath, data }),\n                ),\n              );\n\n              break;\n            }\n\n            /**\n             * Unsubscribe from a data subscription.\n             */\n            case 'unsubscribe': {\n              const id = request.data.id as number | undefined;\n              if (id) {\n                const dispose = disposables.get(id);\n\n                if (dispose) {\n                  dispose();\n                  disposables.delete(id);\n                }\n              }\n\n              break;\n            }\n\n            /**\n             * Open a file in VSCode.\n             */\n            case 'openSource': {\n              const { rootPath, relativePath = '', line, column } = request.data;\n              const fullPath = path.join(rootPath as string, relativePath as string);\n\n              console.log(`Opening VSCode with path: ${fullPath}`);\n              execSync(`code --goto ${fullPath}:${line}:${column}`, { cwd: process.cwd() });\n              break;\n            }\n\n            /**\n             * Open a file or folder in the OS's default file manager.\n             */\n            case 'open': {\n              const { rootPath, relativePath = '' } = request.data;\n              const fullPath = path.join(rootPath as string, relativePath as string);\n\n              console.log(`Opening path: ${fullPath}`);\n              const openCommand = os.platform() == 'win32' ? 'start' : 'open';\n\n              execSync(`${openCommand} ${fullPath}`, { cwd: process.cwd() });\n              break;\n            }\n\n            /**\n             * Opens the cloudpack config in VSCode for the user to manually edit. If the file doesn't exist,\n             * it will be created.\n             */\n            case 'editConfig': {\n              editCloudpackConfig().catch(() => {\n                /* no-op */\n              });\n              break;\n            }\n\n            /**\n             * Adds an override to the cloudpack config.\n             */\n            case 'addOverride': {\n              // TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.\n              const { packageName, importPath } = request.data as Record<string, string>;\n              (async () => {\n                await addOverride({ session, packageName, importPath });\n                session.incrementSessionVersion();\n                notifyReload();\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'validateOverride': {\n              // TODO: Get filename from request data when chromium Issue 1371551 is fixed.\n              const { requestId, data } = request as { requestId: string; data: Record<string, string> };\n              const { packageName, importPath } = data;\n              (async () => {\n                const fixable = await validateOverride({ session, packageName, importPath });\n                sendMessage({ type: 'validateOverride', requestId, data: { fixable } });\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'restartAllTasks': {\n              console.log('ApiServer: Restarting all tasks');\n\n              // Clear entire local cache.\n              fsExtra.emptyDirSync(getCachePath());\n\n              // All tasks can be removed as notifyReload()\n              // will cause the client to add the tasks again.\n              allTasks.forEach((_, id) => {\n                taskRunner.remove(id);\n              });\n\n              // Parse config if it exists.\n              const cloudpackConfig = readConfigSync(appPath);\n\n              // Initialize package overrides.\n              PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(cloudpackConfig));\n\n              // Update session version.\n              session.incrementSessionVersion();\n\n              notifyReload();\n              break;\n            }\n\n            case 'restartTask': {\n              const { id, inputPath } = request.data as Record<string, string>;\n              console.log(`ApiServer: Restarting task ${id}`);\n              taskRunner.remove(id);\n              session.incrementTargetVersion(inputPath);\n              notifyReload();\n              break;\n            }\n\n            case 'reportMetric': {\n              const { metric, value } = request.data as { metric: string; value: number };\n              console.debug(`ApiServer: Received metric: ${metric}, value: ${value}`);\n              rootSpan?.addEvent(metric, value);\n              break;\n            }\n          }\n        } catch (err) {\n          console.error('ApiServer: error handling message');\n          console.error('Error:', err);\n          console.error('Message:', rawData.toString());\n        }\n      })\n      .on('close', () => {\n        for (const d of disposables.values()) {\n          d();\n        }\n      });\n  });\n\n  const notifyReload = () => {\n    session.sequence++;\n    socketServer.clients.forEach((socket: WebSocket) => {\n      if (socket.readyState === WebSocket.OPEN) {\n        socket.send(\n          JSON.stringify({\n            type: 'reload',\n            data: { sessionId: session.id },\n          }),\n        );\n      }\n    });\n  };\n\n  let scheduler: TaskScheduler | undefined;\n\n  if (session.config.features?.enableLage) {\n    const { TaskScheduler } = await import('./task-scheduler/TaskScheduler.js');\n\n    scheduler = new TaskScheduler({ reporter, root: session.appPath });\n  }\n\n  return {\n    url: `${protocol}://${host}:${port}`,\n    port,\n\n    notifyReload,\n\n    addTask: (task, options) => {\n      return addTask(task, options);\n    },\n\n    scheduleTask: async (bundleRequest, scripts, options) => {\n      if (!scheduler) {\n        throw new Error('Cannot schedule task when not using lage');\n      }\n\n      reportStart({\n        id: bundleRequest.id,\n        inputPath: bundleRequest.packagePath,\n        outputPath: bundleRequest.outputPath,\n        name: bundleRequest.packageName,\n      });\n\n      await scheduler.scheduleTask(bundleRequest, scripts, options);\n\n      reportEnd({\n        id: bundleRequest.id,\n      });\n    },\n\n    close: () =>\n      new Promise<void>((resolve, reject) => {\n        socketServer.clients.forEach((socket: WebSocket) => socket.terminate());\n        socketServer.close((err) => (err ? reject(err) : resolve()));\n        server.close();\n      }),\n  };\n}\n"]}
+{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../src/startApiServer.ts"],"names":[],"mappings":"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","sourcesContent":["import os from 'os';\nimport getPort from 'get-port';\nimport path from 'path';\nimport http from 'http';\nimport https from 'https';\nimport WebSocket, { WebSocketServer } from 'ws';\nimport { createDataBus } from '@ms-cloudpack/data-bus';\nimport { execSync } from 'child_process';\nimport { TaskRunner } from './utilities/TaskRunner.js';\nimport { getCachePath } from './utilities/getCachePath.js';\nimport fsExtra from 'fs-extra';\nimport { startWatcher } from './utilities/startWatcher.js';\nimport type { TaskDescription } from './types/TaskDescription.js';\nimport type { TaskEndDescription } from './types/TaskEndDescription.js';\nimport type { TaskStartDescription } from './types/TaskStartDescription.js';\nimport type { ApiServer } from './types/ApiServer.js';\nimport type { SessionStats } from './types/SessionStats.js';\nimport type { Session } from './types/Session.js';\nimport { addOverride } from './utilities/addOverride.js';\nimport { validateOverride } from './utilities/validateOverride.js';\nimport { parseHttpsConfig } from '@ms-cloudpack/create-express-app';\nimport type { Span } from '@ms-cloudpack/telemetry';\nimport { editCloudpackConfig } from './utilities/editCloudpackConfig.js';\nimport type { TaskScheduler } from './task-scheduler/TaskScheduler.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\n/**\n * The api server handles the data pub/sub (for things like reporting build status)\n * and hosting the dashboard verb backend (for executing actions like loading vscode,\n * changing dependencies, connecting new projects to the running session, etc.)\n *\n * Each time `cloudpack start` is run, an api server will start up for that session. The\n * hosted web page will have a \"cloudpack-api-server\" header which points\n * to the websocket server.\n *\n * The bundle server will call the api server to publish build status updates.\n *\n * The app server will burn the api server url on the host html, so that client-side\n * javascript can connect and subscribe to page changes.\n */\nexport async function startApiServer(params: {\n  session: Session;\n  rootSpan: Span | undefined;\n  reporter: TaskReporter;\n  packages: PackageDefinitionsCache;\n}): Promise<ApiServer> {\n  const { session, rootSpan, reporter, packages } = params;\n  const host = session.config?.devServer?.domain || 'localhost';\n  const port = await getPort({ port: [9890, 9891, 9892, 9893] });\n  const bus = createDataBus();\n  const sessionStats: SessionStats = {\n    status: 'idle',\n\n    remainingTasks: 0,\n    totalTasks: 0,\n\n    totalErrors: 0,\n    totalWarnings: 0,\n  };\n\n  const allTasks = new Map<string, TaskDescription>();\n  const taskRunner = new TaskRunner();\n\n  function reportStart(taskStart: TaskStartDescription): void {\n    const previousResult = allTasks.get(taskStart.id);\n    const now = new Date().getTime();\n\n    if (!previousResult) {\n      sessionStats.totalTasks++;\n    }\n\n    if (previousResult?.status === 'complete') {\n      sessionStats.totalErrors -= previousResult.errors?.length || 0;\n      sessionStats.totalWarnings -= previousResult.warnings?.length || 0;\n    }\n\n    sessionStats.remainingTasks++;\n    sessionStats.status = 'pending';\n\n    allTasks.set(taskStart.id, {\n      ...taskStart,\n      status: 'pending',\n      startTime: now,\n    });\n\n    bus.publish([session.id, 'status'], sessionStats);\n    bus.publish([session.id, 'status-details'], { tasks: Array.from(allTasks.values()) });\n  }\n\n  function reportEnd(taskEnd: TaskEndDescription): void {\n    const previousResult = allTasks.get(taskEnd.id);\n    const now = new Date().getTime();\n\n    if (previousResult) {\n      sessionStats.remainingTasks--;\n      sessionStats.totalErrors += taskEnd.errors?.length || 0;\n      sessionStats.totalWarnings += taskEnd.warnings?.length || 0;\n\n      allTasks.set(taskEnd.id, {\n        ...previousResult,\n        ...taskEnd,\n        status: 'complete',\n        durationMilliseconds: now - previousResult.startTime,\n        lastUpdated: now,\n      });\n\n      if (sessionStats.remainingTasks === 0) {\n        sessionStats.status = 'idle';\n      }\n\n      bus.publish([session.id, 'status'], sessionStats);\n      bus.publish([session.id, 'status-details'], { tasks: Array.from(allTasks.values()) });\n    }\n  }\n\n  bus.publish([session.id, 'status'], sessionStats);\n\n  const addTask: ApiServer['addTask'] = (task, options) => {\n    if (task.watch) {\n      options = options || {};\n      options.watch = () => {\n        watcher.watch(task, { onSuccess: notifyReload });\n      };\n    }\n\n    return taskRunner.add(\n      {\n        ...task,\n        execute: async () => {\n          reportStart({\n            ...task.getStartDescription?.(),\n            id: task.id,\n          });\n\n          let taskResult;\n\n          try {\n            taskResult = await task.execute();\n          } catch (err) {\n            // no-op\n          }\n\n          reportEnd({\n            ...task.getEndDescription?.(taskResult),\n            id: task.id,\n          } as TaskEndDescription);\n\n          return taskResult;\n        },\n      },\n      options,\n    );\n  };\n\n  const watcher = startWatcher(addTask);\n\n  // Create a node http(s) server.\n  let server: http.Server | https.Server;\n  const httpsConfig = session.config?.devServer?.https;\n  const protocol = httpsConfig ? 'wss' : 'ws';\n\n  if (httpsConfig) {\n    const { key, cert, passphrase } = parseHttpsConfig(httpsConfig);\n\n    if (!key || !cert) {\n      console.error('Invalid https config in cloudpack.config.json. Make sure key and cert are valid.');\n\n      throw new Error('Invalid https config.');\n    }\n\n    server = https\n      .createServer(\n        {\n          key,\n          cert,\n          passphrase,\n        },\n        () => {\n          /* no-op */\n        },\n      )\n      .listen(port, host);\n  } else {\n    server = http.createServer().listen(port, host);\n  }\n\n  // Create a websocket server which listens for subscriptions and verb requests,\n  // and broadcasts the data to all connected clients.\n  const socketServer = new WebSocketServer({ server }, () => {\n    // console.log(`ApiServer: Started on port ${port}`);\n  }).on('connection', (socket: WebSocket) => {\n    const disposables = new Map<number, () => void>();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    function sendMessage(message: any) {\n      socket.send(JSON.stringify(message, null, 2));\n    }\n\n    socket.send(\n      JSON.stringify({\n        type: 'sequence',\n        sequence: session.sequence,\n      }),\n    );\n\n    socket\n      .on('message', (rawData) => {\n        try {\n          // eslint-disable-next-line @typescript-eslint/no-base-to-string\n          const request = JSON.parse(rawData.toString()) as {\n            type: string;\n            requestId?: string;\n            data: Record<string, unknown>;\n          };\n\n          switch (request.type) {\n            /**\n             * Subscribe to a data subscription.\n             */\n            case 'subscribe': {\n              const { path: subscriptionPath, id } = request.data;\n\n              disposables.set(\n                id as number,\n                bus.subscribe(\n                  subscriptionPath as string[],\n                  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment\n                  (data: any) => sendMessage({ type: 'notify', id, path: subscriptionPath, data }),\n                ),\n              );\n\n              break;\n            }\n\n            /**\n             * Unsubscribe from a data subscription.\n             */\n            case 'unsubscribe': {\n              const id = request.data.id as number | undefined;\n              if (id) {\n                const dispose = disposables.get(id);\n\n                if (dispose) {\n                  dispose();\n                  disposables.delete(id);\n                }\n              }\n\n              break;\n            }\n\n            /**\n             * Open a file in VSCode.\n             */\n            case 'openSource': {\n              const { rootPath, relativePath = '', line, column } = request.data;\n              const fullPath = path.join(rootPath as string, relativePath as string);\n\n              console.log(`Opening VSCode with path: ${fullPath}`);\n              execSync(`code --goto ${fullPath}:${line}:${column}`, { cwd: process.cwd() });\n              break;\n            }\n\n            /**\n             * Open a file or folder in the OS's default file manager.\n             */\n            case 'open': {\n              const { rootPath, relativePath = '' } = request.data;\n              const fullPath = path.join(rootPath as string, relativePath as string);\n\n              console.log(`Opening path: ${fullPath}`);\n              const openCommand = os.platform() == 'win32' ? 'start' : 'open';\n\n              execSync(`${openCommand} ${fullPath}`, { cwd: process.cwd() });\n              break;\n            }\n\n            /**\n             * Opens the cloudpack config in VSCode for the user to manually edit. If the file doesn't exist,\n             * it will be created.\n             */\n            case 'editConfig': {\n              editCloudpackConfig().catch(() => {\n                /* no-op */\n              });\n              break;\n            }\n\n            /**\n             * Adds an override to the cloudpack config.\n             */\n            case 'addOverride': {\n              // TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.\n              const { packageName, importPath } = request.data as Record<string, string>;\n              (async () => {\n                await addOverride({ packageName, importPath }, { session, packages });\n                session.incrementSessionVersion();\n                notifyReload();\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'validateOverride': {\n              // TODO: Get filename from request data when chromium Issue 1371551 is fixed.\n              const { requestId, data } = request as { requestId: string; data: Record<string, string> };\n              const { packageName, importPath } = data;\n              (async () => {\n                const fixable = await validateOverride({ packageName, importPath }, { session, packages });\n                sendMessage({ type: 'validateOverride', requestId, data: { fixable } });\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'restartAllTasks': {\n              console.log('ApiServer: Restarting all tasks');\n\n              // Clear entire local cache.\n              fsExtra.emptyDirSync(getCachePath());\n\n              // All tasks can be removed as notifyReload()\n              // will cause the client to add the tasks again.\n              allTasks.forEach((_, id) => {\n                taskRunner.remove(id);\n              });\n\n              // Update session version.\n              session.incrementSessionVersion();\n\n              notifyReload();\n              break;\n            }\n\n            case 'restartTask': {\n              const { id, inputPath } = request.data as Record<string, string>;\n              console.log(`ApiServer: Restarting task ${id}`);\n              taskRunner.remove(id);\n              session.incrementTargetVersion(inputPath);\n              notifyReload();\n              break;\n            }\n\n            case 'reportMetric': {\n              const { metric, value } = request.data as { metric: string; value: number };\n              console.debug(`ApiServer: Received metric: ${metric}, value: ${value}`);\n              rootSpan?.addEvent(metric, value);\n              break;\n            }\n          }\n        } catch (err) {\n          console.error('ApiServer: error handling message');\n          console.error('Error:', err);\n          // eslint-disable-next-line @typescript-eslint/no-base-to-string\n          console.error('Message:', rawData.toString());\n        }\n      })\n      .on('close', () => {\n        for (const d of disposables.values()) {\n          d();\n        }\n      });\n  });\n\n  const notifyReload = () => {\n    session.sequence++;\n    socketServer.clients.forEach((socket: WebSocket) => {\n      if (socket.readyState === WebSocket.OPEN) {\n        socket.send(\n          JSON.stringify({\n            type: 'reload',\n            data: { sessionId: session.id },\n          }),\n        );\n      }\n    });\n  };\n\n  let scheduler: TaskScheduler | undefined;\n\n  if (session.config.features?.enableLage) {\n    const { TaskScheduler } = await import('./task-scheduler/TaskScheduler.js');\n\n    scheduler = new TaskScheduler({ reporter, root: session.appPath });\n  }\n\n  return {\n    url: `${protocol}://${host}:${port}`,\n    port,\n\n    notifyReload,\n\n    addTask: (task, options) => {\n      return addTask(task, options);\n    },\n\n    scheduleTask: async (bundleRequest, scripts, options) => {\n      if (!scheduler) {\n        throw new Error('Cannot schedule task when not using lage');\n      }\n\n      reportStart({\n        id: bundleRequest.id,\n        inputPath: bundleRequest.packagePath,\n        outputPath: bundleRequest.outputPath,\n        name: bundleRequest.packageName,\n      });\n\n      await scheduler.scheduleTask(bundleRequest, scripts, options);\n\n      reportEnd({\n        id: bundleRequest.id,\n      });\n    },\n\n    close: () =>\n      new Promise<void>((resolve, reject) => {\n        socketServer.clients.forEach((socket: WebSocket) => socket.terminate());\n        socketServer.close((err) => (err ? reject(err) : resolve()));\n        server.close();\n      }),\n  };\n}\n"]}

package/lib/trpc.d.ts

@@ -10,6 +10,7 @@ export declare const router: <TProcRouterRecord extends import("@trpc/server").P
         taskRunner: import("./utilities/TaskRunner.js").TaskRunner;
         rootSpan: import("@opentelemetry/api").Span | undefined;
         reporter: import("@ms-cloudpack/task-reporter").TaskReporter;
+        packages: import("@ms-cloudpack/bundler-types").PackageDefinitionsCache;
     };
     meta: object;
     errorShape: import("@trpc/server").DefaultErrorShape;
@@ -24,6 +25,7 @@ export declare const publicProcedure: import("@trpc/server").ProcedureBuilder<{
             taskRunner: import("./utilities/TaskRunner.js").TaskRunner;
             rootSpan: import("@opentelemetry/api").Span | undefined;
             reporter: import("@ms-cloudpack/task-reporter").TaskReporter;
+            packages: import("@ms-cloudpack/bundler-types").PackageDefinitionsCache;
         };
         meta: object;
         errorShape: import("@trpc/server").DefaultErrorShape;
@@ -36,6 +38,7 @@ export declare const publicProcedure: import("@trpc/server").ProcedureBuilder<{
         taskRunner: import("./utilities/TaskRunner.js").TaskRunner;
         rootSpan: import("@opentelemetry/api").Span | undefined;
         reporter: import("@ms-cloudpack/task-reporter").TaskReporter;
+        packages: import("@ms-cloudpack/bundler-types").PackageDefinitionsCache;
     };
     _input_in: typeof import("@trpc/server").unsetMarker;
     _input_out: typeof import("@trpc/server").unsetMarker;

package/lib/trpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trpc.d.ts","sourceRoot":"","sources":["../src/trpc.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;sBAAW,CAAC;AAC/B,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAc,CAAC;AAE3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC"}
+{"version":3,"file":"trpc.d.ts","sourceRoot":"","sources":["../src/trpc.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;sBAAW,CAAC;AAC/B,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAc,CAAC;AAE3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC"}

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.36.0"
+      "packageVersion": "7.36.1"
     }
   ]
 }

package/lib/utilities/TaskRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAI7B,6DAA6D;AAC7D,MAAM,GAAG,GAAG,CAAC,GAAG,QAAmB,EAAE,EAAE;IACrC,2CAA2C;AAC7C,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,OAAO,UAAU;IAUrB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAU,IAAmB,EAAE,OAAqB;QACrD,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACnC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAEvC,KAAK,EAAE,EAAE,CAAC;QAEV,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;SAC/B;QAED,2DAA2D;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAwB,CAAC;QACnE,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE;YAClC,GAAG,CAAC,sCAAsC,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;YACzD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,yDAAyD;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAiC,CAAC;QAC3E,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC7B;YACD,GAAG,CAAC,oCAAoC,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;YACvD,OAAO,OAAO,CAAC;SAChB;QAED,MAAM,aAAa,GAAG,CAAC,KAAK,IAAI,EAAE;YAChC,IAAI,UAA+B,CAAC;YACpC,IAAI,SAAkB,CAAC;YACvB,IAAI,SAAS,GAAG,KAAK,CAAC;YAEtB,GAAG;gBACD,uCAAuC;gBACvC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC/B,IAAI;oBACF,yDAAyD;oBACzD,qDAAqD;oBACrD,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAwB,CAAC;oBACrE,SAAS,GAAG,IAAI,CAAC;iBAClB;gBAAC,OAAO,GAAG,EAAE;oBACZ,wEAAwE;oBACxE,SAAS,GAAG,GAAG,CAAC;iBACjB;aACF,QAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAEtC,GAAG,CAAC,mBAAmB,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;YAEtC,4BAA4B;YAC5B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAE9B,IAAI,SAAS,EAAE;gBACb,yBAAyB;gBACzB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;gBACzC,uBAAuB;gBACvB,OAAO,UAAqB,CAAC;aAC9B;YAED,0EAA0E;YAC1E,MAAM,SAAS,CAAC;QAClB,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEhC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAU,EAAU;QACvB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;SAC1C;QACD,OAAyB,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAU;QACf,IAAI,CAAC,UAAU;aACZ,GAAG,CAAC,EAAE,CAAC;YACR,EAAE,OAAO,EAAE,EAAE;aACZ,KAAK,CAAC,GAAG,EAAE;YACV,GAAG,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;CACF","sourcesContent":["import PQueue from 'p-queue';\nimport type { TaskOptions } from '../types/TaskOptions.js';\nimport type { Task } from '../types/Task.js';\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst log = (...messages: unknown[]) => {\n  // console.log(`TaskRunner:`, ...messages);\n};\n\n/**\n * TaskRunner class manages the state of Tasks.\n * This class is to be called by the api server.\n */\nexport class TaskRunner {\n  private _queue: PQueue;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _pendingTasks: Map<string, Promise<any>>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _completedTasks: Map<string, any>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor() {\n    this._queue = new PQueue({ concurrency: 10 });\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n  }\n\n  /**\n   * The add method enqueues a Task and returns its Promise.\n   * If a Task with the same id has already been processed,\n   * it returns either the result or the promise.\n   * Rerun flag forces the Task to be run again.\n   */\n  add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, watch } = options || {};\n\n    watch?.();\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      log(`Previous action found, returning: \"${name}:${id}\"`);\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      log(`Previous action found, waiting: \"${name}:${id}\"`);\n      return pending;\n    }\n\n    const resultPromise = (async () => {\n      let taskResult: TReturn | undefined;\n      let taskError: unknown;\n      let completed = false;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n        try {\n          // TODO: possibly remove cast once this issue is resolved\n          // https://github.com/sindresorhus/p-queue/issues/175\n          taskResult = (await this._queue.add(execute)) as TReturn | undefined;\n          completed = true;\n        } catch (err) {\n          // Save the error--it will be thrown later if a rerun was not requested.\n          taskError = err;\n        }\n      } while (this._requiresRerun.has(id));\n\n      log(`Task finished: \"${name}:${id}\"`);\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n\n      if (completed) {\n        // Update finished Tasks.\n        this._completedTasks.set(id, taskResult);\n        // Resolve the promise.\n        return taskResult as TReturn;\n      }\n\n      // If the task never completed successfully, throw the error from earlier.\n      throw taskError;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n\n    return resultPromise;\n  }\n\n  /**\n   * The reset method removes a task from the TaskRunner\n   * and then adds it again through a previous execute function.\n   *\n   * This is useful for when a task needs to be forcibly rerun.\n   *\n   * It is intented to be used by the api server\n   * to rerun a task when it is stuck or it failed.\n   */\n  reset<TReturn>(id: string): Promise<TReturn> {\n    this.remove(id);\n    const prevTask = this._prevTasks.get(id);\n    if (prevTask === undefined) {\n      throw new Error(`Task not found: ${id}`);\n    }\n    return <Promise<TReturn>>this.add(prevTask, { rerun: true });\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intented to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        log(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.clear?.();\n    this._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n  }\n}\n"]}
+{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"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","sourcesContent":["import PQueue from 'p-queue';\nimport type { TaskOptions } from '../types/TaskOptions.js';\nimport type { Task } from '../types/Task.js';\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst log = (...messages: unknown[]) => {\n  // console.log(`TaskRunner:`, ...messages);\n};\n\n/**\n * TaskRunner class manages the state of Tasks.\n * This class is to be called by the api server.\n */\nexport class TaskRunner {\n  private _queue: PQueue;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _pendingTasks: Map<string, Promise<any>>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _completedTasks: Map<string, any>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor() {\n    this._queue = new PQueue({ concurrency: 10 });\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n  }\n\n  /**\n   * The add method enqueues a Task and returns its Promise.\n   * If a Task with the same id has already been processed,\n   * it returns either the result or the promise.\n   * Rerun flag forces the Task to be run again.\n   */\n  add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, watch } = options || {};\n\n    watch?.();\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      log(`Previous action found, returning: \"${name}:${id}\"`);\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      log(`Previous action found, waiting: \"${name}:${id}\"`);\n      return pending;\n    }\n\n    const resultPromise = (async () => {\n      let taskResult: TReturn | undefined;\n      let taskError: unknown;\n      let completed = false;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n        try {\n          // TODO: possibly remove cast once this issue is resolved\n          // https://github.com/sindresorhus/p-queue/issues/175\n          taskResult = (await this._queue.add(execute)) as TReturn | undefined;\n          completed = true;\n        } catch (err) {\n          // Save the error--it will be thrown later if a rerun was not requested.\n          taskError = err;\n        }\n      } while (this._requiresRerun.has(id));\n\n      log(`Task finished: \"${name}:${id}\"`);\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n\n      if (completed) {\n        // Update finished Tasks.\n        this._completedTasks.set(id, taskResult);\n        // Resolve the promise.\n        return taskResult as TReturn;\n      }\n\n      // If the task never completed successfully, throw the error from earlier.\n      throw taskError;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n\n    return resultPromise;\n  }\n\n  /**\n   * The reset method removes a task from the TaskRunner\n   * and then adds it again through a previous execute function.\n   *\n   * This is useful for when a task needs to be forcibly rerun.\n   *\n   * It is intented to be used by the api server\n   * to rerun a task when it is stuck or it failed.\n   */\n  reset<TReturn>(id: string): Promise<TReturn> {\n    this.remove(id);\n    const prevTask = this._prevTasks.get(id);\n    if (prevTask === undefined) {\n      throw new Error(`Task not found: ${id}`);\n    }\n    return this.add(prevTask, { rerun: true }) as Promise<TReturn>;\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intented to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        log(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.clear?.();\n    this._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n  }\n}\n"]}

package/lib/utilities/addOverride.d.ts

@@ -1,13 +1,16 @@
 import type { Session } from '../types/Session.js';
+import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
 /**
  * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path
- * that isn't recognized. When the user trigers this override, we should write it to the cloudpack config, rather
- * than overrides which could get "reset" on `init --reset`.
+ * that isn't recognized. When the user trigers this override, we write it to the cloudpack user config, rather
+ * than generated configs which could get "reset" on `init --reset`.
  */
-export declare function addOverride({ session, packageName, importPath, filename, }: {
-    session: Session;
+export declare function addOverride(options: {
     packageName: string;
     importPath: string;
-    filename?: string;
+    issuerUrl?: string;
+}, context: {
+    packages: PackageDefinitionsCache;
+    session: Session;
 }): Promise<void>;
 //# sourceMappingURL=addOverride.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"addOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAOnD;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,WAAW,EACX,UAAU,EACV,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,iBAkEA"}
+{"version":3,"file":"addOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAG3E;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;CAClB,iBAwEF"}

package/lib/utilities/addOverride.js

@@ -1,18 +1,18 @@
-import { createPackageOverrideTransform } from './createPackageOverrideTransform.js';
-import { addExportsMapEntry, findResolveMapEntry, getExportsMap, PackageDefinitions, } from '@ms-cloudpack/package-utilities';
+import { addExportsMapEntry, findResolveMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';
 import { slash } from '@ms-cloudpack/path-string-parsing';
 import { parseRequestInfo } from './parseRequestInfo.js';
-import { readConfig, writeGeneratedConfig } from '@ms-cloudpack/config';
-import { findPackageOverride } from './findPackageOverride.js';
+import { getPackageSettings, readUserConfig, writeUserConfig } from '@ms-cloudpack/config';
 /**
  * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path
- * that isn't recognized. When the user trigers this override, we should write it to the cloudpack config, rather
- * than overrides which could get "reset" on `init --reset`.
+ * that isn't recognized. When the user trigers this override, we write it to the cloudpack user config, rather
+ * than generated configs which could get "reset" on `init --reset`.
  */
-export async function addOverride({ session, packageName, importPath, filename, }) {
+export async function addOverride(options, context) {
+    const { packageName, importPath, issuerUrl } = options;
+    const { session, packages } = context;
     let definition = undefined;
-    if (filename) {
-        const requestPath = slash(new URL(filename).pathname);
+    if (issuerUrl) {
+        const requestPath = slash(new URL(issuerUrl).pathname);
         const { packageName: name, version } = parseRequestInfo(requestPath);
         definition = { name, version };
     }
@@ -22,45 +22,44 @@ export async function addOverride({ session, packageName, importPath, filename,
         definition,
     });
     if (entry === undefined) {
-        console.error(`Could not find entry of package ${packageName} in resolve map`);
+        console.error(`Could not find entry of package "${packageName}" in resolve map`);
         return;
     }
-    const exports = (await getExportsMap(entry.path));
+    // Get current exports. We want to add an additional entry to what's there - not replace the default exports,
+    // so we need the full map for the package.
+    const exports = await getExportsMap({ packagePath: entry.path }, { packages });
+    // Now add the exports entry.
     await addExportsMapEntry({
         exports,
         packagePath: entry.path,
         importPath,
+    }, { packages });
+    // Parse the user config if it exists.
+    const config = await readUserConfig(session.appPath);
+    // Ensure packageSettings exist.
+    config.packageSettings ??= [];
+    // Get the existing override if it exists.
+    let setting = getPackageSettings({
+        name: entry.name,
+        version: entry.version,
+        config,
     });
-    const packageOverride = {
-        name: packageName,
-        versionRequirement: `^${entry.version}`,
-        overrides: {
-            exports,
-        },
-    };
-    // Parse config if it exists.
-    const { packageOverrides = [] } = await readConfig(session.appPath);
-    // Add package override to config.
-    if (!packageOverrides.length) {
-        packageOverrides.push(packageOverride);
+    // Initialize a new one if needed.
+    if (!setting) {
+        setting = {
+            match: {
+                name: packageName,
+                version: entry.version?.match(/^\d+\.\d+\.\d+(-[a-z0-9.-]+)?$/) ? `^${entry.version}` : undefined,
+            },
+        };
+        config.packageSettings.push(setting);
     }
-    else {
-        const existingOverride = findPackageOverride(packageOverrides, packageName, entry.version);
-        if (existingOverride) {
-            existingOverride.overrides = packageOverride.overrides;
-        }
-        else {
-            packageOverrides.push(packageOverride);
-        }
-    } // Write config.
-    await writeGeneratedConfig({
-        packageOverrides,
-    }, session.appPath);
-    console.debug(`Added override for ${packageName} to cloudpack config`);
-    const override = {
-        packageOverrides: [packageOverride],
-    };
-    // Initialize package overrides.
-    PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(override));
+    // Update the exports.
+    setting.exports = exports;
+    // Write config.
+    await writeUserConfig(config, session.appPath);
+    console.debug(`Added override for "${packageName}" to "cloudpack.config.json".`);
+    // Instruct the package cache to reset, so that transforms can respect the modification to the exports map.
+    packages.reset({ newConfig: config });
 }
 //# sourceMappingURL=addOverride.js.map

package/lib/utilities/addOverride.js.map

@@ -1 +1 @@
-{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,kBAAkB,GACnB,MAAM,iCAAiC,CAAC;AAIzC,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAChC,OAAO,EACP,WAAW,EACX,UAAU,EACV,QAAQ,GAMT;IACC,IAAI,UAAU,GAAG,SAAS,CAAC;IAE3B,IAAI,QAAQ,EAAE;QACZ,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;QACtD,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,KAAK,KAAK,SAAS,EAAE;QACvB,OAAO,CAAC,KAAK,CAAC,mCAAmC,WAAW,iBAAiB,CAAC,CAAC;QAC/E,OAAO;KACR;IAED,MAAM,OAAO,GAAG,CAAC,MAAM,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAA2C,CAAC;IAE5F,MAAM,kBAAkB,CAAC;QACvB,OAAO;QACP,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,eAAe,GAAoB;QACvC,IAAI,EAAE,WAAW;QACjB,kBAAkB,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE;QACvC,SAAS,EAAE;YACT,OAAO;SACR;KACF,CAAC;IAEF,6BAA6B;IAC7B,MAAM,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpE,kCAAkC;IAClC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;QAC5B,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KACxC;SAAM;QACL,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAE3F,IAAI,gBAAgB,EAAE;YACpB,gBAAgB,CAAC,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;SACxD;aAAM;YACL,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACxC;KACF,CAAC,gBAAgB;IAClB,MAAM,oBAAoB,CACxB;QACE,gBAAgB;KACjB,EACD,OAAO,CAAC,OAAO,CAChB,CAAC;IAEF,OAAO,CAAC,KAAK,CAAC,sBAAsB,WAAW,sBAAsB,CAAC,CAAC;IAEvE,MAAM,QAAQ,GAAoB;QAChC,gBAAgB,EAAE,CAAC,eAAe,CAAC;KACpC,CAAC;IAEF,gCAAgC;IAChC,kBAAkB,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC/F,CAAC","sourcesContent":["import { createPackageOverrideTransform } from './createPackageOverrideTransform.js';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  getExportsMap,\n  PackageDefinitions,\n} from '@ms-cloudpack/package-utilities';\nimport type { PackageOverride } from '../types/PackageOverride.js';\nimport type { Session } from '../types/Session.js';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport { readConfig, writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { findPackageOverride } from './findPackageOverride.js';\n\n/**\n * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path\n * that isn't recognized. When the user trigers this override, we should write it to the cloudpack config, rather\n * than overrides which could get \"reset\" on `init --reset`.\n */\nexport async function addOverride({\n  session,\n  packageName,\n  importPath,\n  filename,\n}: {\n  session: Session;\n  packageName: string;\n  importPath: string;\n  filename?: string;\n}) {\n  let definition = undefined;\n\n  if (filename) {\n    const requestPath = slash(new URL(filename).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 === undefined) {\n    console.error(`Could not find entry of package ${packageName} in resolve map`);\n    return;\n  }\n\n  const exports = (await getExportsMap(entry.path)) as Record<string, Record<string, string>>;\n\n  await addExportsMapEntry({\n    exports,\n    packagePath: entry.path,\n    importPath,\n  });\n\n  const packageOverride: PackageOverride = {\n    name: packageName,\n    versionRequirement: `^${entry.version}`,\n    overrides: {\n      exports,\n    },\n  };\n\n  // Parse config if it exists.\n  const { packageOverrides = [] } = await readConfig(session.appPath);\n\n  // Add package override to config.\n  if (!packageOverrides.length) {\n    packageOverrides.push(packageOverride);\n  } else {\n    const existingOverride = findPackageOverride(packageOverrides, packageName, entry.version);\n\n    if (existingOverride) {\n      existingOverride.overrides = packageOverride.overrides;\n    } else {\n      packageOverrides.push(packageOverride);\n    }\n  } // Write config.\n  await writeGeneratedConfig(\n    {\n      packageOverrides,\n    },\n    session.appPath,\n  );\n\n  console.debug(`Added override for ${packageName} to cloudpack config`);\n\n  const override: CloudpackConfig = {\n    packageOverrides: [packageOverride],\n  };\n\n  // Initialize package overrides.\n  PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(override));\n}\n"]}
+{"version":3,"file":"addOverride.js","sourceRoot":"","sources":["../../src/utilities/addOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEzG,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3F;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAIC,EACD,OAGC;IAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,UAAU,GAAG,SAAS,CAAC;IAE3B,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,KAAK,KAAK,SAAS,EAAE;QACvB,OAAO,CAAC,KAAK,CAAC,oCAAoC,WAAW,kBAAkB,CAAC,CAAC;QACjF,OAAO;KACR;IAED,6GAA6G;IAC7G,2CAA2C;IAC3C,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE/E,6BAA6B;IAC7B,MAAM,kBAAkB,CACtB;QACE,OAAO;QACP,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,UAAU;KACX,EACD,EAAE,QAAQ,EAAE,CACb,CAAC;IAEF,sCAAsC;IACtC,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAErD,gCAAgC;IAChC,MAAM,CAAC,eAAe,KAAK,EAAE,CAAC;IAE9B,0CAA0C;IAC1C,IAAI,OAAO,GAAG,kBAAkB,CAAC;QAC/B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM;KACP,CAAC,CAAC;IAEH,kCAAkC;IAClC,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,GAAG;YACR,KAAK,EAAE;gBACL,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS;aAClG;SACF,CAAC;QAEF,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACtC;IAED,sBAAsB;IACtB,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAE1B,gBAAgB;IAChB,MAAM,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/C,OAAO,CAAC,KAAK,CAAC,uBAAuB,WAAW,+BAA+B,CAAC,CAAC;IAEjF,2GAA2G;IAC3G,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AACxC,CAAC","sourcesContent":["import { addExportsMapEntry, findResolveMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';\nimport type { Session } from '../types/Session.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { getPackageSettings, readUserConfig, writeUserConfig } from '@ms-cloudpack/config';\n\n/**\n * The addOverride method is triggered by a user action in the overlay, when we detect new usage of an import path\n * that isn't recognized. When the user trigers this override, we write it to the cloudpack user config, rather\n * than generated configs which could get \"reset\" on `init --reset`.\n */\nexport async function addOverride(\n  options: {\n    packageName: string;\n    importPath: string;\n    issuerUrl?: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Session;\n  },\n) {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session, packages } = context;\n  let definition = 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 === undefined) {\n    console.error(`Could not find entry of package \"${packageName}\" in resolve map`);\n    return;\n  }\n\n  // Get current exports. We want to add an additional entry to what's there - not replace the default exports,\n  // so we need the full map for the package.\n  const exports = await getExportsMap({ packagePath: entry.path }, { packages });\n\n  // Now add the exports entry.\n  await addExportsMapEntry(\n    {\n      exports,\n      packagePath: entry.path,\n      importPath,\n    },\n    { packages },\n  );\n\n  // Parse the user config if it exists.\n  const config = await readUserConfig(session.appPath);\n\n  // Ensure packageSettings exist.\n  config.packageSettings ??= [];\n\n  // Get the existing override if it exists.\n  let setting = getPackageSettings({\n    name: entry.name,\n    version: entry.version,\n    config,\n  });\n\n  // Initialize a new one if needed.\n  if (!setting) {\n    setting = {\n      match: {\n        name: packageName,\n        version: entry.version?.match(/^\\d+\\.\\d+\\.\\d+(-[a-z0-9.-]+)?$/) ? `^${entry.version}` : undefined,\n      },\n    };\n\n    config.packageSettings.push(setting);\n  }\n\n  // Update the exports.\n  setting.exports = exports;\n\n  // Write config.\n  await writeUserConfig(config, session.appPath);\n\n  console.debug(`Added override for \"${packageName}\" to \"cloudpack.config.json\".`);\n\n  // Instruct the package cache to reset, so that transforms can respect the modification to the exports map.\n  packages.reset({ newConfig: config });\n}\n"]}

package/lib/utilities/editCloudpackConfig.js

@@ -6,12 +6,12 @@ import { getConfigPath, configTemplate } from '@ms-cloudpack/config';
  * Opens the cloudpack config file in the editor.
  */
 export async function editCloudpackConfig() {
-    const { configPath } = getConfigPath(process.cwd());
+    const { userConfigPath } = getConfigPath(process.cwd());
     // Check if file exists
-    if (!(await isFile(configPath))) {
+    if (!(await isFile(userConfigPath))) {
         // Create file with default config
-        await writeJson(configPath, configTemplate);
+        await writeJson(userConfigPath, configTemplate);
     }
-    execSync(`code --goto ${JSON.stringify(configPath)}`, { cwd: process.cwd() });
+    execSync(`code --goto ${JSON.stringify(userConfigPath)}`, { cwd: process.cwd() });
 }
 //# sourceMappingURL=editCloudpackConfig.js.map

package/lib/utilities/editCloudpackConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"editCloudpackConfig.js","sourceRoot":"","sources":["../../src/utilities/editCloudpackConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAEpD,uBAAuB;IACvB,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE;QAC/B,kCAAkC;QAClC,MAAM,SAAS,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;KAC7C;IAED,QAAQ,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAChF,CAAC","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isFile } from '@ms-cloudpack/path-utilities';\nimport { execSync } from 'child_process';\nimport { getConfigPath, configTemplate } from '@ms-cloudpack/config';\n\n/**\n * Opens the cloudpack config file in the editor.\n */\nexport async function editCloudpackConfig() {\n  const { configPath } = getConfigPath(process.cwd());\n\n  // Check if file exists\n  if (!(await isFile(configPath))) {\n    // Create file with default config\n    await writeJson(configPath, configTemplate);\n  }\n\n  execSync(`code --goto ${JSON.stringify(configPath)}`, { cwd: process.cwd() });\n}\n"]}
+{"version":3,"file":"editCloudpackConfig.js","sourceRoot":"","sources":["../../src/utilities/editCloudpackConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,MAAM,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAExD,uBAAuB;IACvB,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE;QACnC,kCAAkC;QAClC,MAAM,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;KACjD;IAED,QAAQ,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AACpF,CAAC","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { isFile } from '@ms-cloudpack/path-utilities';\nimport { execSync } from 'child_process';\nimport { getConfigPath, configTemplate } from '@ms-cloudpack/config';\n\n/**\n * Opens the cloudpack config file in the editor.\n */\nexport async function editCloudpackConfig() {\n  const { userConfigPath } = getConfigPath(process.cwd());\n\n  // Check if file exists\n  if (!(await isFile(userConfigPath))) {\n    // Create file with default config\n    await writeJson(userConfigPath, configTemplate);\n  }\n\n  execSync(`code --goto ${JSON.stringify(userConfigPath)}`, { cwd: process.cwd() });\n}\n"]}

package/lib/utilities/startWatcher.js.map

@@ -1 +1 @@
-{"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,GAAgB,IAAI,GAAG,EAAE,CAAC;IAEvC,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: Set<string> = new Set();\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"]}
+{"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"]}

package/lib/utilities/validateOverride.d.ts

@@ -1,8 +1,15 @@
 import type { Session } from '../types/Session.js';
-export declare function validateOverride({ session, packageName, importPath, filename, }: {
-    session: Session;
+import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
+/**
+ * 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;
-    filename?: string;
+    issuerUrl?: string;
+}, context: {
+    session: Session;
+    packages: PackageDefinitionsCache;
 }): 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":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAGnD,wBAAsB,gBAAgB,CAAC,EACrC,OAAO,EACP,WAAW,EACX,UAAU,EACV,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,oBA4BA"}
+{"version":3,"file":"validateOverride.d.ts","sourceRoot":"","sources":["../../src/utilities/validateOverride.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E;;;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;IACP,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,uBAAuB,CAAC;CACnC,oBAkCF"}

package/lib/utilities/validateOverride.js

@@ -1,10 +1,16 @@
 import { findResolveMapEntry, findFileInPackage } from '@ms-cloudpack/package-utilities';
 import { slash } from '@ms-cloudpack/path-string-parsing';
 import { parseRequestInfo } from './parseRequestInfo.js';
-export async function validateOverride({ session, packageName, importPath, filename, }) {
+/**
+ * Given a package name, import path, and optional issuerUrl, returns a boolean indicating if the given
+ * override is valid.
+ */
+export async function validateOverride(options, context) {
+    const { packageName, importPath, issuerUrl } = options;
+    const { session } = context;
     let definition = undefined;
-    if (filename) {
-        const requestPath = slash(new URL(filename).pathname);
+    if (issuerUrl) {
+        const requestPath = slash(new URL(issuerUrl).pathname);
         const { packageName: name, version } = parseRequestInfo(requestPath);
         definition = { name, version };
     }
@@ -19,7 +25,7 @@ export async function validateOverride({ session, packageName, importPath, filen
     const { filePath } = await findFileInPackage({
         packagePath: entry.path,
         filePath: importPath,
-    });
+    }, context);
     if (filePath) {
         return true;
     }

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;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACrC,OAAO,EACP,WAAW,EACX,UAAU,EACV,QAAQ,GAMT;IACC,IAAI,UAAU,GAAG,SAAS,CAAC;IAE3B,IAAI,QAAQ,EAAE;QACZ,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;QACtD,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,KAAK,KAAK,SAAS,EAAE;QACvB,OAAO,KAAK,CAAC;KACd;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,iBAAiB,CAAC;QAC3C,WAAW,EAAE,KAAK,CAAC,IAAI;QACvB,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;IAEH,IAAI,QAAQ,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import { findResolveMapEntry, findFileInPackage } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { Session } from '../types/Session.js';\nimport { parseRequestInfo } from './parseRequestInfo.js';\n\nexport async function validateOverride({\n  session,\n  packageName,\n  importPath,\n  filename,\n}: {\n  session: Session;\n  packageName: string;\n  importPath: string;\n  filename?: string;\n}) {\n  let definition = undefined;\n\n  if (filename) {\n    const requestPath = slash(new URL(filename).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 === undefined) {\n    return false;\n  }\n\n  const { filePath } = await findFileInPackage({\n    packagePath: entry.path,\n    filePath: importPath,\n  });\n\n  if (filePath) {\n    return true;\n  }\n  return false;\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,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAIC,EACD,OAGC;IAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,IAAI,UAAU,GAAG,SAAS,CAAC;IAE3B,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,KAAK,KAAK,SAAS,EAAE;QACvB,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,IAAI,QAAQ,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import { findResolveMapEntry, findFileInPackage } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { Session } from '../types/Session.js';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\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: {\n    session: Session;\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { packageName, importPath, issuerUrl } = options;\n  const { session } = context;\n  let definition = 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 === undefined) {\n    return false;\n  }\n\n  const { filePath } = await findFileInPackage(\n    {\n      packagePath: entry.path,\n      filePath: importPath,\n    },\n    context,\n  );\n\n  if (filePath) {\n    return true;\n  }\n  return false;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.6.20",
+  "version": "0.7.0",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -17,14 +17,14 @@
     "@lage-run/scheduler": "^1.0.0",
     "@lage-run/target-graph": "^0.8.6",
     "@lage-run/hasher": "^1.0.0",
-    "@ms-cloudpack/bundler-types": "^0.14.0",
-    "@ms-cloudpack/config": "^0.7.5",
-    "@ms-cloudpack/create-express-app": "^1.3.7",
-    "@ms-cloudpack/data-bus": "^0.3.0",
-    "@ms-cloudpack/package-utilities": "^3.1.5",
-    "@ms-cloudpack/path-string-parsing": "^1.0.2",
-    "@ms-cloudpack/task-reporter": "^0.5.2",
-    "@ms-cloudpack/telemetry": "^0.3.4",
+    "@ms-cloudpack/bundler-types": "^0.16.0",
+    "@ms-cloudpack/config": "^0.8.0",
+    "@ms-cloudpack/create-express-app": "^1.3.8",
+    "@ms-cloudpack/data-bus": "^0.3.1",
+    "@ms-cloudpack/package-utilities": "^4.0.0",
+    "@ms-cloudpack/path-string-parsing": "^1.0.3",
+    "@ms-cloudpack/task-reporter": "^0.5.3",
+    "@ms-cloudpack/telemetry": "^0.3.5",
     "@trpc/client": "^10.21.1",
     "@trpc/server": "^10.21.1",
     "chokidar": "^3.5.3",

package/lib/utilities/createPackageOverrideTransform.d.ts

@@ -1,7 +0,0 @@
-import type { CloudpackConfig } from '@ms-cloudpack/config';
-import type { PackageDefinitionTransform } from '@ms-cloudpack/bundler-types';
-/**
- * Creates a transform to be registered with a PackageDefinitions registry for overriding package.json definitions.
- */
-export declare function createPackageOverrideTransform(config: CloudpackConfig): PackageDefinitionTransform;
-//# sourceMappingURL=createPackageOverrideTransform.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"createPackageOverrideTransform.d.ts","sourceRoot":"","sources":["../../src/utilities/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAe,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAG3F;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,eAAe,GAAG,0BAA0B,CAgBlG"}