swipium 1.4.0 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +313 -0
- package/README.md +175 -219
- package/THREAT_MODEL.md +223 -47
- package/dist/appMap/automationLink.js +39 -26
- package/dist/appMap/automationLink.js.map +1 -1
- package/dist/appMap/build.js +68 -20
- package/dist/appMap/build.js.map +1 -1
- package/dist/appMap/codeIndex.js +31 -5
- package/dist/appMap/codeIndex.js.map +1 -1
- package/dist/appMap/featureIndex.js +23 -5
- package/dist/appMap/featureIndex.js.map +1 -1
- package/dist/appMap/featureModel.js +44 -8
- package/dist/appMap/featureModel.js.map +1 -1
- package/dist/appMap/firstRunApply.js +24 -6
- package/dist/appMap/firstRunApply.js.map +1 -1
- package/dist/appMap/fsWalk.js +19 -2
- package/dist/appMap/fsWalk.js.map +1 -1
- package/dist/appMap/issues.js +10 -30
- package/dist/appMap/issues.js.map +1 -1
- package/dist/appMap/migrations.js +6 -6
- package/dist/appMap/migrations.js.map +1 -1
- package/dist/appMap/prelaunch.js +2 -2
- package/dist/appMap/prelaunch.js.map +1 -1
- package/dist/appMap/projectRegistry.js +83 -11
- package/dist/appMap/projectRegistry.js.map +1 -1
- package/dist/appMap/provenance.js +2 -2
- package/dist/appMap/provenance.js.map +1 -1
- package/dist/appMap/query.js +21 -5
- package/dist/appMap/query.js.map +1 -1
- package/dist/appMap/runtimeMerge.js +12 -5
- package/dist/appMap/runtimeMerge.js.map +1 -1
- package/dist/appMap/schema.js +1 -1
- package/dist/appMap/schema.js.map +1 -1
- package/dist/appMap/screenMatch.js +6 -2
- package/dist/appMap/screenMatch.js.map +1 -1
- package/dist/appMap/staticScan.js +151 -39
- package/dist/appMap/staticScan.js.map +1 -1
- package/dist/appMap/store.js +58 -85
- package/dist/appMap/store.js.map +1 -1
- package/dist/appMap/tsAstScan.js +34 -12
- package/dist/appMap/tsAstScan.js.map +1 -1
- package/dist/artifacts/bundletool.js +49 -12
- package/dist/artifacts/bundletool.js.map +1 -1
- package/dist/artifacts/resolve.js +41 -14
- package/dist/artifacts/resolve.js.map +1 -1
- package/dist/automation/capabilities.js +112 -30
- package/dist/automation/capabilities.js.map +1 -1
- package/dist/automation/gestures.js +6 -2
- package/dist/automation/gestures.js.map +1 -1
- package/dist/automation/plan.js +71 -23
- package/dist/automation/plan.js.map +1 -1
- package/dist/automation/report.js +15 -5
- package/dist/automation/report.js.map +1 -1
- package/dist/automation/selectors.js +22 -28
- package/dist/automation/selectors.js.map +1 -1
- package/dist/automation/types.js +1 -1
- package/dist/automation/types.js.map +1 -1
- package/dist/automation/waits.js +14 -8
- package/dist/automation/waits.js.map +1 -1
- package/dist/automation/webview.js +9 -3
- package/dist/automation/webview.js.map +1 -1
- package/dist/automationGen/appiumModel.js +16 -8
- package/dist/automationGen/appiumModel.js.map +1 -1
- package/dist/automationGen/ciEmitter.js +6 -6
- package/dist/automationGen/ciEmitter.js.map +1 -1
- package/dist/automationGen/identifiers.js +224 -0
- package/dist/automationGen/identifiers.js.map +1 -0
- package/dist/automationGen/jsEmitter.js +288 -121
- package/dist/automationGen/jsEmitter.js.map +1 -1
- package/dist/automationGen/packagePatch.js +2 -2
- package/dist/automationGen/packagePatch.js.map +1 -1
- package/dist/automationGen/platformResolve.js +36 -0
- package/dist/automationGen/platformResolve.js.map +1 -0
- package/dist/automationGen/projectProfile.js +76 -27
- package/dist/automationGen/projectProfile.js.map +1 -1
- package/dist/automationGen/pythonEmitter.js +278 -107
- package/dist/automationGen/pythonEmitter.js.map +1 -1
- package/dist/automationGen/readmeEmitter.js +7 -6
- package/dist/automationGen/readmeEmitter.js.map +1 -1
- package/dist/automationGen/run.js +388 -0
- package/dist/automationGen/run.js.map +1 -0
- package/dist/automationGen/suitePlan.js +17 -10
- package/dist/automationGen/suitePlan.js.map +1 -1
- package/dist/automationGen/validation.js +52 -12
- package/dist/automationGen/validation.js.map +1 -1
- package/dist/build/parseBuildLog.js +235 -31
- package/dist/build/parseBuildLog.js.map +1 -1
- package/dist/build/plan.js +39 -18
- package/dist/build/plan.js.map +1 -1
- package/dist/ci/preflight.js +13 -4
- package/dist/ci/preflight.js.map +1 -1
- package/dist/cli/gc.js +74 -0
- package/dist/cli/gc.js.map +1 -0
- package/dist/cli/init.js +217 -26
- package/dist/cli/init.js.map +1 -1
- package/dist/cli/main.js +50 -0
- package/dist/cli/main.js.map +1 -0
- package/dist/cli/report.js +218 -0
- package/dist/cli/report.js.map +1 -0
- package/dist/cli/scan.js +36 -15
- package/dist/cli/scan.js.map +1 -1
- package/dist/cli/suite.js +7 -7
- package/dist/cli/suite.js.map +1 -1
- package/dist/cli/verify.js +7 -7
- package/dist/cli/verify.js.map +1 -1
- package/dist/consent/consent.js +162 -5
- package/dist/consent/consent.js.map +1 -1
- package/dist/context/detect.js +55 -18
- package/dist/context/detect.js.map +1 -1
- package/dist/context/findApps.js +22 -8
- package/dist/context/findApps.js.map +1 -1
- package/dist/context/projectRoot.js +174 -19
- package/dist/context/projectRoot.js.map +1 -1
- package/dist/context/scan.js +1 -1
- package/dist/context/scan.js.map +1 -1
- package/dist/core/capabilityGroups.js +90 -0
- package/dist/core/capabilityGroups.js.map +1 -0
- package/dist/core/target.js +10 -8
- package/dist/core/target.js.map +1 -1
- package/dist/core/targetPlan.js +160 -39
- package/dist/core/targetPlan.js.map +1 -1
- package/dist/drivers/DirectDriver.js +317 -43
- package/dist/drivers/DirectDriver.js.map +1 -1
- package/dist/drivers/SimctlDriver.js +124 -8
- package/dist/drivers/SimctlDriver.js.map +1 -1
- package/dist/drivers/WdaDriver.js +365 -55
- package/dist/drivers/WdaDriver.js.map +1 -1
- package/dist/explore/candidates.js +7 -3
- package/dist/explore/candidates.js.map +1 -1
- package/dist/explore/graph.js +15 -6
- package/dist/explore/graph.js.map +1 -1
- package/dist/explore/memory.js +4 -1
- package/dist/explore/memory.js.map +1 -1
- package/dist/explore/planner.js +54 -9
- package/dist/explore/planner.js.map +1 -1
- package/dist/explore/policy.js +11 -6
- package/dist/explore/policy.js.map +1 -1
- package/dist/explore/runner.js +363 -190
- package/dist/explore/runner.js.map +1 -1
- package/dist/explore/signatures.js +4 -2
- package/dist/explore/signatures.js.map +1 -1
- package/dist/explore/suite.js +3 -1
- package/dist/explore/suite.js.map +1 -1
- package/dist/featureTesting/executionBootstrap.js +137 -29
- package/dist/featureTesting/executionBootstrap.js.map +1 -1
- package/dist/featureTesting/featureMap.js +6 -3
- package/dist/featureTesting/featureMap.js.map +1 -1
- package/dist/featureTesting/featureScope.js +101 -20
- package/dist/featureTesting/featureScope.js.map +1 -1
- package/dist/featureTesting/mapFeatureScope.js +44 -15
- package/dist/featureTesting/mapFeatureScope.js.map +1 -1
- package/dist/featureTesting/objectiveModel.js +15 -11
- package/dist/featureTesting/objectiveModel.js.map +1 -1
- package/dist/featureTesting/resultMerge.js +16 -8
- package/dist/featureTesting/resultMerge.js.map +1 -1
- package/dist/featureTesting/sources.js +8 -5
- package/dist/featureTesting/sources.js.map +1 -1
- package/dist/featureTesting/suiteBridge.js +8 -2
- package/dist/featureTesting/suiteBridge.js.map +1 -1
- package/dist/featureTesting/synonyms.js +32 -4
- package/dist/featureTesting/synonyms.js.map +1 -1
- package/dist/featureTesting/testCaseFactory.js +27 -15
- package/dist/featureTesting/testCaseFactory.js.map +1 -1
- package/dist/featureTesting/testPlan.js +34 -12
- package/dist/featureTesting/testPlan.js.map +1 -1
- package/dist/firstRun/authStateMachine.js +1 -1
- package/dist/firstRun/authStateMachine.js.map +1 -1
- package/dist/firstRun/classifyScreen.js +9 -6
- package/dist/firstRun/classifyScreen.js.map +1 -1
- package/dist/firstRun/firstRunPlanner.js +16 -13
- package/dist/firstRun/firstRunPlanner.js.map +1 -1
- package/dist/firstRun/firstRunRunner.js +92 -31
- package/dist/firstRun/firstRunRunner.js.map +1 -1
- package/dist/firstRun/generatedDataPolicy.js +25 -15
- package/dist/firstRun/generatedDataPolicy.js.map +1 -1
- package/dist/firstRun/inputPlanner.js +45 -11
- package/dist/firstRun/inputPlanner.js.map +1 -1
- package/dist/firstRun/onboardingStateMachine.js +1 -1
- package/dist/firstRun/onboardingStateMachine.js.map +1 -1
- package/dist/firstRun/paywallPolicy.js +3 -3
- package/dist/firstRun/paywallPolicy.js.map +1 -1
- package/dist/firstRun/types.js +1 -1
- package/dist/firstRun/types.js.map +1 -1
- package/dist/fixtures/catalog.js +72 -9
- package/dist/fixtures/catalog.js.map +1 -1
- package/dist/fixtures/load.js +50 -0
- package/dist/fixtures/load.js.map +1 -0
- package/dist/flows/discover.js +2 -2
- package/dist/flows/discover.js.map +1 -1
- package/dist/flows/generate.js +68 -17
- package/dist/flows/generate.js.map +1 -1
- package/dist/flows/lint.js +88 -14
- package/dist/flows/lint.js.map +1 -1
- package/dist/flows/pack.js +21 -5
- package/dist/flows/pack.js.map +1 -1
- package/dist/flows/paths.js +57 -0
- package/dist/flows/paths.js.map +1 -0
- package/dist/flows/repair.js +176 -37
- package/dist/flows/repair.js.map +1 -1
- package/dist/flows/run.js +308 -99
- package/dist/flows/run.js.map +1 -1
- package/dist/flows/schema.js +107 -25
- package/dist/flows/schema.js.map +1 -1
- package/dist/flows/seedExec.js +8 -4
- package/dist/flows/seedExec.js.map +1 -1
- package/dist/flows/templates.js +5 -5
- package/dist/index.js +50 -8
- package/dist/index.js.map +1 -1
- package/dist/ios/signing.js +32 -3
- package/dist/ios/signing.js.map +1 -1
- package/dist/issues/classify.js +28 -20
- package/dist/issues/classify.js.map +1 -1
- package/dist/issues/fingerprint.js +35 -9
- package/dist/issues/fingerprint.js.map +1 -1
- package/dist/issues/index.js +93 -46
- package/dist/issues/index.js.map +1 -1
- package/dist/issues/metrics.js +6 -5
- package/dist/issues/metrics.js.map +1 -1
- package/dist/issues/recurrence.js +35 -8
- package/dist/issues/recurrence.js.map +1 -1
- package/dist/issues/report.js +12 -8
- package/dist/issues/report.js.map +1 -1
- package/dist/issues/reportBridge.js +40 -9
- package/dist/issues/reportBridge.js.map +1 -1
- package/dist/issues/schema.js +2 -2
- package/dist/issues/schema.js.map +1 -1
- package/dist/issues/sourceRevision.js +2 -2
- package/dist/issues/sourceRevision.js.map +1 -1
- package/dist/issues/store.js +110 -32
- package/dist/issues/store.js.map +1 -1
- package/dist/lib/abortScope.js +48 -0
- package/dist/lib/abortScope.js.map +1 -0
- package/dist/lib/android.js +84 -8
- package/dist/lib/android.js.map +1 -1
- package/dist/lib/coordSpace.js +1 -1
- package/dist/lib/coordSpace.js.map +1 -1
- package/dist/lib/device.js +53 -12
- package/dist/lib/device.js.map +1 -1
- package/dist/lib/gestures.js +141 -0
- package/dist/lib/gestures.js.map +1 -0
- package/dist/lib/gitignore.js +4 -3
- package/dist/lib/gitignore.js.map +1 -1
- package/dist/lib/image.js +12 -3
- package/dist/lib/image.js.map +1 -1
- package/dist/lib/lockfile.js +399 -0
- package/dist/lib/lockfile.js.map +1 -0
- package/dist/lib/needsInput.js +9 -6
- package/dist/lib/needsInput.js.map +1 -1
- package/dist/lib/png.js +4 -3
- package/dist/lib/png.js.map +1 -1
- package/dist/lib/redact.js +170 -9
- package/dist/lib/redact.js.map +1 -1
- package/dist/lib/result.js +94 -10
- package/dist/lib/result.js.map +1 -1
- package/dist/lib/schemaHash.js +7 -5
- package/dist/lib/schemaHash.js.map +1 -1
- package/dist/lib/sensitive.js +6 -3
- package/dist/lib/sensitive.js.map +1 -1
- package/dist/lib/simctl.js +3 -3
- package/dist/lib/simctl.js.map +1 -1
- package/dist/lib/spawn.js +78 -17
- package/dist/lib/spawn.js.map +1 -1
- package/dist/lib/toolAnnotations.js +114 -0
- package/dist/lib/toolAnnotations.js.map +1 -0
- package/dist/lib/wda.js +321 -25
- package/dist/lib/wda.js.map +1 -1
- package/dist/lib/wdaConfig.js +12 -5
- package/dist/lib/wdaConfig.js.map +1 -1
- package/dist/lib/wdaTune.js +52 -23
- package/dist/lib/wdaTune.js.map +1 -1
- package/dist/mobileAudit/checks.js +150 -28
- package/dist/mobileAudit/checks.js.map +1 -1
- package/dist/mobileAudit/evidence.js +4 -4
- package/dist/mobileAudit/evidence.js.map +1 -1
- package/dist/mobileAudit/profiles.js +121 -20
- package/dist/mobileAudit/profiles.js.map +1 -1
- package/dist/mobileAudit/results.js +9 -4
- package/dist/mobileAudit/results.js.map +1 -1
- package/dist/mobileAudit/runner.js +214 -35
- package/dist/mobileAudit/runner.js.map +1 -1
- package/dist/oracle/auth.js +1 -1
- package/dist/oracle/auth.js.map +1 -1
- package/dist/oracle/failures.js +1085 -145
- package/dist/oracle/failures.js.map +1 -1
- package/dist/oracle/health.js +148 -26
- package/dist/oracle/health.js.map +1 -1
- package/dist/oracle/locator.js +148 -19
- package/dist/oracle/locator.js.map +1 -1
- package/dist/oracle/record.js +3 -3
- package/dist/oracle/record.js.map +1 -1
- package/dist/orchestration/envelope.js +2 -2
- package/dist/orchestration/envelope.js.map +1 -1
- package/dist/orchestration/goal.js +7 -13
- package/dist/orchestration/goal.js.map +1 -1
- package/dist/orchestration/testThis/execute.js +167 -0
- package/dist/orchestration/testThis/execute.js.map +1 -0
- package/dist/orchestration/testThis/pipeline.js +413 -0
- package/dist/orchestration/testThis/pipeline.js.map +1 -0
- package/dist/orchestration/testThis/plan.js +519 -0
- package/dist/orchestration/testThis/plan.js.map +1 -0
- package/dist/orchestration/testThis/sessionIntent.js +72 -0
- package/dist/orchestration/testThis/sessionIntent.js.map +1 -0
- package/dist/orchestration/testThis/terminal.js +136 -0
- package/dist/orchestration/testThis/terminal.js.map +1 -0
- package/dist/orchestration/testThis/types.js +12 -0
- package/dist/orchestration/testThis/types.js.map +1 -0
- package/dist/plan/plan.js +9 -9
- package/dist/plan/plan.js.map +1 -1
- package/dist/prompts/index.js +24 -24
- package/dist/prompts/index.js.map +1 -1
- package/dist/report/coverage.js +0 -1
- package/dist/report/coverage.js.map +1 -1
- package/dist/report/evidence.js.map +1 -1
- package/dist/report/export.js +449 -72
- package/dist/report/export.js.map +1 -1
- package/dist/report/findingsDedupe.js +41 -0
- package/dist/report/findingsDedupe.js.map +1 -0
- package/dist/report/flake.js +13 -14
- package/dist/report/flake.js.map +1 -1
- package/dist/report/history.js +72 -38
- package/dist/report/history.js.map +1 -1
- package/dist/report/policy.js +18 -7
- package/dist/report/policy.js.map +1 -1
- package/dist/report/qaLevel.js +10 -16
- package/dist/report/qaLevel.js.map +1 -1
- package/dist/report/readiness.js +42 -12
- package/dist/report/readiness.js.map +1 -1
- package/dist/report/sarifSources.js +160 -0
- package/dist/report/sarifSources.js.map +1 -0
- package/dist/report/summary.js +2 -2
- package/dist/report/summary.js.map +1 -1
- package/dist/report/testCatalog.js +4 -4
- package/dist/report/testCatalog.js.map +1 -1
- package/dist/report/timing.js +23 -23
- package/dist/report/timing.js.map +1 -1
- package/dist/report/toolHealth.js +124 -0
- package/dist/report/toolHealth.js.map +1 -0
- package/dist/server.js +501 -69
- package/dist/server.js.map +1 -1
- package/dist/services/automationGenerate.js +8 -2
- package/dist/services/automationGenerate.js.map +1 -1
- package/dist/services/build.js +10 -4
- package/dist/services/build.js.map +1 -1
- package/dist/services/flowGenerate.js +75 -0
- package/dist/services/flowGenerate.js.map +1 -0
- package/dist/services/preflight.js +40 -8
- package/dist/services/preflight.js.map +1 -1
- package/dist/services/prepareAndroid.js +92 -18
- package/dist/services/prepareAndroid.js.map +1 -1
- package/dist/services/prepareIos.js +94 -17
- package/dist/services/prepareIos.js.map +1 -1
- package/dist/services/report.js +271 -80
- package/dist/services/report.js.map +1 -1
- package/dist/services/smoke.js +68 -22
- package/dist/services/smoke.js.map +1 -1
- package/dist/services/suiteGenerate.js +43 -6
- package/dist/services/suiteGenerate.js.map +1 -1
- package/dist/services/testSuiteKnowledge.js +78 -33
- package/dist/services/testSuiteKnowledge.js.map +1 -1
- package/dist/session/attach.js +284 -4
- package/dist/session/attach.js.map +1 -1
- package/dist/session/processRegistry.js +433 -0
- package/dist/session/processRegistry.js.map +1 -0
- package/dist/session/progress.js +1 -1
- package/dist/session/progress.js.map +1 -1
- package/dist/session/retention.js +201 -0
- package/dist/session/retention.js.map +1 -0
- package/dist/session/store.js +459 -59
- package/dist/session/store.js.map +1 -1
- package/dist/snapshot/overlays.js +60 -10
- package/dist/snapshot/overlays.js.map +1 -1
- package/dist/snapshot/parse.js +30 -12
- package/dist/snapshot/parse.js.map +1 -1
- package/dist/snapshot/present.js +36 -6
- package/dist/snapshot/present.js.map +1 -1
- package/dist/snapshot/settle.js +39 -9
- package/dist/snapshot/settle.js.map +1 -1
- package/dist/state/consent.js +99 -0
- package/dist/state/consent.js.map +1 -0
- package/dist/state/profile.js +82 -11
- package/dist/state/profile.js.map +1 -1
- package/dist/suite/compile.js +15 -6
- package/dist/suite/compile.js.map +1 -1
- package/dist/suite/lint.js +22 -4
- package/dist/suite/lint.js.map +1 -1
- package/dist/suite/pom.js +75 -44
- package/dist/suite/pom.js.map +1 -1
- package/dist/suite/secretGuard.js +266 -0
- package/dist/suite/secretGuard.js.map +1 -0
- package/dist/suite/testcase.js +15 -11
- package/dist/suite/testcase.js.map +1 -1
- package/dist/testSuite/exporter.js +7 -3
- package/dist/testSuite/exporter.js.map +1 -1
- package/dist/testSuite/generator.js +43 -14
- package/dist/testSuite/generator.js.map +1 -1
- package/dist/testSuite/history.js +1 -1
- package/dist/testSuite/history.js.map +1 -1
- package/dist/testSuite/issueLinks.js +3 -3
- package/dist/testSuite/issueLinks.js.map +1 -1
- package/dist/testSuite/lint.js +4 -4
- package/dist/testSuite/lint.js.map +1 -1
- package/dist/testSuite/merge.js +13 -7
- package/dist/testSuite/merge.js.map +1 -1
- package/dist/testSuite/schema.js +21 -16
- package/dist/testSuite/schema.js.map +1 -1
- package/dist/testSuite/store.js +12 -4
- package/dist/testSuite/store.js.map +1 -1
- package/dist/testSuite/traceability.js +2 -2
- package/dist/testSuite/traceability.js.map +1 -1
- package/dist/tools/act.js +868 -174
- package/dist/tools/act.js.map +1 -1
- package/dist/tools/agent.js +521 -112
- package/dist/tools/agent.js.map +1 -1
- package/dist/tools/appControl.js +82 -19
- package/dist/tools/appControl.js.map +1 -1
- package/dist/tools/appMap.js +393 -189
- package/dist/tools/appMap.js.map +1 -1
- package/dist/tools/build.js +92 -51
- package/dist/tools/build.js.map +1 -1
- package/dist/tools/bundletool.js +141 -40
- package/dist/tools/bundletool.js.map +1 -1
- package/dist/tools/clearOverlay.js +98 -18
- package/dist/tools/clearOverlay.js.map +1 -1
- package/dist/tools/device.js +108 -19
- package/dist/tools/device.js.map +1 -1
- package/dist/tools/doctor.js +98 -35
- package/dist/tools/doctor.js.map +1 -1
- package/dist/tools/explore.js +110 -42
- package/dist/tools/explore.js.map +1 -1
- package/dist/tools/featureTesting.js +152 -130
- package/dist/tools/featureTesting.js.map +1 -1
- package/dist/tools/firstRun.js +94 -66
- package/dist/tools/firstRun.js.map +1 -1
- package/dist/tools/flow.js +347 -132
- package/dist/tools/flow.js.map +1 -1
- package/dist/tools/flowRepair.js +42 -10
- package/dist/tools/flowRepair.js.map +1 -1
- package/dist/tools/generate.js +199 -0
- package/dist/tools/generate.js.map +1 -0
- package/dist/tools/getArtifact.js +37 -8
- package/dist/tools/getArtifact.js.map +1 -1
- package/dist/tools/health.js +17 -12
- package/dist/tools/health.js.map +1 -1
- package/dist/tools/ios.js +148 -194
- package/dist/tools/ios.js.map +1 -1
- package/dist/tools/issues.js +256 -171
- package/dist/tools/issues.js.map +1 -1
- package/dist/tools/jobs.js +55 -11
- package/dist/tools/jobs.js.map +1 -1
- package/dist/tools/metro.js +84 -38
- package/dist/tools/metro.js.map +1 -1
- package/dist/tools/mobileAudit.js +83 -26
- package/dist/tools/mobileAudit.js.map +1 -1
- package/dist/tools/network.js +36 -14
- package/dist/tools/network.js.map +1 -1
- package/dist/tools/note.js +31 -17
- package/dist/tools/note.js.map +1 -1
- package/dist/tools/prepareIosTarget.js +31 -14
- package/dist/tools/prepareIosTarget.js.map +1 -1
- package/dist/tools/prepareTarget.js +193 -47
- package/dist/tools/prepareTarget.js.map +1 -1
- package/dist/tools/report.js +16 -8
- package/dist/tools/report.js.map +1 -1
- package/dist/tools/resolveArtifact.js +12 -12
- package/dist/tools/resolveArtifact.js.map +1 -1
- package/dist/tools/resolveTarget.js +81 -18
- package/dist/tools/resolveTarget.js.map +1 -1
- package/dist/tools/screenRecord.js +85 -20
- package/dist/tools/screenRecord.js.map +1 -1
- package/dist/tools/screenshot.js +42 -18
- package/dist/tools/screenshot.js.map +1 -1
- package/dist/tools/smoke.js +29 -12
- package/dist/tools/smoke.js.map +1 -1
- package/dist/tools/snapshot.js +157 -107
- package/dist/tools/snapshot.js.map +1 -1
- package/dist/tools/startSession.js +117 -84
- package/dist/tools/startSession.js.map +1 -1
- package/dist/tools/suite.js +391 -310
- package/dist/tools/suite.js.map +1 -1
- package/dist/tools/testSuite.js +112 -36
- package/dist/tools/testSuite.js.map +1 -1
- package/dist/tools/testThis.js +35 -802
- package/dist/tools/testThis.js.map +1 -1
- package/dist/tools/visual.js +698 -116
- package/dist/tools/visual.js.map +1 -1
- package/dist/tools/wait.js +9 -23
- package/dist/tools/wait.js.map +1 -1
- package/dist/tools/wda.js +312 -54
- package/dist/tools/wda.js.map +1 -1
- package/dist/version.js +37 -64
- package/dist/version.js.map +1 -1
- package/dist/visual/ocr.js +65 -8
- package/dist/visual/ocr.js.map +1 -1
- package/dist/visual/provider.js +87 -15
- package/dist/visual/provider.js.map +1 -1
- package/docs/README.md +24 -10
- package/docs/ci-reports.md +328 -0
- package/docs/concepts.md +227 -0
- package/docs/flows.md +153 -0
- package/docs/mcp-server.md +210 -104
- package/docs/physical-devices.md +84 -0
- package/docs/tools.md +808 -217
- package/package.json +16 -6
- package/dist/appMap/diff.js +0 -60
- package/dist/appMap/diff.js.map +0 -1
- package/dist/automation/maestroIr.js +0 -282
- package/dist/automation/maestroIr.js.map +0 -1
- package/dist/interop/maestro.js +0 -151
- package/dist/interop/maestro.js.map +0 -1
- package/dist/tools/assertVisual.js +0 -74
- package/dist/tools/assertVisual.js.map +0 -1
- package/dist/tools/automationGenerate.js +0 -394
- package/dist/tools/automationGenerate.js.map +0 -1
- package/dist/tools/capabilities.js +0 -209
- package/dist/tools/capabilities.js.map +0 -1
- package/dist/tools/detectContext.js +0 -41
- package/dist/tools/detectContext.js.map +0 -1
- package/dist/tools/flowGenerate.js +0 -55
- package/dist/tools/flowGenerate.js.map +0 -1
- package/dist/tools/history.js +0 -56
- package/dist/tools/history.js.map +0 -1
- package/dist/tools/idling.js +0 -104
- package/dist/tools/idling.js.map +0 -1
- package/dist/tools/inputCapabilities.js +0 -30
- package/dist/tools/inputCapabilities.js.map +0 -1
- package/dist/tools/locator.js +0 -57
- package/dist/tools/locator.js.map +0 -1
- package/dist/tools/maestro.js +0 -78
- package/dist/tools/maestro.js.map +0 -1
- package/dist/tools/permissions.js +0 -149
- package/dist/tools/permissions.js.map +0 -1
- package/dist/tools/plan.js +0 -49
- package/dist/tools/plan.js.map +0 -1
- package/dist/tools/screenInfo.js +0 -70
- package/dist/tools/screenInfo.js.map +0 -1
- package/dist/tools/seed.js +0 -101
- package/dist/tools/seed.js.map +0 -1
- package/dist/tools/state.js +0 -170
- package/dist/tools/state.js.map +0 -1
- package/dist/tools/visualText.js +0 -61
- package/dist/tools/visualText.js.map +0 -1
package/dist/appMap/store.js
CHANGED
|
@@ -1,16 +1,14 @@
|
|
|
1
|
-
// Persistence
|
|
1
|
+
// Persistence for the App Knowledge Map. The canonical map lives at
|
|
2
2
|
// `.swipium/app-map.json`; timestamped snapshots accumulate under `.swipium/app-map.history/`; the
|
|
3
3
|
// code-symbol + feature indexes live under `.swipium/app-map.index/`. Loading ALWAYS routes through
|
|
4
4
|
// migrateAppMap() so an older on-disk shape keeps working. We never commit the map automatically
|
|
5
|
-
// (Non-Goals)
|
|
5
|
+
// (Non-Goals), but we DO keep `.swipium/` out of the user's VCS via ensureGitignored().
|
|
6
6
|
import { createHash } from 'node:crypto';
|
|
7
7
|
import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
|
|
8
8
|
import { join } from 'node:path';
|
|
9
9
|
import { ensureGitignored } from '../lib/gitignore.js';
|
|
10
|
-
import {
|
|
10
|
+
import { cleanupOrphanTmpFiles, withFileLock, withFileLockAsync, writeFileAtomicSync } from '../lib/lockfile.js';
|
|
11
11
|
import { migrateAppMap } from './migrations.js';
|
|
12
|
-
import { APP_MAP_SCHEMA_VERSION } from './schema.js';
|
|
13
|
-
import { validateIssueSummary } from './issues.js';
|
|
14
12
|
const SWIPIUM = '.swipium';
|
|
15
13
|
/** Stable per-project id used in the MCP resource URI (mirrors the session store's project hash). */
|
|
16
14
|
export function projectId(root) {
|
|
@@ -28,6 +26,44 @@ export function appMapIndexDir(root) {
|
|
|
28
26
|
export function appMapResourceUri(root) {
|
|
29
27
|
return `swipium://project/${projectId(root)}/app-map`;
|
|
30
28
|
}
|
|
29
|
+
/** Run a load > mutate > save cycle over app-map.json under the cross-process advisory lock. Every
|
|
30
|
+
* WRITE cycle (buildAppMap, linkAutomationSuite, qa_app_map_update, the suite mirror) wraps its
|
|
31
|
+
* whole cycle in this. Locking only the save would still let two writers load the same base map
|
|
32
|
+
* and clobber each other. saveAppMap itself never locks, so there is no nested acquisition. */
|
|
33
|
+
export function withAppMapLock(root, fn) {
|
|
34
|
+
mkdirSync(join(root, SWIPIUM), { recursive: true }); // the lock dir's parent must exist before mkdir(lock)
|
|
35
|
+
return withFileLock(join(root, SWIPIUM, 'app-map.lock'), fn);
|
|
36
|
+
}
|
|
37
|
+
/** Async twin of withAppMapLock for async critical sections: the lock is heartbeated while `fn`
|
|
38
|
+
* runs, so a long holder is never judged stale and taken over (H8). */
|
|
39
|
+
export function withAppMapLockAsync(root, fn) {
|
|
40
|
+
mkdirSync(join(root, SWIPIUM), { recursive: true });
|
|
41
|
+
return withFileLockAsync(join(root, SWIPIUM, 'app-map.lock'), fn);
|
|
42
|
+
}
|
|
43
|
+
/** Newest parseable history snapshot (torn/corrupt snapshots are skipped), or null when none. */
|
|
44
|
+
function recoverFromHistory(root) {
|
|
45
|
+
try {
|
|
46
|
+
const dir = appMapHistoryDir(root);
|
|
47
|
+
if (!existsSync(dir))
|
|
48
|
+
return null;
|
|
49
|
+
const snaps = readdirSync(dir)
|
|
50
|
+
.filter((f) => f.endsWith('.json'))
|
|
51
|
+
.sort()
|
|
52
|
+
.reverse();
|
|
53
|
+
for (const file of snaps) {
|
|
54
|
+
try {
|
|
55
|
+
return { raw: JSON.parse(readFileSync(join(dir, file), 'utf8')), file };
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
/* torn snapshot, try the next-older one */
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
/* best-effort: fall through to a fresh map */
|
|
64
|
+
}
|
|
65
|
+
return null;
|
|
66
|
+
}
|
|
31
67
|
/** Load + migrate the map if present. Returns map:null when no file exists (caller builds fresh). */
|
|
32
68
|
export function loadAppMap(root, fallbackProject, at) {
|
|
33
69
|
const path = appMapPath(root);
|
|
@@ -38,8 +74,12 @@ export function loadAppMap(root, fallbackProject, at) {
|
|
|
38
74
|
raw = JSON.parse(readFileSync(path, 'utf8'));
|
|
39
75
|
}
|
|
40
76
|
catch {
|
|
41
|
-
// corrupt file
|
|
42
|
-
|
|
77
|
+
// corrupt canonical file > restore the newest parseable history snapshot instead of silently
|
|
78
|
+
// resetting to a fresh map; fresh only when no snapshot parses either. Flagged via migration.
|
|
79
|
+
const recovered = recoverFromHistory(root);
|
|
80
|
+
const migration = migrateAppMap(recovered?.raw ?? null, fallbackProject, at);
|
|
81
|
+
if (recovered)
|
|
82
|
+
migration.recoveredFrom = recovered.file;
|
|
43
83
|
return { map: migration.map, existed: true, migration };
|
|
44
84
|
}
|
|
45
85
|
const migration = migrateAppMap(raw, fallbackProject, at);
|
|
@@ -48,16 +88,21 @@ export function loadAppMap(root, fallbackProject, at) {
|
|
|
48
88
|
function safeStamp(iso) {
|
|
49
89
|
return iso.replace(/[:.]/g, '-');
|
|
50
90
|
}
|
|
51
|
-
/** Write the canonical map + a timestamped history snapshot. Keeps the last 30 snapshots.
|
|
91
|
+
/** Write the canonical map + a timestamped history snapshot. Keeps the last 30 snapshots.
|
|
92
|
+
* Lock-free by design: callers hold withAppMapLock() across their full load > mutate > save cycle. */
|
|
52
93
|
export function saveAppMap(root, map) {
|
|
53
94
|
mkdirSync(join(root, SWIPIUM), { recursive: true });
|
|
54
95
|
mkdirSync(appMapHistoryDir(root), { recursive: true });
|
|
55
96
|
ensureGitignored(root);
|
|
56
97
|
const path = appMapPath(root);
|
|
57
98
|
const json = JSON.stringify(map, null, 2);
|
|
58
|
-
|
|
99
|
+
// Atomic write (unique tmp + rename, retried on transient Windows sharing violations) so a crash
|
|
100
|
+
// mid-write never leaves a truncated app-map.json. Tmp residue from a writer that crashed between
|
|
101
|
+
// write and rename is swept once it is old enough not to belong to a live writer.
|
|
102
|
+
writeFileAtomicSync(path, json);
|
|
103
|
+
cleanupOrphanTmpFiles(join(root, SWIPIUM), 'app-map.json');
|
|
59
104
|
const historyPath = join(appMapHistoryDir(root), `${safeStamp(map.updatedAt)}.json`);
|
|
60
|
-
|
|
105
|
+
writeFileAtomicSync(historyPath, json);
|
|
61
106
|
pruneHistory(root);
|
|
62
107
|
return { path, historyPath, resourceUri: appMapResourceUri(root) };
|
|
63
108
|
}
|
|
@@ -66,7 +111,9 @@ function pruneHistory(root) {
|
|
|
66
111
|
const dir = appMapHistoryDir(root);
|
|
67
112
|
if (!existsSync(dir))
|
|
68
113
|
return;
|
|
69
|
-
const snaps = readdirSync(dir)
|
|
114
|
+
const snaps = readdirSync(dir)
|
|
115
|
+
.filter((f) => f.endsWith('.json'))
|
|
116
|
+
.sort();
|
|
70
117
|
for (const stale of snaps.slice(0, Math.max(0, snaps.length - 30)))
|
|
71
118
|
rmSync(join(dir, stale), { force: true });
|
|
72
119
|
}
|
|
@@ -96,78 +143,4 @@ export function loadCodeIndex(root) {
|
|
|
96
143
|
return null;
|
|
97
144
|
}
|
|
98
145
|
}
|
|
99
|
-
/**
|
|
100
|
-
* Validate schema, provenance completeness, missing links, stale fingerprints, and impossible
|
|
101
|
-
* states (SWIPIUM-REQ-01 qa_app_map_validate — "Must be part of npm test").
|
|
102
|
-
*/
|
|
103
|
-
export function validateAppMap(map, opts = {}) {
|
|
104
|
-
const issues = [];
|
|
105
|
-
const err = (code, detail) => issues.push({ severity: 'error', code, detail });
|
|
106
|
-
const warn = (code, detail) => issues.push({ severity: 'warning', code, detail });
|
|
107
|
-
if (map.schemaVersion !== APP_MAP_SCHEMA_VERSION)
|
|
108
|
-
err('SCHEMA_VERSION', `schemaVersion ${map.schemaVersion} != ${APP_MAP_SCHEMA_VERSION}`);
|
|
109
|
-
if (!map.project?.root)
|
|
110
|
-
err('NO_PROJECT_ROOT', 'project.root is required');
|
|
111
|
-
const staticIds = new Set(map.staticTopology.screens.map((s) => s.id));
|
|
112
|
-
const runtimeIds = new Set(map.runtimeTopology.screens.map((s) => s.id));
|
|
113
|
-
// duplicate ids
|
|
114
|
-
if (staticIds.size !== map.staticTopology.screens.length)
|
|
115
|
-
err('DUP_STATIC_ID', 'duplicate static screen ids');
|
|
116
|
-
if (runtimeIds.size !== map.runtimeTopology.screens.length)
|
|
117
|
-
err('DUP_RUNTIME_ID', 'duplicate runtime screen ids');
|
|
118
|
-
// missing links: runtime → static
|
|
119
|
-
for (const r of map.runtimeTopology.screens) {
|
|
120
|
-
if (r.linkedStaticScreenId && !staticIds.has(r.linkedStaticScreenId))
|
|
121
|
-
err('DANGLING_LINK', `runtime ${r.id} links to unknown static ${r.linkedStaticScreenId}`);
|
|
122
|
-
if (r.unmapped && r.linkedStaticScreenId)
|
|
123
|
-
err('IMPOSSIBLE_UNMAPPED', `runtime ${r.id} is both unmapped and linked`);
|
|
124
|
-
}
|
|
125
|
-
// confidence ranges + feature integrity
|
|
126
|
-
for (const f of map.features) {
|
|
127
|
-
if (f.confidence < 0 || f.confidence > 1)
|
|
128
|
-
err('CONFIDENCE_RANGE', `feature ${f.id} confidence ${f.confidence} out of [0,1]`);
|
|
129
|
-
if (f.status !== 'fact' && f.status !== 'hypothesis')
|
|
130
|
-
err('FEATURE_STATUS', `feature ${f.id} bad status ${f.status}`);
|
|
131
|
-
if (f.testCoverage === 'covered' && f.runtimeScreens.length === 0)
|
|
132
|
-
warn('COVERAGE_NO_RUNTIME', `feature ${f.id} marked covered but has no runtime screens`);
|
|
133
|
-
for (const s of f.staticScreens)
|
|
134
|
-
if (!staticIds.has(s))
|
|
135
|
-
warn('FEATURE_DANGLING_SCREEN', `feature ${f.id} references unknown static screen ${s}`);
|
|
136
|
-
}
|
|
137
|
-
// derived issue summaries (SWIPIUM-REQ-08) must be structurally valid where present.
|
|
138
|
-
for (const s of map.runtimeTopology.screens)
|
|
139
|
-
for (const e of validateIssueSummary(s.issueSummary, `runtime ${s.id}`))
|
|
140
|
-
err('ISSUE_SUMMARY', e);
|
|
141
|
-
for (const s of map.staticTopology.screens)
|
|
142
|
-
for (const e of validateIssueSummary(s.issueSummary, `static ${s.id}`))
|
|
143
|
-
err('ISSUE_SUMMARY', e);
|
|
144
|
-
for (const f of map.features)
|
|
145
|
-
for (const e of validateIssueSummary(f.issueSummary, `feature ${f.id}`))
|
|
146
|
-
err('ISSUE_SUMMARY', e);
|
|
147
|
-
// provenance completeness: a map with content should carry at least one provenance entry.
|
|
148
|
-
const hasContent = map.staticTopology.screens.length > 0 || map.runtimeTopology.screens.length > 0 || map.features.length > 0;
|
|
149
|
-
if (hasContent && map.provenance.length === 0)
|
|
150
|
-
warn('NO_PROVENANCE', 'map has content but no provenance entries');
|
|
151
|
-
// impossible coverage counts
|
|
152
|
-
if (map.coverage.runtimeScreens !== map.runtimeTopology.screens.length)
|
|
153
|
-
warn('COVERAGE_COUNT', `coverage.runtimeScreens=${map.coverage.runtimeScreens} != ${map.runtimeTopology.screens.length}`);
|
|
154
|
-
if (map.coverage.staticScreens !== map.staticTopology.screens.length)
|
|
155
|
-
warn('COVERAGE_COUNT', `coverage.staticScreens=${map.coverage.staticScreens} != ${map.staticTopology.screens.length}`);
|
|
156
|
-
// stale fingerprints (optional — needs filesystem access)
|
|
157
|
-
if (opts.checkFingerprint && opts.root) {
|
|
158
|
-
let stale = 0;
|
|
159
|
-
for (const f of map.sourceFingerprint.files) {
|
|
160
|
-
const h = fileHash(join(opts.root, f.path));
|
|
161
|
-
if (!h)
|
|
162
|
-
stale++;
|
|
163
|
-
else if (h.hash !== f.hash)
|
|
164
|
-
stale++;
|
|
165
|
-
}
|
|
166
|
-
if (stale)
|
|
167
|
-
warn('STALE_FINGERPRINT', `${stale}/${map.sourceFingerprint.files.length} fingerprinted files changed or vanished — rebuild the map`);
|
|
168
|
-
}
|
|
169
|
-
const errors = issues.filter((i) => i.severity === 'error').length;
|
|
170
|
-
const warnings = issues.filter((i) => i.severity === 'warning').length;
|
|
171
|
-
return { ok: errors === 0, errors, warnings, issues };
|
|
172
|
-
}
|
|
173
146
|
//# sourceMappingURL=store.js.map
|
package/dist/appMap/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/appMap/store.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/appMap/store.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,mGAAmG;AACnG,oGAAoG;AACpG,iGAAiG;AACjG,wFAAwF;AAExF,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClG,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACjH,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AAKtE,MAAM,OAAO,GAAG,UAAU,CAAC;AAE3B,qGAAqG;AACrG,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;AAC7C,CAAC;AACD,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;AAChD,CAAC;AACD,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC;AACD,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,OAAO,qBAAqB,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;AACxD,CAAC;AAED;;;gGAGgG;AAChG,MAAM,UAAU,cAAc,CAAI,IAAY,EAAE,EAAW;IACzD,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,sDAAsD;IAC3G,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED;wEACwE;AACxE,MAAM,UAAU,mBAAmB,CAAI,IAAY,EAAE,EAAoB;IACvE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;AACpE,CAAC;AAQD,iGAAiG;AACjG,SAAS,kBAAkB,CAAC,IAAY;IACtC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QAClC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC;aAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aAClC,IAAI,EAAE;aACN,OAAO,EAAE,CAAC;QACb,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;YAC1E,CAAC;YAAC,MAAM,CAAC;gBACP,2CAA2C;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,8CAA8C;IAChD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,eAAgC,EAAE,EAAU;IACnF,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5D,IAAI,GAAG,GAAY,IAAI,CAAC;IACxB,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,6FAA6F;QAC7F,8FAA8F;QAC9F,MAAM,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,EAAE,GAAG,IAAI,IAAI,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAI,SAAS;YAAE,SAAS,CAAC,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC;QACxD,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC1D,CAAC;IACD,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;IAC1D,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,SAAS,CAAC,GAAW;IAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAQD;uGACuG;AACvG,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,GAAoB;IAC3D,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACvB,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1C,iGAAiG;IACjG,kGAAkG;IAClG,kFAAkF;IAClF,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACrF,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACvC,YAAY,CAAC,IAAI,CAAC,CAAC;IACnB,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;AACrE,CAAC;AAED,SAAS,YAAY,CAAC,IAAY;IAChC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO;QAC7B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC;aAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aAClC,IAAI,EAAE,CAAC;QACV,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChH,CAAC;IAAC,MAAM,CAAC;QACP,iBAAiB;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,SAA2B,EAAE,QAAuB;IAC5F,IAAI,CAAC;QACH,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI,SAAS;YAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,mBAAmB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAClH,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,oBAAoB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3H,CAAC;IAAC,MAAM,CAAC;QACP,+DAA+D;IACjE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,MAAM,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,mBAAmB,CAAC,CAAC;IAC1D,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAc,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
package/dist/appMap/tsAstScan.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Vision Gap Fix 10
|
|
1
|
+
// Vision Gap Fix 10: AST-based JS/TS/TSX route + screen + symbol discovery using the TypeScript
|
|
2
2
|
// compiler API, with the regex scanner as a fallback. Regex misses common navigation patterns it can't
|
|
3
3
|
// resolve: a route name passed through a constant (`<Stack.Screen name={ROUTES.Weather} .../>`), a
|
|
4
4
|
// multiline default-export component, or `navigation.navigate(ROUTES.Weather)`. This module parses the
|
|
@@ -29,18 +29,23 @@ export function tsAstAvailable() {
|
|
|
29
29
|
}
|
|
30
30
|
function scriptKindFor(ts, fileName) {
|
|
31
31
|
switch (extname(fileName).toLowerCase()) {
|
|
32
|
-
case '.tsx':
|
|
33
|
-
|
|
34
|
-
case '.
|
|
32
|
+
case '.tsx':
|
|
33
|
+
return ts.ScriptKind.TSX;
|
|
34
|
+
case '.ts':
|
|
35
|
+
return ts.ScriptKind.TS;
|
|
36
|
+
case '.jsx':
|
|
37
|
+
return ts.ScriptKind.JSX;
|
|
35
38
|
case '.mjs':
|
|
36
39
|
case '.cjs':
|
|
37
|
-
case '.js':
|
|
38
|
-
|
|
40
|
+
case '.js':
|
|
41
|
+
return ts.ScriptKind.JS;
|
|
42
|
+
default:
|
|
43
|
+
return ts.ScriptKind.TSX;
|
|
39
44
|
}
|
|
40
45
|
}
|
|
41
46
|
/**
|
|
42
47
|
* Parse a single JS/TS source file and extract screens, navigation edges, and route constants.
|
|
43
|
-
* Returns parsed:false (empty result) when the TS compiler API is unavailable
|
|
48
|
+
* Returns parsed:false (empty result) when the TS compiler API is unavailable. The caller then uses
|
|
44
49
|
* the regex scanner. Never throws: a parse error is recorded in parserNotes.
|
|
45
50
|
*/
|
|
46
51
|
export function scanTsSource(fileName, text) {
|
|
@@ -59,7 +64,7 @@ export function scanTsSource(fileName, text) {
|
|
|
59
64
|
const navEdges = [];
|
|
60
65
|
const routeConstants = [];
|
|
61
66
|
const parserNotes = [];
|
|
62
|
-
// Resolution map: both "ROUTES.Weather"
|
|
67
|
+
// Resolution map: both "ROUTES.Weather" > "WeatherAnalysis" and bare "Weather" > "WeatherAnalysis".
|
|
63
68
|
const constMap = new Map();
|
|
64
69
|
const addScreen = (s) => {
|
|
65
70
|
if (!s.name)
|
|
@@ -75,7 +80,9 @@ export function scanTsSource(fileName, text) {
|
|
|
75
80
|
if (ts.isIdentifier(decl.name) && decl.initializer && ts.isObjectLiteralExpression(decl.initializer)) {
|
|
76
81
|
const objName = decl.name.text;
|
|
77
82
|
for (const prop of decl.initializer.properties) {
|
|
78
|
-
if (ts.isPropertyAssignment(prop) &&
|
|
83
|
+
if (ts.isPropertyAssignment(prop) &&
|
|
84
|
+
(ts.isIdentifier(prop.name) || ts.isStringLiteral(prop.name)) &&
|
|
85
|
+
ts.isStringLiteralLike(prop.initializer)) {
|
|
79
86
|
const key = prop.name.text;
|
|
80
87
|
const value = prop.initializer.text;
|
|
81
88
|
constMap.set(`${objName}.${key}`, value);
|
|
@@ -130,14 +137,26 @@ export function scanTsSource(fileName, text) {
|
|
|
130
137
|
const expr = node.expression;
|
|
131
138
|
const name = ts.isIdentifier(expr) ? expr.text : undefined;
|
|
132
139
|
if (name)
|
|
133
|
-
addScreen({
|
|
140
|
+
addScreen({
|
|
141
|
+
name,
|
|
142
|
+
kind: SCREEN_SUFFIX.test(name) ? 'screen' : 'component',
|
|
143
|
+
component: name,
|
|
144
|
+
confidence: 0.7,
|
|
145
|
+
reasons: ['ast_default_export_component'],
|
|
146
|
+
});
|
|
134
147
|
}
|
|
135
148
|
// function/class components, incl. `export default function FooScreen()` spanning lines.
|
|
136
149
|
if (ts.isFunctionDeclaration(node) && node.name) {
|
|
137
150
|
const name = node.name.text;
|
|
138
151
|
const isDefault = node.modifiers?.some((m) => m.kind === ts.SyntaxKind.DefaultKeyword);
|
|
139
152
|
if (SCREEN_SUFFIX.test(name) || isDefault) {
|
|
140
|
-
addScreen({
|
|
153
|
+
addScreen({
|
|
154
|
+
name,
|
|
155
|
+
kind: SCREEN_SUFFIX.test(name) ? 'screen' : 'component',
|
|
156
|
+
component: name,
|
|
157
|
+
confidence: SCREEN_SUFFIX.test(name) ? 0.75 : 0.6,
|
|
158
|
+
reasons: [isDefault ? 'ast_default_export_function' : 'ast_function_component'],
|
|
159
|
+
});
|
|
141
160
|
}
|
|
142
161
|
}
|
|
143
162
|
if (ts.isClassDeclaration(node) && node.name && SCREEN_SUFFIX.test(node.name.text)) {
|
|
@@ -146,7 +165,10 @@ export function scanTsSource(fileName, text) {
|
|
|
146
165
|
// const FooScreen = (...) => (...) / = function () {}
|
|
147
166
|
if (ts.isVariableStatement(node)) {
|
|
148
167
|
for (const decl of node.declarationList.declarations) {
|
|
149
|
-
if (ts.isIdentifier(decl.name) &&
|
|
168
|
+
if (ts.isIdentifier(decl.name) &&
|
|
169
|
+
SCREEN_SUFFIX.test(decl.name.text) &&
|
|
170
|
+
decl.initializer &&
|
|
171
|
+
(ts.isArrowFunction(decl.initializer) || ts.isFunctionExpression(decl.initializer))) {
|
|
150
172
|
addScreen({ name: decl.name.text, kind: 'screen', component: decl.name.text, confidence: 0.7, reasons: ['ast_arrow_component'] });
|
|
151
173
|
}
|
|
152
174
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsAstScan.js","sourceRoot":"","sources":["../../src/appMap/tsAstScan.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"tsAstScan.js","sourceRoot":"","sources":["../../src/appMap/tsAstScan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// bundletool integration
|
|
1
|
+
// bundletool integration. An .aab is not installable; it must be
|
|
2
2
|
// converted to a universal APK first. This module detects bundletool (a `bundletool` launcher on
|
|
3
3
|
// PATH, a `$BUNDLETOOL_JAR` run via java, or a jar in common locations), builds a universal APK
|
|
4
4
|
// set with the debug keystore, extracts universal.apk, and caches it under .swipium/artifacts/.
|
|
@@ -38,11 +38,11 @@ export function universalApkCachePath(projectRoot, aabPath) {
|
|
|
38
38
|
const base = basename(aabPath).replace(/\.aab$/i, '');
|
|
39
39
|
return join(projectRoot, '.swipium', 'artifacts', `${base}-universal.apk`);
|
|
40
40
|
}
|
|
41
|
-
/** The bundletool build-apks argv for a universal APK set (pure
|
|
41
|
+
/** The bundletool build-apks argv for a universal APK set (pure, for tests + logging). */
|
|
42
42
|
export function buildApksArgs(launcher, aabPath, apksOut) {
|
|
43
43
|
return [...launcher.prefix, 'build-apks', '--bundle', aabPath, '--output', apksOut, '--overwrite', '--mode', 'universal'];
|
|
44
44
|
}
|
|
45
|
-
/** PURE: signing args for build-apks (empty
|
|
45
|
+
/** PURE: signing args for build-apks (empty > debug keystore fallback). */
|
|
46
46
|
export function signingArgs(signing) {
|
|
47
47
|
if (!signing)
|
|
48
48
|
return [];
|
|
@@ -94,7 +94,12 @@ export function classifyBundletoolError(output, phase) {
|
|
|
94
94
|
export async function buildAndInstallApkSet(aabPath, projectRoot, opts = {}) {
|
|
95
95
|
const launcher = await findBundletool();
|
|
96
96
|
if (!launcher) {
|
|
97
|
-
return {
|
|
97
|
+
return {
|
|
98
|
+
ok: false,
|
|
99
|
+
logText: '',
|
|
100
|
+
failureCode: 'BUNDLETOOL_MISSING',
|
|
101
|
+
error: 'bundletool not found (install it, set $BUNDLETOOL_JAR, or build an APK directly).',
|
|
102
|
+
};
|
|
98
103
|
}
|
|
99
104
|
const base = basename(aabPath).replace(/\.aab$/i, '');
|
|
100
105
|
const apksOut = join(projectRoot, '.swipium', 'artifacts', `${base}-${opts.deviceId ? sanitize(opts.deviceId) : 'device'}.apks`);
|
|
@@ -107,7 +112,9 @@ export async function buildAndInstallApkSet(aabPath, projectRoot, opts = {}) {
|
|
|
107
112
|
return { ok: true, apksPath: apksOut, logText: 'using cached device APK set\n', installed: false };
|
|
108
113
|
}
|
|
109
114
|
}
|
|
110
|
-
catch {
|
|
115
|
+
catch {
|
|
116
|
+
/* rebuild */
|
|
117
|
+
}
|
|
111
118
|
}
|
|
112
119
|
const buildArgs = buildApksConnectedArgs(launcher, aabPath, apksOut, { deviceId: opts.deviceId, signing: opts.signing });
|
|
113
120
|
const buildCommand = `${launcher.cmd} ${buildArgs.join(' ')}`;
|
|
@@ -115,7 +122,14 @@ export async function buildAndInstallApkSet(aabPath, projectRoot, opts = {}) {
|
|
|
115
122
|
const built = await run(launcher.cmd, buildArgs, { signal: opts.signal, timeoutMs });
|
|
116
123
|
logText += built.stdout + built.stderr + '\n';
|
|
117
124
|
if (built.code !== 0) {
|
|
118
|
-
return {
|
|
125
|
+
return {
|
|
126
|
+
ok: false,
|
|
127
|
+
apksPath: existsSync(apksOut) ? apksOut : undefined,
|
|
128
|
+
logText,
|
|
129
|
+
buildCommand,
|
|
130
|
+
failureCode: classifyBundletoolError(built.stdout + built.stderr, 'build'),
|
|
131
|
+
error: built.stderr.trim() || built.stdout.trim() || `bundletool build-apks exited ${built.code}`,
|
|
132
|
+
};
|
|
119
133
|
}
|
|
120
134
|
if (!opts.install) {
|
|
121
135
|
return { ok: true, apksPath: apksOut, logText, buildCommand, installed: false };
|
|
@@ -126,7 +140,15 @@ export async function buildAndInstallApkSet(aabPath, projectRoot, opts = {}) {
|
|
|
126
140
|
const installed = await run(launcher.cmd, installArgs, { signal: opts.signal, timeoutMs });
|
|
127
141
|
logText += installed.stdout + installed.stderr + '\n';
|
|
128
142
|
if (installed.code !== 0) {
|
|
129
|
-
return {
|
|
143
|
+
return {
|
|
144
|
+
ok: false,
|
|
145
|
+
apksPath: apksOut,
|
|
146
|
+
logText,
|
|
147
|
+
buildCommand,
|
|
148
|
+
installCommand,
|
|
149
|
+
failureCode: classifyBundletoolError(installed.stdout + installed.stderr, 'install'),
|
|
150
|
+
error: installed.stderr.trim() || installed.stdout.trim() || `bundletool install-apks exited ${installed.code}`,
|
|
151
|
+
};
|
|
130
152
|
}
|
|
131
153
|
return { ok: true, apksPath: apksOut, logText, buildCommand, installCommand, installed: true };
|
|
132
154
|
}
|
|
@@ -151,7 +173,11 @@ export async function convertAabToApk(aabPath, projectRoot, opts = {}) {
|
|
|
151
173
|
}
|
|
152
174
|
const launcher = await findBundletool();
|
|
153
175
|
if (!launcher) {
|
|
154
|
-
return {
|
|
176
|
+
return {
|
|
177
|
+
ok: false,
|
|
178
|
+
failureCode: 'AAB_NEEDS_BUNDLETOOL',
|
|
179
|
+
error: 'bundletool not found (install it, set $BUNDLETOOL_JAR, or build an APK directly).',
|
|
180
|
+
};
|
|
155
181
|
}
|
|
156
182
|
mkdirSync(join(projectRoot, '.swipium', 'artifacts'), { recursive: true });
|
|
157
183
|
const apksOut = apkPath.replace(/\.apk$/, '.apks');
|
|
@@ -160,12 +186,23 @@ export async function convertAabToApk(aabPath, projectRoot, opts = {}) {
|
|
|
160
186
|
const timeoutMs = opts.timeoutMs ?? 5 * 60_000;
|
|
161
187
|
const built = await run(launcher.cmd, args, { signal: opts.signal, timeoutMs });
|
|
162
188
|
if (built.code !== 0) {
|
|
163
|
-
return {
|
|
189
|
+
return {
|
|
190
|
+
ok: false,
|
|
191
|
+
failureCode: 'AAB_BUILD_APKS_FAILED',
|
|
192
|
+
error: built.stderr.trim() || built.stdout.trim() || `bundletool exited ${built.code}`,
|
|
193
|
+
command,
|
|
194
|
+
};
|
|
164
195
|
}
|
|
165
|
-
// The .apks is a zip containing universal.apk
|
|
196
|
+
// The .apks is a zip containing universal.apk. Extract it (prefer `unzip`, else bundletool can't).
|
|
166
197
|
const extracted = await extractUniversalApk(apksOut, apkPath, opts.signal);
|
|
167
198
|
if (!extracted) {
|
|
168
|
-
return {
|
|
199
|
+
return {
|
|
200
|
+
ok: false,
|
|
201
|
+
failureCode: 'AAB_BUILD_APKS_FAILED',
|
|
202
|
+
error: 'built .apks but could not extract universal.apk (need `unzip` on PATH).',
|
|
203
|
+
command,
|
|
204
|
+
apksPath: apksOut,
|
|
205
|
+
};
|
|
169
206
|
}
|
|
170
207
|
return { ok: true, apkPath, apksPath: apksOut, command };
|
|
171
208
|
}
|
|
@@ -186,7 +223,7 @@ async function extractUniversalApk(apksPath, outApk, signal) {
|
|
|
186
223
|
return false;
|
|
187
224
|
return existsSync(join(dir, any));
|
|
188
225
|
}
|
|
189
|
-
// Rename universal.apk
|
|
226
|
+
// Rename universal.apk to the cache name.
|
|
190
227
|
const { renameSync } = await import('node:fs');
|
|
191
228
|
try {
|
|
192
229
|
renameSync(produced, outApk);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundletool.js","sourceRoot":"","sources":["../../src/artifacts/bundletool.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"bundletool.js","sourceRoot":"","sources":["../../src/artifacts/bundletool.ts"],"names":[],"mappings":"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"}
|