@optave/codegraph 3.10.0 → 3.11.1
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/README.md +40 -33
- package/dist/ast-analysis/engine.d.ts.map +1 -1
- package/dist/ast-analysis/engine.js +91 -60
- package/dist/ast-analysis/engine.js.map +1 -1
- package/dist/ast-analysis/rules/index.d.ts.map +1 -1
- package/dist/ast-analysis/rules/index.js +77 -0
- package/dist/ast-analysis/rules/index.js.map +1 -1
- package/dist/ast-analysis/visitor-utils.d.ts +3 -0
- package/dist/ast-analysis/visitor-utils.d.ts.map +1 -1
- package/dist/ast-analysis/visitor-utils.js +83 -49
- package/dist/ast-analysis/visitor-utils.js.map +1 -1
- package/dist/ast-analysis/visitors/ast-store-visitor.d.ts.map +1 -1
- package/dist/ast-analysis/visitors/ast-store-visitor.js +78 -62
- package/dist/ast-analysis/visitors/ast-store-visitor.js.map +1 -1
- package/dist/ast-analysis/visitors/dataflow-visitor.d.ts.map +1 -1
- package/dist/ast-analysis/visitors/dataflow-visitor.js +61 -42
- package/dist/ast-analysis/visitors/dataflow-visitor.js.map +1 -1
- package/dist/cli/commands/audit.js +1 -1
- package/dist/cli/commands/audit.js.map +1 -1
- package/dist/cli/commands/build.d.ts.map +1 -1
- package/dist/cli/commands/build.js +2 -0
- package/dist/cli/commands/build.js.map +1 -1
- package/dist/cli/commands/check.js +1 -1
- package/dist/cli/commands/check.js.map +1 -1
- package/dist/cli/commands/children.js +1 -1
- package/dist/cli/commands/children.js.map +1 -1
- package/dist/cli/commands/diff-impact.js +1 -1
- package/dist/cli/commands/diff-impact.js.map +1 -1
- package/dist/cli/commands/embed.d.ts.map +1 -1
- package/dist/cli/commands/embed.js +49 -4
- package/dist/cli/commands/embed.js.map +1 -1
- package/dist/cli/commands/roles.js +1 -1
- package/dist/cli/commands/roles.js.map +1 -1
- package/dist/cli/commands/structure.js +1 -1
- package/dist/cli/commands/structure.js.map +1 -1
- package/dist/cli/shared/options.js +1 -1
- package/dist/cli/shared/options.js.map +1 -1
- package/dist/db/connection.d.ts.map +1 -1
- package/dist/db/connection.js +8 -0
- package/dist/db/connection.js.map +1 -1
- package/dist/domain/analysis/dependencies.d.ts.map +1 -1
- package/dist/domain/analysis/dependencies.js +106 -80
- package/dist/domain/analysis/dependencies.js.map +1 -1
- package/dist/domain/analysis/fn-impact.d.ts.map +1 -1
- package/dist/domain/analysis/fn-impact.js +77 -52
- package/dist/domain/analysis/fn-impact.js.map +1 -1
- package/dist/domain/analysis/module-map.d.ts.map +1 -1
- package/dist/domain/analysis/module-map.js +132 -121
- package/dist/domain/analysis/module-map.js.map +1 -1
- package/dist/domain/graph/builder/helpers.d.ts +4 -4
- package/dist/domain/graph/builder/helpers.d.ts.map +1 -1
- package/dist/domain/graph/builder/helpers.js +47 -33
- package/dist/domain/graph/builder/helpers.js.map +1 -1
- package/dist/domain/graph/builder/incremental.d.ts +6 -6
- package/dist/domain/graph/builder/incremental.d.ts.map +1 -1
- package/dist/domain/graph/builder/incremental.js +148 -99
- package/dist/domain/graph/builder/incremental.js.map +1 -1
- package/dist/domain/graph/builder/pipeline.d.ts +1 -0
- package/dist/domain/graph/builder/pipeline.d.ts.map +1 -1
- package/dist/domain/graph/builder/pipeline.js +23 -637
- package/dist/domain/graph/builder/pipeline.js.map +1 -1
- package/dist/domain/graph/builder/stages/build-edges.d.ts.map +1 -1
- package/dist/domain/graph/builder/stages/build-edges.js +141 -98
- package/dist/domain/graph/builder/stages/build-edges.js.map +1 -1
- package/dist/domain/graph/builder/stages/build-structure.d.ts.map +1 -1
- package/dist/domain/graph/builder/stages/build-structure.js +82 -65
- package/dist/domain/graph/builder/stages/build-structure.js.map +1 -1
- package/dist/domain/graph/builder/stages/detect-changes.d.ts.map +1 -1
- package/dist/domain/graph/builder/stages/detect-changes.js +84 -56
- package/dist/domain/graph/builder/stages/detect-changes.js.map +1 -1
- package/dist/domain/graph/builder/stages/finalize.d.ts.map +1 -1
- package/dist/domain/graph/builder/stages/finalize.js +60 -51
- package/dist/domain/graph/builder/stages/finalize.js.map +1 -1
- package/dist/domain/graph/builder/stages/insert-nodes.d.ts +8 -6
- package/dist/domain/graph/builder/stages/insert-nodes.d.ts.map +1 -1
- package/dist/domain/graph/builder/stages/insert-nodes.js +107 -122
- package/dist/domain/graph/builder/stages/insert-nodes.js.map +1 -1
- package/dist/domain/graph/builder/stages/native-db-lifecycle.d.ts +14 -0
- package/dist/domain/graph/builder/stages/native-db-lifecycle.d.ts.map +1 -0
- package/dist/domain/graph/builder/stages/native-db-lifecycle.js +77 -0
- package/dist/domain/graph/builder/stages/native-db-lifecycle.js.map +1 -0
- package/dist/domain/graph/builder/stages/native-orchestrator.d.ts +62 -0
- package/dist/domain/graph/builder/stages/native-orchestrator.d.ts.map +1 -0
- package/dist/domain/graph/builder/stages/native-orchestrator.js +747 -0
- package/dist/domain/graph/builder/stages/native-orchestrator.js.map +1 -0
- package/dist/domain/graph/builder/stages/resolve-imports.d.ts.map +1 -1
- package/dist/domain/graph/builder/stages/resolve-imports.js +73 -22
- package/dist/domain/graph/builder/stages/resolve-imports.js.map +1 -1
- package/dist/domain/graph/cycles.d.ts +6 -4
- package/dist/domain/graph/cycles.d.ts.map +1 -1
- package/dist/domain/graph/cycles.js +50 -55
- package/dist/domain/graph/cycles.js.map +1 -1
- package/dist/domain/graph/journal.d.ts.map +1 -1
- package/dist/domain/graph/journal.js +89 -70
- package/dist/domain/graph/journal.js.map +1 -1
- package/dist/domain/graph/watcher.d.ts.map +1 -1
- package/dist/domain/graph/watcher.js +28 -20
- package/dist/domain/graph/watcher.js.map +1 -1
- package/dist/domain/parser.d.ts +12 -23
- package/dist/domain/parser.d.ts.map +1 -1
- package/dist/domain/parser.js +153 -80
- package/dist/domain/parser.js.map +1 -1
- package/dist/domain/search/generator.d.ts +3 -1
- package/dist/domain/search/generator.d.ts.map +1 -1
- package/dist/domain/search/generator.js +68 -45
- package/dist/domain/search/generator.js.map +1 -1
- package/dist/domain/search/models.d.ts +18 -0
- package/dist/domain/search/models.d.ts.map +1 -1
- package/dist/domain/search/models.js +72 -4
- package/dist/domain/search/models.js.map +1 -1
- package/dist/domain/search/search/hybrid.d.ts.map +1 -1
- package/dist/domain/search/search/hybrid.js +49 -40
- package/dist/domain/search/search/hybrid.js.map +1 -1
- package/dist/domain/search/search/semantic.d.ts.map +1 -1
- package/dist/domain/search/search/semantic.js +69 -49
- package/dist/domain/search/search/semantic.js.map +1 -1
- package/dist/domain/wasm-worker-entry.js +209 -137
- package/dist/domain/wasm-worker-entry.js.map +1 -1
- package/dist/extractors/c.js +25 -6
- package/dist/extractors/c.js.map +1 -1
- package/dist/extractors/cpp.js +47 -6
- package/dist/extractors/cpp.js.map +1 -1
- package/dist/extractors/cuda.js +90 -14
- package/dist/extractors/cuda.js.map +1 -1
- package/dist/extractors/elixir.js +108 -4
- package/dist/extractors/elixir.js.map +1 -1
- package/dist/extractors/erlang.js +56 -20
- package/dist/extractors/erlang.js.map +1 -1
- package/dist/extractors/fsharp.d.ts +7 -0
- package/dist/extractors/fsharp.d.ts.map +1 -1
- package/dist/extractors/fsharp.js +94 -0
- package/dist/extractors/fsharp.js.map +1 -1
- package/dist/extractors/gleam.d.ts.map +1 -1
- package/dist/extractors/gleam.js +29 -33
- package/dist/extractors/gleam.js.map +1 -1
- package/dist/extractors/groovy.js +41 -1
- package/dist/extractors/groovy.js.map +1 -1
- package/dist/extractors/haskell.js +48 -4
- package/dist/extractors/haskell.js.map +1 -1
- package/dist/extractors/helpers.d.ts +79 -1
- package/dist/extractors/helpers.d.ts.map +1 -1
- package/dist/extractors/helpers.js +137 -0
- package/dist/extractors/helpers.js.map +1 -1
- package/dist/extractors/java.d.ts.map +1 -1
- package/dist/extractors/java.js +37 -49
- package/dist/extractors/java.js.map +1 -1
- package/dist/extractors/javascript.d.ts.map +1 -1
- package/dist/extractors/javascript.js +44 -44
- package/dist/extractors/javascript.js.map +1 -1
- package/dist/extractors/julia.js +198 -74
- package/dist/extractors/julia.js.map +1 -1
- package/dist/extractors/kotlin.js +4 -0
- package/dist/extractors/kotlin.js.map +1 -1
- package/dist/extractors/objc.js +184 -47
- package/dist/extractors/objc.js.map +1 -1
- package/dist/extractors/python.js +7 -4
- package/dist/extractors/python.js.map +1 -1
- package/dist/extractors/r.d.ts.map +1 -1
- package/dist/extractors/r.js +103 -87
- package/dist/extractors/r.js.map +1 -1
- package/dist/extractors/scala.d.ts.map +1 -1
- package/dist/extractors/scala.js +18 -32
- package/dist/extractors/scala.js.map +1 -1
- package/dist/extractors/solidity.d.ts.map +1 -1
- package/dist/extractors/solidity.js +55 -69
- package/dist/extractors/solidity.js.map +1 -1
- package/dist/extractors/verilog.js +80 -15
- package/dist/extractors/verilog.js.map +1 -1
- package/dist/features/boundaries.d.ts.map +1 -1
- package/dist/features/boundaries.js +49 -39
- package/dist/features/boundaries.js.map +1 -1
- package/dist/features/cfg.d.ts.map +1 -1
- package/dist/features/cfg.js +90 -63
- package/dist/features/cfg.js.map +1 -1
- package/dist/features/check.d.ts.map +1 -1
- package/dist/features/check.js +43 -34
- package/dist/features/check.js.map +1 -1
- package/dist/features/cochange.d.ts.map +1 -1
- package/dist/features/cochange.js +68 -56
- package/dist/features/cochange.js.map +1 -1
- package/dist/features/complexity.d.ts.map +1 -1
- package/dist/features/complexity.js +105 -75
- package/dist/features/complexity.js.map +1 -1
- package/dist/features/dataflow.d.ts.map +1 -1
- package/dist/features/dataflow.js +37 -29
- package/dist/features/dataflow.js.map +1 -1
- package/dist/features/flow.d.ts.map +1 -1
- package/dist/features/flow.js +31 -22
- package/dist/features/flow.js.map +1 -1
- package/dist/features/graph-enrichment.d.ts.map +1 -1
- package/dist/features/graph-enrichment.js +77 -70
- package/dist/features/graph-enrichment.js.map +1 -1
- package/dist/features/owners.d.ts +17 -26
- package/dist/features/owners.d.ts.map +1 -1
- package/dist/features/owners.js +120 -109
- package/dist/features/owners.js.map +1 -1
- package/dist/features/sequence.d.ts.map +1 -1
- package/dist/features/sequence.js +59 -54
- package/dist/features/sequence.js.map +1 -1
- package/dist/features/structure-query.d.ts.map +1 -1
- package/dist/features/structure-query.js +60 -60
- package/dist/features/structure-query.js.map +1 -1
- package/dist/features/structure.js +28 -36
- package/dist/features/structure.js.map +1 -1
- package/dist/graph/algorithms/leiden/optimiser.d.ts.map +1 -1
- package/dist/graph/algorithms/leiden/optimiser.js +100 -69
- package/dist/graph/algorithms/leiden/optimiser.js.map +1 -1
- package/dist/graph/classifiers/roles.d.ts.map +1 -1
- package/dist/graph/classifiers/roles.js +63 -59
- package/dist/graph/classifiers/roles.js.map +1 -1
- package/dist/infrastructure/config.d.ts +1 -1
- package/dist/infrastructure/config.d.ts.map +1 -1
- package/dist/infrastructure/config.js +1 -1
- package/dist/infrastructure/config.js.map +1 -1
- package/dist/mcp/tool-registry.d.ts.map +1 -1
- package/dist/mcp/tool-registry.js +4 -0
- package/dist/mcp/tool-registry.js.map +1 -1
- package/dist/mcp/tools/semantic-search.d.ts +1 -0
- package/dist/mcp/tools/semantic-search.d.ts.map +1 -1
- package/dist/mcp/tools/semantic-search.js +1 -0
- package/dist/mcp/tools/semantic-search.js.map +1 -1
- package/dist/presentation/cfg.d.ts.map +1 -1
- package/dist/presentation/cfg.js +44 -29
- package/dist/presentation/cfg.js.map +1 -1
- package/dist/presentation/flow.d.ts.map +1 -1
- package/dist/presentation/flow.js +58 -38
- package/dist/presentation/flow.js.map +1 -1
- package/dist/types.d.ts +16 -2
- package/dist/types.d.ts.map +1 -1
- package/grammars/tree-sitter-erlang.wasm +0 -0
- package/grammars/tree-sitter-fsharp.wasm +0 -0
- package/grammars/tree-sitter-fsharp_signature.wasm +0 -0
- package/grammars/tree-sitter-gleam.wasm +0 -0
- package/package.json +10 -10
- package/src/ast-analysis/engine.ts +145 -61
- package/src/ast-analysis/rules/index.ts +87 -0
- package/src/ast-analysis/visitor-utils.ts +86 -46
- package/src/ast-analysis/visitors/ast-store-visitor.ts +104 -69
- package/src/ast-analysis/visitors/dataflow-visitor.ts +86 -47
- package/src/cli/commands/audit.ts +1 -1
- package/src/cli/commands/build.ts +2 -0
- package/src/cli/commands/check.ts +1 -1
- package/src/cli/commands/children.ts +1 -1
- package/src/cli/commands/diff-impact.ts +1 -1
- package/src/cli/commands/embed.ts +54 -4
- package/src/cli/commands/roles.ts +1 -1
- package/src/cli/commands/structure.ts +1 -1
- package/src/cli/shared/options.ts +1 -1
- package/src/db/connection.ts +8 -0
- package/src/domain/analysis/dependencies.ts +166 -85
- package/src/domain/analysis/fn-impact.ts +120 -50
- package/src/domain/analysis/module-map.ts +175 -140
- package/src/domain/graph/builder/helpers.ts +85 -76
- package/src/domain/graph/builder/incremental.ts +223 -131
- package/src/domain/graph/builder/pipeline.ts +32 -785
- package/src/domain/graph/builder/stages/build-edges.ts +207 -142
- package/src/domain/graph/builder/stages/build-structure.ts +115 -82
- package/src/domain/graph/builder/stages/detect-changes.ts +107 -64
- package/src/domain/graph/builder/stages/finalize.ts +72 -70
- package/src/domain/graph/builder/stages/insert-nodes.ts +154 -120
- package/src/domain/graph/builder/stages/native-db-lifecycle.ts +74 -0
- package/src/domain/graph/builder/stages/native-orchestrator.ts +942 -0
- package/src/domain/graph/builder/stages/resolve-imports.ts +79 -25
- package/src/domain/graph/cycles.ts +51 -49
- package/src/domain/graph/journal.ts +84 -69
- package/src/domain/graph/watcher.ts +29 -25
- package/src/domain/parser.ts +170 -67
- package/src/domain/search/generator.ts +132 -74
- package/src/domain/search/models.ts +75 -4
- package/src/domain/search/search/hybrid.ts +53 -42
- package/src/domain/search/search/semantic.ts +105 -65
- package/src/domain/wasm-worker-entry.ts +243 -153
- package/src/extractors/c.ts +27 -8
- package/src/extractors/cpp.ts +50 -8
- package/src/extractors/cuda.ts +90 -16
- package/src/extractors/elixir.ts +103 -4
- package/src/extractors/erlang.ts +63 -20
- package/src/extractors/fsharp.ts +104 -0
- package/src/extractors/gleam.ts +40 -39
- package/src/extractors/groovy.ts +45 -1
- package/src/extractors/haskell.ts +45 -4
- package/src/extractors/helpers.ts +205 -1
- package/src/extractors/java.ts +42 -45
- package/src/extractors/javascript.ts +44 -43
- package/src/extractors/julia.ts +191 -77
- package/src/extractors/kotlin.ts +4 -0
- package/src/extractors/objc.ts +171 -47
- package/src/extractors/python.ts +5 -3
- package/src/extractors/r.ts +104 -82
- package/src/extractors/scala.ts +24 -36
- package/src/extractors/solidity.ts +59 -78
- package/src/extractors/verilog.ts +83 -15
- package/src/features/boundaries.ts +64 -46
- package/src/features/cfg.ts +145 -74
- package/src/features/check.ts +60 -43
- package/src/features/cochange.ts +95 -72
- package/src/features/complexity.ts +134 -79
- package/src/features/dataflow.ts +57 -34
- package/src/features/flow.ts +48 -24
- package/src/features/graph-enrichment.ts +105 -70
- package/src/features/owners.ts +186 -146
- package/src/features/sequence.ts +99 -69
- package/src/features/structure-query.ts +94 -79
- package/src/features/structure.ts +56 -56
- package/src/graph/algorithms/leiden/optimiser.ts +142 -87
- package/src/graph/classifiers/roles.ts +64 -54
- package/src/infrastructure/config.ts +1 -1
- package/src/mcp/tool-registry.ts +5 -0
- package/src/mcp/tools/semantic-search.ts +2 -0
- package/src/presentation/cfg.ts +48 -32
- package/src/presentation/flow.ts +100 -52
- package/src/types.ts +16 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-orchestrator.js","sourceRoot":"","sources":["../../../../../src/domain/graph/builder/stages/native-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,mBAAmB,EACnB,WAAW,EACX,MAAM,EACN,cAAc,EACd,mBAAmB,EACnB,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQlE,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,gBAAgB,EAChB,YAAY,IAAI,gBAAgB,EAChC,QAAQ,EACR,QAAQ,EACR,YAAY,GACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAoDzD,yEAAyE;AAEzE,sHAAsH;AACtH,SAAS,4BAA4B,CAAC,GAAoB;IACxD,IAAI,GAAG,CAAC,gBAAgB;QAAE,OAAO,kBAAkB,CAAC;IACpD,0EAA0E;IAC1E,sEAAsE;IACtE,2DAA2D;IAC3D,MAAM,iBAAiB,GAAG,CAAC,CAAC,GAAG,CAAC,aAAa,IAAI,aAAa,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/F,IAAI,iBAAiB;QAAE,OAAO,eAAe,GAAG,CAAC,aAAa,EAAE,CAAC;IACjE,IAAI,GAAG,CAAC,UAAU,KAAK,QAAQ;QAAE,OAAO,UAAU,GAAG,CAAC,UAAU,EAAE,CAAC;IACnE,OAAO,IAAI,CAAC;AACd,CAAC;AAED;kFACkF;AAClF,SAAS,0BAA0B,CAAC,GAAoB;IACtD,aAAa,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,KAAK,CAAC,kCAAkC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC;QACH,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,IAAI,CAAC,2CAA4C,SAAmB,CAAC,OAAO,EAAE,CAAC,CAAC;QAChF,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,4BAA4B,CACnC,GAAoB,EACpB,UAAqB;IAErB,IAAI,KAAK,GACP,sFAAsF,CAAC;IACzF,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzD,KAAK,IAAI,iBAAiB,YAAY,GAAG,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IAC7B,CAAC;IACD,KAAK,IAAI,sBAAsB,CAAC;IAEhC,MAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAM7C,CAAC;IAEJ,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IACvD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG;gBACN,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE,EAAE;gBACT,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,IAAI,GAAG,EAAE;aACnB,CAAC;YACF,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;YACrB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,IAA0B;YACpC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,SAAS;SAClC,CAAC,CAAC;IACL,CAAC;IAED,gEAAgE;IAChE,8DAA8D;IAC9D,gEAAgE;IAChE,wCAAwC;IACxC,MAAM,eAAe,GAAG,GAAG,CAAC,EAAE;SAC3B,OAAO,CACN;;;;uBAIiB,CAClB;SACA,GAAG,EAAqC,CAAC;IAC5C,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,KAAK;YAAE,KAAK,CAAC,OAAO,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAA+B,CAAC;IAC9E,CAAC;IAED,MAAM,eAAe,GAAG,GAAG,CAAC,EAAE;SAC3B,OAAO,CACN;;;;;;;2BAOqB,CACtB;SACA,GAAG,EAAqC,CAAC;IAC5C,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,KAAK;YAAE,KAAK,CAAC,OAAO,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAA+B,CAAC;IAC9E,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,sBAAsB,CACnC,GAAoB,EACpB,cAA4C,EAC5C,WAAoB,EACpB,YAAkC;IAElC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IACzC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;QACtC,KAAK,MAAM,OAAO,IAAI,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC/C,MAAM,gBAAgB,GAAG,GAAG,CAAC,EAAE;aAC5B,OAAO,CACN;;+BAEuB,CACxB;aACA,GAAG,EAAiD,CAAC;QACxD,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACnC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QAC7C,CAAC;QAED,0EAA0E;QAC1E,wEAAwE;QACxE,2EAA2E;QAC3E,MAAM,gBAAgB,GAAG,WAAW,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;QACpF,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,MAAM,CACxD,mCAAmC,CACpC,CASA,CAAC;QACF,gBAAgB,CACd,GAAG,CAAC,EAAE,EACN,cAAc,EACd,GAAG,CAAC,OAAO,EACX,YAAY,EACZ,WAAW,EACX,gBAAgB,CACjB,CAAC;QACF,KAAK,CACH,sDAAsD,gBAAgB,CAAC,CAAC,CAAC,KAAK,gBAAgB,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAC7H,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,8CAA8C,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,WAAW,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;AAC5C,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,qBAAqB,CAClC,GAAoB,EACpB,cAA4C,EAC5C,YAAkC;IAElC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;IAEtE,mDAAmD;IACnD,IAAI,mBAAiD,CAAC;IACtD,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,mBAAmB,GAAG,IAAI,GAAG,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,KAAK;gBAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,mBAAmB,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,sEAAsE;IACtE,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,IAAI,MAAM,EAAE,cAAc,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC/D,IAAI,GAAG,CAAC,UAAU;gBAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC7D,CAAC;QAAC,MAAM,CAAC;YACP,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAC;YACzB,IAAI,GAAG,CAAC,UAAU;gBAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,sEAAsE;IACtE,uEAAuE;IACvE,6DAA6D;IAC7D,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;QACnC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACtC,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QACtC,GAAG,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,oCAAoC,CAAC,CAQzF,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,GAAG,CAAC,EAAE,EACN,mBAAmB,EACnB,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,IAA+B,EACnC,GAAG,CAAC,UAA4D,CACjE,CAAC;QACF,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,8CAA8C,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,uEAAuE;IACvE,sEAAsE;IACtE,oDAAoD;IACpD,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,8BAA8B;QAChC,CAAC;QACD,IAAI,CAAC;YACH,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;QAAC,MAAM,CAAC;YACP,yBAAyB;QAC3B,CAAC;QACD,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAC;QACzB,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACnB,GAAG,CAAC,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC;YACpC,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC;YACvC,GAAG,CAAC,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;QACxC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,iFAAiF;AACjF,SAAS,wBAAwB,CAC/B,CAAyB,EACzB,gBAAwB,EACxB,cAA0F;IAE1F,OAAO;QACL,MAAM,EAAE;YACN,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACzC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACvC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACvC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAClE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrC,KAAK,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC9C,YAAY,EAAE,CAAC,CAAC,cAAc,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5D,KAAK,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC9C,UAAU,EAAE,CAAC,CAAC,cAAc,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACxD,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;SAC5C;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAA8B;IACtE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAC1F,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAQ,EAAE;QACxC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACvC,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5C,IAAI,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO;QACrC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO;QACpC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,uEAAuE;QACvE,mEAAmE;QACnE,gEAAgE;QAChE,oEAAoE;QACpE,oEAAoE;QACpE,iDAAiD;QACjD,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,aAAa;QAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,cAAc;QAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,SAAS,gBAAgB,CAAC,QAA0B;IAClD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC5C,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5C,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,SAAS,wBAAwB,CAAC,GAAoB;IACpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,EAAU,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,IAAI,GAAG,CACtB,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CACzE,CAAC;IAEF,MAAM,gBAAgB,GAAG,GAAG,CAAC,EAAE;SAC5B,OAAO,CAAC,qDAAqD,CAAC;SAC9D,GAAG,EAA6B,CAAC;IACpC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnE,IAAI,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,GAAG,CAAC,EAAE;aAC5B,OAAO,CAAC,uCAAuC,CAAC;aAChD,GAAG,EAA6B,CAAC;QACpC,cAAc,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,wEAAwE;QACxE,wDAAwD;QACxD,KAAK,CACH,4EAA4E,cAAc,CAAC,CAAC,CAAC,EAAE,CAChG,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,0BAA0B,EAAE,CAAC;IACnD,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QAChE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QACtC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,QAAQ,GAAG,yBAAyB,CAAC;QACzC,aAAa;QACb,cAAc;QACd,QAAQ;QACR,aAAa;QACb,eAAe,EAAE,2BAA2B;KAC7C,CAAC,CAAC;IAEH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;AAC9C,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,0BAA0B,CACvC,GAAoB,EACpB,GAAuB;IAEvB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;IACjD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAE7D,0EAA0E;IAC1E,8BAA8B;IAC9B,IAAI,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACzB,aAAa,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;QAC1C,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5B,GAAG,CAAC,gBAAgB,GAAG,KAAK,CAAC;IAC/B,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,EAAsC,CAAC;IAE1D,oEAAoE;IACpE,yEAAyE;IACzE,2EAA2E;IAC3E,kCAAkC;IAClC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,0EAA0E;QAC1E,sEAAsE;QACtE,uEAAuE;QACvE,6DAA6D;QAC7D,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,CACF,YAAY,QAAQ,CAAC,MAAM,qCAAqC,UAAU,CAAC,IAAI,qEAAqE,0BAA0B,CAAC,UAAU,CAAC,EAAE,CAC7L,CAAC;QACF,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEpC,4EAA4E;IAC5E,yEAAyE;IACzE,2EAA2E;IAC3E,0EAA0E;IAC1E,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAI,MAAM,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QAClD,IAAI,CACF,+BAA+B,MAAM,CAAC,uBAAuB,CAAC,mBAAmB,OAAO,CAAC,IAAI,6EAA6E,0BAA0B,CAAC,OAAO,CAAC,EAAE,CAChN,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3C,MAAM,OAAO,GAAG,QAAQ,CAAC,0BAA0B,CAAC,CAAC;QACrD,IAAI,CACF,+BAA+B,MAAM,CAAC,0BAA0B,CAAC,mBAAmB,OAAO,CAAC,IAAI,qGAAqG,0BAA0B,CAAC,OAAO,CAAC,EAAE,CAC3O,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,yBAAyB,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAE7E,MAAM,IAAI,GAAgB,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,WAAW,EAAE,CAAC;QAC7C,0EAA0E;QAC1E,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACvE,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;YAC5C,qEAAqE;YACrE,sEAAsE;YACtE,iBAAiB;YACjB,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACzC,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC/D,IAAI,CAAC,IAAI,CAAC;gBACR,GAAG,CAAC,IAAI;gBACR,GAAG,CAAC,IAAI;gBACR,OAAO;gBACP,GAAG,CAAC,IAAI;gBACR,GAAG,CAAC,OAAO,IAAI,IAAI;gBACnB,IAAI;gBACJ,GAAG,CAAC,IAAI;gBACR,KAAK;gBACL,GAAG,CAAC,UAAU,IAAI,IAAI;aACvB,CAAC,CAAC;QACL,CAAC;QACD,wEAAwE;QACxE,wEAAwE;QACxE,kEAAkE;QAClE,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YACxC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YACrF,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IACD,MAAM,EAAE,GAAG,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAE3B,0EAA0E;IAC1E,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAG,GAAG,CAAC;QACzB,MAAM,eAAe,GAAG,IAAI,GAAG,EAA2B,CAAC;QAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC;YACzD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;YAC1D,MAAM,SAAS,GAAG,GAAG,GAAG,CAAC,CAAC;YAC1B,IAAI,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAChD,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAC3B,EAAE,MAAM,EAAE,SAAS,EAAE,EACrB,GAAG,EAAE,CAAC,mDAAmD,CAC1D,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACf,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC,uCAAuC,UAAU,EAAE,CAAC,CAAC;gBAC7E,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAC7C,CAAC;YACD,MAAM,IAAI,GAAc,EAAE,CAAC;YAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC7B,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAc,CAAC;gBACrC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC;YACD,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,4EAA4E;IAC5E,oEAAoE;IACpE,yEAAyE;IACzE,yEAAyE;IACzE,yEAAyE;IACzE,yEAAyE;IACzE,+BAA+B;IAC/B,EAAE;IACF,oEAAoE;IACpE,yEAAyE;IACzE,aAAa;IACb,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAC3B,kFAAkF,CACnF,CAAC;QACF,MAAM,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC9B,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC9B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO;oBAAE,SAAS;gBACnC,IAAI,IAAmB,CAAC;gBACxB,IAAI,CAAC;oBACH,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,KAAK,CAAC,+CAA+C,OAAO,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACtF,SAAS;gBACX,CAAC;gBACD,IAAI,IAAI,KAAK,IAAI;oBAAE,SAAS;gBAC5B,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACvD,CAAC;QACH,CAAC,CAAC,CAAC;QACH,WAAW,EAAE,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,KAAK,CACH,+EAA+E,cAAc,CAAC,CAAC,CAAC,EAAE,CACnG,CAAC;IACJ,CAAC;IAED,+DAA+D;IAC/D,2EAA2E;IAC3E,uEAAuE;IACvE,8DAA8D;IAC9D,yEAAyE;IACzE,uEAAuE;IACvE,sEAAsE;IACtE,uDAAuD;IACvD,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,WAAW,EAAE,CAAC;QACtC,MAAM,IAAI,GAAI,OAA+C,CAAC,KAAK,CAAC;QACpE,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC9C,IAAI,CAAC;gBACH,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,CAAC;YAAC,MAAM,CAAC;gBACP,2BAA2B;YAC7B,CAAC;QACH,CAAC;QACA,OAAkD,CAAC,KAAK,GAAG,SAAS,CAAC;QACrE,OAAkD,CAAC,OAAO,GAAG,SAAS,CAAC;IAC1E,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAAoB;IAEpB,MAAM,UAAU,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,UAAU,EAAE,CAAC;QACf,KAAK,CAAC,iCAAiC,UAAU,EAAE,CAAC,CAAC;QACrD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,0EAA0E;IAC1E,6EAA6E;IAC7E,iDAAiD;IACjD,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAC5B,IAAI,MAAM,EAAE,cAAc,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,uEAAuE;gBACvE,0EAA0E;gBAC1E,yEAAyE;gBACzE,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;gBACf,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAChC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC/D,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;gBAC1B,iEAAiE;gBACjE,qEAAqE;gBACrE,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC9C,KAAK,CAAC,UAAU,GAAG,GAAG,GAAG,CAAC,MAAM,OAAO,CAAC;gBACxC,GAAG,CAAC,EAAE,GAAG,KAAiC,CAAC;gBAC3C,GAAG,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC9B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,oDAAoD,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAChF,IAAI,CAAC;oBACH,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;gBACxB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,KAAK,CAAC,wDAAwD,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACrF,CAAC;gBACD,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAC;gBACzB,GAAG,CAAC,gBAAgB,GAAG,KAAK,CAAC,CAAC,qFAAqF;gBACnH,mBAAmB,CAAC,GAAG,GAAG,CAAC,MAAM,OAAO,CAAC,CAAC;gBAC1C,iDAAiD;gBACjD,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU;QAAE,OAAO,SAAS,CAAC;IAEhD,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CACxC,GAAG,CAAC,OAAO,EACX,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAC1B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CACzB,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAA6B,CAAC;IAElE,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC5B,sEAAsE;QACtE,uEAAuE;QACvE,qEAAqE;QACrE,mEAAmE;QACnE,qEAAqE;QACrE,MAAM,GAAG,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzD,MAAM,0BAA0B,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC7C,CAAC;QACD,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,qDAAqD;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,gBAAgB,OAAO,aAAa,OAAO,UAAU,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IAExB,uEAAuE;IACvE,wEAAwE;IACxE,qEAAqE;IACrE,qEAAqE;IACrE,oEAAoE;IACpE,mEAAmE;IACnE,qEAAqE;IACrE,wBAAwB;IACxB,EAAE;IACF,sEAAsE;IACtE,8DAA8D;IAC9D,iEAAiE;IACjE,uEAAuE;IACvE,qEAAqE;IACrE,MAAM,oBAAoB,GAAG,GAAG,CAAC,mBAAmB,IAAI,iBAAiB,CAAC;IAC1E,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE;QACnB,MAAM,EAAE,GAAG,CAAC,UAAU;QACtB,cAAc,EAAE,oBAAoB;QACpC,iBAAiB,EAAE,oBAAoB;QACvC,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QACzC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACnC,CAAC,CAAC;IAEH,IAAI,CACF,wCAAwC,MAAM,CAAC,SAAS,IAAI,CAAC,WAAW,MAAM,CAAC,SAAS,IAAI,CAAC,WAAW,MAAM,CAAC,SAAS,IAAI,CAAC,QAAQ,CACtI,CAAC;IAEF,qEAAqE;IACrE,IAAI,cAAc,GAAG;QACnB,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QACtB,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC;QACpC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QACtB,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC;KACjC,CAAC;IACF,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,yEAAyE;IACzE,wEAAwE;IACxE,kDAAkD;IAClD,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC;IAChD,wEAAwE;IACxE,8DAA8D;IAC9D,MAAM,qBAAqB,GACzB,CAAC,MAAM,CAAC,gBAAgB;QACxB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK;YACrB,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,KAAK;YAC7B,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK;YACtB,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC;IAEjC,IAAI,cAAc,IAAI,qBAAqB,EAAE,CAAC;QAC5C,oEAAoE;QACpE,sEAAsE;QACtE,yDAAyD;QACzD,IAAI,qBAAqB,IAAI,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAClD,aAAa,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC;YAC5C,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC5B,GAAG,CAAC,gBAAgB,GAAG,KAAK,CAAC;QAC/B,CAAC;aAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC;YACrE,2CAA2C;YAC3C,OAAO,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,WAAW,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAEtD,IAAI,cAAc,EAAE,CAAC;YACnB,gBAAgB,GAAG,MAAM,sBAAsB,CAC7C,GAAG,EACH,WAAW,EACX,CAAC,CAAC,MAAM,CAAC,WAAW,EACpB,MAAM,CAAC,YAAY,CACpB,CAAC;QACJ,CAAC;QAED,IAAI,qBAAqB,EAAE,CAAC;YAC1B,cAAc,GAAG,MAAM,qBAAqB,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAED,oEAAoE;IACpE,wEAAwE;IACxE,yEAAyE;IACzE,4CAA4C;IAC5C,EAAE;IACF,wEAAwE;IACxE,yEAAyE;IACzE,sEAAsE;IACtE,qEAAqE;IACrE,0EAA0E;IAC1E,oEAAoE;IACpE,oEAAoE;IACpE,mEAAmE;IACnE,eAAe;IACf,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;IAC9C,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAC1C,IACE,MAAM,CAAC,WAAW;QAClB,YAAY,GAAG,CAAC;QAChB,YAAY,GAAG,CAAC;QAChB,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QACzB,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EACvB,CAAC;QACD,MAAM,0BAA0B,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,OAAO,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-imports.d.ts","sourceRoot":"","sources":["../../../../../src/domain/graph/builder/stages/resolve-imports.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-imports.d.ts","sourceRoot":"","sources":["../../../../../src/domain/graph/builder/stages/resolve-imports.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAoKrD,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CxE;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAO/F;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAO3E;AASD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,eAAe,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GACvC,MAAM,GAAG,IAAI,CAuBf"}
|
|
@@ -20,23 +20,27 @@ function buildReexportMap(ctx) {
|
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
/**
|
|
23
|
-
* Find barrel files related to
|
|
24
|
-
* For small
|
|
25
|
-
* or are imported by
|
|
23
|
+
* Find barrel files related to `fromRelPaths` for scoped re-parsing.
|
|
24
|
+
* For small frontiers (<=smallFilesThreshold files), only barrels that re-export from
|
|
25
|
+
* or are imported by `fromRelPaths`. For larger frontiers, all barrels.
|
|
26
|
+
*
|
|
27
|
+
* `firstPass` gates the reexport-from DB scan: re-parsed barrels haven't
|
|
28
|
+
* changed content, so subsequent passes can't surface new reexport-from
|
|
29
|
+
* candidates and only need to follow imports of newly-merged barrels
|
|
30
|
+
* (mirrors the Rust orchestrator's seed-only `collect_reexport_from_barrels`).
|
|
26
31
|
*/
|
|
27
|
-
function findBarrelCandidates(ctx) {
|
|
32
|
+
function findBarrelCandidates(ctx, fromRelPaths, firstPass) {
|
|
28
33
|
const { db, fileSymbols, rootDir, aliases } = ctx;
|
|
29
|
-
|
|
30
|
-
if (changedRelPaths.size <= ctx.config.build.smallFilesThreshold) {
|
|
34
|
+
if (fromRelPaths.length <= ctx.config.build.smallFilesThreshold) {
|
|
31
35
|
const allBarrelFiles = new Set(db
|
|
32
36
|
.prepare(`SELECT DISTINCT n1.file FROM edges e
|
|
33
37
|
JOIN nodes n1 ON e.source_id = n1.id
|
|
34
38
|
WHERE e.kind = 'reexports' AND n1.kind = 'file'`)
|
|
35
39
|
.all().map((r) => r.file));
|
|
36
40
|
const barrels = new Set();
|
|
37
|
-
// Find barrels imported by
|
|
41
|
+
// Find barrels imported by `fromRelPaths` using parsed import data
|
|
38
42
|
// (can't query DB edges -- they were purged for the changed files).
|
|
39
|
-
for (const relPath of
|
|
43
|
+
for (const relPath of fromRelPaths) {
|
|
40
44
|
const symbols = fileSymbols.get(relPath);
|
|
41
45
|
if (!symbols)
|
|
42
46
|
continue;
|
|
@@ -47,14 +51,15 @@ function findBarrelCandidates(ctx) {
|
|
|
47
51
|
barrels.add(target);
|
|
48
52
|
}
|
|
49
53
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
54
|
+
if (firstPass) {
|
|
55
|
+
const reexportSourceStmt = db.prepare(`SELECT DISTINCT n1.file FROM edges e
|
|
56
|
+
JOIN nodes n1 ON e.source_id = n1.id
|
|
57
|
+
JOIN nodes n2 ON e.target_id = n2.id
|
|
58
|
+
WHERE e.kind = 'reexports' AND n1.kind = 'file' AND n2.file = ?`);
|
|
59
|
+
for (const relPath of fromRelPaths) {
|
|
60
|
+
for (const row of reexportSourceStmt.all(relPath)) {
|
|
61
|
+
barrels.add(row.file);
|
|
62
|
+
}
|
|
58
63
|
}
|
|
59
64
|
}
|
|
60
65
|
return [...barrels].map((file) => ({ file }));
|
|
@@ -65,7 +70,18 @@ function findBarrelCandidates(ctx) {
|
|
|
65
70
|
WHERE e.kind = 'reexports' AND n1.kind = 'file'`)
|
|
66
71
|
.all();
|
|
67
72
|
}
|
|
68
|
-
/**
|
|
73
|
+
/**
|
|
74
|
+
* Re-parse barrel files and update fileSymbols/reexportMap with fresh data.
|
|
75
|
+
* Returns the relative paths of newly-merged files so the caller can scan
|
|
76
|
+
* them for the next level of barrel candidates.
|
|
77
|
+
*
|
|
78
|
+
* A re-parsed file is marked `barrel-only` only when it really is one (the
|
|
79
|
+
* `isBarrelFile` check — reexports >= ownDefs). The previous unconditional
|
|
80
|
+
* `.add(relPath)` caused hybrid barrels with many local defs (e.g. a file
|
|
81
|
+
* with one `export type ... from` and dozens of internal functions) to drop
|
|
82
|
+
* all their non-reexport imports in build-edges, since the barrel-only branch
|
|
83
|
+
* skips them (#1174).
|
|
84
|
+
*/
|
|
69
85
|
async function reparseBarrelFiles(ctx, barrelCandidates) {
|
|
70
86
|
const { db, fileSymbols, rootDir, engineOpts } = ctx;
|
|
71
87
|
const barrelPaths = [];
|
|
@@ -75,14 +91,23 @@ async function reparseBarrelFiles(ctx, barrelCandidates) {
|
|
|
75
91
|
}
|
|
76
92
|
}
|
|
77
93
|
if (barrelPaths.length === 0)
|
|
78
|
-
return;
|
|
79
|
-
|
|
94
|
+
return [];
|
|
95
|
+
// Preserve `contains` and `parameter_of` — those are emitted by insertNodes,
|
|
96
|
+
// which only runs on the original (changed + reverse-dep) fileSymbols. Barrel
|
|
97
|
+
// candidates are merged here *after* insertNodes, so wiping those kinds
|
|
98
|
+
// would permanently drop them (mirrors the Rust orchestrator's Stage 6b
|
|
99
|
+
// delete in build_pipeline.rs).
|
|
100
|
+
const deleteOutgoingEdges = db.prepare(`DELETE FROM edges WHERE source_id IN (SELECT id FROM nodes WHERE file = ?)
|
|
101
|
+
AND kind NOT IN ('contains', 'parameter_of')`);
|
|
102
|
+
const added = [];
|
|
80
103
|
try {
|
|
81
104
|
const barrelSymbols = await parseFilesAuto(barrelPaths, rootDir, engineOpts);
|
|
82
105
|
for (const [relPath, fileSym] of barrelSymbols) {
|
|
83
106
|
deleteOutgoingEdges.run(relPath);
|
|
84
107
|
fileSymbols.set(relPath, fileSym);
|
|
85
|
-
ctx
|
|
108
|
+
if (isBarrelFile(ctx, relPath)) {
|
|
109
|
+
ctx.barrelOnlyFiles.add(relPath);
|
|
110
|
+
}
|
|
86
111
|
const reexports = fileSym.imports.filter((imp) => imp.reexport);
|
|
87
112
|
if (reexports.length > 0) {
|
|
88
113
|
ctx.reexportMap.set(relPath, reexports.map((imp) => ({
|
|
@@ -91,11 +116,13 @@ async function reparseBarrelFiles(ctx, barrelCandidates) {
|
|
|
91
116
|
wildcardReexport: imp.wildcardReexport || false,
|
|
92
117
|
})));
|
|
93
118
|
}
|
|
119
|
+
added.push(relPath);
|
|
94
120
|
}
|
|
95
121
|
}
|
|
96
122
|
catch (e) {
|
|
97
123
|
debug(`Barrel re-parse failed (non-fatal): ${e.message}`);
|
|
98
124
|
}
|
|
125
|
+
return added;
|
|
99
126
|
}
|
|
100
127
|
export async function resolveImports(ctx) {
|
|
101
128
|
const { fileSymbols, rootDir, aliases, allFiles, isFullBuild } = ctx;
|
|
@@ -112,8 +139,32 @@ export async function resolveImports(ctx) {
|
|
|
112
139
|
buildReexportMap(ctx);
|
|
113
140
|
ctx.barrelOnlyFiles = new Set();
|
|
114
141
|
if (!isFullBuild) {
|
|
115
|
-
|
|
116
|
-
|
|
142
|
+
// Iteratively discover and re-parse barrel chains. A barrel that imports
|
|
143
|
+
// another barrel (e.g. `parser.ts → extractors/index.ts → extractors/<lang>.ts`)
|
|
144
|
+
// needs both loaded so build-edges can emit the barrel-through edges from
|
|
145
|
+
// the first barrel to the leaf targets. Without iteration, only the first
|
|
146
|
+
// level of barrels gets merged into fileSymbols; the deeper chain has no
|
|
147
|
+
// entry in reexportMap and the resolver silently drops the affected edges
|
|
148
|
+
// on every incremental rebuild (#1174).
|
|
149
|
+
//
|
|
150
|
+
// Convergence is guaranteed because fileSymbols grows monotonically and
|
|
151
|
+
// is bounded by the set of barrel files in the project — each iteration
|
|
152
|
+
// either adds a previously-unseen barrel or terminates.
|
|
153
|
+
//
|
|
154
|
+
// Subsequent passes only walk newly-merged barrels' imports (`frontier`
|
|
155
|
+
// = paths returned by reparseBarrelFiles), matching the Rust
|
|
156
|
+
// orchestrator's `&newly_added` slice. Without this, every pass would
|
|
157
|
+
// re-query the DB for every key in `fileSymbols`.
|
|
158
|
+
let frontier = [...fileSymbols.keys()];
|
|
159
|
+
let firstPass = true;
|
|
160
|
+
while (frontier.length > 0) {
|
|
161
|
+
const barrelCandidates = findBarrelCandidates(ctx, frontier, firstPass);
|
|
162
|
+
const added = await reparseBarrelFiles(ctx, barrelCandidates);
|
|
163
|
+
if (added.length === 0)
|
|
164
|
+
break;
|
|
165
|
+
frontier = added;
|
|
166
|
+
firstPass = false;
|
|
167
|
+
}
|
|
117
168
|
}
|
|
118
169
|
}
|
|
119
170
|
export function getResolved(ctx, absFile, importSource) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-imports.js","sourceRoot":"","sources":["../../../../../src/domain/graph/builder/stages/resolve-imports.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAS1E,sEAAsE;AACtE,SAAS,gBAAgB,CAAC,GAAoB;IAC5C,GAAG,CAAC,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IACrD,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IACrC,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,WAAW,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,GAAG,CAAC,WAAW,CAAC,GAAG,CACjB,OAAO,EACP,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACtB,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;gBACjE,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,KAAK;aAChD,CAAC,CAAC,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"resolve-imports.js","sourceRoot":"","sources":["../../../../../src/domain/graph/builder/stages/resolve-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import type { BetterSqlite3Database } from '../../types.js';
|
|
2
|
+
type Edge = {
|
|
3
|
+
source: string;
|
|
4
|
+
target: string;
|
|
5
|
+
};
|
|
2
6
|
/**
|
|
3
7
|
* Find cycles using Tarjan's SCC algorithm.
|
|
4
8
|
*
|
|
@@ -9,9 +13,7 @@ export declare function findCycles(db: BetterSqlite3Database, opts?: {
|
|
|
9
13
|
fileLevel?: boolean;
|
|
10
14
|
noTests?: boolean;
|
|
11
15
|
}): string[][];
|
|
12
|
-
export declare function findCyclesJS(edges:
|
|
13
|
-
source: string;
|
|
14
|
-
target: string;
|
|
15
|
-
}>): string[][];
|
|
16
|
+
export declare function findCyclesJS(edges: Edge[]): string[][];
|
|
16
17
|
export declare function formatCycles(cycles: string[][]): string;
|
|
18
|
+
export {};
|
|
17
19
|
//# sourceMappingURL=cycles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cycles.d.ts","sourceRoot":"","sources":["../../../src/domain/graph/cycles.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5D;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,qBAAqB,EACzB,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GACpD,MAAM,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"cycles.d.ts","sourceRoot":"","sources":["../../../src/domain/graph/cycles.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5D,KAAK,IAAI,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAuC/C;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,qBAAqB,EACzB,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GACpD,MAAM,EAAE,EAAE,CAWZ;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,CAEtD;AAsED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAgBvD"}
|
|
@@ -1,6 +1,46 @@
|
|
|
1
1
|
import { getCallableNodes, getCallEdges, getFileNodesAll, getImportEdges } from '../../db/index.js';
|
|
2
2
|
import { loadNative } from '../../infrastructure/native.js';
|
|
3
3
|
import { isTestFile } from '../../infrastructure/test-filter.js';
|
|
4
|
+
/**
|
|
5
|
+
* Build a label-based edge list from DB rows, filtering to known nodes and
|
|
6
|
+
* deduplicating. Self-loops are skipped (Tarjan treats them as trivial SCCs).
|
|
7
|
+
*/
|
|
8
|
+
function buildLabelEdges(dbEdges, idToLabel) {
|
|
9
|
+
const edges = [];
|
|
10
|
+
const seen = new Set();
|
|
11
|
+
for (const e of dbEdges) {
|
|
12
|
+
if (e.source_id === e.target_id)
|
|
13
|
+
continue;
|
|
14
|
+
const src = idToLabel.get(e.source_id);
|
|
15
|
+
const tgt = idToLabel.get(e.target_id);
|
|
16
|
+
if (src === undefined || tgt === undefined)
|
|
17
|
+
continue;
|
|
18
|
+
const key = `${src}\0${tgt}`;
|
|
19
|
+
if (seen.has(key))
|
|
20
|
+
continue;
|
|
21
|
+
seen.add(key);
|
|
22
|
+
edges.push({ source: src, target: tgt });
|
|
23
|
+
}
|
|
24
|
+
return edges;
|
|
25
|
+
}
|
|
26
|
+
function buildFileLevelEdges(db, noTests) {
|
|
27
|
+
let nodes = getFileNodesAll(db);
|
|
28
|
+
if (noTests)
|
|
29
|
+
nodes = nodes.filter((n) => !isTestFile(n.file));
|
|
30
|
+
const idToLabel = new Map();
|
|
31
|
+
for (const n of nodes)
|
|
32
|
+
idToLabel.set(n.id, n.file);
|
|
33
|
+
return buildLabelEdges(getImportEdges(db), idToLabel);
|
|
34
|
+
}
|
|
35
|
+
function buildCallableEdges(db, noTests) {
|
|
36
|
+
let nodes = getCallableNodes(db);
|
|
37
|
+
if (noTests)
|
|
38
|
+
nodes = nodes.filter((n) => !isTestFile(n.file));
|
|
39
|
+
const idToLabel = new Map();
|
|
40
|
+
for (const n of nodes)
|
|
41
|
+
idToLabel.set(n.id, `${n.name}|${n.file}`);
|
|
42
|
+
return buildLabelEdges(getCallEdges(db), idToLabel);
|
|
43
|
+
}
|
|
4
44
|
/**
|
|
5
45
|
* Find cycles using Tarjan's SCC algorithm.
|
|
6
46
|
*
|
|
@@ -10,56 +50,7 @@ import { isTestFile } from '../../infrastructure/test-filter.js';
|
|
|
10
50
|
export function findCycles(db, opts = {}) {
|
|
11
51
|
const fileLevel = opts.fileLevel !== false;
|
|
12
52
|
const noTests = opts.noTests || false;
|
|
13
|
-
const edges =
|
|
14
|
-
const seen = new Set();
|
|
15
|
-
if (fileLevel) {
|
|
16
|
-
let nodes = getFileNodesAll(db);
|
|
17
|
-
if (noTests)
|
|
18
|
-
nodes = nodes.filter((n) => !isTestFile(n.file));
|
|
19
|
-
const nodeIds = new Set();
|
|
20
|
-
const idToFile = new Map();
|
|
21
|
-
for (const n of nodes) {
|
|
22
|
-
nodeIds.add(n.id);
|
|
23
|
-
idToFile.set(n.id, n.file);
|
|
24
|
-
}
|
|
25
|
-
for (const e of getImportEdges(db)) {
|
|
26
|
-
if (!nodeIds.has(e.source_id) || !nodeIds.has(e.target_id))
|
|
27
|
-
continue;
|
|
28
|
-
if (e.source_id === e.target_id)
|
|
29
|
-
continue;
|
|
30
|
-
const src = idToFile.get(e.source_id);
|
|
31
|
-
const tgt = idToFile.get(e.target_id);
|
|
32
|
-
const key = `${src}\0${tgt}`;
|
|
33
|
-
if (seen.has(key))
|
|
34
|
-
continue;
|
|
35
|
-
seen.add(key);
|
|
36
|
-
edges.push({ source: src, target: tgt });
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
let nodes = getCallableNodes(db);
|
|
41
|
-
if (noTests)
|
|
42
|
-
nodes = nodes.filter((n) => !isTestFile(n.file));
|
|
43
|
-
const nodeIds = new Set();
|
|
44
|
-
const idToLabel = new Map();
|
|
45
|
-
for (const n of nodes) {
|
|
46
|
-
nodeIds.add(n.id);
|
|
47
|
-
idToLabel.set(n.id, `${n.name}|${n.file}`);
|
|
48
|
-
}
|
|
49
|
-
for (const e of getCallEdges(db)) {
|
|
50
|
-
if (!nodeIds.has(e.source_id) || !nodeIds.has(e.target_id))
|
|
51
|
-
continue;
|
|
52
|
-
if (e.source_id === e.target_id)
|
|
53
|
-
continue;
|
|
54
|
-
const src = idToLabel.get(e.source_id);
|
|
55
|
-
const tgt = idToLabel.get(e.target_id);
|
|
56
|
-
const key = `${src}\0${tgt}`;
|
|
57
|
-
if (seen.has(key))
|
|
58
|
-
continue;
|
|
59
|
-
seen.add(key);
|
|
60
|
-
edges.push({ source: src, target: tgt });
|
|
61
|
-
}
|
|
62
|
-
}
|
|
53
|
+
const edges = fileLevel ? buildFileLevelEdges(db, noTests) : buildCallableEdges(db, noTests);
|
|
63
54
|
const native = loadNative();
|
|
64
55
|
if (native) {
|
|
65
56
|
return native.detectCycles(edges);
|
|
@@ -69,11 +60,7 @@ export function findCycles(db, opts = {}) {
|
|
|
69
60
|
export function findCyclesJS(edges) {
|
|
70
61
|
return tarjanFromEdges(edges);
|
|
71
62
|
}
|
|
72
|
-
|
|
73
|
-
* Run Tarjan's SCC on a flat edge list. Returns SCCs with length > 1 (cycles).
|
|
74
|
-
* Uses a simple adjacency-list Map instead of a full CodeGraph.
|
|
75
|
-
*/
|
|
76
|
-
function tarjanFromEdges(edges) {
|
|
63
|
+
function buildAdjacency(edges) {
|
|
77
64
|
const adj = new Map();
|
|
78
65
|
const allNodes = new Set();
|
|
79
66
|
for (const { source, target } of edges) {
|
|
@@ -86,6 +73,14 @@ function tarjanFromEdges(edges) {
|
|
|
86
73
|
}
|
|
87
74
|
list.push(target);
|
|
88
75
|
}
|
|
76
|
+
return { adj, allNodes };
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Run Tarjan's SCC on a flat edge list. Returns SCCs with length > 1 (cycles).
|
|
80
|
+
* Uses a simple adjacency-list Map instead of a full CodeGraph.
|
|
81
|
+
*/
|
|
82
|
+
function tarjanFromEdges(edges) {
|
|
83
|
+
const { adj, allNodes } = buildAdjacency(edges);
|
|
89
84
|
let index = 0;
|
|
90
85
|
const stack = [];
|
|
91
86
|
const onStack = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cycles.js","sourceRoot":"","sources":["../../../src/domain/graph/cycles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"cycles.js","sourceRoot":"","sources":["../../../src/domain/graph/cycles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal.d.ts","sourceRoot":"","sources":["../../../src/domain/graph/journal.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"journal.d.ts","sourceRoot":"","sources":["../../../src/domain/graph/journal.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAgOlD,UAAU,aAAa;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAwCD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAe1D;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAClD,IAAI,CAeN;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAiB3E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EACnD,SAAS,EAAE,MAAM,GAChB,IAAI,CA+BN"}
|
|
@@ -85,64 +85,75 @@ function trySteal(lockPath) {
|
|
|
85
85
|
}
|
|
86
86
|
return { fd, nonce };
|
|
87
87
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
88
|
+
/**
|
|
89
|
+
* Try to create the lockfile fresh via `wx`. Returns the acquired lock on
|
|
90
|
+
* success, `null` if another holder exists, or throws on unexpected errors.
|
|
91
|
+
*
|
|
92
|
+
* If the stamp write fails (ENOSPC, I/O error) we release the empty file —
|
|
93
|
+
* leaving it would look stale to concurrent waiters and admit double-acquire.
|
|
94
|
+
*/
|
|
95
|
+
function tryFreshAcquire(lockPath) {
|
|
96
|
+
const nonce = `${process.pid}-${crypto.randomBytes(8).toString('hex')}`;
|
|
97
|
+
let fd;
|
|
98
|
+
try {
|
|
99
|
+
fd = fs.openSync(lockPath, 'wx');
|
|
100
|
+
}
|
|
101
|
+
catch (e) {
|
|
102
|
+
if (e.code === 'EEXIST')
|
|
103
|
+
return null;
|
|
104
|
+
throw e;
|
|
105
|
+
}
|
|
106
|
+
try {
|
|
107
|
+
fs.writeSync(fd, `${process.pid}\n${nonce}\n`);
|
|
108
|
+
}
|
|
109
|
+
catch {
|
|
92
110
|
try {
|
|
93
|
-
|
|
94
|
-
try {
|
|
95
|
-
fs.writeSync(fd, `${process.pid}\n${nonce}\n`);
|
|
96
|
-
}
|
|
97
|
-
catch {
|
|
98
|
-
// Stamp write failed (ENOSPC, I/O error). An empty lockfile would
|
|
99
|
-
// look stale to concurrent waiters (Number('') === 0, isPidAlive(0)
|
|
100
|
-
// returns false), so they'd steal our live lock. Release and retry.
|
|
101
|
-
try {
|
|
102
|
-
fs.closeSync(fd);
|
|
103
|
-
}
|
|
104
|
-
catch {
|
|
105
|
-
/* ignore */
|
|
106
|
-
}
|
|
107
|
-
try {
|
|
108
|
-
fs.unlinkSync(lockPath);
|
|
109
|
-
}
|
|
110
|
-
catch {
|
|
111
|
-
/* ignore */
|
|
112
|
-
}
|
|
113
|
-
if (Date.now() - start > LOCK_TIMEOUT_MS) {
|
|
114
|
-
throw new Error(`Failed to acquire journal lock at ${lockPath} within ${LOCK_TIMEOUT_MS}ms`);
|
|
115
|
-
}
|
|
116
|
-
sleepSync(LOCK_RETRY_MS);
|
|
117
|
-
continue;
|
|
118
|
-
}
|
|
119
|
-
return { fd, nonce };
|
|
111
|
+
fs.closeSync(fd);
|
|
120
112
|
}
|
|
121
|
-
catch
|
|
122
|
-
|
|
123
|
-
throw e;
|
|
113
|
+
catch {
|
|
114
|
+
/* ignore */
|
|
124
115
|
}
|
|
125
|
-
let holderAlive = true;
|
|
126
116
|
try {
|
|
127
|
-
|
|
128
|
-
holderAlive = isPidAlive(Number(pidContent));
|
|
117
|
+
fs.unlinkSync(lockPath);
|
|
129
118
|
}
|
|
130
119
|
catch {
|
|
131
|
-
/*
|
|
132
|
-
}
|
|
133
|
-
let shouldSteal = !holderAlive;
|
|
134
|
-
if (holderAlive) {
|
|
135
|
-
try {
|
|
136
|
-
const stat = fs.statSync(lockPath);
|
|
137
|
-
if (Date.now() - stat.mtimeMs > LOCK_STALE_MS) {
|
|
138
|
-
shouldSteal = true;
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
catch {
|
|
142
|
-
/* stat failed — keep retrying */
|
|
143
|
-
}
|
|
120
|
+
/* ignore */
|
|
144
121
|
}
|
|
145
|
-
|
|
122
|
+
return null;
|
|
123
|
+
}
|
|
124
|
+
return { fd, nonce };
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* Decide whether the current lock holder is stale and should be stolen.
|
|
128
|
+
* Returns true if the PID is dead, or if the lockfile mtime exceeds the
|
|
129
|
+
* staleness threshold.
|
|
130
|
+
*/
|
|
131
|
+
function isLockStale(lockPath) {
|
|
132
|
+
let holderAlive = true;
|
|
133
|
+
try {
|
|
134
|
+
const pidContent = fs.readFileSync(lockPath, 'utf-8').split('\n')[0].trim();
|
|
135
|
+
holderAlive = isPidAlive(Number(pidContent));
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
/* unreadable — fall through to age check */
|
|
139
|
+
}
|
|
140
|
+
if (!holderAlive)
|
|
141
|
+
return true;
|
|
142
|
+
try {
|
|
143
|
+
const stat = fs.statSync(lockPath);
|
|
144
|
+
return Date.now() - stat.mtimeMs > LOCK_STALE_MS;
|
|
145
|
+
}
|
|
146
|
+
catch {
|
|
147
|
+
return false;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
function acquireJournalLock(lockPath) {
|
|
151
|
+
const start = Date.now();
|
|
152
|
+
for (;;) {
|
|
153
|
+
const fresh = tryFreshAcquire(lockPath);
|
|
154
|
+
if (fresh)
|
|
155
|
+
return fresh;
|
|
156
|
+
if (isLockStale(lockPath)) {
|
|
146
157
|
const stolen = trySteal(lockPath);
|
|
147
158
|
if (stolen)
|
|
148
159
|
return stolen;
|
|
@@ -217,25 +228,19 @@ function withJournalLock(rootDir, fn) {
|
|
|
217
228
|
releaseJournalLock(lockPath, lock);
|
|
218
229
|
}
|
|
219
230
|
}
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
let content;
|
|
223
|
-
try {
|
|
224
|
-
content = fs.readFileSync(journalPath, 'utf-8');
|
|
225
|
-
}
|
|
226
|
-
catch {
|
|
227
|
-
return { valid: false };
|
|
228
|
-
}
|
|
229
|
-
const lines = content.split('\n');
|
|
230
|
-
if (lines.length === 0 || !lines[0].startsWith(HEADER_PREFIX)) {
|
|
231
|
+
function parseJournalHeader(firstLine) {
|
|
232
|
+
if (!firstLine || !firstLine.startsWith(HEADER_PREFIX)) {
|
|
231
233
|
debug('Journal has malformed or missing header');
|
|
232
|
-
return
|
|
234
|
+
return null;
|
|
233
235
|
}
|
|
234
|
-
const timestamp = Number(
|
|
236
|
+
const timestamp = Number(firstLine.slice(HEADER_PREFIX.length).trim());
|
|
235
237
|
if (!Number.isFinite(timestamp) || timestamp <= 0) {
|
|
236
238
|
debug('Journal has invalid timestamp');
|
|
237
|
-
return
|
|
239
|
+
return null;
|
|
238
240
|
}
|
|
241
|
+
return timestamp;
|
|
242
|
+
}
|
|
243
|
+
function parseJournalBody(lines) {
|
|
239
244
|
const changed = [];
|
|
240
245
|
const removed = [];
|
|
241
246
|
const seenChanged = new Set();
|
|
@@ -251,13 +256,27 @@ export function readJournal(rootDir) {
|
|
|
251
256
|
removed.push(filePath);
|
|
252
257
|
}
|
|
253
258
|
}
|
|
254
|
-
else {
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
changed.push(line);
|
|
258
|
-
}
|
|
259
|
+
else if (!seenChanged.has(line)) {
|
|
260
|
+
seenChanged.add(line);
|
|
261
|
+
changed.push(line);
|
|
259
262
|
}
|
|
260
263
|
}
|
|
264
|
+
return { changed, removed };
|
|
265
|
+
}
|
|
266
|
+
export function readJournal(rootDir) {
|
|
267
|
+
const journalPath = path.join(rootDir, '.codegraph', JOURNAL_FILENAME);
|
|
268
|
+
let content;
|
|
269
|
+
try {
|
|
270
|
+
content = fs.readFileSync(journalPath, 'utf-8');
|
|
271
|
+
}
|
|
272
|
+
catch {
|
|
273
|
+
return { valid: false };
|
|
274
|
+
}
|
|
275
|
+
const lines = content.split('\n');
|
|
276
|
+
const timestamp = parseJournalHeader(lines[0]);
|
|
277
|
+
if (timestamp === null)
|
|
278
|
+
return { valid: false };
|
|
279
|
+
const { changed, removed } = parseJournalBody(lines);
|
|
261
280
|
return { valid: true, timestamp, changed, removed };
|
|
262
281
|
}
|
|
263
282
|
export function appendJournalEntries(rootDir, entries) {
|