@skyramp/skyramp 1.3.16 → 1.3.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyramp/skyramp",
-  "version": "1.3.16",
+  "version": "1.3.18",
   "description": "module for leveraging skyramp cli functionality",
   "scripts": {
     "lint": "eslint 'src/**/*.js' 'src/**/*.ts' --fix",

package/src/classes/GoJSDiagram.js

@@ -320,6 +320,7 @@ class GoJSDiagram {
       anchorOffsetY = 0,
     } = opts;
 
+    // Phase 1: Add the node via GoJS model API (no selection here).
     await this._evaluateInFrame(([diagSel, palSel, nodeKey, nodeCat, anKey, offX, offY]) => {
       const go = window.go;
       if (!go) throw new Error('GoJSDiagram: GoJS not found on window');
@@ -361,6 +362,32 @@ class GoJSDiagram {
         diagram.commitTransaction(txName);
       }
     }, [diagramSelector, paletteSelector ?? '', key, category, anchorKey ?? '', anchorOffsetX, anchorOffsetY]);
+
+    // Phase 2: Wait for GoJS to finish its layout pass after the transaction.
+    await this._page.waitForTimeout(300);
+
+    // Phase 3: Select via GoJS API (fires ChangedSelection for apps that listen to it).
+    // Returns debug info so callers can log selection state without cross-origin console issues.
+    await this._evaluateInFrame(([diagSel, nodeKey]) => {
+      const go = window.go;
+      if (!go) return { error: 'no go' };
+      const diagramDiv = document.querySelector(diagSel);
+      if (!diagramDiv) return { error: 'no div' };
+      const diagram = go.Diagram.fromDiv(diagramDiv);
+      if (!diagram) return { error: 'no diagram' };
+      const node = diagram.findNodeForKey(nodeKey);
+      if (!node) return { error: 'node not found', key: nodeKey };
+      diagram.select(node);
+      return { selected: node.isSelected, selectionCount: diagram.selection.count };
+    }, [diagramSelector, key]);
+
+    // Phase 4: Click at the node's page-level coordinates using Playwright's mouse.
+    // This fires the full browser event chain (including any overlay div handlers)
+    // for apps that rely on click events rather than GoJS's ChangedSelection.
+    // _resolveDiagramNode() computes page-level coords by combining the canvas
+    // bounding box (via Playwright) with GoJS transformDocToView() (via frame.evaluate).
+    const coords = await this._resolveDiagramNode(diagramSelector, key);
+    await this._page.mouse.click(coords.x, coords.y);
   }
 }
 

package/src/classes/SkyrampClient.d.ts

@@ -146,6 +146,9 @@ interface GenerateRestTestOptions {
   consumerMode?: boolean;
   providerOutput?: string;
   consumerOutput?: string;
+  skipProvisionParents?: boolean;
+  mockPort?: number;
+  optionalFields?: boolean;
 }
 
 interface GenerateRestMockOptions {
@@ -172,6 +175,8 @@ interface GenerateRestMockOptions {
   apiSchema?: string[];
   traceFilePath?: string;
   entrypoint?: string;
+  mockPort?: number;
+  optionalFields?: boolean;
 }
 
 interface SendScenarioOptions {

package/src/classes/SkyrampClient.js

@@ -111,7 +111,8 @@ const generateRestTestWrapper = lib.func('generateRestTestWrapper', 'string', [
     'string',       // providerOutput (contract test)
     'string',       // consumerOutput (contract test)
     'bool',         // skipProvisionParents
-    'int'           // mockPort
+    'int',          // mockPort
+    'bool'          // optionalFields
 ]);
 const generateRestMockWrapper = lib.func('generateRestMockWrapper', 'string', [
     'string',       // uri
@@ -136,7 +137,8 @@ const generateRestMockWrapper = lib.func('generateRestMockWrapper', 'string', [
     'string',       // apiSchema
     'string',       // traceFilePath
     'string',       // entryPoint
-    'int'           // mockPort
+    'int',          // mockPort
+    'bool'          // optionalFields
 ]);
 const traceCollectWrapper = lib.func('traceCollectWrapper', 'string', ['string', 'string', 'bool', 'string', 'string']);
 const analyzeOpenapiWrapper = lib.func('analyzeOpenapiWrapper', 'string', ['string', 'string']);
@@ -960,6 +962,7 @@ class SkyrampClient {
         options.consumerOutput || "",
         options.skipProvisionParents || false,
         options.mockPort || 0,
+        options.optionalFields || false,
         (err, res) => {
           if (err) {
             reject(err);
@@ -997,6 +1000,7 @@ class SkyrampClient {
         options.traceFilePath || "",
         options.entrypoint || "",
         options.mockPort || 0,
+        options.optionalFields || false,
         (err, res) => {
           if (err) {
             reject(err);

package/src/classes/SmartPlaywright.js

@@ -189,6 +189,11 @@ async function retryWithLLM(skyrampLocator, error) {
         throw error
     }
 
+    const consecutiveCount = skyrampLocator._skyrampPage.incrementConsecutiveLLMCount();
+    if (consecutiveCount >= 3) {
+        throw new Error(`LLM-based locator retry limit exceeded (${consecutiveCount} consecutive attempts). Please add "data-testid" attributes for more stable locators.`);
+    }
+
     let locatorStr = skyrampLocator._locator.toString();
 
     if (!shouldAttemptImprovement(errorMessage, errorType)) {
@@ -241,7 +246,8 @@ async function retryWithLLM(skyrampLocator, error) {
 
             if (locatorCount == 1) {
                 const func = newLocator[skyrampLocator.execFname];
-                return func.call(newLocator, skyrampLocator.execParam, skyrampLocator.execArgs).then(result => {
+                try {
+                    const result = await func.call(newLocator, skyrampLocator.execParam, skyrampLocator.execArgs);
                     console.log(`✅ SUCCESS! Used selector: ${newLocator} instead of ${skyrampLocator._locator}`);
                     console.log(`  ${parseErrorStack(error.stack)}`);
 
@@ -249,10 +255,10 @@ async function retryWithLLM(skyrampLocator, error) {
                     skyrampLocator.locatorCount = 1;
                     skyrampLocator._skyrampPage.addLLMChoices(skyrampLocator._locator, newLocator, error.stack);
                     return result;
-                }).catch(error => {
+                } catch (innerError) {
                     // if it fails, move to the next one
-                    debug(`retrying with LLM failed at ${skyrampLocator._locator} replaced by {newLocator}`, error.name);
-                });
+                    debug(`retrying with LLM failed at ${skyrampLocator._locator} replaced by ${newLocator}`, innerError.name);
+                }
             }
         } catch {
             continue
@@ -400,6 +406,7 @@ class SkyrampPlaywrightLocator {
             // if it fails, there could be potentially a hydration issue we can retry after a little wait time
             try {
                 return await this.execute().then(result => {
+                    this._skyrampPage.resetConsecutiveLLMCount();
                     return this._skyrampPage.checkNavigation(currentUrl, result);
                 });
             } catch (error) {
@@ -412,6 +419,7 @@ class SkyrampPlaywrightLocator {
 
                     // Is this really necessary?
                     await this.execute(true).then(result => {
+                        this._skyrampPage.resetConsecutiveLLMCount();
                         return this._skyrampPage.checkNavigation(currentUrl, result);
                     }).catch(() => {
                         debug(`  failed second time and execute previous locator ${this._previousLocator._locator} again`);
@@ -458,6 +466,7 @@ class SkyrampPlaywrightLocator {
 
             // this will likely fail, but we try to get error message generated by playwright
             return this.execute().then(result => {
+                this._skyrampPage.resetConsecutiveLLMCount();
                 return this._skyrampPage.checkNavigation(currentUrl, result);
             }).catch(error => {
                 return this._retryWithLLM(error, this.newMultiLocatorErrorMsg());
@@ -482,6 +491,7 @@ class SkyrampPlaywrightLocator {
                 try {
                     // then execute the current one
                     return await this.execute().then(result => {
+                        this._skyrampPage.resetConsecutiveLLMCount();
                         return this._skyrampPage.checkNavigation(currentUrl, result);
                     });
                 } catch (error) {
@@ -490,6 +500,7 @@ class SkyrampPlaywrightLocator {
                         // wait for some time and re execute
                         await this.wait(defaultWaitForTimeout);
                         return this.execute(true).then(result => {
+                            this._skyrampPage.resetConsecutiveLLMCount();
                             return this._skyrampPage.checkNavigation(currentUrl, result);
                         }).catch(newError => {
                             return this._retryWithLLM(newError, this.newPrevHydrationErrorMsg());
@@ -517,6 +528,7 @@ class SkyrampPlaywrightLocator {
 
                 try {
                     return await this.execute().then(result => {
+                        this._skyrampPage.resetConsecutiveLLMCount();
                         return this._skyrampPage.checkNavigation(currentUrl, result);
                     });
                 } catch (error) {
@@ -524,6 +536,7 @@ class SkyrampPlaywrightLocator {
                         debug(`${this._locator} failed at first try. attempting again with some timeout`);
                         await this.wait(defaultWaitForTimeout);
                         return this.execute(true).then(result=> {
+                            this._skyrampPage.resetConsecutiveLLMCount();
                             return this._skyrampPage.checkNavigation(currentUrl, result);
                         }).catch(newError => {
                             if (newError.name == "TimeoutError") {
@@ -1265,6 +1278,18 @@ class SkyrampPlaywrightPage {
         return result;
     }
 
+    incrementConsecutiveLLMCount() {
+        if (this.consecutiveLLMCount == undefined) {
+            this.consecutiveLLMCount = 0;
+        }
+        this.consecutiveLLMCount++;
+        return this.consecutiveLLMCount;
+    }
+
+    resetConsecutiveLLMCount() {
+        this.consecutiveLLMCount = 0;
+    }
+
     addLLMChoices(originalLocator, newLocator, stack) {
         if (this.llmChoices == undefined) {
             this.llmChoices = []