@ms-cloudpack/cli 0.0.6 → 0.1.1

package/CHANGELOG.json

@@ -2,7 +2,94 @@
   "name": "@ms-cloudpack/cli",
   "entries": [
     {
-      "date": "Sat, 14 May 2022 04:35:56 GMT",
+      "date": "Sat, 21 May 2022 00:31:20 GMT",
+      "tag": "@ms-cloudpack/cli_v0.1.1",
+      "version": "0.1.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/cli",
+            "commit": "c26c7bcc7abda501d07180598e3da003b435b03b",
+            "comment": "Adding call to burn import map on the page and placeholder html rendering logic."
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/bundler to v0.1.1",
+            "commit": "c26c7bcc7abda501d07180598e3da003b435b03b"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/package-utilities to v0.3.0",
+            "commit": "c26c7bcc7abda501d07180598e3da003b435b03b"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 20 May 2022 04:26:15 GMT",
+      "tag": "@ms-cloudpack/cli_v0.1.0",
+      "version": "0.1.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/cli",
+            "commit": "b39bb143fc53e622c39f9e9fd349f71c9ebadd77",
+            "comment": "Integrating ori-api"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/bundler to v0.1.0",
+            "commit": "b39bb143fc53e622c39f9e9fd349f71c9ebadd77"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/create-express-app to v0.1.0",
+            "commit": "b39bb143fc53e622c39f9e9fd349f71c9ebadd77"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/package-utilities to v0.2.0",
+            "commit": "b39bb143fc53e622c39f9e9fd349f71c9ebadd77"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/path-utilities to v0.2.0",
+            "commit": "b39bb143fc53e622c39f9e9fd349f71c9ebadd77"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 19 May 2022 21:04:02 GMT",
+      "tag": "@ms-cloudpack/cli_v0.0.7",
+      "version": "0.0.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/bundler to v0.0.7",
+            "commit": "9bd9230fc985c94b2ad7d32a1abadada2fa75852"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/package-utilities to v0.1.7",
+            "commit": "9bd9230fc985c94b2ad7d32a1abadada2fa75852"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 14 May 2022 04:36:11 GMT",
       "tag": "@ms-cloudpack/cli_v0.0.6",
       "version": "0.0.6",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,43 @@
 # Change Log - @ms-cloudpack/cli
 
-This log was last generated on Sat, 14 May 2022 04:35:56 GMT and should not be manually modified.
+This log was last generated on Sat, 21 May 2022 00:31:20 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.1.1
+
+Sat, 21 May 2022 00:31:20 GMT
+
+### Patches
+
+- Adding call to burn import map on the page and placeholder html rendering logic. (dzearing@microsoft.com)
+- Bump @ms-cloudpack/bundler to v0.1.1
+- Bump @ms-cloudpack/package-utilities to v0.3.0
+
+## 0.1.0
+
+Fri, 20 May 2022 04:26:15 GMT
+
+### Minor changes
+
+- Integrating ori-api (dzearing@microsoft.com)
+- Bump @ms-cloudpack/bundler to v0.1.0
+- Bump @ms-cloudpack/create-express-app to v0.1.0
+- Bump @ms-cloudpack/package-utilities to v0.2.0
+- Bump @ms-cloudpack/path-utilities to v0.2.0
+
+## 0.0.7
+
+Thu, 19 May 2022 21:04:02 GMT
+
+### Patches
+
+- Bump @ms-cloudpack/bundler to v0.0.7
+- Bump @ms-cloudpack/package-utilities to v0.1.7
+
 ## 0.0.6
 
-Sat, 14 May 2022 04:35:56 GMT
+Sat, 14 May 2022 04:36:11 GMT
 
 ### Patches
 

package/lib/commands/start/createSession.d.ts

@@ -0,0 +1,5 @@
+import type { Session } from './types.js';
+export interface SessionOptions {
+    appPath: string;
+}
+export declare function createSession(options: SessionOptions): Promise<Session>;

package/lib/commands/start/createSession.js

@@ -0,0 +1,21 @@
+import { v4 as uuid } from 'uuid';
+import { createResolveMap } from '@ms-cloudpack/package-utilities';
+import fs from 'fs';
+import path from 'path';
+export async function createSession(options) {
+    const { appPath } = options;
+    const id = uuid();
+    // Grab the installed dependency locations.
+    console.log(`Resolving dependencies...`);
+    const resolveMap = await createResolveMap({ appPath });
+    fs.writeFileSync(path.join(process.cwd(), 'resolve-map.json'), JSON.stringify(resolveMap, null, 2));
+    console.log(`Resolved dependencies. (${Object.keys(resolveMap).length} total)`);
+    return {
+        id,
+        appPath,
+        type: 'web-app',
+        mode: 'library',
+        resolveMap,
+    };
+}
+//# sourceMappingURL=createSession.js.map

package/lib/commands/start/createSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAuB;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC;IAElB,2CAA2C;IAC3C,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAEzC,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEvD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,kBAAkB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpG,OAAO,CAAC,GAAG,CAAC,2BAA2B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,SAAS,CAAC,CAAC;IAEhF,OAAO;QACL,EAAE;QACF,OAAO;QACP,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,UAAU;KACX,CAAC;AACJ,CAAC"}

package/lib/commands/start/index.js

@@ -1,3 +1,4 @@
+/* Defines the "start" verb. */
 export function init(command) {
     command
         .command('start')

package/lib/commands/start/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,IAAI,CAAC,OAAgB;IACnC,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,0DAA0D,CAAC;SACvE,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"AAEA,+BAA+B;AAC/B,MAAM,UAAU,IAAI,CAAC,OAAgB;IACnC,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,0DAA0D,CAAC;SACvE,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;AAC9D,CAAC"}

package/lib/commands/start/start.d.ts

@@ -1 +1,4 @@
+/**
+ * Defines the "start" verb entry point.
+ */
 export declare function start(): Promise<void>;

package/lib/commands/start/start.js

@@ -1,26 +1,23 @@
+import { createSession } from './createSession.js';
 import { startBundleServer } from './startBundleServer.js';
-import { openBrowser } from './openBrowser.js';
 import { startAppServer } from './startAppServer.js';
-import { v4 as uuid } from 'uuid';
+import { openBrowser } from './openBrowser.js';
+/**
+ * Defines the "start" verb entry point.
+ */
 export async function start() {
     const appPath = process.cwd();
-    const id = uuid();
     // Initialize session definition.
-    const session = {
-        id,
-        appPath,
-        type: 'web-app',
-        mode: 'library',
-    };
-    // Start the bundle and html server for this session.
-    const [bundleServer, appServer] = await Promise.all([startBundleServer(session), startAppServer()]);
+    const session = await createSession({ appPath });
+    const bundleServer = await startBundleServer(session);
+    const appServer = await startAppServer(session, `http://localhost:${bundleServer.port}`);
     // Close things on completion.
     process.on('SIGINT', async function () {
         bundleServer.close();
         appServer.close();
         process.exit(0);
     });
-    // Open the browser.
+    // TODO: Uncomment when app server is added back. Open the browser.
     openBrowser(`http://localhost:${appServer.port}`);
 }
 //# sourceMappingURL=start.js.map

package/lib/commands/start/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9B,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC;IAElB,iCAAiC;IACjC,MAAM,OAAO,GAAY;QACvB,EAAE;QACF,OAAO;QACP,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;KAChB,CAAC;IAEF,qDAAqD;IACrD,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;IAEpG,8BAA8B;IAC9B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK;QACxB,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,oBAAoB;IACpB,WAAW,CAAC,oBAAoB,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE9B,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,oBAAoB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IAEzF,8BAA8B;IAC9B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK;QACxB,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,WAAW,CAAC,oBAAoB,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC"}

package/lib/commands/start/startAppServer.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
+import type { Session } from './types.js';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
  * which loads resources from the bundle server.
@@ -7,7 +8,7 @@
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export declare function startAppServer(): Promise<{
+export declare function startAppServer(session: Session, bundleServerUrl: string): Promise<{
     close: () => import("http").Server;
     port: number;
 }>;

package/lib/commands/start/startAppServer.js

@@ -1,6 +1,7 @@
 // import type { Session } from './types.js';
 import path from 'path';
 import { slash } from '@ms-cloudpack/path-utilities';
+import { createImportMap } from '@ms-cloudpack/package-utilities';
 import { createExpressApp } from '@ms-cloudpack/create-express-app';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
@@ -10,14 +11,27 @@ import { createExpressApp } from '@ms-cloudpack/create-express-app';
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export async function startAppServer() {
+export async function startAppServer(session, bundleServerUrl) {
+    const importMap = await createImportMap(session.resolveMap, bundleServerUrl);
     const { server, port } = await createExpressApp([5000, 5001, 5002, 5003], (app) => {
         // Set up the express app routes.
         app.get('*', async (req, res) => {
             const requestPath = slash(req.path.substring(1));
             const requestExt = path.extname(requestPath);
+            const entryScript = `${bundleServerUrl}/session/app/lib/index.js`; // getEntryScript(requestPath);
             console.log(`App server: Request: ${requestPath}, ext: ${requestExt}, ${port}`);
-            res.send(`<html><body>hello</body></html>`);
+            res.cookie('cloudpack-session-id', session.id);
+            res.set('Content-Security-Policy', `connect-src 'self' ws:;`);
+            res.send(`
+      <html>
+        <head>
+          <script type="importmap">${JSON.stringify(importMap, null, 2)}</script>
+        </head>
+        <body>
+          <script type="module" src="${entryScript}"></script>
+        </body>
+      </html>
+      `);
         });
     });
     return {

package/lib/commands/start/startAppServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../src/commands/start/startAppServer.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;QAChF,iCAAiC;QACjC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE7C,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,UAAU,UAAU,KAAK,IAAI,EAAE,CAAC,CAAC;YAEhF,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC3B,IAAI;KACL,CAAC;AACJ,CAAC"}
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../src/commands/start/startAppServer.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAgB,EAAE,eAAuB;IAC5E,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAE7E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;QAChF,iCAAiC;QACjC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC7C,MAAM,WAAW,GAAG,GAAG,eAAe,2BAA2B,CAAC,CAAC,+BAA+B;YAElG,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,UAAU,UAAU,KAAK,IAAI,EAAE,CAAC,CAAC;YAEhF,GAAG,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,yBAAyB,CAAC,CAAC;YAE9D,GAAG,CAAC,IAAI,CAAC;;;qCAGsB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;;;uCAGhC,WAAW;;;OAG3C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC3B,IAAI;KACL,CAAC;AACJ,CAAC"}

package/lib/commands/start/startBundleServer.js

@@ -1,63 +1,70 @@
 import { bundlePackage } from '@ms-cloudpack/bundler';
 import { createExpressApp } from '@ms-cloudpack/create-express-app';
 import { readJson, writeJsonSync } from '@ms-cloudpack/json-utilities';
-import { createResolveMap, isExternalPackage } from '@ms-cloudpack/package-utilities';
+import { isExternalPackage } from '@ms-cloudpack/package-utilities';
 import { slash } from '@ms-cloudpack/path-utilities';
 import filenamify from 'filenamify';
-import { ensureDir } from 'fs-extra';
+import fsExtra from 'fs-extra';
 import hash from 'object-hash';
 import os from 'os';
 import path from 'path';
 import { parseRequestInfo } from './parseRequestInfo.js';
+const { ensureDir } = fsExtra;
 const bundleLookupPath = path.join(os.tmpdir(), 'cloudpack-output', 'all-bundles.json');
 export async function startBundleServer(session) {
-    const { appPath } = session;
-    const bundleActions = (await readJson(bundleLookupPath)) || {};
-    const pendingActions = {};
-    // Grab the installed dependency locations.
-    console.log(`BundleServer: Resolving dependencies...`);
-    const { resolveMap, stats } = await createResolveMap({ appPath });
-    console.log(`BundleServer: Resolved dependencies.`, stats);
+    const createdBundles = (await readJson(bundleLookupPath)) || {};
+    const pendingBundles = {};
+    const { resolveMap } = session;
     const { server, port } = await createExpressApp([5500, 5501, 5502, 5503], (app) => {
         // Set up the express app routes.
         app.get('*', async (req, res) => {
             const requestPath = slash(req.path.substring(1));
-            const requestExt = path.extname(requestPath);
-            const requestInfo = parseRequestInfo(requestPath);
-            const packagePath = resolveMap[requestInfo.packageName]?.path;
+            const { packageName, version, filePath } = parseRequestInfo(requestPath);
+            const packagePath = resolveMap[`${packageName}@${version}`]?.path;
             const isExternal = isExternalPackage(packagePath);
             const force = req.query.force;
-            console.log(`BundleServer: Request: "${requestInfo.packageName}@${requestInfo.version}${requestInfo.filePath}"`);
-            // If there are invalid arguments, 400.
-            if (!requestPath || !requestExt || !requestInfo.packageName || !requestInfo.version) {
-                console.log(`BundleServer: Response (400): "${requestInfo.packageName}@${requestInfo.version}${requestInfo.filePath}"`);
+            console.log(`BundleServer: Request: "${packageName}@${version}${filePath}"`);
+            // If the package is missing, invalid arguments.
+            if (!requestPath || !packageName) {
+                console.log(`BundleServer: Response (400): "${packageName}@${version}${filePath}"`);
                 res.status(400).send(`Requests must be in the format "/{packageName}@{version}/path/file.ext".`);
                 return;
             }
+            // If the version is missing, redirect to the primary version.
+            if (!version) {
+                const resolvedPackage = resolveMap[packageName];
+                if (!resolvedPackage) {
+                    console.log(`BundleServer: Response (404): Unrecognized package "${packageName}"`);
+                    res.status(404).send(`Unrecognized package "${packageName}".`);
+                    return;
+                }
+                res.redirect(`/${packageName}@${resolvedPackage.version}/${filePath}`);
+                return;
+            }
             // If it's an unrecognized package, 404.
             if (!packagePath) {
-                console.log(`BundleServer: Response (404): "${requestInfo.packageName}@${requestInfo.version}${requestInfo.filePath}"`);
+                console.log(`BundleServer: Response (404): "${packageName}@${version}${filePath}"`);
                 res.status(404).send(`The requested package "${packagePath}" is not available.`);
                 return;
             }
             // Create an identifier for the bundle.
             const bundleId = hash({
-                name: requestInfo.packageName,
-                version: isExternal ? requestInfo.version : packagePath,
+                name: packageName,
+                version: isExternal ? version : packagePath,
                 mode: session.mode,
             });
             // Derive where the output should be.
-            const outputPath = path.join(os.tmpdir(), 'cloudpack-output', `${filenamify(requestInfo.packageName)}-${session.mode}-${requestInfo.version}-${bundleId}`);
-            let action = bundleActions[bundleId];
+            const outputPath = path.join(os.tmpdir(), 'cloudpack-output', `${filenamify(packageName)}-${session.mode}-${version}-${bundleId}`);
+            let action = createdBundles[bundleId];
             // If we haven't completed this bundle, enqueue it or piggyback on an existing run.
             if (!action || force) {
-                let pendingAction = pendingActions[bundleId];
+                let pendingAction = pendingBundles[bundleId];
                 // Either latch on to a pending request or create a new one.
                 if (!pendingAction) {
-                    pendingAction = pendingActions[bundleId] = new Promise((resolve) => {
-                        // Define a helper function so that we can await on async operations.
+                    pendingAction = pendingBundles[bundleId] = new Promise((resolve) => {
+                        // Async helper so that we can await and call resolve.
                         async function createBundle() {
-                            console.log(`BundleServer: No previous action found, bundling: "${requestInfo.packageName}@${requestInfo.version}${requestInfo.filePath}"`);
+                            console.log(`BundleServer: No previous action found, bundling: "${packageName}@${version}${filePath}"`);
                             await ensureDir(outputPath);
                             const bundlerResult = await bundlePackage({
                                 packagePath,
@@ -65,44 +72,46 @@ export async function startBundleServer(session) {
                                 outputType: 'library',
                             });
                             console.log(`BundleServer: Bundle complete: ${outputPath}`);
-                            bundleActions[bundleId] = {
+                            createdBundles[bundleId] = {
                                 id: bundleId,
-                                packageName: requestInfo.packageName,
-                                packageVersion: requestInfo.version,
+                                packageName: packageName,
+                                packageVersion: version,
+                                packagePath,
                                 outputPath,
                                 result: bundlerResult.errors?.length == 0 ? 'success' : 'errors',
                                 errors: bundlerResult.errors,
                                 warnings: bundlerResult.warnings,
                             };
-                            delete pendingActions[bundleId];
-                            return bundleActions[bundleId];
+                            delete pendingBundles[bundleId];
+                            return createdBundles[bundleId];
                         }
                         // Call the async function and tie it in with the promise.
                         createBundle().then(resolve);
                     });
                 }
                 else {
-                    console.log(`BundleServer: Previous action found, waiting: "${requestInfo.packageName}@${requestInfo.version}${requestInfo.filePath}"`);
+                    console.log(`BundleServer: Previous action found, waiting: "${packageName}@${version}${filePath}"`);
                 }
                 action = await pendingAction;
             }
             else {
-                console.log(`BundleServer: Bundle cached, returning: "${requestInfo.packageName}@${requestInfo.version}${requestInfo.filePath}"`);
+                console.log(`BundleServer: Bundle cached, returning: "${packageName}@${version}${filePath}"`);
             }
             // At this point we should have an action compeleted.
             if (action.result === 'errors') {
                 res.status(500).type('json').send(action);
             }
             else {
-                console.log(`BundleServer: Bundle returning: "${requestInfo.packageName}@${requestInfo.version}${requestInfo.filePath}"`);
+                console.log(`BundleServer: Bundle returning: "${packageName}@${version}${filePath}"`);
                 // Try to return the result.
-                res.sendFile(path.join(outputPath, requestInfo.filePath));
+                res.sendFile(path.join(outputPath, filePath));
             }
         });
     });
+    console.log(`Bundle server started (http://localhost:${port})`);
     return {
         close: () => {
-            writeJsonSync(bundleLookupPath, bundleActions);
+            writeJsonSync(bundleLookupPath, createdBundles);
             server.close();
         },
         port,

package/lib/commands/start/startBundleServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;AAexF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAgB;IACtD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,aAAa,GAAiC,CAAC,MAAM,QAAQ,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7F,MAAM,cAAc,GAA0C,EAAE,CAAC;IAEjE,2CAA2C;IAC3C,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IAEvD,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAElE,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;IAE3D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;QAChF,iCAAiC;QACjC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC7C,MAAM,WAAW,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC;YAC9D,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;YAE9B,OAAO,CAAC,GAAG,CAAC,2BAA2B,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,QAAQ,GAAG,CAAC,CAAC;YAEjH,uCAAuC;YACvC,IAAI,CAAC,WAAW,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;gBACnF,OAAO,CAAC,GAAG,CACT,kCAAkC,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,QAAQ,GAAG,CAC3G,CAAC;gBAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;gBACjG,OAAO;aACR;YAED,wCAAwC;YACxC,IAAI,CAAC,WAAW,EAAE;gBAChB,OAAO,CAAC,GAAG,CACT,kCAAkC,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,QAAQ,GAAG,CAC3G,CAAC;gBAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,0BAA0B,WAAW,qBAAqB,CAAC,CAAC;gBACjF,OAAO;aACR;YAED,uCAAuC;YACvC,MAAM,QAAQ,GAAG,IAAI,CAAC;gBACpB,IAAI,EAAE,WAAW,CAAC,WAAW;gBAC7B,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;gBACvD,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC,CAAC;YAEH,qCAAqC;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,EAAE,CAAC,MAAM,EAAE,EACX,kBAAkB,EAClB,GAAG,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,IAAI,QAAQ,EAAE,CAC5F,CAAC;YAEF,IAAI,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;YAErC,mFAAmF;YACnF,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE;gBACpB,IAAI,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE7C,4DAA4D;gBAC5D,IAAI,CAAC,aAAa,EAAE;oBAClB,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAe,CAAC,OAAO,EAAE,EAAE;wBAC/E,qEAAqE;wBACrE,KAAK,UAAU,YAAY;4BACzB,OAAO,CAAC,GAAG,CACT,sDAAsD,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,QAAQ,GAAG,CAC/H,CAAC;4BAEF,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;4BAE5B,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC;gCACxC,WAAW;gCACX,UAAU;gCACV,UAAU,EAAE,SAAS;6BACtB,CAAC,CAAC;4BAEH,OAAO,CAAC,GAAG,CAAC,kCAAkC,UAAU,EAAE,CAAC,CAAC;4BAE5D,aAAa,CAAC,QAAQ,CAAC,GAAG;gCACxB,EAAE,EAAE,QAAQ;gCACZ,WAAW,EAAE,WAAW,CAAC,WAAW;gCACpC,cAAc,EAAE,WAAW,CAAC,OAAO;gCACnC,UAAU;gCACV,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;gCAChE,MAAM,EAAE,aAAa,CAAC,MAAM;gCAC5B,QAAQ,EAAE,aAAa,CAAC,QAAQ;6BACjC,CAAC;4BAEF,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;4BAEhC,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;wBACjC,CAAC;wBAED,0DAA0D;wBAC1D,YAAY,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC/B,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,OAAO,CAAC,GAAG,CACT,kDAAkD,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,QAAQ,GAAG,CAC3H,CAAC;iBACH;gBAED,MAAM,GAAG,MAAM,aAAa,CAAC;aAC9B;iBAAM;gBACL,OAAO,CAAC,GAAG,CACT,4CAA4C,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,QAAQ,GAAG,CACrH,CAAC;aACH;YAED,qDAAqD;YACrD,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE;gBAC9B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3C;iBAAM;gBACL,OAAO,CAAC,GAAG,CACT,oCAAoC,WAAW,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,QAAQ,GAAG,CAC7G,CAAC;gBACF,4BAA4B;gBAC5B,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;aAC3D;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE,GAAG,EAAE;YACV,aAAa,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;YAC/C,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;QACD,IAAI;KACL,CAAC;AACJ,CAAC"}
+{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAgB,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;AAE9B,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;AAgBxF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAgB;IACtD,MAAM,cAAc,GAAkC,CAAC,MAAM,QAAQ,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/F,MAAM,cAAc,GAA2C,EAAE,CAAC;IAClE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE/B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAY,EAAE,EAAE;QACzF,iCAAiC;QACjC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;YACzE,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,WAAW,IAAI,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC;YAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;YAE9B,OAAO,CAAC,GAAG,CAAC,2BAA2B,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;YAE7E,gDAAgD;YAChD,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE;gBAChC,OAAO,CAAC,GAAG,CAAC,kCAAkC,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAEpF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;gBACjG,OAAO;aACR;YAED,8DAA8D;YAC9D,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;gBAEhD,IAAI,CAAC,eAAe,EAAE;oBACpB,OAAO,CAAC,GAAG,CAAC,uDAAuD,WAAW,GAAG,CAAC,CAAC;oBAEnF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,CAAC,CAAC;oBAC/D,OAAO;iBACR;gBAED,GAAG,CAAC,QAAQ,CAAC,IAAI,WAAW,IAAI,eAAe,CAAC,OAAO,IAAI,QAAQ,EAAE,CAAC,CAAC;gBACvE,OAAO;aACR;YAED,wCAAwC;YACxC,IAAI,CAAC,WAAW,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,kCAAkC,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAEpF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,0BAA0B,WAAW,qBAAqB,CAAC,CAAC;gBACjF,OAAO;aACR;YAED,uCAAuC;YACvC,MAAM,QAAQ,GAAG,IAAI,CAAC;gBACpB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;gBAC3C,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC,CAAC;YAEH,qCAAqC;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,EAAE,CAAC,MAAM,EAAE,EACX,kBAAkB,EAClB,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,IAAI,QAAQ,EAAE,CACpE,CAAC;YAEF,IAAI,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;YAEtC,mFAAmF;YACnF,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE;gBACpB,IAAI,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE7C,4DAA4D;gBAC5D,IAAI,CAAC,aAAa,EAAE;oBAClB,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;wBAChF,sDAAsD;wBACtD,KAAK,UAAU,YAAY;4BACzB,OAAO,CAAC,GAAG,CAAC,sDAAsD,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;4BAExG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;4BAE5B,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC;gCACxC,WAAW;gCACX,UAAU;gCACV,UAAU,EAAE,SAAS;6BACtB,CAAC,CAAC;4BAEH,OAAO,CAAC,GAAG,CAAC,kCAAkC,UAAU,EAAE,CAAC,CAAC;4BAE5D,cAAc,CAAC,QAAQ,CAAC,GAAG;gCACzB,EAAE,EAAE,QAAQ;gCACZ,WAAW,EAAE,WAAW;gCACxB,cAAc,EAAE,OAAO;gCACvB,WAAW;gCACX,UAAU;gCACV,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;gCAChE,MAAM,EAAE,aAAa,CAAC,MAAM;gCAC5B,QAAQ,EAAE,aAAa,CAAC,QAAQ;6BACjC,CAAC;4BAEF,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;4BAEhC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;wBAClC,CAAC;wBAED,0DAA0D;wBAC1D,YAAY,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC/B,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,kDAAkD,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;iBACrG;gBAED,MAAM,GAAG,MAAM,aAAa,CAAC;aAC9B;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,4CAA4C,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;aAC/F;YAED,qDAAqD;YACrD,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE;gBAC9B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3C;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,oCAAoC,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBACtF,4BAA4B;gBAC5B,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,2CAA2C,IAAI,GAAG,CAAC,CAAC;IAEhE,OAAO;QACL,KAAK,EAAE,GAAG,EAAE;YACV,aAAa,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YAChD,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;QACD,IAAI;KACL,CAAC;AACJ,CAAC"}

package/lib/commands/start/types.d.ts

@@ -1,3 +1,4 @@
+import type { ResolveMap } from '@ms-cloudpack/package-utilities';
 export interface Session {
     /**
      * The session id, used for identifying
@@ -21,4 +22,8 @@ export interface Session {
      * the browser.
      */
     mode: 'library' | 'development' | 'production';
+    /**
+     * Used to resolve packages in the dependency graph.
+     */
+    resolveMap: ResolveMap;
 }

package/lib/getVersion.d.ts

@@ -0,0 +1 @@
+export declare function getVersion(): string;

package/lib/getVersion.js

@@ -0,0 +1,10 @@
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { findPackageRoot } from '@ms-cloudpack/path-utilities';
+import { readJsonSync } from '@ms-cloudpack/json-utilities';
+export function getVersion() {
+    const packageJSONpath = path.join(findPackageRoot(path.dirname(fileURLToPath(import.meta.url))), 'package.json');
+    const definition = readJsonSync(packageJSONpath);
+    return definition.version;
+}
+//# sourceMappingURL=getVersion.js.map

package/lib/getVersion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getVersion.js","sourceRoot":"","sources":["../src/getVersion.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,MAAM,UAAU,UAAU;IACxB,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IACjH,MAAM,UAAU,GAAG,YAAY,CAAC,eAAe,CAAsB,CAAC;IAEtE,OAAO,UAAU,CAAC,OAAO,CAAC;AAC5B,CAAC"}

package/lib/index.d.ts

@@ -1 +1,5 @@
+/**
+ * Entry point for the cloudpack CLI. Resolves all commands defined
+ * within the "./commands" folder.
+ */
 export declare function start(): Promise<void>;

package/lib/index.js

@@ -2,15 +2,23 @@ import { Command } from 'commander';
 import glob from 'glob';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
+import { getVersion } from './getVersion.js';
 const currentPath = path.dirname(fileURLToPath(import.meta.url));
+/**
+ * Entry point for the cloudpack CLI. Resolves all commands defined
+ * within the "./commands" folder.
+ */
 export async function start() {
     const program = new Command();
-    program.name('cloudpack').usage('<command> [options]');
+    program.name('cloudpack').version(getVersion()).usage('<command> [options]');
     const commands = glob.sync('commands/*/index.js', { cwd: currentPath });
     for (const commandPath of commands) {
         const command = await import(pathToFileURL(path.resolve(currentPath, commandPath)).toString());
         command.init(program);
     }
     program.parse(process.argv);
+    if (program.args.length === 0) {
+        program.help();
+    }
 }
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEnD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAEvD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAExE,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;QAClC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE/F,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAE7E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAExE,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;QAClC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE/F,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.0.6",
+  "version": "0.1.1",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -16,11 +16,11 @@
     "cloudpack": "./lib/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/bundler": "^0.0.6",
-    "@ms-cloudpack/create-express-app": "^0.0.2",
+    "@ms-cloudpack/bundler": "^0.1.1",
+    "@ms-cloudpack/create-express-app": "^0.1.0",
     "@ms-cloudpack/json-utilities": "^0.0.3",
-    "@ms-cloudpack/package-utilities": "^0.1.6",
-    "@ms-cloudpack/path-utilities": "^0.1.0",
+    "@ms-cloudpack/package-utilities": "^0.3.0",
+    "@ms-cloudpack/path-utilities": "^0.2.0",
     "commander": "^9.1.0",
     "filenamify": "^5.1.0",
     "fs-extra": "^10.1.0",

package/lib/tsdoc-metadata.json

@@ -1,11 +0,0 @@
-// This file is read by tools that parse documentation comments conforming to the TSDoc standard.
-// It should be published with your NPM package.  It should not be tracked by Git.
-{
-  "tsdocVersion": "0.12",
-  "toolPackages": [
-    {
-      "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.24.0"
-    }
-  ]
-}