@appland/appmap 3.81.0 → 3.82.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [@appland/appmap-v3.82.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.81.0...@appland/appmap-v3.82.0) (2023-07-19)
+
+
+### Bug Fixes
+
+* Fall back to browser when opening AppMap on Darwin in VSCode ([23147af](https://github.com/getappmap/appmap-js/commit/23147af419aaadd4f3123a065d9085757ee8db71)), closes [#1250](https://github.com/getappmap/appmap-js/issues/1250)
+
+
+### Features
+
+* upgrade @appland/models to 2.6.3 ([6e31f9c](https://github.com/getappmap/appmap-js/commit/6e31f9cc179ac0edfcde2861b937cd104ed4c687))
+
 # [@appland/appmap-v3.81.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.80.2...@appland/appmap-v3.81.0) (2023-07-13)
 
 

package/built/cmds/open/openers.js

@@ -3,22 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openInTool = exports.openInVSCode = exports.vscodeURL = exports.openInBrowser = exports.abspath = void 0;
+exports.vscodeURL = exports.openInBrowser = exports.abspath = void 0;
+const node_process_1 = __importDefault(require("node:process"));
 const serveAndOpen_1 = require("../../lib/serveAndOpen");
-const supports_hyperlinks_1 = __importDefault(require("supports-hyperlinks"));
 const path_1 = require("path");
-// See also: https://github.com/getappmap/scanner/pull/9/files#diff-3294a832ea2276e554177e0b3007cc2d401c082912c7fbde49fa09141bf1aed1R1
-function hyperlink(filePath, link) {
-    const OSC = '\u001B]';
-    const BEL = '\u0007';
-    const SEP = ';';
-    if (!supports_hyperlinks_1.default.stdout) {
-        return filePath;
-    }
-    return [OSC, '8', SEP, SEP, link, BEL, filePath, OSC, '8', SEP, SEP, BEL].join('');
-}
 function abspath(file) {
-    return (0, path_1.resolve)(process.cwd(), file);
+    return (0, path_1.resolve)(node_process_1.default.cwd(), file);
 }
 exports.abspath = abspath;
 async function openInBrowser(appMapFile, verifyInSubdir) {
@@ -29,13 +19,4 @@ function vscodeURL(appMapFile) {
     return (0, path_1.join)('vscode://file/', abspath(appMapFile));
 }
 exports.vscodeURL = vscodeURL;
-async function openInVSCode(appMapFile) {
-    console.log(hyperlink(appMapFile, vscodeURL(appMapFile)));
-}
-exports.openInVSCode = openInVSCode;
-async function openInTool(appMapFile, toolId) {
-    const link = `${toolId}://open?file=${abspath(appMapFile)}`;
-    console.log(hyperlink(appMapFile, link));
-}
-exports.openInTool = openInTool;
 //# sourceMappingURL=openers.js.map

package/built/cmds/open/openers.js.map

@@ -1 +1 @@
-{"version":3,"file":"openers.js","sourceRoot":"","sources":["../../../src/cmds/open/openers.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA4D;AAC5D,8EAAqD;AACrD,+BAAqC;AAErC,sIAAsI;AACtI,SAAS,SAAS,CAAC,QAAgB,EAAE,IAAY;IAC/C,MAAM,GAAG,GAAG,SAAS,CAAC;IACtB,MAAM,GAAG,GAAG,QAAQ,CAAC;IACrB,MAAM,GAAG,GAAG,GAAG,CAAC;IAEhB,IAAI,CAAC,6BAAkB,CAAC,MAAM,EAAE;QAC9B,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACrF,CAAC;AAED,SAAgB,OAAO,CAAC,IAAY;IAClC,OAAO,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC;AAFD,0BAEC;AAEM,KAAK,UAAU,aAAa,CAAC,UAAkB,EAAE,cAAuB;IAC7E,MAAM,IAAA,iCAAkB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;AACvD,CAAC;AAFD,sCAEC;AAED,SAAgB,SAAS,CAAC,UAAkB;IAC1C,OAAO,IAAA,WAAI,EAAC,gBAAgB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;AACrD,CAAC;AAFD,8BAEC;AAEM,KAAK,UAAU,YAAY,CAAC,UAAkB;IACnD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;AAC5D,CAAC;AAFD,oCAEC;AAEM,KAAK,UAAU,UAAU,CAAC,UAAkB,EAAE,MAAe;IAClE,MAAM,IAAI,GAAG,GAAG,MAAM,gBAAgB,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;AAC3C,CAAC;AAHD,gCAGC"}
+{"version":3,"file":"openers.js","sourceRoot":"","sources":["../../../src/cmds/open/openers.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAmC;AACnC,yDAA4D;AAC5D,+BAAqC;AAErC,SAAgB,OAAO,CAAC,IAAY;IAClC,OAAO,IAAA,cAAO,EAAC,sBAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC;AAFD,0BAEC;AAEM,KAAK,UAAU,aAAa,CAAC,UAAkB,EAAE,cAAuB;IAC7E,MAAM,IAAA,iCAAkB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;AACvD,CAAC;AAFD,sCAEC;AAED,SAAgB,SAAS,CAAC,UAAkB;IAC1C,OAAO,IAAA,WAAI,EAAC,gBAAgB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;AACrD,CAAC;AAFD,8BAEC"}

package/built/cmds/open/showAppMap.js

@@ -3,17 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_process_1 = __importDefault(require("node:process"));
 const child_process_1 = require("child_process");
 const userInteraction_1 = __importDefault(require("../userInteraction"));
 const openers_1 = require("./openers");
 async function showAppMap(appMapFile) {
-    const termProgram = process.env.TERM_PROGRAM;
-    if (process.platform === 'darwin' && termProgram === 'vscode') {
-        (0, child_process_1.spawn)('code', [(0, openers_1.abspath)(appMapFile)]);
-    }
-    else {
-        await (0, openers_1.openInBrowser)(appMapFile, false);
+    function open() {
+        if (node_process_1.default.platform === 'darwin' && node_process_1.default.env.TERM_PROGRAM === 'vscode')
+            try {
+                (0, child_process_1.spawn)('code', [(0, openers_1.abspath)(appMapFile)]);
+                return;
+            }
+            catch (_a) { } // fallthrough
+        return (0, openers_1.openInBrowser)(appMapFile, false);
     }
+    await open();
     const { action } = await userInteraction_1.default.prompt({
         type: 'list',
         name: 'action',

package/built/cmds/open/showAppMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"showAppMap.js","sourceRoot":"","sources":["../../../src/cmds/open/showAppMap.ts"],"names":[],"mappings":";;;;;AAAA,iDAAsC;AACtC,yEAAoC;AACpC,uCAA6E;AAE9D,KAAK,UAAU,UAAU,CAAC,UAAkB;IACzD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;IAC7C,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC7D,IAAA,qBAAK,EAAC,MAAM,EAAE,CAAC,IAAA,iBAAO,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KACtC;SAAM;QACL,MAAM,IAAA,uBAAa,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;KACxC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;QACjC,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,CAAC,UAAU,UAAU,EAAE,EAAE,MAAM,CAAC;KAC1C,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC/B,MAAM,UAAU,CAAC,UAAU,CAAC,CAAC;KAC9B;AACH,CAAC;AAjBD,6BAiBC"}
+{"version":3,"file":"showAppMap.js","sourceRoot":"","sources":["../../../src/cmds/open/showAppMap.ts"],"names":[],"mappings":";;;;;AAAA,gEAAmC;AACnC,iDAAsC;AACtC,yEAAoC;AACpC,uCAAmD;AAEpC,KAAK,UAAU,UAAU,CAAC,UAAkB;IACzD,SAAS,IAAI;QACX,IAAI,sBAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,sBAAO,CAAC,GAAG,CAAC,YAAY,KAAK,QAAQ;YACxE,IAAI;gBACF,IAAA,qBAAK,EAAC,MAAM,EAAE,CAAC,IAAA,iBAAO,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBACrC,OAAO;aACR;YAAC,WAAM,GAAE,CAAC,cAAc;QAC3B,OAAO,IAAA,uBAAa,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,IAAI,EAAE,CAAC;IAEb,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;QACjC,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,CAAC,UAAU,UAAU,EAAE,EAAE,MAAM,CAAC;KAC1C,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC/B,MAAM,UAAU,CAAC,UAAU,CAAC,CAAC;KAC9B;AACH,CAAC;AArBD,6BAqBC"}